From 7dc9fce0c8e6cc6c22027693a0f542f37e30c9d5 Mon Sep 17 00:00:00 2001 From: Alison Goryachev Date: Mon, 15 Mar 2021 20:20:58 -0400 Subject: [PATCH 01/24] [Upgrade Assistant] Add support for deprecated index settings (#93293) --- .../public/doc_links/doc_links_service.ts | 3 +- .../translations/translations/ja-JP.json | 1 - .../translations/translations/zh-CN.json | 1 - .../upgrade_assistant/common/constants.ts | 12 + .../plugins/upgrade_assistant/common/types.ts | 21 +- .../public/application/app.tsx | 4 +- .../public/application/app_context.tsx | 3 +- .../public/application/components/tabs.tsx | 6 +- .../__snapshots__/checkup_tab.test.tsx.snap | 442 +++++++++--------- .../components/tabs/checkup/checkup_tab.tsx | 4 +- .../tabs/checkup/deprecations/cell.tsx | 9 + .../checkup/deprecations/grouped.test.tsx | 1 + .../tabs/checkup/deprecations/grouped.tsx | 5 +- .../deprecations/index_settings/button.tsx | 54 +++ .../deprecations/index_settings/index.ts | 8 + .../remove_settings_provider.tsx | 137 ++++++ .../checkup/deprecations/index_table.test.tsx | 1 + .../tabs/checkup/deprecations/index_table.tsx | 51 +- .../tabs/checkup/deprecations/list.test.tsx | 2 + .../tabs/checkup/deprecations/list.tsx | 11 +- .../checkup/deprecations/reindex/button.tsx | 3 +- .../checklist_step.test.tsx.snap | 4 +- .../__snapshots__/warning_step.test.tsx.snap | 2 +- .../deprecations/reindex/flyout/_index.scss | 1 - .../reindex/flyout/_warnings_step.scss | 4 - .../reindex/flyout/checklist_step.test.tsx | 4 +- .../reindex/flyout/warning_step.test.tsx | 43 +- .../reindex/flyout/warning_step_checkbox.tsx | 161 +++++++ .../reindex/flyout/warnings_step.tsx | 104 ++--- .../application/mount_management_section.ts | 3 +- .../es_migration_apis.test.ts.snap | 6 + .../server/lib/es_migration_apis.ts | 10 + .../lib/reindexing/index_settings.test.ts | 238 ++++++---- .../server/lib/reindexing/index_settings.ts | 109 +++-- .../upgrade_assistant/server/plugin.ts | 2 + .../reindex_indices/reindex_indices.test.ts | 23 +- .../server/routes/update_index_settings.ts | 65 +++ .../helpers/http_requests.ts | 56 +++ .../tests_client_integration/helpers/index.ts | 5 +- .../helpers/indices.helpers.ts | 62 +++ .../helpers/setup_environment.tsx | 22 +- .../tests_client_integration/indices.test.ts | 93 ++++ .../tests_client_integration/overview.test.ts | 10 +- .../upgrade_assistant/upgrade_assistant.ts | 115 ++++- 44 files changed, 1417 insertions(+), 504 deletions(-) create mode 100644 x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_settings/button.tsx create mode 100644 x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_settings/index.ts create mode 100644 x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_settings/remove_settings_provider.tsx delete mode 100644 x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/_warnings_step.scss create mode 100644 x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/warning_step_checkbox.tsx create mode 100644 x-pack/plugins/upgrade_assistant/server/routes/update_index_settings.ts create mode 100644 x-pack/plugins/upgrade_assistant/tests_client_integration/helpers/http_requests.ts create mode 100644 x-pack/plugins/upgrade_assistant/tests_client_integration/helpers/indices.helpers.ts create mode 100644 x-pack/plugins/upgrade_assistant/tests_client_integration/indices.test.ts diff --git a/src/core/public/doc_links/doc_links_service.ts b/src/core/public/doc_links/doc_links_service.ts index 0a781394afc41..ee5f50588ff04 100644 --- a/src/core/public/doc_links/doc_links_service.ts +++ b/src/core/public/doc_links/doc_links_service.ts @@ -133,7 +133,8 @@ export class DocLinksService { remoteClustersProxy: `${ELASTICSEARCH_DOCS}modules-remote-clusters.html#proxy-mode`, remoteClusersProxySettings: `${ELASTICSEARCH_DOCS}modules-remote-clusters.html#remote-cluster-proxy-settings`, scriptParameters: `${ELASTICSEARCH_DOCS}modules-scripting-using.html#prefer-params`, - transportSettings: `${ELASTICSEARCH_DOCS}modules-network.html`, + transportSettings: `${ELASTICSEARCH_DOCS}modules-transport.html`, + typesRemoval: `${ELASTICSEARCH_DOCS}removal-of-types.html`, }, siem: { guide: `${ELASTIC_WEBSITE_URL}guide/en/security/${DOC_LINK_VERSION}/index.html`, diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index c0c810496bb9a..32b749d2d7fa7 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -22801,7 +22801,6 @@ "xpack.upgradeAssistant.checkupTab.reindexing.flyout.indexClosedCallout.calloutTitle": "インデックスが閉じました", "xpack.upgradeAssistant.checkupTab.reindexing.flyout.openAndCloseDocumentation": "ドキュメンテーション", "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 index 9a8c014dbc386..db3ca3d56ec5a 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -23158,7 +23158,6 @@ "xpack.upgradeAssistant.checkupTab.reindexing.flyout.indexClosedCallout.calloutTitle": "索引已关闭", "xpack.upgradeAssistant.checkupTab.reindexing.flyout.openAndCloseDocumentation": "文档", "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 index 87b014c5bbc5b..cc8eaf9d66e04 100644 --- a/x-pack/plugins/upgrade_assistant/common/constants.ts +++ b/x-pack/plugins/upgrade_assistant/common/constants.ts @@ -20,3 +20,15 @@ export const mockKibanaSemverVersion = new SemVer(mockKibanaVersion); * and will be presented with a message indicating as such. */ export const UA_READONLY_MODE = true; + +/* + * Map of 7.0 --> 8.0 index setting deprecation log messages and associated settings + * We currently only support one setting deprecation (translog retention), but the code is written + * in a way to be able to support any number of deprecated index settings defined here + */ +export const indexSettingDeprecations = { + translog: { + deprecationMessage: 'translog retention settings are ignored', // expected message from ES deprecation info API + settings: ['translog.retention.size', 'translog.retention.age'], + }, +}; diff --git a/x-pack/plugins/upgrade_assistant/common/types.ts b/x-pack/plugins/upgrade_assistant/common/types.ts index 6d83bdc5f36e9..b8a5a7c1ab8cc 100644 --- a/x-pack/plugins/upgrade_assistant/common/types.ts +++ b/x-pack/plugins/upgrade_assistant/common/types.ts @@ -92,11 +92,21 @@ export interface ReindexOperation extends SavedObjectAttributes { export type ReindexSavedObject = SavedObject; -export enum ReindexWarning { - // 7.0 -> 8.0 warnings - customTypeName, - - // 8.0 -> 9.0 warnings +// 7.0 -> 8.0 warnings +export type ReindexWarningTypes = 'customTypeName' | 'indexSetting'; +export interface ReindexWarning { + warningType: ReindexWarningTypes; + /** + * Optional metadata for deprecations + * + * @remark + * For example, for the "customTypeName" deprecation, + * we want to surface the typeName to the user. + * For "indexSetting" we want to surface the deprecated settings. + */ + meta?: { + [key: string]: string | string[]; + }; } export enum IndexGroup { @@ -181,6 +191,7 @@ export interface EnrichedDeprecationInfo extends DeprecationInfo { index?: string; node?: string; reindex?: boolean; + deprecatedIndexSettings?: string[]; /** * Indicate what blockers have been detected for calling reindex * against this index. diff --git a/x-pack/plugins/upgrade_assistant/public/application/app.tsx b/x-pack/plugins/upgrade_assistant/public/application/app.tsx index d54a6957f4b6e..1276198a528df 100644 --- a/x-pack/plugins/upgrade_assistant/public/application/app.tsx +++ b/x-pack/plugins/upgrade_assistant/public/application/app.tsx @@ -18,9 +18,7 @@ export const RootComponent = ({ i18n, ...contextValue }: AppDependencies) => { return ( -
- -
+ ); diff --git a/x-pack/plugins/upgrade_assistant/public/application/app_context.tsx b/x-pack/plugins/upgrade_assistant/public/application/app_context.tsx index 2a16be7ec5204..3dccd7b6959f2 100644 --- a/x-pack/plugins/upgrade_assistant/public/application/app_context.tsx +++ b/x-pack/plugins/upgrade_assistant/public/application/app_context.tsx @@ -5,7 +5,7 @@ * 2.0. */ -import { DocLinksStart, HttpSetup } from 'src/core/public'; +import { DocLinksStart, HttpSetup, NotificationsStart } from 'src/core/public'; import React, { createContext, useContext } from 'react'; export interface KibanaVersionContext { @@ -19,6 +19,7 @@ export interface ContextValue { isCloudEnabled: boolean; docLinks: DocLinksStart; kibanaVersionInfo: KibanaVersionContext; + notifications: NotificationsStart; isReadOnlyMode: boolean; } diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/tabs.tsx index fa6badb34635b..48dfc40af7392 100644 --- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs.tsx +++ b/x-pack/plugins/upgrade_assistant/public/application/components/tabs.tsx @@ -160,7 +160,8 @@ export class UpgradeAssistantTabs extends React.Component { const resp = await this.props.http.get('/api/upgrade_assistant/status'); this.setState({ loadingState: LoadingState.Success, - checkupData: resp, + // resp.data is specifically to handle the CITs which uses axios to mock HTTP requests + checkupData: resp.data ? resp.data : resp, }); } catch (e) { if (get(e, 'response.status') === 426) { @@ -243,8 +244,7 @@ export class UpgradeAssistantTabs extends React.Component { this.setState({ telemetryState: TelemetryState.Running }); - await this.props.http.fetch('/api/upgrade_assistant/stats/ui_open', { - method: 'PUT', + await this.props.http.put('/api/upgrade_assistant/stats/ui_open', { body: JSON.stringify(set({}, tabName, true)), }); diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/__snapshots__/checkup_tab.test.tsx.snap b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/__snapshots__/checkup_tab.test.tsx.snap index bac67bf722ea7..c4714796763ed 100644 --- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/__snapshots__/checkup_tab.test.tsx.snap +++ b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/__snapshots__/checkup_tab.test.tsx.snap @@ -60,225 +60,229 @@ exports[`CheckupTab render with deprecations 1`] = ` - - - +
+ + + +
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/checkup_tab.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/checkup_tab.tsx index 87c3d69ad03c6..f06abb33fc300 100644 --- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/checkup_tab.tsx +++ b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/checkup_tab.tsx @@ -162,7 +162,7 @@ export const CheckupTab: FunctionComponent = ({ {loadingState === LoadingState.Error ? ( ) : deprecations && deprecations.length > 0 ? ( - <> +
= ({ /> {renderCheckupData()} - +
) : ( ; reindexIndexName?: string; + deprecatedIndexSettings?: string[]; docUrl?: string; headline?: string; healthColor?: string; @@ -38,6 +40,7 @@ export const DeprecationCell: FunctionComponent = ({ headline, healthColor, reindexIndexName, + deprecatedIndexSettings, docUrl, items = [], children, @@ -94,6 +97,12 @@ export const DeprecationCell: FunctionComponent = ({ )} + + {deprecatedIndexSettings?.length && ( + + + + )} diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/grouped.test.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/grouped.test.tsx index 91d34a3907d45..0885286961b11 100644 --- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/grouped.test.tsx +++ b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/grouped.test.tsx @@ -201,6 +201,7 @@ describe('GroupedDeprecations', () => { describe('DeprecationAccordion', () => { const defaultProps = { id: 'x', + dataTestSubj: 'data-test-subj', title: 'Issue 1', currentGroupBy: GroupByOption.message, forceExpand: false, diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/grouped.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/grouped.tsx index f27a2cf6cb2b6..3c18d6fe8a609 100644 --- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/grouped.tsx +++ b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/grouped.tsx @@ -65,7 +65,8 @@ export const DeprecationAccordion: FunctionComponent<{ title: string; currentGroupBy: GroupByOption; forceExpand: boolean; -}> = ({ id, deprecations, title, currentGroupBy, forceExpand }) => { + dataTestSubj: string; +}> = ({ id, deprecations, title, currentGroupBy, forceExpand, dataTestSubj }) => { const hasIndices = Boolean( currentGroupBy === GroupByOption.message && deprecations.filter((d) => d.index).length ); @@ -74,6 +75,7 @@ export const DeprecationAccordion: FunctionComponent<{ return ( {title}} @@ -223,6 +225,7 @@ export class GroupedDeprecations extends React.Component< = ({ settings, index }) => { + return ( + + {(removeIndexSettingsPrompt, successfulRequests) => { + const isSuccessfulRequest = successfulRequests[index] === true; + return ( + removeIndexSettingsPrompt(index, settings)} + isDisabled={isSuccessfulRequest} + iconType={isSuccessfulRequest ? 'check' : undefined} + > + {isSuccessfulRequest ? i18nTexts.doneButtonLabel : i18nTexts.fixButtonLabel} + + ); + }} + + ); +}; diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_settings/index.ts b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_settings/index.ts new file mode 100644 index 0000000000000..e8a83790ee2a6 --- /dev/null +++ b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_settings/index.ts @@ -0,0 +1,8 @@ +/* + * 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. + */ + +export { FixIndexSettingsButton } from './button'; diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_settings/remove_settings_provider.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_settings/remove_settings_provider.tsx new file mode 100644 index 0000000000000..5078cf51e9d81 --- /dev/null +++ b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_settings/remove_settings_provider.tsx @@ -0,0 +1,137 @@ +/* + * 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 React, { useState, useRef } from 'react'; +import { i18n } from '@kbn/i18n'; +import { EuiCode, EuiConfirmModal } from '@elastic/eui'; +import { useAppContext } from '../../../../../app_context'; + +interface Props { + children: ( + removeSettingsPrompt: (index: string, settings: string[]) => void, + successfulRequests: { [key: string]: boolean } + ) => React.ReactNode; +} + +const i18nTexts = { + removeButtonLabel: i18n.translate( + 'xpack.upgradeAssistant.checkupTab.confirmationModal.removeButtonLabel', + { + defaultMessage: 'Remove', + } + ), + cancelButtonLabel: i18n.translate( + 'xpack.upgradeAssistant.checkupTab.indexSettings.confirmationModal.cancelButtonLabel', + { + defaultMessage: 'Cancel', + } + ), + modalDescription: i18n.translate( + 'xpack.upgradeAssistant.checkupTab.indexSettings.confirmationModal.description', + { + defaultMessage: 'The following deprecated index settings were detected and will be removed:', + } + ), + successNotificationText: i18n.translate( + 'xpack.upgradeAssistant.checkupTab.indexSettings.confirmationModal.successNotificationText', + { + defaultMessage: 'Index settings removed', + } + ), + errorNotificationText: i18n.translate( + 'xpack.upgradeAssistant.checkupTab.indexSettings.confirmationModal.errorNotificationText', + { + defaultMessage: 'Error removing index settings', + } + ), +}; + +export const RemoveIndexSettingsProvider = ({ children }: Props) => { + const [isModalOpen, setIsModalOpen] = useState(false); + const [successfulRequests, setSuccessfulRequests] = useState<{ [key: string]: boolean }>({}); + const [isLoading, setIsLoading] = useState(false); + + const deprecatedSettings = useRef([]); + const indexName = useRef(undefined); + + const { http, notifications } = useAppContext(); + + const removeIndexSettings = async () => { + setIsLoading(true); + try { + await http.post(`/api/upgrade_assistant/${indexName.current}/index_settings`, { + body: JSON.stringify({ + settings: deprecatedSettings.current, + }), + }); + + setIsLoading(false); + setSuccessfulRequests({ + [indexName.current!]: true, + }); + closeModal(); + notifications.toasts.addSuccess(i18nTexts.successNotificationText); + } catch (e) { + setIsLoading(false); + closeModal(); + notifications.toasts.addError(e, { + title: i18nTexts.errorNotificationText, + }); + } + }; + + const closeModal = () => { + setIsModalOpen(false); + }; + + const removeSettingsPrompt = (index: string, settings: string[]) => { + setIsModalOpen(true); + setSuccessfulRequests({ + [index]: false, + }); + indexName.current = index; + deprecatedSettings.current = settings; + }; + + return ( + <> + {children(removeSettingsPrompt, successfulRequests)} + + {isModalOpen && ( + + <> +

{i18nTexts.modalDescription}

+
    + {deprecatedSettings.current.map((setting, index) => ( +
  • + {setting} +
    • + ))} +
+ + + )} + + ); +}; diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_table.test.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_table.test.tsx index e9defa76f5d0d..188e70b64ce6a 100644 --- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_table.test.tsx +++ b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_table.test.tsx @@ -77,6 +77,7 @@ describe('IndexDeprecationTable', () => { } } responsive={true} + rowProps={[Function]} sorting={ Object { "sort": Object { diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_table.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_table.tsx index 292887853e4b3..da2f5f04effc4 100644 --- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_table.tsx +++ b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_table.tsx @@ -13,12 +13,14 @@ import { i18n } from '@kbn/i18n'; import { ReindexButton } from './reindex'; import { AppContext } from '../../../../app_context'; import { EnrichedDeprecationInfo } from '../../../../../../common/types'; +import { FixIndexSettingsButton } from './index_settings'; const PAGE_SIZES = [10, 25, 50, 100, 250, 500, 1000]; export interface IndexDeprecationDetails { index: string; reindex: boolean; + deprecatedIndexSettings?: string[]; blockerForReindexing?: EnrichedDeprecationInfo['blockerForReindexing']; details?: string; } @@ -97,6 +99,11 @@ export class IndexDeprecationTable extends React.Component< pagination={pagination} onChange={this.onTableChange} hasActions={false} + rowProps={(indexDetails) => { + return { + 'data-test-subj': `indexTableRow-${indexDetails.index}`, + }; + }} /> ); } @@ -142,12 +149,15 @@ 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 use cases. + // NOTE: this naive implementation assumes all indices in the table + // should show the reindex button or fix indices button. This should work for known use cases. const { indices } = this.props; - const hasActionsColumn = Boolean(indices.find((i) => i.reindex === true)); + const showReindexButton = Boolean(indices.find((i) => i.reindex === true)); + const showFixSettingsButton = Boolean( + indices.find((i) => i.deprecatedIndexSettings && i.deprecatedIndexSettings.length > 0) + ); - if (hasActionsColumn === false) { + if (showReindexButton === false && showFixSettingsButton === false) { return null; } @@ -155,19 +165,28 @@ export class IndexDeprecationTable extends React.Component< actions: [ { render(indexDep: IndexDeprecationDetails) { + if (showReindexButton) { + return ( + + {({ http, docLinks }) => { + return ( + + ); + }} + + ); + } + return ( - - {({ http, docLinks }) => { - return ( - - ); - }} - + ); }, }, diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/list.test.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/list.test.tsx index 0bd930484af04..1d646442ebee0 100644 --- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/list.test.tsx +++ b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/list.test.tsx @@ -73,12 +73,14 @@ describe('DeprecationList', () => { Array [ Object { "blockerForReindexing": undefined, + "deprecatedIndexSettings": undefined, "details": undefined, "index": "0", "reindex": false, }, Object { "blockerForReindexing": undefined, + "deprecatedIndexSettings": undefined, "details": undefined, "index": "1", "reindex": false, diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/list.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/list.tsx index a3e024ee54669..eb9012b3bddd1 100644 --- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/list.tsx +++ b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/list.tsx @@ -21,9 +21,9 @@ const sortByLevelDesc = (a: DeprecationInfo, b: DeprecationInfo) => { /** * Used to show a single deprecation message with any detailed information. */ -const MessageDeprecation: FunctionComponent<{ deprecation: EnrichedDeprecationInfo }> = ({ - deprecation, -}) => { +const MessageDeprecation: FunctionComponent<{ + deprecation: EnrichedDeprecationInfo; +}> = ({ deprecation }) => { const items = []; if (deprecation.details) { @@ -36,6 +36,7 @@ const MessageDeprecation: FunctionComponent<{ deprecation: EnrichedDeprecationIn headline={deprecation.message} healthColor={COLOR_MAP[deprecation.level]} reindexIndexName={deprecation.reindex ? deprecation.index! : undefined} + deprecatedIndexSettings={deprecation.deprecatedIndexSettings} docUrl={deprecation.url} items={items} /> @@ -59,12 +60,13 @@ const SimpleMessageDeprecation: FunctionComponent<{ deprecation: EnrichedDepreca reindexBlocker={deprecation.blockerForReindexing} items={items} docUrl={deprecation.url} + deprecatedIndexSettings={deprecation.deprecatedIndexSettings} /> ); }; interface IndexDeprecationProps { - deprecation: DeprecationInfo; + deprecation: EnrichedDeprecationInfo; indices: IndexDeprecationDetails[]; } @@ -96,6 +98,7 @@ export const DeprecationList: FunctionComponent<{ index: dep.index!, details: dep.details, reindex: dep.reindex === true, + deprecatedIndexSettings: dep.deprecatedIndexSettings, blockerForReindexing: dep.blockerForReindexing, })); return ; diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/button.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/button.tsx index 1a99eca816007..2692dd083c3b8 100644 --- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/button.tsx +++ b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/button.tsx @@ -240,8 +240,7 @@ export class ReindexButton extends React.Component diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/_index.scss b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/_index.scss index 9e899eee88796..1c9fd599b13a8 100644 --- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/_index.scss +++ b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/_index.scss @@ -1,2 +1 @@ @import 'step_progress'; -@import 'warnings_step'; diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/_warnings_step.scss b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/_warnings_step.scss deleted file mode 100644 index 4279c0110ea75..0000000000000 --- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/_warnings_step.scss +++ /dev/null @@ -1,4 +0,0 @@ -.upgWarningsStep__warningDescription { - margin-left: $euiSizeL; - margin-top: $euiSizeXS; -} diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/checklist_step.test.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/checklist_step.test.tsx index feca7fe392bd8..5bea0d855e45e 100644 --- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/checklist_step.test.tsx +++ b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/checklist_step.test.tsx @@ -9,7 +9,7 @@ import { shallow } from 'enzyme'; import { cloneDeep } from 'lodash'; import React from 'react'; -import { ReindexStatus, ReindexWarning } from '../../../../../../../../common/types'; +import { ReindexStatus } from '../../../../../../../../common/types'; import { LoadingState } from '../../../../../types'; import { ReindexState } from '../polling_service'; import { ChecklistFlyoutStep } from './checklist_step'; @@ -29,7 +29,7 @@ describe('ChecklistFlyout', () => { status: undefined, reindexTaskPercComplete: null, errorMessage: null, - reindexWarnings: [ReindexWarning.customTypeName], + reindexWarnings: [], hasRequiredPrivileges: true, } as ReindexState, }; diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/warning_step.test.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/warning_step.test.tsx index d365cd82ba86c..ca9c53354bf75 100644 --- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/warning_step.test.tsx +++ b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/warning_step.test.tsx @@ -8,19 +8,21 @@ import { I18nProvider } from '@kbn/i18n/react'; import { mount, shallow } from 'enzyme'; import React from 'react'; -import { mockKibanaSemverVersion } from '../../../../../../../../common/constants'; import { ReindexWarning } from '../../../../../../../../common/types'; +import { mockKibanaSemverVersion } from '../../../../../../../../common/constants'; + import { idForWarning, WarningsFlyoutStep } from './warnings_step'; jest.mock('../../../../../../app_context', () => { + const { docLinksServiceMock } = jest.requireActual( + '../../../../../../../../../../../src/core/public/doc_links/doc_links_service.mock' + ); + return { useAppContext: () => { return { - docLinks: { - DOC_LINK_VERSION: 'current', - ELASTIC_WEBSITE_URL: 'https://www.elastic.co/', - }, + docLinks: docLinksServiceMock.createStartContract(), kibanaVersionInfo: { currentMajor: mockKibanaSemverVersion.major, prevMajor: mockKibanaSemverVersion.major - 1, @@ -34,7 +36,7 @@ jest.mock('../../../../../../app_context', () => { describe('WarningsFlyoutStep', () => { const defaultProps = { advanceNextStep: jest.fn(), - warnings: [ReindexWarning.customTypeName], + warnings: [] as ReindexWarning[], closeFlyout: jest.fn(), renderGlobalCallouts: jest.fn(), }; @@ -45,19 +47,40 @@ describe('WarningsFlyoutStep', () => { if (mockKibanaSemverVersion.major === 7) { it('does not allow proceeding until all are checked', () => { + const defaultPropsWithWarnings = { + ...defaultProps, + warnings: [ + { + warningType: 'customTypeName', + meta: { + typeName: 'my_mapping_type', + }, + }, + { + warningType: 'indexSetting', + meta: { + deprecatedSettings: ['index.force_memory_term_dictionary'], + }, + }, + ] as ReindexWarning[], + }; const wrapper = mount( - + ); const button = wrapper.find('EuiButton'); button.simulate('click'); - expect(defaultProps.advanceNextStep).not.toHaveBeenCalled(); + expect(defaultPropsWithWarnings.advanceNextStep).not.toHaveBeenCalled(); - wrapper.find(`input#${idForWarning(ReindexWarning.customTypeName)}`).simulate('change'); + // first warning (customTypeName) + wrapper.find(`input#${idForWarning(0)}`).simulate('change'); + // second warning (indexSetting) + wrapper.find(`input#${idForWarning(1)}`).simulate('change'); button.simulate('click'); - expect(defaultProps.advanceNextStep).toHaveBeenCalled(); + + expect(defaultPropsWithWarnings.advanceNextStep).toHaveBeenCalled(); }); } }); diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/warning_step_checkbox.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/warning_step_checkbox.tsx new file mode 100644 index 0000000000000..19952938a1dd9 --- /dev/null +++ b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/warning_step_checkbox.tsx @@ -0,0 +1,161 @@ +/* + * 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 React from 'react'; + +import { + EuiCheckbox, + EuiCode, + EuiLink, + EuiSpacer, + EuiText, + EuiFlexGroup, + EuiFlexItem, + EuiIconTip, +} from '@elastic/eui'; +import { FormattedMessage } from '@kbn/i18n/react'; +import { DocLinksStart } from 'kibana/public'; +import { ReindexWarning, ReindexWarningTypes } from '../../../../../../../../common/types'; + +export const hasReindexWarning = ( + warnings: ReindexWarning[], + warningType: ReindexWarningTypes +): boolean => { + return Boolean(warnings.find((warning) => warning.warningType === warningType)); +}; + +const WarningCheckbox: React.FunctionComponent<{ + isChecked: boolean; + warningId: string; + label: React.ReactNode; + description: React.ReactNode; + documentationUrl: string; + onChange: (event: React.ChangeEvent) => void; +}> = ({ isChecked, warningId, label, onChange, description, documentationUrl }) => ( + <> + + + + {label}} + checked={isChecked} + onChange={onChange} + /> + + + + + } + position="right" + type="help" + /> + + + + + + + {description} + + + + +); + +export interface WarningCheckboxProps { + isChecked: boolean; + onChange: (event: React.ChangeEvent) => void; + docLinks: DocLinksStart['links']; + id: string; + meta?: ReindexWarning['meta']; +} + +export const CustomTypeNameWarningCheckbox: React.FunctionComponent = ({ + isChecked, + onChange, + docLinks, + id, + meta, +}) => { + return ( + {meta!.typeName as string}, + defaultType: _doc, + }} + /> + } + description={ + _doc, + }} + /> + } + documentationUrl={docLinks.elasticsearch.typesRemoval} + /> + ); +}; + +export const DeprecatedSettingWarningCheckbox: React.FunctionComponent = ({ + isChecked, + onChange, + docLinks, + id, + meta, +}) => { + return ( + + } + description={ + <> + + + + +
    + {(meta!.deprecatedSettings as string[]).map((setting, index) => { + return ( +
  • + {setting} +
    • + ); + })} +
+ + } + documentationUrl={docLinks.elasticsearch.indexModules} + /> + ); +}; diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/warnings_step.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/warnings_step.tsx index f6620e4125c9a..d0904c588ed07 100644 --- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/warnings_step.tsx +++ b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/warnings_step.tsx @@ -10,59 +10,35 @@ import React, { useState } from 'react'; import { EuiButton, EuiButtonEmpty, - EuiCode, EuiCallOut, - EuiCheckbox, EuiFlexGroup, EuiFlexItem, EuiFlyoutBody, EuiFlyoutFooter, - EuiLink, EuiSpacer, - EuiText, } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; + +import { ReindexWarning, ReindexWarningTypes } from '../../../../../../../../common/types'; import { useAppContext } from '../../../../../../app_context'; -import { ReindexWarning } from '../../../../../../../../common/types'; +import { + CustomTypeNameWarningCheckbox, + DeprecatedSettingWarningCheckbox, + WarningCheckboxProps, +} from './warning_step_checkbox'; interface CheckedIds { [id: string]: boolean; } -export const idForWarning = (warning: ReindexWarning) => `reindexWarning-${warning}`; - -const WarningCheckbox: React.FunctionComponent<{ - checkedIds: CheckedIds; - warning: ReindexWarning; - label: React.ReactNode; - description: React.ReactNode; - documentationUrl: string; - onChange: (event: React.ChangeEvent) => void; -}> = ({ checkedIds, warning, label, onChange, description, documentationUrl }) => ( - <> - - {label}} - checked={checkedIds[idForWarning(warning)]} - onChange={onChange} - /> -

- {description} -
- - - -

- - - - -); +const warningToComponentMap: { + [key in ReindexWarningTypes]: React.FunctionComponent; +} = { + customTypeName: CustomTypeNameWarningCheckbox, + indexSetting: DeprecatedSettingWarningCheckbox, +}; +export const idForWarning = (id: number) => `reindexWarning-${id}`; interface WarningsConfirmationFlyoutProps { renderGlobalCallouts: () => React.ReactNode; closeFlyout: () => void; @@ -80,9 +56,12 @@ export const WarningsFlyoutStep: React.FunctionComponent { + const { docLinks } = useAppContext(); + const { links } = docLinks; + const [checkedIds, setCheckedIds] = useState( - warnings.reduce((initialCheckedIds, warning) => { - initialCheckedIds[idForWarning(warning)] = false; + warnings.reduce((initialCheckedIds, warning, index) => { + initialCheckedIds[idForWarning(index)] = false; return initialCheckedIds; }, {} as { [id: string]: boolean }) ); @@ -101,14 +80,11 @@ export const WarningsFlyoutStep: React.FunctionComponent {renderGlobalCallouts()} + - {kibanaVersionInfo.currentMajor === 7 && warnings.includes(ReindexWarning.customTypeName) && ( - _doc, - }} - /> - } - description={ - _doc, - }} - /> - } - documentationUrl={`${esDocBasePath}/${DOC_LINK_VERSION}/removal-of-types.html`} - /> - )} + {warnings.map((warning, index) => { + const WarningCheckbox = warningToComponentMap[warning.warningType]; + return ( + + ); + })} diff --git a/x-pack/plugins/upgrade_assistant/public/application/mount_management_section.ts b/x-pack/plugins/upgrade_assistant/public/application/mount_management_section.ts index 905f8201e0648..cb45247473465 100644 --- a/x-pack/plugins/upgrade_assistant/public/application/mount_management_section.ts +++ b/x-pack/plugins/upgrade_assistant/public/application/mount_management_section.ts @@ -17,7 +17,7 @@ export async function mountManagementSection( params: ManagementAppMountParams, kibanaVersionInfo: KibanaVersionContext ) { - const [{ i18n, docLinks }] = await coreSetup.getStartServices(); + const [{ i18n, docLinks, notifications }] = await coreSetup.getStartServices(); return renderApp({ element: params.element, isCloudEnabled, @@ -25,6 +25,7 @@ export async function mountManagementSection( i18n, docLinks, kibanaVersionInfo, + notifications, isReadOnlyMode: UA_READONLY_MODE, }); } diff --git a/x-pack/plugins/upgrade_assistant/server/lib/__snapshots__/es_migration_apis.test.ts.snap b/x-pack/plugins/upgrade_assistant/server/lib/__snapshots__/es_migration_apis.test.ts.snap index 244fc96acd194..aefac2b4c63f6 100644 --- a/x-pack/plugins/upgrade_assistant/server/lib/__snapshots__/es_migration_apis.test.ts.snap +++ b/x-pack/plugins/upgrade_assistant/server/lib/__snapshots__/es_migration_apis.test.ts.snap @@ -31,6 +31,7 @@ Object { "indices": Array [ Object { "blockerForReindexing": undefined, + "deprecatedIndexSettings": Array [], "details": "[[type: doc, field: spins], [type: doc, field: mlockall], [type: doc, field: node_master], [type: doc, field: primary]]", "index": ".monitoring-es-6-2018.11.07", "level": "warning", @@ -40,6 +41,7 @@ Object { }, Object { "blockerForReindexing": undefined, + "deprecatedIndexSettings": Array [], "details": "[[type: tweet, field: liked]]", "index": "twitter", "level": "warning", @@ -49,6 +51,7 @@ Object { }, Object { "blockerForReindexing": undefined, + "deprecatedIndexSettings": Array [], "details": "[[type: index-pattern, field: notExpandable], [type: config, field: xPackMonitoring:allowReport], [type: config, field: xPackMonitoring:showBanner], [type: dashboard, field: pause], [type: dashboard, field: timeRestore]]", "index": ".kibana", "level": "warning", @@ -58,6 +61,7 @@ Object { }, Object { "blockerForReindexing": undefined, + "deprecatedIndexSettings": Array [], "details": "[[type: doc, field: notify], [type: doc, field: created], [type: doc, field: attach_payload], [type: doc, field: met]]", "index": ".watcher-history-6-2018.11.07", "level": "warning", @@ -67,6 +71,7 @@ Object { }, Object { "blockerForReindexing": undefined, + "deprecatedIndexSettings": Array [], "details": "[[type: doc, field: snapshot]]", "index": ".monitoring-kibana-6-2018.11.07", "level": "warning", @@ -76,6 +81,7 @@ Object { }, Object { "blockerForReindexing": undefined, + "deprecatedIndexSettings": Array [], "details": "[[type: tweet, field: liked]]", "index": "twitter2", "level": "warning", diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_migration_apis.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_migration_apis.ts index 6e357fd755c82..3486603341674 100644 --- a/x-pack/plugins/upgrade_assistant/server/lib/es_migration_apis.ts +++ b/x-pack/plugins/upgrade_assistant/server/lib/es_migration_apis.ts @@ -6,6 +6,7 @@ */ import { IScopedClusterClient } from 'src/core/server'; +import { indexSettingDeprecations } from '../../common/constants'; import { DeprecationAPIResponse, EnrichedDeprecationInfo, @@ -57,6 +58,7 @@ const getCombinedIndexInfos = (deprecations: DeprecationAPIResponse) => ...d, index: indexName, reindex: /Index created before/.test(d.message), + deprecatedIndexSettings: getIndexSettingDeprecations(d.message), } as EnrichedDeprecationInfo) ) ); @@ -74,3 +76,11 @@ const getClusterDeprecations = (deprecations: DeprecationAPIResponse, isCloudEna return combined; } }; + +const getIndexSettingDeprecations = (message: string) => { + const indexDeprecation = Object.values(indexSettingDeprecations).find( + ({ deprecationMessage }) => deprecationMessage === message + ); + + return indexDeprecation?.settings || []; +}; diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/index_settings.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/index_settings.test.ts index f778981b95054..5e994f76f927c 100644 --- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/index_settings.test.ts +++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/index_settings.test.ts @@ -6,7 +6,6 @@ */ import { mockKibanaSemverVersion, mockKibanaVersion } from '../../../common/constants'; -import { ReindexWarning } from '../../../common/types'; import { versionService } from '../version'; import { getMockVersionInfo } from '../__fixtures__/version'; @@ -64,6 +63,11 @@ describe('transformFlatSettings', () => { 'index.verified_before_close': 'true', 'index.version.created': '123123', 'index.version.upgraded': '123123', + + // Deprecated settings + 'index.force_memory_term_dictionary': '1024', + 'index.max_adjacency_matrix_filters': 'true', + 'index.soft_deletes.enabled': 'true', }, mappings: {}, }) @@ -76,129 +80,173 @@ describe('transformFlatSettings', () => { }); }); - it('does not allow index.mapper.dynamic to be set', () => { - expect(() => + it('removes index.translog.retention.size if soft deletes is enabled', () => { + expect( transformFlatSettings({ settings: { - 'index.mapper.dynamic': 'true', - }, - mappings: {}, - }) - ).toThrowError(`'index.mapper.dynamic' is no longer supported.`); - }); + // Settings that should get preserved + 'index.number_of_replicas': '1', + 'index.number_of_shards': '5', - it('does not allow index.merge.policy.reclaim_deletes_weight to be set', () => { - expect(() => - transformFlatSettings({ - settings: { - 'index.merge.policy.reclaim_deletes_weight': '2.0d', + // Deprecated settings + 'index.soft_deletes.enabled': 'true', + 'index.translog.retention.size': '5b', }, mappings: {}, }) - ).toThrowError(`'index.merge.policy.reclaim_deletes_weight' is no longer supported.`); + ).toEqual({ + settings: { + 'index.number_of_replicas': '1', + 'index.number_of_shards': '5', + }, + mappings: {}, + }); }); - it('does not allow index.force_memory_term_dictionary to be set', () => { - expect(() => + it('removes index.translog.retention.age if soft deletes is enabled', () => { + expect( transformFlatSettings({ settings: { - 'index.force_memory_term_dictionary': 'false', - }, - mappings: {}, - }) - ).toThrowError(`'index.force_memory_term_dictionary' is no longer supported.`); - }); + // Settings that should get preserved + 'index.number_of_replicas': '1', + 'index.number_of_shards': '5', - it('does not index.max_adjacency_matrix_filters to be set', () => { - expect(() => - transformFlatSettings({ - settings: { - 'index.max_adjacency_matrix_filters': '1024', + // Deprecated settings + 'index.soft_deletes.enabled': 'true', + 'index.translog.retention.age': '5d', }, mappings: {}, }) - ).toThrowError( - `'index.max_adjacency_matrix_filters' is no longer supported; use 'indices.query.bool.max_clause_count' as an alternative.` - ); + ).toEqual({ + settings: { + 'index.number_of_replicas': '1', + 'index.number_of_shards': '5', + }, + mappings: {}, + }); }); -}); -describe('sourceNameForIndex', () => { - beforeEach(() => { - versionService.setup(mockKibanaVersion); - }); + describe('sourceNameForIndex', () => { + beforeEach(() => { + versionService.setup(mockKibanaVersion); + }); - it('parses internal indices', () => { - expect(sourceNameForIndex('.myInternalIndex')).toEqual('.myInternalIndex'); - }); + it('parses internal indices', () => { + expect(sourceNameForIndex('.myInternalIndex')).toEqual('.myInternalIndex'); + }); - it('parses non-internal indices', () => { - expect(sourceNameForIndex('myIndex')).toEqual('myIndex'); - }); + it('parses non-internal indices', () => { + expect(sourceNameForIndex('myIndex')).toEqual('myIndex'); + }); - it(`replaces reindexed-v${prevMajor} with reindexed-v${currentMajor} in newIndexName`, () => { - expect(sourceNameForIndex(`reindexed-v${prevMajor}-myIndex`)).toEqual('myIndex'); - expect(sourceNameForIndex(`.reindexed-v${prevMajor}-myInternalIndex`)).toEqual( - '.myInternalIndex' - ); + it(`replaces reindexed-v${prevMajor} with reindexed-v${currentMajor} in newIndexName`, () => { + expect(sourceNameForIndex(`reindexed-v${prevMajor}-myIndex`)).toEqual('myIndex'); + expect(sourceNameForIndex(`.reindexed-v${prevMajor}-myInternalIndex`)).toEqual( + '.myInternalIndex' + ); + }); }); -}); -describe('generateNewIndexName', () => { - beforeEach(() => { - versionService.setup(mockKibanaVersion); - }); + describe('generateNewIndexName', () => { + beforeEach(() => { + versionService.setup(mockKibanaVersion); + }); - it('parses internal indices', () => { - expect(generateNewIndexName('.myInternalIndex')).toEqual( - `.reindexed-v${currentMajor}-myInternalIndex` - ); - }); + it('parses internal indices', () => { + expect(generateNewIndexName('.myInternalIndex')).toEqual( + `.reindexed-v${currentMajor}-myInternalIndex` + ); + }); - it('parses non-internal indices', () => { - expect(generateNewIndexName('myIndex')).toEqual(`reindexed-v${currentMajor}-myIndex`); - }); + it('parses non-internal indices', () => { + expect(generateNewIndexName('myIndex')).toEqual(`reindexed-v${currentMajor}-myIndex`); + }); - it(`replaces reindexed-v${prevMajor} with reindexed-v${currentMajor} in generateNewIndexName`, () => { - expect(generateNewIndexName(`reindexed-v${prevMajor}-myIndex`)).toEqual( - `reindexed-v${currentMajor}-myIndex` - ); + it(`replaces reindexed-v${prevMajor} with reindexed-v${currentMajor} in generateNewIndexName`, () => { + expect(generateNewIndexName(`reindexed-v${prevMajor}-myIndex`)).toEqual( + `reindexed-v${currentMajor}-myIndex` + ); - expect(generateNewIndexName(`.reindexed-v${prevMajor}-myInternalIndex`)).toEqual( - `.reindexed-v${currentMajor}-myInternalIndex` - ); + expect(generateNewIndexName(`.reindexed-v${prevMajor}-myInternalIndex`)).toEqual( + `.reindexed-v${currentMajor}-myInternalIndex` + ); + }); }); -}); -describe('getReindexWarnings', () => { - it('does not blow up for empty mappings', () => { - expect( - getReindexWarnings({ - settings: {}, - mappings: {}, - }) - ).toEqual([]); - }); + describe('getReindexWarnings', () => { + it('does not blow up for empty mappings', () => { + expect( + getReindexWarnings({ + settings: {}, + mappings: {}, + }) + ).toEqual([]); + }); - if (mockKibanaSemverVersion.major === 7) { - describe('customTypeName warning', () => { - it('returns customTypeName for non-_doc mapping types', () => { - expect( - getReindexWarnings({ - settings: {}, - mappings: { doc: {} }, - }) - ).toEqual([ReindexWarning.customTypeName]); + if (mockKibanaSemverVersion.major === 7) { + describe('[7.x] customTypeName warning', () => { + it('returns customTypeName warning for non-_doc mapping types', () => { + expect( + getReindexWarnings({ + settings: {}, + mappings: { doc: {} }, + }) + ).toEqual([ + { + warningType: 'customTypeName', + meta: { + typeName: 'doc', + }, + }, + ]); + }); + it('does not return customTypeName warning for _doc mapping types', () => { + expect( + getReindexWarnings({ + settings: {}, + mappings: { _doc: {} }, + }) + ).toEqual([]); + }); }); - it('does not return customTypeName for _doc mapping types', () => { - expect( - getReindexWarnings({ - settings: {}, - mappings: { _doc: {} }, - }) - ).toEqual([]); + describe('[7.x] deprecatedSetting warning', () => { + it('returns deprecatedSetting warning for deprecated index settings', () => { + expect( + getReindexWarnings({ + settings: { + // Deprecated settings + 'index.force_memory_term_dictionary': '1024', + 'index.max_adjacency_matrix_filters': 'true', + 'index.soft_deletes.enabled': 'true', + }, + mappings: {}, + }) + ).toEqual([ + { + warningType: 'indexSetting', + meta: { + deprecatedSettings: [ + 'index.force_memory_term_dictionary', + 'index.max_adjacency_matrix_filters', + 'index.soft_deletes.enabled', + ], + }, + }, + ]); + }); + + it('does not return a deprecatedSetting warning for there are no deprecated index settings', () => { + expect( + getReindexWarnings({ + settings: { + 'index.number_of_replicas': '1', + }, + mappings: {}, + }) + ).toEqual([]); + }); }); - }); - } + } + }); }); diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/index_settings.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/index_settings.ts index 70e1992d5b3e9..5ee067f3640f3 100644 --- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/index_settings.ts +++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/index_settings.ts @@ -15,6 +15,17 @@ export interface ParsedIndexName { newIndexName: string; cleanBaseName: string; } +/** + * An array of deprecated index settings specific to 7.0 --> 8.0 upgrade + * This excludes the deprecated translog retention settings + * as these are only marked as deprecated if soft deletes is enabled + * See logic in getDeprecatedSettingWarning() for more details + */ +const deprecatedSettings = [ + 'index.force_memory_term_dictionary', + 'index.max_adjacency_matrix_filters', + 'index.soft_deletes.enabled', +]; /** * Validates, and updates deprecated settings and mappings to be applied to the @@ -64,6 +75,55 @@ export const generateNewIndexName = (indexName: string): string => { : `${currentVersion}-${sourceName}`; }; +export const getCustomTypeWarning = ( + flatSettings: FlatSettingsWithTypeName | FlatSettings +): ReindexWarning | undefined => { + const DEFAULT_TYPE_NAME = '_doc'; + // In 7+, it's not possible to have more than one type, + // so always grab the first (and only) key. + const typeName = Object.getOwnPropertyNames(flatSettings.mappings)[0]; + const typeNameWarning = Boolean(typeName && typeName !== DEFAULT_TYPE_NAME); + + if (typeNameWarning) { + return { + warningType: 'customTypeName', + meta: { + typeName, + }, + }; + } +}; + +export const getDeprecatedSettingWarning = ( + flatSettings: FlatSettingsWithTypeName | FlatSettings +): ReindexWarning | undefined => { + const { settings } = flatSettings; + + const deprecatedSettingsInUse = Object.keys(settings).filter((setting) => { + return deprecatedSettings.indexOf(setting) > -1; + }); + + // Translog settings are only marked as deprecated if soft deletes is enabled + if (settings['index.soft_deletes.enabled'] === 'true') { + if (settings['index.translog.retention.size']) { + deprecatedSettingsInUse.push('index.translog.retention.size'); + } + + if (settings['index.translog.retention.age']) { + deprecatedSettingsInUse.push('index.translog.retention.age'); + } + } + + if (deprecatedSettingsInUse.length) { + return { + warningType: 'indexSetting', + meta: { + deprecatedSettings: deprecatedSettingsInUse, + }, + }; + } +}; + /** * Returns an array of warnings that should be displayed to user before reindexing begins. * @param flatSettings @@ -71,22 +131,22 @@ export const generateNewIndexName = (indexName: string): string => { export const getReindexWarnings = ( flatSettings: FlatSettingsWithTypeName | FlatSettings ): ReindexWarning[] => { - const warnings = [ - // No warnings yet for 8.0 -> 9.0 - ] as Array<[ReindexWarning, boolean]>; + const warnings = [] as ReindexWarning[]; if (versionService.getMajorVersion() === 7) { - const DEFAULT_TYPE_NAME = '_doc'; - // In 7+ it's not possible to have more than one type anyways, so always grab the first - // (and only) key. - const typeName = Object.getOwnPropertyNames(flatSettings.mappings)[0]; + const customTypeWarning = getCustomTypeWarning(flatSettings); + const deprecatedSettingWarning = getDeprecatedSettingWarning(flatSettings); - const typeNameWarning = Boolean(typeName && typeName !== DEFAULT_TYPE_NAME); + if (customTypeWarning) { + warnings.push(customTypeWarning); + } - warnings.push([ReindexWarning.customTypeName, typeNameWarning]); + if (deprecatedSettingWarning) { + warnings.push(deprecatedSettingWarning); + } } - return warnings.filter(([_, applies]) => applies).map(([warning, _]) => warning); + return warnings; }; const removeUnsettableSettings = (settings: FlatSettings['settings']) => @@ -119,30 +179,25 @@ const removeUnsettableSettings = (settings: FlatSettings['settings']) => 'index.version.upgraded', ]); -const validateSettings = (settings: FlatSettings['settings']) => { - if (settings['index.mapper.dynamic']) { - throw new Error(`'index.mapper.dynamic' is no longer supported.`); - } - - if (settings['index.merge.policy.reclaim_deletes_weight']) { - throw new Error(`'index.merge.policy.reclaim_deletes_weight' is no longer supported.`); - } +const removeDeprecatedSettings = (settings: FlatSettings['settings']) => { + const updatedSettings = { ...settings }; - if (settings['index.force_memory_term_dictionary']) { - throw new Error(`'index.force_memory_term_dictionary' is no longer supported.`); - } + // Translog settings are only marked as deprecated if soft deletes is enabled + if (updatedSettings['index.soft_deletes.enabled'] === 'true') { + if (updatedSettings['index.translog.retention.size']) { + delete updatedSettings['index.translog.retention.size']; + } - if (settings['index.max_adjacency_matrix_filters']) { - throw new Error( - `'index.max_adjacency_matrix_filters' is no longer supported; use 'indices.query.bool.max_clause_count' as an alternative.` - ); + if (settings['index.translog.retention.age']) { + delete updatedSettings['index.translog.retention.age']; + } } - return settings; + return omit(updatedSettings, deprecatedSettings); }; // Use `flow` to pipe the settings through each function. -const transformSettings = flow(removeUnsettableSettings, validateSettings); +const transformSettings = flow(removeUnsettableSettings, removeDeprecatedSettings); const updateFixableMappings = (mappings: FlatSettings['mappings']) => { return mappings; diff --git a/x-pack/plugins/upgrade_assistant/server/plugin.ts b/x-pack/plugins/upgrade_assistant/server/plugin.ts index c6da641f4092f..ae5975c2bc8a7 100644 --- a/x-pack/plugins/upgrade_assistant/server/plugin.ts +++ b/x-pack/plugins/upgrade_assistant/server/plugin.ts @@ -29,6 +29,7 @@ import { registerClusterCheckupRoutes } from './routes/cluster_checkup'; import { registerDeprecationLoggingRoutes } from './routes/deprecation_logging'; import { registerReindexIndicesRoutes, createReindexWorker } from './routes/reindex_indices'; import { registerTelemetryRoutes } from './routes/telemetry'; +import { registerUpdateSettingsRoute } from './routes/update_index_settings'; import { telemetrySavedObjectType, reindexOperationSavedObjectType } from './saved_object_types'; import { RouteDependencies } from './types'; @@ -111,6 +112,7 @@ export class UpgradeAssistantServerPlugin implements Plugin { registerReindexIndicesRoutes(dependencies, this.getWorker.bind(this)); // Bootstrap the needed routes and the collector for the telemetry registerTelemetryRoutes(dependencies); + registerUpdateSettingsRoute(dependencies); if (usageCollection) { getStartServices().then(([{ savedObjects: savedObjectsService, elasticsearch }]) => { diff --git a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.test.ts b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.test.ts index 21dded346bbd3..08d9995ee6219 100644 --- a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.test.ts +++ b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.test.ts @@ -31,12 +31,7 @@ jest.mock('../../lib/reindexing', () => { }; }); -import { - IndexGroup, - ReindexSavedObject, - ReindexStatus, - ReindexWarning, -} from '../../../common/types'; +import { IndexGroup, ReindexSavedObject, ReindexStatus } from '../../../common/types'; import { credentialStoreFactory } from '../../lib/reindexing/credential_store'; import { registerReindexIndicesRoutes } from './reindex_indices'; @@ -90,7 +85,12 @@ describe('reindex API', () => { attributes: { indexName: 'wowIndex', status: ReindexStatus.inProgress }, }); mockReindexService.detectReindexWarnings.mockResolvedValueOnce([ - ReindexWarning.customTypeName, + { + warningType: 'customTypeName', + meta: { + typeName: 'my_mapping_type', + }, + }, ]); const resp = await routeDependencies.router.getHandler({ @@ -110,7 +110,14 @@ describe('reindex API', () => { expect(resp.status).toEqual(200); const data = resp.payload; expect(data.reindexOp).toEqual({ indexName: 'wowIndex', status: ReindexStatus.inProgress }); - expect(data.warnings).toEqual([0]); + expect(data.warnings).toEqual([ + { + warningType: 'customTypeName', + meta: { + typeName: 'my_mapping_type', + }, + }, + ]); }); it("returns null for both if reindex operation doesn't exist and index doesn't exist", async () => { diff --git a/x-pack/plugins/upgrade_assistant/server/routes/update_index_settings.ts b/x-pack/plugins/upgrade_assistant/server/routes/update_index_settings.ts new file mode 100644 index 0000000000000..6dfafbea00816 --- /dev/null +++ b/x-pack/plugins/upgrade_assistant/server/routes/update_index_settings.ts @@ -0,0 +1,65 @@ +/* + * 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 { schema } from '@kbn/config-schema'; +import { versionCheckHandlerWrapper } from '../lib/es_version_precheck'; +import { RouteDependencies } from '../types'; + +export function registerUpdateSettingsRoute({ router }: RouteDependencies) { + router.post( + { + path: '/api/upgrade_assistant/{indexName}/index_settings', + validate: { + params: schema.object({ + indexName: schema.string(), + }), + body: schema.object({ + settings: schema.arrayOf(schema.string()), + }), + }, + }, + versionCheckHandlerWrapper( + async ( + { + core: { + elasticsearch: { client }, + }, + }, + request, + response + ) => { + try { + const { indexName } = request.params; + const { settings } = request.body; + + const settingsToDelete = settings.reduce((settingsBody, currentSetting) => { + settingsBody[currentSetting] = null; + return settingsBody; + }, {} as { [key: string]: null }); + + const { body: settingsResponse } = await client.asCurrentUser.indices.putSettings({ + index: indexName, + body: { + index: settingsToDelete, + }, + }); + + return response.ok({ + body: settingsResponse, + }); + } catch (e) { + const status = e.status || e.statusCode; + if (status === 403) { + return response.forbidden({ body: e }); + } + + throw e; + } + } + ) + ); +} diff --git a/x-pack/plugins/upgrade_assistant/tests_client_integration/helpers/http_requests.ts b/x-pack/plugins/upgrade_assistant/tests_client_integration/helpers/http_requests.ts new file mode 100644 index 0000000000000..73aa997fa568b --- /dev/null +++ b/x-pack/plugins/upgrade_assistant/tests_client_integration/helpers/http_requests.ts @@ -0,0 +1,56 @@ +/* + * 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 sinon, { SinonFakeServer } from 'sinon'; +import { UpgradeAssistantStatus } from '../../common/types'; + +// Register helpers to mock HTTP Requests +const registerHttpRequestMockHelpers = (server: SinonFakeServer) => { + const setLoadStatusResponse = ( + response?: UpgradeAssistantStatus, + error?: { body?: Error; status: number } + ) => { + const status = error ? error.status || 400 : 200; + const body = error ? error.body : response; + + server.respondWith('GET', '/api/upgrade_assistant/status', [ + status, + { 'Content-Type': 'application/json' }, + JSON.stringify(body), + ]); + }; + + const setUpdateIndexSettingsResponse = (response?: object) => { + server.respondWith('POST', `/api/upgrade_assistant/:indexName/index_settings`, [ + 200, + { 'Content-Type': 'application/json' }, + JSON.stringify(response), + ]); + }; + + return { + setLoadStatusResponse, + setUpdateIndexSettingsResponse, + }; +}; + +export const init = () => { + const server = sinon.fakeServer.create(); + server.respondImmediately = true; + + // Define default response for unhandled requests. + // We make requests to APIs which don't impact the component under test, e.g. UI metric telemetry, + // and we can mock them all with a 200 instead of mocking each one individually. + server.respondWith([200, {}, 'DefaultMockedResponse']); + + const httpRequestsMockHelpers = registerHttpRequestMockHelpers(server); + + return { + server, + httpRequestsMockHelpers, + }; +}; diff --git a/x-pack/plugins/upgrade_assistant/tests_client_integration/helpers/index.ts b/x-pack/plugins/upgrade_assistant/tests_client_integration/helpers/index.ts index 358c854a0af9f..74aa173866b7a 100644 --- a/x-pack/plugins/upgrade_assistant/tests_client_integration/helpers/index.ts +++ b/x-pack/plugins/upgrade_assistant/tests_client_integration/helpers/index.ts @@ -5,4 +5,7 @@ * 2.0. */ -export { setup, OverviewTestBed } from './overview.helpers'; +export { setup as setupOverviewPage, OverviewTestBed } from './overview.helpers'; +export { setup as setupIndicesPage, IndicesTestBed } from './indices.helpers'; + +export { setupEnvironment } from './setup_environment'; diff --git a/x-pack/plugins/upgrade_assistant/tests_client_integration/helpers/indices.helpers.ts b/x-pack/plugins/upgrade_assistant/tests_client_integration/helpers/indices.helpers.ts new file mode 100644 index 0000000000000..dcedcac27ad32 --- /dev/null +++ b/x-pack/plugins/upgrade_assistant/tests_client_integration/helpers/indices.helpers.ts @@ -0,0 +1,62 @@ +/* + * 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 { registerTestBed, TestBed, TestBedConfig } from '@kbn/test/jest'; +import { PageContent } from '../../public/application/components/page_content'; +import { WithAppDependencies } from './setup_environment'; + +const testBedConfig: TestBedConfig = { + doMountAsync: true, +}; + +export type IndicesTestBed = TestBed & { + actions: ReturnType; +}; + +const createActions = (testBed: TestBed) => { + /** + * User Actions + */ + const clickTab = (tabName: string) => { + const { find } = testBed; + const camelcaseTabName = tabName.charAt(0).toUpperCase() + tabName.slice(1); + + find(`upgradeAssistant${camelcaseTabName}Tab`).simulate('click'); + }; + + const clickFixButton = () => { + const { find } = testBed; + find('removeIndexSettingsButton').simulate('click'); + }; + + const clickExpandAll = () => { + const { find } = testBed; + find('expandAll').simulate('click'); + }; + + return { + clickTab, + clickFixButton, + clickExpandAll, + }; +}; + +export const setup = async (overrides?: Record): Promise => { + const initTestBed = registerTestBed(WithAppDependencies(PageContent, overrides), testBedConfig); + const testBed = await initTestBed(); + + return { + ...testBed, + actions: createActions(testBed), + }; +}; + +export type IndicesTestSubjects = + | 'expandAll' + | 'removeIndexSettingsButton' + | 'deprecationsContainer' + | string; diff --git a/x-pack/plugins/upgrade_assistant/tests_client_integration/helpers/setup_environment.tsx b/x-pack/plugins/upgrade_assistant/tests_client_integration/helpers/setup_environment.tsx index 75a0ce4d47e77..898a7fee15394 100644 --- a/x-pack/plugins/upgrade_assistant/tests_client_integration/helpers/setup_environment.tsx +++ b/x-pack/plugins/upgrade_assistant/tests_client_integration/helpers/setup_environment.tsx @@ -7,14 +7,17 @@ import React from 'react'; import axios from 'axios'; +// @ts-ignore +import axiosXhrAdapter from 'axios/lib/adapters/xhr'; -import { docLinksServiceMock } from '../../../../../src/core/public/mocks'; +import { docLinksServiceMock, notificationServiceMock } from '../../../../../src/core/public/mocks'; import { HttpSetup } from '../../../../../src/core/public'; import { mockKibanaSemverVersion, UA_READONLY_MODE } from '../../common/constants'; import { AppContextProvider } from '../../public/application/app_context'; +import { init as initHttpRequests } from './http_requests'; -const mockHttpClient = axios.create(); +const mockHttpClient = axios.create({ adapter: axiosXhrAdapter }); const contextValue = { http: (mockHttpClient as unknown) as HttpSetup, @@ -26,12 +29,25 @@ const contextValue = { nextMajor: mockKibanaSemverVersion.major + 1, }, isReadOnlyMode: UA_READONLY_MODE, + notifications: notificationServiceMock.createStartContract(), }; -export const WithAppDependencies = (Comp: any, overrides: any = {}) => (props: any) => { +export const WithAppDependencies = ( + Comp: React.FunctionComponent>, + overrides: Record = {} +) => (props: Record) => { return ( ); }; + +export const setupEnvironment = () => { + const { server, httpRequestsMockHelpers } = initHttpRequests(); + + return { + server, + httpRequestsMockHelpers, + }; +}; diff --git a/x-pack/plugins/upgrade_assistant/tests_client_integration/indices.test.ts b/x-pack/plugins/upgrade_assistant/tests_client_integration/indices.test.ts new file mode 100644 index 0000000000000..3eda626c24628 --- /dev/null +++ b/x-pack/plugins/upgrade_assistant/tests_client_integration/indices.test.ts @@ -0,0 +1,93 @@ +/* + * 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 { act } from 'react-dom/test-utils'; +import { indexSettingDeprecations } from '../common/constants'; +import { MIGRATION_DEPRECATION_LEVEL } from '../common/types'; + +import { IndicesTestBed, setupIndicesPage, setupEnvironment } from './helpers'; + +describe('Indices tab', () => { + let testBed: IndicesTestBed; + const { server, httpRequestsMockHelpers } = setupEnvironment(); + + const upgradeStatusMockResponse = { + readyForUpgrade: false, + cluster: [], + indices: [ + { + level: 'warning' as MIGRATION_DEPRECATION_LEVEL, + message: indexSettingDeprecations.translog.deprecationMessage, + url: 'doc_url', + index: 'my_index', + deprecatedIndexSettings: indexSettingDeprecations.translog.settings, + }, + ], + }; + + httpRequestsMockHelpers.setLoadStatusResponse(upgradeStatusMockResponse); + + beforeEach(async () => { + await act(async () => { + testBed = await setupIndicesPage({ isReadOnlyMode: false }); + }); + + // Navigate to the indices tab + testBed.actions.clickTab('indices'); + }); + + afterAll(() => { + server.restore(); + }); + + describe('Fix indices button', () => { + test('removes deprecated index settings', async () => { + const { component, actions, exists, find } = testBed; + + expect(exists('deprecationsContainer')).toBe(true); + + // Open all deprecations + actions.clickExpandAll(); + + const accordionTestSubj = `depgroup_${indexSettingDeprecations.translog.deprecationMessage + .split(' ') + .join('_')}`; + + await act(async () => { + find(`${accordionTestSubj}.removeIndexSettingsButton`).simulate('click'); + }); + + const modal = document.body.querySelector( + '[data-test-subj="indexSettingsDeleteConfirmModal"]' + ); + const confirmButton: HTMLButtonElement | null = modal!.querySelector( + '[data-test-subj="confirmModalConfirmButton"]' + ); + + expect(modal).not.toBe(null); + expect(modal!.textContent).toContain('Remove deprecated settings'); + + const indexName = upgradeStatusMockResponse.indices[0].index; + + httpRequestsMockHelpers.setUpdateIndexSettingsResponse({ + acknowledged: true, + }); + + await act(async () => { + confirmButton!.click(); + }); + + component.update(); + + const request = server.requests[server.requests.length - 1]; + + expect(request.method).toBe('POST'); + expect(request.url).toBe(`/api/upgrade_assistant/${indexName}/index_settings`); + expect(request.status).toEqual(200); + }); + }); +}); diff --git a/x-pack/plugins/upgrade_assistant/tests_client_integration/overview.test.ts b/x-pack/plugins/upgrade_assistant/tests_client_integration/overview.test.ts index b475c8b89c616..4b41e6ff9d681 100644 --- a/x-pack/plugins/upgrade_assistant/tests_client_integration/overview.test.ts +++ b/x-pack/plugins/upgrade_assistant/tests_client_integration/overview.test.ts @@ -7,14 +7,14 @@ import { act } from 'react-dom/test-utils'; -import { OverviewTestBed, setup } from './helpers'; +import { OverviewTestBed, setupOverviewPage } from './helpers'; -describe('', () => { +describe('Overview page', () => { let testBed: OverviewTestBed; beforeEach(async () => { await act(async () => { - testBed = await setup(); + testBed = await setupOverviewPage(); }); }); @@ -32,11 +32,11 @@ describe('', () => { await act(async () => { // Override the default context value to verify tab content renders as expected // This will be the default behavior on the last minor before the next major release (e.g., v7.15) - testBed = await setup({ isReadOnlyMode: false }); + testBed = await setupOverviewPage({ isReadOnlyMode: false }); }); }); - test('renders the coming soon prompt by default', () => { + test('renders the Upgrade Assistant overview tab', () => { const { exists } = testBed; expect(exists('comingSoonPrompt')).toBe(false); diff --git a/x-pack/test/api_integration/apis/upgrade_assistant/upgrade_assistant.ts b/x-pack/test/api_integration/apis/upgrade_assistant/upgrade_assistant.ts index c4675adfd1142..7041427fb74d7 100644 --- a/x-pack/test/api_integration/apis/upgrade_assistant/upgrade_assistant.ts +++ b/x-pack/test/api_integration/apis/upgrade_assistant/upgrade_assistant.ts @@ -12,24 +12,113 @@ import { reindexOperationWithLargeErrorMessage } from './reindex_operation_with_ export default function ({ getService }: FtrProviderContext) { const es = getService('es'); + const supertest = getService('supertest'); - describe('Reindex operation saved object', function () { - const dotKibanaIndex = '.kibana'; - const fakeSavedObjectId = 'fakeSavedObjectId'; + describe('Upgrade Assistant', () => { + describe('Reindex operation saved object', () => { + const dotKibanaIndex = '.kibana'; + const fakeSavedObjectId = 'fakeSavedObjectId'; - after(async () => { - // Clean up the fake saved object we created. This will error if the test failed. - return await es.delete({ index: dotKibanaIndex, id: fakeSavedObjectId }); + after(async () => { + // Clean up the fake saved object we created. This will error if the test failed. + return await es.delete({ index: dotKibanaIndex, id: fakeSavedObjectId }); + }); + + it('is indexed successfully with immense error message', async () => { + // Guards against regression of https://github.com/elastic/kibana/pull/71710. + const result = await es.create({ + index: dotKibanaIndex, // In normal operation this would be the .kibana-n index. + id: fakeSavedObjectId, + body: reindexOperationWithLargeErrorMessage, + }); + expect(result).to.be.ok(); + }); }); - it('is indexed successfully with immense error message', async () => { - // Guards against regression of https://github.com/elastic/kibana/pull/71710. - const result = await es.create({ - index: dotKibanaIndex, // In normal operation this would be the .kibana-n index. - id: fakeSavedObjectId, - body: reindexOperationWithLargeErrorMessage, + describe('Update index settings route', () => { + const indexName = 'update_settings_test_index'; + const indexSettings = { + number_of_shards: '3', + number_of_replicas: '2', + refresh_interval: '1s', + }; + + before(async () => { + // Create an index with settings that can be used for testing + try { + await es.indices.create({ + index: indexName, + body: { + settings: { + index: indexSettings, + }, + }, + }); + } catch (err) { + // eslint-disable-next-line no-console + console.log('[Setup error] Error creating index'); + throw err; + } + }); + + after(async () => { + // Delete index created for test + try { + await es.indices.delete({ + index: indexName, + }); + } catch (err) { + // eslint-disable-next-line no-console + console.log('[Cleanup error] Error deleting index'); + throw err; + } + }); + + it('removes index settings', async () => { + const { body } = await supertest + .post(`/api/upgrade_assistant/${indexName}/index_settings`) + .set('kbn-xsrf', 'xxx') + .send({ + settings: ['refresh_interval'], // index setting to remove + }) + .expect(200); + + expect(body).to.eql({ + acknowledged: true, + }); + + // Refetch the index and verify settings were updated correctly + try { + const { body: indexSettingsResponse } = await es.indices.getSettings({ + index: indexName, + }); + + const updatedIndexSettings = indexSettingsResponse[indexName].settings.index; + + // Verify number_of_shards and number_of_replicas are unchanged + expect(updatedIndexSettings.number_of_shards).to.eql(indexSettings.number_of_shards); + expect(updatedIndexSettings.number_of_replicas).to.eql(indexSettings.number_of_replicas); + // Verify refresh_interval no longer exists + expect(updatedIndexSettings.refresh_interval).to.be.eql(undefined); + } catch (err) { + // eslint-disable-next-line no-console + console.log('[Error] Unable to fetch index and verify index settings'); + throw err; + } + }); + + it('handles error', async () => { + const indexDoesNotExistName = 'index_does_not_exist'; + const { body } = await supertest + .post(`/api/upgrade_assistant/${indexDoesNotExistName}/index_settings`) + .set('kbn-xsrf', 'xxx') + .send({ + settings: ['refresh_interval'], // index setting to remove + }) + .expect(500); + + expect(body.error).to.eql('Internal Server Error'); }); - expect(result).to.be.ok(); }); }); } From f14ac90e7d05e83321bf571ebec62c0213ecd59e Mon Sep 17 00:00:00 2001 From: Ryland Herrick Date: Mon, 15 Mar 2021 19:44:18 -0500 Subject: [PATCH 02/24] [Security Solution][Detections] Display callout if users have new ML jobs installed (#94393) * WIP: Add basic structure of our ML Job callout * Tests are not implemented * logic is questionable * Detections now makes redundant ML API calls * Fix JSDoc reference * Move ML Jobs callout to Rules page As opposed to the more general Detections page. * Extends callout logic to include installation of any affected jobs * If old jobs are used with new ECS data, you'll be missing anomalies/alerts * If new jobs are used with old ECS data, you'll be missing anomalies/alerts * Flesh out our link to ML Job compatibility docs This page doesn't exist yet; the URI/copy is subject to change. * ML Job Upgrade -> ML Job Compatibility This is a more accurate name for the concept since the problem is more general than presence/absence of an upgrade. * Add some placeholder copy to get the ball rolling * Test callout behavior with different API responses * Prevent fetching ML data when ML popover is opened/closed We already fetch this data when the component is initially rendered. In the normal workflow of page load -> open popover, we perform six (6) ML API calls, 3 of which are redundant. The one downside of this is that opening/closing the popover will not refresh data; however, this workflow would previously have resulted in 6 API calls as well. * Revert "Prevent fetching ML data when ML popover is opened/closed" This reverts commit 810b78d2b90e90f6fa97046e84c8c7ab28c4c98d. * Update link to relevant documentation We're going to add a new section to this existing page, and link directly to that heading. We should be able to generate whatever anchor we need here, so choosing one arbitrarily on the assumption that docs can make it work. * Update copy from product Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../links_to_docs/links_components.tsx | 7 ++ .../links_to_docs/links_translations.ts | 8 +++ .../ml/hooks/use_installed_security_jobs.ts | 2 +- .../affected_job_ids.ts | 63 +++++++++++++++++ .../index.test.tsx | 69 +++++++++++++++++++ .../ml_job_compatibility_callout/index.tsx | 35 ++++++++++ .../translations.tsx | 50 ++++++++++++++ .../pages/detection_engine/rules/index.tsx | 2 + 8 files changed, 235 insertions(+), 1 deletion(-) create mode 100644 x-pack/plugins/security_solution/public/detections/components/callouts/ml_job_compatibility_callout/affected_job_ids.ts create mode 100644 x-pack/plugins/security_solution/public/detections/components/callouts/ml_job_compatibility_callout/index.test.tsx create mode 100644 x-pack/plugins/security_solution/public/detections/components/callouts/ml_job_compatibility_callout/index.tsx create mode 100644 x-pack/plugins/security_solution/public/detections/components/callouts/ml_job_compatibility_callout/translations.tsx diff --git a/x-pack/plugins/security_solution/public/common/components/links_to_docs/links_components.tsx b/x-pack/plugins/security_solution/public/common/components/links_to_docs/links_components.tsx index d5a3cfdefe646..82d4c5b5a3e27 100644 --- a/x-pack/plugins/security_solution/public/common/components/links_to_docs/links_components.tsx +++ b/x-pack/plugins/security_solution/public/common/components/links_to_docs/links_components.tsx @@ -22,3 +22,10 @@ export const DetectionsRequirementsLink = () => ( linkText={i18n.DETECTIONS_REQUIREMENTS_LINK_TEXT} /> ); + +export const MlJobCompatibilityLink = () => ( + +); diff --git a/x-pack/plugins/security_solution/public/common/components/links_to_docs/links_translations.ts b/x-pack/plugins/security_solution/public/common/components/links_to_docs/links_translations.ts index fc38899e7ff82..a495d95b3cf37 100644 --- a/x-pack/plugins/security_solution/public/common/components/links_to_docs/links_translations.ts +++ b/x-pack/plugins/security_solution/public/common/components/links_to_docs/links_translations.ts @@ -33,3 +33,11 @@ export const DETECTIONS_REQUIREMENTS_LINK_TEXT = i18n.translate( defaultMessage: 'Detections prerequisites and requirements', } ); + +export const ML_JOB_COMPATIBILITY_LINK_PATH = 'alerts-ui-monitor.html#ml-job-compatibility'; +export const ML_JOB_COMPATIBILITY_LINK_TEXT = i18n.translate( + 'xpack.securitySolution.documentationLinks.mlJobCompatibility.text', + { + defaultMessage: 'ML job compatibility', + } +); diff --git a/x-pack/plugins/security_solution/public/common/components/ml/hooks/use_installed_security_jobs.ts b/x-pack/plugins/security_solution/public/common/components/ml/hooks/use_installed_security_jobs.ts index 605fc6c09a944..7bdad2514c82e 100644 --- a/x-pack/plugins/security_solution/public/common/components/ml/hooks/use_installed_security_jobs.ts +++ b/x-pack/plugins/security_solution/public/common/components/ml/hooks/use_installed_security_jobs.ts @@ -31,7 +31,7 @@ export interface UseInstalledSecurityJobsReturn { * necessary (running jobs, etc). * * NOTE: If you need to include jobs that are not currently installed, try the - * {@link useInstalledSecurityJobs} hook. + * {@link useSecurityJobs} hook. * */ export const useInstalledSecurityJobs = (): UseInstalledSecurityJobsReturn => { diff --git a/x-pack/plugins/security_solution/public/detections/components/callouts/ml_job_compatibility_callout/affected_job_ids.ts b/x-pack/plugins/security_solution/public/detections/components/callouts/ml_job_compatibility_callout/affected_job_ids.ts new file mode 100644 index 0000000000000..8228a5c314c2d --- /dev/null +++ b/x-pack/plugins/security_solution/public/detections/components/callouts/ml_job_compatibility_callout/affected_job_ids.ts @@ -0,0 +1,63 @@ +/* + * 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. + */ + +// These are the job IDs of ML jobs that are dependent on specific ECS data. If +// any of them is installed, we want to notify the user that they potentially +// have incompatibility between their beats, rules, and jobs. +// There are four modules of jobs that are affected. However, because the API +// that returns installed jobs does not include those jobs' modules, hardcoding +// the IDs from those modules (as found in e.g. +// x-pack/plugins/ml/server/models/data_recognizer/modules/security_windows/manifest.json) +// allows us to make this determination from a single API call. +export const affectedJobIds: string[] = [ + // security_linux module + 'v2_rare_process_by_host_linux_ecs', + 'v2_linux_rare_metadata_user', + 'v2_linux_rare_metadata_process', + 'v2_linux_anomalous_user_name_ecs', + 'v2_linux_anomalous_process_all_hosts_ecs', + 'v2_linux_anomalous_network_port_activity_ecs', + // security_windows module + 'v2_rare_process_by_host_windows_ecs', + 'v2_windows_anomalous_network_activity_ecs', + 'v2_windows_anomalous_path_activity_ecs', + 'v2_windows_anomalous_process_all_hosts_ecs', + 'v2_windows_anomalous_process_creation', + 'v2_windows_anomalous_user_name_ecs', + 'v2_windows_rare_metadata_process', + 'v2_windows_rare_metadata_user', + // siem_auditbeat module + 'rare_process_by_host_linux_ecs', + 'linux_anomalous_network_activity_ecs', + 'linux_anomalous_network_port_activity_ecs', + 'linux_anomalous_network_service', + 'linux_anomalous_network_url_activity_ecs', + 'linux_anomalous_process_all_hosts_ecs', + 'linux_anomalous_user_name_ecs', + 'linux_rare_metadata_process', + 'linux_rare_metadata_user', + 'linux_rare_user_compiler', + 'linux_rare_kernel_module_arguments', + 'linux_rare_sudo_user', + 'linux_system_user_discovery', + 'linux_system_information_discovery', + 'linux_system_process_discovery', + 'linux_network_connection_discovery', + 'linux_network_configuration_discovery', + // siem_winlogbeat module + 'rare_process_by_host_windows_ecs', + 'windows_anomalous_network_activity_ecs', + 'windows_anomalous_path_activity_ecs', + 'windows_anomalous_process_all_hosts_ecs', + 'windows_anomalous_process_creation', + 'windows_anomalous_script', + 'windows_anomalous_service', + 'windows_anomalous_user_name_ecs', + 'windows_rare_user_runas_event', + 'windows_rare_metadata_process', + 'windows_rare_metadata_user', +]; diff --git a/x-pack/plugins/security_solution/public/detections/components/callouts/ml_job_compatibility_callout/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/callouts/ml_job_compatibility_callout/index.test.tsx new file mode 100644 index 0000000000000..23f6eea435d72 --- /dev/null +++ b/x-pack/plugins/security_solution/public/detections/components/callouts/ml_job_compatibility_callout/index.test.tsx @@ -0,0 +1,69 @@ +/* + * 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 { mount } from 'enzyme'; +import React from 'react'; + +import { TestProviders } from '../../../../common/mock'; +import { useInstalledSecurityJobs } from '../../../../common/components/ml/hooks/use_installed_security_jobs'; +import { MlJobCompatibilityCallout } from './index'; + +jest.mock('../../../../common/components/ml/hooks/use_installed_security_jobs'); + +describe('MlJobCompatibilityCallout', () => { + it('renders when new affected jobs are installed', () => { + (useInstalledSecurityJobs as jest.Mock).mockReturnValue({ + loading: false, + jobs: [{ id: 'v2_linux_rare_metadata_process' }], + }); + const wrapper = mount( + + + + ); + expect(wrapper.exists('[data-test-subj="callout-ml-job-compatibility"]')).toEqual(true); + }); + + it('renders when old affected jobs are installed', () => { + (useInstalledSecurityJobs as jest.Mock).mockReturnValue({ + loading: false, + jobs: [{ id: 'linux_rare_metadata_process' }], + }); + const wrapper = mount( + + + + ); + expect(wrapper.exists('[data-test-subj="callout-ml-job-compatibility"]')).toEqual(true); + }); + + it('does not render if no affected jobs are installed', () => { + (useInstalledSecurityJobs as jest.Mock).mockReturnValue({ + loading: false, + jobs: [{ id: 'windows_rare_user_type10_remote_login' }], + }); + const wrapper = mount( + + + + ); + expect(wrapper.exists('[data-test-subj="callout-ml-job-compatibility"]')).toEqual(false); + }); + + it('does not render while jobs are loading', () => { + (useInstalledSecurityJobs as jest.Mock).mockReturnValue({ + loading: true, + jobs: [], + }); + const wrapper = mount( + + + + ); + expect(wrapper.exists('[data-test-subj="callout-ml-job-compatibility"]')).toEqual(false); + }); +}); diff --git a/x-pack/plugins/security_solution/public/detections/components/callouts/ml_job_compatibility_callout/index.tsx b/x-pack/plugins/security_solution/public/detections/components/callouts/ml_job_compatibility_callout/index.tsx new file mode 100644 index 0000000000000..ff266cfd859bf --- /dev/null +++ b/x-pack/plugins/security_solution/public/detections/components/callouts/ml_job_compatibility_callout/index.tsx @@ -0,0 +1,35 @@ +/* + * 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 React, { memo } from 'react'; + +import { CallOutMessage, CallOutSwitcher } from '../../../../common/components/callouts'; +import { useInstalledSecurityJobs } from '../../../../common/components/ml/hooks/use_installed_security_jobs'; +import { affectedJobIds } from './affected_job_ids'; +import * as i18n from './translations'; + +const mlJobCompatibilityCalloutMessage: CallOutMessage = { + type: 'primary', + id: 'ml-job-compatibility', + title: i18n.ML_JOB_COMPATIBILITY_CALLOUT_TITLE, + description: , +}; + +const MlJobCompatibilityCalloutComponent = () => { + const { loading, jobs } = useInstalledSecurityJobs(); + const newJobsInstalled = jobs.some((job) => affectedJobIds.includes(job.id)); + + return ( + + ); +}; + +export const MlJobCompatibilityCallout = memo(MlJobCompatibilityCalloutComponent); diff --git a/x-pack/plugins/security_solution/public/detections/components/callouts/ml_job_compatibility_callout/translations.tsx b/x-pack/plugins/security_solution/public/detections/components/callouts/ml_job_compatibility_callout/translations.tsx new file mode 100644 index 0000000000000..35ffdb6f7abf8 --- /dev/null +++ b/x-pack/plugins/security_solution/public/detections/components/callouts/ml_job_compatibility_callout/translations.tsx @@ -0,0 +1,50 @@ +/* + * 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 React from 'react'; +import { i18n } from '@kbn/i18n'; +import { FormattedMessage } from '@kbn/i18n/react'; +import { MlJobCompatibilityLink } from '../../../../common/components/links_to_docs'; + +export const ML_JOB_COMPATIBILITY_CALLOUT_TITLE = i18n.translate( + 'xpack.securitySolution.detectionEngine.mlJobCompatibilityCallout.messageTitle', + { + defaultMessage: 'Your ML jobs may be incompatible with your data sources and/or ML rules', + } +); + +export const MlJobCompatibilityCalloutBody = () => ( + + +

+ ), + docs: ( +
    +
  • + +
    • +
+ ), + }} + /> +); diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.tsx index 89cec16851010..57566986e47d2 100644 --- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.tsx +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.tsx @@ -36,6 +36,7 @@ import { SecurityPageName } from '../../../../app/types'; import { LinkButton } from '../../../../common/components/links'; import { useFormatUrl } from '../../../../common/components/link_to'; import { NeedAdminForUpdateRulesCallOut } from '../../../components/callouts/need_admin_for_update_callout'; +import { MlJobCompatibilityCallout } from '../../../components/callouts/ml_job_compatibility_callout'; type Func = () => Promise; @@ -161,6 +162,7 @@ const RulesPageComponent: React.FC = () => { <> + setShowValueListsModal(false)} From 7349f82facbc7810b4f90b9267e1e2313540d471 Mon Sep 17 00:00:00 2001 From: Oliver Gupte Date: Mon, 15 Mar 2021 18:35:50 -0700 Subject: [PATCH 03/24] [APM] Hide correlations tabs with license message (#94494) * [APM] Hide correlations tabs with license message (#94228) * removes unused CorrelationsMetricsLicenseCheck component * Code readability improvements Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../components/app/correlations/index.tsx | 137 +++++++++--------- 1 file changed, 69 insertions(+), 68 deletions(-) diff --git a/x-pack/plugins/apm/public/components/app/correlations/index.tsx b/x-pack/plugins/apm/public/components/app/correlations/index.tsx index 464bcf1cde870..e0651edbeb79b 100644 --- a/x-pack/plugins/apm/public/components/app/correlations/index.tsx +++ b/x-pack/plugins/apm/public/components/app/correlations/index.tsx @@ -35,6 +35,7 @@ import { import { isActivePlatinumLicense } from '../../../../common/license_check'; import { useLicenseContext } from '../../../context/license/use_license_context'; import { LicensePrompt } from '../../shared/LicensePrompt'; +import { IUrlParams } from '../../../context/url_params_context/types'; const latencyTab = { key: 'latency', @@ -53,12 +54,23 @@ const errorRateTab = { const tabs = [latencyTab, errorRateTab]; export function Correlations() { + const license = useLicenseContext(); + const hasActivePlatinumLicense = isActivePlatinumLicense(license); const { urlParams } = useUrlParams(); const history = useHistory(); const [isFlyoutVisible, setIsFlyoutVisible] = useState(false); const [currentTab, setCurrentTab] = useState(latencyTab.key); const { component: TabContent } = tabs.find((tab) => tab.key === currentTab) ?? latencyTab; + const metric = { + app: 'apm' as const, + metric: hasActivePlatinumLicense + ? 'correlations_flyout_view' + : 'correlations_license_prompt', + metricType: METRIC_TYPE.COUNT as METRIC_TYPE.COUNT, + }; + useTrackMetric(metric); + useTrackMetric({ ...metric, delay: 15000 }); return ( <> @@ -99,49 +111,38 @@ export function Correlations() { /> - - {tabs.map(({ key, label }) => ( - { - setCurrentTab(key); - }} - > - {label} - - ))} - + {hasActivePlatinumLicense && ( + + {tabs.map(({ key, label }) => ( + { + setCurrentTab(key); + }} + > + {label} + + ))} + + )} - - {urlParams.kuery ? ( - <> - - - {i18n.translate( - 'xpack.apm.correlations.filteringByLabel', - { defaultMessage: 'Filtering by' } - )} - - {urlParams.kuery} - - - {i18n.translate( - 'xpack.apm.correlations.clearFiltersLabel', - { defaultMessage: 'Clear' } - )} - - - - - - ) : null} - - setIsFlyoutVisible(false)} /> - + {hasActivePlatinumLicense ? ( + <> + + setIsFlyoutVisible(false)} /> + + ) : ( + + )} @@ -150,39 +151,39 @@ export function Correlations() { ); } -const CORRELATIONS_TITLE = i18n.translate('xpack.apm.correlations.title', { - defaultMessage: 'Correlations', -}); - -function CorrelationsMetricsLicenseCheck({ - children, +function Filters({ + urlParams, + history, }: { - children: React.ReactNode; + urlParams: IUrlParams; + history: ReturnType; }) { - const license = useLicenseContext(); - const hasActivePlatinumLicense = isActivePlatinumLicense(license); - - const metric = { - app: 'apm' as const, - metric: hasActivePlatinumLicense - ? 'correlations_flyout_view' - : 'correlations_license_prompt', - metricType: METRIC_TYPE.COUNT as METRIC_TYPE.COUNT, - }; - useTrackMetric(metric); - useTrackMetric({ ...metric, delay: 15000 }); + if (!urlParams.kuery) { + return null; + } return ( <> - {hasActivePlatinumLicense ? ( - children - ) : ( - + + {i18n.translate('xpack.apm.correlations.filteringByLabel', { + defaultMessage: 'Filtering by', })} - /> - )} + + {urlParams.kuery} + + + {i18n.translate('xpack.apm.correlations.clearFiltersLabel', { + defaultMessage: 'Clear', + })} + + + + ); } + +const CORRELATIONS_TITLE = i18n.translate('xpack.apm.correlations.title', { + defaultMessage: 'Correlations', +}); From d02169e4be23da7f084c38149462e0574aa57602 Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Mon, 15 Mar 2021 20:50:23 -0700 Subject: [PATCH 04/24] [RFC] Bazel (#92758) Signed-off-by: Tyler Smalley Co-authored-by: Spencer Co-authored-by: Jonathan Budzenski Co-authored-by: Spencer Co-authored-by: Josh Dover <1813008+joshdover@users.noreply.github.com> --- rfcs/text/0015_bazel.md | 309 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 309 insertions(+) create mode 100644 rfcs/text/0015_bazel.md diff --git a/rfcs/text/0015_bazel.md b/rfcs/text/0015_bazel.md new file mode 100644 index 0000000000000..1bdd80e2cbaaf --- /dev/null +++ b/rfcs/text/0015_bazel.md @@ -0,0 +1,309 @@ +- Start Date: 2021-02-24 +- RFC PR: (leave this empty) +- Kibana Issue: (leave this empty) + +# Summary + +Adopt Bazel, an open-source build and test tool as the build system for Kibana. + + +# What is Bazel + +Bazel is an open-source build and test tool similar to Make, Maven, and Gradle. It uses a human-readable, high-level build language. Bazel supports projects in multiple languages and builds outputs for multiple platforms. Bazel supports large codebases across multiple repositories, and large numbers of users. + +Bazel offers the following advantages: + +* **High-level build language**. Bazel uses an abstract, human-readable language to describe the build properties of your project at a high semantical level. Unlike other tools, Bazel operates on the concepts of libraries, binaries, scripts, and data sets, shielding you from the complexity of writing individual calls to tools such as compilers and linkers. +* **Bazel is fast and reliable**. Bazel caches all previously done work and tracks changes to both file content and build commands. This way, Bazel knows when something needs to be rebuilt, and rebuilds only that. To further speed up your builds, you can set up your project to build in a highly parallel and incremental fashion. +* **Bazel is multi-platform**. Bazel runs on Linux, macOS, and Windows. Bazel can build binaries and deployable packages for multiple platforms, including desktop, server, and mobile, from the same project. +* **Bazel scales**. Bazel maintains agility while handling builds with 100k+ source files. It works with multiple repositories and user bases in the tens of thousands. +* **Bazel is extensible**. Many languages are supported, and you can extend Bazel to support any other language or framework. + +For more information, please refer to the [Bazel website](https://www.bazel.build/). + + +# Motivation + +Kibana has grown substantially over the years and now includes more than 2,100,000 lines of code across 25,000 TypeScript and Javascript files, excluding NPM dependencies. For someone to get Kibana up and running, they rely on five main steps: + +### Installation of NPM dependencies + +Yarn Package Manager handles the installation of NPM dependencies, and the migration to Bazel will not immediately affect the time this step takes. + +### Building packages + +The building of [packages](https://github.com/elastic/kibana/tree/master/packages) happens during the bootstrap process initiated by running `yarn kbn bootstrap` and without any cache takes about a minute. Currently, we maintain a single cache item per package, so drastic changes like switching branches frequently results in the worst-case scenario of no-cache being usable. + +### Building TypeScript project references + +The size of the project and the amount of TypeScript has created scaling issues, resulting in slow project completion and IDE unresponsiveness. To combat this, we have been migrating plugins to use [project references](https://www.typescriptlang.org/docs/handbook/project-references.html) and pre-build them during bootstrap. Currently, this takes over five minutes to complete. + +### Building client-side plugins + +The [@kbn/optimizer](https://github.com/elastic/kibana/tree/master/packages/kbn-optimizer) package is responsible for building client-side plugins and is initiated during `yarn start`. Without any cache, it takes between three and four minutes, but is highly dependent on the amount of CPU cores available. The caching works similar to packages and requires a rebuild if any files change. Under the hood, this package is managing a set number of workers to run individual Webpack instances. When we first introduced Webpack back in [June of 2015](https://github.com/elastic/kibana/pull/4335), it was responsible for bundling all client-side code within a single process. As the Kibana project continued to grow over time, this Webpack process continued to impact the developer experience. A common theme to address these issues was through reducing the responsibilities of Webpack by separating [SCSS](https://github.com/elastic/kibana/pull/19643) and [vendor code](https://github.com/elastic/kibana/pull/22618). Knowing we would need to continue to scale, one of the new platform’s core objectives was to be able to build each plugin independently. This work paved the way for what we are proposing here and led to the [creation of @kbn/optimizer](https://github.com/elastic/kibana/pull/53976), which improved performance by separating and parallelizing Webpack builds. + +### Compiling server-side code + +While in development, we rely on [@babel/register](https://babel.dev/docs/en/babel-register) to transpile server-side code during runtime. The use of `@babel/register` results in the compile-time cost being paid when the code is run, mostly during startup or when initiating a unit test. When comparing development startup to production, where the code is pre-compiled, we see startup time taking about twice as long even when the Babel cache exists. + +--- + +These steps cost developers more than ten minutes of their time when updating or changing branches. These times will continue to worsen as the project continues to grow. Instead of making small incremental changes as we have done in the past, like improving caching in a single area, we would like to leverage Bazel, where there are already solutions to many of these problems. + +One of the primary advantages Bazel provides is that the builds are hermetic, meaning they are dependent only on a known set of inputs to ensure the builds are reproducible and cacheable. To create these assurances, builds utilize a sandbox environment with only the defined dependencies available. This not only allows for aggressive local caching but the use of remote caching as well. If Bazel determines that a package or plugin needs to be re-built and it's not in the local cache, it will check the remote cache and, if found, will persist locally for subsequent builds. Once the project has completely migrated to Bazel, a developer will only build code they have directly modified or is dependent on those changes. In building packages and plugins, the expected cost for most developers will be downloading the builds from the remote cache for anything changed since their last build. + +Building TypeScript reference definitions and using `@babel/register` will be negated by using the TypeScript compiler directly instead of using Babel. Currently, we use Babel for code generation and `tsc` for type check and type declaration output. Additionally, the TypeScript implementation in [rules_nodejs](https://bazelbuild.github.io/rules_nodejs/TypeScript.html) for Bazel handles incremental builds, resulting in faster re-builds. + +In addition to the benefits of building code, there are also benefits regarding running unit tests. Developers currently need to understand what unit tests to run to validate changes or rely on waiting for CI, which has a long feedback loop. Since Bazel knows the dependency tree, it will only run unit tests for a package or plugin modified or dependent on those modifications. This optimization helps developers and will significantly reduce the amount of work CI needs to do. On CI, unit tests take 35 minutes to complete, where the average single Jest project takes just twenty seconds. + +# Detailed design + +## Installation and configuration + +To avoid adding Bazel as a dependency that developers need to manage, we will be using a project called Bazelisk to provide that resolution, similar to Gradle Wrapper. The bootstrap command will ensure that the `@bazel/bazelisk` package is installed globally. Two files will exist at the root of the repository, `.bazeliskversion` and `.bazelversion`, to define the required versions of those packages, similar to specifying the Node version today. + + +## Typescript + +The [NodeJS](https://bazelbuild.github.io/rules_nodejs/TypeScript.html) rules for Bazel contain two different methods for handling TypeScript; `ts_library` and `ts_project`. We will be using `ts_project`, as it provides a wrapper around `tsc` where `ts_library` is an open-sourced version of the rule used to compile TypeScript at Google. While there are advantages to `ts_library`, it’s very opinionated and hard to migrate an existing project to while also locking us into a specific version of TypeScript. Over time, it’s expected that `ts_project` will catch up to that of `ts_library`. + +Bazel maintains a persistent worker which `ts_project` takes advantage of by keeping the AST in memory and providing incremental updates. This should improve the time it takes for changes to be represented. + +A Bazel [macro](https://docs.bazel.build/versions/master/skylark/macros.html) will be created to centralize the usage of `ts_project`. The macro will, at minimum, accept a TypeScript configuration file, supply the base `tsconfig.js` file as a source and ensure incremental builds are enabled. + + +## Webpack + +A Bazel [macro](https://docs.bazel.build/versions/master/skylark/macros.html) will be created to centralize the usage of Webpack. The macro will, at minimum, accept a configuration file and supply a base `webpack.config.js` file. Currently, all plugins share the same Webpack configuration. Allowing a plugin to provide additional configuration will allow plugins the ability to add loaders without affecting the performance of others. + +While running Kibana from source in development, the proxy server will ensure that client-side code for plugins is compiled and available. This is currently handled by the [basePathProxy](https://github.com/elastic/kibana/blob/master/src/core/server/http/base_path_proxy_server.ts), where server restarts and optimizer builds are observed and cause the proxy to pause requests. With Bazel, we will utilize [iBazel](https://github.com/bazelbuild/bazel-watche) to watch for file changes and re-build the plugin targets when necessary. The watcher will emit [events](https://github.com/bazelbuild/bazel-watcher#remote-events) that we will use to block requests and provide feedback to the logs. + +While there are a few proofs of concepts for a Webpack 5 Bazel rule, none currently exist which are deemed production-ready. In the meantime, we can use the Webpack CLI directly. One of the main advantages being explored in these rules will be the support for using the Bazel worker to provide incremental builds similar to what `@kbn/optimizer` is doing today. + +We are aware there are quite a few alternatives to Webpack, but our plan is to continue using it during the migration. Once all packages have been migrated to Bazel, it will be much easier to test alternatives through changing the targets of a single plugins `BUILD.bazel` file. + + +### Unit Testing + +A Bazel macro will be created to centralize the usage of Jest unit testing. The macro will, at minimum, accept a Jest configuration file, add the [Jest preset](https://github.com/elastic/kibana/blob/master/packages/kbn-test/jest-preset.js) and its dependencies as sources, then use the Jest CLI to execute tests. + +Developers currently use `yarn test:jest` to efficiently run tests in a given directory without remembering the command or path. This command will continue to work as it does today, but will begin running tests through Bazel for packages or plugins which have been migrated. + +CI will have an additional job to run `bazel test //…:jest`. This will run unit tests for any package or plugin modified or dependent on modifications since the last successful CI run on that branch. + +When migrating a package or plugin using Jest to Bazel, a `jest` target using our macro will be defined in its `BUILD.bazel` file. The project is then excluded from the root `jest.config.js` file to ensure the tests do not needlessly run multiple times. While we could still use Babel for supporting TypeScript in Jest, there would be advantages to utilizing Bazel to handle compiling TypeScript. Not only would developers immediately receive type checking, but those builds would also be shared with anything else using the target, like the Kibana server or Webpack. + + +## Yarn & Node Version Management + +Bazel provides the ability to define the version of Node and Yarn which are used, and once we have fully migrated to Bazel, developers will no longer need to take action when we choose to change versions. The only requirement would be to have a single version of Yarn installed so scripts defined in the `package.json` could be executed. + +Example excerpt from `WORKSPACE.bazel`: +```python +node_repositories( + node_repositories = { + "14.15.4-darwin_amd64": ("node-v14.15.4-darwin-x64.tar.gz", "node-v14.15.4-darwin-x64", "6b0e19e5c2601ef97510f7eb4f52cc8ee261ba14cb05f31eb1a41a5043b0304e"), + "14.15.4-linux_arm64": ("node-v14.15.4-linux-arm64.tar.xz", "node-v14.15.4-linux-arm64", "b990bd99679158c3164c55a20c2a6677c3d9e9ffdfa0d4a40afe9c9b5e97a96f"), + "14.15.4-linux_s390x": ("node-v14.15.4-linux-s390x.tar.xz", "node-v14.15.4-linux-s390x", "29f794d492eccaf0b08e6492f91162447ad95cfefc213fc580a72e29e11501a9"), + "14.15.4-linux_amd64": ("node-v14.15.4-linux-x64.tar.xz", "node-v14.15.4-linux-x64", "ed01043751f86bb534d8c70b16ab64c956af88fd35a9506b7e4a68f5b8243d8a"), + "14.15.4-windows_amd64": ("node-v14.15.4-win-x64.zip", "node-v14.15.4-win-x64", "b2a0765240f8fbd3ba90a050b8c87069d81db36c9f3745aff7516e833e4d2ed6"), + }, + node_version = "14.15.4", + node_urls = [ + "https://nodejs.org/dist/v{version}/{filename}", + ], + yarn_repositories = { + "1.21.1": ("yarn-v1.21.1.tar.gz", "yarn-v1.21.1", "d1d9f4a0f16f5ed484e814afeb98f39b82d4728c6c8beaafb5abc99c02db6674"), + }, + yarn_version = "1.21.1", + yarn_urls = [ + "https://github.com/yarnpkg/yarn/releases/download/v{version}/{filename}", + ], + package_json = ["//:package.json"], +) +``` + +## Target outputs + +The Kibana project will contain a new `bazel` directory with symlinks to current builds and logs. This directory is not checked in and is covered by gitignore. More details can be found in the Bazel documentation for [output directory layout](https://docs.bazel.build/versions/master/output_directories.html). Keep in mind we specify a [symlink prefix](https://docs.bazel.build/versions/master/user-manual.html#flag--symlink_prefix) of “bazel” to maintain a single directory. + +For most, this change will be welcomed as it has been a common complaint that our targets are scattered throughout the repository making it difficult to search without configuring the ignore list. + + +## Preserve Symlinks + +Bazel outputs are created in a folder relative to the monorepo at `./bazel`. However, that folder is just a compilation of symlinks that Bazel creates pointing to temporary folders on the local disk. During the migration, we will begin referencing packages within the `bazel/bin` directory. Internally, Yarn will handle this by creating another symlink from within the `node_modules` directory to packages. By default, any import will be based on the location of the file and not the location of the symlink. This causes issues with module resolution since the `node_modules` directory populated by other dependencies will not be within the tree. To resolve this, we will use the node flag `--preserve-symlinks` that will patch the require calls and prevent Node from expanding the symlinks into their real path during the module resolution. + + +## Build Packaging + +One of the additional benefits to Bazel is that it is multi-platform. While it runs on Linux, macOS, and Windows, it can build binaries across platforms. + +Bazel provides a [pkg](https://github.com/bazelbuild/rules_pkg/tree/main/pkg) rule providing tar, deb, and rpm support. To facilitate cross-platform tar support in the distributable build, we are currently using tar through Node, which is slow. The pkg tar rule will provide an improvement in performance. For deb and RPM builds, Kibana is currently using a Ruby package called [fpm](https://github.com/jordansissel/fpm) created by a former Elastic employee. + +For Docker, we currently create the images during the build using Docker then extract the image as a tar to provide the Release Manager which publishes it to our repository. For ARM, we only create a Docker context which Release Manager uses to create the image on ARM hardware. Bazel has a [docker](https://github.com/bazelbuild/rules_docker) rule, which should allow us to cross-build, and do so without actually using Docker. + +The current build is fairly procedural and has little caching where subsequent builds take almost as long as the previous. When working on a step later in the build system, one ultimately ends up commenting out previously completed steps to save time when testing. With Bazel, each target consumes sources or dependencies which could be other targets. Conceivably, we will have a target called release, which is dependent on another target for each of the assets in the distribution (Windows zip, Linux 64-bit tar, Darwin tar, RPM 64-bit, Deb 64-bit, Bed Aarch64, etc). Each one of these assets will then depend on the Kibana core and the rest of the plugins. The entire dependency tree for this will be resolved and rebuilt only when necessary. + + +## scripts/* + +We decided to use scripts to define and list any command-line utility for the repository. With Bazel, we can still use these entry points, but they will need to consume the code from `bazel/dist` instead of relying on `src/setup_node_env` to provide transpiling using `@babel/register`. + +After the entire migration, we should consider using Bazel targets to execute the script, as with it, we can automatically resolve the dependencies and build anything not yet available. + + +## Remote Cache + +As mentioned previously, the remote cache is an essential feature of Bazel and something we plan to utilize. + +The Node binary is platform-specific, and because it’s used as an input to build the majority of our targets, we will need to write cache for each platform we support in development. A CI job will build and test all Bazel targets for Linux, macOS, and Windows on merge to a tracked branch. It’s important that this job completes as soon as possible to ensure anyone updating with that branch will have cache available. In the future, we will consider allowing pull request jobs to also write to the cache to minimize this race condition. + +We have created a proof of concept using persistent storage on Google Cloud and are currently in a trial with [BuildBuddy](https://www.buildbuddy.io/) which provides not only caching but an event viewer, result store, and remote execution of builds. If we decide to move forward with BuildBuddy, we will most likely use their self-hosted solution where we can provide our own GCP infrastructure. + + +## Packages Build Outline + +Within Bazel, the packages will have new overall rules: + +* It cannot contain build scripts. Every package build will be written using a Bazel `BUILD.bazel` file +* It cannot have side effects. Every package build should be cacheable and reproducible and can not produce any side effects +* Each package should define three major public target rules in `BUILD.bazel` files: `build`, `jest`, and a js_library target with the same name of the folder where the package is living. +* In order to output its targets in the most Bazel friendly way, each package will output its target according to the following folder structure: for node targets, it will be `target_server`, for web target it will be `target_web` and for types, it will be `target_types`. + + +## package.json’s Outline + +As a prerequisite for Bazel and for additional benefits outlined in pull-request [#76412](https://github.com/elastic/kibana/issues/76412), the Kibana repository went from using Yarn Workspaces to a single `package.json` defining all dependencies. + +One of the benefits Bazel has over Gradle is the support for Node modules. Bazel will manage the dependencies using either the NPM or Yarn Package Manager. When doing this, a `BUILD.bazel` file will be generated for each module allowing for fine-grained control. + +# Adoption strategy + +The project is broken down into four initial phases, providing improvements along the way. + + +## Phase I - Infrastructure & Packages + +In this phase, we set out to provide the necessary infrastructure outlined previously to begin utilizing Bazel and begin doing so by migrating the current 38 packages. + +A `BUILD.bazel` file will be added to the root of each package defining a `build` target. This filegroup target will be what we call during the bootstrap phase to build all packages migrated to Bazel. This target is temporary to maintain similar functionality during our transition. In the future, these procedural build steps will be removed in favor of dependency, tree-driven actions where work will only be done if it’s necessary for the given task like running the Kibana server or executing a unit test. + +The `@kbn/pm` package was updated in https://github.com/elastic/kibana/pull/89961 to run the new packages build target, invoked by calling `bazel build //packages:build`, before executing the existing legacy package builds. + +The build targets will no longer reside within the package themselves and instead will be within the `bazel/bin` directory. To account for this, any defined dependency will need to be updated to reference the new directory (example: `link:bazel/bin/packages/elastic-datemath`). While also in this transition period, the build will need to copy over the packages from `bazel/bin` into the `node_modules` of the build target. + +Example package BUILD.bazel for `packages/elastic-datemath`: + +```python +load("@build_bazel_rules_nodejs//:index.bzl", "pkg_npm") +load("@build_bazel_rules_nodejs//internal/js_library:js_library.bzl", "js_library") + +SRCS = [ + ".npmignore", + "index.js", + "index.d.ts", + "package.json", + "readme", + "tsconfig.json", +] + +filegroup( + name = "src", + srcs = glob(SRCS), +) + +js_library( + name = "elastic-datemath", + srcs = [ ":src" ], + deps = [ "@npm//moment" ], + package_name = "@elastic/datemath", + visibility = ["//visibility:public"], +) + +alias( + name = "build", + actual = "elastic-datemath", + visibility = ["//visibility:public"], +) +``` + +If the package has unit tests, they will need to be migrated which will be invoked with `bazel test` as described in the Unit Testing section. + + +## Phase II - Docs, Developer Experience + +Packages were a likely choice for phase 1 for a few reasons; they aren’t often updated and the developer experience is quite lacking making it easy to maintain parity with. In phase 2, we will bring the developer experience of packages to that which developers are accustomed to with plugins. This means re-builds will be automatic when a change occurs as well as giving time to address any developer experience shortcomings which were not foreseen. During this time we will work on overall Bazel documentation as it pertains to the Kibana repository. + + +## Phase III - Core & Plugins + +In this phase, we will be migrating each of the 135 plugins over to being built and unit tested using Bazel. During this time, the legacy systems will stay in place and run in parallel with Bazel. Once all plugins have been migrated, we can decommission the legacy systems. + +The `BUILD.bazel` files will look similar to that of packages, there will be a target for `web`, `server`, and `jest`. Just like packages, as the Jest unit tests are migrated, they will need to be removed from the root `jest.config.js` file as described in the Unit Testing section. + +Plugins are built in a sandbox, so they will no longer be able to use relative imports from one another. For Typescript, relative imports will be replaced with a path reference to the `bazel/bin`. + +Static imports across plugins are a concern that would affect the developer experience due to cascading re-builds. For example, if every plugin has static imports from `src/core`, any changes to `src/core` would cause all those plugins to re-build. There are a few options to address this; the first would be to minimize or eliminate these imports. Most plugins are importing types, so we can also ensure that only type-level changes actually trigger a re-build. Additionally, these types of dependencies could be further broken down into smaller packages to reduce the times further this is necessary. + +``` +"compilerOptions": { + "rootDirs": [ + ".", + "./bazel/out/host/bin/path/to", + "./bazel/out/darwin-fastbuild/bin/path/to", + "./bazel/out/k8-fastbuild/bin/path/to", + "./bazel/out/x64_windows-fastbuild/bin/path/to", + "./bazel/out/darwin-dbg/bin/path/to", + "./bazel/out/k8-dbg/bin/path/to", + "./bazel/out/x64_windows-dbg/bin/path/to", + ] +} +``` + + +## Phase IV - Build Packaging + +In this phase, we will be replacing our current build tooling located at `src/dev/build` to use Bazel. A single target of `release` will provide all assets needed by the release manager: + +* Windows (zip) +* Linux 64-bit (tar) +* Linux aarch64 (tar) +* RPM 64-bit +* RPM aarch64 +* Deb 64-bit +* Deb aarch64 +* Darwin 64-bit (tar) +* CentOS 64-bit Docker Image & Context (tar) +* CentOS aarch64 Docker Image & Context (tar) +* UBI Docker Image & Context (tar) +* Ironbank Docker Context (tar) + +There are a few rules already available provided by Bazel that should be used. In some cases, like tar, they have been re-implemented to ensure the output is hermetic. `rules_pgk` has `pkg_tar`, `pkg_deb`, `pkg_rpm`, and `pkg_zip` to assist with this. `rules_docker` provides the ability to build containers without depending on Docker to be installed and providing the ability to build for other platforms. + +While this phase can begin with phase 1, it can not be completed until all packages and plugins have been migrated. + +# Drawbacks + +With Bazel, all dependencies need to be defined on each package which can become tedious. However, that is also how Bazel is able to provide the level of cache and performance which it does. + +Bazel is substantially different from what people in the Javascript community are accustomed to, so teaching might be difficult. For example, in Javascript when you would like to add support for Typescript, you would probably find a package that adds the support to Jest, Webpack, or Babel. However, in Bazel, it works on inputs and outputs. You could still do what was previously described, but it wouldn’t be efficient. Instead, you would have your Typescript code as an input, which would use the Typescript compiler to output Javascript which would be the input to Webpack or Jest. This way, that compile step would only happen once for each of those paths. + +It’s also possible there is something better out there for our use, or as some have suggested splitting up our repository into smaller pieces. + + +# Alternatives + +Gradle is widely used at Elastic, however, it doesn’t have the NodeJS specific support which Bazel has. + +There are other alternatives that seem to have been created by past Google employees who wanted something like Blaze which is the internal tool used at Google before they open-sourced Bazel (an anagram of Blaze). Most of these just didn’t have a large enough community or provide the level of caching and scaling we were looking for. + + +# Adoption strategy + +The migration would happen in phases starting with packages, then the build system, then plugins. All steps in the phase can happen gradually and over time. + + +# How we teach this + +There will be a lot to teach here, and we have been iterating on a talk which we would give to the entire Kibana team. The Operations team would be available to assist anyone with questions or assistance with Bazel aspects of the build system. From f3b74b457cb9b56dc922c29a5c3f496f485b40c3 Mon Sep 17 00:00:00 2001 From: Walter Rafelsberger Date: Tue, 16 Mar 2021 11:41:48 +0100 Subject: [PATCH 05/24] [ML] Transforms: Fixes missing number of transform nodes and error reporting in stats bar. (#93956) - Adds a Kibana API endpoint transforms/_nodes - Adds number of nodes to the stats bar in the transforms list. - Shows a callout when no transform nodes are available. - Disable all actions except delete when no transform nodes are available. - Disables the create button when no transform nodes are available. --- .../public/doc_links/doc_links_service.ts | 1 + .../common/api_schemas/transforms.ts | 5 ++ .../common/api_schemas/type_guards.ts | 9 +++ .../transform/public/app/hooks/use_api.ts | 8 +++ .../app/hooks/use_documentation_links.ts | 1 + .../public/app/hooks/use_get_transforms.ts | 8 ++- .../lib/authorization/components/common.ts | 10 ++- .../step_define/step_define_form.tsx | 3 +- .../action_clone/use_clone_action.tsx | 6 +- .../action_edit/use_edit_action.tsx | 6 +- .../action_start/start_action_name.test.tsx | 1 + .../action_start/start_action_name.tsx | 18 +++-- .../action_start/use_start_action.tsx | 13 ++-- .../create_transform_button.test.tsx | 2 +- .../create_transform_button.tsx | 16 ++++- .../transform_list/transform_list.test.tsx | 3 +- .../transform_list/transform_list.tsx | 36 +++------- .../transform_list/transforms_stats_bar.tsx | 68 ++++++++++++++++-- .../transform_list/use_actions.test.tsx | 2 +- .../components/transform_list/use_actions.tsx | 8 ++- .../transform_list/use_columns.test.tsx | 2 +- .../components/transform_list/use_columns.tsx | 6 +- .../transform_management_section.tsx | 40 ++++++++--- .../transform/server/routes/api/transforms.ts | 5 +- .../routes/api/transforms_nodes.test.ts | 43 +++++++++++ .../server/routes/api/transforms_nodes.ts | 71 +++++++++++++++++++ .../api_integration/apis/transform/index.ts | 1 + .../apis/transform/transforms_nodes.ts | 48 +++++++++++++ 28 files changed, 368 insertions(+), 72 deletions(-) create mode 100644 x-pack/plugins/transform/server/routes/api/transforms_nodes.test.ts create mode 100644 x-pack/plugins/transform/server/routes/api/transforms_nodes.ts create mode 100644 x-pack/test/api_integration/apis/transform/transforms_nodes.ts diff --git a/src/core/public/doc_links/doc_links_service.ts b/src/core/public/doc_links/doc_links_service.ts index ee5f50588ff04..6e52245e16bbf 100644 --- a/src/core/public/doc_links/doc_links_service.ts +++ b/src/core/public/doc_links/doc_links_service.ts @@ -129,6 +129,7 @@ export class DocLinksService { elasticsearch: { indexModules: `${ELASTICSEARCH_DOCS}index-modules.html`, mapping: `${ELASTICSEARCH_DOCS}mapping.html`, + nodeRoles: `${ELASTICSEARCH_DOCS}modules-node.html#node-roles`, remoteClusters: `${ELASTICSEARCH_DOCS}modules-remote-clusters.html`, remoteClustersProxy: `${ELASTICSEARCH_DOCS}modules-remote-clusters.html#proxy-mode`, remoteClusersProxySettings: `${ELASTICSEARCH_DOCS}modules-remote-clusters.html#remote-cluster-proxy-settings`, diff --git a/x-pack/plugins/transform/common/api_schemas/transforms.ts b/x-pack/plugins/transform/common/api_schemas/transforms.ts index 4d25bd74f4e74..fc5c728311f7d 100644 --- a/x-pack/plugins/transform/common/api_schemas/transforms.ts +++ b/x-pack/plugins/transform/common/api_schemas/transforms.ts @@ -16,6 +16,11 @@ import type { TransformId, TransformPivotConfig } from '../types/transform'; import { transformStateSchema, runtimeMappingsSchema } from './common'; +// GET transform nodes +export interface GetTransformNodesResponseSchema { + count: number; +} + // GET transforms export const getTransformsRequestSchema = schema.arrayOf( schema.object({ diff --git a/x-pack/plugins/transform/common/api_schemas/type_guards.ts b/x-pack/plugins/transform/common/api_schemas/type_guards.ts index 28eaf9ce2894f..476e2bad853c9 100644 --- a/x-pack/plugins/transform/common/api_schemas/type_guards.ts +++ b/x-pack/plugins/transform/common/api_schemas/type_guards.ts @@ -19,6 +19,7 @@ import type { DeleteTransformsResponseSchema } from './delete_transforms'; import type { StartTransformsResponseSchema } from './start_transforms'; import type { StopTransformsResponseSchema } from './stop_transforms'; import type { + GetTransformNodesResponseSchema, GetTransformsResponseSchema, PostTransformsPreviewResponseSchema, PutTransformsResponseSchema, @@ -35,6 +36,14 @@ const isGenericResponseSchema = (arg: any): arg is T => { ); }; +export const isGetTransformNodesResponseSchema = ( + arg: unknown +): arg is GetTransformNodesResponseSchema => { + return ( + isPopulatedObject(arg) && {}.hasOwnProperty.call(arg, 'count') && typeof arg.count === 'number' + ); +}; + export const isGetTransformsResponseSchema = (arg: unknown): arg is GetTransformsResponseSchema => { return isGenericResponseSchema(arg); }; diff --git a/x-pack/plugins/transform/public/app/hooks/use_api.ts b/x-pack/plugins/transform/public/app/hooks/use_api.ts index 7afbc5e403b78..f3c90a688453d 100644 --- a/x-pack/plugins/transform/public/app/hooks/use_api.ts +++ b/x-pack/plugins/transform/public/app/hooks/use_api.ts @@ -29,6 +29,7 @@ import type { StopTransformsResponseSchema, } from '../../../common/api_schemas/stop_transforms'; import type { + GetTransformNodesResponseSchema, GetTransformsResponseSchema, PostTransformsPreviewRequestSchema, PostTransformsPreviewResponseSchema, @@ -66,6 +67,13 @@ export const useApi = () => { return useMemo( () => ({ + async getTransformNodes(): Promise { + try { + return await http.get(`${API_BASE_PATH}transforms/_nodes`); + } catch (e) { + return e; + } + }, async getTransform( transformId: TransformId ): Promise { diff --git a/x-pack/plugins/transform/public/app/hooks/use_documentation_links.ts b/x-pack/plugins/transform/public/app/hooks/use_documentation_links.ts index ded14a2c0e69e..030f96315835a 100644 --- a/x-pack/plugins/transform/public/app/hooks/use_documentation_links.ts +++ b/x-pack/plugins/transform/public/app/hooks/use_documentation_links.ts @@ -13,6 +13,7 @@ export const useDocumentationLinks = () => { return { esAggsCompositeMissingBucket: deps.docLinks.links.aggs.composite_missing_bucket, esIndicesCreateIndex: deps.docLinks.links.apis.createIndex, + esNodeRoles: deps.docLinks.links.elasticsearch.nodeRoles, esPluginDocBasePath: `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/plugins/${DOC_LINK_VERSION}/`, esQueryDsl: deps.docLinks.links.query.queryDsl, esTransform: deps.docLinks.links.transforms.guide, diff --git a/x-pack/plugins/transform/public/app/hooks/use_get_transforms.ts b/x-pack/plugins/transform/public/app/hooks/use_get_transforms.ts index dbb268b44cfd2..2d3425dfeedca 100644 --- a/x-pack/plugins/transform/public/app/hooks/use_get_transforms.ts +++ b/x-pack/plugins/transform/public/app/hooks/use_get_transforms.ts @@ -8,6 +8,7 @@ import { HttpFetchError } from 'src/core/public'; import { + isGetTransformNodesResponseSchema, isGetTransformsResponseSchema, isGetTransformsStatsResponseSchema, } from '../../../common/api_schemas/type_guards'; @@ -22,6 +23,7 @@ export type GetTransforms = (forceRefresh?: boolean) => void; export const useGetTransforms = ( setTransforms: React.Dispatch>, + setTransformNodes: React.Dispatch>, setErrorMessage: React.Dispatch>, setIsInitialized: React.Dispatch>, blockRefresh: boolean @@ -40,17 +42,20 @@ export const useGetTransforms = ( } const fetchOptions = { asSystemRequest: true }; + const transformNodes = await api.getTransformNodes(); const transformConfigs = await api.getTransforms(fetchOptions); const transformStats = await api.getTransformsStats(fetchOptions); if ( !isGetTransformsResponseSchema(transformConfigs) || - !isGetTransformsStatsResponseSchema(transformStats) + !isGetTransformsStatsResponseSchema(transformStats) || + !isGetTransformNodesResponseSchema(transformNodes) ) { // An error is followed immediately by setting the state to idle. // This way we're able to treat ERROR as a one-time-event like REFRESH. refreshTransformList$.next(REFRESH_TRANSFORM_LIST_STATE.ERROR); refreshTransformList$.next(REFRESH_TRANSFORM_LIST_STATE.IDLE); + setTransformNodes(0); setTransforms([]); setIsInitialized(true); @@ -86,6 +91,7 @@ export const useGetTransforms = ( return reducedtableRows; }, [] as TransformListRow[]); + setTransformNodes(transformNodes.count); setTransforms(tableRows); setErrorMessage(undefined); setIsInitialized(true); diff --git a/x-pack/plugins/transform/public/app/lib/authorization/components/common.ts b/x-pack/plugins/transform/public/app/lib/authorization/components/common.ts index cf82478d94423..28e9f190a9108 100644 --- a/x-pack/plugins/transform/public/app/lib/authorization/components/common.ts +++ b/x-pack/plugins/transform/public/app/lib/authorization/components/common.ts @@ -58,7 +58,9 @@ export const hasPrivilegeFactory = (privileges: Privileges | undefined | null) = // create the text for button's tooltips if the user // doesn't have the permission to press that button -export function createCapabilityFailureMessage(capability: keyof Capabilities) { +export function createCapabilityFailureMessage( + capability: keyof Capabilities | 'noTransformNodes' +) { let message = ''; switch (capability) { @@ -80,6 +82,12 @@ export function createCapabilityFailureMessage(capability: keyof Capabilities) { defaultMessage: 'You do not have permission to delete transforms.', }); break; + + case 'noTransformNodes': + message = i18n.translate('xpack.transform.capability.noPermission.noTransformNodesTooltip', { + defaultMessage: 'There are no transform nodes available.', + }); + break; } return i18n.translate('xpack.transform.capability.pleaseContactAdministratorTooltip', { diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.tsx index 1ddb9aa61045b..39593e7da59f8 100644 --- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.tsx +++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.tsx @@ -191,8 +191,7 @@ export const StepDefineForm: FC = React.memo((props) => { stepDefineForm.advancedPivotEditor.actions.setAdvancedPivotEditorApplyButtonEnabled(false); }; - const { esQueryDsl } = useDocumentationLinks(); - const { esTransformPivot } = useDocumentationLinks(); + const { esQueryDsl, esTransformPivot } = useDocumentationLinks(); const advancedEditorsSidebarWidth = '220px'; diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_clone/use_clone_action.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_clone/use_clone_action.tsx index 958b329814b88..6249e77ce31dc 100644 --- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_clone/use_clone_action.tsx +++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_clone/use_clone_action.tsx @@ -18,7 +18,7 @@ import { useAppDependencies, useToastNotifications } from '../../../../app_depen import { cloneActionNameText, CloneActionName } from './clone_action_name'; export type CloneAction = ReturnType; -export const useCloneAction = (forceDisable: boolean) => { +export const useCloneAction = (forceDisable: boolean, transformNodes: number) => { const history = useHistory(); const appDeps = useAppDependencies(); const savedObjectsClient = appDeps.savedObjects.client; @@ -72,14 +72,14 @@ export const useCloneAction = (forceDisable: boolean) => { const action: TransformListAction = useMemo( () => ({ name: (item: TransformListRow) => , - enabled: () => canCreateTransform && !forceDisable, + enabled: () => canCreateTransform && !forceDisable && transformNodes > 0, description: cloneActionNameText, icon: 'copy', type: 'icon', onClick: clickHandler, 'data-test-subj': 'transformActionClone', }), - [canCreateTransform, forceDisable, clickHandler] + [canCreateTransform, forceDisable, clickHandler, transformNodes] ); return { action }; diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_edit/use_edit_action.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_edit/use_edit_action.tsx index 353a7660ac582..b84b309c478fd 100644 --- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_edit/use_edit_action.tsx +++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_edit/use_edit_action.tsx @@ -14,7 +14,7 @@ import { AuthorizationContext } from '../../../../lib/authorization'; import { editActionNameText, EditActionName } from './edit_action_name'; -export const useEditAction = (forceDisable: boolean) => { +export const useEditAction = (forceDisable: boolean, transformNodes: number) => { const { canCreateTransform } = useContext(AuthorizationContext).capabilities; const [config, setConfig] = useState(); @@ -28,14 +28,14 @@ export const useEditAction = (forceDisable: boolean) => { const action: TransformListAction = useMemo( () => ({ name: () => , - enabled: () => canCreateTransform || !forceDisable, + enabled: () => canCreateTransform && !forceDisable && transformNodes > 0, description: editActionNameText, icon: 'pencil', type: 'icon', onClick: (item: TransformListRow) => showFlyout(item.config), 'data-test-subj': 'transformActionEdit', }), - [canCreateTransform, forceDisable] + [canCreateTransform, forceDisable, transformNodes] ); return { diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_action_name.test.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_action_name.test.tsx index 5559f7758204f..490651afc7e96 100644 --- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_action_name.test.tsx +++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_action_name.test.tsx @@ -23,6 +23,7 @@ describe('Transform: Transform List Actions ', () => { const props: StartActionNameProps = { forceDisable: false, items: [item], + transformNodes: 1, }; const wrapper = shallow(); diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_action_name.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_action_name.tsx index 5cc0ac077c240..32207fc586c82 100644 --- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_action_name.tsx +++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_action_name.tsx @@ -26,7 +26,8 @@ export const startActionNameText = i18n.translate( export const isStartActionDisabled = ( items: TransformListRow[], - canStartStopTransform: boolean + canStartStopTransform: boolean, + transformNodes: number ) => { // Disable start for batch transforms which have completed. const completedBatchTransform = items.some((i: TransformListRow) => isCompletedBatchTransform(i)); @@ -36,15 +37,24 @@ export const isStartActionDisabled = ( ); return ( - !canStartStopTransform || completedBatchTransform || startedTransform || items.length === 0 + !canStartStopTransform || + completedBatchTransform || + startedTransform || + items.length === 0 || + transformNodes === 0 ); }; export interface StartActionNameProps { items: TransformListRow[]; forceDisable?: boolean; + transformNodes: number; } -export const StartActionName: FC = ({ items, forceDisable }) => { +export const StartActionName: FC = ({ + items, + forceDisable, + transformNodes, +}) => { const { canStartStopTransform } = useContext(AuthorizationContext).capabilities; const isBulkAction = items.length > 1; @@ -89,7 +99,7 @@ export const StartActionName: FC = ({ items, forceDisable ); } - const actionIsDisabled = isStartActionDisabled(items, canStartStopTransform); + const actionIsDisabled = isStartActionDisabled(items, canStartStopTransform, transformNodes); let content: string | undefined; if (actionIsDisabled && items.length > 0) { diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/use_start_action.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/use_start_action.tsx index 02379972ba87c..2c45da45509e5 100644 --- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/use_start_action.tsx +++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/use_start_action.tsx @@ -16,7 +16,7 @@ import { useStartTransforms } from '../../../../hooks'; import { isStartActionDisabled, startActionNameText, StartActionName } from './start_action_name'; export type StartAction = ReturnType; -export const useStartAction = (forceDisable: boolean) => { +export const useStartAction = (forceDisable: boolean, transformNodes: number) => { const { canStartStopTransform } = useContext(AuthorizationContext).capabilities; const startTransforms = useStartTransforms(); @@ -43,17 +43,22 @@ export const useStartAction = (forceDisable: boolean) => { const action: TransformListAction = useMemo( () => ({ name: (item: TransformListRow) => ( - + ), available: (item: TransformListRow) => item.stats.state === TRANSFORM_STATE.STOPPED, - enabled: (item: TransformListRow) => !isStartActionDisabled([item], canStartStopTransform), + enabled: (item: TransformListRow) => + !isStartActionDisabled([item], canStartStopTransform, transformNodes), description: startActionNameText, icon: 'play', type: 'icon', onClick: (item: TransformListRow) => openModal([item]), 'data-test-subj': 'transformActionStart', }), - [canStartStopTransform, forceDisable] + [canStartStopTransform, forceDisable, transformNodes] ); return { diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/create_transform_button/create_transform_button.test.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/create_transform_button/create_transform_button.test.tsx index 275585246d82c..0a7324fd09ffc 100644 --- a/x-pack/plugins/transform/public/app/sections/transform_management/components/create_transform_button/create_transform_button.test.tsx +++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/create_transform_button/create_transform_button.test.tsx @@ -14,7 +14,7 @@ jest.mock('../../../../../shared_imports'); describe('Transform: Transform List ', () => { test('Minimal initialization', () => { - const wrapper = shallow(); + const wrapper = shallow(); expect(wrapper).toMatchSnapshot(); }); diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/create_transform_button/create_transform_button.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/create_transform_button/create_transform_button.tsx index 47addec6c0e5e..96b0b51294f08 100644 --- a/x-pack/plugins/transform/public/app/sections/transform_management/components/create_transform_button/create_transform_button.tsx +++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/create_transform_button/create_transform_button.tsx @@ -18,15 +18,20 @@ import { interface CreateTransformButtonProps { onClick: MouseEventHandler; + transformNodes: number; } -export const CreateTransformButton: FC = ({ onClick }) => { +export const CreateTransformButton: FC = ({ + onClick, + transformNodes, +}) => { const { capabilities } = useContext(AuthorizationContext); const disabled = !capabilities.canCreateTransform || !capabilities.canPreviewTransform || - !capabilities.canStartStopTransform; + !capabilities.canStartStopTransform || + transformNodes === 0; const createTransformButton = ( = ({ onClick if (disabled) { return ( - + 0 ? 'canCreateTransform' : 'noTransformNodes' + )} + > {createTransformButton} ); diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/transform_list.test.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/transform_list.test.tsx index 7665063dce2d8..ac00d31a620b9 100644 --- a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/transform_list.test.tsx +++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/transform_list.test.tsx @@ -17,9 +17,8 @@ describe('Transform: Transform List ', () => { test('Minimal initialization', () => { const wrapper = shallow( diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/transform_list.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/transform_list.tsx index 8668281d0b181..bacf8f9deccae 100644 --- a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/transform_list.tsx +++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/transform_list.tsx @@ -12,7 +12,6 @@ import { i18n } from '@kbn/i18n'; import { EuiButtonEmpty, EuiButtonIcon, - EuiCallOut, EuiEmptyPrompt, EuiFlexGroup, EuiFlexItem, @@ -62,18 +61,16 @@ function getItemIdToExpandedRowMap( }, {} as ItemIdToExpandedRowMap); } -interface Props { - errorMessage: any; - isInitialized: boolean; +interface TransformListProps { onCreateTransform: MouseEventHandler; + transformNodes: number; transforms: TransformListRow[]; transformsLoading: boolean; } -export const TransformList: FC = ({ - errorMessage, - isInitialized, +export const TransformList: FC = ({ onCreateTransform, + transformNodes, transforms, transformsLoading, }) => { @@ -86,7 +83,7 @@ export const TransformList: FC = ({ const [expandedRowItemIds, setExpandedRowItemIds] = useState([]); const [transformSelection, setTransformSelection] = useState([]); const [isActionsMenuOpen, setIsActionsMenuOpen] = useState(false); - const bulkStartAction = useStartAction(false); + const bulkStartAction = useStartAction(false, transformNodes); const bulkDeleteAction = useDeleteAction(false); const [searchError, setSearchError] = useState(undefined); @@ -106,6 +103,7 @@ export const TransformList: FC = ({ const { columns, modals: singleActionModals } = useColumns( expandedRowItemIds, setExpandedRowItemIds, + transformNodes, transformSelection ); @@ -131,26 +129,10 @@ export const TransformList: FC = ({ } }; - // Before the transforms have been loaded for the first time, display the loading indicator only. - // Otherwise a user would see 'No transforms found' during the initial loading. - if (!isInitialized) { + if (transforms.length === 0 && transformNodes === 0) { return null; } - if (typeof errorMessage !== 'undefined') { - return ( - - 
{JSON.stringify(errorMessage)}
- - ); - } - if (transforms.length === 0) { return ( = ({ const bulkActionMenuItems = [
bulkStartAction.openModal(transformSelection)}> - +
,
@@ -257,7 +239,7 @@ export const TransformList: FC = ({ - + ); diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/transforms_stats_bar.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/transforms_stats_bar.tsx index fed9f0d9a8518..16d5cd800b548 100644 --- a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/transforms_stats_bar.tsx +++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/transforms_stats_bar.tsx @@ -6,15 +6,21 @@ */ import React, { FC } from 'react'; + +import { EuiCallOut, EuiLink, EuiSpacer } from '@elastic/eui'; + import { i18n } from '@kbn/i18n'; +import { FormattedMessage } from '@kbn/i18n/react'; import { TRANSFORM_MODE, TRANSFORM_STATE } from '../../../../../../common/constants'; import { TransformListRow } from '../../../../common'; +import { useDocumentationLinks } from '../../../../hooks/use_documentation_links'; + import { StatsBar, TransformStatsBarStats } from '../stats_bar'; -function createTranformStats(transformsList: TransformListRow[]) { +function createTranformStats(transformNodes: number, transformsList: TransformListRow[]) { const transformStats = { total: { label: i18n.translate('xpack.transform.statsBar.totalTransformsLabel', { @@ -51,6 +57,13 @@ function createTranformStats(transformsList: TransformListRow[]) { value: 0, show: true, }, + nodes: { + label: i18n.translate('xpack.transform.statsBar.transformNodesLabel', { + defaultMessage: 'Nodes', + }), + value: transformNodes, + show: true, + }, }; if (transformsList === undefined) { @@ -87,12 +100,57 @@ function createTranformStats(transformsList: TransformListRow[]) { return transformStats; } -interface Props { +interface TransformStatsBarProps { + transformNodes: number; transformsList: TransformListRow[]; } -export const TransformStatsBar: FC = ({ transformsList }) => { - const transformStats: TransformStatsBarStats = createTranformStats(transformsList); +export const TransformStatsBar: FC = ({ + transformNodes, + transformsList, +}) => { + const { esNodeRoles } = useDocumentationLinks(); + + const transformStats: TransformStatsBarStats = createTranformStats( + transformNodes, + transformsList + ); - return ; + return ( + <> + + {transformNodes === 0 && ( + <> + + + } + color="warning" + iconType="alert" + > +

+ + + + ), + }} + /> +

+ + + )} + + ); }; diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_actions.test.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_actions.test.tsx index 5b3f921a07d67..90487d21610ea 100644 --- a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_actions.test.tsx +++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_actions.test.tsx @@ -14,7 +14,7 @@ jest.mock('../../../../../app/app_dependencies'); describe('Transform: Transform List Actions', () => { test('useActions()', () => { - const { result } = renderHook(() => useActions({ forceDisable: false })); + const { result } = renderHook(() => useActions({ forceDisable: false, transformNodes: 1 })); const actions = result.current.actions; // Using `any` for the callback. Somehow the EUI types don't pass diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_actions.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_actions.tsx index b30cbd0aba741..d9b9008490666 100644 --- a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_actions.tsx +++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_actions.tsx @@ -20,16 +20,18 @@ import { useStopAction } from '../action_stop'; export const useActions = ({ forceDisable, + transformNodes, }: { forceDisable: boolean; + transformNodes: number; }): { actions: EuiTableActionsColumnType['actions']; modals: JSX.Element; } => { - const cloneAction = useCloneAction(forceDisable); + const cloneAction = useCloneAction(forceDisable, transformNodes); const deleteAction = useDeleteAction(forceDisable); - const editAction = useEditAction(forceDisable); - const startAction = useStartAction(forceDisable); + const editAction = useEditAction(forceDisable, transformNodes); + const startAction = useStartAction(forceDisable, transformNodes); const stopAction = useStopAction(forceDisable); return { diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_columns.test.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_columns.test.tsx index ec65781acc4cc..53eed01f1226d 100644 --- a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_columns.test.tsx +++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_columns.test.tsx @@ -14,7 +14,7 @@ jest.mock('../../../../../app/app_dependencies'); describe('Transform: Job List Columns', () => { test('useColumns()', () => { - const { result } = renderHook(() => useColumns([], () => {}, [])); + const { result } = renderHook(() => useColumns([], () => {}, 1, [])); const columns: ReturnType['columns'] = result.current.columns; expect(columns).toHaveLength(7); diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_columns.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_columns.tsx index d792192f58b61..a8f6a9a233c62 100644 --- a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_columns.tsx +++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_columns.tsx @@ -65,9 +65,13 @@ export const getTaskStateBadge = ( export const useColumns = ( expandedRowItemIds: TransformId[], setExpandedRowItemIds: React.Dispatch>, + transformNodes: number, transformSelection: TransformListRow[] ) => { - const { actions, modals } = useActions({ forceDisable: transformSelection.length > 0 }); + const { actions, modals } = useActions({ + forceDisable: transformSelection.length > 0, + transformNodes, + }); function toggleDetails(item: TransformListRow) { const index = expandedRowItemIds.indexOf(item.config.id); diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/transform_management_section.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/transform_management_section.tsx index fa1a42b94f0b7..cc4c502f21eb5 100644 --- a/x-pack/plugins/transform/public/app/sections/transform_management/transform_management_section.tsx +++ b/x-pack/plugins/transform/public/app/sections/transform_management/transform_management_section.tsx @@ -7,12 +7,15 @@ import React, { FC, Fragment, useEffect, useState } from 'react'; +import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n/react'; import { EuiButtonEmpty, + EuiCallOut, EuiFlexGroup, EuiFlexItem, + EuiLoadingContent, EuiModal, EuiPageContent, EuiPageContentBody, @@ -42,10 +45,12 @@ export const TransformManagement: FC = () => { const [isInitialized, setIsInitialized] = useState(false); const [blockRefresh, setBlockRefresh] = useState(false); const [transforms, setTransforms] = useState([]); + const [transformNodes, setTransformNodes] = useState(0); const [errorMessage, setErrorMessage] = useState(undefined); const getTransforms = useGetTransforms( setTransforms, + setTransformNodes, setErrorMessage, setIsInitialized, blockRefresh @@ -111,15 +116,32 @@ export const TransformManagement: FC = () => { - - - + {!isInitialized && } + {isInitialized && ( + <> + + + {typeof errorMessage !== 'undefined' && ( + + 
{JSON.stringify(errorMessage)}
+ + )} + {typeof errorMessage === 'undefined' && ( + + )} + + )} {isSearchSelectionVisible && ( diff --git a/x-pack/plugins/transform/server/routes/api/transforms.ts b/x-pack/plugins/transform/server/routes/api/transforms.ts index 20961a64da44b..93f5caf7cf5b0 100644 --- a/x-pack/plugins/transform/server/routes/api/transforms.ts +++ b/x-pack/plugins/transform/server/routes/api/transforms.ts @@ -58,6 +58,7 @@ import { addBasePath } from '../index'; import { isRequestTimeout, fillResultsWithTimeouts, wrapError, wrapEsError } from './error_utils'; import { registerTransformsAuditMessagesRoutes } from './transforms_audit_messages'; +import { registerTransformNodesRoutes } from './transforms_nodes'; import { IIndexPattern } from '../../../../../../src/plugins/data/common/index_patterns'; import { isLatestTransform } from '../../../common/types/transform'; @@ -175,7 +176,6 @@ export function registerTransformsRoutes(routeDependencies: RouteDependencies) { } }) ); - registerTransformsAuditMessagesRoutes(routeDependencies); /** * @apiGroup Transforms @@ -389,6 +389,9 @@ export function registerTransformsRoutes(routeDependencies: RouteDependencies) { } }) ); + + registerTransformsAuditMessagesRoutes(routeDependencies); + registerTransformNodesRoutes(routeDependencies); } async function getIndexPatternId( diff --git a/x-pack/plugins/transform/server/routes/api/transforms_nodes.test.ts b/x-pack/plugins/transform/server/routes/api/transforms_nodes.test.ts new file mode 100644 index 0000000000000..462a4688ad455 --- /dev/null +++ b/x-pack/plugins/transform/server/routes/api/transforms_nodes.test.ts @@ -0,0 +1,43 @@ +/* + * 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 { isNodes } from './transforms_nodes'; + +describe('Transform: Nodes API endpoint', () => { + test('isNodes()', () => { + expect(isNodes(undefined)).toBe(false); + expect(isNodes({})).toBe(false); + expect(isNodes({ nodeId: {} })).toBe(false); + expect(isNodes({ nodeId: { someAttribute: {} } })).toBe(false); + expect(isNodes({ nodeId: { attributes: {} } })).toBe(false); + expect( + isNodes({ + nodeId1: { attributes: { someAttribute: true } }, + nodeId2: { someAttribute: 'asdf' }, + }) + ).toBe(false); + + // Legacy format based on attributes should return false + expect(isNodes({ nodeId: { attributes: { someAttribute: true } } })).toBe(false); + expect( + isNodes({ + nodeId1: { attributes: { someAttribute: true } }, + nodeId2: { attributes: { 'transform.node': 'true' } }, + }) + ).toBe(false); + + // Current format based on roles should return true + expect(isNodes({ nodeId: { roles: ['master', 'transform'] } })).toBe(true); + expect(isNodes({ nodeId: { roles: ['transform'] } })).toBe(true); + expect( + isNodes({ + nodeId1: { roles: ['master', 'data'] }, + nodeId2: { roles: ['transform'] }, + }) + ).toBe(true); + }); +}); diff --git a/x-pack/plugins/transform/server/routes/api/transforms_nodes.ts b/x-pack/plugins/transform/server/routes/api/transforms_nodes.ts new file mode 100644 index 0000000000000..afdcc93998303 --- /dev/null +++ b/x-pack/plugins/transform/server/routes/api/transforms_nodes.ts @@ -0,0 +1,71 @@ +/* + * 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 { isPopulatedObject } from '../../../common/utils/object_utils'; + +import { RouteDependencies } from '../../types'; + +import { addBasePath } from '../index'; + +import { wrapError, wrapEsError } from './error_utils'; + +const NODE_ROLES = 'roles'; + +interface NodesAttributes { + roles: string[]; +} +type Nodes = Record; + +export const isNodes = (arg: unknown): arg is Nodes => { + return ( + isPopulatedObject(arg) && + Object.values(arg).every( + (node) => + isPopulatedObject(node) && + {}.hasOwnProperty.call(node, NODE_ROLES) && + Array.isArray(node.roles) + ) + ); +}; + +export function registerTransformNodesRoutes({ router, license }: RouteDependencies) { + /** + * @apiGroup Transform Nodes + * + * @api {get} /api/transforms/_nodes Transform Nodes + * @apiName GetTransformNodes + * @apiDescription Get transform nodes + */ + router.get( + { + path: addBasePath('transforms/_nodes'), + validate: false, + }, + license.guardApiRoute(async (ctx, req, res) => { + try { + const { + body: { nodes }, + } = await ctx.core.elasticsearch.client.asInternalUser.nodes.info({ + filter_path: `nodes.*.${NODE_ROLES}`, + }); + + let count = 0; + if (isNodes(nodes)) { + for (const { roles } of Object.values(nodes)) { + if (roles.includes('transform')) { + count++; + } + } + } + + return res.ok({ body: { count } }); + } catch (e) { + return res.customError(wrapError(wrapEsError(e))); + } + }) + ); +} diff --git a/x-pack/test/api_integration/apis/transform/index.ts b/x-pack/test/api_integration/apis/transform/index.ts index efea3d69d2212..d0aa9533c3860 100644 --- a/x-pack/test/api_integration/apis/transform/index.ts +++ b/x-pack/test/api_integration/apis/transform/index.ts @@ -32,6 +32,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) { loadTestFile(require.resolve('./start_transforms')); loadTestFile(require.resolve('./stop_transforms')); loadTestFile(require.resolve('./transforms')); + loadTestFile(require.resolve('./transforms_nodes')); loadTestFile(require.resolve('./transforms_preview')); loadTestFile(require.resolve('./transforms_stats')); loadTestFile(require.resolve('./transforms_update')); diff --git a/x-pack/test/api_integration/apis/transform/transforms_nodes.ts b/x-pack/test/api_integration/apis/transform/transforms_nodes.ts new file mode 100644 index 0000000000000..593a1fb8fb723 --- /dev/null +++ b/x-pack/test/api_integration/apis/transform/transforms_nodes.ts @@ -0,0 +1,48 @@ +/* + * 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 expect from '@kbn/expect'; + +import type { GetTransformNodesResponseSchema } from '../../../../plugins/transform/common/api_schemas/transforms'; +import { isGetTransformNodesResponseSchema } from '../../../../plugins/transform/common/api_schemas/type_guards'; +import { COMMON_REQUEST_HEADERS } from '../../../functional/services/ml/common_api'; +import { USER } from '../../../functional/services/transform/security_common'; + +import { FtrProviderContext } from '../../ftr_provider_context'; + +export default ({ getService }: FtrProviderContext) => { + const supertest = getService('supertestWithoutAuth'); + const transform = getService('transform'); + + const expected = { + apiTransformTransformsNodes: { + count: 1, + }, + }; + + function assertTransformsNodesResponseBody(body: GetTransformNodesResponseSchema) { + expect(isGetTransformNodesResponseSchema(body)).to.eql(true); + + expect(body.count).to.eql(expected.apiTransformTransformsNodes.count); + } + + describe('/api/transform/transforms/_nodes', function () { + it('should return the number of available transform nodes', async () => { + const { body } = await supertest + .get('/api/transform/transforms/_nodes') + .auth( + USER.TRANSFORM_POWERUSER, + transform.securityCommon.getPasswordForUser(USER.TRANSFORM_POWERUSER) + ) + .set(COMMON_REQUEST_HEADERS) + .send() + .expect(200); + + assertTransformsNodesResponseBody(body); + }); + }); +}; From 73a73332ebd3debd56148aad194e8d5438df64ec Mon Sep 17 00:00:00 2001 From: ymao1 Date: Tue, 16 Mar 2021 08:05:01 -0400 Subject: [PATCH 06/24] [Alerting][Docs] Updating glossary with new terminology (#94447) * Updating glossary with new terminology * Updating glossary with new terminology Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- docs/glossary.asciidoc | 44 +++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/docs/glossary.asciidoc b/docs/glossary.asciidoc index f86f15b1f0e67..02751ec57a1cf 100644 --- a/docs/glossary.asciidoc +++ b/docs/glossary.asciidoc @@ -2,7 +2,7 @@ [[glossary]] = Glossary -<> | <> | <> | <> | <> | <> | <> | H | I | J | <> | <> | <> | N | O | <> | <> | R | <> | <> | <> | V | <> | X | Y | Z +<> | <> | <> | <> | <> | <> | <> | H | I | J | <> | <> | <> | N | O | <> | <> | <> | <> | <> | <> | V | <> | X | Y | Z [float] [[a_glos]] @@ -13,10 +13,10 @@ + -- // tag::action-def[] -The alert-specific response that occurs when an alert fires. -An alert can have multiple actions. +The rule-specific response that occurs when an alerting rule fires. +A rule can have multiple actions. See -{kibana-ref}/action-types.html[Action and connector types]. +{kibana-ref}/action-types.html[Connectors and actions]. // end::action-def[] -- @@ -28,20 +28,6 @@ Part of {kib} Stack Management. See {kibana-ref}/advanced-options.html[Advanced Settings]. // end::advanced-settings-def[] -[[glossary-alert]] alert :: -// tag::alert-def[] -A set of <>, schedules, and <> -that enable notifications. -See <>. -// end::alert-def[] - -[[glossary-alerts-and-actions]] Alerts and Actions :: -// tag::alerts-and-actions-def[] -A comprehensive view of all your alerts. Enables you to access and -manage alerts for all {kib} apps from one place. -See {kibana-ref}/alerting-getting-started.html[Alerts and Actions]. -// end::alerts-and-actions-def[] - [[glossary-annotation]] annotation :: // tag::annotation-def[] A way to augment a data display with descriptive domain knowledge. @@ -113,13 +99,13 @@ The cluster location is the weighted centroid for all documents in the grid cell [[glossary-condition]] condition :: // tag::condition-def[] -Specifies the circumstances that must be met to trigger an alert. +Specifies the circumstances that must be met to trigger an alerting rule. // end::condition-def[] [[glossary-connector]] connector :: // tag::connector-def[] A configuration that enables integration with an external system (the destination for an action). -See {kibana-ref}/action-types.html[Action and connector types]. +See {kibana-ref}/action-types.html[Connectors and actions]. // end::connector-def[] [[glossary-console]] Console :: @@ -335,6 +321,24 @@ A tool that enables you to inspect and analyze search queries to diagnose and de See {kibana-ref}/xpack-profiler.html[Query Profiler]. // end::query-profiler-def[] +[float] +[[r_glos]] +== R + +[[glossary-rule]] rule :: +// tag::rule-def[] +A set of <>, schedules, and <> +that enable notifications. +See <>. +// end::rule-def[] + +[[glossary-rules-and-connectors]] Rules and Connectors :: +// tag::rules-and-connectors-def[] +A comprehensive view of all your alerting rules. Enables you to access and +manage rules for all {kib} apps from one place. +See {kibana-ref}/alerting-getting-started.html[Rules and Connectors]. +// end::rules-and-connectors-def[] + [float] [[s_glos]] == S From e830e077d3fe88085b7b488cd0f08c554c8a84ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20St=C3=BCrmer?= Date: Tue, 16 Mar 2021 13:29:29 +0100 Subject: [PATCH 07/24] [Logs UI] Style improvements for log stream search strategy (#94560) --- .../log_entries/log_entries_search_strategy.ts | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/x-pack/plugins/infra/server/services/log_entries/log_entries_search_strategy.ts b/x-pack/plugins/infra/server/services/log_entries/log_entries_search_strategy.ts index bf7e497385f9a..190464ab6d5c1 100644 --- a/x-pack/plugins/infra/server/services/log_entries/log_entries_search_strategy.ts +++ b/x-pack/plugins/infra/server/services/log_entries/log_entries_search_strategy.ts @@ -20,7 +20,6 @@ import type { } from '../../../../../../src/plugins/data/server'; import { LogSourceColumnConfiguration, - LogSourceConfigurationProperties, logSourceFieldColumnConfigurationRT, } from '../../../common/http_api/log_sources'; import { @@ -107,7 +106,10 @@ export const logEntriesSearchStrategyProvider = ({ params.size + 1, configuration.fields.timestamp, configuration.fields.tiebreaker, - getRequiredFields(configuration, messageFormattingRules, params.columns), + getRequiredFields( + params.columns ?? configuration.logColumns, + messageFormattingRules + ), params.query, params.highlightPhrase ), @@ -131,7 +133,7 @@ export const logEntriesSearchStrategyProvider = ({ .slice(0, request.params.size) .map( getLogEntryFromHit( - request.params.columns ? request.params.columns : configuration.logColumns, + request.params.columns ?? configuration.logColumns, messageFormattingRules ) ); @@ -257,12 +259,9 @@ function getResponseCursors(entries: LogEntry[]) { const VIEW_IN_CONTEXT_FIELDS = ['log.file.path', 'host.name', 'container.id']; const getRequiredFields = ( - configuration: LogSourceConfigurationProperties, - messageFormattingRules: CompiledLogMessageFormattingRule, - columnOverrides?: LogSourceColumnConfiguration[] + columns: LogSourceColumnConfiguration[], + messageFormattingRules: CompiledLogMessageFormattingRule ): string[] => { - const columns = columnOverrides ? columnOverrides : configuration.logColumns; - const fieldsFromColumns = columns.reduce((accumulatedFields, logColumn) => { if (logSourceFieldColumnConfigurationRT.is(logColumn)) { return [...accumulatedFields, logColumn.fieldColumn.field]; From 638f166f71e9fbb59bfe286d807aec587696be37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20S=C3=A1nchez?= Date: Tue, 16 Mar 2021 13:36:06 +0100 Subject: [PATCH 08/24] [SECURITY_SOLUTION] Add helper text on entry input for trusted applications (#94563) * Added text help for each entry input option * Add new unit test * Fix wrong import on test file * Change entry variable to readonly. Use it.each instead of a for loop * Move function inside useMemo since it is only used there * Remove old commented code * Update failing test --- .../condition_entry_input/index.test.tsx | 141 ++++++++++++++++++ .../condition_entry_input/index.tsx | 20 ++- .../create_trusted_app_form.test.tsx | 6 +- .../pages/trusted_apps/view/translations.ts | 15 ++ 4 files changed, 180 insertions(+), 2 deletions(-) create mode 100644 x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/condition_entry_input/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/condition_entry_input/index.test.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/condition_entry_input/index.test.tsx new file mode 100644 index 0000000000000..4e9ec3a0883a2 --- /dev/null +++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/condition_entry_input/index.test.tsx @@ -0,0 +1,141 @@ +/* + * 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 { shallow, mount } from 'enzyme'; +import React from 'react'; +import { keys } from 'lodash'; +import { + ConditionEntry, + ConditionEntryField, + OperatingSystem, +} from '../../../../../../../common/endpoint/types'; + +import { ConditionEntryInput } from '.'; +import { EuiSuperSelectProps } from '@elastic/eui'; + +let onRemoveMock: jest.Mock; +let onChangeMock: jest.Mock; +let onVisitedMock: jest.Mock; + +const entry: Readonly = { + field: ConditionEntryField.HASH, + type: 'match', + operator: 'included', + value: 'trustedApp', +}; + +describe('Condition entry input', () => { + beforeEach(() => { + onRemoveMock = jest.fn(); + onChangeMock = jest.fn(); + onVisitedMock = jest.fn(); + }); + + const getElement = ( + subject: string, + os: OperatingSystem = OperatingSystem.WINDOWS, + isRemoveDisabled: boolean = false + ) => ( + + ); + + it.each(keys(ConditionEntryField).map((k) => [k]))( + 'should call on change for field input with value %s', + (field) => { + const element = shallow(getElement('testOnChange')); + expect(onChangeMock).toHaveBeenCalledTimes(0); + element + .find('[data-test-subj="testOnChange-field"]') + .first() + .simulate('change', { target: { value: field } }); + expect(onChangeMock).toHaveBeenCalledTimes(1); + expect(onChangeMock).toHaveBeenCalledWith( + { + ...entry, + field: { target: { value: field } }, + }, + entry + ); + } + ); + + it('should call on remove for field input', () => { + const element = mount(getElement('testOnRemove')); + expect(onRemoveMock).toHaveBeenCalledTimes(0); + element.find('[data-test-subj="testOnRemove-remove"]').first().simulate('click'); + expect(onRemoveMock).toHaveBeenCalledTimes(1); + expect(onRemoveMock).toHaveBeenCalledWith(entry); + }); + + it('should not be able to call on remove for field input because disabled', () => { + const element = mount(getElement('testOnRemove', OperatingSystem.WINDOWS, true)); + expect(onRemoveMock).toHaveBeenCalledTimes(0); + element.find('[data-test-subj="testOnRemove-remove"]').first().simulate('click'); + expect(onRemoveMock).toHaveBeenCalledTimes(0); + }); + + it('should call on visited for field input', () => { + const element = shallow(getElement('testOnVisited')); + expect(onVisitedMock).toHaveBeenCalledTimes(0); + element.find('[data-test-subj="testOnVisited-value"]').first().simulate('blur'); + expect(onVisitedMock).toHaveBeenCalledTimes(1); + expect(onVisitedMock).toHaveBeenCalledWith(entry); + }); + + it('should change value for field input', () => { + const element = shallow(getElement('testOnChange')); + expect(onChangeMock).toHaveBeenCalledTimes(0); + element + .find('[data-test-subj="testOnChange-value"]') + .first() + .simulate('change', { target: { value: 'new value' } }); + expect(onChangeMock).toHaveBeenCalledTimes(1); + expect(onChangeMock).toHaveBeenCalledWith( + { + ...entry, + value: 'new value', + }, + entry + ); + }); + + it('should be able to select three options when WINDOWS OS', () => { + const element = mount(getElement('testCheckSignatureOption')); + const superSelectProps = element + .find('[data-test-subj="testCheckSignatureOption-field"]') + .first() + .props() as EuiSuperSelectProps; + expect(superSelectProps.options.length).toBe(3); + }); + + it('should be able to select two options when LINUX OS', () => { + const element = mount(getElement('testCheckSignatureOption', OperatingSystem.LINUX)); + const superSelectProps = element + .find('[data-test-subj="testCheckSignatureOption-field"]') + .first() + .props() as EuiSuperSelectProps; + expect(superSelectProps.options.length).toBe(2); + }); + + it('should be able to select two options when MAC OS', () => { + const element = mount(getElement('testCheckSignatureOption', OperatingSystem.MAC)); + const superSelectProps = element + .find('[data-test-subj="testCheckSignatureOption-field"]') + .first() + .props() as EuiSuperSelectProps; + expect(superSelectProps.options.length).toBe(2); + }); +}); diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/condition_entry_input/index.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/condition_entry_input/index.tsx index 72467cf28ec56..f85f00810bc72 100644 --- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/condition_entry_input/index.tsx +++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/condition_entry_input/index.tsx @@ -15,6 +15,7 @@ import { EuiFormRow, EuiSuperSelect, EuiSuperSelectOption, + EuiText, } from '@elastic/eui'; import { @@ -23,7 +24,12 @@ import { OperatingSystem, } from '../../../../../../../common/endpoint/types'; -import { CONDITION_FIELD_TITLE, ENTRY_PROPERTY_TITLES, OPERATOR_TITLE } from '../../translations'; +import { + CONDITION_FIELD_DESCRIPTION, + CONDITION_FIELD_TITLE, + ENTRY_PROPERTY_TITLES, + OPERATOR_TITLE, +} from '../../translations'; const ConditionEntryCell = memo<{ showLabel: boolean; @@ -75,18 +81,30 @@ export const ConditionEntryInput = memo( ]); const fieldOptions = useMemo>>(() => { + const getDropdownDisplay = (field: ConditionEntryField) => ( + <> + {CONDITION_FIELD_TITLE[field]} + + {CONDITION_FIELD_DESCRIPTION[field]} + + + ); + return [ { + dropdownDisplay: getDropdownDisplay(ConditionEntryField.HASH), inputDisplay: CONDITION_FIELD_TITLE[ConditionEntryField.HASH], value: ConditionEntryField.HASH, }, { + dropdownDisplay: getDropdownDisplay(ConditionEntryField.PATH), inputDisplay: CONDITION_FIELD_TITLE[ConditionEntryField.PATH], value: ConditionEntryField.PATH, }, ...(os === OperatingSystem.WINDOWS ? [ { + dropdownDisplay: getDropdownDisplay(ConditionEntryField.SIGNER), inputDisplay: CONDITION_FIELD_TITLE[ConditionEntryField.SIGNER], value: ConditionEntryField.SIGNER, }, diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/create_trusted_app_form.test.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/create_trusted_app_form.test.tsx index 441847bd88bb9..7d056ae6999e7 100644 --- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/create_trusted_app_form.test.tsx +++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/create_trusted_app_form.test.tsx @@ -165,7 +165,11 @@ describe('When showing the Trusted App Create Form', () => { '.euiSuperSelect__listbox button.euiSuperSelect__item' ) ).map((button) => button.textContent); - expect(options).toEqual(['Hash', 'Path', 'Signature']); + expect(options).toEqual([ + 'Hashmd5, sha1, or sha256', + 'PathThe full path of the application', + 'SignatureThe signer of the application', + ]); }); it('should show the value field as required', () => { diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/translations.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/translations.ts index 3b9db3f8a1c02..b594c355a6983 100644 --- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/translations.ts +++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/translations.ts @@ -37,6 +37,21 @@ export const CONDITION_FIELD_TITLE: { [K in ConditionEntryField]: string } = { ), }; +export const CONDITION_FIELD_DESCRIPTION: { [K in ConditionEntryField]: string } = { + [ConditionEntryField.HASH]: i18n.translate( + 'xpack.securitySolution.trustedapps.logicalConditionBuilder.entry.field.description.hash', + { defaultMessage: 'md5, sha1, or sha256' } + ), + [ConditionEntryField.PATH]: i18n.translate( + 'xpack.securitySolution.trustedapps.logicalConditionBuilder.entry.field.description.path', + { defaultMessage: 'The full path of the application' } + ), + [ConditionEntryField.SIGNER]: i18n.translate( + 'xpack.securitySolution.trustedapps.logicalConditionBuilder.entry.field.description.signature', + { defaultMessage: 'The signer of the application' } + ), +}; + export const OPERATOR_TITLE: { [K in ConditionEntry['operator']]: string } = { included: i18n.translate('xpack.securitySolution.trustedapps.card.operator.includes', { defaultMessage: 'is', From 4a83a024336c70f518b6bd3b838eade73c1064ae Mon Sep 17 00:00:00 2001 From: Jean-Louis Leysens Date: Tue, 16 Mar 2021 13:40:13 +0100 Subject: [PATCH 09/24] [ILM] Hide node allocation notices on Cloud (#94581) * block node allocation notices on cloud * added test to check that notices are not showing Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../features/node_allocation.test.ts | 30 +++++------ .../components/index.ts | 2 - .../components/missing_cloud_tier_callout.tsx | 53 ------------------- .../data_tier_allocation_field.tsx | 27 ++-------- 4 files changed, 16 insertions(+), 96 deletions(-) delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/data_tier_allocation_field/components/missing_cloud_tier_callout.tsx diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation.test.ts index 832963827663d..e289991780c04 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation.test.ts +++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation.test.ts @@ -365,9 +365,9 @@ describe(' node allocation', () => { await act(async () => { testBed = await setup({ appServicesContext: { cloud: { isCloudEnabled: true } } }); }); - const { actions, component, exists, find } = testBed; + testBed.component.update(); - component.update(); + const { actions, component, exists, find } = testBed; await actions.warm.enable(true); expect(component.find('.euiLoadingSpinner').exists()).toBeFalsy(); @@ -375,35 +375,29 @@ describe(' node allocation', () => { expect(exists('defaultDataAllocationOption')).toBeTruthy(); expect(exists('customDataAllocationOption')).toBeTruthy(); expect(exists('noneDataAllocationOption')).toBeTruthy(); - // We should not be showing the call-to-action for users to activate data tier in cloud - expect(exists('cloudDataTierCallout')).toBeFalsy(); // Do not show the call-to-action for users to migrate their cluster to use node roles expect(find('cloudDataTierCallout').exists()).toBeFalsy(); }); - - test(`shows cloud notice when cold tier nodes do not exist`, async () => { + test('do not show node allocation specific warnings on cloud', async () => { httpRequestsMockHelpers.setListNodes({ - nodesByAttributes: {}, - nodesByRoles: { data: ['test'], data_hot: ['test'], data_warm: ['test'] }, + nodesByAttributes: { test: ['123'] }, + // No nodes with node roles like "data_hot" or "data_warm" + nodesByRoles: {}, isUsingDeprecatedDataRoleConfig: false, }); await act(async () => { testBed = await setup({ appServicesContext: { cloud: { isCloudEnabled: true } } }); }); - const { actions, component, exists, find } = testBed; + testBed.component.update(); - component.update(); + const { actions, component, exists } = testBed; + await actions.warm.enable(true); await actions.cold.enable(true); expect(component.find('.euiLoadingSpinner').exists()).toBeFalsy(); - expect(exists('cloudMissingTierCallout')).toBeTruthy(); - expect(find('cloudMissingTierCallout').text()).toContain( - `Edit your Elastic Cloud deployment to set up a cold tier` - ); - - // Assert that other notices are not showing - expect(actions.cold.hasDefaultAllocationNotice()).toBeFalsy(); - expect(actions.cold.hasNoNodeAttrsWarning()).toBeFalsy(); + expect(exists('cloudDataTierCallout')).toBeFalsy(); + expect(exists('defaultAllocationNotice')).toBeFalsy(); + expect(exists('defaultAllocationWarning')).toBeFalsy(); }); }); }); diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/data_tier_allocation_field/components/index.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/data_tier_allocation_field/components/index.ts index dacec1df52e2e..e9c884a42fa93 100644 --- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/data_tier_allocation_field/components/index.ts +++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/data_tier_allocation_field/components/index.ts @@ -17,8 +17,6 @@ export { DefaultAllocationWarning } from './default_allocation_warning'; export { NoNodeAttributesWarning } from './no_node_attributes_warning'; -export { MissingCloudTierCallout } from './missing_cloud_tier_callout'; - export { CloudDataTierCallout } from './cloud_data_tier_callout'; export { LoadingError } from './loading_error'; diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/data_tier_allocation_field/components/missing_cloud_tier_callout.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/data_tier_allocation_field/components/missing_cloud_tier_callout.tsx deleted file mode 100644 index 09d3135cde469..0000000000000 --- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/data_tier_allocation_field/components/missing_cloud_tier_callout.tsx +++ /dev/null @@ -1,53 +0,0 @@ -/* - * 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 { i18n } from '@kbn/i18n'; -import React, { FunctionComponent } from 'react'; -import { EuiCallOut, EuiLink } from '@elastic/eui'; - -const geti18nTexts = (tier: 'cold' | 'frozen') => ({ - title: i18n.translate('xpack.indexLifecycleMgmt.editPolicy.cloudMissingTierCallout.title', { - defaultMessage: 'Create a {tier} tier', - values: { tier }, - }), - body: i18n.translate('xpack.indexLifecycleMgmt.editPolicy.cloudMissingTierCallout.body', { - defaultMessage: 'Edit your Elastic Cloud deployment to set up a {tier} tier.', - values: { tier }, - }), - linkText: i18n.translate( - 'xpack.indexLifecycleMgmt.editPolicy.cloudMissingTierCallout.linkToCloudDeploymentDescription', - { defaultMessage: 'View cloud deployment' } - ), -}); - -interface Props { - phase: 'cold' | 'frozen'; - linkToCloudDeployment?: string; -} - -/** - * A call-to-action for users to activate their cold tier slider to provision cold tier nodes. - * This may need to be change when we have autoscaling enabled on a cluster because nodes may not - * yet exist, but will automatically be provisioned. - */ -export const MissingCloudTierCallout: FunctionComponent = ({ - phase, - linkToCloudDeployment, -}) => { - const i18nTexts = geti18nTexts(phase); - - return ( - - {i18nTexts.body}{' '} - {Boolean(linkToCloudDeployment) && ( - - {i18nTexts.linkText} - - )} - - ); -}; diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/data_tier_allocation_field/data_tier_allocation_field.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/data_tier_allocation_field/data_tier_allocation_field.tsx index ef0e82063ce20..ffd4e2758ab86 100644 --- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/data_tier_allocation_field/data_tier_allocation_field.tsx +++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/data_tier_allocation_field/data_tier_allocation_field.tsx @@ -25,7 +25,6 @@ import { DefaultAllocationNotice, DefaultAllocationWarning, NoNodeAttributesWarning, - MissingCloudTierCallout, CloudDataTierCallout, LoadingError, } from './components'; @@ -59,10 +58,6 @@ export const DataTierAllocationField: FunctionComponent = ({ phase, descr const { nodesByRoles, nodesByAttributes, isUsingDeprecatedDataRoleConfig } = data!; - const hasDataNodeRoles = Object.keys(nodesByRoles).some((nodeRole) => - // match any of the "data_" roles, including data_content. - nodeRole.trim().startsWith('data_') - ); const hasNodeAttrs = Boolean(Object.keys(nodesByAttributes ?? {}).length); const isCloudEnabled = cloud?.isCloudEnabled ?? false; const cloudDeploymentUrl = cloud?.cloudDeploymentUrl; @@ -71,26 +66,12 @@ export const DataTierAllocationField: FunctionComponent = ({ phase, descr switch (allocationType) { case 'node_roles': /** - * We'll drive Cloud users to add a cold or frozen tier to their deployment if there are no nodes with that role. + * On cloud most users should be using autoscaling which will provision tiers as they are needed. We do not surface any + * of the notices below. */ - if ( - isCloudEnabled && - !isUsingDeprecatedDataRoleConfig && - (phase === 'cold' || phase === 'frozen') - ) { - const hasNoNodesWithNodeRole = !nodesByRoles[`data_${phase}` as const]?.length; - - if (hasDataNodeRoles && hasNoNodesWithNodeRole) { - // Tell cloud users they can deploy nodes on cloud. - return ( - <> - - - - ); - } + if (isCloudEnabled) { + return null; } - /** * Node role allocation moves data in a phase to a corresponding tier of the same name. To prevent policy execution from getting * stuck ILM allocation will fall back to a previous tier if possible. We show the WARNING below to inform a user when even From 6c9cfd4893983917a36bc9f82f79e9eb235cf9eb Mon Sep 17 00:00:00 2001 From: James Rodewig <40268737+jrodewig@users.noreply.github.com> Date: Tue, 16 Mar 2021 08:45:32 -0400 Subject: [PATCH 10/24] Use documentation link service for Watcher (#93339) --- .../watcher/public/application/app_context.tsx | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/x-pack/plugins/watcher/public/application/app_context.tsx b/x-pack/plugins/watcher/public/application/app_context.tsx index 8b1efbc9a1fe5..81fbfa97845a6 100644 --- a/x-pack/plugins/watcher/public/application/app_context.tsx +++ b/x-pack/plugins/watcher/public/application/app_context.tsx @@ -16,18 +16,14 @@ interface ContextValue extends Omit { const AppContext = createContext(null as any); -// eslint-disable-next-line @typescript-eslint/naming-convention -const generateDocLinks = ({ ELASTIC_WEBSITE_URL, DOC_LINK_VERSION }: DocLinksStart) => { - const elasticDocLinkBase = `${ELASTIC_WEBSITE_URL}guide/en/`; - const esBase = `${elasticDocLinkBase}elasticsearch/reference/${DOC_LINK_VERSION}`; - const kibanaBase = `${elasticDocLinkBase}kibana/${DOC_LINK_VERSION}`; - const putWatchApiUrl = `${esBase}/watcher-api-put-watch.html`; - const executeWatchApiUrl = `${esBase}/watcher-api-execute-watch.html#watcher-api-execute-watch-action-mode`; - const watcherGettingStartedUrl = `${kibanaBase}/watcher-ui.html`; +const generateDocLinks = ({ links }: DocLinksStart) => { + const putWatchApiUrl = `${links.apis.putWatch}`; + const executeWatchApiUrl = `${links.apis.executeWatchActionModes}`; + const watcherGettingStartedUrl = `${links.watcher.ui}`; const watchActionsConfigurationMap = { - [ACTION_TYPES.SLACK]: `${esBase}/actions-slack.html#configuring-slack`, - [ACTION_TYPES.PAGERDUTY]: `${esBase}/actions-pagerduty.html#configuring-pagerduty`, - [ACTION_TYPES.JIRA]: `${esBase}/actions-jira.html#configuring-jira`, + [ACTION_TYPES.SLACK]: `${links.watcher.slackAction}`, + [ACTION_TYPES.PAGERDUTY]: `${links.watcher.pagerDutyAction}`, + [ACTION_TYPES.JIRA]: `${links.watcher.jiraAction}`, }; return { From b0fa077e8a8e75d2937a0d53a0905e0a5d26612a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cau=C3=AA=20Marcondes?= <55978943+cauemarcondes@users.noreply.github.com> Date: Tue, 16 Mar 2021 09:12:50 -0400 Subject: [PATCH 11/24] [APM] Adding comparison to Throughput chart, Error rate chart, and Errors table (#94204) * adding comparison to throuput chart * adding comparison to error rate chart * adding comparison to errors table * fixing/adding api test * addressing pr comments * addressing pr comments Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../get_column.tsx | 16 +- .../service_overview_errors_table/index.tsx | 97 ++- .../service_overview_throughput_chart.tsx | 73 +- .../get_columns.tsx | 5 +- .../transaction_error_rate_chart/index.tsx | 78 +- .../get_service_map_service_node_info.ts | 3 + ...rvice_error_group_comparison_statistics.ts | 88 ++- .../lib/transaction_groups/get_error_rate.ts | 73 +- x-pack/plugins/apm/server/routes/services.ts | 17 +- .../plugins/apm/server/routes/transactions.ts | 12 +- .../error_groups_comparison_statistics.snap | 72 ++ .../error_groups_comparison_statistics.ts | 94 ++- .../__snapshots__/error_rate.snap | 738 ++++++++++++++++++ .../tests/transactions/error_rate.ts | 175 ++++- 14 files changed, 1432 insertions(+), 109 deletions(-) diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_errors_table/get_column.tsx b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_errors_table/get_column.tsx index 94913c1678d21..fd1120808db9e 100644 --- a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_errors_table/get_column.tsx +++ b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_errors_table/get_column.tsx @@ -22,9 +22,11 @@ type ErrorGroupComparisonStatistics = APIReturnType<'GET /api/apm/services/{serv export function getColumns({ serviceName, errorGroupComparisonStatistics, + comparisonEnabled, }: { serviceName: string; errorGroupComparisonStatistics: ErrorGroupComparisonStatistics; + comparisonEnabled?: boolean; }): Array> { return [ { @@ -71,12 +73,17 @@ export function getColumns({ ), width: px(unit * 12), render: (_, { occurrences, group_id: errorGroupId }) => { - const timeseries = - errorGroupComparisonStatistics?.[errorGroupId]?.timeseries; + const currentPeriodTimeseries = + errorGroupComparisonStatistics?.currentPeriod?.[errorGroupId] + ?.timeseries; + const previousPeriodTimeseries = + errorGroupComparisonStatistics?.previousPeriod?.[errorGroupId] + ?.timeseries; + return ( ); }, diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_errors_table/index.tsx b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_errors_table/index.tsx index bbd36a4c8df93..d36bee8d6be73 100644 --- a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_errors_table/index.tsx +++ b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_errors_table/index.tsx @@ -18,14 +18,18 @@ import uuid from 'uuid'; import { useApmServiceContext } from '../../../../context/apm_service/use_apm_service_context'; import { useUrlParams } from '../../../../context/url_params_context/use_url_params'; import { FETCH_STATUS, useFetcher } from '../../../../hooks/use_fetcher'; +import { APIReturnType } from '../../../../services/rest/createCallApmApi'; import { ErrorOverviewLink } from '../../../shared/Links/apm/ErrorOverviewLink'; import { TableFetchWrapper } from '../../../shared/table_fetch_wrapper'; +import { getTimeRangeComparison } from '../../../shared/time_comparison/get_time_range_comparison'; import { ServiceOverviewTableContainer } from '../service_overview_table_container'; import { getColumns } from './get_column'; interface Props { serviceName: string; } +type ErrorGroupPrimaryStatistics = APIReturnType<'GET /api/apm/services/{serviceName}/error_groups/primary_statistics'>; +type ErrorGroupComparisonStatistics = APIReturnType<'GET /api/apm/services/{serviceName}/error_groups/comparison_statistics'>; type SortDirection = 'asc' | 'desc'; type SortField = 'name' | 'last_seen' | 'occurrences'; @@ -36,14 +40,31 @@ const DEFAULT_SORT = { field: 'occurrences' as const, }; -const INITIAL_STATE = { +const INITIAL_STATE_PRIMARY_STATISTICS: { + items: ErrorGroupPrimaryStatistics['error_groups']; + totalItems: number; + requestId?: string; +} = { items: [], + totalItems: 0, requestId: undefined, }; +const INITIAL_STATE_COMPARISON_STATISTICS: ErrorGroupComparisonStatistics = { + currentPeriod: {}, + previousPeriod: {}, +}; + export function ServiceOverviewErrorsTable({ serviceName }: Props) { const { - urlParams: { environment, kuery, start, end }, + urlParams: { + environment, + kuery, + start, + end, + comparisonType, + comparisonEnabled, + }, } = useUrlParams(); const { transactionType } = useApmServiceContext(); const [tableOptions, setTableOptions] = useState<{ @@ -57,9 +78,16 @@ export function ServiceOverviewErrorsTable({ serviceName }: Props) { sort: DEFAULT_SORT, }); + const { comparisonStart, comparisonEnd } = getTimeRangeComparison({ + start, + end, + comparisonType, + }); + const { pageIndex, sort } = tableOptions; + const { direction, field } = sort; - const { data = INITIAL_STATE, status } = useFetcher( + const { data = INITIAL_STATE_PRIMARY_STATISTICS, status } = useFetcher( (callApmApi) => { if (!start || !end || !transactionType) { return; @@ -78,37 +106,43 @@ export function ServiceOverviewErrorsTable({ serviceName }: Props) { }, }, }).then((response) => { + const currentPageErrorGroups = orderBy( + response.error_groups, + field, + direction + ).slice(pageIndex * PAGE_SIZE, (pageIndex + 1) * PAGE_SIZE); + return { requestId: uuid(), - items: response.error_groups, + items: currentPageErrorGroups, + totalItems: response.error_groups.length, }; }); }, - [environment, kuery, start, end, serviceName, transactionType] + // comparisonType is listed as dependency even thought it is not used. This is needed to trigger the comparison api when it is changed. + // eslint-disable-next-line react-hooks/exhaustive-deps + [ + environment, + kuery, + start, + end, + serviceName, + transactionType, + pageIndex, + direction, + field, + comparisonType, + ] ); - const { requestId, items } = data; - const currentPageErrorGroups = orderBy( - items, - sort.field, - sort.direction - ).slice(pageIndex * PAGE_SIZE, (pageIndex + 1) * PAGE_SIZE); + const { requestId, items, totalItems } = data; - const groupIds = JSON.stringify( - currentPageErrorGroups.map(({ group_id: groupId }) => groupId).sort() - ); const { - data: errorGroupComparisonStatistics, + data: errorGroupComparisonStatistics = INITIAL_STATE_COMPARISON_STATISTICS, status: errorGroupComparisonStatisticsStatus, } = useFetcher( (callApmApi) => { - if ( - requestId && - currentPageErrorGroups.length && - start && - end && - transactionType - ) { + if (requestId && items.length && start && end && transactionType) { return callApmApi({ endpoint: 'GET /api/apm/services/{serviceName}/error_groups/comparison_statistics', @@ -121,21 +155,26 @@ export function ServiceOverviewErrorsTable({ serviceName }: Props) { end, numBuckets: 20, transactionType, - groupIds, + groupIds: JSON.stringify( + items.map(({ group_id: groupId }) => groupId).sort() + ), + comparisonStart, + comparisonEnd, }, }, }); } }, - // only fetches agg results when requestId or group ids change + // only fetches agg results when requestId changes // eslint-disable-next-line react-hooks/exhaustive-deps - [requestId, groupIds], + [requestId], { preservePreviousData: false } ); const columns = getColumns({ serviceName, - errorGroupComparisonStatistics: errorGroupComparisonStatistics ?? {}, + errorGroupComparisonStatistics, + comparisonEnabled, }); return ( @@ -164,16 +203,16 @@ export function ServiceOverviewErrorsTable({ serviceName }: Props) { (); const { - urlParams: { environment, kuery, start, end }, + urlParams: { + environment, + kuery, + start, + end, + comparisonEnabled, + comparisonType, + }, } = useUrlParams(); const { transactionType } = useApmServiceContext(); + const comparisonChartTheme = getComparisonChartTheme(theme); + const { comparisonStart, comparisonEnd } = getTimeRangeComparison({ + start, + end, + comparisonType, + }); const { data = INITIAL_STATE, status } = useFetcher( (callApmApi) => { @@ -48,14 +65,49 @@ export function ServiceOverviewThroughputChart({ start, end, transactionType, + comparisonStart, + comparisonEnd, }, }, }); } }, - [environment, kuery, serviceName, start, end, transactionType] + [ + environment, + kuery, + serviceName, + start, + end, + transactionType, + comparisonStart, + comparisonEnd, + ] ); + const timeseries = [ + { + data: data.currentPeriod, + type: 'linemark', + color: theme.eui.euiColorVis0, + title: i18n.translate('xpack.apm.serviceOverview.throughtputChartTitle', { + defaultMessage: 'Throughput', + }), + }, + ...(comparisonEnabled + ? [ + { + data: data.previousPeriod, + type: 'area', + color: theme.eui.euiColorLightestShade, + title: i18n.translate( + 'xpack.apm.serviceOverview.throughtputChart.previousPeriodLabel', + { defaultMessage: 'Previous period' } + ), + }, + ] + : []), + ]; + return ( @@ -70,18 +122,9 @@ export function ServiceOverviewThroughputChart({ height={height} showAnnotations={false} fetchStatus={status} - timeseries={[ - { - data: data.currentPeriod, - type: 'linemark', - color: theme.eui.euiColorVis0, - title: i18n.translate( - 'xpack.apm.serviceOverview.throughtputChartTitle', - { defaultMessage: 'Throughput' } - ), - }, - ]} + timeseries={timeseries} yLabelFormat={asTransactionRate} + customTheme={comparisonChartTheme} /> ); diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_transactions_table/get_columns.tsx b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_transactions_table/get_columns.tsx index bff45b5d274c3..d9ca3356d7fd2 100644 --- a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_transactions_table/get_columns.tsx +++ b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_transactions_table/get_columns.tsx @@ -159,14 +159,13 @@ export function getColumns({ transactionGroupComparisonStatistics?.currentPeriod?.[name]?.impact ?? 0; const previousImpact = - transactionGroupComparisonStatistics?.previousPeriod?.[name] - ?.impact ?? 0; + transactionGroupComparisonStatistics?.previousPeriod?.[name]?.impact; return ( - {comparisonEnabled && ( + {comparisonEnabled && previousImpact && ( diff --git a/x-pack/plugins/apm/public/components/shared/charts/transaction_error_rate_chart/index.tsx b/x-pack/plugins/apm/public/components/shared/charts/transaction_error_rate_chart/index.tsx index b3c38651ea178..fd9435db57bfd 100644 --- a/x-pack/plugins/apm/public/components/shared/charts/transaction_error_rate_chart/index.tsx +++ b/x-pack/plugins/apm/public/components/shared/charts/transaction_error_rate_chart/index.tsx @@ -9,12 +9,17 @@ import { EuiPanel, EuiTitle } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import React from 'react'; import { useParams } from 'react-router-dom'; +import { APIReturnType } from '../../../../services/rest/createCallApmApi'; import { asPercent } from '../../../../../common/utils/formatters'; import { useFetcher } from '../../../../hooks/use_fetcher'; import { useTheme } from '../../../../hooks/use_theme'; import { useUrlParams } from '../../../../context/url_params_context/use_url_params'; import { TimeseriesChart } from '../timeseries_chart'; import { useApmServiceContext } from '../../../../context/apm_service/use_apm_service_context'; +import { + getComparisonChartTheme, + getTimeRangeComparison, +} from '../../time_comparison/get_time_range_comparison'; function yLabelFormat(y?: number | null) { return asPercent(y || 0, 1); @@ -25,6 +30,21 @@ interface Props { showAnnotations?: boolean; } +type ErrorRate = APIReturnType<'GET /api/apm/services/{serviceName}/transactions/charts/error_rate'>; + +const INITIAL_STATE: ErrorRate = { + currentPeriod: { + noHits: true, + transactionErrorRate: [], + average: null, + }, + previousPeriod: { + noHits: true, + transactionErrorRate: [], + average: null, + }, +}; + export function TransactionErrorRateChart({ height, showAnnotations = true, @@ -32,11 +52,25 @@ export function TransactionErrorRateChart({ const theme = useTheme(); const { serviceName } = useParams<{ serviceName?: string }>(); const { - urlParams: { environment, kuery, start, end, transactionName }, + urlParams: { + environment, + kuery, + start, + end, + transactionName, + comparisonEnabled, + comparisonType, + }, } = useUrlParams(); const { transactionType } = useApmServiceContext(); + const comparisonChartThem = getComparisonChartTheme(theme); + const { comparisonStart, comparisonEnd } = getTimeRangeComparison({ + start, + end, + comparisonType, + }); - const { data, status } = useFetcher( + const { data = INITIAL_STATE, status } = useFetcher( (callApmApi) => { if (transactionType && serviceName && start && end) { return callApmApi({ @@ -53,6 +87,8 @@ export function TransactionErrorRateChart({ end, transactionType, transactionName, + comparisonStart, + comparisonEnd, }, }, }); @@ -66,10 +102,34 @@ export function TransactionErrorRateChart({ end, transactionType, transactionName, + comparisonStart, + comparisonEnd, ] ); - const errorRates = data?.transactionErrorRate || []; + const timeseries = [ + { + data: data.currentPeriod.transactionErrorRate, + type: 'linemark', + color: theme.eui.euiColorVis7, + title: i18n.translate('xpack.apm.errorRate.chart.errorRate', { + defaultMessage: 'Error rate (avg.)', + }), + }, + ...(comparisonEnabled + ? [ + { + data: data.previousPeriod.transactionErrorRate, + type: 'area', + color: theme.eui.euiColorLightestShade, + title: i18n.translate( + 'xpack.apm.errorRate.chart.errorRate.previousPeriodLabel', + { defaultMessage: 'Previous period' } + ), + }, + ] + : []), + ]; return ( @@ -85,18 +145,10 @@ export function TransactionErrorRateChart({ height={height} showAnnotations={showAnnotations} fetchStatus={status} - timeseries={[ - { - data: errorRates, - type: 'linemark', - color: theme.eui.euiColorVis7, - title: i18n.translate('xpack.apm.errorRate.chart.errorRate', { - defaultMessage: 'Error rate (avg.)', - }), - }, - ]} + timeseries={timeseries} yLabelFormat={yLabelFormat} yDomain={{ min: 0, max: 1 }} + customTheme={comparisonChartThem} /> ); diff --git a/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts b/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts index a6e7832bf697d..7da3ce772ef5f 100644 --- a/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts +++ b/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts @@ -106,11 +106,14 @@ async function getErrorStats({ searchAggregatedTransactions: boolean; }) { return withApmSpan('get_error_rate_for_service_map_node', async () => { + const { start, end } = setup; const { noHits, average } = await getErrorRate({ environment, setup, serviceName, searchAggregatedTransactions, + start, + end, }); return { avgErrorRate: noHits ? null : average }; diff --git a/x-pack/plugins/apm/server/lib/services/get_service_error_groups/get_service_error_group_comparison_statistics.ts b/x-pack/plugins/apm/server/lib/services/get_service_error_groups/get_service_error_group_comparison_statistics.ts index e33044bff8ffa..b559f55bbe78e 100644 --- a/x-pack/plugins/apm/server/lib/services/get_service_error_groups/get_service_error_group_comparison_statistics.ts +++ b/x-pack/plugins/apm/server/lib/services/get_service_error_groups/get_service_error_group_comparison_statistics.ts @@ -5,6 +5,7 @@ * 2.0. */ import { keyBy } from 'lodash'; +import { Coordinate } from '../../../../typings/timeseries'; import { ERROR_GROUP_ID, SERVICE_NAME, @@ -16,6 +17,7 @@ import { rangeQuery, kqlQuery, } from '../../../../server/utils/queries'; +import { offsetPreviousPeriodCoordinates } from '../../../utils/offset_previous_period_coordinate'; import { withApmSpan } from '../../../utils/with_apm_span'; import { getBucketSize } from '../../helpers/get_bucket_size'; import { Setup, SetupTimeRange } from '../../helpers/setup_request'; @@ -28,19 +30,23 @@ export async function getServiceErrorGroupComparisonStatistics({ transactionType, groupIds, environment, + start, + end, }: { kuery?: string; serviceName: string; - setup: Setup & SetupTimeRange; + setup: Setup; numBuckets: number; transactionType: string; groupIds: string[]; environment?: string; -}) { + start: number; + end: number; +}): Promise> { return withApmSpan( 'get_service_error_group_comparison_statistics', async () => { - const { apmEventClient, start, end } = setup; + const { apmEventClient } = setup; const { intervalString } = getBucketSize({ start, end, numBuckets }); @@ -87,10 +93,10 @@ export async function getServiceErrorGroupComparisonStatistics({ }); if (!timeseriesResponse.aggregations) { - return {}; + return []; } - const groups = timeseriesResponse.aggregations.error_groups.buckets.map( + return timeseriesResponse.aggregations.error_groups.buckets.map( (bucket) => { const groupId = bucket.key as string; return { @@ -104,8 +110,76 @@ export async function getServiceErrorGroupComparisonStatistics({ }; } ); - - return keyBy(groups, 'groupId'); } ); } + +export async function getServiceErrorGroupPeriods({ + kuery, + serviceName, + setup, + numBuckets, + transactionType, + groupIds, + environment, + comparisonStart, + comparisonEnd, +}: { + kuery?: string; + serviceName: string; + setup: Setup & SetupTimeRange; + numBuckets: number; + transactionType: string; + groupIds: string[]; + environment?: string; + comparisonStart?: number; + comparisonEnd?: number; +}) { + const { start, end } = setup; + + const commonProps = { + environment, + kuery, + serviceName, + setup, + numBuckets, + transactionType, + groupIds, + }; + + const currentPeriodPromise = getServiceErrorGroupComparisonStatistics({ + ...commonProps, + start, + end, + }); + + const previousPeriodPromise = + comparisonStart && comparisonEnd + ? getServiceErrorGroupComparisonStatistics({ + ...commonProps, + start: comparisonStart, + end: comparisonEnd, + }) + : []; + + const [currentPeriod, previousPeriod] = await Promise.all([ + currentPeriodPromise, + previousPeriodPromise, + ]); + + const firtCurrentPeriod = currentPeriod.length ? currentPeriod[0] : undefined; + + return { + currentPeriod: keyBy(currentPeriod, 'groupId'), + previousPeriod: keyBy( + previousPeriod.map((errorRateGroup) => ({ + ...errorRateGroup, + timeseries: offsetPreviousPeriodCoordinates({ + currentPeriodTimeseries: firtCurrentPeriod?.timeseries, + previousPeriodTimeseries: errorRateGroup.timeseries, + }), + })), + 'groupId' + ), + }; +} diff --git a/x-pack/plugins/apm/server/lib/transaction_groups/get_error_rate.ts b/x-pack/plugins/apm/server/lib/transaction_groups/get_error_rate.ts index 627086df9d681..ec5dd1308cb7e 100644 --- a/x-pack/plugins/apm/server/lib/transaction_groups/get_error_rate.ts +++ b/x-pack/plugins/apm/server/lib/transaction_groups/get_error_rate.ts @@ -31,6 +31,7 @@ import { getTransactionErrorRateTimeSeries, } from '../helpers/transaction_error_rate'; import { withApmSpan } from '../../utils/with_apm_span'; +import { offsetPreviousPeriodCoordinates } from '../../utils/offset_previous_period_coordinate'; export async function getErrorRate({ environment, @@ -40,21 +41,25 @@ export async function getErrorRate({ transactionName, setup, searchAggregatedTransactions, + start, + end, }: { environment?: string; kuery?: string; serviceName: string; transactionType?: string; transactionName?: string; - setup: Setup & SetupTimeRange; + setup: Setup; searchAggregatedTransactions: boolean; + start: number; + end: number; }): Promise<{ noHits: boolean; transactionErrorRate: Coordinate[]; average: number | null; }> { return withApmSpan('get_transaction_group_error_rate', async () => { - const { start, end, apmEventClient } = setup; + const { apmEventClient } = setup; const transactionNamefilter = transactionName ? [{ term: { [TRANSACTION_NAME]: transactionName } }] @@ -129,3 +134,67 @@ export async function getErrorRate({ return { noHits, transactionErrorRate, average }; }); } + +export async function getErrorRatePeriods({ + environment, + kuery, + serviceName, + transactionType, + transactionName, + setup, + searchAggregatedTransactions, + comparisonStart, + comparisonEnd, +}: { + environment?: string; + kuery?: string; + serviceName: string; + transactionType?: string; + transactionName?: string; + setup: Setup & SetupTimeRange; + searchAggregatedTransactions: boolean; + comparisonStart?: number; + comparisonEnd?: number; +}) { + const { start, end } = setup; + const commonProps = { + environment, + kuery, + serviceName, + transactionType, + transactionName, + setup, + searchAggregatedTransactions, + }; + + const currentPeriodPromise = getErrorRate({ ...commonProps, start, end }); + + const previousPeriodPromise = + comparisonStart && comparisonEnd + ? getErrorRate({ + ...commonProps, + start: comparisonStart, + end: comparisonEnd, + }) + : { noHits: true, transactionErrorRate: [], average: null }; + + const [currentPeriod, previousPeriod] = await Promise.all([ + currentPeriodPromise, + previousPeriodPromise, + ]); + + const firtCurrentPeriod = currentPeriod.transactionErrorRate.length + ? currentPeriod.transactionErrorRate + : undefined; + + return { + currentPeriod, + previousPeriod: { + ...previousPeriod, + transactionErrorRate: offsetPreviousPeriodCoordinates({ + currentPeriodTimeseries: firtCurrentPeriod, + previousPeriodTimeseries: previousPeriod.transactionErrorRate, + }), + }, + }; +} diff --git a/x-pack/plugins/apm/server/routes/services.ts b/x-pack/plugins/apm/server/routes/services.ts index a84c8dc274248..bac970416792b 100644 --- a/x-pack/plugins/apm/server/routes/services.ts +++ b/x-pack/plugins/apm/server/routes/services.ts @@ -17,7 +17,7 @@ import { getServices } from '../lib/services/get_services'; import { getServiceAgentName } from '../lib/services/get_service_agent_name'; import { getServiceDependencies } from '../lib/services/get_service_dependencies'; import { getServiceErrorGroupPrimaryStatistics } from '../lib/services/get_service_error_groups/get_service_error_group_primary_statistics'; -import { getServiceErrorGroupComparisonStatistics } from '../lib/services/get_service_error_groups/get_service_error_group_comparison_statistics'; +import { getServiceErrorGroupPeriods } from '../lib/services/get_service_error_groups/get_service_error_group_comparison_statistics'; import { getServiceInstances } from '../lib/services/get_service_instances'; import { getServiceMetadataDetails } from '../lib/services/get_service_metadata_details'; import { getServiceMetadataIcons } from '../lib/services/get_service_metadata_icons'; @@ -329,6 +329,7 @@ export const serviceErrorGroupsComparisonStatisticsRoute = createRoute({ environmentRt, kueryRt, rangeRt, + comparisonRangeRt, t.type({ numBuckets: toNumberRt, transactionType: t.string, @@ -342,10 +343,18 @@ export const serviceErrorGroupsComparisonStatisticsRoute = createRoute({ const { path: { serviceName }, - query: { environment, kuery, numBuckets, transactionType, groupIds }, + query: { + environment, + kuery, + numBuckets, + transactionType, + groupIds, + comparisonStart, + comparisonEnd, + }, } = context.params; - return getServiceErrorGroupComparisonStatistics({ + return getServiceErrorGroupPeriods({ environment, kuery, serviceName, @@ -353,6 +362,8 @@ export const serviceErrorGroupsComparisonStatisticsRoute = createRoute({ numBuckets, transactionType, groupIds, + comparisonStart, + comparisonEnd, }); }, }); diff --git a/x-pack/plugins/apm/server/routes/transactions.ts b/x-pack/plugins/apm/server/routes/transactions.ts index 1571efb373cc9..f3424a252e409 100644 --- a/x-pack/plugins/apm/server/routes/transactions.ts +++ b/x-pack/plugins/apm/server/routes/transactions.ts @@ -22,7 +22,7 @@ import { getAnomalySeries } from '../lib/transactions/get_anomaly_data'; import { getLatencyPeriods } from '../lib/transactions/get_latency_charts'; import { getThroughputCharts } from '../lib/transactions/get_throughput_charts'; import { getTransactionGroupList } from '../lib/transaction_groups'; -import { getErrorRate } from '../lib/transaction_groups/get_error_rate'; +import { getErrorRatePeriods } from '../lib/transaction_groups/get_error_rate'; import { createRoute } from './create_route'; import { comparisonRangeRt, @@ -380,11 +380,9 @@ export const transactionChartsErrorRateRoute = createRoute({ serviceName: t.string, }), query: t.intersection([ - environmentRt, - kueryRt, - rangeRt, t.type({ transactionType: t.string }), t.partial({ transactionName: t.string }), + t.intersection([environmentRt, kueryRt, rangeRt, comparisonRangeRt]), ]), }), options: { tags: ['access:apm'] }, @@ -397,13 +395,15 @@ export const transactionChartsErrorRateRoute = createRoute({ kuery, transactionType, transactionName, + comparisonStart, + comparisonEnd, } = params.query; const searchAggregatedTransactions = await getSearchAggregatedTransactions( setup ); - return getErrorRate({ + return getErrorRatePeriods({ environment, kuery, serviceName, @@ -411,6 +411,8 @@ export const transactionChartsErrorRateRoute = createRoute({ transactionName, setup, searchAggregatedTransactions, + comparisonStart, + comparisonEnd, }); }, }); diff --git a/x-pack/test/apm_api_integration/tests/services/__snapshots__/error_groups_comparison_statistics.snap b/x-pack/test/apm_api_integration/tests/services/__snapshots__/error_groups_comparison_statistics.snap index a536a6de67ff3..31bc29a2476ca 100644 --- a/x-pack/test/apm_api_integration/tests/services/__snapshots__/error_groups_comparison_statistics.snap +++ b/x-pack/test/apm_api_integration/tests/services/__snapshots__/error_groups_comparison_statistics.snap @@ -131,3 +131,75 @@ Object { ], } `; + +exports[`APM API tests basic apm_8.0.0 Error groups comparison statistics when data is loaded with previous data returns the correct data returns correct timeseries 1`] = ` +Object { + "groupId": "051f95eabf120ebe2f8b0399fe3e54c5", + "timeseries": Array [ + Object { + "x": 1607436720000, + "y": 0, + }, + Object { + "x": 1607436780000, + "y": 0, + }, + Object { + "x": 1607436840000, + "y": 0, + }, + Object { + "x": 1607436900000, + "y": 0, + }, + Object { + "x": 1607436960000, + "y": 0, + }, + Object { + "x": 1607437020000, + "y": 0, + }, + Object { + "x": 1607437080000, + "y": 0, + }, + Object { + "x": 1607437140000, + "y": 0, + }, + Object { + "x": 1607437200000, + "y": 2, + }, + Object { + "x": 1607437260000, + "y": 0, + }, + Object { + "x": 1607437320000, + "y": 1, + }, + Object { + "x": 1607437380000, + "y": 0, + }, + Object { + "x": 1607437440000, + "y": 0, + }, + Object { + "x": 1607437500000, + "y": 0, + }, + Object { + "x": 1607437560000, + "y": 0, + }, + Object { + "x": 1607437620000, + "y": 0, + }, + ], +} +`; diff --git a/x-pack/test/apm_api_integration/tests/services/error_groups_comparison_statistics.ts b/x-pack/test/apm_api_integration/tests/services/error_groups_comparison_statistics.ts index 4a19efac5a809..821d0515aa808 100644 --- a/x-pack/test/apm_api_integration/tests/services/error_groups_comparison_statistics.ts +++ b/x-pack/test/apm_api_integration/tests/services/error_groups_comparison_statistics.ts @@ -7,6 +7,7 @@ import url from 'url'; import expect from '@kbn/expect'; +import moment from 'moment'; import archives_metadata from '../../common/fixtures/es_archiver/archives_metadata'; import { FtrProviderContext } from '../../common/ftr_provider_context'; import { registry } from '../../common/registry'; @@ -45,8 +46,9 @@ export default function ApiTest({ getService }: FtrProviderContext) { }, }) ); + expect(response.status).to.be(200); - expect(response.body).to.empty(); + expect(response.body).to.be.eql({ currentPeriod: {}, previousPeriod: {} }); }); } ); @@ -72,20 +74,23 @@ export default function ApiTest({ getService }: FtrProviderContext) { expect(response.status).to.be(200); const errorGroupsComparisonStatistics = response.body as ErrorGroupsComparisonStatistics; - expect(Object.keys(errorGroupsComparisonStatistics).sort()).to.eql(groupIds.sort()); + expect(Object.keys(errorGroupsComparisonStatistics.currentPeriod).sort()).to.eql( + groupIds.sort() + ); groupIds.forEach((groupId) => { - expect(errorGroupsComparisonStatistics[groupId]).not.to.be.empty(); + expect(errorGroupsComparisonStatistics.currentPeriod[groupId]).not.to.be.empty(); }); - const errorgroupsComparisonStatistics = errorGroupsComparisonStatistics[groupIds[0]]; + const errorgroupsComparisonStatistics = + errorGroupsComparisonStatistics.currentPeriod[groupIds[0]]; expect( - errorgroupsComparisonStatistics.timeseries.map(({ y }) => isFinite(y)).length + errorgroupsComparisonStatistics.timeseries.map(({ y }) => y && isFinite(y)).length ).to.be.greaterThan(0); expectSnapshot(errorgroupsComparisonStatistics).toMatch(); }); - it('returns an empty list when requested groupIds are not available in the given time range', async () => { + it('returns an empty state when requested groupIds are not available in the given time range', async () => { const response = await supertest.get( url.format({ pathname: `/api/apm/services/opbeans-java/error_groups/comparison_statistics`, @@ -100,7 +105,82 @@ export default function ApiTest({ getService }: FtrProviderContext) { ); expect(response.status).to.be(200); - expect(response.body).to.empty(); + expect(response.body).to.be.eql({ currentPeriod: {}, previousPeriod: {} }); + }); + } + ); + + registry.when( + 'Error groups comparison statistics when data is loaded with previous data', + { config: 'basic', archives: [archiveName] }, + () => { + describe('returns the correct data', async () => { + let response: { + status: number; + body: ErrorGroupsComparisonStatistics; + }; + before(async () => { + response = await supertest.get( + url.format({ + pathname: `/api/apm/services/opbeans-java/error_groups/comparison_statistics`, + query: { + numBuckets: 20, + transactionType: 'request', + groupIds: JSON.stringify(groupIds), + start: moment(end).subtract(15, 'minutes').toISOString(), + end, + comparisonStart: start, + comparisonEnd: moment(start).add(15, 'minutes').toISOString(), + }, + }) + ); + + expect(response.status).to.be(200); + }); + + it('returns correct timeseries', () => { + const errorGroupsComparisonStatistics = response.body as ErrorGroupsComparisonStatistics; + const errorgroupsComparisonStatistics = + errorGroupsComparisonStatistics.currentPeriod[groupIds[0]]; + expect( + errorgroupsComparisonStatistics.timeseries.map(({ y }) => y && isFinite(y)).length + ).to.be.greaterThan(0); + expectSnapshot(errorgroupsComparisonStatistics).toMatch(); + }); + + it('matches x-axis on current period and previous period', () => { + const errorGroupsComparisonStatistics = response.body as ErrorGroupsComparisonStatistics; + + const currentPeriodItems = Object.values(errorGroupsComparisonStatistics.currentPeriod); + const previousPeriodItems = Object.values(errorGroupsComparisonStatistics.previousPeriod); + + const currentPeriodFirstItem = currentPeriodItems[0]; + const previousPeriodFirstItem = previousPeriodItems[0]; + + expect(currentPeriodFirstItem.timeseries.map(({ x }) => x)).to.be.eql( + previousPeriodFirstItem.timeseries.map(({ x }) => x) + ); + }); + }); + + it('returns an empty state when requested groupIds are not available in the given time range', async () => { + const response = await supertest.get( + url.format({ + pathname: `/api/apm/services/opbeans-java/error_groups/comparison_statistics`, + query: { + numBuckets: 20, + transactionType: 'request', + groupIds: JSON.stringify(['foo']), + start: moment(end).subtract(15, 'minutes').toISOString(), + end, + comparisonStart: start, + comparisonEnd: moment(start).add(15, 'minutes').toISOString(), + }, + }) + ); + + expect(response.status).to.be(200); + expect(response.body).to.be.eql({ currentPeriod: {}, previousPeriod: {} }); }); } ); diff --git a/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/error_rate.snap b/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/error_rate.snap index d97d39cda1b8d..7ec68bbc0a9fd 100644 --- a/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/error_rate.snap +++ b/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/error_rate.snap @@ -248,3 +248,741 @@ Array [ }, ] `; + +exports[`APM API tests basic apm_8.0.0 Error rate when data is loaded returns the transaction error rate with comparison data has the correct error rate 1`] = ` +Array [ + Object { + "x": 1607436770000, + "y": null, + }, + Object { + "x": 1607436780000, + "y": null, + }, + Object { + "x": 1607436790000, + "y": null, + }, + Object { + "x": 1607436800000, + "y": null, + }, + Object { + "x": 1607436810000, + "y": null, + }, + Object { + "x": 1607436820000, + "y": 0, + }, + Object { + "x": 1607436830000, + "y": null, + }, + Object { + "x": 1607436840000, + "y": null, + }, + Object { + "x": 1607436850000, + "y": null, + }, + Object { + "x": 1607436860000, + "y": 1, + }, + Object { + "x": 1607436870000, + "y": 0, + }, + Object { + "x": 1607436880000, + "y": 0, + }, + Object { + "x": 1607436890000, + "y": null, + }, + Object { + "x": 1607436900000, + "y": null, + }, + Object { + "x": 1607436910000, + "y": null, + }, + Object { + "x": 1607436920000, + "y": null, + }, + Object { + "x": 1607436930000, + "y": null, + }, + Object { + "x": 1607436940000, + "y": null, + }, + Object { + "x": 1607436950000, + "y": null, + }, + Object { + "x": 1607436960000, + "y": null, + }, + Object { + "x": 1607436970000, + "y": null, + }, + Object { + "x": 1607436980000, + "y": 0, + }, + Object { + "x": 1607436990000, + "y": 0, + }, + Object { + "x": 1607437000000, + "y": 0, + }, + Object { + "x": 1607437010000, + "y": null, + }, + Object { + "x": 1607437020000, + "y": null, + }, + Object { + "x": 1607437030000, + "y": null, + }, + Object { + "x": 1607437040000, + "y": null, + }, + Object { + "x": 1607437050000, + "y": null, + }, + Object { + "x": 1607437060000, + "y": null, + }, + Object { + "x": 1607437070000, + "y": null, + }, + Object { + "x": 1607437080000, + "y": null, + }, + Object { + "x": 1607437090000, + "y": null, + }, + Object { + "x": 1607437100000, + "y": 0, + }, + Object { + "x": 1607437110000, + "y": 0, + }, + Object { + "x": 1607437120000, + "y": null, + }, + Object { + "x": 1607437130000, + "y": null, + }, + Object { + "x": 1607437140000, + "y": null, + }, + Object { + "x": 1607437150000, + "y": null, + }, + Object { + "x": 1607437160000, + "y": null, + }, + Object { + "x": 1607437170000, + "y": null, + }, + Object { + "x": 1607437180000, + "y": null, + }, + Object { + "x": 1607437190000, + "y": null, + }, + Object { + "x": 1607437200000, + "y": null, + }, + Object { + "x": 1607437210000, + "y": null, + }, + Object { + "x": 1607437220000, + "y": 0, + }, + Object { + "x": 1607437230000, + "y": 0.6, + }, + Object { + "x": 1607437240000, + "y": 0, + }, + Object { + "x": 1607437250000, + "y": null, + }, + Object { + "x": 1607437260000, + "y": null, + }, + Object { + "x": 1607437270000, + "y": 0, + }, + Object { + "x": 1607437280000, + "y": null, + }, + Object { + "x": 1607437290000, + "y": null, + }, + Object { + "x": 1607437300000, + "y": null, + }, + Object { + "x": 1607437310000, + "y": null, + }, + Object { + "x": 1607437320000, + "y": null, + }, + Object { + "x": 1607437330000, + "y": null, + }, + Object { + "x": 1607437340000, + "y": 0, + }, + Object { + "x": 1607437350000, + "y": null, + }, + Object { + "x": 1607437360000, + "y": 0.5, + }, + Object { + "x": 1607437370000, + "y": null, + }, + Object { + "x": 1607437380000, + "y": null, + }, + Object { + "x": 1607437390000, + "y": null, + }, + Object { + "x": 1607437400000, + "y": null, + }, + Object { + "x": 1607437410000, + "y": null, + }, + Object { + "x": 1607437420000, + "y": null, + }, + Object { + "x": 1607437430000, + "y": null, + }, + Object { + "x": 1607437440000, + "y": null, + }, + Object { + "x": 1607437450000, + "y": null, + }, + Object { + "x": 1607437460000, + "y": 1, + }, + Object { + "x": 1607437470000, + "y": 0, + }, + Object { + "x": 1607437480000, + "y": 1, + }, + Object { + "x": 1607437490000, + "y": null, + }, + Object { + "x": 1607437500000, + "y": null, + }, + Object { + "x": 1607437510000, + "y": null, + }, + Object { + "x": 1607437520000, + "y": null, + }, + Object { + "x": 1607437530000, + "y": null, + }, + Object { + "x": 1607437540000, + "y": null, + }, + Object { + "x": 1607437550000, + "y": null, + }, + Object { + "x": 1607437560000, + "y": null, + }, + Object { + "x": 1607437570000, + "y": 0, + }, + Object { + "x": 1607437580000, + "y": null, + }, + Object { + "x": 1607437590000, + "y": null, + }, + Object { + "x": 1607437600000, + "y": null, + }, + Object { + "x": 1607437610000, + "y": null, + }, + Object { + "x": 1607437620000, + "y": null, + }, + Object { + "x": 1607437630000, + "y": null, + }, + Object { + "x": 1607437640000, + "y": null, + }, + Object { + "x": 1607437650000, + "y": null, + }, + Object { + "x": 1607437660000, + "y": null, + }, + Object { + "x": 1607437670000, + "y": null, + }, +] +`; + +exports[`APM API tests basic apm_8.0.0 Error rate when data is loaded returns the transaction error rate with comparison data has the correct error rate 2`] = ` +Array [ + Object { + "x": 1607436770000, + "y": null, + }, + Object { + "x": 1607436780000, + "y": null, + }, + Object { + "x": 1607436790000, + "y": null, + }, + Object { + "x": 1607436800000, + "y": 0, + }, + Object { + "x": 1607436810000, + "y": null, + }, + Object { + "x": 1607436820000, + "y": null, + }, + Object { + "x": 1607436830000, + "y": null, + }, + Object { + "x": 1607436840000, + "y": 0, + }, + Object { + "x": 1607436850000, + "y": null, + }, + Object { + "x": 1607436860000, + "y": null, + }, + Object { + "x": 1607436870000, + "y": null, + }, + Object { + "x": 1607436880000, + "y": null, + }, + Object { + "x": 1607436890000, + "y": null, + }, + Object { + "x": 1607436900000, + "y": null, + }, + Object { + "x": 1607436910000, + "y": 0, + }, + Object { + "x": 1607436920000, + "y": 0, + }, + Object { + "x": 1607436930000, + "y": 0, + }, + Object { + "x": 1607436940000, + "y": null, + }, + Object { + "x": 1607436950000, + "y": null, + }, + Object { + "x": 1607436960000, + "y": null, + }, + Object { + "x": 1607436970000, + "y": null, + }, + Object { + "x": 1607436980000, + "y": null, + }, + Object { + "x": 1607436990000, + "y": null, + }, + Object { + "x": 1607437000000, + "y": null, + }, + Object { + "x": 1607437010000, + "y": null, + }, + Object { + "x": 1607437020000, + "y": null, + }, + Object { + "x": 1607437030000, + "y": 0, + }, + Object { + "x": 1607437040000, + "y": 0, + }, + Object { + "x": 1607437050000, + "y": null, + }, + Object { + "x": 1607437060000, + "y": null, + }, + Object { + "x": 1607437070000, + "y": null, + }, + Object { + "x": 1607437080000, + "y": null, + }, + Object { + "x": 1607437090000, + "y": null, + }, + Object { + "x": 1607437100000, + "y": null, + }, + Object { + "x": 1607437110000, + "y": null, + }, + Object { + "x": 1607437120000, + "y": null, + }, + Object { + "x": 1607437130000, + "y": null, + }, + Object { + "x": 1607437140000, + "y": null, + }, + Object { + "x": 1607437150000, + "y": null, + }, + Object { + "x": 1607437160000, + "y": 0, + }, + Object { + "x": 1607437170000, + "y": null, + }, + Object { + "x": 1607437180000, + "y": null, + }, + Object { + "x": 1607437190000, + "y": null, + }, + Object { + "x": 1607437200000, + "y": null, + }, + Object { + "x": 1607437210000, + "y": null, + }, + Object { + "x": 1607437220000, + "y": null, + }, + Object { + "x": 1607437230000, + "y": null, + }, + Object { + "x": 1607437240000, + "y": 1, + }, + Object { + "x": 1607437250000, + "y": null, + }, + Object { + "x": 1607437260000, + "y": null, + }, + Object { + "x": 1607437270000, + "y": null, + }, + Object { + "x": 1607437280000, + "y": 0, + }, + Object { + "x": 1607437290000, + "y": 0, + }, + Object { + "x": 1607437300000, + "y": null, + }, + Object { + "x": 1607437310000, + "y": null, + }, + Object { + "x": 1607437320000, + "y": null, + }, + Object { + "x": 1607437330000, + "y": null, + }, + Object { + "x": 1607437340000, + "y": null, + }, + Object { + "x": 1607437350000, + "y": null, + }, + Object { + "x": 1607437360000, + "y": null, + }, + Object { + "x": 1607437370000, + "y": null, + }, + Object { + "x": 1607437380000, + "y": null, + }, + Object { + "x": 1607437390000, + "y": null, + }, + Object { + "x": 1607437400000, + "y": 0, + }, + Object { + "x": 1607437410000, + "y": 0, + }, + Object { + "x": 1607437420000, + "y": 0.25, + }, + Object { + "x": 1607437430000, + "y": null, + }, + Object { + "x": 1607437440000, + "y": null, + }, + Object { + "x": 1607437450000, + "y": null, + }, + Object { + "x": 1607437460000, + "y": null, + }, + Object { + "x": 1607437470000, + "y": null, + }, + Object { + "x": 1607437480000, + "y": null, + }, + Object { + "x": 1607437490000, + "y": null, + }, + Object { + "x": 1607437500000, + "y": null, + }, + Object { + "x": 1607437510000, + "y": null, + }, + Object { + "x": 1607437520000, + "y": 0.5, + }, + Object { + "x": 1607437530000, + "y": 0.2, + }, + Object { + "x": 1607437540000, + "y": 0, + }, + Object { + "x": 1607437550000, + "y": null, + }, + Object { + "x": 1607437560000, + "y": null, + }, + Object { + "x": 1607437570000, + "y": null, + }, + Object { + "x": 1607437580000, + "y": null, + }, + Object { + "x": 1607437590000, + "y": null, + }, + Object { + "x": 1607437600000, + "y": null, + }, + Object { + "x": 1607437610000, + "y": null, + }, + Object { + "x": 1607437620000, + "y": null, + }, + Object { + "x": 1607437630000, + "y": null, + }, + Object { + "x": 1607437640000, + "y": null, + }, + Object { + "x": 1607437650000, + "y": 1, + }, + Object { + "x": 1607437660000, + "y": 0, + }, + Object { + "x": 1607437670000, + "y": null, + }, +] +`; diff --git a/x-pack/test/apm_api_integration/tests/transactions/error_rate.ts b/x-pack/test/apm_api_integration/tests/transactions/error_rate.ts index 2b94816466aa7..ce16ad2c96c3b 100644 --- a/x-pack/test/apm_api_integration/tests/transactions/error_rate.ts +++ b/x-pack/test/apm_api_integration/tests/transactions/error_rate.ts @@ -8,10 +8,14 @@ import expect from '@kbn/expect'; import { first, last } from 'lodash'; import { format } from 'url'; +import moment from 'moment'; +import { APIReturnType } from '../../../../plugins/apm/public/services/rest/createCallApmApi'; import archives_metadata from '../../common/fixtures/es_archiver/archives_metadata'; import { FtrProviderContext } from '../../common/ftr_provider_context'; import { registry } from '../../common/registry'; +type ErrorRate = APIReturnType<'GET /api/apm/services/{serviceName}/transactions/charts/error_rate'>; + export default function ApiTest({ getService }: FtrProviderContext) { const supertest = getService('supertest'); @@ -21,20 +25,43 @@ export default function ApiTest({ getService }: FtrProviderContext) { const { start, end } = archives_metadata[archiveName]; const transactionType = 'request'; - const url = format({ - pathname: '/api/apm/services/opbeans-java/transactions/charts/error_rate', - query: { start, end, transactionType }, - }); - registry.when('Error rate when data is not loaded', { config: 'basic', archives: [] }, () => { it('handles the empty state', async () => { - const response = await supertest.get(url); + const response = await supertest.get( + format({ + pathname: '/api/apm/services/opbeans-java/transactions/charts/error_rate', + query: { start, end, transactionType }, + }) + ); expect(response.status).to.be(200); - expect(response.body.noHits).to.be(true); + const body = response.body as ErrorRate; + expect(body).to.be.eql({ + currentPeriod: { noHits: true, transactionErrorRate: [], average: null }, + previousPeriod: { noHits: true, transactionErrorRate: [], average: null }, + }); + }); + + it('handles the empty state with comparison data', async () => { + const response = await supertest.get( + format({ + pathname: '/api/apm/services/opbeans-java/transactions/charts/error_rate', + query: { + transactionType, + start: moment(end).subtract(15, 'minutes').toISOString(), + end, + comparisonStart: start, + comparisonEnd: moment(start).add(15, 'minutes').toISOString(), + }, + }) + ); + expect(response.status).to.be(200); - expect(response.body.transactionErrorRate.length).to.be(0); - expect(response.body.average).to.be(null); + const body = response.body as ErrorRate; + expect(body).to.be.eql({ + currentPeriod: { noHits: true, transactionErrorRate: [], average: null }, + previousPeriod: { noHits: true, transactionErrorRate: [], average: null }, + }); }); }); @@ -43,22 +70,26 @@ export default function ApiTest({ getService }: FtrProviderContext) { { config: 'basic', archives: [archiveName] }, () => { describe('returns the transaction error rate', () => { - let errorRateResponse: { - transactionErrorRate: Array<{ x: number; y: number | null }>; - average: number; - }; + let errorRateResponse: ErrorRate; before(async () => { - const response = await supertest.get(url); + const response = await supertest.get( + format({ + pathname: '/api/apm/services/opbeans-java/transactions/charts/error_rate', + query: { start, end, transactionType }, + }) + ); errorRateResponse = response.body; }); it('returns some data', () => { - expect(errorRateResponse.average).to.be.greaterThan(0); + expect(errorRateResponse.currentPeriod.average).to.be.greaterThan(0); + expect(errorRateResponse.previousPeriod.average).to.be(null); - expect(errorRateResponse.transactionErrorRate.length).to.be.greaterThan(0); + expect(errorRateResponse.currentPeriod.transactionErrorRate.length).to.be.greaterThan(0); + expect(errorRateResponse.previousPeriod.transactionErrorRate).to.empty(); - const nonNullDataPoints = errorRateResponse.transactionErrorRate.filter( + const nonNullDataPoints = errorRateResponse.currentPeriod.transactionErrorRate.filter( ({ y }) => y !== null ); @@ -67,26 +98,126 @@ export default function ApiTest({ getService }: FtrProviderContext) { it('has the correct start date', () => { expectSnapshot( - new Date(first(errorRateResponse.transactionErrorRate)?.x ?? NaN).toISOString() + new Date( + first(errorRateResponse.currentPeriod.transactionErrorRate)?.x ?? NaN + ).toISOString() ).toMatchInline(`"2020-12-08T13:57:30.000Z"`); }); it('has the correct end date', () => { expectSnapshot( - new Date(last(errorRateResponse.transactionErrorRate)?.x ?? NaN).toISOString() + new Date( + last(errorRateResponse.currentPeriod.transactionErrorRate)?.x ?? NaN + ).toISOString() ).toMatchInline(`"2020-12-08T14:27:30.000Z"`); }); it('has the correct number of buckets', () => { - expectSnapshot(errorRateResponse.transactionErrorRate.length).toMatchInline(`61`); + expectSnapshot(errorRateResponse.currentPeriod.transactionErrorRate.length).toMatchInline( + `61` + ); + }); + + it('has the correct calculation for average', () => { + expectSnapshot(errorRateResponse.currentPeriod.average).toMatchInline(`0.16`); + }); + + it('has the correct error rate', () => { + expectSnapshot(errorRateResponse.currentPeriod.transactionErrorRate).toMatch(); + }); + }); + + describe('returns the transaction error rate with comparison data', () => { + let errorRateResponse: ErrorRate; + + before(async () => { + const response = await supertest.get( + format({ + pathname: '/api/apm/services/opbeans-java/transactions/charts/error_rate', + query: { + transactionType, + start: moment(end).subtract(15, 'minutes').toISOString(), + end, + comparisonStart: start, + comparisonEnd: moment(start).add(15, 'minutes').toISOString(), + }, + }) + ); + errorRateResponse = response.body; + }); + + it('returns some data', () => { + expect(errorRateResponse.currentPeriod.average).to.be.greaterThan(0); + expect(errorRateResponse.previousPeriod.average).to.be.greaterThan(0); + + expect(errorRateResponse.currentPeriod.transactionErrorRate.length).to.be.greaterThan(0); + expect(errorRateResponse.previousPeriod.transactionErrorRate.length).to.be.greaterThan(0); + + const currentPeriodNonNullDataPoints = errorRateResponse.currentPeriod.transactionErrorRate.filter( + ({ y }) => y !== null + ); + + const previousPeriodNonNullDataPoints = errorRateResponse.previousPeriod.transactionErrorRate.filter( + ({ y }) => y !== null + ); + + expect(currentPeriodNonNullDataPoints.length).to.be.greaterThan(0); + expect(previousPeriodNonNullDataPoints.length).to.be.greaterThan(0); + }); + + it('has the correct start date', () => { + expectSnapshot( + new Date( + first(errorRateResponse.currentPeriod.transactionErrorRate)?.x ?? NaN + ).toISOString() + ).toMatchInline(`"2020-12-08T14:12:50.000Z"`); + expectSnapshot( + new Date( + first(errorRateResponse.previousPeriod.transactionErrorRate)?.x ?? NaN + ).toISOString() + ).toMatchInline(`"2020-12-08T14:12:50.000Z"`); + }); + + it('has the correct end date', () => { + expectSnapshot( + new Date( + last(errorRateResponse.currentPeriod.transactionErrorRate)?.x ?? NaN + ).toISOString() + ).toMatchInline(`"2020-12-08T14:27:50.000Z"`); + expectSnapshot( + new Date( + last(errorRateResponse.previousPeriod.transactionErrorRate)?.x ?? NaN + ).toISOString() + ).toMatchInline(`"2020-12-08T14:27:50.000Z"`); + }); + + it('has the correct number of buckets', () => { + expectSnapshot(errorRateResponse.currentPeriod.transactionErrorRate.length).toMatchInline( + `91` + ); + expectSnapshot( + errorRateResponse.previousPeriod.transactionErrorRate.length + ).toMatchInline(`91`); }); it('has the correct calculation for average', () => { - expectSnapshot(errorRateResponse.average).toMatchInline(`0.16`); + expectSnapshot(errorRateResponse.currentPeriod.average).toMatchInline( + `0.233333333333333` + ); + expectSnapshot(errorRateResponse.previousPeriod.average).toMatchInline( + `0.111111111111111` + ); }); it('has the correct error rate', () => { - expectSnapshot(errorRateResponse.transactionErrorRate).toMatch(); + expectSnapshot(errorRateResponse.currentPeriod.transactionErrorRate).toMatch(); + expectSnapshot(errorRateResponse.previousPeriod.transactionErrorRate).toMatch(); + }); + + it('matches x-axis on current period and previous period', () => { + expect(errorRateResponse.currentPeriod.transactionErrorRate.map(({ x }) => x)).to.be.eql( + errorRateResponse.previousPeriod.transactionErrorRate.map(({ x }) => x) + ); }); }); } From b71c6092c9316135131ae2e66ff175a0651c6f86 Mon Sep 17 00:00:00 2001 From: Gabriel Landau <42078554+gabriellandau@users.noreply.github.com> Date: Tue, 16 Mar 2021 10:00:54 -0400 Subject: [PATCH 12/24] Add bytes_compressed_present to Endpoint Security Telemetry (#94594) --- x-pack/plugins/security_solution/server/lib/telemetry/sender.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts b/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts index e169c036419c5..114cf5d2d3425 100644 --- a/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts +++ b/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts @@ -407,6 +407,7 @@ const allowlistEventFields: AllowlistFields = { bytes_address: true, bytes_allocation_offset: true, bytes_compressed: true, + bytes_compressed_present: true, mapped_pe: { Ext: { code_signature: { From ee84e0b0b709d01c08ae42daa08b20c197f7b2a7 Mon Sep 17 00:00:00 2001 From: Mikhail Shustov Date: Tue, 16 Mar 2021 15:13:49 +0100 Subject: [PATCH 13/24] Merge tsconfig and x-pack/tsconfig files (#94519) * merge all the typings at root level * merge x-pack/tsconfig into tsconfig.json * fix tsconfig after changes in master * remove unnecessary typings * update paths to the global typings * update paths to the global elaticsearch typings * fix import * fix path to typings/elasticsearch in fleet plugin * remove file deleted from master * fix lint errors --- src/dev/typescript/projects.ts | 1 - test/tsconfig.json | 5 +- test/typings/rison_node.d.ts | 28 ----- tsconfig.json | 81 +++++++++++- .../cytoscape_dagre.d.ts | 12 +- .../elasticsearch/aggregations.d.ts | 5 +- .../elasticsearch/index.d.ts | 5 +- {x-pack/typings => typings}/global_fetch.d.ts | 5 +- typings/index.d.ts | 2 + .../typings => typings}/js_levenshtein.d.ts | 5 +- {x-pack/typings => typings}/react_vis.d.ts | 5 +- .../examples/alerting_example/tsconfig.json | 2 +- .../embedded_lens_example/tsconfig.json | 2 +- .../tsconfig.json | 2 +- .../shared/KueryBar/get_bool_filter.ts | 2 +- .../plugins/apm/public/utils/testHelpers.tsx | 2 +- .../apm/scripts/shared/get_es_client.ts | 2 +- .../server/lib/alerts/alerting_es_client.ts | 2 +- .../chart_preview/get_transaction_duration.ts | 2 +- .../collect_data_telemetry/index.ts | 2 +- .../collect_data_telemetry/tasks.ts | 2 +- .../index.ts | 4 +- .../get_duration_for_percentile.ts | 2 +- .../get_latency_distribution.ts | 4 +- .../get_max_latency.ts | 2 +- .../index.ts | 4 +- .../process_significant_term_aggs.ts | 2 +- .../lib/errors/distribution/get_buckets.ts | 2 +- .../apm/server/lib/errors/get_error_groups.ts | 2 +- .../add_filter_to_exclude_legacy_data.ts | 2 +- .../create_apm_event_client/index.ts | 2 +- .../unpack_processor_events.ts | 2 +- .../create_internal_es_client/index.ts | 2 +- .../lib/helpers/transaction_error_rate.ts | 2 +- .../metrics/fetch_and_transform_metrics.ts | 2 +- .../lib/metrics/transform_metrics_chart.ts | 2 +- .../rum_client/ui_filters/get_es_filter.ts | 2 +- .../lib/service_map/get_service_anomalies.ts | 2 +- .../get_service_map_service_node_info.ts | 2 +- .../lib/service_map/get_trace_sample_ids.ts | 2 +- .../get_derived_service_annotations.ts | 2 +- .../annotations/get_stored_annotations.ts | 2 +- .../lib/services/annotations/index.test.ts | 2 +- ...et_service_instance_system_metric_stats.ts | 2 +- .../services/get_service_metadata_details.ts | 2 +- .../apm/server/lib/services/get_throughput.ts | 2 +- .../get_service_profiling_statistics.ts | 2 +- .../convert_settings_to_string.ts | 2 +- .../find_exact_configuration.ts | 2 +- .../search_configurations.ts | 2 +- .../server/lib/transaction_groups/fetcher.ts | 2 +- .../get_transaction_group_stats.ts | 2 +- .../transactions/get_anomaly_data/fetcher.ts | 2 +- .../transactions/get_latency_charts/index.ts | 2 +- .../get_throughput_charts/index.ts | 2 +- .../plugins/apm/server/projections/typings.ts | 2 +- .../util/merge_projection/index.ts | 2 +- x-pack/plugins/apm/server/utils/queries.ts | 2 +- .../plugins/apm/server/utils/test_helpers.tsx | 2 +- x-pack/plugins/apm/tsconfig.json | 2 +- .../fleet/server/services/agents/crud.ts | 2 +- .../fleet/server/services/agents/helpers.ts | 2 +- .../services/api_keys/enrollment_api_key.ts | 2 +- .../server/services/artifacts/artifacts.ts | 2 +- .../server/services/artifacts/mappings.ts | 2 +- .../fleet/server/services/artifacts/mocks.ts | 2 +- x-pack/plugins/fleet/tsconfig.json | 2 +- .../global_search_providers/tsconfig.json | 2 +- x-pack/plugins/grokdebugger/tsconfig.json | 2 +- .../index_lifecycle_management/tsconfig.json | 2 +- x-pack/plugins/index_management/tsconfig.json | 2 +- x-pack/plugins/infra/tsconfig.json | 2 +- x-pack/plugins/ingest_pipelines/tsconfig.json | 2 +- .../plugins/lens/server/routes/field_stats.ts | 2 +- x-pack/plugins/lens/server/usage/task.ts | 2 +- x-pack/plugins/lens/tsconfig.json | 2 +- .../threshold/get_threshold_bucket_filters.ts | 2 +- .../server/lib/machine_learning/index.test.ts | 2 +- x-pack/plugins/snapshot_restore/tsconfig.json | 2 +- .../common/build_sorted_events_query.ts | 4 +- .../alert_types/es_query/action_context.ts | 2 +- .../alert_types/es_query/alert_type.test.ts | 2 +- .../server/alert_types/es_query/alert_type.ts | 4 +- .../monitoring/workload_statistics.test.ts | 2 +- .../server/monitoring/workload_statistics.ts | 2 +- .../plugins/task_manager/server/task_store.ts | 2 +- .../plugins/ui_actions_enhanced/tsconfig.json | 2 +- x-pack/plugins/uptime/server/lib/lib.ts | 2 +- .../lib/requests/get_monitor_availability.ts | 2 +- .../lib/requests/get_monitor_details.ts | 2 +- .../lib/requests/get_monitor_locations.ts | 2 +- .../lib/requests/get_snapshot_counts.ts | 2 +- .../lib/requests/search/query_context.ts | 2 +- x-pack/plugins/watcher/tsconfig.json | 2 +- .../trial/tests/annotations.ts | 2 +- x-pack/test/tsconfig.json | 4 +- x-pack/tsconfig.json | 117 ------------------ x-pack/typings/@elastic/eui/index.d.ts | 16 --- x-pack/typings/cytoscape_dagre.d.ts | 8 -- x-pack/typings/index.d.ts | 33 ----- x-pack/typings/rison_node.d.ts | 30 ----- 101 files changed, 188 insertions(+), 352 deletions(-) delete mode 100644 test/typings/rison_node.d.ts rename test/typings/index.d.ts => typings/cytoscape_dagre.d.ts (54%) rename {x-pack/typings => typings}/elasticsearch/aggregations.d.ts (98%) rename {x-pack/typings => typings}/elasticsearch/index.d.ts (95%) rename {x-pack/typings => typings}/global_fetch.d.ts (66%) rename {x-pack/typings => typings}/js_levenshtein.d.ts (59%) rename {x-pack/typings => typings}/react_vis.d.ts (50%) delete mode 100644 x-pack/tsconfig.json delete mode 100644 x-pack/typings/@elastic/eui/index.d.ts delete mode 100644 x-pack/typings/cytoscape_dagre.d.ts delete mode 100644 x-pack/typings/index.d.ts delete mode 100644 x-pack/typings/rison_node.d.ts diff --git a/src/dev/typescript/projects.ts b/src/dev/typescript/projects.ts index 8b306fc967115..050743114f657 100644 --- a/src/dev/typescript/projects.ts +++ b/src/dev/typescript/projects.ts @@ -14,7 +14,6 @@ import { Project } from './project'; export const PROJECTS = [ new Project(resolve(REPO_ROOT, 'tsconfig.json')), new Project(resolve(REPO_ROOT, 'test/tsconfig.json'), { name: 'kibana/test' }), - new Project(resolve(REPO_ROOT, 'x-pack/tsconfig.json')), new Project(resolve(REPO_ROOT, 'x-pack/test/tsconfig.json'), { name: 'x-pack/test' }), new Project(resolve(REPO_ROOT, 'src/core/tsconfig.json')), new Project(resolve(REPO_ROOT, 'x-pack/plugins/drilldowns/url_drilldown/tsconfig.json'), { diff --git a/test/tsconfig.json b/test/tsconfig.json index c3acf94f8c267..c68e15b2419a1 100644 --- a/test/tsconfig.json +++ b/test/tsconfig.json @@ -2,12 +2,11 @@ "extends": "../tsconfig.base.json", "compilerOptions": { "incremental": false, - "types": ["node", "flot"] + "types": ["node"] }, "include": [ "**/*", - "../typings/elastic__node_crypto.d.ts", - "typings/**/*", + "../typings/**/*", "../packages/kbn-test/types/ftr_globals/**/*" ], "exclude": ["plugin_functional/plugins/**/*", "interpreter_functional/plugins/**/*"], diff --git a/test/typings/rison_node.d.ts b/test/typings/rison_node.d.ts deleted file mode 100644 index dacb2524907be..0000000000000 --- a/test/typings/rison_node.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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 and the Server Side Public License, v 1; you may not use this file except - * in compliance with, at your election, the Elastic License 2.0 or the Server - * Side Public License, v 1. - */ - -declare module 'rison-node' { - export type RisonValue = undefined | null | boolean | number | string | RisonObject | RisonArray; - - // eslint-disable-next-line @typescript-eslint/no-empty-interface - export interface RisonArray extends Array {} - - export interface RisonObject { - [key: string]: RisonValue; - } - - export const decode: (input: string) => RisonValue; - - // eslint-disable-next-line @typescript-eslint/naming-convention - export const decode_object: (input: string) => RisonObject; - - export const encode: (input: Input) => string; - - // eslint-disable-next-line @typescript-eslint/naming-convention - export const encode_object: (input: Input) => string; -} diff --git a/tsconfig.json b/tsconfig.json index f6ce6b92b7e02..18647153acb0a 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,11 +3,25 @@ "compilerOptions": { "incremental": false }, - "include": ["kibana.d.ts", "src/**/*", "typings/**/*"], + "include": [ + "kibana.d.ts", + "typings/**/*", + + "src/cli/**/*", + "src/dev/**/*", + "src/fixtures/**/*", + "src/legacy/**/*", + "src/optimize/**/*", + + "x-pack/mocks.ts", + "x-pack/typings/**/*", + "x-pack/tasks/**/*", + "x-pack/plugins/cases/**/*", + "x-pack/plugins/lists/**/*", + "x-pack/plugins/security_solution/**/*", + ], "exclude": [ - "src/**/__fixtures__/**/*", - "src/core/**/*", - "src/plugins/**/*" + "x-pack/plugins/security_solution/cypress/**/*" ], "references": [ { "path": "./src/core/tsconfig.json" }, @@ -64,5 +78,64 @@ { "path": "./src/plugins/visualize/tsconfig.json" }, { "path": "./src/plugins/index_pattern_management/tsconfig.json" }, { "path": "./src/plugins/index_pattern_field_editor/tsconfig.json" }, + + { "path": "./x-pack/plugins/actions/tsconfig.json" }, + { "path": "./x-pack/plugins/alerting/tsconfig.json" }, + { "path": "./x-pack/plugins/apm/tsconfig.json" }, + { "path": "./x-pack/plugins/beats_management/tsconfig.json" }, + { "path": "./x-pack/plugins/canvas/tsconfig.json" }, + { "path": "./x-pack/plugins/cloud/tsconfig.json" }, + { "path": "./x-pack/plugins/console_extensions/tsconfig.json" }, + { "path": "./x-pack/plugins/data_enhanced/tsconfig.json" }, + { "path": "./x-pack/plugins/dashboard_mode/tsconfig.json" }, + { "path": "./x-pack/plugins/discover_enhanced/tsconfig.json" }, + { "path": "./x-pack/plugins/drilldowns/url_drilldown/tsconfig.json" }, + { "path": "./x-pack/plugins/embeddable_enhanced/tsconfig.json" }, + { "path": "./x-pack/plugins/encrypted_saved_objects/tsconfig.json" }, + { "path": "./x-pack/plugins/enterprise_search/tsconfig.json" }, + { "path": "./x-pack/plugins/event_log/tsconfig.json" }, + { "path": "./x-pack/plugins/features/tsconfig.json" }, + { "path": "./x-pack/plugins/file_upload/tsconfig.json" }, + { "path": "./x-pack/plugins/fleet/tsconfig.json" }, + { "path": "./x-pack/plugins/global_search_bar/tsconfig.json" }, + { "path": "./x-pack/plugins/global_search_providers/tsconfig.json" }, + { "path": "./x-pack/plugins/global_search/tsconfig.json" }, + { "path": "./x-pack/plugins/graph/tsconfig.json" }, + { "path": "./x-pack/plugins/grokdebugger/tsconfig.json" }, + { "path": "./x-pack/plugins/infra/tsconfig.json" }, + { "path": "./x-pack/plugins/ingest_pipelines/tsconfig.json" }, + { "path": "./x-pack/plugins/lens/tsconfig.json" }, + { "path": "./x-pack/plugins/license_management/tsconfig.json" }, + { "path": "./x-pack/plugins/licensing/tsconfig.json" }, + { "path": "./x-pack/plugins/logstash/tsconfig.json" }, + { "path": "./x-pack/plugins/maps_legacy_licensing/tsconfig.json" }, + { "path": "./x-pack/plugins/maps/tsconfig.json" }, + { "path": "./x-pack/plugins/ml/tsconfig.json" }, + { "path": "./x-pack/plugins/monitoring/tsconfig.json" }, + { "path": "./x-pack/plugins/observability/tsconfig.json" }, + { "path": "./x-pack/plugins/osquery/tsconfig.json" }, + { "path": "./x-pack/plugins/painless_lab/tsconfig.json" }, + { "path": "./x-pack/plugins/saved_objects_tagging/tsconfig.json" }, + { "path": "./x-pack/plugins/searchprofiler/tsconfig.json" }, + { "path": "./x-pack/plugins/security/tsconfig.json" }, + { "path": "./x-pack/plugins/snapshot_restore/tsconfig.json" }, + { "path": "./x-pack/plugins/spaces/tsconfig.json" }, + { "path": "./x-pack/plugins/stack_alerts/tsconfig.json" }, + { "path": "./x-pack/plugins/task_manager/tsconfig.json" }, + { "path": "./x-pack/plugins/telemetry_collection_xpack/tsconfig.json" }, + { "path": "./x-pack/plugins/transform/tsconfig.json" }, + { "path": "./x-pack/plugins/translations/tsconfig.json" }, + { "path": "./x-pack/plugins/triggers_actions_ui/tsconfig.json" }, + { "path": "./x-pack/plugins/ui_actions_enhanced/tsconfig.json" }, + { "path": "./x-pack/plugins/upgrade_assistant/tsconfig.json" }, + { "path": "./x-pack/plugins/runtime_fields/tsconfig.json" }, + { "path": "./x-pack/plugins/index_management/tsconfig.json" }, + { "path": "./x-pack/plugins/watcher/tsconfig.json" }, + { "path": "./x-pack/plugins/rollup/tsconfig.json" }, + { "path": "./x-pack/plugins/remote_clusters/tsconfig.json" }, + { "path": "./x-pack/plugins/cross_cluster_replication/tsconfig.json"}, + { "path": "./x-pack/plugins/index_lifecycle_management/tsconfig.json"}, + { "path": "./x-pack/plugins/uptime/tsconfig.json" }, + { "path": "./x-pack/plugins/xpack_legacy/tsconfig.json" } ] } diff --git a/test/typings/index.d.ts b/typings/cytoscape_dagre.d.ts similarity index 54% rename from test/typings/index.d.ts rename to typings/cytoscape_dagre.d.ts index 8ea94a280996e..0cf7cf8be2fee 100644 --- a/test/typings/index.d.ts +++ b/typings/cytoscape_dagre.d.ts @@ -6,14 +6,4 @@ * Side Public License, v 1. */ -declare module '*.html' { - const template: string; - // eslint-disable-next-line import/no-default-export - export default template; -} - -type MethodKeysOf = { - [K in keyof T]: T[K] extends (...args: any[]) => any ? K : never; -}[keyof T]; - -type PublicMethodsOf = Pick>; +declare module 'cytoscape-dagre'; diff --git a/x-pack/typings/elasticsearch/aggregations.d.ts b/typings/elasticsearch/aggregations.d.ts similarity index 98% rename from x-pack/typings/elasticsearch/aggregations.d.ts rename to typings/elasticsearch/aggregations.d.ts index 077399c596d54..2b501c94889f4 100644 --- a/x-pack/typings/elasticsearch/aggregations.d.ts +++ b/typings/elasticsearch/aggregations.d.ts @@ -1,8 +1,9 @@ /* * 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. + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. */ import { Unionize, UnionToIntersection } from 'utility-types'; diff --git a/x-pack/typings/elasticsearch/index.d.ts b/typings/elasticsearch/index.d.ts similarity index 95% rename from x-pack/typings/elasticsearch/index.d.ts rename to typings/elasticsearch/index.d.ts index 41630e81f13e4..a84d4148f6fe7 100644 --- a/x-pack/typings/elasticsearch/index.d.ts +++ b/typings/elasticsearch/index.d.ts @@ -1,8 +1,9 @@ /* * 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. + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. */ import { ValuesType } from 'utility-types'; diff --git a/x-pack/typings/global_fetch.d.ts b/typings/global_fetch.d.ts similarity index 66% rename from x-pack/typings/global_fetch.d.ts rename to typings/global_fetch.d.ts index a79a76aebe539..597bc7e89497c 100644 --- a/x-pack/typings/global_fetch.d.ts +++ b/typings/global_fetch.d.ts @@ -1,8 +1,9 @@ /* * 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. + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. */ // This type needs to still exist due to apollo-link-http-common hasn't yet updated diff --git a/typings/index.d.ts b/typings/index.d.ts index 7192e70559743..c7186a0e5795b 100644 --- a/typings/index.d.ts +++ b/typings/index.d.ts @@ -24,6 +24,8 @@ declare module '*.svg' { export default content; } +declare module 'axios/lib/adapters/xhr'; + // Storybook references this module. It's @ts-ignored in the codebase but when // built into its dist it strips that out. Add it here to avoid a type checking // error. diff --git a/x-pack/typings/js_levenshtein.d.ts b/typings/js_levenshtein.d.ts similarity index 59% rename from x-pack/typings/js_levenshtein.d.ts rename to typings/js_levenshtein.d.ts index f693e17244db1..7c934333dbc7b 100644 --- a/x-pack/typings/js_levenshtein.d.ts +++ b/typings/js_levenshtein.d.ts @@ -1,8 +1,9 @@ /* * 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. + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. */ declare module 'js-levenshtein' { diff --git a/x-pack/typings/react_vis.d.ts b/typings/react_vis.d.ts similarity index 50% rename from x-pack/typings/react_vis.d.ts rename to typings/react_vis.d.ts index bcfbafd47fbc7..209dd398e86f4 100644 --- a/x-pack/typings/react_vis.d.ts +++ b/typings/react_vis.d.ts @@ -1,8 +1,9 @@ /* * 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. + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. */ declare module 'react-vis'; diff --git a/x-pack/examples/alerting_example/tsconfig.json b/x-pack/examples/alerting_example/tsconfig.json index 99e0f1f0e7c9e..95d42d40aceb3 100644 --- a/x-pack/examples/alerting_example/tsconfig.json +++ b/x-pack/examples/alerting_example/tsconfig.json @@ -9,7 +9,7 @@ "public/**/*.tsx", "server/**/*.ts", "common/**/*.ts", - "../../typings/**/*", + "../../../typings/**/*", ], "exclude": [], "references": [ diff --git a/x-pack/examples/embedded_lens_example/tsconfig.json b/x-pack/examples/embedded_lens_example/tsconfig.json index 2bf577e87041c..195db6effc5e6 100644 --- a/x-pack/examples/embedded_lens_example/tsconfig.json +++ b/x-pack/examples/embedded_lens_example/tsconfig.json @@ -9,7 +9,7 @@ "public/**/*.ts", "public/**/*.tsx", "server/**/*.ts", - "../../typings/**/*" + "../../../typings/**/*" ], "exclude": [], "references": [ diff --git a/x-pack/examples/ui_actions_enhanced_examples/tsconfig.json b/x-pack/examples/ui_actions_enhanced_examples/tsconfig.json index 05e5f39d4d628..567baca039d76 100644 --- a/x-pack/examples/ui_actions_enhanced_examples/tsconfig.json +++ b/x-pack/examples/ui_actions_enhanced_examples/tsconfig.json @@ -9,7 +9,7 @@ "public/**/*.ts", "public/**/*.tsx", "server/**/*.ts", - "../../typings/**/*" + "../../../typings/**/*" ], "exclude": [], "references": [ diff --git a/x-pack/plugins/apm/public/components/shared/KueryBar/get_bool_filter.ts b/x-pack/plugins/apm/public/components/shared/KueryBar/get_bool_filter.ts index 8c7947201927f..c86cf769d7529 100644 --- a/x-pack/plugins/apm/public/components/shared/KueryBar/get_bool_filter.ts +++ b/x-pack/plugins/apm/public/components/shared/KueryBar/get_bool_filter.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { ESFilter } from '../../../../../../typings/elasticsearch'; +import { ESFilter } from '../../../../../../../typings/elasticsearch'; import { ERROR_GROUP_ID, PROCESSOR_EVENT, diff --git a/x-pack/plugins/apm/public/utils/testHelpers.tsx b/x-pack/plugins/apm/public/utils/testHelpers.tsx index 80df113e18190..d0d09f703ae9f 100644 --- a/x-pack/plugins/apm/public/utils/testHelpers.tsx +++ b/x-pack/plugins/apm/public/utils/testHelpers.tsx @@ -19,7 +19,7 @@ import { EuiThemeProvider } from '../../../../../src/plugins/kibana_react/common import { ESSearchRequest, ESSearchResponse, -} from '../../../../typings/elasticsearch'; +} from '../../../../../typings/elasticsearch'; import { PromiseReturnType } from '../../../observability/typings/common'; // eslint-disable-next-line @kbn/eslint/no-restricted-paths import { APMConfig } from '../../server'; diff --git a/x-pack/plugins/apm/scripts/shared/get_es_client.ts b/x-pack/plugins/apm/scripts/shared/get_es_client.ts index f17a55cf4e215..7a8e09423ff15 100644 --- a/x-pack/plugins/apm/scripts/shared/get_es_client.ts +++ b/x-pack/plugins/apm/scripts/shared/get_es_client.ts @@ -10,7 +10,7 @@ import { ApiKeyAuth, BasicAuth } from '@elastic/elasticsearch/lib/pool'; import { ESSearchResponse, ESSearchRequest, -} from '../../../../typings/elasticsearch'; +} from '../../../../../typings/elasticsearch'; export type ESClient = ReturnType; diff --git a/x-pack/plugins/apm/server/lib/alerts/alerting_es_client.ts b/x-pack/plugins/apm/server/lib/alerts/alerting_es_client.ts index 727b0c1f04cf4..d5706ac9063ed 100644 --- a/x-pack/plugins/apm/server/lib/alerts/alerting_es_client.ts +++ b/x-pack/plugins/apm/server/lib/alerts/alerting_es_client.ts @@ -9,7 +9,7 @@ import { ThresholdMetActionGroupId } from '../../../common/alert_types'; import { ESSearchRequest, ESSearchResponse, -} from '../../../../../typings/elasticsearch'; +} from '../../../../../../typings/elasticsearch'; import { AlertInstanceContext, AlertInstanceState, diff --git a/x-pack/plugins/apm/server/lib/alerts/chart_preview/get_transaction_duration.ts b/x-pack/plugins/apm/server/lib/alerts/chart_preview/get_transaction_duration.ts index 86456114698cb..bea90109725d0 100644 --- a/x-pack/plugins/apm/server/lib/alerts/chart_preview/get_transaction_duration.ts +++ b/x-pack/plugins/apm/server/lib/alerts/chart_preview/get_transaction_duration.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { MetricsAggregationResponsePart } from '../../../../../../typings/elasticsearch/aggregations'; +import { MetricsAggregationResponsePart } from '../../../../../../../typings/elasticsearch/aggregations'; import { PROCESSOR_EVENT, SERVICE_NAME, diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts index 50ed02879a4d2..98063e3e1e3fd 100644 --- a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts +++ b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts @@ -11,7 +11,7 @@ import { RequestParams } from '@elastic/elasticsearch'; import { ESSearchRequest, ESSearchResponse, -} from '../../../../../../typings/elasticsearch'; +} from '../../../../../../../typings/elasticsearch'; import { ApmIndicesConfig } from '../../settings/apm_indices/get_apm_indices'; import { tasks } from './tasks'; import { APMDataTelemetry } from '../types'; diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts index 36c15366b9b48..e9744c6614641 100644 --- a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts +++ b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts @@ -7,7 +7,7 @@ import { ValuesType } from 'utility-types'; import { flatten, merge, sortBy, sum, pickBy } from 'lodash'; -import { AggregationOptionsByType } from '../../../../../../typings/elasticsearch/aggregations'; +import { AggregationOptionsByType } from '../../../../../../../typings/elasticsearch/aggregations'; import { ProcessorEvent } from '../../../../common/processor_event'; import { TelemetryTask } from '.'; import { AGENT_NAMES, RUM_AGENT_NAMES } from '../../../../common/agent_name'; diff --git a/x-pack/plugins/apm/server/lib/correlations/get_correlations_for_failed_transactions/index.ts b/x-pack/plugins/apm/server/lib/correlations/get_correlations_for_failed_transactions/index.ts index e2411d1d17adc..f613a0dbca402 100644 --- a/x-pack/plugins/apm/server/lib/correlations/get_correlations_for_failed_transactions/index.ts +++ b/x-pack/plugins/apm/server/lib/correlations/get_correlations_for_failed_transactions/index.ts @@ -11,8 +11,8 @@ import { processSignificantTermAggs, TopSigTerm, } from '../process_significant_term_aggs'; -import { AggregationOptionsByType } from '../../../../../../typings/elasticsearch/aggregations'; -import { ESFilter } from '../../../../../../typings/elasticsearch'; +import { AggregationOptionsByType } from '../../../../../../../typings/elasticsearch/aggregations'; +import { ESFilter } from '../../../../../../../typings/elasticsearch'; import { environmentQuery, rangeQuery, diff --git a/x-pack/plugins/apm/server/lib/correlations/get_correlations_for_slow_transactions/get_duration_for_percentile.ts b/x-pack/plugins/apm/server/lib/correlations/get_correlations_for_slow_transactions/get_duration_for_percentile.ts index 27f69c3ca7d56..02141f5f9e76f 100644 --- a/x-pack/plugins/apm/server/lib/correlations/get_correlations_for_slow_transactions/get_duration_for_percentile.ts +++ b/x-pack/plugins/apm/server/lib/correlations/get_correlations_for_slow_transactions/get_duration_for_percentile.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { ESFilter } from '../../../../../../typings/elasticsearch'; +import { ESFilter } from '../../../../../../../typings/elasticsearch'; import { TRANSACTION_DURATION } from '../../../../common/elasticsearch_fieldnames'; import { ProcessorEvent } from '../../../../common/processor_event'; import { withApmSpan } from '../../../utils/with_apm_span'; diff --git a/x-pack/plugins/apm/server/lib/correlations/get_correlations_for_slow_transactions/get_latency_distribution.ts b/x-pack/plugins/apm/server/lib/correlations/get_correlations_for_slow_transactions/get_latency_distribution.ts index eab09e814c18d..b800a21ffc341 100644 --- a/x-pack/plugins/apm/server/lib/correlations/get_correlations_for_slow_transactions/get_latency_distribution.ts +++ b/x-pack/plugins/apm/server/lib/correlations/get_correlations_for_slow_transactions/get_latency_distribution.ts @@ -6,8 +6,8 @@ */ import { isEmpty, dropRightWhile } from 'lodash'; -import { AggregationOptionsByType } from '../../../../../../typings/elasticsearch/aggregations'; -import { ESFilter } from '../../../../../../typings/elasticsearch'; +import { AggregationOptionsByType } from '../../../../../../../typings/elasticsearch/aggregations'; +import { ESFilter } from '../../../../../../../typings/elasticsearch'; import { TRANSACTION_DURATION } from '../../../../common/elasticsearch_fieldnames'; import { ProcessorEvent } from '../../../../common/processor_event'; import { Setup, SetupTimeRange } from '../../helpers/setup_request'; diff --git a/x-pack/plugins/apm/server/lib/correlations/get_correlations_for_slow_transactions/get_max_latency.ts b/x-pack/plugins/apm/server/lib/correlations/get_correlations_for_slow_transactions/get_max_latency.ts index 2777c0944afd1..5f12c86a9c70c 100644 --- a/x-pack/plugins/apm/server/lib/correlations/get_correlations_for_slow_transactions/get_max_latency.ts +++ b/x-pack/plugins/apm/server/lib/correlations/get_correlations_for_slow_transactions/get_max_latency.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { ESFilter } from '../../../../../../typings/elasticsearch'; +import { ESFilter } from '../../../../../../../typings/elasticsearch'; import { TRANSACTION_DURATION } from '../../../../common/elasticsearch_fieldnames'; import { ProcessorEvent } from '../../../../common/processor_event'; import { withApmSpan } from '../../../utils/with_apm_span'; diff --git a/x-pack/plugins/apm/server/lib/correlations/get_correlations_for_slow_transactions/index.ts b/x-pack/plugins/apm/server/lib/correlations/get_correlations_for_slow_transactions/index.ts index 824b290a6ba60..6afca46ec7391 100644 --- a/x-pack/plugins/apm/server/lib/correlations/get_correlations_for_slow_transactions/index.ts +++ b/x-pack/plugins/apm/server/lib/correlations/get_correlations_for_slow_transactions/index.ts @@ -5,8 +5,8 @@ * 2.0. */ -import { AggregationOptionsByType } from '../../../../../../typings/elasticsearch/aggregations'; -import { ESFilter } from '../../../../../../typings/elasticsearch'; +import { AggregationOptionsByType } from '../../../../../../../typings/elasticsearch/aggregations'; +import { ESFilter } from '../../../../../../../typings/elasticsearch'; import { environmentQuery, rangeQuery, diff --git a/x-pack/plugins/apm/server/lib/correlations/process_significant_term_aggs.ts b/x-pack/plugins/apm/server/lib/correlations/process_significant_term_aggs.ts index 1fe50c869f5bf..2732cd45c342e 100644 --- a/x-pack/plugins/apm/server/lib/correlations/process_significant_term_aggs.ts +++ b/x-pack/plugins/apm/server/lib/correlations/process_significant_term_aggs.ts @@ -9,7 +9,7 @@ import { orderBy } from 'lodash'; import { AggregationOptionsByType, AggregationResultOf, -} from '../../../../../typings/elasticsearch/aggregations'; +} from '../../../../../../typings/elasticsearch/aggregations'; export interface TopSigTerm { fieldName: string; diff --git a/x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.ts b/x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.ts index 1e161b0383f0b..462c9bcdc4310 100644 --- a/x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.ts +++ b/x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { ESFilter } from '../../../../../../typings/elasticsearch'; +import { ESFilter } from '../../../../../../../typings/elasticsearch'; import { ERROR_GROUP_ID, SERVICE_NAME, diff --git a/x-pack/plugins/apm/server/lib/errors/get_error_groups.ts b/x-pack/plugins/apm/server/lib/errors/get_error_groups.ts index 5371d69caaa99..1c262ebf882b2 100644 --- a/x-pack/plugins/apm/server/lib/errors/get_error_groups.ts +++ b/x-pack/plugins/apm/server/lib/errors/get_error_groups.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { SortOptions } from '../../../../../typings/elasticsearch/aggregations'; +import { SortOptions } from '../../../../../../typings/elasticsearch/aggregations'; import { ERROR_CULPRIT, ERROR_EXC_HANDLED, diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/add_filter_to_exclude_legacy_data.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/add_filter_to_exclude_legacy_data.ts index 0f2bff09f99c1..96bc8897e62fd 100644 --- a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/add_filter_to_exclude_legacy_data.ts +++ b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/add_filter_to_exclude_legacy_data.ts @@ -10,7 +10,7 @@ import { OBSERVER_VERSION_MAJOR } from '../../../../../common/elasticsearch_fiel import { ESSearchRequest, ESFilter, -} from '../../../../../../../typings/elasticsearch'; +} from '../../../../../../../../typings/elasticsearch'; /* Adds a range query to the ES request to exclude legacy data diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.ts index 368c0eb305f21..e04b3a70a7593 100644 --- a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.ts +++ b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.ts @@ -14,7 +14,7 @@ import { import { ESSearchRequest, ESSearchResponse, -} from '../../../../../../../typings/elasticsearch'; +} from '../../../../../../../../typings/elasticsearch'; import { unwrapEsResponse } from '../../../../../../observability/server'; import { ProcessorEvent } from '../../../../../common/processor_event'; import { APMError } from '../../../../../typings/es_schemas/ui/apm_error'; diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/unpack_processor_events.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/unpack_processor_events.ts index 38989d172a73f..76e615f42bb64 100644 --- a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/unpack_processor_events.ts +++ b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/unpack_processor_events.ts @@ -11,7 +11,7 @@ import { ProcessorEvent } from '../../../../../common/processor_event'; import { ESSearchRequest, ESFilter, -} from '../../../../../../../typings/elasticsearch'; +} from '../../../../../../../../typings/elasticsearch'; import { APMEventESSearchRequest } from '.'; import { ApmIndicesConfig, diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_internal_es_client/index.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_internal_es_client/index.ts index ff1509dc83d15..4faf80d7ca8db 100644 --- a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_internal_es_client/index.ts +++ b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_internal_es_client/index.ts @@ -13,7 +13,7 @@ import { APMRequestHandlerContext } from '../../../../routes/typings'; import { ESSearchResponse, ESSearchRequest, -} from '../../../../../../../typings/elasticsearch'; +} from '../../../../../../../../typings/elasticsearch'; import { callAsyncWithDebug, getDebugBody, diff --git a/x-pack/plugins/apm/server/lib/helpers/transaction_error_rate.ts b/x-pack/plugins/apm/server/lib/helpers/transaction_error_rate.ts index e22c2514a89a4..9bec5eb4a247c 100644 --- a/x-pack/plugins/apm/server/lib/helpers/transaction_error_rate.ts +++ b/x-pack/plugins/apm/server/lib/helpers/transaction_error_rate.ts @@ -10,7 +10,7 @@ import { EventOutcome } from '../../../common/event_outcome'; import { AggregationOptionsByType, AggregationResultOf, -} from '../../../../../typings/elasticsearch/aggregations'; +} from '../../../../../../typings/elasticsearch/aggregations'; export const getOutcomeAggregation = () => ({ terms: { diff --git a/x-pack/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts b/x-pack/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts index ef24b531d8046..30234447821ec 100644 --- a/x-pack/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts +++ b/x-pack/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts @@ -6,7 +6,7 @@ */ import { Overwrite, Unionize } from 'utility-types'; -import { AggregationOptionsByType } from '../../../../../typings/elasticsearch'; +import { AggregationOptionsByType } from '../../../../../../typings/elasticsearch'; import { getMetricsProjection } from '../../projections/metrics'; import { mergeProjection } from '../../projections/util/merge_projection'; import { APMEventESSearchRequest } from '../helpers/create_es_client/create_apm_event_client'; diff --git a/x-pack/plugins/apm/server/lib/metrics/transform_metrics_chart.ts b/x-pack/plugins/apm/server/lib/metrics/transform_metrics_chart.ts index a7c5fc6628c52..17759f9094a87 100644 --- a/x-pack/plugins/apm/server/lib/metrics/transform_metrics_chart.ts +++ b/x-pack/plugins/apm/server/lib/metrics/transform_metrics_chart.ts @@ -6,7 +6,7 @@ */ import theme from '@elastic/eui/dist/eui_theme_light.json'; -import { ESSearchResponse } from '../../../../../typings/elasticsearch'; +import { ESSearchResponse } from '../../../../../../typings/elasticsearch'; import { getVizColorForIndex } from '../../../common/viz_colors'; import { GenericMetricsRequest } from './fetch_and_transform_metrics'; import { ChartBase } from './types'; diff --git a/x-pack/plugins/apm/server/lib/rum_client/ui_filters/get_es_filter.ts b/x-pack/plugins/apm/server/lib/rum_client/ui_filters/get_es_filter.ts index aed361f13bd7d..43cbb485c4510 100644 --- a/x-pack/plugins/apm/server/lib/rum_client/ui_filters/get_es_filter.ts +++ b/x-pack/plugins/apm/server/lib/rum_client/ui_filters/get_es_filter.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { ESFilter } from '../../../../../../typings/elasticsearch'; +import { ESFilter } from '../../../../../../../typings/elasticsearch'; import { UIFilters } from '../../../../typings/ui_filters'; import { localUIFilters, localUIFilterNames } from './local_ui_filters/config'; diff --git a/x-pack/plugins/apm/server/lib/service_map/get_service_anomalies.ts b/x-pack/plugins/apm/server/lib/service_map/get_service_anomalies.ts index f08cc27b2e59c..8c97a3993e8c0 100644 --- a/x-pack/plugins/apm/server/lib/service_map/get_service_anomalies.ts +++ b/x-pack/plugins/apm/server/lib/service_map/get_service_anomalies.ts @@ -7,7 +7,7 @@ import Boom from '@hapi/boom'; import { sortBy, uniqBy } from 'lodash'; -import { ESSearchResponse } from '../../../../../typings/elasticsearch'; +import { ESSearchResponse } from '../../../../../../typings/elasticsearch'; import { MlPluginSetup } from '../../../../ml/server'; import { PromiseReturnType } from '../../../../observability/typings/common'; import { getSeverity, ML_ERRORS } from '../../../common/anomaly_detection'; diff --git a/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts b/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts index 7da3ce772ef5f..c1dfed377a763 100644 --- a/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts +++ b/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { ESFilter } from '../../../../../typings/elasticsearch'; +import { ESFilter } from '../../../../../../typings/elasticsearch'; import { METRIC_CGROUP_MEMORY_USAGE_BYTES, METRIC_SYSTEM_CPU_PERCENT, diff --git a/x-pack/plugins/apm/server/lib/service_map/get_trace_sample_ids.ts b/x-pack/plugins/apm/server/lib/service_map/get_trace_sample_ids.ts index 2b949863bcb30..8bc1b1f0562f5 100644 --- a/x-pack/plugins/apm/server/lib/service_map/get_trace_sample_ids.ts +++ b/x-pack/plugins/apm/server/lib/service_map/get_trace_sample_ids.ts @@ -7,7 +7,7 @@ import Boom from '@hapi/boom'; import { sortBy, take, uniq } from 'lodash'; -import { ESFilter } from '../../../../../typings/elasticsearch'; +import { ESFilter } from '../../../../../../typings/elasticsearch'; import { SERVICE_ENVIRONMENT, SERVICE_NAME, diff --git a/x-pack/plugins/apm/server/lib/services/annotations/get_derived_service_annotations.ts b/x-pack/plugins/apm/server/lib/services/annotations/get_derived_service_annotations.ts index efe9608edb95d..028c8c042c8dc 100644 --- a/x-pack/plugins/apm/server/lib/services/annotations/get_derived_service_annotations.ts +++ b/x-pack/plugins/apm/server/lib/services/annotations/get_derived_service_annotations.ts @@ -6,7 +6,7 @@ */ import { isFiniteNumber } from '../../../../common/utils/is_finite_number'; -import { ESFilter } from '../../../../../../typings/elasticsearch'; +import { ESFilter } from '../../../../../../../typings/elasticsearch'; import { Annotation, AnnotationType } from '../../../../common/annotations'; import { SERVICE_NAME, diff --git a/x-pack/plugins/apm/server/lib/services/annotations/get_stored_annotations.ts b/x-pack/plugins/apm/server/lib/services/annotations/get_stored_annotations.ts index 87ee0e9830fce..e0329e5f60e19 100644 --- a/x-pack/plugins/apm/server/lib/services/annotations/get_stored_annotations.ts +++ b/x-pack/plugins/apm/server/lib/services/annotations/get_stored_annotations.ts @@ -12,7 +12,7 @@ import { unwrapEsResponse, WrappedElasticsearchClientError, } from '../../../../../observability/server'; -import { ESSearchResponse } from '../../../../../../typings/elasticsearch'; +import { ESSearchResponse } from '../../../../../../../typings/elasticsearch'; import { Annotation as ESAnnotation } from '../../../../../observability/common/annotations'; import { ScopedAnnotationsClient } from '../../../../../observability/server'; import { Annotation, AnnotationType } from '../../../../common/annotations'; diff --git a/x-pack/plugins/apm/server/lib/services/annotations/index.test.ts b/x-pack/plugins/apm/server/lib/services/annotations/index.test.ts index d86016ed9d505..e2597a4a79cba 100644 --- a/x-pack/plugins/apm/server/lib/services/annotations/index.test.ts +++ b/x-pack/plugins/apm/server/lib/services/annotations/index.test.ts @@ -8,7 +8,7 @@ import { ESSearchRequest, ESSearchResponse, -} from '../../../../../../typings/elasticsearch'; +} from '../../../../../../../typings/elasticsearch'; import { inspectSearchParams, SearchParamsMock, diff --git a/x-pack/plugins/apm/server/lib/services/get_service_instances/get_service_instance_system_metric_stats.ts b/x-pack/plugins/apm/server/lib/services/get_service_instances/get_service_instance_system_metric_stats.ts index 3e788ca8ddf83..6a72f817b3f69 100644 --- a/x-pack/plugins/apm/server/lib/services/get_service_instances/get_service_instance_system_metric_stats.ts +++ b/x-pack/plugins/apm/server/lib/services/get_service_instances/get_service_instance_system_metric_stats.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { AggregationOptionsByType } from '../../../../../../typings/elasticsearch'; +import { AggregationOptionsByType } from '../../../../../../../typings/elasticsearch'; import { environmentQuery, rangeQuery, diff --git a/x-pack/plugins/apm/server/lib/services/get_service_metadata_details.ts b/x-pack/plugins/apm/server/lib/services/get_service_metadata_details.ts index a064d5b3008c2..a71772d1429cb 100644 --- a/x-pack/plugins/apm/server/lib/services/get_service_metadata_details.ts +++ b/x-pack/plugins/apm/server/lib/services/get_service_metadata_details.ts @@ -6,7 +6,7 @@ */ import { ProcessorEvent } from '../../../common/processor_event'; -import { SortOptions } from '../../../../../typings/elasticsearch'; +import { SortOptions } from '../../../../../../typings/elasticsearch'; import { AGENT, CLOUD, diff --git a/x-pack/plugins/apm/server/lib/services/get_throughput.ts b/x-pack/plugins/apm/server/lib/services/get_throughput.ts index 490eec337840e..5f5008a28c232 100644 --- a/x-pack/plugins/apm/server/lib/services/get_throughput.ts +++ b/x-pack/plugins/apm/server/lib/services/get_throughput.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { ESFilter } from '../../../../../typings/elasticsearch'; +import { ESFilter } from '../../../../../../typings/elasticsearch'; import { SERVICE_NAME, TRANSACTION_TYPE, diff --git a/x-pack/plugins/apm/server/lib/services/profiling/get_service_profiling_statistics.ts b/x-pack/plugins/apm/server/lib/services/profiling/get_service_profiling_statistics.ts index 8b60d39a8de5d..858f36e6e2c13 100644 --- a/x-pack/plugins/apm/server/lib/services/profiling/get_service_profiling_statistics.ts +++ b/x-pack/plugins/apm/server/lib/services/profiling/get_service_profiling_statistics.ts @@ -15,7 +15,7 @@ import { getValueTypeConfig, } from '../../../../common/profiling'; import { ProcessorEvent } from '../../../../common/processor_event'; -import { ESFilter } from '../../../../../../typings/elasticsearch'; +import { ESFilter } from '../../../../../../../typings/elasticsearch'; import { PROFILE_STACK, PROFILE_TOP_ID, diff --git a/x-pack/plugins/apm/server/lib/settings/agent_configuration/convert_settings_to_string.ts b/x-pack/plugins/apm/server/lib/settings/agent_configuration/convert_settings_to_string.ts index b38ca71d93c0a..2d6eff33b5b4e 100644 --- a/x-pack/plugins/apm/server/lib/settings/agent_configuration/convert_settings_to_string.ts +++ b/x-pack/plugins/apm/server/lib/settings/agent_configuration/convert_settings_to_string.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { ESSearchHit } from '../../../../../../typings/elasticsearch'; +import { ESSearchHit } from '../../../../../../../typings/elasticsearch'; import { AgentConfiguration } from '../../../../common/agent_configuration/configuration_types'; // needed for backwards compatability diff --git a/x-pack/plugins/apm/server/lib/settings/agent_configuration/find_exact_configuration.ts b/x-pack/plugins/apm/server/lib/settings/agent_configuration/find_exact_configuration.ts index 55d00b70b8c29..972c076d88e76 100644 --- a/x-pack/plugins/apm/server/lib/settings/agent_configuration/find_exact_configuration.ts +++ b/x-pack/plugins/apm/server/lib/settings/agent_configuration/find_exact_configuration.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { ESSearchHit } from '../../../../../../typings/elasticsearch'; +import { ESSearchHit } from '../../../../../../../typings/elasticsearch'; import { AgentConfiguration } from '../../../../common/agent_configuration/configuration_types'; import { SERVICE_ENVIRONMENT, diff --git a/x-pack/plugins/apm/server/lib/settings/agent_configuration/search_configurations.ts b/x-pack/plugins/apm/server/lib/settings/agent_configuration/search_configurations.ts index 0e7205c309e9f..12ba0939508e3 100644 --- a/x-pack/plugins/apm/server/lib/settings/agent_configuration/search_configurations.ts +++ b/x-pack/plugins/apm/server/lib/settings/agent_configuration/search_configurations.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { ESSearchHit } from '../../../../../../typings/elasticsearch'; +import { ESSearchHit } from '../../../../../../../typings/elasticsearch'; import { SERVICE_NAME, SERVICE_ENVIRONMENT, diff --git a/x-pack/plugins/apm/server/lib/transaction_groups/fetcher.ts b/x-pack/plugins/apm/server/lib/transaction_groups/fetcher.ts index ce0b6cf2a64fe..6308236000a53 100644 --- a/x-pack/plugins/apm/server/lib/transaction_groups/fetcher.ts +++ b/x-pack/plugins/apm/server/lib/transaction_groups/fetcher.ts @@ -8,7 +8,7 @@ import { sortBy, take } from 'lodash'; import moment from 'moment'; import { Unionize } from 'utility-types'; -import { AggregationOptionsByType } from '../../../../../typings/elasticsearch'; +import { AggregationOptionsByType } from '../../../../../../typings/elasticsearch'; import { PromiseReturnType } from '../../../../observability/typings/common'; import { SERVICE_NAME, diff --git a/x-pack/plugins/apm/server/lib/transaction_groups/get_transaction_group_stats.ts b/x-pack/plugins/apm/server/lib/transaction_groups/get_transaction_group_stats.ts index 5ee46bf1a5918..5409f919bf895 100644 --- a/x-pack/plugins/apm/server/lib/transaction_groups/get_transaction_group_stats.ts +++ b/x-pack/plugins/apm/server/lib/transaction_groups/get_transaction_group_stats.ts @@ -8,7 +8,7 @@ import { merge } from 'lodash'; import { TRANSACTION_TYPE } from '../../../common/elasticsearch_fieldnames'; import { arrayUnionToCallable } from '../../../common/utils/array_union_to_callable'; -import { AggregationInputMap } from '../../../../../typings/elasticsearch'; +import { AggregationInputMap } from '../../../../../../typings/elasticsearch'; import { TransactionGroupRequestBase, TransactionGroupSetup } from './fetcher'; import { getTransactionDurationFieldForAggregatedTransactions } from '../helpers/aggregated_transactions'; import { withApmSpan } from '../../utils/with_apm_span'; diff --git a/x-pack/plugins/apm/server/lib/transactions/get_anomaly_data/fetcher.ts b/x-pack/plugins/apm/server/lib/transactions/get_anomaly_data/fetcher.ts index cfd09f0207536..a35780539a256 100644 --- a/x-pack/plugins/apm/server/lib/transactions/get_anomaly_data/fetcher.ts +++ b/x-pack/plugins/apm/server/lib/transactions/get_anomaly_data/fetcher.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { ESSearchResponse } from '../../../../../../typings/elasticsearch'; +import { ESSearchResponse } from '../../../../../../../typings/elasticsearch'; import { PromiseReturnType } from '../../../../../observability/typings/common'; import { rangeQuery } from '../../../../server/utils/queries'; import { withApmSpan } from '../../../utils/with_apm_span'; diff --git a/x-pack/plugins/apm/server/lib/transactions/get_latency_charts/index.ts b/x-pack/plugins/apm/server/lib/transactions/get_latency_charts/index.ts index 31b5c6ff64dfd..5bd80f500fd2b 100644 --- a/x-pack/plugins/apm/server/lib/transactions/get_latency_charts/index.ts +++ b/x-pack/plugins/apm/server/lib/transactions/get_latency_charts/index.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { ESFilter } from '../../../../../../typings/elasticsearch'; +import { ESFilter } from '../../../../../../../typings/elasticsearch'; import { PromiseReturnType } from '../../../../../observability/typings/common'; import { SERVICE_NAME, diff --git a/x-pack/plugins/apm/server/lib/transactions/get_throughput_charts/index.ts b/x-pack/plugins/apm/server/lib/transactions/get_throughput_charts/index.ts index 3b7ffafff0d2a..a0225eb47e584 100644 --- a/x-pack/plugins/apm/server/lib/transactions/get_throughput_charts/index.ts +++ b/x-pack/plugins/apm/server/lib/transactions/get_throughput_charts/index.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { ESFilter } from '../../../../../../typings/elasticsearch'; +import { ESFilter } from '../../../../../../../typings/elasticsearch'; import { PromiseReturnType } from '../../../../../observability/typings/common'; import { SERVICE_NAME, diff --git a/x-pack/plugins/apm/server/projections/typings.ts b/x-pack/plugins/apm/server/projections/typings.ts index 725756b61b209..558f165d43cf5 100644 --- a/x-pack/plugins/apm/server/projections/typings.ts +++ b/x-pack/plugins/apm/server/projections/typings.ts @@ -9,7 +9,7 @@ import { AggregationOptionsByType, AggregationInputMap, ESSearchBody, -} from '../../../../typings/elasticsearch'; +} from '../../../../../typings/elasticsearch'; import { APMEventESSearchRequest } from '../lib/helpers/create_es_client/create_apm_event_client'; export type Projection = Omit & { diff --git a/x-pack/plugins/apm/server/projections/util/merge_projection/index.ts b/x-pack/plugins/apm/server/projections/util/merge_projection/index.ts index 33d8b127137f0..7f08707064862 100644 --- a/x-pack/plugins/apm/server/projections/util/merge_projection/index.ts +++ b/x-pack/plugins/apm/server/projections/util/merge_projection/index.ts @@ -10,7 +10,7 @@ import { DeepPartial } from 'utility-types'; import { AggregationInputMap, ESSearchBody, -} from '../../../../../../typings/elasticsearch'; +} from '../../../../../../../typings/elasticsearch'; import { APMEventESSearchRequest } from '../../../lib/helpers/create_es_client/create_apm_event_client'; import { Projection } from '../../typings'; diff --git a/x-pack/plugins/apm/server/utils/queries.ts b/x-pack/plugins/apm/server/utils/queries.ts index 6eab50d089821..3cbcb0a5b684f 100644 --- a/x-pack/plugins/apm/server/utils/queries.ts +++ b/x-pack/plugins/apm/server/utils/queries.ts @@ -6,7 +6,7 @@ */ import { esKuery } from '../../../../../src/plugins/data/server'; -import { ESFilter } from '../../../../typings/elasticsearch'; +import { ESFilter } from '../../../../../typings/elasticsearch'; import { SERVICE_ENVIRONMENT } from '../../common/elasticsearch_fieldnames'; import { ENVIRONMENT_ALL, diff --git a/x-pack/plugins/apm/server/utils/test_helpers.tsx b/x-pack/plugins/apm/server/utils/test_helpers.tsx index e804183c78867..6252c33c5994d 100644 --- a/x-pack/plugins/apm/server/utils/test_helpers.tsx +++ b/x-pack/plugins/apm/server/utils/test_helpers.tsx @@ -10,7 +10,7 @@ import { PromiseReturnType } from '../../../observability/typings/common'; import { ESSearchRequest, ESSearchResponse, -} from '../../../../typings/elasticsearch'; +} from '../../../../../typings/elasticsearch'; import { UIFilters } from '../../typings/ui_filters'; interface Options { diff --git a/x-pack/plugins/apm/tsconfig.json b/x-pack/plugins/apm/tsconfig.json index ea1602d916822..ffbf11c23f63a 100644 --- a/x-pack/plugins/apm/tsconfig.json +++ b/x-pack/plugins/apm/tsconfig.json @@ -8,7 +8,7 @@ "declarationMap": true }, "include": [ - "../../typings/**/*", + "../../../typings/**/*", "common/**/*", "public/**/*", "scripts/**/*", diff --git a/x-pack/plugins/fleet/server/services/agents/crud.ts b/x-pack/plugins/fleet/server/services/agents/crud.ts index 975ca7fec08b1..06353d831c60f 100644 --- a/x-pack/plugins/fleet/server/services/agents/crud.ts +++ b/x-pack/plugins/fleet/server/services/agents/crud.ts @@ -14,7 +14,7 @@ import { appContextService, agentPolicyService } from '../../services'; import type { FleetServerAgent } from '../../../common'; import { isAgentUpgradeable, SO_SEARCH_LIMIT } from '../../../common'; import { AGENT_SAVED_OBJECT_TYPE, AGENTS_INDEX } from '../../constants'; -import type { ESSearchHit } from '../../../../../typings/elasticsearch'; +import type { ESSearchHit } from '../../../../../../typings/elasticsearch'; import { escapeSearchQueryPhrase, normalizeKuery } from '../saved_object'; import type { KueryNode } from '../../../../../../src/plugins/data/server'; import { esKuery } from '../../../../../../src/plugins/data/server'; diff --git a/x-pack/plugins/fleet/server/services/agents/helpers.ts b/x-pack/plugins/fleet/server/services/agents/helpers.ts index 1dab3b64755fd..3fdb347ed246b 100644 --- a/x-pack/plugins/fleet/server/services/agents/helpers.ts +++ b/x-pack/plugins/fleet/server/services/agents/helpers.ts @@ -5,7 +5,7 @@ * 2.0. */ -import type { ESSearchHit } from '../../../../../typings/elasticsearch'; +import type { ESSearchHit } from '../../../../../../typings/elasticsearch'; import type { Agent, AgentSOAttributes, FleetServerAgent } from '../../types'; export function searchHitToAgent(hit: ESSearchHit): Agent { diff --git a/x-pack/plugins/fleet/server/services/api_keys/enrollment_api_key.ts b/x-pack/plugins/fleet/server/services/api_keys/enrollment_api_key.ts index 387d69c5c0ca7..4365c3913f433 100644 --- a/x-pack/plugins/fleet/server/services/api_keys/enrollment_api_key.ts +++ b/x-pack/plugins/fleet/server/services/api_keys/enrollment_api_key.ts @@ -12,7 +12,7 @@ import type { GetResponse } from 'elasticsearch'; import { ResponseError } from '@elastic/elasticsearch/lib/errors'; import type { SavedObjectsClientContract, ElasticsearchClient } from 'src/core/server'; -import type { ESSearchResponse as SearchResponse } from '../../../../../typings/elasticsearch'; +import type { ESSearchResponse as SearchResponse } from '../../../../../../typings/elasticsearch'; import type { EnrollmentAPIKey, FleetServerEnrollmentAPIKey } from '../../types'; import { ENROLLMENT_API_KEYS_INDEX } from '../../constants'; import { agentPolicyService } from '../agent_policy'; diff --git a/x-pack/plugins/fleet/server/services/artifacts/artifacts.ts b/x-pack/plugins/fleet/server/services/artifacts/artifacts.ts index 02a0d5669d967..2a5f39c4e8a26 100644 --- a/x-pack/plugins/fleet/server/services/artifacts/artifacts.ts +++ b/x-pack/plugins/fleet/server/services/artifacts/artifacts.ts @@ -16,7 +16,7 @@ import type { ElasticsearchClient } from 'kibana/server'; import type { ListResult } from '../../../common'; import { FLEET_SERVER_ARTIFACTS_INDEX } from '../../../common'; -import type { ESSearchHit, ESSearchResponse } from '../../../../../typings/elasticsearch'; +import type { ESSearchHit, ESSearchResponse } from '../../../../../../typings/elasticsearch'; import { ArtifactsElasticsearchError } from '../../errors'; diff --git a/x-pack/plugins/fleet/server/services/artifacts/mappings.ts b/x-pack/plugins/fleet/server/services/artifacts/mappings.ts index bdc50d444c862..863eff5aac74c 100644 --- a/x-pack/plugins/fleet/server/services/artifacts/mappings.ts +++ b/x-pack/plugins/fleet/server/services/artifacts/mappings.ts @@ -5,7 +5,7 @@ * 2.0. */ -import type { ESSearchHit } from '../../../../../typings/elasticsearch'; +import type { ESSearchHit } from '../../../../../../typings/elasticsearch'; import type { Artifact, ArtifactElasticsearchProperties } from './types'; import { ARTIFACT_DOWNLOAD_RELATIVE_PATH } from './constants'; diff --git a/x-pack/plugins/fleet/server/services/artifacts/mocks.ts b/x-pack/plugins/fleet/server/services/artifacts/mocks.ts index a89d6913c680c..b1e01208a24ca 100644 --- a/x-pack/plugins/fleet/server/services/artifacts/mocks.ts +++ b/x-pack/plugins/fleet/server/services/artifacts/mocks.ts @@ -10,7 +10,7 @@ import type { ApiResponse } from '@elastic/elasticsearch'; import { ResponseError } from '@elastic/elasticsearch/lib/errors'; import { elasticsearchServiceMock } from '../../../../../../src/core/server/mocks'; -import type { ESSearchHit, ESSearchResponse } from '../../../../../typings/elasticsearch'; +import type { ESSearchHit, ESSearchResponse } from '../../../../../../typings/elasticsearch'; import type { Artifact, ArtifactElasticsearchProperties, ArtifactsClientInterface } from './types'; diff --git a/x-pack/plugins/fleet/tsconfig.json b/x-pack/plugins/fleet/tsconfig.json index e6dc206912c4b..a20d82de3c859 100644 --- a/x-pack/plugins/fleet/tsconfig.json +++ b/x-pack/plugins/fleet/tsconfig.json @@ -15,7 +15,7 @@ "server/**/*.json", "scripts/**/*", "package.json", - "../../typings/**/*" + "../../../typings/**/*" ], "references": [ { "path": "../../../src/core/tsconfig.json" }, diff --git a/x-pack/plugins/global_search_providers/tsconfig.json b/x-pack/plugins/global_search_providers/tsconfig.json index 381d314b2e530..f2759954a6845 100644 --- a/x-pack/plugins/global_search_providers/tsconfig.json +++ b/x-pack/plugins/global_search_providers/tsconfig.json @@ -10,7 +10,7 @@ "include": [ "public/**/*", "server/**/*", - "../../typings/**/*", + "../../../typings/**/*", ], "references": [ { "path": "../../../src/core/tsconfig.json" }, diff --git a/x-pack/plugins/grokdebugger/tsconfig.json b/x-pack/plugins/grokdebugger/tsconfig.json index 34cf8d74c0024..51d2d0b6db0ea 100644 --- a/x-pack/plugins/grokdebugger/tsconfig.json +++ b/x-pack/plugins/grokdebugger/tsconfig.json @@ -11,7 +11,7 @@ "common/**/*", "public/**/*", "server/**/*", - "../../typings/**/*", + "../../../typings/**/*", ], "references": [ { "path": "../../../src/core/tsconfig.json" }, diff --git a/x-pack/plugins/index_lifecycle_management/tsconfig.json b/x-pack/plugins/index_lifecycle_management/tsconfig.json index 73dcc62132cbf..75bd775a36749 100644 --- a/x-pack/plugins/index_lifecycle_management/tsconfig.json +++ b/x-pack/plugins/index_lifecycle_management/tsconfig.json @@ -12,7 +12,7 @@ "common/**/*", "public/**/*", "server/**/*", - "../../typings/**/*", + "../../../typings/**/*", ], "references": [ { "path": "../../../src/core/tsconfig.json" }, diff --git a/x-pack/plugins/index_management/tsconfig.json b/x-pack/plugins/index_management/tsconfig.json index 87be6cfc2d627..81a96a77cef83 100644 --- a/x-pack/plugins/index_management/tsconfig.json +++ b/x-pack/plugins/index_management/tsconfig.json @@ -13,7 +13,7 @@ "public/**/*", "server/**/*", "test/**/*", - "../../typings/**/*", + "../../../typings/**/*", ], "references": [ { "path": "../../../src/core/tsconfig.json" }, diff --git a/x-pack/plugins/infra/tsconfig.json b/x-pack/plugins/infra/tsconfig.json index 026da311192d2..765af7974a2f1 100644 --- a/x-pack/plugins/infra/tsconfig.json +++ b/x-pack/plugins/infra/tsconfig.json @@ -8,7 +8,7 @@ "declarationMap": true }, "include": [ - "../../typings/**/*", + "../../../typings/**/*", "common/**/*", "public/**/*", "scripts/**/*", diff --git a/x-pack/plugins/ingest_pipelines/tsconfig.json b/x-pack/plugins/ingest_pipelines/tsconfig.json index 5d78992600e81..a248bc9f337fe 100644 --- a/x-pack/plugins/ingest_pipelines/tsconfig.json +++ b/x-pack/plugins/ingest_pipelines/tsconfig.json @@ -12,7 +12,7 @@ "public/**/*", "server/**/*", "__jest__/**/*", - "../../typings/**/*" + "../../../typings/**/*" ], "references": [ { "path": "../../../src/core/tsconfig.json" }, diff --git a/x-pack/plugins/lens/server/routes/field_stats.ts b/x-pack/plugins/lens/server/routes/field_stats.ts index 3b293f9af7f28..49ea8c2076f7a 100644 --- a/x-pack/plugins/lens/server/routes/field_stats.ts +++ b/x-pack/plugins/lens/server/routes/field_stats.ts @@ -11,7 +11,7 @@ import { schema } from '@kbn/config-schema'; import { CoreSetup } from 'src/core/server'; import { IFieldType } from 'src/plugins/data/common'; import { SavedObjectNotFound } from '../../../../../src/plugins/kibana_utils/common'; -import { ESSearchResponse } from '../../../../typings/elasticsearch'; +import { ESSearchResponse } from '../../../../../typings/elasticsearch'; import { FieldStatsResponse, BASE_API_URL } from '../../common'; import { PluginStartContract } from '../plugin'; diff --git a/x-pack/plugins/lens/server/usage/task.ts b/x-pack/plugins/lens/server/usage/task.ts index f9296e0a41ca3..d583e1628cbe8 100644 --- a/x-pack/plugins/lens/server/usage/task.ts +++ b/x-pack/plugins/lens/server/usage/task.ts @@ -16,7 +16,7 @@ import { } from '../../../task_manager/server'; import { getVisualizationCounts } from './visualization_counts'; -import { ESSearchResponse } from '../../../../typings/elasticsearch'; +import { ESSearchResponse } from '../../../../../typings/elasticsearch'; // This task is responsible for running daily and aggregating all the Lens click event objects // into daily rolled-up documents, which will be used in reporting click stats diff --git a/x-pack/plugins/lens/tsconfig.json b/x-pack/plugins/lens/tsconfig.json index 636d2f44b0217..dfddccbf20392 100644 --- a/x-pack/plugins/lens/tsconfig.json +++ b/x-pack/plugins/lens/tsconfig.json @@ -13,7 +13,7 @@ "common/**/*", "public/**/*", "server/**/*", - "../../typings/**/*" + "../../../typings/**/*" ], "references": [ { "path": "../../../src/core/tsconfig.json" }, diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/get_threshold_bucket_filters.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/get_threshold_bucket_filters.ts index 208727944765c..73068a73a38a3 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/get_threshold_bucket_filters.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/get_threshold_bucket_filters.ts @@ -6,7 +6,7 @@ */ import { Filter } from 'src/plugins/data/common'; -import { ESFilter } from '../../../../../../../typings/elasticsearch'; +import { ESFilter } from '../../../../../../../../typings/elasticsearch'; import { ThresholdSignalHistory, ThresholdSignalHistoryRecord } from '../types'; export const getThresholdBucketFilters = async ({ diff --git a/x-pack/plugins/security_solution/server/lib/machine_learning/index.test.ts b/x-pack/plugins/security_solution/server/lib/machine_learning/index.test.ts index 1f49ac7bf5019..30dd5adf6123b 100644 --- a/x-pack/plugins/security_solution/server/lib/machine_learning/index.test.ts +++ b/x-pack/plugins/security_solution/server/lib/machine_learning/index.test.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { ESFilter } from '../../../../../typings/elasticsearch'; +import { ESFilter } from '../../../../../../typings/elasticsearch'; import { getExceptionListItemSchemaMock } from '../../../../lists/common/schemas/response/exception_list_item_schema.mock'; import { getAnomalies, AnomaliesSearchParams } from '.'; diff --git a/x-pack/plugins/snapshot_restore/tsconfig.json b/x-pack/plugins/snapshot_restore/tsconfig.json index 5d962c7c17aff..39beda02977e1 100644 --- a/x-pack/plugins/snapshot_restore/tsconfig.json +++ b/x-pack/plugins/snapshot_restore/tsconfig.json @@ -13,7 +13,7 @@ "public/**/*", "server/**/*", "test/**/*", - "../../typings/**/*", + "../../../typings/**/*", ], "references": [ { "path": "../../../src/core/tsconfig.json" }, diff --git a/x-pack/plugins/stack_alerts/common/build_sorted_events_query.ts b/x-pack/plugins/stack_alerts/common/build_sorted_events_query.ts index c7ed7df38be0f..add3e1f59e20e 100644 --- a/x-pack/plugins/stack_alerts/common/build_sorted_events_query.ts +++ b/x-pack/plugins/stack_alerts/common/build_sorted_events_query.ts @@ -5,8 +5,8 @@ * 2.0. */ -import { ESSearchBody, ESSearchRequest } from '../../../typings/elasticsearch'; -import { SortOrder } from '../../../typings/elasticsearch/aggregations'; +import { ESSearchBody, ESSearchRequest } from '../../../../typings/elasticsearch'; +import { SortOrder } from '../../../../typings/elasticsearch/aggregations'; type BuildSortedEventsQueryOpts = Pick & Pick, 'index' | 'size'>; diff --git a/x-pack/plugins/stack_alerts/server/alert_types/es_query/action_context.ts b/x-pack/plugins/stack_alerts/server/alert_types/es_query/action_context.ts index 617da80bcc8d7..f0596a9fcb964 100644 --- a/x-pack/plugins/stack_alerts/server/alert_types/es_query/action_context.ts +++ b/x-pack/plugins/stack_alerts/server/alert_types/es_query/action_context.ts @@ -8,7 +8,7 @@ import { i18n } from '@kbn/i18n'; import { AlertExecutorOptions, AlertInstanceContext } from '../../../../alerting/server'; import { EsQueryAlertParams } from './alert_type_params'; -import { ESSearchHit } from '../../../../../typings/elasticsearch'; +import { ESSearchHit } from '../../../../../../typings/elasticsearch'; // alert type context provided to actions diff --git a/x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type.test.ts b/x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type.test.ts index 86e07fa64af66..4adc7c05821f9 100644 --- a/x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type.test.ts +++ b/x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type.test.ts @@ -17,7 +17,7 @@ import { loggingSystemMock } from '../../../../../../src/core/server/mocks'; import { getAlertType, ConditionMetAlertInstanceId, ActionGroupId } from './alert_type'; import { EsQueryAlertParams, EsQueryAlertState } from './alert_type_params'; import { ActionContext } from './action_context'; -import { ESSearchResponse, ESSearchRequest } from '../../../../../typings/elasticsearch'; +import { ESSearchResponse, ESSearchRequest } from '../../../../../../typings/elasticsearch'; describe('alertType', () => { const logger = loggingSystemMock.create().get(); diff --git a/x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type.ts b/x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type.ts index 74af8b0038a3a..7734c59425a16 100644 --- a/x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type.ts +++ b/x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type.ts @@ -7,7 +7,7 @@ import { i18n } from '@kbn/i18n'; import { Logger } from 'src/core/server'; -import { ESSearchResponse } from '../../../../../typings/elasticsearch'; +import { ESSearchResponse } from '../../../../../../typings/elasticsearch'; import { AlertType, AlertExecutorOptions } from '../../types'; import { ActionContext, EsQueryAlertActionContext, addMessages } from './action_context'; import { @@ -19,7 +19,7 @@ import { STACK_ALERTS_FEATURE_ID } from '../../../common'; import { ComparatorFns, getHumanReadableComparator } from '../lib'; import { parseDuration } from '../../../../alerting/server'; import { buildSortedEventsQuery } from '../../../common/build_sorted_events_query'; -import { ESSearchHit } from '../../../../../typings/elasticsearch'; +import { ESSearchHit } from '../../../../../../typings/elasticsearch'; export const ES_QUERY_ID = '.es-query'; diff --git a/x-pack/plugins/task_manager/server/monitoring/workload_statistics.test.ts b/x-pack/plugins/task_manager/server/monitoring/workload_statistics.test.ts index a5a7954204492..46d8478a7ecfa 100644 --- a/x-pack/plugins/task_manager/server/monitoring/workload_statistics.test.ts +++ b/x-pack/plugins/task_manager/server/monitoring/workload_statistics.test.ts @@ -14,7 +14,7 @@ import { estimateRecurringTaskScheduling, } from './workload_statistics'; import { ConcreteTaskInstance } from '../task'; -import { AggregationResultOf, ESSearchResponse } from '../../../../typings/elasticsearch'; +import { AggregationResultOf, ESSearchResponse } from '../../../../../typings/elasticsearch'; import { times } from 'lodash'; import { taskStoreMock } from '../task_store.mock'; import { of, Subject } from 'rxjs'; diff --git a/x-pack/plugins/task_manager/server/monitoring/workload_statistics.ts b/x-pack/plugins/task_manager/server/monitoring/workload_statistics.ts index 75331615e3f07..08850c8650519 100644 --- a/x-pack/plugins/task_manager/server/monitoring/workload_statistics.ts +++ b/x-pack/plugins/task_manager/server/monitoring/workload_statistics.ts @@ -12,7 +12,7 @@ import { JsonObject } from 'src/plugins/kibana_utils/common'; import { keyBy, mapValues } from 'lodash'; import { AggregatedStatProvider } from './runtime_statistics_aggregator'; import { parseIntervalAsSecond, asInterval, parseIntervalAsMillisecond } from '../lib/intervals'; -import { AggregationResultOf } from '../../../../typings/elasticsearch'; +import { AggregationResultOf } from '../../../../../typings/elasticsearch'; import { HealthStatus } from './monitoring_stats_stream'; import { TaskStore } from '../task_store'; diff --git a/x-pack/plugins/task_manager/server/task_store.ts b/x-pack/plugins/task_manager/server/task_store.ts index 0b54f2779065f..083ce1507e6e5 100644 --- a/x-pack/plugins/task_manager/server/task_store.ts +++ b/x-pack/plugins/task_manager/server/task_store.ts @@ -31,7 +31,7 @@ import { } from './task'; import { TaskTypeDictionary } from './task_type_dictionary'; -import { ESSearchResponse, ESSearchBody } from '../../../typings/elasticsearch'; +import { ESSearchResponse, ESSearchBody } from '../../../../typings/elasticsearch'; export interface StoreOpts { esClient: ElasticsearchClient; diff --git a/x-pack/plugins/ui_actions_enhanced/tsconfig.json b/x-pack/plugins/ui_actions_enhanced/tsconfig.json index af24c30389b8b..39318770126e5 100644 --- a/x-pack/plugins/ui_actions_enhanced/tsconfig.json +++ b/x-pack/plugins/ui_actions_enhanced/tsconfig.json @@ -11,7 +11,7 @@ "public/**/*", "server/**/*", "common/**/*", - "../../typings/**/*" + "../../../typings/**/*" ], "references": [ { "path": "../../../src/core/tsconfig.json" }, diff --git a/x-pack/plugins/uptime/server/lib/lib.ts b/x-pack/plugins/uptime/server/lib/lib.ts index 5ac56d14c171d..1a7cef504b019 100644 --- a/x-pack/plugins/uptime/server/lib/lib.ts +++ b/x-pack/plugins/uptime/server/lib/lib.ts @@ -16,7 +16,7 @@ import { UMBackendFrameworkAdapter } from './adapters'; import { UMLicenseCheck } from './domains'; import { UptimeRequests } from './requests'; import { savedObjectsAdapter } from './saved_objects'; -import { ESSearchResponse } from '../../../../typings/elasticsearch'; +import { ESSearchResponse } from '../../../../../typings/elasticsearch'; export interface UMDomainLibs { requests: UptimeRequests; diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor_availability.ts b/x-pack/plugins/uptime/server/lib/requests/get_monitor_availability.ts index 26b7c84b17c98..f6195db6f6bce 100644 --- a/x-pack/plugins/uptime/server/lib/requests/get_monitor_availability.ts +++ b/x-pack/plugins/uptime/server/lib/requests/get_monitor_availability.ts @@ -8,7 +8,7 @@ import { UMElasticsearchQueryFn } from '../adapters'; import { GetMonitorAvailabilityParams, Ping } from '../../../common/runtime_types'; import { AfterKey } from './get_monitor_status'; -import { SortOptions } from '../../../../../typings/elasticsearch'; +import { SortOptions } from '../../../../../../typings/elasticsearch'; export interface AvailabilityKey { monitorId: string; diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor_details.ts b/x-pack/plugins/uptime/server/lib/requests/get_monitor_details.ts index 7034fef8a9e3b..e4b8fac3b44dd 100644 --- a/x-pack/plugins/uptime/server/lib/requests/get_monitor_details.ts +++ b/x-pack/plugins/uptime/server/lib/requests/get_monitor_details.ts @@ -9,7 +9,7 @@ import { UMElasticsearchQueryFn } from '../adapters'; import { MonitorDetails, Ping } from '../../../common/runtime_types'; import { formatFilterString } from '../alerts/status_check'; import { UptimeESClient } from '../lib'; -import { ESSearchBody } from '../../../../../typings/elasticsearch'; +import { ESSearchBody } from '../../../../../../typings/elasticsearch'; export interface GetMonitorDetailsParams { monitorId: string; diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor_locations.ts b/x-pack/plugins/uptime/server/lib/requests/get_monitor_locations.ts index 64f62de6397ce..24e7376160b67 100644 --- a/x-pack/plugins/uptime/server/lib/requests/get_monitor_locations.ts +++ b/x-pack/plugins/uptime/server/lib/requests/get_monitor_locations.ts @@ -8,7 +8,7 @@ import { UMElasticsearchQueryFn } from '../adapters'; import { MonitorLocations, MonitorLocation } from '../../../common/runtime_types'; import { UNNAMED_LOCATION } from '../../../common/constants'; -import { SortOptions } from '../../../../../typings/elasticsearch'; +import { SortOptions } from '../../../../../../typings/elasticsearch'; /** * Fetch data for the monitor page title. diff --git a/x-pack/plugins/uptime/server/lib/requests/get_snapshot_counts.ts b/x-pack/plugins/uptime/server/lib/requests/get_snapshot_counts.ts index 2999f9ebca065..0e47f2a3d56c2 100644 --- a/x-pack/plugins/uptime/server/lib/requests/get_snapshot_counts.ts +++ b/x-pack/plugins/uptime/server/lib/requests/get_snapshot_counts.ts @@ -9,7 +9,7 @@ import { UMElasticsearchQueryFn } from '../adapters'; import { CONTEXT_DEFAULTS } from '../../../common/constants'; import { Snapshot } from '../../../common/runtime_types'; import { QueryContext } from './search'; -import { ESFilter } from '../../../../../typings/elasticsearch'; +import { ESFilter } from '../../../../../../typings/elasticsearch'; export interface GetSnapshotCountParams { dateRangeStart: string; diff --git a/x-pack/plugins/uptime/server/lib/requests/search/query_context.ts b/x-pack/plugins/uptime/server/lib/requests/search/query_context.ts index f377ba74dc8af..d749460ba997c 100644 --- a/x-pack/plugins/uptime/server/lib/requests/search/query_context.ts +++ b/x-pack/plugins/uptime/server/lib/requests/search/query_context.ts @@ -10,7 +10,7 @@ import { CursorPagination } from './types'; import { parseRelativeDate } from '../../helper'; import { CursorDirection, SortOrder } from '../../../../common/runtime_types'; import { UptimeESClient } from '../../lib'; -import { ESFilter } from '../../../../../../typings/elasticsearch'; +import { ESFilter } from '../../../../../../../typings/elasticsearch'; export class QueryContext { callES: UptimeESClient; diff --git a/x-pack/plugins/watcher/tsconfig.json b/x-pack/plugins/watcher/tsconfig.json index 4680847ba486d..e8dabe8cd40a9 100644 --- a/x-pack/plugins/watcher/tsconfig.json +++ b/x-pack/plugins/watcher/tsconfig.json @@ -13,7 +13,7 @@ "common/**/*", "tests_client_integration/**/*", "__fixtures__/*", - "../../typings/**/*" + "../../../typings/**/*" ], "references": [ { "path": "../../../src/core/tsconfig.json" }, diff --git a/x-pack/test/observability_api_integration/trial/tests/annotations.ts b/x-pack/test/observability_api_integration/trial/tests/annotations.ts index ef4e34a2818de..928d160a5df9e 100644 --- a/x-pack/test/observability_api_integration/trial/tests/annotations.ts +++ b/x-pack/test/observability_api_integration/trial/tests/annotations.ts @@ -8,7 +8,7 @@ import expect from '@kbn/expect'; import { JsonObject } from 'src/plugins/kibana_utils/common'; import { Annotation } from '../../../../plugins/observability/common/annotations'; -import { ESSearchHit } from '../../../../typings/elasticsearch'; +import { ESSearchHit } from '../../../../../typings/elasticsearch'; import { FtrProviderContext } from '../../common/ftr_provider_context'; const DEFAULT_INDEX_NAME = 'observability-annotations'; diff --git a/x-pack/test/tsconfig.json b/x-pack/test/tsconfig.json index 8ac8bdad6dfd0..8757b39a0b3ac 100644 --- a/x-pack/test/tsconfig.json +++ b/x-pack/test/tsconfig.json @@ -3,9 +3,9 @@ "compilerOptions": { // overhead is too significant "incremental": false, - "types": ["node", "flot"] + "types": ["node"] }, - "include": ["**/*", "../typings/**/*", "../../packages/kbn-test/types/ftr_globals/**/*"], + "include": ["**/*", "../../typings/**/*", "../../packages/kbn-test/types/ftr_globals/**/*"], "references": [ { "path": "../../src/core/tsconfig.json" }, { "path": "../../src/plugins/bfetch/tsconfig.json" }, diff --git a/x-pack/tsconfig.json b/x-pack/tsconfig.json deleted file mode 100644 index aaf014ea6165c..0000000000000 --- a/x-pack/tsconfig.json +++ /dev/null @@ -1,117 +0,0 @@ -{ - "extends": "../tsconfig.base.json", - "include": [ - "mocks.ts", - "typings/**/*", - "tasks/**/*", - "plugins/cases/**/*", - "plugins/lists/**/*", - "plugins/security_solution/**/*" - ], - "exclude": [ - "test/**/*", - "plugins/apm/e2e/cypress/**/*", - "plugins/apm/ftr_e2e/**/*", - "plugins/apm/scripts/**/*", - "plugins/security_solution/cypress/**/*" - ], - "compilerOptions": { - // overhead is too significant - "incremental": false - }, - "references": [ - { "path": "../src/core/tsconfig.json" }, - { "path": "../src/plugins/bfetch/tsconfig.json" }, - { "path": "../src/plugins/charts/tsconfig.json" }, - { "path": "../src/plugins/console/tsconfig.json" }, - { "path": "../src/plugins/dashboard/tsconfig.json" }, - { "path": "../src/plugins/data/tsconfig.json" }, - { "path": "../src/plugins/dev_tools/tsconfig.json" }, - { "path": "../src/plugins/discover/tsconfig.json" }, - { "path": "../src/plugins/embeddable/tsconfig.json" }, - { "path": "../src/plugins/es_ui_shared/tsconfig.json" }, - { "path": "../src/plugins/expressions/tsconfig.json" }, - { "path": "../src/plugins/home/tsconfig.json" }, - { "path": "../src/plugins/index_pattern_management/tsconfig.json" }, - { "path": "../src/plugins/inspector/tsconfig.json" }, - { "path": "../src/plugins/kibana_legacy/tsconfig.json" }, - { "path": "../src/plugins/kibana_overview/tsconfig.json" }, - { "path": "../src/plugins/kibana_react/tsconfig.json" }, - { "path": "../src/plugins/kibana_usage_collection/tsconfig.json" }, - { "path": "../src/plugins/kibana_utils/tsconfig.json" }, - { "path": "../src/plugins/legacy_export/tsconfig.json" }, - { "path": "../src/plugins/management/tsconfig.json" }, - { "path": "../src/plugins/navigation/tsconfig.json" }, - { "path": "../src/plugins/newsfeed/tsconfig.json" }, - { "path": "../src/plugins/presentation_util/tsconfig.json" }, - { "path": "../src/plugins/saved_objects_management/tsconfig.json" }, - { "path": "../src/plugins/saved_objects_tagging_oss/tsconfig.json" }, - { "path": "../src/plugins/saved_objects/tsconfig.json" }, - { "path": "../src/plugins/security_oss/tsconfig.json" }, - { "path": "../src/plugins/share/tsconfig.json" }, - { "path": "../src/plugins/telemetry_collection_manager/tsconfig.json" }, - { "path": "../src/plugins/telemetry_management_section/tsconfig.json" }, - { "path": "../src/plugins/telemetry/tsconfig.json" }, - { "path": "../src/plugins/ui_actions/tsconfig.json" }, - { "path": "../src/plugins/url_forwarding/tsconfig.json" }, - { "path": "../src/plugins/usage_collection/tsconfig.json" }, - { "path": "./plugins/actions/tsconfig.json" }, - { "path": "./plugins/alerting/tsconfig.json" }, - { "path": "./plugins/apm/tsconfig.json" }, - { "path": "./plugins/beats_management/tsconfig.json" }, - { "path": "./plugins/canvas/tsconfig.json" }, - { "path": "./plugins/cloud/tsconfig.json" }, - { "path": "./plugins/console_extensions/tsconfig.json" }, - { "path": "./plugins/data_enhanced/tsconfig.json" }, - { "path": "./plugins/dashboard_mode/tsconfig.json" }, - { "path": "./plugins/discover_enhanced/tsconfig.json" }, - { "path": "./plugins/drilldowns/url_drilldown/tsconfig.json" }, - { "path": "./plugins/embeddable_enhanced/tsconfig.json" }, - { "path": "./plugins/encrypted_saved_objects/tsconfig.json" }, - { "path": "./plugins/enterprise_search/tsconfig.json" }, - { "path": "./plugins/event_log/tsconfig.json" }, - { "path": "./plugins/features/tsconfig.json" }, - { "path": "./plugins/file_upload/tsconfig.json" }, - { "path": "./plugins/fleet/tsconfig.json" }, - { "path": "./plugins/global_search_bar/tsconfig.json" }, - { "path": "./plugins/global_search_providers/tsconfig.json" }, - { "path": "./plugins/global_search/tsconfig.json" }, - { "path": "./plugins/graph/tsconfig.json" }, - { "path": "./plugins/grokdebugger/tsconfig.json" }, - { "path": "./plugins/infra/tsconfig.json" }, - { "path": "./plugins/ingest_pipelines/tsconfig.json" }, - { "path": "./plugins/lens/tsconfig.json" }, - { "path": "./plugins/license_management/tsconfig.json" }, - { "path": "./plugins/licensing/tsconfig.json" }, - { "path": "./plugins/logstash/tsconfig.json" }, - { "path": "./plugins/maps_legacy_licensing/tsconfig.json" }, - { "path": "./plugins/maps/tsconfig.json" }, - { "path": "./plugins/ml/tsconfig.json" }, - { "path": "./plugins/monitoring/tsconfig.json" }, - { "path": "./plugins/observability/tsconfig.json" }, - { "path": "./plugins/osquery/tsconfig.json" }, - { "path": "./plugins/painless_lab/tsconfig.json" }, - { "path": "./plugins/saved_objects_tagging/tsconfig.json" }, - { "path": "./plugins/searchprofiler/tsconfig.json" }, - { "path": "./plugins/security/tsconfig.json" }, - { "path": "./plugins/snapshot_restore/tsconfig.json" }, - { "path": "./plugins/spaces/tsconfig.json" }, - { "path": "./plugins/stack_alerts/tsconfig.json" }, - { "path": "./plugins/task_manager/tsconfig.json" }, - { "path": "./plugins/telemetry_collection_xpack/tsconfig.json" }, - { "path": "./plugins/transform/tsconfig.json" }, - { "path": "./plugins/translations/tsconfig.json" }, - { "path": "./plugins/triggers_actions_ui/tsconfig.json" }, - { "path": "./plugins/ui_actions_enhanced/tsconfig.json" }, - { "path": "./plugins/upgrade_assistant/tsconfig.json" }, - { "path": "./plugins/runtime_fields/tsconfig.json" }, - { "path": "./plugins/index_management/tsconfig.json" }, - { "path": "./plugins/watcher/tsconfig.json" }, - { "path": "./plugins/rollup/tsconfig.json" }, - { "path": "./plugins/remote_clusters/tsconfig.json" }, - { "path": "./plugins/cross_cluster_replication/tsconfig.json"}, - { "path": "./plugins/index_lifecycle_management/tsconfig.json"}, - { "path": "./plugins/uptime/tsconfig.json" }, - { "path": "./plugins/xpack_legacy/tsconfig.json" } - ] -} diff --git a/x-pack/typings/@elastic/eui/index.d.ts b/x-pack/typings/@elastic/eui/index.d.ts deleted file mode 100644 index 7664eaa20e432..0000000000000 --- a/x-pack/typings/@elastic/eui/index.d.ts +++ /dev/null @@ -1,16 +0,0 @@ -/* - * 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. - */ - -// TODO: Remove once typescript definitions are in EUI - -declare module '@elastic/eui/lib/services' { - export const RIGHT_ALIGNMENT: any; -} - -declare module '@elastic/eui/lib/services/format' { - export const dateFormatAliases: any; -} diff --git a/x-pack/typings/cytoscape_dagre.d.ts b/x-pack/typings/cytoscape_dagre.d.ts deleted file mode 100644 index ddc991c9fbd0a..0000000000000 --- a/x-pack/typings/cytoscape_dagre.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/* - * 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. - */ - -declare module 'cytoscape-dagre'; diff --git a/x-pack/typings/index.d.ts b/x-pack/typings/index.d.ts deleted file mode 100644 index 171171de5561f..0000000000000 --- a/x-pack/typings/index.d.ts +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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. - */ - -declare module '*.html' { - const template: string; - // eslint-disable-next-line import/no-default-export - export default template; -} - -declare module '*.png' { - const content: string; - // eslint-disable-next-line import/no-default-export - export default content; -} - -declare module '*.svg' { - const content: string; - // eslint-disable-next-line import/no-default-export - export default content; -} - -declare module 'axios/lib/adapters/xhr'; - -// Storybook references this module. It's @ts-ignored in the codebase but when -// built into its dist it strips that out. Add it here to avoid a type checking -// error. -// -// See https://github.com/storybookjs/storybook/issues/11684 -declare module 'react-syntax-highlighter/dist/cjs/create-element'; diff --git a/x-pack/typings/rison_node.d.ts b/x-pack/typings/rison_node.d.ts deleted file mode 100644 index b24300c100d8b..0000000000000 --- a/x-pack/typings/rison_node.d.ts +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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. - */ - -declare module 'rison-node' { - export type RisonValue = undefined | null | boolean | number | string | RisonObject | RisonArray; - - // eslint-disable-next-line @typescript-eslint/no-empty-interface - export interface RisonArray extends Array {} - - export interface RisonObject { - [key: string]: RisonValue; - } - - export const decode: (input: string) => RisonValue; - - // eslint-disable-next-line @typescript-eslint/naming-convention - export const decode_object: (input: string) => RisonObject; - - export const encode: (input: Input) => string; - - // eslint-disable-next-line @typescript-eslint/naming-convention - export const encode_object: (input: Input) => string; - - // eslint-disable-next-line @typescript-eslint/naming-convention - export const encode_array: (input: Input) => string; -} From 09f90d86510d9620c254f8bd3ebc7b05931ef73f Mon Sep 17 00:00:00 2001 From: Mikhail Shustov Date: Tue, 16 Mar 2021 15:22:09 +0100 Subject: [PATCH 14/24] [Canvas] Cleanup types in lib (#94517) * fix get_legend_config error in canvas/lib/index * convert resolve_dataurl to ts to fix canvas/lib/index failure * convert expression_form_handler to ts to fix canvas/lib/index failure * convert canvas lib/error into ts * canvas: do not compile json file due to effect on performance * remove type. it is not exported and inferred as any implicitly * fix datatable error in lib/index.d.ts file * fix url resolver * case manually to avoid incompatibility error --- .../canvas_plugin_src/functions/common/image.ts | 3 +-- .../functions/common/repeat_image.ts | 1 - .../functions/common/revealImage.ts | 5 ++--- .../functions/server/demodata/index.ts | 2 -- .../common/lib/datatable/{index.js => index.ts} | 2 +- .../common/lib/datatable/{query.js => query.ts} | 12 ++++++------ .../canvas/common/lib/{errors.js => errors.ts} | 14 +++++++++----- ...orm_handlers.js => expression_form_handlers.ts} | 4 +++- .../{get_legend_config.js => get_legend_config.ts} | 13 ++++++++++--- x-pack/plugins/canvas/common/lib/index.ts | 5 ----- .../lib/{resolve_dataurl.js => resolve_dataurl.ts} | 9 ++++++--- x-pack/plugins/canvas/public/functions/pie.ts | 1 - .../plugins/canvas/public/functions/plot/index.ts | 1 - x-pack/plugins/canvas/shareable_runtime/types.ts | 4 +--- x-pack/plugins/canvas/tsconfig.json | 12 ++++-------- 15 files changed, 43 insertions(+), 45 deletions(-) rename x-pack/plugins/canvas/common/lib/datatable/{index.js => index.ts} (85%) rename x-pack/plugins/canvas/common/lib/datatable/{query.js => query.ts} (73%) rename x-pack/plugins/canvas/common/lib/{errors.js => errors.ts} (73%) rename x-pack/plugins/canvas/common/lib/{expression_form_handlers.js => expression_form_handlers.ts} (82%) rename x-pack/plugins/canvas/common/lib/{get_legend_config.js => get_legend_config.ts} (66%) rename x-pack/plugins/canvas/common/lib/{resolve_dataurl.js => resolve_dataurl.ts} (75%) diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/image.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/image.ts index 7c4b973511672..b4d067280cb69 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/image.ts +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/image.ts @@ -8,7 +8,6 @@ import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common'; import { getFunctionHelp, getFunctionErrors } from '../../../i18n'; -// @ts-expect-error untyped local import { resolveWithMissingImage } from '../../../common/lib/resolve_dataurl'; import { elasticLogo } from '../../lib/elastic_logo'; @@ -64,7 +63,7 @@ export function image(): ExpressionFunctionDefinition<'image', null, Arguments, return { type: 'image', mode: modeStyle, - dataurl: resolveWithMissingImage(dataurl, elasticLogo), + dataurl: resolveWithMissingImage(dataurl, elasticLogo) as string, }; }, }; diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/repeat_image.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/repeat_image.ts index c685a7aab84a8..6e62139e4da0d 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/repeat_image.ts +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/repeat_image.ts @@ -6,7 +6,6 @@ */ import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common'; -// @ts-expect-error untyped local import { resolveWithMissingImage } from '../../../common/lib/resolve_dataurl'; import { elasticOutline } from '../../lib/elastic_outline'; import { Render } from '../../../types'; diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/revealImage.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/revealImage.ts index 1c9f2c7c1e0f9..91d70609ab708 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/revealImage.ts +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/revealImage.ts @@ -6,7 +6,6 @@ */ import { ExpressionFunctionDefinition, ExpressionValueRender } from 'src/plugins/expressions'; -// @ts-expect-error untyped local import { resolveWithMissingImage } from '../../../common/lib/resolve_dataurl'; import { elasticOutline } from '../../lib/elastic_outline'; import { getFunctionHelp, getFunctionErrors } from '../../../i18n'; @@ -75,8 +74,8 @@ export function revealImage(): ExpressionFunctionDefinition< value: { percent, ...args, - image: resolveWithMissingImage(args.image, elasticOutline), - emptyImage: resolveWithMissingImage(args.emptyImage), + image: resolveWithMissingImage(args.image, elasticOutline) as string, + emptyImage: resolveWithMissingImage(args.emptyImage) as string, }, }; }, diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/index.ts index bdaeb9cb0929f..5dc1790e67d7d 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/index.ts +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/index.ts @@ -7,7 +7,6 @@ import { sortBy } from 'lodash'; import { ExpressionFunctionDefinition } from 'src/plugins/expressions'; -// @ts-expect-error unconverted lib file import { queryDatatable } from '../../../../common/lib/datatable/query'; import { DemoRows } from './demo_rows_types'; import { getDemoRows } from './get_demo_rows'; @@ -62,7 +61,6 @@ export function demodata(): ExpressionFunctionDefinition< { id: 'project', name: 'project', meta: { type: 'string' } }, { id: 'percent_uptime', name: 'percent_uptime', meta: { type: 'number' } }, ], - // @ts-expect-error invalid json mock rows: sortBy(demoRows, 'time'), }; } else if (args.type === DemoRows.SHIRTS) { diff --git a/x-pack/plugins/canvas/common/lib/datatable/index.js b/x-pack/plugins/canvas/common/lib/datatable/index.ts similarity index 85% rename from x-pack/plugins/canvas/common/lib/datatable/index.js rename to x-pack/plugins/canvas/common/lib/datatable/index.ts index 66ede766e4741..a1bb7d690ec4c 100644 --- a/x-pack/plugins/canvas/common/lib/datatable/index.js +++ b/x-pack/plugins/canvas/common/lib/datatable/index.ts @@ -5,4 +5,4 @@ * 2.0. */ -export * from './query'; +export { queryDatatable } from './query'; diff --git a/x-pack/plugins/canvas/common/lib/datatable/query.js b/x-pack/plugins/canvas/common/lib/datatable/query.ts similarity index 73% rename from x-pack/plugins/canvas/common/lib/datatable/query.js rename to x-pack/plugins/canvas/common/lib/datatable/query.ts index da2219a2e2bcd..748810432bd22 100644 --- a/x-pack/plugins/canvas/common/lib/datatable/query.js +++ b/x-pack/plugins/canvas/common/lib/datatable/query.ts @@ -4,8 +4,8 @@ * 2.0; you may not use this file except in compliance with the Elastic License * 2.0. */ - -export function queryDatatable(datatable, query) { +import type { Datatable } from '../../../types'; +export function queryDatatable(datatable: Datatable, query: Record) { if (query.size) { datatable = { ...datatable, @@ -14,17 +14,17 @@ export function queryDatatable(datatable, query) { } if (query.and) { - query.and.forEach((filter) => { + query.and.forEach((filter: any) => { // handle exact matches if (filter.filterType === 'exactly') { - datatable.rows = datatable.rows.filter((row) => { + datatable.rows = datatable.rows.filter((row: any) => { return row[filter.column] === filter.value; }); } // handle time filters if (filter.filterType === 'time') { - const columnNames = datatable.columns.map((col) => col.name); + const columnNames = datatable.columns.map((col: any) => col.name); // remove row if no column match if (!columnNames.includes(filter.column)) { @@ -32,7 +32,7 @@ export function queryDatatable(datatable, query) { return; } - datatable.rows = datatable.rows.filter((row) => { + datatable.rows = datatable.rows.filter((row: any) => { const fromTime = new Date(filter.from).getTime(); const toTime = new Date(filter.to).getTime(); const rowTime = new Date(row[filter.column]).getTime(); diff --git a/x-pack/plugins/canvas/common/lib/errors.js b/x-pack/plugins/canvas/common/lib/errors.ts similarity index 73% rename from x-pack/plugins/canvas/common/lib/errors.js rename to x-pack/plugins/canvas/common/lib/errors.ts index 93678c308b5c4..f9039e7aa5ba6 100644 --- a/x-pack/plugins/canvas/common/lib/errors.js +++ b/x-pack/plugins/canvas/common/lib/errors.ts @@ -5,8 +5,10 @@ * 2.0. */ +type NewableError = (...args: any[]) => Error; + // helper to correctly set the prototype of custom error constructor -function setErrorPrototype(CustomError) { +function setErrorPrototype(CustomError: NewableError) { CustomError.prototype = Object.create(Error.prototype, { constructor: { value: Error, @@ -20,15 +22,17 @@ function setErrorPrototype(CustomError) { } // helper to create a custom error by name -function createError(name) { - function CustomError(...args) { +function createError(name: string) { + function CustomError(...args: any[]) { const instance = new Error(...args); - instance.name = this.name = name; + // @ts-expect-error this has not type annotation + const self = this as any; + instance.name = self.name = name; if (Error.captureStackTrace) { Error.captureStackTrace(instance, CustomError); } else { - Object.defineProperty(this, 'stack', { + Object.defineProperty(self, 'stack', { get() { return instance.stack; }, diff --git a/x-pack/plugins/canvas/common/lib/expression_form_handlers.js b/x-pack/plugins/canvas/common/lib/expression_form_handlers.ts similarity index 82% rename from x-pack/plugins/canvas/common/lib/expression_form_handlers.js rename to x-pack/plugins/canvas/common/lib/expression_form_handlers.ts index ac6ef62d3bba8..18e32eb635bb3 100644 --- a/x-pack/plugins/canvas/common/lib/expression_form_handlers.js +++ b/x-pack/plugins/canvas/common/lib/expression_form_handlers.ts @@ -6,12 +6,14 @@ */ export class ExpressionFormHandlers { + public destroy: () => void; + public done: () => void; constructor() { this.destroy = () => {}; this.done = () => {}; } - onDestroy(fn) { + onDestroy(fn: () => void) { this.destroy = fn; } } diff --git a/x-pack/plugins/canvas/common/lib/get_legend_config.js b/x-pack/plugins/canvas/common/lib/get_legend_config.ts similarity index 66% rename from x-pack/plugins/canvas/common/lib/get_legend_config.js rename to x-pack/plugins/canvas/common/lib/get_legend_config.ts index 6f143b26ab783..ae27d1449f140 100644 --- a/x-pack/plugins/canvas/common/lib/get_legend_config.js +++ b/x-pack/plugins/canvas/common/lib/get_legend_config.ts @@ -5,7 +5,15 @@ * 2.0. */ -export const getLegendConfig = (legend, size) => { +import { Legend } from '../../types'; +const acceptedPositions: Legend[] = [ + Legend.NORTH_WEST, + Legend.SOUTH_WEST, + Legend.NORTH_EAST, + Legend.SOUTH_EAST, +]; + +export const getLegendConfig = (legend: boolean | Legend, size: number) => { if (!legend || size < 2) { return { show: false }; } @@ -16,8 +24,7 @@ export const getLegendConfig = (legend, size) => { labelBoxBorderColor: 'transparent', }; - const acceptedPositions = ['nw', 'ne', 'sw', 'se']; - + // @ts-expect-error config.position = !legend || acceptedPositions.includes(legend) ? legend : 'ne'; return config; diff --git a/x-pack/plugins/canvas/common/lib/index.ts b/x-pack/plugins/canvas/common/lib/index.ts index f7b4de235f353..afce09c6d5ee9 100644 --- a/x-pack/plugins/canvas/common/lib/index.ts +++ b/x-pack/plugins/canvas/common/lib/index.ts @@ -5,26 +5,21 @@ * 2.0. */ -// @ts-expect-error missing local definition export * from './datatable'; export * from './autocomplete'; export * from './constants'; export * from './dataurl'; -// @ts-expect-error missing local definition export * from './errors'; -// @ts-expect-error missing local definition export * from './expression_form_handlers'; export * from './fetch'; export * from './fonts'; export * from './get_field_type'; -// @ts-expect-error missing local definition export * from './get_legend_config'; export * from './hex_to_rgb'; export * from './httpurl'; export * from './missing_asset'; export * from './palettes'; export * from './pivot_object_array'; -// @ts-expect-error missing local definition export * from './resolve_dataurl'; export * from './unquote_string'; export * from './url'; diff --git a/x-pack/plugins/canvas/common/lib/resolve_dataurl.js b/x-pack/plugins/canvas/common/lib/resolve_dataurl.ts similarity index 75% rename from x-pack/plugins/canvas/common/lib/resolve_dataurl.js rename to x-pack/plugins/canvas/common/lib/resolve_dataurl.ts index 92bb69ff9c7fb..79e49c0595355 100644 --- a/x-pack/plugins/canvas/common/lib/resolve_dataurl.js +++ b/x-pack/plugins/canvas/common/lib/resolve_dataurl.ts @@ -14,13 +14,16 @@ import { missingImage } from '../../common/lib/missing_asset'; * For example: * [{"type":"expression","chain":[{"type":"function","function":"asset","arguments":{"_":["..."]}}]}] */ -export const resolveFromArgs = (args, defaultDataurl = null) => { +export const resolveFromArgs = (args: any, defaultDataurl: string | null = null): string => { const dataurl = get(args, 'dataurl.0', null); return isValidUrl(dataurl) ? dataurl : defaultDataurl; }; -export const resolveWithMissingImage = (img, alt = null) => { - if (isValidUrl(img)) { +export const resolveWithMissingImage = ( + img: string | null, + alt: string | null = null +): string | null => { + if (img !== null && isValidUrl(img)) { return img; } if (img === null) { diff --git a/x-pack/plugins/canvas/public/functions/pie.ts b/x-pack/plugins/canvas/public/functions/pie.ts index 31da3e074152f..0840667302ebe 100644 --- a/x-pack/plugins/canvas/public/functions/pie.ts +++ b/x-pack/plugins/canvas/public/functions/pie.ts @@ -7,7 +7,6 @@ import { get, keyBy, map, groupBy } from 'lodash'; import { PaletteOutput, PaletteRegistry } from 'src/plugins/charts/public'; -// @ts-expect-error untyped local import { getLegendConfig } from '../../common/lib/get_legend_config'; import { getFunctionHelp } from '../../i18n'; import { diff --git a/x-pack/plugins/canvas/public/functions/plot/index.ts b/x-pack/plugins/canvas/public/functions/plot/index.ts index 6dff62b7d7cd7..47b9212bbc4c0 100644 --- a/x-pack/plugins/canvas/public/functions/plot/index.ts +++ b/x-pack/plugins/canvas/public/functions/plot/index.ts @@ -9,7 +9,6 @@ import { set } from '@elastic/safer-lodash-set'; import { groupBy, get, keyBy, map, sortBy } from 'lodash'; import { ExpressionFunctionDefinition, Style } from 'src/plugins/expressions'; import { PaletteOutput, PaletteRegistry } from 'src/plugins/charts/public'; -// @ts-expect-error untyped local import { getLegendConfig } from '../../../common/lib/get_legend_config'; import { getFlotAxisConfig } from './get_flot_axis_config'; import { getFontSpec } from './get_font_spec'; diff --git a/x-pack/plugins/canvas/shareable_runtime/types.ts b/x-pack/plugins/canvas/shareable_runtime/types.ts index 14449ca6d9a93..ac8f140b7f11d 100644 --- a/x-pack/plugins/canvas/shareable_runtime/types.ts +++ b/x-pack/plugins/canvas/shareable_runtime/types.ts @@ -6,8 +6,6 @@ */ import { RefObject } from 'react'; -// @ts-expect-error Unlinked Webpack Type -import ContainerStyle from 'types/interpreter'; import { SavedObject, SavedObjectAttributes } from 'src/core/public'; import { ElementPosition, CanvasPage, CanvasWorkpad, RendererSpec } from '../types'; @@ -52,7 +50,7 @@ export interface CanvasRenderable { state: 'ready' | 'error'; value: { as: string; - containerStyle: ContainerStyle; + containerStyle: any; css: string; type: 'render'; value: any; diff --git a/x-pack/plugins/canvas/tsconfig.json b/x-pack/plugins/canvas/tsconfig.json index 3e3986082e207..487b68ba3542b 100644 --- a/x-pack/plugins/canvas/tsconfig.json +++ b/x-pack/plugins/canvas/tsconfig.json @@ -5,7 +5,10 @@ "outDir": "./target/types", "emitDeclarationOnly": true, "declaration": true, - "declarationMap": true + "declarationMap": true, + + // the plugin contains some heavy json files + "resolveJsonModule": false, }, "include": [ "../../../typings/**/*", @@ -19,13 +22,6 @@ "storybook/**/*", "tasks/mocks/*", "types/**/*", - "**/*.json", - ], - "exclude": [ - // these files are too large and upset tsc, so we exclude them - "server/sample_data/*.json", - "canvas_plugin_src/functions/server/demodata/*.json", - "shareable_runtime/test/workpads/*.json", ], "references": [ { "path": "../../../src/core/tsconfig.json" }, From c9d1dbf599669fdd3e548c682d4323842197ad19 Mon Sep 17 00:00:00 2001 From: Vadim Yakhin Date: Tue, 16 Mar 2021 11:48:07 -0300 Subject: [PATCH 15/24] [Workplace Search] Misc bugfixes (#94612) * Fix incorrect copy * Fix incorrect copy * Update Box icon to match other icon sizes * Add missing spacer on connector configuration screen * Add missing spacer to Manage Source modal on Group page * Remove shadows on Security page * Align the last column content in tables to the right * Fix colors on save custom source page "Secondary" is greenish in new version is EUI, we need "subdued" * Fix link to personal dashboard * Add missing breadcrumbs to Security and Settings pages * Deduplicate Security tests on Basic and Platinum licenses * Prevent range slider from shifting to left when priority is 10 When priority is 10, the number become wider and it pushes the range slider to the left. This commit is a quick fix for that. We could improve it later by adding a proper input. * Fix i18n duplicate ID * Revert "Fix link to personal dashboard" This reverts commit 5fc3ad2937f3c3236ed140c994daf2edd178a555. --- .../components/shared/assets/source_icons/box.svg | 2 +- .../components/shared/source_row/source_row.scss | 4 ---- .../components/shared/source_row/source_row.tsx | 2 +- .../public/applications/workplace_search/constants.ts | 2 +- .../components/add_source/save_config.tsx | 1 + .../components/add_source/save_custom.tsx | 8 ++++---- .../views/content_sources/components/overview.tsx | 4 ++-- .../views/content_sources/components/source_content.tsx | 6 ++++-- .../workplace_search/views/content_sources/constants.ts | 4 ++-- .../views/groups/components/group_row.tsx | 2 +- .../groups/components/group_source_prioritization.tsx | 2 +- .../views/groups/components/shared_sources_modal.tsx | 2 ++ .../views/security/components/private_sources_table.tsx | 4 ++-- .../workplace_search/views/security/security.test.tsx | 9 +++++---- .../workplace_search/views/security/security.tsx | 5 ++++- .../views/settings/settings_router.test.tsx | 2 ++ .../workplace_search/views/settings/settings_router.tsx | 5 +++++ 17 files changed, 38 insertions(+), 26 deletions(-) diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/box.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/box.svg index 827f8cf0a55ec..b1b542eadd59c 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/box.svg +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/box.svg @@ -1 +1 @@ - + \ No newline at end of file diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_row/source_row.scss b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_row/source_row.scss index a099b974a0d41..fb8a47d134269 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_row/source_row.scss +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_row/source_row.scss @@ -8,10 +8,6 @@ font-weight: 500; } - &__actions { - width: 100px; - } - &__actions a { opacity: 1.0; pointer-events: auto; diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_row/source_row.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_row/source_row.tsx index 6cfc68b45ee3c..a6b2878de6449 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_row/source_row.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_row/source_row.tsx @@ -164,7 +164,7 @@ export const SourceRow: React.FC = ({ /> )} - + {showFix && {fixLink}} diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts index cdfd07b07de91..ddec0d9d13873 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts @@ -574,7 +574,7 @@ export const CUSTOMIZE_HEADER_DESCRIPTION = i18n.translate( export const CUSTOMIZE_NAME_LABEL = i18n.translate( 'xpack.enterpriseSearch.workplaceSearch.customize.name.label', { - defaultMessage: 'Personalize general organization settings.', + defaultMessage: 'Organization name', } ); diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/save_config.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/save_config.tsx index 956d5143ef2c5..053a3b6b0e6bb 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/save_config.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/save_config.tsx @@ -224,6 +224,7 @@ export const SaveConfig: React.FC = ({ return ( <> {header} +
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/save_custom.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/save_custom.tsx index b42bd674109fe..5aae4b352a1fb 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/save_custom.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/save_custom.tsx @@ -102,7 +102,7 @@ export const SaveCustom: React.FC = ({

{SAVE_CUSTOM_API_KEYS_TITLE}

 - +

{SAVE_CUSTOM_API_KEYS_BODY}

 @@ -126,7 +126,7 @@ export const SaveCustom: React.FC = ({

{SAVE_CUSTOM_VISUAL_WALKTHROUGH_TITLE}

- +

= ({

{SAVE_CUSTOM_STYLING_RESULTS_TITLE}

- +

= ({

{SAVE_CUSTOM_DOC_PERMISSIONS_TITLE}

- +

{ {EVENT_HEADER} {!custom && {STATUS_HEADER}} - {TIME_HEADER} + {TIME_HEADER} {activities.map(({ details: activityDetails, event, time, status }, i) => ( @@ -203,7 +203,7 @@ export const Overview: React.FC = () => { )} - + {time} diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_content.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_content.tsx index 3dd8ad1dc7899..1a6d97bbf75ba 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_content.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_content.tsx @@ -151,7 +151,9 @@ export const SourceContent: React.FC = () => { )} - {moment(updated).format('M/D/YYYY, h:mm:ss A')} + + {moment(updated).format('M/D/YYYY, h:mm:ss A')} + ); }; @@ -164,7 +166,7 @@ export const SourceContent: React.FC = () => { {TITLE_HEADING} {startCase(urlField)} - {LAST_UPDATED_HEADING} + {LAST_UPDATED_HEADING} {contentItems.map(contentItem)} diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/constants.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/constants.ts index 3e1290292704e..aa6d4da99ea40 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/constants.ts +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/constants.ts @@ -300,9 +300,9 @@ export const SOURCE_REMOVE_TITLE = i18n.translate( ); export const SOURCE_REMOVE_DESCRIPTION = i18n.translate( - 'xpack.enterpriseSearch.workplaceSearch.sources.config.description', + 'xpack.enterpriseSearch.workplaceSearch.sources.remove.description', { - defaultMessage: 'Edit content source connector settings to change.', + defaultMessage: 'This action cannot be undone.', } ); diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_row.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_row.tsx index 5e89d4491d597..204d8f5655172 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_row.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_row.tsx @@ -91,7 +91,7 @@ export const GroupRow: React.FC = ({

)} - + diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_source_prioritization.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_source_prioritization.tsx index 9b131e730b937..df7435bd25461 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_source_prioritization.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_source_prioritization.tsx @@ -164,7 +164,7 @@ export const GroupSourcePrioritization: React.FC = () => { } /> - +
{activeSourcePriorities[id]}
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/shared_sources_modal.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/shared_sources_modal.tsx index 2fcd880318a27..631c4f80f36b0 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/shared_sources_modal.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/shared_sources_modal.tsx @@ -9,6 +9,7 @@ import React from 'react'; import { useActions, useValues } from 'kea'; +import { EuiSpacer } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { GroupLogic } from '../group_logic'; @@ -53,6 +54,7 @@ export const SharedSourcesModal: React.FC = () => { values: { groupName: group.name }, })}

+ = ({ const emptyState = ( <> - + {isRemote ? REMOTE_SOURCES_EMPTY_TABLE_TITLE : STANDARD_SOURCES_EMPTY_TABLE_TITLE} @@ -175,7 +175,7 @@ export const PrivateSourcesTable: React.FC = ({ ); return ( - + {sectionHeading} {hasSources && sourcesTable} diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/security/security.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/security/security.test.tsx index 51346a69eeec2..346994ac557f9 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/security/security.test.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/security/security.test.tsx @@ -14,6 +14,8 @@ import { shallow } from 'enzyme'; import { EuiSwitch, EuiConfirmModal } from '@elastic/eui'; +import { SetWorkplaceSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome'; + import { Loading } from '../../../shared/loading'; import { UnsavedChangesPrompt } from '../../../shared/unsaved_changes_prompt'; import { ViewContentHeader } from '../../components/shared/view_content_header'; @@ -53,20 +55,19 @@ describe('Security', () => { }); }); - it('renders on Basic license', () => { + it('renders', () => { setMockValues({ ...mockValues, hasPlatinumLicense: false }); const wrapper = shallow(); + expect(wrapper.find(SetPageChrome)).toHaveLength(1); expect(wrapper.find(UnsavedChangesPrompt)).toHaveLength(1); expect(wrapper.find(ViewContentHeader)).toHaveLength(1); expect(wrapper.find(EuiSwitch).prop('disabled')).toEqual(true); }); - it('renders on Platinum license', () => { + it('does not disable switch on Platinum license', () => { const wrapper = shallow(); - expect(wrapper.find(UnsavedChangesPrompt)).toHaveLength(1); - expect(wrapper.find(ViewContentHeader)).toHaveLength(1); expect(wrapper.find(EuiSwitch).prop('disabled')).toEqual(false); }); diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/security/security.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/security/security.tsx index a81ac93ab69dd..669015794baef 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/security/security.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/security/security.tsx @@ -23,6 +23,7 @@ import { } from '@elastic/eui'; import { FlashMessages } from '../../../shared/flash_messages'; +import { SetWorkplaceSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome'; import { LicensingLogic } from '../../../shared/licensing'; import { Loading } from '../../../shared/loading'; import { UnsavedChangesPrompt } from '../../../shared/unsaved_changes_prompt'; @@ -40,6 +41,7 @@ import { PRIVATE_PLATINUM_LICENSE_CALLOUT, CONFIRM_CHANGES_TEXT, PRIVATE_SOURCES_UPDATE_CONFIRMATION_TEXT, + NAV, } from '../../constants'; import { PrivateSourcesTable } from './components/private_sources_table'; @@ -114,7 +116,7 @@ export const Security: React.FC = () => { ); const allSourcesToggle = ( - + { return ( <> + { const wrapper = shallow(); expect(wrapper.find(FlashMessages)).toHaveLength(1); + expect(wrapper.find(SetPageChrome)).toHaveLength(3); expect(wrapper.find(Switch)).toHaveLength(1); expect(wrapper.find(Route)).toHaveLength(NUM_ROUTES); expect(wrapper.find(Redirect)).toHaveLength(1); diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/settings_router.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/settings_router.tsx index 34dcc48621a2e..e6264103df6d8 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/settings_router.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/settings_router.tsx @@ -11,6 +11,8 @@ import { Redirect, Route, Switch } from 'react-router-dom'; import { useActions } from 'kea'; import { FlashMessages } from '../../../shared/flash_messages'; +import { SetWorkplaceSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome'; +import { NAV } from '../../constants'; import { ORG_SETTINGS_PATH, ORG_SETTINGS_CUSTOMIZE_PATH, @@ -38,12 +40,15 @@ export const SettingsRouter: React.FC = () => { + + + {staticSourceData.map(({ editPath }, i) => ( From 310194193aad34fee6852a4bd195562fb494c7ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loix?= Date: Tue, 16 Mar 2021 15:22:24 +0000 Subject: [PATCH 16/24] [ILM] Use global field to set the snapshot repository (#94602) --- .../features/searchable_snapshots.test.ts | 48 ++++++++++- .../phases/cold_phase/cold_phase.tsx | 4 +- .../phases/delete_phase/delete_phase.tsx | 12 ++- .../components/phases/hot_phase/hot_phase.tsx | 4 +- .../min_age_field/min_age_field.tsx | 4 +- .../repository_combobox_field.tsx | 66 ++++++++++++++ .../searchable_snapshot_field.tsx | 85 +++++-------------- .../phases/warm_phase/warm_phase.tsx | 4 +- .../timeline/timeline.container.tsx | 4 +- .../sections/edit_policy/constants.ts | 6 ++ .../sections/edit_policy/edit_policy.tsx | 49 +++++++---- .../edit_policy/form/components/form.tsx | 25 +++--- ..._context.tsx => configuration_context.tsx} | 33 +++---- .../sections/edit_policy/form/deserializer.ts | 22 ++++- .../form/deserializer_and_serializer.test.ts | 4 +- .../form/global_fields_context.tsx | 54 ++++++++++++ .../sections/edit_policy/form/index.ts | 11 ++- .../form/phase_timings_context.tsx | 25 +++--- .../sections/edit_policy/form/schema.ts | 27 ++++-- .../edit_policy/form/serializer/serializer.ts | 23 ++++- ...absolute_timing_to_relative_timing.test.ts | 4 +- .../edit_policy/lib/get_default_repository.ts | 20 +++++ .../sections/edit_policy/lib/index.ts | 2 + .../application/sections/edit_policy/types.ts | 4 +- .../public/shared_imports.ts | 1 + 25 files changed, 373 insertions(+), 168 deletions(-) create mode 100644 x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/searchable_snapshot_field/repository_combobox_field.tsx rename x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/{configuration_issues_context.tsx => configuration_context.tsx} (66%) create mode 100644 x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/global_fields_context.tsx create mode 100644 x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/lib/get_default_repository.ts diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/searchable_snapshots.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/searchable_snapshots.test.ts index 44e03564cb89a..a570c817cfe1b 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/searchable_snapshots.test.ts +++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/searchable_snapshots.test.ts @@ -67,6 +67,46 @@ describe(' searchable snapshots', () => { expect(actions.hot.searchableSnapshotsExists()).toBeTruthy(); }); + test('should set the repository from previously defined repository', async () => { + const { actions } = testBed; + + const repository = 'myRepo'; + await actions.hot.setSearchableSnapshot(repository); + await actions.cold.enable(true); + await actions.cold.toggleSearchableSnapshot(true); + await actions.frozen.enable(true); + + await actions.savePolicy(); + const latestRequest = server.requests[server.requests.length - 1]; + expect(latestRequest.method).toBe('POST'); + expect(latestRequest.url).toBe('/api/index_lifecycle_management/policies'); + const reqBody = JSON.parse(JSON.parse(latestRequest.requestBody).body); + + expect(reqBody.phases.hot.actions.searchable_snapshot.snapshot_repository).toBe(repository); + expect(reqBody.phases.cold.actions.searchable_snapshot.snapshot_repository).toBe(repository); + expect(reqBody.phases.frozen.actions.searchable_snapshot.snapshot_repository).toBe(repository); + }); + + test('should update the repository in all searchable snapshot actions', async () => { + const { actions } = testBed; + + await actions.hot.setSearchableSnapshot('myRepo'); + await actions.cold.enable(true); + await actions.cold.toggleSearchableSnapshot(true); + await actions.frozen.enable(true); + + // We update the repository in one phase + await actions.frozen.setSearchableSnapshot('changed'); + await actions.savePolicy(); + const latestRequest = server.requests[server.requests.length - 1]; + const reqBody = JSON.parse(JSON.parse(latestRequest.requestBody).body); + + // And all phases should be updated + expect(reqBody.phases.hot.actions.searchable_snapshot.snapshot_repository).toBe('changed'); + expect(reqBody.phases.cold.actions.searchable_snapshot.snapshot_repository).toBe('changed'); + expect(reqBody.phases.frozen.actions.searchable_snapshot.snapshot_repository).toBe('changed'); + }); + describe('on cloud', () => { describe('new policy', () => { beforeEach(async () => { @@ -86,6 +126,7 @@ describe(' searchable snapshots', () => { const { component } = testBed; component.update(); }); + test('defaults searchable snapshot to true on cloud', async () => { const { find, actions } = testBed; await actions.cold.enable(true); @@ -112,14 +153,17 @@ describe(' searchable snapshots', () => { const { component } = testBed; component.update(); }); + test('correctly sets snapshot repository default to "found-snapshots"', async () => { const { actions } = testBed; await actions.cold.enable(true); await actions.cold.toggleSearchableSnapshot(true); await actions.savePolicy(); const latestRequest = server.requests[server.requests.length - 1]; - const request = JSON.parse(JSON.parse(latestRequest.requestBody).body); - expect(request.phases.cold.actions.searchable_snapshot.snapshot_repository).toEqual( + expect(latestRequest.method).toBe('POST'); + expect(latestRequest.url).toBe('/api/index_lifecycle_management/policies'); + const reqBody = JSON.parse(JSON.parse(latestRequest.requestBody).body); + expect(reqBody.phases.cold.actions.searchable_snapshot.snapshot_repository).toEqual( 'found-snapshots' ); }); diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/cold_phase/cold_phase.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/cold_phase/cold_phase.tsx index bc22516e6c996..72651778f403e 100644 --- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/cold_phase/cold_phase.tsx +++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/cold_phase/cold_phase.tsx @@ -8,7 +8,7 @@ import React, { FunctionComponent } from 'react'; import { i18n } from '@kbn/i18n'; -import { useConfigurationIssues } from '../../../form'; +import { useConfiguration } from '../../../form'; import { DataTierAllocationField, SearchableSnapshotField, @@ -29,7 +29,7 @@ const i18nTexts = { }; export const ColdPhase: FunctionComponent = () => { - const { isUsingSearchableSnapshotInHotPhase } = useConfigurationIssues(); + const { isUsingSearchableSnapshotInHotPhase } = useConfiguration(); return ( }> diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/delete_phase/delete_phase.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/delete_phase/delete_phase.tsx index 6c96178c86b5b..7b613757fa474 100644 --- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/delete_phase/delete_phase.tsx +++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/delete_phase/delete_phase.tsx @@ -20,18 +20,16 @@ import { import { FormattedMessage } from '@kbn/i18n/react'; import { useFormData } from '../../../../../../shared_imports'; - import { i18nTexts } from '../../../i18n_texts'; - -import { usePhaseTimings } from '../../../form'; - -import { MinAgeField, SnapshotPoliciesField } from '../shared_fields'; -import './delete_phase.scss'; +import { usePhaseTimings, globalFields } from '../../../form'; import { PhaseIcon } from '../../phase_icon'; +import { MinAgeField, SnapshotPoliciesField } from '../shared_fields'; import { PhaseErrorIndicator } from '../phase/phase_error_indicator'; +import './delete_phase.scss'; + const formFieldPaths = { - enabled: '_meta.delete.enabled', + enabled: globalFields.deleteEnabled.path, }; export const DeletePhase: FunctionComponent = () => { diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/hot_phase/hot_phase.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/hot_phase/hot_phase.tsx index 6d4e2750bb2e8..ea345009b230b 100644 --- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/hot_phase/hot_phase.tsx +++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/hot_phase/hot_phase.tsx @@ -23,7 +23,7 @@ import { useFormData, SelectField, NumericField } from '../../../../../../shared import { i18nTexts } from '../../../i18n_texts'; -import { ROLLOVER_EMPTY_VALIDATION, useConfigurationIssues, UseField } from '../../../form'; +import { ROLLOVER_EMPTY_VALIDATION, useConfiguration, UseField } from '../../../form'; import { useEditPolicyContext } from '../../../edit_policy_context'; @@ -47,7 +47,7 @@ export const HotPhase: FunctionComponent = () => { const [formData] = useFormData({ watch: isUsingDefaultRolloverPath, }); - const { isUsingRollover } = useConfigurationIssues(); + const { isUsingRollover } = useConfiguration(); const isUsingDefaultRollover: boolean = get(formData, isUsingDefaultRolloverPath); const [showEmptyRolloverFieldsError, setShowEmptyRolloverFieldsError] = useState(false); diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/min_age_field/min_age_field.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/min_age_field/min_age_field.tsx index 04b756dc23559..3fe2f08cb4066 100644 --- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/min_age_field/min_age_field.tsx +++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/min_age_field/min_age_field.tsx @@ -22,7 +22,7 @@ import { import { getFieldValidityAndErrorMessage } from '../../../../../../../shared_imports'; -import { UseField, useConfigurationIssues } from '../../../../form'; +import { UseField, useConfiguration } from '../../../../form'; import { getUnitsAriaLabelForPhase, getTimingLabelForPhase } from './util'; @@ -81,7 +81,7 @@ interface Props { } export const MinAgeField: FunctionComponent = ({ phase }): React.ReactElement => { - const { isUsingRollover } = useConfigurationIssues(); + const { isUsingRollover } = useConfiguration(); return ( {(field) => { diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/searchable_snapshot_field/repository_combobox_field.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/searchable_snapshot_field/repository_combobox_field.tsx new file mode 100644 index 0000000000000..a5a9d8d492682 --- /dev/null +++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/searchable_snapshot_field/repository_combobox_field.tsx @@ -0,0 +1,66 @@ +/* + * 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 React, { useEffect, useRef } from 'react'; +import { EuiComboBoxOptionOption } from '@elastic/eui'; + +import { ComboBoxField, FieldHook } from '../../../../../../../shared_imports'; +import { useGlobalFields } from '../../../../form'; + +interface PropsRepositoryCombobox { + field: FieldHook; + isLoading: boolean; + repos: string[]; + noSuggestions: boolean; + globalRepository: string; +} + +export const RepositoryComboBoxField = ({ + field, + isLoading, + repos, + noSuggestions, + globalRepository, +}: PropsRepositoryCombobox) => { + const isMounted = useRef(false); + const { setValue } = field; + const { + searchableSnapshotRepo: { setValue: setSearchableSnapshotRepository }, + } = useGlobalFields(); + + useEffect(() => { + // We keep our phase searchable action field in sync + // with the default repository field declared globally for the policy + if (isMounted.current) { + setValue(Boolean(globalRepository.trim()) ? [globalRepository] : []); + } + isMounted.current = true; + }, [setValue, globalRepository]); + + return ( + ({ label: repo, value: repo })), + singleSelection: { asPlainText: true }, + isLoading, + noSuggestions, + onCreateOption: (newOption: string) => { + setSearchableSnapshotRepository(newOption); + }, + onChange: (options: EuiComboBoxOptionOption[]) => { + if (options.length > 0) { + setSearchableSnapshotRepository(options[0].label); + } else { + setSearchableSnapshotRepository(''); + } + }, + }} + /> + ); +}; diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/searchable_snapshot_field/searchable_snapshot_field.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/searchable_snapshot_field/searchable_snapshot_field.tsx index 816e1aaec31d7..4cef7615a2d8d 100644 --- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/searchable_snapshot_field/searchable_snapshot_field.tsx +++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/searchable_snapshot_field/searchable_snapshot_field.tsx @@ -5,24 +5,18 @@ * 2.0. */ +import React, { FunctionComponent, useState, useEffect } from 'react'; import { i18n } from '@kbn/i18n'; import { get } from 'lodash'; -import React, { FunctionComponent, useState, useEffect } from 'react'; import { FormattedMessage } from '@kbn/i18n/react'; -import { - EuiComboBoxOptionOption, - EuiTextColor, - EuiSpacer, - EuiCallOut, - EuiLink, -} from '@elastic/eui'; - -import { ComboBoxField, useKibana, useFormData } from '../../../../../../../shared_imports'; +import { EuiTextColor, EuiSpacer, EuiCallOut, EuiLink } from '@elastic/eui'; +import { useKibana, useFormData } from '../../../../../../../shared_imports'; import { useEditPolicyContext } from '../../../../edit_policy_context'; -import { useConfigurationIssues, UseField, searchableSnapshotFields } from '../../../../form'; +import { useConfiguration, UseField, globalFields } from '../../../../form'; import { FieldLoadingError, DescribedFormRow, LearnMoreLink } from '../../../'; import { SearchableSnapshotDataProvider } from './searchable_snapshot_data_provider'; +import { RepositoryComboBoxField } from './repository_combobox_field'; import './_searchable_snapshot_field.scss'; @@ -31,12 +25,6 @@ export interface Props { canBeDisabled?: boolean; } -/** - * This repository is provisioned by Elastic Cloud and will always - * exist as a "managed" repository. - */ -const CLOUD_DEFAULT_REPO = 'found-snapshots'; - const geti18nTexts = (phase: Props['phase']) => ({ title: i18n.translate('xpack.indexLifecycleMgmt.editPolicy.searchableSnapshotFieldTitle', { defaultMessage: 'Searchable snapshot', @@ -71,13 +59,15 @@ export const SearchableSnapshotField: FunctionComponent = ({ services: { cloud }, } = useKibana(); const { getUrlForApp, policy, license, isNewPolicy } = useEditPolicyContext(); - const { isUsingSearchableSnapshotInHotPhase } = useConfigurationIssues(); + const { isUsingSearchableSnapshotInHotPhase } = useConfiguration(); const searchableSnapshotRepoPath = `phases.${phase}.actions.searchable_snapshot.snapshot_repository`; - const [formData] = useFormData({ watch: searchableSnapshotRepoPath }); - const searchableSnapshotRepo = get(formData, searchableSnapshotRepoPath); + const [formData] = useFormData({ + watch: globalFields.searchableSnapshotRepo.path, + }); + const searchableSnapshotGlobalRepo = get(formData, globalFields.searchableSnapshotRepo.path); const isColdPhase = phase === 'cold'; const isFrozenPhase = phase === 'frozen'; const isColdOrFrozenPhase = isColdPhase || isFrozenPhase; @@ -164,7 +154,10 @@ export const SearchableSnapshotField: FunctionComponent = ({ /> ); - } else if (searchableSnapshotRepo && !repos.includes(searchableSnapshotRepo)) { + } else if ( + searchableSnapshotGlobalRepo && + !repos.includes(searchableSnapshotGlobalRepo) + ) { calloutContent = ( = ({ return (
- - config={{ - ...searchableSnapshotFields.snapshot_repository, - defaultValue: cloud?.isCloudEnabled ? CLOUD_DEFAULT_REPO : undefined, - }} + - {(field) => { - const singleSelectionArray: [selectedSnapshot?: string] = field.value - ? [field.value] - : []; - - return ( - ({ label: repo, value: repo })), - singleSelection: { asPlainText: true }, - isLoading, - noSuggestions: !!(error || repos.length === 0), - onCreateOption: (newOption: string) => { - field.setValue(newOption); - }, - onChange: (options: EuiComboBoxOptionOption[]) => { - if (options.length > 0) { - field.setValue(options[0].label); - } else { - field.setValue(''); - } - }, - }} - /> - ); + defaultValue={!!searchableSnapshotGlobalRepo ? [searchableSnapshotGlobalRepo] : []} + component={RepositoryComboBoxField} + componentProps={{ + globalRepository: searchableSnapshotGlobalRepo, + isLoading, + repos, + noSuggestions: !!(error || repos.length === 0), }} - + /> {calloutContent && ( <> diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/warm_phase/warm_phase.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/warm_phase/warm_phase.tsx index 577dab6804147..d082489c4b918 100644 --- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/warm_phase/warm_phase.tsx +++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/warm_phase/warm_phase.tsx @@ -8,7 +8,7 @@ import React, { FunctionComponent } from 'react'; import { i18n } from '@kbn/i18n'; -import { useConfigurationIssues } from '../../../form'; +import { useConfiguration } from '../../../form'; import { ForcemergeField, @@ -30,7 +30,7 @@ const i18nTexts = { }; export const WarmPhase: FunctionComponent = () => { - const { isUsingSearchableSnapshotInHotPhase } = useConfigurationIssues(); + const { isUsingSearchableSnapshotInHotPhase } = useConfiguration(); return ( diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/timeline/timeline.container.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/timeline/timeline.container.tsx index 88d9d2de03d89..d5cbb267c77c3 100644 --- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/timeline/timeline.container.tsx +++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/timeline/timeline.container.tsx @@ -11,7 +11,7 @@ import { useFormData } from '../../../../../shared_imports'; import { formDataToAbsoluteTimings } from '../../lib'; -import { useConfigurationIssues } from '../../form'; +import { useConfiguration } from '../../form'; import { FormInternal } from '../../types'; @@ -20,7 +20,7 @@ import { Timeline as ViewComponent } from './timeline'; export const Timeline: FunctionComponent = () => { const [formData] = useFormData(); const timings = formDataToAbsoluteTimings(formData); - const { isUsingRollover } = useConfigurationIssues(); + const { isUsingRollover } = useConfiguration(); return ( = ({ history }) => { license, } = useEditPolicyContext(); - const serializer = useMemo(() => { - return createSerializer(isNewPolicy ? undefined : currentPolicy); - }, [isNewPolicy, currentPolicy]); + const { + services: { cloud }, + } = useKibana(); const [saveAsNew, setSaveAsNew] = useState(false); const originalPolicyName: string = isNewPolicy ? '' : policyName!; const isAllowedByLicense = license.canUseSearchableSnapshot(); + const isCloudEnabled = Boolean(cloud?.isCloudEnabled); - const { form } = useForm({ - schema, - defaultValue: { + const serializer = useMemo(() => { + return createSerializer(isNewPolicy ? undefined : currentPolicy); + }, [isNewPolicy, currentPolicy]); + + const deserializer = useMemo(() => { + return createDeserializer(isCloudEnabled); + }, [isCloudEnabled]); + + const defaultValue = useMemo( + () => ({ ...currentPolicy, name: originalPolicyName, - }, + }), + [currentPolicy, originalPolicyName] + ); + + const schema = useMemo(() => { + return getSchema(isCloudEnabled); + }, [isCloudEnabled]); + + const { form } = useForm({ + schema, + defaultValue, deserializer, serializer, }); diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/components/form.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/components/form.tsx index be8243cab289f..5d1add85bf9f4 100644 --- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/components/form.tsx +++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/components/form.tsx @@ -9,20 +9,25 @@ import React, { FunctionComponent } from 'react'; import { Form as LibForm, FormHook } from '../../../../../shared_imports'; -import { ConfigurationIssuesProvider } from '../configuration_issues_context'; +import { ConfigurationProvider } from '../configuration_context'; import { FormErrorsProvider } from '../form_errors_context'; import { PhaseTimingsProvider } from '../phase_timings_context'; +import { GlobalFieldsProvider } from '../global_fields_context'; interface Props { form: FormHook; } -export const Form: FunctionComponent = ({ form, children }) => ( - - - - {children} - - - -); +export const Form: FunctionComponent = ({ form, children }) => { + return ( + + + + + {children} + + + + + ); +}; diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/configuration_issues_context.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/configuration_context.tsx similarity index 66% rename from x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/configuration_issues_context.tsx rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/configuration_context.tsx index c2e55f7aa6e61..97952a3a212c7 100644 --- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/configuration_issues_context.tsx +++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/configuration_context.tsx @@ -12,7 +12,7 @@ import { useFormData } from '../../../../shared_imports'; import { isUsingDefaultRolloverPath, isUsingCustomRolloverPath } from '../constants'; -export interface ConfigurationIssues { +export interface Configuration { /** * Whether the serialized policy will use rollover. This blocks certain actions in * the form such as hot phase (forcemerge, shrink) and cold phase (searchable snapshot). @@ -28,7 +28,7 @@ export interface ConfigurationIssues { isUsingSearchableSnapshotInColdPhase: boolean; } -const ConfigurationIssuesContext = createContext(null as any); +const ConfigurationContext = createContext(null as any); const pathToHotPhaseSearchableSnapshot = 'phases.hot.actions.searchable_snapshot.snapshot_repository'; @@ -36,7 +36,7 @@ const pathToHotPhaseSearchableSnapshot = const pathToColdPhaseSearchableSnapshot = 'phases.cold.actions.searchable_snapshot.snapshot_repository'; -export const ConfigurationIssuesProvider: FunctionComponent = ({ children }) => { +export const ConfigurationProvider: FunctionComponent = ({ children }) => { const [formData] = useFormData({ watch: [ pathToHotPhaseSearchableSnapshot, @@ -49,25 +49,18 @@ export const ConfigurationIssuesProvider: FunctionComponent = ({ children }) => // Provide default value, as path may become undefined if removed from the DOM const isUsingCustomRollover = get(formData, isUsingCustomRolloverPath, true); - return ( - - {children} - - ); + const context: Configuration = { + isUsingRollover: isUsingDefaultRollover === false ? isUsingCustomRollover : true, + isUsingSearchableSnapshotInHotPhase: get(formData, pathToHotPhaseSearchableSnapshot) != null, + isUsingSearchableSnapshotInColdPhase: get(formData, pathToColdPhaseSearchableSnapshot) != null, + }; + + return {children}; }; -export const useConfigurationIssues = () => { - const ctx = useContext(ConfigurationIssuesContext); - if (!ctx) - throw new Error('Cannot use configuration issues outside of configuration issues context'); +export const useConfiguration = () => { + const ctx = useContext(ConfigurationContext); + if (!ctx) throw new Error('Cannot use configuration outside of configuration context'); return ctx; }; diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/deserializer.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/deserializer.ts index 227f135ca7b72..d8cffb974dfd1 100644 --- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/deserializer.ts +++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/deserializer.ts @@ -8,18 +8,29 @@ import { produce } from 'immer'; import { SerializedPolicy } from '../../../../../common/types'; - import { splitSizeAndUnits } from '../../../lib/policies'; - import { determineDataTierAllocationType, isUsingDefaultRollover } from '../../../lib'; - +import { getDefaultRepository } from '../lib'; import { FormInternal } from '../types'; +import { CLOUD_DEFAULT_REPO } from '../constants'; -export const deserializer = (policy: SerializedPolicy): FormInternal => { +export const createDeserializer = (isCloudEnabled: boolean) => ( + policy: SerializedPolicy +): FormInternal => { const { phases: { hot, warm, cold, frozen, delete: deletePhase }, } = policy; + let defaultRepository = getDefaultRepository([ + hot?.actions.searchable_snapshot, + cold?.actions.searchable_snapshot, + frozen?.actions.searchable_snapshot, + ]); + + if (!defaultRepository && isCloudEnabled) { + defaultRepository = CLOUD_DEFAULT_REPO; + } + const _meta: FormInternal['_meta'] = { hot: { isUsingDefaultRollover: isUsingDefaultRollover(policy), @@ -49,6 +60,9 @@ export const deserializer = (policy: SerializedPolicy): FormInternal => { delete: { enabled: Boolean(deletePhase), }, + searchableSnapshot: { + repository: defaultRepository, + }, }; return produce( diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/deserializer_and_serializer.test.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/deserializer_and_serializer.test.ts index ab60a631dacc5..bdb915ba62d44 100644 --- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/deserializer_and_serializer.test.ts +++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/deserializer_and_serializer.test.ts @@ -9,7 +9,7 @@ import { setAutoFreeze } from 'immer'; import { cloneDeep } from 'lodash'; import { SerializedPolicy } from '../../../../../common/types'; import { defaultRolloverAction } from '../../../constants'; -import { deserializer } from './deserializer'; +import { createDeserializer } from './deserializer'; import { createSerializer } from './serializer'; import { FormInternal } from '../types'; @@ -18,6 +18,8 @@ const isObject = (v: unknown): v is { [key: string]: any } => const unknownValue = { some: 'value' }; +const deserializer = createDeserializer(false); + const populateWithUnknownEntries = (v: unknown) => { if (isObject(v)) { for (const key of Object.keys(v)) { diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/global_fields_context.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/global_fields_context.tsx new file mode 100644 index 0000000000000..30a00390a18cc --- /dev/null +++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/global_fields_context.tsx @@ -0,0 +1,54 @@ +/* + * 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 React, { createContext, FunctionComponent, useContext } from 'react'; +import { UseMultiFields, FieldHook, FieldConfig } from '../../../../shared_imports'; + +/** + * Those are the fields that we always want present in our form. + */ +interface GlobalFieldsTypes { + deleteEnabled: boolean; + searchableSnapshotRepo: string; +} + +type GlobalFields = { + [K in keyof GlobalFieldsTypes]: FieldHook; +}; + +const GlobalFieldsContext = createContext(null); + +export const globalFields: Record< + keyof GlobalFields, + { path: string; config?: FieldConfig } +> = { + deleteEnabled: { + path: '_meta.delete.enabled', + }, + searchableSnapshotRepo: { + path: '_meta.searchableSnapshot.repository', + }, +}; + +export const GlobalFieldsProvider: FunctionComponent = ({ children }) => { + return ( + fields={globalFields}> + {(fields) => { + return ( + {children} + ); + }} + + ); +}; + +export const useGlobalFields = () => { + const ctx = useContext(GlobalFieldsContext); + if (!ctx) throw new Error('Cannot use global fields outside of global fields context'); + + return ctx; +}; diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/index.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/index.ts index 6deb4d7fd4711..f31fedfac6681 100644 --- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/index.ts +++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/index.ts @@ -5,20 +5,17 @@ * 2.0. */ -export { deserializer } from './deserializer'; +export { createDeserializer } from './deserializer'; export { createSerializer } from './serializer'; -export { schema, searchableSnapshotFields } from './schema'; +export { getSchema } from './schema'; export * from './validations'; export { Form, EnhancedUseField as UseField } from './components'; -export { - ConfigurationIssuesProvider, - useConfigurationIssues, -} from './configuration_issues_context'; +export { ConfigurationProvider, useConfiguration } from './configuration_context'; export { FormErrorsProvider, useFormErrorsContext } from './form_errors_context'; @@ -27,3 +24,5 @@ export { usePhaseTimings, PhaseTimingConfiguration, } from './phase_timings_context'; + +export { useGlobalFields, globalFields } from './global_fields_context'; diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/phase_timings_context.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/phase_timings_context.tsx index 98ffb7e2dd7af..0cbee8832c55b 100644 --- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/phase_timings_context.tsx +++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/phase_timings_context.tsx @@ -8,7 +8,7 @@ import React, { createContext, FunctionComponent, useContext } from 'react'; import { useFormData } from '../../../../shared_imports'; import { FormInternal } from '../types'; -import { UseField } from './index'; +import { useGlobalFields } from './index'; export interface PhaseTimingConfiguration { /** @@ -48,6 +48,7 @@ export interface PhaseTimings { const PhaseTimingsContext = createContext(null as any); export const PhaseTimingsProvider: FunctionComponent = ({ children }) => { + const { deleteEnabled } = useGlobalFields(); const [formData] = useFormData({ watch: [ '_meta.warm.enabled', @@ -58,21 +59,15 @@ export const PhaseTimingsProvider: FunctionComponent = ({ children }) => { }); return ( - - {(field) => { - return ( - - {children} - - ); + + > + {children} + ); }; diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/schema.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/schema.ts index 5861c7b320de1..c0e489042586c 100644 --- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/schema.ts +++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/schema.ts @@ -9,12 +9,8 @@ import { i18n } from '@kbn/i18n'; import { FormSchema, fieldValidators } from '../../../../shared_imports'; import { defaultIndexPriority } from '../../../constants'; -import { ROLLOVER_FORM_PATHS } from '../constants'; - -import { FormInternal } from '../types'; - -const rolloverFormPaths = Object.values(ROLLOVER_FORM_PATHS); - +import { ROLLOVER_FORM_PATHS, CLOUD_DEFAULT_REPO } from '../constants'; +import { i18nTexts } from '../i18n_texts'; import { ifExistsNumberGreaterThanZero, ifExistsNumberNonNegative, @@ -22,7 +18,7 @@ import { minAgeValidator, } from './validations'; -import { i18nTexts } from '../i18n_texts'; +const rolloverFormPaths = Object.values(ROLLOVER_FORM_PATHS); const { emptyField, numberGreaterThanField } = fieldValidators; @@ -54,6 +50,13 @@ export const searchableSnapshotFields = { validations: [ { validator: emptyField(i18nTexts.editPolicy.errors.searchableSnapshotRepoRequired) }, ], + // TODO: update text copy + helpText: i18n.translate( + 'xpack.indexLifecycleMgmt.editPolicy.searchableSnapshot.repositoryHelpText', + { + defaultMessage: 'Each phase uses the same snapshot repository.', + } + ), }, storage: { label: i18n.translate('xpack.indexLifecycleMgmt.editPolicy.searchableSnapshot.storageLabel', { @@ -114,7 +117,7 @@ const getPriorityField = (phase: 'hot' | 'warm' | 'cold' | 'frozen') => ({ serializer: serializers.stringToNumber, }); -export const schema: FormSchema = { +export const getSchema = (isCloudEnabled: boolean): FormSchema => ({ _meta: { hot: { isUsingDefaultRollover: { @@ -230,6 +233,11 @@ export const schema: FormSchema = { defaultValue: 'd', }, }, + searchableSnapshot: { + repository: { + defaultValue: isCloudEnabled ? CLOUD_DEFAULT_REPO : '', + }, + }, }, phases: { hot: { @@ -288,6 +296,7 @@ export const schema: FormSchema = { set_priority: { priority: getPriorityField('hot'), }, + searchable_snapshot: searchableSnapshotFields, }, }, warm: { @@ -375,4 +384,4 @@ export const schema: FormSchema = { }, }, }, -}; +}); diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/serializer/serializer.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/serializer/serializer.ts index b21545ce1739c..57112b0e1cb16 100644 --- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/serializer/serializer.ts +++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/serializer/serializer.ts @@ -124,7 +124,12 @@ export const createSerializer = (originalPolicy?: SerializedPolicy) => ( /** * HOT PHASE SEARCHABLE SNAPSHOT */ - if (!updatedPolicy.phases.hot!.actions?.searchable_snapshot) { + if (updatedPolicy.phases.hot!.actions?.searchable_snapshot) { + hotPhaseActions.searchable_snapshot = { + ...hotPhaseActions.searchable_snapshot, + snapshot_repository: _meta.searchableSnapshot.repository, + }; + } else { delete hotPhaseActions.searchable_snapshot; } } @@ -234,7 +239,12 @@ export const createSerializer = (originalPolicy?: SerializedPolicy) => ( /** * COLD PHASE SEARCHABLE SNAPSHOT */ - if (!updatedPolicy.phases.cold?.actions?.searchable_snapshot) { + if (updatedPolicy.phases.cold?.actions?.searchable_snapshot) { + coldPhase.actions.searchable_snapshot = { + ...coldPhase.actions.searchable_snapshot, + snapshot_repository: _meta.searchableSnapshot.repository, + }; + } else { delete coldPhase.actions.searchable_snapshot; } } else { @@ -251,7 +261,12 @@ export const createSerializer = (originalPolicy?: SerializedPolicy) => ( /** * FROZEN PHASE SEARCHABLE SNAPSHOT */ - if (!updatedPolicy.phases.frozen?.actions?.searchable_snapshot) { + if (updatedPolicy.phases.frozen?.actions?.searchable_snapshot) { + frozenPhase.actions.searchable_snapshot = { + ...frozenPhase.actions.searchable_snapshot, + snapshot_repository: _meta.searchableSnapshot.repository, + }; + } else { delete frozenPhase.actions.searchable_snapshot; } } else { @@ -271,7 +286,7 @@ export const createSerializer = (originalPolicy?: SerializedPolicy) => ( deletePhase.actions.delete = deletePhase.actions.delete ?? {}; /** - * DELETE PHASE SEARCHABLE SNAPSHOT + * DELETE PHASE MIN AGE */ if (updatedPolicy.phases.delete?.min_age) { deletePhase.min_age = `${updatedPolicy.phases.delete!.min_age}${_meta.delete.minAgeUnit}`; diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/lib/absolute_timing_to_relative_timing.test.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/lib/absolute_timing_to_relative_timing.test.ts index 8a9635e2db219..d4a26924385f0 100644 --- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/lib/absolute_timing_to_relative_timing.test.ts +++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/lib/absolute_timing_to_relative_timing.test.ts @@ -6,13 +6,15 @@ */ import { flow } from 'fp-ts/function'; -import { deserializer } from '../form'; +import { createDeserializer } from '../form'; import { formDataToAbsoluteTimings, calculateRelativeFromAbsoluteMilliseconds, } from './absolute_timing_to_relative_timing'; +const deserializer = createDeserializer(false); + export const calculateRelativeTimingMs = flow( formDataToAbsoluteTimings, calculateRelativeFromAbsoluteMilliseconds diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/lib/get_default_repository.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/lib/get_default_repository.ts new file mode 100644 index 0000000000000..43e911333e357 --- /dev/null +++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/lib/get_default_repository.ts @@ -0,0 +1,20 @@ +/* + * 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 { SearchableSnapshotAction } from '../../../../../common/types'; + +export const getDefaultRepository = ( + configs: Array +): string => { + if (configs.length === 0) { + return ''; + } + if (Boolean(configs[0]?.snapshot_repository)) { + return configs[0]!.snapshot_repository; + } + return getDefaultRepository(configs.slice(1)); +}; diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/lib/index.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/lib/index.ts index af4757a7b7105..19d87532f2bfe 100644 --- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/lib/index.ts +++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/lib/index.ts @@ -12,3 +12,5 @@ export { PhaseAgeInMilliseconds, RelativePhaseTimingInMs, } from './absolute_timing_to_relative_timing'; + +export { getDefaultRepository } from './get_default_repository'; diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/types.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/types.ts index 4330cde378b6d..977554f12da42 100644 --- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/types.ts +++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/types.ts @@ -4,7 +4,6 @@ * 2.0; you may not use this file except in compliance with the Elastic License * 2.0. */ - import { SerializedPolicy } from '../../../../common/types'; export type DataTierAllocationType = 'node_roles' | 'node_attrs' | 'none'; @@ -76,5 +75,8 @@ export interface FormInternal extends SerializedPolicy { cold: ColdPhaseMetaFields; frozen: FrozenPhaseMetaFields; delete: DeletePhaseMetaFields; + searchableSnapshot: { + repository: string; + }; }; } diff --git a/x-pack/plugins/index_lifecycle_management/public/shared_imports.ts b/x-pack/plugins/index_lifecycle_management/public/shared_imports.ts index cf2d5d5efc0f8..a8e0182ada77b 100644 --- a/x-pack/plugins/index_lifecycle_management/public/shared_imports.ts +++ b/x-pack/plugins/index_lifecycle_management/public/shared_imports.ts @@ -23,6 +23,7 @@ export { useFormContext, FormSchema, ValidationConfig, + UseMultiFields, } from '../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib'; export { fieldValidators } from '../../../../src/plugins/es_ui_shared/static/forms/helpers'; From c937f2648ecbc869042bf3d66f3178db03704089 Mon Sep 17 00:00:00 2001 From: Devon Thomson Date: Tue, 16 Mar 2021 11:23:19 -0400 Subject: [PATCH 17/24] tiny fix for loading state in dashboard top nav (#94643) --- .../dashboard/public/application/top_nav/dashboard_top_nav.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/dashboard/public/application/top_nav/dashboard_top_nav.tsx b/src/plugins/dashboard/public/application/top_nav/dashboard_top_nav.tsx index 6230a16f10491..a82aa78b815ec 100644 --- a/src/plugins/dashboard/public/application/top_nav/dashboard_top_nav.tsx +++ b/src/plugins/dashboard/public/application/top_nav/dashboard_top_nav.tsx @@ -249,11 +249,11 @@ export function DashboardTopNav({ useReplace: true, }); } else { - setIsSaveInProgress(false); dashboardStateManager.resetState(); chrome.docTitle.change(dashboardStateManager.savedDashboard.lastSavedTitle); } } + setIsSaveInProgress(false); return { id }; }) .catch((error) => { From badf38b0cd5ae78bff3bb8b730253fd617a3f3be Mon Sep 17 00:00:00 2001 From: Constance Date: Tue, 16 Mar 2021 08:30:32 -0700 Subject: [PATCH 18/24] [Curation] Add support for a custom drag handle to the Result component (#94652) * Update Result component to render a custom drag handle * Update Result library with a draggable example - note: this doesn't actually handle reorder logic, it's purely a UI/UX example * Update CurationResult to pass dragHandleProps through to Result --- .../curation/results/curation_result.test.tsx | 9 +++++-- .../curation/results/curation_result.tsx | 5 +++- .../app_search/components/library/library.tsx | 25 +++++++++++++++++++ .../app_search/components/result/result.scss | 17 ++++++++++--- .../components/result/result.test.tsx | 15 +++++++++++ .../app_search/components/result/result.tsx | 8 ++++++ 6 files changed, 72 insertions(+), 7 deletions(-) diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/curation_result.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/curation_result.test.tsx index 5c417d308636e..460c0f4dfa44c 100644 --- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/curation_result.test.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/curation_result.test.tsx @@ -8,6 +8,7 @@ import { setMockValues } from '../../../../../__mocks__'; import React from 'react'; +import { DraggableProvidedDragHandleProps } from 'react-beautiful-dnd'; import { shallow, ShallowWrapper } from 'enzyme'; @@ -29,12 +30,15 @@ describe('CurationResult', () => { { title: 'add', iconType: 'plus', onClick: () => {} }, { title: 'remove', iconType: 'minus', onClick: () => {} }, ]; + const mockDragging = {} as DraggableProvidedDragHandleProps; // Passed from EuiDraggable let wrapper: ShallowWrapper; beforeAll(() => { setMockValues(values); - wrapper = shallow(); + wrapper = shallow( + + ); }); it('passes EngineLogic state', () => { @@ -42,8 +46,9 @@ describe('CurationResult', () => { expect(wrapper.find(Result).prop('schemaForTypeHighlights')).toEqual('some mock schema'); }); - it('passes result and actions props', () => { + it('passes result, actions, and dragHandleProps props', () => { expect(wrapper.find(Result).prop('result')).toEqual(mockResult); expect(wrapper.find(Result).prop('actions')).toEqual(mockActions); + expect(wrapper.find(Result).prop('dragHandleProps')).toEqual(mockDragging); }); }); diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/curation_result.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/curation_result.tsx index 3be11bcd65956..c737d93ce1823 100644 --- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/curation_result.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/curation_result.tsx @@ -6,6 +6,7 @@ */ import React from 'react'; +import { DraggableProvidedDragHandleProps } from 'react-beautiful-dnd'; import { useValues } from 'kea'; @@ -18,9 +19,10 @@ import { Result as ResultType, ResultAction } from '../../../result/types'; interface Props { result: ResultType; actions: ResultAction[]; + dragHandleProps?: DraggableProvidedDragHandleProps; } -export const CurationResult: React.FC = ({ result, actions }) => { +export const CurationResult: React.FC = ({ result, actions, dragHandleProps }) => { const { isMetaEngine, engine: { schema }, @@ -33,6 +35,7 @@ export const CurationResult: React.FC = ({ result, actions }) => { actions={actions} isMetaEngine={isMetaEngine} schemaForTypeHighlights={schema} + dragHandleProps={dragHandleProps} /> diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/library/library.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/library/library.tsx index 3f72199d12805..594584d9ba101 100644 --- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/library/library.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/library/library.tsx @@ -14,6 +14,9 @@ import { EuiTitle, EuiPageContentBody, EuiPageContent, + EuiDragDropContext, + EuiDroppable, + EuiDraggable, } from '@elastic/eui'; import { SetAppSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome'; @@ -228,6 +231,28 @@ export const Library: React.FC = () => { + + +

With a drag handle

+ + + {}}> + + {[1, 2, 3].map((_, i) => ( + + {(provided) => } + + ))} + + + +

With field value type highlights

diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result/result.scss b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result/result.scss index f69acbdaba150..5f1b165f2c362 100644 --- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result/result.scss +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result/result.scss @@ -1,10 +1,10 @@ .appSearchResult { display: grid; - grid-template-columns: 1fr auto; - grid-template-rows: 1fr auto; + grid-template-columns: auto 1fr auto; + grid-template-rows: auto 1fr auto; grid-template-areas: - 'content actions' - 'toggle actions'; + 'drag content actions' + 'drag toggle actions'; overflow: hidden; // Prevents child background-colors from clipping outside of panel border-radius &__content { @@ -52,6 +52,15 @@ background-color: $euiPageBackgroundColor; } } + + &__dragHandle { + grid-area: drag; + display: flex; + justify-content: center; + align-items: center; + width: $euiSizeXL; + border-right: $euiBorderThin; + } } /** diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result/result.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result/result.test.tsx index 86b71229f3785..15c9ee2967d3e 100644 --- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result/result.test.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result/result.test.tsx @@ -6,6 +6,7 @@ */ import React from 'react'; +import { DraggableProvidedDragHandleProps } from 'react-beautiful-dnd'; import { shallow, ShallowWrapper } from 'enzyme'; @@ -129,6 +130,20 @@ describe('Result', () => { }); }); + describe('dragging', () => { + // In the real world, the drag library sets data attributes, role, tabIndex, etc. + const mockDragHandleProps = ({ + someMockProp: true, + } as unknown) as DraggableProvidedDragHandleProps; + + it('will render a drag handle with the passed props', () => { + const wrapper = shallow(); + + expect(wrapper.find('.appSearchResult__dragHandle')).toHaveLength(1); + expect(wrapper.find('.appSearchResult__dragHandle').prop('someMockProp')).toEqual(true); + }); + }); + it('will render field details with type highlights if schemaForTypeHighlights has been provided', () => { const wrapper = shallow( diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result/result.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result/result.tsx index 2812b596e87fa..89208a041af35 100644 --- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result/result.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result/result.tsx @@ -6,6 +6,7 @@ */ import React, { useState, useMemo } from 'react'; +import { DraggableProvidedDragHandleProps } from 'react-beautiful-dnd'; import classNames from 'classnames'; @@ -31,6 +32,7 @@ interface Props { shouldLinkToDetailPage?: boolean; schemaForTypeHighlights?: Schema; actions?: ResultAction[]; + dragHandleProps?: DraggableProvidedDragHandleProps; } const RESULT_CUTOFF = 5; @@ -42,6 +44,7 @@ export const Result: React.FC = ({ shouldLinkToDetailPage = false, schemaForTypeHighlights, actions = [], + dragHandleProps, }) => { const [isOpen, setIsOpen] = useState(false); @@ -87,6 +90,11 @@ export const Result: React.FC = ({ values: { id: result[ID].raw }, })} > + {dragHandleProps && ( +
+ +
+ )} {conditionallyLinkedArticle( <> Date: Tue, 16 Mar 2021 16:41:07 +0100 Subject: [PATCH 19/24] [Uptime] Synthetic check steps list view (#90978) Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../translations/translations/ja-JP.json | 6 - .../translations/translations/zh-CN.json | 6 - x-pack/plugins/uptime/common/constants/ui.ts | 2 + .../uptime/common/runtime_types/ping/ping.ts | 2 + .../components/common/step_detail_link.tsx | 12 +- .../columns/ping_timestamp/nav_buttons.tsx | 8 +- .../ping_timestamp/ping_timestamp.test.tsx | 12 +- .../columns/ping_timestamp/ping_timestamp.tsx | 45 ++- .../step_image_caption.test.tsx | 5 +- .../ping_timestamp/step_image_caption.tsx | 33 ++- .../ping_timestamp/step_image_popover.tsx | 3 +- .../monitor/ping_list/expanded_row.test.tsx | 37 ++- .../monitor/ping_list/expanded_row.tsx | 19 -- .../monitor/ping_list/ping_list.tsx | 57 +++- .../synthetics/browser_expanded_row.test.tsx | 203 -------------- .../synthetics/browser_expanded_row.tsx | 65 ----- .../synthetics/executed_journey.test.tsx | 265 ------------------ .../monitor/synthetics/executed_journey.tsx | 88 ------ .../monitor/synthetics/executed_step.tsx | 110 -------- .../monitor/synthetics/status_badge.test.tsx | 42 --- .../step_detail/step_detail_container.tsx | 2 +- .../step_detail/use_monitor_breadcrumb.tsx | 33 ++- .../use_monitor_breadcrumbs.test.tsx | 84 +++++- .../columns/monitor_status_column.tsx | 2 +- .../step_expanded_row/screenshot_link.tsx | 47 ++++ .../step_expanded_row/step_screenshots.tsx | 86 ++++++ .../synthetics/check_steps/step_image.tsx | 28 ++ .../synthetics/check_steps/step_list.test.tsx | 144 ++++++++++ .../synthetics/check_steps/steps_list.tsx | 175 ++++++++++++ .../synthetics/check_steps/use_check_steps.ts | 29 ++ .../check_steps/use_expanded_row.test.tsx | 152 ++++++++++ .../check_steps/use_expanded_row.tsx | 88 ++++++ .../synthetics/code_block_accordion.tsx | 4 +- .../synthetics/console_event.test.tsx | 0 .../synthetics/console_event.tsx | 4 +- .../console_output_event_list.test.tsx | 0 .../synthetics/console_output_event_list.tsx | 4 +- .../synthetics/empty_journey.test.tsx | 0 .../synthetics/empty_journey.tsx | 0 .../synthetics/executed_step.test.tsx | 53 ++-- .../components/synthetics/executed_step.tsx | 118 ++++++++ .../synthetics/status_badge.test.tsx | 33 +++ .../{monitor => }/synthetics/status_badge.tsx | 20 +- .../step_screenshot_display.test.tsx | 2 +- .../synthetics/step_screenshot_display.tsx | 89 ++---- .../components/synthetics/translations.ts | 20 ++ .../uptime/public/hooks/use_telemetry.ts | 1 + x-pack/plugins/uptime/public/pages/index.ts | 2 +- .../pages/synthetics/checks_navigation.tsx | 60 ++++ .../{ => synthetics}/step_detail_page.tsx | 6 +- .../pages/synthetics/synthetics_checks.tsx | 44 +++ x-pack/plugins/uptime/public/routes.tsx | 9 + .../uptime/public/state/api/journey.ts | 17 ++ .../lib/requests/get_journey_details.ts | 6 +- .../lib/requests/get_journey_screenshot.ts | 4 +- .../lib/requests/get_journey_steps.test.ts | 4 +- .../server/lib/requests/get_journey_steps.ts | 2 +- .../lib/requests/get_last_successful_step.ts | 77 +++++ .../uptime/server/lib/requests/index.ts | 2 + .../plugins/uptime/server/rest_api/index.ts | 2 + .../rest_api/pings/journey_screenshots.ts | 5 +- .../uptime/server/rest_api/pings/journeys.ts | 23 +- .../synthetics/last_successful_step.ts | 33 +++ 63 files changed, 1514 insertions(+), 1020 deletions(-) delete mode 100644 x-pack/plugins/uptime/public/components/monitor/synthetics/browser_expanded_row.test.tsx delete mode 100644 x-pack/plugins/uptime/public/components/monitor/synthetics/browser_expanded_row.tsx delete mode 100644 x-pack/plugins/uptime/public/components/monitor/synthetics/executed_journey.test.tsx delete mode 100644 x-pack/plugins/uptime/public/components/monitor/synthetics/executed_journey.tsx delete mode 100644 x-pack/plugins/uptime/public/components/monitor/synthetics/executed_step.tsx delete mode 100644 x-pack/plugins/uptime/public/components/monitor/synthetics/status_badge.test.tsx create mode 100644 x-pack/plugins/uptime/public/components/synthetics/check_steps/step_expanded_row/screenshot_link.tsx create mode 100644 x-pack/plugins/uptime/public/components/synthetics/check_steps/step_expanded_row/step_screenshots.tsx create mode 100644 x-pack/plugins/uptime/public/components/synthetics/check_steps/step_image.tsx create mode 100644 x-pack/plugins/uptime/public/components/synthetics/check_steps/step_list.test.tsx create mode 100644 x-pack/plugins/uptime/public/components/synthetics/check_steps/steps_list.tsx create mode 100644 x-pack/plugins/uptime/public/components/synthetics/check_steps/use_check_steps.ts create mode 100644 x-pack/plugins/uptime/public/components/synthetics/check_steps/use_expanded_row.test.tsx create mode 100644 x-pack/plugins/uptime/public/components/synthetics/check_steps/use_expanded_row.tsx rename x-pack/plugins/uptime/public/components/{monitor => }/synthetics/code_block_accordion.tsx (87%) rename x-pack/plugins/uptime/public/components/{monitor => }/synthetics/console_event.test.tsx (100%) rename x-pack/plugins/uptime/public/components/{monitor => }/synthetics/console_event.tsx (89%) rename x-pack/plugins/uptime/public/components/{monitor => }/synthetics/console_output_event_list.test.tsx (100%) rename x-pack/plugins/uptime/public/components/{monitor => }/synthetics/console_output_event_list.tsx (92%) rename x-pack/plugins/uptime/public/components/{monitor => }/synthetics/empty_journey.test.tsx (100%) rename x-pack/plugins/uptime/public/components/{monitor => }/synthetics/empty_journey.tsx (100%) rename x-pack/plugins/uptime/public/components/{monitor => }/synthetics/executed_step.test.tsx (54%) create mode 100644 x-pack/plugins/uptime/public/components/synthetics/executed_step.tsx create mode 100644 x-pack/plugins/uptime/public/components/synthetics/status_badge.test.tsx rename x-pack/plugins/uptime/public/components/{monitor => }/synthetics/status_badge.tsx (66%) rename x-pack/plugins/uptime/public/components/{monitor => }/synthetics/step_screenshot_display.test.tsx (96%) rename x-pack/plugins/uptime/public/components/{monitor => }/synthetics/step_screenshot_display.tsx (52%) create mode 100644 x-pack/plugins/uptime/public/components/synthetics/translations.ts create mode 100644 x-pack/plugins/uptime/public/pages/synthetics/checks_navigation.tsx rename x-pack/plugins/uptime/public/pages/{ => synthetics}/step_detail_page.tsx (75%) create mode 100644 x-pack/plugins/uptime/public/pages/synthetics/synthetics_checks.tsx create mode 100644 x-pack/plugins/uptime/server/lib/requests/get_last_successful_step.ts create mode 100644 x-pack/plugins/uptime/server/rest_api/synthetics/last_successful_step.ts diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index 32b749d2d7fa7..a558834ab67f6 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -23257,12 +23257,8 @@ "xpack.uptime.synthetics.emptyJourney.message.footer": "表示する詳細情報はありません。", "xpack.uptime.synthetics.emptyJourney.message.heading": "ステップが含まれていませんでした。", "xpack.uptime.synthetics.emptyJourney.title": "ステップがありません。", - "xpack.uptime.synthetics.executedJourney.heading": "概要情報", "xpack.uptime.synthetics.executedStep.errorHeading": "エラー", - "xpack.uptime.synthetics.executedStep.scriptHeading": "スクリプトのステップ", "xpack.uptime.synthetics.executedStep.stackTrace": "スタックトレース", - "xpack.uptime.synthetics.executedStep.stepName": "{stepNumber}. {stepName}", - "xpack.uptime.synthetics.experimentalCallout.title": "実験的機能", "xpack.uptime.synthetics.imageLoadingSpinner.ariaLabel": "画像を示すアニメーションスピナーを読み込んでいます", "xpack.uptime.synthetics.journey.allFailedMessage": "{total}ステップ - すべて失敗またはスキップされました", "xpack.uptime.synthetics.journey.allSucceededMessage": "{total}ステップ - すべて成功しました", @@ -23273,8 +23269,6 @@ "xpack.uptime.synthetics.screenshot.noImageMessage": "画像がありません", "xpack.uptime.synthetics.screenshotDisplay.altText": "名前「{stepName}」のステップのスクリーンショット", "xpack.uptime.synthetics.screenshotDisplay.altTextWithoutName": "スクリーンショット", - "xpack.uptime.synthetics.screenshotDisplay.thumbnailAltText": "名前「{stepName}」のステップのサムネイルスクリーンショット", - "xpack.uptime.synthetics.screenshotDisplay.thumbnailAltTextWithoutName": "サムネイルスクリーンショット", "xpack.uptime.synthetics.statusBadge.failedMessage": "失敗", "xpack.uptime.synthetics.statusBadge.skippedMessage": "スキップ", "xpack.uptime.synthetics.statusBadge.succeededMessage": "成功", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index db3ca3d56ec5a..9113b44d6ad31 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -23614,12 +23614,8 @@ "xpack.uptime.synthetics.emptyJourney.message.footer": "没有更多可显示的信息。", "xpack.uptime.synthetics.emptyJourney.message.heading": "此过程不包含任何步骤。", "xpack.uptime.synthetics.emptyJourney.title": "没有此过程的任何步骤", - "xpack.uptime.synthetics.executedJourney.heading": "摘要信息", "xpack.uptime.synthetics.executedStep.errorHeading": "错误", - "xpack.uptime.synthetics.executedStep.scriptHeading": "步骤脚本", "xpack.uptime.synthetics.executedStep.stackTrace": "堆栈跟踪", - "xpack.uptime.synthetics.executedStep.stepName": "{stepNumber}：{stepName}", - "xpack.uptime.synthetics.experimentalCallout.title": "实验功能", "xpack.uptime.synthetics.imageLoadingSpinner.ariaLabel": "表示图像正在加载的动画旋转图标", "xpack.uptime.synthetics.journey.allFailedMessage": "{total} 个步骤 - 全部失败或跳过", "xpack.uptime.synthetics.journey.allSucceededMessage": "{total} 个步骤 - 全部成功", @@ -23630,8 +23626,6 @@ "xpack.uptime.synthetics.screenshot.noImageMessage": "没有可用图像", "xpack.uptime.synthetics.screenshotDisplay.altText": "名称为“{stepName}”的步骤的屏幕截图", "xpack.uptime.synthetics.screenshotDisplay.altTextWithoutName": "屏幕截图", - "xpack.uptime.synthetics.screenshotDisplay.thumbnailAltText": "名称为“{stepName}”的步骤的缩略屏幕截图", - "xpack.uptime.synthetics.screenshotDisplay.thumbnailAltTextWithoutName": "缩略屏幕截图", "xpack.uptime.synthetics.statusBadge.failedMessage": "失败", "xpack.uptime.synthetics.statusBadge.skippedMessage": "已跳过", "xpack.uptime.synthetics.statusBadge.succeededMessage": "成功", diff --git a/x-pack/plugins/uptime/common/constants/ui.ts b/x-pack/plugins/uptime/common/constants/ui.ts index 880bc0f92ddf6..dcaf4bb310ad7 100644 --- a/x-pack/plugins/uptime/common/constants/ui.ts +++ b/x-pack/plugins/uptime/common/constants/ui.ts @@ -15,6 +15,8 @@ export const CERTIFICATES_ROUTE = '/certificates'; export const STEP_DETAIL_ROUTE = '/journey/:checkGroupId/step/:stepIndex'; +export const SYNTHETIC_CHECK_STEPS_ROUTE = '/journey/:checkGroupId/steps'; + export enum STATUS { UP = 'up', DOWN = 'down', diff --git a/x-pack/plugins/uptime/common/runtime_types/ping/ping.ts b/x-pack/plugins/uptime/common/runtime_types/ping/ping.ts index 8991d52f6a920..77b9473f2912e 100644 --- a/x-pack/plugins/uptime/common/runtime_types/ping/ping.ts +++ b/x-pack/plugins/uptime/common/runtime_types/ping/ping.ts @@ -216,6 +216,7 @@ export const PingType = t.intersection([ type: t.string, url: t.string, end: t.number, + text: t.string, }), }), tags: t.array(t.string), @@ -251,6 +252,7 @@ export const SyntheticsJourneyApiResponseType = t.intersection([ t.intersection([ t.type({ timestamp: t.string, + journey: PingType, }), t.partial({ next: t.type({ diff --git a/x-pack/plugins/uptime/public/components/common/step_detail_link.tsx b/x-pack/plugins/uptime/public/components/common/step_detail_link.tsx index 313dd18e67c11..fa6d0b4c3f8bb 100644 --- a/x-pack/plugins/uptime/public/components/common/step_detail_link.tsx +++ b/x-pack/plugins/uptime/public/components/common/step_detail_link.tsx @@ -6,7 +6,7 @@ */ import React, { FC } from 'react'; -import { ReactRouterEuiButton } from './react_router_helpers'; +import { ReactRouterEuiButtonEmpty } from './react_router_helpers'; interface StepDetailLinkProps { /** @@ -23,14 +23,8 @@ export const StepDetailLink: FC = ({ children, checkGroupId const to = `/journey/${checkGroupId}/step/${stepIndex}`; return ( - + {children} - + ); }; diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/nav_buttons.tsx b/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/nav_buttons.tsx index 390a133b1819b..3b0aad721be8a 100644 --- a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/nav_buttons.tsx +++ b/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/nav_buttons.tsx @@ -6,7 +6,7 @@ */ import { EuiButtonIcon, EuiFlexItem, EuiFlexGroup } from '@elastic/eui'; -import React from 'react'; +import React, { MouseEvent } from 'react'; import { nextAriaLabel, prevAriaLabel } from './translations'; export interface NavButtonsProps { @@ -34,8 +34,9 @@ export const NavButtons: React.FC = ({ disabled={stepNumber === 1} color="subdued" size="s" - onClick={() => { + onClick={(evt: MouseEvent) => { setStepNumber(stepNumber - 1); + evt.stopPropagation(); }} iconType="arrowLeft" aria-label={prevAriaLabel} @@ -46,8 +47,9 @@ export const NavButtons: React.FC = ({ disabled={stepNumber === maxSteps} color="subdued" size="s" - onClick={() => { + onClick={(evt: MouseEvent) => { setStepNumber(stepNumber + 1); + evt.stopPropagation(); }} iconType="arrowRight" aria-label={nextAriaLabel} diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/ping_timestamp.test.tsx b/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/ping_timestamp.test.tsx index 2a1989cafa434..d628b2d8388f9 100644 --- a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/ping_timestamp.test.tsx +++ b/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/ping_timestamp.test.tsx @@ -12,6 +12,8 @@ import { mockReduxHooks } from '../../../../../lib/helper/test_helpers'; import { render } from '../../../../../lib/helper/rtl_helpers'; import { Ping } from '../../../../../../common/runtime_types/ping'; import * as observabilityPublic from '../../../../../../../observability/public'; +import { getShortTimeStamp } from '../../../../overview/monitor_list/columns/monitor_status_column'; +import moment from 'moment'; mockReduxHooks(); @@ -68,7 +70,7 @@ describe('Ping Timestamp component', () => { .spyOn(observabilityPublic, 'useFetcher') .mockReturnValue({ status: fetchStatus, data: null, refetch: () => null }); const { getByTestId } = render( - + ); expect(getByTestId('pingTimestampSpinner')).toBeInTheDocument(); } @@ -79,7 +81,7 @@ describe('Ping Timestamp component', () => { .spyOn(observabilityPublic, 'useFetcher') .mockReturnValue({ status: FETCH_STATUS.SUCCESS, data: null, refetch: () => null }); const { getByTestId } = render( - + ); expect(getByTestId('pingTimestampNoImageAvailable')).toBeInTheDocument(); }); @@ -91,7 +93,9 @@ describe('Ping Timestamp component', () => { data: { src }, refetch: () => null, }); - const { container } = render(); + const { container } = render( + + ); expect(container.querySelector('img')?.src).toBe(src); }); @@ -103,7 +107,7 @@ describe('Ping Timestamp component', () => { refetch: () => null, }); const { getByAltText, getAllByText, queryByAltText } = render( - + ); const caption = getAllByText('Nov 26, 2020 10:28:56 AM'); fireEvent.mouseEnter(caption[0]); diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/ping_timestamp.tsx b/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/ping_timestamp.tsx index cfb92dd31190e..16553e9de8604 100644 --- a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/ping_timestamp.tsx +++ b/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/ping_timestamp.tsx @@ -8,18 +8,15 @@ import React, { useContext, useEffect, useState } from 'react'; import useIntersection from 'react-use/lib/useIntersection'; import styled from 'styled-components'; -import moment from 'moment'; import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; import { Ping } from '../../../../../../common/runtime_types/ping'; import { useFetcher, FETCH_STATUS } from '../../../../../../../observability/public'; import { getJourneyScreenshot } from '../../../../../state/api/journey'; import { UptimeSettingsContext } from '../../../../../contexts'; -import { NavButtons } from './nav_buttons'; import { NoImageDisplay } from './no_image_display'; import { StepImageCaption } from './step_image_caption'; import { StepImagePopover } from './step_image_popover'; import { formatCaptionContent } from './translations'; -import { getShortTimeStamp } from '../../../../overview/monitor_list/columns/monitor_status_column'; const StepDiv = styled.div` figure.euiImage { @@ -27,25 +24,16 @@ const StepDiv = styled.div` display: none; } } - - position: relative; - div.stepArrows { - display: none; - } - :hover { - div.stepArrows { - display: flex; - } - } `; interface Props { - timestamp: string; + label?: string; ping: Ping; + initialStepNo?: number; } -export const PingTimestamp = ({ timestamp, ping }: Props) => { - const [stepNumber, setStepNumber] = useState(1); +export const PingTimestamp = ({ label, ping, initialStepNo = 1 }: Props) => { + const [stepNumber, setStepNumber] = useState(initialStepNo); const [isImagePopoverOpen, setIsImagePopoverOpen] = useState(false); const [stepImages, setStepImages] = useState([]); @@ -77,6 +65,8 @@ export const PingTimestamp = ({ timestamp, ping }: Props) => { const captionContent = formatCaptionContent(stepNumber, data?.maxSteps); + const [numberOfCaptions, setNumberOfCaptions] = useState(0); + const ImageCaption = ( { maxSteps={data?.maxSteps} setStepNumber={setStepNumber} stepNumber={stepNumber} - timestamp={timestamp} isLoading={status === FETCH_STATUS.LOADING || status === FETCH_STATUS.PENDING} + label={label} + onVisible={(val) => setNumberOfCaptions((prevVal) => (val ? prevVal + 1 : prevVal - 1))} /> ); + useEffect(() => { + // This is a hack to get state if image is in full screen, we should refactor + // it once eui image exposes it's full screen state + // we are checking if number of captions are 2, that means + // image is in full screen mode since caption is also rendered on + // full screen image + // we dont want to change image displayed in thumbnail + if (numberOfCaptions === 1 && stepNumber !== initialStepNo) { + setStepNumber(initialStepNo); + } + }, [numberOfCaptions, initialStepNo, stepNumber]); + return ( @@ -111,16 +114,10 @@ export const PingTimestamp = ({ timestamp, ping }: Props) => { isPending={status === FETCH_STATUS.PENDING} /> )} - - {getShortTimeStamp(moment(timestamp))} + {label} ); diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/step_image_caption.test.tsx b/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/step_image_caption.test.tsx index a33e587093279..5c2c4d3669e79 100644 --- a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/step_image_caption.test.tsx +++ b/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/step_image_caption.test.tsx @@ -9,6 +9,8 @@ import { fireEvent, waitFor } from '@testing-library/react'; import React from 'react'; import { render } from '../../../../../lib/helper/rtl_helpers'; import { StepImageCaption, StepImageCaptionProps } from './step_image_caption'; +import { getShortTimeStamp } from '../../../../overview/monitor_list/columns/monitor_status_column'; +import moment from 'moment'; describe('StepImageCaption', () => { let defaultProps: StepImageCaptionProps; @@ -20,7 +22,8 @@ describe('StepImageCaption', () => { maxSteps: 3, setStepNumber: jest.fn(), stepNumber: 2, - timestamp: '2020-11-26T15:28:56.896Z', + label: getShortTimeStamp(moment('2020-11-26T15:28:56.896Z')), + onVisible: jest.fn(), isLoading: false, }; }); diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/step_image_caption.tsx b/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/step_image_caption.tsx index fe9709a02b684..80d41ccc23dc8 100644 --- a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/step_image_caption.tsx +++ b/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/step_image_caption.tsx @@ -5,11 +5,9 @@ * 2.0. */ +import React, { MouseEvent, useEffect } from 'react'; import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui'; -import React from 'react'; -import moment from 'moment'; import { nextAriaLabel, prevAriaLabel } from './translations'; -import { getShortTimeStamp } from '../../../../overview/monitor_list/columns/monitor_status_column'; import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common'; export interface StepImageCaptionProps { @@ -18,7 +16,8 @@ export interface StepImageCaptionProps { maxSteps?: number; setStepNumber: React.Dispatch>; stepNumber: number; - timestamp: string; + label?: string; + onVisible: (val: boolean) => void; isLoading: boolean; } @@ -35,19 +34,34 @@ export const StepImageCaption: React.FC = ({ maxSteps, setStepNumber, stepNumber, - timestamp, isLoading, + label, + onVisible, }) => { + useEffect(() => { + onVisible(true); + return () => { + onVisible(false); + }; + // eslint-disable-next-line react-hooks/exhaustive-deps + }, []); + return ( - + { + // we don't want this to be captured by row click which leads to step list page + evt.stopPropagation(); + }} + >
{imgSrc && ( { + onClick={(evt: MouseEvent) => { setStepNumber(stepNumber - 1); + evt.preventDefault(); }} iconType="arrowLeft" aria-label={prevAriaLabel} @@ -62,8 +76,9 @@ export const StepImageCaption: React.FC = ({ { + onClick={(evt: MouseEvent) => { setStepNumber(stepNumber + 1); + evt.stopPropagation(); }} iconType="arrowRight" iconSide="right" @@ -75,7 +90,7 @@ export const StepImageCaption: React.FC = ({ )} - {getShortTimeStamp(moment(timestamp))} + {label}
); diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/step_image_popover.tsx b/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/step_image_popover.tsx index 4fc8db515a5d6..d3dce3a2505b2 100644 --- a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/step_image_popover.tsx +++ b/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/step_image_popover.tsx @@ -38,7 +38,7 @@ export const StepImagePopover: React.FC = ({ isImagePopoverOpen, }) => ( = ({ /> } isOpen={isImagePopoverOpen} + closePopover={() => {}} > { > - - - + color="primary" + > + + The Title", + "hash": "testhash", + } + } + /> + + + , + "title": "Response Body", + }, + ] + } + /> + `); diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/expanded_row.tsx b/x-pack/plugins/uptime/public/components/monitor/ping_list/expanded_row.tsx index 2599b8ed9fdca..df0d273d3bc3a 100644 --- a/x-pack/plugins/uptime/public/components/monitor/ping_list/expanded_row.tsx +++ b/x-pack/plugins/uptime/public/components/monitor/ping_list/expanded_row.tsx @@ -21,7 +21,6 @@ import { i18n } from '@kbn/i18n'; import { Ping, HttpResponseBody } from '../../../../common/runtime_types'; import { DocLinkForBody } from './doc_link_body'; import { PingRedirects } from './ping_redirects'; -import { BrowserExpandedRow } from '../synthetics/browser_expanded_row'; import { PingHeaders } from './headers'; interface Props { @@ -57,24 +56,6 @@ const BodyExcerpt = ({ content }: { content: string }) => export const PingListExpandedRowComponent = ({ ping }: Props) => { const listItems = []; - if (ping.monitor.type === 'browser') { - return ( - - - - - - - - - ); - } - // Show the error block if (ping.error) { listItems.push({ diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/ping_list.tsx b/x-pack/plugins/uptime/public/components/monitor/ping_list/ping_list.tsx index 18bc5f5ec3ecb..65644ce493906 100644 --- a/x-pack/plugins/uptime/public/components/monitor/ping_list/ping_list.tsx +++ b/x-pack/plugins/uptime/public/components/monitor/ping_list/ping_list.tsx @@ -7,8 +7,10 @@ import { EuiBasicTable, EuiPanel, EuiSpacer } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; -import React, { useCallback, useState, useEffect } from 'react'; +import React, { useCallback, useState, useEffect, MouseEvent } from 'react'; import styled from 'styled-components'; +import { useHistory } from 'react-router-dom'; +import moment from 'moment'; import { useDispatch } from 'react-redux'; import { Ping } from '../../../../common/runtime_types'; import { convertMicrosecondsToMilliseconds as microsToMillis } from '../../../lib/helper'; @@ -27,6 +29,7 @@ import { FailedStep } from './columns/failed_step'; import { usePingsList } from './use_pings'; import { PingListHeader } from './ping_list_header'; import { clearPings } from '../../../state/actions'; +import { getShortTimeStamp } from '../../overview/monitor_list/columns/monitor_status_column'; export const SpanWithMargin = styled.span` margin-right: 16px; @@ -69,6 +72,8 @@ export const PingList = () => { const dispatch = useDispatch(); + const history = useHistory(); + const pruneJourneysCallback = useCallback( (checkGroups: string[]) => dispatch(pruneJourneyState(checkGroups)), [dispatch] @@ -140,7 +145,7 @@ export const PingList = () => { field: 'timestamp', name: TIMESTAMP_LABEL, render: (timestamp: string, item: Ping) => ( - + ), }, ] @@ -197,20 +202,43 @@ export const PingList = () => { }, ] : []), - { - align: 'right', - width: '24px', - isExpander: true, - render: (item: Ping) => ( - - ), - }, + ...(monitorType !== MONITOR_TYPES.BROWSER + ? [ + { + align: 'right', + width: '24px', + isExpander: true, + render: (item: Ping) => ( + + ), + }, + ] + : []), ]; + const getRowProps = (item: Ping) => { + if (monitorType !== MONITOR_TYPES.BROWSER) { + return {}; + } + const { monitor } = item; + return { + height: '85px', + 'data-test-subj': `row-${monitor.check_group}`, + onClick: (evt: MouseEvent) => { + const targetElem = evt.target as HTMLElement; + + // we dont want to capture image click event + if (targetElem.tagName !== 'IMG' && targetElem.tagName !== 'path') { + history.push(`/journey/${monitor.check_group}/steps`); + } + }, + }; + }; + const pagination: Pagination = { initialPageSize: DEFAULT_PAGE_SIZE, pageIndex, @@ -247,6 +275,7 @@ export const PingList = () => { setPageIndex(criteria.page!.index); }} tableLayout={'auto'} + rowProps={getRowProps} /> ); diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/browser_expanded_row.test.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/browser_expanded_row.test.tsx deleted file mode 100644 index 396d51e3002b2..0000000000000 --- a/x-pack/plugins/uptime/public/components/monitor/synthetics/browser_expanded_row.test.tsx +++ /dev/null @@ -1,203 +0,0 @@ -/* - * 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 { shallowWithIntl } from '@kbn/test/jest'; -import React from 'react'; -import { BrowserExpandedRowComponent } from './browser_expanded_row'; -import { Ping } from '../../../../common/runtime_types'; - -describe('BrowserExpandedRowComponent', () => { - let defStep: Ping; - beforeEach(() => { - defStep = { - docId: 'doc-id', - timestamp: '123', - monitor: { - duration: { - us: 100, - }, - id: 'mon-id', - status: 'up', - type: 'browser', - }, - }; - }); - - it('returns empty step state when no journey', () => { - expect(shallowWithIntl()).toMatchInlineSnapshot( - `` - ); - }); - - it('returns empty step state when journey has no steps', () => { - expect( - shallowWithIntl( - - ) - ).toMatchInlineSnapshot(``); - }); - - it('displays loading spinner when loading', () => { - expect( - shallowWithIntl( - - ) - ).toMatchInlineSnapshot(` -
- -
- `); - }); - - it('renders executed journey when step/end is present', () => { - expect( - shallowWithIntl( - - ) - ).toMatchInlineSnapshot(` - - `); - }); - - it('handles case where synth type is somehow missing', () => { - expect( - shallowWithIntl( - - ) - ).toMatchInlineSnapshot(`""`); - }); - - it('renders console output step list when only console steps are present', () => { - expect( - shallowWithIntl( - - ) - ).toMatchInlineSnapshot(` - - `); - }); - - it('renders null when only unsupported steps are present', () => { - expect( - shallowWithIntl( - - ) - ).toMatchInlineSnapshot(`""`); - }); -}); diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/browser_expanded_row.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/browser_expanded_row.tsx deleted file mode 100644 index 2ceaa2d1b68ef..0000000000000 --- a/x-pack/plugins/uptime/public/components/monitor/synthetics/browser_expanded_row.tsx +++ /dev/null @@ -1,65 +0,0 @@ -/* - * 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 { EuiLoadingSpinner } from '@elastic/eui'; -import React, { useEffect, FC } from 'react'; -import { useDispatch, useSelector } from 'react-redux'; -import { Ping } from '../../../../common/runtime_types'; -import { getJourneySteps } from '../../../state/actions/journey'; -import { JourneyState } from '../../../state/reducers/journey'; -import { journeySelector } from '../../../state/selectors'; -import { EmptyJourney } from './empty_journey'; -import { ExecutedJourney } from './executed_journey'; -import { ConsoleOutputEventList } from './console_output_event_list'; - -interface BrowserExpandedRowProps { - checkGroup?: string; -} - -export const BrowserExpandedRow: React.FC = ({ checkGroup }) => { - const dispatch = useDispatch(); - useEffect(() => { - if (checkGroup) { - dispatch(getJourneySteps({ checkGroup })); - } - }, [dispatch, checkGroup]); - - const journeys = useSelector(journeySelector); - const journey = journeys[checkGroup ?? '']; - - return ; -}; - -type ComponentProps = BrowserExpandedRowProps & { - journey?: JourneyState; -}; - -const stepEnd = (step: Ping) => step.synthetics?.type === 'step/end'; -const stepConsole = (step: Ping) => - ['stderr', 'cmd/status'].indexOf(step.synthetics?.type ?? '') !== -1; - -export const BrowserExpandedRowComponent: FC = ({ checkGroup, journey }) => { - if (!!journey && journey.loading) { - return ( -
- -
- ); - } - - if (!journey || journey.steps.length === 0) { - return ; - } - - if (journey.steps.some(stepEnd)) return ; - - if (journey.steps.some(stepConsole)) return ; - - // TODO: should not happen, this means that the journey has no step/end and no console logs, but some other steps; filmstrip, screenshot, etc. - // we should probably create an error prompt letting the user know this step is not supported yet - return null; -}; diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/executed_journey.test.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/executed_journey.test.tsx deleted file mode 100644 index 2fbc19d245826..0000000000000 --- a/x-pack/plugins/uptime/public/components/monitor/synthetics/executed_journey.test.tsx +++ /dev/null @@ -1,265 +0,0 @@ -/* - * 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 { shallowWithIntl } from '@kbn/test/jest'; -import React from 'react'; -import { ExecutedJourney } from './executed_journey'; -import { Ping } from '../../../../common/runtime_types'; - -const MONITOR_BOILERPLATE = { - id: 'MON_ID', - duration: { - us: 10, - }, - status: 'down', - type: 'browser', -}; - -describe('ExecutedJourney component', () => { - let steps: Ping[]; - - beforeEach(() => { - steps = [ - { - docId: '1', - timestamp: '123', - monitor: MONITOR_BOILERPLATE, - synthetics: { - payload: { - status: 'failed', - }, - type: 'step/end', - }, - }, - { - docId: '2', - timestamp: '124', - monitor: MONITOR_BOILERPLATE, - synthetics: { - payload: { - status: 'failed', - }, - type: 'step/end', - }, - }, - ]; - }); - - it('creates expected message for all failed', () => { - const wrapper = shallowWithIntl( - - ); - expect(wrapper.find('EuiText')).toMatchInlineSnapshot(` - -

- -

-

- 2 Steps - all failed or skipped -

- - `); - }); - - it('creates expected message for all succeeded', () => { - steps[0].synthetics!.payload!.status = 'succeeded'; - steps[1].synthetics!.payload!.status = 'succeeded'; - const wrapper = shallowWithIntl( - - ); - expect(wrapper.find('EuiText')).toMatchInlineSnapshot(` - -

- -

-

- 2 Steps - all succeeded -

- - `); - }); - - it('creates appropriate message for mixed results', () => { - steps[0].synthetics!.payload!.status = 'succeeded'; - const wrapper = shallowWithIntl( - - ); - expect(wrapper.find('EuiText')).toMatchInlineSnapshot(` - -

- -

-

- 2 Steps - 1 succeeded -

- - `); - }); - - it('tallies skipped steps', () => { - steps[0].synthetics!.payload!.status = 'succeeded'; - steps[1].synthetics!.payload!.status = 'skipped'; - const wrapper = shallowWithIntl( - - ); - expect(wrapper.find('EuiText')).toMatchInlineSnapshot(` - -

- -

-

- 2 Steps - 1 succeeded -

- - `); - }); - - it('uses appropriate count when non-step/end steps are included', () => { - steps[0].synthetics!.payload!.status = 'succeeded'; - steps.push({ - docId: '3', - timestamp: '125', - monitor: MONITOR_BOILERPLATE, - synthetics: { - type: 'stderr', - error: { - message: `there was an error, that's all we know`, - stack: 'your.error.happened.here', - }, - }, - }); - const wrapper = shallowWithIntl( - - ); - expect(wrapper.find('EuiText')).toMatchInlineSnapshot(` - -

- -

-

- 2 Steps - 1 succeeded -

- - `); - }); - - it('renders a component per step', () => { - expect( - shallowWithIntl( - - ).find('EuiFlexGroup') - ).toMatchInlineSnapshot(` - - - - - - `); - }); -}); diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/executed_journey.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/executed_journey.tsx deleted file mode 100644 index 1ded7f065d8ab..0000000000000 --- a/x-pack/plugins/uptime/public/components/monitor/synthetics/executed_journey.tsx +++ /dev/null @@ -1,88 +0,0 @@ -/* - * 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 { EuiFlexGroup, EuiSpacer, EuiText } from '@elastic/eui'; -import { i18n } from '@kbn/i18n'; -import { FormattedMessage } from '@kbn/i18n/react'; -import React, { FC } from 'react'; -import { Ping } from '../../../../common/runtime_types'; -import { JourneyState } from '../../../state/reducers/journey'; -import { ExecutedStep } from './executed_step'; - -interface StepStatusCount { - failed: number; - skipped: number; - succeeded: number; -} - -function statusMessage(count: StepStatusCount) { - const total = count.succeeded + count.failed + count.skipped; - if (count.failed + count.skipped === total) { - return i18n.translate('xpack.uptime.synthetics.journey.allFailedMessage', { - defaultMessage: '{total} Steps - all failed or skipped', - values: { total }, - }); - } else if (count.succeeded === total) { - return i18n.translate('xpack.uptime.synthetics.journey.allSucceededMessage', { - defaultMessage: '{total} Steps - all succeeded', - values: { total }, - }); - } - return i18n.translate('xpack.uptime.synthetics.journey.partialSuccessMessage', { - defaultMessage: '{total} Steps - {succeeded} succeeded', - values: { succeeded: count.succeeded, total }, - }); -} - -function reduceStepStatus(prev: StepStatusCount, cur: Ping): StepStatusCount { - if (cur.synthetics?.payload?.status === 'succeeded') { - prev.succeeded += 1; - return prev; - } else if (cur.synthetics?.payload?.status === 'skipped') { - prev.skipped += 1; - return prev; - } - prev.failed += 1; - return prev; -} - -function isStepEnd(step: Ping) { - return step.synthetics?.type === 'step/end'; -} - -interface ExecutedJourneyProps { - journey: JourneyState; -} - -export const ExecutedJourney: FC = ({ journey }) => { - return ( -
- -

- -

-

- {statusMessage( - journey.steps - .filter(isStepEnd) - .reduce(reduceStepStatus, { failed: 0, skipped: 0, succeeded: 0 }) - )} -

- - - - {journey.steps.filter(isStepEnd).map((step, index) => ( - - ))} - - -
- ); -}; diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/executed_step.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/executed_step.tsx deleted file mode 100644 index 991aa8fefba0a..0000000000000 --- a/x-pack/plugins/uptime/public/components/monitor/synthetics/executed_step.tsx +++ /dev/null @@ -1,110 +0,0 @@ -/* - * 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 { EuiFlexItem, EuiFlexGroup, EuiSpacer, EuiText } from '@elastic/eui'; -import { FormattedMessage } from '@kbn/i18n/react'; -import React, { FC } from 'react'; -import { i18n } from '@kbn/i18n'; -import { CodeBlockAccordion } from './code_block_accordion'; -import { StepScreenshotDisplay } from './step_screenshot_display'; -import { StatusBadge } from './status_badge'; -import { Ping } from '../../../../common/runtime_types'; -import { StepDetailLink } from '../../common/step_detail_link'; -import { VIEW_PERFORMANCE } from './translations'; - -const CODE_BLOCK_OVERFLOW_HEIGHT = 360; - -interface ExecutedStepProps { - step: Ping; - index: number; - checkGroup: string; -} - -export const ExecutedStep: FC = ({ step, index, checkGroup }) => { - return ( - <> -
- - - - - - - - -
- -
- - - -
- - - - - - {step.synthetics?.step?.index && ( - - - {VIEW_PERFORMANCE} - - - - )} - - {step.synthetics?.payload?.source} - - - {step.synthetics?.error?.message} - - - {step.synthetics?.error?.stack} - - - -
-
- - ); -}; diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/status_badge.test.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/status_badge.test.tsx deleted file mode 100644 index 304787e96818f..0000000000000 --- a/x-pack/plugins/uptime/public/components/monitor/synthetics/status_badge.test.tsx +++ /dev/null @@ -1,42 +0,0 @@ -/* - * 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 { shallowWithIntl } from '@kbn/test/jest'; -import React from 'react'; -import { StatusBadge } from './status_badge'; - -describe('StatusBadge', () => { - it('displays success message', () => { - expect(shallowWithIntl()).toMatchInlineSnapshot(` - - Succeeded - - `); - }); - - it('displays failed message', () => { - expect(shallowWithIntl()).toMatchInlineSnapshot(` - - Failed - - `); - }); - - it('displays skipped message', () => { - expect(shallowWithIntl()).toMatchInlineSnapshot(` - - Skipped - - `); - }); -}); diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/step_detail_container.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/step_detail_container.tsx index 346af9d31a28b..ef0d001ac905e 100644 --- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/step_detail_container.tsx +++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/step_detail_container.tsx @@ -48,7 +48,7 @@ export const StepDetailContainer: React.FC = ({ checkGroup, stepIndex }) }; }, [stepIndex, journey]); - useMonitorBreadcrumb({ journey, activeStep }); + useMonitorBreadcrumb({ details: journey?.details, activeStep, performanceBreakDownView: true }); const handleNextStep = useCallback(() => { history.push(`/journey/${checkGroup}/step/${stepIndex + 1}`); diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_monitor_breadcrumb.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_monitor_breadcrumb.tsx index c51b85f76d605..8b85f05130d0b 100644 --- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_monitor_breadcrumb.tsx +++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_monitor_breadcrumb.tsx @@ -6,20 +6,25 @@ */ import moment from 'moment'; +import { i18n } from '@kbn/i18n'; import { useBreadcrumbs } from '../../../../hooks/use_breadcrumbs'; -import { useKibana, useUiSetting$ } from '../../../../../../../../src/plugins/kibana_react/public'; +import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public'; import { JourneyState } from '../../../../state/reducers/journey'; import { Ping } from '../../../../../common/runtime_types/ping'; import { PLUGIN } from '../../../../../common/constants/plugin'; +import { getShortTimeStamp } from '../../../overview/monitor_list/columns/monitor_status_column'; interface Props { - journey: JourneyState; + details: JourneyState['details']; activeStep?: Ping; + performanceBreakDownView?: boolean; } -export const useMonitorBreadcrumb = ({ journey, activeStep }: Props) => { - const [dateFormat] = useUiSetting$('dateFormat'); - +export const useMonitorBreadcrumb = ({ + details, + activeStep, + performanceBreakDownView = false, +}: Props) => { const kibana = useKibana(); const appPath = kibana.services.application?.getUrlForApp(PLUGIN.ID) ?? ''; @@ -32,8 +37,22 @@ export const useMonitorBreadcrumb = ({ journey, activeStep }: Props) => { }, ] : []), - ...(journey?.details?.timestamp - ? [{ text: moment(journey?.details?.timestamp).format(dateFormat) }] + ...(details?.journey?.monitor?.check_group + ? [ + { + text: getShortTimeStamp(moment(details?.timestamp)), + href: `${appPath}/journey/${details.journey.monitor.check_group}/steps`, + }, + ] + : []), + ...(performanceBreakDownView + ? [ + { + text: i18n.translate('xpack.uptime.synthetics.performanceBreakDown.label', { + defaultMessage: 'Performance breakdown', + }), + }, + ] : []), ]); }; diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_monitor_breadcrumbs.test.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_monitor_breadcrumbs.test.tsx index ac79d7f4c2a8a..4aed073424788 100644 --- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_monitor_breadcrumbs.test.tsx +++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_monitor_breadcrumbs.test.tsx @@ -17,7 +17,7 @@ import { JourneyState } from '../../../../state/reducers/journey'; import { chromeServiceMock, uiSettingsServiceMock } from 'src/core/public/mocks'; describe('useMonitorBreadcrumbs', () => { - it('sets the given breadcrumbs', () => { + it('sets the given breadcrumbs for steps list view', () => { let breadcrumbObj: ChromeBreadcrumb[] = []; const getBreadcrumbs = () => { return breadcrumbObj; @@ -43,8 +43,13 @@ describe('useMonitorBreadcrumbs', () => { const Component = () => { useMonitorBreadcrumb({ - activeStep: { monitor: { id: 'test-monitor' } } as Ping, - journey: { details: { timestamp: '2021-01-04T11:25:19.104Z' } } as JourneyState, + activeStep: { monitor: { id: 'test-monitor', check_group: 'fake-test-group' } } as Ping, + details: { + timestamp: '2021-01-04T11:25:19.104Z', + journey: { + monitor: { id: 'test-monitor', check_group: 'fake-test-group' }, + }, + } as JourneyState['details'], }); return <>Step Water Fall; }; @@ -69,7 +74,78 @@ describe('useMonitorBreadcrumbs', () => { "text": "test-monitor", }, Object { - "text": "Jan 4, 2021 @ 06:25:19.104", + "href": "/app/uptime/journey/fake-test-group/steps", + "onClick": [Function], + "text": "Jan 4, 2021 6:25:19 AM", + }, + ] + `); + }); + + it('sets the given breadcrumbs for performance breakdown page', () => { + let breadcrumbObj: ChromeBreadcrumb[] = []; + const getBreadcrumbs = () => { + return breadcrumbObj; + }; + + const core = { + chrome: { + ...chromeServiceMock.createStartContract(), + setBreadcrumbs: (newBreadcrumbs: ChromeBreadcrumb[]) => { + breadcrumbObj = newBreadcrumbs; + }, + }, + uiSettings: { + ...uiSettingsServiceMock.createSetupContract(), + get(key: string, defaultOverride?: any): any { + return `MMM D, YYYY @ HH:mm:ss.SSS` || defaultOverride; + }, + get$(key: string, defaultOverride?: any): any { + return of(`MMM D, YYYY @ HH:mm:ss.SSS`) || of(defaultOverride); + }, + }, + }; + + const Component = () => { + useMonitorBreadcrumb({ + activeStep: { monitor: { id: 'test-monitor', check_group: 'fake-test-group' } } as Ping, + details: { + timestamp: '2021-01-04T11:25:19.104Z', + journey: { + monitor: { id: 'test-monitor', check_group: 'fake-test-group' }, + }, + } as JourneyState['details'], + performanceBreakDownView: true, + }); + return <>Step Water Fall; + }; + + render( + + + , + { core } + ); + + expect(getBreadcrumbs()).toMatchInlineSnapshot(` + Array [ + Object { + "href": "/app/uptime", + "onClick": [Function], + "text": "Uptime", + }, + Object { + "href": "/app/uptime/monitor/dGVzdC1tb25pdG9y", + "onClick": [Function], + "text": "test-monitor", + }, + Object { + "href": "/app/uptime/journey/fake-test-group/steps", + "onClick": [Function], + "text": "Jan 4, 2021 6:25:19 AM", + }, + Object { + "text": "Performance breakdown", }, ] `); diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/monitor_status_column.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/monitor_status_column.tsx index c6476a5bf2e53..f5581f75b3759 100644 --- a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/monitor_status_column.tsx +++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/monitor_status_column.tsx @@ -67,7 +67,7 @@ export const getShortTimeStamp = (timeStamp: moment.Moment, relative = false) => moment.locale(prevLocale); return shortTimestamp; } else { - if (moment().diff(timeStamp, 'd') > 1) { + if (moment().diff(timeStamp, 'd') >= 1) { return timeStamp.format('ll LTS'); } return timeStamp.format('LTS'); diff --git a/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_expanded_row/screenshot_link.tsx b/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_expanded_row/screenshot_link.tsx new file mode 100644 index 0000000000000..16068e0d72b46 --- /dev/null +++ b/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_expanded_row/screenshot_link.tsx @@ -0,0 +1,47 @@ +/* + * 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 React from 'react'; +import { FormattedMessage } from '@kbn/i18n/react'; +import { ReactRouterEuiLink } from '../../../common/react_router_helpers'; +import { Ping } from '../../../../../common/runtime_types/ping'; +import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common'; + +const LabelLink = euiStyled.div` + margin-bottom: ${(props) => props.theme.eui.paddingSizes.xs}; + font-size: ${({ theme }) => theme.eui.euiFontSizeS}; +`; + +interface Props { + lastSuccessfulStep: Ping; +} + +export const ScreenshotLink = ({ lastSuccessfulStep }: Props) => { + return ( + + + + + + + ), + }} + /> + + ); +}; diff --git a/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_expanded_row/step_screenshots.tsx b/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_expanded_row/step_screenshots.tsx new file mode 100644 index 0000000000000..eb7bc95751557 --- /dev/null +++ b/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_expanded_row/step_screenshots.tsx @@ -0,0 +1,86 @@ +/* + * 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 moment from 'moment'; +import React from 'react'; +import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui'; +import { FormattedMessage } from '@kbn/i18n/react'; +import { StepScreenshotDisplay } from '../../step_screenshot_display'; +import { Ping } from '../../../../../common/runtime_types/ping'; +import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common'; +import { useFetcher } from '../../../../../../observability/public'; +import { fetchLastSuccessfulStep } from '../../../../state/api/journey'; +import { ScreenshotLink } from './screenshot_link'; +import { getShortTimeStamp } from '../../../overview/monitor_list/columns/monitor_status_column'; + +const Label = euiStyled.div` + margin-bottom: ${(props) => props.theme.eui.paddingSizes.xs}; + font-size: ${({ theme }) => theme.eui.euiFontSizeS}; + color: ${({ theme }) => theme.eui.euiColorDarkShade}; +`; + +interface Props { + step: Ping; +} + +export const StepScreenshots = ({ step }: Props) => { + const isSucceeded = step.synthetics?.payload?.status === 'succeeded'; + + const { data: lastSuccessfulStep } = useFetcher(() => { + if (!isSucceeded) { + return fetchLastSuccessfulStep({ + timestamp: step.timestamp, + monitorId: step.monitor.id, + stepIndex: step.synthetics?.step?.index!, + }); + } + }, [step.docId, step.timestamp]); + + return ( + + + + + + + + {!isSucceeded && lastSuccessfulStep?.monitor && ( + + + + + + + )} + + ); +}; diff --git a/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_image.tsx b/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_image.tsx new file mode 100644 index 0000000000000..69a5ef91a5925 --- /dev/null +++ b/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_image.tsx @@ -0,0 +1,28 @@ +/* + * 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 React from 'react'; +import { EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui'; +import { Ping } from '../../../../common/runtime_types/ping'; +import { PingTimestamp } from '../../monitor/ping_list/columns/ping_timestamp'; + +interface Props { + step: Ping; +} + +export const StepImage = ({ step }: Props) => { + return ( + + + + + + {step.synthetics?.step?.name} + + + ); +}; diff --git a/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_list.test.tsx b/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_list.test.tsx new file mode 100644 index 0000000000000..959bf0f644580 --- /dev/null +++ b/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_list.test.tsx @@ -0,0 +1,144 @@ +/* + * 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 React from 'react'; +import { Ping } from '../../../../common/runtime_types/ping'; +import { StepsList } from './steps_list'; +import { render } from '../../../lib/helper/rtl_helpers'; + +describe('StepList component', () => { + let steps: Ping[]; + + beforeEach(() => { + steps = [ + { + docId: '1', + timestamp: '123', + monitor: { + id: 'MON_ID', + duration: { + us: 10, + }, + status: 'down', + type: 'browser', + check_group: 'fake-group', + }, + synthetics: { + payload: { + status: 'failed', + }, + type: 'step/end', + step: { + name: 'load page', + index: 1, + }, + }, + }, + { + docId: '2', + timestamp: '124', + monitor: { + id: 'MON_ID', + duration: { + us: 10, + }, + status: 'down', + type: 'browser', + check_group: 'fake-group-1', + }, + synthetics: { + payload: { + status: 'failed', + }, + type: 'step/end', + step: { + name: 'go to login', + index: 2, + }, + }, + }, + ]; + }); + + it('creates expected message for all failed', () => { + const { getByText } = render(); + expect(getByText('2 Steps - all failed or skipped')); + }); + + it('renders a link to the step detail view', () => { + const { getByTitle, getByTestId } = render(); + expect(getByTestId('step-detail-link')).toHaveAttribute('href', '/journey/fake-group/step/1'); + expect(getByTitle(`Failed`)); + }); + + it.each([ + ['succeeded', 'Succeeded'], + ['failed', 'Failed'], + ['skipped', 'Skipped'], + ])('supplies status badge correct status', (status, expectedStatus) => { + const step = steps[0]; + step.synthetics!.payload!.status = status; + const { getByText } = render(); + expect(getByText(expectedStatus)); + }); + + it('creates expected message for all succeeded', () => { + steps[0].synthetics!.payload!.status = 'succeeded'; + steps[1].synthetics!.payload!.status = 'succeeded'; + + const { getByText } = render(); + expect(getByText('2 Steps - all succeeded')); + }); + + it('creates appropriate message for mixed results', () => { + steps[0].synthetics!.payload!.status = 'succeeded'; + + const { getByText } = render(); + expect(getByText('2 Steps - 1 succeeded')); + }); + + it('tallies skipped steps', () => { + steps[0].synthetics!.payload!.status = 'succeeded'; + steps[1].synthetics!.payload!.status = 'skipped'; + + const { getByText } = render(); + expect(getByText('2 Steps - 1 succeeded')); + }); + + it('uses appropriate count when non-step/end steps are included', () => { + steps[0].synthetics!.payload!.status = 'succeeded'; + steps.push({ + docId: '3', + timestamp: '125', + monitor: { + id: 'MON_ID', + duration: { + us: 10, + }, + status: 'down', + type: 'browser', + check_group: 'fake-group-2', + }, + synthetics: { + type: 'stderr', + error: { + message: `there was an error, that's all we know`, + stack: 'your.error.happened.here', + }, + }, + }); + + const { getByText } = render(); + expect(getByText('2 Steps - 1 succeeded')); + }); + + it('renders a row per step', () => { + const { getByTestId } = render(); + expect(getByTestId('row-fake-group')); + expect(getByTestId('row-fake-group-1')); + }); +}); diff --git a/x-pack/plugins/uptime/public/components/synthetics/check_steps/steps_list.tsx b/x-pack/plugins/uptime/public/components/synthetics/check_steps/steps_list.tsx new file mode 100644 index 0000000000000..47bf3ae0a1784 --- /dev/null +++ b/x-pack/plugins/uptime/public/components/synthetics/check_steps/steps_list.tsx @@ -0,0 +1,175 @@ +/* + * 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 { EuiBasicTable, EuiButtonIcon, EuiPanel, EuiTitle } from '@elastic/eui'; +import { i18n } from '@kbn/i18n'; +import React, { MouseEvent } from 'react'; +import styled from 'styled-components'; +import { Ping } from '../../../../common/runtime_types'; +import { STATUS_LABEL } from '../../monitor/ping_list/translations'; +import { COLLAPSE_LABEL, EXPAND_LABEL, STEP_NAME_LABEL } from '../translations'; +import { StatusBadge } from '../status_badge'; +import { StepDetailLink } from '../../common/step_detail_link'; +import { VIEW_PERFORMANCE } from '../../monitor/synthetics/translations'; +import { StepImage } from './step_image'; +import { useExpandedRow } from './use_expanded_row'; + +export const SpanWithMargin = styled.span` + margin-right: 16px; +`; + +interface Props { + data: Ping[]; + error?: Error; + loading: boolean; +} + +interface StepStatusCount { + failed: number; + skipped: number; + succeeded: number; +} + +function isStepEnd(step: Ping) { + return step.synthetics?.type === 'step/end'; +} + +function statusMessage(count: StepStatusCount, loading?: boolean) { + if (loading) { + return i18n.translate('xpack.uptime.synthetics.journey.loadingSteps', { + defaultMessage: 'Loading steps ...', + }); + } + const total = count.succeeded + count.failed + count.skipped; + if (count.failed + count.skipped === total) { + return i18n.translate('xpack.uptime.synthetics.journey.allFailedMessage', { + defaultMessage: '{total} Steps - all failed or skipped', + values: { total }, + }); + } else if (count.succeeded === total) { + return i18n.translate('xpack.uptime.synthetics.journey.allSucceededMessage', { + defaultMessage: '{total} Steps - all succeeded', + values: { total }, + }); + } + return i18n.translate('xpack.uptime.synthetics.journey.partialSuccessMessage', { + defaultMessage: '{total} Steps - {succeeded} succeeded', + values: { succeeded: count.succeeded, total }, + }); +} + +function reduceStepStatus(prev: StepStatusCount, cur: Ping): StepStatusCount { + if (cur.synthetics?.payload?.status === 'succeeded') { + prev.succeeded += 1; + return prev; + } else if (cur.synthetics?.payload?.status === 'skipped') { + prev.skipped += 1; + return prev; + } + prev.failed += 1; + return prev; +} + +export const StepsList = ({ data, error, loading }: Props) => { + const steps = data.filter(isStepEnd); + + const { expandedRows, toggleExpand } = useExpandedRow({ steps, allPings: data, loading }); + + const columns: any[] = [ + { + field: 'synthetics.payload.status', + name: STATUS_LABEL, + render: (pingStatus: string, item: Ping) => ( + + ), + }, + { + align: 'left', + field: 'timestamp', + name: STEP_NAME_LABEL, + render: (timestamp: string, item: Ping) => , + }, + { + align: 'left', + field: 'timestamp', + name: '', + render: (val: string, item: Ping) => ( + + {VIEW_PERFORMANCE} + + ), + }, + { + align: 'right', + width: '24px', + isExpander: true, + render: (ping: Ping) => { + return ( + toggleExpand({ ping })} + aria-label={expandedRows[ping.docId] ? COLLAPSE_LABEL : EXPAND_LABEL} + iconType={expandedRows[ping.docId] ? 'arrowUp' : 'arrowDown'} + /> + ); + }, + }, + ]; + + const getRowProps = (item: Ping) => { + const { monitor } = item; + + return { + height: '85px', + 'data-test-subj': `row-${monitor.check_group}`, + onClick: (evt: MouseEvent) => { + const targetElem = evt.target as HTMLElement; + + // we dont want to capture image click event + if (targetElem.tagName !== 'IMG' && targetElem.tagName !== 'BUTTON') { + toggleExpand({ ping: item }); + } + }, + }; + }; + + return ( + + +

+ {statusMessage( + steps.reduce(reduceStepStatus, { failed: 0, skipped: 0, succeeded: 0 }), + loading + )} +

+ + + + ); +}; diff --git a/x-pack/plugins/uptime/public/components/synthetics/check_steps/use_check_steps.ts b/x-pack/plugins/uptime/public/components/synthetics/check_steps/use_check_steps.ts new file mode 100644 index 0000000000000..da40b900fdcc2 --- /dev/null +++ b/x-pack/plugins/uptime/public/components/synthetics/check_steps/use_check_steps.ts @@ -0,0 +1,29 @@ +/* + * 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 { useParams } from 'react-router-dom'; +import { FETCH_STATUS, useFetcher } from '../../../../../observability/public'; +import { fetchJourneySteps } from '../../../state/api/journey'; +import { JourneyState } from '../../../state/reducers/journey'; + +export const useCheckSteps = (): JourneyState => { + const { checkGroupId } = useParams<{ checkGroupId: string }>(); + + const { data, status, error } = useFetcher(() => { + return fetchJourneySteps({ + checkGroup: checkGroupId, + }); + }, [checkGroupId]); + + return { + error, + checkGroup: checkGroupId, + steps: data?.steps ?? [], + details: data?.details, + loading: status === FETCH_STATUS.LOADING || status === FETCH_STATUS.PENDING, + }; +}; diff --git a/x-pack/plugins/uptime/public/components/synthetics/check_steps/use_expanded_row.test.tsx b/x-pack/plugins/uptime/public/components/synthetics/check_steps/use_expanded_row.test.tsx new file mode 100644 index 0000000000000..d94122a7311ca --- /dev/null +++ b/x-pack/plugins/uptime/public/components/synthetics/check_steps/use_expanded_row.test.tsx @@ -0,0 +1,152 @@ +/* + * 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 React from 'react'; +import { Route } from 'react-router-dom'; +import { fireEvent, screen } from '@testing-library/dom'; +import { EuiButtonIcon } from '@elastic/eui'; +import { createMemoryHistory } from 'history'; + +import { useExpandedRow } from './use_expanded_row'; +import { render } from '../../../lib/helper/rtl_helpers'; +import { Ping } from '../../../../common/runtime_types/ping'; +import { SYNTHETIC_CHECK_STEPS_ROUTE } from '../../../../common/constants'; +import { COLLAPSE_LABEL, EXPAND_LABEL } from '../translations'; +import { act } from 'react-dom/test-utils'; + +describe('useExpandedROw', () => { + let expandedRowsObj = {}; + const TEST_ID = 'uptimeStepListExpandBtn'; + + const history = createMemoryHistory({ + initialEntries: ['/journey/fake-group/steps'], + }); + const steps: Ping[] = [ + { + docId: '1', + timestamp: '123', + monitor: { + id: 'MON_ID', + duration: { + us: 10, + }, + status: 'down', + type: 'browser', + check_group: 'fake-group', + }, + synthetics: { + payload: { + status: 'failed', + }, + type: 'step/end', + step: { + name: 'load page', + index: 1, + }, + }, + }, + { + docId: '2', + timestamp: '124', + monitor: { + id: 'MON_ID', + duration: { + us: 10, + }, + status: 'down', + type: 'browser', + check_group: 'fake-group', + }, + synthetics: { + payload: { + status: 'failed', + }, + type: 'step/end', + step: { + name: 'go to login', + index: 2, + }, + }, + }, + ]; + + const Component = () => { + const { expandedRows, toggleExpand } = useExpandedRow({ + steps, + allPings: steps, + loading: false, + }); + + expandedRowsObj = expandedRows; + + return ( + + Step list + {steps.map((ping, index) => ( + toggleExpand({ ping })} + aria-label={expandedRows[ping.docId] ? COLLAPSE_LABEL : EXPAND_LABEL} + iconType={expandedRows[ping.docId] ? 'arrowUp' : 'arrowDown'} + /> + ))} + + ); + }; + + it('it toggles rows on expand click', async () => { + render(, { + history, + }); + + fireEvent.click(await screen.findByTestId(TEST_ID + '1')); + + expect(Object.keys(expandedRowsObj)).toStrictEqual(['1']); + + expect(JSON.stringify(expandedRowsObj)).toContain('fake-group'); + + await act(async () => { + fireEvent.click(await screen.findByTestId(TEST_ID + '1')); + }); + + expect(Object.keys(expandedRowsObj)).toStrictEqual([]); + }); + + it('it can expand both rows at same time', async () => { + render(, { + history, + }); + + // let's expand both rows + fireEvent.click(await screen.findByTestId(TEST_ID + '1')); + fireEvent.click(await screen.findByTestId(TEST_ID + '0')); + + expect(Object.keys(expandedRowsObj)).toStrictEqual(['0', '1']); + }); + + it('it updates already expanded rows on new check group monitor', async () => { + render(, { + history, + }); + + // let's expand both rows + fireEvent.click(await screen.findByTestId(TEST_ID + '1')); + fireEvent.click(await screen.findByTestId(TEST_ID + '0')); + + const newFakeGroup = 'new-fake-group-1'; + + steps[0].monitor.check_group = newFakeGroup; + steps[1].monitor.check_group = newFakeGroup; + + act(() => { + history.push(`/journey/${newFakeGroup}/steps`); + }); + + expect(JSON.stringify(expandedRowsObj)).toContain(newFakeGroup); + }); +}); diff --git a/x-pack/plugins/uptime/public/components/synthetics/check_steps/use_expanded_row.tsx b/x-pack/plugins/uptime/public/components/synthetics/check_steps/use_expanded_row.tsx new file mode 100644 index 0000000000000..bb56b237dfbd2 --- /dev/null +++ b/x-pack/plugins/uptime/public/components/synthetics/check_steps/use_expanded_row.tsx @@ -0,0 +1,88 @@ +/* + * 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 React, { useEffect, useState, useCallback } from 'react'; +import { useParams } from 'react-router-dom'; +import { ExecutedStep } from '../executed_step'; +import { Ping } from '../../../../common/runtime_types/ping'; + +interface HookProps { + loading: boolean; + allPings: Ping[]; + steps: Ping[]; +} + +type ExpandRowType = Record; + +export const useExpandedRow = ({ loading, steps, allPings }: HookProps) => { + const [expandedRows, setExpandedRows] = useState({}); + // eui table uses index from 0, synthetics uses 1 + + const { checkGroupId } = useParams<{ checkGroupId: string }>(); + + const getBrowserConsole = useCallback( + (index: number) => { + return allPings.find( + (stepF) => + stepF.synthetics?.type === 'journey/browserconsole' && + stepF.synthetics?.step?.index! === index + )?.synthetics?.payload?.text; + }, + [allPings] + ); + + useEffect(() => { + const expandedRowsN: ExpandRowType = {}; + for (const expandedRowKeyStr in expandedRows) { + if (expandedRows.hasOwnProperty(expandedRowKeyStr)) { + const expandedRowKey = Number(expandedRowKeyStr); + + const step = steps.find((stepF) => stepF.synthetics?.step?.index !== expandedRowKey)!; + + expandedRowsN[expandedRowKey] = ( + + ); + } + } + + setExpandedRows(expandedRowsN); + + // we only want to update when checkGroupId changes + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [checkGroupId, loading]); + + const toggleExpand = ({ ping }: { ping: Ping }) => { + // eui table uses index from 0, synthetics uses 1 + const stepIndex = ping.synthetics?.step?.index! - 1; + + // If already expanded, collapse + if (expandedRows[stepIndex]) { + delete expandedRows[stepIndex]; + setExpandedRows({ ...expandedRows }); + } else { + // Otherwise expand this row + setExpandedRows({ + ...expandedRows, + [stepIndex]: ( + + ), + }); + } + }; + + return { expandedRows, toggleExpand }; +}; diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/code_block_accordion.tsx b/x-pack/plugins/uptime/public/components/synthetics/code_block_accordion.tsx similarity index 87% rename from x-pack/plugins/uptime/public/components/monitor/synthetics/code_block_accordion.tsx rename to x-pack/plugins/uptime/public/components/synthetics/code_block_accordion.tsx index 18aeb7a236ca8..225ba1041c263 100644 --- a/x-pack/plugins/uptime/public/components/monitor/synthetics/code_block_accordion.tsx +++ b/x-pack/plugins/uptime/public/components/synthetics/code_block_accordion.tsx @@ -13,6 +13,7 @@ interface Props { id?: string; language: 'html' | 'javascript'; overflowHeight: number; + initialIsOpen?: boolean; } /** @@ -25,9 +26,10 @@ export const CodeBlockAccordion: FC = ({ id, language, overflowHeight, + initialIsOpen = false, }) => { return children && id ? ( - + {children} diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/console_event.test.tsx b/x-pack/plugins/uptime/public/components/synthetics/console_event.test.tsx similarity index 100% rename from x-pack/plugins/uptime/public/components/monitor/synthetics/console_event.test.tsx rename to x-pack/plugins/uptime/public/components/synthetics/console_event.test.tsx diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/console_event.tsx b/x-pack/plugins/uptime/public/components/synthetics/console_event.tsx similarity index 89% rename from x-pack/plugins/uptime/public/components/monitor/synthetics/console_event.tsx rename to x-pack/plugins/uptime/public/components/synthetics/console_event.tsx index dc7b6ce9ea123..19672f953607b 100644 --- a/x-pack/plugins/uptime/public/components/monitor/synthetics/console_event.tsx +++ b/x-pack/plugins/uptime/public/components/synthetics/console_event.tsx @@ -7,8 +7,8 @@ import { EuiFlexItem, EuiFlexGroup } from '@elastic/eui'; import React, { useContext, FC } from 'react'; -import { Ping } from '../../../../common/runtime_types'; -import { UptimeThemeContext } from '../../../contexts'; +import { UptimeThemeContext } from '../../contexts'; +import { Ping } from '../../../common/runtime_types/ping'; interface Props { event: Ping; diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/console_output_event_list.test.tsx b/x-pack/plugins/uptime/public/components/synthetics/console_output_event_list.test.tsx similarity index 100% rename from x-pack/plugins/uptime/public/components/monitor/synthetics/console_output_event_list.test.tsx rename to x-pack/plugins/uptime/public/components/synthetics/console_output_event_list.test.tsx diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/console_output_event_list.tsx b/x-pack/plugins/uptime/public/components/synthetics/console_output_event_list.tsx similarity index 92% rename from x-pack/plugins/uptime/public/components/monitor/synthetics/console_output_event_list.tsx rename to x-pack/plugins/uptime/public/components/synthetics/console_output_event_list.tsx index df1f6aeb3623b..df4314e5ccf1c 100644 --- a/x-pack/plugins/uptime/public/components/monitor/synthetics/console_output_event_list.tsx +++ b/x-pack/plugins/uptime/public/components/synthetics/console_output_event_list.tsx @@ -8,9 +8,9 @@ import { EuiCodeBlock, EuiSpacer, EuiTitle } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; import React, { FC } from 'react'; -import { Ping } from '../../../../common/runtime_types'; -import { JourneyState } from '../../../state/reducers/journey'; import { ConsoleEvent } from './console_event'; +import { Ping } from '../../../common/runtime_types/ping'; +import { JourneyState } from '../../state/reducers/journey'; interface Props { journey: JourneyState; diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/empty_journey.test.tsx b/x-pack/plugins/uptime/public/components/synthetics/empty_journey.test.tsx similarity index 100% rename from x-pack/plugins/uptime/public/components/monitor/synthetics/empty_journey.test.tsx rename to x-pack/plugins/uptime/public/components/synthetics/empty_journey.test.tsx diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/empty_journey.tsx b/x-pack/plugins/uptime/public/components/synthetics/empty_journey.tsx similarity index 100% rename from x-pack/plugins/uptime/public/components/monitor/synthetics/empty_journey.tsx rename to x-pack/plugins/uptime/public/components/synthetics/empty_journey.tsx diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/executed_step.test.tsx b/x-pack/plugins/uptime/public/components/synthetics/executed_step.test.tsx similarity index 54% rename from x-pack/plugins/uptime/public/components/monitor/synthetics/executed_step.test.tsx rename to x-pack/plugins/uptime/public/components/synthetics/executed_step.test.tsx index 225ccb884ad00..24b52e09adbf9 100644 --- a/x-pack/plugins/uptime/public/components/monitor/synthetics/executed_step.test.tsx +++ b/x-pack/plugins/uptime/public/components/synthetics/executed_step.test.tsx @@ -7,8 +7,8 @@ import React from 'react'; import { ExecutedStep } from './executed_step'; -import { Ping } from '../../../../common/runtime_types'; -import { render } from '../../../lib/helper/rtl_helpers'; +import { render } from '../../lib/helper/rtl_helpers'; +import { Ping } from '../../../common/runtime_types/ping'; describe('ExecutedStep', () => { let step: Ping; @@ -34,33 +34,6 @@ describe('ExecutedStep', () => { }; }); - it('renders correct step heading', () => { - const { getByText } = render(); - - expect(getByText(`${step?.synthetics?.step?.index}. ${step?.synthetics?.step?.name}`)); - }); - - it('renders a link to the step detail view', () => { - const { getByRole, getByText } = render( - - ); - expect(getByRole('link')).toHaveAttribute('href', '/journey/fake-group/step/4'); - expect(getByText('4. STEP_NAME')); - }); - - it.each([ - ['succeeded', 'Succeeded'], - ['failed', 'Failed'], - ['skipped', 'Skipped'], - ['somegarbage', '4.'], - ])('supplies status badge correct status', (status, expectedStatus) => { - step.synthetics = { - payload: { status }, - }; - const { getByText } = render(); - expect(getByText(expectedStatus)); - }); - it('renders accordion for step', () => { step.synthetics = { payload: { @@ -72,10 +45,9 @@ describe('ExecutedStep', () => { }, }; - const { getByText } = render(); + const { getByText } = render(); - expect(getByText('4. STEP_NAME')); - expect(getByText('Step script')); + expect(getByText('Script executed at this step')); expect(getByText(`const someVar = "the var"`)); }); @@ -87,11 +59,22 @@ describe('ExecutedStep', () => { }, }; - const { getByText } = render(); + const { getByText } = render(); - expect(getByText('4.')); - expect(getByText('Error')); + expect(getByText('Error message')); expect(getByText('There was an error executing the step.')); expect(getByText('some.stack.trace.string')); }); + + it('renders accordions for console output', () => { + const browserConsole = + "Refused to execute script from because its MIME type ('image/gif') is not executable"; + + const { getByText } = render( + + ); + + expect(getByText('Console output')); + expect(getByText(browserConsole)); + }); }); diff --git a/x-pack/plugins/uptime/public/components/synthetics/executed_step.tsx b/x-pack/plugins/uptime/public/components/synthetics/executed_step.tsx new file mode 100644 index 0000000000000..a77b3dfe3ba21 --- /dev/null +++ b/x-pack/plugins/uptime/public/components/synthetics/executed_step.tsx @@ -0,0 +1,118 @@ +/* + * 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 { EuiLoadingSpinner, EuiSpacer, EuiText } from '@elastic/eui'; +import React, { FC } from 'react'; +import { i18n } from '@kbn/i18n'; +import { CodeBlockAccordion } from './code_block_accordion'; +import { Ping } from '../../../common/runtime_types/ping'; +import { euiStyled } from '../../../../../../src/plugins/kibana_react/common'; +import { StepScreenshots } from './check_steps/step_expanded_row/step_screenshots'; + +const CODE_BLOCK_OVERFLOW_HEIGHT = 360; + +interface ExecutedStepProps { + step: Ping; + index: number; + loading: boolean; + browserConsole?: string; +} + +const Label = euiStyled.div` + margin-bottom: ${(props) => props.theme.eui.paddingSizes.xs}; + font-size: ${({ theme }) => theme.eui.euiFontSizeS}; + color: ${({ theme }) => theme.eui.euiColorDarkShade}; +`; + +const Message = euiStyled.div` + font-weight: bold; + font-size:${({ theme }) => theme.eui.euiFontSizeM}; + margin-bottom: ${(props) => props.theme.eui.paddingSizes.m}; +`; + +const ExpandedRow = euiStyled.div` + padding: '8px'; + max-width: 1000px; + width: 100%; +`; + +export const ExecutedStep: FC = ({ + loading, + step, + index, + browserConsole = '', +}) => { + const isSucceeded = step.synthetics?.payload?.status === 'succeeded'; + + return ( + + {loading ? ( + + ) : ( + <> + + {step.synthetics?.error?.message && ( + + + {step.synthetics?.error?.message} + + )} + + + {step.synthetics?.payload?.source} + + + + <> + {browserConsole} + + + + + + + {step.synthetics?.error?.stack} + + + )} + + ); +}; diff --git a/x-pack/plugins/uptime/public/components/synthetics/status_badge.test.tsx b/x-pack/plugins/uptime/public/components/synthetics/status_badge.test.tsx new file mode 100644 index 0000000000000..500c680b91bf6 --- /dev/null +++ b/x-pack/plugins/uptime/public/components/synthetics/status_badge.test.tsx @@ -0,0 +1,33 @@ +/* + * 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 React from 'react'; +import { StatusBadge } from './status_badge'; +import { render } from '../../lib/helper/rtl_helpers'; + +describe('StatusBadge', () => { + it('displays success message', () => { + const { getByText } = render(); + + expect(getByText('1.')); + expect(getByText('Succeeded')); + }); + + it('displays failed message', () => { + const { getByText } = render(); + + expect(getByText('2.')); + expect(getByText('Failed')); + }); + + it('displays skipped message', () => { + const { getByText } = render(); + + expect(getByText('3.')); + expect(getByText('Skipped')); + }); +}); diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/status_badge.tsx b/x-pack/plugins/uptime/public/components/synthetics/status_badge.tsx similarity index 66% rename from x-pack/plugins/uptime/public/components/monitor/synthetics/status_badge.tsx rename to x-pack/plugins/uptime/public/components/synthetics/status_badge.tsx index 0cf9e5477d0db..b4c4e310abe6b 100644 --- a/x-pack/plugins/uptime/public/components/monitor/synthetics/status_badge.tsx +++ b/x-pack/plugins/uptime/public/components/synthetics/status_badge.tsx @@ -5,14 +5,15 @@ * 2.0. */ -import { EuiBadge } from '@elastic/eui'; +import { EuiBadge, EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import React, { useContext, FC } from 'react'; -import { UptimeAppColors } from '../../../apps/uptime_app'; -import { UptimeThemeContext } from '../../../contexts'; +import { UptimeAppColors } from '../../apps/uptime_app'; +import { UptimeThemeContext } from '../../contexts'; interface StatusBadgeProps { status?: string; + stepNo: number; } export function colorFromStatus(color: UptimeAppColors, status?: string) { @@ -45,9 +46,18 @@ export function textFromStatus(status?: string) { } } -export const StatusBadge: FC = ({ status }) => { +export const StatusBadge: FC = ({ status, stepNo }) => { const theme = useContext(UptimeThemeContext); return ( - {textFromStatus(status)} + + + + {stepNo}. + + + + {textFromStatus(status)} + + ); }; diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_screenshot_display.test.tsx b/x-pack/plugins/uptime/public/components/synthetics/step_screenshot_display.test.tsx similarity index 96% rename from x-pack/plugins/uptime/public/components/monitor/synthetics/step_screenshot_display.test.tsx rename to x-pack/plugins/uptime/public/components/synthetics/step_screenshot_display.test.tsx index 29dca39c34bf2..52d2eacaf0e52 100644 --- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_screenshot_display.test.tsx +++ b/x-pack/plugins/uptime/public/components/synthetics/step_screenshot_display.test.tsx @@ -5,9 +5,9 @@ * 2.0. */ -import { render } from '../../../lib/helper/rtl_helpers'; import React from 'react'; import { StepScreenshotDisplay } from './step_screenshot_display'; +import { render } from '../../lib/helper/rtl_helpers'; jest.mock('react-use/lib/useIntersection', () => () => ({ isIntersecting: true, diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_screenshot_display.tsx b/x-pack/plugins/uptime/public/components/synthetics/step_screenshot_display.tsx similarity index 52% rename from x-pack/plugins/uptime/public/components/monitor/synthetics/step_screenshot_display.tsx rename to x-pack/plugins/uptime/public/components/synthetics/step_screenshot_display.tsx index 654193de72a9c..78c65b7d40803 100644 --- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_screenshot_display.tsx +++ b/x-pack/plugins/uptime/public/components/synthetics/step_screenshot_display.tsx @@ -5,33 +5,32 @@ * 2.0. */ -import { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiImage, EuiPopover, EuiText } from '@elastic/eui'; +import { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiImage, EuiText } from '@elastic/eui'; import styled from 'styled-components'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n/react'; import React, { useContext, useEffect, useRef, useState, FC } from 'react'; import useIntersection from 'react-use/lib/useIntersection'; -import { UptimeSettingsContext, UptimeThemeContext } from '../../../contexts'; +import { UptimeSettingsContext, UptimeThemeContext } from '../../contexts'; interface StepScreenshotDisplayProps { screenshotExists?: boolean; checkGroup?: string; stepIndex?: number; stepName?: string; + lazyLoad?: boolean; } -const THUMBNAIL_WIDTH = 320; -const THUMBNAIL_HEIGHT = 180; -const POPOVER_IMG_WIDTH = 640; -const POPOVER_IMG_HEIGHT = 360; +const IMAGE_WIDTH = 640; +const IMAGE_HEIGHT = 360; const StepImage = styled(EuiImage)` &&& { figcaption { display: none; } - width: ${THUMBNAIL_WIDTH}, - height: ${THUMBNAIL_HEIGHT}, + width: ${IMAGE_WIDTH}, + height: ${IMAGE_HEIGHT}, objectFit: 'cover', objectPosition: 'center top', } @@ -42,6 +41,7 @@ export const StepScreenshotDisplay: FC = ({ screenshotExists, stepIndex, stepName, + lazyLoad = true, }) => { const containerRef = useRef(null); const { @@ -50,8 +50,6 @@ export const StepScreenshotDisplay: FC = ({ const { basePath } = useContext(UptimeSettingsContext); - const [isImagePopoverOpen, setIsImagePopoverOpen] = useState(false); - const intersection = useIntersection(containerRef, { root: null, rootMargin: '0px', @@ -69,57 +67,26 @@ export const StepScreenshotDisplay: FC = ({ let content: JSX.Element | null = null; const imgSrc = basePath + `/api/uptime/journey/screenshot/${checkGroup}/${stepIndex}`; - if (hasIntersected && screenshotExists) { + if ((hasIntersected || !lazyLoad) && screenshotExists) { content = ( - <> - setIsImagePopoverOpen(true)} - onMouseLeave={() => setIsImagePopoverOpen(false)} - /> - } - closePopover={() => setIsImagePopoverOpen(false)} - isOpen={isImagePopoverOpen} - > - - - + ); } else if (screenshotExists === false) { content = ( @@ -148,7 +115,7 @@ export const StepScreenshotDisplay: FC = ({ return (
{content}
diff --git a/x-pack/plugins/uptime/public/components/synthetics/translations.ts b/x-pack/plugins/uptime/public/components/synthetics/translations.ts new file mode 100644 index 0000000000000..743118574b325 --- /dev/null +++ b/x-pack/plugins/uptime/public/components/synthetics/translations.ts @@ -0,0 +1,20 @@ +/* + * 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 { i18n } from '@kbn/i18n'; + +export const STEP_NAME_LABEL = i18n.translate('xpack.uptime.stepList.stepName', { + defaultMessage: 'Step name', +}); + +export const COLLAPSE_LABEL = i18n.translate('xpack.uptime.stepList.collapseRow', { + defaultMessage: 'Collapse', +}); + +export const EXPAND_LABEL = i18n.translate('xpack.uptime.stepList.expandRow', { + defaultMessage: 'Expand', +}); diff --git a/x-pack/plugins/uptime/public/hooks/use_telemetry.ts b/x-pack/plugins/uptime/public/hooks/use_telemetry.ts index da0f109747758..b9ec9cc5e5516 100644 --- a/x-pack/plugins/uptime/public/hooks/use_telemetry.ts +++ b/x-pack/plugins/uptime/public/hooks/use_telemetry.ts @@ -16,6 +16,7 @@ export enum UptimePage { Settings = 'Settings', Certificates = 'Certificates', StepDetail = 'StepDetail', + SyntheticCheckStepsPage = 'SyntheticCheckStepsPage', NotFound = '__not-found__', } diff --git a/x-pack/plugins/uptime/public/pages/index.ts b/x-pack/plugins/uptime/public/pages/index.ts index 828942bc1eb1e..5624f61c3abb5 100644 --- a/x-pack/plugins/uptime/public/pages/index.ts +++ b/x-pack/plugins/uptime/public/pages/index.ts @@ -6,6 +6,6 @@ */ export { MonitorPage } from './monitor'; -export { StepDetailPage } from './step_detail_page'; +export { StepDetailPage } from './synthetics/step_detail_page'; export { SettingsPage } from './settings'; export { NotFoundPage } from './not_found'; diff --git a/x-pack/plugins/uptime/public/pages/synthetics/checks_navigation.tsx b/x-pack/plugins/uptime/public/pages/synthetics/checks_navigation.tsx new file mode 100644 index 0000000000000..291019d93c398 --- /dev/null +++ b/x-pack/plugins/uptime/public/pages/synthetics/checks_navigation.tsx @@ -0,0 +1,60 @@ +/* + * 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 React from 'react'; +import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui'; +import { FormattedMessage } from '@kbn/i18n/react'; +import { useHistory } from 'react-router-dom'; +import moment from 'moment'; +import { SyntheticsJourneyApiResponse } from '../../../common/runtime_types/ping'; +import { getShortTimeStamp } from '../../components/overview/monitor_list/columns/monitor_status_column'; + +interface Props { + timestamp: string; + details: SyntheticsJourneyApiResponse['details']; +} + +export const ChecksNavigation = ({ timestamp, details }: Props) => { + const history = useHistory(); + + return ( + + + { + history.push(`/journey/${details?.previous?.checkGroup}/steps`); + }} + > + + + + + {getShortTimeStamp(moment(timestamp))} + + + { + history.push(`/journey/${details?.next?.checkGroup}/steps`); + }} + > + + + + + ); +}; diff --git a/x-pack/plugins/uptime/public/pages/step_detail_page.tsx b/x-pack/plugins/uptime/public/pages/synthetics/step_detail_page.tsx similarity index 75% rename from x-pack/plugins/uptime/public/pages/step_detail_page.tsx rename to x-pack/plugins/uptime/public/pages/synthetics/step_detail_page.tsx index aa81ddd0eae3d..de38d2d663523 100644 --- a/x-pack/plugins/uptime/public/pages/step_detail_page.tsx +++ b/x-pack/plugins/uptime/public/pages/synthetics/step_detail_page.tsx @@ -7,9 +7,9 @@ import React from 'react'; import { useParams } from 'react-router-dom'; -import { useTrackPageview } from '../../../observability/public'; -import { useInitApp } from '../hooks/use_init_app'; -import { StepDetailContainer } from '../components/monitor/synthetics/step_detail/step_detail_container'; +import { useTrackPageview } from '../../../../observability/public'; +import { useInitApp } from '../../hooks/use_init_app'; +import { StepDetailContainer } from '../../components/monitor/synthetics/step_detail/step_detail_container'; export const StepDetailPage: React.FC = () => { useInitApp(); diff --git a/x-pack/plugins/uptime/public/pages/synthetics/synthetics_checks.tsx b/x-pack/plugins/uptime/public/pages/synthetics/synthetics_checks.tsx new file mode 100644 index 0000000000000..edfd7ae24f91b --- /dev/null +++ b/x-pack/plugins/uptime/public/pages/synthetics/synthetics_checks.tsx @@ -0,0 +1,44 @@ +/* + * 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 React from 'react'; +import { EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiTitle } from '@elastic/eui'; +import { useTrackPageview } from '../../../../observability/public'; +import { useInitApp } from '../../hooks/use_init_app'; +import { StepsList } from '../../components/synthetics/check_steps/steps_list'; +import { useCheckSteps } from '../../components/synthetics/check_steps/use_check_steps'; +import { ChecksNavigation } from './checks_navigation'; +import { useMonitorBreadcrumb } from '../../components/monitor/synthetics/step_detail/use_monitor_breadcrumb'; +import { EmptyJourney } from '../../components/synthetics/empty_journey'; + +export const SyntheticsCheckSteps: React.FC = () => { + useInitApp(); + useTrackPageview({ app: 'uptime', path: 'syntheticCheckSteps' }); + useTrackPageview({ app: 'uptime', path: 'syntheticCheckSteps', delay: 15000 }); + + const { error, loading, steps, details, checkGroup } = useCheckSteps(); + + useMonitorBreadcrumb({ details, activeStep: details?.journey }); + + return ( + <> + + + +

{details?.journey?.monitor.name || details?.journey?.monitor.id}

+ + + + {details && } + + + + + {(!steps || steps.length === 0) && !loading && } + + ); +}; diff --git a/x-pack/plugins/uptime/public/routes.tsx b/x-pack/plugins/uptime/public/routes.tsx index 82aa09c3293e6..dcfb21955f219 100644 --- a/x-pack/plugins/uptime/public/routes.tsx +++ b/x-pack/plugins/uptime/public/routes.tsx @@ -15,10 +15,12 @@ import { OVERVIEW_ROUTE, SETTINGS_ROUTE, STEP_DETAIL_ROUTE, + SYNTHETIC_CHECK_STEPS_ROUTE, } from '../common/constants'; import { MonitorPage, StepDetailPage, NotFoundPage, SettingsPage } from './pages'; import { CertificatesPage } from './pages/certificates'; import { UptimePage, useUptimeTelemetry } from './hooks'; +import { SyntheticsCheckSteps } from './pages/synthetics/synthetics_checks'; interface RouteProps { path: string; @@ -71,6 +73,13 @@ const Routes: RouteProps[] = [ dataTestSubj: 'uptimeStepDetailPage', telemetryId: UptimePage.StepDetail, }, + { + title: baseTitle, + path: SYNTHETIC_CHECK_STEPS_ROUTE, + component: SyntheticsCheckSteps, + dataTestSubj: 'uptimeSyntheticCheckStepsPage', + telemetryId: UptimePage.SyntheticCheckStepsPage, + }, { title: baseTitle, path: OVERVIEW_ROUTE, diff --git a/x-pack/plugins/uptime/public/state/api/journey.ts b/x-pack/plugins/uptime/public/state/api/journey.ts index 5c4c7c7149792..63796a66d1c5c 100644 --- a/x-pack/plugins/uptime/public/state/api/journey.ts +++ b/x-pack/plugins/uptime/public/state/api/journey.ts @@ -8,6 +8,7 @@ import { apiService } from './utils'; import { FetchJourneyStepsParams } from '../actions/journey'; import { + Ping, SyntheticsJourneyApiResponse, SyntheticsJourneyApiResponseType, } from '../../../common/runtime_types'; @@ -34,6 +35,22 @@ export async function fetchJourneysFailedSteps({ )) as SyntheticsJourneyApiResponse; } +export async function fetchLastSuccessfulStep({ + monitorId, + timestamp, + stepIndex, +}: { + monitorId: string; + timestamp: string; + stepIndex: number; +}): Promise { + return (await apiService.get(`/api/uptime/synthetics/step/success/`, { + monitorId, + timestamp, + stepIndex, + })) as Ping; +} + export async function getJourneyScreenshot(imgSrc: string) { try { const imgRequest = new Request(imgSrc); diff --git a/x-pack/plugins/uptime/server/lib/requests/get_journey_details.ts b/x-pack/plugins/uptime/server/lib/requests/get_journey_details.ts index e0edcc4576378..de37688b155f5 100644 --- a/x-pack/plugins/uptime/server/lib/requests/get_journey_details.ts +++ b/x-pack/plugins/uptime/server/lib/requests/get_journey_details.ts @@ -27,13 +27,12 @@ export const getJourneyDetails: UMElasticsearchQueryFn< }, { term: { - 'synthetics.type': 'journey/end', + 'synthetics.type': 'journey/start', }, }, ], }, }, - _source: ['@timestamp', 'monitor.id'], size: 1, }; @@ -53,7 +52,7 @@ export const getJourneyDetails: UMElasticsearchQueryFn< }, { term: { - 'synthetics.type': 'journey/end', + 'synthetics.type': 'journey/start', }, }, ], @@ -109,6 +108,7 @@ export const getJourneyDetails: UMElasticsearchQueryFn< nextJourneyResult?.hits?.hits.length > 0 ? nextJourneyResult?.hits?.hits[0] : null; return { timestamp: thisJourneySource['@timestamp'], + journey: thisJourneySource, previous: previousJourney ? { checkGroup: previousJourney._source.monitor.check_group, diff --git a/x-pack/plugins/uptime/server/lib/requests/get_journey_screenshot.ts b/x-pack/plugins/uptime/server/lib/requests/get_journey_screenshot.ts index 9cb5e1eedb6b0..faa260eb9abd4 100644 --- a/x-pack/plugins/uptime/server/lib/requests/get_journey_screenshot.ts +++ b/x-pack/plugins/uptime/server/lib/requests/get_journey_screenshot.ts @@ -60,10 +60,10 @@ export const getJourneyScreenshot: UMElasticsearchQueryFn< return null; } - const stepHit = result?.aggregations?.step.image.hits.hits[0]._source as Ping; + const stepHit = result?.aggregations?.step.image.hits.hits[0]?._source as Ping; return { - blob: stepHit.synthetics?.blob ?? null, + blob: stepHit?.synthetics?.blob ?? null, stepName: stepHit?.synthetics?.step?.name ?? '', totalSteps: result?.hits?.total.value, }; diff --git a/x-pack/plugins/uptime/server/lib/requests/get_journey_steps.test.ts b/x-pack/plugins/uptime/server/lib/requests/get_journey_steps.test.ts index 1034318257f66..af7752b05997e 100644 --- a/x-pack/plugins/uptime/server/lib/requests/get_journey_steps.test.ts +++ b/x-pack/plugins/uptime/server/lib/requests/get_journey_steps.test.ts @@ -14,9 +14,9 @@ describe('getJourneySteps request module', () => { expect(formatSyntheticEvents()).toMatchInlineSnapshot(` Array [ "step/end", - "stderr", "cmd/status", "step/screenshot", + "journey/browserconsole", ] `); }); @@ -121,9 +121,9 @@ describe('getJourneySteps request module', () => { "terms": Object { "synthetics.type": Array [ "step/end", - "stderr", "cmd/status", "step/screenshot", + "journey/browserconsole", ], }, } diff --git a/x-pack/plugins/uptime/server/lib/requests/get_journey_steps.ts b/x-pack/plugins/uptime/server/lib/requests/get_journey_steps.ts index 3055f169fc495..43d17cb938159 100644 --- a/x-pack/plugins/uptime/server/lib/requests/get_journey_steps.ts +++ b/x-pack/plugins/uptime/server/lib/requests/get_journey_steps.ts @@ -13,7 +13,7 @@ export interface GetJourneyStepsParams { syntheticEventTypes?: string | string[]; } -const defaultEventTypes = ['step/end', 'stderr', 'cmd/status', 'step/screenshot']; +const defaultEventTypes = ['step/end', 'cmd/status', 'step/screenshot', 'journey/browserconsole']; export const formatSyntheticEvents = (eventTypes?: string | string[]) => { if (!eventTypes) { diff --git a/x-pack/plugins/uptime/server/lib/requests/get_last_successful_step.ts b/x-pack/plugins/uptime/server/lib/requests/get_last_successful_step.ts new file mode 100644 index 0000000000000..82958167341c0 --- /dev/null +++ b/x-pack/plugins/uptime/server/lib/requests/get_last_successful_step.ts @@ -0,0 +1,77 @@ +/* + * 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 { UMElasticsearchQueryFn } from '../adapters/framework'; +import { Ping } from '../../../common/runtime_types/ping'; + +export interface GetStepScreenshotParams { + monitorId: string; + timestamp: string; + stepIndex: number; +} + +export const getStepLastSuccessfulStep: UMElasticsearchQueryFn< + GetStepScreenshotParams, + any +> = async ({ uptimeEsClient, monitorId, stepIndex, timestamp }) => { + const lastSuccessCheckParams = { + size: 1, + sort: [ + { + '@timestamp': { + order: 'desc', + }, + }, + ], + query: { + bool: { + filter: [ + { + range: { + '@timestamp': { + lte: timestamp, + }, + }, + }, + { + term: { + 'monitor.id': monitorId, + }, + }, + { + term: { + 'synthetics.type': 'step/end', + }, + }, + { + term: { + 'synthetics.step.status': 'succeeded', + }, + }, + { + term: { + 'synthetics.step.index': stepIndex, + }, + }, + ], + }, + }, + }; + + const { body: result } = await uptimeEsClient.search({ body: lastSuccessCheckParams }); + + if (result?.hits?.total.value < 1) { + return null; + } + + const step = result?.hits.hits[0]._source as Ping & { '@timestamp': string }; + + return { + ...step, + timestamp: step['@timestamp'], + }; +}; diff --git a/x-pack/plugins/uptime/server/lib/requests/index.ts b/x-pack/plugins/uptime/server/lib/requests/index.ts index 9e665fb8bbdb0..24109245c2902 100644 --- a/x-pack/plugins/uptime/server/lib/requests/index.ts +++ b/x-pack/plugins/uptime/server/lib/requests/index.ts @@ -24,6 +24,7 @@ import { getJourneyScreenshot } from './get_journey_screenshot'; import { getJourneyDetails } from './get_journey_details'; import { getNetworkEvents } from './get_network_events'; import { getJourneyFailedSteps } from './get_journey_failed_steps'; +import { getStepLastSuccessfulStep } from './get_last_successful_step'; export const requests = { getCerts, @@ -42,6 +43,7 @@ export const requests = { getIndexStatus, getJourneySteps, getJourneyFailedSteps, + getStepLastSuccessfulStep, getJourneyScreenshot, getJourneyDetails, getNetworkEvents, diff --git a/x-pack/plugins/uptime/server/rest_api/index.ts b/x-pack/plugins/uptime/server/rest_api/index.ts index 41556d3c8d513..91b5597321ed0 100644 --- a/x-pack/plugins/uptime/server/rest_api/index.ts +++ b/x-pack/plugins/uptime/server/rest_api/index.ts @@ -27,6 +27,7 @@ import { createGetMonitorDurationRoute } from './monitors/monitors_durations'; import { createGetIndexPatternRoute, createGetIndexStatusRoute } from './index_state'; import { createNetworkEventsRoute } from './network_events'; import { createJourneyFailedStepsRoute } from './pings/journeys'; +import { createLastSuccessfulStepRoute } from './synthetics/last_successful_step'; export * from './types'; export { createRouteWithAuth } from './create_route_with_auth'; @@ -52,4 +53,5 @@ export const restApiRoutes: UMRestApiRouteFactory[] = [ createJourneyScreenshotRoute, createNetworkEventsRoute, createJourneyFailedStepsRoute, + createLastSuccessfulStepRoute, ]; diff --git a/x-pack/plugins/uptime/server/rest_api/pings/journey_screenshots.ts b/x-pack/plugins/uptime/server/rest_api/pings/journey_screenshots.ts index cda078da01539..2b056498d7f10 100644 --- a/x-pack/plugins/uptime/server/rest_api/pings/journey_screenshots.ts +++ b/x-pack/plugins/uptime/server/rest_api/pings/journey_screenshots.ts @@ -18,6 +18,9 @@ export const createJourneyScreenshotRoute: UMRestApiRouteFactory = (libs: UMServ stepIndex: schema.number(), _debug: schema.maybe(schema.boolean()), }), + query: schema.object({ + _debug: schema.maybe(schema.boolean()), + }), }, handler: async ({ uptimeEsClient, request, response }) => { const { checkGroup, stepIndex } = request.params; @@ -28,7 +31,7 @@ export const createJourneyScreenshotRoute: UMRestApiRouteFactory = (libs: UMServ stepIndex, }); - if (result === null) { + if (result === null || !result.blob) { return response.notFound(); } return response.ok({ diff --git a/x-pack/plugins/uptime/server/rest_api/pings/journeys.ts b/x-pack/plugins/uptime/server/rest_api/pings/journeys.ts index def373e88ae16..9b5bffc380c27 100644 --- a/x-pack/plugins/uptime/server/rest_api/pings/journeys.ts +++ b/x-pack/plugins/uptime/server/rest_api/pings/journeys.ts @@ -15,7 +15,6 @@ export const createJourneyRoute: UMRestApiRouteFactory = (libs: UMServerLibs) => validate: { params: schema.object({ checkGroup: schema.string(), - _debug: schema.maybe(schema.boolean()), }), query: schema.object({ // provides a filter for the types of synthetic events to include @@ -23,21 +22,24 @@ export const createJourneyRoute: UMRestApiRouteFactory = (libs: UMServerLibs) => syntheticEventTypes: schema.maybe( schema.oneOf([schema.arrayOf(schema.string()), schema.string()]) ), + _debug: schema.maybe(schema.boolean()), }), }, handler: async ({ uptimeEsClient, request }): Promise => { const { checkGroup } = request.params; const { syntheticEventTypes } = request.query; - const result = await libs.requests.getJourneySteps({ - uptimeEsClient, - checkGroup, - syntheticEventTypes, - }); - const details = await libs.requests.getJourneyDetails({ - uptimeEsClient, - checkGroup, - }); + const [result, details] = await Promise.all([ + await libs.requests.getJourneySteps({ + uptimeEsClient, + checkGroup, + syntheticEventTypes, + }), + await libs.requests.getJourneyDetails({ + uptimeEsClient, + checkGroup, + }), + ]); return { checkGroup, @@ -53,6 +55,7 @@ export const createJourneyFailedStepsRoute: UMRestApiRouteFactory = (libs: UMSer validate: { query: schema.object({ checkGroups: schema.arrayOf(schema.string()), + _debug: schema.maybe(schema.boolean()), }), }, handler: async ({ uptimeEsClient, request }): Promise => { diff --git a/x-pack/plugins/uptime/server/rest_api/synthetics/last_successful_step.ts b/x-pack/plugins/uptime/server/rest_api/synthetics/last_successful_step.ts new file mode 100644 index 0000000000000..a1523fae9d4a1 --- /dev/null +++ b/x-pack/plugins/uptime/server/rest_api/synthetics/last_successful_step.ts @@ -0,0 +1,33 @@ +/* + * 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 { schema } from '@kbn/config-schema'; +import { UMServerLibs } from '../../lib/lib'; +import { UMRestApiRouteFactory } from '../types'; + +export const createLastSuccessfulStepRoute: UMRestApiRouteFactory = (libs: UMServerLibs) => ({ + method: 'GET', + path: '/api/uptime/synthetics/step/success/', + validate: { + query: schema.object({ + monitorId: schema.string(), + stepIndex: schema.number(), + timestamp: schema.string(), + _debug: schema.maybe(schema.boolean()), + }), + }, + handler: async ({ uptimeEsClient, request, response }) => { + const { timestamp, monitorId, stepIndex } = request.query; + + return await libs.requests.getStepLastSuccessfulStep({ + uptimeEsClient, + monitorId, + stepIndex, + timestamp, + }); + }, +}); From f90a4d95a52c7b337f0ebed319efe8a8c9de9014 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cau=C3=AA=20Marcondes?= <55978943+cauemarcondes@users.noreply.github.com> Date: Tue, 16 Mar 2021 11:41:43 -0400 Subject: [PATCH 20/24] [APM] Telemetry: Add UI usage telemetry on the Timeseries comparison feature (#91439) * adding telemetry and removing time comparison * adding telemetry and removing time comparison * adding telemetry Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../components/app/transaction_overview/index.tsx | 1 - .../components/shared/time_comparison/index.tsx | 15 ++++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/x-pack/plugins/apm/public/components/app/transaction_overview/index.tsx b/x-pack/plugins/apm/public/components/app/transaction_overview/index.tsx index 97be35ec6f5b9..0814c6d95b96a 100644 --- a/x-pack/plugins/apm/public/components/app/transaction_overview/index.tsx +++ b/x-pack/plugins/apm/public/components/app/transaction_overview/index.tsx @@ -83,7 +83,6 @@ export function TransactionOverview({ serviceName }: TransactionOverviewProps) { return ( <> - diff --git a/x-pack/plugins/apm/public/components/shared/time_comparison/index.tsx b/x-pack/plugins/apm/public/components/shared/time_comparison/index.tsx index 1769119593c0e..84a2dad278a9b 100644 --- a/x-pack/plugins/apm/public/components/shared/time_comparison/index.tsx +++ b/x-pack/plugins/apm/public/components/shared/time_comparison/index.tsx @@ -10,6 +10,7 @@ import { i18n } from '@kbn/i18n'; import moment from 'moment'; import React from 'react'; import { useHistory } from 'react-router-dom'; +import { useUiTracker } from '../../../../../observability/public'; import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common'; import { getDateDifference } from '../../../../common/utils/formatters'; import { useUrlParams } from '../../../context/url_params_context/use_url_params'; @@ -132,6 +133,7 @@ function getSelectOptions({ } export function TimeComparison() { + const trackApmEvent = useUiTracker({ app: 'apm' }); const history = useHistory(); const { isMedium, isLarge } = useBreakPoints(); const { @@ -181,9 +183,17 @@ export function TimeComparison() { })} checked={comparisonEnabled} onChange={() => { + const nextComparisonEnabledValue = !comparisonEnabled; + if (nextComparisonEnabledValue === false) { + trackApmEvent({ + metric: 'time_comparison_disabled', + }); + } urlHelpers.push(history, { query: { - comparisonEnabled: Boolean(!comparisonEnabled).toString(), + comparisonEnabled: Boolean( + nextComparisonEnabledValue + ).toString(), }, }); }} @@ -191,6 +201,9 @@ export function TimeComparison() { } onChange={(e) => { + trackApmEvent({ + metric: `time_comparison_type_change_${e.target.value}`, + }); urlHelpers.push(history, { query: { comparisonType: e.target.value, From bae6021d7f2b184229a2c2dfd628e3760ef3fb49 Mon Sep 17 00:00:00 2001 From: Devon Thomson Date: Tue, 16 Mar 2021 11:55:11 -0400 Subject: [PATCH 21/24] [Save Modal] Quick Fix for Scrollbar (#94640) * quick fixes for no scroll bar on save modals --- .../panel_actions/customize_title/customize_panel_modal.tsx | 2 +- .../__snapshots__/saved_object_save_modal.test.tsx.snap | 4 ++++ .../public/save_modal/saved_object_save_modal.tsx | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_title/customize_panel_modal.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_title/customize_panel_modal.tsx index 411da6c037900..6d5c2224c0635 100644 --- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_title/customize_panel_modal.tsx +++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_title/customize_panel_modal.tsx @@ -71,7 +71,7 @@ export class CustomizePanelModal extends Component { return ( -
+

Customize panel

diff --git a/src/plugins/saved_objects/public/save_modal/__snapshots__/saved_object_save_modal.test.tsx.snap b/src/plugins/saved_objects/public/save_modal/__snapshots__/saved_object_save_modal.test.tsx.snap index 1f05ed6b94405..91f99fd8e87dd 100644 --- a/src/plugins/saved_objects/public/save_modal/__snapshots__/saved_object_save_modal.test.tsx.snap +++ b/src/plugins/saved_objects/public/save_modal/__snapshots__/saved_object_save_modal.test.tsx.snap @@ -7,6 +7,7 @@ exports[`SavedObjectSaveModal should render matching snapshot 1`] = ` onClose={[Function]} >
@@ -103,6 +104,7 @@ exports[`SavedObjectSaveModal should render matching snapshot when custom isVali onClose={[Function]} > @@ -199,6 +201,7 @@ exports[`SavedObjectSaveModal should render matching snapshot when custom isVali onClose={[Function]} > @@ -295,6 +298,7 @@ exports[`SavedObjectSaveModal should render matching snapshot when given options onClose={[Function]} > diff --git a/src/plugins/saved_objects/public/save_modal/saved_object_save_modal.tsx b/src/plugins/saved_objects/public/save_modal/saved_object_save_modal.tsx index 07f6336dac52c..c9e21d5204b01 100644 --- a/src/plugins/saved_objects/public/save_modal/saved_object_save_modal.tsx +++ b/src/plugins/saved_objects/public/save_modal/saved_object_save_modal.tsx @@ -128,7 +128,7 @@ export class SavedObjectSaveModal extends React.Component className={`kbnSavedObjectSaveModal${hasColumns ? ' kbnSavedObjectsSaveModal--wide' : ''}`} onClose={this.props.onClose} > - + Date: Tue, 16 Mar 2021 17:19:42 +0100 Subject: [PATCH 22/24] [APM] Use top_hits instead of top_metrics (#94694) * [APM] Use top_hits instead of top_metrics for high cardinality fields Closes #94676. * Update snapshots --- .../get_destination_map.ts | 17 +++++++---------- .../distribution/get_buckets/index.ts | 14 ++++++-------- .../tests/transactions/distribution.ts | 8 ++++---- 3 files changed, 17 insertions(+), 22 deletions(-) diff --git a/x-pack/plugins/apm/server/lib/services/get_service_dependencies/get_destination_map.ts b/x-pack/plugins/apm/server/lib/services/get_service_dependencies/get_destination_map.ts index cb9d37d56b867..e41a88649c5ff 100644 --- a/x-pack/plugins/apm/server/lib/services/get_service_dependencies/get_destination_map.ts +++ b/x-pack/plugins/apm/server/lib/services/get_service_dependencies/get_destination_map.ts @@ -71,12 +71,9 @@ export const getDestinationMap = ({ }, aggs: { sample: { - top_metrics: { - metrics: [ - { field: SPAN_TYPE }, - { field: SPAN_SUBTYPE }, - { field: SPAN_ID }, - ] as const, + top_hits: { + size: 1, + _source: [SPAN_TYPE, SPAN_SUBTYPE, SPAN_ID], sort: { '@timestamp': 'desc', }, @@ -91,15 +88,15 @@ export const getDestinationMap = ({ const outgoingConnections = response.aggregations?.connections.buckets.map((bucket) => { - const fieldValues = bucket.sample.top[0].metrics; + const sample = bucket.sample.hits.hits[0]._source; return { [SPAN_DESTINATION_SERVICE_RESOURCE]: String( bucket.key[SPAN_DESTINATION_SERVICE_RESOURCE] ), - [SPAN_ID]: (fieldValues[SPAN_ID] ?? '') as string, - [SPAN_TYPE]: (fieldValues[SPAN_TYPE] ?? '') as string, - [SPAN_SUBTYPE]: (fieldValues[SPAN_SUBTYPE] ?? '') as string, + [SPAN_ID]: sample.span.id, + [SPAN_TYPE]: sample.span.type, + [SPAN_SUBTYPE]: sample.span.subtype, }; }) ?? []; diff --git a/x-pack/plugins/apm/server/lib/transactions/distribution/get_buckets/index.ts b/x-pack/plugins/apm/server/lib/transactions/distribution/get_buckets/index.ts index fb7544e5fcb8d..1771b5ead68a7 100644 --- a/x-pack/plugins/apm/server/lib/transactions/distribution/get_buckets/index.ts +++ b/x-pack/plugins/apm/server/lib/transactions/distribution/get_buckets/index.ts @@ -118,11 +118,8 @@ export async function getBuckets({ }), aggs: { samples: { - top_metrics: { - metrics: [ - { field: TRANSACTION_ID }, - { field: TRACE_ID }, - ] as const, + top_hits: { + _source: [TRANSACTION_ID, TRACE_ID], size: 10, sort: { _score: 'desc', @@ -138,11 +135,12 @@ export async function getBuckets({ return ( response.aggregations?.distribution.buckets.map((bucket) => { + const samples = bucket.samples.hits.hits; return { key: bucket.key, - samples: bucket.samples.top.map((sample) => ({ - traceId: sample.metrics[TRACE_ID] as string, - transactionId: sample.metrics[TRANSACTION_ID] as string, + samples: samples.map(({ _source: sample }) => ({ + traceId: sample.trace.id, + transactionId: sample.transaction.id, })), }; }) ?? [] diff --git a/x-pack/test/apm_api_integration/tests/transactions/distribution.ts b/x-pack/test/apm_api_integration/tests/transactions/distribution.ts index 770fc90267680..cfedcc9ac2232 100644 --- a/x-pack/test/apm_api_integration/tests/transactions/distribution.ts +++ b/x-pack/test/apm_api_integration/tests/transactions/distribution.ts @@ -82,16 +82,16 @@ export default function ApiTest({ getService }: FtrProviderContext) { .toMatchInline(` Array [ Object { - "traceId": "a4eb3781a21dc11d289293076fd1a1b3", - "transactionId": "21892bde4ff1364d", + "traceId": "af0f18dc0841cfc1f567e7e1d55cfda7", + "transactionId": "925f02e5ac122897", }, Object { "traceId": "ccd327537120e857bdfa407434dfb9a4", "transactionId": "c5f923159cc1b8a6", }, Object { - "traceId": "af0f18dc0841cfc1f567e7e1d55cfda7", - "transactionId": "925f02e5ac122897", + "traceId": "a4eb3781a21dc11d289293076fd1a1b3", + "transactionId": "21892bde4ff1364d", }, ] `); From 378073c74a7331ab23fdaaae04b2545c53f877eb Mon Sep 17 00:00:00 2001 From: Kaarina Tungseth Date: Tue, 16 Mar 2021 11:21:35 -0500 Subject: [PATCH 23/24] [DOCS] Canvas updates for 7.12.0 (#94325) * [DOCS] Canvas updates for 7.12.0 * Fixes Visualize Library title --- docs/canvas/canvas-edit-workpads.asciidoc | 10 +-- docs/canvas/canvas-present-workpad.asciidoc | 4 +- docs/canvas/canvas-share-workpad.asciidoc | 4 +- docs/canvas/canvas-tutorial.asciidoc | 17 ++-- docs/canvas/images/canvas-gs-example.png | Bin 99894 -> 204911 bytes docs/user/canvas.asciidoc | 90 +++++++++++++------- 6 files changed, 75 insertions(+), 50 deletions(-) diff --git a/docs/canvas/canvas-edit-workpads.asciidoc b/docs/canvas/canvas-edit-workpads.asciidoc index 6ad2d89be4a42..9f2808c9ad451 100644 --- a/docs/canvas/canvas-edit-workpads.asciidoc +++ b/docs/canvas/canvas-edit-workpads.asciidoc @@ -22,13 +22,13 @@ each element instead of updating them manually. For example, to change the index pattern for a set of charts: -Specify the variable options. - +. Specify the variable options. ++ [role="screenshot"] image::images/specify_variable_syntax.png[Image describing how to specify the variable syntax] - -Copy the variable, then apply it to each element you want to update in the *Expression editor*. - ++ +. Copy the variable, then apply it to each element you want to update in the *Expression editor*. ++ [role="screenshot"] image::images/copy_variable_syntax.png[Image demonstrating expression editor] diff --git a/docs/canvas/canvas-present-workpad.asciidoc b/docs/canvas/canvas-present-workpad.asciidoc index b1492f57e46f8..438e09b701fa3 100644 --- a/docs/canvas/canvas-present-workpad.asciidoc +++ b/docs/canvas/canvas-present-workpad.asciidoc @@ -20,7 +20,7 @@ image::images/canvas-autoplay-interval.png[Element autoplay interval] [role="screenshot"] image::images/canvas-fullscreen.png[Image showing how to enter fullscreen mode from view dropdown] -. When you are ready to exit fullscreen mode, press the Esc (Escape) key. +. When you are ready to exit fullscreen mode, press Esc. [float] [[zoom-in-out]] @@ -48,4 +48,4 @@ Change how often the data refreshes on your workpad. [role="screenshot"] image::images/canvas-refresh-interval.png[Element data refresh interval] + -To manually refresh the data, click image:canvas/images/canvas-refresh-data.png[]. +To manually refresh the data, click image:canvas/images/canvas-refresh-data.png[Canvas refresh data button]. diff --git a/docs/canvas/canvas-share-workpad.asciidoc b/docs/canvas/canvas-share-workpad.asciidoc index 68078b74da171..348d15f39ad76 100644 --- a/docs/canvas/canvas-share-workpad.asciidoc +++ b/docs/canvas/canvas-share-workpad.asciidoc @@ -23,7 +23,7 @@ Want to export multiple workpads? Go to the *Canvas* home page, select the workp [[add-workpad-website]] === Share the workpad on a website -beta[] Canvas allows you to create _shareables_, which are workpads that you download and securely share on any website. +beta[] *Canvas* allows you to create _shareables_, which are workpads that you download and securely share on any website. To customize the behavior of the workpad on your website, you can choose to autoplay the pages or hide the workpad toolbar. . Click *Share > Share on a website*. @@ -32,7 +32,7 @@ To customize the behavior of the workpad on your website, you can choose to auto . To customize the workpad behavior to autoplay the pages or hide the toolbar, use the inline parameters. + -To make sure that your data remains secure, the data in the JSON file is not connected to {kib}. Canvas does not display elements that manipulate the data on the workpad. +To make sure that your data remains secure, the data in the JSON file is not connected to {kib}. *Canvas* does not display elements that manipulate the data on the workpad. + [role="screenshot"] image::canvas/images/canvas-embed_workpad.gif[Image showing how to share the workpad on a website] diff --git a/docs/canvas/canvas-tutorial.asciidoc b/docs/canvas/canvas-tutorial.asciidoc index 6456ba02bb8a8..89114affb9322 100644 --- a/docs/canvas/canvas-tutorial.asciidoc +++ b/docs/canvas/canvas-tutorial.asciidoc @@ -2,17 +2,16 @@ [[canvas-tutorial]] == Tutorial: Create a workpad for monitoring sales -To get up and running with Canvas, add the Sample eCommerce orders data, then use the data to create a workpad for monitoring sales at an eCommerce store. +To familiarize yourself with *Canvas*, add the Sample eCommerce orders data, then use the data to create a workpad for monitoring sales at an eCommerce store. [float] -=== Before you begin +=== Open and set up Canvas -For this tutorial, you'll need to add the <>. +To create a workpad of the eCommerce store data, add the data set, then create the workpad. -[float] -=== Create your workpad +. On the {kib} *Home* page, click *Try our sample data*. -Your first step to working with Canvas is to create a workpad. +. From *Sample eCommerce orders data*, click *Add data*. . Open the main menu, then click *Canvas*. @@ -59,7 +58,7 @@ The query selects the total price field and sets it to the sum_total_price field .. Change the *Label* to `Total sales`. -. The error is gone, but the element could use some formatting. To format the number, use the Canvas expression language. +. The error is gone, but the element could use some formatting. To format the number, use the *Canvas* expression language. .. Click *Expression editor*. + @@ -118,7 +117,7 @@ Your workpad is complete! [float] === What's next? -Now that you know the Canvas basics, you're ready to explore on your own. +Now that you know the basics, you're ready to explore on your own. Here are some things to try: @@ -126,4 +125,4 @@ Here are some things to try: * Build presentations of your own data with <>. -* Deep dive into the {kibana-ref}/canvas-function-reference.html[expression language and functions] that drive Canvas. +* Deep dive into the {kibana-ref}/canvas-function-reference.html[expression language and functions] that drive *Canvas*. diff --git a/docs/canvas/images/canvas-gs-example.png b/docs/canvas/images/canvas-gs-example.png index a9b960342709f81c14d17b29684deaada3a3be6b..bae32ef96a93fd1a72f79de258fcd7052da00ccb 100644 GIT binary patch literal 204911 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 Z^2W`OnV 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 VLo-e}P_Rilj-rk`a_w<({{V|X1qc8D literal 99894 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 diff --git a/docs/user/canvas.asciidoc b/docs/user/canvas.asciidoc index 6a3cee020538d..e5ac44a4e5401 100644 --- a/docs/user/canvas.asciidoc +++ b/docs/user/canvas.asciidoc @@ -5,31 +5,52 @@ [partintro] -- -Canvas is a data visualization and presentation tool that sits within {kib}. With Canvas, you can pull live data directly from {es}, and combine the data with colors, images, text, and your imagination to create dynamic, multi-page, pixel-perfect displays. If you are a little bit creative, a little bit technical, and a whole lot curious, then Canvas is for you. +*Canvas* is a data visualization and presentation tool that allows you to pull live data from {es}, +then combine the data with colors, images, text, and your imagination to create dynamic, multi-page, pixel-perfect displays. +If you are a little bit creative, a little bit technical, and a whole lot curious, then *Canvas* is for you. -With Canvas, you can: +With *Canvas*, you can: * Create and personalize your work space with backgrounds, borders, colors, fonts, and more. * Customize your workpad with your own visualizations, such as images and text. -* Pull your data directly from Elasticsearch, then show it off with charts, graphs, progress monitors, and more. +* Pull your data directly from {es}, then show it off with charts, graphs, progress monitors, and more. * Focus the data you want to display with filters. -To begin, open the main menu, then click *Canvas*. - -[role="screenshot"] -image::images/canvas-gs-example.png[Getting started example] - -For a quick overview of Canvas, watch link:https://www.youtube.com/watch?v=ZqvF_5-1xjQ[Stand out with Canvas]. +++++ + +
+++++ [float] [[create-workpads]] == Create workpads -A _workpad_ provides you with a space where you can build presentations of your live data. With Canvas, -you can create a workpad from scratch, start with a preconfigured workpad, import an existing workpad, or use a sample data workpad. +A _workpad_ provides you with a space where you can build presentations of your live data. You can create a workpad from scratch, start with a preconfigured workpad, +import an existing workpad, or use a sample data workpad. + +[float] +[[canvas-minimum-requirements]] +=== Minimum requirements + +To create workpads, you must meet the minimum requirements. + +* If you need to set up {kib}, use https://www.elastic.co/cloud/elasticsearch-service/signup?baymax=docs-body&elektra=docs[our free trial]. + +* Make sure you have {ref}/getting-started-index.html[data indexed into {es}] and an <>. + +* Have an understanding of {ref}/documents-indices.html[{es} documents and indices]. + +* Make sure you have sufficient privileges to create and save workpads. When the read-only indicator appears, you have insufficient privileges, +and the options to create and save workpads are unavailable. For more information, refer to <>. + +To open *Canvas*, open the main menu, then click *Canvas*. [float] [[start-with-a-blank-workpad]] @@ -54,7 +75,7 @@ image::images/canvas-background-color-picker.png[Canvas color picker] [[create-workpads-from-templates]] === Create workpads from templates -If you're unsure about where to start, you can use one of the preconfigured templates that come with Canvas. +If you're unsure about where to start, you can use one of the preconfigured templates that come with *Canvas*. . On the *Canvas workpads* page, select *Templates*. @@ -90,55 +111,60 @@ Create a story about your data by adding elements to your workpad that include i [[create-elements]] === Create elements -Choose the type of element you want to use, then use the preconfigured demo data to familiarize yourself with the element. When you're ready, connect the element to your own data. By default, most of the elements you create use -demo data until you change the data source. The demo data includes a small data set that you can use to experiment with your element. - -To begin, click *Add element*, then select the element you want to use. +Choose the type of element you want to use, then use the preconfigured demo data to familiarize yourself with the element. When you're ready, connect the element to your own data. +By default, most of the elements you create use the demo data until you change the data source. The demo data includes a small data set that you can use to experiment with your element. +. Click *Add element*, then select the element you want to use. ++ [role="screenshot"] image::images/canvas-element-select.gif[Canvas elements] -When you're ready to connect the element to your data, select *Data*, then select one of the following data sources: +. To connect the element to your data, select *Data*, then select one of the following data sources: * *{es} SQL* — Access your data in {es} using {ref}/sql-spec.html[SQL syntax]. -* *{es} documents* — Access your data in {es} without using aggregations. To use, select an index and fields, and optionally enter a query using the <>. Use the *{es} documents* data source when you have low volume datasets, to view raw documents, or to plot exact, non-aggregated values on a chart. - -* *Timelion* — Access your time series data using <> queries. To use Timelion queries, you can enter a query using the <>. +* *{es} documents* — Access your data in {es} without using aggregations. To use, select an index and fields, and optionally enter a query using the <>. +Use the *{es} documents* data source when you have low volume datasets, to view raw documents, or to plot exact, non-aggregated values on a chart. +* *Timelion* — Access your time series data using <> queries. To use *Timelion* queries, you can enter a query using the <>. ++ Each element can display a different data source, and pages and workpads often contain multiple data sources. -When you're ready to save your element, select the element, then click *Edit > Save as new element*. +. To save, use the following options: +* To save a single element, select the element, then click *Edit > Save as new element*. ++ [role="screenshot"] image::images/canvas_save_element.png[] -To save a group of elements, press and hold Shift, select the elements you want to save, then click *Edit > Save as new element*. +* To save a group of elements, press and hold Shift, select the elements you want to save, then click *Edit > Save as new element*. -Elements are saved in *Add element > My elements*. +To access your saved elements, click *Add element > My elements*. [float] -[[add-saved-objects]] -=== Add saved objects +[[add-kibana-visualizations]] +=== Add panels from the Visualize Library -Add <> to your workpad, such as maps and visualizations. +Add a panel that you saved in *Visualize Library* to your workpad. . Click *Add element > Add from {kib}*. -. Select the saved object you want to add. +. Select the panel you want to add. + [role="screenshot"] image::images/canvas-map-embed.gif[] -. To use the customization options, click the panel menu, then select one of the following options: +. To use the customization options, open the panel menu, then select one of the following options: + +* *Edit map* — Opens <> so that you can edit the panel. -* *Edit map* — Opens <> or a visualization builder so that you can edit the original saved object. +* *Edit visualization* — Opens the visualization editor so that you can edit the panel. -* *Edit panel title* — Adds a title to the saved object. +* *Edit panel title* — Allows you to change the panel title. -* *Customize time range* — Exposes a time filter dedicated to the saved object. +* *Customize time range* — Allows you to change the time filter dedicated to the panel. -* *Inspect* — Allows you to drill down into the element data. +* *Inspect* — Allows you to drill down into the panel data. [float] [[add-your-own-images]] From 067543b51ba66f35a80233c1739eb842f34cbce1 Mon Sep 17 00:00:00 2001 From: Tim Sullivan Date: Tue, 16 Mar 2021 09:34:03 -0700 Subject: [PATCH 24/24] App Services API updates for CSV Export (#94537) * App Arch API updates for CSV Export * add logging to show error cause from es * revert logging the error in an inconsistent way --- ...erver.iscopedsearchclient.cancelsession.md | 11 ++++ ...erver.iscopedsearchclient.deletesession.md | 11 ++++ ...erver.iscopedsearchclient.extendsession.md | 11 ++++ ...server.iscopedsearchclient.findsessions.md | 11 ++++ ...a-server.iscopedsearchclient.getsession.md | 11 ++++ ...plugins-data-server.iscopedsearchclient.md | 24 ++++++++ ...-server.iscopedsearchclient.savesession.md | 11 ++++ ...erver.iscopedsearchclient.updatesession.md | 11 ++++ .../kibana-plugin-plugins-data-server.md | 1 + src/plugins/data/server/index.ts | 1 + src/plugins/data/server/server.api.md | 55 +++++++++++++------ src/plugins/discover/public/index.ts | 1 + src/plugins/discover/public/shared/index.ts | 14 +++++ 13 files changed, 155 insertions(+), 18 deletions(-) create mode 100644 docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iscopedsearchclient.cancelsession.md create mode 100644 docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iscopedsearchclient.deletesession.md create mode 100644 docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iscopedsearchclient.extendsession.md create mode 100644 docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iscopedsearchclient.findsessions.md create mode 100644 docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iscopedsearchclient.getsession.md create mode 100644 docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iscopedsearchclient.md create mode 100644 docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iscopedsearchclient.savesession.md create mode 100644 docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iscopedsearchclient.updatesession.md create mode 100644 src/plugins/discover/public/shared/index.ts diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iscopedsearchclient.cancelsession.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iscopedsearchclient.cancelsession.md new file mode 100644 index 0000000000000..3b38e64ecc3da --- /dev/null +++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iscopedsearchclient.cancelsession.md @@ -0,0 +1,11 @@ + + +[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [IScopedSearchClient](./kibana-plugin-plugins-data-server.iscopedsearchclient.md) > [cancelSession](./kibana-plugin-plugins-data-server.iscopedsearchclient.cancelsession.md) + +## IScopedSearchClient.cancelSession property + +Signature: + +```typescript +cancelSession: IScopedSearchSessionsClient['cancel']; +``` diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iscopedsearchclient.deletesession.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iscopedsearchclient.deletesession.md new file mode 100644 index 0000000000000..609c730c2911c --- /dev/null +++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iscopedsearchclient.deletesession.md @@ -0,0 +1,11 @@ + + +[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [IScopedSearchClient](./kibana-plugin-plugins-data-server.iscopedsearchclient.md) > [deleteSession](./kibana-plugin-plugins-data-server.iscopedsearchclient.deletesession.md) + +## IScopedSearchClient.deleteSession property + +Signature: + +```typescript +deleteSession: IScopedSearchSessionsClient['delete']; +``` diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iscopedsearchclient.extendsession.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iscopedsearchclient.extendsession.md new file mode 100644 index 0000000000000..33ce8f2a82d0f --- /dev/null +++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iscopedsearchclient.extendsession.md @@ -0,0 +1,11 @@ + + +[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [IScopedSearchClient](./kibana-plugin-plugins-data-server.iscopedsearchclient.md) > [extendSession](./kibana-plugin-plugins-data-server.iscopedsearchclient.extendsession.md) + +## IScopedSearchClient.extendSession property + +Signature: + +```typescript +extendSession: IScopedSearchSessionsClient['extend']; +``` diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iscopedsearchclient.findsessions.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iscopedsearchclient.findsessions.md new file mode 100644 index 0000000000000..2a78e09841e77 --- /dev/null +++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iscopedsearchclient.findsessions.md @@ -0,0 +1,11 @@ + + +[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [IScopedSearchClient](./kibana-plugin-plugins-data-server.iscopedsearchclient.md) > [findSessions](./kibana-plugin-plugins-data-server.iscopedsearchclient.findsessions.md) + +## IScopedSearchClient.findSessions property + +Signature: + +```typescript +findSessions: IScopedSearchSessionsClient['find']; +``` diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iscopedsearchclient.getsession.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iscopedsearchclient.getsession.md new file mode 100644 index 0000000000000..4afcf4ad29195 --- /dev/null +++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iscopedsearchclient.getsession.md @@ -0,0 +1,11 @@ + + +[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [IScopedSearchClient](./kibana-plugin-plugins-data-server.iscopedsearchclient.md) > [getSession](./kibana-plugin-plugins-data-server.iscopedsearchclient.getsession.md) + +## IScopedSearchClient.getSession property + +Signature: + +```typescript +getSession: IScopedSearchSessionsClient['get']; +``` diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iscopedsearchclient.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iscopedsearchclient.md new file mode 100644 index 0000000000000..41ac662905b6b --- /dev/null +++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iscopedsearchclient.md @@ -0,0 +1,24 @@ + + +[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [IScopedSearchClient](./kibana-plugin-plugins-data-server.iscopedsearchclient.md) + +## IScopedSearchClient interface + +Signature: + +```typescript +export interface IScopedSearchClient extends ISearchClient +``` + +## Properties + +| Property | Type | Description | +| --- | --- | --- | +| [cancelSession](./kibana-plugin-plugins-data-server.iscopedsearchclient.cancelsession.md) | IScopedSearchSessionsClient['cancel'] | | +| [deleteSession](./kibana-plugin-plugins-data-server.iscopedsearchclient.deletesession.md) | IScopedSearchSessionsClient['delete'] | | +| [extendSession](./kibana-plugin-plugins-data-server.iscopedsearchclient.extendsession.md) | IScopedSearchSessionsClient['extend'] | | +| [findSessions](./kibana-plugin-plugins-data-server.iscopedsearchclient.findsessions.md) | IScopedSearchSessionsClient['find'] | | +| [getSession](./kibana-plugin-plugins-data-server.iscopedsearchclient.getsession.md) | IScopedSearchSessionsClient['get'] | | +| [saveSession](./kibana-plugin-plugins-data-server.iscopedsearchclient.savesession.md) | IScopedSearchSessionsClient['save'] | | +| [updateSession](./kibana-plugin-plugins-data-server.iscopedsearchclient.updatesession.md) | IScopedSearchSessionsClient['update'] | | + diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iscopedsearchclient.savesession.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iscopedsearchclient.savesession.md new file mode 100644 index 0000000000000..78cd49c376005 --- /dev/null +++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iscopedsearchclient.savesession.md @@ -0,0 +1,11 @@ + + +[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [IScopedSearchClient](./kibana-plugin-plugins-data-server.iscopedsearchclient.md) > [saveSession](./kibana-plugin-plugins-data-server.iscopedsearchclient.savesession.md) + +## IScopedSearchClient.saveSession property + +Signature: + +```typescript +saveSession: IScopedSearchSessionsClient['save']; +``` diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iscopedsearchclient.updatesession.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iscopedsearchclient.updatesession.md new file mode 100644 index 0000000000000..5e010f9168e43 --- /dev/null +++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iscopedsearchclient.updatesession.md @@ -0,0 +1,11 @@ + + +[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [IScopedSearchClient](./kibana-plugin-plugins-data-server.iscopedsearchclient.md) > [updateSession](./kibana-plugin-plugins-data-server.iscopedsearchclient.updatesession.md) + +## IScopedSearchClient.updateSession property + +Signature: + +```typescript +updateSession: IScopedSearchSessionsClient['update']; +``` diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md index fd9ed1e8f635c..e0734bc017f4f 100644 --- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md +++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md @@ -52,6 +52,7 @@ | [IFieldSubType](./kibana-plugin-plugins-data-server.ifieldsubtype.md) | | | [IFieldType](./kibana-plugin-plugins-data-server.ifieldtype.md) | | | [IndexPatternAttributes](./kibana-plugin-plugins-data-server.indexpatternattributes.md) | Interface for an index pattern saved object | +| [IScopedSearchClient](./kibana-plugin-plugins-data-server.iscopedsearchclient.md) | | | [ISearchOptions](./kibana-plugin-plugins-data-server.isearchoptions.md) | | | [ISearchSessionService](./kibana-plugin-plugins-data-server.isearchsessionservice.md) | | | [ISearchSetup](./kibana-plugin-plugins-data-server.isearchsetup.md) | | diff --git a/src/plugins/data/server/index.ts b/src/plugins/data/server/index.ts index 2a21b9e434596..cbf09ef57d96a 100644 --- a/src/plugins/data/server/index.ts +++ b/src/plugins/data/server/index.ts @@ -220,6 +220,7 @@ export { } from '../common'; export { + IScopedSearchClient, ISearchStrategy, ISearchSetup, ISearchStart, diff --git a/src/plugins/data/server/server.api.md b/src/plugins/data/server/server.api.md index f755679405de0..0118906c181cc 100644 --- a/src/plugins/data/server/server.api.md +++ b/src/plugins/data/server/server.api.md @@ -963,6 +963,29 @@ export class IndexPatternsServiceProvider implements Plugin_3 { - // Warning: (ae-forgotten-export) The symbol "IScopedSearchSessionsClient" needs to be exported by the entry point index.d.ts - // // (undocumented) asScopedProvider: (core: CoreStart) => (request: KibanaRequest) => IScopedSearchSessionsClient; } @@ -1010,8 +1031,6 @@ export interface ISearchStart IScopedSearchClient; getSearchStrategy: (name?: string) => ISearchStrategy; @@ -1481,20 +1500,20 @@ export function usageProvider(core: CoreSetup_2): SearchUsage; // src/plugins/data/server/index.ts:101:26 - (ae-forgotten-export) The symbol "HistogramFormat" needs to be exported by the entry point index.d.ts // src/plugins/data/server/index.ts:128:27 - (ae-forgotten-export) The symbol "isFilterable" needs to be exported by the entry point index.d.ts // src/plugins/data/server/index.ts:128:27 - (ae-forgotten-export) The symbol "isNestedField" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:243:20 - (ae-forgotten-export) The symbol "getRequestInspectorStats" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:243:20 - (ae-forgotten-export) The symbol "getResponseInspectorStats" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:243:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:243:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:245:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:246:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:255:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:256:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:257:1 - (ae-forgotten-export) The symbol "Ipv4Address" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:261:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:262:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:266:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:269:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:270:1 - (ae-forgotten-export) The symbol "calcAutoIntervalLessThan" needs to be exported by the entry point index.d.ts +// src/plugins/data/server/index.ts:244:20 - (ae-forgotten-export) The symbol "getRequestInspectorStats" needs to be exported by the entry point index.d.ts +// src/plugins/data/server/index.ts:244:20 - (ae-forgotten-export) The symbol "getResponseInspectorStats" needs to be exported by the entry point index.d.ts +// src/plugins/data/server/index.ts:244:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts +// src/plugins/data/server/index.ts:244:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts +// src/plugins/data/server/index.ts:246:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts +// src/plugins/data/server/index.ts:247:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts +// src/plugins/data/server/index.ts:256:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts +// src/plugins/data/server/index.ts:257:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts +// src/plugins/data/server/index.ts:258:1 - (ae-forgotten-export) The symbol "Ipv4Address" needs to be exported by the entry point index.d.ts +// src/plugins/data/server/index.ts:262:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts +// src/plugins/data/server/index.ts:263:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts +// src/plugins/data/server/index.ts:267:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts +// src/plugins/data/server/index.ts:270:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts +// src/plugins/data/server/index.ts:271:1 - (ae-forgotten-export) The symbol "calcAutoIntervalLessThan" needs to be exported by the entry point index.d.ts // src/plugins/data/server/plugin.ts:79:74 - (ae-forgotten-export) The symbol "DataEnhancements" needs to be exported by the entry point index.d.ts // src/plugins/data/server/search/types.ts:114:5 - (ae-forgotten-export) The symbol "ISearchStartSearchSource" needs to be exported by the entry point index.d.ts diff --git a/src/plugins/discover/public/index.ts b/src/plugins/discover/public/index.ts index de76c65ccdc98..fbe853ec6deb5 100644 --- a/src/plugins/discover/public/index.ts +++ b/src/plugins/discover/public/index.ts @@ -16,4 +16,5 @@ export function plugin(initializerContext: PluginInitializerContext) { export { SavedSearch, SavedSearchLoader, createSavedSearchesLoader } from './saved_searches'; export { ISearchEmbeddable, SEARCH_EMBEDDABLE_TYPE, SearchInput } from './application/embeddable'; +export { loadSharingDataHelpers } from './shared'; export { DISCOVER_APP_URL_GENERATOR, DiscoverUrlGeneratorState } from './url_generator'; diff --git a/src/plugins/discover/public/shared/index.ts b/src/plugins/discover/public/shared/index.ts new file mode 100644 index 0000000000000..b1e4d9d87000e --- /dev/null +++ b/src/plugins/discover/public/shared/index.ts @@ -0,0 +1,14 @@ +/* + * 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 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. + */ + +/* + * Allows the getSharingData function to be lazy loadable + */ +export async function loadSharingDataHelpers() { + return await import('../application/helpers/get_sharing_data'); +}