From 7e469af7c6881267f528b9a3d611244415f68269 Mon Sep 17 00:00:00 2001 From: Kyle Pollich Date: Tue, 27 Sep 2022 11:08:46 -0400 Subject: [PATCH 01/95] [Fleet] Point APM bundling process at package storage v2 (#141944) * Point APM bundling process at package storage v2 * Add Fleet as codeowner for bundled packages task --- .github/CODEOWNERS | 1 + src/dev/build/tasks/bundle_fleet_packages.ts | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 5633cf2e6e1bc..2c1a3e323a993 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -132,6 +132,7 @@ x-pack/examples/files_example @elastic/kibana-app-services /x-pack/test/fleet_api_integration @elastic/fleet /x-pack/test/fleet_cypress @elastic/fleet /x-pack/test/fleet_functional @elastic/fleet +/src/dev/build/tasks/bundle_fleet_packages.ts # APM /x-pack/plugins/apm/ @elastic/apm-ui diff --git a/src/dev/build/tasks/bundle_fleet_packages.ts b/src/dev/build/tasks/bundle_fleet_packages.ts index 4ba5e79d29928..30cfc1d22b0e6 100644 --- a/src/dev/build/tasks/bundle_fleet_packages.ts +++ b/src/dev/build/tasks/bundle_fleet_packages.ts @@ -15,6 +15,10 @@ import { Task, read, downloadToDisk, unzipBuffer, createZipFile } from '../lib'; const BUNDLED_PACKAGES_DIR = 'x-pack/plugins/fleet/target/bundled_packages'; +// APM needs to directly request its versions from Package Storage v2 - this should +// be removed when Package Storage v2 is in production +const PACKAGE_STORAGE_V2_URL = 'https://epr-v2.ea-web.elastic.dev'; + interface FleetPackage { name: string; version: string; @@ -64,7 +68,12 @@ export const BundleFleetPackages: Task = { } const archivePath = `${fleetPackage.name}-${versionToWrite}.zip`; - const archiveUrl = `${eprUrl}/epr/${fleetPackage.name}/${fleetPackage.name}-${fleetPackage.version}.zip`; + let archiveUrl = `${eprUrl}/epr/${fleetPackage.name}/${fleetPackage.name}-${fleetPackage.version}.zip`; + + // Point APM to package storage v2 + if (fleetPackage.name === 'apm') { + archiveUrl = `${PACKAGE_STORAGE_V2_URL}/epr/${fleetPackage.name}/${fleetPackage.name}-${fleetPackage.version}.zip`; + } const destination = build.resolvePath(BUNDLED_PACKAGES_DIR, archivePath); From 0446e0100bafff7255cc7e8581ad82a5dc4a91ca Mon Sep 17 00:00:00 2001 From: Robert Oskamp Date: Tue, 27 Sep 2022 17:09:49 +0200 Subject: [PATCH 02/95] [ML] Stabilize docs screenshots suites (#141755) This PR stabilizes the docs screenshots suite by disabling Kibana tour popovers and wrapping the multi selection service method into a retry. --- .../test/functional/services/ml/common_ui.ts | 35 +++++++++++-------- .../functional/services/ml/test_resources.ts | 8 +++++ .../screenshot_creation/apps/ml_docs/index.ts | 2 ++ .../apps/response_ops_docs/index.ts | 2 ++ 4 files changed, 32 insertions(+), 15 deletions(-) diff --git a/x-pack/test/functional/services/ml/common_ui.ts b/x-pack/test/functional/services/ml/common_ui.ts index 0d8ee7d11a8b1..ef69f909437c1 100644 --- a/x-pack/test/functional/services/ml/common_ui.ts +++ b/x-pack/test/functional/services/ml/common_ui.ts @@ -164,22 +164,27 @@ export function MachineLearningCommonUIProvider({ }, async setMultiSelectFilter(testDataSubj: string, fieldTypes: string[]) { - await testSubjects.clickWhenNotDisabledWithoutRetry(`${testDataSubj}-button`); - await testSubjects.existOrFail(`${testDataSubj}-popover`); - await testSubjects.existOrFail(`${testDataSubj}-searchInput`); - const searchBarInput = await testSubjects.find(`${testDataSubj}-searchInput`); + await retry.tryForTime(60 * 1000, async () => { + // escape popover + await browser.pressKeys(browser.keys.ESCAPE); - for (const fieldType of fieldTypes) { - await retry.tryForTime(5000, async () => { - await searchBarInput.clearValueWithKeyboard(); - await searchBarInput.type(fieldType); - if (!(await testSubjects.exists(`${testDataSubj}-option-${fieldType}-checked`))) { - await testSubjects.existOrFail(`${testDataSubj}-option-${fieldType}`); - await testSubjects.click(`${testDataSubj}-option-${fieldType}`); - await testSubjects.existOrFail(`${testDataSubj}-option-${fieldType}-checked`); - } - }); - } + await testSubjects.clickWhenNotDisabledWithoutRetry(`${testDataSubj}-button`); + await testSubjects.existOrFail(`${testDataSubj}-popover`); + await testSubjects.existOrFail(`${testDataSubj}-searchInput`); + const searchBarInput = await testSubjects.find(`${testDataSubj}-searchInput`); + + for (const fieldType of fieldTypes) { + await retry.tryForTime(5000, async () => { + await searchBarInput.clearValueWithKeyboard(); + await searchBarInput.type(fieldType); + if (!(await testSubjects.exists(`${testDataSubj}-option-${fieldType}-checked`))) { + await testSubjects.existOrFail(`${testDataSubj}-option-${fieldType}`); + await testSubjects.click(`${testDataSubj}-option-${fieldType}`); + await testSubjects.existOrFail(`${testDataSubj}-option-${fieldType}-checked`); + } + }); + } + }); // escape popover await browser.pressKeys(browser.keys.ESCAPE); diff --git a/x-pack/test/functional/services/ml/test_resources.ts b/x-pack/test/functional/services/ml/test_resources.ts index 4fccde6712e62..d1a7557caf2b1 100644 --- a/x-pack/test/functional/services/ml/test_resources.ts +++ b/x-pack/test/functional/services/ml/test_resources.ts @@ -46,6 +46,14 @@ export function MachineLearningTestResourcesProvider( await kibanaServer.uiSettings.unset('dateFormat:tz'); }, + async disableKibanaAnnouncements() { + await kibanaServer.uiSettings.update({ hideAnnouncements: true }); + }, + + async resetKibanaAnnouncements() { + await kibanaServer.uiSettings.unset('hideAnnouncements'); + }, + async savedObjectExistsById(id: string, objectType: SavedObjectType): Promise { const response = await supertest.get(`/api/saved_objects/${objectType}/${id}`); return response.status === 200; diff --git a/x-pack/test/screenshot_creation/apps/ml_docs/index.ts b/x-pack/test/screenshot_creation/apps/ml_docs/index.ts index 1c12efc89caf7..806414939cd84 100644 --- a/x-pack/test/screenshot_creation/apps/ml_docs/index.ts +++ b/x-pack/test/screenshot_creation/apps/ml_docs/index.ts @@ -22,6 +22,7 @@ export default function ({ getPageObject, getService, loadTestFile }: FtrProvide before(async () => { await ml.testResources.installAllKibanaSampleData(); await ml.testResources.setKibanaTimeZoneToUTC(); + await ml.testResources.disableKibanaAnnouncements(); await browser.setWindowSize(1920, 1080); }); @@ -29,6 +30,7 @@ export default function ({ getPageObject, getService, loadTestFile }: FtrProvide await securityPage.forceLogout(); await ml.testResources.removeAllKibanaSampleData(); await ml.testResources.resetKibanaTimeZone(); + await ml.testResources.resetKibanaAnnouncements(); }); loadTestFile(require.resolve('./anomaly_detection')); diff --git a/x-pack/test/screenshot_creation/apps/response_ops_docs/index.ts b/x-pack/test/screenshot_creation/apps/response_ops_docs/index.ts index 64ed2599d65b4..e836e3e63c9b7 100644 --- a/x-pack/test/screenshot_creation/apps/response_ops_docs/index.ts +++ b/x-pack/test/screenshot_creation/apps/response_ops_docs/index.ts @@ -23,6 +23,7 @@ export default function ({ getPageObject, getService, loadTestFile }: FtrProvide before(async () => { await ml.testResources.installAllKibanaSampleData(); await ml.testResources.setKibanaTimeZoneToUTC(); + await ml.testResources.disableKibanaAnnouncements(); await browser.setWindowSize(1920, 1080); await securityPage.login( esTestConfig.getUrlParts().username, @@ -34,6 +35,7 @@ export default function ({ getPageObject, getService, loadTestFile }: FtrProvide await securityPage.forceLogout(); await ml.testResources.removeAllKibanaSampleData(); await ml.testResources.resetKibanaTimeZone(); + await ml.testResources.resetKibanaAnnouncements(); }); loadTestFile(require.resolve('./stack_cases')); From f585dd6e5a3d0336d2a97fd0c5ee3ff88ccf0ab0 Mon Sep 17 00:00:00 2001 From: Vitalii Dmyterko <92328789+vitaliidm@users.noreply.github.com> Date: Tue, 27 Sep 2022 16:14:22 +0100 Subject: [PATCH 03/95] [Security Solution][Alerts] saved query UX changes follow-up (#141747) ## Summary addresses feedback left during code review for https://github.com/elastic/kibana/pull/140064 - Saved query checkbox label shows saved query name - `createSavedQuery` moved to `x-pack/plugins/security_solution/cypress/tasks/api_calls/saved_queries.ts` - `useGetSavedQuery` moved to `x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details` - additional comments and minor code changes ### Before Screenshot 2022-09-26 at 11 38 05 ### After Screenshot 2022-09-26 at 11 37 23 --- .../custom_saved_query_rule.cy.ts | 4 ++-- .../cypress/tasks/api_calls/saved_queries.ts | 17 +++++++++++++++++ .../security_solution/cypress/tasks/common.ts | 17 ----------------- .../public/common/hooks/translations.ts | 7 ------- .../components/rules/query_bar/index.tsx | 1 + .../components/rules/step_define_rule/index.tsx | 7 +++++-- .../rules/step_define_rule/schema.tsx | 6 ------ .../rules/step_define_rule/translations.tsx | 13 +++++++++++-- .../detection_engine/rules/details/index.tsx | 4 +++- .../rules/details/translations.ts | 7 +++++++ .../rules/details}/use_get_saved_query.ts | 9 +++++---- .../lib/detection_engine/signals/get_filter.ts | 5 +---- 12 files changed, 52 insertions(+), 45 deletions(-) rename x-pack/plugins/security_solution/public/{common/hooks => detections/pages/detection_engine/rules/details}/use_get_saved_query.ts (81%) diff --git a/x-pack/plugins/security_solution/cypress/e2e/detection_rules/custom_saved_query_rule.cy.ts b/x-pack/plugins/security_solution/cypress/e2e/detection_rules/custom_saved_query_rule.cy.ts index 9b1d5c71a6fa9..5027fe09a8d3e 100644 --- a/x-pack/plugins/security_solution/cypress/e2e/detection_rules/custom_saved_query_rule.cy.ts +++ b/x-pack/plugins/security_solution/cypress/e2e/detection_rules/custom_saved_query_rule.cy.ts @@ -25,8 +25,8 @@ import { import { goToRuleDetails, editFirstRule } from '../../tasks/alerts_detection_rules'; import { createTimeline } from '../../tasks/api_calls/timelines'; -import { createSavedQuery } from '../../tasks/api_calls/saved_queries'; -import { cleanKibana, deleteAlertsAndRules, deleteSavedQueries } from '../../tasks/common'; +import { createSavedQuery, deleteSavedQueries } from '../../tasks/api_calls/saved_queries'; +import { cleanKibana, deleteAlertsAndRules } from '../../tasks/common'; import { createAndEnableRule, fillAboutRuleAndContinue, diff --git a/x-pack/plugins/security_solution/cypress/tasks/api_calls/saved_queries.ts b/x-pack/plugins/security_solution/cypress/tasks/api_calls/saved_queries.ts index 8c4aea51ec045..08867cf55d4c0 100644 --- a/x-pack/plugins/security_solution/cypress/tasks/api_calls/saved_queries.ts +++ b/x-pack/plugins/security_solution/cypress/tasks/api_calls/saved_queries.ts @@ -33,3 +33,20 @@ export const createSavedQuery = ( }, headers: { 'kbn-xsrf': 'cypress-creds' }, }); + +export const deleteSavedQueries = () => { + const kibanaIndexUrl = `${Cypress.env('ELASTICSEARCH_URL')}/.kibana_\*`; + cy.request('POST', `${kibanaIndexUrl}/_delete_by_query?conflicts=proceed`, { + query: { + bool: { + filter: [ + { + match: { + type: 'query', + }, + }, + ], + }, + }, + }); +}; diff --git a/x-pack/plugins/security_solution/cypress/tasks/common.ts b/x-pack/plugins/security_solution/cypress/tasks/common.ts index 23f04d0fd3c2b..cd9525e95b0b2 100644 --- a/x-pack/plugins/security_solution/cypress/tasks/common.ts +++ b/x-pack/plugins/security_solution/cypress/tasks/common.ts @@ -179,23 +179,6 @@ export const deleteCases = () => { }); }; -export const deleteSavedQueries = () => { - const kibanaIndexUrl = `${Cypress.env('ELASTICSEARCH_URL')}/.kibana_\*`; - cy.request('POST', `${kibanaIndexUrl}/_delete_by_query?conflicts=proceed`, { - query: { - bool: { - filter: [ - { - match: { - type: 'query', - }, - }, - ], - }, - }, - }); -}; - export const postDataView = (dataSource: string) => { cy.request({ method: 'POST', diff --git a/x-pack/plugins/security_solution/public/common/hooks/translations.ts b/x-pack/plugins/security_solution/public/common/hooks/translations.ts index 1f939282b5c72..54ed3a79d017f 100644 --- a/x-pack/plugins/security_solution/public/common/hooks/translations.ts +++ b/x-pack/plugins/security_solution/public/common/hooks/translations.ts @@ -39,10 +39,3 @@ export const EQL_TIME_INTERVAL_NOT_DEFINED = i18n.translate( defaultMessage: 'Time intervals are not defined.', } ); - -export const SAVED_QUERY_LOAD_ERROR_TOAST = i18n.translate( - 'xpack.securitySolution.hooks.useGetSavedQuery.errorToastMessage', - { - defaultMessage: 'Failed to load the saved query', - } -); diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/query_bar/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/query_bar/index.tsx index a5316eabb11f9..7d7c9534c1688 100644 --- a/x-pack/plugins/security_solution/public/detections/components/rules/query_bar/index.tsx +++ b/x-pack/plugins/security_solution/public/detections/components/rules/query_bar/index.tsx @@ -70,6 +70,7 @@ const savedQueryToFieldValue = (savedQuery: SavedQuery): FieldValueQueryBar => ( filters: savedQuery.attributes.filters ?? [], query: savedQuery.attributes.query, saved_id: savedQuery.id, + title: savedQuery.attributes.title, }); export const QueryBarDefineRule = ({ diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/index.tsx index 23042cd1165ec..21bf8125540b4 100644 --- a/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/index.tsx +++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/index.tsx @@ -739,8 +739,8 @@ const StepDefineRuleComponent: FC = ({ <> = ({ 'data-test-subj': 'detectionEngineStepDefineRuleShouldLoadQueryDynamically', euiFieldProps: { disabled: isLoading, + label: formQuery?.title + ? i18n.getSavedQueryCheckboxLabel(formQuery.title) + : undefined, }, }} /> diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/schema.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/schema.tsx index bc3937013b6ae..b23b496eae82e 100644 --- a/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/schema.tsx +++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/schema.tsx @@ -629,12 +629,6 @@ export const schema: FormSchema = { }, shouldLoadQueryDynamically: { type: FIELD_TYPES.CHECKBOX, - label: i18n.translate( - 'xpack.securitySolution.detectionEngine.createRule.stepAboutRule.fieldShouldLoadQueryDynamicallyLabel', - { - defaultMessage: 'Load the saved query dynamically on each rule execution', - } - ), defaultValue: false, }, }; diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/translations.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/translations.tsx index b28d06777fd3c..4650da2ce603a 100644 --- a/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/translations.tsx +++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/translations.tsx @@ -78,13 +78,22 @@ export const EQL_QUERY_BAR_LABEL = i18n.translate( } ); -export const SAVED_QUERY_CHECKBOX_LABEL = i18n.translate( - 'xpack.securitySolution.detectionEngine.createRule.stepDefineRule.SavedQueryCheckboxLabel', +export const SAVED_QUERY_FORM_ROW_LABEL = i18n.translate( + 'xpack.securitySolution.detectionEngine.createRule.stepDefineRule.SavedQueryFormRowLabel', { defaultMessage: 'Saved query', } ); +export const getSavedQueryCheckboxLabel = (savedQueryName: string) => + i18n.translate( + 'xpack.securitySolution.detectionEngine.createRule.stepDefineRule.fieldShouldLoadQueryDynamicallyLabel', + { + defaultMessage: 'Load saved query "{savedQueryName}" dynamically on each rule execution', + values: { savedQueryName }, + } + ); + export const THREAT_MATCH_INDEX_HELPER_TEXT = i18n.translate( 'xpack.securitySolution.detectionEngine.createRule.stepDefineRule.threatMatchingIcesHelperDescription', { diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx index e91756ce74db4..5149269c57d9c 100644 --- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx @@ -116,7 +116,7 @@ import { ExecutionLogTable } from './execution_log_table/execution_log_table'; import * as detectionI18n from '../../translations'; import * as ruleI18n from '../translations'; import { RuleDetailsContextProvider } from './rule_details_context'; -import { useGetSavedQuery } from '../../../../../common/hooks/use_get_saved_query'; +import { useGetSavedQuery } from './use_get_saved_query'; import * as i18n from './translations'; import { NeedAdminForUpdateRulesCallOut } from '../../../../components/callouts/need_admin_for_update_callout'; import { MissingPrivilegesCallOut } from '../../../../components/callouts/missing_privileges_callout'; @@ -307,6 +307,8 @@ const RuleDetailsPageComponent: React.FC = ({ const [dataViewOptions, setDataViewOptions] = useState<{ [x: string]: DataViewListItem }>({}); // load saved query only if rule type === 'saved_query', as other rule types still can have saved_id property that is not used + // Rule schema allows to save any rule with saved_id property, but it only used for saved_query rule type + // In future we might look in possibility to restrict rule schema (breaking change!) and remove saved_id from the rest of rules through migration const savedQueryId = rule?.type === 'saved_query' ? rule?.saved_id : undefined; const { isSavedQueryLoading, savedQueryBar } = useGetSavedQuery(savedQueryId); diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/translations.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/translations.ts index 1a50d570ea179..b1c7e0033f5f4 100644 --- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/translations.ts +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/translations.ts @@ -69,3 +69,10 @@ export const DELETED_RULE = i18n.translate( defaultMessage: 'Deleted rule', } ); + +export const SAVED_QUERY_LOAD_ERROR_TOAST = i18n.translate( + 'xpack.securitySolution.hooks.useGetSavedQuery.errorToastMessage', + { + defaultMessage: 'Failed to load the saved query', + } +); diff --git a/x-pack/plugins/security_solution/public/common/hooks/use_get_saved_query.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/use_get_saved_query.ts similarity index 81% rename from x-pack/plugins/security_solution/public/common/hooks/use_get_saved_query.ts rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/use_get_saved_query.ts index 932fe61e2ce47..4c3c4c6c42fe0 100644 --- a/x-pack/plugins/security_solution/public/common/hooks/use_get_saved_query.ts +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/use_get_saved_query.ts @@ -7,12 +7,13 @@ import { useEffect, useMemo } from 'react'; -import { useSavedQueryServices } from '../utils/saved_query_services'; -import type { DefineStepRule } from '../../detections/pages/detection_engine/rules/types'; +import { useSavedQueryServices } from '../../../../../common/utils/saved_query_services'; +import type { DefineStepRule } from '../types'; + +import { useFetch, REQUEST_NAMES } from '../../../../../common/hooks/use_fetch'; +import { useAppToasts } from '../../../../../common/hooks/use_app_toasts'; -import { useFetch, REQUEST_NAMES } from './use_fetch'; import { SAVED_QUERY_LOAD_ERROR_TOAST } from './translations'; -import { useAppToasts } from './use_app_toasts'; export const useGetSavedQuery = (savedQueryId: string | undefined) => { const savedQueryServices = useSavedQueryServices(); diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_filter.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_filter.ts index bc22ca9ea44d9..521fdf1e5a595 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_filter.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_filter.ts @@ -97,13 +97,10 @@ export const getFilter = async ({ index, exceptionFilter, }); - } else if (savedId && index != null) { - // if savedId present and we ending up here, then saved query failed to be fetched - // and we also didn't fall back to saved in rule query - throw Error(`Failed to fetch saved query. "${err.message}"`); } else { // user did not give any additional fall back mechanism for generating a rule // rethrow error for activity monitoring + err.message = `Failed to fetch saved query. "${err.message}"`; throw err; } } From ce35fcc26861e1c9e2dd8661f6742a2f119fb2d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20S=C3=A1nchez?= Date: Tue, 27 Sep 2022 17:15:45 +0200 Subject: [PATCH 04/95] [Security Solution][Endpoint] Fix react minified error when getting endpoint data (#141212) * Fix react minified error when getting enpoint data * Revert overflow change to hidden Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../components/confirm_incoming_data_with_preview.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/multi_page_layout/components/confirm_incoming_data_with_preview.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/multi_page_layout/components/confirm_incoming_data_with_preview.tsx index af0e3c882ea50..011134151cbd7 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/multi_page_layout/components/confirm_incoming_data_with_preview.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/multi_page_layout/components/confirm_incoming_data_with_preview.tsx @@ -75,7 +75,8 @@ const HitPreview: React.FC<{ hit: SearchHit }> = ({ hit }) => { ); const listItems = Object.entries(hitForDisplay).map(([key, value]) => ({ title: `${key}:`, - description: value, + // Ensures arrays and collections of nested objects are displayed correctly + description: JSON.stringify(value), })); return ( From f567c953d54cbaac2e738377f222b48e31f4afb6 Mon Sep 17 00:00:00 2001 From: Rodney Norris Date: Tue, 27 Sep 2022 11:00:27 -0500 Subject: [PATCH 05/95] [Enterprise Search] align ml inference processor state (#141720) * align ml inference processor state updated how we render the state of the ml inference processor state to be inline with the trained model state. This will ensure we give the user more information if the model is in a state that will cause an error. * [Enterprise Search] replace flags with enum for model state Updated the InferencePipeline type to use an enum for the modelState instead of passing the string from the model and this also replaces the `isDeployed` flags since we want a more granular state that the enum will provide. --- .../common/types/pipelines.ts | 11 +- .../inference_pipeline_card.test.tsx | 14 +- .../pipelines/inference_pipeline_card.tsx | 42 +++-- .../pipelines/ml_model_health.test.tsx | 81 ++++++++++ .../pipelines/ml_model_health.tsx | 144 ++++++++++++++++++ .../enterprise_search_content/routes.ts | 2 + ...h_ml_inference_pipeline_processors.test.ts | 106 ++++++++++--- .../fetch_ml_inference_pipeline_processors.ts | 34 ++++- 8 files changed, 381 insertions(+), 53 deletions(-) create mode 100644 x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_model_health.test.tsx create mode 100644 x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_model_health.tsx diff --git a/x-pack/plugins/enterprise_search/common/types/pipelines.ts b/x-pack/plugins/enterprise_search/common/types/pipelines.ts index 60fd87ca523b9..269f7149cc7b3 100644 --- a/x-pack/plugins/enterprise_search/common/types/pipelines.ts +++ b/x-pack/plugins/enterprise_search/common/types/pipelines.ts @@ -6,7 +6,16 @@ */ export interface InferencePipeline { - isDeployed: boolean; + modelState: TrainedModelState; + modelStateReason?: string; pipelineName: string; types: string[]; } + +export enum TrainedModelState { + NotDeployed = '', + Starting = 'starting', + Stopping = 'stopping', + Started = 'started', + Failed = 'failed', +} diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/inference_pipeline_card.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/inference_pipeline_card.test.tsx index 1c79cff0244e3..27dc055564bd8 100644 --- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/inference_pipeline_card.test.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/inference_pipeline_card.test.tsx @@ -11,14 +11,16 @@ import React from 'react'; import { shallow } from 'enzyme'; -import { EuiBadge, EuiHealth, EuiPanel, EuiTitle } from '@elastic/eui'; +import { EuiBadge, EuiPanel, EuiTitle } from '@elastic/eui'; + +import { InferencePipeline, TrainedModelState } from '../../../../../../common/types/pipelines'; import { InferencePipelineCard } from './inference_pipeline_card'; +import { TrainedModelHealth } from './ml_model_health'; -export const DEFAULT_VALUES = { - isDeployed: true, +export const DEFAULT_VALUES: InferencePipeline = { + modelState: TrainedModelState.Started, pipelineName: 'Sample Processor', - trainedModelName: 'example_trained_model', types: ['pytorch'], }; @@ -34,8 +36,6 @@ describe('InferencePipelineCard', () => { expect(wrapper.find(EuiPanel)).toHaveLength(1); expect(wrapper.find(EuiTitle)).toHaveLength(1); expect(wrapper.find(EuiBadge)).toHaveLength(1); - - const health = wrapper.find(EuiHealth); - expect(health.prop('children')).toEqual('Deployed'); + expect(wrapper.find(TrainedModelHealth)).toHaveLength(1); }); }); diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/inference_pipeline_card.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/inference_pipeline_card.tsx index b73121f947d73..e8017ff15a198 100644 --- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/inference_pipeline_card.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/inference_pipeline_card.tsx @@ -12,31 +12,30 @@ import { useActions, useValues } from 'kea'; import { EuiBadge, EuiButtonEmpty, + EuiButtonIcon, EuiConfirmModal, EuiFlexGroup, EuiFlexItem, - EuiHealth, EuiPanel, EuiPopover, EuiPopoverTitle, EuiText, EuiTitle, + EuiToolTip, } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; -import { InferencePipeline } from '../../../../../../common/types/pipelines'; +import { InferencePipeline, TrainedModelState } from '../../../../../../common/types/pipelines'; import { CANCEL_BUTTON_LABEL, DELETE_BUTTON_LABEL } from '../../../../shared/constants'; import { HttpLogic } from '../../../../shared/http'; +import { ML_MANAGE_TRAINED_MODELS_PATH } from '../../../routes'; import { IndexNameLogic } from '../index_name_logic'; +import { TrainedModelHealth } from './ml_model_health'; import { PipelinesLogic } from './pipelines_logic'; -export const InferencePipelineCard: React.FC = ({ - pipelineName, - isDeployed, - types, -}) => { +export const InferencePipelineCard: React.FC = (pipeline) => { const { http } = useValues(HttpLogic); const { indexName } = useValues(IndexNameLogic); const [isPopOverOpen, setIsPopOverOpen] = useState(false); @@ -46,10 +45,7 @@ export const InferencePipelineCard: React.FC = ({ setShowConfirmDelete(true); setIsPopOverOpen(false); }; - - const deployedText = i18n.translate('xpack.enterpriseSearch.inferencePipelineCard.isDeployed', { - defaultMessage: 'Deployed', - }); + const { pipelineName, types } = pipeline; const actionButton = ( = ({ - - {isDeployed && ( - - {deployedText} + + + + + {pipeline.modelState === TrainedModelState.NotDeployed && ( + + + + )} {types.map((type) => ( diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_model_health.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_model_health.test.tsx new file mode 100644 index 0000000000000..0eb88abb317e5 --- /dev/null +++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_model_health.test.tsx @@ -0,0 +1,81 @@ +/* + * 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 { setMockValues } from '../../../../__mocks__/kea_logic'; + +import React from 'react'; + +import { shallow } from 'enzyme'; + +import { EuiHealth } from '@elastic/eui'; + +import { InferencePipeline, TrainedModelState } from '../../../../../../common/types/pipelines'; + +import { TrainedModelHealth } from './ml_model_health'; + +describe('TrainedModelHealth', () => { + beforeEach(() => { + jest.clearAllMocks(); + setMockValues({}); + }); + + const commonModelData: InferencePipeline = { + modelState: TrainedModelState.NotDeployed, + pipelineName: 'Sample Processor', + types: ['pytorch'], + }; + it('renders model started', () => { + const pipeline: InferencePipeline = { + ...commonModelData, + modelState: TrainedModelState.Started, + }; + const wrapper = shallow(); + const health = wrapper.find(EuiHealth); + expect(health.prop('children')).toEqual('Started'); + expect(health.prop('color')).toEqual('success'); + }); + it('renders model not deployed', () => { + const pipeline: InferencePipeline = { + ...commonModelData, + }; + const wrapper = shallow(); + const health = wrapper.find(EuiHealth); + expect(health.prop('children')).toEqual('Not deployed'); + expect(health.prop('color')).toEqual('danger'); + }); + it('renders model stopping', () => { + const pipeline: InferencePipeline = { + ...commonModelData, + modelState: TrainedModelState.Stopping, + }; + const wrapper = shallow(); + const health = wrapper.find(EuiHealth); + expect(health.prop('children')).toEqual('Stopping'); + expect(health.prop('color')).toEqual('warning'); + }); + it('renders model starting', () => { + const pipeline: InferencePipeline = { + ...commonModelData, + modelState: TrainedModelState.Starting, + }; + const wrapper = shallow(); + const health = wrapper.find(EuiHealth); + expect(health.prop('children')).toEqual('Starting'); + expect(health.prop('color')).toEqual('warning'); + }); + it('renders model failed', () => { + const pipeline: InferencePipeline = { + ...commonModelData, + modelState: TrainedModelState.Failed, + modelStateReason: 'Model start boom.', + }; + const wrapper = shallow(); + const health = wrapper.find(EuiHealth); + expect(health.prop('children')).toEqual('Deployment failed'); + expect(health.prop('color')).toEqual('danger'); + }); +}); diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_model_health.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_model_health.tsx new file mode 100644 index 0000000000000..0d47c7018d4fe --- /dev/null +++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_model_health.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 { EuiHealth, EuiToolTip } from '@elastic/eui'; + +import { i18n } from '@kbn/i18n'; +import { FormattedMessage } from '@kbn/i18n-react'; + +import { InferencePipeline, TrainedModelState } from '../../../../../../common/types/pipelines'; + +const modelStartedText = i18n.translate( + 'xpack.enterpriseSearch.inferencePipelineCard.modelState.started', + { + defaultMessage: 'Started', + } +); +const modelStartedTooltip = i18n.translate( + 'xpack.enterpriseSearch.inferencePipelineCard.modelState.started.tooltip', + { + defaultMessage: 'This trained model is running and fully available', + } +); +const modelStartingText = i18n.translate( + 'xpack.enterpriseSearch.inferencePipelineCard.modelState.starting', + { + defaultMessage: 'Starting', + } +); +const modelStartingTooltip = i18n.translate( + 'xpack.enterpriseSearch.inferencePipelineCard.modelState.starting.tooltip', + { + defaultMessage: + 'This trained model is in the process of starting up and will be available shortly', + } +); +const modelStoppingText = i18n.translate( + 'xpack.enterpriseSearch.inferencePipelineCard.modelState.stopping', + { + defaultMessage: 'Stopping', + } +); +const modelStoppingTooltip = i18n.translate( + 'xpack.enterpriseSearch.inferencePipelineCard.modelState.stopping.tooltip', + { + defaultMessage: + 'This trained model is in the process of shutting down and is currently unavailable', + } +); +const modelDeploymentFailedText = i18n.translate( + 'xpack.enterpriseSearch.inferencePipelineCard.modelState.deploymentFailed', + { + defaultMessage: 'Deployment failed', + } +); +const modelNotDeployedText = i18n.translate( + 'xpack.enterpriseSearch.inferencePipelineCard.modelState.notDeployed', + { + defaultMessage: 'Not deployed', + } +); +const modelNotDeployedTooltip = i18n.translate( + 'xpack.enterpriseSearch.inferencePipelineCard.modelState.notDeployed.tooltip', + { + defaultMessage: + 'This trained model is not currently deployed. Visit the trained models page to make changes', + } +); + +export const TrainedModelHealth: React.FC = ({ + modelState, + modelStateReason, +}) => { + let modelHealth: { + healthColor: string; + healthText: React.ReactNode; + tooltipText: React.ReactNode; + }; + switch (modelState) { + case TrainedModelState.Started: + modelHealth = { + healthColor: 'success', + healthText: modelStartedText, + tooltipText: modelStartedTooltip, + }; + break; + case TrainedModelState.Stopping: + modelHealth = { + healthColor: 'warning', + healthText: modelStoppingText, + tooltipText: modelStoppingTooltip, + }; + break; + case TrainedModelState.Starting: + modelHealth = { + healthColor: 'warning', + healthText: modelStartingText, + tooltipText: modelStartingTooltip, + }; + break; + case TrainedModelState.Failed: + modelHealth = { + healthColor: 'danger', + healthText: modelDeploymentFailedText, + tooltipText: ( + + ), + }; + break; + case TrainedModelState.NotDeployed: + modelHealth = { + healthColor: 'danger', + healthText: modelNotDeployedText, + tooltipText: modelNotDeployedTooltip, + }; + break; + } + return ( + + {modelHealth.healthText} + + ); +}; diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/routes.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/routes.ts index 60260dcaa5377..a980402119062 100644 --- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/routes.ts +++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/routes.ts @@ -21,3 +21,5 @@ export const SEARCH_INDEX_PATH = `${SEARCH_INDICES_PATH}/:indexName`; export const SEARCH_INDEX_TAB_PATH = `${SEARCH_INDEX_PATH}/:tabId`; export const SEARCH_INDEX_CRAWLER_DOMAIN_DETAIL_PATH = `${SEARCH_INDEX_PATH}/crawler/domains/:domainId`; export const SEARCH_INDEX_SELECT_CONNECTOR_PATH = `${SEARCH_INDEX_PATH}/select_connector`; + +export const ML_MANAGE_TRAINED_MODELS_PATH = '/app/ml/trained_models'; diff --git a/x-pack/plugins/enterprise_search/server/lib/indices/fetch_ml_inference_pipeline_processors.test.ts b/x-pack/plugins/enterprise_search/server/lib/indices/fetch_ml_inference_pipeline_processors.test.ts index 9a34bb42ec876..79d4600bb31e4 100644 --- a/x-pack/plugins/enterprise_search/server/lib/indices/fetch_ml_inference_pipeline_processors.test.ts +++ b/x-pack/plugins/enterprise_search/server/lib/indices/fetch_ml_inference_pipeline_processors.test.ts @@ -9,7 +9,7 @@ import { MlTrainedModelConfig } from '@elastic/elasticsearch/lib/api/typesWithBo import { ElasticsearchClient } from '@kbn/core/server'; import { BUILT_IN_MODEL_TAG } from '@kbn/ml-plugin/common/constants/data_frame_analytics'; -import { InferencePipeline } from '../../../common/types/pipelines'; +import { InferencePipeline, TrainedModelState } from '../../../common/types/pipelines'; import { fetchAndAddTrainedModelData, @@ -169,35 +169,74 @@ const mockGetTrainedModelsData = { model_type: 'pytorch', tags: [], }, + { + inference_config: { text_classification: {} }, + model_id: 'trained-model-id-3', + model_type: 'pytorch', + tags: [], + }, + { + inference_config: { fill_mask: {} }, + model_id: 'trained-model-id-4', + model_type: 'pytorch', + tags: [], + }, ], }; const mockGetTrainedModelStats = { - count: 1, + count: 4, trained_model_stats: [ { model_id: 'trained-model-id-1', }, { deployment_stats: { + allocation_status: { + allocation_count: 1, + }, state: 'started', }, model_id: 'trained-model-id-2', }, + { + deployment_stats: { + allocation_status: { + allocation_count: 1, + }, + state: 'failed', + reason: 'something is wrong, boom', + }, + model_id: 'trained-model-id-3', + }, + { + deployment_stats: { + allocation_status: { + allocation_count: 1, + }, + state: 'starting', + }, + model_id: 'trained-model-id-4', + }, ], }; -const trainedModelDataObject = { +const trainedModelDataObject: Record = { 'trained-model-id-1': { - isDeployed: false, + modelState: TrainedModelState.NotDeployed, pipelineName: 'ml-inference-pipeline-1', types: ['lang_ident', 'ner'], }, 'trained-model-id-2': { - isDeployed: true, + modelState: TrainedModelState.Started, pipelineName: 'ml-inference-pipeline-2', types: ['pytorch', 'ner'], }, + 'ml-inference-pipeline-3': { + modelState: TrainedModelState.NotDeployed, + pipelineName: 'ml-inference-pipeline-3', + types: ['lang_ident', 'ner'], + }, }; describe('fetchMlInferencePipelineProcessorNames lib function', () => { @@ -254,15 +293,15 @@ describe('fetchPipelineProcessorInferenceData lib function', () => { it('should return the inference processor data for the pipelines', async () => { mockClient.ingest.getPipeline.mockImplementation(() => Promise.resolve(mockGetPipeline2)); - const expected = [ + const expected: InferencePipelineData[] = [ { - isDeployed: false, + modelState: TrainedModelState.NotDeployed, pipelineName: 'ml-inference-pipeline-1', trainedModelName: 'trained-model-id-1', types: [], }, { - isDeployed: false, + modelState: TrainedModelState.NotDeployed, pipelineName: 'ml-inference-pipeline-2', trainedModelName: 'trained-model-id-2', types: [], @@ -338,20 +377,20 @@ describe('getMlModelConfigsForModelIds lib function', () => { Promise.resolve(mockGetTrainedModelStats) ); - const input = { + const input: Record = { 'trained-model-id-1': { - isDeployed: true, + modelState: TrainedModelState.Started, pipelineName: '', trainedModelName: 'trained-model-id-1', types: ['pytorch', 'ner'], }, 'trained-model-id-2': { - isDeployed: true, + modelState: TrainedModelState.Started, pipelineName: '', trainedModelName: 'trained-model-id-2', types: ['pytorch', 'ner'], }, - } as Record; + }; const expected = { 'trained-model-id-2': input['trained-model-id-2'], @@ -392,32 +431,57 @@ describe('fetchAndAddTrainedModelData lib function', () => { const pipelines: InferencePipelineData[] = [ { - isDeployed: false, + modelState: TrainedModelState.NotDeployed, pipelineName: 'ml-inference-pipeline-1', trainedModelName: 'trained-model-id-1', types: [], }, { - isDeployed: false, + modelState: TrainedModelState.NotDeployed, pipelineName: 'ml-inference-pipeline-2', trainedModelName: 'trained-model-id-2', types: [], }, + { + modelState: TrainedModelState.NotDeployed, + pipelineName: 'ml-inference-pipeline-3', + trainedModelName: 'trained-model-id-3', + types: [], + }, + { + modelState: TrainedModelState.NotDeployed, + pipelineName: 'ml-inference-pipeline-4', + trainedModelName: 'trained-model-id-4', + types: [], + }, ]; const expected: InferencePipelineData[] = [ { - isDeployed: false, + modelState: TrainedModelState.NotDeployed, pipelineName: 'ml-inference-pipeline-1', trainedModelName: 'trained-model-id-1', types: ['lang_ident', 'ner'], }, { - isDeployed: true, + modelState: TrainedModelState.Started, pipelineName: 'ml-inference-pipeline-2', trainedModelName: 'trained-model-id-2', types: ['pytorch', 'ner'], }, + { + modelState: TrainedModelState.Failed, + modelStateReason: 'something is wrong, boom', + pipelineName: 'ml-inference-pipeline-3', + trainedModelName: 'trained-model-id-3', + types: ['pytorch', 'text_classification'], + }, + { + modelState: TrainedModelState.Starting, + pipelineName: 'ml-inference-pipeline-4', + trainedModelName: 'trained-model-id-4', + types: ['pytorch', 'fill_mask'], + }, ]; const response = await fetchAndAddTrainedModelData( @@ -426,10 +490,10 @@ describe('fetchAndAddTrainedModelData lib function', () => { ); expect(mockClient.ml.getTrainedModels).toHaveBeenCalledWith({ - model_id: 'trained-model-id-1,trained-model-id-2', + model_id: 'trained-model-id-1,trained-model-id-2,trained-model-id-3,trained-model-id-4', }); expect(mockClient.ml.getTrainedModelsStats).toHaveBeenCalledWith({ - model_id: 'trained-model-id-1,trained-model-id-2', + model_id: 'trained-model-id-1,trained-model-id-2,trained-model-id-3,trained-model-id-4', }); expect(response).toEqual(expected); }); @@ -551,11 +615,7 @@ describe('fetchMlInferencePipelineProcessors lib function', () => { const expected: InferencePipeline[] = [ trainedModelDataObject['trained-model-id-1'], - { - isDeployed: false, - pipelineName: 'ml-inference-pipeline-3', - types: ['lang_ident', 'ner'], - }, + trainedModelDataObject['ml-inference-pipeline-3'], ]; const response = await fetchMlInferencePipelineProcessors( diff --git a/x-pack/plugins/enterprise_search/server/lib/indices/fetch_ml_inference_pipeline_processors.ts b/x-pack/plugins/enterprise_search/server/lib/indices/fetch_ml_inference_pipeline_processors.ts index 3b695d53ba9ab..95839a9b6ac20 100644 --- a/x-pack/plugins/enterprise_search/server/lib/indices/fetch_ml_inference_pipeline_processors.ts +++ b/x-pack/plugins/enterprise_search/server/lib/indices/fetch_ml_inference_pipeline_processors.ts @@ -9,7 +9,7 @@ import { MlTrainedModelConfig } from '@elastic/elasticsearch/lib/api/typesWithBo import { ElasticsearchClient } from '@kbn/core/server'; import { BUILT_IN_MODEL_TAG } from '@kbn/ml-plugin/common/constants/data_frame_analytics'; -import { InferencePipeline } from '../../../common/types/pipelines'; +import { InferencePipeline, TrainedModelState } from '../../../common/types/pipelines'; import { getInferencePipelineNameFromIndexName } from '../../utils/ml_inference_pipeline_utils'; export type InferencePipelineData = InferencePipeline & { @@ -58,7 +58,7 @@ export const fetchPipelineProcessorInferenceData = async ( const trainedModelName = inferenceProcessor?.inference?.model_id; if (trainedModelName) pipelineProcessorData.push({ - isDeployed: false, + modelState: TrainedModelState.NotDeployed, pipelineName: pipelineProcessorName, trainedModelName, types: [], @@ -98,7 +98,7 @@ export const getMlModelConfigsForModelIds = async ( if (trainedModelNames.includes(trainedModelName)) { modelConfigs[trainedModelName] = { - isDeployed: false, + modelState: TrainedModelState.NotDeployed, pipelineName: '', trainedModelName, types: getMlModelTypesForModelConfig(trainedModelData), @@ -109,8 +109,27 @@ export const getMlModelConfigsForModelIds = async ( trainedModelsStats.trained_model_stats.forEach((trainedModelStats) => { const trainedModelName = trainedModelStats.model_id; if (modelConfigs.hasOwnProperty(trainedModelName)) { - const isDeployed = trainedModelStats.deployment_stats?.state === 'started'; - modelConfigs[trainedModelName].isDeployed = isDeployed; + let modelState: TrainedModelState; + switch (trainedModelStats.deployment_stats?.state) { + case 'started': + modelState = TrainedModelState.Started; + break; + case 'starting': + modelState = TrainedModelState.Starting; + break; + case 'stopping': + modelState = TrainedModelState.Stopping; + break; + // @ts-ignore: type is wrong, "failed" is a possible state + case 'failed': + modelState = TrainedModelState.Failed; + break; + default: + modelState = TrainedModelState.NotDeployed; + break; + } + modelConfigs[trainedModelName].modelState = modelState; + modelConfigs[trainedModelName].modelStateReason = trainedModelStats.deployment_stats?.reason; } }); @@ -131,11 +150,12 @@ export const fetchAndAddTrainedModelData = async ( if (!model) { return data; } - const { types, isDeployed } = model; + const { types, modelState, modelStateReason } = model; return { ...data, types, - isDeployed, + modelState, + modelStateReason, }; }); }; From db931bf60e1a639dc887cdcae8239c96c6a098bf Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Tue, 27 Sep 2022 18:03:40 +0200 Subject: [PATCH 06/95] Update renovate.json with new backport labels (#141954) Use `backport:all-open` instead of the deprecated `auto-backport` label. --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 6eed31366c409..4075b2452bea1 100644 --- a/renovate.json +++ b/renovate.json @@ -125,7 +125,7 @@ ], "reviewers": ["team:kibana-security"], "matchBaseBranches": ["main"], - "labels": ["Team:Security", "release_note:skip", "auto-backport"], + "labels": ["Team:Security", "release_note:skip", "backport:all-open"], "enabled": true }, { From bde62fd5d82deb56d47fa99f8112e030c62a45de Mon Sep 17 00:00:00 2001 From: Pablo Machado Date: Tue, 27 Sep 2022 18:22:22 +0200 Subject: [PATCH 07/95] Fix wrong Critical Hosts and Critical Users count color (#141953) --- .../overview/components/entity_analytics/header/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugins/security_solution/public/overview/components/entity_analytics/header/index.tsx b/x-pack/plugins/security_solution/public/overview/components/entity_analytics/header/index.tsx index d8f087a7cc884..c1a52364a76f8 100644 --- a/x-pack/plugins/security_solution/public/overview/components/entity_analytics/header/index.tsx +++ b/x-pack/plugins/security_solution/public/overview/components/entity_analytics/header/index.tsx @@ -28,7 +28,7 @@ import { useMlCapabilities } from '../../../../common/components/ml/hooks/use_ml import { useQueryInspector } from '../../../../common/components/page/manage_query'; const StyledEuiTitle = styled(EuiTitle)` - color: ${({ theme: { eui } }) => eui.euiColorVis9}; + color: ${({ theme: { eui } }) => eui.euiColorDanger}; `; const HOST_RISK_QUERY_ID = 'hostRiskScoreKpiQuery'; From 7aa54285975814e0b4cdb5f6344e22b470a91383 Mon Sep 17 00:00:00 2001 From: Juan Pablo Djeredjian Date: Tue, 27 Sep 2022 18:29:34 +0200 Subject: [PATCH 08/95] [Security Solution] Don't mute rules when bulk editing rule actions (#140626) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Intro This PR modifies the logic of bulk updating rule actions, in preparation for https://github.com/elastic/kibana/pull/137430 ## Summary - Removes the mute logic for bulk updating rule actions - Remove option for “Perform no actions” from the bulk update rule actions dropdown options ONLY (option still available when creating or editing rules individually) - Also corrects bulk update rule actions flyout, so that: - available actions are always displayed - copy referring to using "Perform No Actions" to mute all selected rules is no longer displayed. ## Screenshots **Removed unwanted copy and "On each rule execution" selected as default** ![image](https://user-images.githubusercontent.com/5354282/191498419-10299ee5-4a9e-474e-b00a-657dc90816fa.png) **"Perform No Action" option no longer available** ![image](https://user-images.githubusercontent.com/5354282/191498500-3965edad-8142-4834-808e-c210e72e17cb.png) ### Checklist Delete any items that are not applicable to this PR. - [ ] [Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html) was added for features that require explanation or tutorials - [ ] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios - [ ] Any UI touched in this PR is usable by keyboard only (learn more about [keyboard accessibility](https://webaim.org/techniques/keyboard/)) - [ ] Any UI touched in this PR does not create any new axe failures (run axe in browser: [FF](https://addons.mozilla.org/en-US/firefox/addon/axe-devtools/), [Chrome](https://chrome.google.com/webstore/detail/axe-web-accessibility-tes/lhdoppojpmngadmnindnejefpokejbdd?hl=en-US)) - [ ] If a plugin configuration key changed, check if it needs to be allowlisted in the cloud and added to the [docker list](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker) - [ ] This renders correctly on smaller devices using a responsive layout. (You can test this [in your browser](https://www.browserstack.com/guide/responsive-testing-on-local-server)) - [ ] This was checked for [cross-browser compatibility](https://www.elastic.co/support/matrix#matrix_browsers) ### For maintainers - [ ] This was checked for breaking API changes and was [labeled appropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process) --- .../index.ts | 1 - .../src/default_throttle_null/index.test.ts | 44 --- .../src/default_throttle_null/index.ts | 23 -- .../src/throttle/index.ts | 10 +- .../src/time_duration/index.test.ts | 373 +++++++++++++----- .../src/time_duration/index.ts | 76 ++-- .../request/perform_bulk_action_schema.ts | 19 +- .../description_step/throttle_description.tsx | 7 +- .../rules/step_rule_actions/index.tsx | 11 +- .../rules/throttle_select_field/index.tsx | 10 +- .../bulk_actions/forms/rule_actions_form.tsx | 64 +-- .../detection_engine/rules/bulk_edit_rules.ts | 33 +- .../group10/perform_bulk_action.ts | 16 +- .../group10/update_rules.ts | 4 +- .../group10/update_rules_bulk.ts | 6 +- 15 files changed, 412 insertions(+), 285 deletions(-) delete mode 100644 packages/kbn-securitysolution-io-ts-alerting-types/src/default_throttle_null/index.test.ts delete mode 100644 packages/kbn-securitysolution-io-ts-alerting-types/src/default_throttle_null/index.ts diff --git a/packages/kbn-securitysolution-io-ts-alerting-types/index.ts b/packages/kbn-securitysolution-io-ts-alerting-types/index.ts index c2e00482cd2d3..75d5352c9f63e 100644 --- a/packages/kbn-securitysolution-io-ts-alerting-types/index.ts +++ b/packages/kbn-securitysolution-io-ts-alerting-types/index.ts @@ -18,7 +18,6 @@ export * from './src/default_per_page'; export * from './src/default_risk_score_mapping_array'; export * from './src/default_severity_mapping_array'; export * from './src/default_threat_array'; -export * from './src/default_throttle_null'; export * from './src/default_to_string'; export * from './src/default_uuid'; export * from './src/from'; diff --git a/packages/kbn-securitysolution-io-ts-alerting-types/src/default_throttle_null/index.test.ts b/packages/kbn-securitysolution-io-ts-alerting-types/src/default_throttle_null/index.test.ts deleted file mode 100644 index b92815d4fe828..0000000000000 --- a/packages/kbn-securitysolution-io-ts-alerting-types/src/default_throttle_null/index.test.ts +++ /dev/null @@ -1,44 +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. - */ - -import { pipe } from 'fp-ts/lib/pipeable'; -import { left } from 'fp-ts/lib/Either'; -import { Throttle } from '../throttle'; -import { DefaultThrottleNull } from '.'; -import { foldLeftRight, getPaths } from '@kbn/securitysolution-io-ts-utils'; - -describe('default_throttle_null', () => { - test('it should validate a throttle string', () => { - const payload: Throttle = 'some string'; - const decoded = DefaultThrottleNull.decode(payload); - const message = pipe(decoded, foldLeftRight); - - expect(getPaths(left(message.errors))).toEqual([]); - expect(message.schema).toEqual(payload); - }); - - test('it should not validate an array with a number', () => { - const payload = 5; - const decoded = DefaultThrottleNull.decode(payload); - const message = pipe(decoded, foldLeftRight); - - expect(getPaths(left(message.errors))).toEqual([ - 'Invalid value "5" supplied to "DefaultThreatNull"', - ]); - expect(message.schema).toEqual({}); - }); - - test('it should return a default "null" if not provided a value', () => { - const payload = undefined; - const decoded = DefaultThrottleNull.decode(payload); - const message = pipe(decoded, foldLeftRight); - - expect(getPaths(left(message.errors))).toEqual([]); - expect(message.schema).toEqual(null); - }); -}); diff --git a/packages/kbn-securitysolution-io-ts-alerting-types/src/default_throttle_null/index.ts b/packages/kbn-securitysolution-io-ts-alerting-types/src/default_throttle_null/index.ts deleted file mode 100644 index e9b9ec27ea418..0000000000000 --- a/packages/kbn-securitysolution-io-ts-alerting-types/src/default_throttle_null/index.ts +++ /dev/null @@ -1,23 +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. - */ - -import * as t from 'io-ts'; -import { Either } from 'fp-ts/lib/Either'; -import { throttle, ThrottleOrNull } from '../throttle'; - -/** - * Types the DefaultThrottleNull as: - * - If null or undefined, then a null will be set - */ -export const DefaultThrottleNull = new t.Type( - 'DefaultThreatNull', - throttle.is, - (input, context): Either => - input == null ? t.success(null) : throttle.validate(input, context), - t.identity -); diff --git a/packages/kbn-securitysolution-io-ts-alerting-types/src/throttle/index.ts b/packages/kbn-securitysolution-io-ts-alerting-types/src/throttle/index.ts index 19e75dcc3be07..d7d636ad0994e 100644 --- a/packages/kbn-securitysolution-io-ts-alerting-types/src/throttle/index.ts +++ b/packages/kbn-securitysolution-io-ts-alerting-types/src/throttle/index.ts @@ -6,13 +6,15 @@ * Side Public License, v 1. */ +import { TimeDuration } from '@kbn/securitysolution-io-ts-types'; import * as t from 'io-ts'; -export const throttle = t.string; +export const throttle = t.union([ + t.literal('no_actions'), + t.literal('rule'), + TimeDuration({ allowedUnits: ['h', 'd'] }), +]); export type Throttle = t.TypeOf; export const throttleOrNull = t.union([throttle, t.null]); export type ThrottleOrNull = t.TypeOf; - -export const throttleOrNullOrUndefined = t.union([throttle, t.null, t.undefined]); -export type ThrottleOrUndefinedOrNull = t.TypeOf; diff --git a/packages/kbn-securitysolution-io-ts-types/src/time_duration/index.test.ts b/packages/kbn-securitysolution-io-ts-types/src/time_duration/index.test.ts index 872affa9989a7..dc6b5e61ebbf6 100644 --- a/packages/kbn-securitysolution-io-ts-types/src/time_duration/index.test.ts +++ b/packages/kbn-securitysolution-io-ts-types/src/time_duration/index.test.ts @@ -6,122 +6,315 @@ * Side Public License, v 1. */ -import { pipe } from 'fp-ts/lib/pipeable'; import { left } from 'fp-ts/lib/Either'; import { TimeDuration } from '.'; import { foldLeftRight, getPaths } from '@kbn/securitysolution-io-ts-utils'; describe('TimeDuration', () => { - test('it should validate a correctly formed TimeDuration with time unit of seconds', () => { - const payload = '1s'; - const decoded = TimeDuration.decode(payload); - const message = pipe(decoded, foldLeftRight); + describe('with allowedDurations', () => { + test('it should validate a correctly formed TimeDuration with an allowed duration of 1s', () => { + const payload = '1s'; + const decoded = TimeDuration({ + allowedDurations: [ + [1, 's'], + [2, 'h'], + [7, 'd'], + ], + }).decode(payload); + const message = foldLeftRight(decoded); - expect(getPaths(left(message.errors))).toEqual([]); - expect(message.schema).toEqual(payload); - }); + expect(getPaths(left(message.errors))).toEqual([]); + expect(message.schema).toEqual(payload); + }); - test('it should validate a correctly formed TimeDuration with time unit of minutes', () => { - const payload = '100m'; - const decoded = TimeDuration.decode(payload); - const message = pipe(decoded, foldLeftRight); + test('it should validate a correctly formed TimeDuration with an allowed duration of 7d', () => { + const payload = '1s'; + const decoded = TimeDuration({ + allowedDurations: [ + [1, 's'], + [2, 'h'], + [7, 'd'], + ], + }).decode(payload); + const message = foldLeftRight(decoded); - expect(getPaths(left(message.errors))).toEqual([]); - expect(message.schema).toEqual(payload); - }); + expect(getPaths(left(message.errors))).toEqual([]); + expect(message.schema).toEqual(payload); + }); - test('it should validate a correctly formed TimeDuration with time unit of hours', () => { - const payload = '10000000h'; - const decoded = TimeDuration.decode(payload); - const message = pipe(decoded, foldLeftRight); + test('it should NOT validate a time duration if the allowed durations does not include it', () => { + const payload = '24h'; + const decoded = TimeDuration({ + allowedDurations: [ + [1, 's'], + [2, 'h'], + [7, 'd'], + ], + }).decode(payload); + const message = foldLeftRight(decoded); - expect(getPaths(left(message.errors))).toEqual([]); - expect(message.schema).toEqual(payload); - }); + expect(getPaths(left(message.errors))).toEqual([ + 'Invalid value "24h" supplied to "TimeDuration"', + ]); + expect(message.schema).toEqual({}); + }); - test('it should NOT validate a TimeDuration of 0 length', () => { - const payload = '0s'; - const decoded = TimeDuration.decode(payload); - const message = pipe(decoded, foldLeftRight); + test('it should NOT validate a an allowed duration with a negative number', () => { + const payload = '10s'; + const decoded = TimeDuration({ + allowedDurations: [ + [1, 's'], + [-7, 'd'], + ], + }).decode(payload); + const message = foldLeftRight(decoded); - expect(getPaths(left(message.errors))).toEqual([ - 'Invalid value "0s" supplied to "TimeDuration"', - ]); - expect(message.schema).toEqual({}); - }); + expect(getPaths(left(message.errors))).toEqual([ + 'Invalid value "[[1,"s"],[-7,"d"]]" supplied to "TimeDuration"', + ]); + expect(message.schema).toEqual({}); + }); - test('it should NOT validate a negative TimeDuration', () => { - const payload = '-10s'; - const decoded = TimeDuration.decode(payload); - const message = pipe(decoded, foldLeftRight); + test('it should NOT validate an allowed duration with a fractional number', () => { + const payload = '1.5s'; + const decoded = TimeDuration({ + allowedDurations: [ + [1, 's'], + [-7, 'd'], + ], + }).decode(payload); + const message = foldLeftRight(decoded); - expect(getPaths(left(message.errors))).toEqual([ - 'Invalid value "-10s" supplied to "TimeDuration"', - ]); - expect(message.schema).toEqual({}); - }); + expect(getPaths(left(message.errors))).toEqual([ + 'Invalid value "1.5s" supplied to "TimeDuration"', + ]); + expect(message.schema).toEqual({}); + }); - test('it should NOT validate a decimal TimeDuration', () => { - const payload = '1.5s'; - const decoded = TimeDuration.decode(payload); - const message = pipe(decoded, foldLeftRight); + test('it should NOT validate a an allowed duration with a duration of 0', () => { + const payload = '10s'; + const decoded = TimeDuration({ + allowedDurations: [ + [0, 's'], + [7, 'd'], + ], + }).decode(payload); + const message = foldLeftRight(decoded); - expect(getPaths(left(message.errors))).toEqual([ - 'Invalid value "1.5s" supplied to "TimeDuration"', - ]); - expect(message.schema).toEqual({}); - }); + expect(getPaths(left(message.errors))).toEqual([ + 'Invalid value "[[0,"s"],[7,"d"]]" supplied to "TimeDuration"', + ]); + expect(message.schema).toEqual({}); + }); - test('it should NOT validate a TimeDuration with some other time unit', () => { - const payload = '10000000w'; - const decoded = TimeDuration.decode(payload); - const message = pipe(decoded, foldLeftRight); + test('it should NOT validate a TimeDuration with an invalid time unit', () => { + const payload = '10000000days'; + const decoded = TimeDuration({ + allowedDurations: [ + [1, 'h'], + [1, 'd'], + [7, 'd'], + ], + }).decode(payload); + const message = foldLeftRight(decoded); - expect(getPaths(left(message.errors))).toEqual([ - 'Invalid value "10000000w" supplied to "TimeDuration"', - ]); - expect(message.schema).toEqual({}); - }); + expect(getPaths(left(message.errors))).toEqual([ + 'Invalid value "10000000days" supplied to "TimeDuration"', + ]); + expect(message.schema).toEqual({}); + }); - test('it should NOT validate a TimeDuration with a time interval with incorrect format', () => { - const payload = '100ff0000w'; - const decoded = TimeDuration.decode(payload); - const message = pipe(decoded, foldLeftRight); + test('it should NOT validate a TimeDuration with a time interval with incorrect format', () => { + const payload = '100ff0000w'; + const decoded = TimeDuration({ + allowedDurations: [ + [1, 'h'], + [1, 'd'], + [7, 'd'], + ], + }).decode(payload); + const message = foldLeftRight(decoded); - expect(getPaths(left(message.errors))).toEqual([ - 'Invalid value "100ff0000w" supplied to "TimeDuration"', - ]); - expect(message.schema).toEqual({}); - }); + expect(getPaths(left(message.errors))).toEqual([ + 'Invalid value "100ff0000w" supplied to "TimeDuration"', + ]); + expect(message.schema).toEqual({}); + }); - test('it should NOT validate an empty string', () => { - const payload = ''; - const decoded = TimeDuration.decode(payload); - const message = pipe(decoded, foldLeftRight); + test('it should NOT validate an empty string', () => { + const payload = ''; + const decoded = TimeDuration({ + allowedDurations: [ + [1, 'h'], + [1, 'd'], + [7, 'd'], + ], + }).decode(payload); + const message = foldLeftRight(decoded); - expect(getPaths(left(message.errors))).toEqual(['Invalid value "" supplied to "TimeDuration"']); - expect(message.schema).toEqual({}); - }); + expect(getPaths(left(message.errors))).toEqual([ + 'Invalid value "" supplied to "TimeDuration"', + ]); + expect(message.schema).toEqual({}); + }); + + test('it should NOT validate an number', () => { + const payload = 100; + const decoded = TimeDuration({ + allowedDurations: [ + [1, 'h'], + [1, 'd'], + [7, 'd'], + ], + }).decode(payload); + const message = foldLeftRight(decoded); - test('it should NOT validate an number', () => { - const payload = 100; - const decoded = TimeDuration.decode(payload); - const message = pipe(decoded, foldLeftRight); + expect(getPaths(left(message.errors))).toEqual([ + 'Invalid value "100" supplied to "TimeDuration"', + ]); + expect(message.schema).toEqual({}); + }); - expect(getPaths(left(message.errors))).toEqual([ - 'Invalid value "100" supplied to "TimeDuration"', - ]); - expect(message.schema).toEqual({}); + test('it should NOT validate an TimeDuration with a valid time unit but unsafe integer', () => { + const payload = `${Math.pow(2, 53)}h`; + const decoded = TimeDuration({ + allowedDurations: [ + [1, 'h'], + [1, 'd'], + [7, 'd'], + ], + }).decode(payload); + const message = foldLeftRight(decoded); + + expect(getPaths(left(message.errors))).toEqual([ + `Invalid value "${Math.pow(2, 53)}h" supplied to "TimeDuration"`, + ]); + expect(message.schema).toEqual({}); + }); }); + describe('with allowedUnits', () => { + test('it should validate a correctly formed TimeDuration with time unit of seconds', () => { + const payload = '1s'; + const decoded = TimeDuration({ allowedUnits: ['s'] }).decode(payload); + const message = foldLeftRight(decoded); + + expect(getPaths(left(message.errors))).toEqual([]); + expect(message.schema).toEqual(payload); + }); + + test('it should validate a correctly formed TimeDuration with time unit of minutes', () => { + const payload = '100m'; + const decoded = TimeDuration({ allowedUnits: ['s', 'm'] }).decode(payload); + const message = foldLeftRight(decoded); + + expect(getPaths(left(message.errors))).toEqual([]); + expect(message.schema).toEqual(payload); + }); + + test('it should validate a correctly formed TimeDuration with time unit of hours', () => { + const payload = '10000000h'; + const decoded = TimeDuration({ allowedUnits: ['s', 'm', 'h'] }).decode(payload); + const message = foldLeftRight(decoded); + + expect(getPaths(left(message.errors))).toEqual([]); + expect(message.schema).toEqual(payload); + }); + + test('it should validate a correctly formed TimeDuration with time unit of days', () => { + const payload = '7d'; + const decoded = TimeDuration({ allowedUnits: ['s', 'm', 'h', 'd'] }).decode(payload); + const message = foldLeftRight(decoded); + + expect(getPaths(left(message.errors))).toEqual([]); + expect(message.schema).toEqual(payload); + }); + + test('it should NOT validate a correctly formed TimeDuration with time unit of seconds if it is not an allowed unit', () => { + const payload = '30s'; + const decoded = TimeDuration({ allowedUnits: ['m', 'h', 'd'] }).decode(payload); + const message = foldLeftRight(decoded); + + expect(getPaths(left(message.errors))).toEqual([ + 'Invalid value "30s" supplied to "TimeDuration"', + ]); + expect(message.schema).toEqual({}); + }); + + test('it should NOT validate a negative TimeDuration', () => { + const payload = '-10s'; + const decoded = TimeDuration({ allowedUnits: ['s', 'm', 'h', 'd'] }).decode(payload); + const message = foldLeftRight(decoded); + + expect(getPaths(left(message.errors))).toEqual([ + 'Invalid value "-10s" supplied to "TimeDuration"', + ]); + expect(message.schema).toEqual({}); + }); + + test('it should NOT validate a fractional number', () => { + const payload = '1.5s'; + const decoded = TimeDuration({ allowedUnits: ['s', 'm', 'h', 'd'] }).decode(payload); + const message = foldLeftRight(decoded); + + expect(getPaths(left(message.errors))).toEqual([ + 'Invalid value "1.5s" supplied to "TimeDuration"', + ]); + expect(message.schema).toEqual({}); + }); + + test('it should NOT validate a TimeDuration with an invalid time unit', () => { + const payload = '10000000days'; + const decoded = TimeDuration({ allowedUnits: ['s', 'm', 'h', 'd'] }).decode(payload); + const message = foldLeftRight(decoded); + + expect(getPaths(left(message.errors))).toEqual([ + 'Invalid value "10000000days" supplied to "TimeDuration"', + ]); + expect(message.schema).toEqual({}); + }); + + test('it should NOT validate a TimeDuration with a time interval with incorrect format', () => { + const payload = '100ff0000w'; + const decoded = TimeDuration({ allowedUnits: ['s', 'm', 'h'] }).decode(payload); + const message = foldLeftRight(decoded); + + expect(getPaths(left(message.errors))).toEqual([ + 'Invalid value "100ff0000w" supplied to "TimeDuration"', + ]); + expect(message.schema).toEqual({}); + }); + + test('it should NOT validate an empty string', () => { + const payload = ''; + const decoded = TimeDuration({ allowedUnits: ['s', 'm', 'h'] }).decode(payload); + const message = foldLeftRight(decoded); + + expect(getPaths(left(message.errors))).toEqual([ + 'Invalid value "" supplied to "TimeDuration"', + ]); + expect(message.schema).toEqual({}); + }); + + test('it should NOT validate an number', () => { + const payload = 100; + const decoded = TimeDuration({ allowedUnits: ['s', 'm', 'h'] }).decode(payload); + const message = foldLeftRight(decoded); + + expect(getPaths(left(message.errors))).toEqual([ + 'Invalid value "100" supplied to "TimeDuration"', + ]); + expect(message.schema).toEqual({}); + }); - test('it should NOT validate an TimeDuration with a valid time unit but unsafe integer', () => { - const payload = `${Math.pow(2, 53)}h`; - const decoded = TimeDuration.decode(payload); - const message = pipe(decoded, foldLeftRight); + test('it should NOT validate an TimeDuration with a valid time unit but unsafe integer', () => { + const payload = `${Math.pow(2, 53)}h`; + const decoded = TimeDuration({ allowedUnits: ['s', 'm', 'h'] }).decode(payload); + const message = foldLeftRight(decoded); - expect(getPaths(left(message.errors))).toEqual([ - `Invalid value "${Math.pow(2, 53)}h" supplied to "TimeDuration"`, - ]); - expect(message.schema).toEqual({}); + expect(getPaths(left(message.errors))).toEqual([ + `Invalid value "${Math.pow(2, 53)}h" supplied to "TimeDuration"`, + ]); + expect(message.schema).toEqual({}); + }); }); }); diff --git a/packages/kbn-securitysolution-io-ts-types/src/time_duration/index.ts b/packages/kbn-securitysolution-io-ts-types/src/time_duration/index.ts index 5549979ac68de..0b69c62e0d2f5 100644 --- a/packages/kbn-securitysolution-io-ts-types/src/time_duration/index.ts +++ b/packages/kbn-securitysolution-io-ts-types/src/time_duration/index.ts @@ -12,38 +12,60 @@ import { Either } from 'fp-ts/lib/Either'; /** * Types the TimeDuration as: * - A string that is not empty, and composed of a positive integer greater than 0 followed by a unit of time - * - in the format {safe_integer}{timeUnit}, e.g. "30s", "1m", "2h" + * - in the format {safe_integer}{timeUnit}, e.g. "30s", "1m", "2h", "7d" */ -export const TimeDuration = new t.Type( - 'TimeDuration', - t.string.is, - (input, context): Either => { - if (typeof input === 'string' && input.trim() !== '') { - try { - const inputLength = input.length; - const unit = input.trim().at(-1); - const time = parseFloat(input.trim().substring(0, inputLength - 1)); - if (!Number.isInteger(time)) { - return t.failure(input, context); - } - if ( - time >= 1 && - Number.isSafeInteger(time) && - (unit === 's' || unit === 'm' || unit === 'h') - ) { - return t.success(input); - } else { +type TimeUnits = 's' | 'm' | 'h' | 'd' | 'w' | 'y'; +interface TimeDurationWithAllowedDurations { + allowedDurations: Array<[number, TimeUnits]>; + allowedUnits?: never; +} +interface TimeDurationWithAllowedUnits { + allowedUnits: TimeUnits[]; + allowedDurations?: never; +} + +type TimeDurationType = TimeDurationWithAllowedDurations | TimeDurationWithAllowedUnits; + +const isTimeSafe = (time: number) => time >= 1 && Number.isSafeInteger(time); + +export const TimeDuration = ({ allowedUnits, allowedDurations }: TimeDurationType) => { + return new t.Type( + 'TimeDuration', + t.string.is, + (input, context): Either => { + if (typeof input === 'string' && input.trim() !== '') { + try { + const inputLength = input.length; + const time = Number(input.trim().substring(0, inputLength - 1)); + const unit = input.trim().at(-1); + if (!isTimeSafe(time)) { + return t.failure(input, context); + } + if (allowedDurations) { + for (const [allowedTime, allowedUnit] of allowedDurations) { + if (!isTimeSafe(allowedTime)) { + return t.failure(allowedDurations, context); + } + if (allowedTime === time && allowedUnit === unit) { + return t.success(input); + } + } + return t.failure(input, context); + } else if (allowedUnits.includes(unit as TimeUnits)) { + return t.success(input); + } else { + return t.failure(input, context); + } + } catch (error) { return t.failure(input, context); } - } catch (error) { + } else { return t.failure(input, context); } - } else { - return t.failure(input, context); - } - }, - t.identity -); + }, + t.identity + ); +}; export type TimeDurationC = typeof TimeDuration; diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/perform_bulk_action_schema.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/perform_bulk_action_schema.ts index a74845721a022..0140e5f8d9262 100644 --- a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/perform_bulk_action_schema.ts +++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/perform_bulk_action_schema.ts @@ -9,7 +9,6 @@ import * as t from 'io-ts'; import { NonEmptyArray, TimeDuration, enumeration } from '@kbn/securitysolution-io-ts-types'; import { - throttle, action_group as actionGroup, action_params as actionParams, action_id as actionId, @@ -41,6 +40,18 @@ export enum BulkActionEditType { 'set_schedule' = 'set_schedule', } +export const throttleForBulkActions = t.union([ + t.literal('rule'), + TimeDuration({ + allowedDurations: [ + [1, 'h'], + [1, 'd'], + [7, 'd'], + ], + }), +]); +export type ThrottleForBulkActions = t.TypeOf; + const bulkActionEditPayloadTags = t.type({ type: t.union([ t.literal(BulkActionEditType.add_tags), @@ -96,7 +107,7 @@ const bulkActionEditPayloadRuleActions = t.type({ t.literal(BulkActionEditType.set_rule_actions), ]), value: t.type({ - throttle, + throttle: throttleForBulkActions, actions: t.array(normalizedRuleAction), }), }); @@ -106,8 +117,8 @@ export type BulkActionEditPayloadRuleActions = t.TypeOf; diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/throttle_description.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/throttle_description.tsx index 69110b2e53602..c0b6780ea8bc5 100644 --- a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/throttle_description.tsx +++ b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/throttle_description.tsx @@ -6,10 +6,13 @@ */ import { find } from 'lodash/fp'; -import { THROTTLE_OPTIONS, DEFAULT_THROTTLE_OPTION } from '../throttle_select_field'; +import { + THROTTLE_OPTIONS_FOR_RULE_CREATION_AND_EDITING, + DEFAULT_THROTTLE_OPTION, +} from '../throttle_select_field'; export const buildThrottleDescription = (value = DEFAULT_THROTTLE_OPTION.value, title: string) => { - const throttleOption = find(['value', value], THROTTLE_OPTIONS); + const throttleOption = find(['value', value], THROTTLE_OPTIONS_FOR_RULE_CREATION_AND_EDITING); return { title, diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/index.tsx index 5cdf89df572cf..fe2c5d8fa4ee0 100644 --- a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/index.tsx +++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/index.tsx @@ -33,7 +33,7 @@ import { Form, UseField, useForm, useFormData } from '../../../../shared_imports import { StepContentWrapper } from '../step_content_wrapper'; import { ThrottleSelectField, - THROTTLE_OPTIONS, + THROTTLE_OPTIONS_FOR_RULE_CREATION_AND_EDITING, DEFAULT_THROTTLE_OPTION, } from '../throttle_select_field'; import { RuleActionsField } from '../rule_actions_field'; @@ -62,11 +62,14 @@ const GhostFormField = () => <>; const getThrottleOptions = (throttle?: string | null) => { // Add support for throttle options set by the API - if (throttle && findIndex(['value', throttle], THROTTLE_OPTIONS) < 0) { - return [...THROTTLE_OPTIONS, { value: throttle, text: throttle }]; + if ( + throttle && + findIndex(['value', throttle], THROTTLE_OPTIONS_FOR_RULE_CREATION_AND_EDITING) < 0 + ) { + return [...THROTTLE_OPTIONS_FOR_RULE_CREATION_AND_EDITING, { value: throttle, text: throttle }]; } - return THROTTLE_OPTIONS; + return THROTTLE_OPTIONS_FOR_RULE_CREATION_AND_EDITING; }; const DisplayActionsHeader = () => { diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/throttle_select_field/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/throttle_select_field/index.tsx index 4bc15d418a38b..264e72fafb60c 100644 --- a/x-pack/plugins/security_solution/public/detections/components/rules/throttle_select_field/index.tsx +++ b/x-pack/plugins/security_solution/public/detections/components/rules/throttle_select_field/index.tsx @@ -13,15 +13,19 @@ import { } from '../../../../../common/constants'; import { SelectField } from '../../../../shared_imports'; -export const THROTTLE_OPTIONS = [ - { value: NOTIFICATION_THROTTLE_NO_ACTIONS, text: 'Perform no actions' }, +export const THROTTLE_OPTIONS_FOR_BULK_RULE_ACTIONS = [ { value: NOTIFICATION_THROTTLE_RULE, text: 'On each rule execution' }, { value: '1h', text: 'Hourly' }, { value: '1d', text: 'Daily' }, { value: '7d', text: 'Weekly' }, ]; -export const DEFAULT_THROTTLE_OPTION = THROTTLE_OPTIONS[0]; +export const THROTTLE_OPTIONS_FOR_RULE_CREATION_AND_EDITING = [ + { value: NOTIFICATION_THROTTLE_NO_ACTIONS, text: 'Perform no actions' }, + ...THROTTLE_OPTIONS_FOR_BULK_RULE_ACTIONS, +]; + +export const DEFAULT_THROTTLE_OPTION = THROTTLE_OPTIONS_FOR_RULE_CREATION_AND_EDITING[0]; type ThrottleSelectField = typeof SelectField; diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/bulk_actions/forms/rule_actions_form.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/bulk_actions/forms/rule_actions_form.tsx index 8a9e52c9d5528..0ec448a1ab1fb 100644 --- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/bulk_actions/forms/rule_actions_form.tsx +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/bulk_actions/forms/rule_actions_form.tsx @@ -12,6 +12,7 @@ import type { RuleAction, ActionTypeRegistryContract, } from '@kbn/triggers-actions-ui-plugin/public'; + import type { FormSchema } from '../../../../../../../shared_imports'; import { useForm, @@ -21,9 +22,12 @@ import { getUseField, Field, } from '../../../../../../../shared_imports'; -import type { BulkActionEditPayload } from '../../../../../../../../common/detection_engine/schemas/request/perform_bulk_action_schema'; import { BulkActionEditType } from '../../../../../../../../common/detection_engine/schemas/request/perform_bulk_action_schema'; -import { NOTIFICATION_THROTTLE_NO_ACTIONS } from '../../../../../../../../common/constants'; +import type { + BulkActionEditPayload, + ThrottleForBulkActions, +} from '../../../../../../../../common/detection_engine/schemas/request/perform_bulk_action_schema'; +import { NOTIFICATION_THROTTLE_RULE } from '../../../../../../../../common/constants'; import { BulkEditFormWrapper } from './bulk_edit_form_wrapper'; import { bulkAddRuleActions as i18n } from '../translations'; @@ -32,7 +36,7 @@ import { useKibana } from '../../../../../../../common/lib/kibana'; import { ThrottleSelectField, - THROTTLE_OPTIONS, + THROTTLE_OPTIONS_FOR_BULK_RULE_ACTIONS, } from '../../../../../../components/rules/throttle_select_field'; import { getAllActionMessageParams } from '../../../helpers'; @@ -42,7 +46,7 @@ import { validateRuleActionsField } from '../../../../../../containers/detection const CommonUseField = getUseField({ component: Field }); export interface RuleActionsFormData { - throttle: string; + throttle: ThrottleForBulkActions; actions: RuleAction[]; overwrite: boolean; } @@ -68,7 +72,7 @@ const getFormSchema = ( }); const defaultFormData: RuleActionsFormData = { - throttle: NOTIFICATION_THROTTLE_NO_ACTIONS, + throttle: NOTIFICATION_THROTTLE_RULE, actions: [], overwrite: false, }; @@ -93,7 +97,7 @@ const RuleActionsFormComponent = ({ rulesCount, onClose, onConfirm }: RuleAction defaultValue: defaultFormData, }); - const [{ overwrite, throttle }] = useFormData({ form, watch: ['overwrite', 'throttle'] }); + const [{ overwrite }] = useFormData({ form, watch: ['overwrite', 'throttle'] }); const handleSubmit = useCallback(async () => { const { data, isValid } = await form.submit(); @@ -121,7 +125,7 @@ const RuleActionsFormComponent = ({ rulesCount, onClose, onConfirm }: RuleAction dataTestSubj: 'bulkEditRulesRuleActionThrottle', hasNoInitialSelection: false, euiFieldProps: { - options: THROTTLE_OPTIONS, + options: THROTTLE_OPTIONS_FOR_BULK_RULE_ACTIONS, }, }), [] @@ -129,8 +133,6 @@ const RuleActionsFormComponent = ({ rulesCount, onClose, onConfirm }: RuleAction const messageVariables = useMemo(() => getAllActionMessageParams(), []); - const showActionsSelect = throttle !== NOTIFICATION_THROTTLE_NO_ACTIONS; - return ( -
  • - - - - ), - overwriteActionsCheckbox: ( - - - - ), - }} - /> -
  • {i18n.RULE_VARIABLES_DETAIL}
    • @@ -193,18 +171,14 @@ const RuleActionsFormComponent = ({ rulesCount, onClose, onConfirm }: RuleAction /> - {showActionsSelect && ( - <> - - - - )} + + [BulkActionEditType.set_rule_actions, BulkActionEditType.add_rule_actions].includes(rule.type) ); - // bulk edit actions are applying in a historical order. + // bulk edit actions are applied in historical order. // So, we need to find a rule action that will be applied the last, to be able to check if rule should be muted/unmuted const rulesAction = ruleActions.pop(); if (rulesAction) { - const muteOrUnmuteErrors: BulkEditError[] = []; - const rulesToMuteOrUnmute = await pMap( + const unmuteErrors: BulkEditError[] = []; + const rulesToUnmute = await pMap( result.rules, async (rule) => { try { if (rule.muteAll && rulesAction.value.throttle !== NOTIFICATION_THROTTLE_NO_ACTIONS) { await rulesClient.unmuteAll({ id: rule.id }); return (await readRules({ rulesClient, id: rule.id, ruleId: undefined })) ?? rule; - } else if ( - !rule.muteAll && - rulesAction.value.throttle === NOTIFICATION_THROTTLE_NO_ACTIONS - ) { - await rulesClient.muteAll({ id: rule.id }); - return (await readRules({ rulesClient, id: rule.id, ruleId: undefined })) ?? rule; } return rule; } catch (err) { - muteOrUnmuteErrors.push({ + unmuteErrors.push({ message: err.message, rule: { id: rule.id, @@ -115,8 +106,8 @@ export const bulkEditRules = async ({ return { ...result, - rules: rulesToMuteOrUnmute.filter((rule): rule is RuleAlertType => rule != null), - errors: [...result.errors, ...muteOrUnmuteErrors], + rules: rulesToUnmute.filter((rule): rule is RuleAlertType => rule != null), + errors: [...result.errors, ...unmuteErrors], }; } diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/perform_bulk_action.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/perform_bulk_action.ts index b60ce575c4cd0..c17e679b6be31 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/perform_bulk_action.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/perform_bulk_action.ts @@ -1513,10 +1513,9 @@ export default ({ getService }: FtrProviderContext): void => { }); describe('throttle', () => { + // For bulk editing of rule actions, NOTIFICATION_THROTTLE_NO_ACTIONS + // is not available as payload, because "Perform No Actions" is not a valid option const casesForEmptyActions = [ - { - payloadThrottle: NOTIFICATION_THROTTLE_NO_ACTIONS, - }, { payloadThrottle: NOTIFICATION_THROTTLE_RULE, }, @@ -1561,10 +1560,6 @@ export default ({ getService }: FtrProviderContext): void => { }); const casesForNonEmptyActions = [ - { - payloadThrottle: NOTIFICATION_THROTTLE_NO_ACTIONS, - expectedThrottle: NOTIFICATION_THROTTLE_NO_ACTIONS, - }, { payloadThrottle: NOTIFICATION_THROTTLE_RULE, expectedThrottle: NOTIFICATION_THROTTLE_RULE, @@ -1616,12 +1611,9 @@ export default ({ getService }: FtrProviderContext): void => { }); describe('notifyWhen', () => { + // For bulk editing of rule actions, NOTIFICATION_THROTTLE_NO_ACTIONS + // is not available as payload, because "Perform No Actions" is not a valid option const cases = [ - { - payload: { throttle: NOTIFICATION_THROTTLE_NO_ACTIONS }, - // keeps existing default value which is onActiveAlert - expected: { notifyWhen: 'onActiveAlert' }, - }, { payload: { throttle: '1d' }, expected: { notifyWhen: 'onThrottleInterval' }, diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/update_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/update_rules.ts index a8dc735376f69..705714ec3ba50 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/update_rules.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/update_rules.ts @@ -220,7 +220,7 @@ export default ({ getService }: FtrProviderContext) => { updatedRule.rule_id = createRuleBody.rule_id; updatedRule.name = 'some other name'; updatedRule.actions = [action1]; - updatedRule.throttle = '1m'; + updatedRule.throttle = '1d'; delete updatedRule.id; const { body } = await supertest @@ -243,7 +243,7 @@ export default ({ getService }: FtrProviderContext) => { }, }, ]; - outputRule.throttle = '1m'; + outputRule.throttle = '1d'; const bodyToCompare = removeServerGeneratedPropertiesIncludingRuleId(body); expect(bodyToCompare).to.eql(outputRule); }); diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/update_rules_bulk.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/update_rules_bulk.ts index dc7209b9f1c98..2f5fb63382552 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/update_rules_bulk.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/update_rules_bulk.ts @@ -150,12 +150,12 @@ export default ({ getService }: FtrProviderContext) => { const updatedRule1 = getSimpleRuleUpdate('rule-1'); updatedRule1.name = 'some other name'; updatedRule1.actions = [action1]; - updatedRule1.throttle = '1m'; + updatedRule1.throttle = '1d'; const updatedRule2 = getSimpleRuleUpdate('rule-2'); updatedRule2.name = 'some other name'; updatedRule2.actions = [action1]; - updatedRule2.throttle = '1m'; + updatedRule2.throttle = '1d'; // update both rule names const { body }: { body: FullResponseSchema[] } = await supertest @@ -179,7 +179,7 @@ export default ({ getService }: FtrProviderContext) => { }, }, ]; - outputRule.throttle = '1m'; + outputRule.throttle = '1d'; const bodyToCompare = removeServerGeneratedProperties(response); expect(bodyToCompare).to.eql(outputRule); }); From 4695634fec475d6e6c0e42c23840467f272968d6 Mon Sep 17 00:00:00 2001 From: Christos Nasikas Date: Tue, 27 Sep 2022 20:02:47 +0300 Subject: [PATCH 09/95] Test assignees section on upgrade (#141973) --- x-pack/test/functional_with_es_ssl/apps/cases/upgrade.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/x-pack/test/functional_with_es_ssl/apps/cases/upgrade.ts b/x-pack/test/functional_with_es_ssl/apps/cases/upgrade.ts index cbbbb90c05abc..c1e2979d313bb 100644 --- a/x-pack/test/functional_with_es_ssl/apps/cases/upgrade.ts +++ b/x-pack/test/functional_with_es_ssl/apps/cases/upgrade.ts @@ -18,6 +18,7 @@ export default ({ getPageObject, getService }: FtrProviderContext) => { const supertest = getService('supertest'); const testSubjects = getService('testSubjects'); const find = getService('find'); + const toasts = getService('toasts'); const updateConnector = async (id: string, req: Record) => { const { body: connector } = await supertest @@ -74,6 +75,10 @@ export default ({ getPageObject, getService }: FtrProviderContext) => { }); describe('Case view page', function () { + it('does not show any error toasters', async () => { + expect(await toasts.getToastCount()).to.be(0); + }); + it('shows the title correctly', async () => { const title = await testSubjects.find('header-page-title'); expect(await title.getVisibleText()).equal('Upgrade test in Kibana'); @@ -275,6 +280,10 @@ export default ({ getPageObject, getService }: FtrProviderContext) => { it('shows the add comment button', async () => { await testSubjects.exists('submit-comment'); }); + + it('shows the assignees section', async () => { + await testSubjects.exists('case-view-assignees'); + }); }); }); }; From cbb2e2a4c6d181b87dffafba495cc391ceeb9da7 Mon Sep 17 00:00:00 2001 From: Ashokaditya <1849116+ashokaditya@users.noreply.github.com> Date: Tue, 27 Sep 2022 19:20:34 +0200 Subject: [PATCH 10/95] [Security Solution][Endpoint][Response Actions] Additional actions log tests (#141447) * list handler tests - tests the logic for branching with status filter - tests request params formats for strings into string [] - tests logic for index_not_found_exception * verify that hostnames filter also shows inactive agents refs elastic/security-team/issues/4721 * verify useGetEndpointsList lists 50 agents at most Even when metadata list has more than 50 agents the `useGetEndpointsList` hook should list only 50 at most refs elastic/security-team/issues/4721 * verify useGetEndpointsList shows 10 more in list When all 50 or more agents are selected in the filter list, the hook should list 10 more agents refs elastic/security-team/issues/4721 * Add a metadata list test for hostname search refs elastic/security-team/issues/4721 * Refactor table props into a hook fixes elastic/security-team/issues/4990 * remove redundant checks review changes (@paul-tavares) --- .../components/hooks.tsx | 1 - .../response_actions_log.test.tsx | 20 + .../response_actions_log.tsx | 469 +----------------- .../use_response_actions_log_table.tsx | 441 ++++++++++++++++ .../endpoint/use_get_endpoints_list.test.ts | 125 +++++ .../routes/actions/list_handler.test.ts | 169 +++++++ .../apis/metadata.fixtures.ts | 12 +- .../apis/metadata.ts | 20 + 8 files changed, 807 insertions(+), 450 deletions(-) create mode 100644 x-pack/plugins/security_solution/public/management/components/endpoint_response_actions_list/use_response_actions_log_table.tsx create mode 100644 x-pack/plugins/security_solution/server/endpoint/routes/actions/list_handler.test.ts diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_response_actions_list/components/hooks.tsx b/x-pack/plugins/security_solution/public/management/components/endpoint_response_actions_list/components/hooks.tsx index bb2c1b7761d5a..34cc5a3ca0f99 100644 --- a/x-pack/plugins/security_solution/public/management/components/endpoint_response_actions_list/components/hooks.tsx +++ b/x-pack/plugins/security_solution/public/management/components/endpoint_response_actions_list/components/hooks.tsx @@ -159,7 +159,6 @@ export const getCommandKey = ( } }; -// TODO: add more filter names here export type FilterName = keyof typeof FILTER_NAMES; export const useActionsLogFilter = ({ filterName, diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_response_actions_list/response_actions_log.test.tsx b/x-pack/plugins/security_solution/public/management/components/endpoint_response_actions_list/response_actions_log.test.tsx index 30148c9643baa..556c765296337 100644 --- a/x-pack/plugins/security_solution/public/management/components/endpoint_response_actions_list/response_actions_log.test.tsx +++ b/x-pack/plugins/security_solution/public/management/components/endpoint_response_actions_list/response_actions_log.test.tsx @@ -393,6 +393,26 @@ describe('Response actions history', () => { expect(noTrays).toEqual([]); }); + it('should contain relevant details in each expanded row', async () => { + render(); + const { getAllByTestId } = renderResult; + + const expandButtons = getAllByTestId(`${testPrefix}-expand-button`); + expandButtons.map((button) => userEvent.click(button)); + const trays = getAllByTestId(`${testPrefix}-details-tray`); + expect(trays).toBeTruthy(); + expect(Array.from(trays[0].querySelectorAll('dt')).map((title) => title.textContent)).toEqual( + [ + 'Command placed', + 'Execution started on', + 'Execution completed', + 'Input', + 'Parameters', + 'Output:', + ] + ); + }); + it('should refresh data when autoRefresh is toggled on', async () => { render(); const { getByTestId } = renderResult; diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_response_actions_list/response_actions_log.tsx b/x-pack/plugins/security_solution/public/management/components/endpoint_response_actions_list/response_actions_log.tsx index 2a9362830c76d..ac9a0829bb7b8 100644 --- a/x-pack/plugins/security_solution/public/management/components/endpoint_response_actions_list/response_actions_log.tsx +++ b/x-pack/plugins/security_solution/public/management/components/endpoint_response_actions_list/response_actions_log.tsx @@ -5,112 +5,29 @@ * 2.0. */ -import { - EuiAvatar, - EuiBasicTable, - EuiButtonIcon, - EuiDescriptionList, - EuiEmptyPrompt, - EuiFacetButton, - EuiFlexGroup, - EuiFlexItem, - EuiHorizontalRule, - EuiScreenReaderOnly, - EuiI18nNumber, - EuiText, - EuiCodeBlock, - EuiToolTip, - RIGHT_ALIGNMENT, -} from '@elastic/eui'; -import { euiStyled, css } from '@kbn/kibana-react-plugin/common'; +import { EuiBasicTable, EuiEmptyPrompt, EuiFlexItem, EuiHorizontalRule } from '@elastic/eui'; -import type { HorizontalAlignment, CriteriaWithPagination } from '@elastic/eui'; +import type { CriteriaWithPagination } from '@elastic/eui'; import React, { memo, useCallback, useEffect, useMemo, useState } from 'react'; import { FormattedMessage } from '@kbn/i18n-react'; import type { ResponseActions, ResponseActionStatus, } from '../../../../common/endpoint/service/response_actions/constants'; -import { getEmptyValue } from '../../../common/components/empty_value'; -import { FormattedDate } from '../../../common/components/formatted_date'; + import type { ActionListApiResponse } from '../../../../common/endpoint/types'; import type { EndpointActionListRequestQuery } from '../../../../common/endpoint/schema/actions'; import { ManagementEmptyStateWrapper } from '../management_empty_state_wrapper'; import { useGetEndpointActionList } from '../../hooks'; -import { OUTPUT_MESSAGES, TABLE_COLUMN_NAMES, UX_MESSAGES } from './translations'; -import { MANAGEMENT_PAGE_SIZE_OPTIONS } from '../../common/constants'; +import { UX_MESSAGES } from './translations'; import { useTestIdGenerator } from '../../hooks/use_test_id_generator'; import { ActionsLogFilters } from './components/actions_log_filters'; -import { - getActionStatus, - getUiCommand, - getCommandKey, - useDateRangePicker, -} from './components/hooks'; -import { StatusBadge } from './components/status_badge'; +import { getCommandKey, useDateRangePicker } from './components/hooks'; import { useActionHistoryUrlParams } from './components/use_action_history_url_params'; import { useUrlPagination } from '../../hooks/use_url_pagination'; import { ManagementPageLoader } from '../management_page_loader'; import { ActionsLogEmptyState } from './components/actions_log_empty_state'; - -const emptyValue = getEmptyValue(); - -// Truncated usernames -const StyledFacetButton = euiStyled(EuiFacetButton)` - .euiText { - margin-top: 0.38rem; - overflow-y: visible !important; - } -`; - -const customDescriptionListCss = css` - &.euiDescriptionList { - > .euiDescriptionList__title { - color: ${(props) => props.theme.eui.euiColorDarkShade}; - font-size: ${(props) => props.theme.eui.euiFontSizeXS}; - margin-top: ${(props) => props.theme.eui.euiSizeS}; - } - - > .euiDescriptionList__description { - font-weight: ${(props) => props.theme.eui.euiFontWeightSemiBold}; - margin-top: ${(props) => props.theme.eui.euiSizeS}; - } - } -`; - -const StyledDescriptionList = euiStyled(EuiDescriptionList).attrs({ - compressed: true, - type: 'column', -})` - ${customDescriptionListCss} -`; - -// output section styles -const topSpacingCss = css` - ${(props) => `${props.theme.eui.euiCodeBlockPaddingModifiers.paddingMedium} 0`} -`; -const dashedBorderCss = css` - ${(props) => `1px dashed ${props.theme.eui.euiColorDisabled}`}; -`; -const StyledDescriptionListOutput = euiStyled(EuiDescriptionList).attrs({ compressed: true })` - ${customDescriptionListCss} - dd { - margin: ${topSpacingCss}; - padding: ${topSpacingCss}; - border-top: ${dashedBorderCss}; - border-bottom: ${dashedBorderCss}; - } -`; - -// code block styles -const StyledEuiCodeBlock = euiStyled(EuiCodeBlock).attrs({ - transparentBackground: true, - paddingSize: 'none', -})` - code { - color: ${(props) => props.theme.eui.euiColorDarkShade} !important; - } -`; +import { useResponseActionsLogTable } from './use_response_actions_log_table'; export const ResponseActionsLog = memo< Pick & { @@ -131,9 +48,6 @@ export const ResponseActionsLog = memo< } = useActionHistoryUrlParams(); const getTestId = useTestIdGenerator('response-actions-list'); - const [itemIdToExpandedRowMap, setItemIdToExpandedRowMap] = useState<{ - [k: ActionListApiResponse['data'][number]['id']]: React.ReactNode; - }>({}); // Used to decide if display global loader or not (only the fist time tha page loads) const [isFirstAttempt, setIsFirstAttempt] = useState(true); @@ -183,6 +97,19 @@ export const ResponseActionsLog = memo< { retry: false } ); + // total actions + const totalItemCount = useMemo(() => actionList?.total ?? 0, [actionList]); + + // table columns and expanded row state + const { itemIdToExpandedRowMap, recordRangeLabel, responseActionListColumns, tablePagination } = + useResponseActionsLogTable({ + showHostNames, + pageIndex: isFlyout ? (queryParams.page || 1) - 1 : paginationFromUrlParams.page - 1, + pageSize: isFlyout ? queryParams.pageSize || 10 : paginationFromUrlParams.pageSize, + queryParams, + totalItemCount, + }); + // Hide page header when there is no actions index calling the setIsDataInResponse with false value. // Otherwise, it shows the page header calling the setIsDataInResponse with true value and it also keeps track // if the API request was done for the first time. @@ -248,310 +175,6 @@ export const ResponseActionsLog = memo< [setQueryParams] ); - // total actions - const totalItemCount = useMemo(() => actionList?.total ?? 0, [actionList]); - - // expanded tray contents - const toggleDetails = useCallback( - (item: ActionListApiResponse['data'][number]) => { - const itemIdToExpandedRowMapValues = { ...itemIdToExpandedRowMap }; - if (itemIdToExpandedRowMapValues[item.id]) { - delete itemIdToExpandedRowMapValues[item.id]; - } else { - const { - startedAt, - completedAt, - isCompleted, - wasSuccessful, - isExpired, - command: _command, - parameters, - } = item; - - const parametersList = parameters - ? Object.entries(parameters).map(([key, value]) => { - return `${key}:${value}`; - }) - : undefined; - - const command = getUiCommand(_command); - const dataList = [ - { - title: OUTPUT_MESSAGES.expandSection.placedAt, - description: `${startedAt}`, - }, - { - title: OUTPUT_MESSAGES.expandSection.startedAt, - description: `${startedAt}`, - }, - { - title: OUTPUT_MESSAGES.expandSection.completedAt, - description: `${completedAt ?? emptyValue}`, - }, - { - title: OUTPUT_MESSAGES.expandSection.input, - description: `${command}`, - }, - { - title: OUTPUT_MESSAGES.expandSection.parameters, - description: parametersList ? parametersList : emptyValue, - }, - ].map(({ title, description }) => { - return { - title: {title}, - description: {description}, - }; - }); - - const outputList = [ - { - title: ( - {`${OUTPUT_MESSAGES.expandSection.output}:`} - ), - description: ( - // codeblock for output - - {isExpired - ? OUTPUT_MESSAGES.hasExpired(command) - : isCompleted - ? wasSuccessful - ? OUTPUT_MESSAGES.wasSuccessful(command) - : OUTPUT_MESSAGES.hasFailed(command) - : OUTPUT_MESSAGES.isPending(command)} - - ), - }, - ]; - - itemIdToExpandedRowMapValues[item.id] = ( - <> - - - - - - - - - - ); - } - setItemIdToExpandedRowMap(itemIdToExpandedRowMapValues); - }, - [getTestId, itemIdToExpandedRowMap] - ); - // memoized callback for toggleDetails - const onClickCallback = useCallback( - (actionListDataItem: ActionListApiResponse['data'][number]) => () => - toggleDetails(actionListDataItem), - [toggleDetails] - ); - - // table column - const responseActionListColumns = useMemo(() => { - const columns = [ - { - field: 'startedAt', - name: TABLE_COLUMN_NAMES.time, - width: !showHostNames ? '21%' : '15%', - truncateText: true, - render: (startedAt: ActionListApiResponse['data'][number]['startedAt']) => { - return ( - - ); - }, - }, - { - field: 'command', - name: TABLE_COLUMN_NAMES.command, - width: !showHostNames ? '21%' : '10%', - truncateText: true, - render: (_command: ActionListApiResponse['data'][number]['command']) => { - const command = getUiCommand(_command); - return ( - - - {command} - - - ); - }, - }, - { - field: 'createdBy', - name: TABLE_COLUMN_NAMES.user, - width: !showHostNames ? '21%' : '14%', - truncateText: true, - render: (userId: ActionListApiResponse['data'][number]['createdBy']) => { - return ( - - } - > - - - {userId} - - - - ); - }, - }, - // conditional hostnames column - { - field: 'hosts', - name: TABLE_COLUMN_NAMES.hosts, - width: '20%', - truncateText: true, - render: (_hosts: ActionListApiResponse['data'][number]['hosts']) => { - const hosts = _hosts && Object.values(_hosts); - // join hostnames if the action is for multiple agents - // and skip empty strings for names if any - const _hostnames = hosts - .reduce((acc, host) => { - if (host.name.trim()) { - acc.push(host.name); - } - return acc; - }, []) - .join(', '); - - let hostnames = _hostnames; - if (!_hostnames) { - if (hosts.length > 1) { - // when action was for a single agent and no host name - hostnames = UX_MESSAGES.unenrolled.hosts; - } else if (hosts.length === 1) { - // when action was for a multiple agents - // and none of them have a host name - hostnames = UX_MESSAGES.unenrolled.host; - } - } - return ( - - - {hostnames} - - - ); - }, - }, - { - field: 'comment', - name: TABLE_COLUMN_NAMES.comments, - width: !showHostNames ? '21%' : '30%', - truncateText: true, - render: (comment: ActionListApiResponse['data'][number]['comment']) => { - return ( - - - {comment ?? emptyValue} - - - ); - }, - }, - { - field: 'status', - name: TABLE_COLUMN_NAMES.status, - width: !showHostNames ? '15%' : '10%', - render: (_status: ActionListApiResponse['data'][number]['status']) => { - const status = getActionStatus(_status); - - return ( - - - - ); - }, - }, - { - field: '', - align: RIGHT_ALIGNMENT as HorizontalAlignment, - width: '40px', - isExpander: true, - name: ( - - {UX_MESSAGES.screenReaderExpand} - - ), - render: (actionListDataItem: ActionListApiResponse['data'][number]) => { - return ( - - ); - }, - }, - ]; - // filter out the `hosts` column - // if showHostNames is FALSE - if (!showHostNames) { - return columns.filter((column) => column.field !== 'hosts'); - } - return columns; - }, [showHostNames, getTestId, itemIdToExpandedRowMap, onClickCallback]); - - // table pagination - const tablePagination = useMemo(() => { - const pageIndex = isFlyout ? (queryParams.page || 1) - 1 : paginationFromUrlParams.page - 1; - const pageSize = isFlyout ? queryParams.pageSize || 10 : paginationFromUrlParams.pageSize; - return { - // this controls the table UI page - // to match 0-based table paging - pageIndex, - pageSize, - totalItemCount, - pageSizeOptions: MANAGEMENT_PAGE_SIZE_OPTIONS as number[], - }; - }, [ - isFlyout, - paginationFromUrlParams.page, - paginationFromUrlParams.pageSize, - queryParams.page, - queryParams.pageSize, - totalItemCount, - ]); - // handle onChange const handleTableOnChange = useCallback( ({ page: _page }: CriteriaWithPagination) => { @@ -563,16 +186,12 @@ export const ResponseActionsLog = memo< page: index + 1, pageSize: size, }; - if (isFlyout) { - setQueryParams((prevState) => ({ - ...prevState, - ...pagingArgs, - })); - } else { - setQueryParams((prevState) => ({ - ...prevState, - ...pagingArgs, - })); + + setQueryParams((prevState) => ({ + ...prevState, + ...pagingArgs, + })); + if (!isFlyout) { setPaginationOnUrlParams({ ...pagingArgs, }); @@ -582,42 +201,6 @@ export const ResponseActionsLog = memo< [isFlyout, reFetchEndpointActionList, setQueryParams, setPaginationOnUrlParams] ); - // compute record ranges - const pagedResultsCount = useMemo(() => { - const page = queryParams.page ?? 1; - const perPage = queryParams?.pageSize ?? 10; - - const totalPages = Math.ceil(totalItemCount / perPage); - const fromCount = perPage * page - perPage + 1; - const toCount = - page === totalPages || totalPages === 1 ? totalItemCount : fromCount + perPage - 1; - return { fromCount, toCount }; - }, [queryParams.page, queryParams.pageSize, totalItemCount]); - - // create range label to display - const recordRangeLabel = useMemo( - () => ( - - - - {'-'} - - - ), - total: , - recordsLabel: {UX_MESSAGES.recordsLabel(totalItemCount)}, - }} - /> - - ), - [getTestId, pagedResultsCount.fromCount, pagedResultsCount.toCount, totalItemCount] - ); - if (error?.body?.statusCode === 404 && error?.body?.message === 'index_not_found_exception') { return ; } else if (isFetching && isFirstAttempt) { @@ -675,7 +258,7 @@ export const ResponseActionsLog = memo< columns={responseActionListColumns} itemId="id" itemIdToExpandedRowMap={itemIdToExpandedRowMap} - isExpandable={true} + isExpandable pagination={tablePagination} onChange={handleTableOnChange} loading={isFetching} diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_response_actions_list/use_response_actions_log_table.tsx b/x-pack/plugins/security_solution/public/management/components/endpoint_response_actions_list/use_response_actions_log_table.tsx new file mode 100644 index 0000000000000..e4dd30b468127 --- /dev/null +++ b/x-pack/plugins/security_solution/public/management/components/endpoint_response_actions_list/use_response_actions_log_table.tsx @@ -0,0 +1,441 @@ +/* + * 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, { useCallback, useMemo, useState } from 'react'; +import type { HorizontalAlignment } from '@elastic/eui'; + +import { + EuiI18nNumber, + EuiAvatar, + EuiButtonIcon, + EuiCodeBlock, + EuiDescriptionList, + EuiFacetButton, + EuiFlexGroup, + EuiFlexItem, + RIGHT_ALIGNMENT, + EuiScreenReaderOnly, + EuiText, + EuiToolTip, +} from '@elastic/eui'; +import { css, euiStyled } from '@kbn/kibana-react-plugin/common'; +import { FormattedMessage } from '@kbn/i18n-react'; + +import type { ActionListApiResponse } from '../../../../common/endpoint/types'; +import type { EndpointActionListRequestQuery } from '../../../../common/endpoint/schema/actions'; +import { FormattedDate } from '../../../common/components/formatted_date'; +import { OUTPUT_MESSAGES, TABLE_COLUMN_NAMES, UX_MESSAGES } from './translations'; +import { getActionStatus, getUiCommand } from './components/hooks'; +import { getEmptyValue } from '../../../common/components/empty_value'; +import { StatusBadge } from './components/status_badge'; +import { useTestIdGenerator } from '../../hooks/use_test_id_generator'; +import { MANAGEMENT_PAGE_SIZE_OPTIONS } from '../../common/constants'; + +const emptyValue = getEmptyValue(); + +// Truncated usernames +const StyledFacetButton = euiStyled(EuiFacetButton)` + .euiText { + margin-top: 0.38rem; + overflow-y: visible !important; + } +`; + +const customDescriptionListCss = css` + &.euiDescriptionList { + > .euiDescriptionList__title { + color: ${(props) => props.theme.eui.euiColorDarkShade}; + font-size: ${(props) => props.theme.eui.euiFontSizeXS}; + margin-top: ${(props) => props.theme.eui.euiSizeS}; + } + + > .euiDescriptionList__description { + font-weight: ${(props) => props.theme.eui.euiFontWeightSemiBold}; + margin-top: ${(props) => props.theme.eui.euiSizeS}; + } + } +`; + +const StyledDescriptionList = euiStyled(EuiDescriptionList).attrs({ + compressed: true, + type: 'column', +})` + ${customDescriptionListCss} +`; + +// output section styles +const topSpacingCss = css` + ${(props) => `${props.theme.eui.euiCodeBlockPaddingModifiers.paddingMedium} 0`} +`; +const dashedBorderCss = css` + ${(props) => `1px dashed ${props.theme.eui.euiColorDisabled}`}; +`; +const StyledDescriptionListOutput = euiStyled(EuiDescriptionList).attrs({ compressed: true })` + ${customDescriptionListCss} + dd { + margin: ${topSpacingCss}; + padding: ${topSpacingCss}; + border-top: ${dashedBorderCss}; + border-bottom: ${dashedBorderCss}; + } +`; + +// code block styles +const StyledEuiCodeBlock = euiStyled(EuiCodeBlock).attrs({ + transparentBackground: true, + paddingSize: 'none', +})` + code { + color: ${(props) => props.theme.eui.euiColorDarkShade} !important; + } +`; + +export const useResponseActionsLogTable = ({ + pageIndex, + pageSize, + queryParams, + showHostNames, + totalItemCount, +}: { + pageIndex: number; + pageSize: number; + queryParams: EndpointActionListRequestQuery; + showHostNames: boolean; + totalItemCount: number; +}) => { + const getTestId = useTestIdGenerator('response-actions-list'); + + const [itemIdToExpandedRowMap, setItemIdToExpandedRowMap] = useState<{ + [k: ActionListApiResponse['data'][number]['id']]: React.ReactNode; + }>({}); + + // expanded tray contents + const toggleDetails = useCallback( + (item: ActionListApiResponse['data'][number]) => { + const itemIdToExpandedRowMapValues = { ...itemIdToExpandedRowMap }; + if (itemIdToExpandedRowMapValues[item.id]) { + delete itemIdToExpandedRowMapValues[item.id]; + } else { + const { + startedAt, + completedAt, + isCompleted, + wasSuccessful, + isExpired, + command: _command, + parameters, + } = item; + + const parametersList = parameters + ? Object.entries(parameters).map(([key, value]) => { + return `${key}:${value}`; + }) + : undefined; + + const command = getUiCommand(_command); + const dataList = [ + { + title: OUTPUT_MESSAGES.expandSection.placedAt, + description: `${startedAt}`, + }, + { + title: OUTPUT_MESSAGES.expandSection.startedAt, + description: `${startedAt}`, + }, + { + title: OUTPUT_MESSAGES.expandSection.completedAt, + description: `${completedAt ?? emptyValue}`, + }, + { + title: OUTPUT_MESSAGES.expandSection.input, + description: `${command}`, + }, + { + title: OUTPUT_MESSAGES.expandSection.parameters, + description: parametersList ? parametersList : emptyValue, + }, + ].map(({ title, description }) => { + return { + title: {title}, + description: {description}, + }; + }); + + const outputList = [ + { + title: ( + {`${OUTPUT_MESSAGES.expandSection.output}:`} + ), + description: ( + // codeblock for output + + {isExpired + ? OUTPUT_MESSAGES.hasExpired(command) + : isCompleted + ? wasSuccessful + ? OUTPUT_MESSAGES.wasSuccessful(command) + : OUTPUT_MESSAGES.hasFailed(command) + : OUTPUT_MESSAGES.isPending(command)} + + ), + }, + ]; + + itemIdToExpandedRowMapValues[item.id] = ( + <> + + + + + + + + + + ); + } + setItemIdToExpandedRowMap(itemIdToExpandedRowMapValues); + }, + [getTestId, itemIdToExpandedRowMap] + ); + // memoized callback for toggleDetails + const onClickCallback = useCallback( + (actionListDataItem: ActionListApiResponse['data'][number]) => () => + toggleDetails(actionListDataItem), + [toggleDetails] + ); + + const responseActionListColumns = useMemo(() => { + const columns = [ + { + field: 'startedAt', + name: TABLE_COLUMN_NAMES.time, + width: !showHostNames ? '21%' : '15%', + truncateText: true, + render: (startedAt: ActionListApiResponse['data'][number]['startedAt']) => { + return ( + + ); + }, + }, + { + field: 'command', + name: TABLE_COLUMN_NAMES.command, + width: !showHostNames ? '21%' : '10%', + truncateText: true, + render: (_command: ActionListApiResponse['data'][number]['command']) => { + const command = getUiCommand(_command); + return ( + + + {command} + + + ); + }, + }, + { + field: 'createdBy', + name: TABLE_COLUMN_NAMES.user, + width: !showHostNames ? '21%' : '14%', + truncateText: true, + render: (userId: ActionListApiResponse['data'][number]['createdBy']) => { + return ( + + } + > + + + {userId} + + + + ); + }, + }, + // conditional hostnames column + { + field: 'hosts', + name: TABLE_COLUMN_NAMES.hosts, + width: '20%', + truncateText: true, + render: (_hosts: ActionListApiResponse['data'][number]['hosts']) => { + const hosts = _hosts && Object.values(_hosts); + // join hostnames if the action is for multiple agents + // and skip empty strings for names if any + const _hostnames = hosts + .reduce((acc, host) => { + if (host.name.trim()) { + acc.push(host.name); + } + return acc; + }, []) + .join(', '); + + let hostnames = _hostnames; + if (!_hostnames) { + if (hosts.length > 1) { + // when action was for a single agent and no host name + hostnames = UX_MESSAGES.unenrolled.hosts; + } else if (hosts.length === 1) { + // when action was for a multiple agents + // and none of them have a host name + hostnames = UX_MESSAGES.unenrolled.host; + } + } + return ( + + + {hostnames} + + + ); + }, + }, + { + field: 'comment', + name: TABLE_COLUMN_NAMES.comments, + width: !showHostNames ? '21%' : '30%', + truncateText: true, + render: (comment: ActionListApiResponse['data'][number]['comment']) => { + return ( + + + {comment ?? emptyValue} + + + ); + }, + }, + { + field: 'status', + name: TABLE_COLUMN_NAMES.status, + width: !showHostNames ? '15%' : '10%', + render: (_status: ActionListApiResponse['data'][number]['status']) => { + const status = getActionStatus(_status); + + return ( + + + + ); + }, + }, + { + field: '', + align: RIGHT_ALIGNMENT as HorizontalAlignment, + width: '40px', + isExpander: true, + name: ( + + {UX_MESSAGES.screenReaderExpand} + + ), + render: (actionListDataItem: ActionListApiResponse['data'][number]) => { + return ( + + ); + }, + }, + ]; + // filter out the `hosts` column + // if showHostNames is FALSE + if (!showHostNames) { + return columns.filter((column) => column.field !== 'hosts'); + } + return columns; + }, [showHostNames, getTestId, itemIdToExpandedRowMap, onClickCallback]); + + // table pagination + const tablePagination = useMemo(() => { + return { + pageIndex, + pageSize, + totalItemCount, + pageSizeOptions: MANAGEMENT_PAGE_SIZE_OPTIONS as number[], + }; + }, [pageIndex, pageSize, totalItemCount]); + + // compute record ranges + const pagedResultsCount = useMemo(() => { + const page = queryParams.page ?? 1; + const perPage = queryParams?.pageSize ?? 10; + + const totalPages = Math.ceil(totalItemCount / perPage); + const fromCount = perPage * page - perPage + 1; + const toCount = + page === totalPages || totalPages === 1 ? totalItemCount : fromCount + perPage - 1; + return { fromCount, toCount }; + }, [queryParams.page, queryParams.pageSize, totalItemCount]); + + // create range label to display + const recordRangeLabel = useMemo( + () => ( + + + + {'-'} + + + ), + total: , + recordsLabel: {UX_MESSAGES.recordsLabel(totalItemCount)}, + }} + /> + + ), + [getTestId, pagedResultsCount.fromCount, pagedResultsCount.toCount, totalItemCount] + ); + + return { itemIdToExpandedRowMap, responseActionListColumns, recordRangeLabel, tablePagination }; +}; diff --git a/x-pack/plugins/security_solution/public/management/hooks/endpoint/use_get_endpoints_list.test.ts b/x-pack/plugins/security_solution/public/management/hooks/endpoint/use_get_endpoints_list.test.ts index 0804bef55b3e7..cdb1041cda7ed 100644 --- a/x-pack/plugins/security_solution/public/management/hooks/endpoint/use_get_endpoints_list.test.ts +++ b/x-pack/plugins/security_solution/public/management/hooks/endpoint/use_get_endpoints_list.test.ts @@ -11,6 +11,8 @@ import { useGetEndpointsList } from './use_get_endpoints_list'; import { HOST_METADATA_LIST_ROUTE } from '../../../../common/endpoint/constants'; import { useQuery as _useQuery } from '@tanstack/react-query'; import { endpointMetadataHttpMocks } from '../../pages/endpoint_hosts/mocks'; +import { EndpointStatus, HostStatus } from '../../../../common/endpoint/types'; +import { EndpointDocGenerator } from '../../../../common/endpoint/generate_data'; const useQueryMock = _useQuery as jest.Mock; @@ -107,4 +109,127 @@ describe('useGetEndpointsList hook', () => { }) ); }); + + it('should also list inactive agents', async () => { + const getApiResponse = apiMocks.responseProvider.metadataList.getMockImplementation(); + + // set a few of the agents as inactive/unenrolled + apiMocks.responseProvider.metadataList.mockImplementation(() => { + if (getApiResponse) { + return { + ...getApiResponse(), + data: getApiResponse().data.map((item, i) => { + const isInactiveIndex = [0, 1, 3].includes(i); + return { + ...item, + host_status: isInactiveIndex ? HostStatus.INACTIVE : item.host_status, + metadata: { + ...item.metadata, + host: { + ...item.metadata.host, + hostname: isInactiveIndex + ? `${item.metadata.host.hostname}-inactive` + : item.metadata.host.hostname, + }, + Endpoint: { + ...item.metadata.Endpoint, + status: isInactiveIndex + ? EndpointStatus.unenrolled + : item.metadata.Endpoint.status, + }, + }, + }; + }), + }; + } + throw new Error('some error'); + }); + + // verify useGetEndpointsList hook returns the same inactive agents + const res = await renderReactQueryHook(() => useGetEndpointsList({ searchString: 'inactive' })); + expect( + res.data?.map((host) => host.name.split('-')[2]).filter((name) => name === 'inactive').length + ).toEqual(3); + }); + + it('should only list 50 agents when more than 50 in the metadata list API', async () => { + const getApiResponse = apiMocks.responseProvider.metadataList.getMockImplementation(); + + apiMocks.responseProvider.metadataList.mockImplementation(() => { + if (getApiResponse) { + const generator = new EndpointDocGenerator('seed'); + const total = 60; + const data = Array.from({ length: total }, () => { + const endpoint = { + metadata: generator.generateHostMetadata(), + host_status: HostStatus.UNHEALTHY, + }; + + generator.updateCommonInfo(); + + return endpoint; + }); + + return { + ...getApiResponse(), + data, + page: 0, + // this page size is not used by the hook (it uses the default of 50) + // this is only for the test + pageSize: 80, + total, + }; + } + throw new Error('some error'); + }); + + // verify useGetEndpointsList hook returns all 50 agents in the list + const res = await renderReactQueryHook(() => useGetEndpointsList({ searchString: '' })); + expect(res.data?.length).toEqual(50); + }); + + it('should only list 10 more agents when 50 or more agents are already selected', async () => { + const getApiResponse = apiMocks.responseProvider.metadataList.getMockImplementation(); + + apiMocks.responseProvider.metadataList.mockImplementation(() => { + if (getApiResponse) { + const generator = new EndpointDocGenerator('seed'); + const total = 61; + const data = Array.from({ length: total }, () => { + const endpoint = { + metadata: generator.generateHostMetadata(), + host_status: HostStatus.UNHEALTHY, + }; + + generator.updateCommonInfo(); + + return endpoint; + }); + + return { + ...getApiResponse(), + data, + page: 0, + // since we're mocking that all 50 agents are selected + // page size is set to max allowed + pageSize: 10000, + total, + }; + } + throw new Error('some error'); + }); + + // get the first 50 agents to select + const agentIdsToSelect = apiMocks.responseProvider + .metadataList() + .data.map((d) => d.metadata.agent.id) + .slice(0, 50); + + // call useGetEndpointsList with all 50 agents selected + const res = await renderReactQueryHook(() => + useGetEndpointsList({ searchString: '', selectedAgentIds: agentIdsToSelect }) + ); + // verify useGetEndpointsList hook returns 60 agents + expect(res.data?.length).toEqual(60); + }); }); diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/actions/list_handler.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/actions/list_handler.test.ts new file mode 100644 index 0000000000000..51326c8adbd12 --- /dev/null +++ b/x-pack/plugins/security_solution/server/endpoint/routes/actions/list_handler.test.ts @@ -0,0 +1,169 @@ +/* + * 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. + */ + +/* eslint-disable @typescript-eslint/no-explicit-any */ + +import type { KibanaResponseFactory, RequestHandler, RouteConfig } from '@kbn/core/server'; +import { + coreMock, + elasticsearchServiceMock, + httpServerMock, + httpServiceMock, + loggingSystemMock, + savedObjectsClientMock, +} from '@kbn/core/server/mocks'; +import type { EndpointActionListRequestQuery } from '../../../../common/endpoint/schema/actions'; +import { ENDPOINTS_ACTION_LIST_ROUTE } from '../../../../common/endpoint/constants'; +import { parseExperimentalConfigValue } from '../../../../common/experimental_features'; +import { createMockConfig } from '../../../lib/detection_engine/routes/__mocks__'; +import { EndpointAppContextService } from '../../endpoint_app_context_services'; +import { + createMockEndpointAppContextServiceSetupContract, + createMockEndpointAppContextServiceStartContract, + createRouteHandlerContext, +} from '../../mocks'; +import { registerActionListRoutes } from './list'; +import type { SecuritySolutionRequestHandlerContext } from '../../../types'; +import { doesLogsEndpointActionsIndexExist } from '../../utils'; +import { getActionList, getActionListByStatus } from '../../services'; + +jest.mock('../../utils'); +const mockDoesLogsEndpointActionsIndexExist = doesLogsEndpointActionsIndexExist as jest.Mock; + +jest.mock('../../services'); +const mockGetActionList = getActionList as jest.Mock; +const mockGetActionListByStatus = getActionListByStatus as jest.Mock; + +describe(' Action List Handler', () => { + let endpointAppContextService: EndpointAppContextService; + let mockResponse: jest.Mocked; + + let actionListHandler: ( + query?: EndpointActionListRequestQuery + ) => Promise>; + + beforeEach(() => { + const esClientMock = elasticsearchServiceMock.createScopedClusterClient(); + const routerMock = httpServiceMock.createRouter(); + endpointAppContextService = new EndpointAppContextService(); + endpointAppContextService.setup(createMockEndpointAppContextServiceSetupContract()); + endpointAppContextService.start(createMockEndpointAppContextServiceStartContract()); + mockDoesLogsEndpointActionsIndexExist.mockResolvedValue(true); + + registerActionListRoutes(routerMock, { + logFactory: loggingSystemMock.create(), + service: endpointAppContextService, + config: () => Promise.resolve(createMockConfig()), + experimentalFeatures: parseExperimentalConfigValue(createMockConfig().enableExperimental), + }); + + actionListHandler = async ( + query?: EndpointActionListRequestQuery + ): Promise> => { + const req = httpServerMock.createKibanaRequest({ + query, + }); + mockResponse = httpServerMock.createResponseFactory(); + const [, routeHandler]: [ + RouteConfig, + RequestHandler< + unknown, + EndpointActionListRequestQuery, + unknown, + SecuritySolutionRequestHandlerContext + > + ] = routerMock.get.mock.calls.find(([{ path }]) => + path.startsWith(ENDPOINTS_ACTION_LIST_ROUTE) + )!; + await routeHandler( + coreMock.createCustomRequestHandlerContext( + createRouteHandlerContext(esClientMock, savedObjectsClientMock.create()) + ) as SecuritySolutionRequestHandlerContext, + req, + mockResponse + ); + + return mockResponse; + }; + }); + + afterEach(() => { + endpointAppContextService.stop(); + }); + + describe('Internals', () => { + it('should return `notFound` when actions index does not exist', async () => { + mockDoesLogsEndpointActionsIndexExist.mockResolvedValue(false); + await actionListHandler({ pageSize: 10, page: 1 }); + expect(mockResponse.notFound).toHaveBeenCalledWith({ + body: 'index_not_found_exception', + }); + }); + + it('should return `ok` when actions index exists', async () => { + await actionListHandler({ pageSize: 10, page: 1 }); + expect(mockResponse.ok).toHaveBeenCalled(); + }); + + it('should call `getActionListByStatus` when statuses filter values are provided', async () => { + await actionListHandler({ pageSize: 10, page: 1, statuses: ['failed', 'pending'] }); + expect(mockGetActionListByStatus).toBeCalledWith( + expect.objectContaining({ statuses: ['failed', 'pending'] }) + ); + }); + + it('should correctly format the request when calling `getActionListByStatus`', async () => { + await actionListHandler({ + agentIds: 'agentX', + commands: 'running-processes', + statuses: 'failed', + userIds: 'userX', + }); + expect(mockGetActionListByStatus).toBeCalledWith( + expect.objectContaining({ + elasticAgentIds: ['agentX'], + commands: ['running-processes'], + statuses: ['failed'], + userIds: ['userX'], + }) + ); + }); + + it('should call `getActionList` when statuses filter values are not provided', async () => { + await actionListHandler({ + pageSize: 10, + page: 1, + commands: ['isolate', 'kill-process'], + userIds: ['userX', 'userY'], + }); + expect(mockGetActionList).toBeCalledWith( + expect.objectContaining({ + commands: ['isolate', 'kill-process'], + userIds: ['userX', 'userY'], + }) + ); + }); + + it('should correctly format the request when calling `getActionList`', async () => { + await actionListHandler({ + page: 1, + pageSize: 10, + agentIds: 'agentX', + commands: 'isolate', + userIds: 'userX', + }); + + expect(mockGetActionList).toHaveBeenCalledWith( + expect.objectContaining({ + commands: ['isolate'], + elasticAgentIds: ['agentX'], + userIds: ['userX'], + }) + ); + }); + }); +}); diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/metadata.fixtures.ts b/x-pack/test/security_solution_endpoint_api_int/apis/metadata.fixtures.ts index 281ba95d8e0cb..3a81ad1c71dcb 100644 --- a/x-pack/test/security_solution_endpoint_api_int/apis/metadata.fixtures.ts +++ b/x-pack/test/security_solution_endpoint_api_int/apis/metadata.fixtures.ts @@ -247,8 +247,8 @@ export function generateMetadataDocs(timestamp: number) { dataset: 'endpoint.metadata', }, host: { - hostname: 'rezzani-7.example.com', - name: 'rezzani-7.example.com', + hostname: 'Example-host-name-XYZ', + name: 'Example-host-name-XYZ', id: 'fc0ff548-feba-41b6-8367-65e8790d0eaf', ip: ['10.101.149.26', '2606:a000:ffc0:39:11ef:37b9:3371:578c'], mac: ['e2-6d-f9-0-46-2e'], @@ -399,8 +399,8 @@ export function generateMetadataDocs(timestamp: number) { }, host: { architecture: 'x86', - hostname: 'rezzani-7.example.com', - name: 'rezzani-7.example.com', + hostname: 'Example-host-name-XYZ', + name: 'Example-host-name-XYZ', id: 'fc0ff548-feba-41b6-8367-65e8790d0eaf', ip: ['10.101.149.26', '2606:a000:ffc0:39:11ef:37b9:3371:578c'], mac: ['e2-6d-f9-0-46-2e'], @@ -550,8 +550,8 @@ export function generateMetadataDocs(timestamp: number) { }, host: { architecture: 'x86', - hostname: 'rezzani-7.example.com', - name: 'rezzani-7.example.com', + hostname: 'Example-host-name-XYZ', + name: 'Example-host-name-XYZ', id: 'fc0ff548-feba-41b6-8367-65e8790d0eaf', ip: ['10.101.149.26', '2606:a000:ffc0:39:11ef:37b9:3371:578c'], mac: ['e2-6d-f9-0-46-2e'], diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/metadata.ts b/x-pack/test/security_solution_endpoint_api_int/apis/metadata.ts index 508aa8884fcfe..0ee6b44952577 100644 --- a/x-pack/test/security_solution_endpoint_api_int/apis/metadata.ts +++ b/x-pack/test/security_solution_endpoint_api_int/apis/metadata.ts @@ -259,6 +259,26 @@ export default function ({ getService }: FtrProviderContext) { expect(body.pageSize).to.eql(10); }); + it('metadata api should return the endpoint based on the agent hostname', async () => { + const targetEndpointId = 'fc0ff548-feba-41b6-8367-65e8790d0eaf'; + const targetAgentHostname = 'Example-host-name-XYZ'; + const { body } = await supertest + .get(HOST_METADATA_LIST_ROUTE) + .set('kbn-xsrf', 'xxx') + .query({ + kuery: `united.endpoint.host.hostname:${targetAgentHostname}`, + }) + .expect(200); + expect(body.total).to.eql(1); + const resultHostId: string = body.data[0].metadata.host.id; + const resultElasticAgentName: string = body.data[0].metadata.host.hostname; + expect(resultHostId).to.eql(targetEndpointId); + expect(resultElasticAgentName).to.eql(targetAgentHostname); + expect(body.data.length).to.eql(1); + expect(body.page).to.eql(0); + expect(body.pageSize).to.eql(10); + }); + it('metadata api should return all hosts when filter is empty string', async () => { const { body } = await supertest .get(HOST_METADATA_LIST_ROUTE) From 54ad60464d3642ddd6659253bc67c2e189d012d3 Mon Sep 17 00:00:00 2001 From: Elastic Machine Date: Tue, 27 Sep 2022 10:27:32 -0700 Subject: [PATCH 11/95] [automation] Update references to bundled packages (#141818) Co-authored-by: apmmachine --- fleet_packages.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fleet_packages.json b/fleet_packages.json index c4a7f87127f10..4651e86287588 100644 --- a/fleet_packages.json +++ b/fleet_packages.json @@ -20,7 +20,7 @@ [ { "name": "apm", - "version": "8.4.0", + "version": "8.6.0-preview-1663775281", "forceAlignStackVersion": true }, { @@ -29,7 +29,7 @@ }, { "name": "endpoint", - "version": "8.4.1" + "version": "8.5.0" }, { "name": "fleet_server", @@ -39,4 +39,4 @@ "name": "synthetics", "version": "0.10.2" } -] +] \ No newline at end of file From 02f874bb01567a0c397fcc91b74c3ae47a240054 Mon Sep 17 00:00:00 2001 From: Byron Hulcher Date: Tue, 27 Sep 2022 13:36:34 -0400 Subject: [PATCH 12/95] Hide curl request in Search Index pipelines tab for connector and crawler indices (#141976) --- .../pipelines/ingest_pipelines_card.tsx | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ingest_pipelines_card.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ingest_pipelines_card.tsx index ca6140b7b9625..7bf1ef06e1e75 100644 --- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ingest_pipelines_card.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ingest_pipelines_card.tsx @@ -26,6 +26,7 @@ import { KibanaLogic } from '../../../../shared/kibana'; import { LicensingLogic } from '../../../../shared/licensing'; import { CreateCustomPipelineApiLogic } from '../../../api/index/create_custom_pipeline_api_logic'; import { FetchCustomPipelineApiLogic } from '../../../api/index/fetch_custom_pipeline_api_logic'; +import { isApiIndex } from '../../../utils/indices'; import { CurlRequest } from '../components/curl_request/curl_request'; import { IndexViewLogic } from '../index_view_logic'; @@ -36,7 +37,7 @@ import { PipelinesLogic } from './pipelines_logic'; export const IngestPipelinesCard: React.FC = () => { const { indexName } = useValues(IndexViewLogic); - const { canSetPipeline, pipelineState, showModal } = useValues(PipelinesLogic); + const { canSetPipeline, index, pipelineState, showModal } = useValues(PipelinesLogic); const { closeModal, openModal, setPipelineState, savePipeline } = useActions(PipelinesLogic); const { makeRequest: fetchCustomPipeline } = useActions(FetchCustomPipelineApiLogic); const { makeRequest: createCustomPipeline } = useActions(CreateCustomPipelineApiLogic); @@ -97,22 +98,24 @@ export const IngestPipelinesCard: React.FC = () => {     - - - - - - + + {isApiIndex(index) && ( + + + + + + )} {i18n.translate( From fb55d8d6c151ac9f7070a7d1ccf6fdbe01020cbe Mon Sep 17 00:00:00 2001 From: Dima Arnautov Date: Tue, 27 Sep 2022 19:51:37 +0200 Subject: [PATCH 13/95] [ML] Fix expanded row layout in the Nodes table (#141964) Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../nodes_overview/allocated_models.tsx | 1 + .../nodes_overview/expanded_row.tsx | 48 ++++++++++--------- 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/x-pack/plugins/ml/public/application/trained_models/nodes_overview/allocated_models.tsx b/x-pack/plugins/ml/public/application/trained_models/nodes_overview/allocated_models.tsx index 0da7778c6e2bc..d1808c2c82135 100644 --- a/x-pack/plugins/ml/public/application/trained_models/nodes_overview/allocated_models.tsx +++ b/x-pack/plugins/ml/public/application/trained_models/nodes_overview/allocated_models.tsx @@ -190,6 +190,7 @@ export const AllocatedModels: FC = ({ })} onTableChange={() => {}} data-test-subj={'mlNodesAllocatedModels'} + css={{ overflow: 'auto' }} /> ); }; diff --git a/x-pack/plugins/ml/public/application/trained_models/nodes_overview/expanded_row.tsx b/x-pack/plugins/ml/public/application/trained_models/nodes_overview/expanded_row.tsx index 4c96904862786..a6b6adc4fbc20 100644 --- a/x-pack/plugins/ml/public/application/trained_models/nodes_overview/expanded_row.tsx +++ b/x-pack/plugins/ml/public/application/trained_models/nodes_overview/expanded_row.tsx @@ -17,6 +17,7 @@ import { import { FormattedMessage } from '@kbn/i18n-react'; import { cloneDeep } from 'lodash'; import { FIELD_FORMAT_IDS } from '@kbn/field-formats-plugin/common'; +import { css } from '@emotion/react'; import { NodeItem } from './nodes_list'; import { useListItemsFormatter } from '../models_management/expanded_row'; import { AllocatedModels } from './allocated_models'; @@ -44,10 +45,12 @@ export const ExpandedRow: FC = ({ item }) => { attributes['ml.max_jvm_size'] = bytesFormatter(attributes['ml.max_jvm_size']); return ( - <> - - - +
    + @@ -85,25 +88,26 @@ export const ExpandedRow: FC = ({ item }) => { /> + - {allocatedModels.length > 0 ? ( - - - -
    - -
    -     - + {allocatedModels.length > 0 ? ( + <> + + + +
    + +
    +     + - -     -     - ) : null} - - + + + + ) : null} +
    ); }; From 2aebaf720ea805fdd2b5545251f4944c56c873c8 Mon Sep 17 00:00:00 2001 From: Jonathan Buttner <56361221+jonathan-buttner@users.noreply.github.com> Date: Tue, 27 Sep 2022 13:57:54 -0400 Subject: [PATCH 14/95] Updating no matches text (#141981) --- .../user_profiles/no_matches.test.tsx | 2 +- .../components/user_profiles/no_matches.tsx | 21 ++++++++++++++++--- .../components/user_profiles/translations.ts | 15 +++++++++---- 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/x-pack/plugins/cases/public/components/user_profiles/no_matches.test.tsx b/x-pack/plugins/cases/public/components/user_profiles/no_matches.test.tsx index 3471aad3fec3c..e2d23dfd988e1 100644 --- a/x-pack/plugins/cases/public/components/user_profiles/no_matches.test.tsx +++ b/x-pack/plugins/cases/public/components/user_profiles/no_matches.test.tsx @@ -13,6 +13,6 @@ describe('NoMatches', () => { it('renders the no matches messages', () => { render(); - expect(screen.getByText('No matching users with required access.')); + expect(screen.getByText("User doesn't exist or is unavailable")); }); }); diff --git a/x-pack/plugins/cases/public/components/user_profiles/no_matches.tsx b/x-pack/plugins/cases/public/components/user_profiles/no_matches.tsx index 638d705fade86..ccd27b123f235 100644 --- a/x-pack/plugins/cases/public/components/user_profiles/no_matches.tsx +++ b/x-pack/plugins/cases/public/components/user_profiles/no_matches.tsx @@ -5,7 +5,15 @@ * 2.0. */ -import { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiSpacer, EuiText, EuiTextAlign } from '@elastic/eui'; +import { + EuiFlexGroup, + EuiFlexItem, + EuiIcon, + EuiLink, + EuiSpacer, + EuiText, + EuiTextAlign, +} from '@elastic/eui'; import React from 'react'; import * as i18n from './translations'; @@ -25,11 +33,18 @@ const NoMatchesComponent: React.FC = () => { - {i18n.NO_MATCHING_USERS} + {i18n.USER_DOES_NOT_EXIST}
    - {i18n.TRY_MODIFYING_SEARCH} + {i18n.MODIFY_SEARCH} +
    + + {i18n.LEARN_PRIVILEGES_GRANT_ACCESS} +     diff --git a/x-pack/plugins/cases/public/components/user_profiles/translations.ts b/x-pack/plugins/cases/public/components/user_profiles/translations.ts index db76408759bec..2624ec834cd2e 100644 --- a/x-pack/plugins/cases/public/components/user_profiles/translations.ts +++ b/x-pack/plugins/cases/public/components/user_profiles/translations.ts @@ -44,12 +44,19 @@ export const ASSIGNEES = i18n.translate('xpack.cases.userProfile.assigneesTitle' defaultMessage: 'Assignees', }); -export const NO_MATCHING_USERS = i18n.translate('xpack.cases.userProfiles.noMatchingUsers', { - defaultMessage: 'No matching users with required access.', +export const USER_DOES_NOT_EXIST = i18n.translate('xpack.cases.userProfiles.userDoesNotExist', { + defaultMessage: "User doesn't exist or is unavailable", }); -export const TRY_MODIFYING_SEARCH = i18n.translate('xpack.cases.userProfiles.tryModifyingSearch', { - defaultMessage: 'Try modifying your search.', +export const LEARN_PRIVILEGES_GRANT_ACCESS = i18n.translate( + 'xpack.cases.userProfiles.learnPrivileges', + { + defaultMessage: 'Learn what privileges grant access to cases.', + } +); + +export const MODIFY_SEARCH = i18n.translate('xpack.cases.userProfiles.modifySearch', { + defaultMessage: "Modify your search or check the user's privileges.", }); export const INVALID_ASSIGNEES = i18n.translate('xpack.cases.create.invalidAssignees', { From aeb7a65b5fa30e056cf116952a083e132fc906ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cau=C3=AA=20Marcondes?= <55978943+cauemarcondes@users.noreply.github.com> Date: Tue, 27 Sep 2022 14:06:07 -0400 Subject: [PATCH 15/95] [APM] rename tech preview feedback copy (#141857) --- .../observability/server/ui_settings.ts | 49 +++++-------------- 1 file changed, 13 insertions(+), 36 deletions(-) diff --git a/x-pack/plugins/observability/server/ui_settings.ts b/x-pack/plugins/observability/server/ui_settings.ts index 69e7f0ba51af6..a5b111569e311 100644 --- a/x-pack/plugins/observability/server/ui_settings.ts +++ b/x-pack/plugins/observability/server/ui_settings.ts @@ -29,11 +29,16 @@ import { const technicalPreviewLabel = i18n.translate( 'xpack.observability.uiSettings.technicalPreviewLabel', - { - defaultMessage: 'technical preview', - } + { defaultMessage: 'technical preview' } ); +function feedbackLink({ href }: { href: string }) { + return `${i18n.translate( + 'xpack.observability.uiSettings.giveFeedBackLabel', + { defaultMessage: 'Give feedback' } + )}`; +} + type UiSettings = UiSettingsParams & { showInLabs?: boolean }; /** @@ -167,12 +172,7 @@ export const uiSettings: Record = { '{technicalPreviewLabel} Enable the Service groups feature on APM UI. {feedbackLink}.', values: { technicalPreviewLabel: `[${technicalPreviewLabel}]`, - feedbackLink: - '' + - i18n.translate('xpack.observability.enableServiceGroups.feedbackLinkText', { - defaultMessage: 'Give feedback', - }) + - '', + feedbackLink: feedbackLink({ href: 'https://ela.st/feedback-service-groups' }), }, }), schema: schema.boolean(), @@ -206,15 +206,7 @@ export const uiSettings: Record = { '{technicalPreviewLabel} Default APM Service Inventory page sort (for Services without Machine Learning applied) to sort by Service Name. {feedbackLink}.', values: { technicalPreviewLabel: `[${technicalPreviewLabel}]`, - feedbackLink: - '' + - i18n.translate( - 'xpack.observability.apmServiceInventoryOptimizedSorting.feedbackLinkText', - { - defaultMessage: 'Give feedback', - } - ) + - '', + feedbackLink: feedbackLink({ href: 'https://ela.st/feedback-apm-page-performance' }), }, } ), @@ -245,12 +237,7 @@ export const uiSettings: Record = { '{technicalPreviewLabel} Enable the APM Trace Explorer feature, that allows you to search and inspect traces with KQL or EQL. {feedbackLink}.', values: { technicalPreviewLabel: `[${technicalPreviewLabel}]`, - feedbackLink: - '' + - i18n.translate('xpack.observability.apmTraceExplorerTabDescription.feedbackLinkText', { - defaultMessage: 'Give feedback', - }) + - '', + feedbackLink: feedbackLink({ href: 'https://ela.st/feedback-trace-explorer' }), }, }), schema: schema.boolean(), @@ -269,12 +256,7 @@ export const uiSettings: Record = { '{technicalPreviewLabel} Enable the APM Operations Breakdown feature, that displays aggregates for backend operations. {feedbackLink}.', values: { technicalPreviewLabel: `[${technicalPreviewLabel}]`, - feedbackLink: - '' + - i18n.translate('xpack.observability.apmOperationsBreakdownDescription.feedbackLinkText', { - defaultMessage: 'Give feedback', - }) + - '', + feedbackLink: feedbackLink({ href: 'https://ela.st/feedback-operations-breakdown' }), }, }), schema: schema.boolean(), @@ -318,12 +300,7 @@ export const uiSettings: Record = { '{technicalPreviewLabel} Display Amazon Lambda metrics in the service metrics tab. {feedbackLink}', values: { technicalPreviewLabel: `[${technicalPreviewLabel}]`, - feedbackLink: - '' + - i18n.translate('xpack.observability.awsLambdaDescription', { - defaultMessage: 'Send feedback', - }) + - '', + feedbackLink: feedbackLink({ href: 'https://ela.st/feedback-aws-lambda' }), }, }), schema: schema.boolean(), From bad534f71b7f8b975b392794195dcf36eee60759 Mon Sep 17 00:00:00 2001 From: Jiawei Wu <74562234+JiaweiWu@users.noreply.github.com> Date: Tue, 27 Sep 2022 12:44:37 -0600 Subject: [PATCH 16/95] [RAM] Split bulk snooze options into 4 menu options (snooze/unsnooze/schedule/unschedule) (#141785) * Split bulk snooze options into 4 items * Update x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/bulk_snooze_modal.tsx Co-authored-by: Lisa Cawley Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> Co-authored-by: Lisa Cawley --- .../rule_quick_edit_buttons.test.tsx | 55 ++++++++++-- .../components/rule_quick_edit_buttons.tsx | 84 ++++++++++++++++++ .../components/bulk_snooze_modal.tsx | 86 +++++++++++++++---- .../components/bulk_snooze_schedule_modal.tsx | 49 ++++++----- .../rules_list/components/rules_list.test.tsx | 67 ++++++++++++++- .../rules_list/components/rules_list.tsx | 43 +++++++++- 6 files changed, 337 insertions(+), 47 deletions(-) diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/rule_quick_edit_buttons.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/rule_quick_edit_buttons.test.tsx index 4e6ae5c7cdb91..1605f09ebc0f5 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/rule_quick_edit_buttons.test.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/rule_quick_edit_buttons.test.tsx @@ -20,9 +20,13 @@ jest.mock('../../../../common/lib/kibana', () => ({ const setRulesToUpdateAPIKey = jest.fn(); const setRulesToSnooze = jest.fn(); +const setRulesToUnsnooze = jest.fn(); const setRulesToSchedule = jest.fn(); +const setRulesToUnschedule = jest.fn(); const setRulesToSnoozeFilter = jest.fn(); +const setRulesToUnsnoozeFilter = jest.fn(); const setRulesToScheduleFilter = jest.fn(); +const setRulesToUnscheduleFilter = jest.fn(); const setRulesToUpdateAPIKeyFilter = jest.fn(); describe('rule_quick_edit_buttons', () => { @@ -46,9 +50,13 @@ describe('rule_quick_edit_buttons', () => { setRulesToDelete={() => {}} setRulesToUpdateAPIKey={() => {}} setRulesToSnooze={() => {}} + setRulesToUnsnooze={() => {}} setRulesToSchedule={() => {}} + setRulesToUnschedule={() => {}} setRulesToSnoozeFilter={() => {}} + setRulesToUnsnoozeFilter={() => {}} setRulesToScheduleFilter={() => {}} + setRulesToUnscheduleFilter={() => {}} setRulesToUpdateAPIKeyFilter={() => {}} /> ); @@ -58,7 +66,9 @@ describe('rule_quick_edit_buttons', () => { expect(wrapper.find('[data-test-subj="updateAPIKeys"]').exists()).toBeTruthy(); expect(wrapper.find('[data-test-subj="deleteAll"]').exists()).toBeTruthy(); expect(wrapper.find('[data-test-subj="bulkSnooze"]').exists()).toBeTruthy(); + expect(wrapper.find('[data-test-subj="bulkUnsnooze"]').exists()).toBeTruthy(); expect(wrapper.find('[data-test-subj="bulkSnoozeSchedule"]').exists()).toBeTruthy(); + expect(wrapper.find('[data-test-subj="bulkRemoveSnoozeSchedule"]').exists()).toBeTruthy(); }); it('renders enableAll if rules are all disabled', async () => { @@ -77,9 +87,13 @@ describe('rule_quick_edit_buttons', () => { setRulesToDelete={() => {}} setRulesToUpdateAPIKey={() => {}} setRulesToSnooze={() => {}} + setRulesToUnsnooze={() => {}} setRulesToSchedule={() => {}} + setRulesToUnschedule={() => {}} setRulesToSnoozeFilter={() => {}} + setRulesToUnsnoozeFilter={() => {}} setRulesToScheduleFilter={() => {}} + setRulesToUnscheduleFilter={() => {}} setRulesToUpdateAPIKeyFilter={() => {}} /> ); @@ -104,20 +118,27 @@ describe('rule_quick_edit_buttons', () => { setRulesToDelete={() => {}} setRulesToUpdateAPIKey={() => {}} setRulesToSnooze={() => {}} + setRulesToUnsnooze={() => {}} setRulesToSchedule={() => {}} + setRulesToUnschedule={() => {}} setRulesToSnoozeFilter={() => {}} + setRulesToUnsnoozeFilter={() => {}} setRulesToScheduleFilter={() => {}} + setRulesToUnscheduleFilter={() => {}} setRulesToUpdateAPIKeyFilter={() => {}} /> ); expect(wrapper.find('[data-test-subj="disableAll"]').first().prop('isDisabled')).toBeTruthy(); expect(wrapper.find('[data-test-subj="deleteAll"]').first().prop('isDisabled')).toBeTruthy(); - - expect(wrapper.find('[data-test-subj="updateAPIKeys"]').first().prop('isDiabled')).toBeFalsy(); - expect(wrapper.find('[data-test-subj="bulkSnooze"]').first().prop('isDiabled')).toBeFalsy(); + expect(wrapper.find('[data-test-subj="updateAPIKeys"]').first().prop('isDisabled')).toBeFalsy(); + expect(wrapper.find('[data-test-subj="bulkSnooze"]').first().prop('isDisabled')).toBeFalsy(); + expect(wrapper.find('[data-test-subj="bulkUnsnooze"]').first().prop('isDisabled')).toBeFalsy(); + expect( + wrapper.find('[data-test-subj="bulkSnoozeSchedule"]').first().prop('isDisabled') + ).toBeFalsy(); expect( - wrapper.find('[data-test-subj="bulkSnoozeSchedule"]').first().prop('isDiabled') + wrapper.find('[data-test-subj="bulkRemoveSnoozeSchedule"]').first().prop('isDisabled') ).toBeFalsy(); }); @@ -137,10 +158,14 @@ describe('rule_quick_edit_buttons', () => { onActionPerformed={() => {}} setRulesToDelete={() => {}} setRulesToSnooze={setRulesToSnooze} + setRulesToUnsnooze={setRulesToUnsnooze} setRulesToSchedule={setRulesToSchedule} + setRulesToUnschedule={setRulesToUnschedule} setRulesToUpdateAPIKey={setRulesToUpdateAPIKey} setRulesToSnoozeFilter={setRulesToSnoozeFilter} + setRulesToUnsnoozeFilter={setRulesToUnsnoozeFilter} setRulesToScheduleFilter={setRulesToScheduleFilter} + setRulesToUnscheduleFilter={setRulesToUnscheduleFilter} setRulesToUpdateAPIKeyFilter={setRulesToUpdateAPIKeyFilter} /> ); @@ -148,14 +173,22 @@ describe('rule_quick_edit_buttons', () => { wrapper.find('[data-test-subj="bulkSnooze"]').first().simulate('click'); expect(setRulesToSnooze).toHaveBeenCalledTimes(1); + wrapper.find('[data-test-subj="bulkUnsnooze"]').first().simulate('click'); + expect(setRulesToUnsnooze).toHaveBeenCalledTimes(1); + wrapper.find('[data-test-subj="bulkSnoozeSchedule"]').first().simulate('click'); expect(setRulesToSchedule).toHaveBeenCalledTimes(1); + wrapper.find('[data-test-subj="bulkRemoveSnoozeSchedule"]').first().simulate('click'); + expect(setRulesToUnschedule).toHaveBeenCalledTimes(1); + wrapper.find('[data-test-subj="updateAPIKeys"]').first().simulate('click'); expect(setRulesToUpdateAPIKey).toHaveBeenCalledTimes(1); expect(setRulesToSnoozeFilter).not.toHaveBeenCalled(); + expect(setRulesToUnsnoozeFilter).not.toHaveBeenCalled(); expect(setRulesToScheduleFilter).not.toHaveBeenCalled(); + expect(setRulesToUnscheduleFilter).not.toHaveBeenCalled(); expect(setRulesToUpdateAPIKeyFilter).not.toHaveBeenCalled(); }); @@ -175,10 +208,14 @@ describe('rule_quick_edit_buttons', () => { onActionPerformed={() => {}} setRulesToDelete={() => {}} setRulesToSnooze={setRulesToSnooze} + setRulesToUnsnooze={setRulesToUnsnooze} setRulesToSchedule={setRulesToSchedule} + setRulesToUnschedule={setRulesToUnschedule} setRulesToUpdateAPIKey={setRulesToUpdateAPIKey} setRulesToSnoozeFilter={setRulesToSnoozeFilter} + setRulesToUnsnoozeFilter={setRulesToUnsnoozeFilter} setRulesToScheduleFilter={setRulesToScheduleFilter} + setRulesToUnscheduleFilter={setRulesToUnscheduleFilter} setRulesToUpdateAPIKeyFilter={setRulesToUpdateAPIKeyFilter} /> ); @@ -186,14 +223,22 @@ describe('rule_quick_edit_buttons', () => { wrapper.find('[data-test-subj="bulkSnooze"]').first().simulate('click'); expect(setRulesToSnoozeFilter).toHaveBeenCalledTimes(1); + wrapper.find('[data-test-subj="bulkUnsnooze"]').first().simulate('click'); + expect(setRulesToUnsnoozeFilter).toHaveBeenCalledTimes(1); + wrapper.find('[data-test-subj="bulkSnoozeSchedule"]').first().simulate('click'); expect(setRulesToScheduleFilter).toHaveBeenCalledTimes(1); + wrapper.find('[data-test-subj="bulkRemoveSnoozeSchedule"]').first().simulate('click'); + expect(setRulesToUnscheduleFilter).toHaveBeenCalledTimes(1); + wrapper.find('[data-test-subj="updateAPIKeys"]').first().simulate('click'); expect(setRulesToUpdateAPIKeyFilter).toHaveBeenCalledTimes(1); - expect(setRulesToSchedule).not.toHaveBeenCalled(); expect(setRulesToSnooze).not.toHaveBeenCalled(); + expect(setRulesToUnsnooze).not.toHaveBeenCalled(); + expect(setRulesToSchedule).not.toHaveBeenCalled(); + expect(setRulesToUnschedule).not.toHaveBeenCalled(); expect(setRulesToUpdateAPIKey).not.toHaveBeenCalled(); }); }); diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/rule_quick_edit_buttons.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/rule_quick_edit_buttons.tsx index 0b7db1ebeceba..c91c461993a54 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/rule_quick_edit_buttons.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/rule_quick_edit_buttons.tsx @@ -25,14 +25,20 @@ export type ComponentOpts = { onPerformingAction?: () => void; onActionPerformed?: () => void; isSnoozingRules?: boolean; + isUnsnoozingRules?: boolean; isSchedulingRules?: boolean; + isUnschedulingRules?: boolean; isUpdatingRuleAPIKeys?: boolean; setRulesToDelete: React.Dispatch>; setRulesToUpdateAPIKey: React.Dispatch>; setRulesToSnooze: React.Dispatch>; + setRulesToUnsnooze: React.Dispatch>; setRulesToSchedule: React.Dispatch>; + setRulesToUnschedule: React.Dispatch>; setRulesToSnoozeFilter: React.Dispatch>; + setRulesToUnsnoozeFilter: React.Dispatch>; setRulesToScheduleFilter: React.Dispatch>; + setRulesToUnscheduleFilter: React.Dispatch>; setRulesToUpdateAPIKeyFilter: React.Dispatch>; } & BulkOperationsComponentOpts; @@ -65,16 +71,22 @@ export const RuleQuickEditButtons: React.FunctionComponent = ({ onPerformingAction = noop, onActionPerformed = noop, isSnoozingRules = false, + isUnsnoozingRules = false, isSchedulingRules = false, + isUnschedulingRules = false, isUpdatingRuleAPIKeys = false, enableRules, disableRules, setRulesToDelete, setRulesToUpdateAPIKey, setRulesToSnooze, + setRulesToUnsnooze, setRulesToSchedule, + setRulesToUnschedule, setRulesToSnoozeFilter, + setRulesToUnsnoozeFilter, setRulesToScheduleFilter, + setRulesToUnscheduleFilter, setRulesToUpdateAPIKeyFilter, }: ComponentOpts) => { const { @@ -90,7 +102,9 @@ export const RuleQuickEditButtons: React.FunctionComponent = ({ isDisablingRules || isDeletingRules || isSnoozingRules || + isUnsnoozingRules || isSchedulingRules || + isUnschedulingRules || isUpdatingRuleAPIKeys; const allRulesDisabled = useMemo(() => { @@ -220,6 +234,28 @@ export const RuleQuickEditButtons: React.FunctionComponent = ({ } } + async function onUnsnoozeAllClick() { + onPerformingAction(); + try { + if (isAllSelected) { + setRulesToUnsnoozeFilter(getFilter()); + } else { + setRulesToUnsnooze(selectedItems); + } + } catch (e) { + toasts.addDanger({ + title: i18n.translate( + 'xpack.triggersActionsUI.sections.rulesList.bulkActionPopover.failedToSnoozeRules', + { + defaultMessage: 'Failed to snooze or unsnooze rules', + } + ), + }); + } finally { + onActionPerformed(); + } + } + async function onScheduleAllClick() { onPerformingAction(); try { @@ -242,6 +278,28 @@ export const RuleQuickEditButtons: React.FunctionComponent = ({ } } + async function onUnscheduleAllClick() { + onPerformingAction(); + try { + if (isAllSelected) { + setRulesToUnscheduleFilter(getFilter()); + } else { + setRulesToUnschedule(selectedItems); + } + } catch (e) { + toasts.addDanger({ + title: i18n.translate( + 'xpack.triggersActionsUI.sections.rulesList.bulkActionPopover.failedToSnoozeRules', + { + defaultMessage: 'Failed to snooze or unsnooze rules', + } + ), + }); + } finally { + onActionPerformed(); + } + } + return ( = ({ />     + + + + + = ({ /> + + + + + void; onSave: () => void; - setIsLoading: (isLoading: boolean) => void; + setIsSnoozingRule: (isLoading: boolean) => void; + setIsUnsnoozingRule: (isLoading: boolean) => void; onSearchPopulate?: (filter: string) => void; } & BulkOperationsComponentOpts; @@ -43,13 +47,29 @@ const failureMessage = i18n.translate( } ); +const deleteConfirmPlural = (total: number) => + i18n.translate('xpack.triggersActionsUI.sections.rulesList.bulkUnsnoozeConfirmationPlural', { + defaultMessage: 'Unsnooze {total, plural, one {# rule} other {# rules}}? ', + values: { total }, + }); + +const deleteConfirmSingle = (ruleName: string) => + i18n.translate('xpack.triggersActionsUI.sections.rulesList.bulkUnsnoozeConfirmationSingle', { + defaultMessage: 'Unsnooze {ruleName}?', + values: { ruleName }, + }); + export const BulkSnoozeModal = (props: BulkSnoozeModalProps) => { const { rulesToSnooze, + rulesToUnsnooze, rulesToSnoozeFilter, + rulesToUnsnoozeFilter, + numberOfSelectedRules = 0, onClose, onSave, - setIsLoading, + setIsSnoozingRule, + setIsUnsnoozingRule, onSearchPopulate, bulkSnoozeRules, bulkUnsnoozeRules, @@ -68,12 +88,12 @@ export const BulkSnoozeModal = (props: BulkSnoozeModalProps) => { return rulesToSnooze.length > 0; }, [rulesToSnooze, rulesToSnoozeFilter]); - const isSnoozed = useMemo(() => { - if (rulesToSnoozeFilter) { + const isUnsnoozeModalOpen = useMemo(() => { + if (rulesToUnsnoozeFilter) { return true; } - return rulesToSnooze.some((item) => isRuleSnoozed(item)); - }, [rulesToSnooze, rulesToSnoozeFilter]); + return rulesToUnsnooze.length > 0; + }, [rulesToUnsnooze, rulesToUnsnoozeFilter]); const interval = useMemo(() => { if (rulesToSnoozeFilter) { @@ -87,7 +107,7 @@ export const BulkSnoozeModal = (props: BulkSnoozeModalProps) => { const onSnoozeRule = async (schedule: SnoozeSchedule) => { onClose(); - setIsLoading(true); + setIsSnoozingRule(true); try { const response = await bulkSnoozeRules({ ids: rulesToSnooze.map((item) => item.id), @@ -100,18 +120,17 @@ export const BulkSnoozeModal = (props: BulkSnoozeModalProps) => { title: failureMessage, }); } - setIsLoading(false); + setIsSnoozingRule(false); onSave(); }; - const onUnsnoozeRule = async (scheduleIds?: string[]) => { + const onUnsnoozeRule = async () => { onClose(); - setIsLoading(true); + setIsUnsnoozingRule(true); try { const response = await bulkUnsnoozeRules({ - ids: rulesToSnooze.map((item) => item.id), - filter: rulesToSnoozeFilter, - scheduleIds, + ids: rulesToUnsnooze.map((item) => item.id), + filter: rulesToUnsnoozeFilter, }); showToast(response, 'snooze'); } catch (error) { @@ -119,10 +138,42 @@ export const BulkSnoozeModal = (props: BulkSnoozeModalProps) => { title: failureMessage, }); } - setIsLoading(false); + setIsUnsnoozingRule(false); onSave(); }; + const confirmationTitle = useMemo(() => { + if (!rulesToUnsnoozeFilter && numberOfSelectedRules === 1 && rulesToUnsnooze[0]) { + return deleteConfirmSingle(rulesToUnsnooze[0].name); + } + return deleteConfirmPlural(numberOfSelectedRules); + }, [rulesToUnsnooze, rulesToUnsnoozeFilter, numberOfSelectedRules]); + + if (isUnsnoozeModalOpen) { + return ( + + ); + } + if (isSnoozeModalOpen) { return ( @@ -138,11 +189,11 @@ export const BulkSnoozeModal = (props: BulkSnoozeModalProps) => { @@ -153,6 +204,7 @@ export const BulkSnoozeModal = (props: BulkSnoozeModalProps) => { ); } + return null; }; diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/bulk_snooze_schedule_modal.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/bulk_snooze_schedule_modal.tsx index 56293c01614de..cbf009acaa9ae 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/bulk_snooze_schedule_modal.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/bulk_snooze_schedule_modal.tsx @@ -5,18 +5,18 @@ * 2.0. */ -import React, { useMemo, useState } from 'react'; +import React, { useMemo } from 'react'; import { FormattedMessage } from '@kbn/i18n-react'; import { i18n } from '@kbn/i18n'; import { + EuiConfirmModal, EuiModal, EuiModalHeader, + EuiModalHeaderTitle, EuiModalBody, EuiModalFooter, EuiSpacer, EuiButtonEmpty, - EuiModalHeaderTitle, - EuiConfirmModal, } from '@elastic/eui'; import { withBulkRuleOperations, @@ -49,24 +49,30 @@ const deleteConfirmSingle = (ruleName: string) => export type BulkSnoozeScheduleModalProps = { rulesToSchedule: RuleTableItem[]; + rulesToUnschedule: RuleTableItem[]; rulesToScheduleFilter?: string; + rulesToUnscheduleFilter?: string; numberOfSelectedRules?: number; onClose: () => void; onSave: () => void; - setIsLoading: (isLoading: boolean) => void; + setIsSchedulingRule: (isLoading: boolean) => void; + setIsUnschedulingRule: (isLoading: boolean) => void; onSearchPopulate?: (filter: string) => void; } & BulkOperationsComponentOpts; export const BulkSnoozeScheduleModal = (props: BulkSnoozeScheduleModalProps) => { const { rulesToSchedule, + rulesToUnschedule, rulesToScheduleFilter, + rulesToUnscheduleFilter, numberOfSelectedRules = 0, onClose, onSave, bulkSnoozeRules, bulkUnsnoozeRules, - setIsLoading, + setIsSchedulingRule, + setIsUnschedulingRule, onSearchPopulate, } = props; @@ -76,8 +82,6 @@ export const BulkSnoozeScheduleModal = (props: BulkSnoozeScheduleModalProps) => const { showToast } = useBulkEditResponse({ onSearchPopulate }); - const [showConfirmation, setShowConfirmation] = useState(false); - const isScheduleModalOpen = useMemo(() => { if (rulesToScheduleFilter) { return true; @@ -85,9 +89,16 @@ export const BulkSnoozeScheduleModal = (props: BulkSnoozeScheduleModalProps) => return rulesToSchedule.length > 0; }, [rulesToSchedule, rulesToScheduleFilter]); + const isUnscheduleModalOpen = useMemo(() => { + if (rulesToUnscheduleFilter) { + return true; + } + return rulesToUnschedule.length > 0; + }, [rulesToUnschedule, rulesToUnscheduleFilter]); + const onAddSnoozeSchedule = async (schedule: SnoozeSchedule) => { onClose(); - setIsLoading(true); + setIsSchedulingRule(true); try { const response = await bulkSnoozeRules({ ids: rulesToSchedule.map((item) => item.id), @@ -100,18 +111,17 @@ export const BulkSnoozeScheduleModal = (props: BulkSnoozeScheduleModalProps) => title: failureMessage, }); } - setIsLoading(false); + setIsSchedulingRule(false); onSave(); }; const onRemoveSnoozeSchedule = async () => { - setShowConfirmation(false); onClose(); - setIsLoading(true); + setIsUnschedulingRule(true); try { const response = await bulkUnsnoozeRules({ - ids: rulesToSchedule.map((item) => item.id), - filter: rulesToScheduleFilter, + ids: rulesToUnschedule.map((item) => item.id), + filter: rulesToUnscheduleFilter, scheduleIds: [], }); showToast(response, 'snoozeSchedule'); @@ -120,7 +130,7 @@ export const BulkSnoozeScheduleModal = (props: BulkSnoozeScheduleModalProps) => title: failureMessage, }); } - setIsLoading(false); + setIsUnschedulingRule(false); onSave(); }; @@ -131,14 +141,11 @@ export const BulkSnoozeScheduleModal = (props: BulkSnoozeScheduleModalProps) => return deleteConfirmPlural(numberOfSelectedRules); }, [rulesToSchedule, rulesToScheduleFilter, numberOfSelectedRules]); - if (showConfirmation) { + if (isUnscheduleModalOpen) { return ( { - setShowConfirmation(false); - onClose(); - }} + onCancel={onClose} onConfirm={onRemoveSnoozeSchedule} confirmButtonText={i18n.translate( 'xpack.triggersActionsUI.sections.rulesList.bulkDeleteConfirmButton', @@ -154,6 +161,7 @@ export const BulkSnoozeScheduleModal = (props: BulkSnoozeScheduleModalProps) => )} buttonColor="danger" defaultFocusedButton="confirm" + data-test-subj="bulkRemoveScheduleConfirmationModal" /> ); } @@ -172,13 +180,12 @@ export const BulkSnoozeScheduleModal = (props: BulkSnoozeScheduleModalProps) => setShowConfirmation(true)} + onCancelSchedules={onRemoveSnoozeSchedule} onClose={() => {}} /> diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.test.tsx index 3bde062935a86..6bfe953e28696 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.test.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.test.tsx @@ -80,8 +80,14 @@ jest.mock('../../../../common/get_experimental_features', () => ({ const ruleTags = ['a', 'b', 'c', 'd']; -const { loadRuleTypes, updateAPIKey, loadRuleTags, bulkSnoozeRules, bulkUpdateAPIKey } = - jest.requireMock('../../../lib/rule_api'); +const { + loadRuleTypes, + updateAPIKey, + loadRuleTags, + bulkSnoozeRules, + bulkUnsnoozeRules, + bulkUpdateAPIKey, +} = jest.requireMock('../../../lib/rule_api'); const { loadRuleAggregationsWithKueryFilter } = jest.requireMock( '../../../lib/rule_api/aggregate_kuery_filter' ); @@ -1994,6 +2000,33 @@ describe.skip('Rules list bulk actions', () => { ); }); + it('can bulk unsnooze', async () => { + await setup(); + wrapper.find('[data-test-subj="checkboxSelectRow-1"]').at(1).simulate('change'); + wrapper.find('[data-test-subj="selectAllRulesButton"]').at(1).simulate('click'); + wrapper.find('[data-test-subj="showBulkActionButton"]').first().simulate('click'); + + // Unselect something to test filtering + wrapper.find('[data-test-subj="checkboxSelectRow-2"]').at(1).simulate('change'); + + wrapper.find('[data-test-subj="bulkUnsnooze"]').first().simulate('click'); + + expect(wrapper.find('[data-test-subj="bulkUnsnoozeConfirmationModal"]').exists()).toBeTruthy(); + wrapper.find('[data-test-subj="confirmModalConfirmButton"]').first().simulate('click'); + + await act(async () => { + await nextTick(); + wrapper.update(); + }); + + expect(bulkUnsnoozeRules).toHaveBeenCalledWith( + expect.objectContaining({ + ids: [], + filter: 'NOT (alert.id: "alert:2")', + }) + ); + }); + it('can bulk add snooze schedule', async () => { await setup(); wrapper.find('[data-test-subj="checkboxSelectRow-1"]').at(1).simulate('change'); @@ -2020,6 +2053,36 @@ describe.skip('Rules list bulk actions', () => { ); }); + it('can bulk remove snooze schedule', async () => { + await setup(); + wrapper.find('[data-test-subj="checkboxSelectRow-1"]').at(1).simulate('change'); + wrapper.find('[data-test-subj="selectAllRulesButton"]').at(1).simulate('click'); + wrapper.find('[data-test-subj="showBulkActionButton"]').first().simulate('click'); + + // Unselect something to test filtering + wrapper.find('[data-test-subj="checkboxSelectRow-2"]').at(1).simulate('change'); + + wrapper.find('[data-test-subj="bulkRemoveSnoozeSchedule"]').first().simulate('click'); + + expect( + wrapper.find('[data-test-subj="bulkRemoveScheduleConfirmationModal"]').exists() + ).toBeTruthy(); + wrapper.find('[data-test-subj="confirmModalConfirmButton"]').first().simulate('click'); + + await act(async () => { + await nextTick(); + wrapper.update(); + }); + + expect(bulkUnsnoozeRules).toHaveBeenCalledWith( + expect.objectContaining({ + ids: [], + filter: 'NOT (alert.id: "alert:2")', + scheduleIds: [], + }) + ); + }); + it('can bulk update API key', async () => { await setup(); wrapper.find('[data-test-subj="checkboxSelectRow-1"]').at(1).simulate('change'); diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.tsx index a725a0e916c19..0061e56d48498 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.tsx @@ -209,14 +209,22 @@ export const RulesList = ({ const [rulesToSnooze, setRulesToSnooze] = useState([]); const [rulesToSnoozeFilter, setRulesToSnoozeFilter] = useState(''); + const [rulesToUnsnooze, setRulesToUnsnooze] = useState([]); + const [rulesToUnsnoozeFilter, setRulesToUnsnoozeFilter] = useState(''); + const [rulesToSchedule, setRulesToSchedule] = useState([]); const [rulesToScheduleFilter, setRulesToScheduleFilter] = useState(''); + const [rulesToUnschedule, setRulesToUnschedule] = useState([]); + const [rulesToUnscheduleFilter, setRulesToUnscheduleFilter] = useState(''); + const [rulesToUpdateAPIKey, setRulesToUpdateAPIKey] = useState([]); const [rulesToUpdateAPIKeyFilter, setRulesToUpdateAPIKeyFilter] = useState(''); const [isSnoozingRules, setIsSnoozingRules] = useState(false); const [isSchedulingRules, setIsSchedulingRules] = useState(false); + const [isUnsnoozingRules, setIsUnsnoozingRules] = useState(false); + const [isUnschedulingRules, setIsUnschedulingRules] = useState(false); const [isUpdatingRuleAPIKeys, setIsUpdatingRuleAPIKeys] = useState(false); const hasAnyAuthorizedRuleType = useMemo(() => { @@ -597,11 +605,21 @@ export const RulesList = ({ setRulesToSnoozeFilter(''); }; + const clearRulesToUnsnooze = () => { + setRulesToUnsnooze([]); + setRulesToUnsnoozeFilter(''); + }; + const clearRulesToSchedule = () => { setRulesToSchedule([]); setRulesToScheduleFilter(''); }; + const clearRulesToUnschedule = () => { + setRulesToUnschedule([]); + setRulesToUnscheduleFilter(''); + }; + const clearRulesToUpdateAPIKey = () => { setRulesToUpdateAPIKey([]); setRulesToUpdateAPIKeyFilter(''); @@ -613,7 +631,9 @@ export const RulesList = ({ ruleTypesState.isLoading || isPerformingAction || isSnoozingRules || + isUnsnoozingRules || isSchedulingRules || + isUnschedulingRules || isUpdatingRuleAPIKeys ); }, [ @@ -621,7 +641,9 @@ export const RulesList = ({ ruleTypesState, isPerformingAction, isSnoozingRules, + isUnsnoozingRules, isSchedulingRules, + isUnschedulingRules, isUpdatingRuleAPIKeys, ]); @@ -903,14 +925,20 @@ export const RulesList = ({ setIsPerformingAction(false); }} isSnoozingRules={isSnoozingRules} + isUnsnoozingRules={isUnsnoozingRules} isSchedulingRules={isSchedulingRules} + isUnschedulingRules={isUnschedulingRules} isUpdatingRuleAPIKeys={isUpdatingRuleAPIKeys} setRulesToDelete={setRulesToDelete} setRulesToUpdateAPIKey={setRulesToUpdateAPIKey} setRulesToSnooze={setRulesToSnooze} + setRulesToUnsnooze={setRulesToUnsnooze} setRulesToSchedule={setRulesToSchedule} + setRulesToUnschedule={setRulesToUnschedule} setRulesToSnoozeFilter={setRulesToSnoozeFilter} + setRulesToUnsnoozeFilter={setRulesToUnsnoozeFilter} setRulesToScheduleFilter={setRulesToScheduleFilter} + setRulesToUnscheduleFilter={setRulesToUnscheduleFilter} setRulesToUpdateAPIKeyFilter={setRulesToUpdateAPIKeyFilter} /> @@ -983,13 +1011,19 @@ export const RulesList = ({ /> { clearRulesToSnooze(); + clearRulesToUnsnooze(); }} onSave={async () => { clearRulesToSnooze(); + clearRulesToUnsnooze(); onClearSelection(); await loadData(); }} @@ -997,14 +1031,19 @@ export const RulesList = ({ /> { clearRulesToSchedule(); + clearRulesToUnschedule(); }} onSave={async () => { clearRulesToSchedule(); + clearRulesToUnschedule(); onClearSelection(); await loadData(); }} From 7af3f3945c7a1f35048f338bb1110dbe28b6fff8 Mon Sep 17 00:00:00 2001 From: Byron Hulcher Date: Tue, 27 Sep 2022 14:51:55 -0400 Subject: [PATCH 17/95] Allow empty nextSyncConfig field in register connector request (#141986) --- .../server/routes/enterprise_search/connectors.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugins/enterprise_search/server/routes/enterprise_search/connectors.ts b/x-pack/plugins/enterprise_search/server/routes/enterprise_search/connectors.ts index c0dcc2dbdb0a9..0aaf30ef126d4 100644 --- a/x-pack/plugins/enterprise_search/server/routes/enterprise_search/connectors.ts +++ b/x-pack/plugins/enterprise_search/server/routes/enterprise_search/connectors.ts @@ -114,7 +114,7 @@ export function registerConnectorRoutes({ router, log }: RouteDependencies) { connectorId: schema.string(), }), body: schema.object({ - nextSyncConfig: schema.string(), + nextSyncConfig: schema.maybe(schema.string()), }), }, }, From 504d8c4c700c8d8d1b2c7796b3915c2bc41b2c40 Mon Sep 17 00:00:00 2001 From: Paul Tavares <56442535+paul-tavares@users.noreply.github.com> Date: Tue, 27 Sep 2022 14:54:15 -0400 Subject: [PATCH 18/95] [Security Solution][Endpoint] Generic hook to handle Response Actions API interactions (#141224) - New general hook (`useConsoleActionSubmitter()`) for handling response console commands that need to generate an endpoint response action - Refactored all Response Actions to use new hook - Fixed bug in `useIsMounted()` hook --- .../common/endpoint/schema/actions.ts | 2 + .../common/endpoint/types/actions.ts | 1 + .../artifact_list_page.test.tsx | 2 +- .../artifact_list_page/artifact_list_page.tsx | 4 +- .../components/artifact_delete_modal.test.ts | 2 +- .../components/artifact_flyout.test.tsx | 2 +- .../components/artifact_flyout.tsx | 12 +- .../hooks/use_with_artifact_list_data.ts | 8 +- .../management/components/console/types.ts | 2 +- .../get_processes_action.test.tsx | 4 +- .../get_processes_action.tsx | 257 +++++---------- .../components/endpoint_responder/hooks.tsx | 100 ------ .../use_console_action_submitter.test.tsx | 275 +++++++++++++++++ .../hooks/use_console_action_submitter.tsx | 292 ++++++++++++++++++ .../isolate_action.test.tsx | 6 +- .../endpoint_responder/isolate_action.tsx | 54 ++-- .../kill_process_action.test.tsx | 8 +- .../kill_process_action.tsx | 144 ++------- .../release_action.test.tsx | 6 +- .../endpoint_responder/release_action.tsx | 55 ++-- .../suspend_process_action.test.tsx | 8 +- .../suspend_process_action.tsx | 144 ++------- .../components/endpoint_responder/types.ts | 22 +- .../endpoint_responder/utils.test.ts | 4 +- .../components/endpoint_responder/utils.ts | 10 +- .../components/page_overlay/page_overlay.tsx | 8 +- .../public/management/hooks/use_is_mounted.ts | 26 -- .../{components/mocks.tsx => mocks/utils.ts} | 3 +- .../policy_artifacts_delete_modal.test.tsx | 2 +- .../translations/translations/fr-FR.json | 5 - .../translations/translations/ja-JP.json | 5 - .../translations/translations/zh-CN.json | 5 - 32 files changed, 806 insertions(+), 672 deletions(-) delete mode 100644 x-pack/plugins/security_solution/public/management/components/endpoint_responder/hooks.tsx create mode 100644 x-pack/plugins/security_solution/public/management/components/endpoint_responder/hooks/use_console_action_submitter.test.tsx create mode 100644 x-pack/plugins/security_solution/public/management/components/endpoint_responder/hooks/use_console_action_submitter.tsx delete mode 100644 x-pack/plugins/security_solution/public/management/hooks/use_is_mounted.ts rename x-pack/plugins/security_solution/public/management/{components/mocks.tsx => mocks/utils.ts} (93%) diff --git a/x-pack/plugins/security_solution/common/endpoint/schema/actions.ts b/x-pack/plugins/security_solution/common/endpoint/schema/actions.ts index 08adac7c9ede0..8b982e6e6f463 100644 --- a/x-pack/plugins/security_solution/common/endpoint/schema/actions.ts +++ b/x-pack/plugins/security_solution/common/endpoint/schema/actions.ts @@ -28,6 +28,8 @@ export const NoParametersRequestSchema = { body: schema.object({ ...BaseActionRequestSchema }), }; +export type BaseActionRequestBody = TypeOf; + export const KillOrSuspendProcessRequestSchema = { body: schema.object({ ...BaseActionRequestSchema, diff --git a/x-pack/plugins/security_solution/common/endpoint/types/actions.ts b/x-pack/plugins/security_solution/common/endpoint/types/actions.ts index bcbdcfb3b66b8..91eb10c5f45a2 100644 --- a/x-pack/plugins/security_solution/common/endpoint/types/actions.ts +++ b/x-pack/plugins/security_solution/common/endpoint/types/actions.ts @@ -253,6 +253,7 @@ export interface PendingActionsResponse { } export type PendingActionsRequestQuery = TypeOf; + export interface ActionDetails { /** The action id */ id: string; diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/artifact_list_page.test.tsx b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/artifact_list_page.test.tsx index 9160732e32b3e..6780335312251 100644 --- a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/artifact_list_page.test.tsx +++ b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/artifact_list_page.test.tsx @@ -12,7 +12,7 @@ import { act, fireEvent, waitFor, waitForElementToBeRemoved } from '@testing-lib import userEvent from '@testing-library/user-event'; import type { ArtifactListPageRenderingSetup } from './mocks'; import { getArtifactListPageRenderingSetup } from './mocks'; -import { getDeferred } from '../mocks'; +import { getDeferred } from '../../mocks/utils'; jest.mock('../../../common/components/user_privileges'); diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/artifact_list_page.tsx b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/artifact_list_page.tsx index fc687282cccac..0586034d15550 100644 --- a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/artifact_list_page.tsx +++ b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/artifact_list_page.tsx @@ -11,6 +11,7 @@ import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-t import { EuiButton, EuiSpacer, EuiText } from '@elastic/eui'; import type { EuiFlyoutSize } from '@elastic/eui/src/components/flyout/flyout'; import { useLocation } from 'react-router-dom'; +import { useIsMounted } from '@kbn/securitysolution-hook-utils'; import type { ServerApiError } from '../../../common/types'; import { AdministrationListPage } from '../administration_list_page'; @@ -45,7 +46,6 @@ import { useToasts } from '../../../common/lib/kibana'; import { useMemoizedRouteState } from '../../common/hooks'; import { BackToExternalAppSecondaryButton } from '../back_to_external_app_secondary_button'; import { BackToExternalAppButton } from '../back_to_external_app_button'; -import { useIsMounted } from '../../hooks/use_is_mounted'; type ArtifactEntryCardType = typeof ArtifactEntryCard; @@ -221,7 +221,7 @@ export const ArtifactListPage = memo( ); const handleArtifactDeleteModalOnSuccess = useCallback(() => { - if (isMounted) { + if (isMounted()) { setSelectedItemForDelete(undefined); refetchListData(); } diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/components/artifact_delete_modal.test.ts b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/components/artifact_delete_modal.test.ts index d0fb3e3c59dfa..57ea165f0b85f 100644 --- a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/components/artifact_delete_modal.test.ts +++ b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/components/artifact_delete_modal.test.ts @@ -11,7 +11,7 @@ import type { ArtifactListPageRenderingSetup } from '../mocks'; import { getArtifactListPageRenderingSetup } from '../mocks'; import { act, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { getDeferred } from '../../mocks'; +import { getDeferred } from '../../../mocks/utils'; describe('When displaying the Delete artifact modal in the Artifact List Page', () => { let renderResult: ReturnType; diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/components/artifact_flyout.test.tsx b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/components/artifact_flyout.test.tsx index ee3ac4a907ee4..5179bb7b76be6 100644 --- a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/components/artifact_flyout.test.tsx +++ b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/components/artifact_flyout.test.tsx @@ -19,7 +19,7 @@ import type { trustedAppsAllHttpMocks } from '../../../mocks'; import { useUserPrivileges as _useUserPrivileges } from '../../../../common/components/user_privileges'; import { entriesToConditionEntries } from '../../../../common/utils/exception_list_items/mappers'; import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types'; -import { getDeferred } from '../../mocks'; +import { getDeferred } from '../../../mocks/utils'; jest.mock('../../../../common/components/user_privileges'); const useUserPrivileges = _useUserPrivileges as jest.Mock; diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/components/artifact_flyout.tsx b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/components/artifact_flyout.tsx index 4d9f53c73341e..1261d01c7af44 100644 --- a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/components/artifact_flyout.tsx +++ b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/components/artifact_flyout.tsx @@ -24,6 +24,7 @@ import { import type { EuiFlyoutSize } from '@elastic/eui/src/components/flyout/flyout'; import type { IHttpFetchError } from '@kbn/core-http-browser'; +import { useIsMounted } from '@kbn/securitysolution-hook-utils'; import { useUrlParams } from '../../../hooks/use_url_params'; import { useIsFlyoutOpened } from '../hooks/use_is_flyout_opened'; import { useTestIdGenerator } from '../../../hooks/use_test_id_generator'; @@ -39,7 +40,6 @@ import { useKibana, useToasts } from '../../../../common/lib/kibana'; import { createExceptionListItemForCreate } from '../../../../../common/endpoint/service/artifacts/utils'; import { useWithArtifactSubmitData } from '../hooks/use_with_artifact_submit_data'; import { useIsArtifactAllowedPerPolicyUsage } from '../hooks/use_is_artifact_allowed_per_policy_usage'; -import { useIsMounted } from '../../../hooks/use_is_mounted'; import { useGetArtifact } from '../../../hooks/artifacts'; import type { PolicyData } from '../../../../../common/endpoint/types'; @@ -271,7 +271,7 @@ export const ArtifactFlyout = memo( const handleFormComponentOnChange: ArtifactFormComponentProps['onChange'] = useCallback( ({ item: updatedItem, isValid }) => { - if (isMounted) { + if (isMounted()) { setFormState({ item: updatedItem, isValid, @@ -289,7 +289,7 @@ export const ArtifactFlyout = memo( : labels.flyoutCreateSubmitSuccess(result) ); - if (isMounted) { + if (isMounted()) { // Close the flyout // `undefined` will cause params to be dropped from url setUrlParams({ ...urlParams, itemId: undefined, show: undefined }, true); @@ -307,12 +307,12 @@ export const ArtifactFlyout = memo( submitHandler(formState.item, formMode) .then(handleSuccess) .catch((submitHandlerError) => { - if (isMounted) { + if (isMounted()) { setExternalSubmitHandlerError(submitHandlerError); } }) .finally(() => { - if (isMounted) { + if (isMounted()) { setExternalIsSubmittingData(false); } }); @@ -326,7 +326,7 @@ export const ArtifactFlyout = memo( useEffect(() => { if (isEditFlow && !hasItemDataForEdit && !error && isInitializing && !isLoadingItemForEdit) { fetchItemForEdit().then(({ data: editItemData }) => { - if (editItemData && isMounted) { + if (editItemData && isMounted()) { setFormState(createFormInitialState(apiClient.listId, editItemData)); } }); diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/hooks/use_with_artifact_list_data.ts b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/hooks/use_with_artifact_list_data.ts index 813e205b64c9a..ddae258fef895 100644 --- a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/hooks/use_with_artifact_list_data.ts +++ b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/hooks/use_with_artifact_list_data.ts @@ -8,8 +8,8 @@ import { useEffect, useMemo, useState } from 'react'; import type { Pagination } from '@elastic/eui'; import { useQuery } from '@tanstack/react-query'; +import { useIsMounted } from '@kbn/securitysolution-hook-utils'; import type { ServerApiError } from '../../../../common/types'; -import { useIsMounted } from '../../../hooks/use_is_mounted'; import { MANAGEMENT_PAGE_SIZE_OPTIONS } from '../../../common/constants'; import { useUrlParams } from '../../../hooks/use_url_params'; import type { ExceptionsListApiClient } from '../../../services/exceptions_list/exceptions_list_api_client'; @@ -98,7 +98,7 @@ export const useWithArtifactListData = ( // Once we know if data exists, update the page initializing state. // This should only ever happen at most once; useEffect(() => { - if (isMounted) { + if (isMounted()) { if (isPageInitializing && !isLoadingDataExists) { setIsPageInitializing(false); } @@ -107,7 +107,7 @@ export const useWithArtifactListData = ( // Update the uiPagination once the query succeeds useEffect(() => { - if (isMounted && listData && !isLoadingListData && isSuccessListData) { + if (isMounted() && listData && !isLoadingListData && isSuccessListData) { setUiPagination((prevState) => { return { ...prevState, @@ -134,7 +134,7 @@ export const useWithArtifactListData = ( // >> Check if data exists again (which should return true useEffect(() => { if ( - isMounted && + isMounted() && !isLoadingListData && !isLoadingDataExists && !listDataError && diff --git a/x-pack/plugins/security_solution/public/management/components/console/types.ts b/x-pack/plugins/security_solution/public/management/components/console/types.ts index 2d863e7878be2..5b90a18f27ce1 100644 --- a/x-pack/plugins/security_solution/public/management/components/console/types.ts +++ b/x-pack/plugins/security_solution/public/management/components/console/types.ts @@ -168,7 +168,7 @@ export type CommandExecutionComponent< /** The arguments that could have been entered by the user */ TArgs extends SupportedArguments = any, /** Internal store for the Command execution */ - TStore extends object = Record, + TStore extends object = any, /** The metadata defined on the Command Definition */ TMeta = any > = ComponentType>; diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/get_processes_action.test.tsx b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/get_processes_action.test.tsx index 29b6fd0446577..97689a790afa1 100644 --- a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/get_processes_action.test.tsx +++ b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/get_processes_action.test.tsx @@ -129,7 +129,7 @@ describe('When using processes action from response actions console', () => { enterConsoleCommand(renderResult, 'processes'); await waitFor(() => { - expect(renderResult.getByTestId('getProcessesErrorCallout').textContent).toMatch( + expect(renderResult.getByTestId('getProcesses-actionFailure').textContent).toMatch( /error one \| error two/ ); }); @@ -145,7 +145,7 @@ describe('When using processes action from response actions console', () => { enterConsoleCommand(renderResult, 'processes'); await waitFor(() => { - expect(renderResult.getByTestId('performGetProcessesErrorCallout').textContent).toMatch( + expect(renderResult.getByTestId('getProcesses-apiFailure').textContent).toMatch( /this is an error/ ); }); diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/get_processes_action.tsx b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/get_processes_action.tsx index c778f03fcb5f5..d7b05ae721abd 100644 --- a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/get_processes_action.tsx +++ b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/get_processes_action.tsx @@ -5,21 +5,17 @@ * 2.0. */ -import React, { memo, useEffect, useMemo } from 'react'; +import React, { memo, useMemo } from 'react'; import styled from 'styled-components'; import { EuiBasicTable } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; -import type { IHttpFetchError } from '@kbn/core-http-browser'; -import { FormattedMessage } from '@kbn/i18n-react'; +import { useConsoleActionSubmitter } from './hooks/use_console_action_submitter'; import type { - ActionDetails, GetProcessesActionOutputContent, + ProcessesRequestBody, } from '../../../../common/endpoint/types'; -import { useGetActionDetails } from '../../hooks/endpoint/use_get_action_details'; -import type { EndpointCommandDefinitionMeta } from './types'; -import type { CommandExecutionComponentProps } from '../console/types'; import { useSendGetEndpointProcessesRequest } from '../../hooks/endpoint/use_send_get_endpoint_processes_request'; -import { ActionError } from './action_error'; +import type { ActionRequestComponentProps } from './types'; // @ts-expect-error TS2769 const StyledEuiBasicTable = styled(EuiBasicTable)` @@ -43,181 +39,90 @@ const StyledEuiBasicTable = styled(EuiBasicTable)` } `; -export const GetProcessesActionResult = memo< - CommandExecutionComponentProps< - { comment?: string }, - { - actionId?: string; - actionRequestSent?: boolean; - completedActionDetails?: ActionDetails; - apiError?: IHttpFetchError; - }, - EndpointCommandDefinitionMeta - > ->(({ command, setStore, store, status, setStatus, ResultComponent }) => { - const endpointId = command.commandDefinition?.meta?.endpointId; - const { actionId, completedActionDetails, apiError } = store; - - const isPending = status === 'pending'; - const isError = status === 'error'; - const actionRequestSent = Boolean(store.actionRequestSent); - - const { - mutate: getProcesses, - data: getProcessesData, - isSuccess: isGetProcessesSuccess, - error: processesActionRequestError, - } = useSendGetEndpointProcessesRequest(); - - const { data: actionDetails } = useGetActionDetails( - actionId ?? '-', - { - enabled: Boolean(actionId) && isPending, - refetchInterval: isPending ? 3000 : false, - } - ); - - // Send get processes request if not yet done - useEffect(() => { - if (!actionRequestSent && endpointId) { - getProcesses({ - endpoint_ids: [endpointId], - comment: command.args.args?.comment?.[0], - }); - - setStore((prevState) => { - return { ...prevState, actionRequestSent: true }; - }); - } - }, [actionRequestSent, command.args.args?.comment, endpointId, getProcesses, setStore]); +export const GetProcessesActionResult = memo( + ({ command, setStore, store, status, setStatus, ResultComponent }) => { + const endpointId = command.commandDefinition?.meta?.endpointId; + const actionCreator = useSendGetEndpointProcessesRequest(); + + const actionRequestBody = useMemo(() => { + return endpointId + ? { + endpoint_ids: [endpointId], + comment: command.args.args?.comment?.[0], + } + : undefined; + }, [command.args.args?.comment, endpointId]); + + const { result, actionDetails: completedActionDetails } = useConsoleActionSubmitter< + ProcessesRequestBody, + GetProcessesActionOutputContent + >({ + ResultComponent, + setStore, + store, + status, + setStatus, + actionCreator, + actionRequestBody, + dataTestSubj: 'getProcesses', + }); + + const columns = useMemo( + () => [ + { + field: 'user', + name: i18n.translate( + 'xpack.securitySolution.endpointResponseActions.getProcesses.table.header.user', + { defaultMessage: 'USER' } + ), + width: '10%', + }, + { + field: 'pid', + name: i18n.translate( + 'xpack.securitySolution.endpointResponseActions.getProcesses.table.header.pid', + { defaultMessage: 'PID' } + ), + width: '5%', + }, + { + field: 'entity_id', + name: i18n.translate( + 'xpack.securitySolution.endpointResponseActions.getProcesses.table.header.enityId', + { defaultMessage: 'ENTITY ID' } + ), + width: '30%', + }, + + { + field: 'command', + name: i18n.translate( + 'xpack.securitySolution.endpointResponseActions.getProcesses.table.header.command', + { defaultMessage: 'COMMAND' } + ), + width: '55%', + }, + ], + [] + ); - // If get processes request was created, store the action id if necessary - useEffect(() => { - if (isPending) { - if (isGetProcessesSuccess && actionId !== getProcessesData?.data.id) { - setStore((prevState) => { - return { ...prevState, actionId: getProcessesData?.data.id }; - }); - } else if (processesActionRequestError) { - setStatus('error'); - setStore((prevState) => { - return { ...prevState, apiError: processesActionRequestError }; - }); + const tableEntries = useMemo(() => { + if (endpointId) { + return completedActionDetails?.outputs?.[endpointId]?.content.entries ?? []; } - } - }, [ - actionId, - getProcessesData?.data.id, - processesActionRequestError, - isGetProcessesSuccess, - setStatus, - setStore, - isPending, - ]); - - useEffect(() => { - if (actionDetails?.data.isCompleted && isPending) { - setStatus('success'); - setStore((prevState) => { - return { - ...prevState, - completedActionDetails: actionDetails?.data, - }; - }); - } - }, [actionDetails?.data, setStatus, setStore, isPending]); - - const columns = useMemo( - () => [ - { - field: 'user', - name: i18n.translate( - 'xpack.securitySolution.endpointResponseActions.getProcesses.table.header.user', - { defaultMessage: 'USER' } - ), - width: '10%', - }, - { - field: 'pid', - name: i18n.translate( - 'xpack.securitySolution.endpointResponseActions.getProcesses.table.header.pid', - { defaultMessage: 'PID' } - ), - width: '5%', - }, - { - field: 'entity_id', - name: i18n.translate( - 'xpack.securitySolution.endpointResponseActions.getProcesses.table.header.enityId', - { defaultMessage: 'ENTITY ID' } - ), - width: '30%', - }, - - { - field: 'command', - name: i18n.translate( - 'xpack.securitySolution.endpointResponseActions.getProcesses.table.header.command', - { defaultMessage: 'COMMAND' } - ), - width: '55%', - }, - ], - [] - ); + return []; + }, [completedActionDetails?.outputs, endpointId]); - const tableEntries = useMemo(() => { - if (endpointId) { - return completedActionDetails?.outputs?.[endpointId]?.content.entries ?? []; + if (!completedActionDetails || !completedActionDetails.wasSuccessful) { + return result; } - return []; - }, [completedActionDetails?.outputs, endpointId]); - - // Show nothing if still pending - if (isPending) { - return ; - } - // Show errors if perform action fails - if (isError && apiError) { + // Show results return ( - - + + ); } - - // Show errors - if (completedActionDetails?.errors) { - return ( - - ); - } - - // Show results - return ( - - - - ); -}); +); GetProcessesActionResult.displayName = 'GetProcessesActionResult'; diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/hooks.tsx b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/hooks.tsx deleted file mode 100644 index bbc390bb2ba53..0000000000000 --- a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/hooks.tsx +++ /dev/null @@ -1,100 +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 { useEffect, useRef } from 'react'; -import { useIsMounted } from '../../hooks/use_is_mounted'; -import { useGetActionDetails } from '../../hooks/endpoint/use_get_action_details'; -import { ACTION_DETAILS_REFRESH_INTERVAL } from './constants'; -import type { ActionRequestState, ActionRequestComponentProps } from './types'; -import type { useSendIsolateEndpointRequest } from '../../hooks/endpoint/use_send_isolate_endpoint_request'; -import type { useSendReleaseEndpointRequest } from '../../hooks/endpoint/use_send_release_endpoint_request'; - -export const useUpdateActionState = ({ - actionRequestApi, - actionRequest, - command, - endpointId, - setStatus, - setStore, - isPending, -}: Pick & { - actionRequestApi: ReturnType< - typeof useSendIsolateEndpointRequest | typeof useSendReleaseEndpointRequest - >; - actionRequest?: ActionRequestState; - endpointId?: string; - isPending: boolean; -}) => { - const isMounted = useIsMounted(); - const actionRequestSent = Boolean(actionRequest?.requestSent); - const { data: actionDetails } = useGetActionDetails(actionRequest?.actionId ?? '-', { - enabled: Boolean(actionRequest?.actionId) && isPending, - refetchInterval: isPending ? ACTION_DETAILS_REFRESH_INTERVAL : false, - }); - - // keep a reference to track the console's mounted state - // in order to update the store and cause a re-render on action request API response - const latestIsMounted = useRef(false); - latestIsMounted.current = isMounted; - - // Create action request - useEffect(() => { - if (!actionRequestSent && endpointId && isMounted) { - const request: ActionRequestState = { - requestSent: true, - actionId: undefined, - }; - - actionRequestApi - .mutateAsync({ - endpoint_ids: [endpointId], - comment: command.args.args?.comment?.[0], - }) - .then((response) => { - request.actionId = response.data.id; - - if (latestIsMounted.current) { - setStore((prevState) => { - return { ...prevState, actionRequest: { ...request } }; - }); - } - }); - - setStore((prevState) => { - return { ...prevState, actionRequest: request }; - }); - } - }, [ - actionRequestApi, - actionRequestSent, - command.args.args?.comment, - endpointId, - isMounted, - setStore, - ]); - - useEffect(() => { - // update the console's mounted state ref - latestIsMounted.current = isMounted; - // set to false when unmounted/console is hidden - return () => { - latestIsMounted.current = false; - }; - }, [isMounted]); - - useEffect(() => { - if (actionDetails?.data.isCompleted && isPending) { - setStatus('success'); - setStore((prevState) => { - return { - ...prevState, - completedActionDetails: actionDetails.data, - }; - }); - } - }, [actionDetails?.data, actionDetails?.data.isCompleted, setStatus, setStore, isPending]); -}; diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/hooks/use_console_action_submitter.test.tsx b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/hooks/use_console_action_submitter.test.tsx new file mode 100644 index 0000000000000..7ef506ea30f32 --- /dev/null +++ b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/hooks/use_console_action_submitter.test.tsx @@ -0,0 +1,275 @@ +/* + * 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 type { + UseConsoleActionSubmitterOptions, + ConsoleActionSubmitter, + CommandResponseActionApiState, +} from './use_console_action_submitter'; +import { useConsoleActionSubmitter } from './use_console_action_submitter'; +import type { AppContextTestRender } from '../../../../common/mock/endpoint'; +import { createAppRootMockRenderer } from '../../../../common/mock/endpoint'; +import { EndpointActionGenerator } from '../../../../../common/endpoint/data_generators/endpoint_action_generator'; +import React, { useState } from 'react'; +import type { CommandExecutionResultProps } from '../../console'; +import type { DeferredInterface } from '../../../mocks/utils'; +import { getDeferred } from '../../../mocks/utils'; +import type { ActionDetails } from '../../../../../common/endpoint/types'; +import { act, waitFor } from '@testing-library/react'; +import { responseActionsHttpMocks } from '../../../mocks/response_actions_http_mocks'; + +describe('When using `useConsoleActionSubmitter()` hook', () => { + let render: () => ReturnType; + let renderResult: ReturnType; + let renderArgs: UseConsoleActionSubmitterOptions; + let updateHookRenderArgs: () => void; + let hookRenderResultStorage: jest.Mock<(args: ConsoleActionSubmitter) => void>; + let releaseSuccessActionRequestApiResponse: DeferredInterface['resolve']; + let releaseFailedActionRequestApiResponse: DeferredInterface['reject']; + let apiMocks: ReturnType; + + const ActionSubmitterTestComponent = () => { + const [hookOptions, setHookOptions] = useState(renderArgs); + + updateHookRenderArgs = () => { + new Promise((r) => { + setTimeout(r, 1); + }).then(() => { + setHookOptions({ + ...renderArgs, + }); + }); + }; + + const { result, actionDetails } = useConsoleActionSubmitter(hookOptions); + + hookRenderResultStorage({ result, actionDetails }); + + return
    {result}
    ; + }; + + const getOutputTextContent = (): string => { + return renderResult.getByTestId('testContainer').textContent ?? ''; + }; + + beforeEach(() => { + const { render: renderComponent, coreStart } = createAppRootMockRenderer(); + const actionGenerator = new EndpointActionGenerator(); + const deferred = getDeferred(); + + apiMocks = responseActionsHttpMocks(coreStart.http); + + hookRenderResultStorage = jest.fn(); + releaseSuccessActionRequestApiResponse = () => + deferred.resolve(actionGenerator.generateActionDetails({ id: '123' })); + releaseFailedActionRequestApiResponse = deferred.reject; + + let status: UseConsoleActionSubmitterOptions['status'] = 'pending'; + let commandStore: CommandResponseActionApiState = {}; + + renderArgs = { + dataTestSubj: 'test', + actionRequestBody: { + endpoint_ids: ['123'], + }, + actionCreator: { + mutateAsync: jest.fn(async () => { + return { + data: await deferred.promise, + }; + }), + } as unknown as UseConsoleActionSubmitterOptions['actionCreator'], + get status() { + return status; + }, + setStatus: jest.fn((newStatus) => { + status = newStatus; + updateHookRenderArgs(); + }), + get store() { + return commandStore; + }, + setStore: jest.fn((newStoreOrCallback: object | ((prevStore: object) => object)) => { + if (typeof newStoreOrCallback === 'function') { + commandStore = newStoreOrCallback(commandStore); + } else { + commandStore = newStoreOrCallback; + } + + updateHookRenderArgs(); + }), + ResultComponent: jest.fn( + ({ children, showAs, 'data-test-subj': dataTestSubj }: CommandExecutionResultProps) => { + return ( +
    + {children} +
    + ); + } + ), + }; + + render = () => { + renderResult = renderComponent(); + return renderResult; + }; + }); + + afterEach(() => { + renderResult.unmount(); + }); + + it('should return expected interface while its still pending', () => { + render(); + + expect(hookRenderResultStorage).toHaveBeenLastCalledWith({ + result: expect.anything(), + action: undefined, + }); + + expect(renderResult.getByTestId('test-pending')).not.toBeNull(); + }); + + it('should update command state when request is sent', () => { + render(); + + expect(renderArgs.store?.actionApiState?.request.sent).toBe(true); + expect(renderArgs.store?.actionApiState?.request.actionId).toBe(undefined); + }); + + it('should store the action id when action request api is successful', async () => { + render(); + + releaseSuccessActionRequestApiResponse(); + + await waitFor(() => { + expect(renderArgs.store?.actionApiState?.request.actionId).toBe('123'); + }); + }); + + it('should store action request api error', async () => { + render(); + const error = new Error('oh oh. request failed'); + + act(() => { + releaseFailedActionRequestApiResponse(error); + }); + + await waitFor(() => { + expect(renderArgs.store?.actionApiState?.request.actionId).toBe(undefined); + expect(renderArgs.store?.actionApiState?.request.error).toBe(error); + }); + + await waitFor(() => { + expect(getOutputTextContent()).toEqual( + 'The following error was encountered:oh oh. request failed' + ); + }); + }); + + it('should still store the action id if component is unmounted while action request API is in flight', async () => { + render(); + renderResult.unmount(); + + expect(renderArgs.store.actionApiState?.request.sent).toBe(true); + + const requestState = renderArgs.store.actionApiState?.request; + releaseSuccessActionRequestApiResponse(); + + await waitFor(() => { + // this check just ensure that we mutated the state when the api returned success instead of + // dispatching a `setStore()`. + expect(renderArgs.store.actionApiState?.request === requestState).toBe(true); + + expect(renderArgs.store.actionApiState?.request.actionId).toEqual('123'); + }); + }); + + it('should call action details api once we have an action id', async () => { + render(); + + expect(apiMocks.responseProvider.actionDetails).not.toHaveBeenCalled(); + + releaseSuccessActionRequestApiResponse(); + + await waitFor(() => { + expect(apiMocks.responseProvider.actionDetails).toHaveBeenCalledWith({ + path: '/api/endpoint/action/123', + }); + }); + }); + + it('should continue to show pending message until action completes', async () => { + apiMocks.responseProvider.actionDetails.mockImplementation(() => { + return { + data: new EndpointActionGenerator().generateActionDetails({ + id: '123', + isCompleted: false, + }), + }; + }); + render(); + releaseSuccessActionRequestApiResponse(); + + await waitFor(() => { + expect(apiMocks.responseProvider.actionDetails).toHaveBeenCalledWith({ + path: '/api/endpoint/action/123', + }); + }); + + expect(renderResult.getByTestId('test-pending')).not.toBeNull(); + + expect(hookRenderResultStorage).toHaveBeenLastCalledWith({ + result: expect.anything(), + actionDetails: undefined, + }); + }); + + it('should store action details api error', async () => { + const error = new Error('on oh. getting action details failed'); + apiMocks.responseProvider.actionDetails.mockImplementation(() => { + throw error; + }); + + render(); + releaseSuccessActionRequestApiResponse(); + + await waitFor(() => { + expect(apiMocks.responseProvider.actionDetails).toHaveBeenCalledWith({ + path: '/api/endpoint/action/123', + }); + }); + + expect(renderArgs.store.actionApiState?.actionDetailsError).toBe(error); + + expect(renderResult.getByTestId('test-apiFailure').textContent).toEqual( + 'The following error was encountered:on oh. getting action details failed' + ); + }); + + it('should store action details once action completes', async () => { + const actionDetails = new EndpointActionGenerator().generateActionDetails({ id: '123' }); + apiMocks.responseProvider.actionDetails.mockReturnValue({ data: actionDetails }); + + render(); + releaseSuccessActionRequestApiResponse(); + + await waitFor(() => { + expect(apiMocks.responseProvider.actionDetails).toHaveBeenCalledWith({ + path: '/api/endpoint/action/123', + }); + }); + + expect(renderArgs.store.actionApiState?.actionDetails).toBe(actionDetails); + expect(hookRenderResultStorage).toHaveBeenLastCalledWith({ + result: expect.anything(), + actionDetails, + }); + + expect(renderResult.getByTestId('test-success').textContent).toEqual(''); + }); +}); diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/hooks/use_console_action_submitter.tsx b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/hooks/use_console_action_submitter.tsx new file mode 100644 index 0000000000000..7183b5cc61ef7 --- /dev/null +++ b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/hooks/use_console_action_submitter.tsx @@ -0,0 +1,292 @@ +/* + * 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, useMemo } from 'react'; +import type { UseMutationResult } from '@tanstack/react-query'; +import type { IHttpFetchError } from '@kbn/core-http-browser'; +import { FormattedMessage } from '@kbn/i18n-react'; +import { useIsMounted } from '@kbn/securitysolution-hook-utils'; +import { useTestIdGenerator } from '../../../hooks/use_test_id_generator'; +import type { BaseActionRequestBody } from '../../../../../common/endpoint/schema/actions'; +import { ActionSuccess } from '../action_success'; +import { ActionError } from '../action_error'; +import { FormattedError } from '../../formatted_error'; +import { useGetActionDetails } from '../../../hooks/endpoint/use_get_action_details'; +import { ACTION_DETAILS_REFRESH_INTERVAL } from '../constants'; +import type { + ActionDetails, + Immutable, + ResponseActionApiResponse, +} from '../../../../../common/endpoint/types'; +import type { CommandExecutionComponentProps } from '../../console'; + +export interface ConsoleActionSubmitter { + /** + * The ui to be returned to the console. This UI will display different states of the action, + * including pending, error conditions and generic success messages. + */ + result: JSX.Element; + actionDetails: Immutable> | undefined; +} + +/** + * Command store state for response action api state. + */ +export interface CommandResponseActionApiState { + actionApiState?: { + request: { + sent: boolean; + actionId: string | undefined; + error: IHttpFetchError | undefined; + }; + actionDetails: ActionDetails | undefined; + actionDetailsError: IHttpFetchError | undefined; + }; +} + +export interface UseConsoleActionSubmitterOptions< + TReqBody extends BaseActionRequestBody = BaseActionRequestBody, + TActionOutputContent extends object = object +> extends Pick< + // eslint-disable-next-line @typescript-eslint/no-explicit-any + CommandExecutionComponentProps>, + 'ResultComponent' | 'setStore' | 'store' | 'status' | 'setStatus' + > { + actionCreator: UseMutationResult; + /** + * The API request body. If `undefined`, then API will not be called. + */ + actionRequestBody: TReqBody | undefined; + + dataTestSubj?: string; +} + +/** + * generic hook for use with Response Action commands. It will create the action, store its ID and + * continuously pull the Action's Details until it completes. It handles all aspects of UI display + * for the different states of the command (pending -> success/failure) + * + * @param actionCreator + * @param actionRequestBody + * @param setStatus + * @param status + * @param setStore + * @param store + * @param ResultComponent + * @param dataTestSubj + */ +export const useConsoleActionSubmitter = < + TReqBody extends BaseActionRequestBody = BaseActionRequestBody, + TActionOutputContent extends object = object +>({ + actionCreator, + actionRequestBody, + setStatus, + status, + setStore, + store, + ResultComponent, + dataTestSubj, +}: UseConsoleActionSubmitterOptions< + TReqBody, + TActionOutputContent +>): ConsoleActionSubmitter => { + const isMounted = useIsMounted(); + const getTestId = useTestIdGenerator(dataTestSubj); + const isPending = status === 'pending'; + + const currentActionState = useMemo< + Immutable>['actionApiState']> + >( + () => + store.actionApiState ?? { + request: { + sent: false, + error: undefined, + actionId: undefined, + }, + actionDetails: undefined, + actionDetailsError: undefined, + }, + [store.actionApiState] + ); + + const { actionDetails, actionDetailsError } = currentActionState; + const { + actionId, + sent: actionRequestSent, + error: actionRequestError, + } = currentActionState.request; + + const { data: apiActionDetailsResponse, error: apiActionDetailsError } = + useGetActionDetails(actionId ?? '-', { + enabled: Boolean(actionId) && isPending, + refetchInterval: isPending ? ACTION_DETAILS_REFRESH_INTERVAL : false, + }); + + // Create the action request if not yet done + useEffect(() => { + if (!actionRequestSent && actionRequestBody && isMounted()) { + const updatedRequestState: Required< + CommandResponseActionApiState + >['actionApiState']['request'] = { + ...( + currentActionState as Required< + CommandResponseActionApiState + >['actionApiState'] + ).request, + sent: true, + }; + + // The object defined above (`updatedRequestState`) is saved to the command state right away. + // the creation of the Action request (below) will mutate this object to store the Action ID + // once the API response is received. We do this to ensure that the action is not created more + // than once if the user happens to close the console prior to the response being returned. + // Once a response is received, we check if the component is mounted, and if so, then we send + // another update to the command store which will cause it to re-render and start checking for + // action completion. + actionCreator + .mutateAsync(actionRequestBody) + .then((response) => { + updatedRequestState.actionId = response.data.id; + }) + .catch((err) => { + updatedRequestState.error = err; + }) + .finally(() => { + // If the component is mounted, then set the store with the updated data (causes a rerender) + if (isMounted()) { + setStore((prevState) => { + return { + ...prevState, + actionApiState: { + ...(prevState.actionApiState ?? currentActionState), + request: { ...updatedRequestState }, + }, + }; + }); + } + }); + + setStore((prevState) => { + return { + ...prevState, + actionApiState: { + ...(prevState.actionApiState ?? currentActionState), + request: updatedRequestState, + }, + }; + }); + } + }, [ + actionCreator, + actionRequestBody, + actionRequestSent, + currentActionState, + isMounted, + setStore, + ]); + + // If an error was returned while attempting to create the action request, + // then set command status to error + useEffect(() => { + if (actionRequestError && isPending) { + setStatus('error'); + } + }, [actionRequestError, isPending, setStatus]); + + // If an error was return by the Action Details API, then store it and set the status to error + useEffect(() => { + if (apiActionDetailsError && isPending) { + setStatus('error'); + setStore((prevState) => { + return { + ...prevState, + actionApiState: { + ...(prevState.actionApiState ?? currentActionState), + actionDetails: undefined, + actionDetailsError: apiActionDetailsError, + }, + }; + }); + } + }, [apiActionDetailsError, currentActionState, isPending, setStatus, setStore]); + + // If the action details indicates complete, then update the action's console state and set the status to success + useEffect(() => { + if (apiActionDetailsResponse?.data.isCompleted && isPending) { + setStatus(apiActionDetailsResponse?.data.wasSuccessful ? 'success' : 'error'); + setStore((prevState) => { + return { + ...prevState, + actionApiState: { + ...(prevState.actionApiState ?? currentActionState), + actionDetails: apiActionDetailsResponse.data, + }, + // Unclear why I needed to cast this here. For some reason the `ActionDetails['outputs']` is + // reporting a type error for the `content` property, although the types seem to line up. + } as typeof prevState; + }); + } + }, [apiActionDetailsResponse, currentActionState, isPending, setStatus, setStore]); + + // Calculate the action's UI result based on the different API responses + const result = useMemo(() => { + if (isPending) { + return ; + } + + const apiError = actionRequestError || actionDetailsError; + + if (apiError) { + return ( + + + + + ); + } + + if (actionDetails) { + // Response action failures + if (actionDetails.errors) { + return ( + + ); + } + + return ( + + ); + } + + return <>; + }, [ + isPending, + actionRequestError, + actionDetailsError, + actionDetails, + ResultComponent, + getTestId, + ]); + + return { + result, + actionDetails: currentActionState.actionDetails, + }; +}; diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/isolate_action.test.tsx b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/isolate_action.test.tsx index 63e05d420deaf..110ddbb53b1b0 100644 --- a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/isolate_action.test.tsx +++ b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/isolate_action.test.tsx @@ -16,9 +16,9 @@ import { getEndpointResponseActionsConsoleCommands } from './endpoint_response_a import { responseActionsHttpMocks } from '../../mocks/response_actions_http_mocks'; import { enterConsoleCommand } from '../console/mocks'; import { waitFor } from '@testing-library/react'; -import { getDeferred } from '../mocks'; import type { ResponderCapabilities } from '../../../../common/endpoint/constants'; import { RESPONDER_CAPABILITIES } from '../../../../common/endpoint/constants'; +import { getDeferred } from '../../mocks/utils'; describe('When using isolate action from response actions console', () => { let render: ( @@ -115,7 +115,7 @@ describe('When using isolate action from response actions console', () => { enterConsoleCommand(renderResult, 'isolate'); await waitFor(() => { - expect(renderResult.getByTestId('isolateSuccessCallout')).toBeTruthy(); + expect(renderResult.getByTestId('isolate-success')).toBeTruthy(); }); }); @@ -130,7 +130,7 @@ describe('When using isolate action from response actions console', () => { enterConsoleCommand(renderResult, 'isolate'); await waitFor(() => { - expect(renderResult.getByTestId('isolateErrorCallout').textContent).toMatch( + expect(renderResult.getByTestId('isolate-actionFailure').textContent).toMatch( /error one \| error two/ ); }); diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/isolate_action.tsx b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/isolate_action.tsx index ec11d022650ca..8df7692cf3ac2 100644 --- a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/isolate_action.tsx +++ b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/isolate_action.tsx @@ -5,47 +5,37 @@ * 2.0. */ -import React, { memo } from 'react'; +import { memo, useMemo } from 'react'; +import { useConsoleActionSubmitter } from './hooks/use_console_action_submitter'; import type { ActionRequestComponentProps } from './types'; import { useSendIsolateEndpointRequest } from '../../hooks/endpoint/use_send_isolate_endpoint_request'; -import { ActionError } from './action_error'; -import { useUpdateActionState } from './hooks'; export const IsolateActionResult = memo( ({ command, setStore, store, status, setStatus, ResultComponent }) => { - const endpointId = command.commandDefinition?.meta?.endpointId; - const { completedActionDetails, actionRequest } = store; - const isPending = status === 'pending'; const isolateHostApi = useSendIsolateEndpointRequest(); - useUpdateActionState({ - actionRequestApi: isolateHostApi, - actionRequest, - command, - endpointId, - setStatus, - setStore, - isPending, - }); - - // Show nothing if still pending - if (isPending) { - return ; - } + const actionRequestBody = useMemo(() => { + const endpointId = command.commandDefinition?.meta?.endpointId; + const comment = command.args.args?.comment?.[0]; - // Show errors - if (completedActionDetails?.errors) { - return ( - - ); - } + return endpointId + ? { + endpoint_ids: [endpointId], + comment, + } + : undefined; + }, [command.args.args?.comment, command.commandDefinition?.meta?.endpointId]); - // Show Success - return ; + return useConsoleActionSubmitter({ + ResultComponent, + setStore, + store, + status, + setStatus, + actionCreator: isolateHostApi, + actionRequestBody, + dataTestSubj: 'isolate', + }).result; } ); IsolateActionResult.displayName = 'IsolateActionResult'; diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/kill_process_action.test.tsx b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/kill_process_action.test.tsx index 827a4d6191754..f888df2099b13 100644 --- a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/kill_process_action.test.tsx +++ b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/kill_process_action.test.tsx @@ -195,7 +195,7 @@ describe('When using the kill-process action from response actions console', () enterConsoleCommand(renderResult, 'kill-process --pid 123'); await waitFor(() => { - expect(renderResult.getByTestId('killProcessSuccessCallout')).toBeTruthy(); + expect(renderResult.getByTestId('killProcess-success')).toBeTruthy(); }); }); @@ -204,7 +204,7 @@ describe('When using the kill-process action from response actions console', () enterConsoleCommand(renderResult, 'kill-process --entityId 123wer'); await waitFor(() => { - expect(renderResult.getByTestId('killProcessSuccessCallout')).toBeTruthy(); + expect(renderResult.getByTestId('killProcess-success')).toBeTruthy(); }); }); @@ -219,7 +219,7 @@ describe('When using the kill-process action from response actions console', () enterConsoleCommand(renderResult, 'kill-process --pid 123'); await waitFor(() => { - expect(renderResult.getByTestId('killProcessErrorCallout').textContent).toMatch( + expect(renderResult.getByTestId('killProcess-actionFailure').textContent).toMatch( /error one \| error two/ ); }); @@ -234,7 +234,7 @@ describe('When using the kill-process action from response actions console', () enterConsoleCommand(renderResult, 'kill-process --pid 123'); await waitFor(() => { - expect(renderResult.getByTestId('killProcessAPIErrorCallout').textContent).toMatch( + expect(renderResult.getByTestId('killProcess-apiFailure').textContent).toMatch( /this is an error/ ); }); diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/kill_process_action.tsx b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/kill_process_action.tsx index 3e4dcf61d1690..bf501c31b9e85 100644 --- a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/kill_process_action.tsx +++ b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/kill_process_action.tsx @@ -5,130 +5,40 @@ * 2.0. */ -import React, { memo, useEffect } from 'react'; -import { FormattedMessage } from '@kbn/i18n-react'; -import type { IHttpFetchError } from '@kbn/core-http-browser'; +import { memo, useMemo } from 'react'; +import type { KillOrSuspendProcessRequestBody } from '../../../../common/endpoint/types'; import { parsedPidOrEntityIdParameter } from './utils'; -import { ActionSuccess } from './action_success'; -import type { - ActionDetails, - KillProcessActionOutputContent, -} from '../../../../common/endpoint/types'; -import { useGetActionDetails } from '../../hooks/endpoint/use_get_action_details'; -import type { EndpointCommandDefinitionMeta } from './types'; import { useSendKillProcessRequest } from '../../hooks/endpoint/use_send_kill_process_endpoint_request'; -import type { CommandExecutionComponentProps } from '../console/types'; -import { ActionError } from './action_error'; -import { ACTION_DETAILS_REFRESH_INTERVAL } from './constants'; +import type { ActionRequestComponentProps } from './types'; +import { useConsoleActionSubmitter } from './hooks/use_console_action_submitter'; export const KillProcessActionResult = memo< - CommandExecutionComponentProps< - { comment?: string; pid?: string; entityId?: string }, - { - actionId?: string; - actionRequestSent?: boolean; - completedActionDetails?: ActionDetails; - apiError?: IHttpFetchError; - }, - EndpointCommandDefinitionMeta - > + ActionRequestComponentProps<{ pid?: string[]; entityId?: string[] }> >(({ command, setStore, store, status, setStatus, ResultComponent }) => { - const endpointId = command.commandDefinition?.meta?.endpointId; - const { actionId, completedActionDetails, apiError } = store; - const isPending = status === 'pending'; - const isError = status === 'error'; - const actionRequestSent = Boolean(store.actionRequestSent); + const actionCreator = useSendKillProcessRequest(); - const { mutate, data, isSuccess, error } = useSendKillProcessRequest(); - - const { data: actionDetails } = useGetActionDetails( - actionId ?? '-', - { - enabled: Boolean(actionId) && isPending, - refetchInterval: isPending ? ACTION_DETAILS_REFRESH_INTERVAL : false, - } - ); - - // Send Kill request if not yet done - useEffect(() => { + const actionRequestBody = useMemo(() => { + const endpointId = command.commandDefinition?.meta?.endpointId; const parameters = parsedPidOrEntityIdParameter(command.args.args); - if (!actionRequestSent && endpointId && parameters) { - mutate({ - endpoint_ids: [endpointId], - comment: command.args.args?.comment?.[0], - parameters, - }); - setStore((prevState) => { - return { ...prevState, actionRequestSent: true }; - }); - } - }, [actionRequestSent, command.args.args, endpointId, mutate, setStore]); - - // If kill-process request was created, store the action id if necessary - useEffect(() => { - if (isPending) { - if (isSuccess && actionId !== data.data.id) { - setStore((prevState) => { - return { ...prevState, actionId: data.data.id }; - }); - } else if (error) { - setStatus('error'); - setStore((prevState) => { - return { ...prevState, apiError: error }; - }); - } - } - }, [actionId, data?.data.id, isSuccess, error, setStore, setStatus, isPending]); - - useEffect(() => { - if (actionDetails?.data.isCompleted && isPending) { - setStatus('success'); - setStore((prevState) => { - return { - ...prevState, - completedActionDetails: actionDetails.data, - }; - }); - } - }, [actionDetails?.data, setStatus, setStore, isPending]); - - // Show API errors if perform action fails - if (isError && apiError) { - return ( - - - - ); - } - - // Show nothing if still pending - if (isPending || !completedActionDetails) { - return ; - } - - // Show errors - if (completedActionDetails?.errors) { - return ( - - ); - } - - // Show Success - return ( - - ); + return endpointId + ? { + endpoint_ids: [endpointId], + comment: command.args.args?.comment?.[0], + parameters, + } + : undefined; + }, [command.args.args, command.commandDefinition?.meta?.endpointId]); + + return useConsoleActionSubmitter({ + ResultComponent, + setStore, + store, + status, + setStatus, + actionCreator, + actionRequestBody, + dataTestSubj: 'killProcess', + }).result; }); KillProcessActionResult.displayName = 'KillProcessActionResult'; diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/release_action.test.tsx b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/release_action.test.tsx index 19e3be94469eb..d1c1ea264f863 100644 --- a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/release_action.test.tsx +++ b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/release_action.test.tsx @@ -16,9 +16,9 @@ import { getEndpointResponseActionsConsoleCommands } from './endpoint_response_a import { enterConsoleCommand } from '../console/mocks'; import { waitFor } from '@testing-library/react'; import { responseActionsHttpMocks } from '../../mocks/response_actions_http_mocks'; -import { getDeferred } from '../mocks'; import type { ResponderCapabilities } from '../../../../common/endpoint/constants'; import { RESPONDER_CAPABILITIES } from '../../../../common/endpoint/constants'; +import { getDeferred } from '../../mocks/utils'; describe('When using the release action from response actions console', () => { let render: ( @@ -116,7 +116,7 @@ describe('When using the release action from response actions console', () => { enterConsoleCommand(renderResult, 'release'); await waitFor(() => { - expect(renderResult.getByTestId('releaseSuccessCallout')).toBeTruthy(); + expect(renderResult.getByTestId('release-success')).toBeTruthy(); }); }); @@ -131,7 +131,7 @@ describe('When using the release action from response actions console', () => { enterConsoleCommand(renderResult, 'release'); await waitFor(() => { - expect(renderResult.getByTestId('releaseErrorCallout').textContent).toMatch( + expect(renderResult.getByTestId('release-actionFailure').textContent).toMatch( /error one \| error two/ ); }); diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/release_action.tsx b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/release_action.tsx index f789b48671324..9b0f371ca003f 100644 --- a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/release_action.tsx +++ b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/release_action.tsx @@ -5,48 +5,37 @@ * 2.0. */ -import React, { memo } from 'react'; +import { memo, useMemo } from 'react'; import type { ActionRequestComponentProps } from './types'; import { useSendReleaseEndpointRequest } from '../../hooks/endpoint/use_send_release_endpoint_request'; -import { ActionError } from './action_error'; -import { useUpdateActionState } from './hooks'; +import { useConsoleActionSubmitter } from './hooks/use_console_action_submitter'; export const ReleaseActionResult = memo( ({ command, setStore, store, status, setStatus, ResultComponent }) => { - const endpointId = command.commandDefinition?.meta?.endpointId; - const { completedActionDetails, actionRequest } = store; - const isPending = status === 'pending'; - const releaseHostApi = useSendReleaseEndpointRequest(); - useUpdateActionState({ - actionRequestApi: releaseHostApi, - actionRequest, - command, - endpointId, - setStatus, - setStore, - isPending, - }); - - // Show nothing if still pending - if (isPending) { - return ; - } + const actionRequestBody = useMemo(() => { + const endpointId = command.commandDefinition?.meta?.endpointId; + const comment = command.args.args?.comment?.[0]; - // Show errors - if (completedActionDetails?.errors) { - return ( - - ); - } + return endpointId + ? { + endpoint_ids: [endpointId], + comment, + } + : undefined; + }, [command.args.args?.comment, command.commandDefinition?.meta?.endpointId]); - // Show Success - return ; + return useConsoleActionSubmitter({ + ResultComponent, + setStore, + store, + status, + setStatus, + actionCreator: releaseHostApi, + actionRequestBody, + dataTestSubj: 'release', + }).result; } ); ReleaseActionResult.displayName = 'ReleaseActionResult'; diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/suspend_process_action.test.tsx b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/suspend_process_action.test.tsx index 9446fb5dcba6a..7479e52edfb07 100644 --- a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/suspend_process_action.test.tsx +++ b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/suspend_process_action.test.tsx @@ -186,7 +186,7 @@ describe('When using the suspend-process action from response actions console', enterConsoleCommand(renderResult, 'suspend-process --pid 123'); await waitFor(() => { - expect(renderResult.getByTestId('suspendProcessSuccessCallout')).toBeTruthy(); + expect(renderResult.getByTestId('suspendProcess-success')).toBeTruthy(); }); }); @@ -195,7 +195,7 @@ describe('When using the suspend-process action from response actions console', enterConsoleCommand(renderResult, 'suspend-process --entityId 123wer'); await waitFor(() => { - expect(renderResult.getByTestId('suspendProcessSuccessCallout')).toBeTruthy(); + expect(renderResult.getByTestId('suspendProcess-success')).toBeTruthy(); }); }); @@ -210,7 +210,7 @@ describe('When using the suspend-process action from response actions console', enterConsoleCommand(renderResult, 'suspend-process --pid 123'); await waitFor(() => { - expect(renderResult.getByTestId('suspendProcessErrorCallout').textContent).toMatch( + expect(renderResult.getByTestId('suspendProcess-actionFailure').textContent).toMatch( /error one \| error two/ ); }); @@ -225,7 +225,7 @@ describe('When using the suspend-process action from response actions console', enterConsoleCommand(renderResult, 'suspend-process --pid 123'); await waitFor(() => { - expect(renderResult.getByTestId('suspendProcessAPIErrorCallout').textContent).toMatch( + expect(renderResult.getByTestId('suspendProcess-apiFailure').textContent).toMatch( /this is an error/ ); }); diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/suspend_process_action.tsx b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/suspend_process_action.tsx index a60e7eb6bd65b..f8401a81fa114 100644 --- a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/suspend_process_action.tsx +++ b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/suspend_process_action.tsx @@ -5,130 +5,46 @@ * 2.0. */ -import React, { memo, useEffect } from 'react'; -import { FormattedMessage } from '@kbn/i18n-react'; -import type { IHttpFetchError } from '@kbn/core-http-browser'; +import { memo, useMemo } from 'react'; import { parsedPidOrEntityIdParameter } from './utils'; -import { ActionSuccess } from './action_success'; import type { - ActionDetails, SuspendProcessActionOutputContent, + KillOrSuspendProcessRequestBody, } from '../../../../common/endpoint/types'; -import { useGetActionDetails } from '../../hooks/endpoint/use_get_action_details'; -import type { EndpointCommandDefinitionMeta } from './types'; import { useSendSuspendProcessRequest } from '../../hooks/endpoint/use_send_suspend_process_endpoint_request'; -import type { CommandExecutionComponentProps } from '../console/types'; -import { ActionError } from './action_error'; -import { ACTION_DETAILS_REFRESH_INTERVAL } from './constants'; +import type { ActionRequestComponentProps } from './types'; +import { useConsoleActionSubmitter } from './hooks/use_console_action_submitter'; export const SuspendProcessActionResult = memo< - CommandExecutionComponentProps< - { comment?: string; pid?: string; entityId?: string }, - { - actionId?: string; - actionRequestSent?: boolean; - completedActionDetails?: ActionDetails; - apiError?: IHttpFetchError; - }, - EndpointCommandDefinitionMeta - > + ActionRequestComponentProps<{ pid?: string[]; entityId?: string[] }> >(({ command, setStore, store, status, setStatus, ResultComponent }) => { - const endpointId = command.commandDefinition?.meta?.endpointId; - const { actionId, completedActionDetails, apiError } = store; - const isPending = status === 'pending'; - const isError = status === 'error'; - const actionRequestSent = Boolean(store.actionRequestSent); + const actionCreator = useSendSuspendProcessRequest(); - const { mutate, data, isSuccess, error } = useSendSuspendProcessRequest(); - - const { data: actionDetails } = useGetActionDetails( - actionId ?? '-', - { - enabled: Boolean(actionId) && isPending, - refetchInterval: isPending ? ACTION_DETAILS_REFRESH_INTERVAL : false, - } - ); - - // Send Suspend request if not yet done - useEffect(() => { + const actionRequestBody = useMemo(() => { + const endpointId = command.commandDefinition?.meta?.endpointId; const parameters = parsedPidOrEntityIdParameter(command.args.args); - if (!actionRequestSent && endpointId && parameters) { - mutate({ - endpoint_ids: [endpointId], - comment: command.args.args?.comment?.[0], - parameters, - }); - setStore((prevState) => { - return { ...prevState, actionRequestSent: true }; - }); - } - }, [actionRequestSent, command.args.args, endpointId, mutate, setStore]); - - // If suspend-process request was created, store the action id if necessary - useEffect(() => { - if (isPending) { - if (isSuccess && actionId !== data.data.id) { - setStore((prevState) => { - return { ...prevState, actionId: data.data.id }; - }); - } else if (error) { - setStatus('error'); - setStore((prevState) => { - return { ...prevState, apiError: error }; - }); - } - } - }, [actionId, data?.data.id, isSuccess, error, setStore, setStatus, isPending]); - - useEffect(() => { - if (actionDetails?.data.isCompleted && isPending) { - setStatus('success'); - setStore((prevState) => { - return { - ...prevState, - completedActionDetails: actionDetails.data, - }; - }); - } - }, [actionDetails?.data, setStatus, setStore, isPending]); - - // Show API errors if perform action fails - if (isError && apiError) { - return ( - - - - ); - } - - // Show nothing if still pending - if (isPending || !completedActionDetails) { - return ; - } - - // Show errors - if (completedActionDetails?.errors) { - return ( - - ); - } - - // Show Success - return ( - - ); + return endpointId + ? { + endpoint_ids: [endpointId], + comment: command.args.args?.comment?.[0], + parameters, + } + : undefined; + }, [command.args.args, command.commandDefinition?.meta?.endpointId]); + + return useConsoleActionSubmitter< + KillOrSuspendProcessRequestBody, + SuspendProcessActionOutputContent + >({ + ResultComponent, + setStore, + store, + status, + setStatus, + actionCreator, + actionRequestBody, + dataTestSubj: 'suspendProcess', + }).result; }); SuspendProcessActionResult.displayName = 'SuspendProcessActionResult'; diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/types.ts b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/types.ts index 34c306ed0a116..92cc3e8c9017a 100644 --- a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/types.ts +++ b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/types.ts @@ -5,8 +5,9 @@ * 2.0. */ +import type { CommandResponseActionApiState } from './hooks/use_console_action_submitter'; import type { ManagedConsoleExtensionComponentProps } from '../console'; -import type { ActionDetails, HostMetadata } from '../../../../common/endpoint/types'; +import type { HostMetadata } from '../../../../common/endpoint/types'; import type { CommandExecutionComponentProps } from '../console/types'; export interface EndpointCommandDefinitionMeta { @@ -17,16 +18,9 @@ export type EndpointResponderExtensionComponentProps = ManagedConsoleExtensionCo endpoint: HostMetadata; }>; -export interface ActionRequestState { - requestSent: boolean; - actionId?: string; -} - -export type ActionRequestComponentProps = CommandExecutionComponentProps< - { comment?: string }, - { - actionRequest?: ActionRequestState; - completedActionDetails?: ActionDetails; - }, - EndpointCommandDefinitionMeta ->; +export type ActionRequestComponentProps = + CommandExecutionComponentProps< + { comment?: string } & TArgs, + CommandResponseActionApiState, + EndpointCommandDefinitionMeta + >; diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/utils.test.ts b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/utils.test.ts index ab84e9de959f0..48b6753645c92 100644 --- a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/utils.test.ts +++ b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/utils.test.ts @@ -19,9 +19,9 @@ describe('Endpoint Responder - Utilities', () => { expect(parameters).toEqual({ entity_id: '123qwe' }); }); - it('should return undefined if no params are defined', () => { + it('should return entity id with emtpy string if no params are defined', () => { const parameters = parsedPidOrEntityIdParameter({}); - expect(parameters).toEqual(undefined); + expect(parameters).toEqual({ entity_id: '' }); }); }); }); diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/utils.ts b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/utils.ts index 9ebcd090bd2a0..0b8e59d0353f7 100644 --- a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/utils.ts +++ b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/utils.ts @@ -4,17 +4,17 @@ * 2.0; you may not use this file except in compliance with the Elastic License * 2.0. */ -import type { EndpointActionDataParameterTypes } from '../../../../common/endpoint/types'; +import type { ResponseActionParametersWithPidOrEntityId } from '../../../../common/endpoint/types'; export const parsedPidOrEntityIdParameter = (parameters: { pid?: string[]; entityId?: string[]; -}): EndpointActionDataParameterTypes => { +}): ResponseActionParametersWithPidOrEntityId => { if (parameters.pid) { return { pid: Number(parameters.pid[0]) }; - } else if (parameters.entityId) { - return { entity_id: parameters.entityId[0] }; } - return undefined; + return { + entity_id: parameters?.entityId?.[0] ?? '', + }; }; diff --git a/x-pack/plugins/security_solution/public/management/components/page_overlay/page_overlay.tsx b/x-pack/plugins/security_solution/public/management/components/page_overlay/page_overlay.tsx index b5c7629b76aa6..2d3a9c9cb7f07 100644 --- a/x-pack/plugins/security_solution/public/management/components/page_overlay/page_overlay.tsx +++ b/x-pack/plugins/security_solution/public/management/components/page_overlay/page_overlay.tsx @@ -13,6 +13,7 @@ import classnames from 'classnames'; import { useLocation } from 'react-router-dom'; import type { EuiPortalProps } from '@elastic/eui/src/components/portal/portal'; import type { EuiTheme } from '@kbn/kibana-react-plugin/common'; +import { useIsMounted } from '@kbn/securitysolution-hook-utils'; import { useHasFullScreenContent } from '../../../common/containers/use_full_screen'; import { FULL_SCREEN_CONTENT_OVERRIDES_CSS_STYLESHEET, @@ -22,7 +23,6 @@ import { SELECTOR_TIMELINE_IS_VISIBLE_CSS_CLASS_NAME, TIMELINE_EUI_THEME_ZINDEX_LEVEL, } from '../../../timelines/components/timeline/styles'; -import { useIsMounted } from '../../hooks/use_is_mounted'; const OverlayRootContainer = styled.div` border: none; @@ -246,7 +246,7 @@ export const PageOverlay = memo( // Capture the URL `pathname` that the overlay was opened for useEffect(() => { - if (isMounted) { + if (isMounted()) { setOpenedOnPathName((prevState) => { if (isHidden) { return null; @@ -270,7 +270,7 @@ export const PageOverlay = memo( // If `hideOnUrlPathNameChange` is true, then determine if the pathname changed and if so, call `onHide()` useEffect(() => { if ( - isMounted && + isMounted() && onHide && hideOnUrlPathnameChange && !isHidden && @@ -283,7 +283,7 @@ export const PageOverlay = memo( // Handle adding class names to the `document.body` DOM element useEffect(() => { - if (isMounted) { + if (isMounted()) { if (isHidden) { unSetDocumentBodyOverlayIsVisible(); unSetDocumentBodyLock(); diff --git a/x-pack/plugins/security_solution/public/management/hooks/use_is_mounted.ts b/x-pack/plugins/security_solution/public/management/hooks/use_is_mounted.ts deleted file mode 100644 index 0c5a79b2ca2fc..0000000000000 --- a/x-pack/plugins/security_solution/public/management/hooks/use_is_mounted.ts +++ /dev/null @@ -1,26 +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 { useEffect, useState } from 'react'; - -/** - * Track when a component is mounted/unmounted. Good for use in async processing that may update - * a component's internal state. - */ -export const useIsMounted = (): boolean => { - const [isMounted, setIsMounted] = useState(false); - - useEffect(() => { - setIsMounted(true); - - return () => { - setIsMounted(false); - }; - }, []); - - return isMounted; -}; diff --git a/x-pack/plugins/security_solution/public/management/components/mocks.tsx b/x-pack/plugins/security_solution/public/management/mocks/utils.ts similarity index 93% rename from x-pack/plugins/security_solution/public/management/components/mocks.tsx rename to x-pack/plugins/security_solution/public/management/mocks/utils.ts index 45c12df818fd8..946d2d50b05d2 100644 --- a/x-pack/plugins/security_solution/public/management/components/mocks.tsx +++ b/x-pack/plugins/security_solution/public/management/mocks/utils.ts @@ -4,7 +4,8 @@ * 2.0; you may not use this file except in compliance with the Elastic License * 2.0. */ -interface DeferredInterface { + +export interface DeferredInterface { promise: Promise; resolve: (data: T) => void; reject: (e: Error) => void; diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/delete_modal/policy_artifacts_delete_modal.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/delete_modal/policy_artifacts_delete_modal.test.tsx index 37f04ff804c1d..b8f7a8c19fbcd 100644 --- a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/delete_modal/policy_artifacts_delete_modal.test.tsx +++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/delete_modal/policy_artifacts_delete_modal.test.tsx @@ -20,7 +20,7 @@ import { PolicyArtifactsDeleteModal } from './policy_artifacts_delete_modal'; import { exceptionsListAllHttpMocks } from '../../../../../mocks/exceptions_list_http_mocks'; import { ExceptionsListApiClient } from '../../../../../services/exceptions_list/exceptions_list_api_client'; import { POLICY_ARTIFACT_DELETE_MODAL_LABELS } from './translations'; -import { getDeferred } from '../../../../../components/mocks'; +import { getDeferred } from '../../../../../mocks/utils'; const listType: Array = [ 'endpoint_events', diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json index b2984037b0302..56922e26edc21 100644 --- a/x-pack/plugins/translations/translations/fr-FR.json +++ b/x-pack/plugins/translations/translations/fr-FR.json @@ -25702,9 +25702,6 @@ "xpack.securitySolution.endpoint.resolver.relatedEventLimitTitle": "Cette liste inclut {numberOfEntries} événements de processus.", "xpack.securitySolution.endpointPolicyStatus.revisionNumber": "rév. {revNumber}", "xpack.securitySolution.endpointResponseActions.actionError.errorMessage": "{ errorCount, plural, =1 {Erreur rencontrée} other {Erreurs rencontrées}} :", - "xpack.securitySolution.endpointResponseActions.getProcesses.performApiErrorMessage": "L'erreur suivante a été rencontrée : {error}", - "xpack.securitySolution.endpointResponseActions.killProcess.performApiErrorMessage": "L'erreur suivante a été rencontrée : {error}", - "xpack.securitySolution.endpointResponseActions.suspendProcess.performApiErrorMessage": "L'erreur suivante a été rencontrée : {error}", "xpack.securitySolution.event.reason.reasonRendererTitle": "Outil de rendu d'événement : {eventRendererName} ", "xpack.securitySolution.eventDetails.nestedColumnCheckboxAriaLabel": "Le champ {field} est un objet, et il est composé de champs imbriqués qui peuvent être ajoutés en tant que colonne", "xpack.securitySolution.eventDetails.viewColumnCheckboxAriaLabel": "Afficher la colonne {field}", @@ -28124,8 +28121,6 @@ "xpack.securitySolution.endpointManagement.noPermissionsSubText": "Vous devez disposer du rôle de superutilisateur pour utiliser cette fonctionnalité. Si vous ne disposez pas de ce rôle, ni d'autorisations pour modifier les rôles d'utilisateur, contactez votre administrateur Kibana.", "xpack.securitySolution.endpointManagemnet.noPermissionsText": "Vous ne disposez pas des autorisations Kibana requises pour utiliser Elastic Security Administration", "xpack.securitySolution.endpointPolicyStatus.tooltipTitleLabel": "Politique appliquée", - "xpack.securitySolution.endpointResponseActions.getProcesses.errorMessageTitle": "Échec de l’obtention des processus", - "xpack.securitySolution.endpointResponseActions.getProcesses.performApiErrorMessageTitle": "Échec de l’exécution de l’action d’obtention des processus", "xpack.securitySolution.endpointResponseActions.getProcesses.table.header.command": "COMMANDE", "xpack.securitySolution.endpointResponseActions.getProcesses.table.header.enityId": "ID D’ENTITÉ", "xpack.securitySolution.endpointResponseActions.getProcesses.table.header.pid": "PID", diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index a09bdfe578cb5..1441559ad00ab 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -25677,9 +25677,6 @@ "xpack.securitySolution.endpoint.resolver.relatedEventLimitTitle": "このリストには、{numberOfEntries} 件のプロセスイベントが含まれています。", "xpack.securitySolution.endpointPolicyStatus.revisionNumber": "rev. {revNumber}", "xpack.securitySolution.endpointResponseActions.actionError.errorMessage": "次の{ errorCount, plural, other {件のエラー}}が発生しました：", - "xpack.securitySolution.endpointResponseActions.getProcesses.performApiErrorMessage": "次のエラーが発生しました：{error}", - "xpack.securitySolution.endpointResponseActions.killProcess.performApiErrorMessage": "次のエラーが発生しました：{error}", - "xpack.securitySolution.endpointResponseActions.suspendProcess.performApiErrorMessage": "次のエラーが発生しました：{error}", "xpack.securitySolution.event.reason.reasonRendererTitle": "イベントレンダラー：{eventRendererName} ", "xpack.securitySolution.eventDetails.nestedColumnCheckboxAriaLabel": "{field}フィールドはオブジェクトであり、列として追加できるネストされたフィールドに分解されます", "xpack.securitySolution.eventDetails.viewColumnCheckboxAriaLabel": "{field} 列を表示", @@ -28099,8 +28096,6 @@ "xpack.securitySolution.endpointManagement.noPermissionsSubText": "この機能を使用するには、スーパーユーザーロールが必要です。スーパーユーザーロールがなく、ユーザーロールを編集する権限もない場合は、Kibana管理者に問い合わせてください。", "xpack.securitySolution.endpointManagemnet.noPermissionsText": "Elastic Security Administrationを使用するために必要なKibana権限がありません。", "xpack.securitySolution.endpointPolicyStatus.tooltipTitleLabel": "ポリシーが適用されました", - "xpack.securitySolution.endpointResponseActions.getProcesses.errorMessageTitle": "プロセスの取得アクションが失敗しました", - "xpack.securitySolution.endpointResponseActions.getProcesses.performApiErrorMessageTitle": "プロセスの取得アクションの実行が失敗しました", "xpack.securitySolution.endpointResponseActions.getProcesses.table.header.command": "コマンド", "xpack.securitySolution.endpointResponseActions.getProcesses.table.header.enityId": "エンティティID", "xpack.securitySolution.endpointResponseActions.getProcesses.table.header.pid": "PID", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index 5ade45168ae73..d1651dddce021 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -25711,9 +25711,6 @@ "xpack.securitySolution.endpoint.resolver.relatedEventLimitTitle": "此列表包括 {numberOfEntries} 个进程事件。", "xpack.securitySolution.endpointPolicyStatus.revisionNumber": "修订版 {revNumber}", "xpack.securitySolution.endpointResponseActions.actionError.errorMessage": "遇到以下{ errorCount, plural, other {错误}}：", - "xpack.securitySolution.endpointResponseActions.getProcesses.performApiErrorMessage": "遇到以下错误：{error}", - "xpack.securitySolution.endpointResponseActions.killProcess.performApiErrorMessage": "遇到以下错误：{error}", - "xpack.securitySolution.endpointResponseActions.suspendProcess.performApiErrorMessage": "遇到以下错误：{error}", "xpack.securitySolution.event.reason.reasonRendererTitle": "事件渲染器：{eventRendererName} ", "xpack.securitySolution.eventDetails.nestedColumnCheckboxAriaLabel": "{field} 字段是对象，并分解为可以添加为列的嵌套字段", "xpack.securitySolution.eventDetails.viewColumnCheckboxAriaLabel": "查看 {field} 列", @@ -28133,8 +28130,6 @@ "xpack.securitySolution.endpointManagement.noPermissionsSubText": "您必须具有超级用户角色才能使用此功能。如果您不具有超级用户角色，且无权编辑用户角色，请与 Kibana 管理员联系。", "xpack.securitySolution.endpointManagemnet.noPermissionsText": "您没有所需的 Kibana 权限，无法使用 Elastic Security 管理", "xpack.securitySolution.endpointPolicyStatus.tooltipTitleLabel": "已应用策略", - "xpack.securitySolution.endpointResponseActions.getProcesses.errorMessageTitle": "获取进程操作失败", - "xpack.securitySolution.endpointResponseActions.getProcesses.performApiErrorMessageTitle": "执行获取进程操作失败", "xpack.securitySolution.endpointResponseActions.getProcesses.table.header.command": "命令", "xpack.securitySolution.endpointResponseActions.getProcesses.table.header.enityId": "实体 ID", "xpack.securitySolution.endpointResponseActions.getProcesses.table.header.pid": "PID", From f571f8082716ecda912a2d380118138cf28d4663 Mon Sep 17 00:00:00 2001 From: Andrew Macri Date: Tue, 27 Sep 2022 14:15:53 -0600 Subject: [PATCH 19/95] [Security Solution] Disable renderer hover actions in the Rules preview flyout (#141546) ## [Security Solution] Disable hover actions on renderers in the Rules preview flyout This PR addresses issue by disabling hover actions on renderers in the _Rules preview_ flyout, per the Before and After screenshots below: ### Before ![before](https://user-images.githubusercontent.com/4459398/191833235-ed9974d8-3d31-4da1-8db6-e5c500003f6b.png) _Above: Before the fix, actions were displayed when hovering over a rendered field in the Rules preview flyout_ ### After ![after](https://user-images.githubusercontent.com/4459398/191833522-427649ab-9670-48df-8a87-1980fe8e4070.png) _Above: After the fix, actions are NOT displayed when hovering over a rendered field in the Rules preview flyout_ --- .../drag_and_drop/draggable_wrapper.test.tsx | 105 +++++++++++++++++- .../drag_and_drop/draggable_wrapper.tsx | 6 +- 2 files changed, 108 insertions(+), 3 deletions(-) diff --git a/x-pack/plugins/security_solution/public/common/components/drag_and_drop/draggable_wrapper.test.tsx b/x-pack/plugins/security_solution/public/common/components/drag_and_drop/draggable_wrapper.test.tsx index c12643a30f943..b6a3995534d1f 100644 --- a/x-pack/plugins/security_solution/public/common/components/drag_and_drop/draggable_wrapper.test.tsx +++ b/x-pack/plugins/security_solution/public/common/components/drag_and_drop/draggable_wrapper.test.tsx @@ -5,16 +5,24 @@ * 2.0. */ +import { fireEvent, render, screen, waitFor } from '@testing-library/react'; import { shallow } from 'enzyme'; import React from 'react'; import type { DraggableStateSnapshot, DraggingStyle } from 'react-beautiful-dnd'; -import { waitFor } from '@testing-library/react'; + import '../../mock/match_media'; +import { TimelineId } from '../../../../common/types'; import { mockBrowserFields } from '../../containers/source/mock'; import { TestProviders } from '../../mock'; import { mockDataProviders } from '../../../timelines/components/timeline/data_providers/mock/mock_data_providers'; +import { ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID } from '../../../timelines/components/row_renderers_browser/constants'; import { DragDropContextWrapper } from './drag_drop_context_wrapper'; -import { ConditionalPortal, DraggableWrapper, getStyle } from './draggable_wrapper'; +import { + ConditionalPortal, + disableHoverActions, + DraggableWrapper, + getStyle, +} from './draggable_wrapper'; import { useMountAppended } from '../../utils/use_mount_appended'; jest.mock('../../lib/kibana'); @@ -27,6 +35,26 @@ jest.mock('@elastic/eui', () => { }; }); +const timelineIdsWithHoverActions = [ + undefined, + TimelineId.active, + TimelineId.alternateTest, + TimelineId.casePage, + TimelineId.detectionsPage, + TimelineId.detectionsRulesDetailsPage, + TimelineId.hostsPageEvents, + TimelineId.hostsPageSessions, + TimelineId.kubernetesPageSessions, + TimelineId.networkPageEvents, + TimelineId.test, + TimelineId.usersPageEvents, +]; + +const timelineIdsNoHoverActions = [ + TimelineId.rulePreview, + ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID, +]; + describe('DraggableWrapper', () => { const dataProvider = mockDataProviders[0]; const message = 'draggable wrapper content'; @@ -36,6 +64,15 @@ describe('DraggableWrapper', () => { jest.useFakeTimers(); }); + afterEach(() => { + const portal = document.querySelector('[data-euiportal="true"]'); + if (portal != null) { + portal.innerHTML = ''; + } + + jest.useRealTimers(); + }); + describe('rendering', () => { test('it renders against the snapshot', () => { const wrapper = shallow( @@ -103,6 +140,56 @@ describe('DraggableWrapper', () => { expect(wrapper.find('[data-test-subj="hover-actions-copy-button"]').exists()).toBe(true); }); }); + + timelineIdsWithHoverActions.forEach((timelineId) => { + test(`it renders hover actions (by default) when 'isDraggable' is false and timelineId is '${timelineId}'`, async () => { + const isDraggable = false; + + const { container } = render( + + + message} + timelineId={timelineId} + /> + + + ); + + fireEvent.mouseEnter(container.querySelector('[data-test-subj="withHoverActionsButton"]')!); + + await waitFor(() => { + expect(screen.getByTestId('hover-actions-copy-button')).toBeInTheDocument(); + }); + }); + }); + + timelineIdsNoHoverActions.forEach((timelineId) => { + test(`it does NOT render hover actions when 'isDraggable' is false and timelineId is '${timelineId}'`, async () => { + const isDraggable = false; + + const { container } = render( + + + message} + timelineId={timelineId} + /> + + + ); + + fireEvent.mouseEnter(container.querySelector('[data-test-subj="withHoverActionsButton"]')!); + + await waitFor(() => { + expect(screen.queryByTestId('hover-actions-copy-button')).not.toBeInTheDocument(); + }); + }); + }); }); describe('text truncation styling', () => { @@ -192,4 +279,18 @@ describe('ConditionalPortal', () => { expect(getStyle(style, snapshot)).toHaveProperty('transitionDuration', '0.00000001s'); }); }); + + describe('disableHoverActions', () => { + timelineIdsNoHoverActions.forEach((timelineId) => + test(`it returns true when timelineId is ${timelineId}`, () => { + expect(disableHoverActions(timelineId)).toBe(true); + }) + ); + + timelineIdsWithHoverActions.forEach((timelineId) => + test(`it returns false when timelineId is ${timelineId}`, () => { + expect(disableHoverActions(timelineId)).toBe(false); + }) + ); + }); }); diff --git a/x-pack/plugins/security_solution/public/common/components/drag_and_drop/draggable_wrapper.tsx b/x-pack/plugins/security_solution/public/common/components/drag_and_drop/draggable_wrapper.tsx index f972bcf463b5b..887f1635c08c6 100644 --- a/x-pack/plugins/security_solution/public/common/components/drag_and_drop/draggable_wrapper.tsx +++ b/x-pack/plugins/security_solution/public/common/components/drag_and_drop/draggable_wrapper.tsx @@ -18,6 +18,7 @@ import { Draggable, Droppable } from 'react-beautiful-dnd'; import { useDispatch } from 'react-redux'; import styled from 'styled-components'; +import { TimelineId } from '../../../../common/types'; import { dragAndDropActions } from '../../store/drag_and_drop'; import type { DataProvider } from '../../../timelines/components/timeline/data_providers/data_provider'; import { ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID } from '../../../timelines/components/row_renderers_browser/constants'; @@ -108,6 +109,9 @@ interface Props { onFilterAdded?: () => void; } +export const disableHoverActions = (timelineId: string | undefined): boolean => + [TimelineId.rulePreview, ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID].includes(timelineId ?? ''); + /** * Wraps a draggable component to handle registration / unregistration of the * data provider associated with the item being dropped @@ -370,7 +374,7 @@ const DraggableWrapperComponent: React.FC = ({ From 27483d5aa90d80d2896d92b22da148372c09195e Mon Sep 17 00:00:00 2001 From: Nick Peihl Date: Tue, 27 Sep 2022 17:18:41 -0400 Subject: [PATCH 20/95] Fix curl documentation (#141971) --- docs/user/reporting/script-example.asciidoc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/user/reporting/script-example.asciidoc b/docs/user/reporting/script-example.asciidoc index 1d8e824798e75..937e140bd67a0 100644 --- a/docs/user/reporting/script-example.asciidoc +++ b/docs/user/reporting/script-example.asciidoc @@ -3,7 +3,7 @@ URL that you use to download the report. Use the `GET` method in the HTTP reques To queue CSV report generation using the `POST` URL with cURL: -["source","sh",subs="attributes"] +[source,curl] --------------------------------------------------------- curl \ -XPOST \ <1> @@ -11,7 +11,6 @@ curl \ -H 'kbn-xsrf: true' \ <3> 'http://0.0.0.0:5601/api/reporting/generate/csv?jobParams=...' <4> --------------------------------------------------------- -// CONSOLE <1> The required `POST` method. <2> The user credentials for a user with permission to access {kib} and {report-features}. @@ -20,7 +19,7 @@ curl \ An example response for a successfully queued report: -[source,json] +[source,js] --------------------------------------------------------- { "path": "/api/reporting/jobs/download/jxzaofkc0ykpf4062305t068", <1> @@ -35,7 +34,6 @@ An example response for a successfully queued report: } } --------------------------------------------------------- -// CONSOLE <1> The relative path on the {kib} host for downloading the report. <2> (Not included in the example) Internal representation of the reporting job, as found in the `.reporting-*` index. From e4080d5b64fa563382cf8a8f9c59f3bb9808d65e Mon Sep 17 00:00:00 2001 From: "Joey F. Poon" Date: Tue, 27 Sep 2022 17:34:49 -0500 Subject: [PATCH 21/95] [Security Solution] use endpoint rbac for isolate/unisolate host (#141810) --- x-pack/plugins/fleet/common/authz.test.ts | 5 +- .../plugins/fleet/common/constants/authz.ts | 2 +- x-pack/plugins/fleet/common/mocks.ts | 15 ++++++ .../endpoint/service/authz/authz.test.ts | 34 ++++++++++++ .../common/endpoint/service/authz/authz.ts | 8 ++- .../endpoint/use_endpoint_privileges.test.ts | 11 ++-- .../details/components/actions_menu.test.tsx | 52 ++++++++++++++----- .../view/hooks/use_endpoint_action_items.tsx | 14 ++--- .../pages/endpoint_hosts/view/index.test.tsx | 32 ++++++++---- 9 files changed, 134 insertions(+), 39 deletions(-) diff --git a/x-pack/plugins/fleet/common/authz.test.ts b/x-pack/plugins/fleet/common/authz.test.ts index ced783c6d4adb..cadb90651b01c 100644 --- a/x-pack/plugins/fleet/common/authz.test.ts +++ b/x-pack/plugins/fleet/common/authz.test.ts @@ -15,7 +15,10 @@ import { ENDPOINT_PRIVILEGES } from './constants'; const SECURITY_SOLUTION_ID = DEFAULT_APP_CATEGORIES.security.id; -function generateActions(privileges: string[] = [], overrides: Record = {}) { +function generateActions( + privileges: typeof ENDPOINT_PRIVILEGES, + overrides: Record = {} +) { return privileges.reduce((acc, privilege) => { const executePackageAction = overrides[privilege] || false; diff --git a/x-pack/plugins/fleet/common/constants/authz.ts b/x-pack/plugins/fleet/common/constants/authz.ts index 3bf1aeb46adc8..d7a0ca4ade2eb 100644 --- a/x-pack/plugins/fleet/common/constants/authz.ts +++ b/x-pack/plugins/fleet/common/constants/authz.ts @@ -23,4 +23,4 @@ export const ENDPOINT_PRIVILEGES = [ 'writeHostIsolation', 'writeProcessOperations', 'writeFileOperations', -]; +] as const; diff --git a/x-pack/plugins/fleet/common/mocks.ts b/x-pack/plugins/fleet/common/mocks.ts index bc8880ed385af..d5aca8398abd8 100644 --- a/x-pack/plugins/fleet/common/mocks.ts +++ b/x-pack/plugins/fleet/common/mocks.ts @@ -7,6 +7,7 @@ import type { DeletePackagePoliciesResponse, NewPackagePolicy, PackagePolicy } from './types'; import type { FleetAuthz } from './authz'; +import { ENDPOINT_PRIVILEGES } from './constants'; export const createNewPackagePolicyMock = (): NewPackagePolicy => { return { @@ -61,6 +62,15 @@ export const deletePackagePolicyMock = (): DeletePackagePoliciesResponse => { * Creates mock `authz` object */ export const createFleetAuthzMock = (): FleetAuthz => { + const endpointActions = ENDPOINT_PRIVILEGES.reduce((acc, privilege) => { + return { + ...acc, + [privilege]: { + executePackageAction: true, + }, + }; + }, {}); + return { fleet: { all: true, @@ -80,5 +90,10 @@ export const createFleetAuthzMock = (): FleetAuthz => { readIntegrationPolicies: true, writeIntegrationPolicies: true, }, + packagePrivileges: { + endpoint: { + actions: endpointActions, + }, + }, }; }; diff --git a/x-pack/plugins/security_solution/common/endpoint/service/authz/authz.test.ts b/x-pack/plugins/security_solution/common/endpoint/service/authz/authz.test.ts index 3434e95f29b4b..b9c0dcff2054a 100644 --- a/x-pack/plugins/security_solution/common/endpoint/service/authz/authz.test.ts +++ b/x-pack/plugins/security_solution/common/endpoint/service/authz/authz.test.ts @@ -107,6 +107,40 @@ describe('Endpoint Authz service', () => { ); }); }); + + describe('endpoint rbac is enabled', () => { + describe('canIsolateHost', () => { + it('should be true if packagePrivilege.writeHostIsolation is true', () => { + fleetAuthz.packagePrivileges!.endpoint.actions.writeHostIsolation.executePackageAction = + true; + const authz = calculateEndpointAuthz(licenseService, fleetAuthz, userRoles, true); + expect(authz.canIsolateHost).toBe(true); + }); + + it('should be false if packagePrivilege.writeHostIsolation is false', () => { + fleetAuthz.packagePrivileges!.endpoint.actions.writeHostIsolation.executePackageAction = + false; + const authz = calculateEndpointAuthz(licenseService, fleetAuthz, userRoles, true); + expect(authz.canIsolateHost).toBe(false); + }); + }); + + describe('canUnIsolateHost', () => { + it('should be true if packagePrivilege.writeHostIsolation is true', () => { + fleetAuthz.packagePrivileges!.endpoint.actions.writeHostIsolation.executePackageAction = + true; + const authz = calculateEndpointAuthz(licenseService, fleetAuthz, userRoles, true); + expect(authz.canUnIsolateHost).toBe(true); + }); + + it('should be false if packagePrivilege.writeHostIsolation is false', () => { + fleetAuthz.packagePrivileges!.endpoint.actions.writeHostIsolation.executePackageAction = + false; + const authz = calculateEndpointAuthz(licenseService, fleetAuthz, userRoles, true); + expect(authz.canUnIsolateHost).toBe(false); + }); + }); + }); }); describe('getEndpointAuthzInitialState()', () => { diff --git a/x-pack/plugins/security_solution/common/endpoint/service/authz/authz.ts b/x-pack/plugins/security_solution/common/endpoint/service/authz/authz.ts index 6f578ec24d856..bc40bd11f5d79 100644 --- a/x-pack/plugins/security_solution/common/endpoint/service/authz/authz.ts +++ b/x-pack/plugins/security_solution/common/endpoint/service/authz/authz.ts @@ -28,14 +28,18 @@ export const calculateEndpointAuthz = ( const isPlatinumPlusLicense = licenseService.isPlatinumPlus(); const isEnterpriseLicense = licenseService.isEnterprise(); const hasEndpointManagementAccess = userRoles.includes('superuser'); + const canIsolateHost = isEndpointRbacEnabled + ? fleetAuthz.packagePrivileges?.endpoint?.actions?.writeHostIsolation?.executePackageAction || + false + : hasEndpointManagementAccess; return { canAccessFleet: fleetAuthz?.fleet.all ?? userRoles.includes('superuser'), canAccessEndpointManagement: hasEndpointManagementAccess, canCreateArtifactsByPolicy: hasEndpointManagementAccess && isPlatinumPlusLicense, // Response Actions - canIsolateHost: isPlatinumPlusLicense && hasEndpointManagementAccess, - canUnIsolateHost: hasEndpointManagementAccess, + canIsolateHost: isPlatinumPlusLicense && canIsolateHost, + canUnIsolateHost: canIsolateHost, canKillProcess: hasEndpointManagementAccess && isEnterpriseLicense, canSuspendProcess: hasEndpointManagementAccess && isEnterpriseLicense, canGetRunningProcesses: hasEndpointManagementAccess && isEnterpriseLicense, diff --git a/x-pack/plugins/security_solution/public/common/components/user_privileges/endpoint/use_endpoint_privileges.test.ts b/x-pack/plugins/security_solution/public/common/components/user_privileges/endpoint/use_endpoint_privileges.test.ts index 29da5688357b0..a0d23820025b8 100644 --- a/x-pack/plugins/security_solution/public/common/components/user_privileges/endpoint/use_endpoint_privileges.test.ts +++ b/x-pack/plugins/security_solution/public/common/components/user_privileges/endpoint/use_endpoint_privileges.test.ts @@ -7,15 +7,19 @@ import type { RenderHookResult, RenderResult } from '@testing-library/react-hooks'; import { act, renderHook } from '@testing-library/react-hooks'; -import { useCurrentUser, useKibana } from '../../../lib/kibana'; -import { useEndpointPrivileges } from './use_endpoint_privileges'; + import { securityMock } from '@kbn/security-plugin/public/mocks'; import type { AuthenticatedUser } from '@kbn/security-plugin/common'; +import { createFleetAuthzMock } from '@kbn/fleet-plugin/common'; + +import type { EndpointPrivileges } from '../../../../../common/endpoint/types'; +import { useCurrentUser, useKibana } from '../../../lib/kibana'; import { licenseService } from '../../../hooks/use_license'; +import { useEndpointPrivileges } from './use_endpoint_privileges'; import { getEndpointPrivilegesInitialStateMock } from './mocks'; -import type { EndpointPrivileges } from '../../../../../common/endpoint/types'; import { getEndpointPrivilegesInitialState } from './utils'; +const useKibanaMock = useKibana as jest.Mocked; jest.mock('../../../lib/kibana'); jest.mock('../../../hooks/use_license', () => { const licenseServiceInstance = { @@ -47,6 +51,7 @@ describe('When using useEndpointPrivileges hook', () => { }); (useCurrentUser as jest.Mock).mockReturnValue(authenticatedUser); + useKibanaMock().services.fleet!.authz = createFleetAuthzMock(); licenseServiceMock.isPlatinumPlus.mockReturnValue(true); diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/components/actions_menu.test.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/components/actions_menu.test.tsx index 6fc8a99ee7320..35fe96d94d91f 100644 --- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/components/actions_menu.test.tsx +++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/components/actions_menu.test.tsx @@ -14,6 +14,9 @@ import { act } from '@testing-library/react'; import { endpointPageHttpMock } from '../../../mocks'; import { fireEvent } from '@testing-library/dom'; import { licenseService } from '../../../../../../common/hooks/use_license'; +import { useUserPrivileges } from '../../../../../../common/components/user_privileges'; +import { initialUserPrivilegesState } from '../../../../../../common/components/user_privileges/user_privileges_context'; +import { getUserPrivilegesMockDefaultValue } from '../../../../../../common/components/user_privileges/__mocks__'; jest.mock('../../../../../../common/lib/kibana/kibana_react', () => { const originalModule = jest.requireActual('../../../../../../common/lib/kibana/kibana_react'); @@ -31,6 +34,7 @@ jest.mock('../../../../../../common/lib/kibana/kibana_react', () => { }; }); jest.mock('../../../../../../common/hooks/use_license'); +jest.mock('../../../../../../common/components/user_privileges'); describe('When using the Endpoint Details Actions Menu', () => { let render: () => Promise>; @@ -59,6 +63,8 @@ describe('When using the Endpoint Details Actions Menu', () => { waitForAction = mockedContext.middlewareSpy.waitForAction; httpMocks = endpointPageHttpMock(mockedContext.coreStart.http); + (useUserPrivileges as jest.Mock).mockReturnValue(getUserPrivilegesMockDefaultValue()); + act(() => { mockedContext.history.push( '/administration/endpoints?selected_endpoint=5fe11314-678c-413e-87a2-b4a3461878ee' @@ -80,6 +86,10 @@ describe('When using the Endpoint Details Actions Menu', () => { }; }); + afterEach(() => { + (useUserPrivileges as jest.Mock).mockClear(); + }); + it('should not show the response actions history link', async () => { await render(); expect(renderResult.queryByTestId('actionsLink')).toBeNull(); @@ -121,18 +131,38 @@ describe('When using the Endpoint Details Actions Menu', () => { describe('and endpoint host is isolated', () => { beforeEach(() => setEndpointMetadataResponse(true)); - it('should display Unisolate action', async () => { - await render(); - expect(renderResult.getByTestId('unIsolateLink')).not.toBeNull(); + describe('and user has unisolate privilege', () => { + it('should display Unisolate action', async () => { + await render(); + expect(renderResult.getByTestId('unIsolateLink')).not.toBeNull(); + }); + + it('should navigate via router when unisolate is clicked', async () => { + await render(); + act(() => { + fireEvent.click(renderResult.getByTestId('unIsolateLink')); + }); + + expect(coreStart.application.navigateToApp).toHaveBeenCalled(); + }); }); - it('should navigate via router when unisolate is clicked', async () => { - await render(); - act(() => { - fireEvent.click(renderResult.getByTestId('unIsolateLink')); + describe('and user does not have unisolate privilege', () => { + beforeEach(() => { + (useUserPrivileges as jest.Mock).mockReturnValue({ + ...initialUserPrivilegesState(), + endpointPrivileges: { + ...initialUserPrivilegesState().endpointPrivileges, + canIsolateHost: false, + canUnIsolateHost: false, + }, + }); }); - expect(coreStart.application.navigateToApp).toHaveBeenCalled(); + it('should not display unisolate action', async () => { + await render(); + expect(renderResult.queryByTestId('unIsolateLink')).toBeNull(); + }); }); }); @@ -143,12 +173,6 @@ describe('When using the Endpoint Details Actions Menu', () => { afterEach(() => licenseServiceMock.isPlatinumPlus.mockReturnValue(true)); - it('should not show the `isolate` action', async () => { - setEndpointMetadataResponse(); - await render(); - expect(renderResult.queryByTestId('isolateLink')).toBeNull(); - }); - it('should still show `unisolate` action for endpoints that are currently isolated', async () => { setEndpointMetadataResponse(true); await render(); diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/hooks/use_endpoint_action_items.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/hooks/use_endpoint_action_items.tsx index 40fd81c4ab587..9a9c884a3979a 100644 --- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/hooks/use_endpoint_action_items.tsx +++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/hooks/use_endpoint_action_items.tsx @@ -19,7 +19,6 @@ import { agentPolicies, uiQueryParams } from '../../store/selectors'; import { useAppUrl } from '../../../../../common/lib/kibana/hooks'; import type { ContextMenuItemNavByRouterProps } from '../../../../components/context_menu_with_router_support/context_menu_item_nav_by_router'; import { isEndpointHostIsolated } from '../../../../../common/utils/validators'; -import { useLicense } from '../../../../../common/hooks/use_license'; import { isIsolationSupported } from '../../../../../../common/endpoint/service/host_isolation/utils'; import { useDoesEndpointSupportResponder } from '../../../../../common/hooks/endpoint/use_does_endpoint_support_responder'; import { UPGRADE_ENDPOINT_FOR_RESPONDER } from '../../../../../common/translations'; @@ -36,7 +35,6 @@ export const useEndpointActionItems = ( endpointMetadata: MaybeImmutable | undefined, options?: Options ): ContextMenuItemNavByRouterProps[] => { - const isPlatinumPlus = useLicense().isPlatinumPlus(); const { getAppUrl } = useAppUrl(); const fleetAgentPolicies = useEndpointSelector(agentPolicies); const allCurrentUrlParams = useEndpointSelector(uiQueryParams); @@ -44,7 +42,8 @@ export const useEndpointActionItems = ( const isResponseActionsConsoleEnabled = useIsExperimentalFeatureEnabled( 'responseActionsConsoleEnabled' ); - const canAccessResponseConsole = useUserPrivileges().endpointPrivileges.canAccessResponseConsole; + const { canAccessResponseConsole, canIsolateHost, canUnIsolateHost } = + useUserPrivileges().endpointPrivileges; const isResponderCapabilitiesEnabled = useDoesEndpointSupportResponder(endpointMetadata); return useMemo(() => { @@ -82,8 +81,8 @@ export const useEndpointActionItems = ( const isolationActions = []; - if (isIsolated) { - // Un-isolate is always available to users regardless of license level + if (isIsolated && canUnIsolateHost) { + // Un-isolate is available to users regardless of license level if they have unisolate permissions isolationActions.push({ 'data-test-subj': 'unIsolateLink', icon: 'lockOpen', @@ -100,7 +99,7 @@ export const useEndpointActionItems = ( /> ), }); - } else if (isPlatinumPlus && isolationSupported) { + } else if (isolationSupported && canIsolateHost) { // For Platinum++ licenses, users also have ability to isolate isolationActions.push({ 'data-test-subj': 'isolateLink', @@ -260,10 +259,11 @@ export const useEndpointActionItems = ( endpointMetadata, fleetAgentPolicies, getAppUrl, - isPlatinumPlus, isResponseActionsConsoleEnabled, showEndpointResponseActionsConsole, options?.isEndpointList, isResponderCapabilitiesEnabled, + canIsolateHost, + canUnIsolateHost, ]); }; diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx index b85ad2cc7f6a5..7d8d625d97e39 100644 --- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx +++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx @@ -1007,6 +1007,7 @@ describe('when on the endpoint list page', () => { let agentId: string; let agentPolicyId: string; let renderResult: ReturnType; + let endpointActionsButton: HTMLElement; // 2nd endpoint only has isolation capabilities const mockEndpointListApi = () => { @@ -1081,13 +1082,7 @@ describe('when on the endpoint list page', () => { beforeEach(async () => { mockEndpointListApi(); - (useUserPrivileges as jest.Mock).mockReturnValue({ - ...mockInitialUserPrivilegesState(), - endpointPrivileges: { - ...mockInitialUserPrivilegesState().endpointPrivileges, - canAccessResponseConsole: true, - }, - }); + (useUserPrivileges as jest.Mock).mockReturnValue(getUserPrivilegesMockDefaultValue()); reactTestingLibrary.act(() => { history.push(`${MANAGEMENT_PATH}/endpoints`); @@ -1097,9 +1092,7 @@ describe('when on the endpoint list page', () => { await middlewareSpy.waitForAction('serverReturnedEndpointList'); await middlewareSpy.waitForAction('serverReturnedEndpointAgentPolicies'); - const endpointActionsButton = ( - await renderResult.findAllByTestId('endpointTableRowActions') - )[0]; + endpointActionsButton = (await renderResult.findAllByTestId('endpointTableRowActions'))[0]; reactTestingLibrary.act(() => { reactTestingLibrary.fireEvent.click(endpointActionsButton); @@ -1108,7 +1101,6 @@ describe('when on the endpoint list page', () => { afterEach(() => { jest.clearAllMocks(); - (useUserPrivileges as jest.Mock).mockReturnValue(getUserPrivilegesMockDefaultValue()); }); it('shows the Responder option when all 3 processes capabilities are present in the endpoint', async () => { @@ -1141,6 +1133,24 @@ describe('when on the endpoint list page', () => { ); }); + it('hides isolate host option if canIsolateHost is false', () => { + (useUserPrivileges as jest.Mock).mockReturnValue({ + ...mockInitialUserPrivilegesState(), + endpointPrivileges: { + ...mockInitialUserPrivilegesState().endpointPrivileges, + canIsolateHost: false, + }, + }); + reactTestingLibrary.act(() => { + reactTestingLibrary.fireEvent.click(endpointActionsButton); + }); + reactTestingLibrary.act(() => { + reactTestingLibrary.fireEvent.click(endpointActionsButton); + }); + const isolateLink = screen.queryByTestId('isolateLink'); + expect(isolateLink).toBeNull(); + }); + it('navigates to the Security Solution Host Details page', async () => { const hostLink = await renderResult.findByTestId('hostLink'); expect(hostLink.getAttribute('href')).toEqual( From cc9f1c640962cc55cbd9181fd4ecd1d9499a0fa7 Mon Sep 17 00:00:00 2001 From: Nathan Reese Date: Tue, 27 Sep 2022 17:53:37 -0600 Subject: [PATCH 22/95] [Maps] fix Go To - lat/long values outside expected range cause blank Maps app (#141873) * [Maps] fix Go To - lat/long values outside expected range cause blank Maps app * UTM form * wire UTM form * add unit tests * fix test names * fix expects * fix functional tests * review feedback --- .../set_view_control/decimal_degrees_form.tsx | 149 ++++ .../set_view_control/mgrs_form.tsx | 149 ++++ .../set_view_control/number_form_row.tsx | 6 + .../set_view_control/set_view_control.tsx | 733 +----------------- .../set_view_control/set_view_form.tsx | 134 ++++ .../set_view_control/utils.test.ts | 52 ++ .../toolbar_overlay/set_view_control/utils.ts | 91 +++ .../set_view_control/utm_form.tsx | 209 +++++ 8 files changed, 804 insertions(+), 719 deletions(-) create mode 100644 x-pack/plugins/maps/public/connected_components/toolbar_overlay/set_view_control/decimal_degrees_form.tsx create mode 100644 x-pack/plugins/maps/public/connected_components/toolbar_overlay/set_view_control/mgrs_form.tsx create mode 100644 x-pack/plugins/maps/public/connected_components/toolbar_overlay/set_view_control/number_form_row.tsx create mode 100644 x-pack/plugins/maps/public/connected_components/toolbar_overlay/set_view_control/set_view_form.tsx create mode 100644 x-pack/plugins/maps/public/connected_components/toolbar_overlay/set_view_control/utils.test.ts create mode 100644 x-pack/plugins/maps/public/connected_components/toolbar_overlay/set_view_control/utils.ts create mode 100644 x-pack/plugins/maps/public/connected_components/toolbar_overlay/set_view_control/utm_form.tsx diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/set_view_control/decimal_degrees_form.tsx b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/set_view_control/decimal_degrees_form.tsx new file mode 100644 index 0000000000000..03b23e409b770 --- /dev/null +++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/set_view_control/decimal_degrees_form.tsx @@ -0,0 +1,149 @@ +/* + * 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, { ChangeEvent, Component } from 'react'; +import { + EuiForm, + EuiFormRow, + EuiButton, + EuiFieldNumber, + EuiTextAlign, + EuiSpacer, +} from '@elastic/eui'; +import { i18n } from '@kbn/i18n'; +import { FormattedMessage } from '@kbn/i18n-react'; +import { MapCenter, MapSettings } from '../../../../common/descriptor_types'; +import { withinRange } from './utils'; + +interface Props { + settings: MapSettings; + zoom: number; + center: MapCenter; + onSubmit: (lat: number, lon: number, zoom: number) => void; +} + +interface State { + lat: number | string; + lon: number | string; + zoom: number | string; +} + +export class DecimalDegreesForm extends Component { + state: State = { + lat: this.props.center.lat, + lon: this.props.center.lon, + zoom: this.props.zoom, + }; + + _onLatChange = (evt: ChangeEvent) => { + const sanitizedValue = parseFloat(evt.target.value); + this.setState({ + lat: isNaN(sanitizedValue) ? '' : sanitizedValue, + }); + }; + + _onLonChange = (evt: ChangeEvent) => { + const sanitizedValue = parseFloat(evt.target.value); + this.setState({ + lon: isNaN(sanitizedValue) ? '' : sanitizedValue, + }); + }; + + _onZoomChange = (evt: ChangeEvent) => { + const sanitizedValue = parseFloat(evt.target.value); + this.setState({ + zoom: isNaN(sanitizedValue) ? '' : sanitizedValue, + }); + }; + + _onSubmit = () => { + const { lat, lon, zoom } = this.state; + this.props.onSubmit(lat as number, lon as number, zoom as number); + }; + + render() { + const { isInvalid: isLatInvalid, error: latError } = withinRange(this.state.lat, -90, 90); + const { isInvalid: isLonInvalid, error: lonError } = withinRange(this.state.lon, -180, 180); + const { isInvalid: isZoomInvalid, error: zoomError } = withinRange( + this.state.zoom, + this.props.settings.minZoom, + this.props.settings.maxZoom + ); + + return ( + + + + + + + + + + + + + + + + + + + + + + ); + } +} diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/set_view_control/mgrs_form.tsx b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/set_view_control/mgrs_form.tsx new file mode 100644 index 0000000000000..48455f89b7464 --- /dev/null +++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/set_view_control/mgrs_form.tsx @@ -0,0 +1,149 @@ +/* + * 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 _ from 'lodash'; +import React, { ChangeEvent, Component } from 'react'; +import { + EuiForm, + EuiFormRow, + EuiButton, + EuiFieldNumber, + EuiFieldText, + EuiTextAlign, + EuiSpacer, +} from '@elastic/eui'; +import { i18n } from '@kbn/i18n'; +import { FormattedMessage } from '@kbn/i18n-react'; +import { MapCenter, MapSettings } from '../../../../common/descriptor_types'; +import { ddToMGRS, mgrsToDD, withinRange } from './utils'; + +interface Props { + settings: MapSettings; + zoom: number; + center: MapCenter; + onSubmit: (lat: number, lon: number, zoom: number) => void; +} + +interface State { + mgrs: string; + zoom: number | string; +} + +export class MgrsForm extends Component { + state: State = { + mgrs: ddToMGRS(this.props.center.lat, this.props.center.lon), + zoom: this.props.zoom, + }; + + _toPoint() { + return this.state.mgrs === '' ? undefined : mgrsToDD(this.state.mgrs); + } + + _isMgrsInvalid() { + const point = this._toPoint(); + return ( + point === undefined || + !point.north || + _.isNaN(point.north) || + !point.south || + _.isNaN(point.south) || + !point.east || + _.isNaN(point.east) || + !point.west || + _.isNaN(point.west) + ); + } + + _onMGRSChange = (evt: ChangeEvent) => { + this.setState({ + mgrs: _.isNull(evt.target.value) ? '' : evt.target.value, + }); + }; + + _onZoomChange = (evt: ChangeEvent) => { + const sanitizedValue = parseFloat(evt.target.value); + this.setState({ + zoom: isNaN(sanitizedValue) ? '' : sanitizedValue, + }); + }; + + _onSubmit = () => { + const point = this._toPoint(); + if (point) { + this.props.onSubmit(point.north, point.east, this.state.zoom as number); + } + }; + + render() { + const isMgrsInvalid = this._isMgrsInvalid(); + const mgrsError = isMgrsInvalid + ? i18n.translate('xpack.maps.setViewControl.mgrsInvalid', { + defaultMessage: 'MGRS is invalid', + }) + : null; + const { isInvalid: isZoomInvalid, error: zoomError } = withinRange( + this.state.zoom, + this.props.settings.minZoom, + this.props.settings.maxZoom + ); + + return ( + + + + + + + + + + + + + + + + + + ); + } +} diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/set_view_control/number_form_row.tsx b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/set_view_control/number_form_row.tsx new file mode 100644 index 0000000000000..1fec1c76430eb --- /dev/null +++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/set_view_control/number_form_row.tsx @@ -0,0 +1,6 @@ +/* + * 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. + */ diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/set_view_control/set_view_control.tsx b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/set_view_control/set_view_control.tsx index eb0b1cfc1ddaf..906cbb8a0bb00 100644 --- a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/set_view_control/set_view_control.tsx +++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/set_view_control/set_view_control.tsx @@ -5,50 +5,11 @@ * 2.0. */ -import React, { ChangeEvent, Component, Fragment } from 'react'; -import { - EuiForm, - EuiFormRow, - EuiButton, - EuiFieldNumber, - EuiFieldText, - EuiButtonIcon, - EuiPopover, - EuiTextAlign, - EuiSpacer, - EuiPanel, -} from '@elastic/eui'; -import { EuiButtonEmpty } from '@elastic/eui'; -import { EuiRadioGroup } from '@elastic/eui'; +import React, { Component } from 'react'; +import { EuiButtonIcon, EuiPopover, EuiPanel } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; -import { FormattedMessage } from '@kbn/i18n-react'; -import * as usng from 'usng.js'; -import { isNaN, isNull } from 'lodash'; import { MapCenter, MapSettings } from '../../../../common/descriptor_types'; - -export const COORDINATE_SYSTEM_DEGREES_DECIMAL = 'dd'; -export const COORDINATE_SYSTEM_MGRS = 'mgrs'; -export const COORDINATE_SYSTEM_UTM = 'utm'; - -export const DEFAULT_SET_VIEW_COORDINATE_SYSTEM = COORDINATE_SYSTEM_DEGREES_DECIMAL; - -// @ts-ignore -const converter = new usng.Converter(); - -const COORDINATE_SYSTEMS = [ - { - id: COORDINATE_SYSTEM_DEGREES_DECIMAL, - label: 'Degrees Decimal', - }, - { - id: COORDINATE_SYSTEM_UTM, - label: 'UTM', - }, - { - id: COORDINATE_SYSTEM_MGRS, - label: 'MGRS', - }, -]; +import { SetViewForm } from './set_view_form'; export interface Props { settings: MapSettings; @@ -59,73 +20,17 @@ export interface Props { interface State { isPopoverOpen: boolean; - lat: number | string; - lon: number | string; - zoom: number | string; - coord: string; - mgrs: string; - utm: { - northing: string; - easting: string; - zoneNumber: string; - zoneLetter: string | undefined; - zone: string; - }; - isCoordPopoverOpen: boolean; - prevView: string | undefined; } export class SetViewControl extends Component { state: State = { isPopoverOpen: false, - lat: 0, - lon: 0, - zoom: 0, - coord: DEFAULT_SET_VIEW_COORDINATE_SYSTEM, - mgrs: '', - utm: { - northing: '', - easting: '', - zoneNumber: '', - zoneLetter: '', - zone: '', - }, - isCoordPopoverOpen: false, - prevView: '', }; - static getDerivedStateFromProps(nextProps: Props, prevState: State) { - const nextView = getViewString(nextProps.center.lat, nextProps.center.lon, nextProps.zoom); - - const utm = convertLatLonToUTM(nextProps.center.lat, nextProps.center.lon); - const mgrs = convertLatLonToMGRS(nextProps.center.lat, nextProps.center.lon); - - if (nextView !== prevState.prevView) { - return { - lat: nextProps.center.lat, - lon: nextProps.center.lon, - zoom: nextProps.zoom, - utm, - mgrs, - prevView: nextView, - }; - } - - return null; - } - _togglePopover = () => { - if (this.state.isPopoverOpen) { - this._closePopover(); - return; - } - - this.setState({ - lat: this.props.center.lat, - lon: this.props.center.lon, - zoom: this.props.zoom, - isPopoverOpen: true, - }); + this.setState((prevState) => ({ + isPopoverOpen: !prevState.isPopoverOpen, + })); }; _closePopover = () => { @@ -134,567 +39,11 @@ export class SetViewControl extends Component { }); }; - _onCoordinateSystemChange = (coordId: string) => { - this.setState({ - coord: coordId, - }); - }; - - _onLatChange = (evt: ChangeEvent) => { - this._onChange('lat', evt); - }; - - _onLonChange = (evt: ChangeEvent) => { - this._onChange('lon', evt); - }; - - _onZoomChange = (evt: ChangeEvent) => { - const sanitizedValue = parseFloat(evt.target.value); - this.setState({ - ['zoom']: isNaN(sanitizedValue) ? '' : sanitizedValue, - }); - }; - - _onUTMZoneChange = (evt: ChangeEvent) => { - this._onUTMChange('zone', evt); - }; - - _onUTMEastingChange = (evt: ChangeEvent) => { - this._onUTMChange('easting', evt); - }; - - _onUTMNorthingChange = (evt: ChangeEvent) => { - this._onUTMChange('northing', evt); - }; - - _onMGRSChange = (evt: ChangeEvent) => { - this.setState( - { - ['mgrs']: isNull(evt.target.value) ? '' : evt.target.value, - }, - this._syncToMGRS - ); - }; - - _onUTMChange = (name: 'easting' | 'northing' | 'zone', evt: ChangeEvent) => { - const value = evt.target.value; - const updateObj = { ...this.state.utm }; - updateObj[name] = isNull(value) ? '' : value; - if (name === 'zone' && value.length > 0) { - const zoneLetter = value.substring(value.length - 1); - const zoneNumber = value.substring(0, value.length - 1); - updateObj.zoneLetter = isNaN(zoneLetter) ? zoneLetter : ''; - updateObj.zoneNumber = isNaN(zoneNumber) ? '' : zoneNumber; - } - this.setState( - { - // @ts-ignore - ['utm']: updateObj, - }, - this._syncToUTM - ); - }; - - _onChange = (name: 'lat' | 'lon', evt: ChangeEvent) => { - const sanitizedValue = parseFloat(evt.target.value); - - this.setState( - // @ts-ignore - { - [name]: isNaN(sanitizedValue) ? '' : sanitizedValue, - }, - this._syncToLatLon - ); - }; - - /** - * Sync all coordinates to the lat/lon that is set - */ - _syncToLatLon = () => { - if (this.state.lat !== '' && this.state.lon !== '') { - const utm = convertLatLonToUTM(this.state.lat, this.state.lon); - const mgrs = convertLatLonToMGRS(this.state.lat, this.state.lon); - - this.setState({ mgrs, utm }); - } else { - this.setState({ - mgrs: '', - utm: { northing: '', easting: '', zoneNumber: '', zoneLetter: '', zone: '' }, - }); - } - }; - - /** - * Sync the current lat/lon to MGRS that is set - */ - _syncToMGRS = () => { - if (this.state.mgrs !== '') { - let lon; - let lat; - - try { - const { north, east } = convertMGRStoLL(this.state.mgrs); - lat = north; - lon = east; - } catch (err) { - return; - } - - const utm = convertLatLonToUTM(lat, lon); - - this.setState({ - lat: isNaN(lat) ? '' : lat, - lon: isNaN(lon) ? '' : lon, - utm, - }); - } else { - this.setState({ - lat: '', - lon: '', - utm: { northing: '', easting: '', zoneNumber: '', zoneLetter: '', zone: '' }, - }); - } - }; - - /** - * Sync the current lat/lon to UTM that is set - */ - _syncToUTM = () => { - if (this.state.utm) { - let lat; - let lon; - try { - ({ lat, lon } = converter.UTMtoLL( - this.state.utm.northing, - this.state.utm.easting, - this.state.utm.zoneNumber - )); - } catch (err) { - return; - } - - const mgrs = convertLatLonToMGRS(lat, lon); - - this.setState({ - lat: isNaN(lat) ? '' : lat, - lon: isNaN(lon) ? '' : lon, - mgrs, - }); - } else { - this.setState({ - lat: '', - lon: '', - mgrs: '', - }); - } - }; - - _renderNumberFormRow = ({ - value, - min, - max, - onChange, - label, - dataTestSubj, - }: { - value: string | number; - min: number; - max: number; - onChange: (evt: ChangeEvent) => void; - label: string; - dataTestSubj: string; - }) => { - const isInvalid = value === '' || value > max || value < min; - const error = isInvalid ? `Must be between ${min} and ${max}` : null; - return { - isInvalid, - component: ( - - - - ), - }; - }; - - _renderMGRSFormRow = ({ - value, - onChange, - label, - dataTestSubj, - }: { - value: string; - onChange: (evt: ChangeEvent) => void; - label: string; - dataTestSubj: string; - }) => { - let point; - try { - point = convertMGRStoLL(value); - } catch (err) { - point = undefined; - } - - const isInvalid = - value === '' || - point === undefined || - !point.north || - isNaN(point.north) || - !point.south || - isNaN(point.south) || - !point.east || - isNaN(point.east) || - !point.west || - isNaN(point.west); - const error = isInvalid - ? i18n.translate('xpack.maps.setViewControl.mgrsInvalid', { - defaultMessage: 'MGRS is invalid', - }) - : null; - return { - isInvalid, - component: ( - - - - ), - }; - }; - - _renderUTMZoneRow = ({ - value, - onChange, - label, - dataTestSubj, - }: { - value: string | number; - onChange: (evt: ChangeEvent) => void; - label: string; - dataTestSubj: string; - }) => { - let point; - try { - point = converter.UTMtoLL( - this.state.utm.northing, - this.state.utm.easting, - this.state.utm.zoneNumber - ); - } catch { - point = undefined; - } - - const isInvalid = value === '' || point === undefined; - const error = isInvalid - ? i18n.translate('xpack.maps.setViewControl.utmInvalidZone', { - defaultMessage: 'UTM Zone is invalid', - }) - : null; - return { - isInvalid, - component: ( - - - - ), - }; - }; - - _renderUTMEastingRow = ({ - value, - onChange, - label, - dataTestSubj, - }: { - value: string | number; - onChange: (evt: ChangeEvent) => void; - label: string; - dataTestSubj: string; - }) => { - let point; - try { - point = converter.UTMtoLL(this.state.utm.northing, value, this.state.utm.zoneNumber); - } catch { - point = undefined; - } - const isInvalid = value === '' || point === undefined; - const error = isInvalid - ? i18n.translate('xpack.maps.setViewControl.utmInvalidEasting', { - defaultMessage: 'UTM Easting is invalid', - }) - : null; - return { - isInvalid, - component: ( - - - - ), - }; - }; - - _renderUTMNorthingRow = ({ - value, - onChange, - label, - dataTestSubj, - }: { - value: string | number; - onChange: (evt: ChangeEvent) => void; - label: string; - dataTestSubj: string; - }) => { - let point; - try { - point = converter.UTMtoLL(value, this.state.utm.easting, this.state.utm.zoneNumber); - } catch { - point = undefined; - } - const isInvalid = value === '' || point === undefined; - const error = isInvalid - ? i18n.translate('xpack.maps.setViewControl.utmInvalidNorthing', { - defaultMessage: 'UTM Northing is invalid', - }) - : null; - return { - isInvalid, - component: ( - - - - ), - }; - }; - - _onSubmit = () => { - const { lat, lon, zoom } = this.state; + _onSubmit = (lat: number, lon: number, zoom: number) => { this._closePopover(); - this.props.onSubmit({ lat: lat as number, lon: lon as number, zoom: zoom as number }); + this.props.onSubmit({ lat, lon, zoom }); }; - _renderSetViewForm() { - let isLatInvalid; - let latFormRow; - let isLonInvalid; - let lonFormRow; - let isMGRSInvalid; - let mgrsFormRow; - let isUtmZoneInvalid; - let utmZoneRow; - let isUtmEastingInvalid; - let utmEastingRow; - let isUtmNorthingInvalid; - let utmNorthingRow; - - if (this.state.coord === COORDINATE_SYSTEM_DEGREES_DECIMAL) { - const latRenderObject = this._renderNumberFormRow({ - value: this.state.lat, - min: -90, - max: 90, - onChange: this._onLatChange, - label: i18n.translate('xpack.maps.setViewControl.latitudeLabel', { - defaultMessage: 'Latitude', - }), - dataTestSubj: 'latitudeInput', - }); - - isLatInvalid = latRenderObject.isInvalid; - latFormRow = latRenderObject.component; - - const lonRenderObject = this._renderNumberFormRow({ - value: this.state.lon, - min: -180, - max: 180, - onChange: this._onLonChange, - label: i18n.translate('xpack.maps.setViewControl.longitudeLabel', { - defaultMessage: 'Longitude', - }), - dataTestSubj: 'longitudeInput', - }); - - isLonInvalid = lonRenderObject.isInvalid; - lonFormRow = lonRenderObject.component; - } else if (this.state.coord === COORDINATE_SYSTEM_MGRS) { - const mgrsRenderObject = this._renderMGRSFormRow({ - value: this.state.mgrs, - onChange: this._onMGRSChange, - label: i18n.translate('xpack.maps.setViewControl.mgrsLabel', { - defaultMessage: 'MGRS', - }), - dataTestSubj: 'mgrsInput', - }); - - isMGRSInvalid = mgrsRenderObject.isInvalid; - mgrsFormRow = mgrsRenderObject.component; - } else if (this.state.coord === COORDINATE_SYSTEM_UTM) { - const utmZoneRenderObject = this._renderUTMZoneRow({ - value: this.state.utm !== undefined ? this.state.utm.zone : '', - onChange: this._onUTMZoneChange, - label: i18n.translate('xpack.maps.setViewControl.utmZoneLabel', { - defaultMessage: 'UTM Zone', - }), - dataTestSubj: 'utmZoneInput', - }); - - isUtmZoneInvalid = utmZoneRenderObject.isInvalid; - utmZoneRow = utmZoneRenderObject.component; - - const utmEastingRenderObject = this._renderUTMEastingRow({ - value: this.state.utm !== undefined ? this.state.utm.easting : '', - onChange: this._onUTMEastingChange, - label: i18n.translate('xpack.maps.setViewControl.utmEastingLabel', { - defaultMessage: 'UTM Easting', - }), - dataTestSubj: 'utmEastingInput', - }); - - isUtmEastingInvalid = utmEastingRenderObject.isInvalid; - utmEastingRow = utmEastingRenderObject.component; - - const utmNorthingRenderObject = this._renderUTMNorthingRow({ - value: this.state.utm !== undefined ? this.state.utm.northing : '', - onChange: this._onUTMNorthingChange, - label: i18n.translate('xpack.maps.setViewControl.utmNorthingLabel', { - defaultMessage: 'UTM Northing', - }), - dataTestSubj: 'utmNorthingInput', - }); - - isUtmNorthingInvalid = utmNorthingRenderObject.isInvalid; - utmNorthingRow = utmNorthingRenderObject.component; - } - - const { isInvalid: isZoomInvalid, component: zoomFormRow } = this._renderNumberFormRow({ - value: this.state.zoom, - min: this.props.settings.minZoom, - max: this.props.settings.maxZoom, - onChange: this._onZoomChange, - label: i18n.translate('xpack.maps.setViewControl.zoomLabel', { - defaultMessage: 'Zoom', - }), - dataTestSubj: 'zoomInput', - }); - - let coordinateInputs; - if (this.state.coord === 'dd') { - coordinateInputs = ( - - {latFormRow} - {lonFormRow} - {zoomFormRow} - - ); - } else if (this.state.coord === 'dms') { - coordinateInputs = ( - - {latFormRow} - {lonFormRow} - {zoomFormRow} - - ); - } else if (this.state.coord === 'utm') { - coordinateInputs = ( - - {utmZoneRow} - {utmEastingRow} - {utmNorthingRow} - {zoomFormRow} - - ); - } else if (this.state.coord === 'mgrs') { - coordinateInputs = ( - - {mgrsFormRow} - {zoomFormRow} - - ); - } - - return ( - - { - this.setState({ isCoordPopoverOpen: false }); - }} - button={ - { - this.setState({ isCoordPopoverOpen: !this.state.isCoordPopoverOpen }); - }} - > - Coordinate System - - } - > - - - - {coordinateInputs} - - - - - - - - - - ); - } - render() { return ( { isOpen={this.state.isPopoverOpen} closePopover={this._closePopover} > - {this._renderSetViewForm()} + ); } } - -function convertLatLonToUTM(lat: string | number, lon: string | number) { - const utmCoord = converter.LLtoUTM(lat, lon); - - let eastwest = 'E'; - if (utmCoord.easting < 0) { - eastwest = 'W'; - } - let norwest = 'N'; - if (utmCoord.northing < 0) { - norwest = 'S'; - } - - if (utmCoord !== 'undefined') { - utmCoord.zoneLetter = isNaN(lat) ? '' : converter.UTMLetterDesignator(lat); - utmCoord.zone = `${utmCoord.zoneNumber}${utmCoord.zoneLetter}`; - utmCoord.easting = Math.round(utmCoord.easting); - utmCoord.northing = Math.round(utmCoord.northing); - utmCoord.str = `${utmCoord.zoneNumber}${utmCoord.zoneLetter} ${utmCoord.easting}${eastwest} ${utmCoord.northing}${norwest}`; - } - - return utmCoord; -} - -function convertLatLonToMGRS(lat: string | number, lon: string | number) { - const mgrsCoord = converter.LLtoMGRS(lat, lon, 5); - return mgrsCoord; -} - -function getViewString(lat: number, lon: number, zoom: number) { - return `${lat},${lon},${zoom}`; -} - -function convertMGRStoUSNG(mgrs: string) { - let squareIdEastSpace = 0; - for (let i = mgrs.length - 1; i > -1; i--) { - // check if we have hit letters yet - if (isNaN(mgrs.substr(i, 1))) { - squareIdEastSpace = i + 1; - break; - } - } - const gridZoneSquareIdSpace = squareIdEastSpace ? squareIdEastSpace - 2 : -1; - const numPartLength = mgrs.substr(squareIdEastSpace).length / 2; - // add the number split space - const eastNorthSpace = squareIdEastSpace ? squareIdEastSpace + numPartLength : -1; - const stringArray = mgrs.split(''); - - stringArray.splice(eastNorthSpace, 0, ' '); - stringArray.splice(squareIdEastSpace, 0, ' '); - stringArray.splice(gridZoneSquareIdSpace, 0, ' '); - - const rejoinedArray = stringArray.join(''); - return rejoinedArray; -} - -function convertMGRStoLL(mgrs: string) { - return mgrs ? converter.USNGtoLL(convertMGRStoUSNG(mgrs)) : ''; -} diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/set_view_control/set_view_form.tsx b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/set_view_control/set_view_form.tsx new file mode 100644 index 0000000000000..28fe6073d7646 --- /dev/null +++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/set_view_control/set_view_form.tsx @@ -0,0 +1,134 @@ +/* + * 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, { Component } from 'react'; +import { EuiButtonEmpty, EuiPopover, EuiRadioGroup } from '@elastic/eui'; +import { i18n } from '@kbn/i18n'; +import { FormattedMessage } from '@kbn/i18n-react'; +import { MapCenter, MapSettings } from '../../../../common/descriptor_types'; +import { DecimalDegreesForm } from './decimal_degrees_form'; +import { MgrsForm } from './mgrs_form'; +import { UtmForm } from './utm_form'; + +const DEGREES_DECIMAL = 'dd'; +const MGRS = 'mgrs'; +const UTM = 'utm'; + +const COORDINATE_SYSTEM_OPTIONS = [ + { + id: DEGREES_DECIMAL, + label: i18n.translate('xpack.maps.setViewControl.decimalDegreesLabel', { + defaultMessage: 'Decimal degrees', + }), + }, + { + id: UTM, + label: 'UTM', + }, + { + id: MGRS, + label: 'MGRS', + }, +]; + +interface Props { + settings: MapSettings; + zoom: number; + center: MapCenter; + onSubmit: (lat: number, lon: number, zoom: number) => void; +} + +interface State { + isPopoverOpen: boolean; + coordinateSystem: string; +} + +export class SetViewForm extends Component { + state: State = { + coordinateSystem: DEGREES_DECIMAL, + isPopoverOpen: false, + }; + + _togglePopover = () => { + this.setState((prevState) => ({ + isPopoverOpen: !prevState.isPopoverOpen, + })); + }; + + _closePopover = () => { + this.setState({ + isPopoverOpen: false, + }); + }; + + _onCoordinateSystemChange = (optionId: string) => { + this._closePopover(); + this.setState({ + coordinateSystem: optionId, + }); + }; + + _renderForm() { + if (this.state.coordinateSystem === MGRS) { + return ( + + ); + } + + if (this.state.coordinateSystem === UTM) { + return ( + + ); + } + + return ( + + ); + } + + render() { + return ( +
    + + + + } + > + + + {this._renderForm()} +
    + ); + } +} diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/set_view_control/utils.test.ts b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/set_view_control/utils.test.ts new file mode 100644 index 0000000000000..e6a6819687d10 --- /dev/null +++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/set_view_control/utils.test.ts @@ -0,0 +1,52 @@ +/* + * 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 { ddToMGRS, mgrsToDD, ddToUTM, utmToDD } from './utils'; + +describe('MGRS', () => { + test('ddToMGRS should convert lat lon to MGRS', () => { + expect(ddToMGRS(29.29926, 32.05495)).toEqual('36RVT08214151'); + }); + + test('ddToMGRS should return empty string for lat lon that does not translate to MGRS grid', () => { + expect(ddToMGRS(90, 32.05495)).toEqual(''); + }); + + test('mgrsToDD should convert MGRS to lat lon', () => { + expect(mgrsToDD('36RVT08214151')).toEqual({ + east: 32.05498649594143, + north: 29.299330195900975, + south: 29.299239224067065, + west: 32.054884373627345, + }); + }); +}); + +describe('UTM', () => { + test('ddToUTM should convert lat lon to UTM', () => { + expect(ddToUTM(29.29926, 32.05495)).toEqual({ + easting: '408216', + northing: '3241512', + zone: '36R', + }); + }); + + test('ddToUTM should return empty strings for lat lon that does not translate to UTM grid', () => { + expect(ddToUTM(90, 32.05495)).toEqual({ + northing: '', + easting: '', + zone: '', + }); + }); + + test('utmToDD should convert UTM to lat lon', () => { + expect(utmToDD('3241512', '408216', '36R')).toEqual({ + lat: 29.29925770984472, + lon: 32.05494597943409, + }); + }); +}); diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/set_view_control/utils.ts b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/set_view_control/utils.ts new file mode 100644 index 0000000000000..7edf1428d9312 --- /dev/null +++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/set_view_control/utils.ts @@ -0,0 +1,91 @@ +/* + * 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 * as usng from 'usng.js'; + +// @ts-ignore +const converter = new usng.Converter(); + +export function withinRange(value: string | number, min: number, max: number) { + const isInvalid = value === '' || value > max || value < min; + const error = isInvalid + ? i18n.translate('xpack.maps.setViewControl.outOfRangeErrorMsg', { + defaultMessage: `Must be between {min} and {max}`, + values: { min, max }, + }) + : null; + return { isInvalid, error }; +} + +export function ddToUTM(lat: number, lon: number) { + try { + const utm = converter.LLtoUTM(lat, lon); + return { + northing: utm === converter.UNDEFINED_STR ? '' : String(Math.round(utm.northing)), + easting: utm === converter.UNDEFINED_STR ? '' : String(Math.round(utm.easting)), + zone: + utm === converter.UNDEFINED_STR + ? '' + : `${utm.zoneNumber}${converter.UTMLetterDesignator(lat)}`, + }; + } catch (e) { + return { + northing: '', + easting: '', + zone: '', + }; + } +} + +export function utmToDD(northing: string, easting: string, zoneNumber: string) { + try { + return converter.UTMtoLL(northing, easting, zoneNumber); + } catch (e) { + return undefined; + } +} + +export function ddToMGRS(lat: number, lon: number) { + try { + const mgrsCoord = converter.LLtoMGRS(lat, lon, 5); + return mgrsCoord; + } catch (e) { + return ''; + } +} + +function mgrstoUSNG(mgrs: string) { + let squareIdEastSpace = 0; + for (let i = mgrs.length - 1; i > -1; i--) { + // check if we have hit letters yet + if (isNaN(parseInt(mgrs.substr(i, 1), 10))) { + squareIdEastSpace = i + 1; + break; + } + } + const gridZoneSquareIdSpace = squareIdEastSpace ? squareIdEastSpace - 2 : -1; + const numPartLength = mgrs.substr(squareIdEastSpace).length / 2; + // add the number split space + const eastNorthSpace = squareIdEastSpace ? squareIdEastSpace + numPartLength : -1; + const stringArray = mgrs.split(''); + + stringArray.splice(eastNorthSpace, 0, ' '); + stringArray.splice(squareIdEastSpace, 0, ' '); + stringArray.splice(gridZoneSquareIdSpace, 0, ' '); + + const rejoinedArray = stringArray.join(''); + return rejoinedArray; +} + +export function mgrsToDD(mgrs: string) { + try { + return converter.USNGtoLL(mgrstoUSNG(mgrs)); + } catch (e) { + return undefined; + } +} diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/set_view_control/utm_form.tsx b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/set_view_control/utm_form.tsx new file mode 100644 index 0000000000000..76a3628217056 --- /dev/null +++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/set_view_control/utm_form.tsx @@ -0,0 +1,209 @@ +/* + * 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 _ from 'lodash'; +import React, { ChangeEvent, Component } from 'react'; +import { + EuiForm, + EuiFormRow, + EuiButton, + EuiFieldNumber, + EuiFieldText, + EuiTextAlign, + EuiSpacer, +} from '@elastic/eui'; +import { i18n } from '@kbn/i18n'; +import { FormattedMessage } from '@kbn/i18n-react'; +import { MapCenter, MapSettings } from '../../../../common/descriptor_types'; +import { ddToUTM, utmToDD, withinRange } from './utils'; + +interface Props { + settings: MapSettings; + zoom: number; + center: MapCenter; + onSubmit: (lat: number, lon: number, zoom: number) => void; +} + +interface State { + northing: string; + easting: string; + zone: string; + zoom: number | string; +} + +export class UtmForm extends Component { + constructor(props: Props) { + super(props); + const utm = ddToUTM(this.props.center.lat, this.props.center.lon); + this.state = { + northing: utm.northing, + easting: utm.easting, + zone: utm.zone, + zoom: this.props.zoom, + }; + } + + _toPoint() { + const { northing, easting, zone } = this.state; + return northing === '' || easting === '' || zone.length < 2 + ? undefined + : utmToDD(northing, easting, zone.substring(0, zone.length - 1)); + } + + _isUtmInvalid() { + const point = this._toPoint(); + return point === undefined; + } + + _onZoneChange = (evt: ChangeEvent) => { + this.setState({ + zone: _.isNull(evt.target.value) ? '' : evt.target.value, + }); + }; + + _onEastingChange = (evt: ChangeEvent) => { + this.setState({ + easting: _.isNull(evt.target.value) ? '' : evt.target.value, + }); + }; + + _onNorthingChange = (evt: ChangeEvent) => { + this.setState({ + northing: _.isNull(evt.target.value) ? '' : evt.target.value, + }); + }; + + _onZoomChange = (evt: ChangeEvent) => { + const sanitizedValue = parseFloat(evt.target.value); + this.setState({ + zoom: isNaN(sanitizedValue) ? '' : sanitizedValue, + }); + }; + + _onSubmit = () => { + const point = this._toPoint(); + if (point) { + this.props.onSubmit(point.lat, point.lon, this.state.zoom as number); + } + }; + + render() { + const isUtmInvalid = this._isUtmInvalid(); + const northingError = + isUtmInvalid || this.state.northing === '' + ? i18n.translate('xpack.maps.setViewControl.utmInvalidNorthing', { + defaultMessage: 'UTM Northing is invalid', + }) + : null; + const eastingError = + isUtmInvalid || this.state.northing === '' + ? i18n.translate('xpack.maps.setViewControl.utmInvalidEasting', { + defaultMessage: 'UTM Easting is invalid', + }) + : null; + const zoneError = + isUtmInvalid || this.state.northing === '' + ? i18n.translate('xpack.maps.setViewControl.utmInvalidZone', { + defaultMessage: 'UTM Zone is invalid', + }) + : null; + const { isInvalid: isZoomInvalid, error: zoomError } = withinRange( + this.state.zoom, + this.props.settings.minZoom, + this.props.settings.maxZoom + ); + + return ( + + + + + + + + + + + + + + + + + + + + + + + + + + ); + } +} From 427637a3b02a48a347409f77eaa34e4f53541970 Mon Sep 17 00:00:00 2001 From: Jiawei Wu <74562234+JiaweiWu@users.noreply.github.com> Date: Tue, 27 Sep 2022 18:05:56 -0600 Subject: [PATCH 23/95] [RAM] Fix bulk editing snooze schedule overwriting existing snooze (#141883) * Fix odd behaviour with bulk snoozing * Fix redundant code Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../server/rules_client/rules_client.ts | 52 ++- .../rules_client/tests/bulk_edit.test.ts | 300 ++++++++++++++---- 2 files changed, 283 insertions(+), 69 deletions(-) diff --git a/x-pack/plugins/alerting/server/rules_client/rules_client.ts b/x-pack/plugins/alerting/server/rules_client/rules_client.ts index ed330dbd22e08..ce1dfcc1827b6 100644 --- a/x-pack/plugins/alerting/server/rules_client/rules_client.ts +++ b/x-pack/plugins/alerting/server/rules_client/rules_client.ts @@ -1797,7 +1797,7 @@ export class RulesClient { break; } if (operation.operation === 'set') { - const snoozeAttributes = getSnoozeAttributes(attributes, operation.value); + const snoozeAttributes = getBulkSnoozeAttributes(attributes, operation.value); try { verifySnoozeScheduleLimit(snoozeAttributes); } catch (error) { @@ -1819,7 +1819,7 @@ export class RulesClient { } attributes = { ...attributes, - ...getUnsnoozeAttributes(attributes, idsToDelete), + ...getBulkUnsnoozeAttributes(attributes, idsToDelete), }; } break; @@ -3254,6 +3254,33 @@ function getSnoozeAttributes(attributes: RawRule, snoozeSchedule: RuleSnoozeSche }; } +function getBulkSnoozeAttributes(attributes: RawRule, snoozeSchedule: RuleSnoozeSchedule) { + // If duration is -1, instead mute all + const { id: snoozeId, duration } = snoozeSchedule; + + if (duration === -1) { + return { + muteAll: true, + snoozeSchedule: clearUnscheduledSnooze(attributes), + }; + } + + // Bulk adding snooze schedule, don't touch the existing snooze/indefinite snooze + if (snoozeId) { + const existingSnoozeSchedules = attributes.snoozeSchedule || []; + return { + muteAll: attributes.muteAll, + snoozeSchedule: [...existingSnoozeSchedules, snoozeSchedule], + }; + } + + // Bulk snoozing, don't touch the existing snooze schedules + return { + muteAll: false, + snoozeSchedule: [...clearUnscheduledSnooze(attributes), snoozeSchedule], + }; +} + function getUnsnoozeAttributes(attributes: RawRule, scheduleIds?: string[]) { const snoozeSchedule = scheduleIds ? clearScheduledSnoozesById(attributes, scheduleIds) @@ -3265,6 +3292,27 @@ function getUnsnoozeAttributes(attributes: RawRule, scheduleIds?: string[]) { }; } +function getBulkUnsnoozeAttributes(attributes: RawRule, scheduleIds?: string[]) { + // Bulk removing snooze schedules, don't touch the current snooze/indefinite snooze + if (scheduleIds) { + const newSchedules = clearScheduledSnoozesById(attributes, scheduleIds); + // Unscheduled snooze is also known as snooze now + const unscheduledSnooze = + attributes.snoozeSchedule?.filter((s) => typeof s.id === 'undefined') || []; + + return { + snoozeSchedule: [...unscheduledSnooze, ...newSchedules], + muteAll: attributes.muteAll, + }; + } + + // Bulk unsnoozing, don't touch current snooze schedules that are NOT active + return { + snoozeSchedule: clearCurrentActiveSnooze(attributes), + muteAll: false, + }; +} + function clearUnscheduledSnooze(attributes: RawRule) { // Clear any snoozes that have no ID property. These are "simple" snoozes created with the quick UI, e.g. snooze for 3 days starting now return attributes.snoozeSchedule diff --git a/x-pack/plugins/alerting/server/rules_client/tests/bulk_edit.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/bulk_edit.test.ts index 1cafcd652349a..5e440d2e6b6d7 100644 --- a/x-pack/plugins/alerting/server/rules_client/tests/bulk_edit.test.ts +++ b/x-pack/plugins/alerting/server/rules_client/tests/bulk_edit.test.ts @@ -26,9 +26,11 @@ jest.mock('../../invalidate_pending_api_keys/bulk_mark_api_keys_for_invalidation })); jest.mock('../../lib/snooze/is_snooze_active', () => ({ - isSnoozeActive: jest.fn(() => true), + isSnoozeActive: jest.fn(), })); +const { isSnoozeActive } = jest.requireMock('../../lib/snooze/is_snooze_active'); + const taskManager = taskManagerMock.createStart(); const ruleTypeRegistry = ruleTypeRegistryMock.create(); const unsecuredSavedObjectsClient = savedObjectsClientMock.create(); @@ -310,9 +312,13 @@ describe('bulkEdit()', () => { }); describe('snoozeSchedule operations', () => { - const getSnoozeSchedule = () => { + afterEach(() => { + isSnoozeActive.mockImplementation(() => false); + }); + + const getSnoozeSchedule = (useId: boolean = true) => { return { - id: uuid.v4(), + ...(useId && { id: uuid.v4() }), duration: 28800000, rRule: { dtstart: '2010-09-19T11:49:59.329Z', @@ -321,8 +327,10 @@ describe('bulkEdit()', () => { }, }; }; - test('should add snooze', async () => { - unsecuredSavedObjectsClient.bulkCreate.mockResolvedValue({ + + // eslint-disable-next-line @typescript-eslint/no-explicit-any + const getMockAttribute = (override: Record = {}) => { + return { saved_objects: [ { id: '1', @@ -339,15 +347,137 @@ describe('bulkEdit()', () => { notifyWhen: null, actions: [], snoozeSchedule: [], + ...override, }, references: [], version: '123', }, ], + }; + }; + + test('should snooze', async () => { + unsecuredSavedObjectsClient.bulkCreate.mockResolvedValue(getMockAttribute()); + const snoozePayload = getSnoozeSchedule(false); + await rulesClient.bulkEdit({ + filter: '', + operations: [ + { + operation: 'set', + field: 'snoozeSchedule', + value: snoozePayload, + }, + ], + }); + + expect(unsecuredSavedObjectsClient.bulkCreate).toHaveBeenCalledTimes(1); + expect(unsecuredSavedObjectsClient.bulkCreate).toHaveBeenCalledWith( + [ + expect.objectContaining({ + id: '1', + type: 'alert', + attributes: expect.objectContaining({ + snoozeSchedule: [snoozePayload], + }), + }), + ], + { overwrite: true } + ); + }); + + test('should add snooze schedule', async () => { + unsecuredSavedObjectsClient.bulkCreate.mockResolvedValue(getMockAttribute()); + + const snoozePayload = getSnoozeSchedule(); + await rulesClient.bulkEdit({ + filter: '', + operations: [ + { + operation: 'set', + field: 'snoozeSchedule', + value: snoozePayload, + }, + ], + }); + + expect(unsecuredSavedObjectsClient.bulkCreate).toHaveBeenCalledTimes(1); + expect(unsecuredSavedObjectsClient.bulkCreate).toHaveBeenCalledWith( + [ + expect.objectContaining({ + id: '1', + type: 'alert', + attributes: expect.objectContaining({ + snoozeSchedule: [snoozePayload], + }), + }), + ], + { overwrite: true } + ); + }); + + test('should not unsnooze a snoozed rule when bulk adding snooze schedules', async () => { + const existingSnooze = [getSnoozeSchedule(false), getSnoozeSchedule()]; + + mockCreatePointInTimeFinderAsInternalUser({ + saved_objects: [ + { + ...existingDecryptedRule, + attributes: { + ...existingDecryptedRule.attributes, + snoozeSchedule: existingSnooze, + // eslint-disable-next-line @typescript-eslint/no-explicit-any + } as any, + }, + ], }); + unsecuredSavedObjectsClient.bulkCreate.mockResolvedValue(getMockAttribute()); + const snoozePayload = getSnoozeSchedule(); + await rulesClient.bulkEdit({ + filter: '', + operations: [ + { + operation: 'set', + field: 'snoozeSchedule', + value: snoozePayload, + }, + ], + }); + expect(unsecuredSavedObjectsClient.bulkCreate).toHaveBeenCalledTimes(1); + expect(unsecuredSavedObjectsClient.bulkCreate).toHaveBeenCalledWith( + [ + expect.objectContaining({ + id: '1', + type: 'alert', + attributes: expect.objectContaining({ + snoozeSchedule: [...existingSnooze, snoozePayload], + }), + }), + ], + { overwrite: true } + ); + }); + + test('should not unsnooze an indefinitely snoozed rule when bulk adding snooze schedules', async () => { + mockCreatePointInTimeFinderAsInternalUser({ + saved_objects: [ + { + ...existingDecryptedRule, + attributes: { + ...existingDecryptedRule.attributes, + muteAll: true, + snoozeSchedule: [], + // eslint-disable-next-line @typescript-eslint/no-explicit-any + } as any, + }, + ], + }); + + unsecuredSavedObjectsClient.bulkCreate.mockResolvedValue(getMockAttribute()); + + const snoozePayload = getSnoozeSchedule(); await rulesClient.bulkEdit({ filter: '', operations: [ @@ -366,6 +496,7 @@ describe('bulkEdit()', () => { id: '1', type: 'alert', attributes: expect.objectContaining({ + muteAll: true, snoozeSchedule: [snoozePayload], }), }), @@ -374,39 +505,74 @@ describe('bulkEdit()', () => { ); }); - test('should delete snooze', async () => { - const existingSnooze = [getSnoozeSchedule(), getSnoozeSchedule()]; + test('should unsnooze', async () => { + const existingSnooze = [getSnoozeSchedule(false), getSnoozeSchedule(), getSnoozeSchedule()]; - unsecuredSavedObjectsClient.bulkCreate.mockResolvedValue({ + mockCreatePointInTimeFinderAsInternalUser({ saved_objects: [ { + ...existingDecryptedRule, + attributes: { + ...existingDecryptedRule.attributes, + snoozeSchedule: existingSnooze, + // eslint-disable-next-line @typescript-eslint/no-explicit-any + } as any, + }, + ], + }); + + unsecuredSavedObjectsClient.bulkCreate.mockResolvedValue(getMockAttribute()); + + await rulesClient.bulkEdit({ + filter: '', + operations: [ + { + operation: 'delete', + field: 'snoozeSchedule', + }, + ], + }); + + expect(unsecuredSavedObjectsClient.bulkCreate).toHaveBeenCalledTimes(1); + expect(unsecuredSavedObjectsClient.bulkCreate).toHaveBeenCalledWith( + [ + expect.objectContaining({ id: '1', type: 'alert', + attributes: expect.objectContaining({ + snoozeSchedule: [existingSnooze[1], existingSnooze[2]], + }), + }), + ], + { overwrite: true } + ); + }); + + test('should remove snooze schedules', async () => { + const existingSnooze = [getSnoozeSchedule(), getSnoozeSchedule()]; + + mockCreatePointInTimeFinderAsInternalUser({ + saved_objects: [ + { + ...existingDecryptedRule, attributes: { - enabled: true, - tags: ['foo', 'test-1'], - alertTypeId: 'myType', - schedule: { interval: '1m' }, - consumer: 'myApp', - scheduledTaskId: 'task-123', - params: {}, - throttle: null, - notifyWhen: null, - actions: [], + ...existingDecryptedRule.attributes, snoozeSchedule: existingSnooze, - }, - references: [], - version: '123', + // eslint-disable-next-line @typescript-eslint/no-explicit-any + } as any, }, ], }); + unsecuredSavedObjectsClient.bulkCreate.mockResolvedValue(getMockAttribute()); + await rulesClient.bulkEdit({ filter: '', operations: [ { operation: 'delete', field: 'snoozeSchedule', + value: [], }, ], }); @@ -426,14 +592,8 @@ describe('bulkEdit()', () => { ); }); - test('should error if adding snooze schedule to rule with 5 schedules', async () => { - const existingSnooze = [ - getSnoozeSchedule(), - getSnoozeSchedule(), - getSnoozeSchedule(), - getSnoozeSchedule(), - getSnoozeSchedule(), - ]; + test('should not unsnooze rule when removing snooze schedules', async () => { + const existingSnooze = [getSnoozeSchedule(false), getSnoozeSchedule(), getSnoozeSchedule()]; mockCreatePointInTimeFinderAsInternalUser({ saved_objects: [ @@ -448,30 +608,58 @@ describe('bulkEdit()', () => { ], }); - unsecuredSavedObjectsClient.bulkCreate.mockResolvedValue({ - saved_objects: [ + unsecuredSavedObjectsClient.bulkCreate.mockResolvedValue(getMockAttribute()); + + await rulesClient.bulkEdit({ + filter: '', + operations: [ { + operation: 'delete', + field: 'snoozeSchedule', + value: [], + }, + ], + }); + + expect(unsecuredSavedObjectsClient.bulkCreate).toHaveBeenCalledTimes(1); + expect(unsecuredSavedObjectsClient.bulkCreate).toHaveBeenCalledWith( + [ + expect.objectContaining({ id: '1', type: 'alert', + attributes: expect.objectContaining({ + snoozeSchedule: [existingSnooze[0]], + }), + }), + ], + { overwrite: true } + ); + }); + + test('should error if adding snooze schedule to rule with 5 schedules', async () => { + const existingSnooze = [ + getSnoozeSchedule(), + getSnoozeSchedule(), + getSnoozeSchedule(), + getSnoozeSchedule(), + getSnoozeSchedule(), + ]; + + mockCreatePointInTimeFinderAsInternalUser({ + saved_objects: [ + { + ...existingDecryptedRule, attributes: { - enabled: true, - tags: ['foo', 'test-1'], - alertTypeId: 'myType', - schedule: { interval: '1m' }, - consumer: 'myApp', - scheduledTaskId: 'task-123', - params: {}, - throttle: null, - notifyWhen: null, - actions: [], + ...existingDecryptedRule.attributes, snoozeSchedule: existingSnooze, - }, - references: [], - version: '123', + // eslint-disable-next-line @typescript-eslint/no-explicit-any + } as any, }, ], }); + unsecuredSavedObjectsClient.bulkCreate.mockResolvedValue(getMockAttribute()); + const snoozePayload = getSnoozeSchedule(); const response = await rulesClient.bulkEdit({ @@ -501,29 +689,7 @@ describe('bulkEdit()', () => { ], }); - unsecuredSavedObjectsClient.bulkCreate.mockResolvedValue({ - saved_objects: [ - { - id: '1', - type: 'alert', - attributes: { - enabled: true, - tags: ['foo', 'test-1'], - alertTypeId: 'myType', - schedule: { interval: '1m' }, - consumer: 'myApp', - scheduledTaskId: 'task-123', - params: {}, - throttle: null, - notifyWhen: null, - actions: [], - snoozeSchedule: [], - }, - references: [], - version: '123', - }, - ], - }); + unsecuredSavedObjectsClient.bulkCreate.mockResolvedValue(getMockAttribute()); const snoozePayload = getSnoozeSchedule(); From a8e8f3f4c58f1caa0165a2cb1669729c8b177736 Mon Sep 17 00:00:00 2001 From: Xavier Mouligneau Date: Tue, 27 Sep 2022 20:19:39 -0400 Subject: [PATCH 24/95] fix filter on kuery node (#142001) --- .../alerting/server/rules_client/rules_client.ts | 2 +- .../server/rules_client/tests/find.test.ts | 6 ++++-- .../spaces_only/tests/alerting/find.ts | 15 +++++++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/x-pack/plugins/alerting/server/rules_client/rules_client.ts b/x-pack/plugins/alerting/server/rules_client/rules_client.ts index ce1dfcc1827b6..a8367d9ff52b4 100644 --- a/x-pack/plugins/alerting/server/rules_client/rules_client.ts +++ b/x-pack/plugins/alerting/server/rules_client/rules_client.ts @@ -1110,7 +1110,7 @@ export class RulesClient { filter: (authorizationFilter && filterKueryNode ? nodeBuilder.and([filterKueryNode, authorizationFilter as KueryNode]) - : authorizationFilter) ?? options.filter, + : authorizationFilter) ?? filterKueryNode, fields: fields ? this.includeFieldsRequiredForAuthentication(fields) : fields, type: 'alert', }); diff --git a/x-pack/plugins/alerting/server/rules_client/tests/find.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/find.test.ts index e26004de99a31..4cfa13f69b84d 100644 --- a/x-pack/plugins/alerting/server/rules_client/tests/find.test.ts +++ b/x-pack/plugins/alerting/server/rules_client/tests/find.test.ts @@ -176,7 +176,7 @@ describe('find()', () => { Array [ Object { "fields": undefined, - "filter": undefined, + "filter": null, "sortField": undefined, "type": "alert", }, @@ -277,7 +277,7 @@ describe('find()', () => { Array [ Object { "fields": undefined, - "filter": undefined, + "filter": null, "sortField": undefined, "type": "alert", }, @@ -730,6 +730,8 @@ describe('find()', () => { expect(unsecuredSavedObjectsClient.find).toHaveBeenCalledWith({ fields: ['tags', 'alertTypeId', 'consumer'], + filter: null, + sortField: undefined, type: 'alert', }); expect(ensureRuleTypeIsAuthorized).toHaveBeenCalledWith('myType', 'myApp', 'rule'); diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/find.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/find.ts index 2d30465401caa..23dcc1abaea44 100644 --- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/find.ts +++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/find.ts @@ -7,6 +7,7 @@ import expect from '@kbn/expect'; import { SuperTest, Test } from 'supertest'; +import { fromKueryExpression } from '@kbn/es-query'; import { Spaces } from '../../scenarios'; import { getUrlPrefix, getTestRuleData, ObjectRemover } from '../../../common/lib'; import { FtrProviderContext } from '../../../common/ftr_provider_context'; @@ -198,6 +199,20 @@ const findTestUtils = ( expect(response.body.data[0].params.strValue).to.eql('my b'); }); + it('should filter on kueryNode parameters', async () => { + const response = await supertest.get( + `${getUrlPrefix(Spaces.space1.id)}/${ + describeType === 'public' ? 'api' : 'internal' + }/alerting/rules/_find?filter=${JSON.stringify( + fromKueryExpression('alert.attributes.params.strValue:"my b"') + )}` + ); + + expect(response.status).to.eql(200); + expect(response.body.total).to.equal(1); + expect(response.body.data[0].params.strValue).to.eql('my b'); + }); + it('should sort by parameters', async () => { const response = await supertest.get( `${getUrlPrefix(Spaces.space1.id)}/${ From ace4f42f598a2e8657c2edcfd173d2b4b0de5529 Mon Sep 17 00:00:00 2001 From: Jiawei Wu <74562234+JiaweiWu@users.noreply.github.com> Date: Tue, 27 Sep 2022 20:08:28 -0700 Subject: [PATCH 25/95] [RAM] Fix bulk snooze select all filter not matching rules list filter (#141996) * Select all filter now correctly match the rules list filter * Improve filter kuery node logic * unit tests Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../server/rules_client/rules_client.ts | 11 +- .../update_api_key_modal_confirmation.tsx | 9 +- .../hooks/use_bulk_edit_select.test.tsx | 131 ++++++++++++++++++ .../hooks/use_bulk_edit_select.tsx | 68 ++++++++- .../public/application/lib/rule_api/snooze.ts | 5 +- .../application/lib/rule_api/unsnooze.ts | 5 +- .../lib/rule_api/update_api_key.ts | 5 +- .../rule_quick_edit_buttons.test.tsx | 10 +- .../components/rule_quick_edit_buttons.tsx | 13 +- .../components/bulk_snooze_modal.tsx | 9 +- .../components/bulk_snooze_schedule_modal.tsx | 9 +- .../rules_list/components/rules_list.tsx | 38 +++-- 12 files changed, 259 insertions(+), 54 deletions(-) create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_edit_select.test.tsx diff --git a/x-pack/plugins/alerting/server/rules_client/rules_client.ts b/x-pack/plugins/alerting/server/rules_client/rules_client.ts index a8367d9ff52b4..c2a643ce8c296 100644 --- a/x-pack/plugins/alerting/server/rules_client/rules_client.ts +++ b/x-pack/plugins/alerting/server/rules_client/rules_client.ts @@ -22,7 +22,7 @@ import { } from 'lodash'; import { i18n } from '@kbn/i18n'; import { AlertConsumers } from '@kbn/rule-data-utils'; -import { fromKueryExpression, KueryNode, nodeBuilder } from '@kbn/es-query'; +import { KueryNode, nodeBuilder } from '@kbn/es-query'; import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey'; import { Logger, @@ -1569,14 +1569,7 @@ export class RulesClient { ); } - let qNodeQueryFilter: null | KueryNode; - if (!queryFilter) { - qNodeQueryFilter = null; - } else if (typeof queryFilter === 'string') { - qNodeQueryFilter = fromKueryExpression(queryFilter); - } else { - qNodeQueryFilter = queryFilter; - } + const qNodeQueryFilter = buildKueryNodeFilter(queryFilter); const qNodeFilter = ids ? convertRuleIdsToKueryNode(ids) : qNodeQueryFilter; let authorizationTuple; diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/update_api_key_modal_confirmation.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/update_api_key_modal_confirmation.tsx index 0c6f3edaf3b89..c3072c123ff82 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/components/update_api_key_modal_confirmation.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/components/update_api_key_modal_confirmation.tsx @@ -6,6 +6,7 @@ */ import { EuiConfirmModal } from '@elastic/eui'; +import { KueryNode } from '@kbn/es-query'; import { i18n } from '@kbn/i18n'; import React, { useEffect, useState, useMemo } from 'react'; import { HttpSetup } from '@kbn/core/public'; @@ -25,7 +26,7 @@ export const UpdateApiKeyModalConfirmation = ({ }: { onCancel: () => void; idsToUpdate: string[]; - idsToUpdateFilter?: string; + idsToUpdateFilter?: KueryNode | null | undefined; numberOfSelectedRules?: number; apiUpdateApiKeyCall: ({ ids, @@ -33,7 +34,7 @@ export const UpdateApiKeyModalConfirmation = ({ filter, }: { ids?: string[]; - filter?: string; + filter?: KueryNode | null | undefined; http: HttpSetup; }) => Promise; setIsLoadingState: (isLoading: boolean) => void; @@ -50,7 +51,7 @@ export const UpdateApiKeyModalConfirmation = ({ const { showToast } = useBulkEditResponse({ onSearchPopulate }); useEffect(() => { - if (idsToUpdateFilter) { + if (typeof idsToUpdateFilter !== 'undefined') { setUpdateModalVisibility(true); } else { setUpdateModalVisibility(idsToUpdate.length > 0); @@ -58,7 +59,7 @@ export const UpdateApiKeyModalConfirmation = ({ }, [idsToUpdate, idsToUpdateFilter]); const numberOfIdsToUpdate = useMemo(() => { - if (idsToUpdateFilter) { + if (typeof idsToUpdateFilter !== 'undefined') { return numberOfSelectedRules; } return idsToUpdate.length; diff --git a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_edit_select.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_edit_select.test.tsx new file mode 100644 index 0000000000000..b0e92a3d3a848 --- /dev/null +++ b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_edit_select.test.tsx @@ -0,0 +1,131 @@ +/* + * 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 { renderHook, act } from '@testing-library/react-hooks'; +import { useBulkEditSelect } from './use_bulk_edit_select'; +import { RuleTableItem } from '../../types'; + +const items = [ + { + id: '1', + isEditable: true, + }, + { + id: '2', + isEditable: true, + }, + { + id: '3', + isEditable: true, + }, + { + id: '4', + isEditable: true, + }, +] as RuleTableItem[]; + +describe('useBulkEditSelectTest', () => { + it('getFilter should return null when nothing is selected', async () => { + const { result } = renderHook(() => + useBulkEditSelect({ + items, + totalItemCount: 4, + }) + ); + + expect(result.current.getFilter()).toEqual(null); + }); + + it('getFilter should return rule list filter when nothing is selected', async () => { + const { result } = renderHook(() => + useBulkEditSelect({ + items, + totalItemCount: 4, + tagsFilter: ['test: 123'], + searchText: 'rules*', + }) + ); + + expect(result.current.getFilter()?.arguments.length).toEqual(2); + }); + + it('getFilter should return rule list filter when something is selected', async () => { + const { result } = renderHook(() => + useBulkEditSelect({ + items, + totalItemCount: 4, + tagsFilter: ['test: 123'], + searchText: 'rules*', + }) + ); + + act(() => { + result.current.onSelectRow(items[0]); + }); + + expect(result.current.getFilter()?.arguments.length).toEqual(2); + expect([...result.current.selectedIds]).toEqual([items[0].id]); + }); + + it('getFilter should return null when selecting all', async () => { + const { result } = renderHook(() => + useBulkEditSelect({ + items, + totalItemCount: 4, + }) + ); + + act(() => { + result.current.onSelectAll(); + }); + + expect(result.current.getFilter()).toEqual(null); + }); + + it('getFilter should return rule list filter when selecting all', async () => { + const { result } = renderHook(() => + useBulkEditSelect({ + items, + totalItemCount: 4, + tagsFilter: ['test: 123'], + searchText: 'rules*', + }) + ); + + act(() => { + result.current.onSelectAll(); + }); + + expect(result.current.getFilter()?.arguments.length).toEqual(2); + }); + + it('getFilter should return rule list filter and exclude ids when selecting all with excluded ids', async () => { + const { result } = renderHook(() => + useBulkEditSelect({ + items, + totalItemCount: 4, + tagsFilter: ['test: 123'], + searchText: 'rules*', + }) + ); + + act(() => { + result.current.onSelectAll(); + result.current.onSelectRow(items[0]); + }); + + expect(result.current.getFilter()?.arguments.length).toEqual(2); + expect(result.current.getFilter()?.arguments[1].arguments[0].arguments).toEqual([ + expect.objectContaining({ + value: 'alert.id', + }), + expect.objectContaining({ + value: 'alert:1', + }), + ]); + }); +}); diff --git a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_edit_select.tsx b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_edit_select.tsx index 20950d35b0264..1e2ff7496907c 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_edit_select.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_edit_select.tsx @@ -5,7 +5,9 @@ * 2.0. */ import { useReducer, useMemo, useCallback } from 'react'; -import { RuleTableItem } from '../../types'; +import { fromKueryExpression, nodeBuilder } from '@kbn/es-query'; +import { mapFiltersToKueryNode } from '../lib/rule_api/map_filters_to_kuery_node'; +import { RuleTableItem, RuleStatus } from '../../types'; interface BulkEditSelectionState { selectedIds: Set; @@ -71,9 +73,26 @@ const reducer = (state: BulkEditSelectionState, action: Action) => { interface UseBulkEditSelectProps { totalItemCount: number; items: RuleTableItem[]; + typesFilter?: string[]; + actionTypesFilter?: string[]; + tagsFilter?: string[]; + ruleExecutionStatusesFilter?: string[]; + ruleStatusesFilter?: RuleStatus[]; + searchText?: string; } -export function useBulkEditSelect({ totalItemCount = 0, items = [] }: UseBulkEditSelectProps) { +export function useBulkEditSelect(props: UseBulkEditSelectProps) { + const { + totalItemCount = 0, + items = [], + typesFilter, + actionTypesFilter, + tagsFilter, + ruleExecutionStatusesFilter, + ruleStatusesFilter, + searchText, + } = props; + const [state, dispatch] = useReducer(reducer, initialState); const itemIds = useMemo(() => { @@ -161,18 +180,55 @@ export function useBulkEditSelect({ totalItemCount = 0, items = [] }: UseBulkEdi dispatch({ type: ActionTypes.CLEAR_SELECTION }); }, []); + const getFilterKueryNode = useCallback( + (idsToExclude?: string[]) => { + const ruleFilterKueryNode = mapFiltersToKueryNode({ + typesFilter, + actionTypesFilter, + tagsFilter, + ruleExecutionStatusesFilter, + ruleStatusesFilter, + searchText, + }); + + if (idsToExclude && idsToExclude.length) { + if (ruleFilterKueryNode) { + return nodeBuilder.and([ + ruleFilterKueryNode, + fromKueryExpression( + `NOT (${idsToExclude.map((id) => `alert.id: "alert:${id}"`).join(' or ')})` + ), + ]); + } + } + + return ruleFilterKueryNode; + }, + [ + typesFilter, + actionTypesFilter, + tagsFilter, + ruleExecutionStatusesFilter, + ruleStatusesFilter, + searchText, + ] + ); + const getFilter = useCallback(() => { const { selectedIds, isAllSelected } = state; const idsArray = [...selectedIds]; if (isAllSelected) { + // Select all but nothing is selected to exclude if (idsArray.length === 0) { - return 'alert.id: *'; + return getFilterKueryNode(); } - return `NOT (${idsArray.map((id) => `alert.id: "alert:${id}"`).join(' or ')})`; + // Select all, exclude certain alerts + return getFilterKueryNode(idsArray); } - return ''; - }, [state]); + + return getFilterKueryNode(); + }, [state, getFilterKueryNode]); return useMemo(() => { return { diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/snooze.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/snooze.ts index 1f020aff106f5..b82efdb5e09cf 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/snooze.ts +++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/snooze.ts @@ -5,6 +5,7 @@ * 2.0. */ import { HttpSetup } from '@kbn/core/public'; +import { KueryNode } from '@kbn/es-query'; import { SnoozeSchedule, BulkEditResponse } from '../../../types'; import { INTERNAL_BASE_ALERTING_API_PATH } from '../../constants'; @@ -37,7 +38,7 @@ export async function snoozeRule({ export interface BulkSnoozeRulesProps { ids?: string[]; - filter?: string; + filter?: KueryNode | null | undefined; snoozeSchedule: SnoozeSchedule; } @@ -51,7 +52,7 @@ export function bulkSnoozeRules({ try { body = JSON.stringify({ ids: ids?.length ? ids : undefined, - filter, + ...(filter ? { filter: JSON.stringify(filter) } : {}), operations: [ { operation: 'set', diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unsnooze.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unsnooze.ts index 7bfadf1e1b824..d055149fdfbd8 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unsnooze.ts +++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unsnooze.ts @@ -5,6 +5,7 @@ * 2.0. */ import { HttpSetup } from '@kbn/core/public'; +import { KueryNode } from '@kbn/es-query'; import { INTERNAL_BASE_ALERTING_API_PATH } from '../../constants'; import { BulkEditResponse } from '../../../types'; @@ -26,7 +27,7 @@ export async function unsnoozeRule({ export interface BulkUnsnoozeRulesProps { ids?: string[]; - filter?: string; + filter?: KueryNode | null | undefined; scheduleIds?: string[]; } @@ -40,7 +41,7 @@ export function bulkUnsnoozeRules({ try { body = JSON.stringify({ ids: ids?.length ? ids : undefined, - filter, + ...(filter ? { filter: JSON.stringify(filter) } : {}), operations: [ { operation: 'delete', diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/update_api_key.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/update_api_key.ts index 53327bbdb1e1e..f9a6912c1d43f 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/update_api_key.ts +++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/update_api_key.ts @@ -5,6 +5,7 @@ * 2.0. */ import { HttpSetup } from '@kbn/core/public'; +import { KueryNode } from '@kbn/es-query'; import { INTERNAL_BASE_ALERTING_API_PATH } from '../../constants'; import { BulkEditResponse } from '../../../types'; @@ -16,7 +17,7 @@ export async function updateAPIKey({ id, http }: { id: string; http: HttpSetup } export interface BulkUpdateAPIKeyProps { ids?: string[]; - filter?: string; + filter?: KueryNode | null | undefined; } export function bulkUpdateAPIKey({ @@ -28,7 +29,7 @@ export function bulkUpdateAPIKey({ try { body = JSON.stringify({ ids: ids?.length ? ids : undefined, - filter, + ...(filter ? { filter: JSON.stringify(filter) } : {}), operations: [ { operation: 'set', diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/rule_quick_edit_buttons.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/rule_quick_edit_buttons.test.tsx index 1605f09ebc0f5..fcf1ba99b7af4 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/rule_quick_edit_buttons.test.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/rule_quick_edit_buttons.test.tsx @@ -43,7 +43,7 @@ describe('rule_quick_edit_buttons', () => { const wrapper = mountWithIntl( ''} + getFilter={() => null} selectedItems={[mockRule]} onPerformingAction={() => {}} onActionPerformed={() => {}} @@ -80,7 +80,7 @@ describe('rule_quick_edit_buttons', () => { const wrapper = mountWithIntl( ''} + getFilter={() => null} selectedItems={[mockRule]} onPerformingAction={() => {}} onActionPerformed={() => {}} @@ -111,7 +111,7 @@ describe('rule_quick_edit_buttons', () => { const wrapper = mountWithIntl( ''} + getFilter={() => null} selectedItems={[mockRule]} onPerformingAction={() => {}} onActionPerformed={() => {}} @@ -152,7 +152,7 @@ describe('rule_quick_edit_buttons', () => { const wrapper = mountWithIntl( ''} + getFilter={() => null} selectedItems={[mockRule]} onPerformingAction={() => {}} onActionPerformed={() => {}} @@ -202,7 +202,7 @@ describe('rule_quick_edit_buttons', () => { const wrapper = mountWithIntl( ''} + getFilter={() => null} selectedItems={[mockRule]} onPerformingAction={() => {}} onActionPerformed={() => {}} diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/rule_quick_edit_buttons.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/rule_quick_edit_buttons.tsx index c91c461993a54..f3cbae535d777 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/rule_quick_edit_buttons.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/rule_quick_edit_buttons.tsx @@ -6,6 +6,7 @@ */ import { i18n } from '@kbn/i18n'; +import { KueryNode } from '@kbn/es-query'; import React, { useState, useMemo } from 'react'; import { FormattedMessage } from '@kbn/i18n-react'; import { EuiButtonEmpty, EuiFlexItem, EuiFlexGroup, EuiIconTip } from '@elastic/eui'; @@ -21,7 +22,7 @@ import { useKibana } from '../../../../common/lib/kibana'; export type ComponentOpts = { selectedItems: RuleTableItem[]; isAllSelected?: boolean; - getFilter: () => string; + getFilter: () => KueryNode | null; onPerformingAction?: () => void; onActionPerformed?: () => void; isSnoozingRules?: boolean; @@ -35,11 +36,11 @@ export type ComponentOpts = { setRulesToUnsnooze: React.Dispatch>; setRulesToSchedule: React.Dispatch>; setRulesToUnschedule: React.Dispatch>; - setRulesToSnoozeFilter: React.Dispatch>; - setRulesToUnsnoozeFilter: React.Dispatch>; - setRulesToScheduleFilter: React.Dispatch>; - setRulesToUnscheduleFilter: React.Dispatch>; - setRulesToUpdateAPIKeyFilter: React.Dispatch>; + setRulesToSnoozeFilter: React.Dispatch>; + setRulesToUnsnoozeFilter: React.Dispatch>; + setRulesToScheduleFilter: React.Dispatch>; + setRulesToUnscheduleFilter: React.Dispatch>; + setRulesToUpdateAPIKeyFilter: React.Dispatch>; } & BulkOperationsComponentOpts; const ButtonWithTooltip = ({ diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/bulk_snooze_modal.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/bulk_snooze_modal.tsx index bbdcfae785c95..95363c5745b43 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/bulk_snooze_modal.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/bulk_snooze_modal.tsx @@ -7,6 +7,7 @@ import React, { useMemo } from 'react'; import { FormattedMessage } from '@kbn/i18n-react'; +import { KueryNode } from '@kbn/es-query'; import { i18n } from '@kbn/i18n'; import { EuiConfirmModal, @@ -30,8 +31,8 @@ import { useKibana } from '../../../../common/lib/kibana'; export type BulkSnoozeModalProps = { rulesToSnooze: RuleTableItem[]; rulesToUnsnooze: RuleTableItem[]; - rulesToSnoozeFilter?: string; - rulesToUnsnoozeFilter?: string; + rulesToSnoozeFilter?: KueryNode | null | undefined; + rulesToUnsnoozeFilter?: KueryNode | null | undefined; numberOfSelectedRules?: number; onClose: () => void; onSave: () => void; @@ -82,14 +83,14 @@ export const BulkSnoozeModal = (props: BulkSnoozeModalProps) => { const { showToast } = useBulkEditResponse({ onSearchPopulate }); const isSnoozeModalOpen = useMemo(() => { - if (rulesToSnoozeFilter) { + if (typeof rulesToSnoozeFilter !== 'undefined') { return true; } return rulesToSnooze.length > 0; }, [rulesToSnooze, rulesToSnoozeFilter]); const isUnsnoozeModalOpen = useMemo(() => { - if (rulesToUnsnoozeFilter) { + if (typeof rulesToUnsnoozeFilter !== 'undefined') { return true; } return rulesToUnsnooze.length > 0; diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/bulk_snooze_schedule_modal.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/bulk_snooze_schedule_modal.tsx index cbf009acaa9ae..d5a1fd3d62b78 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/bulk_snooze_schedule_modal.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/bulk_snooze_schedule_modal.tsx @@ -7,6 +7,7 @@ import React, { useMemo } from 'react'; import { FormattedMessage } from '@kbn/i18n-react'; +import { KueryNode } from '@kbn/es-query'; import { i18n } from '@kbn/i18n'; import { EuiConfirmModal, @@ -50,8 +51,8 @@ const deleteConfirmSingle = (ruleName: string) => export type BulkSnoozeScheduleModalProps = { rulesToSchedule: RuleTableItem[]; rulesToUnschedule: RuleTableItem[]; - rulesToScheduleFilter?: string; - rulesToUnscheduleFilter?: string; + rulesToScheduleFilter?: KueryNode | null | undefined; + rulesToUnscheduleFilter?: KueryNode | null | undefined; numberOfSelectedRules?: number; onClose: () => void; onSave: () => void; @@ -83,14 +84,14 @@ export const BulkSnoozeScheduleModal = (props: BulkSnoozeScheduleModalProps) => const { showToast } = useBulkEditResponse({ onSearchPopulate }); const isScheduleModalOpen = useMemo(() => { - if (rulesToScheduleFilter) { + if (typeof rulesToScheduleFilter !== 'undefined') { return true; } return rulesToSchedule.length > 0; }, [rulesToSchedule, rulesToScheduleFilter]); const isUnscheduleModalOpen = useMemo(() => { - if (rulesToUnscheduleFilter) { + if (typeof rulesToUnscheduleFilter !== 'undefined') { return true; } return rulesToUnschedule.length > 0; diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.tsx index 0061e56d48498..a06958fb3072e 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.tsx @@ -10,6 +10,7 @@ import { i18n } from '@kbn/i18n'; import moment from 'moment'; import { capitalize, isEmpty, sortBy } from 'lodash'; +import { KueryNode } from '@kbn/es-query'; import { FormattedMessage } from '@kbn/i18n-react'; import React, { useEffect, useState, ReactNode, useCallback, useMemo } from 'react'; import { @@ -206,20 +207,31 @@ export const RulesList = ({ const [rulesToDelete, setRulesToDelete] = useState([]); + // TODO - tech debt: Right now we're using null and undefined to determine if we should + // render the bulk edit modal. Refactor this to only keep track of 1 set of rules and types + // to determine which modal to show const [rulesToSnooze, setRulesToSnooze] = useState([]); - const [rulesToSnoozeFilter, setRulesToSnoozeFilter] = useState(''); + const [rulesToSnoozeFilter, setRulesToSnoozeFilter] = useState(); const [rulesToUnsnooze, setRulesToUnsnooze] = useState([]); - const [rulesToUnsnoozeFilter, setRulesToUnsnoozeFilter] = useState(''); + const [rulesToUnsnoozeFilter, setRulesToUnsnoozeFilter] = useState< + KueryNode | null | undefined + >(); const [rulesToSchedule, setRulesToSchedule] = useState([]); - const [rulesToScheduleFilter, setRulesToScheduleFilter] = useState(''); + const [rulesToScheduleFilter, setRulesToScheduleFilter] = useState< + KueryNode | null | undefined + >(); const [rulesToUnschedule, setRulesToUnschedule] = useState([]); - const [rulesToUnscheduleFilter, setRulesToUnscheduleFilter] = useState(''); + const [rulesToUnscheduleFilter, setRulesToUnscheduleFilter] = useState< + KueryNode | null | undefined + >(); const [rulesToUpdateAPIKey, setRulesToUpdateAPIKey] = useState([]); - const [rulesToUpdateAPIKeyFilter, setRulesToUpdateAPIKeyFilter] = useState(''); + const [rulesToUpdateAPIKeyFilter, setRulesToUpdateAPIKeyFilter] = useState< + KueryNode | null | undefined + >(); const [isSnoozingRules, setIsSnoozingRules] = useState(false); const [isSchedulingRules, setIsSchedulingRules] = useState(false); @@ -586,6 +598,12 @@ export const RulesList = ({ } = useBulkEditSelect({ totalItemCount: rulesState.totalItemCount, items: tableItems, + searchText, + typesFilter: rulesTypesFilter, + actionTypesFilter, + ruleExecutionStatusesFilter, + ruleStatusesFilter, + tagsFilter, }); const authorizedToModifySelectedRules = useMemo(() => { @@ -602,27 +620,27 @@ export const RulesList = ({ const clearRulesToSnooze = () => { setRulesToSnooze([]); - setRulesToSnoozeFilter(''); + setRulesToSnoozeFilter(undefined); }; const clearRulesToUnsnooze = () => { setRulesToUnsnooze([]); - setRulesToUnsnoozeFilter(''); + setRulesToUnsnoozeFilter(undefined); }; const clearRulesToSchedule = () => { setRulesToSchedule([]); - setRulesToScheduleFilter(''); + setRulesToScheduleFilter(undefined); }; const clearRulesToUnschedule = () => { setRulesToUnschedule([]); - setRulesToUnscheduleFilter(''); + setRulesToUnscheduleFilter(undefined); }; const clearRulesToUpdateAPIKey = () => { setRulesToUpdateAPIKey([]); - setRulesToUpdateAPIKeyFilter(''); + setRulesToUpdateAPIKeyFilter(undefined); }; const isRulesTableLoading = useMemo(() => { From 411f80d0d8634a7daaa17c47145e0deebe4969be Mon Sep 17 00:00:00 2001 From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> Date: Tue, 27 Sep 2022 22:39:46 -0600 Subject: [PATCH 26/95] [api-docs] Daily api_docs build (#142030) --- api_docs/actions.mdx | 2 +- api_docs/advanced_settings.mdx | 2 +- api_docs/aiops.mdx | 2 +- api_docs/alerting.mdx | 2 +- api_docs/apm.mdx | 2 +- api_docs/banners.mdx | 2 +- api_docs/bfetch.mdx | 2 +- api_docs/canvas.mdx | 2 +- api_docs/cases.mdx | 2 +- api_docs/charts.mdx | 2 +- api_docs/cloud.mdx | 2 +- api_docs/cloud_experiments.mdx | 2 +- api_docs/cloud_security_posture.mdx | 2 +- api_docs/console.mdx | 2 +- api_docs/controls.mdx | 2 +- api_docs/core.devdocs.json | 56 + api_docs/core.mdx | 2 +- api_docs/custom_integrations.mdx | 2 +- api_docs/dashboard.mdx | 2 +- api_docs/dashboard_enhanced.mdx | 2 +- api_docs/data.mdx | 4 +- api_docs/data_query.devdocs.json | 54 +- api_docs/data_query.mdx | 4 +- api_docs/data_search.mdx | 4 +- api_docs/data_view_editor.mdx | 2 +- api_docs/data_view_field_editor.mdx | 2 +- api_docs/data_view_management.mdx | 2 +- api_docs/data_views.mdx | 2 +- api_docs/data_visualizer.mdx | 2 +- api_docs/deprecations_by_api.mdx | 2 +- api_docs/deprecations_by_plugin.mdx | 2 +- api_docs/deprecations_by_team.mdx | 2 +- api_docs/dev_tools.mdx | 2 +- api_docs/discover.mdx | 2 +- api_docs/discover_enhanced.mdx | 2 +- api_docs/embeddable.mdx | 2 +- api_docs/embeddable_enhanced.mdx | 2 +- api_docs/encrypted_saved_objects.mdx | 2 +- api_docs/enterprise_search.mdx | 2 +- api_docs/es_ui_shared.mdx | 4 +- api_docs/event_annotation.mdx | 2 +- api_docs/event_log.mdx | 2 +- api_docs/expression_error.mdx | 2 +- api_docs/expression_gauge.mdx | 2 +- api_docs/expression_heatmap.mdx | 2 +- api_docs/expression_image.mdx | 2 +- api_docs/expression_legacy_metric_vis.mdx | 2 +- api_docs/expression_metric.mdx | 2 +- api_docs/expression_metric_vis.mdx | 2 +- api_docs/expression_partition_vis.mdx | 2 +- api_docs/expression_repeat_image.mdx | 2 +- api_docs/expression_reveal_image.mdx | 2 +- api_docs/expression_shape.mdx | 2 +- api_docs/expression_tagcloud.mdx | 2 +- api_docs/expression_x_y.mdx | 2 +- api_docs/expressions.mdx | 2 +- api_docs/features.mdx | 2 +- api_docs/field_formats.mdx | 2 +- api_docs/file_upload.mdx | 2 +- api_docs/files.devdocs.json | 19 +- api_docs/files.mdx | 4 +- api_docs/fleet.devdocs.json | 267 ++- api_docs/fleet.mdx | 4 +- api_docs/global_search.mdx | 2 +- api_docs/guided_onboarding.mdx | 2 +- api_docs/home.mdx | 2 +- api_docs/index_lifecycle_management.mdx | 2 +- api_docs/index_management.mdx | 2 +- api_docs/infra.mdx | 2 +- api_docs/inspector.mdx | 2 +- api_docs/interactive_setup.mdx | 2 +- api_docs/kbn_ace.mdx | 2 +- api_docs/kbn_aiops_components.mdx | 2 +- api_docs/kbn_aiops_utils.mdx | 2 +- api_docs/kbn_alerts.mdx | 2 +- api_docs/kbn_analytics.mdx | 2 +- api_docs/kbn_analytics_client.mdx | 2 +- ..._analytics_shippers_elastic_v3_browser.mdx | 2 +- ...n_analytics_shippers_elastic_v3_common.mdx | 2 +- ...n_analytics_shippers_elastic_v3_server.mdx | 2 +- api_docs/kbn_analytics_shippers_fullstory.mdx | 2 +- api_docs/kbn_apm_config_loader.mdx | 2 +- api_docs/kbn_apm_synthtrace.mdx | 2 +- api_docs/kbn_apm_utils.mdx | 2 +- api_docs/kbn_axe_config.mdx | 2 +- api_docs/kbn_chart_icons.mdx | 2 +- api_docs/kbn_ci_stats_core.mdx | 2 +- api_docs/kbn_ci_stats_performance_metrics.mdx | 2 +- api_docs/kbn_ci_stats_reporter.mdx | 2 +- api_docs/kbn_cli_dev_mode.mdx | 2 +- api_docs/kbn_coloring.mdx | 2 +- api_docs/kbn_config.mdx | 2 +- api_docs/kbn_config_mocks.mdx | 2 +- api_docs/kbn_config_schema.mdx | 2 +- .../kbn_content_management_table_list.mdx | 2 +- api_docs/kbn_core_analytics_browser.mdx | 2 +- .../kbn_core_analytics_browser_internal.mdx | 2 +- api_docs/kbn_core_analytics_browser_mocks.mdx | 2 +- api_docs/kbn_core_analytics_server.mdx | 2 +- .../kbn_core_analytics_server_internal.mdx | 2 +- api_docs/kbn_core_analytics_server_mocks.mdx | 2 +- api_docs/kbn_core_application_browser.mdx | 2 +- .../kbn_core_application_browser_internal.mdx | 2 +- .../kbn_core_application_browser_mocks.mdx | 2 +- api_docs/kbn_core_application_common.mdx | 2 +- api_docs/kbn_core_apps_browser_internal.mdx | 2 +- api_docs/kbn_core_apps_browser_mocks.mdx | 2 +- api_docs/kbn_core_base_browser_mocks.mdx | 2 +- api_docs/kbn_core_base_common.mdx | 2 +- api_docs/kbn_core_base_server_internal.mdx | 2 +- api_docs/kbn_core_base_server_mocks.mdx | 2 +- .../kbn_core_capabilities_browser_mocks.mdx | 2 +- api_docs/kbn_core_capabilities_common.mdx | 2 +- api_docs/kbn_core_capabilities_server.mdx | 2 +- .../kbn_core_capabilities_server_mocks.mdx | 2 +- api_docs/kbn_core_chrome_browser.mdx | 2 +- api_docs/kbn_core_chrome_browser_mocks.mdx | 2 +- api_docs/kbn_core_config_server_internal.mdx | 2 +- api_docs/kbn_core_deprecations_browser.mdx | 2 +- ...kbn_core_deprecations_browser_internal.mdx | 2 +- .../kbn_core_deprecations_browser_mocks.mdx | 2 +- api_docs/kbn_core_deprecations_common.mdx | 2 +- api_docs/kbn_core_deprecations_server.mdx | 2 +- .../kbn_core_deprecations_server_internal.mdx | 2 +- .../kbn_core_deprecations_server_mocks.mdx | 2 +- api_docs/kbn_core_doc_links_browser.mdx | 2 +- api_docs/kbn_core_doc_links_browser_mocks.mdx | 2 +- api_docs/kbn_core_doc_links_server.mdx | 2 +- api_docs/kbn_core_doc_links_server_mocks.mdx | 2 +- ...e_elasticsearch_client_server_internal.mdx | 2 +- ...core_elasticsearch_client_server_mocks.mdx | 2 +- api_docs/kbn_core_elasticsearch_server.mdx | 2 +- ...kbn_core_elasticsearch_server_internal.mdx | 2 +- .../kbn_core_elasticsearch_server_mocks.mdx | 2 +- .../kbn_core_environment_server_internal.mdx | 2 +- .../kbn_core_environment_server_mocks.mdx | 2 +- .../kbn_core_execution_context_browser.mdx | 2 +- ...ore_execution_context_browser_internal.mdx | 2 +- ...n_core_execution_context_browser_mocks.mdx | 2 +- .../kbn_core_execution_context_common.mdx | 2 +- .../kbn_core_execution_context_server.mdx | 2 +- ...core_execution_context_server_internal.mdx | 2 +- ...bn_core_execution_context_server_mocks.mdx | 2 +- api_docs/kbn_core_fatal_errors_browser.mdx | 2 +- .../kbn_core_fatal_errors_browser_mocks.mdx | 2 +- api_docs/kbn_core_http_browser.mdx | 2 +- api_docs/kbn_core_http_browser_internal.mdx | 2 +- api_docs/kbn_core_http_browser_mocks.mdx | 2 +- api_docs/kbn_core_http_common.mdx | 2 +- .../kbn_core_http_context_server_mocks.mdx | 2 +- .../kbn_core_http_router_server_internal.mdx | 2 +- .../kbn_core_http_router_server_mocks.mdx | 2 +- api_docs/kbn_core_http_server.mdx | 2 +- api_docs/kbn_core_http_server_internal.mdx | 2 +- api_docs/kbn_core_http_server_mocks.mdx | 2 +- api_docs/kbn_core_i18n_browser.mdx | 2 +- api_docs/kbn_core_i18n_browser_mocks.mdx | 2 +- api_docs/kbn_core_i18n_server.mdx | 2 +- api_docs/kbn_core_i18n_server_internal.mdx | 2 +- api_docs/kbn_core_i18n_server_mocks.mdx | 2 +- .../kbn_core_injected_metadata_browser.mdx | 2 +- ...n_core_injected_metadata_browser_mocks.mdx | 2 +- ...kbn_core_integrations_browser_internal.mdx | 2 +- .../kbn_core_integrations_browser_mocks.mdx | 2 +- api_docs/kbn_core_lifecycle_browser.mdx | 2 +- api_docs/kbn_core_lifecycle_browser_mocks.mdx | 2 +- api_docs/kbn_core_logging_server.mdx | 2 +- api_docs/kbn_core_logging_server_internal.mdx | 2 +- api_docs/kbn_core_logging_server_mocks.mdx | 2 +- ...ore_metrics_collectors_server_internal.mdx | 2 +- ...n_core_metrics_collectors_server_mocks.mdx | 2 +- api_docs/kbn_core_metrics_server.mdx | 2 +- api_docs/kbn_core_metrics_server_internal.mdx | 2 +- api_docs/kbn_core_metrics_server_mocks.mdx | 2 +- api_docs/kbn_core_mount_utils_browser.mdx | 2 +- api_docs/kbn_core_node_server.mdx | 2 +- api_docs/kbn_core_node_server_internal.mdx | 2 +- api_docs/kbn_core_node_server_mocks.mdx | 2 +- api_docs/kbn_core_notifications_browser.mdx | 2 +- ...bn_core_notifications_browser_internal.mdx | 2 +- .../kbn_core_notifications_browser_mocks.mdx | 2 +- api_docs/kbn_core_overlays_browser.mdx | 2 +- .../kbn_core_overlays_browser_internal.mdx | 2 +- api_docs/kbn_core_overlays_browser_mocks.mdx | 2 +- api_docs/kbn_core_plugins_browser.mdx | 2 +- api_docs/kbn_core_plugins_browser_mocks.mdx | 2 +- api_docs/kbn_core_preboot_server.mdx | 2 +- api_docs/kbn_core_preboot_server_mocks.mdx | 2 +- api_docs/kbn_core_rendering_browser_mocks.mdx | 2 +- .../kbn_core_saved_objects_api_browser.mdx | 2 +- .../kbn_core_saved_objects_api_server.mdx | 2 +- ...core_saved_objects_api_server_internal.mdx | 2 +- ...bn_core_saved_objects_api_server_mocks.mdx | 2 +- ...ore_saved_objects_base_server_internal.mdx | 2 +- ...n_core_saved_objects_base_server_mocks.mdx | 2 +- api_docs/kbn_core_saved_objects_browser.mdx | 2 +- ...bn_core_saved_objects_browser_internal.mdx | 2 +- .../kbn_core_saved_objects_browser_mocks.mdx | 2 +- api_docs/kbn_core_saved_objects_common.mdx | 2 +- ..._objects_import_export_server_internal.mdx | 2 +- ...ved_objects_import_export_server_mocks.mdx | 2 +- ...aved_objects_migration_server_internal.mdx | 2 +- ...e_saved_objects_migration_server_mocks.mdx | 2 +- api_docs/kbn_core_saved_objects_server.mdx | 2 +- ...kbn_core_saved_objects_server_internal.mdx | 2 +- .../kbn_core_saved_objects_server_mocks.mdx | 2 +- .../kbn_core_saved_objects_utils_server.mdx | 2 +- api_docs/kbn_core_status_common.mdx | 2 +- api_docs/kbn_core_status_common_internal.mdx | 2 +- api_docs/kbn_core_status_server.mdx | 2 +- api_docs/kbn_core_status_server_internal.mdx | 2 +- api_docs/kbn_core_status_server_mocks.mdx | 2 +- ...core_test_helpers_deprecations_getters.mdx | 2 +- ...n_core_test_helpers_http_setup_browser.mdx | 2 +- api_docs/kbn_core_theme_browser.mdx | 2 +- api_docs/kbn_core_theme_browser_internal.mdx | 2 +- api_docs/kbn_core_theme_browser_mocks.mdx | 2 +- api_docs/kbn_core_ui_settings_browser.mdx | 2 +- .../kbn_core_ui_settings_browser_internal.mdx | 2 +- .../kbn_core_ui_settings_browser_mocks.mdx | 2 +- api_docs/kbn_core_ui_settings_common.mdx | 2 +- api_docs/kbn_core_ui_settings_server.mdx | 2 +- .../kbn_core_ui_settings_server_internal.mdx | 2 +- .../kbn_core_ui_settings_server_mocks.mdx | 2 +- api_docs/kbn_core_usage_data_server.mdx | 2 +- .../kbn_core_usage_data_server_internal.mdx | 2 +- api_docs/kbn_core_usage_data_server_mocks.mdx | 2 +- api_docs/kbn_crypto.mdx | 2 +- api_docs/kbn_crypto_browser.mdx | 2 +- api_docs/kbn_datemath.mdx | 2 +- api_docs/kbn_dev_cli_errors.mdx | 2 +- api_docs/kbn_dev_cli_runner.mdx | 2 +- api_docs/kbn_dev_proc_runner.mdx | 2 +- api_docs/kbn_dev_utils.mdx | 2 +- api_docs/kbn_doc_links.mdx | 2 +- api_docs/kbn_docs_utils.mdx | 2 +- api_docs/kbn_ebt_tools.mdx | 2 +- api_docs/kbn_es_archiver.mdx | 2 +- api_docs/kbn_es_errors.mdx | 2 +- api_docs/kbn_es_query.mdx | 2 +- api_docs/kbn_es_types.mdx | 2 +- api_docs/kbn_eslint_plugin_imports.mdx | 2 +- api_docs/kbn_field_types.mdx | 2 +- api_docs/kbn_find_used_node_modules.mdx | 2 +- .../kbn_ftr_common_functional_services.mdx | 2 +- api_docs/kbn_generate.mdx | 2 +- api_docs/kbn_get_repo_files.mdx | 2 +- api_docs/kbn_handlebars.mdx | 2 +- api_docs/kbn_hapi_mocks.mdx | 2 +- api_docs/kbn_home_sample_data_card.mdx | 2 +- api_docs/kbn_home_sample_data_tab.mdx | 2 +- api_docs/kbn_i18n.mdx | 2 +- api_docs/kbn_import_resolver.mdx | 2 +- api_docs/kbn_interpreter.mdx | 2 +- api_docs/kbn_io_ts_utils.mdx | 2 +- api_docs/kbn_jest_serializers.mdx | 2 +- api_docs/kbn_journeys.mdx | 2 +- api_docs/kbn_kibana_manifest_schema.mdx | 2 +- api_docs/kbn_logging.mdx | 2 +- api_docs/kbn_logging_mocks.mdx | 2 +- api_docs/kbn_managed_vscode_config.mdx | 2 +- api_docs/kbn_mapbox_gl.mdx | 2 +- api_docs/kbn_ml_agg_utils.mdx | 2 +- api_docs/kbn_ml_is_populated_object.mdx | 2 +- api_docs/kbn_ml_string_hash.mdx | 2 +- api_docs/kbn_monaco.mdx | 2 +- api_docs/kbn_optimizer.mdx | 2 +- api_docs/kbn_optimizer_webpack_helpers.mdx | 2 +- api_docs/kbn_osquery_io_ts_types.mdx | 2 +- ..._performance_testing_dataset_extractor.mdx | 2 +- api_docs/kbn_plugin_generator.mdx | 2 +- api_docs/kbn_plugin_helpers.mdx | 2 +- api_docs/kbn_react_field.mdx | 2 +- api_docs/kbn_repo_source_classifier.mdx | 2 +- api_docs/kbn_rule_data_utils.mdx | 2 +- .../kbn_securitysolution_autocomplete.mdx | 2 +- api_docs/kbn_securitysolution_es_utils.mdx | 2 +- api_docs/kbn_securitysolution_hook_utils.mdx | 2 +- ...solution_io_ts_alerting_types.devdocs.json | 70 +- ..._securitysolution_io_ts_alerting_types.mdx | 4 +- .../kbn_securitysolution_io_ts_list_types.mdx | 2 +- ..._securitysolution_io_ts_types.devdocs.json | 71 +- api_docs/kbn_securitysolution_io_ts_types.mdx | 4 +- api_docs/kbn_securitysolution_io_ts_utils.mdx | 2 +- api_docs/kbn_securitysolution_list_api.mdx | 2 +- .../kbn_securitysolution_list_constants.mdx | 2 +- api_docs/kbn_securitysolution_list_hooks.mdx | 2 +- api_docs/kbn_securitysolution_list_utils.mdx | 2 +- api_docs/kbn_securitysolution_rules.mdx | 2 +- api_docs/kbn_securitysolution_t_grid.mdx | 2 +- api_docs/kbn_securitysolution_utils.mdx | 2 +- api_docs/kbn_server_http_tools.mdx | 2 +- api_docs/kbn_server_route_repository.mdx | 2 +- api_docs/kbn_shared_svg.mdx | 2 +- ...ared_ux_avatar_user_profile_components.mdx | 2 +- ...hared_ux_button_exit_full_screen_mocks.mdx | 2 +- api_docs/kbn_shared_ux_button_toolbar.mdx | 2 +- api_docs/kbn_shared_ux_card_no_data.mdx | 2 +- api_docs/kbn_shared_ux_card_no_data_mocks.mdx | 2 +- .../kbn_shared_ux_link_redirect_app_mocks.mdx | 2 +- .../kbn_shared_ux_page_analytics_no_data.mdx | 2 +- ...shared_ux_page_analytics_no_data_mocks.mdx | 2 +- .../kbn_shared_ux_page_kibana_no_data.mdx | 2 +- ...bn_shared_ux_page_kibana_no_data_mocks.mdx | 2 +- .../kbn_shared_ux_page_kibana_template.mdx | 2 +- ...n_shared_ux_page_kibana_template_mocks.mdx | 2 +- api_docs/kbn_shared_ux_page_no_data.mdx | 2 +- .../kbn_shared_ux_page_no_data_config.mdx | 2 +- ...bn_shared_ux_page_no_data_config_mocks.mdx | 2 +- api_docs/kbn_shared_ux_page_no_data_mocks.mdx | 2 +- api_docs/kbn_shared_ux_page_solution_nav.mdx | 2 +- .../kbn_shared_ux_prompt_no_data_views.mdx | 2 +- ...n_shared_ux_prompt_no_data_views_mocks.mdx | 2 +- api_docs/kbn_shared_ux_router.mdx | 2 +- api_docs/kbn_shared_ux_router_mocks.mdx | 2 +- api_docs/kbn_shared_ux_storybook_config.mdx | 2 +- api_docs/kbn_shared_ux_storybook_mock.mdx | 2 +- api_docs/kbn_shared_ux_utility.mdx | 2 +- api_docs/kbn_some_dev_log.mdx | 2 +- api_docs/kbn_sort_package_json.mdx | 2 +- api_docs/kbn_std.mdx | 2 +- api_docs/kbn_stdio_dev_helpers.mdx | 2 +- api_docs/kbn_storybook.mdx | 2 +- api_docs/kbn_telemetry_tools.mdx | 2 +- api_docs/kbn_test.mdx | 2 +- api_docs/kbn_test_jest_helpers.mdx | 2 +- api_docs/kbn_test_subj_selector.mdx | 2 +- api_docs/kbn_tooling_log.mdx | 2 +- api_docs/kbn_type_summarizer.mdx | 2 +- api_docs/kbn_type_summarizer_core.mdx | 2 +- api_docs/kbn_typed_react_router_config.mdx | 2 +- api_docs/kbn_ui_theme.mdx | 2 +- api_docs/kbn_user_profile_components.mdx | 2 +- api_docs/kbn_utility_types.mdx | 2 +- api_docs/kbn_utility_types_jest.mdx | 2 +- api_docs/kbn_utils.mdx | 2 +- api_docs/kbn_yarn_lock_validator.mdx | 2 +- api_docs/kibana_overview.mdx | 2 +- api_docs/kibana_react.mdx | 2 +- api_docs/kibana_utils.mdx | 2 +- api_docs/kubernetes_security.mdx | 2 +- api_docs/lens.devdocs.json | 48 + api_docs/lens.mdx | 4 +- api_docs/license_api_guard.mdx | 2 +- api_docs/license_management.mdx | 2 +- api_docs/licensing.mdx | 2 +- api_docs/lists.mdx | 2 +- api_docs/management.mdx | 2 +- api_docs/maps.mdx | 2 +- api_docs/maps_ems.mdx | 2 +- api_docs/ml.mdx | 2 +- api_docs/monitoring.mdx | 2 +- api_docs/monitoring_collection.mdx | 2 +- api_docs/navigation.mdx | 2 +- api_docs/newsfeed.mdx | 2 +- api_docs/observability.devdocs.json | 24 +- api_docs/observability.mdx | 2 +- api_docs/osquery.mdx | 2 +- api_docs/plugin_directory.mdx | 22 +- api_docs/presentation_util.mdx | 2 +- api_docs/profiling.mdx | 2 +- api_docs/remote_clusters.mdx | 2 +- api_docs/reporting.mdx | 2 +- api_docs/rollup.mdx | 2 +- api_docs/rule_registry.mdx | 2 +- api_docs/runtime_fields.mdx | 2 +- api_docs/saved_objects.mdx | 2 +- api_docs/saved_objects_finder.mdx | 2 +- api_docs/saved_objects_management.mdx | 2 +- api_docs/saved_objects_tagging.mdx | 2 +- api_docs/saved_objects_tagging_oss.mdx | 2 +- api_docs/saved_search.mdx | 2 +- api_docs/screenshot_mode.mdx | 2 +- api_docs/screenshotting.mdx | 2 +- api_docs/security.mdx | 2 +- api_docs/security_solution.mdx | 2 +- api_docs/session_view.mdx | 2 +- api_docs/share.mdx | 2 +- api_docs/snapshot_restore.mdx | 2 +- api_docs/spaces.mdx | 2 +- api_docs/stack_alerts.mdx | 2 +- api_docs/stack_connectors.mdx | 2 +- api_docs/task_manager.mdx | 2 +- api_docs/telemetry.mdx | 2 +- api_docs/telemetry_collection_manager.mdx | 2 +- api_docs/telemetry_collection_xpack.mdx | 2 +- api_docs/telemetry_management_section.mdx | 2 +- api_docs/threat_intelligence.mdx | 2 +- api_docs/timelines.mdx | 2 +- api_docs/transform.mdx | 2 +- api_docs/triggers_actions_ui.devdocs.json | 1524 ++++++++++++++++- api_docs/triggers_actions_ui.mdx | 4 +- api_docs/ui_actions.mdx | 2 +- api_docs/ui_actions_enhanced.mdx | 2 +- api_docs/unified_field_list.mdx | 2 +- api_docs/unified_search.mdx | 2 +- api_docs/unified_search_autocomplete.mdx | 2 +- api_docs/url_forwarding.mdx | 2 +- api_docs/usage_collection.mdx | 2 +- api_docs/ux.mdx | 2 +- api_docs/vis_default_editor.mdx | 2 +- api_docs/vis_type_gauge.mdx | 2 +- api_docs/vis_type_heatmap.mdx | 2 +- api_docs/vis_type_pie.mdx | 2 +- api_docs/vis_type_table.mdx | 2 +- api_docs/vis_type_timelion.mdx | 2 +- api_docs/vis_type_timeseries.mdx | 2 +- api_docs/vis_type_vega.mdx | 2 +- api_docs/vis_type_vislib.mdx | 2 +- api_docs/vis_type_xy.mdx | 2 +- api_docs/visualizations.mdx | 2 +- 411 files changed, 2350 insertions(+), 627 deletions(-) diff --git a/api_docs/actions.mdx b/api_docs/actions.mdx index c298d8a395df6..4d0790ec95184 100644 --- a/api_docs/actions.mdx +++ b/api_docs/actions.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/actions title: "actions" image: https://source.unsplash.com/400x175/?github description: API docs for the actions plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions'] --- import actionsObj from './actions.devdocs.json'; diff --git a/api_docs/advanced_settings.mdx b/api_docs/advanced_settings.mdx index 6da505acae8b7..88e4157414a7f 100644 --- a/api_docs/advanced_settings.mdx +++ b/api_docs/advanced_settings.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/advancedSettings title: "advancedSettings" image: https://source.unsplash.com/400x175/?github description: API docs for the advancedSettings plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings'] --- import advancedSettingsObj from './advanced_settings.devdocs.json'; diff --git a/api_docs/aiops.mdx b/api_docs/aiops.mdx index 4e5199b31ef9c..c3bd7eb349a07 100644 --- a/api_docs/aiops.mdx +++ b/api_docs/aiops.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiops title: "aiops" image: https://source.unsplash.com/400x175/?github description: API docs for the aiops plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiops'] --- import aiopsObj from './aiops.devdocs.json'; diff --git a/api_docs/alerting.mdx b/api_docs/alerting.mdx index df1ba878d7e68..cb7a1008b0bc5 100644 --- a/api_docs/alerting.mdx +++ b/api_docs/alerting.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/alerting title: "alerting" image: https://source.unsplash.com/400x175/?github description: API docs for the alerting plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'alerting'] --- import alertingObj from './alerting.devdocs.json'; diff --git a/api_docs/apm.mdx b/api_docs/apm.mdx index 84c92a1ce8643..d9218c6f9c48f 100644 --- a/api_docs/apm.mdx +++ b/api_docs/apm.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/apm title: "apm" image: https://source.unsplash.com/400x175/?github description: API docs for the apm plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'apm'] --- import apmObj from './apm.devdocs.json'; diff --git a/api_docs/banners.mdx b/api_docs/banners.mdx index e10dd6028fafe..b574eadcc22f7 100644 --- a/api_docs/banners.mdx +++ b/api_docs/banners.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/banners title: "banners" image: https://source.unsplash.com/400x175/?github description: API docs for the banners plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'banners'] --- import bannersObj from './banners.devdocs.json'; diff --git a/api_docs/bfetch.mdx b/api_docs/bfetch.mdx index 504dc027276f0..e8fa3ead871d7 100644 --- a/api_docs/bfetch.mdx +++ b/api_docs/bfetch.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/bfetch title: "bfetch" image: https://source.unsplash.com/400x175/?github description: API docs for the bfetch plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'bfetch'] --- import bfetchObj from './bfetch.devdocs.json'; diff --git a/api_docs/canvas.mdx b/api_docs/canvas.mdx index 5dc73b2b9000b..9c484f7dfc615 100644 --- a/api_docs/canvas.mdx +++ b/api_docs/canvas.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/canvas title: "canvas" image: https://source.unsplash.com/400x175/?github description: API docs for the canvas plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'canvas'] --- import canvasObj from './canvas.devdocs.json'; diff --git a/api_docs/cases.mdx b/api_docs/cases.mdx index aaa279d698443..2ec486a4957e7 100644 --- a/api_docs/cases.mdx +++ b/api_docs/cases.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cases title: "cases" image: https://source.unsplash.com/400x175/?github description: API docs for the cases plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cases'] --- import casesObj from './cases.devdocs.json'; diff --git a/api_docs/charts.mdx b/api_docs/charts.mdx index 5e129b2343ca0..b204ddb7b0ee0 100644 --- a/api_docs/charts.mdx +++ b/api_docs/charts.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/charts title: "charts" image: https://source.unsplash.com/400x175/?github description: API docs for the charts plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'charts'] --- import chartsObj from './charts.devdocs.json'; diff --git a/api_docs/cloud.mdx b/api_docs/cloud.mdx index 5c1a4fea8ca5c..fdf2f80ec284b 100644 --- a/api_docs/cloud.mdx +++ b/api_docs/cloud.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloud title: "cloud" image: https://source.unsplash.com/400x175/?github description: API docs for the cloud plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloud'] --- import cloudObj from './cloud.devdocs.json'; diff --git a/api_docs/cloud_experiments.mdx b/api_docs/cloud_experiments.mdx index 6314cca4f901b..33e6421081033 100644 --- a/api_docs/cloud_experiments.mdx +++ b/api_docs/cloud_experiments.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloudExperiments title: "cloudExperiments" image: https://source.unsplash.com/400x175/?github description: API docs for the cloudExperiments plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloudExperiments'] --- import cloudExperimentsObj from './cloud_experiments.devdocs.json'; diff --git a/api_docs/cloud_security_posture.mdx b/api_docs/cloud_security_posture.mdx index 9c7112ee6e3ad..8cdffb406e1d3 100644 --- a/api_docs/cloud_security_posture.mdx +++ b/api_docs/cloud_security_posture.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloudSecurityPosture title: "cloudSecurityPosture" image: https://source.unsplash.com/400x175/?github description: API docs for the cloudSecurityPosture plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloudSecurityPosture'] --- import cloudSecurityPostureObj from './cloud_security_posture.devdocs.json'; diff --git a/api_docs/console.mdx b/api_docs/console.mdx index a673eebc1e1c6..e365d6a87afe3 100644 --- a/api_docs/console.mdx +++ b/api_docs/console.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/console title: "console" image: https://source.unsplash.com/400x175/?github description: API docs for the console plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'console'] --- import consoleObj from './console.devdocs.json'; diff --git a/api_docs/controls.mdx b/api_docs/controls.mdx index 849d5fc71f968..69b2dfc22a263 100644 --- a/api_docs/controls.mdx +++ b/api_docs/controls.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/controls title: "controls" image: https://source.unsplash.com/400x175/?github description: API docs for the controls plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'controls'] --- import controlsObj from './controls.devdocs.json'; diff --git a/api_docs/core.devdocs.json b/api_docs/core.devdocs.json index 08008a2bfe5c5..607bae8fad1fc 100644 --- a/api_docs/core.devdocs.json +++ b/api_docs/core.devdocs.json @@ -584,6 +584,10 @@ "plugin": "@kbn/core-analytics-server-internal", "path": "packages/core/analytics/core-analytics-server-internal/src/analytics_service.ts" }, + { + "plugin": "@kbn/core-root-browser-internal", + "path": "packages/core/root/core-root-browser-internal/src/core_system.ts" + }, { "plugin": "@kbn/core-status-server-internal", "path": "packages/core/status/core-status-server-internal/src/status_service.ts" @@ -620,6 +624,30 @@ "plugin": "@kbn/core-analytics-browser-mocks", "path": "packages/core/analytics/core-analytics-browser-mocks/src/analytics_service.mock.ts" }, + { + "plugin": "@kbn/core-root-browser-internal", + "path": "packages/core/root/core-root-browser-internal/src/core_system.test.ts" + }, + { + "plugin": "@kbn/core-root-browser-internal", + "path": "packages/core/root/core-root-browser-internal/src/core_system.test.ts" + }, + { + "plugin": "@kbn/core-root-browser-internal", + "path": "packages/core/root/core-root-browser-internal/src/core_system.test.ts" + }, + { + "plugin": "@kbn/core-root-browser-internal", + "path": "packages/core/root/core-root-browser-internal/src/core_system.test.ts" + }, + { + "plugin": "@kbn/core-root-browser-internal", + "path": "packages/core/root/core-root-browser-internal/src/core_system.test.ts" + }, + { + "plugin": "@kbn/core-root-browser-internal", + "path": "packages/core/root/core-root-browser-internal/src/core_system.test.ts" + }, { "plugin": "@kbn/core-analytics-browser-mocks", "path": "packages/core/analytics/core-analytics-browser-mocks/src/analytics_service.mock.ts" @@ -19295,6 +19323,10 @@ "plugin": "@kbn/core-analytics-server-internal", "path": "packages/core/analytics/core-analytics-server-internal/src/analytics_service.ts" }, + { + "plugin": "@kbn/core-root-browser-internal", + "path": "packages/core/root/core-root-browser-internal/src/core_system.ts" + }, { "plugin": "@kbn/core-status-server-internal", "path": "packages/core/status/core-status-server-internal/src/status_service.ts" @@ -19331,6 +19363,30 @@ "plugin": "@kbn/core-analytics-browser-mocks", "path": "packages/core/analytics/core-analytics-browser-mocks/src/analytics_service.mock.ts" }, + { + "plugin": "@kbn/core-root-browser-internal", + "path": "packages/core/root/core-root-browser-internal/src/core_system.test.ts" + }, + { + "plugin": "@kbn/core-root-browser-internal", + "path": "packages/core/root/core-root-browser-internal/src/core_system.test.ts" + }, + { + "plugin": "@kbn/core-root-browser-internal", + "path": "packages/core/root/core-root-browser-internal/src/core_system.test.ts" + }, + { + "plugin": "@kbn/core-root-browser-internal", + "path": "packages/core/root/core-root-browser-internal/src/core_system.test.ts" + }, + { + "plugin": "@kbn/core-root-browser-internal", + "path": "packages/core/root/core-root-browser-internal/src/core_system.test.ts" + }, + { + "plugin": "@kbn/core-root-browser-internal", + "path": "packages/core/root/core-root-browser-internal/src/core_system.test.ts" + }, { "plugin": "@kbn/core-analytics-browser-mocks", "path": "packages/core/analytics/core-analytics-browser-mocks/src/analytics_service.mock.ts" diff --git a/api_docs/core.mdx b/api_docs/core.mdx index d63230e7ed586..d554613d1ec1e 100644 --- a/api_docs/core.mdx +++ b/api_docs/core.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/core title: "core" image: https://source.unsplash.com/400x175/?github description: API docs for the core plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'core'] --- import coreObj from './core.devdocs.json'; diff --git a/api_docs/custom_integrations.mdx b/api_docs/custom_integrations.mdx index 7c8ab77b2d5ac..b25052db9516d 100644 --- a/api_docs/custom_integrations.mdx +++ b/api_docs/custom_integrations.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/customIntegrations title: "customIntegrations" image: https://source.unsplash.com/400x175/?github description: API docs for the customIntegrations plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'customIntegrations'] --- import customIntegrationsObj from './custom_integrations.devdocs.json'; diff --git a/api_docs/dashboard.mdx b/api_docs/dashboard.mdx index 507845391c779..609a9e0925333 100644 --- a/api_docs/dashboard.mdx +++ b/api_docs/dashboard.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dashboard title: "dashboard" image: https://source.unsplash.com/400x175/?github description: API docs for the dashboard plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dashboard'] --- import dashboardObj from './dashboard.devdocs.json'; diff --git a/api_docs/dashboard_enhanced.mdx b/api_docs/dashboard_enhanced.mdx index ef9680b1325db..ae6e7c69b3a88 100644 --- a/api_docs/dashboard_enhanced.mdx +++ b/api_docs/dashboard_enhanced.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dashboardEnhanced title: "dashboardEnhanced" image: https://source.unsplash.com/400x175/?github description: API docs for the dashboardEnhanced plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dashboardEnhanced'] --- import dashboardEnhancedObj from './dashboard_enhanced.devdocs.json'; diff --git a/api_docs/data.mdx b/api_docs/data.mdx index f849f08374ded..b8c91c02caa2d 100644 --- a/api_docs/data.mdx +++ b/api_docs/data.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/data title: "data" image: https://source.unsplash.com/400x175/?github description: API docs for the data plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'data'] --- import dataObj from './data.devdocs.json'; @@ -21,7 +21,7 @@ Contact [App Services](https://github.com/orgs/elastic/teams/kibana-app-services | Public API count | Any count | Items lacking comments | Missing exports | |-------------------|-----------|------------------------|-----------------| -| 3211 | 33 | 2508 | 23 | +| 3213 | 33 | 2509 | 23 | ## Client diff --git a/api_docs/data_query.devdocs.json b/api_docs/data_query.devdocs.json index 2507050e905fc..23849f6641368 100644 --- a/api_docs/data_query.devdocs.json +++ b/api_docs/data_query.devdocs.json @@ -3785,10 +3785,10 @@ }, { "parentPluginId": "data", - "id": "def-common.queryStateToExpressionAst", + "id": "def-common.textBasedQueryStateToAstWithValidation", "type": "Function", "tags": [], - "label": "queryStateToExpressionAst", + "label": "textBasedQueryStateToAstWithValidation", "description": [ "\nConverts QueryState to expression AST" ], @@ -3801,15 +3801,15 @@ "section": "def-common.ExpressionAstExpression", "text": "ExpressionAstExpression" }, - ">" + " | undefined>" ], - "path": "src/plugins/data/common/query/to_expression_ast.ts", + "path": "src/plugins/data/common/query/text_based_query_state_to_ast_with_validation.ts", "deprecated": false, "trackAdoption": false, "children": [ { "parentPluginId": "data", - "id": "def-common.queryStateToExpressionAst.$1", + "id": "def-common.textBasedQueryStateToAstWithValidation.$1", "type": "Object", "tags": [], "label": "{\n filters,\n query,\n inputQuery,\n time,\n dataViewsService,\n}", @@ -3817,7 +3817,49 @@ "signature": [ "Args" ], - "path": "src/plugins/data/common/query/to_expression_ast.ts", + "path": "src/plugins/data/common/query/text_based_query_state_to_ast_with_validation.ts", + "deprecated": false, + "trackAdoption": false, + "isRequired": true + } + ], + "returnComment": [], + "initialIsOpen": false + }, + { + "parentPluginId": "data", + "id": "def-common.textBasedQueryStateToExpressionAst", + "type": "Function", + "tags": [], + "label": "textBasedQueryStateToExpressionAst", + "description": [ + "\nConverts QueryState to expression AST" + ], + "signature": [ + "({\n filters,\n query,\n inputQuery,\n time,\n timeFieldName,\n}: Args) => ", + { + "pluginId": "expressions", + "scope": "common", + "docId": "kibExpressionsPluginApi", + "section": "def-common.ExpressionAstExpression", + "text": "ExpressionAstExpression" + } + ], + "path": "src/plugins/data/common/query/text_based_query_state_to_ast.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "data", + "id": "def-common.textBasedQueryStateToExpressionAst.$1", + "type": "Object", + "tags": [], + "label": "{\n filters,\n query,\n inputQuery,\n time,\n timeFieldName,\n}", + "description": [], + "signature": [ + "Args" + ], + "path": "src/plugins/data/common/query/text_based_query_state_to_ast.ts", "deprecated": false, "trackAdoption": false, "isRequired": true diff --git a/api_docs/data_query.mdx b/api_docs/data_query.mdx index bb88b05d16a92..b81d02840aba1 100644 --- a/api_docs/data_query.mdx +++ b/api_docs/data_query.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/data-query title: "data.query" image: https://source.unsplash.com/400x175/?github description: API docs for the data.query plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'data.query'] --- import dataQueryObj from './data_query.devdocs.json'; @@ -21,7 +21,7 @@ Contact [App Services](https://github.com/orgs/elastic/teams/kibana-app-services | Public API count | Any count | Items lacking comments | Missing exports | |-------------------|-----------|------------------------|-----------------| -| 3211 | 33 | 2508 | 23 | +| 3213 | 33 | 2509 | 23 | ## Client diff --git a/api_docs/data_search.mdx b/api_docs/data_search.mdx index 3cf065a957729..12e4806b7ea2b 100644 --- a/api_docs/data_search.mdx +++ b/api_docs/data_search.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/data-search title: "data.search" image: https://source.unsplash.com/400x175/?github description: API docs for the data.search plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'data.search'] --- import dataSearchObj from './data_search.devdocs.json'; @@ -21,7 +21,7 @@ Contact [App Services](https://github.com/orgs/elastic/teams/kibana-app-services | Public API count | Any count | Items lacking comments | Missing exports | |-------------------|-----------|------------------------|-----------------| -| 3211 | 33 | 2508 | 23 | +| 3213 | 33 | 2509 | 23 | ## Client diff --git a/api_docs/data_view_editor.mdx b/api_docs/data_view_editor.mdx index 6fca87db82f91..1384a135bfbe8 100644 --- a/api_docs/data_view_editor.mdx +++ b/api_docs/data_view_editor.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataViewEditor title: "dataViewEditor" image: https://source.unsplash.com/400x175/?github description: API docs for the dataViewEditor plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataViewEditor'] --- import dataViewEditorObj from './data_view_editor.devdocs.json'; diff --git a/api_docs/data_view_field_editor.mdx b/api_docs/data_view_field_editor.mdx index 9e4d3deac15c4..4b95039f7981c 100644 --- a/api_docs/data_view_field_editor.mdx +++ b/api_docs/data_view_field_editor.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataViewFieldEditor title: "dataViewFieldEditor" image: https://source.unsplash.com/400x175/?github description: API docs for the dataViewFieldEditor plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataViewFieldEditor'] --- import dataViewFieldEditorObj from './data_view_field_editor.devdocs.json'; diff --git a/api_docs/data_view_management.mdx b/api_docs/data_view_management.mdx index cf43b6fa9dd9e..3608114bd15af 100644 --- a/api_docs/data_view_management.mdx +++ b/api_docs/data_view_management.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataViewManagement title: "dataViewManagement" image: https://source.unsplash.com/400x175/?github description: API docs for the dataViewManagement plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataViewManagement'] --- import dataViewManagementObj from './data_view_management.devdocs.json'; diff --git a/api_docs/data_views.mdx b/api_docs/data_views.mdx index a5ea60ca6db86..c6389cc090a71 100644 --- a/api_docs/data_views.mdx +++ b/api_docs/data_views.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataViews title: "dataViews" image: https://source.unsplash.com/400x175/?github description: API docs for the dataViews plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataViews'] --- import dataViewsObj from './data_views.devdocs.json'; diff --git a/api_docs/data_visualizer.mdx b/api_docs/data_visualizer.mdx index 797cd5596c31f..69bcfa932c46f 100644 --- a/api_docs/data_visualizer.mdx +++ b/api_docs/data_visualizer.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataVisualizer title: "dataVisualizer" image: https://source.unsplash.com/400x175/?github description: API docs for the dataVisualizer plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataVisualizer'] --- import dataVisualizerObj from './data_visualizer.devdocs.json'; diff --git a/api_docs/deprecations_by_api.mdx b/api_docs/deprecations_by_api.mdx index ec45435a4e875..b658b5b795600 100644 --- a/api_docs/deprecations_by_api.mdx +++ b/api_docs/deprecations_by_api.mdx @@ -7,7 +7,7 @@ id: kibDevDocsDeprecationsByApi slug: /kibana-dev-docs/api-meta/deprecated-api-list-by-api title: Deprecated API usage by API description: A list of deprecated APIs, which plugins are still referencing them, and when they need to be removed by. -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana'] --- diff --git a/api_docs/deprecations_by_plugin.mdx b/api_docs/deprecations_by_plugin.mdx index 430ba54813520..dabf6a7945b9a 100644 --- a/api_docs/deprecations_by_plugin.mdx +++ b/api_docs/deprecations_by_plugin.mdx @@ -7,7 +7,7 @@ id: kibDevDocsDeprecationsByPlugin slug: /kibana-dev-docs/api-meta/deprecated-api-list-by-plugin title: Deprecated API usage by plugin description: A list of deprecated APIs, which plugins are still referencing them, and when they need to be removed by. -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana'] --- diff --git a/api_docs/deprecations_by_team.mdx b/api_docs/deprecations_by_team.mdx index 30143657a7b1e..643d002885ef8 100644 --- a/api_docs/deprecations_by_team.mdx +++ b/api_docs/deprecations_by_team.mdx @@ -7,7 +7,7 @@ id: kibDevDocsDeprecationsDueByTeam slug: /kibana-dev-docs/api-meta/deprecations-due-by-team title: Deprecated APIs due to be removed, by team description: Lists the teams that are referencing deprecated APIs with a remove by date. -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana'] --- diff --git a/api_docs/dev_tools.mdx b/api_docs/dev_tools.mdx index 95bc923cc9da0..ddeb12beb9a7a 100644 --- a/api_docs/dev_tools.mdx +++ b/api_docs/dev_tools.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/devTools title: "devTools" image: https://source.unsplash.com/400x175/?github description: API docs for the devTools plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'devTools'] --- import devToolsObj from './dev_tools.devdocs.json'; diff --git a/api_docs/discover.mdx b/api_docs/discover.mdx index 8f51330d8bc6d..4a2a4abc7d5ef 100644 --- a/api_docs/discover.mdx +++ b/api_docs/discover.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/discover title: "discover" image: https://source.unsplash.com/400x175/?github description: API docs for the discover plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'discover'] --- import discoverObj from './discover.devdocs.json'; diff --git a/api_docs/discover_enhanced.mdx b/api_docs/discover_enhanced.mdx index 7263ed936315a..104fc1d5cde65 100644 --- a/api_docs/discover_enhanced.mdx +++ b/api_docs/discover_enhanced.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/discoverEnhanced title: "discoverEnhanced" image: https://source.unsplash.com/400x175/?github description: API docs for the discoverEnhanced plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'discoverEnhanced'] --- import discoverEnhancedObj from './discover_enhanced.devdocs.json'; diff --git a/api_docs/embeddable.mdx b/api_docs/embeddable.mdx index f5d8586e5194b..3203b4c957545 100644 --- a/api_docs/embeddable.mdx +++ b/api_docs/embeddable.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/embeddable title: "embeddable" image: https://source.unsplash.com/400x175/?github description: API docs for the embeddable plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'embeddable'] --- import embeddableObj from './embeddable.devdocs.json'; diff --git a/api_docs/embeddable_enhanced.mdx b/api_docs/embeddable_enhanced.mdx index 326d612509b6c..e5e64a70e8012 100644 --- a/api_docs/embeddable_enhanced.mdx +++ b/api_docs/embeddable_enhanced.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/embeddableEnhanced title: "embeddableEnhanced" image: https://source.unsplash.com/400x175/?github description: API docs for the embeddableEnhanced plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'embeddableEnhanced'] --- import embeddableEnhancedObj from './embeddable_enhanced.devdocs.json'; diff --git a/api_docs/encrypted_saved_objects.mdx b/api_docs/encrypted_saved_objects.mdx index e5a8bb47a0520..6d488adbda835 100644 --- a/api_docs/encrypted_saved_objects.mdx +++ b/api_docs/encrypted_saved_objects.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/encryptedSavedObjects title: "encryptedSavedObjects" image: https://source.unsplash.com/400x175/?github description: API docs for the encryptedSavedObjects plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'encryptedSavedObjects'] --- import encryptedSavedObjectsObj from './encrypted_saved_objects.devdocs.json'; diff --git a/api_docs/enterprise_search.mdx b/api_docs/enterprise_search.mdx index 23ae523bade64..2d3bbbfe7ad85 100644 --- a/api_docs/enterprise_search.mdx +++ b/api_docs/enterprise_search.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/enterpriseSearch title: "enterpriseSearch" image: https://source.unsplash.com/400x175/?github description: API docs for the enterpriseSearch plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'enterpriseSearch'] --- import enterpriseSearchObj from './enterprise_search.devdocs.json'; diff --git a/api_docs/es_ui_shared.mdx b/api_docs/es_ui_shared.mdx index d5982b5a2a865..e6eb098f3c9cd 100644 --- a/api_docs/es_ui_shared.mdx +++ b/api_docs/es_ui_shared.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/esUiShared title: "esUiShared" image: https://source.unsplash.com/400x175/?github description: API docs for the esUiShared plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'esUiShared'] --- import esUiSharedObj from './es_ui_shared.devdocs.json'; @@ -21,7 +21,7 @@ Contact [Stack Management](https://github.com/orgs/elastic/teams/kibana-stack-ma | Public API count | Any count | Items lacking comments | Missing exports | |-------------------|-----------|------------------------|-----------------| -| 114 | 3 | 110 | 3 | +| 114 | 3 | 110 | 5 | ## Client diff --git a/api_docs/event_annotation.mdx b/api_docs/event_annotation.mdx index 705fa73b04c1d..54a7269ef5325 100644 --- a/api_docs/event_annotation.mdx +++ b/api_docs/event_annotation.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/eventAnnotation title: "eventAnnotation" image: https://source.unsplash.com/400x175/?github description: API docs for the eventAnnotation plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'eventAnnotation'] --- import eventAnnotationObj from './event_annotation.devdocs.json'; diff --git a/api_docs/event_log.mdx b/api_docs/event_log.mdx index 53b40226f0d78..dff00025d47a5 100644 --- a/api_docs/event_log.mdx +++ b/api_docs/event_log.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/eventLog title: "eventLog" image: https://source.unsplash.com/400x175/?github description: API docs for the eventLog plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'eventLog'] --- import eventLogObj from './event_log.devdocs.json'; diff --git a/api_docs/expression_error.mdx b/api_docs/expression_error.mdx index 51a1fd22bc039..ba5e5e742f4c5 100644 --- a/api_docs/expression_error.mdx +++ b/api_docs/expression_error.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionError title: "expressionError" image: https://source.unsplash.com/400x175/?github description: API docs for the expressionError plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionError'] --- import expressionErrorObj from './expression_error.devdocs.json'; diff --git a/api_docs/expression_gauge.mdx b/api_docs/expression_gauge.mdx index c23d6a727bb38..331af14bbd784 100644 --- a/api_docs/expression_gauge.mdx +++ b/api_docs/expression_gauge.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionGauge title: "expressionGauge" image: https://source.unsplash.com/400x175/?github description: API docs for the expressionGauge plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionGauge'] --- import expressionGaugeObj from './expression_gauge.devdocs.json'; diff --git a/api_docs/expression_heatmap.mdx b/api_docs/expression_heatmap.mdx index 1196f07945026..36ea696e53359 100644 --- a/api_docs/expression_heatmap.mdx +++ b/api_docs/expression_heatmap.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionHeatmap title: "expressionHeatmap" image: https://source.unsplash.com/400x175/?github description: API docs for the expressionHeatmap plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionHeatmap'] --- import expressionHeatmapObj from './expression_heatmap.devdocs.json'; diff --git a/api_docs/expression_image.mdx b/api_docs/expression_image.mdx index 046b3c31f107b..97052c63f7476 100644 --- a/api_docs/expression_image.mdx +++ b/api_docs/expression_image.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionImage title: "expressionImage" image: https://source.unsplash.com/400x175/?github description: API docs for the expressionImage plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionImage'] --- import expressionImageObj from './expression_image.devdocs.json'; diff --git a/api_docs/expression_legacy_metric_vis.mdx b/api_docs/expression_legacy_metric_vis.mdx index 9a3e6bd0dc825..95950d42e4473 100644 --- a/api_docs/expression_legacy_metric_vis.mdx +++ b/api_docs/expression_legacy_metric_vis.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionLegacyMetricVis title: "expressionLegacyMetricVis" image: https://source.unsplash.com/400x175/?github description: API docs for the expressionLegacyMetricVis plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionLegacyMetricVis'] --- import expressionLegacyMetricVisObj from './expression_legacy_metric_vis.devdocs.json'; diff --git a/api_docs/expression_metric.mdx b/api_docs/expression_metric.mdx index 76fd8a4068f19..ee6b2d7e353f4 100644 --- a/api_docs/expression_metric.mdx +++ b/api_docs/expression_metric.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionMetric title: "expressionMetric" image: https://source.unsplash.com/400x175/?github description: API docs for the expressionMetric plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionMetric'] --- import expressionMetricObj from './expression_metric.devdocs.json'; diff --git a/api_docs/expression_metric_vis.mdx b/api_docs/expression_metric_vis.mdx index 337717de0a65a..c1edcc43088dd 100644 --- a/api_docs/expression_metric_vis.mdx +++ b/api_docs/expression_metric_vis.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionMetricVis title: "expressionMetricVis" image: https://source.unsplash.com/400x175/?github description: API docs for the expressionMetricVis plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionMetricVis'] --- import expressionMetricVisObj from './expression_metric_vis.devdocs.json'; diff --git a/api_docs/expression_partition_vis.mdx b/api_docs/expression_partition_vis.mdx index 32c3971bd0909..672e12f360d34 100644 --- a/api_docs/expression_partition_vis.mdx +++ b/api_docs/expression_partition_vis.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionPartitionVis title: "expressionPartitionVis" image: https://source.unsplash.com/400x175/?github description: API docs for the expressionPartitionVis plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionPartitionVis'] --- import expressionPartitionVisObj from './expression_partition_vis.devdocs.json'; diff --git a/api_docs/expression_repeat_image.mdx b/api_docs/expression_repeat_image.mdx index ca6a5be21ec3a..7fbd70637ed36 100644 --- a/api_docs/expression_repeat_image.mdx +++ b/api_docs/expression_repeat_image.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionRepeatImage title: "expressionRepeatImage" image: https://source.unsplash.com/400x175/?github description: API docs for the expressionRepeatImage plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionRepeatImage'] --- import expressionRepeatImageObj from './expression_repeat_image.devdocs.json'; diff --git a/api_docs/expression_reveal_image.mdx b/api_docs/expression_reveal_image.mdx index 90854571dc71c..09f5c55834635 100644 --- a/api_docs/expression_reveal_image.mdx +++ b/api_docs/expression_reveal_image.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionRevealImage title: "expressionRevealImage" image: https://source.unsplash.com/400x175/?github description: API docs for the expressionRevealImage plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionRevealImage'] --- import expressionRevealImageObj from './expression_reveal_image.devdocs.json'; diff --git a/api_docs/expression_shape.mdx b/api_docs/expression_shape.mdx index 898224f9aba1a..8414051020d06 100644 --- a/api_docs/expression_shape.mdx +++ b/api_docs/expression_shape.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionShape title: "expressionShape" image: https://source.unsplash.com/400x175/?github description: API docs for the expressionShape plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionShape'] --- import expressionShapeObj from './expression_shape.devdocs.json'; diff --git a/api_docs/expression_tagcloud.mdx b/api_docs/expression_tagcloud.mdx index f6686201cb138..42b6c0963d951 100644 --- a/api_docs/expression_tagcloud.mdx +++ b/api_docs/expression_tagcloud.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionTagcloud title: "expressionTagcloud" image: https://source.unsplash.com/400x175/?github description: API docs for the expressionTagcloud plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionTagcloud'] --- import expressionTagcloudObj from './expression_tagcloud.devdocs.json'; diff --git a/api_docs/expression_x_y.mdx b/api_docs/expression_x_y.mdx index c090283f69746..340a2de8e8e21 100644 --- a/api_docs/expression_x_y.mdx +++ b/api_docs/expression_x_y.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionXY title: "expressionXY" image: https://source.unsplash.com/400x175/?github description: API docs for the expressionXY plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionXY'] --- import expressionXYObj from './expression_x_y.devdocs.json'; diff --git a/api_docs/expressions.mdx b/api_docs/expressions.mdx index cc0dfccc59154..74c3fd828f44f 100644 --- a/api_docs/expressions.mdx +++ b/api_docs/expressions.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressions title: "expressions" image: https://source.unsplash.com/400x175/?github description: API docs for the expressions plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressions'] --- import expressionsObj from './expressions.devdocs.json'; diff --git a/api_docs/features.mdx b/api_docs/features.mdx index 116d58a6218b9..7b4880c40f8d6 100644 --- a/api_docs/features.mdx +++ b/api_docs/features.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/features title: "features" image: https://source.unsplash.com/400x175/?github description: API docs for the features plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'features'] --- import featuresObj from './features.devdocs.json'; diff --git a/api_docs/field_formats.mdx b/api_docs/field_formats.mdx index dbb19f977cc78..8c4ebd13fe23d 100644 --- a/api_docs/field_formats.mdx +++ b/api_docs/field_formats.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/fieldFormats title: "fieldFormats" image: https://source.unsplash.com/400x175/?github description: API docs for the fieldFormats plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'fieldFormats'] --- import fieldFormatsObj from './field_formats.devdocs.json'; diff --git a/api_docs/file_upload.mdx b/api_docs/file_upload.mdx index 31c1b78e94389..c0963ced99a2c 100644 --- a/api_docs/file_upload.mdx +++ b/api_docs/file_upload.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/fileUpload title: "fileUpload" image: https://source.unsplash.com/400x175/?github description: API docs for the fileUpload plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'fileUpload'] --- import fileUploadObj from './file_upload.devdocs.json'; diff --git a/api_docs/files.devdocs.json b/api_docs/files.devdocs.json index 358859310c797..7c94fcdac9025 100644 --- a/api_docs/files.devdocs.json +++ b/api_docs/files.devdocs.json @@ -438,10 +438,10 @@ "tags": [], "label": "getDownloadHref", "description": [ - "\nGet a string for downloading a file that can be passed to a button element's\nhref for download." + "\nGet a string for downloading a file that can be passed to a button element's\nhref for download.\n" ], "signature": [ - "(file: ", + "(args: Pick<", { "pluginId": "files", "scope": "common", @@ -449,7 +449,7 @@ "section": "def-common.FileJSON", "text": "FileJSON" }, - ") => string" + ", \"id\" | \"fileKind\">) => string" ], "path": "x-pack/plugins/files/public/types.ts", "deprecated": false, @@ -460,9 +460,12 @@ "id": "def-public.FilesClient.getDownloadHref.$1", "type": "Object", "tags": [], - "label": "file", - "description": [], + "label": "args", + "description": [ + "- get download URL args" + ], "signature": [ + "Pick<", { "pluginId": "files", "scope": "common", @@ -470,7 +473,7 @@ "section": "def-common.FileJSON", "text": "FileJSON" }, - "" + ", \"id\" | \"fileKind\">" ], "path": "x-pack/plugins/files/public/types.ts", "deprecated": false, @@ -1129,7 +1132,7 @@ "section": "def-common.FileJSON", "text": "FileJSON" }, - "; }>; upload: (arg: Omit & Readonly<{ selfDestructOnAbort?: boolean | undefined; } & {}> & { body: unknown; kind: string; abortSignal?: AbortSignal | undefined; contentType?: string | undefined; }, \"kind\">) => Promise<{ ok: true; size: number; }>; download: (arg: Omit & { kind: string; }, \"kind\">) => Promise; getDownloadHref: (arg: Omit<", + "; }>; upload: (arg: Omit & Readonly<{ selfDestructOnAbort?: boolean | undefined; } & {}> & { body: unknown; kind: string; abortSignal?: AbortSignal | undefined; contentType?: string | undefined; }, \"kind\">) => Promise<{ ok: true; size: number; }>; download: (arg: Omit & { kind: string; }, \"kind\">) => Promise; getDownloadHref: (arg: Omit, \"kind\">) => string; share: (arg: Omit & Readonly<{} & { fileId: string; }> & { kind: string; }, \"kind\">) => Promise<", + ", \"id\" | \"fileKind\">, \"kind\">) => string; share: (arg: Omit & Readonly<{} & { fileId: string; }> & { kind: string; }, \"kind\">) => Promise<", { "pluginId": "files", "scope": "common", diff --git a/api_docs/files.mdx b/api_docs/files.mdx index 149bec1a8acb5..96ec1e67bf2bf 100644 --- a/api_docs/files.mdx +++ b/api_docs/files.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/files title: "files" image: https://source.unsplash.com/400x175/?github description: API docs for the files plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'files'] --- import filesObj from './files.devdocs.json'; @@ -21,7 +21,7 @@ Contact [@elastic/kibana-app-services](https://github.com/orgs/elastic/teams/tea | Public API count | Any count | Items lacking comments | Missing exports | |-------------------|-----------|------------------------|-----------------| -| 263 | 0 | 15 | 2 | +| 263 | 0 | 14 | 2 | ## Client diff --git a/api_docs/fleet.devdocs.json b/api_docs/fleet.devdocs.json index a35508ec3930f..d068e061e494b 100644 --- a/api_docs/fleet.devdocs.json +++ b/api_docs/fleet.devdocs.json @@ -1225,6 +1225,146 @@ ], "initialIsOpen": false }, + { + "parentPluginId": "fleet", + "id": "def-public.PackagePolicyCreateMultiStepExtension", + "type": "Interface", + "tags": [], + "label": "PackagePolicyCreateMultiStepExtension", + "description": [ + "Extension point registration contract for Integration Policy Create views in multi-step onboarding" + ], + "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "fleet", + "id": "def-public.PackagePolicyCreateMultiStepExtension.package", + "type": "string", + "tags": [], + "label": "package", + "description": [], + "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "fleet", + "id": "def-public.PackagePolicyCreateMultiStepExtension.view", + "type": "string", + "tags": [], + "label": "view", + "description": [], + "signature": [ + "\"package-policy-create-multi-step\"" + ], + "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "fleet", + "id": "def-public.PackagePolicyCreateMultiStepExtension.Component", + "type": "Function", + "tags": [], + "label": "Component", + "description": [], + "signature": [ + "React.ExoticComponent<(", + { + "pluginId": "fleet", + "scope": "public", + "docId": "kibFleetPluginApi", + "section": "def-public.PackagePolicyCreateMultiStepExtensionComponentProps", + "text": "PackagePolicyCreateMultiStepExtensionComponentProps" + }, + " & React.RefAttributes>) | (", + { + "pluginId": "fleet", + "scope": "public", + "docId": "kibFleetPluginApi", + "section": "def-public.PackagePolicyCreateMultiStepExtensionComponentProps", + "text": "PackagePolicyCreateMultiStepExtensionComponentProps" + }, + " & { children?: React.ReactNode; })> & { readonly _result: ", + { + "pluginId": "fleet", + "scope": "public", + "docId": "kibFleetPluginApi", + "section": "def-public.PackagePolicyCreateMultiStepExtensionComponent", + "text": "PackagePolicyCreateMultiStepExtensionComponent" + }, + "; }" + ], + "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts", + "deprecated": false, + "trackAdoption": false, + "returnComment": [], + "children": [ + { + "parentPluginId": "fleet", + "id": "def-public.PackagePolicyCreateMultiStepExtension.Component.$1", + "type": "Uncategorized", + "tags": [], + "label": "props", + "description": [], + "signature": [ + "P" + ], + "path": "node_modules/@types/react/index.d.ts", + "deprecated": false, + "trackAdoption": false + } + ] + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "fleet", + "id": "def-public.PackagePolicyCreateMultiStepExtensionComponentProps", + "type": "Interface", + "tags": [], + "label": "PackagePolicyCreateMultiStepExtensionComponentProps", + "description": [], + "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "fleet", + "id": "def-public.PackagePolicyCreateMultiStepExtensionComponentProps.newPolicy", + "type": "Object", + "tags": [], + "label": "newPolicy", + "description": [ + "The integration policy being created" + ], + "signature": [ + { + "pluginId": "fleet", + "scope": "common", + "docId": "kibFleetPluginApi", + "section": "def-common.NewPackagePolicy", + "text": "NewPackagePolicy" + } + ], + "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, { "parentPluginId": "fleet", "id": "def-public.PackagePolicyEditExtension", @@ -1925,10 +2065,10 @@ "id": "def-public.UIExtensionsStorage.Unnamed", "type": "IndexSignature", "tags": [], - "label": "[key: string]: Partial>", + "label": "[key: string]: Partial>", "description": [], "signature": [ - "[key: string]: Partial | React.FunctionComponent<", + { + "pluginId": "fleet", + "scope": "public", + "docId": "kibFleetPluginApi", + "section": "def-public.PackagePolicyCreateMultiStepExtensionComponentProps", + "text": "PackagePolicyCreateMultiStepExtensionComponentProps" + }, + ">" + ], + "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts", + "deprecated": false, + "trackAdoption": false, + "initialIsOpen": false + }, { "parentPluginId": "fleet", "id": "def-public.PackagePolicyEditExtensionComponent", @@ -2269,6 +2442,14 @@ "docId": "kibFleetPluginApi", "section": "def-public.AgentEnrollmentFlyoutFinalStepExtension", "text": "AgentEnrollmentFlyoutFinalStepExtension" + }, + " | ", + { + "pluginId": "fleet", + "scope": "public", + "docId": "kibFleetPluginApi", + "section": "def-public.PackagePolicyCreateMultiStepExtension", + "text": "PackagePolicyCreateMultiStepExtension" } ], "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts", @@ -2365,6 +2546,14 @@ "docId": "kibFleetPluginApi", "section": "def-public.AgentEnrollmentFlyoutFinalStepExtension", "text": "AgentEnrollmentFlyoutFinalStepExtension" + }, + " | ", + { + "pluginId": "fleet", + "scope": "public", + "docId": "kibFleetPluginApi", + "section": "def-public.PackagePolicyCreateMultiStepExtension", + "text": "PackagePolicyCreateMultiStepExtension" } ], "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts", @@ -3725,6 +3914,14 @@ "docId": "kibFleetPluginApi", "section": "def-public.AgentEnrollmentFlyoutFinalStepExtension", "text": "AgentEnrollmentFlyoutFinalStepExtension" + }, + " | ", + { + "pluginId": "fleet", + "scope": "public", + "docId": "kibFleetPluginApi", + "section": "def-public.PackagePolicyCreateMultiStepExtension", + "text": "PackagePolicyCreateMultiStepExtension" } ], "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts", @@ -6227,7 +6424,7 @@ "section": "def-common.AuthenticatedUser", "text": "AuthenticatedUser" }, - " | undefined; force?: boolean | undefined; } | undefined, currentVersion?: string | undefined) => Promise<", + " | undefined; force?: boolean | undefined; skipUniqueNameVerification?: boolean | undefined; } | undefined, currentVersion?: string | undefined) => Promise<", { "pluginId": "fleet", "scope": "common", @@ -6352,6 +6549,20 @@ "path": "x-pack/plugins/fleet/server/services/package_policy_service.ts", "deprecated": false, "trackAdoption": false + }, + { + "parentPluginId": "fleet", + "id": "def-server.PackagePolicyClient.update.$5.skipUniqueNameVerification", + "type": "CompoundType", + "tags": [], + "label": "skipUniqueNameVerification", + "description": [], + "signature": [ + "boolean | undefined" + ], + "path": "x-pack/plugins/fleet/server/services/package_policy_service.ts", + "deprecated": false, + "trackAdoption": false } ] }, @@ -9276,14 +9487,14 @@ { "parentPluginId": "fleet", "id": "def-common.FleetServerAgent.upgraded_at", - "type": "string", + "type": "CompoundType", "tags": [], "label": "upgraded_at", "description": [ "\nDate/time the Elastic Agent was last upgraded" ], "signature": [ - "string | undefined" + "string | null | undefined" ], "path": "x-pack/plugins/fleet/common/types/models/agent.ts", "deprecated": false, @@ -9305,22 +9516,6 @@ "deprecated": false, "trackAdoption": false }, - { - "parentPluginId": "fleet", - "id": "def-common.FleetServerAgent.upgrade_status", - "type": "CompoundType", - "tags": [], - "label": "upgrade_status", - "description": [ - "\nUpgrade status" - ], - "signature": [ - "\"completed\" | \"started\" | undefined" - ], - "path": "x-pack/plugins/fleet/common/types/models/agent.ts", - "deprecated": false, - "trackAdoption": false - }, { "parentPluginId": "fleet", "id": "def-common.FleetServerAgent.access_api_key_id", @@ -14202,21 +14397,6 @@ "trackAdoption": false, "initialIsOpen": false }, - { - "parentPluginId": "fleet", - "id": "def-common.ENDPOINT_PRIVILEGES", - "type": "Array", - "tags": [], - "label": "ENDPOINT_PRIVILEGES", - "description": [], - "signature": [ - "string[]" - ], - "path": "x-pack/plugins/fleet/common/constants/authz.ts", - "deprecated": false, - "trackAdoption": false, - "initialIsOpen": false - }, { "parentPluginId": "fleet", "id": "def-common.EsAssetReference", @@ -16546,6 +16726,21 @@ ], "initialIsOpen": false }, + { + "parentPluginId": "fleet", + "id": "def-common.ENDPOINT_PRIVILEGES", + "type": "Object", + "tags": [], + "label": "ENDPOINT_PRIVILEGES", + "description": [], + "signature": [ + "readonly [\"writeEndpointList\", \"readEndpointList\", \"writeTrustedApplications\", \"readTrustedApplications\", \"writeHostIsolationExceptions\", \"readHostIsolationExceptions\", \"writeBlocklist\", \"readBlocklist\", \"writeEventFilters\", \"readEventFilters\", \"writePolicyManagement\", \"readPolicyManagement\", \"writeActionsLogManagement\", \"readActionsLogManagement\", \"writeHostIsolation\", \"writeProcessOperations\", \"writeFileOperations\"]" + ], + "path": "x-pack/plugins/fleet/common/constants/authz.ts", + "deprecated": false, + "trackAdoption": false, + "initialIsOpen": false + }, { "parentPluginId": "fleet", "id": "def-common.EPM_API_ROUTES", diff --git a/api_docs/fleet.mdx b/api_docs/fleet.mdx index 173f9f76092f4..6f966dbb5a316 100644 --- a/api_docs/fleet.mdx +++ b/api_docs/fleet.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/fleet title: "fleet" image: https://source.unsplash.com/400x175/?github description: API docs for the fleet plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'fleet'] --- import fleetObj from './fleet.devdocs.json'; @@ -21,7 +21,7 @@ Contact [Fleet](https://github.com/orgs/elastic/teams/fleet) for questions regar | Public API count | Any count | Items lacking comments | Missing exports | |-------------------|-----------|------------------------|-----------------| -| 988 | 3 | 888 | 17 | +| 996 | 3 | 893 | 17 | ## Client diff --git a/api_docs/global_search.mdx b/api_docs/global_search.mdx index c689891e7444b..63433541ece2b 100644 --- a/api_docs/global_search.mdx +++ b/api_docs/global_search.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/globalSearch title: "globalSearch" image: https://source.unsplash.com/400x175/?github description: API docs for the globalSearch plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'globalSearch'] --- import globalSearchObj from './global_search.devdocs.json'; diff --git a/api_docs/guided_onboarding.mdx b/api_docs/guided_onboarding.mdx index 5dfb91864c060..c28c8b2fef872 100644 --- a/api_docs/guided_onboarding.mdx +++ b/api_docs/guided_onboarding.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/guidedOnboarding title: "guidedOnboarding" image: https://source.unsplash.com/400x175/?github description: API docs for the guidedOnboarding plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'guidedOnboarding'] --- import guidedOnboardingObj from './guided_onboarding.devdocs.json'; diff --git a/api_docs/home.mdx b/api_docs/home.mdx index 62db97259ee59..8c285e037a355 100644 --- a/api_docs/home.mdx +++ b/api_docs/home.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/home title: "home" image: https://source.unsplash.com/400x175/?github description: API docs for the home plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'home'] --- import homeObj from './home.devdocs.json'; diff --git a/api_docs/index_lifecycle_management.mdx b/api_docs/index_lifecycle_management.mdx index 87bd3e83a63b9..2d1523f302cb2 100644 --- a/api_docs/index_lifecycle_management.mdx +++ b/api_docs/index_lifecycle_management.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/indexLifecycleManagement title: "indexLifecycleManagement" image: https://source.unsplash.com/400x175/?github description: API docs for the indexLifecycleManagement plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'indexLifecycleManagement'] --- import indexLifecycleManagementObj from './index_lifecycle_management.devdocs.json'; diff --git a/api_docs/index_management.mdx b/api_docs/index_management.mdx index eee8cda64e245..46b6303673ab9 100644 --- a/api_docs/index_management.mdx +++ b/api_docs/index_management.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/indexManagement title: "indexManagement" image: https://source.unsplash.com/400x175/?github description: API docs for the indexManagement plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'indexManagement'] --- import indexManagementObj from './index_management.devdocs.json'; diff --git a/api_docs/infra.mdx b/api_docs/infra.mdx index fd32cbab99193..d86809062de00 100644 --- a/api_docs/infra.mdx +++ b/api_docs/infra.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/infra title: "infra" image: https://source.unsplash.com/400x175/?github description: API docs for the infra plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'infra'] --- import infraObj from './infra.devdocs.json'; diff --git a/api_docs/inspector.mdx b/api_docs/inspector.mdx index 00175e67b30b5..0a75d4c550c42 100644 --- a/api_docs/inspector.mdx +++ b/api_docs/inspector.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/inspector title: "inspector" image: https://source.unsplash.com/400x175/?github description: API docs for the inspector plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'inspector'] --- import inspectorObj from './inspector.devdocs.json'; diff --git a/api_docs/interactive_setup.mdx b/api_docs/interactive_setup.mdx index 33ee5123bb5cd..1b2ce0d5a84c2 100644 --- a/api_docs/interactive_setup.mdx +++ b/api_docs/interactive_setup.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/interactiveSetup title: "interactiveSetup" image: https://source.unsplash.com/400x175/?github description: API docs for the interactiveSetup plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'interactiveSetup'] --- import interactiveSetupObj from './interactive_setup.devdocs.json'; diff --git a/api_docs/kbn_ace.mdx b/api_docs/kbn_ace.mdx index bf08287ddc424..3ca0d95b596d9 100644 --- a/api_docs/kbn_ace.mdx +++ b/api_docs/kbn_ace.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ace title: "@kbn/ace" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/ace plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ace'] --- import kbnAceObj from './kbn_ace.devdocs.json'; diff --git a/api_docs/kbn_aiops_components.mdx b/api_docs/kbn_aiops_components.mdx index d4cb51aa5139f..7e469da7a40b8 100644 --- a/api_docs/kbn_aiops_components.mdx +++ b/api_docs/kbn_aiops_components.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-aiops-components title: "@kbn/aiops-components" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/aiops-components plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/aiops-components'] --- import kbnAiopsComponentsObj from './kbn_aiops_components.devdocs.json'; diff --git a/api_docs/kbn_aiops_utils.mdx b/api_docs/kbn_aiops_utils.mdx index 389117150bd55..9e1d8daed9b7c 100644 --- a/api_docs/kbn_aiops_utils.mdx +++ b/api_docs/kbn_aiops_utils.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-aiops-utils title: "@kbn/aiops-utils" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/aiops-utils plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/aiops-utils'] --- import kbnAiopsUtilsObj from './kbn_aiops_utils.devdocs.json'; diff --git a/api_docs/kbn_alerts.mdx b/api_docs/kbn_alerts.mdx index 749a781cf0e47..294c0b5ebb04b 100644 --- a/api_docs/kbn_alerts.mdx +++ b/api_docs/kbn_alerts.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-alerts title: "@kbn/alerts" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/alerts plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/alerts'] --- import kbnAlertsObj from './kbn_alerts.devdocs.json'; diff --git a/api_docs/kbn_analytics.mdx b/api_docs/kbn_analytics.mdx index c0f7031e47a7a..e991378eefb61 100644 --- a/api_docs/kbn_analytics.mdx +++ b/api_docs/kbn_analytics.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics title: "@kbn/analytics" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/analytics plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics'] --- import kbnAnalyticsObj from './kbn_analytics.devdocs.json'; diff --git a/api_docs/kbn_analytics_client.mdx b/api_docs/kbn_analytics_client.mdx index 1595bab913e80..61ec0f495851f 100644 --- a/api_docs/kbn_analytics_client.mdx +++ b/api_docs/kbn_analytics_client.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics-client title: "@kbn/analytics-client" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/analytics-client plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics-client'] --- import kbnAnalyticsClientObj from './kbn_analytics_client.devdocs.json'; diff --git a/api_docs/kbn_analytics_shippers_elastic_v3_browser.mdx b/api_docs/kbn_analytics_shippers_elastic_v3_browser.mdx index ba7823ee64ac1..af69ccaa66458 100644 --- a/api_docs/kbn_analytics_shippers_elastic_v3_browser.mdx +++ b/api_docs/kbn_analytics_shippers_elastic_v3_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics-shippers-elastic-v3-browser title: "@kbn/analytics-shippers-elastic-v3-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/analytics-shippers-elastic-v3-browser plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics-shippers-elastic-v3-browser'] --- import kbnAnalyticsShippersElasticV3BrowserObj from './kbn_analytics_shippers_elastic_v3_browser.devdocs.json'; diff --git a/api_docs/kbn_analytics_shippers_elastic_v3_common.mdx b/api_docs/kbn_analytics_shippers_elastic_v3_common.mdx index 105ff1b565b71..c80fb067196d2 100644 --- a/api_docs/kbn_analytics_shippers_elastic_v3_common.mdx +++ b/api_docs/kbn_analytics_shippers_elastic_v3_common.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics-shippers-elastic-v3-common title: "@kbn/analytics-shippers-elastic-v3-common" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/analytics-shippers-elastic-v3-common plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics-shippers-elastic-v3-common'] --- import kbnAnalyticsShippersElasticV3CommonObj from './kbn_analytics_shippers_elastic_v3_common.devdocs.json'; diff --git a/api_docs/kbn_analytics_shippers_elastic_v3_server.mdx b/api_docs/kbn_analytics_shippers_elastic_v3_server.mdx index ef9a534fa3470..c8fd4ef979406 100644 --- a/api_docs/kbn_analytics_shippers_elastic_v3_server.mdx +++ b/api_docs/kbn_analytics_shippers_elastic_v3_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics-shippers-elastic-v3-server title: "@kbn/analytics-shippers-elastic-v3-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/analytics-shippers-elastic-v3-server plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics-shippers-elastic-v3-server'] --- import kbnAnalyticsShippersElasticV3ServerObj from './kbn_analytics_shippers_elastic_v3_server.devdocs.json'; diff --git a/api_docs/kbn_analytics_shippers_fullstory.mdx b/api_docs/kbn_analytics_shippers_fullstory.mdx index 6a263b0defbb9..102c627e9ef5e 100644 --- a/api_docs/kbn_analytics_shippers_fullstory.mdx +++ b/api_docs/kbn_analytics_shippers_fullstory.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics-shippers-fullstory title: "@kbn/analytics-shippers-fullstory" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/analytics-shippers-fullstory plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics-shippers-fullstory'] --- import kbnAnalyticsShippersFullstoryObj from './kbn_analytics_shippers_fullstory.devdocs.json'; diff --git a/api_docs/kbn_apm_config_loader.mdx b/api_docs/kbn_apm_config_loader.mdx index defb49cbe69ea..88ae4fc21aca0 100644 --- a/api_docs/kbn_apm_config_loader.mdx +++ b/api_docs/kbn_apm_config_loader.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-apm-config-loader title: "@kbn/apm-config-loader" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/apm-config-loader plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/apm-config-loader'] --- import kbnApmConfigLoaderObj from './kbn_apm_config_loader.devdocs.json'; diff --git a/api_docs/kbn_apm_synthtrace.mdx b/api_docs/kbn_apm_synthtrace.mdx index 0a80a8f9d7c64..951b6896fa528 100644 --- a/api_docs/kbn_apm_synthtrace.mdx +++ b/api_docs/kbn_apm_synthtrace.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-apm-synthtrace title: "@kbn/apm-synthtrace" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/apm-synthtrace plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/apm-synthtrace'] --- import kbnApmSynthtraceObj from './kbn_apm_synthtrace.devdocs.json'; diff --git a/api_docs/kbn_apm_utils.mdx b/api_docs/kbn_apm_utils.mdx index f87f80a173bee..a679b1a252dad 100644 --- a/api_docs/kbn_apm_utils.mdx +++ b/api_docs/kbn_apm_utils.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-apm-utils title: "@kbn/apm-utils" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/apm-utils plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/apm-utils'] --- import kbnApmUtilsObj from './kbn_apm_utils.devdocs.json'; diff --git a/api_docs/kbn_axe_config.mdx b/api_docs/kbn_axe_config.mdx index 465473d3ef7cd..c330c66a3b511 100644 --- a/api_docs/kbn_axe_config.mdx +++ b/api_docs/kbn_axe_config.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-axe-config title: "@kbn/axe-config" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/axe-config plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/axe-config'] --- import kbnAxeConfigObj from './kbn_axe_config.devdocs.json'; diff --git a/api_docs/kbn_chart_icons.mdx b/api_docs/kbn_chart_icons.mdx index 8bc8181b1c666..4cf5662b020cc 100644 --- a/api_docs/kbn_chart_icons.mdx +++ b/api_docs/kbn_chart_icons.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-chart-icons title: "@kbn/chart-icons" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/chart-icons plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/chart-icons'] --- import kbnChartIconsObj from './kbn_chart_icons.devdocs.json'; diff --git a/api_docs/kbn_ci_stats_core.mdx b/api_docs/kbn_ci_stats_core.mdx index 26ac1ad8da546..4396f3ffe02e1 100644 --- a/api_docs/kbn_ci_stats_core.mdx +++ b/api_docs/kbn_ci_stats_core.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ci-stats-core title: "@kbn/ci-stats-core" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/ci-stats-core plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ci-stats-core'] --- import kbnCiStatsCoreObj from './kbn_ci_stats_core.devdocs.json'; diff --git a/api_docs/kbn_ci_stats_performance_metrics.mdx b/api_docs/kbn_ci_stats_performance_metrics.mdx index 79c65aec69dbb..1857d82ee013a 100644 --- a/api_docs/kbn_ci_stats_performance_metrics.mdx +++ b/api_docs/kbn_ci_stats_performance_metrics.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ci-stats-performance-metrics title: "@kbn/ci-stats-performance-metrics" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/ci-stats-performance-metrics plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ci-stats-performance-metrics'] --- import kbnCiStatsPerformanceMetricsObj from './kbn_ci_stats_performance_metrics.devdocs.json'; diff --git a/api_docs/kbn_ci_stats_reporter.mdx b/api_docs/kbn_ci_stats_reporter.mdx index 4b5645cc4b132..f3779a0488fb4 100644 --- a/api_docs/kbn_ci_stats_reporter.mdx +++ b/api_docs/kbn_ci_stats_reporter.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ci-stats-reporter title: "@kbn/ci-stats-reporter" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/ci-stats-reporter plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ci-stats-reporter'] --- import kbnCiStatsReporterObj from './kbn_ci_stats_reporter.devdocs.json'; diff --git a/api_docs/kbn_cli_dev_mode.mdx b/api_docs/kbn_cli_dev_mode.mdx index fb74c109385e8..e2d60d46020af 100644 --- a/api_docs/kbn_cli_dev_mode.mdx +++ b/api_docs/kbn_cli_dev_mode.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-cli-dev-mode title: "@kbn/cli-dev-mode" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/cli-dev-mode plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/cli-dev-mode'] --- import kbnCliDevModeObj from './kbn_cli_dev_mode.devdocs.json'; diff --git a/api_docs/kbn_coloring.mdx b/api_docs/kbn_coloring.mdx index 6dfdbdc6a7e19..e0475bc85ecd2 100644 --- a/api_docs/kbn_coloring.mdx +++ b/api_docs/kbn_coloring.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-coloring title: "@kbn/coloring" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/coloring plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/coloring'] --- import kbnColoringObj from './kbn_coloring.devdocs.json'; diff --git a/api_docs/kbn_config.mdx b/api_docs/kbn_config.mdx index e5787da85b661..32514d096d20f 100644 --- a/api_docs/kbn_config.mdx +++ b/api_docs/kbn_config.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-config title: "@kbn/config" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/config plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/config'] --- import kbnConfigObj from './kbn_config.devdocs.json'; diff --git a/api_docs/kbn_config_mocks.mdx b/api_docs/kbn_config_mocks.mdx index 9f30996b585d7..b93c70c8a0eb5 100644 --- a/api_docs/kbn_config_mocks.mdx +++ b/api_docs/kbn_config_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-config-mocks title: "@kbn/config-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/config-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/config-mocks'] --- import kbnConfigMocksObj from './kbn_config_mocks.devdocs.json'; diff --git a/api_docs/kbn_config_schema.mdx b/api_docs/kbn_config_schema.mdx index 97256b7516108..78d758c0f2fe3 100644 --- a/api_docs/kbn_config_schema.mdx +++ b/api_docs/kbn_config_schema.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-config-schema title: "@kbn/config-schema" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/config-schema plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/config-schema'] --- import kbnConfigSchemaObj from './kbn_config_schema.devdocs.json'; diff --git a/api_docs/kbn_content_management_table_list.mdx b/api_docs/kbn_content_management_table_list.mdx index 12779749648df..812ca543dea50 100644 --- a/api_docs/kbn_content_management_table_list.mdx +++ b/api_docs/kbn_content_management_table_list.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-content-management-table-list title: "@kbn/content-management-table-list" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/content-management-table-list plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/content-management-table-list'] --- import kbnContentManagementTableListObj from './kbn_content_management_table_list.devdocs.json'; diff --git a/api_docs/kbn_core_analytics_browser.mdx b/api_docs/kbn_core_analytics_browser.mdx index 89fc744b1c703..c29081c8b626d 100644 --- a/api_docs/kbn_core_analytics_browser.mdx +++ b/api_docs/kbn_core_analytics_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-browser title: "@kbn/core-analytics-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-analytics-browser plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-browser'] --- import kbnCoreAnalyticsBrowserObj from './kbn_core_analytics_browser.devdocs.json'; diff --git a/api_docs/kbn_core_analytics_browser_internal.mdx b/api_docs/kbn_core_analytics_browser_internal.mdx index bad36ac54b215..739c7e7af5969 100644 --- a/api_docs/kbn_core_analytics_browser_internal.mdx +++ b/api_docs/kbn_core_analytics_browser_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-browser-internal title: "@kbn/core-analytics-browser-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-analytics-browser-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-browser-internal'] --- import kbnCoreAnalyticsBrowserInternalObj from './kbn_core_analytics_browser_internal.devdocs.json'; diff --git a/api_docs/kbn_core_analytics_browser_mocks.mdx b/api_docs/kbn_core_analytics_browser_mocks.mdx index 5db786b7754f0..2c0999666ff1f 100644 --- a/api_docs/kbn_core_analytics_browser_mocks.mdx +++ b/api_docs/kbn_core_analytics_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-browser-mocks title: "@kbn/core-analytics-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-analytics-browser-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-browser-mocks'] --- import kbnCoreAnalyticsBrowserMocksObj from './kbn_core_analytics_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_analytics_server.mdx b/api_docs/kbn_core_analytics_server.mdx index 0141718a2ccd2..f58a16ef732ad 100644 --- a/api_docs/kbn_core_analytics_server.mdx +++ b/api_docs/kbn_core_analytics_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-server title: "@kbn/core-analytics-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-analytics-server plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-server'] --- import kbnCoreAnalyticsServerObj from './kbn_core_analytics_server.devdocs.json'; diff --git a/api_docs/kbn_core_analytics_server_internal.mdx b/api_docs/kbn_core_analytics_server_internal.mdx index 2d21be701e133..ced023377219a 100644 --- a/api_docs/kbn_core_analytics_server_internal.mdx +++ b/api_docs/kbn_core_analytics_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-server-internal title: "@kbn/core-analytics-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-analytics-server-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-server-internal'] --- import kbnCoreAnalyticsServerInternalObj from './kbn_core_analytics_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_analytics_server_mocks.mdx b/api_docs/kbn_core_analytics_server_mocks.mdx index 1dc30aff04e5d..cbea4bff1bf86 100644 --- a/api_docs/kbn_core_analytics_server_mocks.mdx +++ b/api_docs/kbn_core_analytics_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-server-mocks title: "@kbn/core-analytics-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-analytics-server-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-server-mocks'] --- import kbnCoreAnalyticsServerMocksObj from './kbn_core_analytics_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_application_browser.mdx b/api_docs/kbn_core_application_browser.mdx index 7e999f21f3e1a..b1580098a3652 100644 --- a/api_docs/kbn_core_application_browser.mdx +++ b/api_docs/kbn_core_application_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-application-browser title: "@kbn/core-application-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-application-browser plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-application-browser'] --- import kbnCoreApplicationBrowserObj from './kbn_core_application_browser.devdocs.json'; diff --git a/api_docs/kbn_core_application_browser_internal.mdx b/api_docs/kbn_core_application_browser_internal.mdx index c957561aa4eca..f704df4a7f345 100644 --- a/api_docs/kbn_core_application_browser_internal.mdx +++ b/api_docs/kbn_core_application_browser_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-application-browser-internal title: "@kbn/core-application-browser-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-application-browser-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-application-browser-internal'] --- import kbnCoreApplicationBrowserInternalObj from './kbn_core_application_browser_internal.devdocs.json'; diff --git a/api_docs/kbn_core_application_browser_mocks.mdx b/api_docs/kbn_core_application_browser_mocks.mdx index 6ba6188770d4c..4767d8fa50538 100644 --- a/api_docs/kbn_core_application_browser_mocks.mdx +++ b/api_docs/kbn_core_application_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-application-browser-mocks title: "@kbn/core-application-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-application-browser-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-application-browser-mocks'] --- import kbnCoreApplicationBrowserMocksObj from './kbn_core_application_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_application_common.mdx b/api_docs/kbn_core_application_common.mdx index 09bb2339c9782..7c6ce13416170 100644 --- a/api_docs/kbn_core_application_common.mdx +++ b/api_docs/kbn_core_application_common.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-application-common title: "@kbn/core-application-common" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-application-common plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-application-common'] --- import kbnCoreApplicationCommonObj from './kbn_core_application_common.devdocs.json'; diff --git a/api_docs/kbn_core_apps_browser_internal.mdx b/api_docs/kbn_core_apps_browser_internal.mdx index a036a5bb51c0e..17402d105d5b5 100644 --- a/api_docs/kbn_core_apps_browser_internal.mdx +++ b/api_docs/kbn_core_apps_browser_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-apps-browser-internal title: "@kbn/core-apps-browser-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-apps-browser-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-apps-browser-internal'] --- import kbnCoreAppsBrowserInternalObj from './kbn_core_apps_browser_internal.devdocs.json'; diff --git a/api_docs/kbn_core_apps_browser_mocks.mdx b/api_docs/kbn_core_apps_browser_mocks.mdx index 42db1a2581375..48cb4145874c7 100644 --- a/api_docs/kbn_core_apps_browser_mocks.mdx +++ b/api_docs/kbn_core_apps_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-apps-browser-mocks title: "@kbn/core-apps-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-apps-browser-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-apps-browser-mocks'] --- import kbnCoreAppsBrowserMocksObj from './kbn_core_apps_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_base_browser_mocks.mdx b/api_docs/kbn_core_base_browser_mocks.mdx index cd0875458844d..28228f4c74761 100644 --- a/api_docs/kbn_core_base_browser_mocks.mdx +++ b/api_docs/kbn_core_base_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-base-browser-mocks title: "@kbn/core-base-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-base-browser-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-base-browser-mocks'] --- import kbnCoreBaseBrowserMocksObj from './kbn_core_base_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_base_common.mdx b/api_docs/kbn_core_base_common.mdx index 468ebd13bf1b3..09afb9dd896c7 100644 --- a/api_docs/kbn_core_base_common.mdx +++ b/api_docs/kbn_core_base_common.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-base-common title: "@kbn/core-base-common" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-base-common plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-base-common'] --- import kbnCoreBaseCommonObj from './kbn_core_base_common.devdocs.json'; diff --git a/api_docs/kbn_core_base_server_internal.mdx b/api_docs/kbn_core_base_server_internal.mdx index c986f9acf0ef3..bf845366f8e62 100644 --- a/api_docs/kbn_core_base_server_internal.mdx +++ b/api_docs/kbn_core_base_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-base-server-internal title: "@kbn/core-base-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-base-server-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-base-server-internal'] --- import kbnCoreBaseServerInternalObj from './kbn_core_base_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_base_server_mocks.mdx b/api_docs/kbn_core_base_server_mocks.mdx index d6cd91c67140a..bf1d2e6b25458 100644 --- a/api_docs/kbn_core_base_server_mocks.mdx +++ b/api_docs/kbn_core_base_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-base-server-mocks title: "@kbn/core-base-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-base-server-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-base-server-mocks'] --- import kbnCoreBaseServerMocksObj from './kbn_core_base_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_capabilities_browser_mocks.mdx b/api_docs/kbn_core_capabilities_browser_mocks.mdx index 7a6ba37310aaf..a2eb49783d4be 100644 --- a/api_docs/kbn_core_capabilities_browser_mocks.mdx +++ b/api_docs/kbn_core_capabilities_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-capabilities-browser-mocks title: "@kbn/core-capabilities-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-capabilities-browser-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-capabilities-browser-mocks'] --- import kbnCoreCapabilitiesBrowserMocksObj from './kbn_core_capabilities_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_capabilities_common.mdx b/api_docs/kbn_core_capabilities_common.mdx index 24b234f7f811d..aa1d950326fc9 100644 --- a/api_docs/kbn_core_capabilities_common.mdx +++ b/api_docs/kbn_core_capabilities_common.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-capabilities-common title: "@kbn/core-capabilities-common" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-capabilities-common plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-capabilities-common'] --- import kbnCoreCapabilitiesCommonObj from './kbn_core_capabilities_common.devdocs.json'; diff --git a/api_docs/kbn_core_capabilities_server.mdx b/api_docs/kbn_core_capabilities_server.mdx index c5359e8345a38..3d8690f8d6f7d 100644 --- a/api_docs/kbn_core_capabilities_server.mdx +++ b/api_docs/kbn_core_capabilities_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-capabilities-server title: "@kbn/core-capabilities-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-capabilities-server plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-capabilities-server'] --- import kbnCoreCapabilitiesServerObj from './kbn_core_capabilities_server.devdocs.json'; diff --git a/api_docs/kbn_core_capabilities_server_mocks.mdx b/api_docs/kbn_core_capabilities_server_mocks.mdx index b847a51cd7a0d..78563e898c03a 100644 --- a/api_docs/kbn_core_capabilities_server_mocks.mdx +++ b/api_docs/kbn_core_capabilities_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-capabilities-server-mocks title: "@kbn/core-capabilities-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-capabilities-server-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-capabilities-server-mocks'] --- import kbnCoreCapabilitiesServerMocksObj from './kbn_core_capabilities_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_chrome_browser.mdx b/api_docs/kbn_core_chrome_browser.mdx index cc02f6073ea91..4b44cbfe07571 100644 --- a/api_docs/kbn_core_chrome_browser.mdx +++ b/api_docs/kbn_core_chrome_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-chrome-browser title: "@kbn/core-chrome-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-chrome-browser plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-chrome-browser'] --- import kbnCoreChromeBrowserObj from './kbn_core_chrome_browser.devdocs.json'; diff --git a/api_docs/kbn_core_chrome_browser_mocks.mdx b/api_docs/kbn_core_chrome_browser_mocks.mdx index b1d46f4e5fe8c..f8052fad772a5 100644 --- a/api_docs/kbn_core_chrome_browser_mocks.mdx +++ b/api_docs/kbn_core_chrome_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-chrome-browser-mocks title: "@kbn/core-chrome-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-chrome-browser-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-chrome-browser-mocks'] --- import kbnCoreChromeBrowserMocksObj from './kbn_core_chrome_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_config_server_internal.mdx b/api_docs/kbn_core_config_server_internal.mdx index ee601e6352e35..79da95fae9e67 100644 --- a/api_docs/kbn_core_config_server_internal.mdx +++ b/api_docs/kbn_core_config_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-config-server-internal title: "@kbn/core-config-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-config-server-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-config-server-internal'] --- import kbnCoreConfigServerInternalObj from './kbn_core_config_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_deprecations_browser.mdx b/api_docs/kbn_core_deprecations_browser.mdx index 6eec129fe2615..ad16ad6aea2e6 100644 --- a/api_docs/kbn_core_deprecations_browser.mdx +++ b/api_docs/kbn_core_deprecations_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-browser title: "@kbn/core-deprecations-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-deprecations-browser plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-browser'] --- import kbnCoreDeprecationsBrowserObj from './kbn_core_deprecations_browser.devdocs.json'; diff --git a/api_docs/kbn_core_deprecations_browser_internal.mdx b/api_docs/kbn_core_deprecations_browser_internal.mdx index 983047e82691a..7fe5dba92aa5c 100644 --- a/api_docs/kbn_core_deprecations_browser_internal.mdx +++ b/api_docs/kbn_core_deprecations_browser_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-browser-internal title: "@kbn/core-deprecations-browser-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-deprecations-browser-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-browser-internal'] --- import kbnCoreDeprecationsBrowserInternalObj from './kbn_core_deprecations_browser_internal.devdocs.json'; diff --git a/api_docs/kbn_core_deprecations_browser_mocks.mdx b/api_docs/kbn_core_deprecations_browser_mocks.mdx index 0190b56cf9739..2547deec251f6 100644 --- a/api_docs/kbn_core_deprecations_browser_mocks.mdx +++ b/api_docs/kbn_core_deprecations_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-browser-mocks title: "@kbn/core-deprecations-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-deprecations-browser-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-browser-mocks'] --- import kbnCoreDeprecationsBrowserMocksObj from './kbn_core_deprecations_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_deprecations_common.mdx b/api_docs/kbn_core_deprecations_common.mdx index 60d444ced08da..d96ff821c4365 100644 --- a/api_docs/kbn_core_deprecations_common.mdx +++ b/api_docs/kbn_core_deprecations_common.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-common title: "@kbn/core-deprecations-common" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-deprecations-common plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-common'] --- import kbnCoreDeprecationsCommonObj from './kbn_core_deprecations_common.devdocs.json'; diff --git a/api_docs/kbn_core_deprecations_server.mdx b/api_docs/kbn_core_deprecations_server.mdx index e9f8e03e21a24..74dee4cd3fdcc 100644 --- a/api_docs/kbn_core_deprecations_server.mdx +++ b/api_docs/kbn_core_deprecations_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-server title: "@kbn/core-deprecations-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-deprecations-server plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-server'] --- import kbnCoreDeprecationsServerObj from './kbn_core_deprecations_server.devdocs.json'; diff --git a/api_docs/kbn_core_deprecations_server_internal.mdx b/api_docs/kbn_core_deprecations_server_internal.mdx index cd76ecc1e5de7..da6a21361ea25 100644 --- a/api_docs/kbn_core_deprecations_server_internal.mdx +++ b/api_docs/kbn_core_deprecations_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-server-internal title: "@kbn/core-deprecations-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-deprecations-server-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-server-internal'] --- import kbnCoreDeprecationsServerInternalObj from './kbn_core_deprecations_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_deprecations_server_mocks.mdx b/api_docs/kbn_core_deprecations_server_mocks.mdx index adcf635bd0895..617a402d35fcc 100644 --- a/api_docs/kbn_core_deprecations_server_mocks.mdx +++ b/api_docs/kbn_core_deprecations_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-server-mocks title: "@kbn/core-deprecations-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-deprecations-server-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-server-mocks'] --- import kbnCoreDeprecationsServerMocksObj from './kbn_core_deprecations_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_doc_links_browser.mdx b/api_docs/kbn_core_doc_links_browser.mdx index d8f11b0a78906..1217a7b8fa20d 100644 --- a/api_docs/kbn_core_doc_links_browser.mdx +++ b/api_docs/kbn_core_doc_links_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-doc-links-browser title: "@kbn/core-doc-links-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-doc-links-browser plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-doc-links-browser'] --- import kbnCoreDocLinksBrowserObj from './kbn_core_doc_links_browser.devdocs.json'; diff --git a/api_docs/kbn_core_doc_links_browser_mocks.mdx b/api_docs/kbn_core_doc_links_browser_mocks.mdx index 04891d7eee772..0ccaad98b392b 100644 --- a/api_docs/kbn_core_doc_links_browser_mocks.mdx +++ b/api_docs/kbn_core_doc_links_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-doc-links-browser-mocks title: "@kbn/core-doc-links-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-doc-links-browser-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-doc-links-browser-mocks'] --- import kbnCoreDocLinksBrowserMocksObj from './kbn_core_doc_links_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_doc_links_server.mdx b/api_docs/kbn_core_doc_links_server.mdx index a211477391f89..14eccd7c10c34 100644 --- a/api_docs/kbn_core_doc_links_server.mdx +++ b/api_docs/kbn_core_doc_links_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-doc-links-server title: "@kbn/core-doc-links-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-doc-links-server plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-doc-links-server'] --- import kbnCoreDocLinksServerObj from './kbn_core_doc_links_server.devdocs.json'; diff --git a/api_docs/kbn_core_doc_links_server_mocks.mdx b/api_docs/kbn_core_doc_links_server_mocks.mdx index cabbd8bcaf86c..f5f017918ee4a 100644 --- a/api_docs/kbn_core_doc_links_server_mocks.mdx +++ b/api_docs/kbn_core_doc_links_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-doc-links-server-mocks title: "@kbn/core-doc-links-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-doc-links-server-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-doc-links-server-mocks'] --- import kbnCoreDocLinksServerMocksObj from './kbn_core_doc_links_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_elasticsearch_client_server_internal.mdx b/api_docs/kbn_core_elasticsearch_client_server_internal.mdx index c6a7f734219d8..477917148b690 100644 --- a/api_docs/kbn_core_elasticsearch_client_server_internal.mdx +++ b/api_docs/kbn_core_elasticsearch_client_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-client-server-internal title: "@kbn/core-elasticsearch-client-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-elasticsearch-client-server-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-elasticsearch-client-server-internal'] --- import kbnCoreElasticsearchClientServerInternalObj from './kbn_core_elasticsearch_client_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_elasticsearch_client_server_mocks.mdx b/api_docs/kbn_core_elasticsearch_client_server_mocks.mdx index 7af48bcbf5f1b..399790680e068 100644 --- a/api_docs/kbn_core_elasticsearch_client_server_mocks.mdx +++ b/api_docs/kbn_core_elasticsearch_client_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-client-server-mocks title: "@kbn/core-elasticsearch-client-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-elasticsearch-client-server-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-elasticsearch-client-server-mocks'] --- import kbnCoreElasticsearchClientServerMocksObj from './kbn_core_elasticsearch_client_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_elasticsearch_server.mdx b/api_docs/kbn_core_elasticsearch_server.mdx index ca2a47bc99331..318e2f19b36d7 100644 --- a/api_docs/kbn_core_elasticsearch_server.mdx +++ b/api_docs/kbn_core_elasticsearch_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-server title: "@kbn/core-elasticsearch-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-elasticsearch-server plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-elasticsearch-server'] --- import kbnCoreElasticsearchServerObj from './kbn_core_elasticsearch_server.devdocs.json'; diff --git a/api_docs/kbn_core_elasticsearch_server_internal.mdx b/api_docs/kbn_core_elasticsearch_server_internal.mdx index 5c6a4b84856c7..b4e402b1d85a7 100644 --- a/api_docs/kbn_core_elasticsearch_server_internal.mdx +++ b/api_docs/kbn_core_elasticsearch_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-server-internal title: "@kbn/core-elasticsearch-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-elasticsearch-server-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-elasticsearch-server-internal'] --- import kbnCoreElasticsearchServerInternalObj from './kbn_core_elasticsearch_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_elasticsearch_server_mocks.mdx b/api_docs/kbn_core_elasticsearch_server_mocks.mdx index dd0e97e30fc7c..1263eb43812bf 100644 --- a/api_docs/kbn_core_elasticsearch_server_mocks.mdx +++ b/api_docs/kbn_core_elasticsearch_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-server-mocks title: "@kbn/core-elasticsearch-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-elasticsearch-server-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-elasticsearch-server-mocks'] --- import kbnCoreElasticsearchServerMocksObj from './kbn_core_elasticsearch_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_environment_server_internal.mdx b/api_docs/kbn_core_environment_server_internal.mdx index 2d4f36ed093a2..efd3c4dce7d8e 100644 --- a/api_docs/kbn_core_environment_server_internal.mdx +++ b/api_docs/kbn_core_environment_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-environment-server-internal title: "@kbn/core-environment-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-environment-server-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-environment-server-internal'] --- import kbnCoreEnvironmentServerInternalObj from './kbn_core_environment_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_environment_server_mocks.mdx b/api_docs/kbn_core_environment_server_mocks.mdx index 587243bb64061..4b8b92e29d47e 100644 --- a/api_docs/kbn_core_environment_server_mocks.mdx +++ b/api_docs/kbn_core_environment_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-environment-server-mocks title: "@kbn/core-environment-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-environment-server-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-environment-server-mocks'] --- import kbnCoreEnvironmentServerMocksObj from './kbn_core_environment_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_execution_context_browser.mdx b/api_docs/kbn_core_execution_context_browser.mdx index 96b79793ed095..12f2b1b89aaa5 100644 --- a/api_docs/kbn_core_execution_context_browser.mdx +++ b/api_docs/kbn_core_execution_context_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-browser title: "@kbn/core-execution-context-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-execution-context-browser plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-browser'] --- import kbnCoreExecutionContextBrowserObj from './kbn_core_execution_context_browser.devdocs.json'; diff --git a/api_docs/kbn_core_execution_context_browser_internal.mdx b/api_docs/kbn_core_execution_context_browser_internal.mdx index d8cfe4d9f349d..22703ff1d56c5 100644 --- a/api_docs/kbn_core_execution_context_browser_internal.mdx +++ b/api_docs/kbn_core_execution_context_browser_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-browser-internal title: "@kbn/core-execution-context-browser-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-execution-context-browser-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-browser-internal'] --- import kbnCoreExecutionContextBrowserInternalObj from './kbn_core_execution_context_browser_internal.devdocs.json'; diff --git a/api_docs/kbn_core_execution_context_browser_mocks.mdx b/api_docs/kbn_core_execution_context_browser_mocks.mdx index fe90efd441051..58d7084730b09 100644 --- a/api_docs/kbn_core_execution_context_browser_mocks.mdx +++ b/api_docs/kbn_core_execution_context_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-browser-mocks title: "@kbn/core-execution-context-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-execution-context-browser-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-browser-mocks'] --- import kbnCoreExecutionContextBrowserMocksObj from './kbn_core_execution_context_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_execution_context_common.mdx b/api_docs/kbn_core_execution_context_common.mdx index e7b47436fa761..9f241f79f3092 100644 --- a/api_docs/kbn_core_execution_context_common.mdx +++ b/api_docs/kbn_core_execution_context_common.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-common title: "@kbn/core-execution-context-common" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-execution-context-common plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-common'] --- import kbnCoreExecutionContextCommonObj from './kbn_core_execution_context_common.devdocs.json'; diff --git a/api_docs/kbn_core_execution_context_server.mdx b/api_docs/kbn_core_execution_context_server.mdx index 8fa86908f719d..2d3ce9691dbc3 100644 --- a/api_docs/kbn_core_execution_context_server.mdx +++ b/api_docs/kbn_core_execution_context_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-server title: "@kbn/core-execution-context-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-execution-context-server plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-server'] --- import kbnCoreExecutionContextServerObj from './kbn_core_execution_context_server.devdocs.json'; diff --git a/api_docs/kbn_core_execution_context_server_internal.mdx b/api_docs/kbn_core_execution_context_server_internal.mdx index 76ca7ae6c111b..db3e364e96ff7 100644 --- a/api_docs/kbn_core_execution_context_server_internal.mdx +++ b/api_docs/kbn_core_execution_context_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-server-internal title: "@kbn/core-execution-context-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-execution-context-server-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-server-internal'] --- import kbnCoreExecutionContextServerInternalObj from './kbn_core_execution_context_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_execution_context_server_mocks.mdx b/api_docs/kbn_core_execution_context_server_mocks.mdx index 3e17e9ed94637..cbeb87f2524be 100644 --- a/api_docs/kbn_core_execution_context_server_mocks.mdx +++ b/api_docs/kbn_core_execution_context_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-server-mocks title: "@kbn/core-execution-context-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-execution-context-server-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-server-mocks'] --- import kbnCoreExecutionContextServerMocksObj from './kbn_core_execution_context_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_fatal_errors_browser.mdx b/api_docs/kbn_core_fatal_errors_browser.mdx index 01d683396e2b7..e838dfc832fd6 100644 --- a/api_docs/kbn_core_fatal_errors_browser.mdx +++ b/api_docs/kbn_core_fatal_errors_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-fatal-errors-browser title: "@kbn/core-fatal-errors-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-fatal-errors-browser plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-fatal-errors-browser'] --- import kbnCoreFatalErrorsBrowserObj from './kbn_core_fatal_errors_browser.devdocs.json'; diff --git a/api_docs/kbn_core_fatal_errors_browser_mocks.mdx b/api_docs/kbn_core_fatal_errors_browser_mocks.mdx index 891c8d8767547..6bdcb4cd9e37a 100644 --- a/api_docs/kbn_core_fatal_errors_browser_mocks.mdx +++ b/api_docs/kbn_core_fatal_errors_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-fatal-errors-browser-mocks title: "@kbn/core-fatal-errors-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-fatal-errors-browser-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-fatal-errors-browser-mocks'] --- import kbnCoreFatalErrorsBrowserMocksObj from './kbn_core_fatal_errors_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_http_browser.mdx b/api_docs/kbn_core_http_browser.mdx index a935d019adeb4..afb5974de9a1d 100644 --- a/api_docs/kbn_core_http_browser.mdx +++ b/api_docs/kbn_core_http_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-browser title: "@kbn/core-http-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-http-browser plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-browser'] --- import kbnCoreHttpBrowserObj from './kbn_core_http_browser.devdocs.json'; diff --git a/api_docs/kbn_core_http_browser_internal.mdx b/api_docs/kbn_core_http_browser_internal.mdx index 04f71c530c9a5..8e28ebbe2ff12 100644 --- a/api_docs/kbn_core_http_browser_internal.mdx +++ b/api_docs/kbn_core_http_browser_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-browser-internal title: "@kbn/core-http-browser-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-http-browser-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-browser-internal'] --- import kbnCoreHttpBrowserInternalObj from './kbn_core_http_browser_internal.devdocs.json'; diff --git a/api_docs/kbn_core_http_browser_mocks.mdx b/api_docs/kbn_core_http_browser_mocks.mdx index 53f1d9fe670a0..463b56f364292 100644 --- a/api_docs/kbn_core_http_browser_mocks.mdx +++ b/api_docs/kbn_core_http_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-browser-mocks title: "@kbn/core-http-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-http-browser-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-browser-mocks'] --- import kbnCoreHttpBrowserMocksObj from './kbn_core_http_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_http_common.mdx b/api_docs/kbn_core_http_common.mdx index f8ff0087dbbfc..bf4cf64d7a58a 100644 --- a/api_docs/kbn_core_http_common.mdx +++ b/api_docs/kbn_core_http_common.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-common title: "@kbn/core-http-common" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-http-common plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-common'] --- import kbnCoreHttpCommonObj from './kbn_core_http_common.devdocs.json'; diff --git a/api_docs/kbn_core_http_context_server_mocks.mdx b/api_docs/kbn_core_http_context_server_mocks.mdx index c93bb2546524b..4047f8a6f4847 100644 --- a/api_docs/kbn_core_http_context_server_mocks.mdx +++ b/api_docs/kbn_core_http_context_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-context-server-mocks title: "@kbn/core-http-context-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-http-context-server-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-context-server-mocks'] --- import kbnCoreHttpContextServerMocksObj from './kbn_core_http_context_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_http_router_server_internal.mdx b/api_docs/kbn_core_http_router_server_internal.mdx index 6121b09f8c1b4..650426f493570 100644 --- a/api_docs/kbn_core_http_router_server_internal.mdx +++ b/api_docs/kbn_core_http_router_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-router-server-internal title: "@kbn/core-http-router-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-http-router-server-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-router-server-internal'] --- import kbnCoreHttpRouterServerInternalObj from './kbn_core_http_router_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_http_router_server_mocks.mdx b/api_docs/kbn_core_http_router_server_mocks.mdx index 49dffda39dcc6..0df0a232ed7e3 100644 --- a/api_docs/kbn_core_http_router_server_mocks.mdx +++ b/api_docs/kbn_core_http_router_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-router-server-mocks title: "@kbn/core-http-router-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-http-router-server-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-router-server-mocks'] --- import kbnCoreHttpRouterServerMocksObj from './kbn_core_http_router_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_http_server.mdx b/api_docs/kbn_core_http_server.mdx index 74c3216b75ebc..404f13d3ca12a 100644 --- a/api_docs/kbn_core_http_server.mdx +++ b/api_docs/kbn_core_http_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-server title: "@kbn/core-http-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-http-server plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-server'] --- import kbnCoreHttpServerObj from './kbn_core_http_server.devdocs.json'; diff --git a/api_docs/kbn_core_http_server_internal.mdx b/api_docs/kbn_core_http_server_internal.mdx index 50ebcbe4058b9..524b236008cfb 100644 --- a/api_docs/kbn_core_http_server_internal.mdx +++ b/api_docs/kbn_core_http_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-server-internal title: "@kbn/core-http-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-http-server-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-server-internal'] --- import kbnCoreHttpServerInternalObj from './kbn_core_http_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_http_server_mocks.mdx b/api_docs/kbn_core_http_server_mocks.mdx index c7649dcf597cf..94a0469ff1071 100644 --- a/api_docs/kbn_core_http_server_mocks.mdx +++ b/api_docs/kbn_core_http_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-server-mocks title: "@kbn/core-http-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-http-server-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-server-mocks'] --- import kbnCoreHttpServerMocksObj from './kbn_core_http_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_i18n_browser.mdx b/api_docs/kbn_core_i18n_browser.mdx index 7e8106d7e3c66..aac9e17df421b 100644 --- a/api_docs/kbn_core_i18n_browser.mdx +++ b/api_docs/kbn_core_i18n_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-browser title: "@kbn/core-i18n-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-i18n-browser plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-i18n-browser'] --- import kbnCoreI18nBrowserObj from './kbn_core_i18n_browser.devdocs.json'; diff --git a/api_docs/kbn_core_i18n_browser_mocks.mdx b/api_docs/kbn_core_i18n_browser_mocks.mdx index 32e6b9184dbe1..e83f6e8553d82 100644 --- a/api_docs/kbn_core_i18n_browser_mocks.mdx +++ b/api_docs/kbn_core_i18n_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-browser-mocks title: "@kbn/core-i18n-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-i18n-browser-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-i18n-browser-mocks'] --- import kbnCoreI18nBrowserMocksObj from './kbn_core_i18n_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_i18n_server.mdx b/api_docs/kbn_core_i18n_server.mdx index 4e5cbf65974a7..a89d07338f781 100644 --- a/api_docs/kbn_core_i18n_server.mdx +++ b/api_docs/kbn_core_i18n_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-server title: "@kbn/core-i18n-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-i18n-server plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-i18n-server'] --- import kbnCoreI18nServerObj from './kbn_core_i18n_server.devdocs.json'; diff --git a/api_docs/kbn_core_i18n_server_internal.mdx b/api_docs/kbn_core_i18n_server_internal.mdx index 93c620cca65a7..3575cc0d18a98 100644 --- a/api_docs/kbn_core_i18n_server_internal.mdx +++ b/api_docs/kbn_core_i18n_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-server-internal title: "@kbn/core-i18n-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-i18n-server-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-i18n-server-internal'] --- import kbnCoreI18nServerInternalObj from './kbn_core_i18n_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_i18n_server_mocks.mdx b/api_docs/kbn_core_i18n_server_mocks.mdx index 13734215059b0..ce24eb49860c5 100644 --- a/api_docs/kbn_core_i18n_server_mocks.mdx +++ b/api_docs/kbn_core_i18n_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-server-mocks title: "@kbn/core-i18n-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-i18n-server-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-i18n-server-mocks'] --- import kbnCoreI18nServerMocksObj from './kbn_core_i18n_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_injected_metadata_browser.mdx b/api_docs/kbn_core_injected_metadata_browser.mdx index 08dbe296b4323..92e9d0e07cfe5 100644 --- a/api_docs/kbn_core_injected_metadata_browser.mdx +++ b/api_docs/kbn_core_injected_metadata_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-injected-metadata-browser title: "@kbn/core-injected-metadata-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-injected-metadata-browser plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-injected-metadata-browser'] --- import kbnCoreInjectedMetadataBrowserObj from './kbn_core_injected_metadata_browser.devdocs.json'; diff --git a/api_docs/kbn_core_injected_metadata_browser_mocks.mdx b/api_docs/kbn_core_injected_metadata_browser_mocks.mdx index b88675d50c204..17e4abfa2a1aa 100644 --- a/api_docs/kbn_core_injected_metadata_browser_mocks.mdx +++ b/api_docs/kbn_core_injected_metadata_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-injected-metadata-browser-mocks title: "@kbn/core-injected-metadata-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-injected-metadata-browser-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-injected-metadata-browser-mocks'] --- import kbnCoreInjectedMetadataBrowserMocksObj from './kbn_core_injected_metadata_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_integrations_browser_internal.mdx b/api_docs/kbn_core_integrations_browser_internal.mdx index fc53dc77eda1c..d8c9f151e2f4f 100644 --- a/api_docs/kbn_core_integrations_browser_internal.mdx +++ b/api_docs/kbn_core_integrations_browser_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-integrations-browser-internal title: "@kbn/core-integrations-browser-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-integrations-browser-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-integrations-browser-internal'] --- import kbnCoreIntegrationsBrowserInternalObj from './kbn_core_integrations_browser_internal.devdocs.json'; diff --git a/api_docs/kbn_core_integrations_browser_mocks.mdx b/api_docs/kbn_core_integrations_browser_mocks.mdx index 2526e6dc2b6b9..574ff5014691b 100644 --- a/api_docs/kbn_core_integrations_browser_mocks.mdx +++ b/api_docs/kbn_core_integrations_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-integrations-browser-mocks title: "@kbn/core-integrations-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-integrations-browser-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-integrations-browser-mocks'] --- import kbnCoreIntegrationsBrowserMocksObj from './kbn_core_integrations_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_lifecycle_browser.mdx b/api_docs/kbn_core_lifecycle_browser.mdx index 8b557e2e502b2..62c8d4f2358e5 100644 --- a/api_docs/kbn_core_lifecycle_browser.mdx +++ b/api_docs/kbn_core_lifecycle_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-lifecycle-browser title: "@kbn/core-lifecycle-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-lifecycle-browser plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-lifecycle-browser'] --- import kbnCoreLifecycleBrowserObj from './kbn_core_lifecycle_browser.devdocs.json'; diff --git a/api_docs/kbn_core_lifecycle_browser_mocks.mdx b/api_docs/kbn_core_lifecycle_browser_mocks.mdx index 74231286ffe09..8deee157e3d42 100644 --- a/api_docs/kbn_core_lifecycle_browser_mocks.mdx +++ b/api_docs/kbn_core_lifecycle_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-lifecycle-browser-mocks title: "@kbn/core-lifecycle-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-lifecycle-browser-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-lifecycle-browser-mocks'] --- import kbnCoreLifecycleBrowserMocksObj from './kbn_core_lifecycle_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_logging_server.mdx b/api_docs/kbn_core_logging_server.mdx index a4e8cb4241bef..cf1126fe73e2a 100644 --- a/api_docs/kbn_core_logging_server.mdx +++ b/api_docs/kbn_core_logging_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-logging-server title: "@kbn/core-logging-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-logging-server plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-logging-server'] --- import kbnCoreLoggingServerObj from './kbn_core_logging_server.devdocs.json'; diff --git a/api_docs/kbn_core_logging_server_internal.mdx b/api_docs/kbn_core_logging_server_internal.mdx index f56eecbd69552..bc4d09292edbf 100644 --- a/api_docs/kbn_core_logging_server_internal.mdx +++ b/api_docs/kbn_core_logging_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-logging-server-internal title: "@kbn/core-logging-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-logging-server-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-logging-server-internal'] --- import kbnCoreLoggingServerInternalObj from './kbn_core_logging_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_logging_server_mocks.mdx b/api_docs/kbn_core_logging_server_mocks.mdx index 2067fdbc72fda..485e124d97e42 100644 --- a/api_docs/kbn_core_logging_server_mocks.mdx +++ b/api_docs/kbn_core_logging_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-logging-server-mocks title: "@kbn/core-logging-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-logging-server-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-logging-server-mocks'] --- import kbnCoreLoggingServerMocksObj from './kbn_core_logging_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_metrics_collectors_server_internal.mdx b/api_docs/kbn_core_metrics_collectors_server_internal.mdx index a7e7a11ae05ea..4b17dbaac8c84 100644 --- a/api_docs/kbn_core_metrics_collectors_server_internal.mdx +++ b/api_docs/kbn_core_metrics_collectors_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-collectors-server-internal title: "@kbn/core-metrics-collectors-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-metrics-collectors-server-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-metrics-collectors-server-internal'] --- import kbnCoreMetricsCollectorsServerInternalObj from './kbn_core_metrics_collectors_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_metrics_collectors_server_mocks.mdx b/api_docs/kbn_core_metrics_collectors_server_mocks.mdx index febc5d3038933..36c1e8c0f9a42 100644 --- a/api_docs/kbn_core_metrics_collectors_server_mocks.mdx +++ b/api_docs/kbn_core_metrics_collectors_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-collectors-server-mocks title: "@kbn/core-metrics-collectors-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-metrics-collectors-server-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-metrics-collectors-server-mocks'] --- import kbnCoreMetricsCollectorsServerMocksObj from './kbn_core_metrics_collectors_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_metrics_server.mdx b/api_docs/kbn_core_metrics_server.mdx index 47cc583e2df0e..a1a8ce47aed54 100644 --- a/api_docs/kbn_core_metrics_server.mdx +++ b/api_docs/kbn_core_metrics_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-server title: "@kbn/core-metrics-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-metrics-server plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-metrics-server'] --- import kbnCoreMetricsServerObj from './kbn_core_metrics_server.devdocs.json'; diff --git a/api_docs/kbn_core_metrics_server_internal.mdx b/api_docs/kbn_core_metrics_server_internal.mdx index 9e16d8304decd..6b4a55f82676d 100644 --- a/api_docs/kbn_core_metrics_server_internal.mdx +++ b/api_docs/kbn_core_metrics_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-server-internal title: "@kbn/core-metrics-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-metrics-server-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-metrics-server-internal'] --- import kbnCoreMetricsServerInternalObj from './kbn_core_metrics_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_metrics_server_mocks.mdx b/api_docs/kbn_core_metrics_server_mocks.mdx index 5db83c7383b67..d1494db236370 100644 --- a/api_docs/kbn_core_metrics_server_mocks.mdx +++ b/api_docs/kbn_core_metrics_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-server-mocks title: "@kbn/core-metrics-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-metrics-server-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-metrics-server-mocks'] --- import kbnCoreMetricsServerMocksObj from './kbn_core_metrics_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_mount_utils_browser.mdx b/api_docs/kbn_core_mount_utils_browser.mdx index 8fafac5831639..ad35d06977cc0 100644 --- a/api_docs/kbn_core_mount_utils_browser.mdx +++ b/api_docs/kbn_core_mount_utils_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-mount-utils-browser title: "@kbn/core-mount-utils-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-mount-utils-browser plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-mount-utils-browser'] --- import kbnCoreMountUtilsBrowserObj from './kbn_core_mount_utils_browser.devdocs.json'; diff --git a/api_docs/kbn_core_node_server.mdx b/api_docs/kbn_core_node_server.mdx index 9fbffa9c5df93..5b5b8a9421411 100644 --- a/api_docs/kbn_core_node_server.mdx +++ b/api_docs/kbn_core_node_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-node-server title: "@kbn/core-node-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-node-server plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-node-server'] --- import kbnCoreNodeServerObj from './kbn_core_node_server.devdocs.json'; diff --git a/api_docs/kbn_core_node_server_internal.mdx b/api_docs/kbn_core_node_server_internal.mdx index d253278b97f15..bf95da355c9e9 100644 --- a/api_docs/kbn_core_node_server_internal.mdx +++ b/api_docs/kbn_core_node_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-node-server-internal title: "@kbn/core-node-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-node-server-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-node-server-internal'] --- import kbnCoreNodeServerInternalObj from './kbn_core_node_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_node_server_mocks.mdx b/api_docs/kbn_core_node_server_mocks.mdx index 5dd3d790c3eaa..3a07f7a676064 100644 --- a/api_docs/kbn_core_node_server_mocks.mdx +++ b/api_docs/kbn_core_node_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-node-server-mocks title: "@kbn/core-node-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-node-server-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-node-server-mocks'] --- import kbnCoreNodeServerMocksObj from './kbn_core_node_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_notifications_browser.mdx b/api_docs/kbn_core_notifications_browser.mdx index ed0c7c4e240ce..130bddee31d14 100644 --- a/api_docs/kbn_core_notifications_browser.mdx +++ b/api_docs/kbn_core_notifications_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-notifications-browser title: "@kbn/core-notifications-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-notifications-browser plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-notifications-browser'] --- import kbnCoreNotificationsBrowserObj from './kbn_core_notifications_browser.devdocs.json'; diff --git a/api_docs/kbn_core_notifications_browser_internal.mdx b/api_docs/kbn_core_notifications_browser_internal.mdx index 5c44022f60828..fef5e6c2f9a85 100644 --- a/api_docs/kbn_core_notifications_browser_internal.mdx +++ b/api_docs/kbn_core_notifications_browser_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-notifications-browser-internal title: "@kbn/core-notifications-browser-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-notifications-browser-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-notifications-browser-internal'] --- import kbnCoreNotificationsBrowserInternalObj from './kbn_core_notifications_browser_internal.devdocs.json'; diff --git a/api_docs/kbn_core_notifications_browser_mocks.mdx b/api_docs/kbn_core_notifications_browser_mocks.mdx index ef4b9a440b592..724251e5e502f 100644 --- a/api_docs/kbn_core_notifications_browser_mocks.mdx +++ b/api_docs/kbn_core_notifications_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-notifications-browser-mocks title: "@kbn/core-notifications-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-notifications-browser-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-notifications-browser-mocks'] --- import kbnCoreNotificationsBrowserMocksObj from './kbn_core_notifications_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_overlays_browser.mdx b/api_docs/kbn_core_overlays_browser.mdx index 559df72a076e4..3837e623f29c4 100644 --- a/api_docs/kbn_core_overlays_browser.mdx +++ b/api_docs/kbn_core_overlays_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-overlays-browser title: "@kbn/core-overlays-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-overlays-browser plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-overlays-browser'] --- import kbnCoreOverlaysBrowserObj from './kbn_core_overlays_browser.devdocs.json'; diff --git a/api_docs/kbn_core_overlays_browser_internal.mdx b/api_docs/kbn_core_overlays_browser_internal.mdx index 6160c98032fef..0f7f597d06d38 100644 --- a/api_docs/kbn_core_overlays_browser_internal.mdx +++ b/api_docs/kbn_core_overlays_browser_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-overlays-browser-internal title: "@kbn/core-overlays-browser-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-overlays-browser-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-overlays-browser-internal'] --- import kbnCoreOverlaysBrowserInternalObj from './kbn_core_overlays_browser_internal.devdocs.json'; diff --git a/api_docs/kbn_core_overlays_browser_mocks.mdx b/api_docs/kbn_core_overlays_browser_mocks.mdx index 5765d85478d62..42846c64f33d6 100644 --- a/api_docs/kbn_core_overlays_browser_mocks.mdx +++ b/api_docs/kbn_core_overlays_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-overlays-browser-mocks title: "@kbn/core-overlays-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-overlays-browser-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-overlays-browser-mocks'] --- import kbnCoreOverlaysBrowserMocksObj from './kbn_core_overlays_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_plugins_browser.mdx b/api_docs/kbn_core_plugins_browser.mdx index 09d09fe708575..a52c3697e57dd 100644 --- a/api_docs/kbn_core_plugins_browser.mdx +++ b/api_docs/kbn_core_plugins_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-plugins-browser title: "@kbn/core-plugins-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-plugins-browser plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-plugins-browser'] --- import kbnCorePluginsBrowserObj from './kbn_core_plugins_browser.devdocs.json'; diff --git a/api_docs/kbn_core_plugins_browser_mocks.mdx b/api_docs/kbn_core_plugins_browser_mocks.mdx index 5416044cac958..238252f104b3c 100644 --- a/api_docs/kbn_core_plugins_browser_mocks.mdx +++ b/api_docs/kbn_core_plugins_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-plugins-browser-mocks title: "@kbn/core-plugins-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-plugins-browser-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-plugins-browser-mocks'] --- import kbnCorePluginsBrowserMocksObj from './kbn_core_plugins_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_preboot_server.mdx b/api_docs/kbn_core_preboot_server.mdx index 962d718e0042b..d5b97eb1a0cbb 100644 --- a/api_docs/kbn_core_preboot_server.mdx +++ b/api_docs/kbn_core_preboot_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-preboot-server title: "@kbn/core-preboot-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-preboot-server plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-preboot-server'] --- import kbnCorePrebootServerObj from './kbn_core_preboot_server.devdocs.json'; diff --git a/api_docs/kbn_core_preboot_server_mocks.mdx b/api_docs/kbn_core_preboot_server_mocks.mdx index 07d55b8bdc9ad..20a753b66ea99 100644 --- a/api_docs/kbn_core_preboot_server_mocks.mdx +++ b/api_docs/kbn_core_preboot_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-preboot-server-mocks title: "@kbn/core-preboot-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-preboot-server-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-preboot-server-mocks'] --- import kbnCorePrebootServerMocksObj from './kbn_core_preboot_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_rendering_browser_mocks.mdx b/api_docs/kbn_core_rendering_browser_mocks.mdx index f31451fde9e77..c074d0f80cb88 100644 --- a/api_docs/kbn_core_rendering_browser_mocks.mdx +++ b/api_docs/kbn_core_rendering_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-rendering-browser-mocks title: "@kbn/core-rendering-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-rendering-browser-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-rendering-browser-mocks'] --- import kbnCoreRenderingBrowserMocksObj from './kbn_core_rendering_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_api_browser.mdx b/api_docs/kbn_core_saved_objects_api_browser.mdx index 97d1f20eba7af..949af62592ecb 100644 --- a/api_docs/kbn_core_saved_objects_api_browser.mdx +++ b/api_docs/kbn_core_saved_objects_api_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-api-browser title: "@kbn/core-saved-objects-api-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-api-browser plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-api-browser'] --- import kbnCoreSavedObjectsApiBrowserObj from './kbn_core_saved_objects_api_browser.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_api_server.mdx b/api_docs/kbn_core_saved_objects_api_server.mdx index 1c1ec6407d249..6fa09c36e31f1 100644 --- a/api_docs/kbn_core_saved_objects_api_server.mdx +++ b/api_docs/kbn_core_saved_objects_api_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-api-server title: "@kbn/core-saved-objects-api-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-api-server plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-api-server'] --- import kbnCoreSavedObjectsApiServerObj from './kbn_core_saved_objects_api_server.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_api_server_internal.mdx b/api_docs/kbn_core_saved_objects_api_server_internal.mdx index 678cf37d24e81..7c588cdc511e2 100644 --- a/api_docs/kbn_core_saved_objects_api_server_internal.mdx +++ b/api_docs/kbn_core_saved_objects_api_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-api-server-internal title: "@kbn/core-saved-objects-api-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-api-server-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-api-server-internal'] --- import kbnCoreSavedObjectsApiServerInternalObj from './kbn_core_saved_objects_api_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_api_server_mocks.mdx b/api_docs/kbn_core_saved_objects_api_server_mocks.mdx index da93d1e0b8552..447e323f6f6c3 100644 --- a/api_docs/kbn_core_saved_objects_api_server_mocks.mdx +++ b/api_docs/kbn_core_saved_objects_api_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-api-server-mocks title: "@kbn/core-saved-objects-api-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-api-server-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-api-server-mocks'] --- import kbnCoreSavedObjectsApiServerMocksObj from './kbn_core_saved_objects_api_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_base_server_internal.mdx b/api_docs/kbn_core_saved_objects_base_server_internal.mdx index 73d6c70c1a9ac..9931b55fa4f21 100644 --- a/api_docs/kbn_core_saved_objects_base_server_internal.mdx +++ b/api_docs/kbn_core_saved_objects_base_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-base-server-internal title: "@kbn/core-saved-objects-base-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-base-server-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-base-server-internal'] --- import kbnCoreSavedObjectsBaseServerInternalObj from './kbn_core_saved_objects_base_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_base_server_mocks.mdx b/api_docs/kbn_core_saved_objects_base_server_mocks.mdx index 2b499a47657b8..deb24928a107a 100644 --- a/api_docs/kbn_core_saved_objects_base_server_mocks.mdx +++ b/api_docs/kbn_core_saved_objects_base_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-base-server-mocks title: "@kbn/core-saved-objects-base-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-base-server-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-base-server-mocks'] --- import kbnCoreSavedObjectsBaseServerMocksObj from './kbn_core_saved_objects_base_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_browser.mdx b/api_docs/kbn_core_saved_objects_browser.mdx index fcec7c16e5f85..3bfa422bdff98 100644 --- a/api_docs/kbn_core_saved_objects_browser.mdx +++ b/api_docs/kbn_core_saved_objects_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-browser title: "@kbn/core-saved-objects-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-browser plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-browser'] --- import kbnCoreSavedObjectsBrowserObj from './kbn_core_saved_objects_browser.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_browser_internal.mdx b/api_docs/kbn_core_saved_objects_browser_internal.mdx index 197152a6dae02..1a306a18a3eb1 100644 --- a/api_docs/kbn_core_saved_objects_browser_internal.mdx +++ b/api_docs/kbn_core_saved_objects_browser_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-browser-internal title: "@kbn/core-saved-objects-browser-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-browser-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-browser-internal'] --- import kbnCoreSavedObjectsBrowserInternalObj from './kbn_core_saved_objects_browser_internal.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_browser_mocks.mdx b/api_docs/kbn_core_saved_objects_browser_mocks.mdx index 80320e7312485..a34e632cf249f 100644 --- a/api_docs/kbn_core_saved_objects_browser_mocks.mdx +++ b/api_docs/kbn_core_saved_objects_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-browser-mocks title: "@kbn/core-saved-objects-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-browser-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-browser-mocks'] --- import kbnCoreSavedObjectsBrowserMocksObj from './kbn_core_saved_objects_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_common.mdx b/api_docs/kbn_core_saved_objects_common.mdx index 63fa1e47ac1bf..59d4d1841c7fa 100644 --- a/api_docs/kbn_core_saved_objects_common.mdx +++ b/api_docs/kbn_core_saved_objects_common.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-common title: "@kbn/core-saved-objects-common" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-common plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-common'] --- import kbnCoreSavedObjectsCommonObj from './kbn_core_saved_objects_common.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_import_export_server_internal.mdx b/api_docs/kbn_core_saved_objects_import_export_server_internal.mdx index 127679f751476..f0610e31ec803 100644 --- a/api_docs/kbn_core_saved_objects_import_export_server_internal.mdx +++ b/api_docs/kbn_core_saved_objects_import_export_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-import-export-server-internal title: "@kbn/core-saved-objects-import-export-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-import-export-server-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-import-export-server-internal'] --- import kbnCoreSavedObjectsImportExportServerInternalObj from './kbn_core_saved_objects_import_export_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_import_export_server_mocks.mdx b/api_docs/kbn_core_saved_objects_import_export_server_mocks.mdx index f633f52c6174d..cd9ba3c71908b 100644 --- a/api_docs/kbn_core_saved_objects_import_export_server_mocks.mdx +++ b/api_docs/kbn_core_saved_objects_import_export_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-import-export-server-mocks title: "@kbn/core-saved-objects-import-export-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-import-export-server-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-import-export-server-mocks'] --- import kbnCoreSavedObjectsImportExportServerMocksObj from './kbn_core_saved_objects_import_export_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_migration_server_internal.mdx b/api_docs/kbn_core_saved_objects_migration_server_internal.mdx index bc446d004b249..f2dd4437d43e1 100644 --- a/api_docs/kbn_core_saved_objects_migration_server_internal.mdx +++ b/api_docs/kbn_core_saved_objects_migration_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-migration-server-internal title: "@kbn/core-saved-objects-migration-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-migration-server-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-migration-server-internal'] --- import kbnCoreSavedObjectsMigrationServerInternalObj from './kbn_core_saved_objects_migration_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_migration_server_mocks.mdx b/api_docs/kbn_core_saved_objects_migration_server_mocks.mdx index ecbb1447d1e5c..88c329e9ae344 100644 --- a/api_docs/kbn_core_saved_objects_migration_server_mocks.mdx +++ b/api_docs/kbn_core_saved_objects_migration_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-migration-server-mocks title: "@kbn/core-saved-objects-migration-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-migration-server-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-migration-server-mocks'] --- import kbnCoreSavedObjectsMigrationServerMocksObj from './kbn_core_saved_objects_migration_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_server.mdx b/api_docs/kbn_core_saved_objects_server.mdx index c694b3c9f6584..df7eaa590f6db 100644 --- a/api_docs/kbn_core_saved_objects_server.mdx +++ b/api_docs/kbn_core_saved_objects_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-server title: "@kbn/core-saved-objects-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-server plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-server'] --- import kbnCoreSavedObjectsServerObj from './kbn_core_saved_objects_server.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_server_internal.mdx b/api_docs/kbn_core_saved_objects_server_internal.mdx index 39099151043aa..5534b4652be59 100644 --- a/api_docs/kbn_core_saved_objects_server_internal.mdx +++ b/api_docs/kbn_core_saved_objects_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-server-internal title: "@kbn/core-saved-objects-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-server-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-server-internal'] --- import kbnCoreSavedObjectsServerInternalObj from './kbn_core_saved_objects_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_server_mocks.mdx b/api_docs/kbn_core_saved_objects_server_mocks.mdx index 73e0b05504386..ccf532e33ba38 100644 --- a/api_docs/kbn_core_saved_objects_server_mocks.mdx +++ b/api_docs/kbn_core_saved_objects_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-server-mocks title: "@kbn/core-saved-objects-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-server-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-server-mocks'] --- import kbnCoreSavedObjectsServerMocksObj from './kbn_core_saved_objects_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_utils_server.mdx b/api_docs/kbn_core_saved_objects_utils_server.mdx index 0012db4e553fb..5b78e21ba58ce 100644 --- a/api_docs/kbn_core_saved_objects_utils_server.mdx +++ b/api_docs/kbn_core_saved_objects_utils_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-utils-server title: "@kbn/core-saved-objects-utils-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-utils-server plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-utils-server'] --- import kbnCoreSavedObjectsUtilsServerObj from './kbn_core_saved_objects_utils_server.devdocs.json'; diff --git a/api_docs/kbn_core_status_common.mdx b/api_docs/kbn_core_status_common.mdx index 1ef8c6abfc97a..f4f9cc899056b 100644 --- a/api_docs/kbn_core_status_common.mdx +++ b/api_docs/kbn_core_status_common.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-common title: "@kbn/core-status-common" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-status-common plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-status-common'] --- import kbnCoreStatusCommonObj from './kbn_core_status_common.devdocs.json'; diff --git a/api_docs/kbn_core_status_common_internal.mdx b/api_docs/kbn_core_status_common_internal.mdx index 7c9440c92271b..86d04a0b4ff7f 100644 --- a/api_docs/kbn_core_status_common_internal.mdx +++ b/api_docs/kbn_core_status_common_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-common-internal title: "@kbn/core-status-common-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-status-common-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-status-common-internal'] --- import kbnCoreStatusCommonInternalObj from './kbn_core_status_common_internal.devdocs.json'; diff --git a/api_docs/kbn_core_status_server.mdx b/api_docs/kbn_core_status_server.mdx index bd5556b6ce877..52e756da1a554 100644 --- a/api_docs/kbn_core_status_server.mdx +++ b/api_docs/kbn_core_status_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-server title: "@kbn/core-status-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-status-server plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-status-server'] --- import kbnCoreStatusServerObj from './kbn_core_status_server.devdocs.json'; diff --git a/api_docs/kbn_core_status_server_internal.mdx b/api_docs/kbn_core_status_server_internal.mdx index 364b20ab80d66..432a7d95007ec 100644 --- a/api_docs/kbn_core_status_server_internal.mdx +++ b/api_docs/kbn_core_status_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-server-internal title: "@kbn/core-status-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-status-server-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-status-server-internal'] --- import kbnCoreStatusServerInternalObj from './kbn_core_status_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_status_server_mocks.mdx b/api_docs/kbn_core_status_server_mocks.mdx index aa7990a556b57..8ccca542c4b7d 100644 --- a/api_docs/kbn_core_status_server_mocks.mdx +++ b/api_docs/kbn_core_status_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-server-mocks title: "@kbn/core-status-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-status-server-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-status-server-mocks'] --- import kbnCoreStatusServerMocksObj from './kbn_core_status_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_test_helpers_deprecations_getters.mdx b/api_docs/kbn_core_test_helpers_deprecations_getters.mdx index d4a0a789572fb..ab86530abfbbd 100644 --- a/api_docs/kbn_core_test_helpers_deprecations_getters.mdx +++ b/api_docs/kbn_core_test_helpers_deprecations_getters.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-test-helpers-deprecations-getters title: "@kbn/core-test-helpers-deprecations-getters" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-test-helpers-deprecations-getters plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-test-helpers-deprecations-getters'] --- import kbnCoreTestHelpersDeprecationsGettersObj from './kbn_core_test_helpers_deprecations_getters.devdocs.json'; diff --git a/api_docs/kbn_core_test_helpers_http_setup_browser.mdx b/api_docs/kbn_core_test_helpers_http_setup_browser.mdx index 826ee5d1b3459..9de9031c75db8 100644 --- a/api_docs/kbn_core_test_helpers_http_setup_browser.mdx +++ b/api_docs/kbn_core_test_helpers_http_setup_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-test-helpers-http-setup-browser title: "@kbn/core-test-helpers-http-setup-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-test-helpers-http-setup-browser plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-test-helpers-http-setup-browser'] --- import kbnCoreTestHelpersHttpSetupBrowserObj from './kbn_core_test_helpers_http_setup_browser.devdocs.json'; diff --git a/api_docs/kbn_core_theme_browser.mdx b/api_docs/kbn_core_theme_browser.mdx index e68a43d0ce9fe..9c59e5a04b8e4 100644 --- a/api_docs/kbn_core_theme_browser.mdx +++ b/api_docs/kbn_core_theme_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-theme-browser title: "@kbn/core-theme-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-theme-browser plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-theme-browser'] --- import kbnCoreThemeBrowserObj from './kbn_core_theme_browser.devdocs.json'; diff --git a/api_docs/kbn_core_theme_browser_internal.mdx b/api_docs/kbn_core_theme_browser_internal.mdx index 8c938db4082e1..02d479962f929 100644 --- a/api_docs/kbn_core_theme_browser_internal.mdx +++ b/api_docs/kbn_core_theme_browser_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-theme-browser-internal title: "@kbn/core-theme-browser-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-theme-browser-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-theme-browser-internal'] --- import kbnCoreThemeBrowserInternalObj from './kbn_core_theme_browser_internal.devdocs.json'; diff --git a/api_docs/kbn_core_theme_browser_mocks.mdx b/api_docs/kbn_core_theme_browser_mocks.mdx index 0cbb8955ac42e..71eada8e5603f 100644 --- a/api_docs/kbn_core_theme_browser_mocks.mdx +++ b/api_docs/kbn_core_theme_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-theme-browser-mocks title: "@kbn/core-theme-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-theme-browser-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-theme-browser-mocks'] --- import kbnCoreThemeBrowserMocksObj from './kbn_core_theme_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_ui_settings_browser.mdx b/api_docs/kbn_core_ui_settings_browser.mdx index 67a42c6099d97..b8b744e259c54 100644 --- a/api_docs/kbn_core_ui_settings_browser.mdx +++ b/api_docs/kbn_core_ui_settings_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-browser title: "@kbn/core-ui-settings-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-ui-settings-browser plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-browser'] --- import kbnCoreUiSettingsBrowserObj from './kbn_core_ui_settings_browser.devdocs.json'; diff --git a/api_docs/kbn_core_ui_settings_browser_internal.mdx b/api_docs/kbn_core_ui_settings_browser_internal.mdx index 791006e8cea6b..a89cdf92e9ac2 100644 --- a/api_docs/kbn_core_ui_settings_browser_internal.mdx +++ b/api_docs/kbn_core_ui_settings_browser_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-browser-internal title: "@kbn/core-ui-settings-browser-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-ui-settings-browser-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-browser-internal'] --- import kbnCoreUiSettingsBrowserInternalObj from './kbn_core_ui_settings_browser_internal.devdocs.json'; diff --git a/api_docs/kbn_core_ui_settings_browser_mocks.mdx b/api_docs/kbn_core_ui_settings_browser_mocks.mdx index b1ae46812b1d2..290774ac1f9eb 100644 --- a/api_docs/kbn_core_ui_settings_browser_mocks.mdx +++ b/api_docs/kbn_core_ui_settings_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-browser-mocks title: "@kbn/core-ui-settings-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-ui-settings-browser-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-browser-mocks'] --- import kbnCoreUiSettingsBrowserMocksObj from './kbn_core_ui_settings_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_ui_settings_common.mdx b/api_docs/kbn_core_ui_settings_common.mdx index ef778256b7997..004e652235478 100644 --- a/api_docs/kbn_core_ui_settings_common.mdx +++ b/api_docs/kbn_core_ui_settings_common.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-common title: "@kbn/core-ui-settings-common" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-ui-settings-common plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-common'] --- import kbnCoreUiSettingsCommonObj from './kbn_core_ui_settings_common.devdocs.json'; diff --git a/api_docs/kbn_core_ui_settings_server.mdx b/api_docs/kbn_core_ui_settings_server.mdx index 545b597ef2b8b..84190ae50348c 100644 --- a/api_docs/kbn_core_ui_settings_server.mdx +++ b/api_docs/kbn_core_ui_settings_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-server title: "@kbn/core-ui-settings-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-ui-settings-server plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-server'] --- import kbnCoreUiSettingsServerObj from './kbn_core_ui_settings_server.devdocs.json'; diff --git a/api_docs/kbn_core_ui_settings_server_internal.mdx b/api_docs/kbn_core_ui_settings_server_internal.mdx index 99402f8c657ce..2f362f1ede3ff 100644 --- a/api_docs/kbn_core_ui_settings_server_internal.mdx +++ b/api_docs/kbn_core_ui_settings_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-server-internal title: "@kbn/core-ui-settings-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-ui-settings-server-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-server-internal'] --- import kbnCoreUiSettingsServerInternalObj from './kbn_core_ui_settings_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_ui_settings_server_mocks.mdx b/api_docs/kbn_core_ui_settings_server_mocks.mdx index a5081a8a512eb..e214233f02eb7 100644 --- a/api_docs/kbn_core_ui_settings_server_mocks.mdx +++ b/api_docs/kbn_core_ui_settings_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-server-mocks title: "@kbn/core-ui-settings-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-ui-settings-server-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-server-mocks'] --- import kbnCoreUiSettingsServerMocksObj from './kbn_core_ui_settings_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_usage_data_server.mdx b/api_docs/kbn_core_usage_data_server.mdx index b490e18b99885..b8ac7249cb2af 100644 --- a/api_docs/kbn_core_usage_data_server.mdx +++ b/api_docs/kbn_core_usage_data_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-usage-data-server title: "@kbn/core-usage-data-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-usage-data-server plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-usage-data-server'] --- import kbnCoreUsageDataServerObj from './kbn_core_usage_data_server.devdocs.json'; diff --git a/api_docs/kbn_core_usage_data_server_internal.mdx b/api_docs/kbn_core_usage_data_server_internal.mdx index 01b13b900344a..4f5cca38779c3 100644 --- a/api_docs/kbn_core_usage_data_server_internal.mdx +++ b/api_docs/kbn_core_usage_data_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-usage-data-server-internal title: "@kbn/core-usage-data-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-usage-data-server-internal plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-usage-data-server-internal'] --- import kbnCoreUsageDataServerInternalObj from './kbn_core_usage_data_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_usage_data_server_mocks.mdx b/api_docs/kbn_core_usage_data_server_mocks.mdx index 90ea1b666c8aa..bc10003b1203b 100644 --- a/api_docs/kbn_core_usage_data_server_mocks.mdx +++ b/api_docs/kbn_core_usage_data_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-usage-data-server-mocks title: "@kbn/core-usage-data-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-usage-data-server-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-usage-data-server-mocks'] --- import kbnCoreUsageDataServerMocksObj from './kbn_core_usage_data_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_crypto.mdx b/api_docs/kbn_crypto.mdx index a9fb17b3cd06f..d95c8ad7295ed 100644 --- a/api_docs/kbn_crypto.mdx +++ b/api_docs/kbn_crypto.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-crypto title: "@kbn/crypto" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/crypto plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/crypto'] --- import kbnCryptoObj from './kbn_crypto.devdocs.json'; diff --git a/api_docs/kbn_crypto_browser.mdx b/api_docs/kbn_crypto_browser.mdx index 0afac1bca8d36..06ce6dd999351 100644 --- a/api_docs/kbn_crypto_browser.mdx +++ b/api_docs/kbn_crypto_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-crypto-browser title: "@kbn/crypto-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/crypto-browser plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/crypto-browser'] --- import kbnCryptoBrowserObj from './kbn_crypto_browser.devdocs.json'; diff --git a/api_docs/kbn_datemath.mdx b/api_docs/kbn_datemath.mdx index d2e4558115131..4bcac88980eb1 100644 --- a/api_docs/kbn_datemath.mdx +++ b/api_docs/kbn_datemath.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-datemath title: "@kbn/datemath" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/datemath plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/datemath'] --- import kbnDatemathObj from './kbn_datemath.devdocs.json'; diff --git a/api_docs/kbn_dev_cli_errors.mdx b/api_docs/kbn_dev_cli_errors.mdx index 42e02f9783509..42846a27d0d57 100644 --- a/api_docs/kbn_dev_cli_errors.mdx +++ b/api_docs/kbn_dev_cli_errors.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dev-cli-errors title: "@kbn/dev-cli-errors" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/dev-cli-errors plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/dev-cli-errors'] --- import kbnDevCliErrorsObj from './kbn_dev_cli_errors.devdocs.json'; diff --git a/api_docs/kbn_dev_cli_runner.mdx b/api_docs/kbn_dev_cli_runner.mdx index 5169411f49a2a..5db4302dd4cd2 100644 --- a/api_docs/kbn_dev_cli_runner.mdx +++ b/api_docs/kbn_dev_cli_runner.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dev-cli-runner title: "@kbn/dev-cli-runner" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/dev-cli-runner plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/dev-cli-runner'] --- import kbnDevCliRunnerObj from './kbn_dev_cli_runner.devdocs.json'; diff --git a/api_docs/kbn_dev_proc_runner.mdx b/api_docs/kbn_dev_proc_runner.mdx index 5872d911b8f47..968955efd32a8 100644 --- a/api_docs/kbn_dev_proc_runner.mdx +++ b/api_docs/kbn_dev_proc_runner.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dev-proc-runner title: "@kbn/dev-proc-runner" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/dev-proc-runner plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/dev-proc-runner'] --- import kbnDevProcRunnerObj from './kbn_dev_proc_runner.devdocs.json'; diff --git a/api_docs/kbn_dev_utils.mdx b/api_docs/kbn_dev_utils.mdx index 8f8299fb3972b..e047906625c28 100644 --- a/api_docs/kbn_dev_utils.mdx +++ b/api_docs/kbn_dev_utils.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dev-utils title: "@kbn/dev-utils" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/dev-utils plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/dev-utils'] --- import kbnDevUtilsObj from './kbn_dev_utils.devdocs.json'; diff --git a/api_docs/kbn_doc_links.mdx b/api_docs/kbn_doc_links.mdx index 93faea017a0fb..c7d4d0fe3d260 100644 --- a/api_docs/kbn_doc_links.mdx +++ b/api_docs/kbn_doc_links.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-doc-links title: "@kbn/doc-links" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/doc-links plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/doc-links'] --- import kbnDocLinksObj from './kbn_doc_links.devdocs.json'; diff --git a/api_docs/kbn_docs_utils.mdx b/api_docs/kbn_docs_utils.mdx index f29fe40eb21d1..30e9b543d9d8d 100644 --- a/api_docs/kbn_docs_utils.mdx +++ b/api_docs/kbn_docs_utils.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-docs-utils title: "@kbn/docs-utils" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/docs-utils plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/docs-utils'] --- import kbnDocsUtilsObj from './kbn_docs_utils.devdocs.json'; diff --git a/api_docs/kbn_ebt_tools.mdx b/api_docs/kbn_ebt_tools.mdx index 2d7b26292e0e8..8590060b07965 100644 --- a/api_docs/kbn_ebt_tools.mdx +++ b/api_docs/kbn_ebt_tools.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ebt-tools title: "@kbn/ebt-tools" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/ebt-tools plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ebt-tools'] --- import kbnEbtToolsObj from './kbn_ebt_tools.devdocs.json'; diff --git a/api_docs/kbn_es_archiver.mdx b/api_docs/kbn_es_archiver.mdx index da7db13bb38b1..1e69af86cfda4 100644 --- a/api_docs/kbn_es_archiver.mdx +++ b/api_docs/kbn_es_archiver.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es-archiver title: "@kbn/es-archiver" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/es-archiver plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/es-archiver'] --- import kbnEsArchiverObj from './kbn_es_archiver.devdocs.json'; diff --git a/api_docs/kbn_es_errors.mdx b/api_docs/kbn_es_errors.mdx index 3d7f8993dd9fb..695ed989dfe99 100644 --- a/api_docs/kbn_es_errors.mdx +++ b/api_docs/kbn_es_errors.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es-errors title: "@kbn/es-errors" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/es-errors plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/es-errors'] --- import kbnEsErrorsObj from './kbn_es_errors.devdocs.json'; diff --git a/api_docs/kbn_es_query.mdx b/api_docs/kbn_es_query.mdx index db9354454f22f..b329278d82729 100644 --- a/api_docs/kbn_es_query.mdx +++ b/api_docs/kbn_es_query.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es-query title: "@kbn/es-query" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/es-query plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/es-query'] --- import kbnEsQueryObj from './kbn_es_query.devdocs.json'; diff --git a/api_docs/kbn_es_types.mdx b/api_docs/kbn_es_types.mdx index 5bee2fdbf5f66..9a2cfbe08a28b 100644 --- a/api_docs/kbn_es_types.mdx +++ b/api_docs/kbn_es_types.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es-types title: "@kbn/es-types" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/es-types plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/es-types'] --- import kbnEsTypesObj from './kbn_es_types.devdocs.json'; diff --git a/api_docs/kbn_eslint_plugin_imports.mdx b/api_docs/kbn_eslint_plugin_imports.mdx index f6c2a308c267e..2e0b9742678dc 100644 --- a/api_docs/kbn_eslint_plugin_imports.mdx +++ b/api_docs/kbn_eslint_plugin_imports.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-eslint-plugin-imports title: "@kbn/eslint-plugin-imports" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/eslint-plugin-imports plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/eslint-plugin-imports'] --- import kbnEslintPluginImportsObj from './kbn_eslint_plugin_imports.devdocs.json'; diff --git a/api_docs/kbn_field_types.mdx b/api_docs/kbn_field_types.mdx index 52dcd1a4217e9..0373e71bbf94c 100644 --- a/api_docs/kbn_field_types.mdx +++ b/api_docs/kbn_field_types.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-field-types title: "@kbn/field-types" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/field-types plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/field-types'] --- import kbnFieldTypesObj from './kbn_field_types.devdocs.json'; diff --git a/api_docs/kbn_find_used_node_modules.mdx b/api_docs/kbn_find_used_node_modules.mdx index e8d91e141f195..f0a54f4a6740d 100644 --- a/api_docs/kbn_find_used_node_modules.mdx +++ b/api_docs/kbn_find_used_node_modules.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-find-used-node-modules title: "@kbn/find-used-node-modules" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/find-used-node-modules plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/find-used-node-modules'] --- import kbnFindUsedNodeModulesObj from './kbn_find_used_node_modules.devdocs.json'; diff --git a/api_docs/kbn_ftr_common_functional_services.mdx b/api_docs/kbn_ftr_common_functional_services.mdx index 93882b49ca42b..a2bfedd08171e 100644 --- a/api_docs/kbn_ftr_common_functional_services.mdx +++ b/api_docs/kbn_ftr_common_functional_services.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ftr-common-functional-services title: "@kbn/ftr-common-functional-services" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/ftr-common-functional-services plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ftr-common-functional-services'] --- import kbnFtrCommonFunctionalServicesObj from './kbn_ftr_common_functional_services.devdocs.json'; diff --git a/api_docs/kbn_generate.mdx b/api_docs/kbn_generate.mdx index 5955c7f01158f..2a9f62b4f3f36 100644 --- a/api_docs/kbn_generate.mdx +++ b/api_docs/kbn_generate.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-generate title: "@kbn/generate" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/generate plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/generate'] --- import kbnGenerateObj from './kbn_generate.devdocs.json'; diff --git a/api_docs/kbn_get_repo_files.mdx b/api_docs/kbn_get_repo_files.mdx index e50741bdb3a60..b1b28470de32e 100644 --- a/api_docs/kbn_get_repo_files.mdx +++ b/api_docs/kbn_get_repo_files.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-get-repo-files title: "@kbn/get-repo-files" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/get-repo-files plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/get-repo-files'] --- import kbnGetRepoFilesObj from './kbn_get_repo_files.devdocs.json'; diff --git a/api_docs/kbn_handlebars.mdx b/api_docs/kbn_handlebars.mdx index 24eedfb0387a4..b675d4d8f4da0 100644 --- a/api_docs/kbn_handlebars.mdx +++ b/api_docs/kbn_handlebars.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-handlebars title: "@kbn/handlebars" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/handlebars plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/handlebars'] --- import kbnHandlebarsObj from './kbn_handlebars.devdocs.json'; diff --git a/api_docs/kbn_hapi_mocks.mdx b/api_docs/kbn_hapi_mocks.mdx index 1d4fddcc02250..b7abe8b512959 100644 --- a/api_docs/kbn_hapi_mocks.mdx +++ b/api_docs/kbn_hapi_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-hapi-mocks title: "@kbn/hapi-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/hapi-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/hapi-mocks'] --- import kbnHapiMocksObj from './kbn_hapi_mocks.devdocs.json'; diff --git a/api_docs/kbn_home_sample_data_card.mdx b/api_docs/kbn_home_sample_data_card.mdx index 59d37e8a5d09f..e7a5d6fe0f7ec 100644 --- a/api_docs/kbn_home_sample_data_card.mdx +++ b/api_docs/kbn_home_sample_data_card.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-home-sample-data-card title: "@kbn/home-sample-data-card" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/home-sample-data-card plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/home-sample-data-card'] --- import kbnHomeSampleDataCardObj from './kbn_home_sample_data_card.devdocs.json'; diff --git a/api_docs/kbn_home_sample_data_tab.mdx b/api_docs/kbn_home_sample_data_tab.mdx index 5e218789e57f1..f716a25e4408f 100644 --- a/api_docs/kbn_home_sample_data_tab.mdx +++ b/api_docs/kbn_home_sample_data_tab.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-home-sample-data-tab title: "@kbn/home-sample-data-tab" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/home-sample-data-tab plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/home-sample-data-tab'] --- import kbnHomeSampleDataTabObj from './kbn_home_sample_data_tab.devdocs.json'; diff --git a/api_docs/kbn_i18n.mdx b/api_docs/kbn_i18n.mdx index 15647319a90f0..25ba31dee6a69 100644 --- a/api_docs/kbn_i18n.mdx +++ b/api_docs/kbn_i18n.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-i18n title: "@kbn/i18n" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/i18n plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/i18n'] --- import kbnI18nObj from './kbn_i18n.devdocs.json'; diff --git a/api_docs/kbn_import_resolver.mdx b/api_docs/kbn_import_resolver.mdx index 56039851af766..c36a372e85d74 100644 --- a/api_docs/kbn_import_resolver.mdx +++ b/api_docs/kbn_import_resolver.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-import-resolver title: "@kbn/import-resolver" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/import-resolver plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/import-resolver'] --- import kbnImportResolverObj from './kbn_import_resolver.devdocs.json'; diff --git a/api_docs/kbn_interpreter.mdx b/api_docs/kbn_interpreter.mdx index 807a82e9cbff7..6051ff9b96e16 100644 --- a/api_docs/kbn_interpreter.mdx +++ b/api_docs/kbn_interpreter.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-interpreter title: "@kbn/interpreter" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/interpreter plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/interpreter'] --- import kbnInterpreterObj from './kbn_interpreter.devdocs.json'; diff --git a/api_docs/kbn_io_ts_utils.mdx b/api_docs/kbn_io_ts_utils.mdx index dfb4aea12e2d7..0554879f31ad2 100644 --- a/api_docs/kbn_io_ts_utils.mdx +++ b/api_docs/kbn_io_ts_utils.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-io-ts-utils title: "@kbn/io-ts-utils" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/io-ts-utils plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/io-ts-utils'] --- import kbnIoTsUtilsObj from './kbn_io_ts_utils.devdocs.json'; diff --git a/api_docs/kbn_jest_serializers.mdx b/api_docs/kbn_jest_serializers.mdx index 28487fab71400..c005d1ea66f6e 100644 --- a/api_docs/kbn_jest_serializers.mdx +++ b/api_docs/kbn_jest_serializers.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-jest-serializers title: "@kbn/jest-serializers" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/jest-serializers plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/jest-serializers'] --- import kbnJestSerializersObj from './kbn_jest_serializers.devdocs.json'; diff --git a/api_docs/kbn_journeys.mdx b/api_docs/kbn_journeys.mdx index 01244be181bf2..b2cd34e94a506 100644 --- a/api_docs/kbn_journeys.mdx +++ b/api_docs/kbn_journeys.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-journeys title: "@kbn/journeys" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/journeys plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/journeys'] --- import kbnJourneysObj from './kbn_journeys.devdocs.json'; diff --git a/api_docs/kbn_kibana_manifest_schema.mdx b/api_docs/kbn_kibana_manifest_schema.mdx index 7d70916d448e4..1b91d601c2246 100644 --- a/api_docs/kbn_kibana_manifest_schema.mdx +++ b/api_docs/kbn_kibana_manifest_schema.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-kibana-manifest-schema title: "@kbn/kibana-manifest-schema" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/kibana-manifest-schema plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/kibana-manifest-schema'] --- import kbnKibanaManifestSchemaObj from './kbn_kibana_manifest_schema.devdocs.json'; diff --git a/api_docs/kbn_logging.mdx b/api_docs/kbn_logging.mdx index 63d9dc96362af..13444331d9fcc 100644 --- a/api_docs/kbn_logging.mdx +++ b/api_docs/kbn_logging.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-logging title: "@kbn/logging" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/logging plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/logging'] --- import kbnLoggingObj from './kbn_logging.devdocs.json'; diff --git a/api_docs/kbn_logging_mocks.mdx b/api_docs/kbn_logging_mocks.mdx index 6b1049cee9be2..d6db9caa5dd01 100644 --- a/api_docs/kbn_logging_mocks.mdx +++ b/api_docs/kbn_logging_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-logging-mocks title: "@kbn/logging-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/logging-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/logging-mocks'] --- import kbnLoggingMocksObj from './kbn_logging_mocks.devdocs.json'; diff --git a/api_docs/kbn_managed_vscode_config.mdx b/api_docs/kbn_managed_vscode_config.mdx index a175904d02573..12ab660fc1764 100644 --- a/api_docs/kbn_managed_vscode_config.mdx +++ b/api_docs/kbn_managed_vscode_config.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-managed-vscode-config title: "@kbn/managed-vscode-config" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/managed-vscode-config plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/managed-vscode-config'] --- import kbnManagedVscodeConfigObj from './kbn_managed_vscode_config.devdocs.json'; diff --git a/api_docs/kbn_mapbox_gl.mdx b/api_docs/kbn_mapbox_gl.mdx index ca5e2566d884c..a0fbd8c5ef3c9 100644 --- a/api_docs/kbn_mapbox_gl.mdx +++ b/api_docs/kbn_mapbox_gl.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-mapbox-gl title: "@kbn/mapbox-gl" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/mapbox-gl plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/mapbox-gl'] --- import kbnMapboxGlObj from './kbn_mapbox_gl.devdocs.json'; diff --git a/api_docs/kbn_ml_agg_utils.mdx b/api_docs/kbn_ml_agg_utils.mdx index 78c0d9fbb8369..6808dca6dbe35 100644 --- a/api_docs/kbn_ml_agg_utils.mdx +++ b/api_docs/kbn_ml_agg_utils.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-agg-utils title: "@kbn/ml-agg-utils" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/ml-agg-utils plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-agg-utils'] --- import kbnMlAggUtilsObj from './kbn_ml_agg_utils.devdocs.json'; diff --git a/api_docs/kbn_ml_is_populated_object.mdx b/api_docs/kbn_ml_is_populated_object.mdx index ffdc48a0fb0d3..8da4778d8b81f 100644 --- a/api_docs/kbn_ml_is_populated_object.mdx +++ b/api_docs/kbn_ml_is_populated_object.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-is-populated-object title: "@kbn/ml-is-populated-object" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/ml-is-populated-object plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-is-populated-object'] --- import kbnMlIsPopulatedObjectObj from './kbn_ml_is_populated_object.devdocs.json'; diff --git a/api_docs/kbn_ml_string_hash.mdx b/api_docs/kbn_ml_string_hash.mdx index a1f168d3fc91d..e9cf6c1838c51 100644 --- a/api_docs/kbn_ml_string_hash.mdx +++ b/api_docs/kbn_ml_string_hash.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-string-hash title: "@kbn/ml-string-hash" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/ml-string-hash plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-string-hash'] --- import kbnMlStringHashObj from './kbn_ml_string_hash.devdocs.json'; diff --git a/api_docs/kbn_monaco.mdx b/api_docs/kbn_monaco.mdx index 7da86649ddf39..4ec4c4ef7c9eb 100644 --- a/api_docs/kbn_monaco.mdx +++ b/api_docs/kbn_monaco.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-monaco title: "@kbn/monaco" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/monaco plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/monaco'] --- import kbnMonacoObj from './kbn_monaco.devdocs.json'; diff --git a/api_docs/kbn_optimizer.mdx b/api_docs/kbn_optimizer.mdx index 29b3596a8bc29..757c4018832a9 100644 --- a/api_docs/kbn_optimizer.mdx +++ b/api_docs/kbn_optimizer.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-optimizer title: "@kbn/optimizer" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/optimizer plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/optimizer'] --- import kbnOptimizerObj from './kbn_optimizer.devdocs.json'; diff --git a/api_docs/kbn_optimizer_webpack_helpers.mdx b/api_docs/kbn_optimizer_webpack_helpers.mdx index fb729fc0747ed..11961ef3d602b 100644 --- a/api_docs/kbn_optimizer_webpack_helpers.mdx +++ b/api_docs/kbn_optimizer_webpack_helpers.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-optimizer-webpack-helpers title: "@kbn/optimizer-webpack-helpers" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/optimizer-webpack-helpers plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/optimizer-webpack-helpers'] --- import kbnOptimizerWebpackHelpersObj from './kbn_optimizer_webpack_helpers.devdocs.json'; diff --git a/api_docs/kbn_osquery_io_ts_types.mdx b/api_docs/kbn_osquery_io_ts_types.mdx index 54d57200bd5a1..a980b80bd7a38 100644 --- a/api_docs/kbn_osquery_io_ts_types.mdx +++ b/api_docs/kbn_osquery_io_ts_types.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-osquery-io-ts-types title: "@kbn/osquery-io-ts-types" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/osquery-io-ts-types plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/osquery-io-ts-types'] --- import kbnOsqueryIoTsTypesObj from './kbn_osquery_io_ts_types.devdocs.json'; diff --git a/api_docs/kbn_performance_testing_dataset_extractor.mdx b/api_docs/kbn_performance_testing_dataset_extractor.mdx index ba91201a52c6c..b1051ed927c86 100644 --- a/api_docs/kbn_performance_testing_dataset_extractor.mdx +++ b/api_docs/kbn_performance_testing_dataset_extractor.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-performance-testing-dataset-extractor title: "@kbn/performance-testing-dataset-extractor" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/performance-testing-dataset-extractor plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/performance-testing-dataset-extractor'] --- import kbnPerformanceTestingDatasetExtractorObj from './kbn_performance_testing_dataset_extractor.devdocs.json'; diff --git a/api_docs/kbn_plugin_generator.mdx b/api_docs/kbn_plugin_generator.mdx index 493ca235ab7a9..98d5196dc24f1 100644 --- a/api_docs/kbn_plugin_generator.mdx +++ b/api_docs/kbn_plugin_generator.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-plugin-generator title: "@kbn/plugin-generator" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/plugin-generator plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/plugin-generator'] --- import kbnPluginGeneratorObj from './kbn_plugin_generator.devdocs.json'; diff --git a/api_docs/kbn_plugin_helpers.mdx b/api_docs/kbn_plugin_helpers.mdx index b16b234ee0f50..a04f5630c37b4 100644 --- a/api_docs/kbn_plugin_helpers.mdx +++ b/api_docs/kbn_plugin_helpers.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-plugin-helpers title: "@kbn/plugin-helpers" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/plugin-helpers plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/plugin-helpers'] --- import kbnPluginHelpersObj from './kbn_plugin_helpers.devdocs.json'; diff --git a/api_docs/kbn_react_field.mdx b/api_docs/kbn_react_field.mdx index f7d3bada225b9..af33c58333e71 100644 --- a/api_docs/kbn_react_field.mdx +++ b/api_docs/kbn_react_field.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-react-field title: "@kbn/react-field" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/react-field plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/react-field'] --- import kbnReactFieldObj from './kbn_react_field.devdocs.json'; diff --git a/api_docs/kbn_repo_source_classifier.mdx b/api_docs/kbn_repo_source_classifier.mdx index 65a1a0d424f15..2a373248eac93 100644 --- a/api_docs/kbn_repo_source_classifier.mdx +++ b/api_docs/kbn_repo_source_classifier.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-repo-source-classifier title: "@kbn/repo-source-classifier" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/repo-source-classifier plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/repo-source-classifier'] --- import kbnRepoSourceClassifierObj from './kbn_repo_source_classifier.devdocs.json'; diff --git a/api_docs/kbn_rule_data_utils.mdx b/api_docs/kbn_rule_data_utils.mdx index ef453ad073e4f..61d440950cbf3 100644 --- a/api_docs/kbn_rule_data_utils.mdx +++ b/api_docs/kbn_rule_data_utils.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-rule-data-utils title: "@kbn/rule-data-utils" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/rule-data-utils plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/rule-data-utils'] --- import kbnRuleDataUtilsObj from './kbn_rule_data_utils.devdocs.json'; diff --git a/api_docs/kbn_securitysolution_autocomplete.mdx b/api_docs/kbn_securitysolution_autocomplete.mdx index f441cc10aa506..4ca4605d2eb99 100644 --- a/api_docs/kbn_securitysolution_autocomplete.mdx +++ b/api_docs/kbn_securitysolution_autocomplete.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-autocomplete title: "@kbn/securitysolution-autocomplete" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/securitysolution-autocomplete plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-autocomplete'] --- import kbnSecuritysolutionAutocompleteObj from './kbn_securitysolution_autocomplete.devdocs.json'; diff --git a/api_docs/kbn_securitysolution_es_utils.mdx b/api_docs/kbn_securitysolution_es_utils.mdx index c81350b38632b..99858a653681a 100644 --- a/api_docs/kbn_securitysolution_es_utils.mdx +++ b/api_docs/kbn_securitysolution_es_utils.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-es-utils title: "@kbn/securitysolution-es-utils" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/securitysolution-es-utils plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-es-utils'] --- import kbnSecuritysolutionEsUtilsObj from './kbn_securitysolution_es_utils.devdocs.json'; diff --git a/api_docs/kbn_securitysolution_hook_utils.mdx b/api_docs/kbn_securitysolution_hook_utils.mdx index 8e6bdc15f9807..c74046c4b1fa8 100644 --- a/api_docs/kbn_securitysolution_hook_utils.mdx +++ b/api_docs/kbn_securitysolution_hook_utils.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-hook-utils title: "@kbn/securitysolution-hook-utils" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/securitysolution-hook-utils plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-hook-utils'] --- import kbnSecuritysolutionHookUtilsObj from './kbn_securitysolution_hook_utils.devdocs.json'; diff --git a/api_docs/kbn_securitysolution_io_ts_alerting_types.devdocs.json b/api_docs/kbn_securitysolution_io_ts_alerting_types.devdocs.json index b42cebbc4fb84..f9869d88c91cd 100644 --- a/api_docs/kbn_securitysolution_io_ts_alerting_types.devdocs.json +++ b/api_docs/kbn_securitysolution_io_ts_alerting_types.devdocs.json @@ -877,21 +877,6 @@ "trackAdoption": false, "initialIsOpen": false }, - { - "parentPluginId": "@kbn/securitysolution-io-ts-alerting-types", - "id": "def-common.ThrottleOrUndefinedOrNull", - "type": "Type", - "tags": [], - "label": "ThrottleOrUndefinedOrNull", - "description": [], - "signature": [ - "string | null | undefined" - ], - "path": "packages/kbn-securitysolution-io-ts-alerting-types/src/throttle/index.ts", - "deprecated": false, - "trackAdoption": false, - "initialIsOpen": false - }, { "parentPluginId": "@kbn/securitysolution-io-ts-alerting-types", "id": "def-common.Type", @@ -1383,24 +1368,6 @@ "trackAdoption": false, "initialIsOpen": false }, - { - "parentPluginId": "@kbn/securitysolution-io-ts-alerting-types", - "id": "def-common.DefaultThrottleNull", - "type": "Object", - "tags": [], - "label": "DefaultThrottleNull", - "description": [ - "\nTypes the DefaultThrottleNull as:\n - If null or undefined, then a null will be set" - ], - "signature": [ - "Type", - "" - ], - "path": "packages/kbn-securitysolution-io-ts-alerting-types/src/default_throttle_null/index.ts", - "deprecated": false, - "trackAdoption": false, - "initialIsOpen": false - }, { "parentPluginId": "@kbn/securitysolution-io-ts-alerting-types", "id": "def-common.DefaultToString", @@ -2921,7 +2888,14 @@ "label": "throttle", "description": [], "signature": [ - "StringC" + "UnionC", + "<[", + "LiteralC", + "<\"no_actions\">, ", + "LiteralC", + "<\"rule\">, ", + "Type", + "]>" ], "path": "packages/kbn-securitysolution-io-ts-alerting-types/src/throttle/index.ts", "deprecated": false, @@ -2938,31 +2912,15 @@ "signature": [ "UnionC", "<[", - "StringC", - ", ", - "NullC", - "]>" - ], - "path": "packages/kbn-securitysolution-io-ts-alerting-types/src/throttle/index.ts", - "deprecated": false, - "trackAdoption": false, - "initialIsOpen": false - }, - { - "parentPluginId": "@kbn/securitysolution-io-ts-alerting-types", - "id": "def-common.throttleOrNullOrUndefined", - "type": "Object", - "tags": [], - "label": "throttleOrNullOrUndefined", - "description": [], - "signature": [ "UnionC", "<[", - "StringC", - ", ", + "LiteralC", + "<\"no_actions\">, ", + "LiteralC", + "<\"rule\">, ", + "Type", + "]>, ", "NullC", - ", ", - "UndefinedC", "]>" ], "path": "packages/kbn-securitysolution-io-ts-alerting-types/src/throttle/index.ts", diff --git a/api_docs/kbn_securitysolution_io_ts_alerting_types.mdx b/api_docs/kbn_securitysolution_io_ts_alerting_types.mdx index 4066f50c33520..5f200ca33cd52 100644 --- a/api_docs/kbn_securitysolution_io_ts_alerting_types.mdx +++ b/api_docs/kbn_securitysolution_io_ts_alerting_types.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-io-ts-alerting-types title: "@kbn/securitysolution-io-ts-alerting-types" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/securitysolution-io-ts-alerting-types plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-io-ts-alerting-types'] --- import kbnSecuritysolutionIoTsAlertingTypesObj from './kbn_securitysolution_io_ts_alerting_types.devdocs.json'; @@ -21,7 +21,7 @@ Contact [Owner missing] for questions regarding this plugin. | Public API count | Any count | Items lacking comments | Missing exports | |-------------------|-----------|------------------------|-----------------| -| 148 | 0 | 129 | 0 | +| 145 | 0 | 127 | 0 | ## Common diff --git a/api_docs/kbn_securitysolution_io_ts_list_types.mdx b/api_docs/kbn_securitysolution_io_ts_list_types.mdx index 720ede9fa9e87..75beb67b94d03 100644 --- a/api_docs/kbn_securitysolution_io_ts_list_types.mdx +++ b/api_docs/kbn_securitysolution_io_ts_list_types.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-io-ts-list-types title: "@kbn/securitysolution-io-ts-list-types" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/securitysolution-io-ts-list-types plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-io-ts-list-types'] --- import kbnSecuritysolutionIoTsListTypesObj from './kbn_securitysolution_io_ts_list_types.devdocs.json'; diff --git a/api_docs/kbn_securitysolution_io_ts_types.devdocs.json b/api_docs/kbn_securitysolution_io_ts_types.devdocs.json index 2ec94e9e8c1c0..ef934492d28ef 100644 --- a/api_docs/kbn_securitysolution_io_ts_types.devdocs.json +++ b/api_docs/kbn_securitysolution_io_ts_types.devdocs.json @@ -405,6 +405,41 @@ ], "returnComment": [], "initialIsOpen": false + }, + { + "parentPluginId": "@kbn/securitysolution-io-ts-types", + "id": "def-common.TimeDuration", + "type": "Function", + "tags": [], + "label": "TimeDuration", + "description": [], + "signature": [ + "({ allowedUnits, allowedDurations }: TimeDurationType) => ", + "Type", + "" + ], + "path": "packages/kbn-securitysolution-io-ts-types/src/time_duration/index.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "@kbn/securitysolution-io-ts-types", + "id": "def-common.TimeDuration.$1", + "type": "CompoundType", + "tags": [], + "label": "{ allowedUnits, allowedDurations }", + "description": [], + "signature": [ + "TimeDurationType" + ], + "path": "packages/kbn-securitysolution-io-ts-types/src/time_duration/index.ts", + "deprecated": false, + "trackAdoption": false, + "isRequired": true + } + ], + "returnComment": [], + "initialIsOpen": false } ], "interfaces": [], @@ -644,12 +679,30 @@ "label": "TimeDurationC", "description": [], "signature": [ + "({ allowedUnits, allowedDurations }: TimeDurationType) => ", "Type", "" ], "path": "packages/kbn-securitysolution-io-ts-types/src/time_duration/index.ts", "deprecated": false, "trackAdoption": false, + "returnComment": [], + "children": [ + { + "parentPluginId": "@kbn/securitysolution-io-ts-types", + "id": "def-common.TimeDurationC.$1", + "type": "CompoundType", + "tags": [], + "label": "__0", + "description": [], + "signature": [ + "TimeDurationWithAllowedDurations | TimeDurationWithAllowedUnits" + ], + "path": "packages/kbn-securitysolution-io-ts-types/src/time_duration/index.ts", + "deprecated": false, + "trackAdoption": false + } + ], "initialIsOpen": false }, { @@ -1042,24 +1095,6 @@ "trackAdoption": false, "initialIsOpen": false }, - { - "parentPluginId": "@kbn/securitysolution-io-ts-types", - "id": "def-common.TimeDuration", - "type": "Object", - "tags": [], - "label": "TimeDuration", - "description": [ - "\nTypes the TimeDuration as:\n - A string that is not empty, and composed of a positive integer greater than 0 followed by a unit of time\n - in the format {safe_integer}{timeUnit}, e.g. \"30s\", \"1m\", \"2h\"" - ], - "signature": [ - "Type", - "" - ], - "path": "packages/kbn-securitysolution-io-ts-types/src/time_duration/index.ts", - "deprecated": false, - "trackAdoption": false, - "initialIsOpen": false - }, { "parentPluginId": "@kbn/securitysolution-io-ts-types", "id": "def-common.UUID", diff --git a/api_docs/kbn_securitysolution_io_ts_types.mdx b/api_docs/kbn_securitysolution_io_ts_types.mdx index f2220252df9f4..2525d36a83930 100644 --- a/api_docs/kbn_securitysolution_io_ts_types.mdx +++ b/api_docs/kbn_securitysolution_io_ts_types.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-io-ts-types title: "@kbn/securitysolution-io-ts-types" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/securitysolution-io-ts-types plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-io-ts-types'] --- import kbnSecuritysolutionIoTsTypesObj from './kbn_securitysolution_io_ts_types.devdocs.json'; @@ -21,7 +21,7 @@ Contact [Owner missing] for questions regarding this plugin. | Public API count | Any count | Items lacking comments | Missing exports | |-------------------|-----------|------------------------|-----------------| -| 63 | 0 | 33 | 0 | +| 65 | 0 | 36 | 0 | ## Common diff --git a/api_docs/kbn_securitysolution_io_ts_utils.mdx b/api_docs/kbn_securitysolution_io_ts_utils.mdx index 4ddd805beceec..1729eb1e31923 100644 --- a/api_docs/kbn_securitysolution_io_ts_utils.mdx +++ b/api_docs/kbn_securitysolution_io_ts_utils.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-io-ts-utils title: "@kbn/securitysolution-io-ts-utils" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/securitysolution-io-ts-utils plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-io-ts-utils'] --- import kbnSecuritysolutionIoTsUtilsObj from './kbn_securitysolution_io_ts_utils.devdocs.json'; diff --git a/api_docs/kbn_securitysolution_list_api.mdx b/api_docs/kbn_securitysolution_list_api.mdx index 837b102f35b7c..e7ea35711a930 100644 --- a/api_docs/kbn_securitysolution_list_api.mdx +++ b/api_docs/kbn_securitysolution_list_api.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-list-api title: "@kbn/securitysolution-list-api" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/securitysolution-list-api plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-list-api'] --- import kbnSecuritysolutionListApiObj from './kbn_securitysolution_list_api.devdocs.json'; diff --git a/api_docs/kbn_securitysolution_list_constants.mdx b/api_docs/kbn_securitysolution_list_constants.mdx index 5e117e7fdd5ff..061d996305ac9 100644 --- a/api_docs/kbn_securitysolution_list_constants.mdx +++ b/api_docs/kbn_securitysolution_list_constants.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-list-constants title: "@kbn/securitysolution-list-constants" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/securitysolution-list-constants plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-list-constants'] --- import kbnSecuritysolutionListConstantsObj from './kbn_securitysolution_list_constants.devdocs.json'; diff --git a/api_docs/kbn_securitysolution_list_hooks.mdx b/api_docs/kbn_securitysolution_list_hooks.mdx index a0d87f4a94bbb..19a2ed45a48ba 100644 --- a/api_docs/kbn_securitysolution_list_hooks.mdx +++ b/api_docs/kbn_securitysolution_list_hooks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-list-hooks title: "@kbn/securitysolution-list-hooks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/securitysolution-list-hooks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-list-hooks'] --- import kbnSecuritysolutionListHooksObj from './kbn_securitysolution_list_hooks.devdocs.json'; diff --git a/api_docs/kbn_securitysolution_list_utils.mdx b/api_docs/kbn_securitysolution_list_utils.mdx index a42cbdfe87318..247718cc1d2a7 100644 --- a/api_docs/kbn_securitysolution_list_utils.mdx +++ b/api_docs/kbn_securitysolution_list_utils.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-list-utils title: "@kbn/securitysolution-list-utils" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/securitysolution-list-utils plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-list-utils'] --- import kbnSecuritysolutionListUtilsObj from './kbn_securitysolution_list_utils.devdocs.json'; diff --git a/api_docs/kbn_securitysolution_rules.mdx b/api_docs/kbn_securitysolution_rules.mdx index c978507107c7d..53f33ec3d564b 100644 --- a/api_docs/kbn_securitysolution_rules.mdx +++ b/api_docs/kbn_securitysolution_rules.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-rules title: "@kbn/securitysolution-rules" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/securitysolution-rules plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-rules'] --- import kbnSecuritysolutionRulesObj from './kbn_securitysolution_rules.devdocs.json'; diff --git a/api_docs/kbn_securitysolution_t_grid.mdx b/api_docs/kbn_securitysolution_t_grid.mdx index d7cd694497c7f..0be9d3e0886f9 100644 --- a/api_docs/kbn_securitysolution_t_grid.mdx +++ b/api_docs/kbn_securitysolution_t_grid.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-t-grid title: "@kbn/securitysolution-t-grid" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/securitysolution-t-grid plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-t-grid'] --- import kbnSecuritysolutionTGridObj from './kbn_securitysolution_t_grid.devdocs.json'; diff --git a/api_docs/kbn_securitysolution_utils.mdx b/api_docs/kbn_securitysolution_utils.mdx index c6c4f053e9525..b3d353cc6987e 100644 --- a/api_docs/kbn_securitysolution_utils.mdx +++ b/api_docs/kbn_securitysolution_utils.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-utils title: "@kbn/securitysolution-utils" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/securitysolution-utils plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-utils'] --- import kbnSecuritysolutionUtilsObj from './kbn_securitysolution_utils.devdocs.json'; diff --git a/api_docs/kbn_server_http_tools.mdx b/api_docs/kbn_server_http_tools.mdx index fc18c7757d1d9..aefc65e7066a3 100644 --- a/api_docs/kbn_server_http_tools.mdx +++ b/api_docs/kbn_server_http_tools.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-server-http-tools title: "@kbn/server-http-tools" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/server-http-tools plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/server-http-tools'] --- import kbnServerHttpToolsObj from './kbn_server_http_tools.devdocs.json'; diff --git a/api_docs/kbn_server_route_repository.mdx b/api_docs/kbn_server_route_repository.mdx index 2c9d51b468868..25cf89691a720 100644 --- a/api_docs/kbn_server_route_repository.mdx +++ b/api_docs/kbn_server_route_repository.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-server-route-repository title: "@kbn/server-route-repository" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/server-route-repository plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/server-route-repository'] --- import kbnServerRouteRepositoryObj from './kbn_server_route_repository.devdocs.json'; diff --git a/api_docs/kbn_shared_svg.mdx b/api_docs/kbn_shared_svg.mdx index 1a40ade046a8a..aaf7c6592481a 100644 --- a/api_docs/kbn_shared_svg.mdx +++ b/api_docs/kbn_shared_svg.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-svg title: "@kbn/shared-svg" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-svg plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-svg'] --- import kbnSharedSvgObj from './kbn_shared_svg.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_avatar_user_profile_components.mdx b/api_docs/kbn_shared_ux_avatar_user_profile_components.mdx index 6d9064ab9d9ac..b12d28f86530e 100644 --- a/api_docs/kbn_shared_ux_avatar_user_profile_components.mdx +++ b/api_docs/kbn_shared_ux_avatar_user_profile_components.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-avatar-user-profile-components title: "@kbn/shared-ux-avatar-user-profile-components" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-avatar-user-profile-components plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-avatar-user-profile-components'] --- import kbnSharedUxAvatarUserProfileComponentsObj from './kbn_shared_ux_avatar_user_profile_components.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_button_exit_full_screen_mocks.mdx b/api_docs/kbn_shared_ux_button_exit_full_screen_mocks.mdx index e28b92febd738..4fafd24671035 100644 --- a/api_docs/kbn_shared_ux_button_exit_full_screen_mocks.mdx +++ b/api_docs/kbn_shared_ux_button_exit_full_screen_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-button-exit-full-screen-mocks title: "@kbn/shared-ux-button-exit-full-screen-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-button-exit-full-screen-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-button-exit-full-screen-mocks'] --- import kbnSharedUxButtonExitFullScreenMocksObj from './kbn_shared_ux_button_exit_full_screen_mocks.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_button_toolbar.mdx b/api_docs/kbn_shared_ux_button_toolbar.mdx index 3515b5ee35bf4..401b8763ce31c 100644 --- a/api_docs/kbn_shared_ux_button_toolbar.mdx +++ b/api_docs/kbn_shared_ux_button_toolbar.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-button-toolbar title: "@kbn/shared-ux-button-toolbar" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-button-toolbar plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-button-toolbar'] --- import kbnSharedUxButtonToolbarObj from './kbn_shared_ux_button_toolbar.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_card_no_data.mdx b/api_docs/kbn_shared_ux_card_no_data.mdx index ba2f64392e72c..25b21295a4ebd 100644 --- a/api_docs/kbn_shared_ux_card_no_data.mdx +++ b/api_docs/kbn_shared_ux_card_no_data.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-card-no-data title: "@kbn/shared-ux-card-no-data" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-card-no-data plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-card-no-data'] --- import kbnSharedUxCardNoDataObj from './kbn_shared_ux_card_no_data.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_card_no_data_mocks.mdx b/api_docs/kbn_shared_ux_card_no_data_mocks.mdx index 6942dcbd38fca..5867910e33d25 100644 --- a/api_docs/kbn_shared_ux_card_no_data_mocks.mdx +++ b/api_docs/kbn_shared_ux_card_no_data_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-card-no-data-mocks title: "@kbn/shared-ux-card-no-data-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-card-no-data-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-card-no-data-mocks'] --- import kbnSharedUxCardNoDataMocksObj from './kbn_shared_ux_card_no_data_mocks.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_link_redirect_app_mocks.mdx b/api_docs/kbn_shared_ux_link_redirect_app_mocks.mdx index 69a6794fbccd5..757324760d8eb 100644 --- a/api_docs/kbn_shared_ux_link_redirect_app_mocks.mdx +++ b/api_docs/kbn_shared_ux_link_redirect_app_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-link-redirect-app-mocks title: "@kbn/shared-ux-link-redirect-app-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-link-redirect-app-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-link-redirect-app-mocks'] --- import kbnSharedUxLinkRedirectAppMocksObj from './kbn_shared_ux_link_redirect_app_mocks.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_page_analytics_no_data.mdx b/api_docs/kbn_shared_ux_page_analytics_no_data.mdx index a8465df7126e6..19d3fcf3f0acc 100644 --- a/api_docs/kbn_shared_ux_page_analytics_no_data.mdx +++ b/api_docs/kbn_shared_ux_page_analytics_no_data.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-analytics-no-data title: "@kbn/shared-ux-page-analytics-no-data" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-page-analytics-no-data plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-analytics-no-data'] --- import kbnSharedUxPageAnalyticsNoDataObj from './kbn_shared_ux_page_analytics_no_data.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_page_analytics_no_data_mocks.mdx b/api_docs/kbn_shared_ux_page_analytics_no_data_mocks.mdx index 9e930a85deb81..f75c2846a0475 100644 --- a/api_docs/kbn_shared_ux_page_analytics_no_data_mocks.mdx +++ b/api_docs/kbn_shared_ux_page_analytics_no_data_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-analytics-no-data-mocks title: "@kbn/shared-ux-page-analytics-no-data-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-page-analytics-no-data-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-analytics-no-data-mocks'] --- import kbnSharedUxPageAnalyticsNoDataMocksObj from './kbn_shared_ux_page_analytics_no_data_mocks.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_page_kibana_no_data.mdx b/api_docs/kbn_shared_ux_page_kibana_no_data.mdx index d96c9079cf5fd..89d4d761d558c 100644 --- a/api_docs/kbn_shared_ux_page_kibana_no_data.mdx +++ b/api_docs/kbn_shared_ux_page_kibana_no_data.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-kibana-no-data title: "@kbn/shared-ux-page-kibana-no-data" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-page-kibana-no-data plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-kibana-no-data'] --- import kbnSharedUxPageKibanaNoDataObj from './kbn_shared_ux_page_kibana_no_data.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_page_kibana_no_data_mocks.mdx b/api_docs/kbn_shared_ux_page_kibana_no_data_mocks.mdx index 86595fb7cfb1f..2056f2314bce9 100644 --- a/api_docs/kbn_shared_ux_page_kibana_no_data_mocks.mdx +++ b/api_docs/kbn_shared_ux_page_kibana_no_data_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-kibana-no-data-mocks title: "@kbn/shared-ux-page-kibana-no-data-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-page-kibana-no-data-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-kibana-no-data-mocks'] --- import kbnSharedUxPageKibanaNoDataMocksObj from './kbn_shared_ux_page_kibana_no_data_mocks.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_page_kibana_template.mdx b/api_docs/kbn_shared_ux_page_kibana_template.mdx index 9132796651764..495d91eac2545 100644 --- a/api_docs/kbn_shared_ux_page_kibana_template.mdx +++ b/api_docs/kbn_shared_ux_page_kibana_template.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-kibana-template title: "@kbn/shared-ux-page-kibana-template" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-page-kibana-template plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-kibana-template'] --- import kbnSharedUxPageKibanaTemplateObj from './kbn_shared_ux_page_kibana_template.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_page_kibana_template_mocks.mdx b/api_docs/kbn_shared_ux_page_kibana_template_mocks.mdx index e5b6a7845bbeb..7767a12066d24 100644 --- a/api_docs/kbn_shared_ux_page_kibana_template_mocks.mdx +++ b/api_docs/kbn_shared_ux_page_kibana_template_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-kibana-template-mocks title: "@kbn/shared-ux-page-kibana-template-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-page-kibana-template-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-kibana-template-mocks'] --- import kbnSharedUxPageKibanaTemplateMocksObj from './kbn_shared_ux_page_kibana_template_mocks.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_page_no_data.mdx b/api_docs/kbn_shared_ux_page_no_data.mdx index 09f6ed5cf1fa0..e0d65073b737e 100644 --- a/api_docs/kbn_shared_ux_page_no_data.mdx +++ b/api_docs/kbn_shared_ux_page_no_data.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-no-data title: "@kbn/shared-ux-page-no-data" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-page-no-data plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-no-data'] --- import kbnSharedUxPageNoDataObj from './kbn_shared_ux_page_no_data.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_page_no_data_config.mdx b/api_docs/kbn_shared_ux_page_no_data_config.mdx index ef0e7d2b60bf3..8c798dd34a9a4 100644 --- a/api_docs/kbn_shared_ux_page_no_data_config.mdx +++ b/api_docs/kbn_shared_ux_page_no_data_config.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-no-data-config title: "@kbn/shared-ux-page-no-data-config" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-page-no-data-config plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-no-data-config'] --- import kbnSharedUxPageNoDataConfigObj from './kbn_shared_ux_page_no_data_config.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_page_no_data_config_mocks.mdx b/api_docs/kbn_shared_ux_page_no_data_config_mocks.mdx index 43ef0de76bb28..243de44838e10 100644 --- a/api_docs/kbn_shared_ux_page_no_data_config_mocks.mdx +++ b/api_docs/kbn_shared_ux_page_no_data_config_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-no-data-config-mocks title: "@kbn/shared-ux-page-no-data-config-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-page-no-data-config-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-no-data-config-mocks'] --- import kbnSharedUxPageNoDataConfigMocksObj from './kbn_shared_ux_page_no_data_config_mocks.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_page_no_data_mocks.mdx b/api_docs/kbn_shared_ux_page_no_data_mocks.mdx index eecbe82f148c7..38664c4b62fdf 100644 --- a/api_docs/kbn_shared_ux_page_no_data_mocks.mdx +++ b/api_docs/kbn_shared_ux_page_no_data_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-no-data-mocks title: "@kbn/shared-ux-page-no-data-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-page-no-data-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-no-data-mocks'] --- import kbnSharedUxPageNoDataMocksObj from './kbn_shared_ux_page_no_data_mocks.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_page_solution_nav.mdx b/api_docs/kbn_shared_ux_page_solution_nav.mdx index 001790b9086e2..3f237d268f073 100644 --- a/api_docs/kbn_shared_ux_page_solution_nav.mdx +++ b/api_docs/kbn_shared_ux_page_solution_nav.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-solution-nav title: "@kbn/shared-ux-page-solution-nav" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-page-solution-nav plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-solution-nav'] --- import kbnSharedUxPageSolutionNavObj from './kbn_shared_ux_page_solution_nav.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_prompt_no_data_views.mdx b/api_docs/kbn_shared_ux_prompt_no_data_views.mdx index 42efbc3a489cc..3ff43ae1b6263 100644 --- a/api_docs/kbn_shared_ux_prompt_no_data_views.mdx +++ b/api_docs/kbn_shared_ux_prompt_no_data_views.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-prompt-no-data-views title: "@kbn/shared-ux-prompt-no-data-views" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-prompt-no-data-views plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-prompt-no-data-views'] --- import kbnSharedUxPromptNoDataViewsObj from './kbn_shared_ux_prompt_no_data_views.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_prompt_no_data_views_mocks.mdx b/api_docs/kbn_shared_ux_prompt_no_data_views_mocks.mdx index 71404d9e00a6f..48e497a99004b 100644 --- a/api_docs/kbn_shared_ux_prompt_no_data_views_mocks.mdx +++ b/api_docs/kbn_shared_ux_prompt_no_data_views_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-prompt-no-data-views-mocks title: "@kbn/shared-ux-prompt-no-data-views-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-prompt-no-data-views-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-prompt-no-data-views-mocks'] --- import kbnSharedUxPromptNoDataViewsMocksObj from './kbn_shared_ux_prompt_no_data_views_mocks.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_router.mdx b/api_docs/kbn_shared_ux_router.mdx index a24b3d7d985a9..15f626088ad23 100644 --- a/api_docs/kbn_shared_ux_router.mdx +++ b/api_docs/kbn_shared_ux_router.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-router title: "@kbn/shared-ux-router" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-router plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-router'] --- import kbnSharedUxRouterObj from './kbn_shared_ux_router.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_router_mocks.mdx b/api_docs/kbn_shared_ux_router_mocks.mdx index b833764dfacbc..2e0d73cc43623 100644 --- a/api_docs/kbn_shared_ux_router_mocks.mdx +++ b/api_docs/kbn_shared_ux_router_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-router-mocks title: "@kbn/shared-ux-router-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-router-mocks plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-router-mocks'] --- import kbnSharedUxRouterMocksObj from './kbn_shared_ux_router_mocks.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_storybook_config.mdx b/api_docs/kbn_shared_ux_storybook_config.mdx index bf5525e9d8ea8..e9accf72f5a02 100644 --- a/api_docs/kbn_shared_ux_storybook_config.mdx +++ b/api_docs/kbn_shared_ux_storybook_config.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-storybook-config title: "@kbn/shared-ux-storybook-config" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-storybook-config plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-storybook-config'] --- import kbnSharedUxStorybookConfigObj from './kbn_shared_ux_storybook_config.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_storybook_mock.mdx b/api_docs/kbn_shared_ux_storybook_mock.mdx index 16c867044187d..6309733dc1bab 100644 --- a/api_docs/kbn_shared_ux_storybook_mock.mdx +++ b/api_docs/kbn_shared_ux_storybook_mock.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-storybook-mock title: "@kbn/shared-ux-storybook-mock" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-storybook-mock plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-storybook-mock'] --- import kbnSharedUxStorybookMockObj from './kbn_shared_ux_storybook_mock.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_utility.mdx b/api_docs/kbn_shared_ux_utility.mdx index ef2f54962c583..c770dd8671956 100644 --- a/api_docs/kbn_shared_ux_utility.mdx +++ b/api_docs/kbn_shared_ux_utility.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-utility title: "@kbn/shared-ux-utility" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-utility plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-utility'] --- import kbnSharedUxUtilityObj from './kbn_shared_ux_utility.devdocs.json'; diff --git a/api_docs/kbn_some_dev_log.mdx b/api_docs/kbn_some_dev_log.mdx index 8fa73d4c68dad..4b531126964e6 100644 --- a/api_docs/kbn_some_dev_log.mdx +++ b/api_docs/kbn_some_dev_log.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-some-dev-log title: "@kbn/some-dev-log" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/some-dev-log plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/some-dev-log'] --- import kbnSomeDevLogObj from './kbn_some_dev_log.devdocs.json'; diff --git a/api_docs/kbn_sort_package_json.mdx b/api_docs/kbn_sort_package_json.mdx index 8a049d4872b72..8073cadd73d80 100644 --- a/api_docs/kbn_sort_package_json.mdx +++ b/api_docs/kbn_sort_package_json.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-sort-package-json title: "@kbn/sort-package-json" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/sort-package-json plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/sort-package-json'] --- import kbnSortPackageJsonObj from './kbn_sort_package_json.devdocs.json'; diff --git a/api_docs/kbn_std.mdx b/api_docs/kbn_std.mdx index f1ba970a48042..c05c4d734c490 100644 --- a/api_docs/kbn_std.mdx +++ b/api_docs/kbn_std.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-std title: "@kbn/std" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/std plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/std'] --- import kbnStdObj from './kbn_std.devdocs.json'; diff --git a/api_docs/kbn_stdio_dev_helpers.mdx b/api_docs/kbn_stdio_dev_helpers.mdx index 2ff62c2d04f35..660e36ef4374e 100644 --- a/api_docs/kbn_stdio_dev_helpers.mdx +++ b/api_docs/kbn_stdio_dev_helpers.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-stdio-dev-helpers title: "@kbn/stdio-dev-helpers" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/stdio-dev-helpers plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/stdio-dev-helpers'] --- import kbnStdioDevHelpersObj from './kbn_stdio_dev_helpers.devdocs.json'; diff --git a/api_docs/kbn_storybook.mdx b/api_docs/kbn_storybook.mdx index b77c7bfc44e93..93828baf05442 100644 --- a/api_docs/kbn_storybook.mdx +++ b/api_docs/kbn_storybook.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-storybook title: "@kbn/storybook" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/storybook plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/storybook'] --- import kbnStorybookObj from './kbn_storybook.devdocs.json'; diff --git a/api_docs/kbn_telemetry_tools.mdx b/api_docs/kbn_telemetry_tools.mdx index f81111a502799..fc2ed806bd5a7 100644 --- a/api_docs/kbn_telemetry_tools.mdx +++ b/api_docs/kbn_telemetry_tools.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-telemetry-tools title: "@kbn/telemetry-tools" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/telemetry-tools plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/telemetry-tools'] --- import kbnTelemetryToolsObj from './kbn_telemetry_tools.devdocs.json'; diff --git a/api_docs/kbn_test.mdx b/api_docs/kbn_test.mdx index eaf2d94c9a05d..fe8a35b282802 100644 --- a/api_docs/kbn_test.mdx +++ b/api_docs/kbn_test.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-test title: "@kbn/test" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/test plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/test'] --- import kbnTestObj from './kbn_test.devdocs.json'; diff --git a/api_docs/kbn_test_jest_helpers.mdx b/api_docs/kbn_test_jest_helpers.mdx index 96f5d4d6ab2a7..b072b928a5fee 100644 --- a/api_docs/kbn_test_jest_helpers.mdx +++ b/api_docs/kbn_test_jest_helpers.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-test-jest-helpers title: "@kbn/test-jest-helpers" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/test-jest-helpers plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/test-jest-helpers'] --- import kbnTestJestHelpersObj from './kbn_test_jest_helpers.devdocs.json'; diff --git a/api_docs/kbn_test_subj_selector.mdx b/api_docs/kbn_test_subj_selector.mdx index db3273ea8883f..2cc7dbb077e4d 100644 --- a/api_docs/kbn_test_subj_selector.mdx +++ b/api_docs/kbn_test_subj_selector.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-test-subj-selector title: "@kbn/test-subj-selector" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/test-subj-selector plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/test-subj-selector'] --- import kbnTestSubjSelectorObj from './kbn_test_subj_selector.devdocs.json'; diff --git a/api_docs/kbn_tooling_log.mdx b/api_docs/kbn_tooling_log.mdx index fe4e9cade439f..4c380a6aada55 100644 --- a/api_docs/kbn_tooling_log.mdx +++ b/api_docs/kbn_tooling_log.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-tooling-log title: "@kbn/tooling-log" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/tooling-log plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/tooling-log'] --- import kbnToolingLogObj from './kbn_tooling_log.devdocs.json'; diff --git a/api_docs/kbn_type_summarizer.mdx b/api_docs/kbn_type_summarizer.mdx index 9744d7e40941f..4658f66ec9f02 100644 --- a/api_docs/kbn_type_summarizer.mdx +++ b/api_docs/kbn_type_summarizer.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-type-summarizer title: "@kbn/type-summarizer" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/type-summarizer plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/type-summarizer'] --- import kbnTypeSummarizerObj from './kbn_type_summarizer.devdocs.json'; diff --git a/api_docs/kbn_type_summarizer_core.mdx b/api_docs/kbn_type_summarizer_core.mdx index 5bf8d7c641755..5c785be7541a2 100644 --- a/api_docs/kbn_type_summarizer_core.mdx +++ b/api_docs/kbn_type_summarizer_core.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-type-summarizer-core title: "@kbn/type-summarizer-core" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/type-summarizer-core plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/type-summarizer-core'] --- import kbnTypeSummarizerCoreObj from './kbn_type_summarizer_core.devdocs.json'; diff --git a/api_docs/kbn_typed_react_router_config.mdx b/api_docs/kbn_typed_react_router_config.mdx index 24144f46636bc..058bbf15a8534 100644 --- a/api_docs/kbn_typed_react_router_config.mdx +++ b/api_docs/kbn_typed_react_router_config.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-typed-react-router-config title: "@kbn/typed-react-router-config" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/typed-react-router-config plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/typed-react-router-config'] --- import kbnTypedReactRouterConfigObj from './kbn_typed_react_router_config.devdocs.json'; diff --git a/api_docs/kbn_ui_theme.mdx b/api_docs/kbn_ui_theme.mdx index fe7f2f02b8192..ffad848d71c2b 100644 --- a/api_docs/kbn_ui_theme.mdx +++ b/api_docs/kbn_ui_theme.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ui-theme title: "@kbn/ui-theme" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/ui-theme plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ui-theme'] --- import kbnUiThemeObj from './kbn_ui_theme.devdocs.json'; diff --git a/api_docs/kbn_user_profile_components.mdx b/api_docs/kbn_user_profile_components.mdx index 7855bb68d62db..b7a7e0d49898e 100644 --- a/api_docs/kbn_user_profile_components.mdx +++ b/api_docs/kbn_user_profile_components.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-user-profile-components title: "@kbn/user-profile-components" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/user-profile-components plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/user-profile-components'] --- import kbnUserProfileComponentsObj from './kbn_user_profile_components.devdocs.json'; diff --git a/api_docs/kbn_utility_types.mdx b/api_docs/kbn_utility_types.mdx index 5adb3b961a126..9c4fac9fc2223 100644 --- a/api_docs/kbn_utility_types.mdx +++ b/api_docs/kbn_utility_types.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-utility-types title: "@kbn/utility-types" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/utility-types plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/utility-types'] --- import kbnUtilityTypesObj from './kbn_utility_types.devdocs.json'; diff --git a/api_docs/kbn_utility_types_jest.mdx b/api_docs/kbn_utility_types_jest.mdx index 879d594892e8b..a08a1f8c35b21 100644 --- a/api_docs/kbn_utility_types_jest.mdx +++ b/api_docs/kbn_utility_types_jest.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-utility-types-jest title: "@kbn/utility-types-jest" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/utility-types-jest plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/utility-types-jest'] --- import kbnUtilityTypesJestObj from './kbn_utility_types_jest.devdocs.json'; diff --git a/api_docs/kbn_utils.mdx b/api_docs/kbn_utils.mdx index 13a63d5a655f6..484f22d4d3fad 100644 --- a/api_docs/kbn_utils.mdx +++ b/api_docs/kbn_utils.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-utils title: "@kbn/utils" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/utils plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/utils'] --- import kbnUtilsObj from './kbn_utils.devdocs.json'; diff --git a/api_docs/kbn_yarn_lock_validator.mdx b/api_docs/kbn_yarn_lock_validator.mdx index 17c5bc67927ee..86360f220dc24 100644 --- a/api_docs/kbn_yarn_lock_validator.mdx +++ b/api_docs/kbn_yarn_lock_validator.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-yarn-lock-validator title: "@kbn/yarn-lock-validator" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/yarn-lock-validator plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/yarn-lock-validator'] --- import kbnYarnLockValidatorObj from './kbn_yarn_lock_validator.devdocs.json'; diff --git a/api_docs/kibana_overview.mdx b/api_docs/kibana_overview.mdx index 661dda80a0227..db2dd293c3e4b 100644 --- a/api_docs/kibana_overview.mdx +++ b/api_docs/kibana_overview.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kibanaOverview title: "kibanaOverview" image: https://source.unsplash.com/400x175/?github description: API docs for the kibanaOverview plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'kibanaOverview'] --- import kibanaOverviewObj from './kibana_overview.devdocs.json'; diff --git a/api_docs/kibana_react.mdx b/api_docs/kibana_react.mdx index 3a54ee39d7116..a8b6bbd605637 100644 --- a/api_docs/kibana_react.mdx +++ b/api_docs/kibana_react.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kibanaReact title: "kibanaReact" image: https://source.unsplash.com/400x175/?github description: API docs for the kibanaReact plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'kibanaReact'] --- import kibanaReactObj from './kibana_react.devdocs.json'; diff --git a/api_docs/kibana_utils.mdx b/api_docs/kibana_utils.mdx index 62af983d79330..e8b72f7cee2d1 100644 --- a/api_docs/kibana_utils.mdx +++ b/api_docs/kibana_utils.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kibanaUtils title: "kibanaUtils" image: https://source.unsplash.com/400x175/?github description: API docs for the kibanaUtils plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'kibanaUtils'] --- import kibanaUtilsObj from './kibana_utils.devdocs.json'; diff --git a/api_docs/kubernetes_security.mdx b/api_docs/kubernetes_security.mdx index c101218ee3f45..fc9a2e294a610 100644 --- a/api_docs/kubernetes_security.mdx +++ b/api_docs/kubernetes_security.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kubernetesSecurity title: "kubernetesSecurity" image: https://source.unsplash.com/400x175/?github description: API docs for the kubernetesSecurity plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'kubernetesSecurity'] --- import kubernetesSecurityObj from './kubernetes_security.devdocs.json'; diff --git a/api_docs/lens.devdocs.json b/api_docs/lens.devdocs.json index 4fc56c34842e9..4d4561547ed2a 100644 --- a/api_docs/lens.devdocs.json +++ b/api_docs/lens.devdocs.json @@ -1527,6 +1527,24 @@ "children": [], "returnComment": [] }, + { + "parentPluginId": "lens", + "id": "def-public.DatasourcePublicAPI.isTextBasedLanguage", + "type": "Function", + "tags": [], + "label": "isTextBasedLanguage", + "description": [ + "\nReturns true if this is a text based language datasource" + ], + "signature": [ + "() => boolean" + ], + "path": "x-pack/plugins/lens/public/types.ts", + "deprecated": false, + "trackAdoption": false, + "children": [], + "returnComment": [] + }, { "parentPluginId": "lens", "id": "def-public.DatasourcePublicAPI.getFilters", @@ -11347,6 +11365,21 @@ "trackAdoption": false, "initialIsOpen": false }, + { + "parentPluginId": "lens", + "id": "def-common.ENABLE_SQL", + "type": "string", + "tags": [], + "label": "ENABLE_SQL", + "description": [], + "signature": [ + "\"discover:enableSql\"" + ], + "path": "x-pack/plugins/lens/common/constants.ts", + "deprecated": false, + "trackAdoption": false, + "initialIsOpen": false + }, { "parentPluginId": "lens", "id": "def-common.FormatFactory", @@ -11495,6 +11528,21 @@ "trackAdoption": false, "initialIsOpen": false }, + { + "parentPluginId": "lens", + "id": "def-common.OriginalColumn", + "type": "Type", + "tags": [], + "label": "OriginalColumn", + "description": [], + "signature": [ + "{ id: string; label: string; } & ({ operationType: \"date_histogram\"; sourceField: string; } | { operationType: string; sourceField: never; })" + ], + "path": "x-pack/plugins/lens/common/expressions/map_to_columns/types.ts", + "deprecated": false, + "trackAdoption": false, + "initialIsOpen": false + }, { "parentPluginId": "lens", "id": "def-common.PieChartType", diff --git a/api_docs/lens.mdx b/api_docs/lens.mdx index e6eb90ca75ba8..75d2cd54a2d8b 100644 --- a/api_docs/lens.mdx +++ b/api_docs/lens.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/lens title: "lens" image: https://source.unsplash.com/400x175/?github description: API docs for the lens plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'lens'] --- import lensObj from './lens.devdocs.json'; @@ -21,7 +21,7 @@ Contact [Vis Editors](https://github.com/orgs/elastic/teams/kibana-vis-editors) | Public API count | Any count | Items lacking comments | Missing exports | |-------------------|-----------|------------------------|-----------------| -| 646 | 0 | 558 | 42 | +| 649 | 0 | 560 | 42 | ## Client diff --git a/api_docs/license_api_guard.mdx b/api_docs/license_api_guard.mdx index 745b2e56c1c9d..42f4d0805fc3c 100644 --- a/api_docs/license_api_guard.mdx +++ b/api_docs/license_api_guard.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/licenseApiGuard title: "licenseApiGuard" image: https://source.unsplash.com/400x175/?github description: API docs for the licenseApiGuard plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'licenseApiGuard'] --- import licenseApiGuardObj from './license_api_guard.devdocs.json'; diff --git a/api_docs/license_management.mdx b/api_docs/license_management.mdx index 3aa129254bb54..ca3e9e1a23c12 100644 --- a/api_docs/license_management.mdx +++ b/api_docs/license_management.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/licenseManagement title: "licenseManagement" image: https://source.unsplash.com/400x175/?github description: API docs for the licenseManagement plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'licenseManagement'] --- import licenseManagementObj from './license_management.devdocs.json'; diff --git a/api_docs/licensing.mdx b/api_docs/licensing.mdx index f4406dfe719d8..67cd87e28a5ce 100644 --- a/api_docs/licensing.mdx +++ b/api_docs/licensing.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/licensing title: "licensing" image: https://source.unsplash.com/400x175/?github description: API docs for the licensing plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'licensing'] --- import licensingObj from './licensing.devdocs.json'; diff --git a/api_docs/lists.mdx b/api_docs/lists.mdx index 6aa4f4f225193..c0fba6cbabbb7 100644 --- a/api_docs/lists.mdx +++ b/api_docs/lists.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/lists title: "lists" image: https://source.unsplash.com/400x175/?github description: API docs for the lists plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'lists'] --- import listsObj from './lists.devdocs.json'; diff --git a/api_docs/management.mdx b/api_docs/management.mdx index 92b5f7e806788..7a332ae0f68be 100644 --- a/api_docs/management.mdx +++ b/api_docs/management.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/management title: "management" image: https://source.unsplash.com/400x175/?github description: API docs for the management plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'management'] --- import managementObj from './management.devdocs.json'; diff --git a/api_docs/maps.mdx b/api_docs/maps.mdx index 2e5da06f70dd9..c821d5118393a 100644 --- a/api_docs/maps.mdx +++ b/api_docs/maps.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/maps title: "maps" image: https://source.unsplash.com/400x175/?github description: API docs for the maps plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'maps'] --- import mapsObj from './maps.devdocs.json'; diff --git a/api_docs/maps_ems.mdx b/api_docs/maps_ems.mdx index a2dd183ea48bc..30e6fc5864b60 100644 --- a/api_docs/maps_ems.mdx +++ b/api_docs/maps_ems.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/mapsEms title: "mapsEms" image: https://source.unsplash.com/400x175/?github description: API docs for the mapsEms plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'mapsEms'] --- import mapsEmsObj from './maps_ems.devdocs.json'; diff --git a/api_docs/ml.mdx b/api_docs/ml.mdx index 55b3f0eff7da0..83e81edff74a4 100644 --- a/api_docs/ml.mdx +++ b/api_docs/ml.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/ml title: "ml" image: https://source.unsplash.com/400x175/?github description: API docs for the ml plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'ml'] --- import mlObj from './ml.devdocs.json'; diff --git a/api_docs/monitoring.mdx b/api_docs/monitoring.mdx index dbf1d15ca06df..8b27dbc3d7849 100644 --- a/api_docs/monitoring.mdx +++ b/api_docs/monitoring.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/monitoring title: "monitoring" image: https://source.unsplash.com/400x175/?github description: API docs for the monitoring plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'monitoring'] --- import monitoringObj from './monitoring.devdocs.json'; diff --git a/api_docs/monitoring_collection.mdx b/api_docs/monitoring_collection.mdx index 16eb11d15bbf2..d0c0e4b930125 100644 --- a/api_docs/monitoring_collection.mdx +++ b/api_docs/monitoring_collection.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/monitoringCollection title: "monitoringCollection" image: https://source.unsplash.com/400x175/?github description: API docs for the monitoringCollection plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'monitoringCollection'] --- import monitoringCollectionObj from './monitoring_collection.devdocs.json'; diff --git a/api_docs/navigation.mdx b/api_docs/navigation.mdx index e9f3d869a2077..c8d4e9b1fbf7c 100644 --- a/api_docs/navigation.mdx +++ b/api_docs/navigation.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/navigation title: "navigation" image: https://source.unsplash.com/400x175/?github description: API docs for the navigation plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'navigation'] --- import navigationObj from './navigation.devdocs.json'; diff --git a/api_docs/newsfeed.mdx b/api_docs/newsfeed.mdx index 95e0ce94137e7..79f080105b7b9 100644 --- a/api_docs/newsfeed.mdx +++ b/api_docs/newsfeed.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/newsfeed title: "newsfeed" image: https://source.unsplash.com/400x175/?github description: API docs for the newsfeed plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'newsfeed'] --- import newsfeedObj from './newsfeed.devdocs.json'; diff --git a/api_docs/observability.devdocs.json b/api_docs/observability.devdocs.json index 7d399eaa890b1..d4d3483ef247c 100644 --- a/api_docs/observability.devdocs.json +++ b/api_docs/observability.devdocs.json @@ -3704,11 +3704,29 @@ "description": [], "signature": [ "{ get: (id: string) => ", - "ActionTypeModel", + { + "pluginId": "triggersActionsUi", + "scope": "public", + "docId": "kibTriggersActionsUiPluginApi", + "section": "def-public.ActionTypeModel", + "text": "ActionTypeModel" + }, "; list: () => ", - "ActionTypeModel", + { + "pluginId": "triggersActionsUi", + "scope": "public", + "docId": "kibTriggersActionsUiPluginApi", + "section": "def-public.ActionTypeModel", + "text": "ActionTypeModel" + }, "[]; register: (objectType: ", - "ActionTypeModel", + { + "pluginId": "triggersActionsUi", + "scope": "public", + "docId": "kibTriggersActionsUiPluginApi", + "section": "def-public.ActionTypeModel", + "text": "ActionTypeModel" + }, ") => void; has: (id: string) => boolean; }" ], "path": "x-pack/plugins/observability/public/plugin.ts", diff --git a/api_docs/observability.mdx b/api_docs/observability.mdx index afdb6cd4fbb3c..4c2ca8b17a13f 100644 --- a/api_docs/observability.mdx +++ b/api_docs/observability.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/observability title: "observability" image: https://source.unsplash.com/400x175/?github description: API docs for the observability plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'observability'] --- import observabilityObj from './observability.devdocs.json'; diff --git a/api_docs/osquery.mdx b/api_docs/osquery.mdx index a634c2e2206cc..942900853abdb 100644 --- a/api_docs/osquery.mdx +++ b/api_docs/osquery.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/osquery title: "osquery" image: https://source.unsplash.com/400x175/?github description: API docs for the osquery plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'osquery'] --- import osqueryObj from './osquery.devdocs.json'; diff --git a/api_docs/plugin_directory.mdx b/api_docs/plugin_directory.mdx index 00a92aa5b8132..bcddc85faf5c2 100644 --- a/api_docs/plugin_directory.mdx +++ b/api_docs/plugin_directory.mdx @@ -7,7 +7,7 @@ id: kibDevDocsPluginDirectory slug: /kibana-dev-docs/api-meta/plugin-api-directory title: Directory description: Directory of public APIs available through plugins or packages. -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana'] --- @@ -15,13 +15,13 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana'] | Count | Plugins or Packages with a
    public API | Number of teams | |--------------|----------|------------------------| -| 473 | 395 | 38 | +| 474 | 395 | 38 | ### Public API health stats | API Count | Any Count | Missing comments | Missing exports | |--------------|----------|-----------------|--------| -| 31772 | 179 | 21354 | 1002 | +| 31860 | 179 | 21432 | 1007 | ## Plugin Directory @@ -47,7 +47,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana'] | | [Fleet](https://github.com/orgs/elastic/teams/fleet) | Add custom data integrations so they can be displayed in the Fleet integrations app | 103 | 0 | 84 | 1 | | | [Kibana Presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | Adds the Dashboard app to Kibana | 144 | 0 | 139 | 10 | | | [App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | - | 52 | 0 | 51 | 0 | -| | [App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | Data services are useful for searching and querying data from Elasticsearch. Helpful utilities include: a re-usable react query bar, KQL autocomplete, async search, Data Views (Index Patterns) and field formatters. | 3211 | 33 | 2508 | 23 | +| | [App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | Data services are useful for searching and querying data from Elasticsearch. Helpful utilities include: a re-usable react query bar, KQL autocomplete, async search, Data Views (Index Patterns) and field formatters. | 3213 | 33 | 2509 | 23 | | | [App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | This plugin provides the ability to create data views via a modal flyout inside Kibana apps | 15 | 0 | 7 | 0 | | | [App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | Reusable data view field editor across Kibana | 60 | 0 | 30 | 0 | | | [App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | Data view management app | 2 | 0 | 2 | 0 | @@ -60,7 +60,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana'] | | [App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | Extends embeddable plugin with more functionality | 14 | 0 | 14 | 0 | | | [Platform Security](https://github.com/orgs/elastic/teams/kibana-security) | This plugin provides encryption and decryption utilities for saved objects containing sensitive information. | 51 | 0 | 42 | 0 | | | [Enterprise Search](https://github.com/orgs/elastic/teams/enterprise-search-frontend) | Adds dashboards for discovering and managing Enterprise Search products. | 9 | 0 | 9 | 0 | -| | [Stack Management](https://github.com/orgs/elastic/teams/kibana-stack-management) | - | 114 | 3 | 110 | 3 | +| | [Stack Management](https://github.com/orgs/elastic/teams/kibana-stack-management) | - | 114 | 3 | 110 | 5 | | | [Vis Editors](https://github.com/orgs/elastic/teams/kibana-vis-editors) | The Event Annotation service contains expressions for event annotations | 174 | 0 | 174 | 3 | | | [Response Ops](https://github.com/orgs/elastic/teams/response-ops) | - | 106 | 0 | 106 | 10 | | | [Kibana Presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | Adds 'error' renderer to expressions | 17 | 0 | 15 | 2 | @@ -80,8 +80,8 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana'] | | [Kibana Core](https://github.com/orgs/elastic/teams/kibana-core) | - | 222 | 0 | 95 | 2 | | | [App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | Index pattern fields and ambiguous values formatters | 288 | 5 | 249 | 3 | | | [Machine Learning UI](https://github.com/orgs/elastic/teams/ml-ui) | The file upload plugin contains components and services for uploading a file, analyzing its data, and then importing the data into an Elasticsearch index. Supported file types include CSV, TSV, newline-delimited JSON and GeoJSON. | 62 | 0 | 62 | 2 | -| | [@elastic/kibana-app-services](https://github.com/orgs/elastic/teams/team:AppServicesUx) | File upload, download, sharing, and serving over HTTP implementation in Kibana. | 263 | 0 | 15 | 2 | -| | [Fleet](https://github.com/orgs/elastic/teams/fleet) | - | 988 | 3 | 888 | 17 | +| | [@elastic/kibana-app-services](https://github.com/orgs/elastic/teams/team:AppServicesUx) | File upload, download, sharing, and serving over HTTP implementation in Kibana. | 263 | 0 | 14 | 2 | +| | [Fleet](https://github.com/orgs/elastic/teams/fleet) | - | 996 | 3 | 893 | 17 | | | [Kibana Core](https://github.com/orgs/elastic/teams/kibana-core) | - | 68 | 0 | 14 | 5 | | globalSearchBar | [Kibana Core](https://github.com/orgs/elastic/teams/kibana-core) | - | 0 | 0 | 0 | 0 | | globalSearchProviders | [Kibana Core](https://github.com/orgs/elastic/teams/kibana-core) | - | 0 | 0 | 0 | 0 | @@ -101,7 +101,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana'] | kibanaUsageCollection | [Kibana Telemetry](https://github.com/orgs/elastic/teams/kibana-telemetry) | - | 0 | 0 | 0 | 0 | | | [App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | - | 615 | 3 | 418 | 9 | | | [Security Team](https://github.com/orgs/elastic/teams/security-team) | - | 3 | 0 | 3 | 1 | -| | [Vis Editors](https://github.com/orgs/elastic/teams/kibana-vis-editors) | Visualization editor allowing to quickly and easily configure compelling visualizations to use on dashboards and canvas workpads. Exposes components to embed visualizations and link into the Lens editor from within other apps in Kibana. | 646 | 0 | 558 | 42 | +| | [Vis Editors](https://github.com/orgs/elastic/teams/kibana-vis-editors) | Visualization editor allowing to quickly and easily configure compelling visualizations to use on dashboards and canvas workpads. Exposes components to embed visualizations and link into the Lens editor from within other apps in Kibana. | 649 | 0 | 560 | 42 | | | [Stack Management](https://github.com/orgs/elastic/teams/kibana-stack-management) | - | 8 | 0 | 8 | 0 | | | [Stack Management](https://github.com/orgs/elastic/teams/kibana-stack-management) | - | 3 | 0 | 3 | 0 | | | [Kibana Core](https://github.com/orgs/elastic/teams/kibana-core) | - | 117 | 0 | 42 | 10 | @@ -152,7 +152,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana'] | | [Security solution](https://github.com/orgs/elastic/teams/security-solution) | - | 452 | 1 | 346 | 33 | | | [Machine Learning UI](https://github.com/orgs/elastic/teams/ml-ui) | This plugin provides access to the transforms features provided by Elastic. Transforms enable you to convert existing Elasticsearch indices into summarized indices, which provide opportunities for new insights and analytics. | 4 | 0 | 4 | 1 | | translations | [Kibana Localization](https://github.com/orgs/elastic/teams/kibana-localization) | - | 0 | 0 | 0 | 0 | -| | [Response Ops](https://github.com/orgs/elastic/teams/response-ops) | - | 437 | 1 | 416 | 45 | +| | [Response Ops](https://github.com/orgs/elastic/teams/response-ops) | - | 513 | 1 | 486 | 48 | | | [App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | Adds UI Actions service to Kibana | 132 | 0 | 91 | 11 | | | [App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | Extends UI Actions plugin with more functionality | 206 | 0 | 142 | 9 | | | [Data Discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | Contains functionality for the field list which can be integrated into apps | 61 | 0 | 59 | 2 | @@ -389,9 +389,9 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana'] | | [Owner missing] | Security Solution auto complete | 56 | 1 | 41 | 1 | | | [Owner missing] | security solution elastic search utilities to use across plugins such lists, security_solution, cases, etc... | 67 | 0 | 61 | 1 | | | [Owner missing] | Security Solution utilities for React hooks | 15 | 0 | 7 | 0 | -| | [Owner missing] | io ts utilities and types to be shared with plugins from the security solution project | 148 | 0 | 129 | 0 | +| | [Owner missing] | io ts utilities and types to be shared with plugins from the security solution project | 145 | 0 | 127 | 0 | | | [Owner missing] | io ts utilities and types to be shared with plugins from the security solution project | 505 | 1 | 492 | 0 | -| | [Owner missing] | io ts utilities and types to be shared with plugins from the security solution project | 63 | 0 | 33 | 0 | +| | [Owner missing] | io ts utilities and types to be shared with plugins from the security solution project | 65 | 0 | 36 | 0 | | | [Owner missing] | io ts utilities and types to be shared with plugins from the security solution project | 28 | 0 | 21 | 0 | | | [Owner missing] | security solution list REST API | 67 | 0 | 64 | 0 | | | [Owner missing] | security solution list constants to use across plugins such lists, security_solution, cases, etc... | 33 | 0 | 17 | 0 | diff --git a/api_docs/presentation_util.mdx b/api_docs/presentation_util.mdx index 971ed39aee0ed..191e4e563cb34 100644 --- a/api_docs/presentation_util.mdx +++ b/api_docs/presentation_util.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/presentationUtil title: "presentationUtil" image: https://source.unsplash.com/400x175/?github description: API docs for the presentationUtil plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'presentationUtil'] --- import presentationUtilObj from './presentation_util.devdocs.json'; diff --git a/api_docs/profiling.mdx b/api_docs/profiling.mdx index 8d2be8c0f9dd7..fb048ac82442b 100644 --- a/api_docs/profiling.mdx +++ b/api_docs/profiling.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/profiling title: "profiling" image: https://source.unsplash.com/400x175/?github description: API docs for the profiling plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'profiling'] --- import profilingObj from './profiling.devdocs.json'; diff --git a/api_docs/remote_clusters.mdx b/api_docs/remote_clusters.mdx index 916ffb9e1e4e0..c0b505ed6394d 100644 --- a/api_docs/remote_clusters.mdx +++ b/api_docs/remote_clusters.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/remoteClusters title: "remoteClusters" image: https://source.unsplash.com/400x175/?github description: API docs for the remoteClusters plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'remoteClusters'] --- import remoteClustersObj from './remote_clusters.devdocs.json'; diff --git a/api_docs/reporting.mdx b/api_docs/reporting.mdx index aa8b69de45190..4088e39f97108 100644 --- a/api_docs/reporting.mdx +++ b/api_docs/reporting.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/reporting title: "reporting" image: https://source.unsplash.com/400x175/?github description: API docs for the reporting plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'reporting'] --- import reportingObj from './reporting.devdocs.json'; diff --git a/api_docs/rollup.mdx b/api_docs/rollup.mdx index 7ecab5c862bf0..4f8cf9c8e8dbf 100644 --- a/api_docs/rollup.mdx +++ b/api_docs/rollup.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/rollup title: "rollup" image: https://source.unsplash.com/400x175/?github description: API docs for the rollup plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'rollup'] --- import rollupObj from './rollup.devdocs.json'; diff --git a/api_docs/rule_registry.mdx b/api_docs/rule_registry.mdx index 42e1a51c2ed9f..15c672f3f6fee 100644 --- a/api_docs/rule_registry.mdx +++ b/api_docs/rule_registry.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/ruleRegistry title: "ruleRegistry" image: https://source.unsplash.com/400x175/?github description: API docs for the ruleRegistry plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'ruleRegistry'] --- import ruleRegistryObj from './rule_registry.devdocs.json'; diff --git a/api_docs/runtime_fields.mdx b/api_docs/runtime_fields.mdx index 4c4a4a4be8d7f..001d245e9adf3 100644 --- a/api_docs/runtime_fields.mdx +++ b/api_docs/runtime_fields.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/runtimeFields title: "runtimeFields" image: https://source.unsplash.com/400x175/?github description: API docs for the runtimeFields plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'runtimeFields'] --- import runtimeFieldsObj from './runtime_fields.devdocs.json'; diff --git a/api_docs/saved_objects.mdx b/api_docs/saved_objects.mdx index d180b9df678f8..51bc9b36316c4 100644 --- a/api_docs/saved_objects.mdx +++ b/api_docs/saved_objects.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjects title: "savedObjects" image: https://source.unsplash.com/400x175/?github description: API docs for the savedObjects plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedObjects'] --- import savedObjectsObj from './saved_objects.devdocs.json'; diff --git a/api_docs/saved_objects_finder.mdx b/api_docs/saved_objects_finder.mdx index d8ee1bd800f99..3a6b9b0a9e738 100644 --- a/api_docs/saved_objects_finder.mdx +++ b/api_docs/saved_objects_finder.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjectsFinder title: "savedObjectsFinder" image: https://source.unsplash.com/400x175/?github description: API docs for the savedObjectsFinder plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedObjectsFinder'] --- import savedObjectsFinderObj from './saved_objects_finder.devdocs.json'; diff --git a/api_docs/saved_objects_management.mdx b/api_docs/saved_objects_management.mdx index a57ba63fec003..8fb7925eb7808 100644 --- a/api_docs/saved_objects_management.mdx +++ b/api_docs/saved_objects_management.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjectsManagement title: "savedObjectsManagement" image: https://source.unsplash.com/400x175/?github description: API docs for the savedObjectsManagement plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedObjectsManagement'] --- import savedObjectsManagementObj from './saved_objects_management.devdocs.json'; diff --git a/api_docs/saved_objects_tagging.mdx b/api_docs/saved_objects_tagging.mdx index 785d7f8ea6a32..9a0469a70f642 100644 --- a/api_docs/saved_objects_tagging.mdx +++ b/api_docs/saved_objects_tagging.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjectsTagging title: "savedObjectsTagging" image: https://source.unsplash.com/400x175/?github description: API docs for the savedObjectsTagging plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedObjectsTagging'] --- import savedObjectsTaggingObj from './saved_objects_tagging.devdocs.json'; diff --git a/api_docs/saved_objects_tagging_oss.mdx b/api_docs/saved_objects_tagging_oss.mdx index bf65a9aa5c648..8abc78f1fdc7e 100644 --- a/api_docs/saved_objects_tagging_oss.mdx +++ b/api_docs/saved_objects_tagging_oss.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjectsTaggingOss title: "savedObjectsTaggingOss" image: https://source.unsplash.com/400x175/?github description: API docs for the savedObjectsTaggingOss plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedObjectsTaggingOss'] --- import savedObjectsTaggingOssObj from './saved_objects_tagging_oss.devdocs.json'; diff --git a/api_docs/saved_search.mdx b/api_docs/saved_search.mdx index 5e294d8d6ea59..a39c3adbc8200 100644 --- a/api_docs/saved_search.mdx +++ b/api_docs/saved_search.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedSearch title: "savedSearch" image: https://source.unsplash.com/400x175/?github description: API docs for the savedSearch plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedSearch'] --- import savedSearchObj from './saved_search.devdocs.json'; diff --git a/api_docs/screenshot_mode.mdx b/api_docs/screenshot_mode.mdx index 4c436c7b23e66..6eaf962f670fa 100644 --- a/api_docs/screenshot_mode.mdx +++ b/api_docs/screenshot_mode.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/screenshotMode title: "screenshotMode" image: https://source.unsplash.com/400x175/?github description: API docs for the screenshotMode plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'screenshotMode'] --- import screenshotModeObj from './screenshot_mode.devdocs.json'; diff --git a/api_docs/screenshotting.mdx b/api_docs/screenshotting.mdx index 5bc1fcd058003..8cb0692d0c854 100644 --- a/api_docs/screenshotting.mdx +++ b/api_docs/screenshotting.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/screenshotting title: "screenshotting" image: https://source.unsplash.com/400x175/?github description: API docs for the screenshotting plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'screenshotting'] --- import screenshottingObj from './screenshotting.devdocs.json'; diff --git a/api_docs/security.mdx b/api_docs/security.mdx index 952c20eac620f..e6f2900462223 100644 --- a/api_docs/security.mdx +++ b/api_docs/security.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/security title: "security" image: https://source.unsplash.com/400x175/?github description: API docs for the security plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'security'] --- import securityObj from './security.devdocs.json'; diff --git a/api_docs/security_solution.mdx b/api_docs/security_solution.mdx index 9cf5459a07a3e..c59c106fce254 100644 --- a/api_docs/security_solution.mdx +++ b/api_docs/security_solution.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/securitySolution title: "securitySolution" image: https://source.unsplash.com/400x175/?github description: API docs for the securitySolution plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'securitySolution'] --- import securitySolutionObj from './security_solution.devdocs.json'; diff --git a/api_docs/session_view.mdx b/api_docs/session_view.mdx index 23f8e18b5e278..ad4253bd0d7e5 100644 --- a/api_docs/session_view.mdx +++ b/api_docs/session_view.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/sessionView title: "sessionView" image: https://source.unsplash.com/400x175/?github description: API docs for the sessionView plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'sessionView'] --- import sessionViewObj from './session_view.devdocs.json'; diff --git a/api_docs/share.mdx b/api_docs/share.mdx index 7ba452349a66b..e6f9de45dbb58 100644 --- a/api_docs/share.mdx +++ b/api_docs/share.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/share title: "share" image: https://source.unsplash.com/400x175/?github description: API docs for the share plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'share'] --- import shareObj from './share.devdocs.json'; diff --git a/api_docs/snapshot_restore.mdx b/api_docs/snapshot_restore.mdx index 194b818f081bf..8a45ec4089ad2 100644 --- a/api_docs/snapshot_restore.mdx +++ b/api_docs/snapshot_restore.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/snapshotRestore title: "snapshotRestore" image: https://source.unsplash.com/400x175/?github description: API docs for the snapshotRestore plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'snapshotRestore'] --- import snapshotRestoreObj from './snapshot_restore.devdocs.json'; diff --git a/api_docs/spaces.mdx b/api_docs/spaces.mdx index 95118ea8b8058..94f8821728343 100644 --- a/api_docs/spaces.mdx +++ b/api_docs/spaces.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/spaces title: "spaces" image: https://source.unsplash.com/400x175/?github description: API docs for the spaces plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'spaces'] --- import spacesObj from './spaces.devdocs.json'; diff --git a/api_docs/stack_alerts.mdx b/api_docs/stack_alerts.mdx index b3467e6a698dc..cb3df93effb09 100644 --- a/api_docs/stack_alerts.mdx +++ b/api_docs/stack_alerts.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/stackAlerts title: "stackAlerts" image: https://source.unsplash.com/400x175/?github description: API docs for the stackAlerts plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'stackAlerts'] --- import stackAlertsObj from './stack_alerts.devdocs.json'; diff --git a/api_docs/stack_connectors.mdx b/api_docs/stack_connectors.mdx index aabbd1805b61d..a71b61831fb69 100644 --- a/api_docs/stack_connectors.mdx +++ b/api_docs/stack_connectors.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/stackConnectors title: "stackConnectors" image: https://source.unsplash.com/400x175/?github description: API docs for the stackConnectors plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'stackConnectors'] --- import stackConnectorsObj from './stack_connectors.devdocs.json'; diff --git a/api_docs/task_manager.mdx b/api_docs/task_manager.mdx index d35966ac57c9c..b84502a5d8c55 100644 --- a/api_docs/task_manager.mdx +++ b/api_docs/task_manager.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/taskManager title: "taskManager" image: https://source.unsplash.com/400x175/?github description: API docs for the taskManager plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'taskManager'] --- import taskManagerObj from './task_manager.devdocs.json'; diff --git a/api_docs/telemetry.mdx b/api_docs/telemetry.mdx index 1dbef1ee43f39..dfdbd20746f57 100644 --- a/api_docs/telemetry.mdx +++ b/api_docs/telemetry.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/telemetry title: "telemetry" image: https://source.unsplash.com/400x175/?github description: API docs for the telemetry plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'telemetry'] --- import telemetryObj from './telemetry.devdocs.json'; diff --git a/api_docs/telemetry_collection_manager.mdx b/api_docs/telemetry_collection_manager.mdx index 438e8d307b1de..edb998b57d6f5 100644 --- a/api_docs/telemetry_collection_manager.mdx +++ b/api_docs/telemetry_collection_manager.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/telemetryCollectionManager title: "telemetryCollectionManager" image: https://source.unsplash.com/400x175/?github description: API docs for the telemetryCollectionManager plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'telemetryCollectionManager'] --- import telemetryCollectionManagerObj from './telemetry_collection_manager.devdocs.json'; diff --git a/api_docs/telemetry_collection_xpack.mdx b/api_docs/telemetry_collection_xpack.mdx index f032f6eee5e0a..c23dd99eb95e3 100644 --- a/api_docs/telemetry_collection_xpack.mdx +++ b/api_docs/telemetry_collection_xpack.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/telemetryCollectionXpack title: "telemetryCollectionXpack" image: https://source.unsplash.com/400x175/?github description: API docs for the telemetryCollectionXpack plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'telemetryCollectionXpack'] --- import telemetryCollectionXpackObj from './telemetry_collection_xpack.devdocs.json'; diff --git a/api_docs/telemetry_management_section.mdx b/api_docs/telemetry_management_section.mdx index 0b1523b1a10d3..5e8ae624dfe82 100644 --- a/api_docs/telemetry_management_section.mdx +++ b/api_docs/telemetry_management_section.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/telemetryManagementSection title: "telemetryManagementSection" image: https://source.unsplash.com/400x175/?github description: API docs for the telemetryManagementSection plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'telemetryManagementSection'] --- import telemetryManagementSectionObj from './telemetry_management_section.devdocs.json'; diff --git a/api_docs/threat_intelligence.mdx b/api_docs/threat_intelligence.mdx index b584556618afe..80ac38a8ed990 100644 --- a/api_docs/threat_intelligence.mdx +++ b/api_docs/threat_intelligence.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/threatIntelligence title: "threatIntelligence" image: https://source.unsplash.com/400x175/?github description: API docs for the threatIntelligence plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'threatIntelligence'] --- import threatIntelligenceObj from './threat_intelligence.devdocs.json'; diff --git a/api_docs/timelines.mdx b/api_docs/timelines.mdx index 14ef93c594cc2..ecb0a115ea511 100644 --- a/api_docs/timelines.mdx +++ b/api_docs/timelines.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/timelines title: "timelines" image: https://source.unsplash.com/400x175/?github description: API docs for the timelines plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'timelines'] --- import timelinesObj from './timelines.devdocs.json'; diff --git a/api_docs/transform.mdx b/api_docs/transform.mdx index b66dc03b52acd..70b733e2c869e 100644 --- a/api_docs/transform.mdx +++ b/api_docs/transform.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/transform title: "transform" image: https://source.unsplash.com/400x175/?github description: API docs for the transform plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'transform'] --- import transformObj from './transform.devdocs.json'; diff --git a/api_docs/triggers_actions_ui.devdocs.json b/api_docs/triggers_actions_ui.devdocs.json index 59be983bb00f5..316d5941b9d23 100644 --- a/api_docs/triggers_actions_ui.devdocs.json +++ b/api_docs/triggers_actions_ui.devdocs.json @@ -303,6 +303,38 @@ ], "initialIsOpen": false }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ButtonGroupField", + "type": "Function", + "tags": [], + "label": "ButtonGroupField", + "description": [], + "signature": [ + "React.NamedExoticComponent" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/application/components/button_group_field.tsx", + "deprecated": false, + "trackAdoption": false, + "returnComment": [], + "children": [ + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ButtonGroupField.$1", + "type": "Uncategorized", + "tags": [], + "label": "props", + "description": [], + "signature": [ + "P" + ], + "path": "node_modules/@types/react/index.d.ts", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, { "parentPluginId": "triggersActionsUi", "id": "def-public.CreateConnectorFlyout", @@ -832,6 +864,145 @@ ], "initialIsOpen": false }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.hasMustacheTokens", + "type": "Function", + "tags": [], + "label": "hasMustacheTokens", + "description": [], + "signature": [ + "(str: string) => boolean" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/application/lib/has_mustache_tokens.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.hasMustacheTokens.$1", + "type": "string", + "tags": [], + "label": "str", + "description": [], + "signature": [ + "string" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/application/lib/has_mustache_tokens.ts", + "deprecated": false, + "trackAdoption": false, + "isRequired": true + } + ], + "returnComment": [], + "initialIsOpen": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.HiddenField", + "type": "Function", + "tags": [], + "label": "HiddenField", + "description": [], + "signature": [ + "React.NamedExoticComponent<", + "Props", + "> & { readonly type: (props: ", + "Props", + ") => JSX.Element; }" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/application/components/hidden_field.tsx", + "deprecated": false, + "trackAdoption": false, + "returnComment": [], + "children": [ + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.HiddenField.$1", + "type": "Uncategorized", + "tags": [], + "label": "props", + "description": [], + "signature": [ + "P" + ], + "path": "node_modules/@types/react/index.d.ts", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.JsonEditorWithMessageVariables", + "type": "Function", + "tags": [], + "label": "JsonEditorWithMessageVariables", + "description": [], + "signature": [ + "({ buttonTitle, messageVariables, paramsProperty, inputTargetValue, label, errors, areaLabel, onDocumentsChange, helpText, onBlur, showButtonTitle, euiCodeEditorProps, }: React.PropsWithChildren) => JSX.Element" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/application/components/json_editor_with_message_variables.tsx", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.JsonEditorWithMessageVariables.$1", + "type": "CompoundType", + "tags": [], + "label": "{\n buttonTitle,\n messageVariables,\n paramsProperty,\n inputTargetValue,\n label,\n errors,\n areaLabel,\n onDocumentsChange,\n helpText,\n onBlur,\n showButtonTitle,\n euiCodeEditorProps = {},\n}", + "description": [], + "signature": [ + "React.PropsWithChildren" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/application/components/json_editor_with_message_variables.tsx", + "deprecated": false, + "trackAdoption": false, + "isRequired": true + } + ], + "returnComment": [], + "initialIsOpen": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.JsonFieldWrapper", + "type": "Function", + "tags": [], + "label": "JsonFieldWrapper", + "description": [], + "signature": [ + "({ field, ...rest }: Props) => JSX.Element" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/application/components/json_field_wrapper.tsx", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.JsonFieldWrapper.$1", + "type": "Object", + "tags": [], + "label": "{ field, ...rest }", + "description": [], + "signature": [ + "Props" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/application/components/json_field_wrapper.tsx", + "deprecated": false, + "trackAdoption": false, + "isRequired": true + } + ], + "returnComment": [], + "initialIsOpen": false + }, { "parentPluginId": "triggersActionsUi", "id": "def-public.loadActionErrorLog", @@ -1398,6 +1569,39 @@ "returnComment": [], "initialIsOpen": false }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.MustacheTextFieldWrapper", + "type": "Function", + "tags": [], + "label": "MustacheTextFieldWrapper", + "description": [], + "signature": [ + "({ field, euiFieldProps, idAria, ...rest }: Props) => JSX.Element" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/application/components/mustache_text_field_wrapper.tsx", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.MustacheTextFieldWrapper.$1", + "type": "Object", + "tags": [], + "label": "{ field, euiFieldProps, idAria, ...rest }", + "description": [], + "signature": [ + "Props" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/application/components/mustache_text_field_wrapper.tsx", + "deprecated": false, + "trackAdoption": false, + "isRequired": true + } + ], + "returnComment": [], + "initialIsOpen": false + }, { "parentPluginId": "triggersActionsUi", "id": "def-public.muteRule", @@ -1490,6 +1694,70 @@ ], "initialIsOpen": false }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.PasswordField", + "type": "Function", + "tags": [], + "label": "PasswordField", + "description": [], + "signature": [ + "React.NamedExoticComponent" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/application/components/password_field.tsx", + "deprecated": false, + "trackAdoption": false, + "returnComment": [], + "children": [ + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.PasswordField.$1", + "type": "Uncategorized", + "tags": [], + "label": "props", + "description": [], + "signature": [ + "P" + ], + "path": "node_modules/@types/react/index.d.ts", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.SimpleConnectorForm", + "type": "Function", + "tags": [], + "label": "SimpleConnectorForm", + "description": [], + "signature": [ + "React.NamedExoticComponent" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/application/components/simple_connector_form.tsx", + "deprecated": false, + "trackAdoption": false, + "returnComment": [], + "children": [ + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.SimpleConnectorForm.$1", + "type": "Uncategorized", + "tags": [], + "label": "props", + "description": [], + "signature": [ + "P" + ], + "path": "node_modules/@types/react/index.d.ts", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, { "parentPluginId": "triggersActionsUi", "id": "def-public.snoozeRule", @@ -1614,72 +1882,185 @@ }, { "parentPluginId": "triggersActionsUi", - "id": "def-public.ThresholdExpression", + "id": "def-public.templateActionVariable", "type": "Function", "tags": [], - "label": "ThresholdExpression", + "label": "templateActionVariable", "description": [], "signature": [ - "(props: ", - "ThresholdExpressionProps", - ") => JSX.Element" + "(variable: ", + { + "pluginId": "alerting", + "scope": "common", + "docId": "kibAlertingPluginApi", + "section": "def-common.ActionVariable", + "text": "ActionVariable" + }, + ") => string" ], - "path": "x-pack/plugins/triggers_actions_ui/public/common/expression_items/index.ts", + "path": "x-pack/plugins/triggers_actions_ui/public/application/lib/template_action_variable.ts", "deprecated": false, "trackAdoption": false, - "returnComment": [], "children": [ { "parentPluginId": "triggersActionsUi", - "id": "def-public.ThresholdExpression.$1", - "type": "Uncategorized", + "id": "def-public.templateActionVariable.$1", + "type": "Object", "tags": [], - "label": "props", + "label": "variable", "description": [], "signature": [ - "T" + { + "pluginId": "alerting", + "scope": "common", + "docId": "kibAlertingPluginApi", + "section": "def-common.ActionVariable", + "text": "ActionVariable" + } ], - "path": "x-pack/plugins/triggers_actions_ui/public/application/lib/suspended_component_with_props.tsx", + "path": "x-pack/plugins/triggers_actions_ui/public/application/lib/template_action_variable.ts", "deprecated": false, - "trackAdoption": false + "trackAdoption": false, + "isRequired": true } ], + "returnComment": [], "initialIsOpen": false }, { "parentPluginId": "triggersActionsUi", - "id": "def-public.unmuteRule", + "id": "def-public.TextAreaWithMessageVariables", "type": "Function", "tags": [], - "label": "unmuteRule", + "label": "TextAreaWithMessageVariables", "description": [], "signature": [ - "({ id, http }: { id: string; http: ", - "HttpSetup", - "; }) => Promise" + "({ messageVariables, paramsProperty, index, inputTargetValue, isDisabled, editAction, label, errors, }: React.PropsWithChildren) => JSX.Element" ], - "path": "x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute.ts", + "path": "x-pack/plugins/triggers_actions_ui/public/application/components/text_area_with_message_variables.tsx", "deprecated": false, "trackAdoption": false, "children": [ { "parentPluginId": "triggersActionsUi", - "id": "def-public.unmuteRule.$1", - "type": "Object", + "id": "def-public.TextAreaWithMessageVariables.$1", + "type": "CompoundType", "tags": [], - "label": "{ id, http }", + "label": "{\n messageVariables,\n paramsProperty,\n index,\n inputTargetValue,\n isDisabled = false,\n editAction,\n label,\n errors,\n}", "description": [], - "path": "x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute.ts", + "signature": [ + "React.PropsWithChildren" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/application/components/text_area_with_message_variables.tsx", "deprecated": false, "trackAdoption": false, - "children": [ - { - "parentPluginId": "triggersActionsUi", - "id": "def-public.unmuteRule.$1.id", - "type": "string", - "tags": [], - "label": "id", - "description": [], + "isRequired": true + } + ], + "returnComment": [], + "initialIsOpen": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.TextFieldWithMessageVariables", + "type": "Function", + "tags": [], + "label": "TextFieldWithMessageVariables", + "description": [], + "signature": [ + "({ buttonTitle, messageVariables, paramsProperty, index, inputTargetValue, editAction, errors, formRowProps, defaultValue, wrapField, showButtonTitle, }: React.PropsWithChildren) => JSX.Element" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/application/components/text_field_with_message_variables.tsx", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.TextFieldWithMessageVariables.$1", + "type": "CompoundType", + "tags": [], + "label": "{\n buttonTitle,\n messageVariables,\n paramsProperty,\n index,\n inputTargetValue,\n editAction,\n errors,\n formRowProps,\n defaultValue,\n wrapField = false,\n showButtonTitle,\n}", + "description": [], + "signature": [ + "React.PropsWithChildren" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/application/components/text_field_with_message_variables.tsx", + "deprecated": false, + "trackAdoption": false, + "isRequired": true + } + ], + "returnComment": [], + "initialIsOpen": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ThresholdExpression", + "type": "Function", + "tags": [], + "label": "ThresholdExpression", + "description": [], + "signature": [ + "(props: ", + "ThresholdExpressionProps", + ") => JSX.Element" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/common/expression_items/index.ts", + "deprecated": false, + "trackAdoption": false, + "returnComment": [], + "children": [ + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ThresholdExpression.$1", + "type": "Uncategorized", + "tags": [], + "label": "props", + "description": [], + "signature": [ + "T" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/application/lib/suspended_component_with_props.tsx", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.unmuteRule", + "type": "Function", + "tags": [], + "label": "unmuteRule", + "description": [], + "signature": [ + "({ id, http }: { id: string; http: ", + "HttpSetup", + "; }) => Promise" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.unmuteRule.$1", + "type": "Object", + "tags": [], + "label": "{ id, http }", + "description": [], + "path": "x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.unmuteRule.$1.id", + "type": "string", + "tags": [], + "label": "id", + "description": [], "path": "x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute.ts", "deprecated": false, "trackAdoption": false @@ -1776,6 +2157,106 @@ "returnComment": [], "initialIsOpen": false }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.updateActionConnector", + "type": "Function", + "tags": [], + "label": "updateActionConnector", + "description": [], + "signature": [ + "({\n http,\n connector,\n id,\n}: { http: ", + "HttpSetup", + "; connector: Pick<", + "ActionConnectorWithoutId", + ", Record>, \"name\" | \"config\" | \"secrets\">; id: string; }) => Promise<", + { + "pluginId": "triggersActionsUi", + "scope": "public", + "docId": "kibTriggersActionsUiPluginApi", + "section": "def-public.ActionConnector", + "text": "ActionConnector" + }, + ", Record>>" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/update.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.updateActionConnector.$1", + "type": "Object", + "tags": [], + "label": "{\n http,\n connector,\n id,\n}", + "description": [], + "path": "x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/update.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.updateActionConnector.$1.http", + "type": "Object", + "tags": [], + "label": "http", + "description": [], + "signature": [ + "HttpSetup" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/update.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.updateActionConnector.$1.connector", + "type": "Object", + "tags": [], + "label": "connector", + "description": [], + "signature": [ + "{ name: string; config: Record; secrets: Record; }" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/update.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.updateActionConnector.$1.id", + "type": "string", + "tags": [], + "label": "id", + "description": [], + "path": "x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/update.ts", + "deprecated": false, + "trackAdoption": false + } + ] + } + ], + "returnComment": [], + "initialIsOpen": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.useConnectorContext", + "type": "Function", + "tags": [], + "label": "useConnectorContext", + "description": [], + "signature": [ + "() => ", + "ConnectorContextValue" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/application/context/use_connector_context.ts", + "deprecated": false, + "trackAdoption": false, + "children": [], + "returnComment": [], + "initialIsOpen": false + }, { "parentPluginId": "triggersActionsUi", "id": "def-public.useLoadRuleTypes", @@ -1819,6 +2300,41 @@ "returnComment": [], "initialIsOpen": false }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.useTypedKibana", + "type": "Function", + "tags": [], + "label": "useTypedKibana", + "description": [], + "signature": [ + "() => ", + { + "pluginId": "kibanaReact", + "scope": "public", + "docId": "kibKibanaReactPluginApi", + "section": "def-public.KibanaReactContextValue", + "text": "KibanaReactContextValue" + }, + " & ", + { + "pluginId": "triggersActionsUi", + "scope": "public", + "docId": "kibTriggersActionsUiPluginApi", + "section": "def-public.TriggersAndActionsUiServices", + "text": "TriggersAndActionsUiServices" + }, + ">" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/kibana_react.ts", + "deprecated": false, + "trackAdoption": false, + "children": [], + "returnComment": [], + "initialIsOpen": false + }, { "parentPluginId": "triggersActionsUi", "id": "def-public.ValueExpression", @@ -1891,95 +2407,651 @@ "interfaces": [ { "parentPluginId": "triggersActionsUi", - "id": "def-public.ActionType", + "id": "def-public.ActionConnectorFieldsProps", "type": "Interface", "tags": [], - "label": "ActionType", + "label": "ActionConnectorFieldsProps", "description": [], - "path": "x-pack/plugins/actions/common/types.ts", + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", "deprecated": false, "trackAdoption": false, "children": [ { "parentPluginId": "triggersActionsUi", - "id": "def-public.ActionType.id", - "type": "string", + "id": "def-public.ActionConnectorFieldsProps.readOnly", + "type": "boolean", "tags": [], - "label": "id", + "label": "readOnly", "description": [], - "path": "x-pack/plugins/actions/common/types.ts", + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "triggersActionsUi", - "id": "def-public.ActionType.name", - "type": "string", + "id": "def-public.ActionConnectorFieldsProps.isEdit", + "type": "boolean", "tags": [], - "label": "name", + "label": "isEdit", "description": [], - "path": "x-pack/plugins/actions/common/types.ts", + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "triggersActionsUi", - "id": "def-public.ActionType.enabled", - "type": "boolean", + "id": "def-public.ActionConnectorFieldsProps.registerPreSubmitValidator", + "type": "Function", "tags": [], - "label": "enabled", + "label": "registerPreSubmitValidator", "description": [], - "path": "x-pack/plugins/actions/common/types.ts", + "signature": [ + "(validator: ", + "ConnectorValidationFunc", + ") => void" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", "deprecated": false, - "trackAdoption": false - }, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionConnectorFieldsProps.registerPreSubmitValidator.$1", + "type": "Function", + "tags": [], + "label": "validator", + "description": [], + "signature": [ + "ConnectorValidationFunc" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", + "deprecated": false, + "trackAdoption": false, + "isRequired": true + } + ], + "returnComment": [] + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionParamsProps", + "type": "Interface", + "tags": [], + "label": "ActionParamsProps", + "description": [], + "signature": [ { - "parentPluginId": "triggersActionsUi", - "id": "def-public.ActionType.enabledInConfig", - "type": "boolean", + "pluginId": "triggersActionsUi", + "scope": "public", + "docId": "kibTriggersActionsUiPluginApi", + "section": "def-public.ActionParamsProps", + "text": "ActionParamsProps" + }, + "" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionParamsProps.actionParams", + "type": "Object", + "tags": [], + "label": "actionParams", + "description": [], + "signature": [ + "{ [P in keyof TParams]?: TParams[P] | undefined; }" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionParamsProps.index", + "type": "number", + "tags": [], + "label": "index", + "description": [], + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionParamsProps.editAction", + "type": "Function", + "tags": [], + "label": "editAction", + "description": [], + "signature": [ + "(key: string, value: ", + "SavedObjectAttribute", + ", index: number) => void" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionParamsProps.editAction.$1", + "type": "string", + "tags": [], + "label": "key", + "description": [], + "signature": [ + "string" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", + "deprecated": false, + "trackAdoption": false, + "isRequired": true + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionParamsProps.editAction.$2", + "type": "CompoundType", + "tags": [], + "label": "value", + "description": [], + "signature": [ + "SavedObjectAttribute" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", + "deprecated": false, + "trackAdoption": false, + "isRequired": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionParamsProps.editAction.$3", + "type": "number", + "tags": [], + "label": "index", + "description": [], + "signature": [ + "number" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", + "deprecated": false, + "trackAdoption": false, + "isRequired": true + } + ], + "returnComment": [] + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionParamsProps.errors", + "type": "Object", + "tags": [], + "label": "errors", + "description": [], + "signature": [ + { + "pluginId": "triggersActionsUi", + "scope": "public", + "docId": "kibTriggersActionsUiPluginApi", + "section": "def-public.IErrorObject", + "text": "IErrorObject" + } + ], + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionParamsProps.messageVariables", + "type": "Array", + "tags": [], + "label": "messageVariables", + "description": [], + "signature": [ + { + "pluginId": "alerting", + "scope": "common", + "docId": "kibAlertingPluginApi", + "section": "def-common.ActionVariable", + "text": "ActionVariable" + }, + "[] | undefined" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionParamsProps.defaultMessage", + "type": "string", + "tags": [], + "label": "defaultMessage", + "description": [], + "signature": [ + "string | undefined" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionParamsProps.actionConnector", + "type": "CompoundType", + "tags": [], + "label": "actionConnector", + "description": [], + "signature": [ + { + "pluginId": "triggersActionsUi", + "scope": "public", + "docId": "kibTriggersActionsUiPluginApi", + "section": "def-public.ActionConnector", + "text": "ActionConnector" + }, + ", Record> | undefined" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionParamsProps.isLoading", + "type": "CompoundType", + "tags": [], + "label": "isLoading", + "description": [], + "signature": [ + "boolean | undefined" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionParamsProps.isDisabled", + "type": "CompoundType", + "tags": [], + "label": "isDisabled", + "description": [], + "signature": [ + "boolean | undefined" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionParamsProps.showEmailSubjectAndMessage", + "type": "CompoundType", + "tags": [], + "label": "showEmailSubjectAndMessage", + "description": [], + "signature": [ + "boolean | undefined" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionType", + "type": "Interface", + "tags": [], + "label": "ActionType", + "description": [], + "path": "x-pack/plugins/actions/common/types.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionType.id", + "type": "string", + "tags": [], + "label": "id", + "description": [], + "path": "x-pack/plugins/actions/common/types.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionType.name", + "type": "string", + "tags": [], + "label": "name", + "description": [], + "path": "x-pack/plugins/actions/common/types.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionType.enabled", + "type": "boolean", + "tags": [], + "label": "enabled", + "description": [], + "path": "x-pack/plugins/actions/common/types.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionType.enabledInConfig", + "type": "boolean", + "tags": [], + "label": "enabledInConfig", + "description": [], + "path": "x-pack/plugins/actions/common/types.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionType.enabledInLicense", + "type": "boolean", + "tags": [], + "label": "enabledInLicense", + "description": [], + "path": "x-pack/plugins/actions/common/types.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionType.minimumLicenseRequired", + "type": "CompoundType", + "tags": [], + "label": "minimumLicenseRequired", + "description": [], + "signature": [ + "\"basic\" | \"standard\" | \"gold\" | \"platinum\" | \"enterprise\" | \"trial\"" + ], + "path": "x-pack/plugins/actions/common/types.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionType.supportedFeatureIds", + "type": "Array", + "tags": [], + "label": "supportedFeatureIds", + "description": [], + "signature": [ + "string[]" + ], + "path": "x-pack/plugins/actions/common/types.ts", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionTypeModel", + "type": "Interface", + "tags": [], + "label": "ActionTypeModel", + "description": [], + "signature": [ + { + "pluginId": "triggersActionsUi", + "scope": "public", + "docId": "kibTriggersActionsUiPluginApi", + "section": "def-public.ActionTypeModel", + "text": "ActionTypeModel" + }, + "" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionTypeModel.id", + "type": "string", + "tags": [], + "label": "id", + "description": [], + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionTypeModel.iconClass", + "type": "CompoundType", + "tags": [], + "label": "iconClass", + "description": [], + "signature": [ + "string | React.ComponentType<{}>" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionTypeModel.selectMessage", + "type": "string", + "tags": [], + "label": "selectMessage", + "description": [], + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionTypeModel.actionTypeTitle", + "type": "string", + "tags": [], + "label": "actionTypeTitle", + "description": [], + "signature": [ + "string | undefined" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionTypeModel.validateParams", + "type": "Function", + "tags": [], + "label": "validateParams", + "description": [], + "signature": [ + "(actionParams: ActionParams) => Promise<", + { + "pluginId": "triggersActionsUi", + "scope": "public", + "docId": "kibTriggersActionsUiPluginApi", + "section": "def-public.GenericValidationResult", + "text": "GenericValidationResult" + }, + ">" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionTypeModel.validateParams.$1", + "type": "Uncategorized", + "tags": [], + "label": "actionParams", + "description": [], + "signature": [ + "ActionParams" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", + "deprecated": false, + "trackAdoption": false, + "isRequired": true + } + ], + "returnComment": [] + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionTypeModel.actionConnectorFields", + "type": "CompoundType", + "tags": [], + "label": "actionConnectorFields", + "description": [], + "signature": [ + "React.LazyExoticComponent> | null" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionTypeModel.actionParamsFields", + "type": "Function", + "tags": [], + "label": "actionParamsFields", + "description": [], + "signature": [ + "React.ExoticComponent<(", + { + "pluginId": "triggersActionsUi", + "scope": "public", + "docId": "kibTriggersActionsUiPluginApi", + "section": "def-public.ActionParamsProps", + "text": "ActionParamsProps" + }, + " & React.RefAttributes, any, any>>) | (", + { + "pluginId": "triggersActionsUi", + "scope": "public", + "docId": "kibTriggersActionsUiPluginApi", + "section": "def-public.ActionParamsProps", + "text": "ActionParamsProps" + }, + " & { children?: React.ReactNode; })> & { readonly _result: React.ComponentType<", + { + "pluginId": "triggersActionsUi", + "scope": "public", + "docId": "kibTriggersActionsUiPluginApi", + "section": "def-public.ActionParamsProps", + "text": "ActionParamsProps" + }, + ">; }" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", + "deprecated": false, + "trackAdoption": false, + "returnComment": [], + "children": [ + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionTypeModel.actionParamsFields.$1", + "type": "Uncategorized", + "tags": [], + "label": "props", + "description": [], + "signature": [ + "P" + ], + "path": "node_modules/@types/react/index.d.ts", + "deprecated": false, + "trackAdoption": false + } + ] + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ActionTypeModel.defaultActionParams", + "type": "Object", "tags": [], - "label": "enabledInConfig", + "label": "defaultActionParams", "description": [], - "path": "x-pack/plugins/actions/common/types.ts", + "signature": [ + "Partial | undefined" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "triggersActionsUi", - "id": "def-public.ActionType.enabledInLicense", - "type": "boolean", + "id": "def-public.ActionTypeModel.defaultRecoveredActionParams", + "type": "Object", "tags": [], - "label": "enabledInLicense", + "label": "defaultRecoveredActionParams", "description": [], - "path": "x-pack/plugins/actions/common/types.ts", + "signature": [ + "Partial | undefined" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "triggersActionsUi", - "id": "def-public.ActionType.minimumLicenseRequired", - "type": "CompoundType", + "id": "def-public.ActionTypeModel.customConnectorSelectItem", + "type": "Object", "tags": [], - "label": "minimumLicenseRequired", + "label": "customConnectorSelectItem", "description": [], "signature": [ - "\"basic\" | \"standard\" | \"gold\" | \"platinum\" | \"enterprise\" | \"trial\"" + "CustomConnectorSelectionItem | undefined" ], - "path": "x-pack/plugins/actions/common/types.ts", + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "triggersActionsUi", - "id": "def-public.ActionType.supportedFeatureIds", - "type": "Array", + "id": "def-public.ActionTypeModel.isExperimental", + "type": "CompoundType", "tags": [], - "label": "supportedFeatureIds", + "label": "isExperimental", "description": [], "signature": [ - "string[]" + "boolean | undefined" ], - "path": "x-pack/plugins/actions/common/types.ts", + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", "deprecated": false, "trackAdoption": false } @@ -2805,6 +3877,45 @@ ], "initialIsOpen": false }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ConfigFieldSchema", + "type": "Interface", + "tags": [], + "label": "ConfigFieldSchema", + "description": [], + "signature": [ + { + "pluginId": "triggersActionsUi", + "scope": "public", + "docId": "kibTriggersActionsUiPluginApi", + "section": "def-public.ConfigFieldSchema", + "text": "ConfigFieldSchema" + }, + " extends ", + "CommonFieldSchema" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/application/components/simple_connector_form.tsx", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ConfigFieldSchema.isUrlField", + "type": "CompoundType", + "tags": [], + "label": "isUrlField", + "description": [], + "signature": [ + "boolean | undefined" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/application/components/simple_connector_form.tsx", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, { "parentPluginId": "triggersActionsUi", "id": "def-public.FieldBrowserOptions", @@ -3010,6 +4121,44 @@ ], "initialIsOpen": false }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.GenericValidationResult", + "type": "Interface", + "tags": [], + "label": "GenericValidationResult", + "description": [], + "signature": [ + { + "pluginId": "triggersActionsUi", + "scope": "public", + "docId": "kibTriggersActionsUiPluginApi", + "section": "def-public.GenericValidationResult", + "text": "GenericValidationResult" + }, + "" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.GenericValidationResult.errors", + "type": "Object", + "tags": [], + "label": "errors", + "description": [], + "signature": [ + "{ [P in Extract]: unknown; }" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, { "parentPluginId": "triggersActionsUi", "id": "def-public.IErrorObject", @@ -3218,11 +4367,29 @@ "description": [], "signature": [ "{ get: (id: string) => ", - "ActionTypeModel", + { + "pluginId": "triggersActionsUi", + "scope": "public", + "docId": "kibTriggersActionsUiPluginApi", + "section": "def-public.ActionTypeModel", + "text": "ActionTypeModel" + }, "; list: () => ", - "ActionTypeModel", + { + "pluginId": "triggersActionsUi", + "scope": "public", + "docId": "kibTriggersActionsUiPluginApi", + "section": "def-public.ActionTypeModel", + "text": "ActionTypeModel" + }, "[]; register: (objectType: ", - "ActionTypeModel", + { + "pluginId": "triggersActionsUi", + "scope": "public", + "docId": "kibTriggersActionsUiPluginApi", + "section": "def-public.ActionTypeModel", + "text": "ActionTypeModel" + }, ") => void; has: (id: string) => boolean; }" ], "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", @@ -4147,6 +5314,45 @@ ], "initialIsOpen": false }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.SecretsFieldSchema", + "type": "Interface", + "tags": [], + "label": "SecretsFieldSchema", + "description": [], + "signature": [ + { + "pluginId": "triggersActionsUi", + "scope": "public", + "docId": "kibTriggersActionsUiPluginApi", + "section": "def-public.SecretsFieldSchema", + "text": "SecretsFieldSchema" + }, + " extends ", + "CommonFieldSchema" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/application/components/simple_connector_form.tsx", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.SecretsFieldSchema.isPasswordField", + "type": "CompoundType", + "tags": [], + "label": "isPasswordField", + "description": [], + "signature": [ + "boolean | undefined" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/application/components/simple_connector_form.tsx", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, { "parentPluginId": "triggersActionsUi", "id": "def-public.TriggersAndActionsUiServices", @@ -4390,11 +5596,29 @@ "description": [], "signature": [ "{ get: (id: string) => ", - "ActionTypeModel", + { + "pluginId": "triggersActionsUi", + "scope": "public", + "docId": "kibTriggersActionsUiPluginApi", + "section": "def-public.ActionTypeModel", + "text": "ActionTypeModel" + }, "; list: () => ", - "ActionTypeModel", + { + "pluginId": "triggersActionsUi", + "scope": "public", + "docId": "kibTriggersActionsUiPluginApi", + "section": "def-public.ActionTypeModel", + "text": "ActionTypeModel" + }, "[]; register: (objectType: ", - "ActionTypeModel", + { + "pluginId": "triggersActionsUi", + "scope": "public", + "docId": "kibTriggersActionsUiPluginApi", + "section": "def-public.ActionTypeModel", + "text": "ActionTypeModel" + }, ") => void; has: (id: string) => boolean; }" ], "path": "x-pack/plugins/triggers_actions_ui/public/application/app.tsx", @@ -4603,6 +5827,18 @@ } ], "enums": [ + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.AlertProvidedActionVariables", + "type": "Enum", + "tags": [], + "label": "AlertProvidedActionVariables", + "description": [], + "path": "x-pack/plugins/triggers_actions_ui/public/application/lib/action_variables.ts", + "deprecated": false, + "trackAdoption": false, + "initialIsOpen": false + }, { "parentPluginId": "triggersActionsUi", "id": "def-public.COMPARATORS", @@ -4690,11 +5926,29 @@ "description": [], "signature": [ "{ get: (id: string) => ", - "ActionTypeModel", + { + "pluginId": "triggersActionsUi", + "scope": "public", + "docId": "kibTriggersActionsUiPluginApi", + "section": "def-public.ActionTypeModel", + "text": "ActionTypeModel" + }, "; list: () => ", - "ActionTypeModel", + { + "pluginId": "triggersActionsUi", + "scope": "public", + "docId": "kibTriggersActionsUiPluginApi", + "section": "def-public.ActionTypeModel", + "text": "ActionTypeModel" + }, "[]; register: (objectType: ", - "ActionTypeModel", + { + "pluginId": "triggersActionsUi", + "scope": "public", + "docId": "kibTriggersActionsUiPluginApi", + "section": "def-public.ActionTypeModel", + "text": "ActionTypeModel" + }, ") => void; has: (id: string) => boolean; }" ], "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", @@ -4717,6 +5971,63 @@ "trackAdoption": false, "initialIsOpen": false }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ALERT_HISTORY_PREFIX", + "type": "string", + "tags": [], + "label": "ALERT_HISTORY_PREFIX", + "description": [], + "signature": [ + "\"kibana-alert-history-\"" + ], + "path": "x-pack/plugins/actions/common/alert_history_schema.ts", + "deprecated": false, + "trackAdoption": false, + "initialIsOpen": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.AlertHistoryDefaultIndexName", + "type": "string", + "tags": [], + "label": "AlertHistoryDefaultIndexName", + "description": [], + "path": "x-pack/plugins/actions/common/alert_history_schema.ts", + "deprecated": false, + "trackAdoption": false, + "initialIsOpen": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.AlertHistoryDocumentTemplate", + "type": "CompoundType", + "tags": [], + "label": "AlertHistoryDocumentTemplate", + "description": [], + "signature": [ + "Readonly<{ event: { kind: string; }; kibana?: { alert: { actionGroupName?: string | undefined; actionGroup?: string | undefined; context?: { [x: string]: Record; } | undefined; id?: string | undefined; }; } | undefined; rule?: { type?: string | undefined; space?: string | undefined; params?: { [x: string]: Record; } | undefined; name?: string | undefined; id?: string | undefined; } | undefined; message?: unknown; tags?: string[] | undefined; '@timestamp': string; }> | null" + ], + "path": "x-pack/plugins/actions/common/alert_history_schema.ts", + "deprecated": false, + "trackAdoption": false, + "initialIsOpen": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.AlertHistoryEsIndexConnectorId", + "type": "string", + "tags": [], + "label": "AlertHistoryEsIndexConnectorId", + "description": [], + "signature": [ + "\"preconfigured-alert-history-es-index\"" + ], + "path": "x-pack/plugins/actions/common/alert_history_schema.ts", + "deprecated": false, + "trackAdoption": false, + "initialIsOpen": false + }, { "parentPluginId": "triggersActionsUi", "id": "def-public.AlertsTableConfigurationRegistryContract", @@ -4784,6 +6095,51 @@ "trackAdoption": false, "initialIsOpen": false }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.connectorDeprecatedMessage", + "type": "string", + "tags": [], + "label": "connectorDeprecatedMessage", + "description": [], + "path": "x-pack/plugins/triggers_actions_ui/public/common/connectors_selection.tsx", + "deprecated": false, + "trackAdoption": false, + "initialIsOpen": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.ConnectorFormSchema", + "type": "Type", + "tags": [], + "label": "ConnectorFormSchema", + "description": [ + "\nThe following type is equivalent to:\n\ninterface ConnectorFormSchema {\n id?: string,\n name?: string,\n actionTypeId: string,\n isDeprecated: boolean,\n config: Config,\n secrets: Secrets,\n}" + ], + "signature": [ + "Pick<", + "UserConfiguredActionConnector", + ", \"config\" | \"secrets\" | \"actionTypeId\" | \"isDeprecated\"> & Partial, \"name\" | \"id\">>" + ], + "path": "x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/types.ts", + "deprecated": false, + "trackAdoption": false, + "initialIsOpen": false + }, + { + "parentPluginId": "triggersActionsUi", + "id": "def-public.deprecatedMessage", + "type": "string", + "tags": [], + "label": "deprecatedMessage", + "description": [], + "path": "x-pack/plugins/triggers_actions_ui/public/common/connectors_selection.tsx", + "deprecated": false, + "trackAdoption": false, + "initialIsOpen": false + }, { "parentPluginId": "triggersActionsUi", "id": "def-public.GetRenderCellValue", @@ -5801,7 +7157,13 @@ "signature": [ "TypeRegistry", "<", - "ActionTypeModel", + { + "pluginId": "triggersActionsUi", + "scope": "public", + "docId": "kibTriggersActionsUiPluginApi", + "section": "def-public.ActionTypeModel", + "text": "ActionTypeModel" + }, ">" ], "path": "x-pack/plugins/triggers_actions_ui/public/plugin.ts", @@ -5873,7 +7235,13 @@ "signature": [ "TypeRegistry", "<", - "ActionTypeModel", + { + "pluginId": "triggersActionsUi", + "scope": "public", + "docId": "kibTriggersActionsUiPluginApi", + "section": "def-public.ActionTypeModel", + "text": "ActionTypeModel" + }, ">" ], "path": "x-pack/plugins/triggers_actions_ui/public/plugin.ts", diff --git a/api_docs/triggers_actions_ui.mdx b/api_docs/triggers_actions_ui.mdx index 0a3cbb630285f..cfa8f8965332e 100644 --- a/api_docs/triggers_actions_ui.mdx +++ b/api_docs/triggers_actions_ui.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/triggersActionsUi title: "triggersActionsUi" image: https://source.unsplash.com/400x175/?github description: API docs for the triggersActionsUi plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'triggersActionsUi'] --- import triggersActionsUiObj from './triggers_actions_ui.devdocs.json'; @@ -21,7 +21,7 @@ Contact [Response Ops](https://github.com/orgs/elastic/teams/response-ops) for q | Public API count | Any count | Items lacking comments | Missing exports | |-------------------|-----------|------------------------|-----------------| -| 437 | 1 | 416 | 45 | +| 513 | 1 | 486 | 48 | ## Client diff --git a/api_docs/ui_actions.mdx b/api_docs/ui_actions.mdx index 2a01df283087a..25fd9d32aac51 100644 --- a/api_docs/ui_actions.mdx +++ b/api_docs/ui_actions.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/uiActions title: "uiActions" image: https://source.unsplash.com/400x175/?github description: API docs for the uiActions plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'uiActions'] --- import uiActionsObj from './ui_actions.devdocs.json'; diff --git a/api_docs/ui_actions_enhanced.mdx b/api_docs/ui_actions_enhanced.mdx index f46cdf9d62ee1..f85563ce18a73 100644 --- a/api_docs/ui_actions_enhanced.mdx +++ b/api_docs/ui_actions_enhanced.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/uiActionsEnhanced title: "uiActionsEnhanced" image: https://source.unsplash.com/400x175/?github description: API docs for the uiActionsEnhanced plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'uiActionsEnhanced'] --- import uiActionsEnhancedObj from './ui_actions_enhanced.devdocs.json'; diff --git a/api_docs/unified_field_list.mdx b/api_docs/unified_field_list.mdx index f70e303ebe4d7..2aae0fbddf27b 100644 --- a/api_docs/unified_field_list.mdx +++ b/api_docs/unified_field_list.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/unifiedFieldList title: "unifiedFieldList" image: https://source.unsplash.com/400x175/?github description: API docs for the unifiedFieldList plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'unifiedFieldList'] --- import unifiedFieldListObj from './unified_field_list.devdocs.json'; diff --git a/api_docs/unified_search.mdx b/api_docs/unified_search.mdx index 2e10e0a54e2cd..261ef25b80e9b 100644 --- a/api_docs/unified_search.mdx +++ b/api_docs/unified_search.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/unifiedSearch title: "unifiedSearch" image: https://source.unsplash.com/400x175/?github description: API docs for the unifiedSearch plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'unifiedSearch'] --- import unifiedSearchObj from './unified_search.devdocs.json'; diff --git a/api_docs/unified_search_autocomplete.mdx b/api_docs/unified_search_autocomplete.mdx index 18b782fa7081b..1e75d7da1deb9 100644 --- a/api_docs/unified_search_autocomplete.mdx +++ b/api_docs/unified_search_autocomplete.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/unifiedSearch-autocomplete title: "unifiedSearch.autocomplete" image: https://source.unsplash.com/400x175/?github description: API docs for the unifiedSearch.autocomplete plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'unifiedSearch.autocomplete'] --- import unifiedSearchAutocompleteObj from './unified_search_autocomplete.devdocs.json'; diff --git a/api_docs/url_forwarding.mdx b/api_docs/url_forwarding.mdx index 7a9ded502796d..d2cdaf4d89c84 100644 --- a/api_docs/url_forwarding.mdx +++ b/api_docs/url_forwarding.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/urlForwarding title: "urlForwarding" image: https://source.unsplash.com/400x175/?github description: API docs for the urlForwarding plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'urlForwarding'] --- import urlForwardingObj from './url_forwarding.devdocs.json'; diff --git a/api_docs/usage_collection.mdx b/api_docs/usage_collection.mdx index 34bbb721a3728..5f6baf6d86c5f 100644 --- a/api_docs/usage_collection.mdx +++ b/api_docs/usage_collection.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/usageCollection title: "usageCollection" image: https://source.unsplash.com/400x175/?github description: API docs for the usageCollection plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'usageCollection'] --- import usageCollectionObj from './usage_collection.devdocs.json'; diff --git a/api_docs/ux.mdx b/api_docs/ux.mdx index c3afd8d86827c..470423b8266a7 100644 --- a/api_docs/ux.mdx +++ b/api_docs/ux.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/ux title: "ux" image: https://source.unsplash.com/400x175/?github description: API docs for the ux plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'ux'] --- import uxObj from './ux.devdocs.json'; diff --git a/api_docs/vis_default_editor.mdx b/api_docs/vis_default_editor.mdx index 271d79629a0b7..ff57731114146 100644 --- a/api_docs/vis_default_editor.mdx +++ b/api_docs/vis_default_editor.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visDefaultEditor title: "visDefaultEditor" image: https://source.unsplash.com/400x175/?github description: API docs for the visDefaultEditor plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visDefaultEditor'] --- import visDefaultEditorObj from './vis_default_editor.devdocs.json'; diff --git a/api_docs/vis_type_gauge.mdx b/api_docs/vis_type_gauge.mdx index f28ab39c716fb..1da13d1fcc094 100644 --- a/api_docs/vis_type_gauge.mdx +++ b/api_docs/vis_type_gauge.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeGauge title: "visTypeGauge" image: https://source.unsplash.com/400x175/?github description: API docs for the visTypeGauge plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeGauge'] --- import visTypeGaugeObj from './vis_type_gauge.devdocs.json'; diff --git a/api_docs/vis_type_heatmap.mdx b/api_docs/vis_type_heatmap.mdx index 32a96558c72f8..d30f1b6a560aa 100644 --- a/api_docs/vis_type_heatmap.mdx +++ b/api_docs/vis_type_heatmap.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeHeatmap title: "visTypeHeatmap" image: https://source.unsplash.com/400x175/?github description: API docs for the visTypeHeatmap plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeHeatmap'] --- import visTypeHeatmapObj from './vis_type_heatmap.devdocs.json'; diff --git a/api_docs/vis_type_pie.mdx b/api_docs/vis_type_pie.mdx index 827eb1f6f0969..f8d894bdaa7de 100644 --- a/api_docs/vis_type_pie.mdx +++ b/api_docs/vis_type_pie.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypePie title: "visTypePie" image: https://source.unsplash.com/400x175/?github description: API docs for the visTypePie plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypePie'] --- import visTypePieObj from './vis_type_pie.devdocs.json'; diff --git a/api_docs/vis_type_table.mdx b/api_docs/vis_type_table.mdx index d9fc5b663679c..deb819de77df3 100644 --- a/api_docs/vis_type_table.mdx +++ b/api_docs/vis_type_table.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeTable title: "visTypeTable" image: https://source.unsplash.com/400x175/?github description: API docs for the visTypeTable plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeTable'] --- import visTypeTableObj from './vis_type_table.devdocs.json'; diff --git a/api_docs/vis_type_timelion.mdx b/api_docs/vis_type_timelion.mdx index e8dfbf76d6ffa..042fb74b10af4 100644 --- a/api_docs/vis_type_timelion.mdx +++ b/api_docs/vis_type_timelion.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeTimelion title: "visTypeTimelion" image: https://source.unsplash.com/400x175/?github description: API docs for the visTypeTimelion plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeTimelion'] --- import visTypeTimelionObj from './vis_type_timelion.devdocs.json'; diff --git a/api_docs/vis_type_timeseries.mdx b/api_docs/vis_type_timeseries.mdx index c962200fe1fdc..2458fbb4d9dee 100644 --- a/api_docs/vis_type_timeseries.mdx +++ b/api_docs/vis_type_timeseries.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeTimeseries title: "visTypeTimeseries" image: https://source.unsplash.com/400x175/?github description: API docs for the visTypeTimeseries plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeTimeseries'] --- import visTypeTimeseriesObj from './vis_type_timeseries.devdocs.json'; diff --git a/api_docs/vis_type_vega.mdx b/api_docs/vis_type_vega.mdx index abe648760bf12..606b4dcf05e16 100644 --- a/api_docs/vis_type_vega.mdx +++ b/api_docs/vis_type_vega.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeVega title: "visTypeVega" image: https://source.unsplash.com/400x175/?github description: API docs for the visTypeVega plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeVega'] --- import visTypeVegaObj from './vis_type_vega.devdocs.json'; diff --git a/api_docs/vis_type_vislib.mdx b/api_docs/vis_type_vislib.mdx index 4260c1aaeb253..e56cd5d8f509d 100644 --- a/api_docs/vis_type_vislib.mdx +++ b/api_docs/vis_type_vislib.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeVislib title: "visTypeVislib" image: https://source.unsplash.com/400x175/?github description: API docs for the visTypeVislib plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeVislib'] --- import visTypeVislibObj from './vis_type_vislib.devdocs.json'; diff --git a/api_docs/vis_type_xy.mdx b/api_docs/vis_type_xy.mdx index f03c9b37afbb4..9ac63dfe30ccc 100644 --- a/api_docs/vis_type_xy.mdx +++ b/api_docs/vis_type_xy.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeXy title: "visTypeXy" image: https://source.unsplash.com/400x175/?github description: API docs for the visTypeXy plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeXy'] --- import visTypeXyObj from './vis_type_xy.devdocs.json'; diff --git a/api_docs/visualizations.mdx b/api_docs/visualizations.mdx index c4ea2e6c61e76..e5907aaf8a8a5 100644 --- a/api_docs/visualizations.mdx +++ b/api_docs/visualizations.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visualizations title: "visualizations" image: https://source.unsplash.com/400x175/?github description: API docs for the visualizations plugin -date: 2022-09-27 +date: 2022-09-28 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visualizations'] --- import visualizationsObj from './visualizations.devdocs.json'; From e24fc503f661091b7dac115695453bb3b7f4e902 Mon Sep 17 00:00:00 2001 From: Pierre Gayvallet Date: Wed, 28 Sep 2022 08:59:09 +0200 Subject: [PATCH 27/95] Move `RequestHandlerContext` types and implementation to packages (#141759) * create empty packages * continue moving things * adapt usages * [CI] Auto-commit changed files from 'node scripts/generate codeowners' * renaming packages... * adapting usages again * [CI] Auto-commit changed files from 'node scripts/generate codeowners' * move preboot context to packages too * add internal test mocks * update READMEs Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com> --- .github/CODEOWNERS | 2 + package.json | 4 + packages/BUILD.bazel | 4 + .../BUILD.bazel | 116 ++++++++++++++++++ .../README.md | 3 + .../index.ts | 10 ++ .../jest.config.js | 13 ++ .../kibana.jsonc | 7 ++ .../package.json | 8 ++ .../src}/core_route_handler_context.test.ts | 33 ++--- .../src/core_route_handler_context.ts | 63 ++++++++++ .../src/index.ts | 12 ++ ...preboot_core_route_handler_context.test.ts | 6 +- .../preboot_core_route_handler_context.ts | 21 ++-- .../core_route_handler_context_params.mock.ts | 21 ++++ .../src/test_helpers/index.ts | 10 ++ ..._core_route_handler_context_params.mock.ts | 15 +++ .../tsconfig.json | 17 +++ .../BUILD.bazel | 110 +++++++++++++++++ .../README.md | 3 + .../index.ts | 16 +++ .../jest.config.js | 13 ++ .../kibana.jsonc | 7 ++ .../package.json | 8 ++ .../src/index.ts | 18 +++ .../src/preboot_request_handler_context.ts | 31 +++++ .../src/request_handler_context.ts | 41 +++---- .../tsconfig.json | 17 +++ .../http_resources/http_resources_service.ts | 2 +- src/core/server/http_resources/types.ts | 2 +- src/core/server/index.ts | 43 ++----- src/core/server/server.ts | 11 +- yarn.lock | 16 +++ 33 files changed, 607 insertions(+), 96 deletions(-) create mode 100644 packages/core/http/core-http-request-handler-context-server-internal/BUILD.bazel create mode 100644 packages/core/http/core-http-request-handler-context-server-internal/README.md create mode 100644 packages/core/http/core-http-request-handler-context-server-internal/index.ts create mode 100644 packages/core/http/core-http-request-handler-context-server-internal/jest.config.js create mode 100644 packages/core/http/core-http-request-handler-context-server-internal/kibana.jsonc create mode 100644 packages/core/http/core-http-request-handler-context-server-internal/package.json rename {src/core/server => packages/core/http/core-http-request-handler-context-server-internal/src}/core_route_handler_context.test.ts (86%) create mode 100644 packages/core/http/core-http-request-handler-context-server-internal/src/core_route_handler_context.ts create mode 100644 packages/core/http/core-http-request-handler-context-server-internal/src/index.ts rename {src/core/server => packages/core/http/core-http-request-handler-context-server-internal/src}/preboot_core_route_handler_context.test.ts (85%) rename {src/core/server => packages/core/http/core-http-request-handler-context-server-internal/src}/preboot_core_route_handler_context.ts (71%) create mode 100644 packages/core/http/core-http-request-handler-context-server-internal/src/test_helpers/core_route_handler_context_params.mock.ts create mode 100644 packages/core/http/core-http-request-handler-context-server-internal/src/test_helpers/index.ts create mode 100644 packages/core/http/core-http-request-handler-context-server-internal/src/test_helpers/preboot_core_route_handler_context_params.mock.ts create mode 100644 packages/core/http/core-http-request-handler-context-server-internal/tsconfig.json create mode 100644 packages/core/http/core-http-request-handler-context-server/BUILD.bazel create mode 100644 packages/core/http/core-http-request-handler-context-server/README.md create mode 100644 packages/core/http/core-http-request-handler-context-server/index.ts create mode 100644 packages/core/http/core-http-request-handler-context-server/jest.config.js create mode 100644 packages/core/http/core-http-request-handler-context-server/kibana.jsonc create mode 100644 packages/core/http/core-http-request-handler-context-server/package.json create mode 100644 packages/core/http/core-http-request-handler-context-server/src/index.ts create mode 100644 packages/core/http/core-http-request-handler-context-server/src/preboot_request_handler_context.ts rename src/core/server/core_route_handler_context.ts => packages/core/http/core-http-request-handler-context-server/src/request_handler_context.ts (53%) create mode 100644 packages/core/http/core-http-request-handler-context-server/tsconfig.json diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 2c1a3e323a993..d802eb4024a08 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -743,6 +743,8 @@ packages/core/http/core-http-browser-mocks @elastic/kibana-core packages/core/http/core-http-common @elastic/kibana-core packages/core/http/core-http-context-server-internal @elastic/kibana-core packages/core/http/core-http-context-server-mocks @elastic/kibana-core +packages/core/http/core-http-request-handler-context-server @elastic/kibana-core +packages/core/http/core-http-request-handler-context-server-internal @elastic/kibana-core packages/core/http/core-http-router-server-internal @elastic/kibana-core packages/core/http/core-http-router-server-mocks @elastic/kibana-core packages/core/http/core-http-server @elastic/kibana-core diff --git a/package.json b/package.json index 6c0913394e246..ebbff20d91733 100644 --- a/package.json +++ b/package.json @@ -213,6 +213,8 @@ "@kbn/core-http-common": "link:bazel-bin/packages/core/http/core-http-common", "@kbn/core-http-context-server-internal": "link:bazel-bin/packages/core/http/core-http-context-server-internal", "@kbn/core-http-context-server-mocks": "link:bazel-bin/packages/core/http/core-http-context-server-mocks", + "@kbn/core-http-request-handler-context-server": "link:bazel-bin/packages/core/http/core-http-request-handler-context-server", + "@kbn/core-http-request-handler-context-server-internal": "link:bazel-bin/packages/core/http/core-http-request-handler-context-server-internal", "@kbn/core-http-router-server-internal": "link:bazel-bin/packages/core/http/core-http-router-server-internal", "@kbn/core-http-router-server-mocks": "link:bazel-bin/packages/core/http/core-http-router-server-mocks", "@kbn/core-http-server": "link:bazel-bin/packages/core/http/core-http-server", @@ -934,6 +936,8 @@ "@types/kbn__core-http-common": "link:bazel-bin/packages/core/http/core-http-common/npm_module_types", "@types/kbn__core-http-context-server-internal": "link:bazel-bin/packages/core/http/core-http-context-server-internal/npm_module_types", "@types/kbn__core-http-context-server-mocks": "link:bazel-bin/packages/core/http/core-http-context-server-mocks/npm_module_types", + "@types/kbn__core-http-request-handler-context-server": "link:bazel-bin/packages/core/http/core-http-request-handler-context-server/npm_module_types", + "@types/kbn__core-http-request-handler-context-server-internal": "link:bazel-bin/packages/core/http/core-http-request-handler-context-server-internal/npm_module_types", "@types/kbn__core-http-router-server-internal": "link:bazel-bin/packages/core/http/core-http-router-server-internal/npm_module_types", "@types/kbn__core-http-router-server-mocks": "link:bazel-bin/packages/core/http/core-http-router-server-mocks/npm_module_types", "@types/kbn__core-http-server": "link:bazel-bin/packages/core/http/core-http-server/npm_module_types", diff --git a/packages/BUILD.bazel b/packages/BUILD.bazel index 62cc4b4ce9ad2..455b851a4936f 100644 --- a/packages/BUILD.bazel +++ b/packages/BUILD.bazel @@ -79,6 +79,8 @@ filegroup( "//packages/core/http/core-http-common:build", "//packages/core/http/core-http-context-server-internal:build", "//packages/core/http/core-http-context-server-mocks:build", + "//packages/core/http/core-http-request-handler-context-server:build", + "//packages/core/http/core-http-request-handler-context-server-internal:build", "//packages/core/http/core-http-router-server-internal:build", "//packages/core/http/core-http-router-server-mocks:build", "//packages/core/http/core-http-server:build", @@ -410,6 +412,8 @@ filegroup( "//packages/core/http/core-http-common:build_types", "//packages/core/http/core-http-context-server-internal:build_types", "//packages/core/http/core-http-context-server-mocks:build_types", + "//packages/core/http/core-http-request-handler-context-server:build_types", + "//packages/core/http/core-http-request-handler-context-server-internal:build_types", "//packages/core/http/core-http-router-server-internal:build_types", "//packages/core/http/core-http-router-server-mocks:build_types", "//packages/core/http/core-http-server:build_types", diff --git a/packages/core/http/core-http-request-handler-context-server-internal/BUILD.bazel b/packages/core/http/core-http-request-handler-context-server-internal/BUILD.bazel new file mode 100644 index 0000000000000..82040b5fb1ad8 --- /dev/null +++ b/packages/core/http/core-http-request-handler-context-server-internal/BUILD.bazel @@ -0,0 +1,116 @@ +load("@npm//@bazel/typescript:index.bzl", "ts_config") +load("@build_bazel_rules_nodejs//:index.bzl", "js_library") +load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project") + +PKG_DIRNAME = "core-http-request-handler-context-server-internal" +PKG_REQUIRE_NAME = "@kbn/core-http-request-handler-context-server-internal" + +SOURCE_FILES = glob( + [ + "**/*.ts", + ], + exclude = [ + "**/*.config.js", + "**/*.mock.*", + "**/*.test.*", + "**/*.stories.*", + "**/__snapshots__/**", + "**/integration_tests/**", + "**/mocks/**", + "**/scripts/**", + "**/storybook/**", + "**/test_fixtures/**", + "**/test_helpers/**", + ], +) + +SRCS = SOURCE_FILES + +filegroup( + name = "srcs", + srcs = SRCS, +) + +NPM_MODULE_EXTRA_FILES = [ + "package.json", +] + +RUNTIME_DEPS = [ + "//packages/core/elasticsearch/core-elasticsearch-server-internal", + "//packages/core/saved-objects/core-saved-objects-server-internal", + "//packages/core/deprecations/core-deprecations-server-internal", + "//packages/core/ui-settings/core-ui-settings-server-internal", +] + +TYPES_DEPS = [ + "@npm//@types/node", + "@npm//@types/jest", + "//packages/core/http/core-http-server:npm_module_types", + "//packages/core/http/core-http-request-handler-context-server:npm_module_types", + "//packages/core/elasticsearch/core-elasticsearch-server-internal:npm_module_types", + "//packages/core/saved-objects/core-saved-objects-server-internal:npm_module_types", + "//packages/core/deprecations/core-deprecations-server-internal:npm_module_types", + "//packages/core/ui-settings/core-ui-settings-server:npm_module_types", + "//packages/core/ui-settings/core-ui-settings-server-internal:npm_module_types", +] + +jsts_transpiler( + name = "target_node", + srcs = SRCS, + build_pkg_name = package_name(), +) + +ts_config( + name = "tsconfig", + src = "tsconfig.json", + deps = [ + "//:tsconfig.base.json", + "//:tsconfig.bazel.json", + ], +) + +ts_project( + name = "tsc_types", + args = ['--pretty'], + srcs = SRCS, + deps = TYPES_DEPS, + declaration = True, + declaration_map = True, + emit_declaration_only = True, + out_dir = "target_types", + tsconfig = ":tsconfig", +) + +js_library( + name = PKG_DIRNAME, + srcs = NPM_MODULE_EXTRA_FILES, + deps = RUNTIME_DEPS + [":target_node"], + package_name = PKG_REQUIRE_NAME, + visibility = ["//visibility:public"], +) + +pkg_npm( + name = "npm_module", + deps = [":" + PKG_DIRNAME], +) + +filegroup( + name = "build", + srcs = [":npm_module"], + visibility = ["//visibility:public"], +) + +pkg_npm_types( + name = "npm_module_types", + srcs = SRCS, + deps = [":tsc_types"], + package_name = PKG_REQUIRE_NAME, + tsconfig = ":tsconfig", + visibility = ["//visibility:public"], +) + +filegroup( + name = "build_types", + srcs = [":npm_module_types"], + visibility = ["//visibility:public"], +) diff --git a/packages/core/http/core-http-request-handler-context-server-internal/README.md b/packages/core/http/core-http-request-handler-context-server-internal/README.md new file mode 100644 index 0000000000000..aa27c116c4f6d --- /dev/null +++ b/packages/core/http/core-http-request-handler-context-server-internal/README.md @@ -0,0 +1,3 @@ +# @kbn/core-http-request-handler-context-server-internal + +This package contains the internal types and implementation of Core's `CoreRequestHandlerContext` diff --git a/packages/core/http/core-http-request-handler-context-server-internal/index.ts b/packages/core/http/core-http-request-handler-context-server-internal/index.ts new file mode 100644 index 0000000000000..2ee514f67265b --- /dev/null +++ b/packages/core/http/core-http-request-handler-context-server-internal/index.ts @@ -0,0 +1,10 @@ +/* + * 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. + */ + +export { CoreRouteHandlerContext, PrebootCoreRouteHandlerContext } from './src'; +export type { CoreRouteHandlerContextParams, PrebootCoreRouteHandlerContextParams } from './src'; diff --git a/packages/core/http/core-http-request-handler-context-server-internal/jest.config.js b/packages/core/http/core-http-request-handler-context-server-internal/jest.config.js new file mode 100644 index 0000000000000..68a5f2b3a03a8 --- /dev/null +++ b/packages/core/http/core-http-request-handler-context-server-internal/jest.config.js @@ -0,0 +1,13 @@ +/* + * 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. + */ + +module.exports = { + preset: '@kbn/test/jest_node', + rootDir: '../../../..', + roots: ['/packages/core/http/core-http-request-handler-context-server-internal'], +}; diff --git a/packages/core/http/core-http-request-handler-context-server-internal/kibana.jsonc b/packages/core/http/core-http-request-handler-context-server-internal/kibana.jsonc new file mode 100644 index 0000000000000..98b452aec0d97 --- /dev/null +++ b/packages/core/http/core-http-request-handler-context-server-internal/kibana.jsonc @@ -0,0 +1,7 @@ +{ + "type": "shared-common", + "id": "@kbn/core-http-request-handler-context-server-internal", + "owner": "@elastic/kibana-core", + "runtimeDeps": [], + "typeDeps": [], +} diff --git a/packages/core/http/core-http-request-handler-context-server-internal/package.json b/packages/core/http/core-http-request-handler-context-server-internal/package.json new file mode 100644 index 0000000000000..672bb6ce72715 --- /dev/null +++ b/packages/core/http/core-http-request-handler-context-server-internal/package.json @@ -0,0 +1,8 @@ +{ + "name": "@kbn/core-http-request-handler-context-server-internal", + "private": true, + "version": "1.0.0", + "main": "./target_node/index.js", + "author": "Kibana Core", + "license": "SSPL-1.0 OR Elastic License 2.0" +} diff --git a/src/core/server/core_route_handler_context.test.ts b/packages/core/http/core-http-request-handler-context-server-internal/src/core_route_handler_context.test.ts similarity index 86% rename from src/core/server/core_route_handler_context.test.ts rename to packages/core/http/core-http-request-handler-context-server-internal/src/core_route_handler_context.test.ts index ace0144eae54f..f8e906650fcf1 100644 --- a/src/core/server/core_route_handler_context.test.ts +++ b/packages/core/http/core-http-request-handler-context-server-internal/src/core_route_handler_context.test.ts @@ -7,13 +7,14 @@ */ import { CoreRouteHandlerContext } from './core_route_handler_context'; -import { coreMock, httpServerMock } from './mocks'; +import { httpServerMock } from '@kbn/core-http-server-mocks'; +import { createCoreRouteHandlerContextParamsMock } from './test_helpers'; describe('#elasticsearch', () => { describe('#client', () => { test('returns the results of coreStart.elasticsearch.client.asScoped', () => { const request = httpServerMock.createKibanaRequest(); - const coreStart = coreMock.createInternalStart(); + const coreStart = createCoreRouteHandlerContextParamsMock(); const context = new CoreRouteHandlerContext(coreStart, request); const client = context.elasticsearch.client; @@ -22,7 +23,7 @@ describe('#elasticsearch', () => { test('lazily created', () => { const request = httpServerMock.createKibanaRequest(); - const coreStart = coreMock.createInternalStart(); + const coreStart = createCoreRouteHandlerContextParamsMock(); const context = new CoreRouteHandlerContext(coreStart, request); expect(coreStart.elasticsearch.client.asScoped).not.toHaveBeenCalled(); @@ -33,7 +34,7 @@ describe('#elasticsearch', () => { test('only creates one instance', () => { const request = httpServerMock.createKibanaRequest(); - const coreStart = coreMock.createInternalStart(); + const coreStart = createCoreRouteHandlerContextParamsMock(); const context = new CoreRouteHandlerContext(coreStart, request); const client1 = context.elasticsearch.client; @@ -50,7 +51,7 @@ describe('#savedObjects', () => { describe('#client', () => { test('returns the results of coreStart.savedObjects.getScopedClient', () => { const request = httpServerMock.createKibanaRequest(); - const coreStart = coreMock.createInternalStart(); + const coreStart = createCoreRouteHandlerContextParamsMock(); const context = new CoreRouteHandlerContext(coreStart, request); const client = context.savedObjects.client; @@ -59,7 +60,7 @@ describe('#savedObjects', () => { test('lazily created', () => { const request = httpServerMock.createKibanaRequest(); - const coreStart = coreMock.createInternalStart(); + const coreStart = createCoreRouteHandlerContextParamsMock(); const context = new CoreRouteHandlerContext(coreStart, request); const savedObjects = context.savedObjects; @@ -71,7 +72,7 @@ describe('#savedObjects', () => { test('only creates one instance', () => { const request = httpServerMock.createKibanaRequest(); - const coreStart = coreMock.createInternalStart(); + const coreStart = createCoreRouteHandlerContextParamsMock(); const context = new CoreRouteHandlerContext(coreStart, request); const client1 = context.savedObjects.client; @@ -86,7 +87,7 @@ describe('#savedObjects', () => { describe('#typeRegistry', () => { test('returns the results of coreStart.savedObjects.getTypeRegistry', () => { const request = httpServerMock.createKibanaRequest(); - const coreStart = coreMock.createInternalStart(); + const coreStart = createCoreRouteHandlerContextParamsMock(); const context = new CoreRouteHandlerContext(coreStart, request); const typeRegistry = context.savedObjects.typeRegistry; @@ -95,7 +96,7 @@ describe('#savedObjects', () => { test('lazily created', () => { const request = httpServerMock.createKibanaRequest(); - const coreStart = coreMock.createInternalStart(); + const coreStart = createCoreRouteHandlerContextParamsMock(); const context = new CoreRouteHandlerContext(coreStart, request); expect(coreStart.savedObjects.getTypeRegistry).not.toHaveBeenCalled(); @@ -106,7 +107,7 @@ describe('#savedObjects', () => { test('only creates one instance', () => { const request = httpServerMock.createKibanaRequest(); - const coreStart = coreMock.createInternalStart(); + const coreStart = createCoreRouteHandlerContextParamsMock(); const context = new CoreRouteHandlerContext(coreStart, request); const typeRegistry1 = context.savedObjects.typeRegistry; @@ -123,7 +124,7 @@ describe('#uiSettings', () => { describe('#client', () => { test('returns the results of coreStart.uiSettings.asScopedToClient', () => { const request = httpServerMock.createKibanaRequest(); - const coreStart = coreMock.createInternalStart(); + const coreStart = createCoreRouteHandlerContextParamsMock(); const context = new CoreRouteHandlerContext(coreStart, request); const client = context.uiSettings.client; @@ -132,7 +133,7 @@ describe('#uiSettings', () => { test('lazily created', () => { const request = httpServerMock.createKibanaRequest(); - const coreStart = coreMock.createInternalStart(); + const coreStart = createCoreRouteHandlerContextParamsMock(); const context = new CoreRouteHandlerContext(coreStart, request); expect(coreStart.uiSettings.asScopedToClient).not.toHaveBeenCalled(); @@ -143,7 +144,7 @@ describe('#uiSettings', () => { test('only creates one instance', () => { const request = httpServerMock.createKibanaRequest(); - const coreStart = coreMock.createInternalStart(); + const coreStart = createCoreRouteHandlerContextParamsMock(); const context = new CoreRouteHandlerContext(coreStart, request); const client1 = context.uiSettings.client; @@ -160,7 +161,7 @@ describe('#deprecations', () => { describe('#client', () => { test('returns the results of coreStart.deprecations.asScopedToClient', () => { const request = httpServerMock.createKibanaRequest(); - const coreStart = coreMock.createInternalStart(); + const coreStart = createCoreRouteHandlerContextParamsMock(); const context = new CoreRouteHandlerContext(coreStart, request); const client = context.deprecations.client; @@ -169,7 +170,7 @@ describe('#deprecations', () => { test('lazily created', () => { const request = httpServerMock.createKibanaRequest(); - const coreStart = coreMock.createInternalStart(); + const coreStart = createCoreRouteHandlerContextParamsMock(); const context = new CoreRouteHandlerContext(coreStart, request); expect(coreStart.deprecations.asScopedToClient).not.toHaveBeenCalled(); @@ -180,7 +181,7 @@ describe('#deprecations', () => { test('only creates one instance', () => { const request = httpServerMock.createKibanaRequest(); - const coreStart = coreMock.createInternalStart(); + const coreStart = createCoreRouteHandlerContextParamsMock(); const context = new CoreRouteHandlerContext(coreStart, request); const client1 = context.deprecations.client; diff --git a/packages/core/http/core-http-request-handler-context-server-internal/src/core_route_handler_context.ts b/packages/core/http/core-http-request-handler-context-server-internal/src/core_route_handler_context.ts new file mode 100644 index 0000000000000..6cc54130a575c --- /dev/null +++ b/packages/core/http/core-http-request-handler-context-server-internal/src/core_route_handler_context.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 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 type { KibanaRequest } from '@kbn/core-http-server'; +import type { CoreRequestHandlerContext } from '@kbn/core-http-request-handler-context-server'; +import { + CoreElasticsearchRouteHandlerContext, + type InternalElasticsearchServiceStart, +} from '@kbn/core-elasticsearch-server-internal'; +import { + CoreSavedObjectsRouteHandlerContext, + type InternalSavedObjectsServiceStart, +} from '@kbn/core-saved-objects-server-internal'; +import { + CoreDeprecationsRouteHandlerContext, + type InternalDeprecationsServiceStart, +} from '@kbn/core-deprecations-server-internal'; +import { + CoreUiSettingsRouteHandlerContext, + type InternalUiSettingsServiceStart, +} from '@kbn/core-ui-settings-server-internal'; + +/** + * Subset of `InternalCoreStart` used by {@link CoreRouteHandlerContext} + * @internal + */ +export interface CoreRouteHandlerContextParams { + elasticsearch: InternalElasticsearchServiceStart; + savedObjects: InternalSavedObjectsServiceStart; + uiSettings: InternalUiSettingsServiceStart; + deprecations: InternalDeprecationsServiceStart; +} + +/** + * The concrete implementation for Core's route handler context. + * + * @internal + */ +export class CoreRouteHandlerContext implements CoreRequestHandlerContext { + readonly elasticsearch: CoreElasticsearchRouteHandlerContext; + readonly savedObjects: CoreSavedObjectsRouteHandlerContext; + readonly uiSettings: CoreUiSettingsRouteHandlerContext; + readonly deprecations: CoreDeprecationsRouteHandlerContext; + + constructor(coreStart: CoreRouteHandlerContextParams, request: KibanaRequest) { + this.elasticsearch = new CoreElasticsearchRouteHandlerContext(coreStart.elasticsearch, request); + this.savedObjects = new CoreSavedObjectsRouteHandlerContext(coreStart.savedObjects, request); + this.uiSettings = new CoreUiSettingsRouteHandlerContext( + coreStart.uiSettings, + this.savedObjects + ); + this.deprecations = new CoreDeprecationsRouteHandlerContext( + coreStart.deprecations, + this.elasticsearch, + this.savedObjects + ); + } +} diff --git a/packages/core/http/core-http-request-handler-context-server-internal/src/index.ts b/packages/core/http/core-http-request-handler-context-server-internal/src/index.ts new file mode 100644 index 0000000000000..48d93f78b2a48 --- /dev/null +++ b/packages/core/http/core-http-request-handler-context-server-internal/src/index.ts @@ -0,0 +1,12 @@ +/* + * 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. + */ + +export { CoreRouteHandlerContext } from './core_route_handler_context'; +export type { CoreRouteHandlerContextParams } from './core_route_handler_context'; +export { PrebootCoreRouteHandlerContext } from './preboot_core_route_handler_context'; +export type { PrebootCoreRouteHandlerContextParams } from './preboot_core_route_handler_context'; diff --git a/src/core/server/preboot_core_route_handler_context.test.ts b/packages/core/http/core-http-request-handler-context-server-internal/src/preboot_core_route_handler_context.test.ts similarity index 85% rename from src/core/server/preboot_core_route_handler_context.test.ts rename to packages/core/http/core-http-request-handler-context-server-internal/src/preboot_core_route_handler_context.test.ts index 8d090d8644637..75bfc39bfdc9a 100644 --- a/src/core/server/preboot_core_route_handler_context.test.ts +++ b/packages/core/http/core-http-request-handler-context-server-internal/src/preboot_core_route_handler_context.test.ts @@ -7,12 +7,12 @@ */ import { PrebootCoreRouteHandlerContext } from './preboot_core_route_handler_context'; -import { coreMock } from './mocks'; +import { createPrebootCoreRouteHandlerContextParamsMock } from './test_helpers'; describe('#uiSettings', () => { describe('#client', () => { test('returns the results of corePreboot.uiSettings.createDefaultsClient', () => { - const corePreboot = coreMock.createInternalPreboot(); + const corePreboot = createPrebootCoreRouteHandlerContextParamsMock(); const context = new PrebootCoreRouteHandlerContext(corePreboot); const client = context.uiSettings.client; @@ -21,7 +21,7 @@ describe('#uiSettings', () => { }); test('only creates one instance', () => { - const corePreboot = coreMock.createInternalPreboot(); + const corePreboot = createPrebootCoreRouteHandlerContextParamsMock(); const context = new PrebootCoreRouteHandlerContext(corePreboot); const client1 = context.uiSettings.client; diff --git a/src/core/server/preboot_core_route_handler_context.ts b/packages/core/http/core-http-request-handler-context-server-internal/src/preboot_core_route_handler_context.ts similarity index 71% rename from src/core/server/preboot_core_route_handler_context.ts rename to packages/core/http/core-http-request-handler-context-server-internal/src/preboot_core_route_handler_context.ts index ec5ef594180d1..c0bf184d8c985 100644 --- a/src/core/server/preboot_core_route_handler_context.ts +++ b/packages/core/http/core-http-request-handler-context-server-internal/src/preboot_core_route_handler_context.ts @@ -8,13 +8,17 @@ // eslint-disable-next-line max-classes-per-file import type { IUiSettingsClient } from '@kbn/core-ui-settings-server'; -import type { InternalCorePreboot } from './internal_types'; +import type { + PrebootUiSettingsRequestHandlerContext, + PrebootCoreRequestHandlerContext, +} from '@kbn/core-http-request-handler-context-server'; +import type { InternalUiSettingsServicePreboot } from '@kbn/core-ui-settings-server-internal'; /** - * @public + * @internal */ -export interface PrebootUiSettingsRequestHandlerContext { - client: IUiSettingsClient; +export interface PrebootCoreRouteHandlerContextParams { + uiSettings: InternalUiSettingsServicePreboot; } /** @@ -25,13 +29,6 @@ class PrebootCoreUiSettingsRouteHandlerContext implements PrebootUiSettingsReque constructor(public readonly client: IUiSettingsClient) {} } -/** - * @public - */ -export interface PrebootCoreRequestHandlerContext { - uiSettings: PrebootUiSettingsRequestHandlerContext; -} - /** * Implementation of {@link PrebootCoreRequestHandlerContext}. * @internal @@ -39,7 +36,7 @@ export interface PrebootCoreRequestHandlerContext { export class PrebootCoreRouteHandlerContext implements PrebootCoreRequestHandlerContext { readonly uiSettings: PrebootUiSettingsRequestHandlerContext; - constructor(private readonly corePreboot: InternalCorePreboot) { + constructor(private readonly corePreboot: PrebootCoreRouteHandlerContextParams) { this.uiSettings = new PrebootCoreUiSettingsRouteHandlerContext( this.corePreboot.uiSettings.createDefaultsClient() ); diff --git a/packages/core/http/core-http-request-handler-context-server-internal/src/test_helpers/core_route_handler_context_params.mock.ts b/packages/core/http/core-http-request-handler-context-server-internal/src/test_helpers/core_route_handler_context_params.mock.ts new file mode 100644 index 0000000000000..eaf46eae3c8b6 --- /dev/null +++ b/packages/core/http/core-http-request-handler-context-server-internal/src/test_helpers/core_route_handler_context_params.mock.ts @@ -0,0 +1,21 @@ +/* + * 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. + */ + +import { elasticsearchServiceMock } from '@kbn/core-elasticsearch-server-mocks'; +import { savedObjectsServiceMock } from '@kbn/core-saved-objects-server-mocks'; +import { uiSettingsServiceMock } from '@kbn/core-ui-settings-server-mocks'; +import { deprecationsServiceMock } from '@kbn/core-deprecations-server-mocks'; + +export const createCoreRouteHandlerContextParamsMock = () => { + return { + elasticsearch: elasticsearchServiceMock.createInternalStart(), + savedObjects: savedObjectsServiceMock.createInternalStartContract(), + uiSettings: uiSettingsServiceMock.createStartContract(), + deprecations: deprecationsServiceMock.createInternalStartContract(), + }; +}; diff --git a/packages/core/http/core-http-request-handler-context-server-internal/src/test_helpers/index.ts b/packages/core/http/core-http-request-handler-context-server-internal/src/test_helpers/index.ts new file mode 100644 index 0000000000000..5556547d4602f --- /dev/null +++ b/packages/core/http/core-http-request-handler-context-server-internal/src/test_helpers/index.ts @@ -0,0 +1,10 @@ +/* + * 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. + */ + +export { createCoreRouteHandlerContextParamsMock } from './core_route_handler_context_params.mock'; +export { createPrebootCoreRouteHandlerContextParamsMock } from './preboot_core_route_handler_context_params.mock'; diff --git a/packages/core/http/core-http-request-handler-context-server-internal/src/test_helpers/preboot_core_route_handler_context_params.mock.ts b/packages/core/http/core-http-request-handler-context-server-internal/src/test_helpers/preboot_core_route_handler_context_params.mock.ts new file mode 100644 index 0000000000000..dc4eab6b55672 --- /dev/null +++ b/packages/core/http/core-http-request-handler-context-server-internal/src/test_helpers/preboot_core_route_handler_context_params.mock.ts @@ -0,0 +1,15 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0 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 { uiSettingsServiceMock } from '@kbn/core-ui-settings-server-mocks'; + +export const createPrebootCoreRouteHandlerContextParamsMock = () => { + return { + uiSettings: uiSettingsServiceMock.createPrebootContract(), + }; +}; diff --git a/packages/core/http/core-http-request-handler-context-server-internal/tsconfig.json b/packages/core/http/core-http-request-handler-context-server-internal/tsconfig.json new file mode 100644 index 0000000000000..71bb40fe57f3f --- /dev/null +++ b/packages/core/http/core-http-request-handler-context-server-internal/tsconfig.json @@ -0,0 +1,17 @@ +{ + "extends": "../../../../tsconfig.bazel.json", + "compilerOptions": { + "declaration": true, + "declarationMap": true, + "emitDeclarationOnly": true, + "outDir": "target_types", + "stripInternal": false, + "types": [ + "jest", + "node" + ] + }, + "include": [ + "**/*.ts", + ] +} diff --git a/packages/core/http/core-http-request-handler-context-server/BUILD.bazel b/packages/core/http/core-http-request-handler-context-server/BUILD.bazel new file mode 100644 index 0000000000000..45c5ebc08776f --- /dev/null +++ b/packages/core/http/core-http-request-handler-context-server/BUILD.bazel @@ -0,0 +1,110 @@ +load("@npm//@bazel/typescript:index.bzl", "ts_config") +load("@build_bazel_rules_nodejs//:index.bzl", "js_library") +load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project") + +PKG_DIRNAME = "core-http-request-handler-context-server" +PKG_REQUIRE_NAME = "@kbn/core-http-request-handler-context-server" + +SOURCE_FILES = glob( + [ + "**/*.ts", + ], + exclude = [ + "**/*.config.js", + "**/*.mock.*", + "**/*.test.*", + "**/*.stories.*", + "**/__snapshots__/**", + "**/integration_tests/**", + "**/mocks/**", + "**/scripts/**", + "**/storybook/**", + "**/test_fixtures/**", + "**/test_helpers/**", + ], +) + +SRCS = SOURCE_FILES + +filegroup( + name = "srcs", + srcs = SRCS, +) + +NPM_MODULE_EXTRA_FILES = [ + "package.json", +] + +RUNTIME_DEPS = [ +] + +TYPES_DEPS = [ + "@npm//@types/node", + "@npm//@types/jest", + "//packages/core/http/core-http-server:npm_module_types", + "//packages/core/elasticsearch/core-elasticsearch-server:npm_module_types", + "//packages/core/saved-objects/core-saved-objects-server:npm_module_types", + "//packages/core/deprecations/core-deprecations-server:npm_module_types", + "//packages/core/ui-settings/core-ui-settings-server:npm_module_types", +] + +jsts_transpiler( + name = "target_node", + srcs = SRCS, + build_pkg_name = package_name(), +) + +ts_config( + name = "tsconfig", + src = "tsconfig.json", + deps = [ + "//:tsconfig.base.json", + "//:tsconfig.bazel.json", + ], +) + +ts_project( + name = "tsc_types", + args = ['--pretty'], + srcs = SRCS, + deps = TYPES_DEPS, + declaration = True, + declaration_map = True, + emit_declaration_only = True, + out_dir = "target_types", + tsconfig = ":tsconfig", +) + +js_library( + name = PKG_DIRNAME, + srcs = NPM_MODULE_EXTRA_FILES, + deps = RUNTIME_DEPS + [":target_node"], + package_name = PKG_REQUIRE_NAME, + visibility = ["//visibility:public"], +) + +pkg_npm( + name = "npm_module", + deps = [":" + PKG_DIRNAME], +) + +filegroup( + name = "build", + srcs = [":npm_module"], + visibility = ["//visibility:public"], +) + +pkg_npm_types( + name = "npm_module_types", + srcs = SRCS, + deps = [":tsc_types"], + package_name = PKG_REQUIRE_NAME, + tsconfig = ":tsconfig", + visibility = ["//visibility:public"], +) + +filegroup( + name = "build_types", + srcs = [":npm_module_types"], + visibility = ["//visibility:public"], +) diff --git a/packages/core/http/core-http-request-handler-context-server/README.md b/packages/core/http/core-http-request-handler-context-server/README.md new file mode 100644 index 0000000000000..b7b191f7345f3 --- /dev/null +++ b/packages/core/http/core-http-request-handler-context-server/README.md @@ -0,0 +1,3 @@ +# @kbn/core-http-request-handler-context-server + +This package contains the public types for Core's server-side `RequestHandlerContext` http subdomain. diff --git a/packages/core/http/core-http-request-handler-context-server/index.ts b/packages/core/http/core-http-request-handler-context-server/index.ts new file mode 100644 index 0000000000000..125c466d25d2c --- /dev/null +++ b/packages/core/http/core-http-request-handler-context-server/index.ts @@ -0,0 +1,16 @@ +/* + * 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. + */ + +export type { + RequestHandlerContext, + CoreRequestHandlerContext, + CustomRequestHandlerContext, + PrebootCoreRequestHandlerContext, + PrebootRequestHandlerContext, + PrebootUiSettingsRequestHandlerContext, +} from './src'; diff --git a/packages/core/http/core-http-request-handler-context-server/jest.config.js b/packages/core/http/core-http-request-handler-context-server/jest.config.js new file mode 100644 index 0000000000000..dc60767ed0880 --- /dev/null +++ b/packages/core/http/core-http-request-handler-context-server/jest.config.js @@ -0,0 +1,13 @@ +/* + * 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. + */ + +module.exports = { + preset: '@kbn/test/jest_node', + rootDir: '../../../..', + roots: ['/packages/core/http/core-http-request-handler-context-server'], +}; diff --git a/packages/core/http/core-http-request-handler-context-server/kibana.jsonc b/packages/core/http/core-http-request-handler-context-server/kibana.jsonc new file mode 100644 index 0000000000000..3fba38b6444e4 --- /dev/null +++ b/packages/core/http/core-http-request-handler-context-server/kibana.jsonc @@ -0,0 +1,7 @@ +{ + "type": "shared-common", + "id": "@kbn/core-http-request-handler-context-server", + "owner": "@elastic/kibana-core", + "runtimeDeps": [], + "typeDeps": [], +} diff --git a/packages/core/http/core-http-request-handler-context-server/package.json b/packages/core/http/core-http-request-handler-context-server/package.json new file mode 100644 index 0000000000000..da85fc826828d --- /dev/null +++ b/packages/core/http/core-http-request-handler-context-server/package.json @@ -0,0 +1,8 @@ +{ + "name": "@kbn/core-http-request-handler-context-server", + "private": true, + "version": "1.0.0", + "main": "./target_node/index.js", + "author": "Kibana Core", + "license": "SSPL-1.0 OR Elastic License 2.0" +} diff --git a/packages/core/http/core-http-request-handler-context-server/src/index.ts b/packages/core/http/core-http-request-handler-context-server/src/index.ts new file mode 100644 index 0000000000000..2ab372a0ab975 --- /dev/null +++ b/packages/core/http/core-http-request-handler-context-server/src/index.ts @@ -0,0 +1,18 @@ +/* + * 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. + */ + +export type { + RequestHandlerContext, + CoreRequestHandlerContext, + CustomRequestHandlerContext, +} from './request_handler_context'; +export type { + PrebootRequestHandlerContext, + PrebootCoreRequestHandlerContext, + PrebootUiSettingsRequestHandlerContext, +} from './preboot_request_handler_context'; diff --git a/packages/core/http/core-http-request-handler-context-server/src/preboot_request_handler_context.ts b/packages/core/http/core-http-request-handler-context-server/src/preboot_request_handler_context.ts new file mode 100644 index 0000000000000..62caefe5619c6 --- /dev/null +++ b/packages/core/http/core-http-request-handler-context-server/src/preboot_request_handler_context.ts @@ -0,0 +1,31 @@ +/* + * 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. + */ + +import type { RequestHandlerContextBase } from '@kbn/core-http-server'; +import type { IUiSettingsClient } from '@kbn/core-ui-settings-server'; + +/** + * @public + */ +export interface PrebootUiSettingsRequestHandlerContext { + client: IUiSettingsClient; +} + +/** + * @public + */ +export interface PrebootCoreRequestHandlerContext { + uiSettings: PrebootUiSettingsRequestHandlerContext; +} + +/** + * @public + */ +export interface PrebootRequestHandlerContext extends RequestHandlerContextBase { + core: Promise; +} diff --git a/src/core/server/core_route_handler_context.ts b/packages/core/http/core-http-request-handler-context-server/src/request_handler_context.ts similarity index 53% rename from src/core/server/core_route_handler_context.ts rename to packages/core/http/core-http-request-handler-context-server/src/request_handler_context.ts index 14cc99b501436..07704752bd8ed 100644 --- a/src/core/server/core_route_handler_context.ts +++ b/packages/core/http/core-http-request-handler-context-server/src/request_handler_context.ts @@ -6,16 +6,11 @@ * Side Public License, v 1. */ -import type { KibanaRequest } from '@kbn/core-http-server'; +import type { RequestHandlerContextBase } from '@kbn/core-http-server'; import type { ElasticsearchRequestHandlerContext } from '@kbn/core-elasticsearch-server'; -import { CoreElasticsearchRouteHandlerContext } from '@kbn/core-elasticsearch-server-internal'; import type { SavedObjectsRequestHandlerContext } from '@kbn/core-saved-objects-server'; -import { CoreSavedObjectsRouteHandlerContext } from '@kbn/core-saved-objects-server-internal'; import type { DeprecationsRequestHandlerContext } from '@kbn/core-deprecations-server'; -import { CoreDeprecationsRouteHandlerContext } from '@kbn/core-deprecations-server-internal'; import type { UiSettingsRequestHandlerContext } from '@kbn/core-ui-settings-server'; -import { CoreUiSettingsRouteHandlerContext } from '@kbn/core-ui-settings-server-internal'; -import type { InternalCoreStart } from './internal_types'; /** * The `core` context provided to route handler. @@ -39,27 +34,19 @@ export interface CoreRequestHandlerContext { } /** - * The concrete implementation for Core's route handler context. + * Base context passed to a route handler, containing the `core` context part. * - * @internal + * @public */ -export class CoreRouteHandlerContext implements CoreRequestHandlerContext { - readonly elasticsearch: CoreElasticsearchRouteHandlerContext; - readonly savedObjects: CoreSavedObjectsRouteHandlerContext; - readonly uiSettings: CoreUiSettingsRouteHandlerContext; - readonly deprecations: CoreDeprecationsRouteHandlerContext; - - constructor(coreStart: InternalCoreStart, request: KibanaRequest) { - this.elasticsearch = new CoreElasticsearchRouteHandlerContext(coreStart.elasticsearch, request); - this.savedObjects = new CoreSavedObjectsRouteHandlerContext(coreStart.savedObjects, request); - this.uiSettings = new CoreUiSettingsRouteHandlerContext( - coreStart.uiSettings, - this.savedObjects - ); - this.deprecations = new CoreDeprecationsRouteHandlerContext( - coreStart.deprecations, - this.elasticsearch, - this.savedObjects - ); - } +export interface RequestHandlerContext extends RequestHandlerContextBase { + core: Promise; } + +/** + * Mixin allowing plugins to define their own request handler contexts. + * + * @public + */ +export type CustomRequestHandlerContext = RequestHandlerContext & { + [Key in keyof T]: T[Key] extends Promise ? T[Key] : Promise; +}; diff --git a/packages/core/http/core-http-request-handler-context-server/tsconfig.json b/packages/core/http/core-http-request-handler-context-server/tsconfig.json new file mode 100644 index 0000000000000..71bb40fe57f3f --- /dev/null +++ b/packages/core/http/core-http-request-handler-context-server/tsconfig.json @@ -0,0 +1,17 @@ +{ + "extends": "../../../../tsconfig.bazel.json", + "compilerOptions": { + "declaration": true, + "declarationMap": true, + "emitDeclarationOnly": true, + "outDir": "target_types", + "stripInternal": false, + "types": [ + "jest", + "node" + ] + }, + "include": [ + "**/*.ts", + ] +} diff --git a/src/core/server/http_resources/http_resources_service.ts b/src/core/server/http_resources/http_resources_service.ts index 7e95dc9e302d9..5db20bf45e409 100644 --- a/src/core/server/http_resources/http_resources_service.ts +++ b/src/core/server/http_resources/http_resources_service.ts @@ -18,7 +18,7 @@ import type { InternalHttpServiceSetup, InternalHttpServicePreboot, } from '@kbn/core-http-server-internal'; -import { RequestHandlerContext } from '..'; +import type { RequestHandlerContext } from '@kbn/core-http-request-handler-context-server'; import { InternalRenderingServicePreboot, InternalRenderingServiceSetup } from '../rendering'; import { InternalHttpResourcesSetup, diff --git a/src/core/server/http_resources/types.ts b/src/core/server/http_resources/types.ts index 397f03098dd13..246a7394c3ade 100644 --- a/src/core/server/http_resources/types.ts +++ b/src/core/server/http_resources/types.ts @@ -15,7 +15,7 @@ import type { KibanaResponseFactory, RequestHandler, } from '@kbn/core-http-server'; -import type { RequestHandlerContext } from '..'; +import type { RequestHandlerContext } from '@kbn/core-http-request-handler-context-server'; /** * Allows to configure HTTP response parameters diff --git a/src/core/server/index.ts b/src/core/server/index.ts index 6e72b1d2623cf..020975c15fb1b 100644 --- a/src/core/server/index.ts +++ b/src/core/server/index.ts @@ -42,7 +42,6 @@ import type { ExecutionContextStart, } from '@kbn/core-execution-context-server'; import type { - RequestHandlerContextBase, IRouter, RequestHandler, KibanaResponseFactory, @@ -69,12 +68,11 @@ import type { CoreUsageDataStart, CoreUsageDataSetup } from '@kbn/core-usage-dat import type { I18nServiceSetup } from '@kbn/core-i18n-server'; import type { StatusServiceSetup } from '@kbn/core-status-server'; import type { UiSettingsServiceSetup, UiSettingsServiceStart } from '@kbn/core-ui-settings-server'; - +import type { RequestHandlerContext } from '@kbn/core-http-request-handler-context-server'; import { HttpResources } from './http_resources'; -import { PluginsServiceSetup, PluginsServiceStart, PluginOpaqueId } from './plugins'; -import type { CoreRequestHandlerContext } from './core_route_handler_context'; -import type { PrebootCoreRequestHandlerContext } from './preboot_core_route_handler_context'; +import { PluginsServiceSetup, PluginsServiceStart } from './plugins'; +export type { PluginOpaqueId } from '@kbn/core-base-common'; export type { CoreUsageStats, CoreUsageData, @@ -462,33 +460,13 @@ export type { AnalyticsServicePreboot, AnalyticsServiceStart, } from '@kbn/core-analytics-server'; - -export type { CoreRequestHandlerContext } from './core_route_handler_context'; - -/** - * Base context passed to a route handler, containing the `core` context part. - * - * @public - */ -export interface RequestHandlerContext extends RequestHandlerContextBase { - core: Promise; -} - -/** - * @internal - */ -export interface PrebootRequestHandlerContext extends RequestHandlerContextBase { - core: Promise; -} - -/** - * Mixin allowing plugins to define their own request handler contexts. - * - * @public - */ -export type CustomRequestHandlerContext = RequestHandlerContext & { - [Key in keyof T]: T[Key] extends Promise ? T[Key] : Promise; -}; +export type { + RequestHandlerContext, + CoreRequestHandlerContext, + CustomRequestHandlerContext, + PrebootRequestHandlerContext, + PrebootCoreRequestHandlerContext, +} from '@kbn/core-http-request-handler-context-server'; /** * Context passed to the `setup` method of `preboot` plugins. @@ -599,7 +577,6 @@ export type { HttpResources, PluginsServiceSetup, PluginsServiceStart, - PluginOpaqueId, }; /** diff --git a/src/core/server/server.ts b/src/core/server/server.ts index aa747a1023b35..e333e8b81a404 100644 --- a/src/core/server/server.ts +++ b/src/core/server/server.ts @@ -58,16 +58,21 @@ import { import { CoreUsageDataService } from '@kbn/core-usage-data-server-internal'; import { StatusService, statusConfig } from '@kbn/core-status-server-internal'; import { UiSettingsService, uiSettingsConfig } from '@kbn/core-ui-settings-server-internal'; +import { + CoreRouteHandlerContext, + PrebootCoreRouteHandlerContext, +} from '@kbn/core-http-request-handler-context-server-internal'; +import type { + RequestHandlerContext, + PrebootRequestHandlerContext, +} from '@kbn/core-http-request-handler-context-server'; import { CoreApp } from './core_app'; import { HttpResourcesService } from './http_resources'; import { RenderingService } from './rendering'; import { PluginsService, config as pluginsConfig } from './plugins'; import { InternalCorePreboot, InternalCoreSetup, InternalCoreStart } from './internal_types'; -import { CoreRouteHandlerContext } from './core_route_handler_context'; -import { PrebootCoreRouteHandlerContext } from './preboot_core_route_handler_context'; import { DiscoveredPlugins } from './plugins'; -import type { RequestHandlerContext, PrebootRequestHandlerContext } from '.'; const coreId = Symbol('core'); const rootConfigPath = ''; diff --git a/yarn.lock b/yarn.lock index f809bc0cac463..085f55146d4ed 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2954,6 +2954,14 @@ version "0.0.0" uid "" +"@kbn/core-http-request-handler-context-server-internal@link:bazel-bin/packages/core/http/core-http-request-handler-context-server-internal": + version "0.0.0" + uid "" + +"@kbn/core-http-request-handler-context-server@link:bazel-bin/packages/core/http/core-http-request-handler-context-server": + version "0.0.0" + uid "" + "@kbn/core-http-router-server-internal@link:bazel-bin/packages/core/http/core-http-router-server-internal": version "0.0.0" uid "" @@ -7075,6 +7083,14 @@ version "0.0.0" uid "" +"@types/kbn__core-http-request-handler-context-server-internal@link:bazel-bin/packages/core/http/core-http-request-handler-context-server-internal/npm_module_types": + version "0.0.0" + uid "" + +"@types/kbn__core-http-request-handler-context-server@link:bazel-bin/packages/core/http/core-http-request-handler-context-server/npm_module_types": + version "0.0.0" + uid "" + "@types/kbn__core-http-router-server-internal@link:bazel-bin/packages/core/http/core-http-router-server-internal/npm_module_types": version "0.0.0" uid "" From 5c2476a5bbb1296bb0a8c2adb3fa830fbb459f7f Mon Sep 17 00:00:00 2001 From: Jiawei Wu <74562234+JiaweiWu@users.noreply.github.com> Date: Wed, 28 Sep 2022 00:07:02 -0700 Subject: [PATCH 28/95] Fix getFilter not returning excluded ids when there is no rules list filter (#142033) --- .../hooks/use_bulk_edit_select.test.tsx | 16 ++++++++++++++++ .../application/hooks/use_bulk_edit_select.tsx | 11 +++++------ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_edit_select.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_edit_select.test.tsx index b0e92a3d3a848..07bf3516fbdef 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_edit_select.test.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_edit_select.test.tsx @@ -86,6 +86,22 @@ describe('useBulkEditSelectTest', () => { expect(result.current.getFilter()).toEqual(null); }); + it('getFilter should return rule list filter when selecting all with excluded ids', async () => { + const { result } = renderHook(() => + useBulkEditSelect({ + items, + totalItemCount: 4, + }) + ); + + act(() => { + result.current.onSelectAll(); + result.current.onSelectRow(items[0]); + }); + + expect(result.current.getFilter()?.arguments.length).toEqual(1); + }); + it('getFilter should return rule list filter when selecting all', async () => { const { result } = renderHook(() => useBulkEditSelect({ diff --git a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_edit_select.tsx b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_edit_select.tsx index 1e2ff7496907c..31c248ae1254e 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_edit_select.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_edit_select.tsx @@ -192,14 +192,13 @@ export function useBulkEditSelect(props: UseBulkEditSelectProps) { }); if (idsToExclude && idsToExclude.length) { + const excludeFilter = fromKueryExpression( + `NOT (${idsToExclude.map((id) => `alert.id: "alert:${id}"`).join(' or ')})` + ); if (ruleFilterKueryNode) { - return nodeBuilder.and([ - ruleFilterKueryNode, - fromKueryExpression( - `NOT (${idsToExclude.map((id) => `alert.id: "alert:${id}"`).join(' or ')})` - ), - ]); + return nodeBuilder.and([ruleFilterKueryNode, excludeFilter]); } + return excludeFilter; } return ruleFilterKueryNode; From e8ebc23dca3be8c2bcda15cda7991e9e5aff4df6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Louv-Jansen?= Date: Wed, 28 Sep 2022 09:08:36 +0200 Subject: [PATCH 29/95] [fleet] Use snapshot registry in dev mode (#141797) * [fleet] Use snapshot registry in dev mode * Update registry_url.ts * Update registry_url.ts * Fix jest test --- .../plugins/fleet/server/services/epm/registry/index.test.ts | 1 + .../plugins/fleet/server/services/epm/registry/registry_url.ts | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/x-pack/plugins/fleet/server/services/epm/registry/index.test.ts b/x-pack/plugins/fleet/server/services/epm/registry/index.test.ts index 6504b6548f078..bf5fe89574b8a 100644 --- a/x-pack/plugins/fleet/server/services/epm/registry/index.test.ts +++ b/x-pack/plugins/fleet/server/services/epm/registry/index.test.ts @@ -35,6 +35,7 @@ jest.mock('../..', () => ({ getKibanaBranch: () => 'main', getKibanaVersion: () => '99.0.0', getConfig: () => ({}), + getIsProductionMode: () => false, }, })); diff --git a/x-pack/plugins/fleet/server/services/epm/registry/registry_url.ts b/x-pack/plugins/fleet/server/services/epm/registry/registry_url.ts index 407a61ad7a912..31bb776ee1d69 100644 --- a/x-pack/plugins/fleet/server/services/epm/registry/registry_url.ts +++ b/x-pack/plugins/fleet/server/services/epm/registry/registry_url.ts @@ -21,7 +21,8 @@ const SNAPSHOT_REGISTRY_URL_CDN = 'https://epr-snapshot.elastic.co'; const getDefaultRegistryUrl = (): string => { const branch = appContextService.getKibanaBranch(); - if (branch === 'main') { + const isProduction = appContextService.getIsProductionMode(); + if (!isProduction || branch === 'main') { return SNAPSHOT_REGISTRY_URL_CDN; } else if (appContextService.getKibanaVersion().includes('-SNAPSHOT')) { return STAGING_REGISTRY_URL_CDN; From 2b094777593e715aeac6fb9678eb48ccd03b5a7a Mon Sep 17 00:00:00 2001 From: James Gowdy Date: Wed, 28 Sep 2022 09:06:15 +0100 Subject: [PATCH 30/95] [ML] Improving log pattern analysis messaging (#141130) * [ML] Improving log pattern analysis messaging * moving to separate component * translations * fixing unselection when time range changes * changes based on review --- .../log_categorization/information_text.tsx | 101 ++++++++++++++++++ .../log_categorization_page.tsx | 14 ++- 2 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 x-pack/plugins/aiops/public/components/log_categorization/information_text.tsx diff --git a/x-pack/plugins/aiops/public/components/log_categorization/information_text.tsx b/x-pack/plugins/aiops/public/components/log_categorization/information_text.tsx new file mode 100644 index 0000000000000..bf80b55fee37c --- /dev/null +++ b/x-pack/plugins/aiops/public/components/log_categorization/information_text.tsx @@ -0,0 +1,101 @@ +/* + * 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, { FC } from 'react'; + +import { FormattedMessage } from '@kbn/i18n-react'; +import { EuiEmptyPrompt } from '@elastic/eui'; + +interface Props { + eventRateLength: number; + fieldSelected: boolean; + categoriesLength: number | null; + loading: boolean; +} + +export const InformationText: FC = ({ + eventRateLength, + fieldSelected, + categoriesLength, + loading, +}) => { + if (loading === true) { + return null; + } + return ( + <> + {eventRateLength === 0 ? ( + + + + } + titleSize="xs" + body={ +

    + +

    + } + data-test-subj="aiopsNoWindowParametersEmptyPrompt" + /> + ) : null} + + {eventRateLength > 0 && categoriesLength === null ? ( + + + + } + titleSize="xs" + body={ +

    + +

    + } + data-test-subj="aiopsNoWindowParametersEmptyPrompt" + /> + ) : null} + + {eventRateLength > 0 && categoriesLength !== null && categoriesLength === 0 ? ( + + + + } + titleSize="xs" + body={ +

    + +

    + } + data-test-subj="aiopsNoWindowParametersEmptyPrompt" + /> + ) : null} + + ); +}; diff --git a/x-pack/plugins/aiops/public/components/log_categorization/log_categorization_page.tsx b/x-pack/plugins/aiops/public/components/log_categorization/log_categorization_page.tsx index 845a4239f1104..4eb6da0e58b9f 100644 --- a/x-pack/plugins/aiops/public/components/log_categorization/log_categorization_page.tsx +++ b/x-pack/plugins/aiops/public/components/log_categorization/log_categorization_page.tsx @@ -40,6 +40,7 @@ import { useCategorizeRequest } from './use_categorize_request'; import type { EventRate, Category, SparkLinesPerCategory } from './use_categorize_request'; import { CategoryTable } from './category_table'; import { DocumentCountChart } from './document_count_chart'; +import { InformationText } from './information_text'; export interface LogCategorizationPageProps { dataView: DataView; @@ -160,6 +161,7 @@ export const LogCategorizationPage: FC = ({ docCount, })) ); + setCategories(null); setTotalCount(documentStats.totalCount); } }, [documentStats, earliest, latest, searchQueryLanguage, searchString, searchQuery]); @@ -210,6 +212,7 @@ export const LogCategorizationPage: FC = ({ ]); const onFieldChange = (value: EuiComboBoxOptionOption[] | undefined) => { + setCategories(null); setSelectedField(value && value.length ? value[0].label : undefined); }; @@ -313,8 +316,17 @@ export const LogCategorizationPage: FC = ({ ) : null} + {loading === true ? : null} - {categories !== null ? ( + + + + {selectedField !== undefined && categories !== null && categories.length > 0 ? ( Date: Wed, 28 Sep 2022 10:11:37 +0200 Subject: [PATCH 31/95] [Fleet] Fix for bulk update tags, updated API tests (#141905) * added action_status check for api tests * fix for update tags quickly * fixed test * updated tag labels * close bulk action menu when closing Add / remove tags popover * fixed test Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../components/bulk_actions.tsx | 1 + .../components/tags_add_remove.test.tsx | 53 +++++++++++++++++++ .../components/tags_add_remove.tsx | 25 ++++++--- .../fleet/server/services/agents/actions.ts | 1 + .../apis/agents/reassign.ts | 17 ++++-- .../apis/agents/unenroll.ts | 7 +++ .../apis/agents/update_agent_tags.ts | 48 +++++++++++++---- .../apis/agents/upgrade.ts | 13 +++-- 8 files changed, 142 insertions(+), 23 deletions(-) diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/bulk_actions.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/bulk_actions.tsx index bb0ec90f2b883..10ced1a5c0323 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/bulk_actions.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/bulk_actions.tsx @@ -228,6 +228,7 @@ export const AgentBulkActions: React.FunctionComponent = ({ }} onClosePopover={() => { setIsTagAddVisible(false); + closeMenu(); }} /> )} diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/tags_add_remove.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/tags_add_remove.test.tsx index 8c4f9f3003c82..465db5236338c 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/tags_add_remove.test.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/tags_add_remove.test.tsx @@ -270,6 +270,59 @@ describe('TagsAddRemove', () => { ); }); + it('should add new tag twice quickly when not found in search and button clicked - bulk selection', () => { + mockBulkUpdateTags.mockImplementation((agents, tagsToAdd, tagsToRemove, onSuccess) => + onSuccess(false) + ); + + const result = renderComponent(undefined, 'query'); + const searchInput = result.getByRole('combobox'); + + fireEvent.input(searchInput, { + target: { value: 'newTag' }, + }); + + fireEvent.click(result.getAllByText('Create a new tag "newTag"')[0].closest('button')!); + + fireEvent.input(searchInput, { + target: { value: 'newTag2' }, + }); + + fireEvent.click(result.getAllByText('Create a new tag "newTag2"')[0].closest('button')!); + + expect(mockBulkUpdateTags).toHaveBeenCalledWith( + 'query', + ['newTag2', 'newTag'], + [], + expect.anything(), + 'Tag created', + 'Tag creation failed' + ); + }); + + it('should remove tags twice quickly on bulk selection', () => { + selectedTags = ['tag1', 'tag2']; + mockBulkUpdateTags.mockImplementation((agents, tagsToAdd, tagsToRemove, onSuccess) => + onSuccess(false) + ); + + const result = renderComponent(undefined, ''); + const getTag = (name: string) => result.getByText(name); + + fireEvent.click(getTag('tag1')); + + fireEvent.click(getTag('tag2')); + + expect(mockBulkUpdateTags).toHaveBeenCalledWith( + '', + [], + ['tag2', 'tag1'], + expect.anything(), + undefined, + undefined + ); + }); + it('should make tag options button visible on mouse enter', async () => { const result = renderComponent('agent1'); diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/tags_add_remove.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/tags_add_remove.tsx index a03ec3808e9ab..70b4da44dad68 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/tags_add_remove.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/tags_add_remove.tsx @@ -6,7 +6,7 @@ */ import React, { Fragment, useEffect, useState, useMemo, useCallback } from 'react'; -import { difference } from 'lodash'; +import { difference, uniq } from 'lodash'; import styled from 'styled-components'; import type { EuiSelectableOption } from '@elastic/eui'; import { @@ -95,8 +95,9 @@ export const TagsAddRemove: React.FC = ({ if (hasCompleted) { return onTagsUpdated(); } - const newSelectedTags = difference(selectedTags, tagsToRemove).concat(tagsToAdd); - const allTagsWithNew = allTags.includes(tagsToAdd[0]) ? allTags : allTags.concat(tagsToAdd); + const selected = labels.filter((tag) => tag.checked === 'on').map((tag) => tag.label); + const newSelectedTags = difference(selected, tagsToRemove).concat(tagsToAdd); + const allTagsWithNew = uniq(allTags.concat(newSelectedTags)); const allTagsWithRemove = isRenameOrDelete ? difference(allTagsWithNew, tagsToRemove) : allTagsWithNew; @@ -109,8 +110,8 @@ export const TagsAddRemove: React.FC = ({ successMessage?: string, errorMessage?: string ) => { - const newSelectedTags = difference(selectedTags, tagsToRemove).concat(tagsToAdd); if (agentId) { + const newSelectedTags = difference(selectedTags, tagsToRemove).concat(tagsToAdd); updateTagsHook.updateTags( agentId, newSelectedTags, @@ -119,10 +120,22 @@ export const TagsAddRemove: React.FC = ({ errorMessage ); } else { + // sending updated tags to add/remove, in case multiple actions are done quickly and the first one is not yet propagated + const updatedTagsToAdd = tagsToAdd.concat( + labels + .filter((tag) => tag.checked === 'on' && !selectedTags.includes(tag.label)) + .map((tag) => tag.label) + ); + const updatedTagsToRemove = tagsToRemove.concat( + labels + .filter((tag) => tag.checked !== 'on' && selectedTags.includes(tag.label)) + .map((tag) => tag.label) + ); + updateTagsHook.bulkUpdateTags( agents!, - tagsToAdd, - tagsToRemove, + updatedTagsToAdd, + updatedTagsToRemove, (hasCompleted) => handleTagsUpdated(tagsToAdd, tagsToRemove, hasCompleted), successMessage, errorMessage diff --git a/x-pack/plugins/fleet/server/services/agents/actions.ts b/x-pack/plugins/fleet/server/services/agents/actions.ts index 4a6c772b69b94..17c745bfd285f 100644 --- a/x-pack/plugins/fleet/server/services/agents/actions.ts +++ b/x-pack/plugins/fleet/server/services/agents/actions.ts @@ -134,6 +134,7 @@ export async function bulkCreateAgentActionResults( await esClient.bulk({ index: AGENT_ACTIONS_RESULTS_INDEX, body: bulkBody, + refresh: 'wait_for', }); } diff --git a/x-pack/test/fleet_api_integration/apis/agents/reassign.ts b/x-pack/test/fleet_api_integration/apis/agents/reassign.ts index 1283c9433ebba..2dd546511dd9a 100644 --- a/x-pack/test/fleet_api_integration/apis/agents/reassign.ts +++ b/x-pack/test/fleet_api_integration/apis/agents/reassign.ts @@ -121,9 +121,18 @@ export default function (providerContext: FtrProviderContext) { ]); expect(agent2data.body.item.policy_id).to.eql('policy2'); expect(agent3data.body.item.policy_id).to.eql('policy2'); + + const { body } = await supertest + .get(`/api/fleet/agents/action_status`) + .set('kbn-xsrf', 'xxx'); + const actionStatus = body.items[0]; + + expect(actionStatus.status).to.eql('FAILED'); + expect(actionStatus.nbAgentsActionCreated).to.eql(2); + expect(actionStatus.nbAgentsFailed).to.eql(3); }); - it('should allow to reassign multiple agents by id -- mixed invalid, hosted, etc', async () => { + it('should return error when none of the agents can be reassigned -- mixed invalid, hosted, etc', async () => { // agent1 is enrolled in policy1. set policy1 to hosted await supertest .put(`/api/fleet/agent_policies/policy1`) @@ -131,13 +140,15 @@ export default function (providerContext: FtrProviderContext) { .send({ name: 'Test policy', namespace: 'default', is_managed: true }) .expect(200); - await supertest + const { body } = await supertest .post(`/api/fleet/agents/bulk_reassign`) .set('kbn-xsrf', 'xxx') .send({ agents: ['agent2', 'INVALID_ID', 'agent3'], policy_id: 'policy2', - }); + }) + .expect(400); + expect(body.message).to.eql('No agents to reassign, already assigned or hosted agents'); const [agent2data, agent3data] = await Promise.all([ supertest.get(`/api/fleet/agents/agent2`), diff --git a/x-pack/test/fleet_api_integration/apis/agents/unenroll.ts b/x-pack/test/fleet_api_integration/apis/agents/unenroll.ts index fe31806038a5c..7f778d77f1a51 100644 --- a/x-pack/test/fleet_api_integration/apis/agents/unenroll.ts +++ b/x-pack/test/fleet_api_integration/apis/agents/unenroll.ts @@ -140,6 +140,13 @@ export default function (providerContext: FtrProviderContext) { expect(typeof agent3data.body.item.unenrollment_started_at).to.be('undefined'); expect(typeof agent3data.body.item.unenrolled_at).to.be('undefined'); expect(agent2data.body.item.active).to.eql(true); + + const { body } = await supertest + .get(`/api/fleet/agents/action_status`) + .set('kbn-xsrf', 'xxx'); + const actionStatus = body.items[0]; + expect(actionStatus.status).to.eql('FAILED'); + expect(actionStatus.nbAgentsFailed).to.eql(2); }); it('/agents/bulk_unenroll should allow to unenroll multiple agents by id from an regular agent policy', async () => { diff --git a/x-pack/test/fleet_api_integration/apis/agents/update_agent_tags.ts b/x-pack/test/fleet_api_integration/apis/agents/update_agent_tags.ts index 88079ae5e1aff..ff11076addcec 100644 --- a/x-pack/test/fleet_api_integration/apis/agents/update_agent_tags.ts +++ b/x-pack/test/fleet_api_integration/apis/agents/update_agent_tags.ts @@ -88,27 +88,46 @@ export default function (providerContext: FtrProviderContext) { }); it('should bulk update tags of multiple agents by kuery in batches', async () => { - await supertest + const { body: actionBody } = await supertest .post(`/api/fleet/agents/bulk_update_agent_tags`) .set('kbn-xsrf', 'xxx') .send({ agents: 'active: true', tagsToAdd: ['newTag'], tagsToRemove: ['existingTag'], - batchSize: 2, + batchSize: 3, }) .expect(200); + const actionId = actionBody.actionId; + + const verifyActionResult = async () => { + const { body } = await supertest.get(`/api/fleet/agents`).set('kbn-xsrf', 'xxx'); + expect(body.total).to.eql(4); + body.items.forEach((agent: any) => { + expect(agent.tags.includes('newTag')).to.be(true); + expect(agent.tags.includes('existingTag')).to.be(false); + }); + }; + await new Promise((resolve, reject) => { - setTimeout(async () => { - const { body } = await supertest.get(`/api/fleet/agents`).set('kbn-xsrf', 'xxx'); - expect(body.total).to.eql(4); - body.items.forEach((agent: any) => { - expect(agent.tags.includes('newTag')).to.be(true); - expect(agent.tags.includes('existingTag')).to.be(false); - }); - resolve({}); - }, 2000); + let attempts = 0; + const intervalId = setInterval(async () => { + if (attempts > 4) { + clearInterval(intervalId); + reject('action timed out'); + } + ++attempts; + const { + body: { items: actionStatuses }, + } = await supertest.get(`/api/fleet/agents/action_status`).set('kbn-xsrf', 'xxx'); + const action = actionStatuses.find((a: any) => a.actionId === actionId); + if (action && action.nbAgentsAck === 4) { + clearInterval(intervalId); + await verifyActionResult(); + resolve({}); + } + }, 1000); }).catch((e) => { throw e; }); @@ -156,6 +175,13 @@ export default function (providerContext: FtrProviderContext) { expect(agent1data.body.item.tags.includes('newTag')).to.be(false); expect(agent2data.body.item.tags.includes('newTag')).to.be(true); + + const { body } = await supertest + .get(`/api/fleet/agents/action_status`) + .set('kbn-xsrf', 'xxx'); + const actionStatus = body.items[0]; + expect(actionStatus.status).to.eql('FAILED'); + expect(actionStatus.nbAgentsFailed).to.eql(1); }); }); }); diff --git a/x-pack/test/fleet_api_integration/apis/agents/upgrade.ts b/x-pack/test/fleet_api_integration/apis/agents/upgrade.ts index e2762e21f33ad..e8dad8624021f 100644 --- a/x-pack/test/fleet_api_integration/apis/agents/upgrade.ts +++ b/x-pack/test/fleet_api_integration/apis/agents/upgrade.ts @@ -608,7 +608,7 @@ export default function (providerContext: FtrProviderContext) { .send({ agents: 'active:true', version: fleetServerVersion, - batchSize: 2, + batchSize: 3, }) .expect(200); @@ -626,7 +626,7 @@ export default function (providerContext: FtrProviderContext) { await new Promise((resolve, reject) => { let attempts = 0; const intervalId = setInterval(async () => { - if (attempts > 2) { + if (attempts > 4) { clearInterval(intervalId); reject('action timed out'); } @@ -636,7 +636,7 @@ export default function (providerContext: FtrProviderContext) { } = await supertest.get(`/api/fleet/agents/action_status`).set('kbn-xsrf', 'xxx'); const action = actionStatuses.find((a: any) => a.actionId === actionId); // 2 upgradeable - if (action && action.nbAgentsActionCreated === 2) { + if (action && action.nbAgentsActionCreated === 2 && action.nbAgentsFailed === 3) { clearInterval(intervalId); await verifyActionResult(); resolve({}); @@ -1032,6 +1032,13 @@ export default function (providerContext: FtrProviderContext) { expect(typeof agent1data.body.item.upgrade_started_at).to.be('undefined'); expect(typeof agent2data.body.item.upgrade_started_at).to.be('string'); + + const { body } = await supertest + .get(`/api/fleet/agents/action_status`) + .set('kbn-xsrf', 'xxx'); + const actionStatus = body.items[0]; + expect(actionStatus.status).to.eql('FAILED'); + expect(actionStatus.nbAgentsFailed).to.eql(1); }); it('enrolled in a hosted agent policy bulk upgrade with force flag should respond with 200 and update the agent SOs', async () => { From 7d69aae2696696342382b5f66267826dd9967cb6 Mon Sep 17 00:00:00 2001 From: James Gowdy Date: Wed, 28 Sep 2022 09:54:33 +0100 Subject: [PATCH 32/95] [ML] Fixing case of log pattern analysis title (#142034) Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../plugins/ml/public/application/aiops/log_categorization.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugins/ml/public/application/aiops/log_categorization.tsx b/x-pack/plugins/ml/public/application/aiops/log_categorization.tsx index e1d816d61357a..899006b5918dd 100644 --- a/x-pack/plugins/ml/public/application/aiops/log_categorization.tsx +++ b/x-pack/plugins/ml/public/application/aiops/log_categorization.tsx @@ -34,7 +34,7 @@ export const LogCategorizationPage: FC = () => { From 8f793cb83c167da32d696715e5b1f1a65f8c1c6c Mon Sep 17 00:00:00 2001 From: Uladzislau Lasitsa Date: Wed, 28 Sep 2022 12:39:26 +0300 Subject: [PATCH 33/95] [TSVB][Lens] Navigate to Lens TSVB Metric (#140878) * Added tsvb metric converting to Lens. * Allowed to convert to lens with invalid color rules. * Fixed static value converting. * Fixed tests. * Added unit tests for getPalette. * Added functional tests for converting to Lens. Co-authored-by: Yaroslav Kuznietsov Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../public/convert_to_lens/index.test.ts | 2 +- .../public/convert_to_lens/index.ts | 4 + .../lib/configurations/metric/index.ts | 67 +++++ .../lib/configurations/metric/palette.test.ts | 177 ++++++++++++ .../lib/configurations/metric/palette.ts | 214 ++++++++++++++ .../convert_to_lens/lib/convert/index.ts | 2 +- .../lib/convert/static_value.ts | 22 +- .../convert_to_lens/lib/convert/types.ts | 2 +- .../lib/metrics/supported_metrics.ts | 7 +- .../lib/series/metrics_columns.test.ts | 14 +- .../lib/series/metrics_columns.ts | 16 +- .../convert_to_lens/metric/index.test.ts | 272 ++++++++++++++++++ .../public/convert_to_lens/metric/index.ts | 130 +++++++++ .../convert_to_lens/metric/utils.test.ts | 104 +++++++ .../public/convert_to_lens/metric/utils.ts | 65 +++++ .../convert_to_lens/timeseries/index.ts | 4 +- .../public/convert_to_lens/top_n/index.ts | 4 +- .../public/convert_to_lens/types.ts | 8 +- .../convert_to_lens/types/configurations.ts | 24 +- .../visualizations/metric/suggestions.test.ts | 8 + .../visualizations/metric/suggestions.ts | 2 +- .../visualizations/metric/visualization.tsx | 40 ++- .../apps/lens/group3/tsvb_open_in_lens.ts | 13 +- 23 files changed, 1179 insertions(+), 22 deletions(-) create mode 100644 src/plugins/vis_types/timeseries/public/convert_to_lens/lib/configurations/metric/index.ts create mode 100644 src/plugins/vis_types/timeseries/public/convert_to_lens/lib/configurations/metric/palette.test.ts create mode 100644 src/plugins/vis_types/timeseries/public/convert_to_lens/lib/configurations/metric/palette.ts create mode 100644 src/plugins/vis_types/timeseries/public/convert_to_lens/metric/index.test.ts create mode 100644 src/plugins/vis_types/timeseries/public/convert_to_lens/metric/index.ts create mode 100644 src/plugins/vis_types/timeseries/public/convert_to_lens/metric/utils.test.ts create mode 100644 src/plugins/vis_types/timeseries/public/convert_to_lens/metric/utils.ts diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/index.test.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/index.test.ts index 435335fe9dd25..309f066b18f29 100644 --- a/src/plugins/vis_types/timeseries/public/convert_to_lens/index.test.ts +++ b/src/plugins/vis_types/timeseries/public/convert_to_lens/index.test.ts @@ -40,7 +40,7 @@ describe('convertTSVBtoLensConfiguration', () => { test('should return null for a not supported chart', async () => { const metricModel = { ...model, - type: 'metric', + type: 'markdown', } as Panel; const triggerOptions = await convertTSVBtoLensConfiguration(metricModel); expect(triggerOptions).toBeNull(); diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/index.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/index.ts index 5b92c0ab21668..a64118a1cb507 100644 --- a/src/plugins/vis_types/timeseries/public/convert_to_lens/index.ts +++ b/src/plugins/vis_types/timeseries/public/convert_to_lens/index.ts @@ -21,6 +21,10 @@ const getConvertFnByType = (type: PANEL_TYPES) => { const { convertToLens } = await import('./top_n'); return convertToLens; }, + [PANEL_TYPES.METRIC]: async () => { + const { convertToLens } = await import('./metric'); + return convertToLens; + }, }; return convertionFns[type]?.(); diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/configurations/metric/index.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/configurations/metric/index.ts new file mode 100644 index 0000000000000..d1f24485d7646 --- /dev/null +++ b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/configurations/metric/index.ts @@ -0,0 +1,67 @@ +/* + * 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. + */ + +import { MetricVisConfiguration } from '@kbn/visualizations-plugin/common'; +import { Metric, Panel, Series } from '../../../../../common/types'; +import { Column, Layer } from '../../convert'; +import { getSeriesAgg } from '../../series'; +import { getPalette } from './palette'; + +const getMetricWithCollapseFn = (series: Series | undefined) => { + if (!series) { + return; + } + const { metrics, seriesAgg } = getSeriesAgg(series.metrics); + const visibleMetric = metrics[metrics.length - 1]; + return { metric: visibleMetric, collapseFn: seriesAgg }; +}; + +const findMetricColumn = (metric: Metric | undefined, columns: Column[]) => { + if (!metric) { + return; + } + + return columns.find((column) => 'meta' in column && column.meta.metricId === metric.id); +}; + +export const getConfigurationForMetric = ( + model: Panel, + layer: Layer, + bucket?: Column +): MetricVisConfiguration | null => { + const [primarySeries, secondarySeries] = model.series.filter(({ hidden }) => !hidden); + + const primaryMetricWithCollapseFn = getMetricWithCollapseFn(primarySeries); + + if (!primaryMetricWithCollapseFn || !primaryMetricWithCollapseFn.metric) { + return null; + } + + const secondaryMetricWithCollapseFn = getMetricWithCollapseFn(secondarySeries); + const primaryColumn = findMetricColumn(primaryMetricWithCollapseFn.metric, layer.columns); + const secondaryColumn = findMetricColumn(secondaryMetricWithCollapseFn?.metric, layer.columns); + + if (primaryMetricWithCollapseFn.collapseFn && secondaryMetricWithCollapseFn?.collapseFn) { + return null; + } + + const palette = getPalette(model.background_color_rules ?? []); + if (palette === null) { + return null; + } + + return { + layerId: layer.layerId, + layerType: 'data', + metricAccessor: primaryColumn?.columnId, + secondaryMetricAccessor: secondaryColumn?.columnId, + breakdownByAccessor: bucket?.columnId, + palette, + collapseFn: primaryMetricWithCollapseFn.collapseFn ?? secondaryMetricWithCollapseFn?.collapseFn, + }; +}; diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/configurations/metric/palette.test.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/configurations/metric/palette.test.ts new file mode 100644 index 0000000000000..827dc15ff171b --- /dev/null +++ b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/configurations/metric/palette.test.ts @@ -0,0 +1,177 @@ +/* + * 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. + */ + +import { getPalette } from './palette'; + +describe('getPalette', () => { + const invalidRules = [ + { id: 'some-id-0' }, + { id: 'some-id-1', value: 10 }, + { id: 'some-id-2', operator: 'gte' }, + { id: 'some-id-3', color: '#000' }, + { id: 'some-id-4', background_color: '#000' }, + ]; + test('should return undefined if no filled rules was provided', () => { + expect(getPalette([])).toBeUndefined(); + expect(getPalette(invalidRules)).toBeUndefined(); + }); + + test('should return undefined if only one valid rule is provided and it is not lte', () => { + expect(getPalette([])).toBeUndefined(); + expect( + getPalette([ + ...invalidRules, + { id: 'some-id-5', operator: 'gt', value: 100, background_color: '#000' }, + ]) + ).toBeUndefined(); + }); + + test('should return custom palette if only one valid rule is provided and it is lte', () => { + expect(getPalette([])).toBeUndefined(); + expect( + getPalette([ + ...invalidRules, + { id: 'some-id-5', operator: 'lte', value: 100, background_color: '#000' }, + ]) + ).toEqual({ + name: 'custom', + params: { + colorStops: [{ color: '#000000', stop: 100 }], + continuity: 'below', + maxSteps: 5, + name: 'custom', + progression: 'fixed', + rangeMax: 100, + rangeMin: -Infinity, + rangeType: 'number', + reverse: false, + steps: 1, + stops: [{ color: '#000000', stop: 100 }], + }, + type: 'palette', + }); + }); + + test('should return undefined if more than two types of rules', () => { + expect(getPalette([])).toBeUndefined(); + expect( + getPalette([ + ...invalidRules, + { id: 'some-id-5', operator: 'lte', value: 100, background_color: '#000' }, + { id: 'some-id-6', operator: 'gte', value: 150, background_color: '#000' }, + { id: 'some-id-7', operator: 'lt', value: 200, background_color: '#000' }, + ]) + ).toBeUndefined(); + }); + + test('should return undefined if two types of rules and last rule is not lte', () => { + expect(getPalette([])).toBeUndefined(); + expect( + getPalette([ + ...invalidRules, + { id: 'some-id-5', operator: 'gte', value: 100, background_color: '#000' }, + { id: 'some-id-7', operator: 'lt', value: 200, background_color: '#000' }, + { id: 'some-id-6', operator: 'gte', value: 150, background_color: '#000' }, + ]) + ).toBeUndefined(); + }); + + test('should return undefined if all rules are lte', () => { + expect(getPalette([])).toBeUndefined(); + expect( + getPalette([ + ...invalidRules, + { id: 'some-id-5', operator: 'lte', value: 100, background_color: '#000' }, + { id: 'some-id-7', operator: 'lte', value: 200, background_color: '#000' }, + { id: 'some-id-6', operator: 'lte', value: 150, background_color: '#000' }, + ]) + ).toBeUndefined(); + }); + + test('should return undefined if two types of rules and all except last one are lt and last one is not lte', () => { + expect(getPalette([])).toBeUndefined(); + expect( + getPalette([ + ...invalidRules, + { id: 'some-id-5', operator: 'lt', value: 100, background_color: '#000' }, + { id: 'some-id-7', operator: 'gte', value: 200, background_color: '#000' }, + { id: 'some-id-6', operator: 'lt', value: 150, background_color: '#000' }, + ]) + ).toBeUndefined(); + }); + + test('should return custom palette if two types of rules and all except last one is lt and last one is lte', () => { + expect(getPalette([])).toBeUndefined(); + expect( + getPalette([ + ...invalidRules, + { id: 'some-id-5', operator: 'lt', value: 100, background_color: '#000' }, + { id: 'some-id-7', operator: 'lte', value: 200, background_color: '#000' }, + { id: 'some-id-6', operator: 'lt', value: 150, background_color: '#000' }, + ]) + ).toEqual({ + name: 'custom', + params: { + colorStops: [ + { color: '#000000', stop: -Infinity }, + { color: '#000000', stop: 100 }, + { color: '#000000', stop: 150 }, + ], + continuity: 'below', + maxSteps: 5, + name: 'custom', + progression: 'fixed', + rangeMax: 200, + rangeMin: -Infinity, + rangeType: 'number', + reverse: false, + steps: 4, + stops: [ + { color: '#000000', stop: 100 }, + { color: '#000000', stop: 150 }, + { color: '#000000', stop: 200 }, + ], + }, + type: 'palette', + }); + }); + + test('should return custom palette if last one is lte and all previous are gte', () => { + expect(getPalette([])).toBeUndefined(); + expect( + getPalette([ + ...invalidRules, + { id: 'some-id-5', operator: 'gte', value: 100, background_color: '#000' }, + { id: 'some-id-7', operator: 'lte', value: 200, background_color: '#000' }, + { id: 'some-id-6', operator: 'gte', value: 150, background_color: '#000' }, + ]) + ).toEqual({ + name: 'custom', + params: { + colorStops: [ + { color: '#000000', stop: 100 }, + { color: '#000000', stop: 150 }, + ], + continuity: 'none', + maxSteps: 5, + name: 'custom', + progression: 'fixed', + rangeMax: 200, + rangeMin: 100, + rangeType: 'number', + reverse: false, + steps: 2, + stops: [ + { color: '#000000', stop: 150 }, + { color: '#000000', stop: 200 }, + ], + }, + type: 'palette', + }); + }); +}); diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/configurations/metric/palette.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/configurations/metric/palette.ts new file mode 100644 index 0000000000000..55741c57595e7 --- /dev/null +++ b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/configurations/metric/palette.ts @@ -0,0 +1,214 @@ +/* + * 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. + */ +import color from 'color'; +import { ColorStop, CustomPaletteParams, PaletteOutput } from '@kbn/coloring'; +import { uniqBy } from 'lodash'; +import { Panel } from '../../../../../common/types'; + +const Operators = { + GTE: 'gte', + GT: 'gt', + LTE: 'lte', + LT: 'lt', +} as const; + +type ColorStopsWithMinMax = Pick< + CustomPaletteParams, + 'colorStops' | 'stops' | 'steps' | 'rangeMax' | 'rangeMin' | 'continuity' +>; + +const getColorStopsWithMinMaxForAllGteOrWithLte = ( + rules: Exclude, + tailOperator: string +): ColorStopsWithMinMax => { + const lastRule = rules[rules.length - 1]; + const lastRuleColor = (lastRule.background_color ?? lastRule.color)!; + + const colorStops = rules.reduce((colors, rule, index, rulesArr) => { + const rgbColor = (rule.background_color ?? rule.color)!; + if (index === rulesArr.length - 1 && tailOperator === Operators.LTE) { + return colors; + } + // if last operation is LTE, color of gte should be replaced by lte + if (index === rulesArr.length - 2 && tailOperator === Operators.LTE) { + return [ + ...colors, + { + color: color(lastRuleColor).hex(), + stop: rule.value!, + }, + ]; + } + return [ + ...colors, + { + color: color(rgbColor).hex(), + stop: rule.value!, + }, + ]; + }, []); + + const stops = colorStops.reduce((prevStops, colorStop, index, colorStopsArr) => { + if (index === colorStopsArr.length - 1) { + return [ + ...prevStops, + { + color: colorStop.color, + stop: tailOperator === Operators.LTE ? lastRule.value! : colorStop.stop + 1, + }, + ]; + } + return [...prevStops, { color: colorStop.color, stop: colorStopsArr[index + 1].stop }]; + }, []); + + const [rule] = rules; + return { + rangeMin: rule.value, + rangeMax: tailOperator === Operators.LTE ? lastRule.value : Infinity, + colorStops, + stops, + steps: colorStops.length, + continuity: tailOperator === Operators.LTE ? 'none' : 'above', + }; +}; + +const getColorStopsWithMinMaxForLtWithLte = ( + rules: Exclude +): ColorStopsWithMinMax => { + const lastRule = rules[rules.length - 1]; + const colorStops = rules.reduce((colors, rule, index, rulesArr) => { + if (index === 0) { + return [{ color: color((rule.background_color ?? rule.color)!).hex(), stop: -Infinity }]; + } + const rgbColor = (rule.background_color ?? rule.color)!; + return [ + ...colors, + { + color: color(rgbColor).hex(), + stop: rulesArr[index - 1].value!, + }, + ]; + }, []); + + const stops = colorStops.reduce((prevStops, colorStop, index, colorStopsArr) => { + if (index === colorStopsArr.length - 1) { + return [ + ...prevStops, + { + color: colorStop.color, + stop: lastRule.value!, + }, + ]; + } + return [...prevStops, { color: colorStop.color, stop: colorStopsArr[index + 1].stop }]; + }, []); + + return { + rangeMin: -Infinity, + rangeMax: lastRule.value, + colorStops, + stops, + steps: colorStops.length + 1, + continuity: 'below', + }; +}; + +const getColorStopWithMinMaxForLte = ( + rule: Exclude[number] +): ColorStopsWithMinMax => { + const colorStop = { + color: color((rule.background_color ?? rule.color)!).hex(), + stop: rule.value!, + }; + return { + rangeMin: -Infinity, + rangeMax: rule.value!, + colorStops: [colorStop], + stops: [colorStop], + steps: 1, + continuity: 'below', + }; +}; + +const getCustomPalette = ( + colorStopsWithMinMax: ColorStopsWithMinMax +): PaletteOutput => { + return { + name: 'custom', + params: { + continuity: 'all', + maxSteps: 5, + name: 'custom', + progression: 'fixed', + rangeMax: Infinity, + rangeMin: -Infinity, + rangeType: 'number', + reverse: false, + ...colorStopsWithMinMax, + }, + type: 'palette', + }; +}; + +export const getPalette = ( + rules: Exclude +): PaletteOutput | null | undefined => { + const validRules = + rules.filter( + ({ operator, color: textColor, value, background_color: bColor }) => + operator && (bColor ?? textColor) && value !== undefined + ) ?? []; + + validRules.sort((rule1, rule2) => { + return rule1.value! - rule2.value!; + }); + + const kindOfRules = uniqBy(validRules, 'operator'); + + if (!kindOfRules.length) { + return; + } + + // lnsMetric is supporting lte only, if one rule is defined + if (validRules.length === 1) { + if (validRules[0].operator !== Operators.LTE) { + return; + } + return getCustomPalette(getColorStopWithMinMaxForLte(validRules[0])); + } + + const headRules = validRules.slice(0, -1); + const tailRule = validRules[validRules.length - 1]; + const kindOfHeadRules = uniqBy(headRules, 'operator'); + + if ( + kindOfHeadRules.length > 1 || + (kindOfHeadRules[0].operator !== tailRule.operator && tailRule.operator !== Operators.LTE) + ) { + return; + } + + const [rule] = kindOfHeadRules; + + if (rule.operator === Operators.LTE) { + return; + } + + if (rule.operator === Operators.LT) { + if (tailRule.operator !== Operators.LTE) { + return; + } + return getCustomPalette(getColorStopsWithMinMaxForLtWithLte(validRules)); + } + + if (rule.operator === Operators.GTE) { + return getCustomPalette( + getColorStopsWithMinMaxForAllGteOrWithLte(validRules, tailRule.operator!) + ); + } +}; diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/index.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/index.ts index 36f05c440bdc2..e03701e6ea153 100644 --- a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/index.ts +++ b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/index.ts @@ -17,7 +17,7 @@ export { export { convertToCumulativeSumColumns } from './cumulative_sum'; export { convertFilterRatioToFormulaColumn } from './filter_ratio'; export { convertToLastValueColumn } from './last_value'; -export { convertToStaticValueColumn } from './static_value'; +export { convertToStaticValueColumn, convertStaticValueToFormulaColumn } from './static_value'; export { convertToFiltersColumn } from './filters'; export { convertToDateHistogramColumn } from './date_histogram'; export { convertToTermsColumn } from './terms'; diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/static_value.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/static_value.ts index c4400f72b289b..e03a9d7821364 100644 --- a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/static_value.ts +++ b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/static_value.ts @@ -7,9 +7,10 @@ */ import { StaticValueParams } from '@kbn/visualizations-plugin/common/convert_to_lens'; -import { CommonColumnsConverterArgs, StaticValueColumn } from './types'; +import { CommonColumnsConverterArgs, FormulaColumn, StaticValueColumn } from './types'; import type { Metric } from '../../../../common/types'; import { createColumn, getFormat } from './column'; +import { createFormulaColumn } from './formula'; export const convertToStaticValueParams = ({ value }: Metric): StaticValueParams => ({ value, @@ -37,3 +38,22 @@ export const convertToStaticValueColumn = ( }, }; }; + +export const convertStaticValueToFormulaColumn = ( + { series, metrics, dataView }: CommonColumnsConverterArgs, + { + visibleSeriesCount = 0, + reducedTimeRange, + }: { visibleSeriesCount?: number; reducedTimeRange?: string } = {} +): FormulaColumn | null => { + // Lens support reference lines only when at least one layer data exists + if (visibleSeriesCount === 1) { + return null; + } + const currentMetric = metrics[metrics.length - 1]; + return createFormulaColumn(currentMetric.value ?? '', { + series, + metric: currentMetric, + dataView, + }); +}; diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/types.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/types.ts index d21291dc2622a..e5b862a0fe70f 100644 --- a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/types.ts +++ b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/types.ts @@ -85,7 +85,7 @@ export type MovingAverageColumn = GenericColumnWithMeta; export type StaticValueColumn = GenericColumnWithMeta; -type ColumnsWithoutMeta = FiltersColumn | TermsColumn | DateHistogramColumn; +export type ColumnsWithoutMeta = FiltersColumn | TermsColumn | DateHistogramColumn; export type AnyColumnWithReferences = GenericColumnWithMeta; type CommonColumns = Exclude; diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/metrics/supported_metrics.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/metrics/supported_metrics.ts index 933e7e344b7fd..76d15793f4516 100644 --- a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/metrics/supported_metrics.ts +++ b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/metrics/supported_metrics.ts @@ -62,7 +62,12 @@ export type SupportedMetrics = LocalSupportedMetrics & { [Key in UnsupportedSupportedMetrics]?: null; }; -const supportedPanelTypes: readonly PANEL_TYPES[] = [PANEL_TYPES.TIMESERIES, PANEL_TYPES.TOP_N]; +const supportedPanelTypes: readonly PANEL_TYPES[] = [ + PANEL_TYPES.TIMESERIES, + PANEL_TYPES.TOP_N, + PANEL_TYPES.METRIC, +]; + const supportedTimeRangeModes: readonly TIME_RANGE_DATA_MODES[] = [ TIME_RANGE_DATA_MODES.ENTIRE_TIME_RANGE, TIME_RANGE_DATA_MODES.LAST_VALUE, diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/series/metrics_columns.test.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/series/metrics_columns.test.ts index 5ca1fe71a0ada..4461072c8df62 100644 --- a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/series/metrics_columns.test.ts +++ b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/series/metrics_columns.test.ts @@ -20,6 +20,7 @@ const mockConvertToCounterRateColumn = jest.fn(); const mockConvertOtherAggsToFormulaColumn = jest.fn(); const mockConvertToLastValueColumn = jest.fn(); const mockConvertToStaticValueColumn = jest.fn(); +const mockConvertStaticValueToFormulaColumn = jest.fn(); const mockConvertToStandartDeviationColumn = jest.fn(); const mockConvertMetricAggregationColumnWithoutSpecialParams = jest.fn(); @@ -32,6 +33,7 @@ jest.mock('../convert', () => ({ convertOtherAggsToFormulaColumn: jest.fn(() => mockConvertOtherAggsToFormulaColumn()), convertToLastValueColumn: jest.fn(() => mockConvertToLastValueColumn()), convertToStaticValueColumn: jest.fn(() => mockConvertToStaticValueColumn()), + convertStaticValueToFormulaColumn: jest.fn(() => mockConvertStaticValueToFormulaColumn()), convertToStandartDeviationColumn: jest.fn(() => mockConvertToStandartDeviationColumn()), convertMetricAggregationColumnWithoutSpecialParams: jest.fn(() => mockConvertMetricAggregationColumnWithoutSpecialParams() @@ -138,8 +140,18 @@ describe('getMetricsColumns', () => { mockConvertToLastValueColumn, ], [ - 'call convertToStaticValueColumn if metric type is static', + 'call convertStaticValueToFormulaColumn if metric type is static', [createSeries({ metrics: [{ type: TSVB_METRIC_TYPES.STATIC, id: '1' }] }), dataView, 1], + mockConvertStaticValueToFormulaColumn, + ], + [ + 'call convertToStaticValueColumn if metric type is static and isStaticValueColumnSupported is true', + [ + createSeries({ metrics: [{ type: TSVB_METRIC_TYPES.STATIC, id: '1' }] }), + dataView, + 1, + { isStaticValueColumnSupported: true }, + ], mockConvertToStaticValueColumn, ], [ diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/series/metrics_columns.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/series/metrics_columns.ts index 07294a3a61aaa..8f7d4ded0d076 100644 --- a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/series/metrics_columns.ts +++ b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/series/metrics_columns.ts @@ -21,6 +21,7 @@ import { convertFilterRatioToFormulaColumn, convertToLastValueColumn, convertToStaticValueColumn, + convertStaticValueToFormulaColumn, convertMetricAggregationColumnWithoutSpecialParams, convertToCounterRateColumn, convertToStandartDeviationColumn, @@ -31,7 +32,10 @@ export const getMetricsColumns = ( series: Series, dataView: DataView, visibleSeriesCount: number, - reducedTimeRange?: string + { + isStaticValueColumnSupported = false, + reducedTimeRange, + }: { reducedTimeRange?: string; isStaticValueColumnSupported?: boolean } = {} ): Column[] | null => { const { metrics: validMetrics, seriesAgg } = getSeriesAgg( series.metrics as [Metric, ...Metric[]] @@ -117,10 +121,12 @@ export const getMetricsColumns = ( return getValidColumns(column); } case 'static': { - const column = convertToStaticValueColumn(columnsConverterArgs, { - visibleSeriesCount, - reducedTimeRange, - }); + const column = isStaticValueColumnSupported + ? convertToStaticValueColumn(columnsConverterArgs, { + visibleSeriesCount, + reducedTimeRange, + }) + : convertStaticValueToFormulaColumn(columnsConverterArgs); return getValidColumns(column); } case 'std_deviation': { diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/metric/index.test.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/metric/index.test.ts new file mode 100644 index 0000000000000..9407599573d9d --- /dev/null +++ b/src/plugins/vis_types/timeseries/public/convert_to_lens/metric/index.test.ts @@ -0,0 +1,272 @@ +/* + * 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. + */ + +import { METRIC_TYPES } from '@kbn/data-plugin/public'; +import { stubLogstashDataView } from '@kbn/data-views-plugin/common/data_view.stub'; +import { convertToLens } from '.'; +import { createPanel, createSeries } from '../lib/__mocks__'; + +const mockGetMetricsColumns = jest.fn(); +const mockGetBucketsColumns = jest.fn(); +const mockGetConfigurationForMetric = jest.fn(); +const mockIsValidMetrics = jest.fn(); +const mockGetDatasourceValue = jest + .fn() + .mockImplementation(() => Promise.resolve(stubLogstashDataView)); +const mockGetDataSourceInfo = jest.fn(); + +jest.mock('../../services', () => ({ + getDataViewsStart: jest.fn(() => mockGetDatasourceValue), +})); + +jest.mock('../lib/series', () => ({ + getMetricsColumns: jest.fn(() => mockGetMetricsColumns()), + getBucketsColumns: jest.fn(() => mockGetBucketsColumns()), +})); + +jest.mock('../lib/configurations/metric', () => ({ + getConfigurationForMetric: jest.fn(() => mockGetConfigurationForMetric()), +})); + +jest.mock('../lib/metrics', () => ({ + isValidMetrics: jest.fn(() => mockIsValidMetrics()), + getReducedTimeRange: jest.fn().mockReturnValue('10'), +})); + +jest.mock('../lib/datasource', () => ({ + getDataSourceInfo: jest.fn(() => mockGetDataSourceInfo()), +})); + +describe('convertToLens', () => { + const model = createPanel({ + series: [ + createSeries({ + metrics: [ + { id: 'some-id', type: METRIC_TYPES.AVG, field: 'test-field' }, + { id: 'some-id-1', type: METRIC_TYPES.COUNT }, + ], + }), + ], + }); + + const bucket = { + isBucketed: true, + isSplit: true, + operationType: 'terms', + params: { + exclude: [], + excludeIsRegex: true, + include: [], + includeIsRegex: true, + orderAgg: { + columnId: 'some-id-0', + dataType: 'number', + isBucketed: true, + isSplit: false, + operationType: 'average', + params: {}, + sourceField: 'bytes', + }, + orderBy: { columnId: 'some-id-0', type: 'column' }, + orderDirection: 'asc', + otherBucket: false, + parentFormat: { id: 'terms' }, + secondaryFields: [], + size: 3, + }, + sourceField: 'bytes', + }; + + const bucket2 = { + isBucketed: true, + isSplit: true, + operationType: 'terms', + params: { + exclude: [], + excludeIsRegex: true, + include: [], + includeIsRegex: true, + orderAgg: { + columnId: 'some-id-1', + dataType: 'number', + isBucketed: true, + isSplit: false, + operationType: 'average', + params: {}, + sourceField: 'bytes', + }, + orderBy: { columnId: 'some-id-1', type: 'column' }, + orderDirection: 'desc', + otherBucket: false, + parentFormat: { id: 'terms' }, + secondaryFields: [], + size: 10, + }, + sourceField: 'bytes', + }; + + const metric = { + meta: { metricId: 'some-id-0' }, + operationType: 'last_value', + params: { showArrayValues: false, sortField: '@timestamp' }, + reducedTimeRange: '10m', + }; + + beforeEach(() => { + mockIsValidMetrics.mockReturnValue(true); + mockGetDataSourceInfo.mockReturnValue({ + indexPatternId: 'test-index-pattern', + timeField: 'timeField', + indexPattern: { id: 'test-index-pattern' }, + }); + mockGetMetricsColumns.mockReturnValue([{}]); + mockGetBucketsColumns.mockReturnValue([{}]); + mockGetConfigurationForMetric.mockReturnValue({}); + }); + + afterEach(() => { + jest.clearAllMocks(); + }); + + test('should return null for invalid metrics', async () => { + mockIsValidMetrics.mockReturnValue(null); + const result = await convertToLens(model); + expect(result).toBeNull(); + expect(mockIsValidMetrics).toBeCalledTimes(1); + }); + + test('should return null for invalid or unsupported metrics', async () => { + mockGetMetricsColumns.mockReturnValue(null); + const result = await convertToLens(model); + expect(result).toBeNull(); + expect(mockGetMetricsColumns).toBeCalledTimes(1); + }); + + test('should return null for invalid or unsupported buckets', async () => { + mockGetBucketsColumns.mockReturnValue(null); + const result = await convertToLens(model); + expect(result).toBeNull(); + expect(mockGetBucketsColumns).toBeCalledTimes(1); + }); + + test('should return state for valid model', async () => { + const result = await convertToLens(model); + expect(result).toBeDefined(); + expect(result?.type).toBe('lnsMetric'); + expect(mockGetBucketsColumns).toBeCalledTimes(model.series.length); + expect(mockGetConfigurationForMetric).toBeCalledTimes(1); + }); + + test('should skip hidden series', async () => { + const result = await convertToLens( + createPanel({ + series: [ + createSeries({ + metrics: [{ id: 'some-id', type: METRIC_TYPES.AVG, field: 'test-field' }], + hidden: true, + }), + ], + }) + ); + expect(result).toBeDefined(); + expect(result?.type).toBe('lnsMetric'); + expect(mockIsValidMetrics).toBeCalledTimes(0); + }); + + test('should return null if multiple indexPatterns are provided', async () => { + mockGetDataSourceInfo.mockReturnValueOnce({ + indexPatternId: 'test-index-pattern-1', + timeField: 'timeField', + indexPattern: { id: 'test-index-pattern-1' }, + }); + + const result = await convertToLens( + createPanel({ + series: [ + createSeries({ + metrics: [{ id: 'some-id', type: METRIC_TYPES.AVG, field: 'test-field' }], + hidden: false, + }), + createSeries({ + metrics: [{ id: 'some-id', type: METRIC_TYPES.AVG, field: 'test-field' }], + hidden: false, + }), + ], + }) + ); + expect(result).toBeNull(); + }); + + test('should return null if visible series is 2 and bucket is 1', async () => { + mockGetBucketsColumns.mockReturnValueOnce([bucket]); + mockGetBucketsColumns.mockReturnValueOnce([]); + mockGetMetricsColumns.mockReturnValueOnce([metric]); + + const result = await convertToLens( + createPanel({ + series: [ + createSeries({ + metrics: [{ id: 'some-id', type: METRIC_TYPES.AVG, field: 'test-field' }], + hidden: false, + }), + createSeries({ + metrics: [{ id: 'some-id', type: METRIC_TYPES.AVG, field: 'test-field' }], + hidden: false, + }), + ], + }) + ); + expect(result).toBeNull(); + }); + + test('should return null if visible series is 2 and two not unique buckets', async () => { + mockGetBucketsColumns.mockReturnValueOnce([bucket]); + mockGetBucketsColumns.mockReturnValueOnce([bucket2]); + mockGetMetricsColumns.mockReturnValueOnce([metric]); + + const result = await convertToLens( + createPanel({ + series: [ + createSeries({ + metrics: [{ id: 'some-id', type: METRIC_TYPES.AVG, field: 'test-field' }], + hidden: false, + }), + createSeries({ + metrics: [{ id: 'some-id', type: METRIC_TYPES.AVG, field: 'test-field' }], + hidden: false, + }), + ], + }) + ); + expect(result).toBeNull(); + }); + + test('should return state if visible series is 2 and two unique buckets', async () => { + mockGetBucketsColumns.mockReturnValueOnce([bucket]); + mockGetBucketsColumns.mockReturnValueOnce([bucket]); + mockGetMetricsColumns.mockReturnValueOnce([metric]); + + const result = await convertToLens( + createPanel({ + series: [ + createSeries({ + metrics: [{ id: 'some-id', type: METRIC_TYPES.AVG, field: 'test-field' }], + hidden: false, + }), + createSeries({ + metrics: [{ id: 'some-id', type: METRIC_TYPES.AVG, field: 'test-field' }], + hidden: false, + }), + ], + }) + ); + expect(result).toBeDefined(); + expect(result?.type).toBe('lnsMetric'); + expect(mockGetConfigurationForMetric).toBeCalledTimes(1); + }); +}); diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/metric/index.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/metric/index.ts new file mode 100644 index 0000000000000..25f55b5a1c44c --- /dev/null +++ b/src/plugins/vis_types/timeseries/public/convert_to_lens/metric/index.ts @@ -0,0 +1,130 @@ +/* + * 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. + */ + +import uuid from 'uuid'; +import { DataView, parseTimeShift } from '@kbn/data-plugin/common'; +import { getIndexPatternIds } from '@kbn/visualizations-plugin/common/convert_to_lens'; +import { PANEL_TYPES } from '../../../common/enums'; +import { getDataViewsStart } from '../../services'; +import { getDataSourceInfo } from '../lib/datasource'; +import { getMetricsColumns, getBucketsColumns } from '../lib/series'; +import { getConfigurationForMetric as getConfiguration } from '../lib/configurations/metric'; +import { getReducedTimeRange, isValidMetrics } from '../lib/metrics'; +import { ConvertTsvbToLensVisualization } from '../types'; +import { ColumnsWithoutMeta, Layer as ExtendedLayer } from '../lib/convert'; +import { excludeMetaFromLayers, getUniqueBuckets } from './utils'; + +const MAX_SERIES = 2; +const MAX_BUCKETS = 2; + +export const convertToLens: ConvertTsvbToLensVisualization = async (model, timeRange) => { + const dataViews = getDataViewsStart(); + const seriesNum = model.series.filter((series) => !series.hidden).length; + + const indexPatternIds = new Set(); + const visibleSeries = model.series.filter(({ hidden }) => !hidden); + let currentIndexPattern: DataView | null = null; + for (const series of visibleSeries) { + const datasourceInfo = await getDataSourceInfo( + model.index_pattern, + model.time_field, + Boolean(series.override_index_pattern), + series.series_index_pattern, + series.series_time_field, + dataViews + ); + + if (!datasourceInfo) { + return null; + } + + const { indexPatternId, indexPattern } = datasourceInfo; + indexPatternIds.add(indexPatternId); + currentIndexPattern = indexPattern; + } + + if (indexPatternIds.size > 1) { + return null; + } + + const [indexPatternId] = indexPatternIds.values(); + + const buckets = []; + const metrics = []; + + // handle multiple layers/series + for (const series of visibleSeries) { + // not valid time shift + if (series.offset_time && parseTimeShift(series.offset_time) === 'invalid') { + return null; + } + + if (!isValidMetrics(series.metrics, PANEL_TYPES.METRIC, series.time_range_mode)) { + return null; + } + + const reducedTimeRange = getReducedTimeRange(model, series, timeRange); + + // handle multiple metrics + const metricsColumns = getMetricsColumns(series, currentIndexPattern!, seriesNum, { + reducedTimeRange, + }); + if (metricsColumns === null) { + return null; + } + + const bucketsColumns = getBucketsColumns( + model, + series, + metricsColumns, + currentIndexPattern!, + false + ); + + if (bucketsColumns === null) { + return null; + } + + buckets.push(...bucketsColumns); + metrics.push(...metricsColumns); + } + + let uniqueBuckets = buckets; + if (visibleSeries.length === MAX_SERIES && buckets.length) { + if (buckets.length !== MAX_BUCKETS) { + return null; + } + + uniqueBuckets = getUniqueBuckets(buckets as ColumnsWithoutMeta[]); + if (uniqueBuckets.length !== 1) { + return null; + } + } + + const [bucket] = uniqueBuckets; + + const extendedLayer: ExtendedLayer = { + indexPatternId: indexPatternId as string, + layerId: uuid(), + columns: [...metrics, ...(bucket ? [bucket] : [])], + columnOrder: [], + }; + + const configuration = getConfiguration(model, extendedLayer, bucket); + if (!configuration) { + return null; + } + + const layers = Object.values(excludeMetaFromLayers({ 0: extendedLayer })); + return { + type: 'lnsMetric', + layers, + configuration, + indexPatternIds: getIndexPatternIds(layers), + }; +}; diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/metric/utils.test.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/metric/utils.test.ts new file mode 100644 index 0000000000000..8f880dfe95c5e --- /dev/null +++ b/src/plugins/vis_types/timeseries/public/convert_to_lens/metric/utils.test.ts @@ -0,0 +1,104 @@ +/* + * 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. + */ + +import { Column, DateHistogramColumn, TermsColumn } from '../lib/convert'; +import { getUniqueBuckets } from './utils'; + +describe('getUniqueBuckets', () => { + const bucket2: TermsColumn = { + columnId: '12', + dataType: 'string', + isBucketed: true, + isSplit: true, + operationType: 'terms', + params: { + exclude: [], + excludeIsRegex: true, + include: [], + includeIsRegex: true, + orderAgg: { + columnId: 'some-id-1', + dataType: 'number', + isBucketed: true, + isSplit: false, + operationType: 'average', + params: {}, + sourceField: 'bytes', + }, + orderBy: { columnId: 'some-id-1', type: 'column' }, + orderDirection: 'desc', + otherBucket: false, + parentFormat: { id: 'terms' }, + secondaryFields: [], + size: 10, + }, + sourceField: 'bytes', + }; + + it('should return unique buckets', () => { + expect(getUniqueBuckets([bucket2, bucket2])).toEqual([bucket2]); + }); + + it('should ignore columnIds', () => { + const bucketWithOtherColumnIds = { + ...bucket2, + columnId: '22', + params: { + ...bucket2.params, + orderAgg: { ...bucket2.params.orderAgg, columnId: '---1' } as Column, + orderBy: { ...bucket2.params.orderBy, columnId: '---2' } as { + type: 'column'; + columnId: string; + }, + }, + }; + expect(getUniqueBuckets([bucket2, bucketWithOtherColumnIds])).toEqual([bucket2]); + }); + + it('should respect differences of terms', () => { + const bucketWithOtherColumnIds = { + ...bucket2, + columnId: '22', + params: { + ...bucket2.params, + orderAgg: { ...bucket2.params.orderAgg, columnId: '---1' } as Column, + orderBy: { ...bucket2.params.orderBy, columnId: '---2' } as { + type: 'column'; + columnId: string; + }, + }, + sourceField: 'name', + }; + expect(getUniqueBuckets([bucket2, bucketWithOtherColumnIds])).toEqual([ + bucket2, + bucketWithOtherColumnIds, + ]); + }); + + it('should respect differences of other buckets', () => { + const bucket: DateHistogramColumn = { + dataType: 'number', + isBucketed: true, + isSplit: false, + operationType: 'date_histogram', + params: { dropPartials: false, includeEmptyRows: true, interval: 'auto' }, + sourceField: 'field1', + columnId: '1', + }; + const bucket1 = { + ...bucket, + columnId: '22', + }; + expect(getUniqueBuckets([bucket, bucket1])).toEqual([bucket]); + const bucket3 = { + ...bucket, + field: 'some-other-field', + }; + expect(getUniqueBuckets([bucket, bucket3])).toEqual([bucket, bucket3]); + }); +}); diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/metric/utils.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/metric/utils.ts new file mode 100644 index 0000000000000..8df1b0f40f8be --- /dev/null +++ b/src/plugins/vis_types/timeseries/public/convert_to_lens/metric/utils.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 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 { uniqWith } from 'lodash'; +import deepEqual from 'react-fast-compare'; +import { Layer, Operations, TermsColumn } from '@kbn/visualizations-plugin/common/convert_to_lens'; +import { Layer as ExtendedLayer, excludeMetaFromColumn, ColumnsWithoutMeta } from '../lib/convert'; + +export const excludeMetaFromLayers = ( + layers: Record +): Record => { + const newLayers: Record = {}; + Object.entries(layers).forEach(([layerId, layer]) => { + const columns = layer.columns.map(excludeMetaFromColumn); + newLayers[layerId] = { ...layer, columns }; + }); + + return newLayers; +}; + +const excludeColumnIdsFromBucket = (bucket: ColumnsWithoutMeta) => { + const { columnId, ...restBucket } = bucket; + if (bucket.operationType === Operations.TERMS) { + const { orderBy, orderAgg, ...restParams } = bucket.params; + let orderByWithoutColumn: Omit = orderBy; + if ('columnId' in orderBy) { + const { columnId: orderByColumnId, ...restOrderBy } = orderBy; + orderByWithoutColumn = restOrderBy; + } + + let orderAggWithoutColumn: Omit | undefined = + orderAgg; + if (orderAgg) { + const { columnId: cId, ...restOrderAgg } = orderAgg; + orderAggWithoutColumn = restOrderAgg; + } + + return { + ...restBucket, + params: { + ...restParams, + orderBy: orderByWithoutColumn, + orderAgg: orderAggWithoutColumn, + }, + }; + } + return restBucket; +}; + +export const getUniqueBuckets = (buckets: ColumnsWithoutMeta[]) => + uniqWith(buckets, (bucket1, bucket2) => { + if (bucket1.operationType !== bucket2.operationType) { + return false; + } + + const bucketWithoutColumnIds1 = excludeColumnIdsFromBucket(bucket1); + const bucketWithoutColumnIds2 = excludeColumnIdsFromBucket(bucket2); + + return deepEqual(bucketWithoutColumnIds1, bucketWithoutColumnIds2); + }); diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/timeseries/index.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/timeseries/index.ts index 4610310c1b378..8cbbbf0f9e739 100644 --- a/src/plugins/vis_types/timeseries/public/convert_to_lens/timeseries/index.ts +++ b/src/plugins/vis_types/timeseries/public/convert_to_lens/timeseries/index.ts @@ -86,7 +86,9 @@ export const convertToLens: ConvertTsvbToLensVisualization = async (model: Panel return null; } // handle multiple metrics - const metricsColumns = getMetricsColumns(series, indexPattern!, seriesNum); + const metricsColumns = getMetricsColumns(series, indexPattern!, seriesNum, { + isStaticValueColumnSupported: true, + }); if (metricsColumns === null) { return null; } diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/top_n/index.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/top_n/index.ts index 630a9e5cf4c97..020aaec28f573 100644 --- a/src/plugins/vis_types/timeseries/public/convert_to_lens/top_n/index.ts +++ b/src/plugins/vis_types/timeseries/public/convert_to_lens/top_n/index.ts @@ -65,7 +65,9 @@ export const convertToLens: ConvertTsvbToLensVisualization = async (model, timeR const reducedTimeRange = getReducedTimeRange(model, series, timeRange); // handle multiple metrics - const metricsColumns = getMetricsColumns(series, indexPattern!, seriesNum, reducedTimeRange); + const metricsColumns = getMetricsColumns(series, indexPattern!, seriesNum, { + reducedTimeRange, + }); if (!metricsColumns) { return null; } diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/types.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/types.ts index acee3c2a1e83a..69a90c7864eb3 100644 --- a/src/plugins/vis_types/timeseries/public/convert_to_lens/types.ts +++ b/src/plugins/vis_types/timeseries/public/convert_to_lens/types.ts @@ -6,14 +6,18 @@ * Side Public License, v 1. */ -import { NavigateToLensContext, XYConfiguration } from '@kbn/visualizations-plugin/common'; +import { + MetricVisConfiguration, + NavigateToLensContext, + XYConfiguration, +} from '@kbn/visualizations-plugin/common'; import { TimeRange } from '@kbn/data-plugin/common'; import type { Panel } from '../../common/types'; export type ConvertTsvbToLensVisualization = ( model: Panel, timeRange?: TimeRange -) => Promise | null>; +) => Promise | null>; export interface Filter { kql?: string | { [key: string]: any } | undefined; diff --git a/src/plugins/visualizations/common/convert_to_lens/types/configurations.ts b/src/plugins/visualizations/common/convert_to_lens/types/configurations.ts index 8c348fec4c2fa..fc1e440db3506 100644 --- a/src/plugins/visualizations/common/convert_to_lens/types/configurations.ts +++ b/src/plugins/visualizations/common/convert_to_lens/types/configurations.ts @@ -6,9 +6,9 @@ * Side Public License, v 1. */ -import { HorizontalAlignment, Position, VerticalAlignment } from '@elastic/charts'; +import { HorizontalAlignment, LayoutDirection, Position, VerticalAlignment } from '@elastic/charts'; import { $Values } from '@kbn/utility-types'; -import type { PaletteOutput } from '@kbn/coloring'; +import type { CustomPaletteParams, PaletteOutput } from '@kbn/coloring'; import { KibanaQueryOutput } from '@kbn/data-plugin/common'; import { LegendSize } from '../../constants'; @@ -199,4 +199,22 @@ export interface TableVisConfiguration { paging?: PagingState; } -export type Configuration = XYConfiguration | TableVisConfiguration; +export interface MetricVisConfiguration { + layerId: string; + layerType: 'data'; + metricAccessor?: string; + secondaryMetricAccessor?: string; + maxAccessor?: string; + breakdownByAccessor?: string; + // the dimensions can optionally be single numbers + // computed by collapsing all rows + collapseFn?: string; + subtitle?: string; + secondaryPrefix?: string; + progressDirection?: LayoutDirection; + color?: string; + palette?: PaletteOutput; + maxCols?: number; +} + +export type Configuration = XYConfiguration | TableVisConfiguration | MetricVisConfiguration; diff --git a/x-pack/plugins/lens/public/visualizations/metric/suggestions.test.ts b/x-pack/plugins/lens/public/visualizations/metric/suggestions.test.ts index 47229650e05f7..45f332776a4d0 100644 --- a/x-pack/plugins/lens/public/visualizations/metric/suggestions.test.ts +++ b/x-pack/plugins/lens/public/visualizations/metric/suggestions.test.ts @@ -79,6 +79,10 @@ describe('metric suggestions', () => { ...metricColumn, columnId: 'metric-column2', }, + { + ...metricColumn, + columnId: 'metric-column3', + }, ], changeType: 'unchanged', }, @@ -99,6 +103,10 @@ describe('metric suggestions', () => { ...metricColumn, columnId: 'metric-column2', }, + { + ...metricColumn, + columnId: 'metric-column3', + }, ], changeType: 'unchanged', }, diff --git a/x-pack/plugins/lens/public/visualizations/metric/suggestions.ts b/x-pack/plugins/lens/public/visualizations/metric/suggestions.ts index ae40bf83574f4..c0354d4db65e0 100644 --- a/x-pack/plugins/lens/public/visualizations/metric/suggestions.ts +++ b/x-pack/plugins/lens/public/visualizations/metric/suggestions.ts @@ -11,7 +11,7 @@ import { layerTypes } from '../../../common'; import { metricLabel, MetricVisualizationState, supportedDataTypes } from './visualization'; const MAX_BUCKETED_COLUMNS = 1; -const MAX_METRIC_COLUMNS = 1; +const MAX_METRIC_COLUMNS = 2; // primary and secondary metric const hasLayerMismatch = (keptLayerIds: string[], table: TableSuggestion) => keptLayerIds.length > 1 || (keptLayerIds.length && table.layerId !== keptLayerIds[0]); diff --git a/x-pack/plugins/lens/public/visualizations/metric/visualization.tsx b/x-pack/plugins/lens/public/visualizations/metric/visualization.tsx index ed1efa900cf24..b58068b3ec202 100644 --- a/x-pack/plugins/lens/public/visualizations/metric/visualization.tsx +++ b/x-pack/plugins/lens/public/visualizations/metric/visualization.tsx @@ -19,13 +19,20 @@ import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public'; import { IconChartMetric } from '@kbn/chart-icons'; import { LayerType } from '../../../common'; import { getSuggestions } from './suggestions'; -import { Visualization, OperationMetadata, DatasourceLayers, AccessorConfig } from '../../types'; +import { + Visualization, + OperationMetadata, + DatasourceLayers, + AccessorConfig, + Suggestion, +} from '../../types'; import { layerTypes } from '../../../common'; import { GROUP_ID, LENS_METRIC_ID } from './constants'; import { DimensionEditor } from './dimension_editor'; import { Toolbar } from './toolbar'; import { generateId } from '../../id_generator'; import { FormatSelectorOptions } from '../../indexpattern_datasource/dimension_panel/format_selector'; +import { IndexPatternLayer } from '../../indexpattern_datasource/types'; export const DEFAULT_MAX_COLUMNS = 3; @@ -50,6 +57,16 @@ export interface MetricVisualizationState { maxCols?: number; } +interface MetricDatasourceState { + [prop: string]: unknown; + layers: IndexPatternLayer[]; +} + +export interface MetricSuggestion extends Suggestion { + datasourceState: MetricDatasourceState; + visualizationState: MetricVisualizationState; +} + export const supportedDataTypes = new Set(['number']); // TODO - deduplicate with gauges? @@ -484,4 +501,25 @@ export const getMetricVisualization = ({ noPadding: true, }; }, + + getSuggestionFromConvertToLensContext({ suggestions, context }) { + const allSuggestions = suggestions as MetricSuggestion[]; + return { + ...allSuggestions[0], + datasourceState: { + ...allSuggestions[0].datasourceState, + layers: allSuggestions.reduce( + (acc, s) => ({ + ...acc, + ...s.datasourceState.layers, + }), + {} + ), + }, + visualizationState: { + ...allSuggestions[0].visualizationState, + ...context.configuration, + }, + }; + }, }); diff --git a/x-pack/test/functional/apps/lens/group3/tsvb_open_in_lens.ts b/x-pack/test/functional/apps/lens/group3/tsvb_open_in_lens.ts index a7acd8bf5ba1c..173ab1c4fdf04 100644 --- a/x-pack/test/functional/apps/lens/group3/tsvb_open_in_lens.ts +++ b/x-pack/test/functional/apps/lens/group3/tsvb_open_in_lens.ts @@ -102,9 +102,18 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { await visualBuilder.clickDataTab('metric'); }); - it('should hide the "Edit Visualization in Lens" menu item', async () => { + it('should show the "Edit Visualization in Lens" menu item', async () => { const button = await testSubjects.exists('visualizeEditInLensButton'); - expect(button).to.eql(false); + expect(button).to.eql(true); + }); + + it('should convert to Lens', async () => { + const button = await testSubjects.find('visualizeEditInLensButton'); + await button.click(); + await lens.waitForVisualization('mtrVis'); + + const metricData = await lens.getMetricVisualizationData(); + expect(metricData[0].title).to.eql('Count of records'); }); }); From 6993716021ae9683994feefcaaf949554beb3649 Mon Sep 17 00:00:00 2001 From: Khristinin Nikita Date: Wed, 28 Sep 2022 12:08:58 +0200 Subject: [PATCH 34/95] skip failed tests (#142040) --- .../cypress/e2e/detection_rules/related_integrations.cy.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/x-pack/plugins/security_solution/cypress/e2e/detection_rules/related_integrations.cy.ts b/x-pack/plugins/security_solution/cypress/e2e/detection_rules/related_integrations.cy.ts index b5c6b5cd341ec..02ccff0c265dd 100644 --- a/x-pack/plugins/security_solution/cypress/e2e/detection_rules/related_integrations.cy.ts +++ b/x-pack/plugins/security_solution/cypress/e2e/detection_rules/related_integrations.cy.ts @@ -122,14 +122,14 @@ describe('Related integrations', () => { visit(DETECTIONS_RULE_MANAGEMENT_URL); }); - it('should display a badge with the installed integrations on the rule management page', () => { + it.skip('should display a badge with the installed integrations on the rule management page', () => { cy.get(INTEGRATIONS_POPOVER).should( 'have.text', `${rule.enabledIntegrations}/${rule.integrations.length} integrations` ); }); - it('should display a popover when clicking the badge with the installed integrations on the rule management page', () => { + it.skip('should display a popover when clicking the badge with the installed integrations on the rule management page', () => { openIntegrationsPopover(); cy.get(INTEGRATIONS_POPOVER_TITLE).should( @@ -148,7 +148,7 @@ describe('Related integrations', () => { }); }); - it('should display the integrations on the definition section', () => { + it.skip('should display the integrations on the definition section', () => { goToTheRuleDetailsOf(rule.name); cy.get(INTEGRATIONS).should('have.length', rule.integrations.length); From 042c76687c46d16a227def1c04199af391bf4e31 Mon Sep 17 00:00:00 2001 From: Dima Arnautov Date: Wed, 28 Sep 2022 12:34:30 +0200 Subject: [PATCH 35/95] [ML] Update the Notification indicator tooltip, add functional tests (#141775) --- .../ml_page/notifications_indicator.tsx | 46 +++++-- .../components/notifications_list.tsx | 6 +- .../routes/schemas/notifications_schema.ts | 16 --- x-pack/test/api_integration/apis/ml/index.ts | 1 + .../ml/notifications/count_notifications.ts | 55 ++++++++ .../ml/notifications/get_notifications.ts | 102 +++++++++++++++ .../apis/ml/notifications/index.ts | 15 +++ .../functional/apps/ml/short_tests/index.ts | 1 + .../ml/short_tests/notifications/index.ts | 16 +++ .../notifications/notification_list.ts | 96 ++++++++++++++ x-pack/test/functional/services/ml/api.ts | 61 +++++++++ .../services/ml/common_table_service.ts | 118 ++++++++++++++++++ x-pack/test/functional/services/ml/index.ts | 8 +- .../functional/services/ml/notifications.ts | 48 +++++++ 14 files changed, 557 insertions(+), 32 deletions(-) create mode 100644 x-pack/test/api_integration/apis/ml/notifications/count_notifications.ts create mode 100644 x-pack/test/api_integration/apis/ml/notifications/get_notifications.ts create mode 100644 x-pack/test/api_integration/apis/ml/notifications/index.ts create mode 100644 x-pack/test/functional/apps/ml/short_tests/notifications/index.ts create mode 100644 x-pack/test/functional/apps/ml/short_tests/notifications/notification_list.ts create mode 100644 x-pack/test/functional/services/ml/common_table_service.ts create mode 100644 x-pack/test/functional/services/ml/notifications.ts diff --git a/x-pack/plugins/ml/public/application/components/ml_page/notifications_indicator.tsx b/x-pack/plugins/ml/public/application/components/ml_page/notifications_indicator.tsx index 20d771f5654d4..d0e3516af3db0 100644 --- a/x-pack/plugins/ml/public/application/components/ml_page/notifications_indicator.tsx +++ b/x-pack/plugins/ml/public/application/components/ml_page/notifications_indicator.tsx @@ -16,7 +16,10 @@ import { EuiToolTip, } from '@elastic/eui'; import { combineLatest, of, timer } from 'rxjs'; -import { catchError, filter, switchMap } from 'rxjs/operators'; +import { catchError, switchMap } from 'rxjs/operators'; +import moment from 'moment'; +import { FIELD_FORMAT_IDS } from '@kbn/field-formats-plugin/common'; +import { useFieldFormatter } from '../../contexts/kibana/use_field_formatter'; import { useAsObservable } from '../../hooks'; import { NotificationsCountResponse } from '../../../../common/types/notifications'; import { useMlKibana } from '../../contexts/kibana'; @@ -31,21 +34,26 @@ export const NotificationsIndicator: FC = () => { mlServices: { mlApiServices }, }, } = useMlKibana(); - const [lastCheckedAt] = useStorage(ML_NOTIFICATIONS_LAST_CHECKED_AT); + const dateFormatter = useFieldFormatter(FIELD_FORMAT_IDS.DATE); + const [lastCheckedAt] = useStorage(ML_NOTIFICATIONS_LAST_CHECKED_AT); const lastCheckedAt$ = useAsObservable(lastCheckedAt); + /** Holds the value used for the actual request */ + const [lastCheckRequested, setLastCheckRequested] = useState(); const [notificationsCounts, setNotificationsCounts] = useState(); useEffect(function startPollingNotifications() { - const subscription = combineLatest([ - lastCheckedAt$.pipe(filter((v): v is number => !!v)), - timer(0, NOTIFICATIONS_CHECK_INTERVAL), - ]) + const subscription = combineLatest([lastCheckedAt$, timer(0, NOTIFICATIONS_CHECK_INTERVAL)]) .pipe( - switchMap(([lastChecked]) => - mlApiServices.notifications.countMessages$({ lastCheckedAt: lastChecked }) - ), + switchMap(([lastChecked]) => { + const lastCheckedAtQuery = lastChecked ?? moment().subtract(7, 'd').valueOf(); + setLastCheckRequested(lastCheckedAtQuery); + // Use the latest check time or 7 days ago by default. + return mlApiServices.notifications.countMessages$({ + lastCheckedAt: lastCheckedAtQuery, + }); + }), catchError((error) => { // Fail silently for now return of({} as NotificationsCountResponse); @@ -80,12 +88,22 @@ export const NotificationsIndicator: FC = () => { content={ } > - {errorsAndWarningCount} + + {errorsAndWarningCount} + ) : null} @@ -96,7 +114,8 @@ export const NotificationsIndicator: FC = () => { content={ } > @@ -106,6 +125,7 @@ export const NotificationsIndicator: FC = () => { aria-label={i18n.translate('xpack.ml.notificationsIndicator.unreadIcon', { defaultMessage: 'Unread notifications indicator.', })} + data-test-subj={'mlNotificationsIndicator'} /> diff --git a/x-pack/plugins/ml/public/application/notifications/components/notifications_list.tsx b/x-pack/plugins/ml/public/application/notifications/components/notifications_list.tsx index 811b1c43bce37..9ea6aa1b70f00 100644 --- a/x-pack/plugins/ml/public/application/notifications/components/notifications_list.tsx +++ b/x-pack/plugins/ml/public/application/notifications/components/notifications_list.tsx @@ -162,6 +162,7 @@ export const NotificationsList: FC = () => { const columns: Array> = [ { + id: 'timestamp', field: 'timestamp', name: , sortable: true, @@ -175,7 +176,7 @@ export const NotificationsList: FC = () => { name: , sortable: true, truncateText: false, - 'data-test-subj': 'mlNotificationLabel', + 'data-test-subj': 'mlNotificationLevel', render: (value: MlNotificationMessageLevel) => { return {value}; }, @@ -194,7 +195,7 @@ export const NotificationsList: FC = () => { }, { field: 'job_id', - name: , + name: , sortable: true, truncateText: false, 'data-test-subj': 'mlNotificationEntity', @@ -320,6 +321,7 @@ export const NotificationsList: FC = () => { }, }, }, + 'data-test-subj': 'mlNotificationsSearchBarInput', }} filters={filters} onChange={(e) => { diff --git a/x-pack/plugins/ml/server/routes/schemas/notifications_schema.ts b/x-pack/plugins/ml/server/routes/schemas/notifications_schema.ts index a82691ee52813..153ffd0aeea87 100644 --- a/x-pack/plugins/ml/server/routes/schemas/notifications_schema.ts +++ b/x-pack/plugins/ml/server/routes/schemas/notifications_schema.ts @@ -8,26 +8,10 @@ import { schema, TypeOf } from '@kbn/config-schema'; export const getNotificationsQuerySchema = schema.object({ - /** - * Message level, e.g. info, error - */ - level: schema.maybe(schema.string()), - /** - * Message type, e.g. anomaly_detector - */ - type: schema.maybe(schema.string()), /** * Search string for the message content */ queryString: schema.maybe(schema.string()), - /** - * Page numer, zero-indexed - */ - from: schema.number({ defaultValue: 0 }), - /** - * Number of messages to return - */ - size: schema.number({ defaultValue: 10 }), /** * Sort field */ diff --git a/x-pack/test/api_integration/apis/ml/index.ts b/x-pack/test/api_integration/apis/ml/index.ts index 915d755ca97c0..e76eef8cb82bf 100644 --- a/x-pack/test/api_integration/apis/ml/index.ts +++ b/x-pack/test/api_integration/apis/ml/index.ts @@ -67,5 +67,6 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) { loadTestFile(require.resolve('./saved_objects')); loadTestFile(require.resolve('./system')); loadTestFile(require.resolve('./trained_models')); + loadTestFile(require.resolve('./notifications')); }); } diff --git a/x-pack/test/api_integration/apis/ml/notifications/count_notifications.ts b/x-pack/test/api_integration/apis/ml/notifications/count_notifications.ts new file mode 100644 index 0000000000000..58932ea199b5d --- /dev/null +++ b/x-pack/test/api_integration/apis/ml/notifications/count_notifications.ts @@ -0,0 +1,55 @@ +/* + * 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 moment from 'moment'; +import type { FtrProviderContext } from '../../../ftr_provider_context'; +import { USER } from '../../../../functional/services/ml/security_common'; +import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api'; + +export default ({ getService }: FtrProviderContext) => { + const supertest = getService('supertestWithoutAuth'); + const ml = getService('ml'); + + describe('GET notifications count', () => { + before(async () => { + await ml.api.initSavedObjects(); + await ml.testResources.setKibanaTimeZoneToUTC(); + + const adJobConfig = ml.commonConfig.getADFqSingleMetricJobConfig('fq_job'); + await ml.api.createAnomalyDetectionJob(adJobConfig); + + await ml.api.waitForJobNotificationsToIndex('fq_job'); + }); + + after(async () => { + await ml.api.cleanMlIndices(); + await ml.testResources.cleanMLSavedObjects(); + }); + + it('return notifications count by level', async () => { + const { body, status } = await supertest + .get(`/api/ml/notifications/count`) + .query({ lastCheckedAt: moment().subtract(7, 'd').valueOf() }) + .auth(USER.ML_POWERUSER, ml.securityCommon.getPasswordForUser(USER.ML_POWERUSER)) + .set(COMMON_REQUEST_HEADERS); + ml.api.assertResponseStatusCode(200, status, body); + + expect(body.info).to.eql(1); + expect(body.warning).to.eql(0); + expect(body.error).to.eql(0); + }); + + it('returns an error for unauthorized user', async () => { + const { body, status } = await supertest + .get(`/api/ml/notifications/count`) + .auth(USER.ML_UNAUTHORIZED, ml.securityCommon.getPasswordForUser(USER.ML_UNAUTHORIZED)) + .set(COMMON_REQUEST_HEADERS); + ml.api.assertResponseStatusCode(403, status, body); + }); + }); +}; diff --git a/x-pack/test/api_integration/apis/ml/notifications/get_notifications.ts b/x-pack/test/api_integration/apis/ml/notifications/get_notifications.ts new file mode 100644 index 0000000000000..992065cdae67d --- /dev/null +++ b/x-pack/test/api_integration/apis/ml/notifications/get_notifications.ts @@ -0,0 +1,102 @@ +/* + * 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 { + NotificationItem, + NotificationsSearchResponse, +} from '@kbn/ml-plugin/common/types/notifications'; +import type { FtrProviderContext } from '../../../ftr_provider_context'; +import { USER } from '../../../../functional/services/ml/security_common'; +import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api'; + +export default ({ getService }: FtrProviderContext) => { + const supertest = getService('supertestWithoutAuth'); + const esArchiver = getService('esArchiver'); + const ml = getService('ml'); + + describe('GET notifications', () => { + before(async () => { + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/bm_classification'); + await ml.api.initSavedObjects(); + await ml.testResources.setKibanaTimeZoneToUTC(); + + const adJobConfig = ml.commonConfig.getADFqSingleMetricJobConfig('fq_job'); + await ml.api.createAnomalyDetectionJob(adJobConfig); + + const dfaJobConfig = ml.commonConfig.getDFABmClassificationJobConfig('df_job'); + await ml.api.createDataFrameAnalyticsJob(dfaJobConfig); + + // wait for notification to index + + await ml.api.waitForJobNotificationsToIndex('fq_job'); + await ml.api.waitForJobNotificationsToIndex('df_job'); + }); + + after(async () => { + await ml.api.cleanMlIndices(); + await ml.testResources.cleanMLSavedObjects(); + }); + + it('return all notifications ', async () => { + const { body, status } = await supertest + .get(`/api/ml/notifications`) + .query({ earliest: 'now-1d', latest: 'now' }) + .auth(USER.ML_POWERUSER, ml.securityCommon.getPasswordForUser(USER.ML_POWERUSER)) + .set(COMMON_REQUEST_HEADERS); + ml.api.assertResponseStatusCode(200, status, body); + + expect((body as NotificationsSearchResponse).total).to.eql(2); + }); + + it('return notifications based on the query string', async () => { + const { body, status } = await supertest + .get(`/api/ml/notifications`) + .query({ earliest: 'now-1d', latest: 'now', queryString: 'job_type:anomaly_detector' }) + .auth(USER.ML_VIEWER, ml.securityCommon.getPasswordForUser(USER.ML_VIEWER)) + .set(COMMON_REQUEST_HEADERS); + ml.api.assertResponseStatusCode(200, status, body); + + expect((body as NotificationsSearchResponse).total).to.eql(1); + expect( + (body as NotificationsSearchResponse).results.filter( + (result: NotificationItem) => result.job_type === 'anomaly_detector' + ) + ).to.length(body.total); + }); + + it('supports sorting asc sorting by field', async () => { + const { body, status } = await supertest + .get(`/api/ml/notifications`) + .query({ earliest: 'now-1d', latest: 'now', sortField: 'job_id', sortDirection: 'asc' }) + .auth(USER.ML_POWERUSER, ml.securityCommon.getPasswordForUser(USER.ML_POWERUSER)) + .set(COMMON_REQUEST_HEADERS); + ml.api.assertResponseStatusCode(200, status, body); + + expect(body.results[0].job_id).to.eql('df_job'); + }); + + it('supports sorting desc sorting by field', async () => { + const { body, status } = await supertest + .get(`/api/ml/notifications`) + .query({ earliest: 'now-1h', latest: 'now', sortField: 'job_id', sortDirection: 'desc' }) + .auth(USER.ML_POWERUSER, ml.securityCommon.getPasswordForUser(USER.ML_POWERUSER)) + .set(COMMON_REQUEST_HEADERS); + ml.api.assertResponseStatusCode(200, status, body); + + expect(body.results[0].job_id).to.eql('fq_job'); + }); + + it('returns an error for unauthorized user', async () => { + const { body, status } = await supertest + .get(`/api/ml/notifications`) + .auth(USER.ML_UNAUTHORIZED, ml.securityCommon.getPasswordForUser(USER.ML_UNAUTHORIZED)) + .set(COMMON_REQUEST_HEADERS); + ml.api.assertResponseStatusCode(403, status, body); + }); + }); +}; diff --git a/x-pack/test/api_integration/apis/ml/notifications/index.ts b/x-pack/test/api_integration/apis/ml/notifications/index.ts new file mode 100644 index 0000000000000..4a09fce5ee51e --- /dev/null +++ b/x-pack/test/api_integration/apis/ml/notifications/index.ts @@ -0,0 +1,15 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { FtrProviderContext } from '../../../ftr_provider_context'; + +export default function ({ loadTestFile }: FtrProviderContext) { + describe('Notifications', function () { + loadTestFile(require.resolve('./get_notifications')); + loadTestFile(require.resolve('./count_notifications')); + }); +} diff --git a/x-pack/test/functional/apps/ml/short_tests/index.ts b/x-pack/test/functional/apps/ml/short_tests/index.ts index f96d2b91ee0ef..d446a35933474 100644 --- a/x-pack/test/functional/apps/ml/short_tests/index.ts +++ b/x-pack/test/functional/apps/ml/short_tests/index.ts @@ -33,5 +33,6 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) { loadTestFile(require.resolve('./model_management')); loadTestFile(require.resolve('./feature_controls')); loadTestFile(require.resolve('./settings')); + loadTestFile(require.resolve('./notifications')); }); } diff --git a/x-pack/test/functional/apps/ml/short_tests/notifications/index.ts b/x-pack/test/functional/apps/ml/short_tests/notifications/index.ts new file mode 100644 index 0000000000000..e026d44a67af2 --- /dev/null +++ b/x-pack/test/functional/apps/ml/short_tests/notifications/index.ts @@ -0,0 +1,16 @@ +/* + * 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 { FtrProviderContext } from '../../../../ftr_provider_context'; + +export default function ({ loadTestFile }: FtrProviderContext) { + describe('Notifcations', function () { + this.tags(['ml', 'skipFirefox']); + + loadTestFile(require.resolve('./notification_list')); + }); +} diff --git a/x-pack/test/functional/apps/ml/short_tests/notifications/notification_list.ts b/x-pack/test/functional/apps/ml/short_tests/notifications/notification_list.ts new file mode 100644 index 0000000000000..c9ad8d2423ef8 --- /dev/null +++ b/x-pack/test/functional/apps/ml/short_tests/notifications/notification_list.ts @@ -0,0 +1,96 @@ +/* + * 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 { FtrProviderContext } from '../../../../ftr_provider_context'; + +export default function ({ getService, getPageObjects }: FtrProviderContext) { + const PageObjects = getPageObjects(['common']); + const esArchiver = getService('esArchiver'); + const ml = getService('ml'); + const browser = getService('browser'); + + describe('Notifications list', function () { + before(async () => { + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); + await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp'); + await ml.testResources.setKibanaTimeZoneToUTC(); + + // Prepare jobs to generate notifications + await Promise.all( + [ + { jobId: 'fq_001', spaceId: undefined }, + { jobId: 'fq_002', spaceId: 'space1' }, + ].map(async (v) => { + const datafeedConfig = ml.commonConfig.getADFqDatafeedConfig(v.jobId); + + await ml.api.createAnomalyDetectionJob( + ml.commonConfig.getADFqSingleMetricJobConfig(v.jobId), + v.spaceId + ); + await ml.api.openAnomalyDetectionJob(v.jobId); + await ml.api.createDatafeed(datafeedConfig, v.spaceId); + await ml.api.startDatafeed(datafeedConfig.datafeed_id); + }) + ); + + await ml.securityUI.loginAsMlPowerUser(); + await PageObjects.common.navigateToApp('ml', { + basePath: '', + }); + }); + + after(async () => { + await ml.api.cleanMlIndices(); + await ml.testResources.cleanMLSavedObjects(); + await ml.testResources.deleteIndexPatternByTitle('ft_farequote'); + }); + + it('displays a generic notification indicator', async () => { + await ml.notifications.assertNotificationIndicatorExist(); + }); + + it('opens the Notifications page', async () => { + await ml.navigation.navigateToNotifications(); + + await ml.notifications.table.waitForTableToLoad(); + await ml.notifications.table.assertRowsNumberPerPage(25); + }); + + it('does not show notifications from another space', async () => { + await ml.notifications.table.filterWithSearchString('Job created', 1); + }); + + it('display a number of errors in the notification indicator', async () => { + await ml.navigation.navigateToOverview(); + + const jobConfig = ml.commonConfig.getADFqSingleMetricJobConfig('fq_fail'); + jobConfig.analysis_config = { + bucket_span: '15m', + influencers: ['airline'], + detectors: [ + { function: 'mean', field_name: 'responsetime', partition_field_name: 'airline' }, + { function: 'min', field_name: 'responsetime', partition_field_name: 'airline' }, + { function: 'max', field_name: 'responsetime', partition_field_name: 'airline' }, + ], + }; + // Set extremely low memory limit to trigger an error + jobConfig.analysis_limits!.model_memory_limit = '1024kb'; + + const datafeedConfig = ml.commonConfig.getADFqDatafeedConfig(jobConfig.job_id); + + await ml.api.createAnomalyDetectionJob(jobConfig); + await ml.api.openAnomalyDetectionJob(jobConfig.job_id); + await ml.api.createDatafeed(datafeedConfig); + await ml.api.startDatafeed(datafeedConfig.datafeed_id); + await ml.api.waitForJobMemoryStatus(jobConfig.job_id, 'hard_limit'); + + // refresh the page to avoid 1m wait + await browser.refresh(); + await ml.notifications.assertNotificationErrorsCount(0); + }); + }); +} diff --git a/x-pack/test/functional/services/ml/api.ts b/x-pack/test/functional/services/ml/api.ts index 07bd1f346cf25..62d46e644f173 100644 --- a/x-pack/test/functional/services/ml/api.ts +++ b/x-pack/test/functional/services/ml/api.ts @@ -273,6 +273,16 @@ export function MachineLearningAPIProvider({ getService }: FtrProviderContext) { return state; }, + async getJobMemoryStatus(jobId: string): Promise<'hard_limit' | 'soft_limit' | 'ok'> { + const jobStats = await this.getADJobStats(jobId); + + expect(jobStats.jobs).to.have.length( + 1, + `Expected job stats to have exactly one job (got '${jobStats.length}')` + ); + return jobStats.jobs[0].model_size_stats.memory_status; + }, + async getADJobStats(jobId: string): Promise { log.debug(`Fetching anomaly detection job stats for job ${jobId}...`); const { body: jobStats, status } = await esSupertest.get( @@ -299,6 +309,27 @@ export function MachineLearningAPIProvider({ getService }: FtrProviderContext) { }); }, + async waitForJobMemoryStatus( + jobId: string, + expectedMemoryStatus: 'hard_limit' | 'soft_limit' | 'ok', + timeout: number = 2 * 60 * 1000 + ) { + await retry.waitForWithTimeout( + `job memory status to be ${expectedMemoryStatus}`, + timeout, + async () => { + const memoryStatus = await this.getJobMemoryStatus(jobId); + if (memoryStatus === expectedMemoryStatus) { + return true; + } else { + throw new Error( + `expected job memory status to be ${expectedMemoryStatus} but got ${memoryStatus}` + ); + } + } + ); + }, + async getDatafeedState(datafeedId: string): Promise { log.debug(`Fetching datafeed state for datafeed ${datafeedId}`); const { body: datafeedStats, status } = await esSupertest.get( @@ -576,6 +607,18 @@ export function MachineLearningAPIProvider({ getService }: FtrProviderContext) { return response; }, + async hasNotifications(query: object) { + const body = await es.search({ + index: '.ml-notifications*', + body: { + size: 10000, + query, + }, + }); + + return body.hits.hits.length > 0; + }, + async adJobExist(jobId: string) { this.validateJobId(jobId); try { @@ -608,6 +651,24 @@ export function MachineLearningAPIProvider({ getService }: FtrProviderContext) { }); }, + async waitForJobNotificationsToIndex(jobId: string, timeout: number = 60 * 1000) { + await retry.waitForWithTimeout(`Notifications for '${jobId}' to exist`, timeout, async () => { + if ( + await this.hasNotifications({ + term: { + job_id: { + value: jobId, + }, + }, + }) + ) { + return true; + } else { + throw new Error(`expected '${jobId}' notifications to exist`); + } + }); + }, + async createAnomalyDetectionJob(jobConfig: Job, space?: string) { const jobId = jobConfig.job_id; log.debug( diff --git a/x-pack/test/functional/services/ml/common_table_service.ts b/x-pack/test/functional/services/ml/common_table_service.ts new file mode 100644 index 0000000000000..50a40ab43f35a --- /dev/null +++ b/x-pack/test/functional/services/ml/common_table_service.ts @@ -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 expect from '@kbn/expect'; +import { WebElementWrapper } from '../../../../../test/functional/services/lib/web_element_wrapper'; +import { FtrProviderContext } from '../../ftr_provider_context'; + +export type MlTableService = ReturnType; + +export function MlTableServiceProvider({ getPageObject, getService }: FtrProviderContext) { + const testSubjects = getService('testSubjects'); + const commonPage = getPageObject('common'); + + const TableService = class { + constructor( + public readonly tableTestSubj: string, + public readonly tableRowSubj: string, + public readonly columns: Array<{ id: string; testSubj: string }>, + public readonly searchInputSubj: string + ) {} + + public async assertTableLoaded() { + await testSubjects.existOrFail(`~${this.tableTestSubj} loaded`); + } + + public async assertTableLoading() { + await testSubjects.existOrFail(`~${this.tableTestSubj} loading`); + } + + public async parseTable() { + const table = await testSubjects.find(`~${this.tableTestSubj}`); + const $ = await table.parseDomContent(); + const rows = []; + + for (const tr of $.findTestSubjects(`~${this.tableRowSubj}`).toArray()) { + const $tr = $(tr); + + const rowObject = this.columns.reduce((acc, curr) => { + acc[curr.id] = $tr + .findTestSubject(curr.testSubj) + .find('.euiTableCellContent') + .text() + .trim(); + return acc; + }, {} as Record); + + rows.push(rowObject); + } + + return rows; + } + + public async assertRowsNumberPerPage(rowsNumber: 10 | 25 | 50 | 100) { + const textContent = await testSubjects.getVisibleText( + `~${this.tableTestSubj} > tablePaginationPopoverButton` + ); + expect(textContent).to.be(`Rows per page: ${rowsNumber}`); + } + + public async waitForTableToStartLoading() { + await testSubjects.existOrFail(`~${this.tableTestSubj}`, { timeout: 60 * 1000 }); + await testSubjects.existOrFail(`${this.tableTestSubj} loading`, { timeout: 30 * 1000 }); + } + + public async waitForTableToLoad() { + await testSubjects.existOrFail(`~${this.tableTestSubj}`, { timeout: 60 * 1000 }); + await testSubjects.existOrFail(`${this.tableTestSubj} loaded`, { timeout: 30 * 1000 }); + } + + async getSearchInput(): Promise { + return await testSubjects.find(this.searchInputSubj); + } + + public async assertSearchInputValue(expectedSearchValue: string) { + const searchBarInput = await this.getSearchInput(); + const actualSearchValue = await searchBarInput.getAttribute('value'); + expect(actualSearchValue).to.eql( + expectedSearchValue, + `Search input value should be '${expectedSearchValue}' (got '${actualSearchValue}')` + ); + } + + public async filterWithSearchString(queryString: string, expectedRowCount: number = 1) { + await this.waitForTableToLoad(); + const searchBarInput = await this.getSearchInput(); + await searchBarInput.clearValueWithKeyboard(); + await searchBarInput.type(queryString); + await commonPage.pressEnterKey(); + await this.assertSearchInputValue(queryString); + await this.waitForTableToStartLoading(); + await this.waitForTableToLoad(); + + const rows = await this.parseTable(); + + expect(rows).to.have.length( + expectedRowCount, + `Filtered table should have ${expectedRowCount} row(s) for filter '${queryString}' (got ${rows.length} matching items)` + ); + } + }; + + return { + getServiceInstance( + name: string, + tableTestSubj: string, + tableRowSubj: string, + columns: Array<{ id: string; testSubj: string }>, + searchInputSubj: string + ) { + Object.defineProperty(TableService, 'name', { value: name }); + return new TableService(tableTestSubj, tableRowSubj, columns, searchInputSubj); + }, + }; +} diff --git a/x-pack/test/functional/services/ml/index.ts b/x-pack/test/functional/services/ml/index.ts index d8c6924ec4cfd..9452baa324898 100644 --- a/x-pack/test/functional/services/ml/index.ts +++ b/x-pack/test/functional/services/ml/index.ts @@ -59,6 +59,8 @@ import { MachineLearningJobAnnotationsProvider } from './job_annotations_table'; import { MlNodesPanelProvider } from './ml_nodes_list'; import { MachineLearningCasesProvider } from './cases'; import { AnomalyChartsProvider } from './anomaly_charts'; +import { NotificationsProvider } from './notifications'; +import { MlTableServiceProvider } from './common_table_service'; export function MachineLearningProvider(context: FtrProviderContext) { const commonAPI = MachineLearningCommonAPIProvider(context); @@ -123,6 +125,7 @@ export function MachineLearningProvider(context: FtrProviderContext) { const settingsFilterList = MachineLearningSettingsFilterListProvider(context, commonUI); const singleMetricViewer = MachineLearningSingleMetricViewerProvider(context, commonUI); const stackManagementJobs = MachineLearningStackManagementJobsProvider(context); + const tableService = MlTableServiceProvider(context); const testExecution = MachineLearningTestExecutionProvider(context); const testResources = MachineLearningTestResourcesProvider(context, api); const alerting = MachineLearningAlertingProvider(context, api, commonUI); @@ -130,6 +133,7 @@ export function MachineLearningProvider(context: FtrProviderContext) { const trainedModels = TrainedModelsProvider(context, commonUI); const trainedModelsTable = TrainedModelsTableProvider(context, commonUI); const mlNodesPanel = MlNodesPanelProvider(context); + const notifications = NotificationsProvider(context, commonUI, tableService); const cases = MachineLearningCasesProvider(context, swimLane, anomalyCharts); @@ -171,7 +175,9 @@ export function MachineLearningProvider(context: FtrProviderContext) { jobWizardMultiMetric, jobWizardPopulation, lensVisualizations, + mlNodesPanel, navigation, + notifications, overviewPage, securityCommon, securityUI, @@ -181,10 +187,10 @@ export function MachineLearningProvider(context: FtrProviderContext) { singleMetricViewer, stackManagementJobs, swimLane, + tableService, testExecution, testResources, trainedModels, trainedModelsTable, - mlNodesPanel, }; } diff --git a/x-pack/test/functional/services/ml/notifications.ts b/x-pack/test/functional/services/ml/notifications.ts new file mode 100644 index 0000000000000..2365717d7226b --- /dev/null +++ b/x-pack/test/functional/services/ml/notifications.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 { FtrProviderContext } from '../../ftr_provider_context'; +import { MlCommonUI } from './common_ui'; +import { MlTableService } from './common_table_service'; + +export function NotificationsProvider( + { getService }: FtrProviderContext, + mlCommonUI: MlCommonUI, + tableService: MlTableService +) { + const testSubjects = getService('testSubjects'); + + return { + async assertNotificationIndicatorExist(expectExist = true) { + if (expectExist) { + await testSubjects.existOrFail('mlNotificationsIndicator'); + } else { + await testSubjects.missingOrFail('mlNotificationsIndicator'); + } + }, + + async assertNotificationErrorsCount(expectedCount: number) { + const actualCount = await testSubjects.getVisibleText('mlNotificationErrorsIndicator'); + expect(actualCount).to.greaterThan(expectedCount); + }, + + table: tableService.getServiceInstance( + 'NotificationsTable', + 'mlNotificationsTable', + 'mlNotificationsTableRow', + [ + { id: 'timestamp', testSubj: 'mlNotificationTime' }, + { id: 'level', testSubj: 'mlNotificationLevel' }, + { id: 'job_type', testSubj: 'mlNotificationType' }, + { id: 'job_id', testSubj: 'mlNotificationEntity' }, + { id: 'message', testSubj: 'mlNotificationMessage' }, + ], + 'mlNotificationsSearchBarInput' + ), + }; +} From 0471095d7d01634ffae4ef5017797e28ff5b13a8 Mon Sep 17 00:00:00 2001 From: Anton Dosov Date: Wed, 28 Sep 2022 13:02:51 +0200 Subject: [PATCH 36/95] Run ILM jest tests as integration tests allowing them to run beyond 5s timeout (#141750) --- .../index_lifecycle_management/README.md | 6 +++++- .../__jest__/extend_index_management.test.tsx | 2 +- .../integration_tests/README.md | 14 ++++++++++++++ .../app/app.helpers.ts | 2 +- .../app/app.test.ts | 0 .../edit_policy/constants.ts | 4 ++-- .../features/delete_phase.helpers.ts | 0 .../edit_policy/features/delete_phase.test.ts | 2 +- .../features/downsample.helpers.ts | 2 +- .../edit_policy/features/downsample.test.ts | 0 .../edit_policy/features/edit_warning.test.ts | 0 .../edit_policy/features/frozen_phase.test.ts | 0 .../cloud_aware_behavior.helpers.ts | 2 +- .../cloud_aware_behavior.test.ts | 0 .../node_allocation/cold_phase.helpers.ts | 0 .../node_allocation/cold_phase.test.ts | 0 .../general_behavior.helpers.ts | 0 .../node_allocation/general_behavior.test.ts | 2 +- .../node_allocation/warm_phase.helpers.ts | 0 .../node_allocation/warm_phase.test.ts | 0 .../features/request_flyout.helpers.ts | 0 .../features/request_flyout.test.ts | 0 .../edit_policy/features/rollover.helpers.ts | 0 .../edit_policy/features/rollover.test.ts | 0 .../features/searchable_snapshots.helpers.ts | 2 +- .../features/searchable_snapshots.test.ts | 2 +- .../edit_policy/features/timeline.helpers.ts | 2 +- .../edit_policy/features/timeline.test.ts | 0 .../edit_policy/features/timing.helpers.ts | 0 .../edit_policy/features/timing.test.ts | 2 +- .../cold_phase_validation.test.ts | 5 ++--- .../downsample_interval.test.ts | 7 +++---- .../form_validation/error_indicators.test.ts | 3 +-- .../hot_phase_validation.test.ts | 5 ++--- .../policy_name_validation.test.ts | 5 ++--- .../form_validation/timing.test.ts | 7 +++---- .../form_validation/validation.helpers.ts | 0 .../warm_phase_validation.test.ts | 5 ++--- .../edit_policy/init_test_bed.ts | 6 +++--- .../policy_serialization.helpers.ts | 2 +- .../policy_serialization.test.ts | 2 +- .../helpers/actions/downsample_actions.ts | 4 ++-- .../helpers/actions/errors_actions.ts | 2 +- .../helpers/actions/forcemerge_actions.ts | 2 +- .../helpers/actions/form_set_value_action.ts | 0 .../helpers/actions/form_toggle_action.ts | 0 .../form_toggle_and_set_value_action.ts | 0 .../helpers/actions/index.ts | 0 .../helpers/actions/index_priority_actions.ts | 2 +- .../helpers/actions/min_age_actions.ts | 2 +- .../actions/node_allocation_actions.ts | 4 ++-- .../helpers/actions/phases.ts | 0 .../helpers/actions/readonly_actions.ts | 2 +- .../helpers/actions/replicas_action.ts | 2 +- .../helpers/actions/request_flyout_actions.ts | 0 .../helpers/actions/rollover_actions.ts | 0 .../helpers/actions/save_policy_action.ts | 0 .../actions/searchable_snapshot_actions.ts | 2 +- .../helpers/actions/shrink_actions.ts | 2 +- .../actions/snapshot_policy_actions.ts | 0 .../helpers/actions/toggle_phase_action.ts | 2 +- .../helpers/global_mocks.tsx | 0 .../helpers/http_requests.ts | 4 ++-- .../helpers/index.ts | 0 .../helpers/setup_environment.tsx | 10 +++++----- .../jest.integration.config.js | 19 +++++++++++++++++++ .../index_lifecycle_management/tsconfig.json | 1 + 67 files changed, 91 insertions(+), 60 deletions(-) create mode 100644 x-pack/plugins/index_lifecycle_management/integration_tests/README.md rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/app/app.helpers.ts (97%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/app/app.test.ts (100%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/constants.ts (97%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/features/delete_phase.helpers.ts (100%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/features/delete_phase.test.ts (98%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/features/downsample.helpers.ts (95%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/features/downsample.test.ts (100%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/features/edit_warning.test.ts (100%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/features/frozen_phase.test.ts (100%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/features/node_allocation/cloud_aware_behavior.helpers.ts (94%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/features/node_allocation/cloud_aware_behavior.test.ts (100%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/features/node_allocation/cold_phase.helpers.ts (100%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/features/node_allocation/cold_phase.test.ts (100%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/features/node_allocation/general_behavior.helpers.ts (100%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/features/node_allocation/general_behavior.test.ts (98%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/features/node_allocation/warm_phase.helpers.ts (100%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/features/node_allocation/warm_phase.test.ts (100%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/features/request_flyout.helpers.ts (100%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/features/request_flyout.test.ts (100%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/features/rollover.helpers.ts (100%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/features/rollover.test.ts (100%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/features/searchable_snapshots.helpers.ts (97%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/features/searchable_snapshots.test.ts (99%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/features/timeline.helpers.ts (94%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/features/timeline.test.ts (100%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/features/timing.helpers.ts (100%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/features/timing.test.ts (95%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/form_validation/cold_phase_validation.test.ts (91%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/form_validation/downsample_interval.test.ts (93%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/form_validation/error_indicators.test.ts (97%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/form_validation/hot_phase_validation.test.ts (97%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/form_validation/policy_name_validation.test.ts (93%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/form_validation/timing.test.ts (93%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/form_validation/validation.helpers.ts (100%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/form_validation/warm_phase_validation.test.ts (95%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/init_test_bed.ts (89%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/serialization/policy_serialization.helpers.ts (95%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/edit_policy/serialization/policy_serialization.test.ts (99%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/helpers/actions/downsample_actions.ts (96%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/helpers/actions/errors_actions.ts (96%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/helpers/actions/forcemerge_actions.ts (96%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/helpers/actions/form_set_value_action.ts (100%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/helpers/actions/form_toggle_action.ts (100%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/helpers/actions/form_toggle_and_set_value_action.ts (100%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/helpers/actions/index.ts (100%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/helpers/actions/index_priority_actions.ts (94%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/helpers/actions/min_age_actions.ts (94%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/helpers/actions/node_allocation_actions.ts (95%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/helpers/actions/phases.ts (100%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/helpers/actions/readonly_actions.ts (92%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/helpers/actions/replicas_action.ts (92%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/helpers/actions/request_flyout_actions.ts (100%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/helpers/actions/rollover_actions.ts (100%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/helpers/actions/save_policy_action.ts (100%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/helpers/actions/searchable_snapshot_actions.ts (96%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/helpers/actions/shrink_actions.ts (97%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/helpers/actions/snapshot_policy_actions.ts (100%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/helpers/actions/toggle_phase_action.ts (96%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/helpers/global_mocks.tsx (100%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/helpers/http_requests.ts (97%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/helpers/index.ts (100%) rename x-pack/plugins/index_lifecycle_management/{__jest__/client_integration => integration_tests}/helpers/setup_environment.tsx (80%) create mode 100644 x-pack/plugins/index_lifecycle_management/jest.integration.config.js diff --git a/x-pack/plugins/index_lifecycle_management/README.md b/x-pack/plugins/index_lifecycle_management/README.md index 35c2aa063ec23..912b19295790f 100644 --- a/x-pack/plugins/index_lifecycle_management/README.md +++ b/x-pack/plugins/index_lifecycle_management/README.md @@ -115,4 +115,8 @@ this by running: ```bash yarn es snapshot --license=trial -``` \ No newline at end of file +``` + +## Integration tests + +See `./integration_tests/README.md` \ No newline at end of file diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/extend_index_management.test.tsx b/x-pack/plugins/index_lifecycle_management/__jest__/extend_index_management.test.tsx index ecefe8132c499..246de6e8ed25b 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/extend_index_management.test.tsx +++ b/x-pack/plugins/index_lifecycle_management/__jest__/extend_index_management.test.tsx @@ -7,7 +7,7 @@ import moment from 'moment-timezone'; -import { init } from './client_integration/helpers/http_requests'; +import { init } from '../integration_tests/helpers/http_requests'; import { mountWithIntl } from '@kbn/test-jest-helpers'; import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/public/mocks'; import { Index } from '../common/types'; diff --git a/x-pack/plugins/index_lifecycle_management/integration_tests/README.md b/x-pack/plugins/index_lifecycle_management/integration_tests/README.md new file mode 100644 index 0000000000000..5e4bf4360cb72 --- /dev/null +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/README.md @@ -0,0 +1,14 @@ +Most plugins of the deployment management team follow +the similar testing infrastructure where integration tests are located in `__jest__` and run as unit tests. + +The `index_lifecycle_management` tests [were refactored](https://github.com/elastic/kibana/pull/141750) to be run as integration tests because they [became flaky hitting the 5 seconds timeout](https://github.com/elastic/kibana/issues/115307#issuecomment-1238417474) for a jest unit test. + +Jest integration tests are just sit in a different directory and have two main differences: +- They never use parallelism, this allows them to access file system resources, launch services, etc. without needing to worry about conflicts with other tests +- They are allowed to take their sweet time, the default timeout is currently 10 minutes. + +To run these tests use: + +``` +node scripts/jest_integration x-pack/plugins/index_lifecycle_management/ +``` \ No newline at end of file diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/app/app.helpers.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/app/app.helpers.ts similarity index 97% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/app/app.helpers.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/app/app.helpers.ts index df64fbce3fa1d..66810ebb1e546 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/app/app.helpers.ts +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/app/app.helpers.ts @@ -8,7 +8,7 @@ import { act } from 'react-dom/test-utils'; import { HttpSetup } from '@kbn/core/public'; import { registerTestBed, TestBed, TestBedConfig } from '@kbn/test-jest-helpers'; -import { App } from '../../../public/application/app'; +import { App } from '../../public/application/app'; import { WithAppDependencies } from '../helpers'; const getTestBedConfig = (initialEntries: string[]): TestBedConfig => ({ diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/app/app.test.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/app/app.test.ts similarity index 100% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/app/app.test.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/app/app.test.ts diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/constants.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/constants.ts similarity index 97% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/constants.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/constants.ts index 620cb9d6f8dde..a41bea1cb8415 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/constants.ts +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/constants.ts @@ -7,9 +7,9 @@ import moment from 'moment-timezone'; -import { PolicyFromES } from '../../../common/types'; +import { PolicyFromES } from '../../common/types'; -import { defaultRolloverAction } from '../../../public/application/constants'; +import { defaultRolloverAction } from '../../public/application/constants'; export const POLICY_NAME = 'my_policy'; export const SNAPSHOT_POLICY_NAME = 'my_snapshot_policy'; diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/delete_phase.helpers.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/delete_phase.helpers.ts similarity index 100% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/delete_phase.helpers.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/delete_phase.helpers.ts diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/delete_phase.test.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/delete_phase.test.ts similarity index 98% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/delete_phase.test.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/delete_phase.test.ts index d877f05d06ae1..df6dd516c8a58 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/delete_phase.test.ts +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/delete_phase.test.ts @@ -6,7 +6,7 @@ */ import { act } from 'react-dom/test-utils'; -import { API_BASE_PATH } from '../../../../common/constants'; +import { API_BASE_PATH } from '../../../common/constants'; import { setupEnvironment } from '../../helpers'; import { DELETE_PHASE_POLICY, diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/downsample.helpers.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/downsample.helpers.ts similarity index 95% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/downsample.helpers.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/downsample.helpers.ts index be96aaabe4a71..1e6ed336a5f03 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/downsample.helpers.ts +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/downsample.helpers.ts @@ -14,7 +14,7 @@ import { createTogglePhaseAction, } from '../../helpers'; import { initTestBed } from '../init_test_bed'; -import { AppServicesContext } from '../../../../public/types'; +import { AppServicesContext } from '../../../public/types'; type SetupReturn = ReturnType; diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/downsample.test.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/downsample.test.ts similarity index 100% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/downsample.test.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/downsample.test.ts diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/edit_warning.test.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/edit_warning.test.ts similarity index 100% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/edit_warning.test.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/edit_warning.test.ts diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/frozen_phase.test.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/frozen_phase.test.ts similarity index 100% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/frozen_phase.test.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/frozen_phase.test.ts diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/cloud_aware_behavior.helpers.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/node_allocation/cloud_aware_behavior.helpers.ts similarity index 94% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/cloud_aware_behavior.helpers.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/node_allocation/cloud_aware_behavior.helpers.ts index 7092d52289de9..b41075c6b6b68 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/cloud_aware_behavior.helpers.ts +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/node_allocation/cloud_aware_behavior.helpers.ts @@ -8,7 +8,7 @@ import { HttpSetup } from '@kbn/core/public'; import { TestBedConfig } from '@kbn/test-jest-helpers'; -import { AppServicesContext } from '../../../../../public/types'; +import { AppServicesContext } from '../../../../public/types'; import { createTogglePhaseAction, createNodeAllocationActions } from '../../../helpers'; import { initTestBed } from '../../init_test_bed'; diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/cloud_aware_behavior.test.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/node_allocation/cloud_aware_behavior.test.ts similarity index 100% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/cloud_aware_behavior.test.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/node_allocation/cloud_aware_behavior.test.ts diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/cold_phase.helpers.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/node_allocation/cold_phase.helpers.ts similarity index 100% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/cold_phase.helpers.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/node_allocation/cold_phase.helpers.ts diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/cold_phase.test.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/node_allocation/cold_phase.test.ts similarity index 100% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/cold_phase.test.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/node_allocation/cold_phase.test.ts diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/general_behavior.helpers.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/node_allocation/general_behavior.helpers.ts similarity index 100% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/general_behavior.helpers.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/node_allocation/general_behavior.helpers.ts diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/general_behavior.test.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/node_allocation/general_behavior.test.ts similarity index 98% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/general_behavior.test.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/node_allocation/general_behavior.test.ts index 1eecd5207664f..4830cee8ee237 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/general_behavior.test.ts +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/node_allocation/general_behavior.test.ts @@ -17,7 +17,7 @@ import { POLICY_WITH_NODE_ATTR_AND_OFF_ALLOCATION, POLICY_WITH_NODE_ROLE_ALLOCATION, } from '../../constants'; -import { API_BASE_PATH } from '../../../../../common/constants'; +import { API_BASE_PATH } from '../../../../common/constants'; describe(' node allocation general behavior', () => { let testBed: GeneralNodeAllocationTestBed; diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/warm_phase.helpers.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/node_allocation/warm_phase.helpers.ts similarity index 100% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/warm_phase.helpers.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/node_allocation/warm_phase.helpers.ts diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/warm_phase.test.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/node_allocation/warm_phase.test.ts similarity index 100% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/warm_phase.test.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/node_allocation/warm_phase.test.ts diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/request_flyout.helpers.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/request_flyout.helpers.ts similarity index 100% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/request_flyout.helpers.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/request_flyout.helpers.ts diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/request_flyout.test.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/request_flyout.test.ts similarity index 100% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/request_flyout.test.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/request_flyout.test.ts diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/rollover.helpers.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/rollover.helpers.ts similarity index 100% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/rollover.helpers.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/rollover.helpers.ts diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/rollover.test.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/rollover.test.ts similarity index 100% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/rollover.test.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/rollover.test.ts diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/searchable_snapshots.helpers.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/searchable_snapshots.helpers.ts similarity index 97% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/searchable_snapshots.helpers.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/searchable_snapshots.helpers.ts index e70f721a48075..d3b68ffc6a13e 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/searchable_snapshots.helpers.ts +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/searchable_snapshots.helpers.ts @@ -18,7 +18,7 @@ import { createTogglePhaseAction, } from '../../helpers'; import { initTestBed } from '../init_test_bed'; -import { AppServicesContext } from '../../../../public/types'; +import { AppServicesContext } from '../../../public/types'; type SetupReturn = ReturnType; 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/integration_tests/edit_policy/features/searchable_snapshots.test.ts similarity index 99% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/searchable_snapshots.test.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/searchable_snapshots.test.ts index 03b7670c1eac5..68e74e23a781c 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/integration_tests/edit_policy/features/searchable_snapshots.test.ts @@ -10,7 +10,7 @@ import { licensingMock } from '@kbn/licensing-plugin/public/mocks'; import { HttpFetchOptionsWithPath } from '@kbn/core/public'; import { setupEnvironment } from '../../helpers'; import { getDefaultHotPhasePolicy } from '../constants'; -import { API_BASE_PATH } from '../../../../common/constants'; +import { API_BASE_PATH } from '../../../common/constants'; import { SearchableSnapshotsTestBed, setupSearchableSnapshotsTestBed, diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timeline.helpers.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/timeline.helpers.ts similarity index 94% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timeline.helpers.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/timeline.helpers.ts index 496b27330c931..202388a844464 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timeline.helpers.ts +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/timeline.helpers.ts @@ -8,7 +8,7 @@ import { HttpSetup } from '@kbn/core/public'; import { createTogglePhaseAction } from '../../helpers'; import { initTestBed } from '../init_test_bed'; -import { Phase } from '../../../../common/types'; +import { Phase } from '../../../common/types'; type SetupReturn = ReturnType; diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timeline.test.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/timeline.test.ts similarity index 100% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timeline.test.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/timeline.test.ts diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timing.helpers.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/timing.helpers.ts similarity index 100% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timing.helpers.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/timing.helpers.ts diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timing.test.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/timing.test.ts similarity index 95% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timing.test.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/timing.test.ts index 0aee8eb5f0be1..72c6a2a4e789c 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timing.test.ts +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/features/timing.test.ts @@ -8,7 +8,7 @@ import { act } from 'react-dom/test-utils'; import { setupEnvironment } from '../../helpers'; import { setupTimingTestBed, TimingTestBed } from './timing.helpers'; -import { PhaseWithTiming } from '../../../../common/types'; +import { PhaseWithTiming } from '../../../common/types'; describe(' timing', () => { let testBed: TimingTestBed; diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/cold_phase_validation.test.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/form_validation/cold_phase_validation.test.ts similarity index 91% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/cold_phase_validation.test.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/form_validation/cold_phase_validation.test.ts index ef2fc67002c14..e75d2cb72ab28 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/cold_phase_validation.test.ts +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/form_validation/cold_phase_validation.test.ts @@ -6,12 +6,11 @@ */ import { act } from 'react-dom/test-utils'; -import { i18nTexts } from '../../../../public/application/sections/edit_policy/i18n_texts'; +import { i18nTexts } from '../../../public/application/sections/edit_policy/i18n_texts'; import { setupEnvironment } from '../../helpers'; import { setupValidationTestBed, ValidationTestBed } from './validation.helpers'; -// FLAKY: https://github.com/elastic/kibana/issues/141645 -describe.skip(' cold phase validation', () => { +describe(' cold phase validation', () => { let testBed: ValidationTestBed; const { httpSetup, httpRequestsMockHelpers } = setupEnvironment(); diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/downsample_interval.test.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/form_validation/downsample_interval.test.ts similarity index 93% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/downsample_interval.test.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/form_validation/downsample_interval.test.ts index 79f5fdc6e2840..d2f9943eba68a 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/downsample_interval.test.ts +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/form_validation/downsample_interval.test.ts @@ -6,14 +6,13 @@ */ import { act } from 'react-dom/test-utils'; -import { i18nTexts } from '../../../../public/application/sections/edit_policy/i18n_texts'; +import { i18nTexts } from '../../../public/application/sections/edit_policy/i18n_texts'; -import { PhaseWithDownsample } from '../../../../common/types'; +import { PhaseWithDownsample } from '../../../common/types'; import { setupEnvironment } from '../../helpers'; import { setupValidationTestBed, ValidationTestBed } from './validation.helpers'; -// FLAKY: https://github.com/elastic/kibana/issues/141160 -describe.skip(' downsample interval validation', () => { +describe(' downsample interval validation', () => { let testBed: ValidationTestBed; let actions: ValidationTestBed['actions']; const { httpSetup, httpRequestsMockHelpers } = setupEnvironment(); diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/error_indicators.test.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/form_validation/error_indicators.test.ts similarity index 97% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/error_indicators.test.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/form_validation/error_indicators.test.ts index 349f98766620d..bd4a2caec0be5 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/error_indicators.test.ts +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/form_validation/error_indicators.test.ts @@ -9,8 +9,7 @@ import { act } from 'react-dom/test-utils'; import { setupEnvironment } from '../../helpers'; import { setupValidationTestBed, ValidationTestBed } from './validation.helpers'; -// FLAKY: https://github.com/elastic/kibana/issues/141645 -describe.skip(' error indicators', () => { +describe(' error indicators', () => { let testBed: ValidationTestBed; const { httpSetup, httpRequestsMockHelpers } = setupEnvironment(); diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/hot_phase_validation.test.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/form_validation/hot_phase_validation.test.ts similarity index 97% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/hot_phase_validation.test.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/form_validation/hot_phase_validation.test.ts index 82b3568d39ce7..71f83a59360d6 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/hot_phase_validation.test.ts +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/form_validation/hot_phase_validation.test.ts @@ -6,12 +6,11 @@ */ import { act } from 'react-dom/test-utils'; -import { i18nTexts } from '../../../../public/application/sections/edit_policy/i18n_texts'; +import { i18nTexts } from '../../../public/application/sections/edit_policy/i18n_texts'; import { setupEnvironment } from '../../helpers'; import { setupValidationTestBed, ValidationTestBed } from './validation.helpers'; -// FLAKY: https://github.com/elastic/kibana/issues/141645 -describe.skip(' hot phase validation', () => { +describe(' hot phase validation', () => { let testBed: ValidationTestBed; let actions: ValidationTestBed['actions']; const { httpSetup, httpRequestsMockHelpers } = setupEnvironment(); diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/policy_name_validation.test.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/form_validation/policy_name_validation.test.ts similarity index 93% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/policy_name_validation.test.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/form_validation/policy_name_validation.test.ts index 928380e3d1eac..c530f73a66c11 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/policy_name_validation.test.ts +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/form_validation/policy_name_validation.test.ts @@ -6,13 +6,12 @@ */ import { act } from 'react-dom/test-utils'; -import { i18nTexts } from '../../../../public/application/sections/edit_policy/i18n_texts'; +import { i18nTexts } from '../../../public/application/sections/edit_policy/i18n_texts'; import { setupEnvironment } from '../../helpers'; import { getGeneratedPolicies } from '../constants'; import { setupValidationTestBed, ValidationTestBed } from './validation.helpers'; -// FLAKY: https://github.com/elastic/kibana/issues/141645 -describe.skip(' policy name validation', () => { +describe(' policy name validation', () => { let testBed: ValidationTestBed; let actions: ValidationTestBed['actions']; const { httpSetup, httpRequestsMockHelpers } = setupEnvironment(); diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/timing.test.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/form_validation/timing.test.ts similarity index 93% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/timing.test.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/form_validation/timing.test.ts index 7db483d6d0ef2..5838f04ba70e9 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/timing.test.ts +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/form_validation/timing.test.ts @@ -6,14 +6,13 @@ */ import { act } from 'react-dom/test-utils'; -import { i18nTexts } from '../../../../public/application/sections/edit_policy/i18n_texts'; +import { i18nTexts } from '../../../public/application/sections/edit_policy/i18n_texts'; -import { PhaseWithTiming } from '../../../../common/types'; +import { PhaseWithTiming } from '../../../common/types'; import { setupEnvironment } from '../../helpers'; import { setupValidationTestBed, ValidationTestBed } from './validation.helpers'; -// FLAKY: https://github.com/elastic/kibana/issues/115307 -describe.skip(' timing validation', () => { +describe(' timing validation', () => { let testBed: ValidationTestBed; let actions: ValidationTestBed['actions']; const { httpSetup, httpRequestsMockHelpers } = setupEnvironment(); diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/validation.helpers.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/form_validation/validation.helpers.ts similarity index 100% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/validation.helpers.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/form_validation/validation.helpers.ts diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/warm_phase_validation.test.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/form_validation/warm_phase_validation.test.ts similarity index 95% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/warm_phase_validation.test.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/form_validation/warm_phase_validation.test.ts index df0607a0a0e65..47917b1f8e3d7 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/warm_phase_validation.test.ts +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/form_validation/warm_phase_validation.test.ts @@ -6,12 +6,11 @@ */ import { act } from 'react-dom/test-utils'; -import { i18nTexts } from '../../../../public/application/sections/edit_policy/i18n_texts'; +import { i18nTexts } from '../../../public/application/sections/edit_policy/i18n_texts'; import { setupEnvironment } from '../../helpers'; import { setupValidationTestBed, ValidationTestBed } from './validation.helpers'; -// FLAKY: https://github.com/elastic/kibana/issues/141645 -describe.skip(' warm phase validation', () => { +describe(' warm phase validation', () => { let testBed: ValidationTestBed; const { httpSetup, httpRequestsMockHelpers } = setupEnvironment(); diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/init_test_bed.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/init_test_bed.ts similarity index 89% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/init_test_bed.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/init_test_bed.ts index 875bf9db36264..56bed7a6e50aa 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/init_test_bed.ts +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/init_test_bed.ts @@ -5,12 +5,12 @@ * 2.0. */ +import { HttpSetup } from '@kbn/core/public'; import { registerTestBed, TestBedConfig } from '@kbn/test-jest-helpers'; -import { HttpSetup } from '@kbn/core/public'; import { WithAppDependencies } from '../helpers'; -import { EditPolicy } from '../../../public/application/sections/edit_policy'; -import { AppServicesContext } from '../../../public/types'; +import { EditPolicy } from '../../public/application/sections/edit_policy'; +import { AppServicesContext } from '../../public/types'; import { POLICY_NAME } from './constants'; const getTestBedConfig = (testBedConfig?: Partial): TestBedConfig => { diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/serialization/policy_serialization.helpers.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/serialization/policy_serialization.helpers.ts similarity index 95% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/serialization/policy_serialization.helpers.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/serialization/policy_serialization.helpers.ts index 417f53c63a20c..e439fca0de512 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/serialization/policy_serialization.helpers.ts +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/serialization/policy_serialization.helpers.ts @@ -6,7 +6,7 @@ */ import { HttpSetup } from '@kbn/core/public'; -import { AppServicesContext } from '../../../../public/types'; +import { AppServicesContext } from '../../../public/types'; import { createColdPhaseActions, createDeletePhaseActions, diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/serialization/policy_serialization.test.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/serialization/policy_serialization.test.ts similarity index 99% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/serialization/policy_serialization.test.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/serialization/policy_serialization.test.ts index 983cfbadfa017..05aa66fcc5f25 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/serialization/policy_serialization.test.ts +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/edit_policy/serialization/policy_serialization.test.ts @@ -9,7 +9,7 @@ import { act } from 'react-dom/test-utils'; import { licensingMock } from '@kbn/licensing-plugin/public/mocks'; import { HttpFetchOptionsWithPath } from '@kbn/core/public'; import { setupEnvironment } from '../../helpers'; -import { API_BASE_PATH } from '../../../../common/constants'; +import { API_BASE_PATH } from '../../../common/constants'; import { getDefaultHotPhasePolicy, POLICY_WITH_INCLUDE_EXCLUDE, diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/downsample_actions.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/downsample_actions.ts similarity index 96% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/downsample_actions.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/downsample_actions.ts index 315ed3d58520a..a389a9deebe32 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/downsample_actions.ts +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/downsample_actions.ts @@ -5,9 +5,9 @@ * 2.0. */ -import { TestBed } from '@kbn/test-jest-helpers'; import { act } from 'react-dom/test-utils'; -import { Phase } from '../../../../common/types'; +import { TestBed } from '@kbn/test-jest-helpers'; +import { Phase } from '../../../common/types'; import { createFormToggleAction } from '..'; const createSetDownsampleIntervalAction = diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/errors_actions.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/errors_actions.ts similarity index 96% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/errors_actions.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/errors_actions.ts index 4b863071e191c..18f07734fadee 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/errors_actions.ts +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/errors_actions.ts @@ -7,7 +7,7 @@ import { act } from 'react-dom/test-utils'; import { TestBed } from '@kbn/test-jest-helpers'; -import { Phase } from '../../../../common/types'; +import { Phase } from '../../../common/types'; const createWaitForValidationAction = (testBed: TestBed) => () => { const { component } = testBed; diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/forcemerge_actions.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/forcemerge_actions.ts similarity index 96% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/forcemerge_actions.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/forcemerge_actions.ts index b6ed40de36ca9..619d6bd8be85f 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/forcemerge_actions.ts +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/forcemerge_actions.ts @@ -7,7 +7,7 @@ import { act } from 'react-dom/test-utils'; import { TestBed } from '@kbn/test-jest-helpers'; -import { Phase } from '../../../../common/types'; +import { Phase } from '../../../common/types'; import { createFormToggleAction } from './form_toggle_action'; import { createFormSetValueAction } from './form_set_value_action'; diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/form_set_value_action.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/form_set_value_action.ts similarity index 100% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/form_set_value_action.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/form_set_value_action.ts diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/form_toggle_action.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/form_toggle_action.ts similarity index 100% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/form_toggle_action.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/form_toggle_action.ts diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/form_toggle_and_set_value_action.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/form_toggle_and_set_value_action.ts similarity index 100% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/form_toggle_and_set_value_action.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/form_toggle_and_set_value_action.ts diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/index.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/index.ts similarity index 100% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/index.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/index.ts diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/index_priority_actions.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/index_priority_actions.ts similarity index 94% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/index_priority_actions.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/index_priority_actions.ts index 79fb77e53cc59..4c6e4604be7d4 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/index_priority_actions.ts +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/index_priority_actions.ts @@ -6,7 +6,7 @@ */ import { TestBed } from '@kbn/test-jest-helpers'; -import { Phase } from '../../../../common/types'; +import { Phase } from '../../../common/types'; import { createFormToggleAction } from './form_toggle_action'; import { createFormToggleAndSetValueAction } from './form_toggle_and_set_value_action'; diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/min_age_actions.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/min_age_actions.ts similarity index 94% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/min_age_actions.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/min_age_actions.ts index ef00fdc8d7757..8b4fa2e5f6179 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/min_age_actions.ts +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/min_age_actions.ts @@ -6,7 +6,7 @@ */ import { TestBed } from '@kbn/test-jest-helpers'; -import { Phase } from '../../../../common/types'; +import { Phase } from '../../../common/types'; import { createFormSetValueAction } from './form_set_value_action'; export const createMinAgeActions = (testBed: TestBed, phase: Phase) => { diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/node_allocation_actions.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/node_allocation_actions.ts similarity index 95% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/node_allocation_actions.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/node_allocation_actions.ts index 2a680590654a8..a3cb607b60f99 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/node_allocation_actions.ts +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/node_allocation_actions.ts @@ -8,8 +8,8 @@ import { act } from 'react-dom/test-utils'; import { TestBed } from '@kbn/test-jest-helpers'; -import { DataTierAllocationType } from '../../../../public/application/sections/edit_policy/types'; -import { Phase } from '../../../../common/types'; +import { DataTierAllocationType } from '../../../public/application/sections/edit_policy/types'; +import { Phase } from '../../../common/types'; import { createFormSetValueAction } from './form_set_value_action'; export const createNodeAllocationActions = (testBed: TestBed, phase: Phase) => { diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/phases.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/phases.ts similarity index 100% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/phases.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/phases.ts diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/readonly_actions.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/readonly_actions.ts similarity index 92% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/readonly_actions.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/readonly_actions.ts index 1a7ec56815b00..fe4c71d76265a 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/readonly_actions.ts +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/readonly_actions.ts @@ -6,7 +6,7 @@ */ import { TestBed } from '@kbn/test-jest-helpers'; -import { Phase } from '../../../../common/types'; +import { Phase } from '../../../common/types'; import { createFormToggleAction } from './form_toggle_action'; export const createReadonlyActions = (testBed: TestBed, phase: Phase) => { diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/replicas_action.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/replicas_action.ts similarity index 92% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/replicas_action.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/replicas_action.ts index 43eca26a4e1ce..35c3afc607513 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/replicas_action.ts +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/replicas_action.ts @@ -6,7 +6,7 @@ */ import { TestBed } from '@kbn/test-jest-helpers'; -import { Phase } from '../../../../common/types'; +import { Phase } from '../../../common/types'; import { createFormToggleAndSetValueAction } from './form_toggle_and_set_value_action'; export const createReplicasAction = (testBed: TestBed, phase: Phase) => { diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/request_flyout_actions.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/request_flyout_actions.ts similarity index 100% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/request_flyout_actions.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/request_flyout_actions.ts diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/rollover_actions.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/rollover_actions.ts similarity index 100% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/rollover_actions.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/rollover_actions.ts diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/save_policy_action.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/save_policy_action.ts similarity index 100% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/save_policy_action.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/save_policy_action.ts diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/searchable_snapshot_actions.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/searchable_snapshot_actions.ts similarity index 96% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/searchable_snapshot_actions.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/searchable_snapshot_actions.ts index 3efffcddbece6..c9a019c2bc842 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/searchable_snapshot_actions.ts +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/searchable_snapshot_actions.ts @@ -7,7 +7,7 @@ import { act } from 'react-dom/test-utils'; import { TestBed } from '@kbn/test-jest-helpers'; -import { Phase } from '../../../../common/types'; +import { Phase } from '../../../common/types'; import { createFormToggleAction } from './form_toggle_action'; export const createSearchableSnapshotActions = (testBed: TestBed, phase: Phase) => { diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/shrink_actions.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/shrink_actions.ts similarity index 97% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/shrink_actions.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/shrink_actions.ts index def20f73b82fe..4bf39185b8c03 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/shrink_actions.ts +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/shrink_actions.ts @@ -7,7 +7,7 @@ import { TestBed } from '@kbn/test-jest-helpers'; import { act } from 'react-dom/test-utils'; -import { Phase } from '../../../../common/types'; +import { Phase } from '../../../common/types'; import { createFormSetValueAction } from './form_set_value_action'; export const createShrinkActions = (testBed: TestBed, phase: Phase) => { diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/snapshot_policy_actions.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/snapshot_policy_actions.ts similarity index 100% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/snapshot_policy_actions.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/snapshot_policy_actions.ts diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/toggle_phase_action.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/toggle_phase_action.ts similarity index 96% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/toggle_phase_action.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/toggle_phase_action.ts index c22efae87d5ac..fc89332e47a67 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/toggle_phase_action.ts +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/actions/toggle_phase_action.ts @@ -8,7 +8,7 @@ import { TestBed } from '@kbn/test-jest-helpers'; import { act } from 'react-dom/test-utils'; -import { Phase } from '../../../../common/types'; +import { Phase } from '../../../common/types'; const toggleDeletePhase = async (testBed: TestBed) => { const { find, component } = testBed; diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/global_mocks.tsx b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/global_mocks.tsx similarity index 100% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/global_mocks.tsx rename to x-pack/plugins/index_lifecycle_management/integration_tests/helpers/global_mocks.tsx diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/http_requests.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/http_requests.ts similarity index 97% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/http_requests.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/helpers/http_requests.ts index 7ddcd5358404f..70e85c8bc5df4 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/http_requests.ts +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/http_requests.ts @@ -6,12 +6,12 @@ */ import { httpServiceMock } from '@kbn/core/public/mocks'; -import { API_BASE_PATH } from '../../../common/constants'; +import { API_BASE_PATH } from '../../common/constants'; import { ListNodesRouteResponse, ListSnapshotReposResponse, NodesDetailsResponse, -} from '../../../common/types'; +} from '../../common/types'; import { getDefaultHotPhasePolicy } from '../edit_policy/constants'; type HttpMethod = 'GET' | 'PUT' | 'DELETE' | 'POST'; diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/index.ts b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/index.ts similarity index 100% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/index.ts rename to x-pack/plugins/index_lifecycle_management/integration_tests/helpers/index.ts diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/setup_environment.tsx b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/setup_environment.tsx similarity index 80% rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/setup_environment.tsx rename to x-pack/plugins/index_lifecycle_management/integration_tests/helpers/setup_environment.tsx index 055097c883e94..91aebb485ea7f 100644 --- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/setup_environment.tsx +++ b/x-pack/plugins/index_lifecycle_management/integration_tests/helpers/setup_environment.tsx @@ -19,12 +19,12 @@ import { executionContextServiceMock, } from '@kbn/core/public/mocks'; import { licensingMock } from '@kbn/licensing-plugin/public/mocks'; -import { init as initHttp } from '../../../public/application/services/http'; +import { init as initHttp } from '../../public/application/services/http'; import { init as initHttpRequests } from './http_requests'; -import { init as initUiMetric } from '../../../public/application/services/ui_metric'; -import { init as initNotification } from '../../../public/application/services/notification'; -import { KibanaContextProvider } from '../../../public/shared_imports'; -import { createBreadcrumbsMock } from '../../../public/application/services/breadcrumbs.mock'; +import { init as initUiMetric } from '../../public/application/services/ui_metric'; +import { init as initNotification } from '../../public/application/services/notification'; +import { KibanaContextProvider } from '../../public/shared_imports'; +import { createBreadcrumbsMock } from '../../public/application/services/breadcrumbs.mock'; const breadcrumbService = createBreadcrumbsMock(); const appContextMock = { diff --git a/x-pack/plugins/index_lifecycle_management/jest.integration.config.js b/x-pack/plugins/index_lifecycle_management/jest.integration.config.js new file mode 100644 index 0000000000000..6d1ac5ec2fd8a --- /dev/null +++ b/x-pack/plugins/index_lifecycle_management/jest.integration.config.js @@ -0,0 +1,19 @@ +/* + * 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. + */ + +module.exports = { + preset: '@kbn/test/jest_integration', + rootDir: '../../..', + roots: ['/x-pack/plugins/index_lifecycle_management'], + testMatch: ['/**/integration_tests/**/*.test.{js,mjs,ts,tsx}'], + coverageDirectory: + '/target/kibana-coverage/jest/x-pack/plugins/index_lifecycle_management', + coverageReporters: ['text', 'html'], + collectCoverageFrom: [ + '/x-pack/plugins/index_lifecycle_management/{common,public,server}/**/*.{ts,tsx}', + ], +}; diff --git a/x-pack/plugins/index_lifecycle_management/tsconfig.json b/x-pack/plugins/index_lifecycle_management/tsconfig.json index d3a342e110211..4b5d7657ed9f6 100644 --- a/x-pack/plugins/index_lifecycle_management/tsconfig.json +++ b/x-pack/plugins/index_lifecycle_management/tsconfig.json @@ -8,6 +8,7 @@ }, "include": [ "__jest__/**/*", + "integration_tests/**/*", "common/**/*", "public/**/*", "server/**/*", From 0fbbd4f18ae78e4346366152192c4b2e0455ba24 Mon Sep 17 00:00:00 2001 From: Ying Mao Date: Wed, 28 Sep 2022 07:35:51 -0400 Subject: [PATCH 37/95] [Alerting][Docs] Adding link to ES docs for CCS setup (#141995) * Adding link to ES docs * Adding link to ES docs * Apply suggestions from code review Co-authored-by: Lisa Cawley Co-authored-by: Lisa Cawley --- docs/user/alerting/alerting-setup.asciidoc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/user/alerting/alerting-setup.asciidoc b/docs/user/alerting/alerting-setup.asciidoc index 819f20005d7a4..36c8b46e7b801 100644 --- a/docs/user/alerting/alerting-setup.asciidoc +++ b/docs/user/alerting/alerting-setup.asciidoc @@ -98,3 +98,10 @@ user without those privileges updates the rule, the rule will no longer function. Conversely, if a user with greater or administrator privileges modifies the rule, it will begin running with increased privileges. ============================================== + +[float] +[[alerting-ccs-setup]] +=== {ccs-cap} + +If you want to use alerting rules with {ccs}, you must configure +{ref}/remote-clusters-privileges.html#clusters-privileges-ccs-kibana[privileges for {ccs-init} and {kib}]. \ No newline at end of file From 82492c791a3e1c27a88b8ceeecbe7a1d35c20ca5 Mon Sep 17 00:00:00 2001 From: jennypavlova Date: Wed, 28 Sep 2022 13:45:14 +0200 Subject: [PATCH 38/95] [Infra Monitoring UI] Change infrastructure pages titles to use breadcrumbs #135874 (#140824) * Use breadcrumbs to set page title intead of DocumentTitle * Remove document title component and use breadcrumbs - Logs Page * Remove no longer needed document title translations * Use docTitle.change in error page and remove document title component * Add document title check to the functional tests * Move test to check title after load * test: Title change * Remove unnecessary docTitle type * Add error page tests * Update snapshot * Functional tests: Wait for loading the header before checking the title * Change test to use react testing library Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../plugins/infra/public/apps/metrics_app.tsx | 1 + .../public/components/document_title.tsx | 72 ------------------- .../infra/public/hooks/use_breadcrumbs.ts | 9 ++- .../infra/public/hooks/use_document_title.tsx | 25 +++++++ .../infra/public/pages/logs/page_content.tsx | 3 - .../infra/public/pages/logs/stream/page.tsx | 2 - .../public/pages/logs/stream/page_header.tsx | 28 -------- .../public/pages/metrics/hosts/index.tsx | 13 ---- .../infra/public/pages/metrics/index.tsx | 7 -- .../pages/metrics/inventory_view/index.tsx | 14 ---- .../components/page_error.test.tsx | 47 ++++++++++++ .../metric_detail/components/page_error.tsx | 16 ++--- .../pages/metrics/metric_detail/index.tsx | 9 --- .../pages/metrics/metrics_explorer/index.tsx | 11 --- x-pack/plugins/infra/public/translations.ts | 4 ++ .../translations/translations/fr-FR.json | 7 +- .../translations/translations/ja-JP.json | 7 +- .../translations/translations/zh-CN.json | 7 +- .../test/functional/apps/infra/home_page.ts | 26 ++++++- x-pack/test/functional/apps/infra/link_to.ts | 2 + .../apps/infra/logs_source_configuration.ts | 10 +++ .../functional/apps/infra/metrics_explorer.ts | 8 +++ 22 files changed, 136 insertions(+), 192 deletions(-) delete mode 100644 x-pack/plugins/infra/public/components/document_title.tsx create mode 100644 x-pack/plugins/infra/public/hooks/use_document_title.tsx delete mode 100644 x-pack/plugins/infra/public/pages/logs/stream/page_header.tsx create mode 100644 x-pack/plugins/infra/public/pages/metrics/metric_detail/components/page_error.test.tsx diff --git a/x-pack/plugins/infra/public/apps/metrics_app.tsx b/x-pack/plugins/infra/public/apps/metrics_app.tsx index fdeb7173d5cee..ce8123b5f2223 100644 --- a/x-pack/plugins/infra/public/apps/metrics_app.tsx +++ b/x-pack/plugins/infra/public/apps/metrics_app.tsx @@ -45,6 +45,7 @@ export const renderApp = ( ); return () => { + core.chrome.docTitle.reset(); ReactDOM.unmountComponentAtNode(element); plugins.data.search.session.clear(); }; diff --git a/x-pack/plugins/infra/public/components/document_title.tsx b/x-pack/plugins/infra/public/components/document_title.tsx deleted file mode 100644 index 20e482d9df5b5..0000000000000 --- a/x-pack/plugins/infra/public/components/document_title.tsx +++ /dev/null @@ -1,72 +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 React from 'react'; - -type TitleProp = string | ((previousTitle: string) => string); - -interface DocumentTitleProps { - title: TitleProp; -} - -interface DocumentTitleState { - index: number; -} - -const wrapWithSharedState = () => { - const titles: string[] = []; - const TITLE_SUFFIX = ' - Kibana'; - - return class extends React.Component { - public componentDidMount() { - this.setState( - () => { - return { index: titles.push('') - 1 }; - }, - () => { - this.pushTitle(this.getTitle(this.props.title)); - this.updateDocumentTitle(); - } - ); - } - - public componentDidUpdate() { - this.pushTitle(this.getTitle(this.props.title)); - this.updateDocumentTitle(); - } - - public componentWillUnmount() { - this.removeTitle(); - this.updateDocumentTitle(); - } - - public render() { - return null; - } - - public getTitle(title: TitleProp) { - return typeof title === 'function' ? title(titles[this.state.index - 1]) : title; - } - - public pushTitle(title: string) { - titles[this.state.index] = title; - } - - public removeTitle() { - titles.pop(); - } - - public updateDocumentTitle() { - const title = (titles[titles.length - 1] || '') + TITLE_SUFFIX; - if (title !== document.title) { - document.title = title; - } - } - }; -}; - -export const DocumentTitle = wrapWithSharedState(); diff --git a/x-pack/plugins/infra/public/hooks/use_breadcrumbs.ts b/x-pack/plugins/infra/public/hooks/use_breadcrumbs.ts index 37801c16bcf1f..97f737380022d 100644 --- a/x-pack/plugins/infra/public/hooks/use_breadcrumbs.ts +++ b/x-pack/plugins/infra/public/hooks/use_breadcrumbs.ts @@ -22,7 +22,7 @@ export const useBreadcrumbs = (app: AppId, appTitle: string, extraCrumbs: Chrome const appLinkProps = useLinkProps({ app }); useEffect(() => { - chrome?.setBreadcrumbs?.([ + const breadcrumbs = [ { ...observabilityLinkProps, text: observabilityTitle, @@ -32,6 +32,11 @@ export const useBreadcrumbs = (app: AppId, appTitle: string, extraCrumbs: Chrome text: appTitle, }, ...extraCrumbs, - ]); + ]; + + const docTitle = [...breadcrumbs].reverse().map((breadcrumb) => breadcrumb.text as string); + + chrome.docTitle.change(docTitle); + chrome.setBreadcrumbs(breadcrumbs); }, [appLinkProps, appTitle, chrome, extraCrumbs, observabilityLinkProps]); }; diff --git a/x-pack/plugins/infra/public/hooks/use_document_title.tsx b/x-pack/plugins/infra/public/hooks/use_document_title.tsx new file mode 100644 index 0000000000000..82fb5a669eb91 --- /dev/null +++ b/x-pack/plugins/infra/public/hooks/use_document_title.tsx @@ -0,0 +1,25 @@ +/* + * 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 { ChromeBreadcrumb } from '@kbn/core/public'; +import { useEffect } from 'react'; +import { observabilityTitle } from '../translations'; +import { useKibanaContextForPlugin } from './use_kibana'; + +export const useDocumentTitle = (extraTitles: ChromeBreadcrumb[]) => { + const { + services: { chrome }, + } = useKibanaContextForPlugin(); + + useEffect(() => { + const docTitle = [{ text: observabilityTitle }, ...extraTitles] + .reverse() + .map((breadcrumb) => breadcrumb.text as string); + + chrome.docTitle.change(docTitle); + }, [chrome, extraTitles]); +}; diff --git a/x-pack/plugins/infra/public/pages/logs/page_content.tsx b/x-pack/plugins/infra/public/pages/logs/page_content.tsx index e42cfc2d7c54a..8acd4004603e9 100644 --- a/x-pack/plugins/infra/public/pages/logs/page_content.tsx +++ b/x-pack/plugins/infra/public/pages/logs/page_content.tsx @@ -12,7 +12,6 @@ import { Route, Switch } from 'react-router-dom'; import { useKibana } from '@kbn/kibana-react-plugin/public'; import { HeaderMenuPortal, useLinkProps } from '@kbn/observability-plugin/public'; import { AlertDropdown } from '../../alerting/log_threshold'; -import { DocumentTitle } from '../../components/document_title'; import { HelpCenterContent } from '../../components/help_center_content'; import { useReadOnlyBadge } from '../../hooks/use_readonly_badge'; import { HeaderActionMenuContext } from '../../utils/header_action_menu_provider'; @@ -62,8 +61,6 @@ export const LogsPageContent: React.FunctionComponent = () => { return ( <> - - {setHeaderActionMenu && theme$ && ( diff --git a/x-pack/plugins/infra/public/pages/logs/stream/page.tsx b/x-pack/plugins/infra/public/pages/logs/stream/page.tsx index bb8e4307fe3b9..19f098a6721bc 100644 --- a/x-pack/plugins/infra/public/pages/logs/stream/page.tsx +++ b/x-pack/plugins/infra/public/pages/logs/stream/page.tsx @@ -10,7 +10,6 @@ import React from 'react'; import { useTrackPageview } from '@kbn/observability-plugin/public'; import { useLogsBreadcrumbs } from '../../../hooks/use_logs_breadcrumbs'; import { StreamPageContent } from './page_content'; -import { StreamPageHeader } from './page_header'; import { LogsPageProviders } from './page_providers'; import { streamTitle } from '../../../translations'; @@ -26,7 +25,6 @@ export const StreamPage = () => { return ( - diff --git a/x-pack/plugins/infra/public/pages/logs/stream/page_header.tsx b/x-pack/plugins/infra/public/pages/logs/stream/page_header.tsx deleted file mode 100644 index f6c4ad8c8c139..0000000000000 --- a/x-pack/plugins/infra/public/pages/logs/stream/page_header.tsx +++ /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; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { i18n } from '@kbn/i18n'; -import React from 'react'; - -import { DocumentTitle } from '../../../components/document_title'; - -export const StreamPageHeader = () => { - return ( - <> - - i18n.translate('xpack.infra.logs.streamPage.documentTitle', { - defaultMessage: '{previousTitle} | Stream', - values: { - previousTitle, - }, - }) - } - /> - - ); -}; diff --git a/x-pack/plugins/infra/public/pages/metrics/hosts/index.tsx b/x-pack/plugins/infra/public/pages/metrics/hosts/index.tsx index 5c2fed9753b80..a5dfd7f2ddd0f 100644 --- a/x-pack/plugins/infra/public/pages/metrics/hosts/index.tsx +++ b/x-pack/plugins/infra/public/pages/metrics/hosts/index.tsx @@ -6,13 +6,10 @@ */ import { EuiErrorBoundary } from '@elastic/eui'; -import { i18n } from '@kbn/i18n'; import React from 'react'; import { useTrackPageview } from '@kbn/observability-plugin/public'; import { APP_WRAPPER_CLASS } from '@kbn/core/public'; -import { DocumentTitle } from '../../../components/document_title'; - import { SourceErrorPage } from '../../../components/source_error_page'; import { SourceLoadingPage } from '../../../components/source_loading_page'; import { useSourceContext } from '../../../containers/metrics_source'; @@ -42,16 +39,6 @@ export const HostsPage = () => { ]); return ( - - i18n.translate('xpack.infra.infrastructureHostsPage.documentTitle', { - defaultMessage: '{previousTitle} | Hosts', - values: { - previousTitle, - }, - }) - } - /> {isLoading && !source ? ( ) : metricIndicesExist && source ? ( diff --git a/x-pack/plugins/infra/public/pages/metrics/index.tsx b/x-pack/plugins/infra/public/pages/metrics/index.tsx index 9c02424aac949..691069a978e83 100644 --- a/x-pack/plugins/infra/public/pages/metrics/index.tsx +++ b/x-pack/plugins/infra/public/pages/metrics/index.tsx @@ -15,7 +15,6 @@ import { useKibana } from '@kbn/kibana-react-plugin/public'; import { HeaderMenuPortal } from '@kbn/observability-plugin/public'; import { useLinkProps } from '@kbn/observability-plugin/public'; import { MetricsSourceConfigurationProperties } from '../../../common/metrics_sources'; -import { DocumentTitle } from '../../components/document_title'; import { HelpCenterContent } from '../../components/help_center_content'; import { useReadOnlyBadge } from '../../hooks/use_readonly_badge'; import { @@ -73,12 +72,6 @@ export const InfrastructurePage = ({ match }: RouteComponentProps) => { - - { return ( - - i18n.translate('xpack.infra.infrastructureSnapshotPage.documentTitle', { - defaultMessage: '{previousTitle} | Inventory', - values: { - previousTitle, - }, - }) - } - /> {isLoading && !source ? ( ) : metricIndicesExist ? ( diff --git a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/page_error.test.tsx b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/page_error.test.tsx new file mode 100644 index 0000000000000..25ae3b3717bd6 --- /dev/null +++ b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/page_error.test.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 { render } from '@testing-library/react'; + +import { PageError } from './page_error'; +import { errorTitle } from '../../../../translations'; +import { InfraHttpError } from '../../../../types'; +import { useDocumentTitle } from '../../../../hooks/use_document_title'; +import { I18nProvider } from '@kbn/i18n-react'; + +jest.mock('../../../../hooks/use_document_title', () => ({ + useDocumentTitle: jest.fn(), +})); + +const renderErrorPage = () => + render( + + + + ); + +describe('PageError component', () => { + it('renders correctly and set title', () => { + const { getByText } = renderErrorPage(); + expect(useDocumentTitle).toHaveBeenCalledWith([{ text: `${errorTitle}` }]); + + expect(getByText('Error Message')).toBeInTheDocument(); + expect(getByText('Please click the back button and try again.')).toBeInTheDocument(); + }); +}); diff --git a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/page_error.tsx b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/page_error.tsx index a6665e0d244f2..b4cdb47399e98 100644 --- a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/page_error.tsx +++ b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/page_error.tsx @@ -6,11 +6,11 @@ */ import React from 'react'; -import { i18n } from '@kbn/i18n'; +import { useDocumentTitle } from '../../../../hooks/use_document_title'; import { InvalidNodeError } from './invalid_node'; -import { DocumentTitle } from '../../../../components/document_title'; import { ErrorPageBody } from '../../../error'; import { InfraHttpError } from '../../../../types'; +import { errorTitle } from '../../../../translations'; interface Props { name: string; @@ -18,18 +18,10 @@ interface Props { } export const PageError = ({ error, name }: Props) => { + useDocumentTitle([{ text: errorTitle }]); + return ( <> - - i18n.translate('xpack.infra.metricDetailPage.documentTitleError', { - defaultMessage: '{previousTitle} | Uh oh', - values: { - previousTitle, - }, - }) - } - /> {error.body?.statusCode === 404 ? ( ) : ( diff --git a/x-pack/plugins/infra/public/pages/metrics/metric_detail/index.tsx b/x-pack/plugins/infra/public/pages/metrics/metric_detail/index.tsx index 823b9d703f502..9b92901976bff 100644 --- a/x-pack/plugins/infra/public/pages/metrics/metric_detail/index.tsx +++ b/x-pack/plugins/infra/public/pages/metrics/metric_detail/index.tsx @@ -9,7 +9,6 @@ import { i18n } from '@kbn/i18n'; import React, { useState } from 'react'; import { EuiTheme, withTheme } from '@kbn/kibana-react-plugin/common'; import { useLinkProps } from '@kbn/observability-plugin/public'; -import { DocumentTitle } from '../../../components/document_title'; import { withMetricPageProviders } from './page_providers'; import { useMetadata } from './hooks/use_metadata'; import { useMetricsBreadcrumbs } from '../../../hooks/use_metrics_breadcrumbs'; @@ -100,14 +99,6 @@ export const MetricDetail = withMetricPageProviders( return ( <> - {metadata ? ( - - i18n.translate('xpack.infra.infrastructureMetricsExplorerPage.documentTitle', { - defaultMessage: '{previousTitle} | Metrics Explorer', - values: { - previousTitle, - }, - }) - } - /> { const esArchiver = getService('esArchiver'); + const browser = getService('browser'); const retry = getService('retry'); - const pageObjects = getPageObjects(['common', 'infraHome', 'infraSavedViews']); + const pageObjects = getPageObjects(['common', 'header', 'infraHome', 'infraSavedViews']); const kibanaServer = getService('kibanaServer'); describe('Home page', function () { @@ -34,6 +35,22 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { await pageObjects.common.navigateToApp('infraOps'); await pageObjects.infraHome.getNoMetricsIndicesPrompt(); }); + + it('renders the correct error page title', async () => { + await pageObjects.common.navigateToUrlWithBrowserHistory( + 'infraOps', + '/detail/host/test', + '', + { + ensureCurrentUrl: false, + } + ); + await pageObjects.infraHome.waitForLoading(); + await pageObjects.header.waitUntilLoadingHasFinished(); + + const documentTitle = await browser.getTitle(); + expect(documentTitle).to.contain('Uh oh - Observability - Elastic'); + }); }); describe('with metrics present', () => { @@ -47,6 +64,13 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs') ); + it('renders the correct page title', async () => { + await pageObjects.header.waitUntilLoadingHasFinished(); + + const documentTitle = await browser.getTitle(); + expect(documentTitle).to.contain('Inventory - Infrastructure - Observability - Elastic'); + }); + it('renders an empty data prompt for dates with no data', async () => { await pageObjects.infraHome.goToTime(DATE_WITHOUT_DATA); await pageObjects.infraHome.getNoMetricsDataPrompt(); diff --git a/x-pack/test/functional/apps/infra/link_to.ts b/x-pack/test/functional/apps/infra/link_to.ts index ebfcb740961b1..05eccc8e57ebc 100644 --- a/x-pack/test/functional/apps/infra/link_to.ts +++ b/x-pack/test/functional/apps/infra/link_to.ts @@ -42,6 +42,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { await retry.tryForTime(5000, async () => { const currentUrl = await browser.getCurrentUrl(); const parsedUrl = new URL(currentUrl); + const documentTitle = await browser.getTitle(); expect(parsedUrl.pathname).to.be('/app/logs/stream'); expect(parsedUrl.searchParams.get('logFilter')).to.be( @@ -51,6 +52,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { `(end:'${endDate}',position:(tiebreaker:0,time:${timestamp}),start:'${startDate}',streamLive:!f)` ); expect(parsedUrl.searchParams.get('sourceId')).to.be('default'); + expect(documentTitle).to.contain('Stream - Logs - Observability - Elastic'); }); }); }); diff --git a/x-pack/test/functional/apps/infra/logs_source_configuration.ts b/x-pack/test/functional/apps/infra/logs_source_configuration.ts index 56eed5ec4b635..38cc795034a22 100644 --- a/x-pack/test/functional/apps/infra/logs_source_configuration.ts +++ b/x-pack/test/functional/apps/infra/logs_source_configuration.ts @@ -16,6 +16,7 @@ const COMMON_REQUEST_HEADERS = { export default ({ getPageObjects, getService }: FtrProviderContext) => { const esArchiver = getService('esArchiver'); + const browser = getService('browser'); const logsUi = getService('logsUi'); const infraSourceConfigurationForm = getService('infraSourceConfigurationForm'); const pageObjects = getPageObjects(['common', 'header', 'infraLogs']); @@ -49,6 +50,15 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs'); }); + it('renders the correct page title', async () => { + await pageObjects.infraLogs.navigateToTab('settings'); + + await pageObjects.header.waitUntilLoadingHasFinished(); + const documentTitle = await browser.getTitle(); + + expect(documentTitle).to.contain('Settings - Logs - Observability - Elastic'); + }); + it('can change the log indices to a pattern that matches nothing', async () => { await pageObjects.infraLogs.navigateToTab('settings'); diff --git a/x-pack/test/functional/apps/infra/metrics_explorer.ts b/x-pack/test/functional/apps/infra/metrics_explorer.ts index fc620d9ba5665..4d6859a4e99e7 100644 --- a/x-pack/test/functional/apps/infra/metrics_explorer.ts +++ b/x-pack/test/functional/apps/infra/metrics_explorer.ts @@ -16,6 +16,7 @@ const timepickerFormat = 'MMM D, YYYY @ HH:mm:ss.SSS'; export default ({ getPageObjects, getService }: FtrProviderContext) => { const esArchiver = getService('esArchiver'); const kibanaServer = getService('kibanaServer'); + const browser = getService('browser'); const pageObjects = getPageObjects([ 'common', 'infraHome', @@ -42,6 +43,13 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { }); after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs')); + it('should render the correct page title', async () => { + const documentTitle = await browser.getTitle(); + expect(documentTitle).to.contain( + 'Metrics Explorer - Infrastructure - Observability - Elastic' + ); + }); + it('should have three metrics by default', async () => { const metrics = await pageObjects.infraMetricsExplorer.getMetrics(); expect(metrics.length).to.equal(3); From 5f057ff610139a88d660e48e41bd5c2648140800 Mon Sep 17 00:00:00 2001 From: Khristinin Nikita Date: Wed, 28 Sep 2022 13:49:07 +0200 Subject: [PATCH 39/95] Add enrichment event log time (#141433) * Add enrichment event log time * fix types * Fix test * Add avg field * Fix enrichments event log * Add telemetry * Update schema Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- x-pack/plugins/event_log/README.md | 1 + .../plugins/event_log/generated/mappings.json | 3 + x-pack/plugins/event_log/generated/schemas.ts | 1 + x-pack/plugins/event_log/scripts/mappings.js | 3 + .../model/execution_metrics.ts | 9 + .../client_for_executors/client.ts | 1 + .../client_for_executors/client_interface.ts | 1 + .../saved_objects_type.ts | 3 + .../create_security_rule_type_wrapper.ts | 5 + .../factories/bulk_create_factory.ts | 24 +- .../lib/detection_engine/rule_types/types.ts | 1 + .../rule_types/utils/index.ts | 1 + .../threat_mapping/create_threat_signals.ts | 1 + .../signals/threat_mapping/utils.test.ts | 38 ++ .../signals/threat_mapping/utils.ts | 4 + .../lib/detection_engine/signals/types.ts | 1 + .../detection_engine/signals/utils.test.ts | 13 + .../lib/detection_engine/signals/utils.ts | 7 + .../server/usage/collector.ts | 252 ++++++++++ .../detections/rules/get_initial_usage.ts | 1 + .../detections/rules/get_metrics.mocks.ts | 414 ++++++++++++++++ .../server/usage/detections/rules/types.ts | 1 + ...event_log_agg_by_rule_type_metrics.test.ts | 15 + .../get_event_log_agg_by_rule_type_metrics.ts | 15 + ...vent_log_agg_by_rule_types_metrics.test.ts | 60 +++ .../get_event_log_agg_by_statuses.test.ts | 60 +++ .../transform_single_rule_metric.test.ts | 14 + .../utils/transform_single_rule_metric.ts | 5 + .../security_solution/server/usage/types.ts | 9 + .../schema/xpack_plugins.json | 468 ++++++++++++++++-- 30 files changed, 1394 insertions(+), 37 deletions(-) diff --git a/x-pack/plugins/event_log/README.md b/x-pack/plugins/event_log/README.md index c1d5869e7ed48..05b05946b652d 100644 --- a/x-pack/plugins/event_log/README.md +++ b/x-pack/plugins/event_log/README.md @@ -159,6 +159,7 @@ Below is a document in the expected structure, with descriptions of the fields: es_search_duration_ms: "total time spent performing ES searches as measured by Elasticsearch", total_search_duration_ms: "total time spent performing ES searches as measured by Kibana; includes network latency and time spent serializing/deserializing request/response", total_indexing_duration_ms: "total time spent indexing documents during current rule execution cycle", + total_enrichment_duration_ms: "total time spent enriching documents during current rule execution cycle", execution_gap_duration_s: "duration in seconds of execution gap" } } diff --git a/x-pack/plugins/event_log/generated/mappings.json b/x-pack/plugins/event_log/generated/mappings.json index db6719fed996a..4756b4f2e5534 100644 --- a/x-pack/plugins/event_log/generated/mappings.json +++ b/x-pack/plugins/event_log/generated/mappings.json @@ -347,6 +347,9 @@ }, "total_run_duration_ms": { "type": "long" + }, + "total_enrichment_duration_ms": { + "type": "long" } } } diff --git a/x-pack/plugins/event_log/generated/schemas.ts b/x-pack/plugins/event_log/generated/schemas.ts index b5557f64e9ac7..523ad683eabf2 100644 --- a/x-pack/plugins/event_log/generated/schemas.ts +++ b/x-pack/plugins/event_log/generated/schemas.ts @@ -150,6 +150,7 @@ export const EventSchema = schema.maybe( claim_to_start_duration_ms: ecsStringOrNumber(), prepare_rule_duration_ms: ecsStringOrNumber(), total_run_duration_ms: ecsStringOrNumber(), + total_enrichment_duration_ms: ecsStringOrNumber(), }) ), }) diff --git a/x-pack/plugins/event_log/scripts/mappings.js b/x-pack/plugins/event_log/scripts/mappings.js index 98050b6557210..65c9220fb5355 100644 --- a/x-pack/plugins/event_log/scripts/mappings.js +++ b/x-pack/plugins/event_log/scripts/mappings.js @@ -130,6 +130,9 @@ exports.EcsCustomPropertyMappings = { total_run_duration_ms: { type: 'long', }, + total_enrichment_duration_ms: { + type: 'long', + }, }, }, }, diff --git a/x-pack/plugins/security_solution/common/detection_engine/rule_monitoring/model/execution_metrics.ts b/x-pack/plugins/security_solution/common/detection_engine/rule_monitoring/model/execution_metrics.ts index c6bb71970e599..b15c76119e441 100644 --- a/x-pack/plugins/security_solution/common/detection_engine/rule_monitoring/model/execution_metrics.ts +++ b/x-pack/plugins/security_solution/common/detection_engine/rule_monitoring/model/execution_metrics.ts @@ -12,8 +12,17 @@ export type DurationMetric = t.TypeOf; export const DurationMetric = PositiveInteger; export type RuleExecutionMetrics = t.TypeOf; + +/** + @property total_search_duration_ms - "total time spent performing ES searches as measured by Kibana; + includes network latency and time spent serializing/deserializing request/response", + @property total_indexing_duration_ms - "total time spent indexing documents during current rule execution cycle", + @property total_enrichment_duration_ms - total time spent enriching documents during current rule execution cycle + @property execution_gap_duration_s - "duration in seconds of execution gap" +*/ export const RuleExecutionMetrics = t.partial({ total_search_duration_ms: DurationMetric, total_indexing_duration_ms: DurationMetric, + total_enrichment_duration_ms: DurationMetric, execution_gap_duration_s: DurationMetric, }); diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_monitoring/logic/rule_execution_log/client_for_executors/client.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_monitoring/logic/rule_execution_log/client_for_executors/client.ts index 4116848b1ffcf..3c712847851fd 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_monitoring/logic/rule_execution_log/client_for_executors/client.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_monitoring/logic/rule_execution_log/client_for_executors/client.ts @@ -222,6 +222,7 @@ const normalizeStatusChangeArgs = (args: StatusChangeArgs): NormalizedStatusChan ? { total_search_duration_ms: normalizeDurations(metrics.searchDurations), total_indexing_duration_ms: normalizeDurations(metrics.indexingDurations), + total_enrichment_duration_ms: normalizeDurations(metrics.enrichmentDurations), execution_gap_duration_s: normalizeGap(metrics.executionGap), } : undefined, diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_monitoring/logic/rule_execution_log/client_for_executors/client_interface.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_monitoring/logic/rule_execution_log/client_for_executors/client_interface.ts index 22392e699fcea..5e48a43e949c3 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_monitoring/logic/rule_execution_log/client_for_executors/client_interface.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_monitoring/logic/rule_execution_log/client_for_executors/client_interface.ts @@ -115,5 +115,6 @@ export interface StatusChangeArgs { export interface MetricsArgs { searchDurations?: string[]; indexingDurations?: string[]; + enrichmentDurations?: string[]; executionGap?: Duration; } diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_monitoring/logic/rule_execution_log/execution_saved_object/saved_objects_type.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_monitoring/logic/rule_execution_log/execution_saved_object/saved_objects_type.ts index ac3b28e87e0d9..1e0a2e74cadcd 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_monitoring/logic/rule_execution_log/execution_saved_object/saved_objects_type.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_monitoring/logic/rule_execution_log/execution_saved_object/saved_objects_type.ts @@ -58,6 +58,9 @@ const ruleExecutionMappings: SavedObjectsType['mappings'] = { total_indexing_duration_ms: { type: 'long', }, + total_enrichment_duration_ms: { + type: 'long', + }, execution_gap_duration_s: { type: 'long', }, diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/create_security_rule_type_wrapper.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/create_security_rule_type_wrapper.ts index ae3f310d841c3..05813ed1ee29c 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/create_security_rule_type_wrapper.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/create_security_rule_type_wrapper.ts @@ -343,6 +343,7 @@ export const createSecurityRuleTypeWrapper: CreateSecurityRuleTypeWrapper = const warningMessages = result.warningMessages.concat(runResult.warningMessages); result = { bulkCreateTimes: result.bulkCreateTimes.concat(runResult.bulkCreateTimes), + enrichmentTimes: result.enrichmentTimes.concat(runResult.enrichmentTimes), createdSignals, createdSignalsCount: createdSignals.length, errors: result.errors.concat(runResult.errors), @@ -358,6 +359,7 @@ export const createSecurityRuleTypeWrapper: CreateSecurityRuleTypeWrapper = } else { result = { bulkCreateTimes: [], + enrichmentTimes: [], createdSignals: [], createdSignalsCount: 0, errors: [], @@ -434,6 +436,7 @@ export const createSecurityRuleTypeWrapper: CreateSecurityRuleTypeWrapper = metrics: { searchDurations: result.searchAfterTimes, indexingDurations: result.bulkCreateTimes, + enrichmentDurations: result.enrichmentTimes, }, }); } @@ -452,6 +455,7 @@ export const createSecurityRuleTypeWrapper: CreateSecurityRuleTypeWrapper = metrics: { searchDurations: result.searchAfterTimes, indexingDurations: result.bulkCreateTimes, + enrichmentDurations: result.enrichmentTimes, }, }); } @@ -464,6 +468,7 @@ export const createSecurityRuleTypeWrapper: CreateSecurityRuleTypeWrapper = metrics: { searchDurations: result.searchAfterTimes, indexingDurations: result.bulkCreateTimes, + enrichmentDurations: result.enrichmentTimes, }, }); diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/bulk_create_factory.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/bulk_create_factory.ts index 81f15364ff128..95bc32571f6ea 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/bulk_create_factory.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/bulk_create_factory.ts @@ -21,6 +21,7 @@ import type { export interface GenericBulkCreateResponse { success: boolean; bulkCreateDuration: string; + enrichmentDuration: string; createdItemsCount: number; createdItems: Array & { _id: string; _index: string }>; errors: string[]; @@ -45,6 +46,7 @@ export const bulkCreateFactory = return { errors: [], success: true, + enrichmentDuration: '0', bulkCreateDuration: '0', createdItemsCount: 0, createdItems: [], @@ -54,6 +56,24 @@ export const bulkCreateFactory = const start = performance.now(); + let enrichmentsTimeStart = 0; + let enrichmentsTimeFinish = 0; + let enrichAlertsWrapper: typeof enrichAlerts; + if (enrichAlerts) { + enrichAlertsWrapper = async (alerts, params) => { + enrichmentsTimeStart = performance.now(); + try { + const enrichedAlerts = await enrichAlerts(alerts, params); + return enrichedAlerts; + } catch (error) { + ruleExecutionLogger.error(`Enrichments failed ${error}`); + throw error; + } finally { + enrichmentsTimeFinish = performance.now(); + } + }; + } + const { createdAlerts, errors, alertsWereTruncated } = await alertWithPersistence( wrappedDocs.map((doc) => ({ _id: doc._id, @@ -62,7 +82,7 @@ export const bulkCreateFactory = })), refreshForBulkCreate, maxAlerts, - enrichAlerts + enrichAlertsWrapper ); const end = performance.now(); @@ -78,6 +98,7 @@ export const bulkCreateFactory = return { errors: Object.keys(errors), success: false, + enrichmentDuration: makeFloatString(enrichmentsTimeFinish - enrichmentsTimeStart), bulkCreateDuration: makeFloatString(end - start), createdItemsCount: createdAlerts.length, createdItems: createdAlerts, @@ -88,6 +109,7 @@ export const bulkCreateFactory = errors: [], success: true, bulkCreateDuration: makeFloatString(end - start), + enrichmentDuration: makeFloatString(enrichmentsTimeFinish - enrichmentsTimeStart), createdItemsCount: createdAlerts.length, createdItems: createdAlerts, alertsWereTruncated, diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/types.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/types.ts index 403d6542f4f0c..e1af3077ec3e3 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/types.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/types.ts @@ -42,6 +42,7 @@ import type { IRuleExecutionLogForExecutors, IRuleExecutionLogService } from '.. export interface SecurityAlertTypeReturnValue { bulkCreateTimes: string[]; + enrichmentTimes: string[]; createdSignalsCount: number; createdSignals: unknown[]; errors: string[]; diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/index.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/index.ts index 5d2dcd4a4b3d2..8f23da386f5c7 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/index.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/index.ts @@ -10,6 +10,7 @@ import type { SecurityAlertTypeReturnValue } from '../types'; export const createResultObject = (state: TState) => { const result: SecurityAlertTypeReturnValue = { + enrichmentTimes: [], bulkCreateTimes: [], createdSignalsCount: 0, createdSignals: [], diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/create_threat_signals.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/create_threat_signals.ts index d80e5cba026b0..0ab6ec2a01dda 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/create_threat_signals.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/create_threat_signals.ts @@ -65,6 +65,7 @@ export const createThreatSignals = async ({ let results: SearchAfterAndBulkCreateReturnType = { success: true, warning: false, + enrichmentTimes: [], bulkCreateTimes: [], searchAfterTimes: [], lastLookBackDate: null, diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/utils.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/utils.test.ts index 981868589e4a1..0bcdc8450a830 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/utils.test.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/utils.test.ts @@ -55,6 +55,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['10', '20', '30'], bulkCreateTimes: ['5', '15', '25'], + enrichmentTimes: ['1', '2', '3'], lastLookBackDate: undefined, createdSignalsCount: 3, createdSignals: Array(3).fill(sampleSignalHit()), @@ -67,6 +68,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['10', '20', '30'], bulkCreateTimes: ['5', '15', '25'], + enrichmentTimes: ['1', '2', '3'], lastLookBackDate: undefined, createdSignalsCount: 3, createdSignals: Array(3).fill(sampleSignalHit()), @@ -83,6 +85,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['10', '20', '30'], bulkCreateTimes: ['5', '15', '25'], + enrichmentTimes: ['1', '2', '3'], lastLookBackDate: undefined, createdSignalsCount: 3, createdSignals: Array(3).fill(sampleSignalHit()), @@ -95,6 +98,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['10', '20', '30'], bulkCreateTimes: ['5', '15', '25'], + enrichmentTimes: ['1', '2', '3'], lastLookBackDate: undefined, createdSignalsCount: 3, createdSignals: Array(3).fill(sampleSignalHit()), @@ -111,6 +115,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['10', '20', '30'], bulkCreateTimes: ['5', '15', '25'], + enrichmentTimes: ['1', '2', '3'], lastLookBackDate: undefined, createdSignalsCount: 3, createdSignals: Array(3).fill(sampleSignalHit()), @@ -123,6 +128,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['10', '20', '30'], bulkCreateTimes: ['5', '15', '25'], + enrichmentTimes: ['1', '2', '3'], lastLookBackDate: new Date('2020-09-16T03:34:32.390Z'), createdSignalsCount: 3, createdSignals: Array(3).fill(sampleSignalHit()), @@ -139,6 +145,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['10', '20', '30'], bulkCreateTimes: ['5', '15', '25'], + enrichmentTimes: ['1', '2', '3'], lastLookBackDate: undefined, createdSignalsCount: 3, createdSignals: Array(3).fill(sampleSignalHit()), @@ -151,6 +158,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['10', '20', '30'], bulkCreateTimes: ['5', '15', '25'], + enrichmentTimes: ['1', '2', '3'], lastLookBackDate: new Date('2020-09-16T03:34:32.390Z'), createdSignalsCount: 3, createdSignals: Array(3).fill(sampleSignalHit()), @@ -162,6 +170,7 @@ describe('utils', () => { expect.objectContaining({ searchAfterTimes: ['60'], bulkCreateTimes: ['50'], + enrichmentTimes: ['6'], }) ); }); @@ -172,6 +181,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['10', '20', '30'], bulkCreateTimes: ['5', '15', '25'], + enrichmentTimes: ['1', '2', '3'], lastLookBackDate: undefined, createdSignalsCount: 3, createdSignals: Array(3).fill(sampleSignalHit()), @@ -184,6 +194,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['10', '20', '30'], bulkCreateTimes: ['5', '15', '25'], + enrichmentTimes: ['1', '2', '3'], lastLookBackDate: new Date('2020-09-16T03:34:32.390Z'), createdSignalsCount: 3, createdSignals: Array(3).fill(sampleSignalHit()), @@ -296,6 +307,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['10', '20', '30'], bulkCreateTimes: ['5', '15', '25'], + enrichmentTimes: ['1', '2', '3'], lastLookBackDate: undefined, createdSignalsCount: 3, createdSignals: Array(3).fill(sampleSignalHit()), @@ -307,6 +319,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['30'], // max value from existingResult.searchAfterTimes bulkCreateTimes: ['25'], // max value from existingResult.bulkCreateTimes + enrichmentTimes: ['3'], // max value from existingResult.enrichmentTimes lastLookBackDate: undefined, createdSignalsCount: 3, createdSignals: Array(3).fill(sampleSignalHit()), @@ -323,6 +336,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['10', '20', '30'], bulkCreateTimes: ['5', '15', '25'], + enrichmentTimes: ['1', '2', '3'], lastLookBackDate: undefined, createdSignalsCount: 3, createdSignals: Array(3).fill(sampleSignalHit()), @@ -334,6 +348,7 @@ describe('utils', () => { warning: false, searchAfterTimes: [], bulkCreateTimes: [], + enrichmentTimes: [], lastLookBackDate: undefined, createdSignalsCount: 0, createdSignals: [], @@ -345,6 +360,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['30'], // max value from existingResult.searchAfterTimes bulkCreateTimes: ['25'], // max value from existingResult.bulkCreateTimes + enrichmentTimes: ['3'], // max value from existingResult.enrichmentTimes lastLookBackDate: undefined, createdSignalsCount: 3, createdSignals: Array(3).fill(sampleSignalHit()), @@ -362,6 +378,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['10', '20', '30'], // max is 30 bulkCreateTimes: ['5', '15', '25'], // max is 25 + enrichmentTimes: ['1', '2', '3'], // max is 3 lastLookBackDate: undefined, createdSignalsCount: 3, createdSignals: Array(3).fill(sampleSignalHit()), @@ -373,6 +390,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['10', '20', '30'], bulkCreateTimes: ['5', '15', '25'], + enrichmentTimes: ['1', '2', '3'], lastLookBackDate: new Date('2020-09-16T03:34:32.390Z'), createdSignalsCount: 5, createdSignals: Array(5).fill(sampleSignalHit()), @@ -384,6 +402,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['40', '5', '15'], bulkCreateTimes: ['50', '5', '15'], + enrichmentTimes: ['4', '2', '3'], lastLookBackDate: new Date('2020-09-16T04:34:32.390Z'), createdSignalsCount: 8, createdSignals: Array(8).fill(sampleSignalHit()), @@ -396,6 +415,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['70'], // max value between newResult1 and newResult2 + max array value of existingResult (40 + 30 = 70) bulkCreateTimes: ['75'], // max value between newResult1 and newResult2 + max array value of existingResult (50 + 25 = 75) + enrichmentTimes: ['7'], // max value between newResult1 and newResult2 + max array value of existingResult (4 + 3 = 7) lastLookBackDate: new Date('2020-09-16T04:34:32.390Z'), // max lastLookBackDate createdSignalsCount: 16, // all the signals counted together (8 + 5 + 3) createdSignals: Array(16).fill(sampleSignalHit()), @@ -413,6 +433,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['10', '20', '30'], // max is 30 bulkCreateTimes: ['5', '15', '25'], // max is 25 + enrichmentTimes: ['1', '2', '3'], // max is 3 lastLookBackDate: undefined, createdSignalsCount: 3, createdSignals: Array(3).fill(sampleSignalHit()), @@ -424,6 +445,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['10', '20', '30'], bulkCreateTimes: ['5', '15', '25'], + enrichmentTimes: ['1', '2', '3'], lastLookBackDate: new Date('2020-09-16T03:34:32.390Z'), createdSignalsCount: 5, createdSignals: Array(5).fill(sampleSignalHit()), @@ -435,6 +457,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['40', '5', '15'], bulkCreateTimes: ['50', '5', '15'], + enrichmentTimes: ['5', '2', '3'], lastLookBackDate: new Date('2020-09-16T04:34:32.390Z'), createdSignalsCount: 8, createdSignals: Array(8).fill(sampleSignalHit()), @@ -447,6 +470,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['70'], // max value between newResult1 and newResult2 + max array value of existingResult (40 + 30 = 70) bulkCreateTimes: ['75'], // max value between newResult1 and newResult2 + max array value of existingResult (50 + 25 = 75) + enrichmentTimes: ['8'], // max value between newResult1 and newResult2 + max array value of existingResult (50 + 3 = 8) lastLookBackDate: new Date('2020-09-16T04:34:32.390Z'), // max lastLookBackDate createdSignalsCount: 16, // all the signals counted together (8 + 5 + 3) createdSignals: Array(16).fill(sampleSignalHit()), @@ -464,6 +488,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['10', '20', '30'], // max is 30 bulkCreateTimes: ['5', '15', '25'], // max is 25 + enrichmentTimes: ['1', '2', '3'], lastLookBackDate: undefined, createdSignalsCount: 3, createdSignals: Array(3).fill(sampleSignalHit()), @@ -475,6 +500,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['10', '20', '30'], bulkCreateTimes: ['5', '15', '25'], + enrichmentTimes: ['1', '2', '3'], lastLookBackDate: new Date('2020-09-16T03:34:32.390Z'), createdSignalsCount: 5, createdSignals: Array(5).fill(sampleSignalHit()), @@ -486,6 +512,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['40', '5', '15'], bulkCreateTimes: ['50', '5', '15'], + enrichmentTimes: ['5', '2', '3'], lastLookBackDate: null, createdSignalsCount: 8, createdSignals: Array(8).fill(sampleSignalHit()), @@ -498,6 +525,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['70'], // max value between newResult1 and newResult2 + max array value of existingResult (40 + 30 = 70) bulkCreateTimes: ['75'], // max value between newResult1 and newResult2 + max array value of existingResult (50 + 25 = 75) + enrichmentTimes: ['8'], // max value between newResult1 and newResult2 + max array value of existingResult (5 + 3 = 8) lastLookBackDate: new Date('2020-09-16T03:34:32.390Z'), // max lastLookBackDate createdSignalsCount: 16, // all the signals counted together (8 + 5 + 3) createdSignals: Array(16).fill(sampleSignalHit()), @@ -515,6 +543,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['10', '20', '30'], bulkCreateTimes: ['5', '15', '25'], + enrichmentTimes: ['1', '2', '3'], lastLookBackDate: undefined, createdSignalsCount: 3, createdSignals: Array(3).fill(sampleSignalHit()), @@ -527,6 +556,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['10', '20', '30'], bulkCreateTimes: ['5', '15', '25'], + enrichmentTimes: ['5', '2', '3'], lastLookBackDate: undefined, createdSignalsCount: 3, createdSignals: Array(3).fill(sampleSignalHit()), @@ -543,6 +573,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['10', '20', '30'], bulkCreateTimes: ['5', '15', '25'], + enrichmentTimes: ['1', '2', '3'], lastLookBackDate: undefined, createdSignalsCount: 3, createdSignals: Array(3).fill(sampleSignalHit()), @@ -555,6 +586,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['10', '20', '30'], bulkCreateTimes: ['5', '15', '25'], + enrichmentTimes: ['1', '2', '3'], lastLookBackDate: undefined, createdSignalsCount: 3, createdSignals: Array(3).fill(sampleSignalHit()), @@ -571,6 +603,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['10', '20', '30'], bulkCreateTimes: ['5', '15', '25'], + enrichmentTimes: ['1', '2', '3'], lastLookBackDate: undefined, createdSignalsCount: 3, createdSignals: Array(3).fill(sampleSignalHit()), @@ -583,6 +616,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['10', '20', '30'], bulkCreateTimes: ['5', '15', '25'], + enrichmentTimes: ['1', '2', '3'], lastLookBackDate: new Date('2020-09-16T03:34:32.390Z'), createdSignalsCount: 3, createdSignals: Array(3).fill(sampleSignalHit()), @@ -599,6 +633,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['10', '20', '30'], bulkCreateTimes: ['5', '15', '25'], + enrichmentTimes: ['1', '2', '3'], lastLookBackDate: undefined, createdSignalsCount: 3, createdSignals: Array(3).fill(sampleSignalHit()), @@ -611,6 +646,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['10', '20', '30'], bulkCreateTimes: ['5', '15', '25'], + enrichmentTimes: ['1', '2', '3'], lastLookBackDate: new Date('2020-09-16T03:34:32.390Z'), createdSignalsCount: 3, createdSignals: Array(3).fill(sampleSignalHit()), @@ -632,6 +668,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['10', '20', '30'], bulkCreateTimes: ['5', '15', '25'], + enrichmentTimes: ['1', '2', '3'], lastLookBackDate: undefined, createdSignalsCount: 3, createdSignals: Array(3).fill(sampleSignalHit()), @@ -644,6 +681,7 @@ describe('utils', () => { warning: false, searchAfterTimes: ['10', '20', '30'], bulkCreateTimes: ['5', '15', '25'], + enrichmentTimes: ['1', '2', '3'], lastLookBackDate: new Date('2020-09-16T03:34:32.390Z'), createdSignalsCount: 3, createdSignals: Array(3).fill(sampleSignalHit()), diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/utils.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/utils.ts index bfba9a6fd22a1..a73ead0bf946d 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/utils.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/utils.ts @@ -70,6 +70,7 @@ export const combineResults = ( ): SearchAfterAndBulkCreateReturnType => ({ success: currentResult.success === false ? false : newResult.success, warning: currentResult.warning || newResult.warning, + enrichmentTimes: calculateAdditiveMax(currentResult.enrichmentTimes, newResult.enrichmentTimes), bulkCreateTimes: calculateAdditiveMax(currentResult.bulkCreateTimes, newResult.bulkCreateTimes), searchAfterTimes: calculateAdditiveMax( currentResult.searchAfterTimes, @@ -94,6 +95,7 @@ export const combineConcurrentResults = ( const maxedNewResult = newResult.reduce( (accum, item) => { const maxSearchAfterTime = calculateMax(accum.searchAfterTimes, item.searchAfterTimes); + const maxEnrichmentTimes = calculateMax(accum.enrichmentTimes, item.enrichmentTimes); const maxBulkCreateTimes = calculateMax(accum.bulkCreateTimes, item.bulkCreateTimes); const lastLookBackDate = calculateMaxLookBack(accum.lastLookBackDate, item.lastLookBackDate); return { @@ -101,6 +103,7 @@ export const combineConcurrentResults = ( warning: accum.warning || item.warning, searchAfterTimes: [maxSearchAfterTime], bulkCreateTimes: [maxBulkCreateTimes], + enrichmentTimes: [maxEnrichmentTimes], lastLookBackDate, createdSignalsCount: accum.createdSignalsCount + item.createdSignalsCount, createdSignals: [...accum.createdSignals, ...item.createdSignals], @@ -113,6 +116,7 @@ export const combineConcurrentResults = ( warning: false, searchAfterTimes: [], bulkCreateTimes: [], + enrichmentTimes: [], lastLookBackDate: undefined, createdSignalsCount: 0, createdSignals: [], diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/types.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/types.ts index 93ddadf826d73..f786a28b50044 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/types.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/types.ts @@ -286,6 +286,7 @@ export interface SearchAfterAndBulkCreateReturnType { success: boolean; warning: boolean; searchAfterTimes: string[]; + enrichmentTimes: string[]; bulkCreateTimes: string[]; lastLookBackDate: Date | null | undefined; createdSignalsCount: number; diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.test.ts index d5603130400c7..d80ed256a0de0 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.test.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.test.ts @@ -953,6 +953,7 @@ describe('utils', () => { }); const expected: SearchAfterAndBulkCreateReturnType = { bulkCreateTimes: [], + enrichmentTimes: [], createdSignalsCount: 0, createdSignals: [], errors: [], @@ -973,6 +974,7 @@ describe('utils', () => { }); const expected: SearchAfterAndBulkCreateReturnType = { bulkCreateTimes: [], + enrichmentTimes: [], createdSignalsCount: 0, createdSignals: [], errors: [], @@ -1291,6 +1293,7 @@ describe('utils', () => { const searchAfterReturnType = createSearchAfterReturnType(); const expected: SearchAfterAndBulkCreateReturnType = { bulkCreateTimes: [], + enrichmentTimes: [], createdSignalsCount: 0, createdSignals: [], errors: [], @@ -1306,6 +1309,7 @@ describe('utils', () => { test('createSearchAfterReturnType can override all values', () => { const searchAfterReturnType = createSearchAfterReturnType({ bulkCreateTimes: ['123'], + enrichmentTimes: [], createdSignalsCount: 5, createdSignals: Array(5).fill(sampleSignalHit()), errors: ['error 1'], @@ -1317,6 +1321,7 @@ describe('utils', () => { }); const expected: SearchAfterAndBulkCreateReturnType = { bulkCreateTimes: ['123'], + enrichmentTimes: [], createdSignalsCount: 5, createdSignals: Array(5).fill(sampleSignalHit()), errors: ['error 1'], @@ -1337,6 +1342,7 @@ describe('utils', () => { }); const expected: SearchAfterAndBulkCreateReturnType = { bulkCreateTimes: [], + enrichmentTimes: [], createdSignalsCount: 5, createdSignals: Array(5).fill(sampleSignalHit()), errors: ['error 1'], @@ -1355,6 +1361,7 @@ describe('utils', () => { const merged = mergeReturns([createSearchAfterReturnType(), createSearchAfterReturnType()]); const expected: SearchAfterAndBulkCreateReturnType = { bulkCreateTimes: [], + enrichmentTimes: [], createdSignalsCount: 0, createdSignals: [], errors: [], @@ -1411,6 +1418,7 @@ describe('utils', () => { const merged = mergeReturns([ createSearchAfterReturnType({ bulkCreateTimes: ['123'], + enrichmentTimes: [], createdSignalsCount: 3, createdSignals: Array(3).fill(sampleSignalHit()), errors: ['error 1', 'error 2'], @@ -1421,6 +1429,7 @@ describe('utils', () => { }), createSearchAfterReturnType({ bulkCreateTimes: ['456'], + enrichmentTimes: [], createdSignalsCount: 2, createdSignals: Array(2).fill(sampleSignalHit()), errors: ['error 3'], @@ -1433,6 +1442,7 @@ describe('utils', () => { ]); const expected: SearchAfterAndBulkCreateReturnType = { bulkCreateTimes: ['123', '456'], // concatenates the prev and next together + enrichmentTimes: [], createdSignalsCount: 5, // Adds the 3 and 2 together createdSignals: Array(5).fill(sampleSignalHit()), errors: ['error 1', 'error 2', 'error 3'], // concatenates the prev and next together @@ -1452,6 +1462,7 @@ describe('utils', () => { const next: GenericBulkCreateResponse = { success: false, bulkCreateDuration: '100', + enrichmentDuration: '0', createdItemsCount: 1, createdItems: [], errors: ['new error'], @@ -1469,6 +1480,7 @@ describe('utils', () => { const next: GenericBulkCreateResponse = { success: true, bulkCreateDuration: '0', + enrichmentDuration: '0', createdItemsCount: 0, createdItems: [], errors: ['error 1'], @@ -1484,6 +1496,7 @@ describe('utils', () => { const next: GenericBulkCreateResponse = { success: true, bulkCreateDuration: '0', + enrichmentDuration: '0', createdItemsCount: 0, createdItems: [], errors: ['error 2'], diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.ts index 6030400da2b75..24b5b068d5689 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.ts @@ -649,6 +649,7 @@ export const createSearchAfterReturnType = ({ success, warning, searchAfterTimes, + enrichmentTimes, bulkCreateTimes, lastLookBackDate, createdSignalsCount, @@ -659,6 +660,7 @@ export const createSearchAfterReturnType = ({ success?: boolean | undefined; warning?: boolean; searchAfterTimes?: string[] | undefined; + enrichmentTimes?: string[] | undefined; bulkCreateTimes?: string[] | undefined; lastLookBackDate?: Date | undefined; createdSignalsCount?: number | undefined; @@ -670,6 +672,7 @@ export const createSearchAfterReturnType = ({ success: success ?? true, warning: warning ?? false, searchAfterTimes: searchAfterTimes ?? [], + enrichmentTimes: enrichmentTimes ?? [], bulkCreateTimes: bulkCreateTimes ?? [], lastLookBackDate: lastLookBackDate ?? null, createdSignalsCount: createdSignalsCount ?? 0, @@ -715,6 +718,7 @@ export const addToSearchAfterReturn = ({ current.createdSignalsCount += next.createdItemsCount; current.createdSignals.push(...next.createdItems); current.bulkCreateTimes.push(next.bulkCreateDuration); + current.enrichmentTimes.push(next.enrichmentDuration); current.errors = [...new Set([...current.errors, ...next.errors])]; }; @@ -727,6 +731,7 @@ export const mergeReturns = ( warning: existingWarning, searchAfterTimes: existingSearchAfterTimes, bulkCreateTimes: existingBulkCreateTimes, + enrichmentTimes: existingEnrichmentTimes, lastLookBackDate: existingLastLookBackDate, createdSignalsCount: existingCreatedSignalsCount, createdSignals: existingCreatedSignals, @@ -738,6 +743,7 @@ export const mergeReturns = ( success: newSuccess, warning: newWarning, searchAfterTimes: newSearchAfterTimes, + enrichmentTimes: newEnrichmentTimes, bulkCreateTimes: newBulkCreateTimes, lastLookBackDate: newLastLookBackDate, createdSignalsCount: newCreatedSignalsCount, @@ -750,6 +756,7 @@ export const mergeReturns = ( success: existingSuccess && newSuccess, warning: existingWarning || newWarning, searchAfterTimes: [...existingSearchAfterTimes, ...newSearchAfterTimes], + enrichmentTimes: [...existingEnrichmentTimes, ...newEnrichmentTimes], bulkCreateTimes: [...existingBulkCreateTimes, ...newBulkCreateTimes], lastLookBackDate: newLastLookBackDate ?? existingLastLookBackDate, createdSignalsCount: existingCreatedSignalsCount + newCreatedSignalsCount, diff --git a/x-pack/plugins/security_solution/server/usage/collector.ts b/x-pack/plugins/security_solution/server/usage/collector.ts index e14af8c553736..6f526051f17d1 100644 --- a/x-pack/plugins/security_solution/server/usage/collector.ts +++ b/x-pack/plugins/security_solution/server/usage/collector.ts @@ -414,6 +414,20 @@ export const registerCollector: RegisterCollector = ({ _meta: { description: 'The min duration' }, }, }, + enrichment_duration: { + max: { + type: 'float', + _meta: { description: 'The max duration' }, + }, + avg: { + type: 'float', + _meta: { description: 'The avg duration' }, + }, + min: { + type: 'float', + _meta: { description: 'The min duration' }, + }, + }, gap_duration: { max: { type: 'float', @@ -500,6 +514,20 @@ export const registerCollector: RegisterCollector = ({ _meta: { description: 'The min duration' }, }, }, + enrichment_duration: { + max: { + type: 'float', + _meta: { description: 'The max duration' }, + }, + avg: { + type: 'float', + _meta: { description: 'The avg duration' }, + }, + min: { + type: 'float', + _meta: { description: 'The min duration' }, + }, + }, gap_duration: { max: { type: 'float', @@ -586,6 +614,20 @@ export const registerCollector: RegisterCollector = ({ _meta: { description: 'The min duration' }, }, }, + enrichment_duration: { + max: { + type: 'float', + _meta: { description: 'The max duration' }, + }, + avg: { + type: 'float', + _meta: { description: 'The avg duration' }, + }, + min: { + type: 'float', + _meta: { description: 'The min duration' }, + }, + }, gap_duration: { max: { type: 'float', @@ -672,6 +714,20 @@ export const registerCollector: RegisterCollector = ({ _meta: { description: 'The min duration' }, }, }, + enrichment_duration: { + max: { + type: 'float', + _meta: { description: 'The max duration' }, + }, + avg: { + type: 'float', + _meta: { description: 'The avg duration' }, + }, + min: { + type: 'float', + _meta: { description: 'The min duration' }, + }, + }, gap_duration: { max: { type: 'float', @@ -758,6 +814,20 @@ export const registerCollector: RegisterCollector = ({ _meta: { description: 'The min duration' }, }, }, + enrichment_duration: { + max: { + type: 'float', + _meta: { description: 'The max duration' }, + }, + avg: { + type: 'float', + _meta: { description: 'The avg duration' }, + }, + min: { + type: 'float', + _meta: { description: 'The min duration' }, + }, + }, gap_duration: { max: { type: 'float', @@ -844,6 +914,20 @@ export const registerCollector: RegisterCollector = ({ _meta: { description: 'The min duration' }, }, }, + enrichment_duration: { + max: { + type: 'float', + _meta: { description: 'The max duration' }, + }, + avg: { + type: 'float', + _meta: { description: 'The avg duration' }, + }, + min: { + type: 'float', + _meta: { description: 'The min duration' }, + }, + }, gap_duration: { max: { type: 'float', @@ -946,6 +1030,20 @@ export const registerCollector: RegisterCollector = ({ _meta: { description: 'The min duration' }, }, }, + enrichment_duration: { + max: { + type: 'float', + _meta: { description: 'The max duration' }, + }, + avg: { + type: 'float', + _meta: { description: 'The avg duration' }, + }, + min: { + type: 'float', + _meta: { description: 'The min duration' }, + }, + }, gap_duration: { max: { type: 'float', @@ -1032,6 +1130,20 @@ export const registerCollector: RegisterCollector = ({ _meta: { description: 'The min duration' }, }, }, + enrichment_duration: { + max: { + type: 'float', + _meta: { description: 'The max duration' }, + }, + avg: { + type: 'float', + _meta: { description: 'The avg duration' }, + }, + min: { + type: 'float', + _meta: { description: 'The min duration' }, + }, + }, gap_duration: { max: { type: 'float', @@ -1118,6 +1230,20 @@ export const registerCollector: RegisterCollector = ({ _meta: { description: 'The min duration' }, }, }, + enrichment_duration: { + max: { + type: 'float', + _meta: { description: 'The max duration' }, + }, + avg: { + type: 'float', + _meta: { description: 'The avg duration' }, + }, + min: { + type: 'float', + _meta: { description: 'The min duration' }, + }, + }, gap_duration: { max: { type: 'float', @@ -1204,6 +1330,20 @@ export const registerCollector: RegisterCollector = ({ _meta: { description: 'The min duration' }, }, }, + enrichment_duration: { + max: { + type: 'float', + _meta: { description: 'The max duration' }, + }, + avg: { + type: 'float', + _meta: { description: 'The avg duration' }, + }, + min: { + type: 'float', + _meta: { description: 'The min duration' }, + }, + }, gap_duration: { max: { type: 'float', @@ -1290,6 +1430,20 @@ export const registerCollector: RegisterCollector = ({ _meta: { description: 'The min duration' }, }, }, + enrichment_duration: { + max: { + type: 'float', + _meta: { description: 'The max duration' }, + }, + avg: { + type: 'float', + _meta: { description: 'The avg duration' }, + }, + min: { + type: 'float', + _meta: { description: 'The min duration' }, + }, + }, gap_duration: { max: { type: 'float', @@ -1376,6 +1530,20 @@ export const registerCollector: RegisterCollector = ({ _meta: { description: 'The min duration' }, }, }, + enrichment_duration: { + max: { + type: 'float', + _meta: { description: 'The max duration' }, + }, + avg: { + type: 'float', + _meta: { description: 'The avg duration' }, + }, + min: { + type: 'float', + _meta: { description: 'The min duration' }, + }, + }, gap_duration: { max: { type: 'float', @@ -1478,6 +1646,20 @@ export const registerCollector: RegisterCollector = ({ _meta: { description: 'The min duration' }, }, }, + enrichment_duration: { + max: { + type: 'float', + _meta: { description: 'The max duration' }, + }, + avg: { + type: 'float', + _meta: { description: 'The avg duration' }, + }, + min: { + type: 'float', + _meta: { description: 'The min duration' }, + }, + }, gap_duration: { max: { type: 'float', @@ -1564,6 +1746,20 @@ export const registerCollector: RegisterCollector = ({ _meta: { description: 'The min duration' }, }, }, + enrichment_duration: { + max: { + type: 'float', + _meta: { description: 'The max duration' }, + }, + avg: { + type: 'float', + _meta: { description: 'The avg duration' }, + }, + min: { + type: 'float', + _meta: { description: 'The min duration' }, + }, + }, gap_duration: { max: { type: 'float', @@ -1650,6 +1846,20 @@ export const registerCollector: RegisterCollector = ({ _meta: { description: 'The min duration' }, }, }, + enrichment_duration: { + max: { + type: 'float', + _meta: { description: 'The max duration' }, + }, + avg: { + type: 'float', + _meta: { description: 'The avg duration' }, + }, + min: { + type: 'float', + _meta: { description: 'The min duration' }, + }, + }, gap_duration: { max: { type: 'float', @@ -1736,6 +1946,20 @@ export const registerCollector: RegisterCollector = ({ _meta: { description: 'The min duration' }, }, }, + enrichment_duration: { + max: { + type: 'float', + _meta: { description: 'The max duration' }, + }, + avg: { + type: 'float', + _meta: { description: 'The avg duration' }, + }, + min: { + type: 'float', + _meta: { description: 'The min duration' }, + }, + }, gap_duration: { max: { type: 'float', @@ -1822,6 +2046,20 @@ export const registerCollector: RegisterCollector = ({ _meta: { description: 'The min duration' }, }, }, + enrichment_duration: { + max: { + type: 'float', + _meta: { description: 'The max duration' }, + }, + avg: { + type: 'float', + _meta: { description: 'The avg duration' }, + }, + min: { + type: 'float', + _meta: { description: 'The min duration' }, + }, + }, gap_duration: { max: { type: 'float', @@ -1908,6 +2146,20 @@ export const registerCollector: RegisterCollector = ({ _meta: { description: 'The min duration' }, }, }, + enrichment_duration: { + max: { + type: 'float', + _meta: { description: 'The max duration' }, + }, + avg: { + type: 'float', + _meta: { description: 'The avg duration' }, + }, + min: { + type: 'float', + _meta: { description: 'The min duration' }, + }, + }, gap_duration: { max: { type: 'float', diff --git a/x-pack/plugins/security_solution/server/usage/detections/rules/get_initial_usage.ts b/x-pack/plugins/security_solution/server/usage/detections/rules/get_initial_usage.ts index eb32c58bda6cf..3ad6b5740b53e 100644 --- a/x-pack/plugins/security_solution/server/usage/detections/rules/get_initial_usage.ts +++ b/x-pack/plugins/security_solution/server/usage/detections/rules/get_initial_usage.ts @@ -144,6 +144,7 @@ export const getInitialSingleEventMetric = (): SingleEventMetric => ({ succeeded: 0, index_duration: getInitialMaxAvgMin(), search_duration: getInitialMaxAvgMin(), + enrichment_duration: getInitialMaxAvgMin(), gap_duration: getInitialMaxAvgMin(), gap_count: 0, }); diff --git a/x-pack/plugins/security_solution/server/usage/detections/rules/get_metrics.mocks.ts b/x-pack/plugins/security_solution/server/usage/detections/rules/get_metrics.mocks.ts index 129d2b32d0b3d..83eb7df28a026 100644 --- a/x-pack/plugins/security_solution/server/usage/detections/rules/get_metrics.mocks.ts +++ b/x-pack/plugins/security_solution/server/usage/detections/rules/get_metrics.mocks.ts @@ -155,6 +155,15 @@ export const getEventLogAllRules = (): SearchResponse ({ avg: 0, min: 0, }, + enrichment_duration: { + max: 0, + avg: 0, + min: 0, + }, gap_count: 0, }, threat_match: { @@ -2506,6 +2835,11 @@ export const getEventLogAllRulesResult = (): SingleEventLogStatusMetric => ({ avg: 0, min: 0, }, + enrichment_duration: { + max: 0, + avg: 0, + min: 0, + }, gap_count: 0, }, machine_learning: { @@ -2529,6 +2863,11 @@ export const getEventLogAllRulesResult = (): SingleEventLogStatusMetric => ({ avg: 0, min: 0, }, + enrichment_duration: { + max: 0, + avg: 0, + min: 0, + }, gap_count: 0, }, query: { @@ -2594,6 +2933,11 @@ export const getEventLogAllRulesResult = (): SingleEventLogStatusMetric => ({ avg: 4246.375, min: 2811, }, + enrichment_duration: { + max: 0, + avg: 0, + min: 0, + }, gap_count: 6, }, saved_query: { @@ -2617,6 +2961,11 @@ export const getEventLogAllRulesResult = (): SingleEventLogStatusMetric => ({ avg: 0, min: 0, }, + enrichment_duration: { + max: 0, + avg: 0, + min: 0, + }, gap_count: 0, }, threshold: { @@ -2640,6 +2989,11 @@ export const getEventLogAllRulesResult = (): SingleEventLogStatusMetric => ({ avg: 0, min: 0, }, + enrichment_duration: { + max: 0, + avg: 0, + min: 0, + }, gap_count: 0, }, total: { @@ -2676,6 +3030,11 @@ export const getEventLogElasticRulesResult = (): SingleEventLogStatusMetric => ( avg: 0, min: 0, }, + enrichment_duration: { + max: 0, + avg: 0, + min: 0, + }, gap_count: 0, }, threat_match: { @@ -2699,6 +3058,11 @@ export const getEventLogElasticRulesResult = (): SingleEventLogStatusMetric => ( avg: 0, min: 0, }, + enrichment_duration: { + max: 0, + avg: 0, + min: 0, + }, gap_count: 0, }, machine_learning: { @@ -2722,6 +3086,11 @@ export const getEventLogElasticRulesResult = (): SingleEventLogStatusMetric => ( avg: 0, min: 0, }, + enrichment_duration: { + max: 0, + avg: 0, + min: 0, + }, gap_count: 0, }, query: { @@ -2772,6 +3141,11 @@ export const getEventLogElasticRulesResult = (): SingleEventLogStatusMetric => ( avg: 4141.75, min: 2811, }, + enrichment_duration: { + max: 0, + avg: 0, + min: 0, + }, gap_count: 4, }, saved_query: { @@ -2795,6 +3169,11 @@ export const getEventLogElasticRulesResult = (): SingleEventLogStatusMetric => ( avg: 0, min: 0, }, + enrichment_duration: { + max: 0, + avg: 0, + min: 0, + }, gap_count: 0, }, threshold: { @@ -2818,6 +3197,11 @@ export const getEventLogElasticRulesResult = (): SingleEventLogStatusMetric => ( avg: 0, min: 0, }, + enrichment_duration: { + max: 0, + avg: 0, + min: 0, + }, gap_count: 0, }, total: { @@ -2854,6 +3238,11 @@ export const getEventLogCustomRulesResult = (): SingleEventLogStatusMetric => ({ avg: 0, min: 0, }, + enrichment_duration: { + max: 0, + avg: 0, + min: 0, + }, gap_count: 0, }, threat_match: { @@ -2877,6 +3266,11 @@ export const getEventLogCustomRulesResult = (): SingleEventLogStatusMetric => ({ avg: 0, min: 0, }, + enrichment_duration: { + max: 0, + avg: 0, + min: 0, + }, gap_count: 0, }, machine_learning: { @@ -2900,6 +3294,11 @@ export const getEventLogCustomRulesResult = (): SingleEventLogStatusMetric => ({ avg: 0, min: 0, }, + enrichment_duration: { + max: 0, + avg: 0, + min: 0, + }, gap_count: 0, }, query: { @@ -2940,6 +3339,11 @@ export const getEventLogCustomRulesResult = (): SingleEventLogStatusMetric => ({ avg: 4351, min: 3051, }, + enrichment_duration: { + max: 0, + avg: 0, + min: 0, + }, gap_count: 2, }, saved_query: { @@ -2963,6 +3367,11 @@ export const getEventLogCustomRulesResult = (): SingleEventLogStatusMetric => ({ avg: 0, min: 0, }, + enrichment_duration: { + max: 0, + avg: 0, + min: 0, + }, gap_count: 0, }, threshold: { @@ -2986,6 +3395,11 @@ export const getEventLogCustomRulesResult = (): SingleEventLogStatusMetric => ({ avg: 0, min: 0, }, + enrichment_duration: { + max: 0, + avg: 0, + min: 0, + }, gap_count: 0, }, total: { diff --git a/x-pack/plugins/security_solution/server/usage/detections/rules/types.ts b/x-pack/plugins/security_solution/server/usage/detections/rules/types.ts index 499c79b11fcfa..84fb656f793d4 100644 --- a/x-pack/plugins/security_solution/server/usage/detections/rules/types.ts +++ b/x-pack/plugins/security_solution/server/usage/detections/rules/types.ts @@ -85,6 +85,7 @@ export interface SingleEventMetric { succeeded: number; index_duration: MaxAvgMin; search_duration: MaxAvgMin; + enrichment_duration: MaxAvgMin; gap_duration: MaxAvgMin; gap_count: number; } diff --git a/x-pack/plugins/security_solution/server/usage/queries/utils/get_event_log_agg_by_rule_type_metrics.test.ts b/x-pack/plugins/security_solution/server/usage/queries/utils/get_event_log_agg_by_rule_type_metrics.test.ts index 09a988fbf02ef..693e3579d7c3a 100644 --- a/x-pack/plugins/security_solution/server/usage/queries/utils/get_event_log_agg_by_rule_type_metrics.test.ts +++ b/x-pack/plugins/security_solution/server/usage/queries/utils/get_event_log_agg_by_rule_type_metrics.test.ts @@ -68,6 +68,21 @@ describe('get_event_log_agg_by_rule_type_metrics', () => { field: 'kibana.alert.rule.execution.metrics.total_search_duration_ms', }, }, + maxTotalEnrichmentDuration: { + max: { + field: 'kibana.alert.rule.execution.metrics.total_enrichment_duration_ms', + }, + }, + minTotalEnrichmentDuration: { + min: { + field: 'kibana.alert.rule.execution.metrics.total_enrichment_duration_ms', + }, + }, + avgTotalEnrichmentDuration: { + avg: { + field: 'kibana.alert.rule.execution.metrics.total_enrichment_duration_ms', + }, + }, }, }); }); diff --git a/x-pack/plugins/security_solution/server/usage/queries/utils/get_event_log_agg_by_rule_type_metrics.ts b/x-pack/plugins/security_solution/server/usage/queries/utils/get_event_log_agg_by_rule_type_metrics.ts index 6fe8103e29a0d..957f56809d64f 100644 --- a/x-pack/plugins/security_solution/server/usage/queries/utils/get_event_log_agg_by_rule_type_metrics.ts +++ b/x-pack/plugins/security_solution/server/usage/queries/utils/get_event_log_agg_by_rule_type_metrics.ts @@ -74,6 +74,21 @@ export const getEventLogAggByRuleTypeMetrics = ( field: 'kibana.alert.rule.execution.metrics.total_search_duration_ms', }, }, + maxTotalEnrichmentDuration: { + max: { + field: 'kibana.alert.rule.execution.metrics.total_enrichment_duration_ms', + }, + }, + minTotalEnrichmentDuration: { + min: { + field: 'kibana.alert.rule.execution.metrics.total_enrichment_duration_ms', + }, + }, + avgTotalEnrichmentDuration: { + avg: { + field: 'kibana.alert.rule.execution.metrics.total_enrichment_duration_ms', + }, + }, }, }; }; diff --git a/x-pack/plugins/security_solution/server/usage/queries/utils/get_event_log_agg_by_rule_types_metrics.test.ts b/x-pack/plugins/security_solution/server/usage/queries/utils/get_event_log_agg_by_rule_types_metrics.test.ts index 22261ac48812c..4673ca1b6bcb8 100644 --- a/x-pack/plugins/security_solution/server/usage/queries/utils/get_event_log_agg_by_rule_types_metrics.test.ts +++ b/x-pack/plugins/security_solution/server/usage/queries/utils/get_event_log_agg_by_rule_types_metrics.test.ts @@ -74,6 +74,21 @@ describe('get_event_log_agg_by_rule_types_metrics', () => { field: 'kibana.alert.rule.execution.metrics.total_search_duration_ms', }, }, + maxTotalEnrichmentDuration: { + max: { + field: 'kibana.alert.rule.execution.metrics.total_enrichment_duration_ms', + }, + }, + minTotalEnrichmentDuration: { + min: { + field: 'kibana.alert.rule.execution.metrics.total_enrichment_duration_ms', + }, + }, + avgTotalEnrichmentDuration: { + avg: { + field: 'kibana.alert.rule.execution.metrics.total_enrichment_duration_ms', + }, + }, }, }, }); @@ -139,6 +154,21 @@ describe('get_event_log_agg_by_rule_types_metrics', () => { field: 'kibana.alert.rule.execution.metrics.total_search_duration_ms', }, }, + maxTotalEnrichmentDuration: { + max: { + field: 'kibana.alert.rule.execution.metrics.total_enrichment_duration_ms', + }, + }, + minTotalEnrichmentDuration: { + min: { + field: 'kibana.alert.rule.execution.metrics.total_enrichment_duration_ms', + }, + }, + avgTotalEnrichmentDuration: { + avg: { + field: 'kibana.alert.rule.execution.metrics.total_enrichment_duration_ms', + }, + }, }, }, }); @@ -204,6 +234,21 @@ describe('get_event_log_agg_by_rule_types_metrics', () => { field: 'kibana.alert.rule.execution.metrics.total_search_duration_ms', }, }, + maxTotalEnrichmentDuration: { + max: { + field: 'kibana.alert.rule.execution.metrics.total_enrichment_duration_ms', + }, + }, + minTotalEnrichmentDuration: { + min: { + field: 'kibana.alert.rule.execution.metrics.total_enrichment_duration_ms', + }, + }, + avgTotalEnrichmentDuration: { + avg: { + field: 'kibana.alert.rule.execution.metrics.total_enrichment_duration_ms', + }, + }, }, }, 'siem.indicatorRule': { @@ -263,6 +308,21 @@ describe('get_event_log_agg_by_rule_types_metrics', () => { field: 'kibana.alert.rule.execution.metrics.total_search_duration_ms', }, }, + maxTotalEnrichmentDuration: { + max: { + field: 'kibana.alert.rule.execution.metrics.total_enrichment_duration_ms', + }, + }, + minTotalEnrichmentDuration: { + min: { + field: 'kibana.alert.rule.execution.metrics.total_enrichment_duration_ms', + }, + }, + avgTotalEnrichmentDuration: { + avg: { + field: 'kibana.alert.rule.execution.metrics.total_enrichment_duration_ms', + }, + }, }, }, }); diff --git a/x-pack/plugins/security_solution/server/usage/queries/utils/get_event_log_agg_by_statuses.test.ts b/x-pack/plugins/security_solution/server/usage/queries/utils/get_event_log_agg_by_statuses.test.ts index 7d474769bd79f..a87046660fe16 100644 --- a/x-pack/plugins/security_solution/server/usage/queries/utils/get_event_log_agg_by_statuses.test.ts +++ b/x-pack/plugins/security_solution/server/usage/queries/utils/get_event_log_agg_by_statuses.test.ts @@ -137,6 +137,21 @@ describe('get_event_log_agg_by_statuses', () => { field: 'kibana.alert.rule.execution.metrics.total_search_duration_ms', }, }, + maxTotalEnrichmentDuration: { + max: { + field: 'kibana.alert.rule.execution.metrics.total_enrichment_duration_ms', + }, + }, + minTotalEnrichmentDuration: { + min: { + field: 'kibana.alert.rule.execution.metrics.total_enrichment_duration_ms', + }, + }, + avgTotalEnrichmentDuration: { + avg: { + field: 'kibana.alert.rule.execution.metrics.total_enrichment_duration_ms', + }, + }, }, }, }, @@ -246,6 +261,21 @@ describe('get_event_log_agg_by_statuses', () => { field: 'kibana.alert.rule.execution.metrics.total_search_duration_ms', }, }, + maxTotalEnrichmentDuration: { + max: { + field: 'kibana.alert.rule.execution.metrics.total_enrichment_duration_ms', + }, + }, + minTotalEnrichmentDuration: { + min: { + field: 'kibana.alert.rule.execution.metrics.total_enrichment_duration_ms', + }, + }, + avgTotalEnrichmentDuration: { + avg: { + field: 'kibana.alert.rule.execution.metrics.total_enrichment_duration_ms', + }, + }, }, }, }, @@ -418,6 +448,21 @@ describe('get_event_log_agg_by_statuses', () => { field: 'kibana.alert.rule.execution.metrics.total_search_duration_ms', }, }, + maxTotalEnrichmentDuration: { + max: { + field: 'kibana.alert.rule.execution.metrics.total_enrichment_duration_ms', + }, + }, + minTotalEnrichmentDuration: { + min: { + field: 'kibana.alert.rule.execution.metrics.total_enrichment_duration_ms', + }, + }, + avgTotalEnrichmentDuration: { + avg: { + field: 'kibana.alert.rule.execution.metrics.total_enrichment_duration_ms', + }, + }, }, }, 'siem.thresholdRule': { @@ -477,6 +522,21 @@ describe('get_event_log_agg_by_statuses', () => { field: 'kibana.alert.rule.execution.metrics.total_search_duration_ms', }, }, + maxTotalEnrichmentDuration: { + max: { + field: 'kibana.alert.rule.execution.metrics.total_enrichment_duration_ms', + }, + }, + minTotalEnrichmentDuration: { + min: { + field: 'kibana.alert.rule.execution.metrics.total_enrichment_duration_ms', + }, + }, + avgTotalEnrichmentDuration: { + avg: { + field: 'kibana.alert.rule.execution.metrics.total_enrichment_duration_ms', + }, + }, }, }, }, diff --git a/x-pack/plugins/security_solution/server/usage/queries/utils/transform_single_rule_metric.test.ts b/x-pack/plugins/security_solution/server/usage/queries/utils/transform_single_rule_metric.test.ts index c64f0833fe851..9c5810011a975 100644 --- a/x-pack/plugins/security_solution/server/usage/queries/utils/transform_single_rule_metric.test.ts +++ b/x-pack/plugins/security_solution/server/usage/queries/utils/transform_single_rule_metric.test.ts @@ -85,6 +85,15 @@ describe('transform_single_rule_metric', () => { minTotalSearchDuration: { value: 12, }, + minTotalEnrichmentDuration: { + value: 4, + }, + maxTotalEnrichmentDuration: { + value: 2, + }, + avgTotalEnrichmentDuration: { + value: 12, + }, }, }); @@ -131,6 +140,11 @@ describe('transform_single_rule_metric', () => { avg: 2, min: 9, }, + enrichment_duration: { + max: 2, + avg: 12, + min: 4, + }, gap_count: 4, }); }); diff --git a/x-pack/plugins/security_solution/server/usage/queries/utils/transform_single_rule_metric.ts b/x-pack/plugins/security_solution/server/usage/queries/utils/transform_single_rule_metric.ts index bebd867fb195f..5b3b6f8b7ebb2 100644 --- a/x-pack/plugins/security_solution/server/usage/queries/utils/transform_single_rule_metric.ts +++ b/x-pack/plugins/security_solution/server/usage/queries/utils/transform_single_rule_metric.ts @@ -52,6 +52,11 @@ export const transformSingleRuleMetric = ({ avg: singleMetric.avgTotalSearchDuration.value ?? 0.0, min: singleMetric.minTotalSearchDuration.value ?? 0.0, }, + enrichment_duration: { + max: singleMetric?.maxTotalEnrichmentDuration?.value ?? 0.0, + avg: singleMetric?.avgTotalEnrichmentDuration?.value ?? 0.0, + min: singleMetric?.minTotalEnrichmentDuration?.value ?? 0.0, + }, gap_duration: { max: singleMetric.maxGapDuration.value ?? 0.0, avg: singleMetric.avgGapDuration.value ?? 0.0, diff --git a/x-pack/plugins/security_solution/server/usage/types.ts b/x-pack/plugins/security_solution/server/usage/types.ts index fe7711196303c..a6db2e3d71e91 100644 --- a/x-pack/plugins/security_solution/server/usage/types.ts +++ b/x-pack/plugins/security_solution/server/usage/types.ts @@ -121,6 +121,15 @@ export interface SingleExecutionMetricAgg { minTotalSearchDuration: { value: number | null; }; + maxTotalEnrichmentDuration: { + value: number | null; + }; + avgTotalEnrichmentDuration: { + value: number | null; + }; + minTotalEnrichmentDuration: { + value: number | null; + }; } export interface EventLogTypeStatusAggs { diff --git a/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json b/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json index 0c389000f6c80..9a47ad9de093e 100644 --- a/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json +++ b/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @@ -4644,6 +4644,18 @@ "properties": { "all": { "properties": { + "total": { + "type": "long" + }, + "monthly": { + "type": "long" + }, + "weekly": { + "type": "long" + }, + "daily": { + "type": "long" + }, "assignees": { "properties": { "total": { @@ -4657,18 +4669,6 @@ } } }, - "total": { - "type": "long" - }, - "monthly": { - "type": "long" - }, - "weekly": { - "type": "long" - }, - "daily": { - "type": "long" - }, "status": { "properties": { "open": { @@ -4720,6 +4720,18 @@ }, "sec": { "properties": { + "total": { + "type": "long" + }, + "monthly": { + "type": "long" + }, + "weekly": { + "type": "long" + }, + "daily": { + "type": "long" + }, "assignees": { "properties": { "total": { @@ -4732,7 +4744,11 @@ "type": "long" } } - }, + } + } + }, + "obs": { + "properties": { "total": { "type": "long" }, @@ -4744,11 +4760,7 @@ }, "daily": { "type": "long" - } - } - }, - "obs": { - "properties": { + }, "assignees": { "properties": { "total": { @@ -4761,7 +4773,11 @@ "type": "long" } } - }, + } + } + }, + "main": { + "properties": { "total": { "type": "long" }, @@ -4773,11 +4789,7 @@ }, "daily": { "type": "long" - } - } - }, - "main": { - "properties": { + }, "assignees": { "properties": { "total": { @@ -4790,18 +4802,6 @@ "type": "long" } } - }, - "total": { - "type": "long" - }, - "monthly": { - "type": "long" - }, - "weekly": { - "type": "long" - }, - "daily": { - "type": "long" } } } @@ -10029,6 +10029,28 @@ } } }, + "enrichment_duration": { + "properties": { + "max": { + "type": "float", + "_meta": { + "description": "The max duration" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "The avg duration" + } + }, + "min": { + "type": "float", + "_meta": { + "description": "The min duration" + } + } + } + }, "gap_duration": { "properties": { "max": { @@ -10161,6 +10183,28 @@ } } }, + "enrichment_duration": { + "properties": { + "max": { + "type": "float", + "_meta": { + "description": "The max duration" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "The avg duration" + } + }, + "min": { + "type": "float", + "_meta": { + "description": "The min duration" + } + } + } + }, "gap_duration": { "properties": { "max": { @@ -10293,6 +10337,28 @@ } } }, + "enrichment_duration": { + "properties": { + "max": { + "type": "float", + "_meta": { + "description": "The max duration" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "The avg duration" + } + }, + "min": { + "type": "float", + "_meta": { + "description": "The min duration" + } + } + } + }, "gap_duration": { "properties": { "max": { @@ -10425,6 +10491,28 @@ } } }, + "enrichment_duration": { + "properties": { + "max": { + "type": "float", + "_meta": { + "description": "The max duration" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "The avg duration" + } + }, + "min": { + "type": "float", + "_meta": { + "description": "The min duration" + } + } + } + }, "gap_duration": { "properties": { "max": { @@ -10557,6 +10645,28 @@ } } }, + "enrichment_duration": { + "properties": { + "max": { + "type": "float", + "_meta": { + "description": "The max duration" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "The avg duration" + } + }, + "min": { + "type": "float", + "_meta": { + "description": "The min duration" + } + } + } + }, "gap_duration": { "properties": { "max": { @@ -10689,6 +10799,28 @@ } } }, + "enrichment_duration": { + "properties": { + "max": { + "type": "float", + "_meta": { + "description": "The max duration" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "The avg duration" + } + }, + "min": { + "type": "float", + "_meta": { + "description": "The min duration" + } + } + } + }, "gap_duration": { "properties": { "max": { @@ -10847,6 +10979,28 @@ } } }, + "enrichment_duration": { + "properties": { + "max": { + "type": "float", + "_meta": { + "description": "The max duration" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "The avg duration" + } + }, + "min": { + "type": "float", + "_meta": { + "description": "The min duration" + } + } + } + }, "gap_duration": { "properties": { "max": { @@ -10979,6 +11133,28 @@ } } }, + "enrichment_duration": { + "properties": { + "max": { + "type": "float", + "_meta": { + "description": "The max duration" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "The avg duration" + } + }, + "min": { + "type": "float", + "_meta": { + "description": "The min duration" + } + } + } + }, "gap_duration": { "properties": { "max": { @@ -11111,6 +11287,28 @@ } } }, + "enrichment_duration": { + "properties": { + "max": { + "type": "float", + "_meta": { + "description": "The max duration" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "The avg duration" + } + }, + "min": { + "type": "float", + "_meta": { + "description": "The min duration" + } + } + } + }, "gap_duration": { "properties": { "max": { @@ -11243,6 +11441,28 @@ } } }, + "enrichment_duration": { + "properties": { + "max": { + "type": "float", + "_meta": { + "description": "The max duration" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "The avg duration" + } + }, + "min": { + "type": "float", + "_meta": { + "description": "The min duration" + } + } + } + }, "gap_duration": { "properties": { "max": { @@ -11375,6 +11595,28 @@ } } }, + "enrichment_duration": { + "properties": { + "max": { + "type": "float", + "_meta": { + "description": "The max duration" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "The avg duration" + } + }, + "min": { + "type": "float", + "_meta": { + "description": "The min duration" + } + } + } + }, "gap_duration": { "properties": { "max": { @@ -11507,6 +11749,28 @@ } } }, + "enrichment_duration": { + "properties": { + "max": { + "type": "float", + "_meta": { + "description": "The max duration" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "The avg duration" + } + }, + "min": { + "type": "float", + "_meta": { + "description": "The min duration" + } + } + } + }, "gap_duration": { "properties": { "max": { @@ -11665,6 +11929,28 @@ } } }, + "enrichment_duration": { + "properties": { + "max": { + "type": "float", + "_meta": { + "description": "The max duration" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "The avg duration" + } + }, + "min": { + "type": "float", + "_meta": { + "description": "The min duration" + } + } + } + }, "gap_duration": { "properties": { "max": { @@ -11797,6 +12083,28 @@ } } }, + "enrichment_duration": { + "properties": { + "max": { + "type": "float", + "_meta": { + "description": "The max duration" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "The avg duration" + } + }, + "min": { + "type": "float", + "_meta": { + "description": "The min duration" + } + } + } + }, "gap_duration": { "properties": { "max": { @@ -11929,6 +12237,28 @@ } } }, + "enrichment_duration": { + "properties": { + "max": { + "type": "float", + "_meta": { + "description": "The max duration" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "The avg duration" + } + }, + "min": { + "type": "float", + "_meta": { + "description": "The min duration" + } + } + } + }, "gap_duration": { "properties": { "max": { @@ -12061,6 +12391,28 @@ } } }, + "enrichment_duration": { + "properties": { + "max": { + "type": "float", + "_meta": { + "description": "The max duration" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "The avg duration" + } + }, + "min": { + "type": "float", + "_meta": { + "description": "The min duration" + } + } + } + }, "gap_duration": { "properties": { "max": { @@ -12193,6 +12545,28 @@ } } }, + "enrichment_duration": { + "properties": { + "max": { + "type": "float", + "_meta": { + "description": "The max duration" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "The avg duration" + } + }, + "min": { + "type": "float", + "_meta": { + "description": "The min duration" + } + } + } + }, "gap_duration": { "properties": { "max": { @@ -12325,6 +12699,28 @@ } } }, + "enrichment_duration": { + "properties": { + "max": { + "type": "float", + "_meta": { + "description": "The max duration" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "The avg duration" + } + }, + "min": { + "type": "float", + "_meta": { + "description": "The min duration" + } + } + } + }, "gap_duration": { "properties": { "max": { From 4c12ff3fddf6edab74147ce9a714bc1e5e91c65e Mon Sep 17 00:00:00 2001 From: Kevin Delemme Date: Wed, 28 Sep 2022 08:11:57 -0400 Subject: [PATCH 40/95] chore(slo): remove space slo resources (#141662) --- .../observability/server/assets/constants.ts | 8 +--- x-pack/plugins/observability/server/plugin.ts | 2 - .../server/routes/register_routes.ts | 4 -- .../observability/server/routes/slo/route.ts | 22 ++------- .../server/services/slo/delete_slo.test.ts | 1 + .../server/services/slo/delete_slo.ts | 3 ++ .../services/slo/resource_installer.test.ts | 19 ++------ .../server/services/slo/resource_installer.ts | 23 ++++------ .../apm_transaction_duration.test.ts.snap | 4 +- .../apm_transaction_error_rate.test.ts.snap | 4 +- .../apm_transaction_duration.test.ts | 4 +- .../apm_transaction_duration.ts | 14 +++--- .../apm_transaction_error_rate.test.ts | 6 +-- .../apm_transaction_error_rate.ts | 14 +++--- .../transform_generator.ts | 2 +- .../services/slo/transform_manager.test.ts | 46 +++---------------- .../server/services/slo/transform_manager.ts | 5 +- 17 files changed, 58 insertions(+), 123 deletions(-) diff --git a/x-pack/plugins/observability/server/assets/constants.ts b/x-pack/plugins/observability/server/assets/constants.ts index 4c0cc0e2e6f83..182ca89712dcc 100644 --- a/x-pack/plugins/observability/server/assets/constants.ts +++ b/x-pack/plugins/observability/server/assets/constants.ts @@ -9,11 +9,7 @@ export const SLO_COMPONENT_TEMPLATE_MAPPINGS_NAME = 'slo-observability.sli-mappi export const SLO_COMPONENT_TEMPLATE_SETTINGS_NAME = 'slo-observability.sli-settings'; export const SLO_INDEX_TEMPLATE_NAME = 'slo-observability.sli'; export const SLO_RESOURCES_VERSION = 1; - -export const getSLOIngestPipelineName = (spaceId: string) => - `${SLO_INDEX_TEMPLATE_NAME}.monthly-${spaceId}`; - -export const getSLODestinationIndexName = (spaceId: string) => - `${SLO_INDEX_TEMPLATE_NAME}-v${SLO_RESOURCES_VERSION}-${spaceId}`; +export const SLO_INGEST_PIPELINE_NAME = `${SLO_INDEX_TEMPLATE_NAME}.monthly`; +export const SLO_DESTINATION_INDEX_NAME = `${SLO_INDEX_TEMPLATE_NAME}-v${SLO_RESOURCES_VERSION}`; export const getSLOTransformId = (sloId: string) => `slo-${sloId}`; diff --git a/x-pack/plugins/observability/server/plugin.ts b/x-pack/plugins/observability/server/plugin.ts index 1d9d3cbf455f1..ff5fd246bea1b 100644 --- a/x-pack/plugins/observability/server/plugin.ts +++ b/x-pack/plugins/observability/server/plugin.ts @@ -144,7 +144,6 @@ export class ObservabilityPlugin implements Plugin { const start = () => core.getStartServices().then(([coreStart]) => coreStart); - const { spacesService } = plugins.spaces; const { ruleDataService } = plugins.ruleRegistry; registerRoutes({ @@ -155,7 +154,6 @@ export class ObservabilityPlugin implements Plugin { logger: this.initContext.logger.get(), repository: getGlobalObservabilityServerRouteRepository(config), ruleDataService, - spacesService, }); return { diff --git a/x-pack/plugins/observability/server/routes/register_routes.ts b/x-pack/plugins/observability/server/routes/register_routes.ts index e0e9e94f5cb21..1c45eb6001479 100644 --- a/x-pack/plugins/observability/server/routes/register_routes.ts +++ b/x-pack/plugins/observability/server/routes/register_routes.ts @@ -14,7 +14,6 @@ import { CoreSetup, CoreStart, Logger, RouteRegistrar } from '@kbn/core/server'; import Boom from '@hapi/boom'; import { errors } from '@elastic/elasticsearch'; import { RuleDataPluginService } from '@kbn/rule-registry-plugin/server'; -import { SpacesServiceStart } from '@kbn/spaces-plugin/server'; import { ObservabilityRequestHandlerContext } from '../types'; import { AbstractObservabilityServerRouteRepository } from './types'; import { getHTTPResponseCode, ObservabilityError } from '../errors'; @@ -24,7 +23,6 @@ export function registerRoutes({ core, logger, ruleDataService, - spacesService, }: { core: { setup: CoreSetup; @@ -33,7 +31,6 @@ export function registerRoutes({ repository: AbstractObservabilityServerRouteRepository; logger: Logger; ruleDataService: RuleDataPluginService; - spacesService: SpacesServiceStart; }) { const routes = Object.values(repository); @@ -67,7 +64,6 @@ export function registerRoutes({ logger, params: decodedParams, ruleDataService, - spacesService, })) as any; if (data === undefined) { diff --git a/x-pack/plugins/observability/server/routes/slo/route.ts b/x-pack/plugins/observability/server/routes/slo/route.ts index 3f04d5e0b13c6..63ef4e1e07e64 100644 --- a/x-pack/plugins/observability/server/routes/slo/route.ts +++ b/x-pack/plugins/observability/server/routes/slo/route.ts @@ -38,19 +38,13 @@ const createSLORoute = createObservabilityServerRoute({ tags: [], }, params: createSLOParamsSchema, - handler: async ({ context, request, params, logger, spacesService }) => { + handler: async ({ context, params, logger }) => { const esClient = (await context.core).elasticsearch.client.asCurrentUser; const soClient = (await context.core).savedObjects.client; - const spaceId = spacesService.getSpaceId(request); - const resourceInstaller = new DefaultResourceInstaller(esClient, logger, spaceId); + const resourceInstaller = new DefaultResourceInstaller(esClient, logger); const repository = new KibanaSavedObjectsSLORepository(soClient); - const transformManager = new DefaultTransformManager( - transformGenerators, - esClient, - logger, - spaceId - ); + const transformManager = new DefaultTransformManager(transformGenerators, esClient, logger); const createSLO = new CreateSLO(resourceInstaller, repository, transformManager); const response = await createSLO.execute(params.body); @@ -65,18 +59,12 @@ const deleteSLORoute = createObservabilityServerRoute({ tags: [], }, params: deleteSLOParamsSchema, - handler: async ({ context, request, params, logger, spacesService }) => { + handler: async ({ context, params, logger }) => { const esClient = (await context.core).elasticsearch.client.asCurrentUser; const soClient = (await context.core).savedObjects.client; - const spaceId = spacesService.getSpaceId(request); const repository = new KibanaSavedObjectsSLORepository(soClient); - const transformManager = new DefaultTransformManager( - transformGenerators, - esClient, - logger, - spaceId - ); + const transformManager = new DefaultTransformManager(transformGenerators, esClient, logger); const deleteSLO = new DeleteSLO(repository, transformManager, esClient); diff --git a/x-pack/plugins/observability/server/services/slo/delete_slo.test.ts b/x-pack/plugins/observability/server/services/slo/delete_slo.test.ts index b1a68b9c04aee..2e43c81f6d382 100644 --- a/x-pack/plugins/observability/server/services/slo/delete_slo.test.ts +++ b/x-pack/plugins/observability/server/services/slo/delete_slo.test.ts @@ -33,6 +33,7 @@ describe('DeleteSLO', () => { await deleteSLO.execute(slo.id); + expect(mockRepository.findById).toHaveBeenCalledWith(slo.id); expect(mockTransformManager.stop).toHaveBeenCalledWith(getSLOTransformId(slo.id)); expect(mockTransformManager.uninstall).toHaveBeenCalledWith(getSLOTransformId(slo.id)); expect(mockEsClient.deleteByQuery).toHaveBeenCalledWith( diff --git a/x-pack/plugins/observability/server/services/slo/delete_slo.ts b/x-pack/plugins/observability/server/services/slo/delete_slo.ts index 59e5df8a5975a..a7d931174a59a 100644 --- a/x-pack/plugins/observability/server/services/slo/delete_slo.ts +++ b/x-pack/plugins/observability/server/services/slo/delete_slo.ts @@ -19,6 +19,9 @@ export class DeleteSLO { ) {} public async execute(sloId: string): Promise { + // ensure the slo exists on the request's space. + await this.repository.findById(sloId); + const sloTransformId = getSLOTransformId(sloId); await this.transformManager.stop(sloTransformId); await this.transformManager.uninstall(sloTransformId); diff --git a/x-pack/plugins/observability/server/services/slo/resource_installer.test.ts b/x-pack/plugins/observability/server/services/slo/resource_installer.test.ts index f8746f38cd246..90749176513da 100644 --- a/x-pack/plugins/observability/server/services/slo/resource_installer.test.ts +++ b/x-pack/plugins/observability/server/services/slo/resource_installer.test.ts @@ -9,7 +9,7 @@ import { IngestGetPipelineResponse } from '@elastic/elasticsearch/lib/api/typesW import { elasticsearchServiceMock } from '@kbn/core/server/mocks'; import { loggerMock } from '@kbn/logging-mocks'; import { - getSLOIngestPipelineName, + SLO_INGEST_PIPELINE_NAME, SLO_COMPONENT_TEMPLATE_MAPPINGS_NAME, SLO_COMPONENT_TEMPLATE_SETTINGS_NAME, SLO_INDEX_TEMPLATE_NAME, @@ -17,17 +17,12 @@ import { } from '../../assets/constants'; import { DefaultResourceInstaller } from './resource_installer'; -const SPACE_ID = 'space-id'; describe('resourceInstaller', () => { describe("when the common resources don't exist", () => { it('installs the common resources', async () => { const mockClusterClient = elasticsearchServiceMock.createElasticsearchClient(); mockClusterClient.indices.existsIndexTemplate.mockResponseOnce(false); - const installer = new DefaultResourceInstaller( - mockClusterClient, - loggerMock.create(), - SPACE_ID - ); + const installer = new DefaultResourceInstaller(mockClusterClient, loggerMock.create()); await installer.ensureCommonResourcesInstalled(); @@ -44,7 +39,7 @@ describe('resourceInstaller', () => { expect.objectContaining({ name: SLO_INDEX_TEMPLATE_NAME }) ); expect(mockClusterClient.ingest.putPipeline).toHaveBeenCalledWith( - expect.objectContaining({ id: getSLOIngestPipelineName(SPACE_ID) }) + expect.objectContaining({ id: SLO_INGEST_PIPELINE_NAME }) ); }); }); @@ -55,13 +50,9 @@ describe('resourceInstaller', () => { mockClusterClient.indices.existsIndexTemplate.mockResponseOnce(true); mockClusterClient.ingest.getPipeline.mockResponseOnce({ // @ts-ignore _meta not typed properly - [getSLOIngestPipelineName(SPACE_ID)]: { _meta: { version: SLO_RESOURCES_VERSION } }, + [SLO_INGEST_PIPELINE_NAME]: { _meta: { version: SLO_RESOURCES_VERSION } }, } as IngestGetPipelineResponse); - const installer = new DefaultResourceInstaller( - mockClusterClient, - loggerMock.create(), - SPACE_ID - ); + const installer = new DefaultResourceInstaller(mockClusterClient, loggerMock.create()); await installer.ensureCommonResourcesInstalled(); diff --git a/x-pack/plugins/observability/server/services/slo/resource_installer.ts b/x-pack/plugins/observability/server/services/slo/resource_installer.ts index 8ed8108b3c4b7..abc02052097b5 100644 --- a/x-pack/plugins/observability/server/services/slo/resource_installer.ts +++ b/x-pack/plugins/observability/server/services/slo/resource_installer.ts @@ -13,7 +13,7 @@ import type { import type { ElasticsearchClient, Logger } from '@kbn/core/server'; import { - getSLOIngestPipelineName, + SLO_INGEST_PIPELINE_NAME, SLO_COMPONENT_TEMPLATE_MAPPINGS_NAME, SLO_COMPONENT_TEMPLATE_SETTINGS_NAME, SLO_INDEX_TEMPLATE_NAME, @@ -29,11 +29,7 @@ export interface ResourceInstaller { } export class DefaultResourceInstaller implements ResourceInstaller { - constructor( - private esClient: ElasticsearchClient, - private logger: Logger, - private spaceId: string - ) {} + constructor(private esClient: ElasticsearchClient, private logger: Logger) {} public async ensureCommonResourcesInstalled(): Promise { const alreadyInstalled = await this.areResourcesAlreadyInstalled(); @@ -64,8 +60,8 @@ export class DefaultResourceInstaller implements ResourceInstaller { await this.createOrUpdateIngestPipelineTemplate( getSLOPipelineTemplate( - getSLOIngestPipelineName(this.spaceId), - this.getPipelinePrefix(SLO_RESOURCES_VERSION, this.spaceId) + SLO_INGEST_PIPELINE_NAME, + this.getPipelinePrefix(SLO_RESOURCES_VERSION) ) ); } catch (err) { @@ -74,10 +70,10 @@ export class DefaultResourceInstaller implements ResourceInstaller { } } - private getPipelinePrefix(version: number, spaceId: string): string { + private getPipelinePrefix(version: number): string { // Following https://www.elastic.co/blog/an-introduction-to-the-elastic-data-stream-naming-scheme - // slo-observability.sli--. - return `${SLO_INDEX_TEMPLATE_NAME}-v${version}-${spaceId}.`; + // slo-observability.sli-. + return `${SLO_INDEX_TEMPLATE_NAME}-v${version}.`; } private async areResourcesAlreadyInstalled(): Promise { @@ -87,12 +83,11 @@ export class DefaultResourceInstaller implements ResourceInstaller { let ingestPipelineExists = false; try { - const pipelineName = getSLOIngestPipelineName(this.spaceId); - const pipeline = await this.esClient.ingest.getPipeline({ id: pipelineName }); + const pipeline = await this.esClient.ingest.getPipeline({ id: SLO_INGEST_PIPELINE_NAME }); ingestPipelineExists = // @ts-ignore _meta is not defined on the type - pipeline && pipeline[pipelineName]._meta.version === SLO_RESOURCES_VERSION; + pipeline && pipeline[SLO_INGEST_PIPELINE_NAME]._meta.version === SLO_RESOURCES_VERSION; } catch (err) { return false; } diff --git a/x-pack/plugins/observability/server/services/slo/transform_generators/__snapshots__/apm_transaction_duration.test.ts.snap b/x-pack/plugins/observability/server/services/slo/transform_generators/__snapshots__/apm_transaction_duration.test.ts.snap index 239c3c93503b9..7b7f49061fd57 100644 --- a/x-pack/plugins/observability/server/services/slo/transform_generators/__snapshots__/apm_transaction_duration.test.ts.snap +++ b/x-pack/plugins/observability/server/services/slo/transform_generators/__snapshots__/apm_transaction_duration.test.ts.snap @@ -20,8 +20,8 @@ Object { "version": 1, }, "dest": Object { - "index": "slo-observability.sli-v1-my-namespace", - "pipeline": "slo-observability.sli.monthly-my-namespace", + "index": "slo-observability.sli-v1", + "pipeline": "slo-observability.sli.monthly", }, "frequency": "1m", "pivot": Object { diff --git a/x-pack/plugins/observability/server/services/slo/transform_generators/__snapshots__/apm_transaction_error_rate.test.ts.snap b/x-pack/plugins/observability/server/services/slo/transform_generators/__snapshots__/apm_transaction_error_rate.test.ts.snap index 1fdaec28f8977..8b73f76a8082d 100644 --- a/x-pack/plugins/observability/server/services/slo/transform_generators/__snapshots__/apm_transaction_error_rate.test.ts.snap +++ b/x-pack/plugins/observability/server/services/slo/transform_generators/__snapshots__/apm_transaction_error_rate.test.ts.snap @@ -20,8 +20,8 @@ Object { "version": 1, }, "dest": Object { - "index": "slo-observability.sli-v1-my-namespace", - "pipeline": "slo-observability.sli.monthly-my-namespace", + "index": "slo-observability.sli-v1", + "pipeline": "slo-observability.sli.monthly", }, "frequency": "1m", "pivot": Object { diff --git a/x-pack/plugins/observability/server/services/slo/transform_generators/apm_transaction_duration.test.ts b/x-pack/plugins/observability/server/services/slo/transform_generators/apm_transaction_duration.test.ts index 1e8fadf365d72..ba984e542619b 100644 --- a/x-pack/plugins/observability/server/services/slo/transform_generators/apm_transaction_duration.test.ts +++ b/x-pack/plugins/observability/server/services/slo/transform_generators/apm_transaction_duration.test.ts @@ -13,7 +13,7 @@ const generator = new ApmTransactionDurationTransformGenerator(); describe('APM Transaction Duration Transform Generator', () => { it('returns the correct transform params with every specified indicator params', async () => { const anSLO = createSLO(createAPMTransactionDurationIndicator()); - const transform = generator.getTransformParams(anSLO, 'my-namespace'); + const transform = generator.getTransformParams(anSLO); expect(transform).toMatchSnapshot({ transform_id: expect.any(String), @@ -34,7 +34,7 @@ describe('APM Transaction Duration Transform Generator', () => { transaction_type: '*', }) ); - const transform = generator.getTransformParams(anSLO, 'my-namespace'); + const transform = generator.getTransformParams(anSLO); expect(transform.source.query).toMatchSnapshot(); }); diff --git a/x-pack/plugins/observability/server/services/slo/transform_generators/apm_transaction_duration.ts b/x-pack/plugins/observability/server/services/slo/transform_generators/apm_transaction_duration.ts index 4c46421737630..bc45e12abbb30 100644 --- a/x-pack/plugins/observability/server/services/slo/transform_generators/apm_transaction_duration.ts +++ b/x-pack/plugins/observability/server/services/slo/transform_generators/apm_transaction_duration.ts @@ -12,8 +12,8 @@ import { } from '@elastic/elasticsearch/lib/api/types'; import { ALL_VALUE } from '../../../types/schema'; import { - getSLODestinationIndexName, - getSLOIngestPipelineName, + SLO_DESTINATION_INDEX_NAME, + SLO_INGEST_PIPELINE_NAME, getSLOTransformId, } from '../../../assets/constants'; import { getSLOTransformTemplate } from '../../../assets/transform_templates/slo_transform_template'; @@ -27,7 +27,7 @@ import { TransformGenerator } from '.'; const APM_SOURCE_INDEX = 'metrics-apm*'; export class ApmTransactionDurationTransformGenerator implements TransformGenerator { - public getTransformParams(slo: SLO, spaceId: string): TransformPutTransformRequest { + public getTransformParams(slo: SLO): TransformPutTransformRequest { if (!apmTransactionDurationSLOSchema.is(slo)) { throw new Error(`Cannot handle SLO of indicator type: ${slo.indicator.type}`); } @@ -35,7 +35,7 @@ export class ApmTransactionDurationTransformGenerator implements TransformGenera return getSLOTransformTemplate( this.buildTransformId(slo), this.buildSource(slo), - this.buildDestination(slo, spaceId), + this.buildDestination(), this.buildGroupBy(), this.buildAggregations(slo) ); @@ -104,10 +104,10 @@ export class ApmTransactionDurationTransformGenerator implements TransformGenera }; } - private buildDestination(slo: APMTransactionDurationSLO, spaceId: string) { + private buildDestination() { return { - pipeline: getSLOIngestPipelineName(spaceId), - index: getSLODestinationIndexName(spaceId), + pipeline: SLO_INGEST_PIPELINE_NAME, + index: SLO_DESTINATION_INDEX_NAME, }; } diff --git a/x-pack/plugins/observability/server/services/slo/transform_generators/apm_transaction_error_rate.test.ts b/x-pack/plugins/observability/server/services/slo/transform_generators/apm_transaction_error_rate.test.ts index afa904fa1f8cb..2bc88c576f8c4 100644 --- a/x-pack/plugins/observability/server/services/slo/transform_generators/apm_transaction_error_rate.test.ts +++ b/x-pack/plugins/observability/server/services/slo/transform_generators/apm_transaction_error_rate.test.ts @@ -13,7 +13,7 @@ const generator = new ApmTransactionErrorRateTransformGenerator(); describe('APM Transaction Error Rate Transform Generator', () => { it('returns the correct transform params with every specified indicator params', async () => { const anSLO = createSLO(createAPMTransactionErrorRateIndicator()); - const transform = generator.getTransformParams(anSLO, 'my-namespace'); + const transform = generator.getTransformParams(anSLO); expect(transform).toMatchSnapshot({ transform_id: expect.any(String), @@ -27,7 +27,7 @@ describe('APM Transaction Error Rate Transform Generator', () => { it("uses default values when 'good_status_codes' is not specified", async () => { const anSLO = createSLO(createAPMTransactionErrorRateIndicator({ good_status_codes: [] })); - const transform = generator.getTransformParams(anSLO, 'my-namespace'); + const transform = generator.getTransformParams(anSLO); expect(transform.pivot?.aggregations).toMatchSnapshot(); }); @@ -41,7 +41,7 @@ describe('APM Transaction Error Rate Transform Generator', () => { transaction_type: '*', }) ); - const transform = generator.getTransformParams(anSLO, 'my-namespace'); + const transform = generator.getTransformParams(anSLO); expect(transform.source.query).toMatchSnapshot(); }); diff --git a/x-pack/plugins/observability/server/services/slo/transform_generators/apm_transaction_error_rate.ts b/x-pack/plugins/observability/server/services/slo/transform_generators/apm_transaction_error_rate.ts index 6740bee2b707f..23a9a03f6e14c 100644 --- a/x-pack/plugins/observability/server/services/slo/transform_generators/apm_transaction_error_rate.ts +++ b/x-pack/plugins/observability/server/services/slo/transform_generators/apm_transaction_error_rate.ts @@ -14,8 +14,8 @@ import { ALL_VALUE } from '../../../types/schema'; import { getSLOTransformTemplate } from '../../../assets/transform_templates/slo_transform_template'; import { TransformGenerator } from '.'; import { - getSLODestinationIndexName, - getSLOIngestPipelineName, + SLO_DESTINATION_INDEX_NAME, + SLO_INGEST_PIPELINE_NAME, getSLOTransformId, } from '../../../assets/constants'; import { @@ -29,7 +29,7 @@ const ALLOWED_STATUS_CODES = ['2xx', '3xx', '4xx', '5xx']; const DEFAULT_GOOD_STATUS_CODES = ['2xx', '3xx', '4xx']; export class ApmTransactionErrorRateTransformGenerator implements TransformGenerator { - public getTransformParams(slo: SLO, spaceId: string): TransformPutTransformRequest { + public getTransformParams(slo: SLO): TransformPutTransformRequest { if (!apmTransactionErrorRateSLOSchema.is(slo)) { throw new Error(`Cannot handle SLO of indicator type: ${slo.indicator.type}`); } @@ -37,7 +37,7 @@ export class ApmTransactionErrorRateTransformGenerator implements TransformGener return getSLOTransformTemplate( this.buildTransformId(slo), this.buildSource(slo), - this.buildDestination(slo, spaceId), + this.buildDestination(), this.buildGroupBy(), this.buildAggregations(slo) ); @@ -106,10 +106,10 @@ export class ApmTransactionErrorRateTransformGenerator implements TransformGener }; } - private buildDestination(slo: APMTransactionErrorRateSLO, spaceId: string) { + private buildDestination() { return { - pipeline: getSLOIngestPipelineName(spaceId), - index: getSLODestinationIndexName(spaceId), + pipeline: SLO_INGEST_PIPELINE_NAME, + index: SLO_DESTINATION_INDEX_NAME, }; } diff --git a/x-pack/plugins/observability/server/services/slo/transform_generators/transform_generator.ts b/x-pack/plugins/observability/server/services/slo/transform_generators/transform_generator.ts index 21a917ea1af6d..3965e809373c8 100644 --- a/x-pack/plugins/observability/server/services/slo/transform_generators/transform_generator.ts +++ b/x-pack/plugins/observability/server/services/slo/transform_generators/transform_generator.ts @@ -9,5 +9,5 @@ import { TransformPutTransformRequest } from '@elastic/elasticsearch/lib/api/typ import { SLO } from '../../../types/models'; export interface TransformGenerator { - getTransformParams(slo: SLO, spaceId: string): TransformPutTransformRequest; + getTransformParams(slo: SLO): TransformPutTransformRequest; } diff --git a/x-pack/plugins/observability/server/services/slo/transform_manager.test.ts b/x-pack/plugins/observability/server/services/slo/transform_manager.test.ts index 1badb6b08e49f..434e6841ff0e9 100644 --- a/x-pack/plugins/observability/server/services/slo/transform_manager.test.ts +++ b/x-pack/plugins/observability/server/services/slo/transform_manager.test.ts @@ -23,8 +23,6 @@ import { import { SLO, SLITypes } from '../../types/models'; import { createAPMTransactionErrorRateIndicator, createSLO } from './fixtures/slo'; -const SPACE_ID = 'space-id'; - describe('TransformManager', () => { let esClientMock: ElasticsearchClientMock; let loggerMock: jest.Mocked; @@ -41,7 +39,7 @@ describe('TransformManager', () => { const generators: Record = { 'slo.apm.transaction_duration': new DummyTransformGenerator(), }; - const service = new DefaultTransformManager(generators, esClientMock, loggerMock, SPACE_ID); + const service = new DefaultTransformManager(generators, esClientMock, loggerMock); await expect( service.install( @@ -63,12 +61,7 @@ describe('TransformManager', () => { const generators: Record = { 'slo.apm.transaction_duration': new FailTransformGenerator(), }; - const transformManager = new DefaultTransformManager( - generators, - esClientMock, - loggerMock, - SPACE_ID - ); + const transformManager = new DefaultTransformManager(generators, esClientMock, loggerMock); await expect( transformManager.install( @@ -92,12 +85,7 @@ describe('TransformManager', () => { const generators: Record = { 'slo.apm.transaction_error_rate': new ApmTransactionErrorRateTransformGenerator(), }; - const transformManager = new DefaultTransformManager( - generators, - esClientMock, - loggerMock, - SPACE_ID - ); + const transformManager = new DefaultTransformManager(generators, esClientMock, loggerMock); const slo = createSLO(createAPMTransactionErrorRateIndicator()); const transformId = await transformManager.install(slo); @@ -113,12 +101,7 @@ describe('TransformManager', () => { const generators: Record = { 'slo.apm.transaction_error_rate': new ApmTransactionErrorRateTransformGenerator(), }; - const transformManager = new DefaultTransformManager( - generators, - esClientMock, - loggerMock, - SPACE_ID - ); + const transformManager = new DefaultTransformManager(generators, esClientMock, loggerMock); await transformManager.start('slo-transform-id'); @@ -132,12 +115,7 @@ describe('TransformManager', () => { const generators: Record = { 'slo.apm.transaction_error_rate': new ApmTransactionErrorRateTransformGenerator(), }; - const transformManager = new DefaultTransformManager( - generators, - esClientMock, - loggerMock, - SPACE_ID - ); + const transformManager = new DefaultTransformManager(generators, esClientMock, loggerMock); await transformManager.stop('slo-transform-id'); @@ -151,12 +129,7 @@ describe('TransformManager', () => { const generators: Record = { 'slo.apm.transaction_error_rate': new ApmTransactionErrorRateTransformGenerator(), }; - const transformManager = new DefaultTransformManager( - generators, - esClientMock, - loggerMock, - SPACE_ID - ); + const transformManager = new DefaultTransformManager(generators, esClientMock, loggerMock); await transformManager.uninstall('slo-transform-id'); @@ -171,12 +144,7 @@ describe('TransformManager', () => { const generators: Record = { 'slo.apm.transaction_error_rate': new ApmTransactionErrorRateTransformGenerator(), }; - const transformManager = new DefaultTransformManager( - generators, - esClientMock, - loggerMock, - SPACE_ID - ); + const transformManager = new DefaultTransformManager(generators, esClientMock, loggerMock); await transformManager.uninstall('slo-transform-id'); diff --git a/x-pack/plugins/observability/server/services/slo/transform_manager.ts b/x-pack/plugins/observability/server/services/slo/transform_manager.ts index ab7799a4a00c6..154660fccaf9f 100644 --- a/x-pack/plugins/observability/server/services/slo/transform_manager.ts +++ b/x-pack/plugins/observability/server/services/slo/transform_manager.ts @@ -24,8 +24,7 @@ export class DefaultTransformManager implements TransformManager { constructor( private generators: Record, private esClient: ElasticsearchClient, - private logger: Logger, - private spaceId: string + private logger: Logger ) {} async install(slo: SLO): Promise { @@ -35,7 +34,7 @@ export class DefaultTransformManager implements TransformManager { throw new Error(`Unsupported SLO type: ${slo.indicator.type}`); } - const transformParams = generator.getTransformParams(slo, this.spaceId); + const transformParams = generator.getTransformParams(slo); try { await retryTransientEsErrors(() => this.esClient.transform.putTransform(transformParams), { logger: this.logger, From 2d6a45b5ef95502e503f17600076680fac5693a0 Mon Sep 17 00:00:00 2001 From: Xavier Mouligneau Date: Wed, 28 Sep 2022 08:50:25 -0400 Subject: [PATCH 41/95] [RAM] Add Stats on top of execution logs (#140883) * WIP * [CI] Auto-commit changed files from 'node scripts/eslint --no-cache --fix' * add new route for global execution KPI + add filter * revert changes * [CI] Auto-commit changed files from 'node scripts/eslint --no-cache --fix' * update query kpi * add new route for global KPI * Add KPI to log tab and add filtering * Add types * Fix calling API multiple times when refresh, add unit tests * Fix lint and type checks * clean up * remove sorting * add tests * fix global kpi log * fix 141833 * fix query to match with filter * allow access to getRuleExecutionKPI * fix unit test * fix jest tests Co-authored-by: Jiawei Wu Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com> --- .../alerting/common/execution_log_types.ts | 13 + .../authorization/alerting_authorization.ts | 1 + .../lib/get_execution_log_aggregation.test.ts | 583 ++++++++++++++++++ .../lib/get_execution_log_aggregation.ts | 199 +++++- .../routes/get_global_execution_kpi.test.ts | 69 +++ .../server/routes/get_global_execution_kpi.ts | 50 ++ .../routes/get_rule_execution_kpi.test.ts | 102 +++ .../server/routes/get_rule_execution_kpi.ts | 56 ++ .../plugins/alerting/server/routes/index.ts | 4 + .../alerting/server/rules_client.mock.ts | 2 + .../server/rules_client/audit_events.ts | 14 + .../server/rules_client/rules_client.ts | 134 ++++ .../server/task_runner/task_runner.ts | 1 - .../alerting.test.ts | 8 + .../feature_privilege_builder/alerting.ts | 9 +- .../application/lib/rule_api/get_filter.ts | 34 + .../public/application/lib/rule_api/index.ts | 4 + .../rule_api/load_action_error_log.test.ts | 2 +- .../lib/rule_api/load_action_error_log.ts | 17 +- .../load_execution_kpi_aggregations.ts | 41 ++ .../load_execution_log_aggregations.ts | 17 +- .../load_global_execution_kpi_aggregations.ts | 38 ++ .../with_bulk_rule_api_operations.tsx | 32 +- .../rule_details/components/rule.test.tsx | 4 +- .../sections/rule_details/components/rule.tsx | 16 +- .../rule_event_log_list_kpi.test.tsx | 183 ++++++ .../components/rule_event_log_list_kpi.tsx | 251 ++++++++ .../components/rule_event_log_list_table.tsx | 19 +- .../alerting/get_global_execution_kpi.ts | 162 +++++ .../tests/alerting/get_rule_execution_kpi.ts | 133 ++++ 30 files changed, 2143 insertions(+), 55 deletions(-) create mode 100644 x-pack/plugins/alerting/server/routes/get_global_execution_kpi.test.ts create mode 100644 x-pack/plugins/alerting/server/routes/get_global_execution_kpi.ts create mode 100644 x-pack/plugins/alerting/server/routes/get_rule_execution_kpi.test.ts create mode 100644 x-pack/plugins/alerting/server/routes/get_rule_execution_kpi.ts create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/get_filter.ts create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_execution_kpi_aggregations.ts create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_global_execution_kpi_aggregations.ts create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_kpi.test.tsx create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_kpi.tsx create mode 100644 x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/alerting/get_global_execution_kpi.ts create mode 100644 x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/alerting/get_rule_execution_kpi.ts diff --git a/x-pack/plugins/alerting/common/execution_log_types.ts b/x-pack/plugins/alerting/common/execution_log_types.ts index 1938d8be4acd3..b08a0bf76d69e 100644 --- a/x-pack/plugins/alerting/common/execution_log_types.ts +++ b/x-pack/plugins/alerting/common/execution_log_types.ts @@ -26,6 +26,17 @@ export const actionErrorLogSortableColumns = [ 'event.action', ]; +export const EMPTY_EXECUTION_KPI_RESULT = { + success: 0, + unknown: 0, + failure: 0, + activeAlerts: 0, + newAlerts: 0, + recoveredAlerts: 0, + erroredActions: 0, + triggeredActions: 0, +}; + export type ExecutionLogSortFields = typeof executionLogSortableColumns[number]; export type ActionErrorLogSortFields = typeof actionErrorLogSortableColumns[number]; @@ -68,3 +79,5 @@ export interface IExecutionLogResult { total: number; data: IExecutionLog[]; } + +export type IExecutionKPIResult = typeof EMPTY_EXECUTION_KPI_RESULT; diff --git a/x-pack/plugins/alerting/server/authorization/alerting_authorization.ts b/x-pack/plugins/alerting/server/authorization/alerting_authorization.ts index 0c501f25a857d..7138aabe9d263 100644 --- a/x-pack/plugins/alerting/server/authorization/alerting_authorization.ts +++ b/x-pack/plugins/alerting/server/authorization/alerting_authorization.ts @@ -35,6 +35,7 @@ export enum ReadOperations { Find = 'find', GetAuthorizedAlertsIndices = 'getAuthorizedAlertsIndices', RunSoon = 'runSoon', + GetRuleExecutionKPI = 'getRuleExecutionKPI', } export enum WriteOperations { diff --git a/x-pack/plugins/alerting/server/lib/get_execution_log_aggregation.test.ts b/x-pack/plugins/alerting/server/lib/get_execution_log_aggregation.test.ts index e48483785490a..eb46ae67e2ef1 100644 --- a/x-pack/plugins/alerting/server/lib/get_execution_log_aggregation.test.ts +++ b/x-pack/plugins/alerting/server/lib/get_execution_log_aggregation.test.ts @@ -13,6 +13,8 @@ import { formatSortForBucketSort, formatSortForTermSort, ExecutionUuidAggResult, + getExecutionKPIAggregation, + formatExecutionKPIResult, } from './get_execution_log_aggregation'; describe('formatSortForBucketSort', () => { @@ -1689,3 +1691,584 @@ describe('formatExecutionLogResult', () => { }); }); }); + +describe('getExecutionKPIAggregation', () => { + test('should correctly generate aggregation', () => { + expect(getExecutionKPIAggregation()).toEqual({ + excludeExecuteStart: { + filter: { + bool: { + must_not: [ + { + term: { + 'event.action': 'execute-start', + }, + }, + ], + }, + }, + aggs: { + executionUuid: { + terms: { + field: 'kibana.alert.rule.execution.uuid', + size: 1000, + }, + aggs: { + executionUuidSorted: { + bucket_sort: { + from: 0, + size: 1000, + gap_policy: 'insert_zeros', + }, + }, + actionExecution: { + filter: { + bool: { + must: [ + { + bool: { + must: [ + { + match: { + 'event.action': 'execute', + }, + }, + { + match: { + 'event.provider': 'actions', + }, + }, + ], + }, + }, + ], + }, + }, + aggs: { + actionOutcomes: { + terms: { + field: 'event.outcome', + size: 2, + }, + }, + }, + }, + ruleExecution: { + filter: { + bool: { + must: [ + { + bool: { + must: [ + { + match: { + 'event.action': 'execute', + }, + }, + { + match: { + 'event.provider': 'alerting', + }, + }, + ], + }, + }, + ], + }, + }, + aggs: { + numTriggeredActions: { + sum: { + field: 'kibana.alert.rule.execution.metrics.number_of_triggered_actions', + missing: 0, + }, + }, + numGeneratedActions: { + sum: { + field: 'kibana.alert.rule.execution.metrics.number_of_generated_actions', + missing: 0, + }, + }, + numActiveAlerts: { + sum: { + field: 'kibana.alert.rule.execution.metrics.alert_counts.active', + missing: 0, + }, + }, + numRecoveredAlerts: { + sum: { + field: 'kibana.alert.rule.execution.metrics.alert_counts.recovered', + missing: 0, + }, + }, + numNewAlerts: { + sum: { + field: 'kibana.alert.rule.execution.metrics.alert_counts.new', + missing: 0, + }, + }, + ruleExecutionOutcomes: { + terms: { + field: 'event.outcome', + size: 2, + }, + }, + }, + }, + minExecutionUuidBucket: { + bucket_selector: { + buckets_path: { + count: 'ruleExecution._count', + }, + script: { + source: 'params.count > 0', + }, + }, + }, + }, + }, + }, + }, + }); + }); + + test('should correctly generate aggregation with a defined filter in the form of a string', () => { + expect(getExecutionKPIAggregation('test:test')).toEqual({ + excludeExecuteStart: { + filter: { + bool: { + must_not: [ + { + term: { + 'event.action': 'execute-start', + }, + }, + ], + }, + }, + aggs: { + executionUuid: { + terms: { + field: 'kibana.alert.rule.execution.uuid', + size: 1000, + }, + aggs: { + executionUuidSorted: { + bucket_sort: { + from: 0, + size: 1000, + gap_policy: 'insert_zeros', + }, + }, + actionExecution: { + filter: { + bool: { + must: [ + { + bool: { + must: [ + { + match: { + 'event.action': 'execute', + }, + }, + { + match: { + 'event.provider': 'actions', + }, + }, + ], + }, + }, + ], + }, + }, + aggs: { + actionOutcomes: { + terms: { + field: 'event.outcome', + size: 2, + }, + }, + }, + }, + ruleExecution: { + filter: { + bool: { + filter: { + bool: { + should: [ + { + match: { + test: 'test', + }, + }, + ], + minimum_should_match: 1, + }, + }, + must: [ + { + bool: { + must: [ + { + match: { + 'event.action': 'execute', + }, + }, + { + match: { + 'event.provider': 'alerting', + }, + }, + ], + }, + }, + ], + }, + }, + aggs: { + numTriggeredActions: { + sum: { + field: 'kibana.alert.rule.execution.metrics.number_of_triggered_actions', + missing: 0, + }, + }, + numGeneratedActions: { + sum: { + field: 'kibana.alert.rule.execution.metrics.number_of_generated_actions', + missing: 0, + }, + }, + numActiveAlerts: { + sum: { + field: 'kibana.alert.rule.execution.metrics.alert_counts.active', + missing: 0, + }, + }, + numRecoveredAlerts: { + sum: { + field: 'kibana.alert.rule.execution.metrics.alert_counts.recovered', + missing: 0, + }, + }, + numNewAlerts: { + sum: { + field: 'kibana.alert.rule.execution.metrics.alert_counts.new', + missing: 0, + }, + }, + ruleExecutionOutcomes: { + terms: { + field: 'event.outcome', + size: 2, + }, + }, + }, + }, + minExecutionUuidBucket: { + bucket_selector: { + buckets_path: { + count: 'ruleExecution._count', + }, + script: { + source: 'params.count > 0', + }, + }, + }, + }, + }, + }, + }, + }); + }); + + test('should correctly generate aggregation with a defined filter in the form of a KueryNode', () => { + expect(getExecutionKPIAggregation(fromKueryExpression('test:test'))).toEqual({ + excludeExecuteStart: { + filter: { + bool: { + must_not: [ + { + term: { + 'event.action': 'execute-start', + }, + }, + ], + }, + }, + aggs: { + executionUuid: { + terms: { + field: 'kibana.alert.rule.execution.uuid', + size: 1000, + }, + aggs: { + executionUuidSorted: { + bucket_sort: { + from: 0, + size: 1000, + gap_policy: 'insert_zeros', + }, + }, + actionExecution: { + filter: { + bool: { + must: [ + { + bool: { + must: [ + { + match: { + 'event.action': 'execute', + }, + }, + { + match: { + 'event.provider': 'actions', + }, + }, + ], + }, + }, + ], + }, + }, + aggs: { + actionOutcomes: { + terms: { + field: 'event.outcome', + size: 2, + }, + }, + }, + }, + ruleExecution: { + filter: { + bool: { + filter: { + bool: { + should: [ + { + match: { + test: 'test', + }, + }, + ], + minimum_should_match: 1, + }, + }, + must: [ + { + bool: { + must: [ + { + match: { + 'event.action': 'execute', + }, + }, + { + match: { + 'event.provider': 'alerting', + }, + }, + ], + }, + }, + ], + }, + }, + aggs: { + numTriggeredActions: { + sum: { + field: 'kibana.alert.rule.execution.metrics.number_of_triggered_actions', + missing: 0, + }, + }, + numGeneratedActions: { + sum: { + field: 'kibana.alert.rule.execution.metrics.number_of_generated_actions', + missing: 0, + }, + }, + numActiveAlerts: { + sum: { + field: 'kibana.alert.rule.execution.metrics.alert_counts.active', + missing: 0, + }, + }, + numRecoveredAlerts: { + sum: { + field: 'kibana.alert.rule.execution.metrics.alert_counts.recovered', + missing: 0, + }, + }, + numNewAlerts: { + sum: { + field: 'kibana.alert.rule.execution.metrics.alert_counts.new', + missing: 0, + }, + }, + ruleExecutionOutcomes: { + terms: { + field: 'event.outcome', + size: 2, + }, + }, + }, + }, + minExecutionUuidBucket: { + bucket_selector: { + buckets_path: { + count: 'ruleExecution._count', + }, + script: { + source: 'params.count > 0', + }, + }, + }, + }, + }, + }, + }, + }); + }); +}); + +describe('formatExecutionKPIAggBuckets', () => { + test('should return empty results if aggregations are undefined', () => { + expect( + formatExecutionKPIResult({ + aggregations: undefined, + }) + ).toEqual({ + activeAlerts: 0, + erroredActions: 0, + failure: 0, + newAlerts: 0, + recoveredAlerts: 0, + success: 0, + triggeredActions: 0, + unknown: 0, + }); + }); + + test('should format results correctly', () => { + const results = { + aggregations: { + excludeExecuteStart: { + meta: {}, + doc_count: 875, + executionUuid: { + meta: {}, + doc_count_error_upper_bound: 0, + sum_other_doc_count: 0, + buckets: [ + { + ruleExecution: { + meta: {}, + doc_count: 3, + numTriggeredActions: { + value: 5.0, + }, + numGeneratedActions: { + value: 5.0, + }, + numActiveAlerts: { + value: 5.0, + }, + numNewAlerts: { + value: 5.0, + }, + numRecoveredAlerts: { + value: 0.0, + }, + ruleExecutionOutcomes: { + doc_count_error_upper_bound: 0, + sum_other_doc_count: 0, + buckets: [ + { + key: 'success', + doc_count: 3, + }, + ], + }, + }, + actionExecution: { + meta: {}, + doc_count: 5, + actionOutcomes: { + doc_count_error_upper_bound: 0, + sum_other_doc_count: 0, + buckets: [ + { + key: 'success', + doc_count: 5, + }, + ], + }, + }, + }, + { + ruleExecution: { + meta: {}, + doc_count: 2, + numTriggeredActions: { + value: 5.0, + }, + numGeneratedActions: { + value: 5.0, + }, + numActiveAlerts: { + value: 5.0, + }, + numNewAlerts: { + value: 5.0, + }, + numRecoveredAlerts: { + value: 0.0, + }, + ruleExecutionOutcomes: { + doc_count_error_upper_bound: 0, + sum_other_doc_count: 0, + buckets: [ + { + key: 'success', + doc_count: 2, + }, + ], + }, + }, + actionExecution: { + meta: {}, + doc_count: 3, + actionOutcomes: { + doc_count_error_upper_bound: 0, + sum_other_doc_count: 0, + buckets: [ + { + key: 'failure', + doc_count: 3, + }, + ], + }, + }, + }, + ], + }, + }, + }, + }; + + expect(formatExecutionKPIResult(results)).toEqual({ + success: 5, + unknown: 0, + failure: 0, + activeAlerts: 10, + newAlerts: 10, + recoveredAlerts: 0, + erroredActions: 3, + triggeredActions: 10, + }); + }); +}); diff --git a/x-pack/plugins/alerting/server/lib/get_execution_log_aggregation.ts b/x-pack/plugins/alerting/server/lib/get_execution_log_aggregation.ts index 0854488d5f29e..fedc827a46c73 100644 --- a/x-pack/plugins/alerting/server/lib/get_execution_log_aggregation.ts +++ b/x-pack/plugins/alerting/server/lib/get_execution_log_aggregation.ts @@ -12,7 +12,7 @@ import { flatMap, get } from 'lodash'; import { AggregateEventsBySavedObjectResult } from '@kbn/event-log-plugin/server'; import { fromKueryExpression, toElasticsearchQuery } from '@kbn/es-query'; import { parseDuration } from '.'; -import { IExecutionLog, IExecutionLogResult } from '../../common'; +import { IExecutionLog, IExecutionLogResult, EMPTY_EXECUTION_KPI_RESULT } from '../../common'; const DEFAULT_MAX_BUCKETS_LIMIT = 1000; // do not retrieve more than this number of executions @@ -51,6 +51,21 @@ interface IActionExecution buckets: Array<{ key: string; doc_count: number }>; } +interface IExecutionUuidKpiAggBucket extends estypes.AggregationsStringTermsBucketKeys { + actionExecution: { + doc_count: number; + actionOutcomes: IActionExecution; + }; + ruleExecution: { + doc_count: number; + numTriggeredActions: estypes.AggregationsSumAggregate; + numGeneratedActions: estypes.AggregationsSumAggregate; + numActiveAlerts: estypes.AggregationsSumAggregate; + numRecoveredAlerts: estypes.AggregationsSumAggregate; + numNewAlerts: estypes.AggregationsSumAggregate; + ruleExecutionOutcomes: IActionExecution; + }; +} interface IExecutionUuidAggBucket extends estypes.AggregationsStringTermsBucketKeys { timeoutMessage: estypes.AggregationsMultiBucketBase; ruleExecution: { @@ -76,12 +91,22 @@ export interface ExecutionUuidAggResult buckets: TBucket[]; } +export interface ExecutionUuidKPIAggResult + extends estypes.AggregationsAggregateBase { + buckets: TBucket[]; +} + interface ExcludeExecuteStartAggResult extends estypes.AggregationsAggregateBase { executionUuid: ExecutionUuidAggResult; executionUuidCardinality: { executionUuidCardinality: estypes.AggregationsCardinalityAggregate; }; } + +interface ExcludeExecuteStartKpiAggResult extends estypes.AggregationsAggregateBase { + executionUuid: ExecutionUuidKPIAggResult; +} + export interface IExecutionLogAggOptions { filter?: string | KueryNode; page: number; @@ -102,6 +127,115 @@ const ExecutionLogSortFields: Record = { num_new_alerts: 'ruleExecution>numNewAlerts', }; +export const getExecutionKPIAggregation = (filter?: IExecutionLogAggOptions['filter']) => { + const dslFilterQuery: estypes.QueryDslBoolQuery['filter'] = buildDslFilterQuery(filter); + + return { + excludeExecuteStart: { + filter: { + bool: { + must_not: [ + { + term: { + 'event.action': 'execute-start', + }, + }, + ], + }, + }, + aggs: { + executionUuid: { + // Bucket by execution UUID + terms: { + field: EXECUTION_UUID_FIELD, + size: DEFAULT_MAX_BUCKETS_LIMIT, + }, + aggs: { + executionUuidSorted: { + bucket_sort: { + from: 0, + size: 1000, + gap_policy: 'insert_zeros' as estypes.AggregationsGapPolicy, + }, + }, + actionExecution: { + filter: { + bool: { + must: [getProviderAndActionFilter('actions', 'execute')], + }, + }, + aggs: { + actionOutcomes: { + terms: { + field: 'event.outcome', + size: 2, + }, + }, + }, + }, + ruleExecution: { + filter: { + bool: { + ...(dslFilterQuery ? { filter: dslFilterQuery } : {}), + must: [getProviderAndActionFilter('alerting', 'execute')], + }, + }, + aggs: { + numTriggeredActions: { + sum: { + field: 'kibana.alert.rule.execution.metrics.number_of_triggered_actions', + missing: 0, + }, + }, + numGeneratedActions: { + sum: { + field: 'kibana.alert.rule.execution.metrics.number_of_generated_actions', + missing: 0, + }, + }, + numActiveAlerts: { + sum: { + field: 'kibana.alert.rule.execution.metrics.alert_counts.active', + missing: 0, + }, + }, + numRecoveredAlerts: { + sum: { + field: 'kibana.alert.rule.execution.metrics.alert_counts.recovered', + missing: 0, + }, + }, + numNewAlerts: { + sum: { + field: 'kibana.alert.rule.execution.metrics.alert_counts.new', + missing: 0, + }, + }, + ruleExecutionOutcomes: { + terms: { + field: 'event.outcome', + size: 2, + }, + }, + }, + }, + minExecutionUuidBucket: { + bucket_selector: { + buckets_path: { + count: 'ruleExecution._count', + }, + script: { + source: 'params.count > 0', + }, + }, + }, + }, + }, + }, + }, + }; +}; + export function getExecutionLogAggregation({ filter, page, @@ -130,13 +264,7 @@ export function getExecutionLogAggregation({ throw Boom.badRequest(`Invalid perPage field "${perPage}" - must be greater than 0`); } - let dslFilterQuery: estypes.QueryDslBoolQuery['filter']; - try { - const filterKueryNode = typeof filter === 'string' ? fromKueryExpression(filter) : filter; - dslFilterQuery = filter ? toElasticsearchQuery(filterKueryNode) : undefined; - } catch (err) { - throw Boom.badRequest(`Invalid kuery syntax for filter ${filter}`); - } + const dslFilterQuery: estypes.QueryDslBoolQuery['filter'] = buildDslFilterQuery(filter); return { excludeExecuteStart: { @@ -295,6 +423,15 @@ export function getExecutionLogAggregation({ }; } +function buildDslFilterQuery(filter: IExecutionLogAggOptions['filter']) { + try { + const filterKueryNode = typeof filter === 'string' ? fromKueryExpression(filter) : filter; + return filter ? toElasticsearchQuery(filterKueryNode) : undefined; + } catch (err) { + throw Boom.badRequest(`Invalid kuery syntax for filter ${filter}`); + } +} + function getProviderAndActionFilter(provider: string, action: string) { return { bool: { @@ -362,6 +499,52 @@ function formatExecutionLogAggBucket(bucket: IExecutionUuidAggBucket): IExecutio }; } +function formatExecutionKPIAggBuckets(buckets: IExecutionUuidKpiAggBucket[]) { + const objToReturn = { + success: 0, + unknown: 0, + failure: 0, + activeAlerts: 0, + newAlerts: 0, + recoveredAlerts: 0, + erroredActions: 0, + triggeredActions: 0, + }; + + buckets.forEach((bucket) => { + const ruleExecutionOutcomes = bucket?.ruleExecution?.ruleExecutionOutcomes?.buckets ?? []; + const actionExecutionOutcomes = bucket?.actionExecution?.actionOutcomes?.buckets ?? []; + + const ruleExecutionCount = bucket?.ruleExecution?.doc_count ?? 0; + const successRuleExecution = + ruleExecutionOutcomes.find((subBucket) => subBucket?.key === 'success')?.doc_count ?? 0; + const failureRuleExecution = + ruleExecutionOutcomes.find((subBucket) => subBucket?.key === 'failure')?.doc_count ?? 0; + + objToReturn.success += successRuleExecution; + objToReturn.unknown += ruleExecutionCount - (successRuleExecution + failureRuleExecution); + objToReturn.failure += failureRuleExecution; + objToReturn.activeAlerts += bucket?.ruleExecution?.numActiveAlerts.value ?? 0; + objToReturn.newAlerts += bucket?.ruleExecution?.numNewAlerts.value ?? 0; + objToReturn.recoveredAlerts += bucket?.ruleExecution?.numRecoveredAlerts.value ?? 0; + objToReturn.erroredActions += + actionExecutionOutcomes.find((subBucket) => subBucket?.key === 'failure')?.doc_count ?? 0; + objToReturn.triggeredActions += bucket?.ruleExecution?.numTriggeredActions.value ?? 0; + }); + + return objToReturn; +} + +export function formatExecutionKPIResult(results: AggregateEventsBySavedObjectResult) { + const { aggregations } = results; + if (!aggregations || !aggregations.excludeExecuteStart) { + return EMPTY_EXECUTION_KPI_RESULT; + } + const aggs = aggregations.excludeExecuteStart as ExcludeExecuteStartKpiAggResult; + const buckets = aggs.executionUuid.buckets; + return formatExecutionKPIAggBuckets(buckets); +} + export function formatExecutionLogResult( results: AggregateEventsBySavedObjectResult ): IExecutionLogResult { diff --git a/x-pack/plugins/alerting/server/routes/get_global_execution_kpi.test.ts b/x-pack/plugins/alerting/server/routes/get_global_execution_kpi.test.ts new file mode 100644 index 0000000000000..89b21547c892a --- /dev/null +++ b/x-pack/plugins/alerting/server/routes/get_global_execution_kpi.test.ts @@ -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 { httpServiceMock } from '@kbn/core/server/mocks'; +import { licenseStateMock } from '../lib/license_state.mock'; +import { mockHandlerArguments } from './_mock_handler_arguments'; +import { rulesClientMock } from '../rules_client.mock'; +import { getGlobalExecutionKPIRoute } from './get_global_execution_kpi'; + +const rulesClient = rulesClientMock.create(); +jest.mock('../lib/license_api_access', () => ({ + verifyApiAccess: jest.fn(), +})); + +beforeEach(() => { + jest.resetAllMocks(); +}); + +describe('getGlobalExecutionKPIRoute', () => { + const dateString = new Date().toISOString(); + const mockedExecutionLog = { + success: 3, + unknown: 0, + failure: 0, + activeAlerts: 5, + newAlerts: 5, + recoveredAlerts: 0, + erroredActions: 0, + triggeredActions: 5, + }; + + it('gets global execution KPI', async () => { + const licenseState = licenseStateMock.create(); + const router = httpServiceMock.createRouter(); + + getGlobalExecutionKPIRoute(router, licenseState); + + const [config, handler] = router.get.mock.calls[0]; + + expect(config.path).toMatchInlineSnapshot(`"/internal/alerting/_global_execution_kpi"`); + + rulesClient.getGlobalExecutionKpiWithAuth.mockResolvedValue(mockedExecutionLog); + + const [context, req, res] = mockHandlerArguments( + { rulesClient }, + { + query: { + date_start: dateString, + }, + }, + ['ok'] + ); + + await handler(context, req, res); + + expect(rulesClient.getGlobalExecutionKpiWithAuth).toHaveBeenCalledTimes(1); + expect(rulesClient.getGlobalExecutionKpiWithAuth.mock.calls[0]).toEqual([ + { + dateStart: dateString, + }, + ]); + + expect(res.ok).toHaveBeenCalled(); + }); +}); diff --git a/x-pack/plugins/alerting/server/routes/get_global_execution_kpi.ts b/x-pack/plugins/alerting/server/routes/get_global_execution_kpi.ts new file mode 100644 index 0000000000000..29937cc3d8c98 --- /dev/null +++ b/x-pack/plugins/alerting/server/routes/get_global_execution_kpi.ts @@ -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 { IRouter } from '@kbn/core/server'; +import { schema } from '@kbn/config-schema'; +import { AlertingRequestHandlerContext, INTERNAL_BASE_ALERTING_API_PATH } from '../types'; +import { RewriteRequestCase, verifyAccessAndContext } from './lib'; +import { GetGlobalExecutionKPIParams } from '../rules_client'; +import { ILicenseState } from '../lib'; + +const querySchema = schema.object({ + date_start: schema.string(), + date_end: schema.maybe(schema.string()), + filter: schema.maybe(schema.string()), +}); + +const rewriteReq: RewriteRequestCase = ({ + date_start: dateStart, + date_end: dateEnd, + ...rest +}) => ({ + ...rest, + dateStart, + dateEnd, +}); + +export const getGlobalExecutionKPIRoute = ( + router: IRouter, + licenseState: ILicenseState +) => { + router.get( + { + path: `${INTERNAL_BASE_ALERTING_API_PATH}/_global_execution_kpi`, + validate: { + query: querySchema, + }, + }, + router.handleLegacyErrors( + verifyAccessAndContext(licenseState, async function (context, req, res) { + const rulesClient = (await context.alerting).getRulesClient(); + return res.ok({ + body: await rulesClient.getGlobalExecutionKpiWithAuth(rewriteReq(req.query)), + }); + }) + ) + ); +}; diff --git a/x-pack/plugins/alerting/server/routes/get_rule_execution_kpi.test.ts b/x-pack/plugins/alerting/server/routes/get_rule_execution_kpi.test.ts new file mode 100644 index 0000000000000..db5033404788c --- /dev/null +++ b/x-pack/plugins/alerting/server/routes/get_rule_execution_kpi.test.ts @@ -0,0 +1,102 @@ +/* + * 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 { httpServiceMock } from '@kbn/core/server/mocks'; +import { licenseStateMock } from '../lib/license_state.mock'; +import { mockHandlerArguments } from './_mock_handler_arguments'; +import { SavedObjectsErrorHelpers } from '@kbn/core/server'; +import { rulesClientMock } from '../rules_client.mock'; +import { getRuleExecutionKPIRoute } from './get_rule_execution_kpi'; + +const rulesClient = rulesClientMock.create(); +jest.mock('../lib/license_api_access', () => ({ + verifyApiAccess: jest.fn(), +})); + +beforeEach(() => { + jest.resetAllMocks(); +}); + +describe('getRuleExecutionKPIRoute', () => { + const dateString = new Date().toISOString(); + const mockedExecutionLog = { + success: 3, + unknown: 0, + failure: 0, + activeAlerts: 5, + newAlerts: 5, + recoveredAlerts: 0, + erroredActions: 0, + triggeredActions: 5, + }; + + it('gets rule execution KPI', async () => { + const licenseState = licenseStateMock.create(); + const router = httpServiceMock.createRouter(); + + getRuleExecutionKPIRoute(router, licenseState); + + const [config, handler] = router.get.mock.calls[0]; + + expect(config.path).toMatchInlineSnapshot(`"/internal/alerting/rule/{id}/_execution_kpi"`); + + rulesClient.getRuleExecutionKPI.mockResolvedValue(mockedExecutionLog); + + const [context, req, res] = mockHandlerArguments( + { rulesClient }, + { + params: { + id: '1', + }, + query: { + date_start: dateString, + }, + }, + ['ok'] + ); + + await handler(context, req, res); + + expect(rulesClient.getRuleExecutionKPI).toHaveBeenCalledTimes(1); + expect(rulesClient.getRuleExecutionKPI.mock.calls[0]).toEqual([ + { + dateStart: dateString, + id: '1', + }, + ]); + + expect(res.ok).toHaveBeenCalled(); + }); + + it('returns NOT-FOUND when rule is not found', async () => { + const licenseState = licenseStateMock.create(); + const router = httpServiceMock.createRouter(); + + getRuleExecutionKPIRoute(router, licenseState); + + const [, handler] = router.get.mock.calls[0]; + + rulesClient.getRuleExecutionKPI = jest + .fn() + .mockRejectedValueOnce(SavedObjectsErrorHelpers.createGenericNotFoundError('alert', '1')); + + const [context, req, res] = mockHandlerArguments( + { rulesClient }, + { + params: { + id: '1', + }, + query: {}, + }, + ['notFound'] + ); + + expect(handler(context, req, res)).rejects.toMatchInlineSnapshot( + `[Error: Saved object [alert/1] not found]` + ); + }); +}); diff --git a/x-pack/plugins/alerting/server/routes/get_rule_execution_kpi.ts b/x-pack/plugins/alerting/server/routes/get_rule_execution_kpi.ts new file mode 100644 index 0000000000000..11f7085c53290 --- /dev/null +++ b/x-pack/plugins/alerting/server/routes/get_rule_execution_kpi.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 { IRouter } from '@kbn/core/server'; +import { schema } from '@kbn/config-schema'; +import { AlertingRequestHandlerContext, INTERNAL_BASE_ALERTING_API_PATH } from '../types'; +import { RewriteRequestCase, verifyAccessAndContext } from './lib'; +import { GetRuleExecutionKPIParams } from '../rules_client'; +import { ILicenseState } from '../lib'; + +const paramSchema = schema.object({ + id: schema.string(), +}); + +const querySchema = schema.object({ + date_start: schema.string(), + date_end: schema.maybe(schema.string()), + filter: schema.maybe(schema.string()), +}); + +const rewriteReq: RewriteRequestCase = ({ + date_start: dateStart, + date_end: dateEnd, + ...rest +}) => ({ + ...rest, + dateStart, + dateEnd, +}); + +export const getRuleExecutionKPIRoute = ( + router: IRouter, + licenseState: ILicenseState +) => { + router.get( + { + path: `${INTERNAL_BASE_ALERTING_API_PATH}/rule/{id}/_execution_kpi`, + validate: { + params: paramSchema, + query: querySchema, + }, + }, + router.handleLegacyErrors( + verifyAccessAndContext(licenseState, async function (context, req, res) { + const rulesClient = (await context.alerting).getRulesClient(); + const { id } = req.params; + return res.ok({ + body: await rulesClient.getRuleExecutionKPI(rewriteReq({ id, ...req.query })), + }); + }) + ) + ); +}; diff --git a/x-pack/plugins/alerting/server/routes/index.ts b/x-pack/plugins/alerting/server/routes/index.ts index dca2e214d0786..de9e2f112d9e9 100644 --- a/x-pack/plugins/alerting/server/routes/index.ts +++ b/x-pack/plugins/alerting/server/routes/index.ts @@ -22,7 +22,9 @@ import { findRulesRoute, findInternalRulesRoute } from './find_rules'; import { getRuleAlertSummaryRoute } from './get_rule_alert_summary'; import { getRuleExecutionLogRoute } from './get_rule_execution_log'; import { getGlobalExecutionLogRoute } from './get_global_execution_logs'; +import { getGlobalExecutionKPIRoute } from './get_global_execution_kpi'; import { getActionErrorLogRoute } from './get_action_error_log'; +import { getRuleExecutionKPIRoute } from './get_rule_execution_kpi'; import { getRuleStateRoute } from './get_rule_state'; import { healthRoute } from './health'; import { resolveRuleRoute } from './resolve_rule'; @@ -63,6 +65,8 @@ export function defineRoutes(opts: RouteOptions) { getRuleExecutionLogRoute(router, licenseState); getGlobalExecutionLogRoute(router, licenseState); getActionErrorLogRoute(router, licenseState); + getRuleExecutionKPIRoute(router, licenseState); + getGlobalExecutionKPIRoute(router, licenseState); getRuleStateRoute(router, licenseState); healthRoute(router, licenseState, encryptedSavedObjects); ruleTypesRoute(router, licenseState); diff --git a/x-pack/plugins/alerting/server/rules_client.mock.ts b/x-pack/plugins/alerting/server/rules_client.mock.ts index 7333ad59bbb71..2092b98e48c0d 100644 --- a/x-pack/plugins/alerting/server/rules_client.mock.ts +++ b/x-pack/plugins/alerting/server/rules_client.mock.ts @@ -30,6 +30,8 @@ const createRulesClientMock = () => { listAlertTypes: jest.fn(), getAlertSummary: jest.fn(), getExecutionLogForRule: jest.fn(), + getRuleExecutionKPI: jest.fn(), + getGlobalExecutionKpiWithAuth: jest.fn(), getGlobalExecutionLogWithAuth: jest.fn(), getActionErrorLog: jest.fn(), getSpaceId: jest.fn(), diff --git a/x-pack/plugins/alerting/server/rules_client/audit_events.ts b/x-pack/plugins/alerting/server/rules_client/audit_events.ts index c29bc99aa6ed7..30b759c895c46 100644 --- a/x-pack/plugins/alerting/server/rules_client/audit_events.ts +++ b/x-pack/plugins/alerting/server/rules_client/audit_events.ts @@ -26,7 +26,9 @@ export enum RuleAuditAction { BULK_EDIT = 'rule_bulk_edit', GET_EXECUTION_LOG = 'rule_get_execution_log', GET_GLOBAL_EXECUTION_LOG = 'rule_get_global_execution_log', + GET_GLOBAL_EXECUTION_KPI = 'rule_get_global_execution_kpi', GET_ACTION_ERROR_LOG = 'rule_get_action_error_log', + GET_RULE_EXECUTION_KPI = 'rule_get_execution_kpi', SNOOZE = 'rule_snooze', UNSNOOZE = 'rule_unsnooze', RUN_SOON = 'rule_run_soon', @@ -68,6 +70,16 @@ const eventVerbs: Record = { rule_snooze: ['snooze', 'snoozing', 'snoozed'], rule_unsnooze: ['unsnooze', 'unsnoozing', 'unsnoozed'], rule_run_soon: ['run', 'running', 'ran'], + rule_get_execution_kpi: [ + 'access execution KPI for', + 'accessing execution KPI for', + 'accessed execution KPI for', + ], + rule_get_global_execution_kpi: [ + 'access global execution KPI for', + 'accessing global execution KPI for', + 'accessed global execution KPI for', + ], }; const eventTypes: Record = { @@ -92,6 +104,8 @@ const eventTypes: Record = { rule_snooze: 'change', rule_unsnooze: 'change', rule_run_soon: 'access', + rule_get_execution_kpi: 'access', + rule_get_global_execution_kpi: 'access', }; export interface RuleAuditEventParams { diff --git a/x-pack/plugins/alerting/server/rules_client/rules_client.ts b/x-pack/plugins/alerting/server/rules_client/rules_client.ts index c2a643ce8c296..f865a0472465a 100644 --- a/x-pack/plugins/alerting/server/rules_client/rules_client.ts +++ b/x-pack/plugins/alerting/server/rules_client/rules_client.ts @@ -118,7 +118,9 @@ import { import { AlertingRulesConfig } from '../config'; import { formatExecutionLogResult, + formatExecutionKPIResult, getExecutionLogAggregation, + getExecutionKPIAggregation, } from '../lib/get_execution_log_aggregation'; import { IExecutionLogResult, IExecutionErrorsResult } from '../../common'; import { validateSnoozeStartDate } from '../lib/validate_snooze_date'; @@ -381,6 +383,19 @@ export interface GetExecutionLogByIdParams { sort: estypes.Sort; } +export interface GetRuleExecutionKPIParams { + id: string; + dateStart: string; + dateEnd?: string; + filter?: string; +} + +export interface GetGlobalExecutionKPIParams { + dateStart: string; + dateEnd?: string; + filter?: string; +} + export interface GetGlobalExecutionLogParams { dateStart: string; dateEnd?: string; @@ -1039,6 +1054,125 @@ export class RulesClient { } } + public async getGlobalExecutionKpiWithAuth({ + dateStart, + dateEnd, + filter, + }: GetGlobalExecutionKPIParams) { + this.logger.debug(`getGlobalExecutionLogWithAuth(): getting global execution log`); + + let authorizationTuple; + try { + authorizationTuple = await this.authorization.getFindAuthorizationFilter( + AlertingAuthorizationEntity.Alert, + { + type: AlertingAuthorizationFilterType.KQL, + fieldNames: { + ruleTypeId: 'kibana.alert.rule.rule_type_id', + consumer: 'kibana.alert.rule.consumer', + }, + } + ); + } catch (error) { + this.auditLogger?.log( + ruleAuditEvent({ + action: RuleAuditAction.GET_GLOBAL_EXECUTION_KPI, + error, + }) + ); + throw error; + } + + this.auditLogger?.log( + ruleAuditEvent({ + action: RuleAuditAction.GET_GLOBAL_EXECUTION_KPI, + }) + ); + + const dateNow = new Date(); + const parsedDateStart = parseDate(dateStart, 'dateStart', dateNow); + const parsedDateEnd = parseDate(dateEnd, 'dateEnd', dateNow); + + const eventLogClient = await this.getEventLogClient(); + + try { + const aggResult = await eventLogClient.aggregateEventsWithAuthFilter( + 'alert', + authorizationTuple.filter as KueryNode, + { + start: parsedDateStart.toISOString(), + end: parsedDateEnd.toISOString(), + aggs: getExecutionKPIAggregation(filter), + } + ); + + return formatExecutionKPIResult(aggResult); + } catch (err) { + this.logger.debug( + `rulesClient.getGlobalExecutionKpiWithAuth(): error searching global execution KPI: ${err.message}` + ); + throw err; + } + } + + public async getRuleExecutionKPI({ id, dateStart, dateEnd, filter }: GetRuleExecutionKPIParams) { + this.logger.debug(`getRuleExecutionKPI(): getting execution KPI for rule ${id}`); + const rule = (await this.get({ id, includeLegacyId: true })) as SanitizedRuleWithLegacyId; + + try { + // Make sure user has access to this rule + await this.authorization.ensureAuthorized({ + ruleTypeId: rule.alertTypeId, + consumer: rule.consumer, + operation: ReadOperations.GetRuleExecutionKPI, + entity: AlertingAuthorizationEntity.Rule, + }); + } catch (error) { + this.auditLogger?.log( + ruleAuditEvent({ + action: RuleAuditAction.GET_RULE_EXECUTION_KPI, + savedObject: { type: 'alert', id }, + error, + }) + ); + throw error; + } + + this.auditLogger?.log( + ruleAuditEvent({ + action: RuleAuditAction.GET_RULE_EXECUTION_KPI, + savedObject: { type: 'alert', id }, + }) + ); + + // default duration of instance summary is 60 * rule interval + const dateNow = new Date(); + const parsedDateStart = parseDate(dateStart, 'dateStart', dateNow); + const parsedDateEnd = parseDate(dateEnd, 'dateEnd', dateNow); + + const eventLogClient = await this.getEventLogClient(); + + try { + const aggResult = await eventLogClient.aggregateEventsBySavedObjectIds( + 'alert', + [id], + { + start: parsedDateStart.toISOString(), + end: parsedDateEnd.toISOString(), + aggs: getExecutionKPIAggregation(filter), + }, + rule.legacyId !== null ? [rule.legacyId] : undefined + ); + + return formatExecutionKPIResult(aggResult); + } catch (err) { + this.logger.debug( + `rulesClient.getRuleExecutionKPI(): error searching execution KPI for rule ${id}: ${err.message}` + ); + throw err; + } + } + public async find({ options: { fields, ...options } = {}, excludeFromPublicApi = false, diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner.ts b/x-pack/plugins/alerting/server/task_runner/task_runner.ts index 457b2872faa62..41029af567524 100644 --- a/x-pack/plugins/alerting/server/task_runner/task_runner.ts +++ b/x-pack/plugins/alerting/server/task_runner/task_runner.ts @@ -420,7 +420,6 @@ export class TaskRunner< checkHasReachedAlertLimit(); this.alertingEventLogger.setExecutionSucceeded(`rule executed: ${ruleLabel}`); - ruleRunMetricsStore.setSearchMetrics([ wrappedScopedClusterClient.getMetrics(), wrappedSearchSourceClient.getMetrics(), diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/alerting.test.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/alerting.test.ts index 8272c9220e103..cd18a28e0d373 100644 --- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/alerting.test.ts +++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/alerting.test.ts @@ -90,6 +90,7 @@ describe(`feature_privilege_builder`, () => { "alerting:1.0.0-zeta1:alert-type/my-feature/rule/getAlertSummary", "alerting:1.0.0-zeta1:alert-type/my-feature/rule/getExecutionLog", "alerting:1.0.0-zeta1:alert-type/my-feature/rule/find", + "alerting:1.0.0-zeta1:alert-type/my-feature/rule/getRuleExecutionKPI", ] `); }); @@ -174,6 +175,7 @@ describe(`feature_privilege_builder`, () => { "alerting:1.0.0-zeta1:alert-type/my-feature/rule/getAlertSummary", "alerting:1.0.0-zeta1:alert-type/my-feature/rule/getExecutionLog", "alerting:1.0.0-zeta1:alert-type/my-feature/rule/find", + "alerting:1.0.0-zeta1:alert-type/my-feature/rule/getRuleExecutionKPI", "alerting:1.0.0-zeta1:alert-type/my-feature/alert/get", "alerting:1.0.0-zeta1:alert-type/my-feature/alert/find", "alerting:1.0.0-zeta1:alert-type/my-feature/alert/getAuthorizedAlertsIndices", @@ -218,6 +220,7 @@ describe(`feature_privilege_builder`, () => { "alerting:1.0.0-zeta1:alert-type/my-feature/rule/getAlertSummary", "alerting:1.0.0-zeta1:alert-type/my-feature/rule/getExecutionLog", "alerting:1.0.0-zeta1:alert-type/my-feature/rule/find", + "alerting:1.0.0-zeta1:alert-type/my-feature/rule/getRuleExecutionKPI", "alerting:1.0.0-zeta1:alert-type/my-feature/rule/create", "alerting:1.0.0-zeta1:alert-type/my-feature/rule/delete", "alerting:1.0.0-zeta1:alert-type/my-feature/rule/update", @@ -316,6 +319,7 @@ describe(`feature_privilege_builder`, () => { "alerting:1.0.0-zeta1:alert-type/my-feature/rule/getAlertSummary", "alerting:1.0.0-zeta1:alert-type/my-feature/rule/getExecutionLog", "alerting:1.0.0-zeta1:alert-type/my-feature/rule/find", + "alerting:1.0.0-zeta1:alert-type/my-feature/rule/getRuleExecutionKPI", "alerting:1.0.0-zeta1:alert-type/my-feature/rule/create", "alerting:1.0.0-zeta1:alert-type/my-feature/rule/delete", "alerting:1.0.0-zeta1:alert-type/my-feature/rule/update", @@ -374,6 +378,7 @@ describe(`feature_privilege_builder`, () => { "alerting:1.0.0-zeta1:alert-type/my-feature/rule/getAlertSummary", "alerting:1.0.0-zeta1:alert-type/my-feature/rule/getExecutionLog", "alerting:1.0.0-zeta1:alert-type/my-feature/rule/find", + "alerting:1.0.0-zeta1:alert-type/my-feature/rule/getRuleExecutionKPI", "alerting:1.0.0-zeta1:alert-type/my-feature/rule/create", "alerting:1.0.0-zeta1:alert-type/my-feature/rule/delete", "alerting:1.0.0-zeta1:alert-type/my-feature/rule/update", @@ -392,6 +397,7 @@ describe(`feature_privilege_builder`, () => { "alerting:1.0.0-zeta1:readonly-alert-type/my-feature/rule/getAlertSummary", "alerting:1.0.0-zeta1:readonly-alert-type/my-feature/rule/getExecutionLog", "alerting:1.0.0-zeta1:readonly-alert-type/my-feature/rule/find", + "alerting:1.0.0-zeta1:readonly-alert-type/my-feature/rule/getRuleExecutionKPI", ] `); }); @@ -480,6 +486,7 @@ describe(`feature_privilege_builder`, () => { "alerting:1.0.0-zeta1:alert-type/my-feature/rule/getAlertSummary", "alerting:1.0.0-zeta1:alert-type/my-feature/rule/getExecutionLog", "alerting:1.0.0-zeta1:alert-type/my-feature/rule/find", + "alerting:1.0.0-zeta1:alert-type/my-feature/rule/getRuleExecutionKPI", "alerting:1.0.0-zeta1:alert-type/my-feature/rule/create", "alerting:1.0.0-zeta1:alert-type/my-feature/rule/delete", "alerting:1.0.0-zeta1:alert-type/my-feature/rule/update", @@ -498,6 +505,7 @@ describe(`feature_privilege_builder`, () => { "alerting:1.0.0-zeta1:readonly-alert-type/my-feature/rule/getAlertSummary", "alerting:1.0.0-zeta1:readonly-alert-type/my-feature/rule/getExecutionLog", "alerting:1.0.0-zeta1:readonly-alert-type/my-feature/rule/find", + "alerting:1.0.0-zeta1:readonly-alert-type/my-feature/rule/getRuleExecutionKPI", "alerting:1.0.0-zeta1:another-alert-type/my-feature/alert/get", "alerting:1.0.0-zeta1:another-alert-type/my-feature/alert/find", "alerting:1.0.0-zeta1:another-alert-type/my-feature/alert/getAuthorizedAlertsIndices", diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/alerting.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/alerting.ts index 542dfd1267d4c..a11a4fa77bcdd 100644 --- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/alerting.ts +++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/alerting.ts @@ -17,7 +17,14 @@ enum AlertingEntity { } const readOperations: Record = { - rule: ['get', 'getRuleState', 'getAlertSummary', 'getExecutionLog', 'find'], + rule: [ + 'get', + 'getRuleState', + 'getAlertSummary', + 'getExecutionLog', + 'find', + 'getRuleExecutionKPI', + ], alert: ['get', 'find', 'getAuthorizedAlertsIndices'], }; diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/get_filter.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/get_filter.ts new file mode 100644 index 0000000000000..65ace4fa72c7b --- /dev/null +++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/get_filter.ts @@ -0,0 +1,34 @@ +/* + * 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 (Jiawei): Use node builder instead of strings +export const getFilter = ({ + message, + outcomeFilter, + runId, +}: { + message?: string; + outcomeFilter?: string[]; + runId?: string; +}) => { + const filter: string[] = []; + + if (message) { + const escapedMessage = message.replace(/([\)\(\<\>\}\{\"\:\\])/gm, '\\$&'); + filter.push(`message: "${escapedMessage}" OR error.message: "${escapedMessage}"`); + } + + if (outcomeFilter && outcomeFilter.length) { + filter.push(`event.outcome: ${outcomeFilter.join(' or ')}`); + } + + if (runId) { + filter.push(`kibana.alert.rule.execution.uuid: ${runId}`); + } + + return filter; +}; diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/index.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/index.ts index e841506595c04..e23fe787e87c2 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/index.ts +++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/index.ts @@ -28,6 +28,10 @@ export { loadExecutionLogAggregations, loadGlobalExecutionLogAggregations, } from './load_execution_log_aggregations'; +export type { LoadExecutionKPIAggregationsProps } from './load_execution_kpi_aggregations'; +export { loadExecutionKPIAggregations } from './load_execution_kpi_aggregations'; +export type { LoadGlobalExecutionKPIAggregationsProps } from './load_global_execution_kpi_aggregations'; +export { loadGlobalExecutionKPIAggregations } from './load_global_execution_kpi_aggregations'; export type { LoadActionErrorLogProps } from './load_action_error_log'; export { loadActionErrorLog } from './load_action_error_log'; export { unmuteAlertInstance } from './unmute_alert'; diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_action_error_log.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_action_error_log.test.ts index b4384713336f7..d06447be31fbc 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_action_error_log.test.ts +++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_action_error_log.test.ts @@ -117,7 +117,7 @@ describe('loadActionErrorLog', () => { "query": Object { "date_end": "2022-03-23T16:17:53.482Z", "date_start": "2022-03-23T16:17:53.482Z", - "filter": "kibana.alert.rule.execution.uuid: 123 and message: \\"test\\" OR error.message: \\"test\\"", + "filter": "message: \\"test\\" OR error.message: \\"test\\" and kibana.alert.rule.execution.uuid: 123", "page": 1, "per_page": 10, "sort": "[{\\"@timestamp\\":{\\"order\\":\\"asc\\"}}]", diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_action_error_log.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_action_error_log.ts index 4ec1a6949bfe5..10f2879085cd0 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_action_error_log.ts +++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_action_error_log.ts @@ -9,6 +9,7 @@ import { HttpSetup } from '@kbn/core/public'; import type { SortOrder } from '@elastic/elasticsearch/lib/api/typesWithBodyKey'; import { IExecutionErrorsResult, ActionErrorLogSortFields } from '@kbn/alerting-plugin/common'; import { INTERNAL_BASE_ALERTING_API_PATH } from '../../constants'; +import { getFilter } from './get_filter'; export type SortField = Record< ActionErrorLogSortFields, @@ -49,22 +50,6 @@ const getRenamedSort = (sort?: SortField[]) => { }); }; -// TODO (Jiawei): Use node builder instead of strings -const getFilter = ({ runId, message }: { runId?: string; message?: string }) => { - const filter: string[] = []; - - if (runId) { - filter.push(`kibana.alert.rule.execution.uuid: ${runId}`); - } - - if (message) { - const escapedMessage = message.replace(/([\)\(\<\>\}\{\"\:\\])/gm, '\\$&'); - filter.push(`message: "${escapedMessage}" OR error.message: "${escapedMessage}"`); - } - - return filter; -}; - export const loadActionErrorLog = ({ id, http, diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_execution_kpi_aggregations.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_execution_kpi_aggregations.ts new file mode 100644 index 0000000000000..076e1167f444a --- /dev/null +++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_execution_kpi_aggregations.ts @@ -0,0 +1,41 @@ +/* + * 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 { HttpSetup } from '@kbn/core/public'; +import { IExecutionKPIResult } from '@kbn/alerting-plugin/common'; +import { INTERNAL_BASE_ALERTING_API_PATH } from '../../constants'; +import { getFilter } from './get_filter'; + +export interface LoadExecutionKPIAggregationsProps { + id: string; + outcomeFilter?: string[]; + message?: string; + dateStart: string; + dateEnd?: string; +} + +export const loadExecutionKPIAggregations = ({ + id, + http, + outcomeFilter, + message, + dateStart, + dateEnd, +}: LoadExecutionKPIAggregationsProps & { http: HttpSetup }) => { + const filter = getFilter({ outcomeFilter, message }); + + return http.get( + `${INTERNAL_BASE_ALERTING_API_PATH}/rule/${id}/_execution_kpi`, + { + query: { + filter: filter.length ? filter.join(' and ') : undefined, + date_start: dateStart, + date_end: dateEnd, + }, + } + ); +}; diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_execution_log_aggregations.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_execution_log_aggregations.ts index c1f8487d842c5..bf5e529499b42 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_execution_log_aggregations.ts +++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_execution_log_aggregations.ts @@ -16,6 +16,7 @@ import { } from '@kbn/alerting-plugin/common'; import { AsApiContract, RewriteRequestCase } from '@kbn/actions-plugin/common'; import { INTERNAL_BASE_ALERTING_API_PATH } from '../../constants'; +import { getFilter } from './get_filter'; const getRenamedLog = (data: IExecutionLog) => { const { @@ -40,22 +41,6 @@ const rewriteBodyRes: RewriteRequestCase = ({ data, ...rest ...rest, }); -// TODO (Jiawei): Use node builder instead of strings -const getFilter = ({ outcomeFilter, message }: { outcomeFilter?: string[]; message?: string }) => { - const filter: string[] = []; - - if (outcomeFilter && outcomeFilter.length) { - filter.push(`event.outcome: ${outcomeFilter.join(' or ')}`); - } - - if (message) { - const escapedMessage = message.replace(/([\)\(\<\>\}\{\"\:\\])/gm, '\\$&'); - filter.push(`message: "${escapedMessage}" OR error.message: "${escapedMessage}"`); - } - - return filter; -}; - export type SortField = Record< ExecutionLogSortFields, { diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_global_execution_kpi_aggregations.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_global_execution_kpi_aggregations.ts new file mode 100644 index 0000000000000..332e14ad4383f --- /dev/null +++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_global_execution_kpi_aggregations.ts @@ -0,0 +1,38 @@ +/* + * 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 { HttpSetup } from '@kbn/core/public'; +import { IExecutionKPIResult } from '@kbn/alerting-plugin/common'; +import { INTERNAL_BASE_ALERTING_API_PATH } from '../../constants'; +import { getFilter } from './get_filter'; + +export interface LoadGlobalExecutionKPIAggregationsProps { + id: string; + outcomeFilter?: string[]; + message?: string; + dateStart: string; + dateEnd?: string; +} + +export const loadGlobalExecutionKPIAggregations = ({ + id, + http, + outcomeFilter, + message, + dateStart, + dateEnd, +}: LoadGlobalExecutionKPIAggregationsProps & { http: HttpSetup }) => { + const filter = getFilter({ outcomeFilter, message }); + + return http.get(`${INTERNAL_BASE_ALERTING_API_PATH}/_global_execution_kpi`, { + query: { + filter: filter.length ? filter.join(' and ') : undefined, + date_start: dateStart, + date_end: dateEnd, + }, + }); +}; diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/with_bulk_rule_api_operations.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/with_bulk_rule_api_operations.tsx index 3150a4cdf407b..fa93ae18ec701 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/with_bulk_rule_api_operations.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/with_bulk_rule_api_operations.tsx @@ -7,7 +7,11 @@ import React from 'react'; -import { IExecutionLogResult, IExecutionErrorsResult } from '@kbn/alerting-plugin/common'; +import { + IExecutionLogResult, + IExecutionErrorsResult, + IExecutionKPIResult, +} from '@kbn/alerting-plugin/common'; import { Rule, RuleType, @@ -46,6 +50,10 @@ import { bulkSnoozeRules, BulkSnoozeRulesProps, unsnoozeRule, + loadExecutionKPIAggregations, + LoadExecutionKPIAggregationsProps, + loadGlobalExecutionKPIAggregations, + LoadGlobalExecutionKPIAggregationsProps, bulkUnsnoozeRules, BulkUnsnoozeRulesProps, } from '../../../lib/rule_api'; @@ -74,12 +82,18 @@ export interface ComponentOpts { loadRuleState: (id: Rule['id']) => Promise; loadRuleSummary: (id: Rule['id'], numberOfExecutions?: number) => Promise; loadRuleTypes: () => Promise; + loadExecutionKPIAggregations: ( + props: LoadExecutionKPIAggregationsProps + ) => Promise; loadExecutionLogAggregations: ( props: LoadExecutionLogAggregationsProps ) => Promise; loadGlobalExecutionLogAggregations: ( props: LoadGlobalExecutionLogAggregationsProps ) => Promise; + loadGlobalExecutionKPIAggregations: ( + props: LoadGlobalExecutionKPIAggregationsProps + ) => Promise; loadActionErrorLog: (props: LoadActionErrorLogProps) => Promise; getHealth: () => Promise; resolveRule: (id: Rule['id']) => Promise; @@ -177,6 +191,22 @@ export function withBulkRuleOperations( http, }) } + loadExecutionKPIAggregations={async ( + loadExecutionKPIAggregationProps: LoadExecutionKPIAggregationsProps + ) => + loadExecutionKPIAggregations({ + ...loadExecutionKPIAggregationProps, + http, + }) + } + loadGlobalExecutionKPIAggregations={async ( + loadGlobalExecutionKPIAggregationsProps: LoadGlobalExecutionKPIAggregationsProps + ) => + loadGlobalExecutionKPIAggregations({ + ...loadGlobalExecutionKPIAggregationsProps, + http, + }) + } resolveRule={async (ruleId: Rule['id']) => resolveRule({ http, ruleId })} getHealth={async () => alertingFrameworkHealth({ http })} snoozeRule={async (rule: Rule, snoozeSchedule: SnoozeSchedule) => { diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule.test.tsx index bfe337a1fb880..5eac73c4e87ac 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule.test.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule.test.tsx @@ -419,8 +419,8 @@ describe('tabbed content', () => { tabbedContent.update(); }); - expect(tabbedContent.find('[aria-labelledby="rule_event_log_list"]').exists()).toBeTruthy(); - expect(tabbedContent.find('[aria-labelledby="rule_alert_list"]').exists()).toBeFalsy(); + expect(tabbedContent.find('[aria-labelledby="rule_event_log_list"]').exists()).toBeFalsy(); + expect(tabbedContent.find('[aria-labelledby="rule_alert_list"]').exists()).toBeTruthy(); tabbedContent.find('[data-test-subj="eventLogListTab"]').simulate('click'); diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule.tsx index 5c44b9161b2c2..db82f36cbc90c 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule.tsx @@ -97,6 +97,14 @@ export function RuleComponent({ }; const tabs = [ + { + id: ALERT_LIST_TAB, + name: i18n.translate('xpack.triggersActionsUI.sections.ruleDetails.rule.alertsTabText', { + defaultMessage: 'Alerts', + }), + 'data-test-subj': 'ruleAlertListTab', + content: renderRuleAlertList(), + }, { id: EVENT_LOG_LIST_TAB, name: i18n.translate('xpack.triggersActionsUI.sections.ruleDetails.rule.eventLogTabText', { @@ -118,14 +126,6 @@ export function RuleComponent({ requestRefresh, }), }, - { - id: ALERT_LIST_TAB, - name: i18n.translate('xpack.triggersActionsUI.sections.ruleDetails.rule.alertsTabText', { - defaultMessage: 'Alerts', - }), - 'data-test-subj': 'ruleAlertListTab', - content: renderRuleAlertList(), - }, ]; const renderTabs = () => { diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_kpi.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_kpi.test.tsx new file mode 100644 index 0000000000000..f77494e4f3c12 --- /dev/null +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_kpi.test.tsx @@ -0,0 +1,183 @@ +/* + * 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 { act } from 'react-dom/test-utils'; +import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers'; +import { loadExecutionKPIAggregations } from '../../../lib/rule_api/load_execution_kpi_aggregations'; +import { loadGlobalExecutionKPIAggregations } from '../../../lib/rule_api/load_global_execution_kpi_aggregations'; +import { RuleEventLogListKPI } from './rule_event_log_list_kpi'; + +jest.mock('../../../../common/lib/kibana', () => ({ + useKibana: jest.fn().mockReturnValue({ + services: { + notifications: { toast: { addDanger: jest.fn() } }, + }, + }), +})); + +jest.mock('../../../lib/rule_api/load_execution_kpi_aggregations', () => ({ + loadExecutionKPIAggregations: jest.fn(), +})); + +jest.mock('../../../lib/rule_api/load_global_execution_kpi_aggregations', () => ({ + loadGlobalExecutionKPIAggregations: jest.fn(), +})); + +const mockKpiResponse = { + success: 4, + unknown: 10, + failure: 60, + activeAlerts: 100, + newAlerts: 40, + recoveredAlerts: 30, + erroredActions: 60, + triggeredActions: 140, +}; + +const loadExecutionKPIAggregationsMock = + loadExecutionKPIAggregations as unknown as jest.MockedFunction; +const loadGlobalExecutionKPIAggregationsMock = + loadGlobalExecutionKPIAggregations as unknown as jest.MockedFunction; + +describe('rule_event_log_list_kpi', () => { + beforeEach(() => { + jest.clearAllMocks(); + loadExecutionKPIAggregationsMock.mockResolvedValue(mockKpiResponse); + loadGlobalExecutionKPIAggregationsMock.mockResolvedValue(mockKpiResponse); + }); + + it('renders correctly', async () => { + const wrapper = mountWithIntl( + + ); + + expect(wrapper.find('[data-test-subj="centerJustifiedSpinner"]').exists()).toBeTruthy(); + + // Let the load resolve + await act(async () => { + await nextTick(); + wrapper.update(); + }); + + expect(wrapper.find('[data-test-subj="centerJustifiedSpinner"]').exists()).toBeFalsy(); + + expect(loadExecutionKPIAggregationsMock).toHaveBeenCalledWith( + expect.objectContaining({ + id: '123', + message: undefined, + outcomeFilter: undefined, + }) + ); + + expect(loadGlobalExecutionKPIAggregations).not.toHaveBeenCalled(); + + expect( + wrapper + .find('[data-test-subj="ruleEventLogKpi-successOutcome"] .euiStat__title') + .first() + .text() + ).toEqual(`${mockKpiResponse.success}`); + expect( + wrapper + .find('[data-test-subj="ruleEventLogKpi-unknownOutcome"] .euiStat__title') + .first() + .text() + ).toEqual(`${mockKpiResponse.unknown}`); + expect( + wrapper + .find('[data-test-subj="ruleEventLogKpi-failureOutcome"] .euiStat__title') + .first() + .text() + ).toEqual(`${mockKpiResponse.failure}`); + expect( + wrapper.find('[data-test-subj="ruleEventLogKpi-activeAlerts"] .euiStat__title').first().text() + ).toEqual(`${mockKpiResponse.activeAlerts}`); + expect( + wrapper.find('[data-test-subj="ruleEventLogKpi-newAlerts"] .euiStat__title').first().text() + ).toEqual(`${mockKpiResponse.newAlerts}`); + expect( + wrapper + .find('[data-test-subj="ruleEventLogKpi-recoveredAlerts"] .euiStat__title') + .first() + .text() + ).toEqual(`${mockKpiResponse.recoveredAlerts}`); + expect( + wrapper + .find('[data-test-subj="ruleEventLogKpi-erroredActions"] .euiStat__title') + .first() + .text() + ).toEqual(`${mockKpiResponse.erroredActions}`); + expect( + wrapper + .find('[data-test-subj="ruleEventLogKpi-triggeredActions"] .euiStat__title') + .first() + .text() + ).toEqual(`${mockKpiResponse.triggeredActions}`); + }); + + it('calls global KPI API if provided global rule id', async () => { + const wrapper = mountWithIntl( + + ); + // Let the load resolve + await act(async () => { + await nextTick(); + wrapper.update(); + }); + + expect(loadGlobalExecutionKPIAggregations).toHaveBeenCalledWith( + expect.objectContaining({ + id: '*', + message: undefined, + outcomeFilter: undefined, + }) + ); + + expect(loadExecutionKPIAggregationsMock).not.toHaveBeenCalled(); + }); + + it('calls KPI API with filters', async () => { + const wrapper = mountWithIntl( + + ); + + // Let the load resolve + await act(async () => { + await nextTick(); + wrapper.update(); + }); + + expect(loadExecutionKPIAggregationsMock).toHaveBeenCalledWith( + expect.objectContaining({ + id: '123', + message: 'test', + outcomeFilter: ['status: 123', 'test:456'], + }) + ); + }); +}); diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_kpi.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_kpi.tsx new file mode 100644 index 0000000000000..7fe7dd8fdb029 --- /dev/null +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_kpi.tsx @@ -0,0 +1,251 @@ +/* + * 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, useMemo, useRef } from 'react'; +import { i18n } from '@kbn/i18n'; +import datemath from '@kbn/datemath'; +import { EuiFlexGroup, EuiFlexItem, EuiPanel, EuiIconTip, EuiStat, EuiSpacer } from '@elastic/eui'; +import { IExecutionKPIResult } from '@kbn/alerting-plugin/common'; +import { + ComponentOpts as RuleApis, + withBulkRuleOperations, +} from '../../common/components/with_bulk_rule_api_operations'; +import { useKibana } from '../../../../common/lib/kibana'; +import { CenterJustifiedSpinner } from '../../../components/center_justified_spinner'; +import { RuleEventLogListStatus } from './rule_event_log_list_status'; + +const getParsedDate = (date: string) => { + if (date.includes('now')) { + return datemath.parse(date)?.format() || date; + } + return date; +}; + +const API_FAILED_MESSAGE = i18n.translate( + 'xpack.triggersActionsUI.sections.ruleDetails.ruleEventLogListKpi.apiError', + { + defaultMessage: 'Failed to fetch event log KPI.', + } +); + +const RESPONSE_TOOLTIP = i18n.translate( + 'xpack.triggersActionsUI.sections.ruleDetails.ruleEventLogListKpi.responseTooltip', + { + defaultMessage: 'The responses for the latest rule runs.', + } +); + +const ALERTS_TOOLTIP = i18n.translate( + 'xpack.triggersActionsUI.sections.ruleDetails.ruleEventLogListKpi.alertsTooltip', + { + defaultMessage: 'The alert statuses for the latest rule runs.', + } +); + +const ACTIONS_TOOLTIP = i18n.translate( + 'xpack.triggersActionsUI.sections.ruleDetails.ruleEventLogListKpi.actionsTooltip', + { + defaultMessage: 'The action statuses for the latest rule runs.', + } +); + +const Stat = ({ + title, + tooltip, + children, +}: { + title: string; + tooltip: string; + children?: JSX.Element; +}) => { + return ( + + + + {title} + + + + + + + {children} + + ); +}; + +export type RuleEventLogListKPIProps = { + ruleId: string; + dateStart: string; + dateEnd: string; + outcomeFilter?: string[]; + message?: string; + refreshToken?: number; +} & Pick; + +export const RuleEventLogListKPI = (props: RuleEventLogListKPIProps) => { + const { + ruleId, + dateStart, + dateEnd, + outcomeFilter, + message, + refreshToken, + loadExecutionKPIAggregations, + loadGlobalExecutionKPIAggregations, + } = props; + const { + notifications: { toasts }, + } = useKibana().services; + + const isInitialized = useRef(false); + + const [isLoading, setIsLoading] = useState(false); + const [kpi, setKpi] = useState(); + + const loadKPIFn = useMemo(() => { + if (ruleId === '*') { + return loadGlobalExecutionKPIAggregations; + } + return loadExecutionKPIAggregations; + }, [ruleId, loadExecutionKPIAggregations, loadGlobalExecutionKPIAggregations]); + + const loadKPIs = async () => { + setIsLoading(true); + try { + const newKpi = await loadKPIFn({ + id: ruleId, + dateStart: getParsedDate(dateStart), + dateEnd: getParsedDate(dateEnd), + outcomeFilter, + message, + }); + setKpi(newKpi); + } catch (e) { + toasts.addDanger({ + title: API_FAILED_MESSAGE, + text: e.body?.message ?? e, + }); + } + setIsLoading(false); + }; + + useEffect(() => { + loadKPIs(); + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [ruleId, dateStart, dateEnd, outcomeFilter, message]); + + useEffect(() => { + if (isInitialized.current) { + loadKPIs(); + } + isInitialized.current = true; + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [refreshToken]); + + if (isLoading || !kpi) { + return ; + } + + const getStatDescription = (element: React.ReactNode) => { + return ( + <> + {element} + + + ); + }; + + return ( + + + + + + )} + titleSize="s" + title={kpi.success} + /> + + + )} + titleSize="s" + title={kpi.unknown} + /> + + + )} + titleSize="s" + title={kpi.failure} + /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); +}; + +export const RuleEventLogListKPIWithApi = withBulkRuleOperations(RuleEventLogListKPI); diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_table.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_table.tsx index b647442a8eaf0..2c1d6df71fc3d 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_table.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_table.tsx @@ -30,9 +30,9 @@ import { RuleEventLogListStatusFilter } from './rule_event_log_list_status_filte import { RuleEventLogDataGrid } from './rule_event_log_data_grid'; import { CenterJustifiedSpinner } from '../../../components/center_justified_spinner'; import { RuleActionErrorLogFlyout } from './rule_action_error_log_flyout'; - import { RefineSearchPrompt } from '../refine_search_prompt'; import { LoadExecutionLogAggregationsProps } from '../../../lib/rule_api'; +import { RuleEventLogListKPIWithApi as RuleEventLogListKPI } from './rule_event_log_list_kpi'; import { ComponentOpts as RuleApis, withBulkRuleOperations, @@ -114,6 +114,9 @@ export const RuleEventLogListTable = ( const [search, setSearch] = useState(''); const [isFlyoutOpen, setIsFlyoutOpen] = useState(false); const [selectedRunLog, setSelectedRunLog] = useState(); + const [internalRefreshToken, setInternalRefreshToken] = useState( + refreshToken + ); // Data grid states const [logs, setLogs] = useState(); @@ -243,6 +246,7 @@ export const RuleEventLogListTable = ( ); const onRefresh = () => { + setInternalRefreshToken(Date.now()); loadEventLogs(); }; @@ -339,6 +343,10 @@ export const RuleEventLogListTable = ( localStorage.setItem(localStorageKey, JSON.stringify(visibleColumns)); }, [localStorageKey, visibleColumns]); + useEffect(() => { + setInternalRefreshToken(refreshToken); + }, [refreshToken]); + return ( <> @@ -371,6 +379,15 @@ export const RuleEventLogListTable = ( + + {renderList()} {isOnLastPage && ( { + const objectRemover = new ObjectRemover(supertest); + + after(() => objectRemover.removeAll()); + + it('should return KPI only from the current space', async () => { + const startTime = new Date().toISOString(); + + const spaceId = UserAtSpaceScenarios[1].space.id; + const user = UserAtSpaceScenarios[1].user; + const response = await supertest + .post(`${getUrlPrefix(spaceId)}/api/alerting/rule`) + .set('kbn-xsrf', 'foo') + .send( + getTestRuleData({ + rule_type_id: 'test.noop', + schedule: { interval: '1s' }, + throttle: null, + }) + ); + + expect(response.status).to.eql(200); + const ruleId = response.body.id; + objectRemover.add(spaceId, ruleId, 'rule', 'alerting'); + + const response2 = await supertest + .post(`${getUrlPrefix(spaceId)}/api/alerting/rule`) + .set('kbn-xsrf', 'foo') + .send( + getTestRuleData({ + rule_type_id: 'test.noop', + schedule: { interval: '1s' }, + throttle: null, + }) + ); + + expect(response2.status).to.eql(200); + const ruleId2 = response2.body.id; + objectRemover.add(spaceId, ruleId2, 'rule', 'alerting'); + + await retry.try(async () => { + // break AAD + await supertest + .put(`${getUrlPrefix(spaceId)}/api/alerts_fixture/saved_object/alert/${ruleId2}`) + .set('kbn-xsrf', 'foo') + .send({ + attributes: { + name: 'bar', + }, + }) + .expect(200); + }); + + await retry.try(async () => { + // there can be a successful execute before the error one + const someEvents = await getEventLog({ + getService, + spaceId, + type: 'alert', + id: ruleId2, + provider: 'alerting', + actions: new Map([['execute', { gte: 1 }]]), + }); + const errorEvents = someEvents.filter( + (event) => event?.kibana?.alerting?.status === 'error' + ); + expect(errorEvents.length).to.be.above(0); + }); + + await retry.try(async () => { + // there can be a successful execute before the error one + const logResponse = await supertestWithoutAuth + .get( + `${getUrlPrefix( + spaceId + )}/internal/alerting/_global_execution_logs?date_start=${startTime}&date_end=9999-12-31T23:59:59Z&per_page=50&page=1` + ) + .set('kbn-xsrf', 'foo') + .auth(user.username, user.password); + expect(logResponse.statusCode).to.be(200); + expect(logResponse.body.data.length).to.be.above(1); + }); + + await retry.try(async () => { + // break AAD + await supertest + .put(`${getUrlPrefix(spaceId)}/api/alerts_fixture/saved_object/alert/${ruleId}`) + .set('kbn-xsrf', 'foo') + .send({ + attributes: { + name: 'bar', + }, + }) + .expect(200); + }); + + await retry.try(async () => { + // there can be a successful execute before the error one + const someEvents = await getEventLog({ + getService, + spaceId, + type: 'alert', + id: ruleId, + provider: 'alerting', + actions: new Map([['execute', { gte: 1 }]]), + }); + const errorEvents = someEvents.filter( + (event) => event?.kibana?.alerting?.status === 'error' + ); + expect(errorEvents.length).to.be.above(0); + }); + + const kpiLogs = await retry.try(async () => { + // there can be a successful execute before the error one + const logResponse = await supertestWithoutAuth + .get( + `${getUrlPrefix( + spaceId + )}/internal/alerting/_global_execution_kpi?date_start=${startTime}&date_end=9999-12-31T23:59:59Z` + ) + .set('kbn-xsrf', 'foo') + .auth(user.username, user.password); + expect(logResponse.statusCode).to.be(200); + + return logResponse.body; + }); + + expect(Object.keys(kpiLogs)).to.eql([ + 'success', + 'unknown', + 'failure', + 'activeAlerts', + 'newAlerts', + 'recoveredAlerts', + 'erroredActions', + 'triggeredActions', + ]); + // it should be above 1 since we have two rule running + expect(kpiLogs.success).to.be.above(1); + expect(kpiLogs.failure).to.be.above(0); + }); + }); +} diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/alerting/get_rule_execution_kpi.ts b/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/alerting/get_rule_execution_kpi.ts new file mode 100644 index 0000000000000..2303fc616d8dc --- /dev/null +++ b/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/alerting/get_rule_execution_kpi.ts @@ -0,0 +1,133 @@ +/* + * 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 { UserAtSpaceScenarios } from '../../../scenarios'; +import { getUrlPrefix, getTestRuleData, ObjectRemover, getEventLog } from '../../../../common/lib'; +import { FtrProviderContext } from '../../../../common/ftr_provider_context'; + +// eslint-disable-next-line import/no-default-export +export default function getRuleExecutionKpiTests({ getService }: FtrProviderContext) { + const supertest = getService('supertest'); + const supertestWithoutAuth = getService('supertestWithoutAuth'); + + const retry = getService('retry'); + + describe('getRuleExecutionKpi', () => { + const objectRemover = new ObjectRemover(supertest); + + after(() => objectRemover.removeAll()); + + it('should return KPI only from the current space', async () => { + const startTime = new Date().toISOString(); + + const spaceId = UserAtSpaceScenarios[1].space.id; + const user = UserAtSpaceScenarios[1].user; + const response = await supertest + .post(`${getUrlPrefix(spaceId)}/api/alerting/rule`) + .set('kbn-xsrf', 'foo') + .send( + getTestRuleData({ + rule_type_id: 'test.noop', + schedule: { interval: '1s' }, + throttle: null, + }) + ); + + expect(response.status).to.eql(200); + const ruleId = response.body.id; + objectRemover.add(spaceId, ruleId, 'rule', 'alerting'); + + const spaceId2 = UserAtSpaceScenarios[4].space.id; + const response2 = await supertest + .post(`${getUrlPrefix(spaceId2)}/api/alerting/rule`) + .set('kbn-xsrf', 'foo') + .send( + getTestRuleData({ + rule_type_id: 'test.noop', + schedule: { interval: '1s' }, + throttle: null, + }) + ); + + expect(response2.status).to.eql(200); + const ruleId2 = response2.body.id; + objectRemover.add(spaceId2, ruleId2, 'rule', 'alerting'); + + await retry.try(async () => { + // there can be a successful execute before the error one + const someEvents = await getEventLog({ + getService, + spaceId, + type: 'alert', + id: ruleId, + provider: 'alerting', + actions: new Map([['execute', { gte: 1 }]]), + }); + + expect(someEvents.length).to.be.above(0); + }); + + await retry.try(async () => { + // break AAD + await supertest + .put(`${getUrlPrefix(spaceId)}/api/alerts_fixture/saved_object/alert/${ruleId}`) + .set('kbn-xsrf', 'foo') + .send({ + attributes: { + name: 'bar', + }, + }) + .expect(200); + }); + + await retry.try(async () => { + // there can be a successful execute before the error one + const someEvents = await getEventLog({ + getService, + spaceId, + type: 'alert', + id: ruleId, + provider: 'alerting', + actions: new Map([['execute', { gte: 1 }]]), + }); + const errorEvents = someEvents.filter( + (event) => event?.kibana?.alerting?.status === 'error' + ); + expect(errorEvents.length).to.be.above(0); + }); + + const kpiLogs = await retry.try(async () => { + // there can be a successful execute before the error one + const logResponse = await supertestWithoutAuth + .get( + `${getUrlPrefix( + spaceId + )}/internal/alerting/rule/${ruleId}/_execution_kpi?date_start=${startTime}&date_end=9999-12-31T23:59:59Z` + ) + .set('kbn-xsrf', 'foo') + .auth(user.username, user.password); + expect(logResponse.statusCode).to.be(200); + + return logResponse.body; + }); + + expect(Object.keys(kpiLogs)).to.eql([ + 'success', + 'unknown', + 'failure', + 'activeAlerts', + 'newAlerts', + 'recoveredAlerts', + 'erroredActions', + 'triggeredActions', + ]); + expect(kpiLogs.success).to.be.above(0); + expect(kpiLogs.failure).to.be.above(0); + }); + }); +} From 254b9a525d5508614d035a22dc690f53ed837a2e Mon Sep 17 00:00:00 2001 From: Stratoula Kalafateli Date: Wed, 28 Sep 2022 15:52:01 +0300 Subject: [PATCH 42/95] [Lens] Stabilize the table functional test (#142038) --- .../test/functional/apps/lens/group1/table.ts | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/x-pack/test/functional/apps/lens/group1/table.ts b/x-pack/test/functional/apps/lens/group1/table.ts index 7bf9b49c53d8d..724efbe6c6c82 100644 --- a/x-pack/test/functional/apps/lens/group1/table.ts +++ b/x-pack/test/functional/apps/lens/group1/table.ts @@ -9,7 +9,7 @@ import expect from '@kbn/expect'; import { FtrProviderContext } from '../../../ftr_provider_context'; export default function ({ getService, getPageObjects }: FtrProviderContext) { - const PageObjects = getPageObjects(['visualize', 'lens', 'common', 'header']); + const PageObjects = getPageObjects(['visualize', 'lens', 'common']); const listingTable = getService('listingTable'); const find = getService('find'); const retry = getService('retry'); @@ -91,14 +91,14 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { it('should allow to sort by transposed columns', async () => { await PageObjects.lens.changeTableSortingBy(2, 'ascending'); - await PageObjects.header.waitUntilLoadingHasFinished(); + await PageObjects.lens.waitForVisualization(); expect(await PageObjects.lens.getDatatableCellText(0, 2)).to.eql('17,246'); }); it('should show dynamic coloring feature for numeric columns', async () => { await PageObjects.lens.openDimensionEditor('lnsDatatable_metrics > lns-dimensionTrigger'); await PageObjects.lens.setTableDynamicColoring('text'); - await PageObjects.header.waitUntilLoadingHasFinished(); + await PageObjects.lens.waitForVisualization(); const styleObj = await PageObjects.lens.getDatatableCellStyle(0, 2); expect(styleObj['background-color']).to.be(undefined); expect(styleObj.color).to.be('rgb(133, 189, 177)'); @@ -106,7 +106,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { it('should allow to color cell background rather than text', async () => { await PageObjects.lens.setTableDynamicColoring('cell'); - await PageObjects.header.waitUntilLoadingHasFinished(); + await PageObjects.lens.waitForVisualization(); const styleObj = await PageObjects.lens.getDatatableCellStyle(0, 2); expect(styleObj['background-color']).to.be('rgb(133, 189, 177)'); // should also set text color when in cell mode @@ -115,9 +115,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { it('should open the palette panel to customize the palette look', async () => { await PageObjects.lens.openPalettePanel('lnsDatatable'); - await PageObjects.header.waitUntilLoadingHasFinished(); + await PageObjects.lens.waitForVisualization(); await PageObjects.lens.changePaletteTo('temperature'); - await PageObjects.header.waitUntilLoadingHasFinished(); + await PageObjects.lens.waitForVisualization(); const styleObj = await PageObjects.lens.getDatatableCellStyle(0, 2); expect(styleObj['background-color']).to.be('rgb(235, 239, 245)'); }); @@ -125,7 +125,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { it('should keep the coloring consistent when changing mode', async () => { // Change mode from percent to number await testSubjects.click('lnsPalettePanel_dynamicColoring_rangeType_groups_number'); - await PageObjects.header.waitUntilLoadingHasFinished(); + await PageObjects.lens.waitForVisualization(); // check that all remained the same const styleObj = await PageObjects.lens.getDatatableCellStyle(0, 2); expect(styleObj['background-color']).to.be('rgb(235, 239, 245)'); @@ -133,7 +133,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { it('should keep the coloring consistent when moving to custom palette from default', async () => { await PageObjects.lens.changePaletteTo('custom'); - await PageObjects.header.waitUntilLoadingHasFinished(); + await PageObjects.lens.waitForVisualization(); // check that all remained the same const styleObj = await PageObjects.lens.getDatatableCellStyle(0, 2); expect(styleObj['background-color']).to.be('rgb(235, 239, 245)'); @@ -149,7 +149,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); // when clicking on another row will trigger a sorting + update await testSubjects.click('lnsPalettePanel_dynamicColoring_range_value_1'); - await PageObjects.header.waitUntilLoadingHasFinished(); + await PageObjects.lens.waitForVisualization(); // pick a cell without color as is below the range const styleObj = await PageObjects.lens.getDatatableCellStyle(3, 3); expect(styleObj['background-color']).to.be(undefined); @@ -159,7 +159,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { it('should allow the user to reverse the palette', async () => { await testSubjects.click('lnsPalettePanel_dynamicColoring_reverseColors'); - await PageObjects.header.waitUntilLoadingHasFinished(); + await PageObjects.lens.waitForVisualization(); const styleObj = await PageObjects.lens.getDatatableCellStyle(1, 1); expect(styleObj['background-color']).to.be('rgb(168, 191, 218)'); // should also set text color when in cell mode @@ -169,7 +169,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { it('should allow to show a summary table for metric columns', async () => { await PageObjects.lens.setTableSummaryRowFunction('sum'); - await PageObjects.header.waitUntilLoadingHasFinished(); + await PageObjects.lens.waitForVisualization(); await PageObjects.lens.assertExactText( '[data-test-subj="lnsDataTable-footer-169.228.188.120-›-Average-of-bytes"]', 'Sum: 18,994' From c7301e51f172028bdce87ea626b25c15849fd7eb Mon Sep 17 00:00:00 2001 From: Vitalii Dmyterko <92328789+vitaliidm@users.noreply.github.com> Date: Wed, 28 Sep 2022 13:58:57 +0100 Subject: [PATCH 43/95] [Security Solution][Detections] adds missing bulk edit data view tests (#141915) ## Summary - addresses https://github.com/elastic/kibana/issues/135201 - adds Data View cypress and integration tests according to [Data view Bulk Edit test plan](https://docs.google.com/document/d/116x7ITTTJQ6cTiwaGK831_f6Ox7XB3qyLiHxC3Cmf8w/edit#heading=h.j583i3o7bg2g) (internal document) - integration tests were added earlier in https://github.com/elastic/kibana/pull/138448 --- .../bulk_edit_rules_data_view.cy.ts | 177 ++++++++++++++ .../cypress/screens/rules_bulk_edit.ts | 6 + .../cypress/tasks/api_calls/rules.ts | 228 +++++++++--------- .../cypress/tasks/rule_details.ts | 3 + .../cypress/tasks/rules_bulk_edit.ts | 9 + .../group10/perform_bulk_action.ts | 36 +++ 6 files changed, 344 insertions(+), 115 deletions(-) create mode 100644 x-pack/plugins/security_solution/cypress/e2e/detection_rules/bulk_edit_rules_data_view.cy.ts diff --git a/x-pack/plugins/security_solution/cypress/e2e/detection_rules/bulk_edit_rules_data_view.cy.ts b/x-pack/plugins/security_solution/cypress/e2e/detection_rules/bulk_edit_rules_data_view.cy.ts new file mode 100644 index 0000000000000..766c8d9483f0a --- /dev/null +++ b/x-pack/plugins/security_solution/cypress/e2e/detection_rules/bulk_edit_rules_data_view.cy.ts @@ -0,0 +1,177 @@ +/* + * 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 { + RULES_BULK_EDIT_DATA_VIEWS_WARNING, + RULES_BULK_EDIT_OVERWRITE_DATA_VIEW_CHECKBOX, +} from '../../screens/rules_bulk_edit'; + +import { DATA_VIEW_DETAILS, INDEX_PATTERNS_DETAILS } from '../../screens/rule_details'; + +import { + waitForRulesTableToBeLoaded, + goToRuleDetails, + selectNumberOfRules, +} from '../../tasks/alerts_detection_rules'; + +import { + typeIndexPatterns, + waitForBulkEditActionToFinish, + submitBulkEditForm, + checkOverwriteDataViewCheckbox, + checkOverwriteIndexPatternsCheckbox, + openBulkEditAddIndexPatternsForm, + openBulkEditDeleteIndexPatternsForm, +} from '../../tasks/rules_bulk_edit'; + +import { hasIndexPatterns, getDetails, assertDetailsNotExist } from '../../tasks/rule_details'; +import { login, visitWithoutDateRange } from '../../tasks/login'; + +import { SECURITY_DETECTIONS_RULES_URL } from '../../urls/navigation'; +import { + createCustomRule, + createCustomIndicatorRule, + createEventCorrelationRule, + createThresholdRule, + createNewTermsRule, + createSavedQueryRule, +} from '../../tasks/api_calls/rules'; +import { cleanKibana, deleteAlertsAndRules, postDataView } from '../../tasks/common'; + +import { + getEqlRule, + getNewThreatIndicatorRule, + getNewRule, + getNewThresholdRule, + getNewTermsRule, +} from '../../objects/rule'; + +import { esArchiverResetKibana } from '../../tasks/es_archiver'; + +const DATA_VIEW_ID = 'auditbeat'; + +const expectedIndexPatterns = ['index-1-*', 'index-2-*']; + +const expectedNumberOfCustomRulesToBeEdited = 6; + +const indexDataSource = { dataView: DATA_VIEW_ID, type: 'dataView' } as const; + +const defaultRuleData = { + dataSource: indexDataSource, +}; + +describe('Detection rules, bulk edit, data view', () => { + before(() => { + cleanKibana(); + login(); + }); + beforeEach(() => { + deleteAlertsAndRules(); + esArchiverResetKibana(); + + postDataView(DATA_VIEW_ID); + + createCustomRule({ ...getNewRule(), ...defaultRuleData }, '1'); + createEventCorrelationRule({ ...getEqlRule(), ...defaultRuleData }, '2'); + createCustomIndicatorRule({ ...getNewThreatIndicatorRule(), ...defaultRuleData }, '3'); + createThresholdRule({ ...getNewThresholdRule(), ...defaultRuleData }, '4'); + createNewTermsRule({ ...getNewTermsRule(), ...defaultRuleData }, '5'); + createSavedQueryRule({ ...getNewRule(), ...defaultRuleData, savedId: 'mocked' }, '6'); + + visitWithoutDateRange(SECURITY_DETECTIONS_RULES_URL); + + waitForRulesTableToBeLoaded(); + }); + + it('Add index patterns to custom rules with configured data view', () => { + selectNumberOfRules(expectedNumberOfCustomRulesToBeEdited); + + openBulkEditAddIndexPatternsForm(); + typeIndexPatterns(expectedIndexPatterns); + submitBulkEditForm(); + + waitForBulkEditActionToFinish({ rulesCount: expectedNumberOfCustomRulesToBeEdited }); + + // check if rule still has data view and index patterns field does not exist + goToRuleDetails(); + getDetails(DATA_VIEW_DETAILS).contains(DATA_VIEW_ID); + assertDetailsNotExist(INDEX_PATTERNS_DETAILS); + }); + + it('Add index patterns to custom rules with configured data view when data view checkbox is checked', () => { + selectNumberOfRules(expectedNumberOfCustomRulesToBeEdited); + + openBulkEditAddIndexPatternsForm(); + typeIndexPatterns(expectedIndexPatterns); + + // click on data view overwrite checkbox, ensure warning is displayed + cy.get(RULES_BULK_EDIT_DATA_VIEWS_WARNING).should('not.exist'); + checkOverwriteDataViewCheckbox(); + cy.get(RULES_BULK_EDIT_DATA_VIEWS_WARNING).should('be.visible'); + + submitBulkEditForm(); + + waitForBulkEditActionToFinish({ rulesCount: expectedNumberOfCustomRulesToBeEdited }); + + // check if rule has been updated with index patterns and data view does not exist + goToRuleDetails(); + hasIndexPatterns(expectedIndexPatterns.join('')); + assertDetailsNotExist(DATA_VIEW_DETAILS); + }); + + it('Overwrite index patterns in custom rules with configured data view', () => { + selectNumberOfRules(expectedNumberOfCustomRulesToBeEdited); + + openBulkEditAddIndexPatternsForm(); + typeIndexPatterns(expectedIndexPatterns); + checkOverwriteIndexPatternsCheckbox(); + submitBulkEditForm(); + + waitForBulkEditActionToFinish({ rulesCount: expectedNumberOfCustomRulesToBeEdited }); + + // check if rule still has data view and index patterns field does not exist + goToRuleDetails(); + getDetails(DATA_VIEW_DETAILS).contains(DATA_VIEW_ID); + assertDetailsNotExist(INDEX_PATTERNS_DETAILS); + }); + + it('Overwrite index patterns in custom rules with configured data view when data view checkbox is checked', () => { + selectNumberOfRules(expectedNumberOfCustomRulesToBeEdited); + + openBulkEditAddIndexPatternsForm(); + typeIndexPatterns(expectedIndexPatterns); + checkOverwriteIndexPatternsCheckbox(); + checkOverwriteDataViewCheckbox(); + + submitBulkEditForm(); + + waitForBulkEditActionToFinish({ rulesCount: expectedNumberOfCustomRulesToBeEdited }); + + // check if rule has been overwritten with index patterns and data view does not exist + goToRuleDetails(); + hasIndexPatterns(expectedIndexPatterns.join('')); + assertDetailsNotExist(DATA_VIEW_DETAILS); + }); + + it('Delete index patterns in custom rules with configured data view', () => { + selectNumberOfRules(expectedNumberOfCustomRulesToBeEdited); + + openBulkEditDeleteIndexPatternsForm(); + typeIndexPatterns(expectedIndexPatterns); + + // in delete form data view checkbox is absent + cy.get(RULES_BULK_EDIT_OVERWRITE_DATA_VIEW_CHECKBOX).should('not.exist'); + + submitBulkEditForm(); + + waitForBulkEditActionToFinish({ rulesCount: expectedNumberOfCustomRulesToBeEdited }); + + // check if rule still has data view and index patterns field does not exist + goToRuleDetails(); + getDetails(DATA_VIEW_DETAILS).contains(DATA_VIEW_ID); + }); +}); diff --git a/x-pack/plugins/security_solution/cypress/screens/rules_bulk_edit.ts b/x-pack/plugins/security_solution/cypress/screens/rules_bulk_edit.ts index 34e4f9515b27f..6f4056034a053 100644 --- a/x-pack/plugins/security_solution/cypress/screens/rules_bulk_edit.ts +++ b/x-pack/plugins/security_solution/cypress/screens/rules_bulk_edit.ts @@ -32,6 +32,9 @@ export const RULES_BULK_EDIT_INDEX_PATTERNS = '[data-test-subj="bulkEditRulesInd export const RULES_BULK_EDIT_OVERWRITE_INDEX_PATTERNS_CHECKBOX = '[data-test-subj="bulkEditRulesOverwriteIndexPatterns"]'; +export const RULES_BULK_EDIT_OVERWRITE_DATA_VIEW_CHECKBOX = + '[data-test-subj="bulkEditRulesOverwriteRulesWithDataViews"]'; + export const RULES_BULK_EDIT_TAGS = '[data-test-subj="bulkEditRulesTags"]'; export const RULES_BULK_EDIT_OVERWRITE_TAGS_CHECKBOX = @@ -48,6 +51,9 @@ export const RULES_BULK_EDIT_TIMELINE_TEMPLATES_SELECTOR = export const RULES_BULK_EDIT_TIMELINE_TEMPLATES_WARNING = '[data-test-subj="bulkEditRulesTimelineTemplateWarning"]'; +export const RULES_BULK_EDIT_DATA_VIEWS_WARNING = + '[data-test-subj="bulkEditRulesDataViewsWarning"]'; + export const RULES_BULK_EDIT_SCHEDULES_WARNING = '[data-test-subj="bulkEditRulesSchedulesWarning"]'; export const UPDATE_SCHEDULE_INTERVAL_INPUT = diff --git a/x-pack/plugins/security_solution/cypress/tasks/api_calls/rules.ts b/x-pack/plugins/security_solution/cypress/tasks/api_calls/rules.ts index 4fb076f11f445..80fb77013acbb 100644 --- a/x-pack/plugins/security_solution/cypress/tasks/api_calls/rules.ts +++ b/x-pack/plugins/security_solution/cypress/tasks/api_calls/rules.ts @@ -53,7 +53,8 @@ export const createCustomRule = ( severity: rule.severity.toLocaleLowerCase(), type: 'query', from: 'now-50000h', - index: rule.dataSource.type === 'indexPatterns' ? rule.dataSource.index : '', + index: rule.dataSource.type === 'indexPatterns' ? rule.dataSource.index : undefined, + data_view_id: rule.dataSource.type === 'dataView' ? rule.dataSource.dataView : undefined, query: rule.customQuery, language: 'kuery', enabled: false, @@ -71,83 +72,80 @@ export const createCustomRule = ( }); export const createEventCorrelationRule = (rule: CustomRule, ruleId = 'rule_testing') => { - if (rule.dataSource.type === 'indexPatterns') { - cy.request({ - method: 'POST', - url: 'api/detection_engine/rules', - body: { - rule_id: ruleId, - risk_score: parseInt(rule.riskScore, 10), - description: rule.description, - interval: `${rule.runsEvery.interval}${rule.runsEvery.type}`, - from: `now-${rule.lookBack.interval}${rule.lookBack.type}`, - name: rule.name, - severity: rule.severity.toLocaleLowerCase(), - type: 'eql', - index: rule.dataSource.index, - query: rule.customQuery, - language: 'eql', - enabled: true, - tags: rule.tags, - }, - headers: { 'kbn-xsrf': 'cypress-creds' }, - }); - } + cy.request({ + method: 'POST', + url: 'api/detection_engine/rules', + body: { + rule_id: ruleId, + risk_score: parseInt(rule.riskScore, 10), + description: rule.description, + interval: `${rule.runsEvery.interval}${rule.runsEvery.type}`, + from: `now-${rule.lookBack.interval}${rule.lookBack.type}`, + name: rule.name, + severity: rule.severity.toLocaleLowerCase(), + type: 'eql', + index: rule.dataSource.type === 'indexPatterns' ? rule.dataSource.index : undefined, + data_view_id: rule.dataSource.type === 'dataView' ? rule.dataSource.dataView : undefined, + query: rule.customQuery, + language: 'eql', + enabled: true, + tags: rule.tags, + }, + headers: { 'kbn-xsrf': 'cypress-creds' }, + }); }; export const createThresholdRule = (rule: ThresholdRule, ruleId = 'rule_testing') => { - if (rule.dataSource.type === 'indexPatterns') { - cy.request({ - method: 'POST', - url: 'api/detection_engine/rules', - body: { - rule_id: ruleId, - risk_score: parseInt(rule.riskScore, 10), - description: rule.description, - interval: `${rule.runsEvery.interval}${rule.runsEvery.type}`, - from: `now-${rule.lookBack.interval}${rule.lookBack.type}`, - name: rule.name, - severity: rule.severity.toLocaleLowerCase(), - type: 'threshold', - index: rule.dataSource.index, - query: rule.customQuery, - threshold: { - field: [rule.thresholdField], - value: parseInt(rule.threshold, 10), - cardinality: [], - }, - enabled: true, - tags: rule.tags, + cy.request({ + method: 'POST', + url: 'api/detection_engine/rules', + body: { + rule_id: ruleId, + risk_score: parseInt(rule.riskScore, 10), + description: rule.description, + interval: `${rule.runsEvery.interval}${rule.runsEvery.type}`, + from: `now-${rule.lookBack.interval}${rule.lookBack.type}`, + name: rule.name, + severity: rule.severity.toLocaleLowerCase(), + type: 'threshold', + index: rule.dataSource.type === 'indexPatterns' ? rule.dataSource.index : undefined, + data_view_id: rule.dataSource.type === 'dataView' ? rule.dataSource.dataView : undefined, + query: rule.customQuery, + threshold: { + field: [rule.thresholdField], + value: parseInt(rule.threshold, 10), + cardinality: [], }, - headers: { 'kbn-xsrf': 'cypress-creds' }, - }); - } + enabled: true, + tags: rule.tags, + }, + headers: { 'kbn-xsrf': 'cypress-creds' }, + }); }; export const createNewTermsRule = (rule: NewTermsRule, ruleId = 'rule_testing') => { - if (rule.dataSource.type === 'indexPatterns') { - cy.request({ - method: 'POST', - url: 'api/detection_engine/rules', - body: { - rule_id: ruleId, - risk_score: parseInt(rule.riskScore, 10), - description: rule.description, - interval: `${rule.runsEvery.interval}${rule.runsEvery.type}`, - from: `now-${rule.lookBack.interval}${rule.lookBack.type}`, - name: rule.name, - severity: rule.severity.toLocaleLowerCase(), - type: 'new_terms', - index: rule.dataSource.index, - query: rule.customQuery, - new_terms_fields: rule.newTermsFields, - history_window_start: `now-${rule.historyWindowSize.interval}${rule.historyWindowSize.type}`, - enabled: true, - tags: rule.tags, - }, - headers: { 'kbn-xsrf': 'cypress-creds' }, - }); - } + cy.request({ + method: 'POST', + url: 'api/detection_engine/rules', + body: { + rule_id: ruleId, + risk_score: parseInt(rule.riskScore, 10), + description: rule.description, + interval: `${rule.runsEvery.interval}${rule.runsEvery.type}`, + from: `now-${rule.lookBack.interval}${rule.lookBack.type}`, + name: rule.name, + severity: rule.severity.toLocaleLowerCase(), + type: 'new_terms', + index: rule.dataSource.type === 'indexPatterns' ? rule.dataSource.index : undefined, + data_view_id: rule.dataSource.type === 'dataView' ? rule.dataSource.dataView : undefined, + query: rule.customQuery, + new_terms_fields: rule.newTermsFields, + history_window_start: `now-${rule.historyWindowSize.interval}${rule.historyWindowSize.type}`, + enabled: true, + tags: rule.tags, + }, + headers: { 'kbn-xsrf': 'cypress-creds' }, + }); }; export const createSavedQueryRule = ( @@ -166,7 +164,8 @@ export const createSavedQueryRule = ( severity: rule.severity.toLocaleLowerCase(), type: 'saved_query', from: 'now-50000h', - index: rule.dataSource.type === 'indexPatterns' ? rule.dataSource.index : '', + index: rule.dataSource.type === 'indexPatterns' ? rule.dataSource.index : undefined, + data_view_id: rule.dataSource.type === 'dataView' ? rule.dataSource.dataView : undefined, saved_id: rule.savedId, language: 'kuery', enabled: false, @@ -184,49 +183,48 @@ export const createSavedQueryRule = ( }); export const createCustomIndicatorRule = (rule: ThreatIndicatorRule, ruleId = 'rule_testing') => { - if (rule.dataSource.type === 'indexPatterns') { - cy.request({ - method: 'POST', - url: 'api/detection_engine/rules', - body: { - rule_id: ruleId, - risk_score: parseInt(rule.riskScore, 10), - description: rule.description, - // Default interval is 1m, our tests config overwrite this to 1s - // See https://github.com/elastic/kibana/pull/125396 for details - interval: '10s', - name: rule.name, - severity: rule.severity.toLocaleLowerCase(), - type: 'threat_match', - timeline_id: rule.timeline.templateTimelineId, - timeline_title: rule.timeline.title, - threat_mapping: [ - { - entries: [ - { - field: rule.indicatorMappingField, - type: 'mapping', - value: rule.indicatorIndexField, - }, - ], - }, - ], - threat_query: '*:*', - threat_language: 'kuery', - threat_filters: [], - threat_index: rule.indicatorIndexPattern, - threat_indicator_path: rule.threatIndicatorPath, - from: 'now-50000h', - index: rule.dataSource.index, - query: rule.customQuery || '*:*', - language: 'kuery', - enabled: true, - tags: rule.tags, - }, - headers: { 'kbn-xsrf': 'cypress-creds' }, - failOnStatusCode: false, - }); - } + cy.request({ + method: 'POST', + url: 'api/detection_engine/rules', + body: { + rule_id: ruleId, + risk_score: parseInt(rule.riskScore, 10), + description: rule.description, + // Default interval is 1m, our tests config overwrite this to 1s + // See https://github.com/elastic/kibana/pull/125396 for details + interval: '10s', + name: rule.name, + severity: rule.severity.toLocaleLowerCase(), + type: 'threat_match', + timeline_id: rule.timeline.templateTimelineId, + timeline_title: rule.timeline.title, + threat_mapping: [ + { + entries: [ + { + field: rule.indicatorMappingField, + type: 'mapping', + value: rule.indicatorIndexField, + }, + ], + }, + ], + threat_query: '*:*', + threat_language: 'kuery', + threat_filters: [], + threat_index: rule.indicatorIndexPattern, + threat_indicator_path: rule.threatIndicatorPath, + from: 'now-50000h', + index: rule.dataSource.type === 'indexPatterns' ? rule.dataSource.index : undefined, + data_view_id: rule.dataSource.type === 'dataView' ? rule.dataSource.dataView : undefined, + query: rule.customQuery || '*:*', + language: 'kuery', + enabled: true, + tags: rule.tags, + }, + headers: { 'kbn-xsrf': 'cypress-creds' }, + failOnStatusCode: false, + }); }; export const createCustomRuleEnabled = ( diff --git a/x-pack/plugins/security_solution/cypress/tasks/rule_details.ts b/x-pack/plugins/security_solution/cypress/tasks/rule_details.ts index 75668b49aa207..0bd06911acf7d 100644 --- a/x-pack/plugins/security_solution/cypress/tasks/rule_details.ts +++ b/x-pack/plugins/security_solution/cypress/tasks/rule_details.ts @@ -158,6 +158,9 @@ export const goBackToAllRulesTable = () => { export const getDetails = (title: string | RegExp) => cy.get(DETAILS_TITLE).contains(title).next(DETAILS_DESCRIPTION); +export const assertDetailsNotExist = (title: string | RegExp) => + cy.get(DETAILS_TITLE).contains(title).should('not.exist'); + export const hasIndexPatterns = (indexPatterns: string) => { cy.get(DEFINITION_DETAILS).within(() => { getDetails(INDEX_PATTERNS_DETAILS).should('have.text', indexPatterns); diff --git a/x-pack/plugins/security_solution/cypress/tasks/rules_bulk_edit.ts b/x-pack/plugins/security_solution/cypress/tasks/rules_bulk_edit.ts index 5b3ae403f4a0b..0000a84f26683 100644 --- a/x-pack/plugins/security_solution/cypress/tasks/rules_bulk_edit.ts +++ b/x-pack/plugins/security_solution/cypress/tasks/rules_bulk_edit.ts @@ -30,6 +30,7 @@ import { APPLY_TIMELINE_RULE_BULK_MENU_ITEM, RULES_BULK_EDIT_OVERWRITE_TAGS_CHECKBOX, RULES_BULK_EDIT_OVERWRITE_INDEX_PATTERNS_CHECKBOX, + RULES_BULK_EDIT_OVERWRITE_DATA_VIEW_CHECKBOX, RULES_BULK_EDIT_TIMELINE_TEMPLATES_SELECTOR, UPDATE_SCHEDULE_MENU_ITEM, UPDATE_SCHEDULE_INTERVAL_INPUT, @@ -159,6 +160,14 @@ export const checkOverwriteIndexPatternsCheckbox = () => { .should('be.checked'); }; +export const checkOverwriteDataViewCheckbox = () => { + cy.get(RULES_BULK_EDIT_OVERWRITE_DATA_VIEW_CHECKBOX) + .should('have.text', 'Apply changes to rules configured with data views') + .click() + .get('input') + .should('be.checked'); +}; + export const selectTimelineTemplate = (timelineTitle: string) => { cy.get(RULES_BULK_EDIT_TIMELINE_TEMPLATES_SELECTOR).click(); cy.get(TIMELINE_SEARCHBOX).type(`${timelineTitle}{enter}`).should('not.exist'); diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/perform_bulk_action.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/perform_bulk_action.ts index c17e679b6be31..8f06bc93820a4 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/perform_bulk_action.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/perform_bulk_action.ts @@ -1829,6 +1829,42 @@ export default ({ getService }: FtrProviderContext): void => { expect(setIndexRule.data_view_id).to.eql(undefined); }); + it('should return error when set an empty index pattern to a rule and overwrite the data view when overwrite_data_views is true', async () => { + const dataViewId = 'index1-*'; + const simpleRule = { + ...getSimpleRule(), + index: undefined, + data_view_id: dataViewId, + }; + const rule = await createRule(supertest, log, simpleRule); + + const { body } = await postBulkAction() + .send({ + query: '', + action: BulkAction.edit, + [BulkAction.edit]: [ + { + type: BulkActionEditType.set_index_patterns, + value: [], + overwrite_data_views: true, + }, + ], + }) + .expect(500); + + expect(body.attributes.summary).to.eql({ failed: 1, succeeded: 0, total: 1 }); + expect(body.attributes.errors[0]).to.eql({ + message: "Mutated params invalid: Index patterns can't be empty", + status_code: 500, + rules: [ + { + id: rule.id, + name: rule.name, + }, + ], + }); + }); + it('should NOT set an index pattern to a rule and overwrite the data view when overwrite_data_views is false', async () => { const ruleId = 'ruleId'; const dataViewId = 'index1-*'; From 7cae4515534d8387c67cc8f114573ed241095106 Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Wed, 28 Sep 2022 14:25:28 +0100 Subject: [PATCH 44/95] skip flaky suite (#133259) --- x-pack/test/api_integration/apis/osquery/packs.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x-pack/test/api_integration/apis/osquery/packs.ts b/x-pack/test/api_integration/apis/osquery/packs.ts index 9d00249a4e1b0..de490a489cec7 100644 --- a/x-pack/test/api_integration/apis/osquery/packs.ts +++ b/x-pack/test/api_integration/apis/osquery/packs.ts @@ -45,7 +45,8 @@ limit 1000;`; export default function ({ getService }: FtrProviderContext) { const supertest = getService('supertest'); - describe('Packs', () => { + // FLAKY: https://github.com/elastic/kibana/issues/133259 + describe.skip('Packs', () => { let packId: string = ''; let hostedPolicy: Record; let packagePolicyId: string; From 421150a445e5811728620bd0c887188d830cc0be Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Wed, 28 Sep 2022 14:27:39 +0100 Subject: [PATCH 45/95] skip flaky suite (#142083) --- .../apps/ml/data_frame_analytics/outlier_detection_creation.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts index 947cd82cdd342..b3c471f7255c9 100644 --- a/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts +++ b/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts @@ -13,7 +13,8 @@ export default function ({ getService }: FtrProviderContext) { const ml = getService('ml'); const editedDescription = 'Edited description'; - describe('outlier detection creation', function () { + // FLAKY: https://github.com/elastic/kibana/issues/142083 + describe.skip('outlier detection creation', function () { before(async () => { await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ihp_outlier'); await ml.testResources.createIndexPatternIfNeeded('ft_ihp_outlier', '@timestamp'); From 6ae4764db6ed54ac8ffc690ac4f1c4c81ad176e1 Mon Sep 17 00:00:00 2001 From: Kaarina Tungseth Date: Wed, 28 Sep 2022 08:46:21 -0500 Subject: [PATCH 46/95] Updates warning for unsupported rolled up data function (#141524) * Updates warning for unsupported rolled up data function * Update the functional test * Fix text on functional test Co-authored-by: Stratoula Kalafateli --- x-pack/plugins/lens/public/indexpattern_datasource/utils.tsx | 2 +- x-pack/test/functional/apps/lens/group2/tsdb.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/utils.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/utils.tsx index 2cb1ba164d572..77a359729a5e0 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/utils.tsx +++ b/x-pack/plugins/lens/public/indexpattern_datasource/utils.tsx @@ -194,7 +194,7 @@ export function getTSDBRollupWarningMessages( ).map((label) => i18n.translate('xpack.lens.indexPattern.tsdbRollupWarning', { defaultMessage: - '"{label}" does not work for all indices in the selected data view because it\'s using a function which is not supported on rolled up data. Please edit the visualization to use another function or change the time range.', + '{label} uses a function that is unsupported by rolled up data. Select a different function or change the time range.', values: { label, }, diff --git a/x-pack/test/functional/apps/lens/group2/tsdb.ts b/x-pack/test/functional/apps/lens/group2/tsdb.ts index 7a43fc47471a5..d19ab9d19db7d 100644 --- a/x-pack/test/functional/apps/lens/group2/tsdb.ts +++ b/x-pack/test/functional/apps/lens/group2/tsdb.ts @@ -119,7 +119,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await testSubjects.click('lns-indexPatternDimension-median'); await PageObjects.lens.waitForVisualization('xyVisChart'); await PageObjects.lens.assertEditorWarning( - '"Median of kubernetes.container.memory.available.bytes" does not work for all indices in the selected data view because it\'s using a function which is not supported on rolled up data. Please edit the visualization to use another function or change the time range.' + 'Median of kubernetes.container.memory.available.bytes uses a function that is unsupported by rolled up data. Select a different function or change the time range.' ); }); it('shows warnings in dashboards as well', async () => { @@ -127,7 +127,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await PageObjects.dashboard.waitForRenderComplete(); await PageObjects.lens.assertInlineWarning( - '"Median of kubernetes.container.memory.available.bytes" does not work for all indices in the selected data view because it\'s using a function which is not supported on rolled up data. Please edit the visualization to use another function or change the time range.' + 'Median of kubernetes.container.memory.available.bytes uses a function that is unsupported by rolled up data. Select a different function or change the time range.' ); }); it('still shows other warnings as toast', async () => { From a73c2d4a1f7e358bac729277c3257dcb499026fc Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Wed, 28 Sep 2022 15:51:23 +0100 Subject: [PATCH 47/95] skip flaky suite (#142083) --- .../apps/ml/data_frame_analytics/outlier_detection_creation.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts index b3c471f7255c9..fb04cd793d9d8 100644 --- a/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts +++ b/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts @@ -109,7 +109,8 @@ export default function ({ getService }: FtrProviderContext) { ]; for (const testData of testDataList) { - describe(`${testData.suiteTitle}`, function () { + // FLAKY: https://github.com/elastic/kibana/issues/142083 + describe.skip(`${testData.suiteTitle}`, function () { after(async () => { await ml.api.deleteIndices(testData.destinationIndex); await ml.testResources.deleteIndexPatternByTitle(testData.destinationIndex); From 04f570c1a577ab93644e5b802c52fbb4185d90a3 Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Wed, 28 Sep 2022 16:20:06 +0100 Subject: [PATCH 48/95] skip flaky suite (#142095) --- .../apps/ml/data_frame_analytics/regression_creation.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts index 7a84c41aa4a66..744b61a2a06ca 100644 --- a/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts +++ b/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts @@ -13,7 +13,8 @@ export default function ({ getService }: FtrProviderContext) { const ml = getService('ml'); const editedDescription = 'Edited description'; - describe('regression creation', function () { + // FLAKY: https://github.com/elastic/kibana/issues/142095 + describe.skip('regression creation', function () { before(async () => { await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/egs_regression'); await ml.testResources.createIndexPatternIfNeeded('ft_egs_regression', '@timestamp'); @@ -86,7 +87,8 @@ export default function ({ getService }: FtrProviderContext) { ]; for (const testData of testDataList) { - describe(`${testData.suiteTitle}`, function () { + // FLAKY: https://github.com/elastic/kibana/issues/142095 + describe.skip(`${testData.suiteTitle}`, function () { after(async () => { await ml.api.deleteIndices(testData.destinationIndex); await ml.testResources.deleteIndexPatternByTitle(testData.destinationIndex); From f72002e6851181870450f8d359986120286fe0d1 Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Wed, 28 Sep 2022 16:24:21 +0100 Subject: [PATCH 49/95] skip flaky suite (#142102) --- .../apps/ml/data_frame_analytics/classification_creation.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts index 2ba4ac6f08350..ea95525062700 100644 --- a/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts +++ b/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts @@ -13,7 +13,8 @@ export default function ({ getService }: FtrProviderContext) { const ml = getService('ml'); const editedDescription = 'Edited description'; - describe('classification creation', function () { + // FLAKY: https://github.com/elastic/kibana/issues/142102 + describe.skip('classification creation', function () { before(async () => { await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/bm_classification'); await ml.testResources.createIndexPatternIfNeeded('ft_bank_marketing', '@timestamp'); @@ -92,7 +93,8 @@ export default function ({ getService }: FtrProviderContext) { }, ]; for (const testData of testDataList) { - describe(`${testData.suiteTitle}`, function () { + // FLAKY: https://github.com/elastic/kibana/issues/142102 + describe.skip(`${testData.suiteTitle}`, function () { after(async () => { await ml.api.deleteIndices(testData.destinationIndex); await ml.testResources.deleteIndexPatternByTitle(testData.destinationIndex); From 0b4a942a00bcceee19604bfd06c35663f87725cd Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Wed, 28 Sep 2022 16:31:36 +0100 Subject: [PATCH 50/95] skip flaky suite (#142118) --- .../test/functional/apps/ml/data_frame_analytics/cloning.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/cloning.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/cloning.ts index 3a33c95edba42..7d6cc5ea9881a 100644 --- a/x-pack/test/functional/apps/ml/data_frame_analytics/cloning.ts +++ b/x-pack/test/functional/apps/ml/data_frame_analytics/cloning.ts @@ -15,7 +15,8 @@ export default function ({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const ml = getService('ml'); - describe('jobs cloning supported by UI form', function () { + // FLAKY: https://github.com/elastic/kibana/issues/142118 + describe.skip('jobs cloning supported by UI form', function () { const testDataList: Array<{ suiteTitle: string; archive: string; @@ -135,7 +136,8 @@ export default function ({ getService }: FtrProviderContext) { }); for (const testData of testDataList) { - describe(`${testData.suiteTitle}`, function () { + // FLAKY: https://github.com/elastic/kibana/issues/142118 + describe.skip(`${testData.suiteTitle}`, function () { const cloneJobId = `${testData.job.id}_clone`; const cloneDestIndex = `${testData.job!.dest!.index}_clone`; From a47918dcd9ca542c5905ac1626e35e4e796743d1 Mon Sep 17 00:00:00 2001 From: doakalexi <109488926+doakalexi@users.noreply.github.com> Date: Wed, 28 Sep 2022 13:17:50 -0400 Subject: [PATCH 51/95] [ResponseOps][Alerting] xpack.actions.proxyUrl is not validated as a URL at startup (#141970) * Adding validation * Removing error --- x-pack/plugins/actions/server/config.test.ts | 22 ++++++++++++++++++++ x-pack/plugins/actions/server/config.ts | 9 ++++++++ 2 files changed, 31 insertions(+) diff --git a/x-pack/plugins/actions/server/config.test.ts b/x-pack/plugins/actions/server/config.test.ts index e6e3a24db5214..475b88089581f 100644 --- a/x-pack/plugins/actions/server/config.test.ts +++ b/x-pack/plugins/actions/server/config.test.ts @@ -163,6 +163,28 @@ describe('config validation', () => { `); }); + test('validates proxyUrl', () => { + const proxyUrl = 'https://test.com'; + const badProxyUrl = 'bad url'; + let validated: ActionsConfig; + + validated = configSchema.validate({ proxyUrl }); + expect(validated.proxyUrl).toEqual(proxyUrl); + expect(getValidatedConfig(mockLogger, validated).proxyUrl).toEqual(proxyUrl); + expect(mockLogger.warn.mock.calls).toMatchInlineSnapshot(`Array []`); + + validated = configSchema.validate({ proxyUrl: badProxyUrl }); + expect(validated.proxyUrl).toEqual(badProxyUrl); + expect(getValidatedConfig(mockLogger, validated).proxyUrl).toEqual(badProxyUrl); + expect(mockLogger.warn.mock.calls).toMatchInlineSnapshot(` + Array [ + Array [ + "The confguration xpack.actions.proxyUrl: bad url is invalid.", + ], + ] + `); + }); + // Most of the customHostSettings tests are in ./lib/custom_host_settings.test.ts // but this one seemed more relevant for this test suite, since url is the one // required property. diff --git a/x-pack/plugins/actions/server/config.ts b/x-pack/plugins/actions/server/config.ts index 4c8ca7ff9fff7..76270a466ee8f 100644 --- a/x-pack/plugins/actions/server/config.ts +++ b/x-pack/plugins/actions/server/config.ts @@ -127,6 +127,15 @@ export type ActionsConfig = TypeOf; export function getValidatedConfig(logger: Logger, originalConfig: ActionsConfig): ActionsConfig { const proxyBypassHosts = originalConfig.proxyBypassHosts; const proxyOnlyHosts = originalConfig.proxyOnlyHosts; + const proxyUrl = originalConfig.proxyUrl; + + if (proxyUrl) { + try { + new URL(proxyUrl); + } catch (err) { + logger.warn(`The confguration xpack.actions.proxyUrl: ${proxyUrl} is invalid.`); + } + } if (proxyBypassHosts && proxyOnlyHosts) { logger.warn( From f76918732e52cf5aa5a87d428ad4035b24e0fd33 Mon Sep 17 00:00:00 2001 From: Christos Nasikas Date: Wed, 28 Sep 2022 20:35:25 +0300 Subject: [PATCH 52/95] [Cases] Convert delete and update cases hook to react query (#141920) * Use react query for delete cases * Convert delete to react query * Convert update to react query * Convert use_get_cases_status to react query * Convert use_get_cases_metrics to react query * Refresh metrics and statuses * Show loading when updating cases * Create query key builder * Improve refreshing logic * Improve delete messages * Fix types and tests * Improvements * PR feedback * Fix bug * Fix i18n --- x-pack/plugins/cases/common/ui/types.ts | 12 +- .../cases/public/common/translations.ts | 8 +- .../public/common/use_cases_toast.test.tsx | 355 +++++++++++------- .../cases/public/common/use_cases_toast.tsx | 30 +- .../all_cases/all_cases_list.test.tsx | 204 +++------- .../components/all_cases/all_cases_list.tsx | 62 +-- .../all_cases/cases_metrics.test.tsx | 41 +- .../components/all_cases/cases_metrics.tsx | 25 +- .../public/components/all_cases/columns.tsx | 82 ++-- .../components/all_cases/index.test.tsx | 17 +- .../public/components/all_cases/table.tsx | 9 +- .../all_cases/table_filters.test.tsx | 9 - .../components/all_cases/table_filters.tsx | 15 +- .../components/all_cases/translations.ts | 41 +- .../all_cases/use_is_loading_cases.tsx | 20 + .../all_cases/use_on_refresh_cases.test.tsx | 36 ++ .../all_cases/use_on_refresh_cases.tsx | 28 ++ .../components/all_cases/utility_bar.tsx | 128 +++---- .../public/components/bulk_actions/index.tsx | 2 +- .../case_action_bar/actions.test.tsx | 46 +-- .../components/case_action_bar/actions.tsx | 43 ++- .../components/case_view/index.test.tsx | 8 +- .../use_on_refresh_case_view_page.tsx | 7 +- .../components/confirm_delete_case/index.tsx | 17 +- .../confirm_delete_case/translations.ts | 6 - .../cases/public/containers/__mocks__/api.ts | 7 +- .../cases/public/containers/api.test.tsx | 8 +- x-pack/plugins/cases/public/containers/api.ts | 6 +- .../containers/configure/use_action_types.tsx | 4 +- .../containers/configure/use_connectors.tsx | 4 +- .../cases/public/containers/constants.ts | 45 ++- .../cases/public/containers/translations.ts | 45 +-- .../containers/use_bulk_update_case.test.tsx | 151 +++----- .../containers/use_bulk_update_case.tsx | 171 ++------- .../containers/use_delete_cases.test.tsx | 155 +++----- .../public/containers/use_delete_cases.tsx | 156 ++------ .../containers/use_get_action_license.tsx | 4 +- .../cases/public/containers/use_get_case.tsx | 4 +- .../containers/use_get_case_metrics.tsx | 4 +- .../containers/use_get_case_user_actions.tsx | 4 +- .../cases/public/containers/use_get_cases.tsx | 4 +- .../containers/use_get_cases_metrics.test.tsx | 126 ++----- .../containers/use_get_cases_metrics.tsx | 93 ++--- .../containers/use_get_cases_status.test.tsx | 108 ++---- .../containers/use_get_cases_status.tsx | 99 ++--- .../cases/public/containers/use_get_tags.tsx | 7 +- .../use_bulk_get_user_profiles.ts | 4 +- .../use_get_current_user_profile.ts | 4 +- .../use_suggest_user_profiles.ts | 8 +- .../translations/translations/fr-FR.json | 3 - .../translations/translations/ja-JP.json | 3 - .../translations/translations/zh-CN.json | 3 - 52 files changed, 977 insertions(+), 1504 deletions(-) create mode 100644 x-pack/plugins/cases/public/components/all_cases/use_is_loading_cases.tsx create mode 100644 x-pack/plugins/cases/public/components/all_cases/use_on_refresh_cases.test.tsx create mode 100644 x-pack/plugins/cases/public/components/all_cases/use_on_refresh_cases.tsx diff --git a/x-pack/plugins/cases/common/ui/types.ts b/x-pack/plugins/cases/common/ui/types.ts index 9af253fc9559e..65a7fec902f7b 100644 --- a/x-pack/plugins/cases/common/ui/types.ts +++ b/x-pack/plugins/cases/common/ui/types.ts @@ -82,6 +82,7 @@ export type Case = Omit, 'comments'> & { comments export type Cases = Omit, 'cases'> & { cases: Case[] }; export type CasesStatus = SnakeToCamelCase; export type CasesMetrics = SnakeToCamelCase; +export type CaseUpdateRequest = SnakeToCamelCase; export interface ResolvedCase { case: Case; @@ -133,12 +134,6 @@ export interface ApiProps { signal: AbortSignal; } -export interface BulkUpdateStatus { - status: string; - id: string; - version: string; -} - export interface ActionLicense { id: string; name: string; @@ -147,11 +142,6 @@ export interface ActionLicense { enabledInLicense: boolean; } -export interface DeleteCase { - id: string; - title: string; -} - export interface FieldMappings { id: string; title?: string; diff --git a/x-pack/plugins/cases/public/common/translations.ts b/x-pack/plugins/cases/public/common/translations.ts index 1dbc271e9be49..9748339878222 100644 --- a/x-pack/plugins/cases/public/common/translations.ts +++ b/x-pack/plugins/cases/public/common/translations.ts @@ -18,7 +18,7 @@ export const CANCEL = i18n.translate('xpack.cases.caseView.cancel', { export const DELETE_CASE = (quantity: number = 1) => i18n.translate('xpack.cases.confirmDeleteCase.deleteCase', { values: { quantity }, - defaultMessage: `Delete {quantity, plural, =1 {case} other {cases}}`, + defaultMessage: `Delete {quantity, plural, =1 {case} other {{quantity} cases}}`, }); export const NAME = i18n.translate('xpack.cases.caseView.name', { @@ -296,3 +296,9 @@ export const READ_ACTIONS_PERMISSIONS_ERROR_MSG = i18n.translate( 'You do not have permission to view connectors. If you would like to view connectors, contact your Kibana administrator.', } ); + +export const DELETED_CASES = (totalCases: number) => + i18n.translate('xpack.cases.containers.deletedCases', { + values: { totalCases }, + defaultMessage: 'Deleted {totalCases, plural, =1 {case} other {{totalCases} cases}}', + }); diff --git a/x-pack/plugins/cases/public/common/use_cases_toast.test.tsx b/x-pack/plugins/cases/public/common/use_cases_toast.test.tsx index e8661387e1e64..cfa2d3a6e0052 100644 --- a/x-pack/plugins/cases/public/common/use_cases_toast.test.tsx +++ b/x-pack/plugins/cases/public/common/use_cases_toast.test.tsx @@ -23,6 +23,7 @@ const useKibanaMock = useKibana as jest.Mocked; describe('Use cases toast hook', () => { const successMock = jest.fn(); + const errorMock = jest.fn(); const getUrlForApp = jest.fn().mockReturnValue(`/app/cases/${mockCase.id}`); const navigateToUrl = jest.fn(); @@ -51,6 +52,7 @@ describe('Use cases toast hook', () => { useToastsMock.mockImplementation(() => { return { addSuccess: successMock, + addError: errorMock, }; }); @@ -63,159 +65,260 @@ describe('Use cases toast hook', () => { }; }); - describe('Toast hook', () => { - it('should create a success toast when invoked with a case', () => { - const { result } = renderHook( - () => { - return useCasesToast(); - }, - { wrapper: TestProviders } - ); - result.current.showSuccessAttach({ - theCase: mockCase, + describe('showSuccessAttach', () => { + describe('Toast hook', () => { + it('should create a success toast when invoked with a case', () => { + const { result } = renderHook( + () => { + return useCasesToast(); + }, + { wrapper: TestProviders } + ); + result.current.showSuccessAttach({ + theCase: mockCase, + }); + expect(successMock).toHaveBeenCalled(); }); - expect(successMock).toHaveBeenCalled(); }); - }); - describe('toast title', () => { - it('should create a success toast when invoked with a case and a custom title', () => { - const { result } = renderHook( - () => { - return useCasesToast(); - }, - { wrapper: TestProviders } - ); - result.current.showSuccessAttach({ theCase: mockCase, title: 'Custom title' }); - validateTitle('Custom title'); - }); + describe('toast title', () => { + it('should create a success toast when invoked with a case and a custom title', () => { + const { result } = renderHook( + () => { + return useCasesToast(); + }, + { wrapper: TestProviders } + ); + result.current.showSuccessAttach({ theCase: mockCase, title: 'Custom title' }); + validateTitle('Custom title'); + }); - it('should display the alert sync title when called with an alert attachment (1 alert)', () => { - const { result } = renderHook( - () => { - return useCasesToast(); - }, - { wrapper: TestProviders } - ); - result.current.showSuccessAttach({ - theCase: mockCase, - attachments: [alertComment as SupportedCaseAttachment], + it('should display the alert sync title when called with an alert attachment (1 alert)', () => { + const { result } = renderHook( + () => { + return useCasesToast(); + }, + { wrapper: TestProviders } + ); + result.current.showSuccessAttach({ + theCase: mockCase, + attachments: [alertComment as SupportedCaseAttachment], + }); + validateTitle('An alert was added to "Another horrible breach!!'); + }); + + it('should display the alert sync title when called with an alert attachment (multiple alerts)', () => { + const { result } = renderHook( + () => { + return useCasesToast(); + }, + { wrapper: TestProviders } + ); + const alert = { + ...alertComment, + alertId: ['1234', '54321'], + } as SupportedCaseAttachment; + + result.current.showSuccessAttach({ + theCase: mockCase, + attachments: [alert], + }); + validateTitle('Alerts were added to "Another horrible breach!!'); + }); + + it('should display a generic title when called with a non-alert attachament', () => { + const { result } = renderHook( + () => { + return useCasesToast(); + }, + { wrapper: TestProviders } + ); + result.current.showSuccessAttach({ + theCase: mockCase, + attachments: [basicComment as SupportedCaseAttachment], + }); + validateTitle('Another horrible breach!! has been updated'); }); - validateTitle('An alert was added to "Another horrible breach!!'); }); - it('should display the alert sync title when called with an alert attachment (multiple alerts)', () => { - const { result } = renderHook( - () => { - return useCasesToast(); - }, - { wrapper: TestProviders } - ); - const alert = { - ...alertComment, - alertId: ['1234', '54321'], - } as SupportedCaseAttachment; - - result.current.showSuccessAttach({ - theCase: mockCase, - attachments: [alert], + describe('Toast content', () => { + let appMockRender: AppMockRenderer; + const onViewCaseClick = jest.fn(); + beforeEach(() => { + appMockRender = createAppMockRenderer(); + onViewCaseClick.mockReset(); + }); + + it('should create a success toast when invoked with a case and a custom content', () => { + const { result } = renderHook( + () => { + return useCasesToast(); + }, + { wrapper: TestProviders } + ); + result.current.showSuccessAttach({ theCase: mockCase, content: 'Custom content' }); + validateContent('Custom content'); + }); + + it('renders an alert-specific content when called with an alert attachment and sync on', () => { + const { result } = renderHook( + () => { + return useCasesToast(); + }, + { wrapper: TestProviders } + ); + result.current.showSuccessAttach({ + theCase: mockCase, + attachments: [alertComment as SupportedCaseAttachment], + }); + validateContent('The alert statuses are synched with the case status.'); + }); + + it('renders empty content when called with an alert attachment and sync off', () => { + const { result } = renderHook( + () => { + return useCasesToast(); + }, + { wrapper: TestProviders } + ); + result.current.showSuccessAttach({ + theCase: { ...mockCase, settings: { ...mockCase.settings, syncAlerts: false } }, + attachments: [alertComment as SupportedCaseAttachment], + }); + validateContent('View case'); + }); + + it('renders a correct successful message content', () => { + const result = appMockRender.render( + + ); + expect(result.getByTestId('toaster-content-sync-text')).toHaveTextContent('my content'); + expect(result.getByTestId('toaster-content-case-view-link')).toHaveTextContent('View case'); + expect(onViewCaseClick).not.toHaveBeenCalled(); + }); + + it('renders a correct successful message without content', () => { + const result = appMockRender.render( + + ); + expect(result.queryByTestId('toaster-content-sync-text')).toBeFalsy(); + expect(result.getByTestId('toaster-content-case-view-link')).toHaveTextContent('View case'); + expect(onViewCaseClick).not.toHaveBeenCalled(); + }); + + it('Calls the onViewCaseClick when clicked', () => { + const result = appMockRender.render( + + ); + userEvent.click(result.getByTestId('toaster-content-case-view-link')); + expect(onViewCaseClick).toHaveBeenCalled(); }); - validateTitle('Alerts were added to "Another horrible breach!!'); }); - it('should display a generic title when called with a non-alert attachament', () => { - const { result } = renderHook( - () => { - return useCasesToast(); - }, - { wrapper: TestProviders } - ); - result.current.showSuccessAttach({ - theCase: mockCase, - attachments: [basicComment as SupportedCaseAttachment], + describe('Toast navigation', () => { + const tests = Object.entries(OWNER_INFO).map(([owner, ownerInfo]) => [ + owner, + ownerInfo.appId, + ]); + + it.each(tests)('should navigate correctly with owner %s and appId %s', (owner, appId) => { + const { result } = renderHook( + () => { + return useCasesToast(); + }, + { wrapper: TestProviders } + ); + + result.current.showSuccessAttach({ + theCase: { ...mockCase, owner }, + title: 'Custom title', + }); + + navigateToCase(); + + expect(getUrlForApp).toHaveBeenCalledWith(appId, { + deepLinkId: 'cases', + path: '/mock-id', + }); + + expect(navigateToUrl).toHaveBeenCalledWith('/app/cases/mock-id'); + }); + + it('navigates to the current app if the owner is invalid', () => { + const { result } = renderHook( + () => { + return useCasesToast(); + }, + { wrapper: TestProviders } + ); + + result.current.showSuccessAttach({ + theCase: { ...mockCase, owner: 'in-valid' }, + title: 'Custom title', + }); + + navigateToCase(); + + expect(getUrlForApp).toHaveBeenCalledWith('testAppId', { + deepLinkId: 'cases', + path: '/mock-id', + }); }); - validateTitle('Another horrible breach!! has been updated'); }); }); - describe('Toast content', () => { - let appMockRender: AppMockRenderer; - const onViewCaseClick = jest.fn(); - beforeEach(() => { - appMockRender = createAppMockRenderer(); - onViewCaseClick.mockReset(); - }); + describe('showErrorToast', () => { + it('should show an error toast', () => { + const error = new Error('showErrorToast: an error occurred'); - it('should create a success toast when invoked with a case and a custom content', () => { const { result } = renderHook( () => { return useCasesToast(); }, { wrapper: TestProviders } ); - result.current.showSuccessAttach({ theCase: mockCase, content: 'Custom content' }); - validateContent('Custom content'); + + result.current.showErrorToast(error); + + expect(errorMock).toHaveBeenCalledWith(error, { title: error.message }); }); - it('renders an alert-specific content when called with an alert attachment and sync on', () => { + it('should override the title', () => { + const error = new Error('showErrorToast: an error occurred'); + const { result } = renderHook( () => { return useCasesToast(); }, { wrapper: TestProviders } ); - result.current.showSuccessAttach({ - theCase: mockCase, - attachments: [alertComment as SupportedCaseAttachment], - }); - validateContent('The alert statuses are synched with the case status.'); + + result.current.showErrorToast(error, { title: 'my title' }); + + expect(errorMock).toHaveBeenCalledWith(error, { title: 'my title' }); }); - it('renders empty content when called with an alert attachment and sync off', () => { + it('should not show an error toast if the error is AbortError', () => { + const error = new Error('showErrorToast: an error occurred'); + error.name = 'AbortError'; + const { result } = renderHook( () => { return useCasesToast(); }, { wrapper: TestProviders } ); - result.current.showSuccessAttach({ - theCase: { ...mockCase, settings: { ...mockCase.settings, syncAlerts: false } }, - attachments: [alertComment as SupportedCaseAttachment], - }); - validateContent('View case'); - }); - it('renders a correct successful message content', () => { - const result = appMockRender.render( - - ); - expect(result.getByTestId('toaster-content-sync-text')).toHaveTextContent('my content'); - expect(result.getByTestId('toaster-content-case-view-link')).toHaveTextContent('View case'); - expect(onViewCaseClick).not.toHaveBeenCalled(); - }); - - it('renders a correct successful message without content', () => { - const result = appMockRender.render( - - ); - expect(result.queryByTestId('toaster-content-sync-text')).toBeFalsy(); - expect(result.getByTestId('toaster-content-case-view-link')).toHaveTextContent('View case'); - expect(onViewCaseClick).not.toHaveBeenCalled(); - }); + result.current.showErrorToast(error); - it('Calls the onViewCaseClick when clicked', () => { - const result = appMockRender.render( - - ); - userEvent.click(result.getByTestId('toaster-content-case-view-link')); - expect(onViewCaseClick).toHaveBeenCalled(); + expect(errorMock).not.toHaveBeenCalled(); }); - }); - describe('Toast navigation', () => { - const tests = Object.entries(OWNER_INFO).map(([owner, ownerInfo]) => [owner, ownerInfo.appId]); + it('should show the body message if it is a ServerError', () => { + const error = new Error('showErrorToast: an error occurred'); + // @ts-expect-error: need to create a ServerError + error.body = { message: 'message error' }; - it.each(tests)('should navigate correctly with owner %s and appId %s', (owner, appId) => { const { result } = renderHook( () => { return useCasesToast(); @@ -223,22 +326,16 @@ describe('Use cases toast hook', () => { { wrapper: TestProviders } ); - result.current.showSuccessAttach({ - theCase: { ...mockCase, owner }, - title: 'Custom title', - }); + result.current.showErrorToast(error); - navigateToCase(); - - expect(getUrlForApp).toHaveBeenCalledWith(appId, { - deepLinkId: 'cases', - path: '/mock-id', + expect(errorMock).toHaveBeenCalledWith(new Error('message error'), { + title: 'message error', }); - - expect(navigateToUrl).toHaveBeenCalledWith('/app/cases/mock-id'); }); + }); - it('navigates to the current app if the owner is invalid', () => { + describe('showSuccessToast', () => { + it('should show a success toast', () => { const { result } = renderHook( () => { return useCasesToast(); @@ -246,17 +343,9 @@ describe('Use cases toast hook', () => { { wrapper: TestProviders } ); - result.current.showSuccessAttach({ - theCase: { ...mockCase, owner: 'in-valid' }, - title: 'Custom title', - }); - - navigateToCase(); + result.current.showSuccessToast('my title'); - expect(getUrlForApp).toHaveBeenCalledWith('testAppId', { - deepLinkId: 'cases', - path: '/mock-id', - }); + expect(successMock).toHaveBeenCalledWith('my title'); }); }); }); diff --git a/x-pack/plugins/cases/public/common/use_cases_toast.tsx b/x-pack/plugins/cases/public/common/use_cases_toast.tsx index 7d445a4edffac..42a358897bc62 100644 --- a/x-pack/plugins/cases/public/common/use_cases_toast.tsx +++ b/x-pack/plugins/cases/public/common/use_cases_toast.tsx @@ -5,6 +5,7 @@ * 2.0. */ +import type { ErrorToastOptions } from '@kbn/core/public'; import { EuiButtonEmpty, EuiText } from '@elastic/eui'; import React from 'react'; import styled from 'styled-components'; @@ -12,7 +13,7 @@ import { toMountPoint } from '@kbn/kibana-react-plugin/public'; import { Case, CommentType } from '../../common'; import { useKibana, useToasts } from './lib/kibana'; import { generateCaseViewPath } from './navigation'; -import { CaseAttachmentsWithoutOwner } from '../types'; +import { CaseAttachmentsWithoutOwner, ServerError } from '../types'; import { CASE_ALERT_SUCCESS_SYNC_TEXT, CASE_ALERT_SUCCESS_TOAST, @@ -98,6 +99,25 @@ function getToastContent({ const isValidOwner = (owner: string): owner is keyof typeof OWNER_INFO => Object.keys(OWNER_INFO).includes(owner); +const isServerError = (error: Error | ServerError): error is ServerError => + Object.hasOwn(error, 'body'); + +const getError = (error: Error | ServerError): Error => { + if (isServerError(error)) { + return new Error(error.body?.message); + } + + return error; +}; + +const getErrorMessage = (error: Error | ServerError): string => { + if (isServerError(error)) { + return error.body?.message ?? ''; + } + + return error.message; +}; + export const useCasesToast = () => { const { appId } = useCasesContext(); const { getUrlForApp, navigateToUrl } = useKibana().services.application; @@ -141,6 +161,14 @@ export const useCasesToast = () => { ), }); }, + showErrorToast: (error: Error | ServerError, opts?: ErrorToastOptions) => { + if (error.name !== 'AbortError') { + toasts.addError(getError(error), { title: getErrorMessage(error), ...opts }); + } + }, + showSuccessToast: (title: string) => { + toasts.addSuccess(title); + }, }; }; diff --git a/x-pack/plugins/cases/public/components/all_cases/all_cases_list.test.tsx b/x-pack/plugins/cases/public/components/all_cases/all_cases_list.test.tsx index a504bf251ff20..1cc3a5f0263e5 100644 --- a/x-pack/plugins/cases/public/components/all_cases/all_cases_list.test.tsx +++ b/x-pack/plugins/cases/public/components/all_cases/all_cases_list.test.tsx @@ -8,7 +8,7 @@ import React from 'react'; import { mount } from 'enzyme'; import moment from 'moment-timezone'; -import { act, render, waitFor, screen } from '@testing-library/react'; +import { render, waitFor, screen, act } from '@testing-library/react'; import { renderHook } from '@testing-library/react-hooks'; import userEvent from '@testing-library/user-event'; import { waitForEuiPopoverOpen } from '@elastic/eui/lib/test/rtl'; @@ -20,15 +20,12 @@ import { noDeleteCasesPermissions, TestProviders, } from '../../common/mock'; -import { casesStatus, useGetCasesMockState, mockCase, connectorsMock } from '../../containers/mock'; +import { useGetCasesMockState, connectorsMock } from '../../containers/mock'; import { StatusAll } from '../../../common/ui/types'; import { CaseSeverity, CaseStatuses } from '../../../common/api'; import { SECURITY_SOLUTION_OWNER } from '../../../common/constants'; import { getEmptyTagValue } from '../empty_value'; -import { useDeleteCases } from '../../containers/use_delete_cases'; -import { useGetCasesStatus } from '../../containers/use_get_cases_status'; -import { useUpdateCases } from '../../containers/use_bulk_update_case'; import { useKibana } from '../../common/lib/kibana'; import { AllCasesList } from './all_cases_list'; import { CasesColumns, GetCasesColumn, useCasesColumns } from './columns'; @@ -37,7 +34,6 @@ import { registerConnectorsToMockActionRegistry } from '../../common/mock/regist import { createStartServicesMock } from '../../common/lib/kibana/kibana_react.mock'; import { waitForComponentToUpdate } from '../../common/test_utils'; import { useCreateAttachments } from '../../containers/use_create_attachments'; -import { useGetCasesMetrics } from '../../containers/use_get_cases_metrics'; import { useGetConnectors } from '../../containers/configure/use_connectors'; import { useGetTags } from '../../containers/use_get_tags'; import { useUpdateCase } from '../../containers/use_update_case'; @@ -46,13 +42,10 @@ import { useGetCurrentUserProfile } from '../../containers/user_profiles/use_get import { userProfiles, userProfilesMap } from '../../containers/user_profiles/api.mock'; import { useBulkGetUserProfiles } from '../../containers/user_profiles/use_bulk_get_user_profiles'; import { useLicense } from '../../common/use_license'; +import * as api from '../../containers/api'; jest.mock('../../containers/use_create_attachments'); -jest.mock('../../containers/use_bulk_update_case'); -jest.mock('../../containers/use_delete_cases'); jest.mock('../../containers/use_get_cases'); -jest.mock('../../containers/use_get_cases_status'); -jest.mock('../../containers/use_get_cases_metrics'); jest.mock('../../containers/use_get_action_license'); jest.mock('../../containers/use_get_tags'); jest.mock('../../containers/user_profiles/use_get_current_user_profile'); @@ -66,11 +59,7 @@ jest.mock('../app/use_available_owners', () => ({ jest.mock('../../containers/use_update_case'); jest.mock('../../common/use_license'); -const useDeleteCasesMock = useDeleteCases as jest.Mock; const useGetCasesMock = useGetCases as jest.Mock; -const useGetCasesStatusMock = useGetCasesStatus as jest.Mock; -const useGetCasesMetricsMock = useGetCasesMetrics as jest.Mock; -const useUpdateCasesMock = useUpdateCases as jest.Mock; const useGetTagsMock = useGetTags as jest.Mock; const useGetCurrentUserProfileMock = useGetCurrentUserProfile as jest.Mock; const useBulkGetUserProfilesMock = useBulkGetUserProfiles as jest.Mock; @@ -92,13 +81,7 @@ const mockKibana = () => { }; describe('AllCasesListGeneric', () => { - const dispatchResetIsDeleted = jest.fn(); - const dispatchResetIsUpdated = jest.fn(); - const handleOnDeleteConfirm = jest.fn(); - const handleToggleModal = jest.fn(); const refetchCases = jest.fn(); - const updateBulkStatus = jest.fn(); - const fetchCasesStatus = jest.fn(); const onRowClick = jest.fn(); const updateCaseProperty = jest.fn(); @@ -113,36 +96,6 @@ describe('AllCasesListGeneric', () => { refetch: refetchCases, }; - const defaultDeleteCases = { - dispatchResetIsDeleted, - handleOnDeleteConfirm, - handleToggleModal, - isDeleted: false, - isDisplayConfirmDeleteModal: false, - isLoading: false, - }; - - const defaultCasesStatus = { - ...casesStatus, - fetchCasesStatus, - isError: false, - isLoading: false, - }; - - const defaultCasesMetrics = { - mttr: 5, - isLoading: false, - fetchCasesMetrics: jest.fn(), - }; - - const defaultUpdateCases = { - isUpdated: false, - isLoading: false, - isError: false, - dispatchResetIsUpdated, - updateBulkStatus, - }; - const defaultColumnArgs = { caseDetailsNavigation: { href: jest.fn(), @@ -167,11 +120,7 @@ describe('AllCasesListGeneric', () => { beforeEach(() => { jest.clearAllMocks(); appMockRenderer = createAppMockRenderer(); - useUpdateCasesMock.mockReturnValue(defaultUpdateCases); useGetCasesMock.mockReturnValue(defaultGetCases); - useDeleteCasesMock.mockReturnValue(defaultDeleteCases); - useGetCasesStatusMock.mockReturnValue(defaultCasesStatus); - useGetCasesMetricsMock.mockReturnValue(defaultCasesMetrics); useGetTagsMock.mockReturnValue({ data: ['coke', 'pepsi'], refetch: jest.fn() }); useGetCurrentUserProfileMock.mockReturnValue({ data: userProfiles[0], isLoading: false }); useBulkGetUserProfilesMock.mockReturnValue({ data: userProfilesMap }); @@ -368,43 +317,48 @@ describe('AllCasesListGeneric', () => { expect(wrapper.find('[data-test-subj="cases-count-stats"]')).toBeTruthy(); }); - it.skip('Bulk delete', async () => { - useDeleteCasesMock - .mockReturnValueOnce({ - ...defaultDeleteCases, - isDisplayConfirmDeleteModal: false, - }) - .mockReturnValue({ - ...defaultDeleteCases, - isDisplayConfirmDeleteModal: true, - }); + it('Bulk delete', async () => { + const deleteCasesSpy = jest.spyOn(api, 'deleteCases'); + const result = appMockRenderer.render(); - const wrapper = mount( - - - - ); + act(() => { + userEvent.click(result.getByTestId('checkboxSelectAll')); + }); - wrapper.find('[data-test-subj="case-table-bulk-actions"] button').first().simulate('click'); - wrapper.find('[data-test-subj="cases-bulk-delete-button"]').first().simulate('click'); + act(() => { + userEvent.click(result.getByText('Bulk actions')); + }); - wrapper - .find( - '[data-test-subj="confirm-delete-case-modal"] [data-test-subj="confirmModalConfirmButton"]' - ) - .last() - .simulate('click'); + await waitForEuiPopoverOpen(); + + act(() => { + userEvent.click(result.getByTestId('cases-bulk-delete-button'), undefined, { + skipPointerEventsCheck: true, + }); + }); await waitFor(() => { - expect(handleToggleModal).toBeCalled(); + expect(result.getByTestId('confirm-delete-case-modal')).toBeInTheDocument(); + }); - expect(handleOnDeleteConfirm.mock.calls[0][0]).toStrictEqual([ - ...useGetCasesMockState.data.cases.map(({ id, title }) => ({ id, title })), - { - id: mockCase.id, - title: mockCase.title, - }, - ]); + act(() => { + userEvent.click(result.getByTestId('confirmModalConfirmButton')); + }); + + await waitFor(() => { + expect(deleteCasesSpy).toHaveBeenCalledWith( + [ + 'basic-case-id', + '1', + '2', + '3', + '4', + 'case-with-alerts-id', + 'case-with-alerts-syncoff-id', + 'case-with-registered-attachment', + ], + expect.anything() + ); }); }); @@ -431,6 +385,8 @@ describe('AllCasesListGeneric', () => { }); it('Bulk close status update', async () => { + const updateCasesSpy = jest.spyOn(api, 'updateCases'); + const result = appMockRenderer.render(); const theCase = useGetCasesMockState.data.cases[0]; userEvent.click(result.getByTestId('case-status-filter')); @@ -441,10 +397,16 @@ describe('AllCasesListGeneric', () => { await waitForEuiPopoverOpen(); userEvent.click(result.getByTestId('cases-bulk-close-button')); await waitFor(() => {}); - expect(updateBulkStatus).toBeCalledWith([theCase], CaseStatuses.closed); + + expect(updateCasesSpy).toBeCalledWith( + [{ id: theCase.id, version: theCase.version, status: CaseStatuses.closed }], + expect.anything() + ); }); it('Bulk open status update', async () => { + const updateCasesSpy = jest.spyOn(api, 'updateCases'); + const result = appMockRenderer.render(); const theCase = useGetCasesMockState.data.cases[0]; userEvent.click(result.getByTestId('case-status-filter')); @@ -455,10 +417,16 @@ describe('AllCasesListGeneric', () => { await waitForEuiPopoverOpen(); userEvent.click(result.getByTestId('cases-bulk-open-button')); await waitFor(() => {}); - expect(updateBulkStatus).toBeCalledWith([theCase], CaseStatuses.open); + + expect(updateCasesSpy).toBeCalledWith( + [{ id: theCase.id, version: theCase.version, status: CaseStatuses.open }], + expect.anything() + ); }); it('Bulk in-progress status update', async () => { + const updateCasesSpy = jest.spyOn(api, 'updateCases'); + const result = appMockRenderer.render(); const theCase = useGetCasesMockState.data.cases[0]; userEvent.click(result.getByTestId('case-status-filter')); @@ -469,43 +437,11 @@ describe('AllCasesListGeneric', () => { await waitForEuiPopoverOpen(); userEvent.click(result.getByTestId('cases-bulk-in-progress-button')); await waitFor(() => {}); - expect(updateBulkStatus).toBeCalledWith([theCase], CaseStatuses['in-progress']); - }); - it('isDeleted is true, refetch', async () => { - useDeleteCasesMock.mockReturnValue({ - ...defaultDeleteCases, - isDeleted: true, - }); - - mount( - - - + expect(updateCasesSpy).toBeCalledWith( + [{ id: theCase.id, version: theCase.version, status: CaseStatuses['in-progress'] }], + expect.anything() ); - await waitFor(() => { - expect(refetchCases).toBeCalled(); - // expect(fetchCasesStatus).toBeCalled(); - expect(dispatchResetIsDeleted).toBeCalled(); - }); - }); - - it('isUpdated is true, refetch', async () => { - useUpdateCasesMock.mockReturnValue({ - ...defaultUpdateCases, - isUpdated: true, - }); - - mount( - - - - ); - await waitFor(() => { - expect(refetchCases).toBeCalled(); - // expect(fetchCasesStatus).toBeCalled(); - expect(dispatchResetIsUpdated).toBeCalled(); - }); }); it('should not render table utility bar when isSelectorView=true', async () => { @@ -769,28 +705,10 @@ describe('AllCasesListGeneric', () => { expect(wrapper.find('[data-test-subj="status-badge-in-progress"]').exists()).toBeTruthy(); }); - it('should call doRefresh if provided', async () => { - const doRefresh = jest.fn(); - - const wrapper = mount( - - - - ); - - await act(async () => { - wrapper.find('[data-test-subj="all-cases-refresh"] button').first().simulate('click'); - }); - - expect(doRefresh).toHaveBeenCalled(); - }); - it('shows Solution column if there are no set owners', async () => { - const doRefresh = jest.fn(); - const wrapper = mount( - + ); @@ -801,11 +719,9 @@ describe('AllCasesListGeneric', () => { }); it('hides Solution column if there is a set owner', async () => { - const doRefresh = jest.fn(); - const wrapper = mount( - + ); diff --git a/x-pack/plugins/cases/public/components/all_cases/all_cases_list.tsx b/x-pack/plugins/cases/public/components/all_cases/all_cases_list.tsx index 0bc5e9b14b29a..c7b2d4895f94a 100644 --- a/x-pack/plugins/cases/public/components/all_cases/all_cases_list.tsx +++ b/x-pack/plugins/cases/public/components/all_cases/all_cases_list.tsx @@ -10,7 +10,6 @@ import { EuiProgress, EuiBasicTable, EuiTableSelectionType } from '@elastic/eui' import { difference, head, isEmpty } from 'lodash/fp'; import styled, { css } from 'styled-components'; -import { useQueryClient } from '@tanstack/react-query'; import { Case, CaseStatusWithAllStatus, @@ -38,11 +37,8 @@ import { } from '../../containers/use_get_cases'; import { useBulkGetUserProfiles } from '../../containers/user_profiles/use_bulk_get_user_profiles'; import { useGetCurrentUserProfile } from '../../containers/user_profiles/use_get_current_user_profile'; -import { - USER_PROFILES_BULK_GET_CACHE_KEY, - USER_PROFILES_CACHE_KEY, -} from '../../containers/constants'; import { getAllPermissionsExceptFrom } from '../../utils/permissions'; +import { useIsLoadingCases } from './use_is_loading_cases'; const ProgressLoader = styled(EuiProgress)` ${({ $isShow }: { $isShow: boolean }) => @@ -64,14 +60,13 @@ export interface AllCasesListProps { hiddenStatuses?: CaseStatusWithAllStatus[]; isSelectorView?: boolean; onRowClick?: (theCase?: Case) => void; - doRefresh?: () => void; } export const AllCasesList = React.memo( - ({ hiddenStatuses = [], isSelectorView = false, onRowClick, doRefresh }) => { + ({ hiddenStatuses = [], isSelectorView = false, onRowClick }) => { const { owner, permissions } = useCasesContext(); const availableSolutions = useAvailableCasesOwners(getAllPermissionsExceptFrom('delete')); - const [refresh, setRefresh] = useState(0); + const isLoading = useIsLoadingCases(); const hasOwner = !!owner.length; @@ -80,19 +75,15 @@ export const AllCasesList = React.memo( ...(!isEmpty(hiddenStatuses) && firstAvailableStatus && { status: firstAvailableStatus }), owner: hasOwner ? owner : availableSolutions, }; + const [filterOptions, setFilterOptions] = useState({ ...DEFAULT_FILTER_OPTIONS, ...initialFilterOptions, }); const [queryParams, setQueryParams] = useState(DEFAULT_QUERY_PARAMS); const [selectedCases, setSelectedCases] = useState([]); - const queryClient = useQueryClient(); - const { - data = initialData, - isFetching: isLoadingCases, - refetch: refetchCases, - } = useGetCases({ + const { data = initialData, isFetching: isLoadingCases } = useGetCases({ filterOptions, queryParams, }); @@ -126,41 +117,13 @@ export const AllCasesList = React.memo( [queryParams.sortField, queryParams.sortOrder] ); - const filterRefetch = useRef<() => void>(); const tableRef = useRef(null); - const [isLoading, handleIsLoading] = useState(false); - - const setFilterRefetch = useCallback( - (refetchFilter: () => void) => { - filterRefetch.current = refetchFilter; - }, - [filterRefetch] - ); const deselectCases = useCallback(() => { setSelectedCases([]); tableRef.current?.setSelection([]); }, [setSelectedCases]); - const refreshCases = useCallback( - (dataRefresh = true) => { - deselectCases(); - if (dataRefresh) { - refetchCases(); - queryClient.refetchQueries([USER_PROFILES_CACHE_KEY, USER_PROFILES_BULK_GET_CACHE_KEY]); - - setRefresh((currRefresh: number) => currRefresh + 1); - } - if (doRefresh) { - doRefresh(); - } - if (filterRefetch.current != null) { - filterRefetch.current(); - } - }, - [deselectCases, doRefresh, queryClient, refetchCases] - ); - const tableOnChangeCallback = useCallback( ({ page, sort }: EuiBasicTableOnChange) => { let newQueryParams = queryParams; @@ -179,9 +142,9 @@ export const AllCasesList = React.memo( }; } setQueryParams(newQueryParams); - refreshCases(false); + deselectCases(); }, - [queryParams, refreshCases, setQueryParams] + [queryParams, deselectCases, setQueryParams] ); const onFilterChangedCallback = useCallback( @@ -229,9 +192,8 @@ export const AllCasesList = React.memo( } : {}), })); - refreshCases(false); }, - [deselectCases, refreshCases, hasOwner, availableSolutions, owner] + [deselectCases, hasOwner, availableSolutions, owner] ); /** @@ -244,8 +206,6 @@ export const AllCasesList = React.memo( filterStatus: filterOptions.status ?? StatusAll, userProfiles: userProfiles ?? new Map(), currentUserProfile, - handleIsLoading, - refreshCases, isSelectorView, connectors, onRowClick, @@ -286,7 +246,7 @@ export const AllCasesList = React.memo( className="essentialAnimation" $isShow={isLoading || isLoadingCases} /> - {!isSelectorView ? : null} + {!isSelectorView ? : null} ( owner: filterOptions.owner, severity: filterOptions.severity, }} - setFilterRefetch={setFilterRefetch} hiddenStatuses={hiddenStatuses} displayCreateCaseButton={isSelectorView} onCreateCasePressed={onRowClick} @@ -315,20 +274,19 @@ export const AllCasesList = React.memo( data={data} filterOptions={filterOptions} goToCreateCase={onRowClick} - handleIsLoading={handleIsLoading} isCasesLoading={isLoadingCases} isCommentUpdating={isLoadingCases} isDataEmpty={isDataEmpty} isSelectorView={isSelectorView} onChange={tableOnChangeCallback} pagination={pagination} - refreshCases={refreshCases} selectedCases={selectedCases} selection={euiBasicTableSelectionProps} showActions={showActions} sorting={sorting} tableRef={tableRef} tableRowProps={tableRowProps} + deselectCases={deselectCases} /> ); diff --git a/x-pack/plugins/cases/public/components/all_cases/cases_metrics.test.tsx b/x-pack/plugins/cases/public/components/all_cases/cases_metrics.test.tsx index 6141527d59f42..323f9deead3eb 100644 --- a/x-pack/plugins/cases/public/components/all_cases/cases_metrics.test.tsx +++ b/x-pack/plugins/cases/public/components/all_cases/cases_metrics.test.tsx @@ -5,46 +5,29 @@ * 2.0. */ -import { within } from '@testing-library/dom'; +import { waitFor, within } from '@testing-library/react'; import React from 'react'; import { AppMockRenderer, createAppMockRenderer } from '../../common/mock'; -import { useGetCasesMetrics } from '../../containers/use_get_cases_metrics'; -import { useGetCasesStatus } from '../../containers/use_get_cases_status'; import { CasesMetrics } from './cases_metrics'; -jest.mock('../../containers/use_get_cases_metrics'); -jest.mock('../../containers/use_get_cases_status'); - -const useGetCasesMetricsMock = useGetCasesMetrics as jest.Mock; -const useGetCasesStatusMock = useGetCasesStatus as jest.Mock; +jest.mock('../../api'); describe('Cases metrics', () => { - useGetCasesStatusMock.mockReturnValue({ - countOpenCases: 2, - countInProgressCases: 3, - countClosedCases: 4, - isLoading: false, - fetchCasesStatus: jest.fn(), - }); - useGetCasesMetricsMock.mockReturnValue({ - // 600 seconds = 10m - mttr: 600, - isLoading: false, - fetchCasesMetrics: jest.fn(), - }); - let appMockRenderer: AppMockRenderer; beforeEach(() => { appMockRenderer = createAppMockRenderer(); }); - it('renders the correct stats', () => { - const result = appMockRenderer.render(); - expect(result.getByTestId('cases-metrics-stats')).toBeTruthy(); - expect(within(result.getByTestId('openStatsHeader')).getByText(2)).toBeTruthy(); - expect(within(result.getByTestId('inProgressStatsHeader')).getByText(3)).toBeTruthy(); - expect(within(result.getByTestId('closedStatsHeader')).getByText(4)).toBeTruthy(); - expect(within(result.getByTestId('mttrStatsHeader')).getByText('10m')).toBeTruthy(); + it('renders the correct stats', async () => { + const result = appMockRenderer.render(); + + await waitFor(() => { + expect(result.getByTestId('cases-metrics-stats')).toBeTruthy(); + expect(within(result.getByTestId('openStatsHeader')).getByText(20)).toBeTruthy(); + expect(within(result.getByTestId('inProgressStatsHeader')).getByText(40)).toBeTruthy(); + expect(within(result.getByTestId('closedStatsHeader')).getByText(130)).toBeTruthy(); + expect(within(result.getByTestId('mttrStatsHeader')).getByText('12s')).toBeTruthy(); + }); }); }); diff --git a/x-pack/plugins/cases/public/components/all_cases/cases_metrics.tsx b/x-pack/plugins/cases/public/components/all_cases/cases_metrics.tsx index e75f0fd8a6708..ca6434aa11c26 100644 --- a/x-pack/plugins/cases/public/components/all_cases/cases_metrics.tsx +++ b/x-pack/plugins/cases/public/components/all_cases/cases_metrics.tsx @@ -5,7 +5,7 @@ * 2.0. */ -import React, { FunctionComponent, useEffect, useMemo } from 'react'; +import React, { useMemo } from 'react'; import { EuiDescriptionList, EuiFlexGroup, @@ -22,9 +22,6 @@ import { StatusStats } from '../status/status_stats'; import { useGetCasesMetrics } from '../../containers/use_get_cases_metrics'; import { ATTC_DESCRIPTION, ATTC_STAT } from './translations'; -interface CountProps { - refresh?: number; -} const MetricsFlexGroup = styled.div` ${({ theme }) => css` .euiFlexGroup { @@ -40,29 +37,23 @@ const MetricsFlexGroup = styled.div` `} `; -export const CasesMetrics: FunctionComponent = ({ refresh }) => { +export const CasesMetrics: React.FC = () => { const { - countOpenCases, - countInProgressCases, - countClosedCases, + data: { countOpenCases, countInProgressCases, countClosedCases } = { + countOpenCases: 0, + countInProgressCases: 0, + countClosedCases: 0, + }, isLoading: isCasesStatusLoading, - fetchCasesStatus, } = useGetCasesStatus(); - const { mttr, isLoading: isCasesMetricsLoading, fetchCasesMetrics } = useGetCasesMetrics(); + const { data: { mttr } = { mttr: 0 }, isLoading: isCasesMetricsLoading } = useGetCasesMetrics(); const mttrValue = useMemo( () => (mttr != null ? prettyMilliseconds(mttr * 1000, { compact: true, verbose: false }) : '-'), [mttr] ); - useEffect(() => { - if (refresh != null) { - fetchCasesStatus(); - fetchCasesMetrics(); - } - }, [fetchCasesMetrics, fetchCasesStatus, refresh]); - return ( diff --git a/x-pack/plugins/cases/public/components/all_cases/columns.tsx b/x-pack/plugins/cases/public/components/all_cases/columns.tsx index 00e9fb077589a..948abdbbcd2f3 100644 --- a/x-pack/plugins/cases/public/components/all_cases/columns.tsx +++ b/x-pack/plugins/cases/public/components/all_cases/columns.tsx @@ -5,7 +5,7 @@ * 2.0. */ -import React, { useCallback, useEffect, useMemo, useState } from 'react'; +import React, { useCallback, useMemo, useState } from 'react'; import { EuiBadgeGroup, EuiBadge, @@ -24,7 +24,7 @@ import { RIGHT_ALIGNMENT } from '@elastic/eui/lib/services'; import styled from 'styled-components'; import { UserProfileWithAvatar } from '@kbn/user-profile-components'; -import { Case, DeleteCase, UpdateByKey } from '../../../common/ui/types'; +import { Case, UpdateByKey } from '../../../common/ui/types'; import { CaseStatuses, ActionConnector, CaseSeverity } from '../../../common/api'; import { OWNER_INFO } from '../../../common/constants'; import { getEmptyTagValue } from '../empty_value'; @@ -49,6 +49,7 @@ import { getUsernameDataTestSubj } from '../user_profiles/data_test_subject'; import { CurrentUserProfile } from '../types'; import { SmallUserAvatar } from '../user_profiles/small_user_avatar'; import { useCasesFeatures } from '../../common/use_cases_features'; +import { useRefreshCases } from './use_on_refresh_cases'; export type CasesColumns = | EuiTableActionsColumnType @@ -103,8 +104,6 @@ export interface GetCasesColumn { filterStatus: string; userProfiles: Map; currentUserProfile: CurrentUserProfile; - handleIsLoading: (a: boolean) => void; - refreshCases?: (a?: boolean) => void; isSelectorView: boolean; connectors?: ActionConnector[]; onRowClick?: (theCase: Case) => void; @@ -115,41 +114,40 @@ export const useCasesColumns = ({ filterStatus, userProfiles, currentUserProfile, - handleIsLoading, - refreshCases, isSelectorView, connectors = [], onRowClick, showSolutionColumn, }: GetCasesColumn): CasesColumns[] => { - // Delete case - const { - dispatchResetIsDeleted, - handleOnDeleteConfirm, - handleToggleModal, - isDeleted, - isDisplayConfirmDeleteModal, - isLoading: isDeleting, - } = useDeleteCases(); - + const [isModalVisible, setIsModalVisible] = useState(false); + const { mutate: deleteCases } = useDeleteCases(); + const refreshCases = useRefreshCases(); const { isAlertsEnabled, caseAssignmentAuthorized } = useCasesFeatures(); const { permissions } = useCasesContext(); - - const [deleteThisCase, setDeleteThisCase] = useState({ - id: '', - title: '', - }); - + const [caseToBeDeleted, setCaseToBeDeleted] = useState(); const { updateCaseProperty, isLoading: isLoadingUpdateCase } = useUpdateCase(); - const toggleDeleteModal = useCallback( - (deleteCase: Case) => { - handleToggleModal(); - setDeleteThisCase({ id: deleteCase.id, title: deleteCase.title }); + const closeModal = useCallback(() => setIsModalVisible(false), []); + const openModal = useCallback(() => setIsModalVisible(true), []); + + const onDeleteAction = useCallback( + (theCase: Case) => { + openModal(); + setCaseToBeDeleted(theCase.id); }, - [handleToggleModal] + [openModal] ); + const onConfirmDeletion = useCallback(() => { + closeModal(); + if (caseToBeDeleted) { + deleteCases({ + caseIds: [caseToBeDeleted], + successToasterTitle: i18n.DELETED_CASES(1), + }); + } + }, [caseToBeDeleted, closeModal, deleteCases]); + const handleDispatchUpdate = useCallback( ({ updateKey, updateValue, caseData }: UpdateByKey) => { updateCaseProperty({ @@ -157,7 +155,7 @@ export const useCasesColumns = ({ updateValue, caseData, onSuccess: () => { - if (refreshCases != null) refreshCases(); + refreshCases(); }, }); }, @@ -167,9 +165,9 @@ export const useCasesColumns = ({ const actions = useMemo( () => getActions({ - deleteCaseOnClick: toggleDeleteModal, + deleteCaseOnClick: onDeleteAction, }), - [toggleDeleteModal] + [onDeleteAction] ); const assignCaseAction = useCallback( @@ -181,17 +179,6 @@ export const useCasesColumns = ({ [onRowClick] ); - useEffect(() => { - handleIsLoading(isDeleting || isLoadingUpdateCase); - }, [handleIsLoading, isDeleting, isLoadingUpdateCase]); - - useEffect(() => { - if (isDeleted) { - if (refreshCases != null) refreshCases(); - dispatchResetIsDeleted(); - } - }, [isDeleted, dispatchResetIsDeleted, refreshCases]); - return [ { name: i18n.NAME, @@ -421,12 +408,13 @@ export const useCasesColumns = ({ name: ( <> {i18n.ACTIONS} - + {isModalVisible ? ( + + ) : null} ), actions, diff --git a/x-pack/plugins/cases/public/components/all_cases/index.test.tsx b/x-pack/plugins/cases/public/components/all_cases/index.test.tsx index 6fd1556f7d4e1..55777dd5bd34c 100644 --- a/x-pack/plugins/cases/public/components/all_cases/index.test.tsx +++ b/x-pack/plugins/cases/public/components/all_cases/index.test.tsx @@ -15,8 +15,7 @@ import { noCreateCasesPermissions, } from '../../common/mock'; import { useGetActionLicense } from '../../containers/use_get_action_license'; -import { casesStatus, connectorsMock, useGetCasesMockState } from '../../containers/mock'; -import { useGetCasesStatus } from '../../containers/use_get_cases_status'; +import { connectorsMock, useGetCasesMockState } from '../../containers/mock'; import { useGetConnectors } from '../../containers/configure/use_connectors'; import { useGetTags } from '../../containers/use_get_tags'; import { useGetCases } from '../../containers/use_get_cases'; @@ -33,13 +32,12 @@ jest.mock('../../containers/use_get_action_license', () => { jest.mock('../../containers/configure/use_connectors'); jest.mock('../../containers/api'); jest.mock('../../containers/use_get_cases'); -jest.mock('../../containers/use_get_cases_status'); jest.mock('../../containers/user_profiles/use_get_current_user_profile'); jest.mock('../../containers/user_profiles/use_bulk_get_user_profiles'); +jest.mock('../../api'); const useGetConnectorsMock = useGetConnectors as jest.Mock; const useGetCasesMock = useGetCases as jest.Mock; -const useGetCasesStatusMock = useGetCasesStatus as jest.Mock; const useGetActionLicenseMock = useGetActionLicense as jest.Mock; const useGetCurrentUserProfileMock = useGetCurrentUserProfile as jest.Mock; const useBulkGetUserProfilesMock = useBulkGetUserProfiles as jest.Mock; @@ -49,7 +47,6 @@ describe('AllCases', () => { const setFilters = jest.fn(); const setQueryParams = jest.fn(); const setSelectedCases = jest.fn(); - const fetchCasesStatus = jest.fn(); const defaultGetCases = { ...useGetCasesMockState, @@ -59,13 +56,6 @@ describe('AllCases', () => { setSelectedCases, }; - const defaultCasesStatus = { - ...casesStatus, - fetchCasesStatus, - isError: false, - isLoading: false, - }; - const defaultActionLicense = { data: null, isLoading: false, @@ -75,7 +65,6 @@ describe('AllCases', () => { beforeAll(() => { (useGetTags as jest.Mock).mockReturnValue({ data: ['coke', 'pepsi'], refetch: jest.fn() }); useGetConnectorsMock.mockImplementation(() => ({ data: connectorsMock, isLoading: false })); - useGetCasesStatusMock.mockReturnValue(defaultCasesStatus); useGetActionLicenseMock.mockReturnValue(defaultActionLicense); useGetCasesMock.mockReturnValue(defaultGetCases); @@ -142,8 +131,6 @@ describe('AllCases', () => { }); it('should render the loading spinner when loading stats', async () => { - useGetCasesStatusMock.mockReturnValue({ ...defaultCasesStatus, isLoading: true }); - const result = appMockRender.render(); await waitFor(() => { diff --git a/x-pack/plugins/cases/public/components/all_cases/table.tsx b/x-pack/plugins/cases/public/components/all_cases/table.tsx index afe653a50e4db..208c26e47648c 100644 --- a/x-pack/plugins/cases/public/components/all_cases/table.tsx +++ b/x-pack/plugins/cases/public/components/all_cases/table.tsx @@ -29,20 +29,19 @@ interface CasesTableProps { data: Cases; filterOptions: FilterOptions; goToCreateCase?: () => void; - handleIsLoading: (a: boolean) => void; isCasesLoading: boolean; isCommentUpdating: boolean; isDataEmpty: boolean; isSelectorView?: boolean; onChange: EuiBasicTableProps['onChange']; pagination: Pagination; - refreshCases: (a?: boolean) => void; selectedCases: Case[]; selection: EuiTableSelectionType; showActions: boolean; sorting: EuiBasicTableProps['sorting']; tableRef: MutableRefObject; tableRowProps: EuiBasicTableProps['rowProps']; + deselectCases: () => void; } const Div = styled.div` @@ -54,20 +53,19 @@ export const CasesTable: FunctionComponent = ({ data, filterOptions, goToCreateCase, - handleIsLoading, isCasesLoading, isCommentUpdating, isDataEmpty, isSelectorView, onChange, pagination, - refreshCases, selectedCases, selection, showActions, sorting, tableRef, tableRowProps, + deselectCases, }) => { const { permissions } = useCasesContext(); const { getCreateCaseUrl, navigateToCreateCase } = useCreateCaseNavigation(); @@ -93,9 +91,8 @@ export const CasesTable: FunctionComponent = ({ data={data} enableBulkActions={showActions} filterOptions={filterOptions} - handleIsLoading={handleIsLoading} selectedCases={selectedCases} - refreshCases={refreshCases} + deselectCases={deselectCases} /> { expect(onFilterChanged).toBeCalledWith({ status: CaseStatuses.closed }); }); - it('should call on load setFilterRefetch', () => { - mount( - - - - ); - expect(setFilterRefetch).toHaveBeenCalled(); - }); - it('should remove tag from selected tags when tag no longer exists', () => { const ourProps = { ...props, diff --git a/x-pack/plugins/cases/public/components/all_cases/table_filters.tsx b/x-pack/plugins/cases/public/components/all_cases/table_filters.tsx index 5ab587ad31759..75fc22a9fee27 100644 --- a/x-pack/plugins/cases/public/components/all_cases/table_filters.tsx +++ b/x-pack/plugins/cases/public/components/all_cases/table_filters.tsx @@ -19,7 +19,6 @@ import { StatusFilter } from './status_filter'; import * as i18n from './translations'; import { SeverityFilter } from './severity_filter'; import { useGetTags } from '../../containers/use_get_tags'; -import { CASE_LIST_CACHE_KEY } from '../../containers/constants'; import { DEFAULT_FILTER_OPTIONS } from '../../containers/use_get_cases'; import { AssigneesFilterPopover } from './assignees_filter'; import { CurrentUserProfile } from '../types'; @@ -31,7 +30,6 @@ interface CasesTableFiltersProps { countOpenCases: number | null; onFilterChanged: (filterOptions: Partial) => void; initial: FilterOptions; - setFilterRefetch: (val: () => void) => void; hiddenStatuses?: CaseStatusWithAllStatus[]; availableSolutions: string[]; displayCreateCaseButton?: boolean; @@ -59,7 +57,6 @@ const CasesTableFiltersComponent = ({ countInProgressCases, onFilterChanged, initial = DEFAULT_FILTER_OPTIONS, - setFilterRefetch, hiddenStatuses, availableSolutions, displayCreateCaseButton, @@ -71,19 +68,9 @@ const CasesTableFiltersComponent = ({ const [selectedTags, setSelectedTags] = useState(initial.tags); const [selectedOwner, setSelectedOwner] = useState([]); const [selectedAssignees, setSelectedAssignees] = useState([]); - const { data: tags = [], refetch: fetchTags } = useGetTags(CASE_LIST_CACHE_KEY); + const { data: tags = [] } = useGetTags(); const { caseAssignmentAuthorized } = useCasesFeatures(); - const refetch = useCallback(() => { - fetchTags(); - }, [fetchTags]); - - useEffect(() => { - if (setFilterRefetch != null) { - setFilterRefetch(refetch); - } - }, [refetch, setFilterRefetch]); - const handleSelectedAssignees = useCallback( (newAssignees: UserProfileWithAvatar[]) => { if (!isEqual(newAssignees, selectedAssignees)) { diff --git a/x-pack/plugins/cases/public/components/all_cases/translations.ts b/x-pack/plugins/cases/public/components/all_cases/translations.ts index 0c4fe02993ea3..96a683aee5077 100644 --- a/x-pack/plugins/cases/public/components/all_cases/translations.ts +++ b/x-pack/plugins/cases/public/components/all_cases/translations.ts @@ -71,10 +71,6 @@ export const CLOSED = i18n.translate('xpack.cases.caseTable.closed', { defaultMessage: 'Closed', }); -export const DELETE = i18n.translate('xpack.cases.caseTable.delete', { - defaultMessage: 'Delete', -}); - export const SELECT = i18n.translate('xpack.cases.caseTable.select', { defaultMessage: 'Select', }); @@ -134,3 +130,40 @@ export const TOTAL_ASSIGNEES_FILTERED = (total: number) => defaultMessage: '{total, plural, one {# assignee} other {# assignees}} filtered', values: { total }, }); + +export const CLOSED_CASES = ({ + totalCases, + caseTitle, +}: { + totalCases: number; + caseTitle?: string; +}) => + i18n.translate('xpack.cases.containers.closedCases', { + values: { caseTitle, totalCases }, + defaultMessage: 'Closed {totalCases, plural, =1 {"{caseTitle}"} other {{totalCases} cases}}', + }); + +export const REOPENED_CASES = ({ + totalCases, + caseTitle, +}: { + totalCases: number; + caseTitle?: string; +}) => + i18n.translate('xpack.cases.containers.reopenedCases', { + values: { caseTitle, totalCases }, + defaultMessage: 'Opened {totalCases, plural, =1 {"{caseTitle}"} other {{totalCases} cases}}', + }); + +export const MARK_IN_PROGRESS_CASES = ({ + totalCases, + caseTitle, +}: { + totalCases: number; + caseTitle?: string; +}) => + i18n.translate('xpack.cases.containers.markInProgressCases', { + values: { caseTitle, totalCases }, + defaultMessage: + 'Marked {totalCases, plural, =1 {"{caseTitle}"} other {{totalCases} cases}} as in progress', + }); diff --git a/x-pack/plugins/cases/public/components/all_cases/use_is_loading_cases.tsx b/x-pack/plugins/cases/public/components/all_cases/use_is_loading_cases.tsx new file mode 100644 index 0000000000000..70f46464ed2f8 --- /dev/null +++ b/x-pack/plugins/cases/public/components/all_cases/use_is_loading_cases.tsx @@ -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 { useIsMutating } from '@tanstack/react-query'; +import { casesMutationsKeys } from '../../containers/constants'; + +/** + * Returns true or false if any of the queries and mutations + * are fetching in the all cases page + */ + +export const useIsLoadingCases = (): boolean => { + const isDeletingCases = useIsMutating(casesMutationsKeys.deleteCases); + const isUpdatingCases = useIsMutating(casesMutationsKeys.updateCases); + return Boolean(isDeletingCases) || Boolean(isUpdatingCases); +}; diff --git a/x-pack/plugins/cases/public/components/all_cases/use_on_refresh_cases.test.tsx b/x-pack/plugins/cases/public/components/all_cases/use_on_refresh_cases.test.tsx new file mode 100644 index 0000000000000..cd077004b5cf9 --- /dev/null +++ b/x-pack/plugins/cases/public/components/all_cases/use_on_refresh_cases.test.tsx @@ -0,0 +1,36 @@ +/* + * 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, renderHook } from '@testing-library/react-hooks'; +import { AppMockRenderer, createAppMockRenderer } from '../../common/mock'; +import { casesQueriesKeys } from '../../containers/constants'; +import { useRefreshCases } from './use_on_refresh_cases'; + +describe('useRefreshCases', () => { + let appMockRender: AppMockRenderer; + + beforeEach(() => { + appMockRender = createAppMockRenderer(); + jest.clearAllMocks(); + }); + + it('should refresh data on refresh', async () => { + const queryClientSpy = jest.spyOn(appMockRender.queryClient, 'invalidateQueries'); + + const { result } = renderHook(() => useRefreshCases(), { + wrapper: appMockRender.AppWrapper, + }); + + act(() => { + result.current(); + }); + + expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.casesList()); + expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.tags()); + expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.userProfiles()); + }); +}); diff --git a/x-pack/plugins/cases/public/components/all_cases/use_on_refresh_cases.tsx b/x-pack/plugins/cases/public/components/all_cases/use_on_refresh_cases.tsx new file mode 100644 index 0000000000000..b50bed282cce1 --- /dev/null +++ b/x-pack/plugins/cases/public/components/all_cases/use_on_refresh_cases.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 { useCallback } from 'react'; +import { useQueryClient } from '@tanstack/react-query'; +import { casesQueriesKeys } from '../../containers/constants'; + +/** + * Using react-query queryClient to invalidate all the + * cases table page cache namespace. + * + * This effectively clears the cache for all the cases table pages and + * forces the page to fetch all the data again. Including + * all cases, user profiles, statuses, metrics, tags, etc. + */ + +export const useRefreshCases = () => { + const queryClient = useQueryClient(); + return useCallback(() => { + queryClient.invalidateQueries(casesQueriesKeys.casesList()); + queryClient.invalidateQueries(casesQueriesKeys.tags()); + queryClient.invalidateQueries(casesQueriesKeys.userProfiles()); + }, [queryClient]); +}; diff --git a/x-pack/plugins/cases/public/components/all_cases/utility_bar.tsx b/x-pack/plugins/cases/public/components/all_cases/utility_bar.tsx index a6247cedd3fac..fdfcdc17d472c 100644 --- a/x-pack/plugins/cases/public/components/all_cases/utility_bar.tsx +++ b/x-pack/plugins/cases/public/components/all_cases/utility_bar.tsx @@ -5,8 +5,9 @@ * 2.0. */ -import React, { FunctionComponent, useCallback, useEffect, useState } from 'react'; +import React, { FunctionComponent, useCallback, useState } from 'react'; import { EuiContextMenuPanel } from '@elastic/eui'; +import { CaseStatuses } from '../../../common'; import { UtilityBar, UtilityBarAction, @@ -15,88 +16,70 @@ import { UtilityBarText, } from '../utility_bar'; import * as i18n from './translations'; -import { Cases, Case, DeleteCase, FilterOptions } from '../../../common/ui/types'; +import { Cases, Case, FilterOptions } from '../../../common/ui/types'; import { getBulkItems } from '../bulk_actions'; import { useDeleteCases } from '../../containers/use_delete_cases'; import { ConfirmDeleteCaseModal } from '../confirm_delete_case'; import { useUpdateCases } from '../../containers/use_bulk_update_case'; +import { useRefreshCases } from './use_on_refresh_cases'; -interface OwnProps { +interface Props { data: Cases; enableBulkActions: boolean; filterOptions: FilterOptions; - handleIsLoading: (a: boolean) => void; - refreshCases?: (a?: boolean) => void; selectedCases: Case[]; + deselectCases: () => void; } -type Props = OwnProps; +export const getStatusToasterMessage = (status: CaseStatuses, cases: Case[]): string => { + const totalCases = cases.length; + const caseTitle = totalCases === 1 ? cases[0].title : ''; + + if (status === CaseStatuses.open) { + return i18n.REOPENED_CASES({ totalCases, caseTitle }); + } else if (status === CaseStatuses['in-progress']) { + return i18n.MARK_IN_PROGRESS_CASES({ totalCases, caseTitle }); + } else if (status === CaseStatuses.closed) { + return i18n.CLOSED_CASES({ totalCases, caseTitle }); + } + + return ''; +}; export const CasesTableUtilityBar: FunctionComponent = ({ data, enableBulkActions = false, filterOptions, - handleIsLoading, - refreshCases, selectedCases, + deselectCases, }) => { - const [deleteCases, setDeleteCases] = useState([]); - - // Delete case - const { - dispatchResetIsDeleted, - handleOnDeleteConfirm, - handleToggleModal, - isLoading: isDeleting, - isDeleted, - isDisplayConfirmDeleteModal, - } = useDeleteCases(); + const [isModalVisible, setIsModalVisible] = useState(false); + const onCloseModal = useCallback(() => setIsModalVisible(false), []); + const refreshCases = useRefreshCases(); - // Update case - const { - dispatchResetIsUpdated, - isLoading: isUpdating, - isUpdated, - updateBulkStatus, - } = useUpdateCases(); + const { mutate: deleteCases } = useDeleteCases(); + const { mutate: updateCases } = useUpdateCases(); - useEffect(() => { - handleIsLoading(isDeleting); - }, [handleIsLoading, isDeleting]); + const toggleBulkDeleteModal = useCallback((cases: Case[]) => { + setIsModalVisible(true); + }, []); - useEffect(() => { - handleIsLoading(isUpdating); - }, [handleIsLoading, isUpdating]); - useEffect(() => { - if (isDeleted) { - if (refreshCases != null) refreshCases(); - dispatchResetIsDeleted(); - } - if (isUpdated) { - if (refreshCases != null) refreshCases(); - dispatchResetIsUpdated(); - } - }, [isDeleted, isUpdated, refreshCases, dispatchResetIsDeleted, dispatchResetIsUpdated]); - - const toggleBulkDeleteModal = useCallback( - (cases: Case[]) => { - handleToggleModal(); - - const convertToDeleteCases: DeleteCase[] = cases.map(({ id, title }) => ({ - id, - title, + const handleUpdateCaseStatus = useCallback( + (status: CaseStatuses) => { + const casesToUpdate = selectedCases.map((theCase) => ({ + status, + id: theCase.id, + version: theCase.version, })); - setDeleteCases(convertToDeleteCases); - }, - [setDeleteCases, handleToggleModal] - ); - const handleUpdateCaseStatus = useCallback( - (status: string) => { - updateBulkStatus(selectedCases, status); + updateCases({ + cases: casesToUpdate, + successToasterTitle: getStatusToasterMessage(status, selectedCases), + }); }, - [selectedCases, updateBulkStatus] + [selectedCases, updateCases] ); + const getBulkItemsPopoverContent = useCallback( (closePopover: () => void) => ( = ({ [selectedCases, filterOptions.status, toggleBulkDeleteModal, handleUpdateCaseStatus] ); + const onConfirmDeletion = useCallback(() => { + setIsModalVisible(false); + deleteCases({ + caseIds: selectedCases.map(({ id }) => id), + successToasterTitle: i18n.DELETED_CASES(selectedCases.length), + }); + }, [deleteCases, selectedCases]); + + const onRefresh = useCallback(() => { + deselectCases(); + refreshCases(); + }, [deselectCases, refreshCases]); + return ( @@ -141,20 +137,20 @@ export const CasesTableUtilityBar: FunctionComponent = ({ {i18n.REFRESH} - + {isModalVisible ? ( + + ) : null} ); }; diff --git a/x-pack/plugins/cases/public/components/bulk_actions/index.tsx b/x-pack/plugins/cases/public/components/bulk_actions/index.tsx index 8cf3a14ffd3ce..fcf2002f8882c 100644 --- a/x-pack/plugins/cases/public/components/bulk_actions/index.tsx +++ b/x-pack/plugins/cases/public/components/bulk_actions/index.tsx @@ -19,7 +19,7 @@ interface GetBulkItems { closePopover: () => void; deleteCasesAction: (cases: Case[]) => void; selectedCases: Case[]; - updateCaseStatus: (status: string) => void; + updateCaseStatus: (status: CaseStatuses) => void; } export const getBulkItems = ({ diff --git a/x-pack/plugins/cases/public/components/case_action_bar/actions.test.tsx b/x-pack/plugins/cases/public/components/case_action_bar/actions.test.tsx index 8735b94d71b2c..cf15d546415be 100644 --- a/x-pack/plugins/cases/public/components/case_action_bar/actions.test.tsx +++ b/x-pack/plugins/cases/public/components/case_action_bar/actions.test.tsx @@ -8,13 +8,14 @@ import React from 'react'; import { mount } from 'enzyme'; -import { useDeleteCases } from '../../containers/use_delete_cases'; import { noDeleteCasesPermissions, TestProviders } from '../../common/mock'; import { basicCase, basicPush } from '../../containers/mock'; import { Actions } from './actions'; import * as i18n from '../case_view/translations'; -jest.mock('../../containers/use_delete_cases'); -const useDeleteCasesMock = useDeleteCases as jest.Mock; +import * as api from '../../containers/api'; +import { waitFor } from '@testing-library/dom'; + +jest.mock('../../containers/api'); jest.mock('react-router-dom', () => { const original = jest.requireActual('react-router-dom'); @@ -26,6 +27,7 @@ jest.mock('react-router-dom', () => { }), }; }); + const defaultProps = { allCasesNavigation: { href: 'all-cases-href', @@ -34,23 +36,10 @@ const defaultProps = { caseData: basicCase, currentExternalIncident: null, }; -describe('CaseView actions', () => { - const handleOnDeleteConfirm = jest.fn(); - const handleToggleModal = jest.fn(); - const dispatchResetIsDeleted = jest.fn(); - const defaultDeleteState = { - dispatchResetIsDeleted, - handleToggleModal, - handleOnDeleteConfirm, - isLoading: false, - isError: false, - isDeleted: false, - isDisplayConfirmDeleteModal: false, - }; +describe('CaseView actions', () => { beforeEach(() => { jest.resetAllMocks(); - useDeleteCasesMock.mockImplementation(() => defaultDeleteState); }); it('clicking trash toggles modal', () => { @@ -61,10 +50,9 @@ describe('CaseView actions', () => { ); expect(wrapper.find('[data-test-subj="confirm-delete-case-modal"]').exists()).toBeFalsy(); - wrapper.find('button[data-test-subj="property-actions-ellipses"]').first().simulate('click'); wrapper.find('button[data-test-subj="property-actions-trash"]').simulate('click'); - expect(handleToggleModal).toHaveBeenCalled(); + expect(wrapper.find('[data-test-subj="confirm-delete-case-modal"]').exists()).toBeTruthy(); }); it('does not show trash icon when user does not have deletion privileges', () => { @@ -78,22 +66,26 @@ describe('CaseView actions', () => { expect(wrapper.find('button[data-test-subj="property-actions-ellipses"]').exists()).toBeFalsy(); }); - it('toggle delete modal and confirm', () => { - useDeleteCasesMock.mockImplementation(() => ({ - ...defaultDeleteState, - isDisplayConfirmDeleteModal: true, - })); + it('toggle delete modal and confirm', async () => { + const deleteCasesSpy = jest + .spyOn(api, 'deleteCases') + .mockRejectedValue(new Error('useDeleteCases: Test error')); + const wrapper = mount( ); + wrapper.find('button[data-test-subj="property-actions-ellipses"]').first().simulate('click'); + wrapper.find('button[data-test-subj="property-actions-trash"]').simulate('click'); + expect(wrapper.find('[data-test-subj="confirm-delete-case-modal"]').exists()).toBeTruthy(); wrapper.find('button[data-test-subj="confirmModalConfirmButton"]').simulate('click'); - expect(handleOnDeleteConfirm.mock.calls[0][0]).toEqual([ - { id: basicCase.id, title: basicCase.title }, - ]); + + await waitFor(() => { + expect(deleteCasesSpy).toHaveBeenCalledWith(['basic-case-id'], expect.anything()); + }); }); it('displays active incident link', () => { diff --git a/x-pack/plugins/cases/public/components/case_action_bar/actions.tsx b/x-pack/plugins/cases/public/components/case_action_bar/actions.tsx index 975cf89fc1031..2481822f76b8d 100644 --- a/x-pack/plugins/cases/public/components/case_action_bar/actions.tsx +++ b/x-pack/plugins/cases/public/components/case_action_bar/actions.tsx @@ -6,7 +6,7 @@ */ import { isEmpty } from 'lodash/fp'; -import React, { useMemo } from 'react'; +import React, { useCallback, useMemo, useState } from 'react'; import { EuiFlexItem } from '@elastic/eui'; import * as i18n from '../case_view/translations'; import { useDeleteCases } from '../../containers/use_delete_cases'; @@ -23,11 +23,18 @@ interface CaseViewActions { } const ActionsComponent: React.FC = ({ caseData, currentExternalIncident }) => { - // Delete case - const { handleToggleModal, handleOnDeleteConfirm, isDeleted, isDisplayConfirmDeleteModal } = - useDeleteCases(); + const { mutate: deleteCases } = useDeleteCases(); const { navigateToAllCases } = useAllCasesNavigation(); const { permissions } = useCasesContext(); + const [isModalVisible, setIsModalVisible] = useState(false); + + const openModal = useCallback(() => { + setIsModalVisible(true); + }, []); + + const closeModal = useCallback(() => { + setIsModalVisible(false); + }, []); const propertyActions = useMemo( () => [ @@ -36,7 +43,7 @@ const ActionsComponent: React.FC = ({ caseData, currentExternal { iconType: 'trash', label: i18n.DELETE_CASE(), - onClick: handleToggleModal, + onClick: openModal, }, ] : []), @@ -50,13 +57,16 @@ const ActionsComponent: React.FC = ({ caseData, currentExternal ] : []), ], - [handleToggleModal, currentExternalIncident, permissions.delete] + [permissions.delete, openModal, currentExternalIncident] ); - if (isDeleted) { - navigateToAllCases(); - return null; - } + const onConfirmDeletion = useCallback(() => { + setIsModalVisible(false); + deleteCases( + { caseIds: [caseData.id], successToasterTitle: i18n.DELETED_CASES(1) }, + { onSuccess: navigateToAllCases } + ); + }, [caseData.id, deleteCases, navigateToAllCases]); if (propertyActions.length === 0) { return null; @@ -65,12 +75,13 @@ const ActionsComponent: React.FC = ({ caseData, currentExternal return ( - + {isModalVisible ? ( + + ) : null} ); }; diff --git a/x-pack/plugins/cases/public/components/case_view/index.test.tsx b/x-pack/plugins/cases/public/components/case_view/index.test.tsx index 20cf2c8d0d9b4..6a5fd8fad8113 100644 --- a/x-pack/plugins/cases/public/components/case_view/index.test.tsx +++ b/x-pack/plugins/cases/public/components/case_view/index.test.tsx @@ -30,7 +30,7 @@ import { AppMockRenderer, createAppMockRenderer } from '../../common/mock'; import CaseView from '.'; import { waitFor } from '@testing-library/dom'; import { useGetTags } from '../../containers/use_get_tags'; -import { CASE_VIEW_CACHE_KEY } from '../../containers/constants'; +import { casesQueriesKeys } from '../../containers/constants'; import { alertsHit, caseViewProps, @@ -173,7 +173,8 @@ describe('CaseView', () => { const queryClientSpy = jest.spyOn(appMockRenderer.queryClient, 'invalidateQueries'); const result = appMockRenderer.render(); userEvent.click(result.getByTestId('case-refresh')); - expect(queryClientSpy).toHaveBeenCalledWith(['case']); + expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.caseView()); + expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.tags()); }); describe('when a `refreshRef` prop is provided', () => { @@ -205,7 +206,8 @@ describe('CaseView', () => { it('should refresh actions and comments', async () => { refreshRef!.current!.refreshCase(); await waitFor(() => { - expect(queryClientSpy).toHaveBeenCalledWith([CASE_VIEW_CACHE_KEY]); + expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.caseView()); + expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.tags()); }); }); }); diff --git a/x-pack/plugins/cases/public/components/case_view/use_on_refresh_case_view_page.tsx b/x-pack/plugins/cases/public/components/case_view/use_on_refresh_case_view_page.tsx index 396f180a074a0..d12ddc258e761 100644 --- a/x-pack/plugins/cases/public/components/case_view/use_on_refresh_case_view_page.tsx +++ b/x-pack/plugins/cases/public/components/case_view/use_on_refresh_case_view_page.tsx @@ -7,7 +7,7 @@ import { useCallback } from 'react'; import { useQueryClient } from '@tanstack/react-query'; -import { CASE_TAGS_CACHE_KEY, CASE_VIEW_CACHE_KEY } from '../../containers/constants'; +import { casesQueriesKeys } from '../../containers/constants'; /** * Using react-query queryClient to invalidate all the @@ -17,10 +17,11 @@ import { CASE_TAGS_CACHE_KEY, CASE_VIEW_CACHE_KEY } from '../../containers/const * forces the page to fetch all the data again. Including * metrics, actions, comments, etc. */ + export const useRefreshCaseViewPage = () => { const queryClient = useQueryClient(); return useCallback(() => { - queryClient.invalidateQueries([CASE_VIEW_CACHE_KEY]); - queryClient.invalidateQueries([CASE_TAGS_CACHE_KEY]); + queryClient.invalidateQueries(casesQueriesKeys.caseView()); + queryClient.invalidateQueries(casesQueriesKeys.tags()); }, [queryClient]); }; diff --git a/x-pack/plugins/cases/public/components/confirm_delete_case/index.tsx b/x-pack/plugins/cases/public/components/confirm_delete_case/index.tsx index ce8287310fb17..e1c4e0c1fa02d 100644 --- a/x-pack/plugins/cases/public/components/confirm_delete_case/index.tsx +++ b/x-pack/plugins/cases/public/components/confirm_delete_case/index.tsx @@ -10,35 +10,28 @@ import { EuiConfirmModal } from '@elastic/eui'; import * as i18n from './translations'; interface ConfirmDeleteCaseModalProps { - caseTitle: string; - isModalVisible: boolean; - caseQuantity?: number; + totalCasesToBeDeleted: number; onCancel: () => void; onConfirm: () => void; } const ConfirmDeleteCaseModalComp: React.FC = ({ - caseTitle, - isModalVisible, - caseQuantity = 1, + totalCasesToBeDeleted, onCancel, onConfirm, }) => { - if (!isModalVisible) { - return null; - } return ( - {i18n.CONFIRM_QUESTION(caseQuantity)} + {i18n.CONFIRM_QUESTION(totalCasesToBeDeleted)} ); }; diff --git a/x-pack/plugins/cases/public/components/confirm_delete_case/translations.ts b/x-pack/plugins/cases/public/components/confirm_delete_case/translations.ts index f8e4ab2a83a73..e6f5072f08f89 100644 --- a/x-pack/plugins/cases/public/components/confirm_delete_case/translations.ts +++ b/x-pack/plugins/cases/public/components/confirm_delete_case/translations.ts @@ -14,12 +14,6 @@ export const DELETE_TITLE = (caseTitle: string) => defaultMessage: 'Delete "{caseTitle}"', }); -export const DELETE_SELECTED_CASES = (quantity: number, title: string) => - i18n.translate('xpack.cases.confirmDeleteCase.selectedCases', { - values: { quantity, title }, - defaultMessage: 'Delete "{quantity, plural, =1 {{title}} other {Selected {quantity} cases}}"', - }); - export const CONFIRM_QUESTION = (quantity: number) => i18n.translate('xpack.cases.confirmDeleteCase.confirmQuestion', { values: { quantity }, diff --git a/x-pack/plugins/cases/public/containers/__mocks__/api.ts b/x-pack/plugins/cases/public/containers/__mocks__/api.ts index 2b43135123080..d01f927d3c324 100644 --- a/x-pack/plugins/cases/public/containers/__mocks__/api.ts +++ b/x-pack/plugins/cases/public/containers/__mocks__/api.ts @@ -8,7 +8,6 @@ import { ActionLicense, Cases, - BulkUpdateStatus, Case, CasesStatus, CaseUserActions, @@ -28,7 +27,7 @@ import { pushedCase, tags, } from '../mock'; -import { ResolvedCase, SeverityAll } from '../../../common/ui/types'; +import { CaseUpdateRequest, ResolvedCase, SeverityAll } from '../../../common/ui/types'; import { CasePatchRequest, CasePostRequest, @@ -99,8 +98,8 @@ export const patchCase = async ( signal: AbortSignal ): Promise => Promise.resolve([basicCase]); -export const patchCasesStatus = async ( - cases: BulkUpdateStatus[], +export const updateCases = async ( + cases: CaseUpdateRequest[], signal: AbortSignal ): Promise => Promise.resolve(allCases.cases); diff --git a/x-pack/plugins/cases/public/containers/api.test.tsx b/x-pack/plugins/cases/public/containers/api.test.tsx index e51224dc593dc..d5618ff8a7e9b 100644 --- a/x-pack/plugins/cases/public/containers/api.test.tsx +++ b/x-pack/plugins/cases/public/containers/api.test.tsx @@ -25,7 +25,7 @@ import { getCaseUserActions, getTags, patchCase, - patchCasesStatus, + updateCases, patchComment, postCase, createAttachments, @@ -449,7 +449,7 @@ describe('Cases API', () => { }); }); - describe('patchCasesStatus', () => { + describe('updateCases', () => { beforeEach(() => { fetchMock.mockClear(); fetchMock.mockResolvedValue(casesSnake); @@ -464,7 +464,7 @@ describe('Cases API', () => { ]; test('should be called with correct check url, method, signal', async () => { - await patchCasesStatus(data, abortCtrl.signal); + await updateCases(data, abortCtrl.signal); expect(fetchMock).toHaveBeenCalledWith(`${CASES_URL}`, { method: 'PATCH', body: JSON.stringify({ cases: data }), @@ -473,7 +473,7 @@ describe('Cases API', () => { }); test('should return correct response should not covert to camel case registered attachments', async () => { - const resp = await patchCasesStatus(data, abortCtrl.signal); + const resp = await updateCases(data, abortCtrl.signal); expect(resp).toEqual(cases); }); }); diff --git a/x-pack/plugins/cases/public/containers/api.ts b/x-pack/plugins/cases/public/containers/api.ts index 697635030eb49..ff8d05ef653d9 100644 --- a/x-pack/plugins/cases/public/containers/api.ts +++ b/x-pack/plugins/cases/public/containers/api.ts @@ -10,6 +10,7 @@ import { BASE_RAC_ALERTS_API_PATH } from '@kbn/rule-registry-plugin/common/const import { isEmpty } from 'lodash'; import { Cases, + CaseUpdateRequest, FetchCasesProps, ResolvedCase, SeverityAll, @@ -58,7 +59,6 @@ import { import { ActionLicense, - BulkUpdateStatus, Case, SingleCaseMetrics, SingleCaseMetricsFeature, @@ -238,8 +238,8 @@ export const patchCase = async ( return convertCasesToCamelCase(decodeCasesResponse(response)); }; -export const patchCasesStatus = async ( - cases: BulkUpdateStatus[], +export const updateCases = async ( + cases: CaseUpdateRequest[], signal: AbortSignal ): Promise => { const response = await KibanaServices.get().http.fetch(CASES_URL, { diff --git a/x-pack/plugins/cases/public/containers/configure/use_action_types.tsx b/x-pack/plugins/cases/public/containers/configure/use_action_types.tsx index 76a48e5d09ca3..8503ccd6eddf8 100644 --- a/x-pack/plugins/cases/public/containers/configure/use_action_types.tsx +++ b/x-pack/plugins/cases/public/containers/configure/use_action_types.tsx @@ -9,13 +9,13 @@ import { useQuery } from '@tanstack/react-query'; import * as i18n from '../translations'; import { fetchActionTypes } from './api'; import { useToasts } from '../../common/lib/kibana'; -import { CASE_CONFIGURATION_CACHE_KEY } from '../constants'; +import { casesQueriesKeys } from '../constants'; import { ServerError } from '../../types'; export const useGetActionTypes = () => { const toasts = useToasts(); return useQuery( - [CASE_CONFIGURATION_CACHE_KEY, 'actionTypes'], + casesQueriesKeys.connectorTypes(), () => { const abortController = new AbortController(); return fetchActionTypes({ signal: abortController.signal }); diff --git a/x-pack/plugins/cases/public/containers/configure/use_connectors.tsx b/x-pack/plugins/cases/public/containers/configure/use_connectors.tsx index 95124af988fb6..5e96dd86ae985 100644 --- a/x-pack/plugins/cases/public/containers/configure/use_connectors.tsx +++ b/x-pack/plugins/cases/public/containers/configure/use_connectors.tsx @@ -9,14 +9,14 @@ import { useQuery } from '@tanstack/react-query'; import { fetchConnectors } from './api'; import { useApplicationCapabilities, useToasts } from '../../common/lib/kibana'; import * as i18n from './translations'; -import { CASE_CONNECTORS_CACHE_KEY } from '../constants'; +import { casesQueriesKeys } from '../constants'; import { ServerError } from '../../types'; export function useGetConnectors() { const toasts = useToasts(); const { actions } = useApplicationCapabilities(); return useQuery( - [CASE_CONNECTORS_CACHE_KEY], + casesQueriesKeys.connectorsList(), async () => { if (!actions.read) { return []; diff --git a/x-pack/plugins/cases/public/containers/constants.ts b/x-pack/plugins/cases/public/containers/constants.ts index a87d773303447..a6acbbd68d412 100644 --- a/x-pack/plugins/cases/public/containers/constants.ts +++ b/x-pack/plugins/cases/public/containers/constants.ts @@ -5,23 +5,36 @@ * 2.0. */ +import { SingleCaseMetricsFeature } from './types'; + export const DEFAULT_TABLE_ACTIVE_PAGE = 1; export const DEFAULT_TABLE_LIMIT = 5; -export const CASE_VIEW_CACHE_KEY = 'case'; -export const CASE_VIEW_ACTIONS_CACHE_KEY = 'user-actions'; -export const CASE_VIEW_METRICS_CACHE_KEY = 'metrics'; -export const CASE_CONFIGURATION_CACHE_KEY = 'case-configuration'; -export const CASE_LIST_CACHE_KEY = 'case-list'; -export const CASE_CONNECTORS_CACHE_KEY = 'case-connectors'; -export const CASE_LICENSE_CACHE_KEY = 'case-license-action'; -export const CASE_TAGS_CACHE_KEY = 'case-tags'; - -/** - * User profiles - */ +export const casesQueriesKeys = { + all: ['cases'] as const, + users: ['users'] as const, + connectors: ['connectors'] as const, + connectorsList: () => [...casesQueriesKeys.connectors, 'list'] as const, + casesList: () => [...casesQueriesKeys.all, 'list'] as const, + casesMetrics: () => [...casesQueriesKeys.casesList(), 'metrics'] as const, + casesStatuses: () => [...casesQueriesKeys.casesList(), 'statuses'] as const, + cases: (params: unknown) => [...casesQueriesKeys.casesList(), 'all-cases', params] as const, + caseView: () => [...casesQueriesKeys.all, 'case'] as const, + case: (id: string) => [...casesQueriesKeys.caseView(), id] as const, + caseMetrics: (id: string, features: SingleCaseMetricsFeature[]) => + [...casesQueriesKeys.case(id), 'metrics', features] as const, + userActions: (id: string, connectorId: string) => + [...casesQueriesKeys.case(id), 'user-actions', connectorId] as const, + userProfiles: () => [...casesQueriesKeys.users, 'user-profiles'] as const, + userProfilesList: (ids: string[]) => [...casesQueriesKeys.userProfiles(), ids] as const, + currentUser: () => [...casesQueriesKeys.users, 'current-user'] as const, + suggestUsers: (params: unknown) => [...casesQueriesKeys.users, 'suggest', params] as const, + connectorTypes: () => [...casesQueriesKeys.connectors, 'types'] as const, + license: () => [...casesQueriesKeys.connectors, 'license'] as const, + tags: () => [...casesQueriesKeys.all, 'tags'] as const, +}; -export const USER_PROFILES_CACHE_KEY = 'user-profiles'; -export const USER_PROFILES_SUGGEST_CACHE_KEY = 'suggest'; -export const USER_PROFILES_BULK_GET_CACHE_KEY = 'bulk-get'; -export const USER_PROFILES_GET_CURRENT_CACHE_KEY = 'get-current'; +export const casesMutationsKeys = { + deleteCases: ['delete-cases'] as const, + updateCases: ['update-cases'] as const, +}; diff --git a/x-pack/plugins/cases/public/containers/translations.ts b/x-pack/plugins/cases/public/containers/translations.ts index 72aeb66772c52..5bf4acf385fce 100644 --- a/x-pack/plugins/cases/public/containers/translations.ts +++ b/x-pack/plugins/cases/public/containers/translations.ts @@ -23,48 +23,9 @@ export const UPDATED_CASE = (caseTitle: string) => defaultMessage: 'Updated "{caseTitle}"', }); -export const DELETED_CASES = (totalCases: number, caseTitle?: string) => - i18n.translate('xpack.cases.containers.deletedCases', { - values: { caseTitle, totalCases }, - defaultMessage: 'Deleted {totalCases, plural, =1 {"{caseTitle}"} other {{totalCases} cases}}', - }); - -export const CLOSED_CASES = ({ - totalCases, - caseTitle, -}: { - totalCases: number; - caseTitle?: string; -}) => - i18n.translate('xpack.cases.containers.closedCases', { - values: { caseTitle, totalCases }, - defaultMessage: 'Closed {totalCases, plural, =1 {"{caseTitle}"} other {{totalCases} cases}}', - }); - -export const REOPENED_CASES = ({ - totalCases, - caseTitle, -}: { - totalCases: number; - caseTitle?: string; -}) => - i18n.translate('xpack.cases.containers.reopenedCases', { - values: { caseTitle, totalCases }, - defaultMessage: 'Opened {totalCases, plural, =1 {"{caseTitle}"} other {{totalCases} cases}}', - }); - -export const MARK_IN_PROGRESS_CASES = ({ - totalCases, - caseTitle, -}: { - totalCases: number; - caseTitle?: string; -}) => - i18n.translate('xpack.cases.containers.markInProgressCases', { - values: { caseTitle, totalCases }, - defaultMessage: - 'Marked {totalCases, plural, =1 {"{caseTitle}"} other {{totalCases} cases}} as in progress', - }); +export const UPDATED_CASES = i18n.translate('xpack.cases.containers.updatedCases', { + defaultMessage: 'Updated cases', +}); export const SUCCESS_SEND_TO_EXTERNAL_SERVICE = (serviceName: string) => i18n.translate('xpack.cases.containers.pushToExternalService', { diff --git a/x-pack/plugins/cases/public/containers/use_bulk_update_case.test.tsx b/x-pack/plugins/cases/public/containers/use_bulk_update_case.test.tsx index d00b361828a6e..d46f79569622f 100644 --- a/x-pack/plugins/cases/public/containers/use_bulk_update_case.test.tsx +++ b/x-pack/plugins/cases/public/containers/use_bulk_update_case.test.tsx @@ -6,126 +6,89 @@ */ import { renderHook, act } from '@testing-library/react-hooks'; -import { CaseStatuses } from '../../common/api'; -import { useUpdateCases, UseUpdateCases } from './use_bulk_update_case'; -import { basicCase } from './mock'; +import { useUpdateCases } from './use_bulk_update_case'; +import { allCases } from './mock'; +import { useToasts } from '../common/lib/kibana'; import * as api from './api'; +import { createAppMockRenderer, AppMockRenderer } from '../common/mock'; +import { casesQueriesKeys } from './constants'; jest.mock('./api'); jest.mock('../common/lib/kibana'); describe('useUpdateCases', () => { const abortCtrl = new AbortController(); + const addSuccess = jest.fn(); + const addError = jest.fn(); + + (useToasts as jest.Mock).mockReturnValue({ addSuccess, addError }); + + let appMockRender: AppMockRenderer; + beforeEach(() => { + appMockRender = createAppMockRenderer(); jest.clearAllMocks(); - jest.restoreAllMocks(); }); - it('init', async () => { - await act(async () => { - const { result, waitForNextUpdate } = renderHook(() => - useUpdateCases() - ); - await waitForNextUpdate(); - expect(result.current).toEqual({ - isLoading: false, - isError: false, - isUpdated: false, - updateBulkStatus: result.current.updateBulkStatus, - dispatchResetIsUpdated: result.current.dispatchResetIsUpdated, - }); + it('calls the api when invoked with the correct parameters', async () => { + const spy = jest.spyOn(api, 'updateCases'); + const { waitForNextUpdate, result } = renderHook(() => useUpdateCases(), { + wrapper: appMockRender.AppWrapper, }); - }); - it('calls patchCase with correct arguments', async () => { - const spyOnPatchCases = jest.spyOn(api, 'patchCasesStatus'); - - await act(async () => { - const { result, waitForNextUpdate } = renderHook(() => - useUpdateCases() - ); - await waitForNextUpdate(); - - result.current.updateBulkStatus([basicCase], CaseStatuses.closed); - await waitForNextUpdate(); - expect(spyOnPatchCases).toBeCalledWith( - [ - { - status: CaseStatuses.closed, - id: basicCase.id, - version: basicCase.version, - }, - ], - abortCtrl.signal - ); + act(() => { + result.current.mutate({ cases: allCases.cases, successToasterTitle: 'Success title' }); }); - }); - it('patch cases', async () => { - await act(async () => { - const { result, waitForNextUpdate } = renderHook(() => - useUpdateCases() - ); - await waitForNextUpdate(); - result.current.updateBulkStatus([basicCase], CaseStatuses.closed); - await waitForNextUpdate(); - expect(result.current).toEqual({ - isUpdated: true, - isLoading: false, - isError: false, - updateBulkStatus: result.current.updateBulkStatus, - dispatchResetIsUpdated: result.current.dispatchResetIsUpdated, - }); - }); + await waitForNextUpdate(); + + expect(spy).toHaveBeenCalledWith(allCases.cases, abortCtrl.signal); }); - it('set isLoading to true when posting case', async () => { - await act(async () => { - const { result, waitForNextUpdate } = renderHook(() => - useUpdateCases() - ); - await waitForNextUpdate(); - result.current.updateBulkStatus([basicCase], CaseStatuses.closed); + it('invalidates the queries correctly', async () => { + const queryClientSpy = jest.spyOn(appMockRender.queryClient, 'invalidateQueries'); + const { waitForNextUpdate, result } = renderHook(() => useUpdateCases(), { + wrapper: appMockRender.AppWrapper, + }); - expect(result.current.isLoading).toBe(true); + act(() => { + result.current.mutate({ cases: allCases.cases, successToasterTitle: 'Success title' }); }); + + await waitForNextUpdate(); + + expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.casesList()); + expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.tags()); + expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.userProfiles()); }); - it('dispatchResetIsUpdated resets is updated', async () => { - await act(async () => { - const { result, waitForNextUpdate } = renderHook(() => - useUpdateCases() - ); - - await waitForNextUpdate(); - result.current.updateBulkStatus([basicCase], CaseStatuses.closed); - await waitForNextUpdate(); - expect(result.current.isUpdated).toBeTruthy(); - result.current.dispatchResetIsUpdated(); - expect(result.current.isUpdated).toBeFalsy(); + it('shows a success toaster', async () => { + const { waitForNextUpdate, result } = renderHook(() => useUpdateCases(), { + wrapper: appMockRender.AppWrapper, + }); + + act(() => { + result.current.mutate({ cases: allCases.cases, successToasterTitle: 'Success title' }); }); + + await waitForNextUpdate(); + + expect(addSuccess).toHaveBeenCalledWith('Success title'); }); - it('unhappy path', async () => { - const spyOnPatchCases = jest.spyOn(api, 'patchCasesStatus'); - spyOnPatchCases.mockImplementation(() => { - throw new Error('Something went wrong'); + it('shows a toast error when the api return an error', async () => { + jest.spyOn(api, 'updateCases').mockRejectedValue(new Error('useUpdateCases: Test error')); + + const { waitForNextUpdate, result } = renderHook(() => useUpdateCases(), { + wrapper: appMockRender.AppWrapper, }); - await act(async () => { - const { result, waitForNextUpdate } = renderHook(() => - useUpdateCases() - ); - await waitForNextUpdate(); - result.current.updateBulkStatus([basicCase], CaseStatuses.closed); - - expect(result.current).toEqual({ - isUpdated: false, - isLoading: false, - isError: true, - updateBulkStatus: result.current.updateBulkStatus, - dispatchResetIsUpdated: result.current.dispatchResetIsUpdated, - }); + act(() => { + result.current.mutate({ cases: allCases.cases, successToasterTitle: 'Success title' }); }); + + await waitForNextUpdate(); + + expect(addError).toHaveBeenCalled(); }); }); diff --git a/x-pack/plugins/cases/public/containers/use_bulk_update_case.tsx b/x-pack/plugins/cases/public/containers/use_bulk_update_case.tsx index 715b0c611c3b8..e0866bf0166a6 100644 --- a/x-pack/plugins/cases/public/containers/use_bulk_update_case.tsx +++ b/x-pack/plugins/cases/public/containers/use_bulk_update_case.tsx @@ -5,149 +5,42 @@ * 2.0. */ -import { useCallback, useReducer, useRef, useEffect } from 'react'; -import { CaseStatuses } from '../../common/api'; +import { useQueryClient, useMutation } from '@tanstack/react-query'; import * as i18n from './translations'; -import { patchCasesStatus } from './api'; -import { BulkUpdateStatus, Case } from './types'; -import { useToasts } from '../common/lib/kibana'; - -interface UpdateState { - isUpdated: boolean; - isLoading: boolean; - isError: boolean; -} -type Action = - | { type: 'FETCH_INIT' } - | { type: 'FETCH_SUCCESS'; payload: boolean } - | { type: 'FETCH_FAILURE' } - | { type: 'RESET_IS_UPDATED' }; - -const dataFetchReducer = (state: UpdateState, action: Action): UpdateState => { - switch (action.type) { - case 'FETCH_INIT': - return { - ...state, - isLoading: true, - isError: false, - }; - case 'FETCH_SUCCESS': - return { - ...state, - isLoading: false, - isError: false, - isUpdated: action.payload, - }; - case 'FETCH_FAILURE': - return { - ...state, - isLoading: false, - isError: true, - }; - case 'RESET_IS_UPDATED': - return { - ...state, - isUpdated: false, - }; - default: - return state; - } -}; -export interface UseUpdateCases extends UpdateState { - updateBulkStatus: (cases: Case[], status: string) => void; - dispatchResetIsUpdated: () => void; +import { updateCases } from './api'; +import { CaseUpdateRequest } from './types'; +import { useCasesToast } from '../common/use_cases_toast'; +import { ServerError } from '../types'; +import { casesQueriesKeys, casesMutationsKeys } from './constants'; + +interface MutationArgs { + cases: CaseUpdateRequest[]; + successToasterTitle: string; } -const getStatusToasterMessage = ( - status: CaseStatuses, - messageArgs: { - totalCases: number; - caseTitle?: string; - } -): string => { - if (status === CaseStatuses.open) { - return i18n.REOPENED_CASES(messageArgs); - } else if (status === CaseStatuses['in-progress']) { - return i18n.MARK_IN_PROGRESS_CASES(messageArgs); - } else if (status === CaseStatuses.closed) { - return i18n.CLOSED_CASES(messageArgs); - } - - return ''; -}; - -export const useUpdateCases = (): UseUpdateCases => { - const [state, dispatch] = useReducer(dataFetchReducer, { - isLoading: false, - isError: false, - isUpdated: false, - }); - const toasts = useToasts(); - const isCancelledRef = useRef(false); - const abortCtrlRef = useRef(new AbortController()); - - const dispatchUpdateCases = useCallback(async (cases: BulkUpdateStatus[], action: string) => { - try { - isCancelledRef.current = false; - abortCtrlRef.current.abort(); - abortCtrlRef.current = new AbortController(); - - dispatch({ type: 'FETCH_INIT' }); - const patchResponse = await patchCasesStatus(cases, abortCtrlRef.current.signal); - - if (!isCancelledRef.current) { - const resultCount = Object.keys(patchResponse).length; - const firstTitle = patchResponse[0].title; - - dispatch({ type: 'FETCH_SUCCESS', payload: true }); - const messageArgs = { - totalCases: resultCount, - caseTitle: resultCount === 1 ? firstTitle : '', - }; +export const useUpdateCases = () => { + const queryClient = useQueryClient(); + const { showErrorToast, showSuccessToast } = useCasesToast(); - const message = - action === 'status' ? getStatusToasterMessage(patchResponse[0].status, messageArgs) : ''; - - toasts.addSuccess(message); - } - } catch (error) { - if (!isCancelledRef.current) { - if (error.name !== 'AbortError') { - toasts.addError( - error.body && error.body.message ? new Error(error.body.message) : error, - { title: i18n.ERROR_TITLE } - ); - } - dispatch({ type: 'FETCH_FAILURE' }); - } - } - // eslint-disable-next-line react-hooks/exhaustive-deps - }, []); - - const dispatchResetIsUpdated = useCallback(() => { - dispatch({ type: 'RESET_IS_UPDATED' }); - }, []); - - const updateBulkStatus = useCallback( - (cases: Case[], status: string) => { - const updateCasesStatus: BulkUpdateStatus[] = cases.map((theCase) => ({ - status, - id: theCase.id, - version: theCase.version, - })); - dispatchUpdateCases(updateCasesStatus, 'status'); - }, - // eslint-disable-next-line react-hooks/exhaustive-deps - [] - ); - - useEffect( - () => () => { - isCancelledRef.current = true; - abortCtrlRef.current.abort(); + return useMutation( + ({ cases }: MutationArgs) => { + const abortCtrlRef = new AbortController(); + return updateCases(cases, abortCtrlRef.signal); }, - [] + { + mutationKey: casesMutationsKeys.updateCases, + onSuccess: (_, { successToasterTitle }) => { + queryClient.invalidateQueries(casesQueriesKeys.casesList()); + queryClient.invalidateQueries(casesQueriesKeys.tags()); + queryClient.invalidateQueries(casesQueriesKeys.userProfiles()); + + showSuccessToast(successToasterTitle); + }, + onError: (error: ServerError) => { + showErrorToast(error, { title: i18n.ERROR_DELETING }); + }, + } ); - - return { ...state, updateBulkStatus, dispatchResetIsUpdated }; }; + +export type UseUpdateCases = ReturnType; diff --git a/x-pack/plugins/cases/public/containers/use_delete_cases.test.tsx b/x-pack/plugins/cases/public/containers/use_delete_cases.test.tsx index 88f6db42144f6..623a01746e3cb 100644 --- a/x-pack/plugins/cases/public/containers/use_delete_cases.test.tsx +++ b/x-pack/plugins/cases/public/containers/use_delete_cases.test.tsx @@ -7,125 +7,88 @@ import { renderHook, act } from '@testing-library/react-hooks'; -import { useDeleteCases, UseDeleteCase } from './use_delete_cases'; +import { useDeleteCases } from './use_delete_cases'; import * as api from './api'; +import { useToasts } from '../common/lib/kibana'; +import { AppMockRenderer, createAppMockRenderer } from '../common/mock'; +import { casesQueriesKeys } from './constants'; jest.mock('./api'); jest.mock('../common/lib/kibana'); describe('useDeleteCases', () => { const abortCtrl = new AbortController(); - const deleteObj = [ - { id: '1', title: 'case 1' }, - { id: '2', title: 'case 2' }, - { id: '3', title: 'case 3' }, - ]; - const deleteArr = ['1', '2', '3']; - it('init', async () => { - await act(async () => { - const { result, waitForNextUpdate } = renderHook(() => - useDeleteCases() - ); - await waitForNextUpdate(); - expect(result.current).toEqual({ - isDisplayConfirmDeleteModal: false, - isLoading: false, - isError: false, - isDeleted: false, - dispatchResetIsDeleted: result.current.dispatchResetIsDeleted, - handleOnDeleteConfirm: result.current.handleOnDeleteConfirm, - handleToggleModal: result.current.handleToggleModal, - }); - }); - }); + const addSuccess = jest.fn(); + const addError = jest.fn(); - it('calls deleteCases with correct arguments', async () => { - const spyOnDeleteCases = jest.spyOn(api, 'deleteCases'); + (useToasts as jest.Mock).mockReturnValue({ addSuccess, addError }); - await act(async () => { - const { result, waitForNextUpdate } = renderHook(() => - useDeleteCases() - ); - await waitForNextUpdate(); + let appMockRender: AppMockRenderer; - result.current.handleOnDeleteConfirm(deleteObj); - await waitForNextUpdate(); - expect(spyOnDeleteCases).toBeCalledWith(deleteArr, abortCtrl.signal); - }); + beforeEach(() => { + appMockRender = createAppMockRenderer(); + jest.clearAllMocks(); }); - it('deletes cases', async () => { - await act(async () => { - const { result, waitForNextUpdate } = renderHook(() => - useDeleteCases() - ); - await waitForNextUpdate(); - result.current.handleToggleModal(); - result.current.handleOnDeleteConfirm(deleteObj); - await waitForNextUpdate(); - expect(result.current).toEqual({ - isDisplayConfirmDeleteModal: false, - isLoading: false, - isError: false, - isDeleted: true, - dispatchResetIsDeleted: result.current.dispatchResetIsDeleted, - handleOnDeleteConfirm: result.current.handleOnDeleteConfirm, - handleToggleModal: result.current.handleToggleModal, - }); + it('calls the api when invoked with the correct parameters', async () => { + const spy = jest.spyOn(api, 'deleteCases'); + const { waitForNextUpdate, result } = renderHook(() => useDeleteCases(), { + wrapper: appMockRender.AppWrapper, + }); + + act(() => { + result.current.mutate({ caseIds: ['1', '2'], successToasterTitle: 'Success title' }); }); + + await waitForNextUpdate(); + + expect(spy).toHaveBeenCalledWith(['1', '2'], abortCtrl.signal); }); - it('resets is deleting', async () => { - await act(async () => { - const { result, waitForNextUpdate } = renderHook(() => - useDeleteCases() - ); - await waitForNextUpdate(); - result.current.handleToggleModal(); - result.current.handleOnDeleteConfirm(deleteObj); - await waitForNextUpdate(); - expect(result.current.isDeleted).toBeTruthy(); - result.current.handleToggleModal(); - result.current.dispatchResetIsDeleted(); - expect(result.current.isDeleted).toBeFalsy(); + it('invalidates the queries correctly', async () => { + const queryClientSpy = jest.spyOn(appMockRender.queryClient, 'invalidateQueries'); + const { waitForNextUpdate, result } = renderHook(() => useDeleteCases(), { + wrapper: appMockRender.AppWrapper, + }); + + act(() => { + result.current.mutate({ caseIds: ['1', '2'], successToasterTitle: 'Success title' }); }); + + await waitForNextUpdate(); + + expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.casesList()); + expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.tags()); + expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.userProfiles()); }); - it('set isLoading to true when deleting cases', async () => { - await act(async () => { - const { result, waitForNextUpdate } = renderHook(() => - useDeleteCases() - ); - await waitForNextUpdate(); - result.current.handleToggleModal(); - result.current.handleOnDeleteConfirm(deleteObj); - expect(result.current.isLoading).toBe(true); + it('shows a success toaster', async () => { + const { waitForNextUpdate, result } = renderHook(() => useDeleteCases(), { + wrapper: appMockRender.AppWrapper, }); + + act(() => { + result.current.mutate({ caseIds: ['1', '2'], successToasterTitle: 'Success title' }); + }); + + await waitForNextUpdate(); + + expect(addSuccess).toHaveBeenCalledWith('Success title'); }); - it('unhappy path', async () => { - const spyOnDeleteCases = jest.spyOn(api, 'deleteCases'); - spyOnDeleteCases.mockImplementation(() => { - throw new Error('Something went wrong'); + it('shows a toast error when the api return an error', async () => { + jest.spyOn(api, 'deleteCases').mockRejectedValue(new Error('useDeleteCases: Test error')); + + const { waitForNextUpdate, result } = renderHook(() => useDeleteCases(), { + wrapper: appMockRender.AppWrapper, }); - await act(async () => { - const { result, waitForNextUpdate } = renderHook(() => - useDeleteCases() - ); - await waitForNextUpdate(); - result.current.handleToggleModal(); - result.current.handleOnDeleteConfirm(deleteObj); - - expect(result.current).toEqual({ - isDisplayConfirmDeleteModal: false, - isLoading: false, - isError: true, - isDeleted: false, - dispatchResetIsDeleted: result.current.dispatchResetIsDeleted, - handleOnDeleteConfirm: result.current.handleOnDeleteConfirm, - handleToggleModal: result.current.handleToggleModal, - }); + act(() => { + result.current.mutate({ caseIds: ['1', '2'], successToasterTitle: 'Success title' }); }); + + await waitForNextUpdate(); + + expect(addError).toHaveBeenCalled(); }); }); diff --git a/x-pack/plugins/cases/public/containers/use_delete_cases.tsx b/x-pack/plugins/cases/public/containers/use_delete_cases.tsx index 7ccec4436ec0b..da2258f8f5d82 100644 --- a/x-pack/plugins/cases/public/containers/use_delete_cases.tsx +++ b/x-pack/plugins/cases/public/containers/use_delete_cases.tsx @@ -5,139 +5,41 @@ * 2.0. */ -import { useCallback, useReducer, useRef, useEffect } from 'react'; +import { useMutation, useQueryClient } from '@tanstack/react-query'; import * as i18n from './translations'; import { deleteCases } from './api'; -import { DeleteCase } from './types'; -import { useToasts } from '../common/lib/kibana'; +import { ServerError } from '../types'; +import { casesQueriesKeys, casesMutationsKeys } from './constants'; +import { useCasesToast } from '../common/use_cases_toast'; -interface DeleteState { - isDisplayConfirmDeleteModal: boolean; - isDeleted: boolean; - isLoading: boolean; - isError: boolean; +interface MutationArgs { + caseIds: string[]; + successToasterTitle: string; } -type Action = - | { type: 'DISPLAY_MODAL'; payload: boolean } - | { type: 'FETCH_INIT' } - | { type: 'FETCH_SUCCESS'; payload: boolean } - | { type: 'FETCH_FAILURE' } - | { type: 'RESET_IS_DELETED' }; -const dataFetchReducer = (state: DeleteState, action: Action): DeleteState => { - switch (action.type) { - case 'DISPLAY_MODAL': - return { - ...state, - isDisplayConfirmDeleteModal: action.payload, - }; - case 'FETCH_INIT': - return { - ...state, - isLoading: true, - isError: false, - }; - case 'FETCH_SUCCESS': - return { - ...state, - isLoading: false, - isError: false, - isDeleted: action.payload, - }; - case 'FETCH_FAILURE': - return { - ...state, - isLoading: false, - isError: true, - }; - case 'RESET_IS_DELETED': - return { - ...state, - isDeleted: false, - }; - default: - return state; - } -}; - -export interface UseDeleteCase extends DeleteState { - dispatchResetIsDeleted: () => void; - handleOnDeleteConfirm: (cases: DeleteCase[]) => void; - handleToggleModal: () => void; -} - -export const useDeleteCases = (): UseDeleteCase => { - const [state, dispatch] = useReducer(dataFetchReducer, { - isDisplayConfirmDeleteModal: false, - isLoading: false, - isError: false, - isDeleted: false, - }); - const toasts = useToasts(); - const isCancelledRef = useRef(false); - const abortCtrlRef = useRef(new AbortController()); - - const dispatchDeleteCases = useCallback(async (cases: DeleteCase[]) => { - try { - isCancelledRef.current = false; - abortCtrlRef.current.abort(); - abortCtrlRef.current = new AbortController(); - dispatch({ type: 'FETCH_INIT' }); - - const caseIds = cases.map((theCase) => theCase.id); - if (cases.length > 0) { - await deleteCases(caseIds, abortCtrlRef.current.signal); - } - - if (!isCancelledRef.current) { - dispatch({ type: 'FETCH_SUCCESS', payload: true }); - toasts.addSuccess( - i18n.DELETED_CASES(cases.length, cases.length === 1 ? cases[0].title : '') - ); - } - } catch (error) { - if (!isCancelledRef.current) { - if (error.name !== 'AbortError') { - toasts.addError( - error.body && error.body.message ? new Error(error.body.message) : error, - { title: i18n.ERROR_DELETING } - ); - } - dispatch({ type: 'FETCH_FAILURE' }); - } - } - // eslint-disable-next-line react-hooks/exhaustive-deps - }, []); +export const useDeleteCases = () => { + const queryClient = useQueryClient(); + const { showErrorToast, showSuccessToast } = useCasesToast(); - const dispatchToggleDeleteModal = useCallback(() => { - dispatch({ type: 'DISPLAY_MODAL', payload: !state.isDisplayConfirmDeleteModal }); - }, [state.isDisplayConfirmDeleteModal]); - - const dispatchResetIsDeleted = useCallback(() => { - dispatch({ type: 'RESET_IS_DELETED' }); - // eslint-disable-next-line react-hooks/exhaustive-deps - }, [state.isDisplayConfirmDeleteModal]); - - const handleOnDeleteConfirm = useCallback( - (cases: DeleteCase[]) => { - dispatchDeleteCases(cases); - dispatchToggleDeleteModal(); - }, - // eslint-disable-next-line react-hooks/exhaustive-deps - [state.isDisplayConfirmDeleteModal] - ); - const handleToggleModal = useCallback(() => { - dispatchToggleDeleteModal(); - // eslint-disable-next-line react-hooks/exhaustive-deps - }, [state.isDisplayConfirmDeleteModal]); - - useEffect( - () => () => { - isCancelledRef.current = true; - abortCtrlRef.current.abort(); + return useMutation( + ({ caseIds }: MutationArgs) => { + const abortCtrlRef = new AbortController(); + return deleteCases(caseIds, abortCtrlRef.signal); }, - [] + { + mutationKey: casesMutationsKeys.deleteCases, + onSuccess: (_, { successToasterTitle }) => { + queryClient.invalidateQueries(casesQueriesKeys.casesList()); + queryClient.invalidateQueries(casesQueriesKeys.tags()); + queryClient.invalidateQueries(casesQueriesKeys.userProfiles()); + + showSuccessToast(successToasterTitle); + }, + onError: (error: ServerError) => { + showErrorToast(error, { title: i18n.ERROR_DELETING }); + }, + } ); - - return { ...state, dispatchResetIsDeleted, handleOnDeleteConfirm, handleToggleModal }; }; + +export type UseDeleteCases = ReturnType; diff --git a/x-pack/plugins/cases/public/containers/use_get_action_license.tsx b/x-pack/plugins/cases/public/containers/use_get_action_license.tsx index 8e9aa28de440a..7f05012cbbe6a 100644 --- a/x-pack/plugins/cases/public/containers/use_get_action_license.tsx +++ b/x-pack/plugins/cases/public/containers/use_get_action_license.tsx @@ -10,7 +10,7 @@ import { useToasts } from '../common/lib/kibana'; import { getActionLicense } from './api'; import * as i18n from './translations'; import { ConnectorTypes } from '../../common/api'; -import { CASE_LICENSE_CACHE_KEY } from './constants'; +import { casesQueriesKeys } from './constants'; import { ServerError } from '../types'; const MINIMUM_LICENSE_REQUIRED_CONNECTOR = ConnectorTypes.jira; @@ -18,7 +18,7 @@ const MINIMUM_LICENSE_REQUIRED_CONNECTOR = ConnectorTypes.jira; export const useGetActionLicense = () => { const toasts = useToasts(); return useQuery( - [CASE_LICENSE_CACHE_KEY], + casesQueriesKeys.license(), async () => { const abortCtrl = new AbortController(); const response = await getActionLicense(abortCtrl.signal); diff --git a/x-pack/plugins/cases/public/containers/use_get_case.tsx b/x-pack/plugins/cases/public/containers/use_get_case.tsx index ded91240239a1..bf588cc1e71d0 100644 --- a/x-pack/plugins/cases/public/containers/use_get_case.tsx +++ b/x-pack/plugins/cases/public/containers/use_get_case.tsx @@ -11,12 +11,12 @@ import * as i18n from './translations'; import { useToasts } from '../common/lib/kibana'; import { resolveCase } from './api'; import { ServerError } from '../types'; -import { CASE_VIEW_CACHE_KEY } from './constants'; +import { casesQueriesKeys } from './constants'; export const useGetCase = (caseId: string) => { const toasts = useToasts(); return useQuery( - [CASE_VIEW_CACHE_KEY, caseId], + casesQueriesKeys.case(caseId), () => { const abortCtrlRef = new AbortController(); return resolveCase(caseId, true, abortCtrlRef.signal); diff --git a/x-pack/plugins/cases/public/containers/use_get_case_metrics.tsx b/x-pack/plugins/cases/public/containers/use_get_case_metrics.tsx index 1e294c4a5ba6e..32d63fcc3b42e 100644 --- a/x-pack/plugins/cases/public/containers/use_get_case_metrics.tsx +++ b/x-pack/plugins/cases/public/containers/use_get_case_metrics.tsx @@ -11,13 +11,13 @@ import { useToasts } from '../common/lib/kibana'; import { getSingleCaseMetrics } from './api'; import { ServerError } from '../types'; import { ERROR_TITLE } from './translations'; -import { CASE_VIEW_CACHE_KEY, CASE_VIEW_METRICS_CACHE_KEY } from './constants'; +import { casesQueriesKeys } from './constants'; export const useGetCaseMetrics = (caseId: string, features: SingleCaseMetricsFeature[]) => { const toasts = useToasts(); const abortCtrlRef = new AbortController(); return useQuery( - [CASE_VIEW_CACHE_KEY, CASE_VIEW_METRICS_CACHE_KEY, caseId, features], + casesQueriesKeys.caseMetrics(caseId, features), async () => { const response: SingleCaseMetrics = await getSingleCaseMetrics( caseId, diff --git a/x-pack/plugins/cases/public/containers/use_get_case_user_actions.tsx b/x-pack/plugins/cases/public/containers/use_get_case_user_actions.tsx index fde45207b673e..c92d56b41ea76 100644 --- a/x-pack/plugins/cases/public/containers/use_get_case_user_actions.tsx +++ b/x-pack/plugins/cases/public/containers/use_get_case_user_actions.tsx @@ -20,7 +20,7 @@ import { import { ServerError } from '../types'; import { useToasts } from '../common/lib/kibana'; import { ERROR_TITLE } from './translations'; -import { CASE_VIEW_ACTIONS_CACHE_KEY, CASE_VIEW_CACHE_KEY } from './constants'; +import { casesQueriesKeys } from './constants'; export interface CaseService extends CaseExternalService { firstPushIndex: number; @@ -238,7 +238,7 @@ export const useGetCaseUserActions = (caseId: string, caseConnectorId: string) = const toasts = useToasts(); const abortCtrlRef = new AbortController(); return useQuery( - [CASE_VIEW_CACHE_KEY, CASE_VIEW_ACTIONS_CACHE_KEY, caseId, caseConnectorId], + casesQueriesKeys.userActions(caseId, caseConnectorId), async () => { const response = await getCaseUserActions(caseId, abortCtrlRef.signal); const participants = !isEmpty(response) diff --git a/x-pack/plugins/cases/public/containers/use_get_cases.tsx b/x-pack/plugins/cases/public/containers/use_get_cases.tsx index 7b046cac3f13f..d630534957e53 100644 --- a/x-pack/plugins/cases/public/containers/use_get_cases.tsx +++ b/x-pack/plugins/cases/public/containers/use_get_cases.tsx @@ -6,7 +6,7 @@ */ import { useQuery, UseQueryResult } from '@tanstack/react-query'; -import { CASE_LIST_CACHE_KEY, DEFAULT_TABLE_ACTIVE_PAGE, DEFAULT_TABLE_LIMIT } from './constants'; +import { casesQueriesKeys, DEFAULT_TABLE_ACTIVE_PAGE, DEFAULT_TABLE_LIMIT } from './constants'; import { Cases, FilterOptions, QueryParams, SortFieldCase, StatusAll, SeverityAll } from './types'; import { useToasts } from '../common/lib/kibana'; import * as i18n from './translations'; @@ -51,7 +51,7 @@ export const useGetCases = ( ): UseQueryResult => { const toasts = useToasts(); return useQuery( - [CASE_LIST_CACHE_KEY, 'cases', params], + casesQueriesKeys.cases(params), () => { const abortCtrl = new AbortController(); return getCases({ diff --git a/x-pack/plugins/cases/public/containers/use_get_cases_metrics.test.tsx b/x-pack/plugins/cases/public/containers/use_get_cases_metrics.test.tsx index a8747a2bd43a5..0b0cdc59a487e 100644 --- a/x-pack/plugins/cases/public/containers/use_get_cases_metrics.test.tsx +++ b/x-pack/plugins/cases/public/containers/use_get_cases_metrics.test.tsx @@ -5,124 +5,56 @@ * 2.0. */ -import React from 'react'; -import { renderHook, act } from '@testing-library/react-hooks'; +import { renderHook } from '@testing-library/react-hooks'; import * as api from '../api'; -import { TestProviders } from '../common/mock'; -import { useGetCasesMetrics, UseGetCasesMetrics } from './use_get_cases_metrics'; +import { AppMockRenderer, createAppMockRenderer } from '../common/mock'; +import { useGetCasesMetrics } from './use_get_cases_metrics'; import { SECURITY_SOLUTION_OWNER } from '../../common/constants'; +import { useToasts } from '../common/lib/kibana'; jest.mock('../api'); jest.mock('../common/lib/kibana'); describe('useGetCasesMetrics', () => { - beforeEach(() => { - jest.clearAllMocks(); - jest.restoreAllMocks(); - }); + const abortCtrl = new AbortController(); + const addSuccess = jest.fn(); + const addError = jest.fn(); - it('init', async () => { - const { result } = renderHook(() => useGetCasesMetrics(), { - wrapper: ({ children }) => {children}, - }); + (useToasts as jest.Mock).mockReturnValue({ addSuccess, addError }); - await act(async () => { - expect(result.current).toEqual({ - mttr: 0, - isLoading: true, - isError: false, - fetchCasesMetrics: result.current.fetchCasesMetrics, - }); - }); + let appMockRender: AppMockRenderer; + + beforeEach(() => { + appMockRender = createAppMockRenderer(); + jest.clearAllMocks(); }); - it('calls getCasesMetrics api', async () => { + it('calls the api when invoked with the correct parameters', async () => { const spy = jest.spyOn(api, 'getCasesMetrics'); - await act(async () => { - const { waitForNextUpdate } = renderHook( - () => useGetCasesMetrics(), - { - wrapper: ({ children }) => {children}, - } - ); - - await waitForNextUpdate(); - expect(spy).toBeCalledWith({ - http: expect.anything(), - signal: expect.anything(), - query: { - features: ['mttr'], - owner: [SECURITY_SOLUTION_OWNER], - }, - }); + const { waitForNextUpdate } = renderHook(() => useGetCasesMetrics(), { + wrapper: appMockRender.AppWrapper, }); - }); - it('fetch cases metrics', async () => { - await act(async () => { - const { result, waitForNextUpdate } = renderHook( - () => useGetCasesMetrics(), - { - wrapper: ({ children }) => {children}, - } - ); + await waitForNextUpdate(); - await waitForNextUpdate(); - expect(result.current).toEqual({ - mttr: 12, - isLoading: false, - isError: false, - fetchCasesMetrics: result.current.fetchCasesMetrics, - }); + expect(spy).toHaveBeenCalledWith({ + http: expect.anything(), + signal: abortCtrl.signal, + query: { owner: [SECURITY_SOLUTION_OWNER], features: ['mttr'] }, }); }); - it('fetches metrics when fetchCasesMetrics is invoked', async () => { - const spy = jest.spyOn(api, 'getCasesMetrics'); - await act(async () => { - const { result, waitForNextUpdate } = renderHook( - () => useGetCasesMetrics(), - { - wrapper: ({ children }) => {children}, - } - ); - - await waitForNextUpdate(); - expect(spy).toBeCalledWith({ - http: expect.anything(), - signal: expect.anything(), - query: { - features: ['mttr'], - owner: [SECURITY_SOLUTION_OWNER], - }, - }); - result.current.fetchCasesMetrics(); - await waitForNextUpdate(); - expect(spy).toHaveBeenCalledTimes(2); - }); - }); + it('shows a toast error when the api return an error', async () => { + jest + .spyOn(api, 'getCasesMetrics') + .mockRejectedValue(new Error('useGetCasesMetrics: Test error')); - it('unhappy path', async () => { - const spy = jest.spyOn(api, 'getCasesMetrics'); - spy.mockImplementation(() => { - throw new Error('Oh on. this is impossible'); + const { waitForNextUpdate } = renderHook(() => useGetCasesMetrics(), { + wrapper: appMockRender.AppWrapper, }); - await act(async () => { - const { result, waitForNextUpdate } = renderHook( - () => useGetCasesMetrics(), - { - wrapper: ({ children }) => {children}, - } - ); - await waitForNextUpdate(); + await waitForNextUpdate(); - expect(result.current).toEqual({ - mttr: 0, - isLoading: false, - isError: true, - fetchCasesMetrics: result.current.fetchCasesMetrics, - }); - }); + expect(addError).toHaveBeenCalled(); }); }); diff --git a/x-pack/plugins/cases/public/containers/use_get_cases_metrics.tsx b/x-pack/plugins/cases/public/containers/use_get_cases_metrics.tsx index a5cb116acc559..b43266e55340d 100644 --- a/x-pack/plugins/cases/public/containers/use_get_cases_metrics.tsx +++ b/x-pack/plugins/cases/public/containers/use_get_cases_metrics.tsx @@ -5,88 +5,37 @@ * 2.0. */ -import { useCallback, useEffect, useState, useRef } from 'react'; - +import { useQuery } from '@tanstack/react-query'; import { useCasesContext } from '../components/cases_context/use_cases_context'; import * as i18n from './translations'; -import { useHttp, useToasts } from '../common/lib/kibana'; +import { useHttp } from '../common/lib/kibana'; import { getCasesMetrics } from '../api'; import { CasesMetrics } from './types'; +import { useCasesToast } from '../common/use_cases_toast'; +import { ServerError } from '../types'; +import { casesQueriesKeys } from './constants'; -interface CasesMetricsState extends CasesMetrics { - isLoading: boolean; - isError: boolean; -} - -const initialData: CasesMetricsState = { - mttr: 0, - isLoading: true, - isError: false, -}; - -export interface UseGetCasesMetrics extends CasesMetricsState { - fetchCasesMetrics: () => void; -} - -export const useGetCasesMetrics = (): UseGetCasesMetrics => { +export const useGetCasesMetrics = () => { const http = useHttp(); const { owner } = useCasesContext(); - const [casesMetricsState, setCasesMetricsState] = useState(initialData); - const toasts = useToasts(); - const isCancelledRef = useRef(false); - const abortCtrlRef = useRef(new AbortController()); - - const fetchCasesMetrics = useCallback(async () => { - try { - isCancelledRef.current = false; - abortCtrlRef.current.abort(); - abortCtrlRef.current = new AbortController(); - setCasesMetricsState({ - ...initialData, - isLoading: true, - }); + const { showErrorToast } = useCasesToast(); - const response = await getCasesMetrics({ + return useQuery( + casesQueriesKeys.casesMetrics(), + () => { + const abortCtrlRef = new AbortController(); + return getCasesMetrics({ http, - signal: abortCtrlRef.current.signal, + signal: abortCtrlRef.signal, query: { owner, features: ['mttr'] }, }); - - if (!isCancelledRef.current) { - setCasesMetricsState({ - ...response, - isLoading: false, - isError: false, - }); - } - } catch (error) { - if (!isCancelledRef.current) { - if (error.name !== 'AbortError') { - toasts.addError( - error.body && error.body.message ? new Error(error.body.message) : error, - { title: i18n.ERROR_TITLE } - ); - } - setCasesMetricsState({ - mttr: 0, - isLoading: false, - isError: true, - }); - } + }, + { + onError: (error: ServerError) => { + showErrorToast(error, { title: i18n.ERROR_TITLE }); + }, } - }, [http, owner, toasts]); - - useEffect(() => { - fetchCasesMetrics(); - - return () => { - isCancelledRef.current = true; - abortCtrlRef.current.abort(); - }; - }, [fetchCasesMetrics]); - - return { - ...casesMetricsState, - fetchCasesMetrics, - }; + ); }; + +export type UseGetCasesMetrics = ReturnType; diff --git a/x-pack/plugins/cases/public/containers/use_get_cases_status.test.tsx b/x-pack/plugins/cases/public/containers/use_get_cases_status.test.tsx index 3978e944db949..4f2572093a285 100644 --- a/x-pack/plugins/cases/public/containers/use_get_cases_status.test.tsx +++ b/x-pack/plugins/cases/public/containers/use_get_cases_status.test.tsx @@ -5,104 +5,56 @@ * 2.0. */ -import React from 'react'; -import { renderHook, act } from '@testing-library/react-hooks'; -import { useGetCasesStatus, UseGetCasesStatus } from './use_get_cases_status'; -import { casesStatus } from './mock'; +import { renderHook } from '@testing-library/react-hooks'; +import { useGetCasesStatus } from './use_get_cases_status'; import * as api from '../api'; -import { TestProviders } from '../common/mock'; +import { AppMockRenderer, createAppMockRenderer } from '../common/mock'; import { SECURITY_SOLUTION_OWNER } from '../../common/constants'; +import { useToasts } from '../common/lib/kibana'; jest.mock('../api'); jest.mock('../common/lib/kibana'); -describe('useGetCasesStatus', () => { +describe('useGetCasesMetrics', () => { const abortCtrl = new AbortController(); + const addSuccess = jest.fn(); + const addError = jest.fn(); + + (useToasts as jest.Mock).mockReturnValue({ addSuccess, addError }); + + let appMockRender: AppMockRenderer; + beforeEach(() => { + appMockRender = createAppMockRenderer(); jest.clearAllMocks(); - jest.restoreAllMocks(); }); - it('init', async () => { - const { result } = renderHook(() => useGetCasesStatus(), { - wrapper: ({ children }) => {children}, - }); - - await act(async () => { - expect(result.current).toEqual({ - countClosedCases: 0, - countOpenCases: 0, - countInProgressCases: 0, - isLoading: true, - isError: false, - fetchCasesStatus: result.current.fetchCasesStatus, - }); + it('calls the api when invoked with the correct parameters', async () => { + const spy = jest.spyOn(api, 'getCasesStatus'); + const { waitForNextUpdate } = renderHook(() => useGetCasesStatus(), { + wrapper: appMockRender.AppWrapper, }); - }); - it('calls getCasesStatus api', async () => { - const spyOnGetCasesStatus = jest.spyOn(api, 'getCasesStatus'); - await act(async () => { - const { waitForNextUpdate } = renderHook( - () => useGetCasesStatus(), - { - wrapper: ({ children }) => {children}, - } - ); + await waitForNextUpdate(); - await waitForNextUpdate(); - expect(spyOnGetCasesStatus).toBeCalledWith({ - http: expect.anything(), - signal: abortCtrl.signal, - query: { owner: [SECURITY_SOLUTION_OWNER] }, - }); + expect(spy).toHaveBeenCalledWith({ + http: expect.anything(), + signal: abortCtrl.signal, + query: { owner: [SECURITY_SOLUTION_OWNER] }, }); }); - it('fetch statuses', async () => { - await act(async () => { - const { result, waitForNextUpdate } = renderHook( - () => useGetCasesStatus(), - { - wrapper: ({ children }) => {children}, - } - ); + it('shows a toast error when the api return an error', async () => { + jest + .spyOn(api, 'getCasesStatus') + .mockRejectedValue(new Error('useGetCasesMetrics: Test error')); - await waitForNextUpdate(); - expect(result.current).toEqual({ - countClosedCases: casesStatus.countClosedCases, - countOpenCases: casesStatus.countOpenCases, - countInProgressCases: casesStatus.countInProgressCases, - isLoading: false, - isError: false, - fetchCasesStatus: result.current.fetchCasesStatus, - }); + const { waitForNextUpdate } = renderHook(() => useGetCasesStatus(), { + wrapper: appMockRender.AppWrapper, }); - }); - it('unhappy path', async () => { - const spyOnGetCasesStatus = jest.spyOn(api, 'getCasesStatus'); - spyOnGetCasesStatus.mockImplementation(() => { - throw new Error('Something went wrong'); - }); + await waitForNextUpdate(); - await act(async () => { - const { result, waitForNextUpdate } = renderHook( - () => useGetCasesStatus(), - { - wrapper: ({ children }) => {children}, - } - ); - await waitForNextUpdate(); - - expect(result.current).toEqual({ - countClosedCases: 0, - countOpenCases: 0, - countInProgressCases: 0, - isLoading: false, - isError: true, - fetchCasesStatus: result.current.fetchCasesStatus, - }); - }); + expect(addError).toHaveBeenCalled(); }); }); diff --git a/x-pack/plugins/cases/public/containers/use_get_cases_status.tsx b/x-pack/plugins/cases/public/containers/use_get_cases_status.tsx index 6530236a2fee6..c2ba6659edcbd 100644 --- a/x-pack/plugins/cases/public/containers/use_get_cases_status.tsx +++ b/x-pack/plugins/cases/public/containers/use_get_cases_status.tsx @@ -5,94 +5,37 @@ * 2.0. */ -import { useCallback, useEffect, useState, useRef } from 'react'; - +import { useQuery } from '@tanstack/react-query'; import { useCasesContext } from '../components/cases_context/use_cases_context'; import * as i18n from './translations'; import { CasesStatus } from './types'; -import { useHttp, useToasts } from '../common/lib/kibana'; +import { useHttp } from '../common/lib/kibana'; import { getCasesStatus } from '../api'; +import { useCasesToast } from '../common/use_cases_toast'; +import { ServerError } from '../types'; +import { casesQueriesKeys } from './constants'; -interface CasesStatusState extends CasesStatus { - isLoading: boolean; - isError: boolean; -} - -const initialData: CasesStatusState = { - countClosedCases: 0, - countInProgressCases: 0, - countOpenCases: 0, - isLoading: true, - isError: false, -}; - -export interface UseGetCasesStatus extends CasesStatusState { - fetchCasesStatus: () => void; -} - -export const useGetCasesStatus = (): UseGetCasesStatus => { +export const useGetCasesStatus = () => { const http = useHttp(); const { owner } = useCasesContext(); - const [casesStatusState, setCasesStatusState] = useState(initialData); - const toasts = useToasts(); - const isCancelledRef = useRef(false); - const abortCtrlRef = useRef(new AbortController()); - - const fetchCasesStatus = useCallback(async () => { - try { - isCancelledRef.current = false; - abortCtrlRef.current.abort(); - abortCtrlRef.current = new AbortController(); - setCasesStatusState({ - ...initialData, - isLoading: true, - }); + const { showErrorToast } = useCasesToast(); - const response = await getCasesStatus({ + return useQuery( + casesQueriesKeys.casesStatuses(), + () => { + const abortCtrlRef = new AbortController(); + return getCasesStatus({ http, - signal: abortCtrlRef.current.signal, + signal: abortCtrlRef.signal, query: { owner }, }); - - if (!isCancelledRef.current) { - setCasesStatusState({ - ...response, - isLoading: false, - isError: false, - }); - } - } catch (error) { - if (!isCancelledRef.current) { - if (error.name !== 'AbortError') { - toasts.addError( - error.body && error.body.message ? new Error(error.body.message) : error, - { title: i18n.ERROR_TITLE } - ); - } - setCasesStatusState({ - countClosedCases: 0, - countInProgressCases: 0, - countOpenCases: 0, - isLoading: false, - isError: true, - }); - } + }, + { + onError: (error: ServerError) => { + showErrorToast(error, { title: i18n.ERROR_TITLE }); + }, } - // eslint-disable-next-line react-hooks/exhaustive-deps - }, []); - - useEffect(() => { - fetchCasesStatus(); - - return () => { - isCancelledRef.current = true; - abortCtrlRef.current.abort(); - }; - // eslint-disable-next-line react-hooks/exhaustive-deps - }, []); - - return { - ...casesStatusState, - fetchCasesStatus, - }; + ); }; + +export type UseGetCasesStatus = ReturnType; diff --git a/x-pack/plugins/cases/public/containers/use_get_tags.tsx b/x-pack/plugins/cases/public/containers/use_get_tags.tsx index 1696a9d1413a5..da56521536cbe 100644 --- a/x-pack/plugins/cases/public/containers/use_get_tags.tsx +++ b/x-pack/plugins/cases/public/containers/use_get_tags.tsx @@ -10,15 +10,14 @@ import { useToasts } from '../common/lib/kibana'; import { useCasesContext } from '../components/cases_context/use_cases_context'; import { ServerError } from '../types'; import { getTags } from './api'; -import { CASE_TAGS_CACHE_KEY } from './constants'; +import { casesQueriesKeys } from './constants'; import * as i18n from './translations'; -export const useGetTags = (cacheKey?: string) => { +export const useGetTags = () => { const toasts = useToasts(); const { owner } = useCasesContext(); - const key = [...(cacheKey ? [cacheKey] : []), CASE_TAGS_CACHE_KEY]; return useQuery( - key, + casesQueriesKeys.tags(), () => { const abortCtrl = new AbortController(); return getTags(abortCtrl.signal, owner); diff --git a/x-pack/plugins/cases/public/containers/user_profiles/use_bulk_get_user_profiles.ts b/x-pack/plugins/cases/public/containers/user_profiles/use_bulk_get_user_profiles.ts index de180b5970f3b..b2928295dbb37 100644 --- a/x-pack/plugins/cases/public/containers/user_profiles/use_bulk_get_user_profiles.ts +++ b/x-pack/plugins/cases/public/containers/user_profiles/use_bulk_get_user_profiles.ts @@ -10,7 +10,7 @@ import { UserProfileWithAvatar } from '@kbn/user-profile-components'; import * as i18n from '../translations'; import { useKibana, useToasts } from '../../common/lib/kibana'; import { ServerError } from '../../types'; -import { USER_PROFILES_CACHE_KEY, USER_PROFILES_BULK_GET_CACHE_KEY } from '../constants'; +import { casesQueriesKeys } from '../constants'; import { bulkGetUserProfiles } from './api'; const profilesToMap = (profiles: UserProfileWithAvatar[]): Map => @@ -25,7 +25,7 @@ export const useBulkGetUserProfiles = ({ uids }: { uids: string[] }) => { const toasts = useToasts(); return useQuery>( - [USER_PROFILES_CACHE_KEY, USER_PROFILES_BULK_GET_CACHE_KEY, uids], + casesQueriesKeys.userProfilesList(uids), () => { return bulkGetUserProfiles({ security, uids }); }, diff --git a/x-pack/plugins/cases/public/containers/user_profiles/use_get_current_user_profile.ts b/x-pack/plugins/cases/public/containers/user_profiles/use_get_current_user_profile.ts index 37c29fa0b2d01..d6e3483672554 100644 --- a/x-pack/plugins/cases/public/containers/user_profiles/use_get_current_user_profile.ts +++ b/x-pack/plugins/cases/public/containers/user_profiles/use_get_current_user_profile.ts @@ -10,7 +10,7 @@ import { UserProfile } from '@kbn/security-plugin/common'; import * as i18n from '../translations'; import { useKibana, useToasts } from '../../common/lib/kibana'; import { ServerError } from '../../types'; -import { USER_PROFILES_CACHE_KEY, USER_PROFILES_GET_CURRENT_CACHE_KEY } from '../constants'; +import { casesQueriesKeys } from '../constants'; import { getCurrentUserProfile } from './api'; export const useGetCurrentUserProfile = () => { @@ -19,7 +19,7 @@ export const useGetCurrentUserProfile = () => { const toasts = useToasts(); return useQuery( - [USER_PROFILES_CACHE_KEY, USER_PROFILES_GET_CURRENT_CACHE_KEY], + casesQueriesKeys.currentUser(), () => { return getCurrentUserProfile({ security }); }, diff --git a/x-pack/plugins/cases/public/containers/user_profiles/use_suggest_user_profiles.ts b/x-pack/plugins/cases/public/containers/user_profiles/use_suggest_user_profiles.ts index 26e03d0163c8e..74c492850acd4 100644 --- a/x-pack/plugins/cases/public/containers/user_profiles/use_suggest_user_profiles.ts +++ b/x-pack/plugins/cases/public/containers/user_profiles/use_suggest_user_profiles.ts @@ -14,7 +14,7 @@ import { DEFAULT_USER_SIZE, SEARCH_DEBOUNCE_MS } from '../../../common/constants import * as i18n from '../translations'; import { useKibana, useToasts } from '../../common/lib/kibana'; import { ServerError } from '../../types'; -import { USER_PROFILES_CACHE_KEY, USER_PROFILES_SUGGEST_CACHE_KEY } from '../constants'; +import { casesQueriesKeys } from '../constants'; import { suggestUserProfiles, SuggestUserProfilesArgs } from './api'; type Props = Omit & { onDebounce?: () => void }; @@ -49,11 +49,7 @@ export const useSuggestUserProfiles = ({ const toasts = useToasts(); return useQuery( - [ - USER_PROFILES_CACHE_KEY, - USER_PROFILES_SUGGEST_CACHE_KEY, - { name: debouncedName, owners, size }, - ], + casesQueriesKeys.suggestUsers({ name: debouncedName, owners, size }), () => { const abortCtrlRef = new AbortController(); return suggestUserProfiles({ diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json index e0ff0ef2793f7..ce86f1de798de 100644 --- a/x-pack/plugins/translations/translations/fr-FR.json +++ b/x-pack/plugins/translations/translations/fr-FR.json @@ -9286,7 +9286,6 @@ "xpack.cases.confirmDeleteCase.confirmQuestion": "Si vous supprimez {quantity, plural, =1 {ce cas} other {ces cas}}, toutes les données des cas connexes seront définitivement retirées et vous ne pourrez plus transmettre de données à un système de gestion des incidents externes. Voulez-vous vraiment continuer ?", "xpack.cases.confirmDeleteCase.deleteCase": "Supprimer {quantity, plural, =1 {le cas} other {les cas}}", "xpack.cases.confirmDeleteCase.deleteTitle": "Supprimer \"{caseTitle}\"", - "xpack.cases.confirmDeleteCase.selectedCases": "Supprimer \"{quantity, plural, =1 {{title}} other {{quantity} cas sélectionnés}}\"", "xpack.cases.connecors.get.missingCaseConnectorErrorMessage": "Le type d'objet \"{id}\" n'est pas enregistré.", "xpack.cases.connecors.register.duplicateCaseConnectorErrorMessage": "Le type d'objet \"{id}\" est déjà enregistré.", "xpack.cases.connectors.card.createCommentWarningDesc": "Configurez les champs Create Comment URL et Create Comment Objects pour que le connecteur {connectorName} puisse partager les commentaires.", @@ -9296,7 +9295,6 @@ "xpack.cases.connectors.cases.externalIncidentUpdated": "(mis à jour le {date} par {user})", "xpack.cases.connectors.jira.unableToGetIssueMessage": "Impossible d'obtenir le problème ayant l'ID {id}", "xpack.cases.containers.closedCases": "Fermeture de {totalCases, plural, =1 {\"{caseTitle}\"} other {{totalCases} cas}} effectuée", - "xpack.cases.containers.deletedCases": "Suppression de {totalCases, plural, =1 {\"{caseTitle}\"} other {{totalCases} cas}} effectuée", "xpack.cases.containers.markInProgressCases": "Marquage effectué de {totalCases, plural, =1 {\"{caseTitle}\"} other {{totalCases} cas}} comme étant en cours", "xpack.cases.containers.pushToExternalService": "Envoyé avec succès à { serviceName }", "xpack.cases.containers.reopenedCases": "Ouverture de {totalCases, plural, =1 {\"{caseTitle}\"} other {{totalCases} cas}} effectuée", @@ -9328,7 +9326,6 @@ "xpack.cases.caseTable.changeStatus": "Modifier le statut", "xpack.cases.caseTable.closed": "Fermé", "xpack.cases.caseTable.closedCases": "Cas fermés", - "xpack.cases.caseTable.delete": "Supprimer", "xpack.cases.caseTable.incidentSystem": "Système de gestion des incidents", "xpack.cases.caseTable.inProgressCases": "Cas en cours", "xpack.cases.caseTable.noCases.body": "Créer un cas ou modifiez vos filtres.", diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index 8715883e4251c..5b56cc076172c 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -9273,7 +9273,6 @@ "xpack.cases.confirmDeleteCase.confirmQuestion": "{quantity, plural, =1 {このケース} other {これらのケース}}を削除すると、関連するすべてのケースデータが完全に削除され、外部インシデント管理システムにデータをプッシュできなくなります。続行していいですか？", "xpack.cases.confirmDeleteCase.deleteCase": "{quantity, plural, other {ケース}}を削除", "xpack.cases.confirmDeleteCase.deleteTitle": "「{caseTitle}」を削除", - "xpack.cases.confirmDeleteCase.selectedCases": "\"{quantity, plural, =1 {{title}} other {選択した{quantity}個のケース}}\"を削除", "xpack.cases.connecors.get.missingCaseConnectorErrorMessage": "オブジェクトタイプ「{id}」は登録されていません。", "xpack.cases.connecors.register.duplicateCaseConnectorErrorMessage": "オブジェクトタイプ「{id}」はすでに登録されています。", "xpack.cases.connectors.card.createCommentWarningDesc": "コメントを外部で共有するには、{connectorName}コネクターの［コメントURLを作成］および［コメントオブジェクトを作成］フィールドを構成します。", @@ -9283,7 +9282,6 @@ "xpack.cases.connectors.cases.externalIncidentUpdated": "（{date}に{user}が更新）", "xpack.cases.connectors.jira.unableToGetIssueMessage": "ID {id}の問題を取得できません", "xpack.cases.containers.closedCases": "{totalCases, plural, =1 {\"{caseTitle}\"} other {{totalCases}件のケース}}をクローズしました", - "xpack.cases.containers.deletedCases": "{totalCases, plural, =1 {\"{caseTitle}\"} other {{totalCases}件のケース}}を削除しました", "xpack.cases.containers.markInProgressCases": "{totalCases, plural, =1 {\"{caseTitle}\"} other {{totalCases}件のケース}}を進行中に設定しました", "xpack.cases.containers.pushToExternalService": "{ serviceName }への送信が正常に完了しました", "xpack.cases.containers.reopenedCases": "{totalCases, plural, =1 {\"{caseTitle}\"} other {{totalCases}件のケース}}をオープンしました", @@ -9315,7 +9313,6 @@ "xpack.cases.caseTable.changeStatus": "ステータスの変更", "xpack.cases.caseTable.closed": "終了", "xpack.cases.caseTable.closedCases": "終了したケース", - "xpack.cases.caseTable.delete": "削除", "xpack.cases.caseTable.incidentSystem": "インシデント管理システム", "xpack.cases.caseTable.inProgressCases": "進行中のケース", "xpack.cases.caseTable.noCases.body": "ケースを作成するか、フィルターを編集します。", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index ee88a0ed92217..09fb50c164e9c 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -9291,7 +9291,6 @@ "xpack.cases.confirmDeleteCase.confirmQuestion": "删除{quantity, plural, =1 {此案例} other {这些案例}}即会永久移除所有相关案例数据，而且您将无法再将数据推送到外部事件管理系统。是否确定要继续？", "xpack.cases.confirmDeleteCase.deleteCase": "删除{quantity, plural, other {案例}}", "xpack.cases.confirmDeleteCase.deleteTitle": "删除“{caseTitle}”", - "xpack.cases.confirmDeleteCase.selectedCases": "删除“{quantity, plural, =1 {{title}} other {选定的 {quantity} 个案例}}”", "xpack.cases.connecors.get.missingCaseConnectorErrorMessage": "对象类型“{id}”未注册。", "xpack.cases.connecors.register.duplicateCaseConnectorErrorMessage": "已注册对象类型“{id}”。", "xpack.cases.connectors.card.createCommentWarningDesc": "为 {connectorName} 连接器配置“创建注释 URL”和“创建注释对象”字段以在外部共享注释。", @@ -9301,7 +9300,6 @@ "xpack.cases.connectors.cases.externalIncidentUpdated": "（由 {user} 于 {date}更新）", "xpack.cases.connectors.jira.unableToGetIssueMessage": "无法获取 ID 为 {id} 的问题", "xpack.cases.containers.closedCases": "已关闭{totalCases, plural, =1 {“{caseTitle}”} other { {totalCases} 个案例}}", - "xpack.cases.containers.deletedCases": "已删除{totalCases, plural, =1 {“{caseTitle}”} other { {totalCases} 个案例}}", "xpack.cases.containers.markInProgressCases": "已将{totalCases, plural, =1 {“{caseTitle}”} other { {totalCases} 个案例}}标记为进行中", "xpack.cases.containers.pushToExternalService": "已成功发送到 { serviceName }", "xpack.cases.containers.reopenedCases": "已打开{totalCases, plural, =1 {“{caseTitle}”} other { {totalCases} 个案例}}", @@ -9333,7 +9331,6 @@ "xpack.cases.caseTable.changeStatus": "更改状态", "xpack.cases.caseTable.closed": "已关闭", "xpack.cases.caseTable.closedCases": "已关闭案例", - "xpack.cases.caseTable.delete": "删除", "xpack.cases.caseTable.incidentSystem": "事件管理系统", "xpack.cases.caseTable.inProgressCases": "进行中的案例", "xpack.cases.caseTable.noCases.body": "创建案例或编辑筛选。", From 61a300818056c36885874db0d805aa2ab37e24a5 Mon Sep 17 00:00:00 2001 From: Julian Gernun Date: Wed, 28 Sep 2022 19:39:44 +0200 Subject: [PATCH 53/95] add ownfocus flyout prop (#142085) --- .../sections/alerts_table/alerts_flyout/alerts_flyout.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_flyout/alerts_flyout.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_flyout/alerts_flyout.tsx index e57e8c9902069..3ddefe1c4cf68 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_flyout/alerts_flyout.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_flyout/alerts_flyout.tsx @@ -99,7 +99,7 @@ export const AlertsFlyout: React.FunctionComponent = ({ ); return ( - + {isLoading && } From 13b283ac4d1d4602e0c700599ef2449d90ee8a23 Mon Sep 17 00:00:00 2001 From: Nicolas Chaulet Date: Wed, 28 Sep 2022 13:46:32 -0400 Subject: [PATCH 54/95] [Fleet] Fix preconfigured ca_trusted_fingerprint in output (#142109) --- .../services/preconfiguration/outputs.test.ts | 27 +++++++++++++++++++ .../services/preconfiguration/outputs.ts | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/x-pack/plugins/fleet/server/services/preconfiguration/outputs.test.ts b/x-pack/plugins/fleet/server/services/preconfiguration/outputs.test.ts index a8eaa39d427df..e6fa2e008e4bb 100644 --- a/x-pack/plugins/fleet/server/services/preconfiguration/outputs.test.ts +++ b/x-pack/plugins/fleet/server/services/preconfiguration/outputs.test.ts @@ -112,6 +112,33 @@ describe('output preconfiguration', () => { expect(spyAgentPolicyServicBumpAllAgentPoliciesForOutput).not.toBeCalled(); }); + it('should create a preconfigured output with ca_trusted_fingerprint that does not exists', async () => { + const soClient = savedObjectsClientMock.create(); + const esClient = elasticsearchServiceMock.createClusterClient().asInternalUser; + await createOrUpdatePreconfiguredOutputs(soClient, esClient, [ + { + id: 'non-existing-output-1', + name: 'Output 1', + type: 'elasticsearch', + is_default: false, + is_default_monitoring: false, + hosts: ['http://test.fr'], + ca_trusted_fingerprint: 'testfingerprint', + }, + ]); + + expect(mockedOutputService.create).toBeCalled(); + expect(mockedOutputService.create).toBeCalledWith( + expect.anything(), + expect.objectContaining({ + ca_trusted_fingerprint: 'testfingerprint', + }), + expect.anything() + ); + expect(mockedOutputService.update).not.toBeCalled(); + expect(spyAgentPolicyServicBumpAllAgentPoliciesForOutput).not.toBeCalled(); + }); + it('should create preconfigured logstash output that does not exist', async () => { const soClient = savedObjectsClientMock.create(); const esClient = elasticsearchServiceMock.createClusterClient().asInternalUser; diff --git a/x-pack/plugins/fleet/server/services/preconfiguration/outputs.ts b/x-pack/plugins/fleet/server/services/preconfiguration/outputs.ts index a61d8316dcc5f..d7f43ce181a42 100644 --- a/x-pack/plugins/fleet/server/services/preconfiguration/outputs.ts +++ b/x-pack/plugins/fleet/server/services/preconfiguration/outputs.ts @@ -78,7 +78,7 @@ export async function createOrUpdatePreconfiguredOutputs( config_yaml: configYaml ?? null, // Set value to null to update these fields on update ca_sha256: outputData.ca_sha256 ?? null, - ca_trusted_fingerprint: outputData.ca_sha256 ?? null, + ca_trusted_fingerprint: outputData.ca_trusted_fingerprint ?? null, ssl: outputData.ssl ?? null, }; From d05eca48e857118ad0ae357d93584051ce62a186 Mon Sep 17 00:00:00 2001 From: doakalexi <109488926+doakalexi@users.noreply.github.com> Date: Wed, 28 Sep 2022 14:24:40 -0400 Subject: [PATCH 55/95] Removing action subgroups (#141794) --- x-pack/plugins/alerting/README.md | 21 +- .../plugins/alerting/common/alert_summary.ts | 1 - .../alerting/server/alert/alert.test.ts | 210 +--------------- x-pack/plugins/alerting/server/alert/alert.ts | 57 +---- .../lib/alert_summary_from_event_log.test.ts | 13 - .../lib/alert_summary_from_event_log.ts | 3 - .../alerting_event_logger.test.ts | 10 +- .../alerting_event_logger.ts | 12 +- ...eate_alert_event_log_record_object.test.ts | 4 - .../create_alert_event_log_record_object.ts | 5 +- .../server/rules_client/rules_client.ts | 3 +- .../server/rules_client/tests/disable.test.ts | 2 - .../tests/get_alert_summary.test.ts | 3 - .../task_runner/create_execution_handler.ts | 3 - .../alerting/server/task_runner/fixtures.ts | 16 +- .../alerting/server/task_runner/log_alerts.ts | 18 +- .../schedule_actions_for_alerts.ts | 23 +- .../server/task_runner/task_runner.test.ts | 95 +------ .../transform_action_params.test.ts | 7 +- .../task_runner/transform_action_params.ts | 4 - .../alerting/server/task_runner/types.ts | 1 - .../routes/rules/preview_rules_route.ts | 1 - .../preview/alert_instance_factory_stub.ts | 10 - .../plugins/alerts/server/alert_types.ts | 22 +- .../group2/tests/alerting/alerts.ts | 76 ------ .../spaces_only/tests/alerting/event_log.ts | 232 ------------------ .../spaces_only/tests/alerting/notify_when.ts | 91 ------- 27 files changed, 42 insertions(+), 901 deletions(-) diff --git a/x-pack/plugins/alerting/README.md b/x-pack/plugins/alerting/README.md index eed17e563860b..ffe17b91b8aeb 100644 --- a/x-pack/plugins/alerting/README.md +++ b/x-pack/plugins/alerting/README.md @@ -770,25 +770,10 @@ This factory returns an instance of `Alert`. The `Alert` class has the following |Method|Description| |---|---| |getState()|Get the current state of the alert.| -|scheduleActions(actionGroup, context)|Call this to schedule the execution of actions. The actionGroup is a string `id` that relates to the group of alert `actions` to execute and the context will be used for templating purposes. `scheduleActions` or `scheduleActionsWithSubGroup` should only be called once per alert.| -|scheduleActionsWithSubGroup(actionGroup, subgroup, context)|Call this to schedule the execution of actions within a subgroup. The actionGroup is a string `id` that relates to the group of alert `actions` to execute, the `subgroup` is a dynamic string that denotes a subgroup within the actionGroup and the context will be used for templating purposes. `scheduleActions` or `scheduleActionsWithSubGroup` should only be called once per alert.| -|replaceState(state)|Used to replace the current state of the alert. This doesn't work like React, the entire state must be provided. Use this feature as you see fit. The state that is set will persist between rule executions whenever you re-create an alert with the same id. The alert state will be erased when `scheduleActions` or `scheduleActionsWithSubGroup` aren't called during an execution.| +|scheduleActions(actionGroup, context)|Call this to schedule the execution of actions. The actionGroup is a string `id` that relates to the group of alert `actions` to execute and the context will be used for templating purposes. `scheduleActions` should only be called once per alert.| +|replaceState(state)|Used to replace the current state of the alert. This doesn't work like React, the entire state must be provided. Use this feature as you see fit. The state that is set will persist between rule executions whenever you re-create an alert with the same id. The alert state will be erased when `scheduleActions`isn't called during an execution.| |setContext(context)|Call this to set the context for this alert that is used for templating purposes. -### When should I use `scheduleActions` and `scheduleActionsWithSubGroup`? -The `scheduleActions` or `scheduleActionsWithSubGroup` methods are both used to achieve the same thing: schedule actions to be run under a specific action group. -It's important to note that when actions are scheduled for an alert, we check whether the alert was already active in this action group after the previous execution. If it was, then we might throttle the actions (adhering to the user's configuration), as we don't consider this a change in the alert. - -What happens though, if the alert _has_ changed, but they just happen to be in the same action group after this change? This is where subgroups come in. By specifying a subgroup (using the `scheduleActionsWithSubGroup` method), the alert becomes active within the action group, but it will also keep track of the subgroup. -If the subgroup changes, then the framework will treat the alert as if it had been placed in a new action group. It is important to note that we only use the subgroup to denote a change if both the current execution and the previous one specified a subgroup. - -You might wonder, why bother using a subgroup if you can just add a new action group? -Action Groups are static, and have to be define when the rule type is defined. -Action Subgroups are dynamic, and can be defined on the fly. - -This approach enables users to specify actions under specific action groups, but they can't specify actions that are specific to subgroups. -As subgroups fall under action groups, we will schedule the actions specified for the action group, but the subgroup allows the RuleType implementer to reuse the same action group for multiple different active subgroups. - ### When should I use `setContext`? `setContext` is intended to be used for setting context for recovered alerts. While rule type executors make the determination as to which alerts are active for an execution, the Alerting Framework automatically determines which alerts are recovered for an execution. `setContext` empowers rule type executors to provide additional contextual information for these recovered alerts that will be templated into actions. @@ -798,7 +783,7 @@ There needs to be a way to map rule context into action parameters. For this, we When an alert executes, the first argument is the `group` of actions to execute and the second is the context the rule exposes to templates. We iterate through each action parameter attributes recursively and render templates if they are a string. Templates have access to the following "variables": -- `context` - provided by context argument of `.scheduleActions(...)`, `.scheduleActionsWithSubGroup(...)` and `setContext(...)` on an alert. +- `context` - provided by context argument of `.scheduleActions(...)` and `setContext(...)` on an alert. - `state` - the alert's `state` provided by the most recent `replaceState` call on an alert. - `alertId` - the id of the rule - `alertInstanceId` - the alert id diff --git a/x-pack/plugins/alerting/common/alert_summary.ts b/x-pack/plugins/alerting/common/alert_summary.ts index b04ce59eed1bd..fc35e3403fe92 100644 --- a/x-pack/plugins/alerting/common/alert_summary.ts +++ b/x-pack/plugins/alerting/common/alert_summary.ts @@ -35,6 +35,5 @@ export interface AlertStatus { status: AlertStatusValues; muted: boolean; actionGroupId?: string; - actionSubgroup?: string; activeStartDate?: string; } diff --git a/x-pack/plugins/alerting/server/alert/alert.test.ts b/x-pack/plugins/alerting/server/alert/alert.test.ts index eae1b18164b0f..d9e05e55a67fd 100644 --- a/x-pack/plugins/alerting/server/alert/alert.test.ts +++ b/x-pack/plugins/alerting/server/alert/alert.test.ts @@ -81,10 +81,10 @@ describe('isThrottled', () => { }); }); -describe('scheduledActionGroupOrSubgroupHasChanged()', () => { +describe('scheduledActionGroupHasChanged()', () => { test('should be false if no last scheduled and nothing scheduled', () => { const alert = new Alert('1'); - expect(alert.scheduledActionGroupOrSubgroupHasChanged()).toEqual(false); + expect(alert.scheduledActionGroupHasChanged()).toEqual(false); }); test('should be false if group does not change', () => { @@ -97,54 +97,13 @@ describe('scheduledActionGroupOrSubgroupHasChanged()', () => { }, }); alert.scheduleActions('default'); - expect(alert.scheduledActionGroupOrSubgroupHasChanged()).toEqual(false); - }); - - test('should be false if group and subgroup does not change', () => { - const alert = new Alert('1', { - meta: { - lastScheduledActions: { - date: new Date(), - group: 'default', - subgroup: 'subgroup', - }, - }, - }); - alert.scheduleActionsWithSubGroup('default', 'subgroup'); - expect(alert.scheduledActionGroupOrSubgroupHasChanged()).toEqual(false); - }); - - test('should be false if group does not change and subgroup goes from undefined to defined', () => { - const alert = new Alert('1', { - meta: { - lastScheduledActions: { - date: new Date(), - group: 'default', - }, - }, - }); - alert.scheduleActionsWithSubGroup('default', 'subgroup'); - expect(alert.scheduledActionGroupOrSubgroupHasChanged()).toEqual(false); - }); - - test('should be false if group does not change and subgroup goes from defined to undefined', () => { - const alert = new Alert('1', { - meta: { - lastScheduledActions: { - date: new Date(), - group: 'default', - subgroup: 'subgroup', - }, - }, - }); - alert.scheduleActions('default'); - expect(alert.scheduledActionGroupOrSubgroupHasChanged()).toEqual(false); + expect(alert.scheduledActionGroupHasChanged()).toEqual(false); }); test('should be true if no last scheduled and has scheduled action', () => { const alert = new Alert('1'); alert.scheduleActions('default'); - expect(alert.scheduledActionGroupOrSubgroupHasChanged()).toEqual(true); + expect(alert.scheduledActionGroupHasChanged()).toEqual(true); }); test('should be true if group does change', () => { @@ -157,35 +116,7 @@ describe('scheduledActionGroupOrSubgroupHasChanged()', () => { }, }); alert.scheduleActions('penguin'); - expect(alert.scheduledActionGroupOrSubgroupHasChanged()).toEqual(true); - }); - - test('should be true if group does change and subgroup does change', () => { - const alert = new Alert('1', { - meta: { - lastScheduledActions: { - date: new Date(), - group: 'default', - subgroup: 'subgroup', - }, - }, - }); - alert.scheduleActionsWithSubGroup('penguin', 'fish'); - expect(alert.scheduledActionGroupOrSubgroupHasChanged()).toEqual(true); - }); - - test('should be true if group does not change and subgroup does change', () => { - const alert = new Alert('1', { - meta: { - lastScheduledActions: { - date: new Date(), - group: 'default', - subgroup: 'subgroup', - }, - }, - }); - alert.scheduleActionsWithSubGroup('default', 'fish'); - expect(alert.scheduledActionGroupOrSubgroupHasChanged()).toEqual(true); + expect(alert.scheduledActionGroupHasChanged()).toEqual(true); }); }); @@ -296,137 +227,6 @@ describe('scheduleActions()', () => { }); }); -describe('scheduleActionsWithSubGroup()', () => { - test('makes hasScheduledActions() return true', () => { - const alert = new Alert('1', { - state: { foo: true }, - meta: { - lastScheduledActions: { - date: new Date(), - group: 'default', - }, - }, - }); - alert - .replaceState({ otherField: true }) - .scheduleActionsWithSubGroup('default', 'subgroup', { field: true }); - expect(alert.hasScheduledActions()).toEqual(true); - }); - - test('makes isThrottled() return true when throttled and subgroup is the same', () => { - const alert = new Alert('1', { - state: { foo: true }, - meta: { - lastScheduledActions: { - date: new Date(), - group: 'default', - subgroup: 'subgroup', - }, - }, - }); - alert - .replaceState({ otherField: true }) - .scheduleActionsWithSubGroup('default', 'subgroup', { field: true }); - expect(alert.isThrottled('1m')).toEqual(true); - }); - - test('makes isThrottled() return true when throttled and last schedule had no subgroup', () => { - const alert = new Alert('1', { - state: { foo: true }, - meta: { - lastScheduledActions: { - date: new Date(), - group: 'default', - }, - }, - }); - alert - .replaceState({ otherField: true }) - .scheduleActionsWithSubGroup('default', 'subgroup', { field: true }); - expect(alert.isThrottled('1m')).toEqual(true); - }); - - test('makes isThrottled() return false when throttled and subgroup is the different', () => { - const alert = new Alert('1', { - state: { foo: true }, - meta: { - lastScheduledActions: { - date: new Date(), - group: 'default', - subgroup: 'prev-subgroup', - }, - }, - }); - alert - .replaceState({ otherField: true }) - .scheduleActionsWithSubGroup('default', 'subgroup', { field: true }); - expect(alert.isThrottled('1m')).toEqual(false); - }); - - test('make isThrottled() return false when throttled expired', () => { - const alert = new Alert('1', { - state: { foo: true }, - meta: { - lastScheduledActions: { - date: new Date(), - group: 'default', - }, - }, - }); - clock.tick(120000); - alert - .replaceState({ otherField: true }) - .scheduleActionsWithSubGroup('default', 'subgroup', { field: true }); - expect(alert.isThrottled('1m')).toEqual(false); - }); - - test('makes getScheduledActionOptions() return given options', () => { - const alert = new Alert('1', { - state: { foo: true }, - meta: {}, - }); - alert - .replaceState({ otherField: true }) - .scheduleActionsWithSubGroup('default', 'subgroup', { field: true }); - expect(alert.getScheduledActionOptions()).toEqual({ - actionGroup: 'default', - subgroup: 'subgroup', - context: { field: true }, - state: { otherField: true }, - }); - }); - - test('cannot schdule for execution twice', () => { - const alert = new Alert('1'); - alert.scheduleActionsWithSubGroup('default', 'subgroup', { field: true }); - expect(() => - alert.scheduleActionsWithSubGroup('default', 'subgroup', { field: false }) - ).toThrowErrorMatchingInlineSnapshot( - `"Alert instance execution has already been scheduled, cannot schedule twice"` - ); - }); - - test('cannot schdule for execution twice with different subgroups', () => { - const alert = new Alert('1'); - alert.scheduleActionsWithSubGroup('default', 'subgroup', { field: true }); - expect(() => - alert.scheduleActionsWithSubGroup('default', 'subgroup', { field: false }) - ).toThrowErrorMatchingInlineSnapshot( - `"Alert instance execution has already been scheduled, cannot schedule twice"` - ); - }); - - test('cannot schdule for execution twice whether there are subgroups', () => { - const alert = new Alert('1'); - alert.scheduleActions('default', { field: true }); - expect(() => - alert.scheduleActionsWithSubGroup('default', 'subgroup', { field: false }) - ).toThrowErrorMatchingInlineSnapshot( - `"Alert instance execution has already been scheduled, cannot schedule twice"` - ); - }); -}); - describe('replaceState()', () => { test('replaces previous state', () => { const alert = new Alert('1', { diff --git a/x-pack/plugins/alerting/server/alert/alert.ts b/x-pack/plugins/alerting/server/alert/alert.ts index bf29cacf556c1..e24b15de41db4 100644 --- a/x-pack/plugins/alerting/server/alert/alert.ts +++ b/x-pack/plugins/alerting/server/alert/alert.ts @@ -23,7 +23,6 @@ interface ScheduledExecutionOptions< ActionGroupIds extends string = DefaultActionGroupId > { actionGroup: ActionGroupIds; - subgroup?: string; context: Context; state: State; } @@ -34,13 +33,7 @@ export type PublicAlert< ActionGroupIds extends string = DefaultActionGroupId > = Pick< Alert, - | 'getState' - | 'replaceState' - | 'scheduleActions' - | 'scheduleActionsWithSubGroup' - | 'setContext' - | 'getContext' - | 'hasContext' + 'getState' | 'replaceState' | 'scheduleActions' | 'setContext' | 'getContext' | 'hasContext' >; export class Alert< @@ -80,10 +73,6 @@ export class Alert< this.meta.lastScheduledActions, this.scheduledExecutionOptions ) && - this.scheduledActionSubgroupIsUnchanged( - this.meta.lastScheduledActions, - this.scheduledExecutionOptions - ) && this.meta.lastScheduledActions.date.getTime() + throttleMills > Date.now() ) { return true; @@ -91,7 +80,7 @@ export class Alert< return false; } - scheduledActionGroupOrSubgroupHasChanged(): boolean { + scheduledActionGroupHasChanged(): boolean { if (!this.meta.lastScheduledActions && this.scheduledExecutionOptions) { // it is considered a change when there are no previous scheduled actions // and new scheduled actions @@ -100,18 +89,11 @@ export class Alert< if (this.meta.lastScheduledActions && this.scheduledExecutionOptions) { // compare previous and new scheduled actions if both exist - return ( - !this.scheduledActionGroupIsUnchanged( - this.meta.lastScheduledActions, - this.scheduledExecutionOptions - ) || - !this.scheduledActionSubgroupIsUnchanged( - this.meta.lastScheduledActions, - this.scheduledExecutionOptions - ) + return !this.scheduledActionGroupIsUnchanged( + this.meta.lastScheduledActions, + this.scheduledExecutionOptions ); } - // no previous and no new scheduled actions return false; } @@ -123,15 +105,6 @@ export class Alert< return lastScheduledActions.group === scheduledExecutionOptions.actionGroup; } - private scheduledActionSubgroupIsUnchanged( - lastScheduledActions: NonNullable, - scheduledExecutionOptions: ScheduledExecutionOptions - ) { - return lastScheduledActions.subgroup && scheduledExecutionOptions.subgroup - ? lastScheduledActions.subgroup === scheduledExecutionOptions.subgroup - : true; - } - getLastScheduledActions() { return this.meta.lastScheduledActions; } @@ -168,22 +141,6 @@ export class Alert< return this; } - scheduleActionsWithSubGroup( - actionGroup: ActionGroupIds, - subgroup: string, - context: Context = {} as Context - ) { - this.ensureHasNoScheduledActions(); - this.setContext(context); - this.scheduledExecutionOptions = { - actionGroup, - subgroup, - context, - state: this.state, - }; - return this; - } - setContext(context: Context) { this.context = context; return this; @@ -200,8 +157,8 @@ export class Alert< return this; } - updateLastScheduledActions(group: ActionGroupIds, subgroup?: string) { - this.meta.lastScheduledActions = { group, subgroup, date: new Date() }; + updateLastScheduledActions(group: ActionGroupIds) { + this.meta.lastScheduledActions = { group, date: new Date() }; } /** diff --git a/x-pack/plugins/alerting/server/lib/alert_summary_from_event_log.test.ts b/x-pack/plugins/alerting/server/lib/alert_summary_from_event_log.test.ts index d2040f8e63f3a..56a862f2ad6ca 100644 --- a/x-pack/plugins/alerting/server/lib/alert_summary_from_event_log.test.ts +++ b/x-pack/plugins/alerting/server/lib/alert_summary_from_event_log.test.ts @@ -121,14 +121,12 @@ describe('alertSummaryFromEventLog', () => { "alerts": Object { "alert-1": Object { "actionGroupId": undefined, - "actionSubgroup": undefined, "activeStartDate": undefined, "muted": true, "status": "OK", }, "alert-2": Object { "actionGroupId": undefined, - "actionSubgroup": undefined, "activeStartDate": undefined, "muted": true, "status": "OK", @@ -233,7 +231,6 @@ describe('alertSummaryFromEventLog', () => { "alerts": Object { "alert-1": Object { "actionGroupId": undefined, - "actionSubgroup": undefined, "activeStartDate": undefined, "muted": false, "status": "OK", @@ -274,7 +271,6 @@ describe('alertSummaryFromEventLog', () => { "alerts": Object { "alert-1": Object { "actionGroupId": undefined, - "actionSubgroup": undefined, "activeStartDate": undefined, "muted": false, "status": "OK", @@ -314,7 +310,6 @@ describe('alertSummaryFromEventLog', () => { "alerts": Object { "alert-1": Object { "actionGroupId": undefined, - "actionSubgroup": undefined, "activeStartDate": undefined, "muted": false, "status": "OK", @@ -355,7 +350,6 @@ describe('alertSummaryFromEventLog', () => { "alerts": Object { "alert-1": Object { "actionGroupId": "action group A", - "actionSubgroup": undefined, "activeStartDate": "2020-06-18T00:00:00.000Z", "muted": false, "status": "Active", @@ -396,7 +390,6 @@ describe('alertSummaryFromEventLog', () => { "alerts": Object { "alert-1": Object { "actionGroupId": undefined, - "actionSubgroup": undefined, "activeStartDate": "2020-06-18T00:00:00.000Z", "muted": false, "status": "Active", @@ -437,7 +430,6 @@ describe('alertSummaryFromEventLog', () => { "alerts": Object { "alert-1": Object { "actionGroupId": "action group B", - "actionSubgroup": undefined, "activeStartDate": "2020-06-18T00:00:00.000Z", "muted": false, "status": "Active", @@ -476,7 +468,6 @@ describe('alertSummaryFromEventLog', () => { "alerts": Object { "alert-1": Object { "actionGroupId": "action group A", - "actionSubgroup": undefined, "activeStartDate": undefined, "muted": false, "status": "Active", @@ -519,14 +510,12 @@ describe('alertSummaryFromEventLog', () => { "alerts": Object { "alert-1": Object { "actionGroupId": "action group A", - "actionSubgroup": undefined, "activeStartDate": "2020-06-18T00:00:00.000Z", "muted": true, "status": "Active", }, "alert-2": Object { "actionGroupId": undefined, - "actionSubgroup": undefined, "activeStartDate": undefined, "muted": true, "status": "OK", @@ -576,14 +565,12 @@ describe('alertSummaryFromEventLog', () => { "alerts": Object { "alert-1": Object { "actionGroupId": "action group B", - "actionSubgroup": undefined, "activeStartDate": "2020-06-18T00:00:00.000Z", "muted": false, "status": "Active", }, "alert-2": Object { "actionGroupId": undefined, - "actionSubgroup": undefined, "activeStartDate": undefined, "muted": false, "status": "OK", diff --git a/x-pack/plugins/alerting/server/lib/alert_summary_from_event_log.ts b/x-pack/plugins/alerting/server/lib/alert_summary_from_event_log.ts index 54ac23bf94f2a..d8e5f4dea9b41 100644 --- a/x-pack/plugins/alerting/server/lib/alert_summary_from_event_log.ts +++ b/x-pack/plugins/alerting/server/lib/alert_summary_from_event_log.ts @@ -87,14 +87,12 @@ export function alertSummaryFromEventLog(params: AlertSummaryFromEventLogParams) case EVENT_LOG_ACTIONS.activeInstance: status.status = 'Active'; status.actionGroupId = event?.kibana?.alerting?.action_group_id; - status.actionSubgroup = event?.kibana?.alerting?.action_subgroup; break; case LEGACY_EVENT_LOG_ACTIONS.resolvedInstance: case EVENT_LOG_ACTIONS.recoveredInstance: status.status = 'OK'; status.activeStartDate = undefined; status.actionGroupId = undefined; - status.actionSubgroup = undefined; } } @@ -153,7 +151,6 @@ function getAlertStatus(alerts: Map, alertId: string): Aler status: 'OK', muted: false, actionGroupId: undefined, - actionSubgroup: undefined, activeStartDate: undefined, }; alerts.set(alertId, status); diff --git a/x-pack/plugins/alerting/server/lib/alerting_event_logger/alerting_event_logger.test.ts b/x-pack/plugins/alerting/server/lib/alerting_event_logger/alerting_event_logger.test.ts index 91904901adcfd..8fe081864b118 100644 --- a/x-pack/plugins/alerting/server/lib/alerting_event_logger/alerting_event_logger.test.ts +++ b/x-pack/plugins/alerting/server/lib/alerting_event_logger/alerting_event_logger.test.ts @@ -59,9 +59,8 @@ const contextWithName = { ...contextWithScheduleDelay, ruleName: 'my-super-cool- const alert = { action: EVENT_LOG_ACTIONS.activeInstance, id: 'aaabbb', - message: `.test-rule-type:123: 'my rule' active alert: 'aaabbb' in actionGroup: 'aGroup'; actionSubGroup: 'bSubGroup'`, + message: `.test-rule-type:123: 'my rule' active alert: 'aaabbb' in actionGroup: 'aGroup';`, group: 'aGroup', - subgroup: 'bSubgroup', state: { start: '2020-01-01T02:00:00.000Z', end: '2020-01-01T03:00:00.000Z', @@ -74,7 +73,6 @@ const action = { typeId: '.email', alertId: '123', alertGroup: 'aGroup', - alertSubgroup: 'bSubgroup', }; describe('AlertingEventLogger', () => { @@ -1006,14 +1004,13 @@ describe('createAlertRecord', () => { expect(record.event?.end).toEqual(alert.state.end); expect(record.event?.duration).toEqual(alert.state.duration); expect(record.message).toEqual( - `.test-rule-type:123: 'my rule' active alert: 'aaabbb' in actionGroup: 'aGroup'; actionSubGroup: 'bSubGroup'` + `.test-rule-type:123: 'my rule' active alert: 'aaabbb' in actionGroup: 'aGroup';` ); expect(record.kibana?.alert?.rule?.rule_type_id).toEqual(contextWithName.ruleType.id); expect(record.kibana?.alert?.rule?.consumer).toEqual(contextWithName.consumer); expect(record.kibana?.alert?.rule?.execution?.uuid).toEqual(contextWithName.executionId); expect(record.kibana?.alerting?.instance_id).toEqual(alert.id); expect(record.kibana?.alerting?.action_group_id).toEqual(alert.group); - expect(record.kibana?.alerting?.action_subgroup).toEqual(alert.subgroup); expect(record.kibana?.saved_objects).toEqual([ { id: contextWithName.ruleId, @@ -1059,14 +1056,13 @@ describe('createActionExecuteRecord', () => { expect(record.event?.kind).toEqual('alert'); expect(record.event?.category).toEqual([contextWithName.ruleType.producer]); expect(record.message).toEqual( - `alert: test:123: 'my-super-cool-rule' instanceId: '123' scheduled actionGroup(subgroup): 'aGroup(bSubgroup)' action: .email:abc` + `alert: test:123: 'my-super-cool-rule' instanceId: '123' scheduled actionGroup: 'aGroup' action: .email:abc` ); expect(record.kibana?.alert?.rule?.rule_type_id).toEqual(contextWithName.ruleType.id); expect(record.kibana?.alert?.rule?.consumer).toEqual(contextWithName.consumer); expect(record.kibana?.alert?.rule?.execution?.uuid).toEqual(contextWithName.executionId); expect(record.kibana?.alerting?.instance_id).toEqual(action.alertId); expect(record.kibana?.alerting?.action_group_id).toEqual(action.alertGroup); - expect(record.kibana?.alerting?.action_subgroup).toEqual(action.alertSubgroup); expect(record.kibana?.saved_objects).toEqual([ { id: contextWithName.ruleId, diff --git a/x-pack/plugins/alerting/server/lib/alerting_event_logger/alerting_event_logger.ts b/x-pack/plugins/alerting/server/lib/alerting_event_logger/alerting_event_logger.ts index 96be872d81b8c..18e4044172eb4 100644 --- a/x-pack/plugins/alerting/server/lib/alerting_event_logger/alerting_event_logger.ts +++ b/x-pack/plugins/alerting/server/lib/alerting_event_logger/alerting_event_logger.ts @@ -47,7 +47,6 @@ interface AlertOpts { id: string; message: string; group?: string; - subgroup?: string; state?: AlertInstanceState; } @@ -56,7 +55,6 @@ interface ActionOpts { typeId: string; alertId: string; alertGroup?: string; - alertSubgroup?: string; } export class AlertingEventLogger { @@ -232,7 +230,6 @@ export function createAlertRecord(context: RuleContextOpts, alert: AlertOpts) { state: alert.state, instanceId: alert.id, group: alert.group, - subgroup: alert.subgroup, message: alert.message, savedObjects: [ { @@ -257,14 +254,7 @@ export function createActionExecuteRecord(context: RuleContextOpts, action: Acti action: EVENT_LOG_ACTIONS.executeAction, instanceId: action.alertId, group: action.alertGroup, - subgroup: action.alertSubgroup, - message: `alert: ${context.ruleType.id}:${context.ruleId}: '${context.ruleName}' instanceId: '${ - action.alertId - }' scheduled ${ - action.alertSubgroup - ? `actionGroup(subgroup): '${action.alertGroup}(${action.alertSubgroup})'` - : `actionGroup: '${action.alertGroup}'` - } action: ${action.typeId}:${action.id}`, + message: `alert: ${context.ruleType.id}:${context.ruleId}: '${context.ruleName}' instanceId: '${action.alertId}' scheduled actionGroup: '${action.alertGroup}' action: ${action.typeId}:${action.id}`, savedObjects: [ { id: context.ruleId, diff --git a/x-pack/plugins/alerting/server/lib/create_alert_event_log_record_object.test.ts b/x-pack/plugins/alerting/server/lib/create_alert_event_log_record_object.test.ts index ba16b7c553e86..8f73ba3a56860 100644 --- a/x-pack/plugins/alerting/server/lib/create_alert_event_log_record_object.test.ts +++ b/x-pack/plugins/alerting/server/lib/create_alert_event_log_record_object.test.ts @@ -99,7 +99,6 @@ describe('createAlertEventLogRecordObject', () => { group: 'group 1', message: 'message text here', namespace: 'default', - subgroup: 'subgroup value', state: { start: '1970-01-01T00:00:00.000Z', end: '1970-01-01T00:05:00.000Z', @@ -136,7 +135,6 @@ describe('createAlertEventLogRecordObject', () => { }, alerting: { action_group_id: 'group 1', - action_subgroup: 'subgroup value', instance_id: 'test1', }, saved_objects: [ @@ -174,7 +172,6 @@ describe('createAlertEventLogRecordObject', () => { group: 'group 1', message: 'action execution start', namespace: 'default', - subgroup: 'subgroup value', state: { start: '1970-01-01T00:00:00.000Z', end: '1970-01-01T00:05:00.000Z', @@ -216,7 +213,6 @@ describe('createAlertEventLogRecordObject', () => { }, alerting: { action_group_id: 'group 1', - action_subgroup: 'subgroup value', instance_id: 'test1', }, saved_objects: [ diff --git a/x-pack/plugins/alerting/server/lib/create_alert_event_log_record_object.ts b/x-pack/plugins/alerting/server/lib/create_alert_event_log_record_object.ts index cd7eda500d15b..a0f229c0b46d9 100644 --- a/x-pack/plugins/alerting/server/lib/create_alert_event_log_record_object.ts +++ b/x-pack/plugins/alerting/server/lib/create_alert_event_log_record_object.ts @@ -23,7 +23,6 @@ interface CreateAlertEventLogRecordParams { message?: string; state?: AlertInstanceState; group?: string; - subgroup?: string; namespace?: string; timestamp?: string; task?: { @@ -48,18 +47,16 @@ export function createAlertEventLogRecordObject(params: CreateAlertEventLogRecor task, ruleId, group, - subgroup, namespace, consumer, spaceId, } = params; const alerting = - params.instanceId || group || subgroup + params.instanceId || group ? { alerting: { ...(params.instanceId ? { instance_id: params.instanceId } : {}), ...(group ? { action_group_id: group } : {}), - ...(subgroup ? { action_subgroup: subgroup } : {}), }, } : undefined; diff --git a/x-pack/plugins/alerting/server/rules_client/rules_client.ts b/x-pack/plugins/alerting/server/rules_client/rules_client.ts index f865a0472465a..89ce20b59ae9b 100644 --- a/x-pack/plugins/alerting/server/rules_client/rules_client.ts +++ b/x-pack/plugins/alerting/server/rules_client/rules_client.ts @@ -2404,7 +2404,7 @@ export class RulesClient { const recoveredAlertInstanceIds = Object.keys(recoveredAlertInstances); for (const instanceId of recoveredAlertInstanceIds) { - const { group: actionGroup, subgroup: actionSubgroup } = + const { group: actionGroup } = recoveredAlertInstances[instanceId].getLastScheduledActions() ?? {}; const instanceState = recoveredAlertInstances[instanceId].getState(); const message = `instance '${instanceId}' has recovered due to the rule was disabled`; @@ -2419,7 +2419,6 @@ export class RulesClient { message, state: instanceState, group: actionGroup, - subgroup: actionSubgroup, namespace: this.namespace, spaceId: this.spaceId, savedObjects: [ diff --git a/x-pack/plugins/alerting/server/rules_client/tests/disable.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/disable.test.ts index cca7cd0d70322..558d33ecca87c 100644 --- a/x-pack/plugins/alerting/server/rules_client/tests/disable.test.ts +++ b/x-pack/plugins/alerting/server/rules_client/tests/disable.test.ts @@ -250,7 +250,6 @@ describe('disable()', () => { meta: { lastScheduledActions: { group: 'default', - subgroup: 'newSubgroup', date: new Date().toISOString(), }, }, @@ -319,7 +318,6 @@ describe('disable()', () => { }, alerting: { action_group_id: 'default', - action_subgroup: 'newSubgroup', instance_id: '1', }, saved_objects: [ diff --git a/x-pack/plugins/alerting/server/rules_client/tests/get_alert_summary.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/get_alert_summary.test.ts index 6dcd64565c562..4aa7ae40f8782 100644 --- a/x-pack/plugins/alerting/server/rules_client/tests/get_alert_summary.test.ts +++ b/x-pack/plugins/alerting/server/rules_client/tests/get_alert_summary.test.ts @@ -156,21 +156,18 @@ describe('getAlertSummary()', () => { "alerts": Object { "alert-currently-active": Object { "actionGroupId": "action group A", - "actionSubgroup": undefined, "activeStartDate": "2019-02-12T21:01:22.479Z", "muted": false, "status": "Active", }, "alert-muted-no-activity": Object { "actionGroupId": undefined, - "actionSubgroup": undefined, "activeStartDate": undefined, "muted": true, "status": "OK", }, "alert-previously-active": Object { "actionGroupId": undefined, - "actionSubgroup": undefined, "activeStartDate": undefined, "muted": false, "status": "OK", diff --git a/x-pack/plugins/alerting/server/task_runner/create_execution_handler.ts b/x-pack/plugins/alerting/server/task_runner/create_execution_handler.ts index 7146ef4a5225c..51ba1404b2a4f 100644 --- a/x-pack/plugins/alerting/server/task_runner/create_execution_handler.ts +++ b/x-pack/plugins/alerting/server/task_runner/create_execution_handler.ts @@ -65,7 +65,6 @@ export function createExecutionHandler< return async ({ actionGroup, - actionSubgroup, context, state, ruleRunMetricsStore, @@ -92,7 +91,6 @@ export function createExecutionHandler< alertInstanceId: alertId, alertActionGroup: actionGroup, alertActionGroupName: ruleTypeActionGroups.get(actionGroup)!, - alertActionSubgroup: actionSubgroup, context, actionParams: action.params, actionId: action.id, @@ -203,7 +201,6 @@ export function createExecutionHandler< typeId: actionTypeId, alertId, alertGroup: actionGroup, - alertSubgroup: actionSubgroup, }); } diff --git a/x-pack/plugins/alerting/server/task_runner/fixtures.ts b/x-pack/plugins/alerting/server/task_runner/fixtures.ts index 39b90efbc786e..0a90456dbdad6 100644 --- a/x-pack/plugins/alerting/server/task_runner/fixtures.ts +++ b/x-pack/plugins/alerting/server/task_runner/fixtures.ts @@ -178,7 +178,7 @@ export const mockTaskInstance = () => ({ ownerId: null, }); -export const generateAlertOpts = ({ action, group, subgroup, state, id }: GeneratorParams = {}) => { +export const generateAlertOpts = ({ action, group, state, id }: GeneratorParams = {}) => { id = id ?? '1'; let message: string = ''; switch (action) { @@ -186,9 +186,7 @@ export const generateAlertOpts = ({ action, group, subgroup, state, id }: Genera message = `test:1: 'rule-name' created new alert: '${id}'`; break; case EVENT_LOG_ACTIONS.activeInstance: - message = subgroup - ? `test:1: 'rule-name' active alert: '${id}' in actionGroup(subgroup): 'default(${subgroup})'` - : `test:1: 'rule-name' active alert: '${id}' in actionGroup: 'default'`; + message = `test:1: 'rule-name' active alert: '${id}' in actionGroup: 'default'`; break; case EVENT_LOG_ACTIONS.recoveredInstance: message = `test:1: 'rule-name' alert '${id}' has recovered`; @@ -200,21 +198,14 @@ export const generateAlertOpts = ({ action, group, subgroup, state, id }: Genera message, state, ...(group ? { group } : {}), - ...(subgroup ? { subgroup } : {}), }; }; -export const generateActionOpts = ({ - subgroup, - id, - alertGroup, - alertId, -}: GeneratorParams = {}) => ({ +export const generateActionOpts = ({ id, alertGroup, alertId }: GeneratorParams = {}) => ({ id: id ?? '1', typeId: 'action', alertId: alertId ?? '1', alertGroup: alertGroup ?? 'default', - ...(subgroup ? { alertSubgroup: subgroup } : {}), }); export const generateRunnerResult = ({ @@ -280,7 +271,6 @@ export const generateAlertInstance = ({ id, duration, start }: GeneratorParams = lastScheduledActions: { date: new Date(DATE_1970), group: 'default', - subgroup: undefined, }, }, state: { diff --git a/x-pack/plugins/alerting/server/task_runner/log_alerts.ts b/x-pack/plugins/alerting/server/task_runner/log_alerts.ts index 87da1fb67f332..2abe72ed06cb5 100644 --- a/x-pack/plugins/alerting/server/task_runner/log_alerts.ts +++ b/x-pack/plugins/alerting/server/task_runner/log_alerts.ts @@ -92,8 +92,7 @@ export function logAlerts< ruleRunMetricsStore.setNumberOfRecoveredAlerts(recoveredAlertIds.length); for (const id of recoveredAlertIds) { - const { group: actionGroup, subgroup: actionSubgroup } = - recoveredAlerts[id].getLastScheduledActions() ?? {}; + const { group: actionGroup } = recoveredAlerts[id].getLastScheduledActions() ?? {}; const state = recoveredAlerts[id].getState(); const message = `${ruleLogPrefix} alert '${id}' has recovered`; @@ -101,41 +100,32 @@ export function logAlerts< action: EVENT_LOG_ACTIONS.recoveredInstance, id, group: actionGroup, - subgroup: actionSubgroup, message, state, }); } for (const id of newAlertIds) { - const { actionGroup, subgroup: actionSubgroup } = - activeAlerts[id].getScheduledActionOptions() ?? {}; + const { actionGroup } = activeAlerts[id].getScheduledActionOptions() ?? {}; const state = activeAlerts[id].getState(); const message = `${ruleLogPrefix} created new alert: '${id}'`; alertingEventLogger.logAlert({ action: EVENT_LOG_ACTIONS.newInstance, id, group: actionGroup, - subgroup: actionSubgroup, message, state, }); } for (const id of activeAlertIds) { - const { actionGroup, subgroup: actionSubgroup } = - activeAlerts[id].getScheduledActionOptions() ?? {}; + const { actionGroup } = activeAlerts[id].getScheduledActionOptions() ?? {}; const state = activeAlerts[id].getState(); - const message = `${ruleLogPrefix} active alert: '${id}' in ${ - actionSubgroup - ? `actionGroup(subgroup): '${actionGroup}(${actionSubgroup})'` - : `actionGroup: '${actionGroup}'` - }`; + const message = `${ruleLogPrefix} active alert: '${id}' in actionGroup: '${actionGroup}'`; alertingEventLogger.logAlert({ action: EVENT_LOG_ACTIONS.activeInstance, id, group: actionGroup, - subgroup: actionSubgroup, message, state, }); diff --git a/x-pack/plugins/alerting/server/task_runner/schedule_actions_for_alerts.ts b/x-pack/plugins/alerting/server/task_runner/schedule_actions_for_alerts.ts index e0cc6d5b81c3a..8c1d62ecf4e32 100644 --- a/x-pack/plugins/alerting/server/task_runner/schedule_actions_for_alerts.ts +++ b/x-pack/plugins/alerting/server/task_runner/schedule_actions_for_alerts.ts @@ -49,16 +49,8 @@ export async function scheduleActionsForAlerts< notifyWhen ); if (executeAction && alert.hasScheduledActions()) { - const { actionGroup, subgroup: actionSubgroup, state } = alert.getScheduledActionOptions()!; - await executeAlert( - alertId, - alert, - executionHandler, - ruleRunMetricsStore, - actionGroup, - state, - actionSubgroup - ); + const { actionGroup, state } = alert.getScheduledActionOptions()!; + await executeAlert(alertId, alert, executionHandler, ruleRunMetricsStore, actionGroup, state); } } @@ -94,14 +86,12 @@ async function executeAlert< executionHandler: ExecutionHandler, ruleRunMetricsStore: RuleRunMetricsStore, actionGroup: ActionGroupIds | RecoveryActionGroupId, - state: InstanceState, - actionSubgroup?: string + state: InstanceState ) { - alert.updateLastScheduledActions(actionGroup, actionSubgroup); + alert.updateLastScheduledActions(actionGroup); alert.unscheduleActions(); return executionHandler({ actionGroup, - actionSubgroup, context: alert.getContext(), state, alertId, @@ -133,10 +123,7 @@ function shouldExecuteAction< muted ? 'muted' : 'throttled' }` ); - } else if ( - notifyWhen === 'onActionGroupChange' && - !alert.scheduledActionGroupOrSubgroupHasChanged() - ) { + } else if (notifyWhen === 'onActionGroupChange' && !alert.scheduledActionGroupHasChanged()) { executeAction = false; logger.debug( `skipping scheduling of actions for '${alertId}' in rule ${ruleLabel}: alert is active but action group has not changed` diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner.test.ts b/x-pack/plugins/alerting/server/task_runner/task_runner.test.ts index 4ce85f54c3dc5..a199fb3b55998 100644 --- a/x-pack/plugins/alerting/server/task_runner/task_runner.test.ts +++ b/x-pack/plugins/alerting/server/task_runner/task_runner.test.ts @@ -312,9 +312,7 @@ describe('Task Runner', () => { AlertInstanceContext, string >) => { - executorServices.alertFactory - .create('1') - .scheduleActionsWithSubGroup('default', 'subDefault'); + executorServices.alertFactory.create('1').scheduleActions('default'); } ); const taskRunner = new TaskRunner( @@ -360,7 +358,6 @@ describe('Task Runner', () => { generateAlertOpts({ action: EVENT_LOG_ACTIONS.newInstance, group: 'default', - subgroup: 'subDefault', state: { start: DATE_1970, duration: '0' }, }) ); @@ -369,14 +366,10 @@ describe('Task Runner', () => { generateAlertOpts({ action: EVENT_LOG_ACTIONS.activeInstance, group: 'default', - subgroup: 'subDefault', state: { start: DATE_1970, duration: '0' }, }) ); - expect(alertingEventLogger.logAction).toHaveBeenNthCalledWith( - 1, - generateActionOpts({ subgroup: 'subDefault' }) - ); + expect(alertingEventLogger.logAction).toHaveBeenNthCalledWith(1, generateActionOpts()); expect(mockUsageCounter.incrementCounter).not.toHaveBeenCalled(); } @@ -859,90 +852,6 @@ describe('Task Runner', () => { } ); - test.each(ephemeralTestParams)( - 'actionsPlugin.execute is called when notifyWhen=onActionGroupChange and alert state subgroup has changed %s', - async (nameExtension, customTaskRunnerFactoryInitializerParams, enqueueFunction) => { - customTaskRunnerFactoryInitializerParams.actionsPlugin.isActionTypeEnabled.mockReturnValue( - true - ); - - customTaskRunnerFactoryInitializerParams.actionsPlugin.isActionExecutable.mockReturnValue( - true - ); - ruleType.executor.mockImplementation( - async ({ - services: executorServices, - }: RuleExecutorOptions< - RuleTypeParams, - RuleTypeState, - AlertInstanceState, - AlertInstanceContext, - string - >) => { - executorServices.alertFactory - .create('1') - .scheduleActionsWithSubGroup('default', 'subgroup1'); - } - ); - const taskRunner = new TaskRunner( - ruleType, - { - ...mockedTaskInstance, - state: { - ...mockedTaskInstance.state, - alertInstances: { - '1': { - meta: { - lastScheduledActions: { - group: 'default', - subgroup: 'newSubgroup', - date: new Date().toISOString(), - }, - }, - state: { bar: false }, - }, - }, - }, - }, - customTaskRunnerFactoryInitializerParams, - inMemoryMetrics - ); - expect(AlertingEventLogger).toHaveBeenCalled(); - - rulesClient.get.mockResolvedValue({ - ...mockedRuleTypeSavedObject, - notifyWhen: 'onActionGroupChange', - }); - encryptedSavedObjectsClient.getDecryptedAsInternalUser.mockResolvedValue(SAVED_OBJECT); - await taskRunner.run(); - - testAlertingEventLogCalls({ - activeAlerts: 1, - triggeredActions: 1, - generatedActions: 1, - status: 'active', - logAlert: 1, - logAction: 1, - }); - expect(alertingEventLogger.logAlert).toHaveBeenNthCalledWith( - 1, - generateAlertOpts({ - action: EVENT_LOG_ACTIONS.activeInstance, - state: { bar: false }, - group: 'default', - subgroup: 'subgroup1', - }) - ); - expect(alertingEventLogger.logAction).toHaveBeenNthCalledWith( - 1, - generateActionOpts({ subgroup: 'subgroup1' }) - ); - - expect(enqueueFunction).toHaveBeenCalledTimes(1); - expect(mockUsageCounter.incrementCounter).not.toHaveBeenCalled(); - } - ); - test.each(ephemeralTestParams)( 'includes the apiKey in the request used to initialize the actionsClient %s', async ( diff --git a/x-pack/plugins/alerting/server/task_runner/transform_action_params.test.ts b/x-pack/plugins/alerting/server/task_runner/transform_action_params.test.ts index 6235e630ba0bb..ababe16dea378 100644 --- a/x-pack/plugins/alerting/server/task_runner/transform_action_params.test.ts +++ b/x-pack/plugins/alerting/server/task_runner/transform_action_params.test.ts @@ -417,7 +417,6 @@ test('rule variables are passed to templates', () => { alertInstanceId: '2', alertActionGroup: 'action-group', alertActionGroupName: 'Action Group', - alertActionSubgroup: 'subgroup', alertParams: {}, }); expect(result).toMatchInlineSnapshot(` @@ -429,8 +428,7 @@ test('rule variables are passed to templates', () => { test('rule alert variables are passed to templates', () => { const actionParams = { - message: - 'Value "{{alert.id}}", "{{alert.actionGroup}}", "{{alert.actionGroupName}}" and "{{alert.actionSubgroup}}" exist', + message: 'Value "{{alert.id}}", "{{alert.actionGroup}}" and "{{alert.actionGroupName}}" exist', }; const result = transformActionParams({ actionsPlugin, @@ -447,12 +445,11 @@ test('rule alert variables are passed to templates', () => { alertInstanceId: '2', alertActionGroup: 'action-group', alertActionGroupName: 'Action Group', - alertActionSubgroup: 'subgroup', alertParams: {}, }); expect(result).toMatchInlineSnapshot(` Object { - "message": "Value \\"2\\", \\"action-group\\", \\"Action Group\\" and \\"subgroup\\" exist", + "message": "Value \\"2\\", \\"action-group\\" and \\"Action Group\\" exist", } `); }); diff --git a/x-pack/plugins/alerting/server/task_runner/transform_action_params.ts b/x-pack/plugins/alerting/server/task_runner/transform_action_params.ts index 322a16c1c238e..61ec54c48886f 100644 --- a/x-pack/plugins/alerting/server/task_runner/transform_action_params.ts +++ b/x-pack/plugins/alerting/server/task_runner/transform_action_params.ts @@ -25,7 +25,6 @@ interface TransformActionParamsOptions { alertInstanceId: string; alertActionGroup: string; alertActionGroupName: string; - alertActionSubgroup?: string; actionParams: RuleActionParams; alertParams: RuleTypeParams; state: AlertInstanceState; @@ -44,7 +43,6 @@ export function transformActionParams({ tags, alertInstanceId, alertActionGroup, - alertActionSubgroup, alertActionGroupName, context, actionParams, @@ -63,7 +61,6 @@ export function transformActionParams({ alertInstanceId, alertActionGroup, alertActionGroupName, - alertActionSubgroup, context, date: new Date().toISOString(), state, @@ -80,7 +77,6 @@ export function transformActionParams({ id: alertInstanceId, actionGroup: alertActionGroup, actionGroupName: alertActionGroupName, - actionSubgroup: alertActionSubgroup, }, }; return actionsPlugin.renderActionParameterTemplates( diff --git a/x-pack/plugins/alerting/server/task_runner/types.ts b/x-pack/plugins/alerting/server/task_runner/types.ts index 87bd65b028481..ce439fa3b3b0a 100644 --- a/x-pack/plugins/alerting/server/task_runner/types.ts +++ b/x-pack/plugins/alerting/server/task_runner/types.ts @@ -116,7 +116,6 @@ export interface CreateExecutionHandlerOptions< export interface ExecutionHandlerOptions { actionGroup: ActionGroupIds; - actionSubgroup?: string; alertId: string; context: AlertInstanceContext; state: AlertInstanceState; diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/preview_rules_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/preview_rules_route.ts index a147118b782d5..15b6ffe47d349 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/preview_rules_route.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/preview_rules_route.ts @@ -182,7 +182,6 @@ export const previewRulesRoute = async ( | 'getState' | 'replaceState' | 'scheduleActions' - | 'scheduleActionsWithSubGroup' | 'setContext' | 'getContext' | 'hasContext' diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/preview/alert_instance_factory_stub.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/preview/alert_instance_factory_stub.ts index b73119d15077a..a3cf4ebc95d7c 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/preview/alert_instance_factory_stub.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/preview/alert_instance_factory_stub.ts @@ -37,16 +37,6 @@ export const alertInstanceFactoryStub = < meta: { lastScheduledActions: { group: 'default', date: new Date() } }, }); }, - scheduleActionsWithSubGroup( - actionGroup: TActionGroupIds, - subgroup: string, - alertcontext: TInstanceContext - ) { - return new Alert('', { - state: {} as TInstanceState, - meta: { lastScheduledActions: { group: 'default', date: new Date() } }, - }); - }, setContext(alertContext: TInstanceContext) { return new Alert('', { state: {} as TInstanceState, diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/alert_types.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/alert_types.ts index 3d68c420e4442..068c516618616 100644 --- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/alert_types.ts +++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/alert_types.ts @@ -109,31 +109,21 @@ async function alwaysFiringExecutor(alertExecutorOptions: any) { rule, } = alertExecutorOptions; let group: string | null = 'default'; - let subgroup: string | null = null; const alertInfo = { alertId, spaceId, namespace, name, tags, createdBy, updatedBy, ...rule }; if (params.groupsToScheduleActionsInSeries) { const index = state.groupInSeriesIndex || 0; - const [scheduledGroup, scheduledSubgroup] = ( - params.groupsToScheduleActionsInSeries[index] ?? '' - ).split(':'); + const [scheduledGroup] = (params.groupsToScheduleActionsInSeries[index] ?? '').split(':'); group = scheduledGroup; - subgroup = scheduledSubgroup; } if (group) { const instance = services.alertFactory.create('1').replaceState({ instanceStateValue: true }); - if (subgroup) { - instance.scheduleActionsWithSubGroup(group, subgroup, { - instanceContextValue: true, - }); - } else { - instance.scheduleActions(group, { - instanceContextValue: true, - }); - } + instance.scheduleActions(group, { + instanceContextValue: true, + }); } await services.scopedClusterClient.asCurrentUser.index({ @@ -506,9 +496,7 @@ function getPatternFiringAlertType() { deep: DeepContextVariables, }); } else if (typeof scheduleByPattern === 'string') { - services.alertFactory - .create(instanceId) - .scheduleActionsWithSubGroup('default', scheduleByPattern); + services.alertFactory.create(instanceId).scheduleActions('default', scheduleByPattern); } } diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/alerting/alerts.ts b/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/alerting/alerts.ts index 63c70e93ea194..8f1b8047e4331 100644 --- a/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/alerting/alerts.ts +++ b/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/alerting/alerts.ts @@ -953,82 +953,6 @@ instanceStateValue: true } }); - it('should not throttle when changing subgroups', async () => { - const testStart = new Date(); - const reference = alertUtils.generateReference(); - const response = await alertUtils.createAlwaysFiringAction({ - reference, - overwrites: { - schedule: { interval: '1s' }, - params: { - index: ES_TEST_INDEX_NAME, - reference, - groupsToScheduleActionsInSeries: ['default:prev', 'default:next'], - }, - actions: [ - { - group: 'default', - id: indexRecordActionId, - params: { - index: ES_TEST_INDEX_NAME, - reference, - message: 'from:{{alertActionGroup}}:{{alertActionSubgroup}}', - }, - }, - ], - }, - }); - - switch (scenario.id) { - case 'no_kibana_privileges at space1': - case 'space_1_all at space2': - case 'global_read at space1': - expect(response.statusCode).to.eql(403); - expect(response.body).to.eql({ - error: 'Forbidden', - message: getConsumerUnauthorizedErrorMessage( - 'create', - 'test.always-firing', - 'alertsFixture' - ), - statusCode: 403, - }); - break; - case 'space_1_all_alerts_none_actions at space1': - expect(response.statusCode).to.eql(403); - expect(response.body).to.eql({ - error: 'Forbidden', - message: `Unauthorized to get actions`, - statusCode: 403, - }); - break; - case 'space_1_all at space1': - case 'space_1_all_with_restricted_fixture at space1': - case 'superuser at space1': - expect(response.statusCode).to.eql(200); - // Wait for actions to execute twice before disabling the alert and waiting for tasks to finish - await esTestIndexTool.waitForDocs('action:test.index-record', reference, 2); - await alertUtils.disable(response.body.id); - await taskManagerUtils.waitForDisabled(response.body.id, testStart); - - // Ensure only 2 actions with proper params exists - const searchResult = await esTestIndexTool.search( - 'action:test.index-record', - reference - ); - // @ts-expect-error doesnt handle total: number - expect(searchResult.body.hits.total.value).to.eql(2); - const messages: string[] = searchResult.body.hits.hits.map( - // @ts-expect-error _source: unknown - (hit: { _source: { params: { message: string } } }) => hit._source.params.message - ); - expect(messages.sort()).to.eql(['from:default:next', 'from:default:prev']); - break; - default: - throw new Error(`Scenario untested: ${JSON.stringify(scenario)}`); - } - }); - it('should reset throttle window when not firing', async () => { const testStart = new Date(); const reference = alertUtils.generateReference(); diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/event_log.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/event_log.ts index 206036ef7fcac..2e63bed197864 100644 --- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/event_log.ts +++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/event_log.ts @@ -6,7 +6,6 @@ */ import expect from '@kbn/expect'; -import uuid from 'uuid'; import { IValidatedEvent, nanosToMillis } from '@kbn/event-log-plugin/server'; import { Spaces } from '../../scenarios'; import { @@ -447,237 +446,6 @@ export default function eventLogTests({ getService }: FtrProviderContext) { } }); - it('should generate expected events for normal operation with subgroups', async () => { - const { body: createdAction } = await supertest - .post(`${getUrlPrefix(space.id)}/api/actions/connector`) - .set('kbn-xsrf', 'foo') - .send({ - name: 'MY action', - connector_type_id: 'test.noop', - config: {}, - secrets: {}, - }) - .expect(200); - - // pattern of when the alert should fire - const [firstSubgroup, secondSubgroup] = [uuid.v4(), uuid.v4()]; - const pattern = { - instance: [false, firstSubgroup, secondSubgroup], - }; - - const response = await supertest - .post(`${getUrlPrefix(space.id)}/api/alerting/rule`) - .set('kbn-xsrf', 'foo') - .send( - getTestRuleData({ - rule_type_id: 'test.patternFiring', - schedule: { interval: '1s' }, - throttle: null, - params: { - pattern, - }, - actions: [ - { - id: createdAction.id, - group: 'default', - params: {}, - }, - ], - }) - ); - - expect(response.status).to.eql(200); - const alertId = response.body.id; - objectRemover.add(space.id, alertId, 'rule', 'alerting'); - - // get the events we're expecting - const events = await retry.try(async () => { - return await getEventLog({ - getService, - spaceId: space.id, - type: 'alert', - id: alertId, - provider: 'alerting', - actions: new Map([ - // make sure the counts of the # of events per type are as expected - ['execute-start', { gte: 4 }], - ['execute', { gte: 4 }], - ['execute-action', { equal: 2 }], - ['new-instance', { equal: 1 }], - ['active-instance', { gte: 2 }], - ['recovered-instance', { equal: 1 }], - ]), - }); - }); - - const executeEvents = getEventsByAction(events, 'execute'); - const executeStartEvents = getEventsByAction(events, 'execute-start'); - const newInstanceEvents = getEventsByAction(events, 'new-instance'); - const recoveredInstanceEvents = getEventsByAction(events, 'recovered-instance'); - - // make sure the events are in the right temporal order - const executeTimes = getTimestamps(executeEvents); - const executeStartTimes = getTimestamps(executeStartEvents); - const newInstanceTimes = getTimestamps(newInstanceEvents); - const recoveredInstanceTimes = getTimestamps(recoveredInstanceEvents); - - expect(executeTimes[0] < newInstanceTimes[0]).to.be(true); - expect(executeTimes[1] >= newInstanceTimes[0]).to.be(true); - expect(executeTimes[2] > newInstanceTimes[0]).to.be(true); - expect(executeStartTimes.length === executeTimes.length).to.be(true); - expect(recoveredInstanceTimes[0] > newInstanceTimes[0]).to.be(true); - - // validate each event - let executeCount = 0; - let numActiveAlerts = 0; - let numNewAlerts = 0; - let numRecoveredAlerts = 0; - let currentExecutionId; - const executeStatuses = ['ok', 'active', 'active']; - for (const event of events) { - switch (event?.event?.action) { - case 'execute-start': - currentExecutionId = event?.kibana?.alert?.rule?.execution?.uuid; - validateEvent(event, { - spaceId: space.id, - savedObjects: [ - { type: 'alert', id: alertId, rel: 'primary', type_id: 'test.patternFiring' }, - ], - message: `rule execution start: "${alertId}"`, - shouldHaveTask: true, - executionId: currentExecutionId, - ruleTypeId: response.body.rule_type_id, - rule: { - id: alertId, - category: response.body.rule_type_id, - license: 'basic', - ruleset: 'alertsFixture', - }, - consumer: 'alertsFixture', - }); - break; - case 'execute-action': - expect( - [firstSubgroup, secondSubgroup].includes( - event?.kibana?.alerting?.action_subgroup! - ) - ).to.be(true); - validateEvent(event, { - spaceId: space.id, - savedObjects: [ - { type: 'alert', id: alertId, rel: 'primary', type_id: 'test.patternFiring' }, - { type: 'action', id: createdAction.id, type_id: 'test.noop' }, - ], - message: `alert: test.patternFiring:${alertId}: 'abc' instanceId: 'instance' scheduled actionGroup(subgroup): 'default(${event?.kibana?.alerting?.action_subgroup})' action: test.noop:${createdAction.id}`, - instanceId: 'instance', - actionGroupId: 'default', - executionId: currentExecutionId, - ruleTypeId: response.body.rule_type_id, - rule: { - id: alertId, - category: response.body.rule_type_id, - license: 'basic', - ruleset: 'alertsFixture', - name: response.body.name, - }, - consumer: 'alertsFixture', - }); - break; - case 'new-instance': - numNewAlerts++; - validateInstanceEvent( - event, - `created new alert: 'instance'`, - false, - currentExecutionId - ); - break; - case 'recovered-instance': - numRecoveredAlerts++; - validateInstanceEvent( - event, - `alert 'instance' has recovered`, - true, - currentExecutionId - ); - break; - case 'active-instance': - numActiveAlerts++; - expect( - [firstSubgroup, secondSubgroup].includes( - event?.kibana?.alerting?.action_subgroup! - ) - ).to.be(true); - validateInstanceEvent( - event, - `active alert: 'instance' in actionGroup(subgroup): 'default(${event?.kibana?.alerting?.action_subgroup})'`, - false, - currentExecutionId - ); - break; - case 'execute': - validateEvent(event, { - spaceId: space.id, - savedObjects: [ - { type: 'alert', id: alertId, rel: 'primary', type_id: 'test.patternFiring' }, - ], - outcome: 'success', - message: `rule executed: test.patternFiring:${alertId}: 'abc'`, - status: executeStatuses[executeCount++], - shouldHaveTask: true, - executionId: currentExecutionId, - ruleTypeId: response.body.rule_type_id, - rule: { - id: alertId, - category: response.body.rule_type_id, - license: 'basic', - ruleset: 'alertsFixture', - name: response.body.name, - }, - consumer: 'alertsFixture', - numActiveAlerts, - numNewAlerts, - numRecoveredAlerts, - }); - numActiveAlerts = 0; - numNewAlerts = 0; - numRecoveredAlerts = 0; - break; - // this will get triggered as we add new event actions - default: - throw new Error(`unexpected event action "${event?.event?.action}"`); - } - } - - function validateInstanceEvent( - event: IValidatedEvent, - subMessage: string, - shouldHaveEventEnd: boolean, - executionId?: string - ) { - validateEvent(event, { - spaceId: space.id, - savedObjects: [ - { type: 'alert', id: alertId, rel: 'primary', type_id: 'test.patternFiring' }, - ], - message: `test.patternFiring:${alertId}: 'abc' ${subMessage}`, - instanceId: 'instance', - actionGroupId: 'default', - shouldHaveEventEnd, - executionId, - ruleTypeId: response.body.rule_type_id, - rule: { - id: alertId, - category: response.body.rule_type_id, - license: 'basic', - ruleset: 'alertsFixture', - name: response.body.name, - }, - consumer: 'alertsFixture', - }); - } - }); - it('should generate events for execution errors', async () => { const response = await supertest .post(`${getUrlPrefix(space.id)}/api/alerting/rule`) diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/notify_when.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/notify_when.ts index 5024a1489f4c8..a7996f19554e8 100644 --- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/notify_when.ts +++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/notify_when.ts @@ -174,97 +174,6 @@ export default function createNotifyWhenTests({ getService }: FtrProviderContext ); expect(executeActionEventsActionGroup).to.eql(expectedActionGroupBasedOnPattern); }); - - it(`alert with notifyWhen=onActionGroupChange should only execute actions when action subgroup changes`, async () => { - const { body: defaultAction } = await supertest - .post(`${getUrlPrefix(Spaces.space1.id)}/api/actions/connector`) - .set('kbn-xsrf', 'foo') - .send({ - name: 'My Default Action', - connector_type_id: 'test.noop', - config: {}, - secrets: {}, - }) - .expect(200); - - const { body: recoveredAction } = await supertest - .post(`${getUrlPrefix(Spaces.space1.id)}/api/actions/connector`) - .set('kbn-xsrf', 'foo') - .send({ - name: 'My Recovered Action', - connector_type_id: 'test.noop', - config: {}, - secrets: {}, - }) - .expect(200); - - const pattern = { - instance: [ - 'subgroup1', - 'subgroup1', - false, - false, - 'subgroup1', - 'subgroup2', - 'subgroup2', - false, - ], - }; - const expectedActionGroupBasedOnPattern = [ - 'default', - 'recovered', - 'default', - 'default', - 'recovered', - ]; - - const { body: createdAlert } = await supertest - .post(`${getUrlPrefix(Spaces.space1.id)}/api/alerting/rule`) - .set('kbn-xsrf', 'foo') - .send( - getTestRuleData({ - rule_type_id: 'test.patternFiring', - params: { pattern }, - schedule: { interval: '1s' }, - throttle: null, - notify_when: 'onActionGroupChange', - actions: [ - { - id: defaultAction.id, - group: 'default', - params: {}, - }, - { - id: recoveredAction.id, - group: 'recovered', - params: {}, - }, - ], - }) - ) - .expect(200); - objectRemover.add(Spaces.space1.id, createdAlert.id, 'rule', 'alerting'); - - const events = await retry.try(async () => { - return await getEventLog({ - getService, - spaceId: Spaces.space1.id, - type: 'alert', - id: createdAlert.id, - provider: 'alerting', - actions: new Map([ - ['execute-action', { gte: 5 }], - ['new-instance', { equal: 2 }], - ]), - }); - }); - - const executeActionEvents = getEventsByAction(events, 'execute-action'); - const executeActionEventsActionGroup = executeActionEvents.map( - (event) => event?.kibana?.alerting?.action_group_id - ); - expect(executeActionEventsActionGroup).to.eql(expectedActionGroupBasedOnPattern); - }); }); } From 77867e162f1eb2a377865605196515c1e1b4ea45 Mon Sep 17 00:00:00 2001 From: Wafaa Nasr Date: Wed, 28 Sep 2022 20:36:05 +0200 Subject: [PATCH 56/95] Exceptions List component (#140985) * add components with a draft exception-list-details to test * fix jest config in xPack=> security=> Public * fix tests * fix header test and use RTL * covert meta test to use RTL and header * fix utlity messageid * fix messageid in utilty * create osCondition, entryContent and entryContent.helper from Conditions.tsx * comment test until fixing all * create package with first components + test + jest config * add constants for url * [CI] Auto-commit changed files from 'node scripts/generate codeowners' * disable tests until finishing moving rest of components or fix it+ add securityLinkAnchorComponent temp; * add exceptionList-components +fixning build issues * add exceptionList-components +fixning build issues * fix translations id + pass comments as props * move utiitly out of package until moving all + fixing css * copy non-js/ts files through babel * remove list-details-components * apply comments * apply comments in references * fix meta tests * update tests + add some descriptions * fix camelcase file name in Readme * fix camelcase file name in Readme Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> Co-authored-by: spalger --- .github/CODEOWNERS | 1 + .i18nrc.json | 1 + package.json | 2 + packages/BUILD.bazel | 2 + .../BUILD.bazel | 163 ++++++++ .../README.md | 27 ++ .../index.ts | 16 + .../jest.config.js | 21 ++ .../kibana.jsonc | 7 + .../package.json | 8 + .../setup_test.ts | 9 + ...on_product_no_results_magnifying_glass.svg | 1 + .../src/custom.d.ts | 13 + .../empty_viewer_state.test.tsx | 138 +++++++ .../empty_viewer_state/empty_viewer_state.tsx | 131 +++++++ .../exception_item_card/comments/comments.tsx | 45 +++ .../conditions/conditions.config.ts | 34 ++ .../conditions/conditions.styles.tsx | 36 ++ .../conditions/conditions.test.tsx | 350 ++++++++++++++++++ .../conditions/conditions.tsx | 56 +++ .../entry_content/entry_content.helper.tsx | 48 +++ .../entry_content/entry_content.tsx | 71 ++++ .../os_conditions/os_conditions.tsx | 34 ++ .../exception_item_card/conditions/types.ts | 32 ++ .../exception_item_card.tsx | 136 +++++++ .../header/header.test.tsx | 76 ++++ .../src/exception_item_card/header/header.tsx | 83 +++++ .../src/exception_item_card/index.test.tsx | 172 +++++++++ .../src/exception_item_card/index.ts | 13 + .../meta/details_info/details_info.tsx | 59 +++ .../exception_item_card/meta/meta.test.tsx | 155 ++++++++ .../src/exception_item_card/meta/meta.tsx | 123 ++++++ .../src/exception_item_card/translations.ts | 166 +++++++++ .../exception_items/exception_items.test.tsx | 103 ++++++ .../src/exception_items/exception_items.tsx | 139 +++++++ .../src/pagination/pagination.test.tsx | 78 ++++ .../src/pagination/pagination.tsx | 50 +++ .../src/pagination/use_pagination.test.ts | 67 ++++ .../src/pagination/use_pagination.ts | 55 +++ .../src/search_bar/search_bar.test.tsx | 90 +++++ .../src/search_bar/search_bar.tsx | 118 ++++++ .../src/translations.ts | 57 +++ .../src/types/index.ts | 65 ++++ .../src/value_with_space_warning/index.ts | 9 + .../use_value_with_space_warning.test.ts | 54 +++ .../use_value_with_space_warning.ts | 32 ++ .../value_with_space_warning.test.tsx | 48 +++ .../value_with_space_warning.tsx | 47 +++ .../tsconfig.json | 21 ++ .../security_solution/public/jest.config.js | 12 +- yarn.lock | 8 + 51 files changed, 3281 insertions(+), 1 deletion(-) create mode 100644 packages/kbn-securitysolution-exception-list-components/BUILD.bazel create mode 100644 packages/kbn-securitysolution-exception-list-components/README.md create mode 100644 packages/kbn-securitysolution-exception-list-components/index.ts create mode 100644 packages/kbn-securitysolution-exception-list-components/jest.config.js create mode 100644 packages/kbn-securitysolution-exception-list-components/kibana.jsonc create mode 100644 packages/kbn-securitysolution-exception-list-components/package.json create mode 100644 packages/kbn-securitysolution-exception-list-components/setup_test.ts create mode 100644 packages/kbn-securitysolution-exception-list-components/src/assets/images/illustration_product_no_results_magnifying_glass.svg create mode 100644 packages/kbn-securitysolution-exception-list-components/src/custom.d.ts create mode 100644 packages/kbn-securitysolution-exception-list-components/src/empty_viewer_state/empty_viewer_state.test.tsx create mode 100644 packages/kbn-securitysolution-exception-list-components/src/empty_viewer_state/empty_viewer_state.tsx create mode 100644 packages/kbn-securitysolution-exception-list-components/src/exception_item_card/comments/comments.tsx create mode 100644 packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/conditions.config.ts create mode 100644 packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/conditions.styles.tsx create mode 100644 packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/conditions.test.tsx create mode 100644 packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/conditions.tsx create mode 100644 packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/entry_content/entry_content.helper.tsx create mode 100644 packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/entry_content/entry_content.tsx create mode 100644 packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/os_conditions/os_conditions.tsx create mode 100644 packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/types.ts create mode 100644 packages/kbn-securitysolution-exception-list-components/src/exception_item_card/exception_item_card.tsx create mode 100644 packages/kbn-securitysolution-exception-list-components/src/exception_item_card/header/header.test.tsx create mode 100644 packages/kbn-securitysolution-exception-list-components/src/exception_item_card/header/header.tsx create mode 100644 packages/kbn-securitysolution-exception-list-components/src/exception_item_card/index.test.tsx create mode 100644 packages/kbn-securitysolution-exception-list-components/src/exception_item_card/index.ts create mode 100644 packages/kbn-securitysolution-exception-list-components/src/exception_item_card/meta/details_info/details_info.tsx create mode 100644 packages/kbn-securitysolution-exception-list-components/src/exception_item_card/meta/meta.test.tsx create mode 100644 packages/kbn-securitysolution-exception-list-components/src/exception_item_card/meta/meta.tsx create mode 100644 packages/kbn-securitysolution-exception-list-components/src/exception_item_card/translations.ts create mode 100644 packages/kbn-securitysolution-exception-list-components/src/exception_items/exception_items.test.tsx create mode 100644 packages/kbn-securitysolution-exception-list-components/src/exception_items/exception_items.tsx create mode 100644 packages/kbn-securitysolution-exception-list-components/src/pagination/pagination.test.tsx create mode 100644 packages/kbn-securitysolution-exception-list-components/src/pagination/pagination.tsx create mode 100644 packages/kbn-securitysolution-exception-list-components/src/pagination/use_pagination.test.ts create mode 100644 packages/kbn-securitysolution-exception-list-components/src/pagination/use_pagination.ts create mode 100644 packages/kbn-securitysolution-exception-list-components/src/search_bar/search_bar.test.tsx create mode 100644 packages/kbn-securitysolution-exception-list-components/src/search_bar/search_bar.tsx create mode 100644 packages/kbn-securitysolution-exception-list-components/src/translations.ts create mode 100644 packages/kbn-securitysolution-exception-list-components/src/types/index.ts create mode 100644 packages/kbn-securitysolution-exception-list-components/src/value_with_space_warning/index.ts create mode 100644 packages/kbn-securitysolution-exception-list-components/src/value_with_space_warning/use_value_with_space_warning.test.ts create mode 100644 packages/kbn-securitysolution-exception-list-components/src/value_with_space_warning/use_value_with_space_warning.ts create mode 100644 packages/kbn-securitysolution-exception-list-components/src/value_with_space_warning/value_with_space_warning.test.tsx create mode 100644 packages/kbn-securitysolution-exception-list-components/src/value_with_space_warning/value_with_space_warning.tsx create mode 100644 packages/kbn-securitysolution-exception-list-components/tsconfig.json diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index d802eb4024a08..0a1fcc60d55b6 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -915,6 +915,7 @@ packages/kbn-rule-data-utils @elastic/apm-ui packages/kbn-safer-lodash-set @elastic/kibana-security packages/kbn-securitysolution-autocomplete @elastic/security-solution-platform packages/kbn-securitysolution-es-utils @elastic/security-solution-platform +packages/kbn-securitysolution-exception-list-components @elastic/security-solution-platform packages/kbn-securitysolution-hook-utils @elastic/security-solution-platform packages/kbn-securitysolution-io-ts-alerting-types @elastic/security-solution-platform packages/kbn-securitysolution-io-ts-list-types @elastic/security-solution-platform diff --git a/.i18nrc.json b/.i18nrc.json index 20b2588ca2fab..462daff20de63 100644 --- a/.i18nrc.json +++ b/.i18nrc.json @@ -60,6 +60,7 @@ "kibana-react": "src/plugins/kibana_react", "kibanaOverview": "src/plugins/kibana_overview", "lists": "packages/kbn-securitysolution-list-utils/src", + "exceptionList-components": "packages/kbn-securitysolution-exception-list-components/src", "management": ["src/legacy/core_plugins/management", "src/plugins/management"], "monaco": "packages/kbn-monaco/src", "navigation": "src/plugins/navigation", diff --git a/package.json b/package.json index ebbff20d91733..eedb8db4b605a 100644 --- a/package.json +++ b/package.json @@ -335,6 +335,7 @@ "@kbn/safer-lodash-set": "link:bazel-bin/packages/kbn-safer-lodash-set", "@kbn/securitysolution-autocomplete": "link:bazel-bin/packages/kbn-securitysolution-autocomplete", "@kbn/securitysolution-es-utils": "link:bazel-bin/packages/kbn-securitysolution-es-utils", + "@kbn/securitysolution-exception-list-components": "link:bazel-bin/packages/kbn-securitysolution-exception-list-components", "@kbn/securitysolution-hook-utils": "link:bazel-bin/packages/kbn-securitysolution-hook-utils", "@kbn/securitysolution-io-ts-alerting-types": "link:bazel-bin/packages/kbn-securitysolution-io-ts-alerting-types", "@kbn/securitysolution-io-ts-list-types": "link:bazel-bin/packages/kbn-securitysolution-io-ts-list-types", @@ -1086,6 +1087,7 @@ "@types/kbn__rule-data-utils": "link:bazel-bin/packages/kbn-rule-data-utils/npm_module_types", "@types/kbn__securitysolution-autocomplete": "link:bazel-bin/packages/kbn-securitysolution-autocomplete/npm_module_types", "@types/kbn__securitysolution-es-utils": "link:bazel-bin/packages/kbn-securitysolution-es-utils/npm_module_types", + "@types/kbn__securitysolution-exception-list-components": "link:bazel-bin/packages/kbn-securitysolution-exception-list-components/npm_module_types", "@types/kbn__securitysolution-hook-utils": "link:bazel-bin/packages/kbn-securitysolution-hook-utils/npm_module_types", "@types/kbn__securitysolution-io-ts-alerting-types": "link:bazel-bin/packages/kbn-securitysolution-io-ts-alerting-types/npm_module_types", "@types/kbn__securitysolution-io-ts-list-types": "link:bazel-bin/packages/kbn-securitysolution-io-ts-list-types/npm_module_types", diff --git a/packages/BUILD.bazel b/packages/BUILD.bazel index 455b851a4936f..cf97e501df09c 100644 --- a/packages/BUILD.bazel +++ b/packages/BUILD.bazel @@ -251,6 +251,7 @@ filegroup( "//packages/kbn-safer-lodash-set:build", "//packages/kbn-securitysolution-autocomplete:build", "//packages/kbn-securitysolution-es-utils:build", + "//packages/kbn-securitysolution-exception-list-components:build", "//packages/kbn-securitysolution-hook-utils:build", "//packages/kbn-securitysolution-io-ts-alerting-types:build", "//packages/kbn-securitysolution-io-ts-list-types:build", @@ -574,6 +575,7 @@ filegroup( "//packages/kbn-safer-lodash-set:build_types", "//packages/kbn-securitysolution-autocomplete:build_types", "//packages/kbn-securitysolution-es-utils:build_types", + "//packages/kbn-securitysolution-exception-list-components:build_types", "//packages/kbn-securitysolution-hook-utils:build_types", "//packages/kbn-securitysolution-io-ts-alerting-types:build_types", "//packages/kbn-securitysolution-io-ts-list-types:build_types", diff --git a/packages/kbn-securitysolution-exception-list-components/BUILD.bazel b/packages/kbn-securitysolution-exception-list-components/BUILD.bazel new file mode 100644 index 0000000000000..6436793fa5f30 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/BUILD.bazel @@ -0,0 +1,163 @@ +load("@npm//@bazel/typescript:index.bzl", "ts_config") +load("@build_bazel_rules_nodejs//:index.bzl", "js_library") +load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project") + + +PKG_DIRNAME = "kbn-securitysolution-exception-list-components" +PKG_REQUIRE_NAME = "@kbn/securitysolution-exception-list-components" + +SOURCE_FILES = glob( + [ + "**/*.ts", + "**/*.tsx", + "**/*.svg", + "**/*.d.ts", + ], + exclude = [ + "**/*.config.js", + "**/*.mock.*", + "**/*.test.*", + "**/*.stories.*", + "**/__snapshots__/**", + "**/integration_tests/**", + "**/mocks/**", + "**/scripts/**", + "**/storybook/**", + "**/test_fixtures/**", + "**/test_helpers/**", + ], +) + +SRCS = SOURCE_FILES + +filegroup( + name = "srcs", + srcs = SRCS, +) + +NPM_MODULE_EXTRA_FILES = [ + "package.json", + "jest.config.js" +] + +# In this array place runtime dependencies, including other packages and NPM packages +# which must be available for this code to run. +# +# To reference other packages use: +# "//repo/relative/path/to/package" +# eg. "//packages/kbn-utils" +# +# To reference a NPM package use: +# "@npm//name-of-package" +# eg. "@npm//lodash" +RUNTIME_DEPS = [ + "@npm//react", + "//packages/kbn-securitysolution-io-ts-list-types", + "//packages/kbn-securitysolution-autocomplete", + "//packages/kbn-ui-theme", + "//packages/kbn-i18n-react", + "//packages/kbn-i18n", + "@npm//@elastic/eui", + "@npm//@emotion/css", + "@npm//@emotion/react", + "@npm//@testing-library/jest-dom", + "@npm//jest", +] + +# In this array place dependencies necessary to build the types, which will include the +# :npm_module_types target of other packages and packages from NPM, including @types/* +# packages. +# +# To reference the types for another package use: +# "//repo/relative/path/to/package:npm_module_types" +# eg. "//packages/kbn-utils:npm_module_types" +# +# References to NPM packages work the same as RUNTIME_DEPS +TYPES_DEPS = [ + "@npm//@types/node", + "@npm//@types/jest", + "@npm//@types/react", + "//packages/kbn-securitysolution-io-ts-list-types:npm_module_types", + "//packages/kbn-securitysolution-autocomplete:npm_module_types", + "//packages/kbn-ui-theme:npm_module_types", + "//packages/kbn-i18n-react:npm_module_types", + "@npm//@elastic/eui", + "@npm//@emotion/css", + "@npm//@emotion/react", + "@npm//jest", + +] + +jsts_transpiler( + name = "target_node", + srcs = SRCS, + build_pkg_name = package_name(), + additional_args = [ + "--copy-files" + ], +) + +jsts_transpiler( + name = "target_web", + srcs = SRCS, + build_pkg_name = package_name(), + web = True, + additional_args = [ + "--copy-files" + ], +) + +ts_config( + name = "tsconfig", + src = "tsconfig.json", + deps = [ + "//:tsconfig.base.json", + "//:tsconfig.bazel.json", + ], +) + +ts_project( + name = "tsc_types", + args = ['--pretty'], + srcs = SRCS, + deps = TYPES_DEPS, + declaration = True, + declaration_map = True, + emit_declaration_only = True, + out_dir = "target_types", + tsconfig = ":tsconfig", +) + +js_library( + name = PKG_DIRNAME, + srcs = NPM_MODULE_EXTRA_FILES, + deps = RUNTIME_DEPS + [":target_node", ":target_web"], + package_name = PKG_REQUIRE_NAME, + visibility = ["//visibility:public"], +) + +pkg_npm( + name = "npm_module", + deps = [":" + PKG_DIRNAME], +) + +filegroup( + name = "build", + srcs = [":npm_module"], + visibility = ["//visibility:public"], +) + +pkg_npm_types( + name = "npm_module_types", + srcs = SRCS, + deps = [":tsc_types"], + package_name = PKG_REQUIRE_NAME, + tsconfig = ":tsconfig", + visibility = ["//visibility:public"], +) + +filegroup( + name = "build_types", + srcs = [":npm_module_types"], + visibility = ["//visibility:public"], +) diff --git a/packages/kbn-securitysolution-exception-list-components/README.md b/packages/kbn-securitysolution-exception-list-components/README.md new file mode 100644 index 0000000000000..e23b85e409960 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/README.md @@ -0,0 +1,27 @@ +# @kbn/securitysolution-exception-list-components + +This is where the building UI components of the Exception-List live +Most of the components here are imported from `x-pack/plugins/security_solutions/public/detection_engine` + +# Aim + +TODO + +# Pattern used + +``` +component + index.tsx + index.styles.ts <-- to hold styles if the component has many custom styles + use_component.ts <-- for logic if the Presentational Component has logic + index.test.tsx + use_component.test.tsx +``` + +# Next + +- Now the `ExceptionItems, ExceptionItemCard +and ExceptionItemCardMetaInfo + ` receive `securityLinkAnchorComponent, exceptionsUtilityComponent +, and exceptionsUtilityComponent +` as props to avoid moving all the `common` components under the `x-pack` at once, later we should move all building blocks to this `kbn-package` diff --git a/packages/kbn-securitysolution-exception-list-components/index.ts b/packages/kbn-securitysolution-exception-list-components/index.ts new file mode 100644 index 0000000000000..f5001ff35fd33 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/index.ts @@ -0,0 +1,16 @@ +/* + * 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. + */ + +export * from './src/search_bar/search_bar'; +export * from './src/empty_viewer_state/empty_viewer_state'; +export * from './src/pagination/pagination'; +// export * from './src/exceptions_utility/exceptions_utility'; +export * from './src/exception_items/exception_items'; +export * from './src/exception_item_card'; +export * from './src/value_with_space_warning'; +export * from './src/types'; diff --git a/packages/kbn-securitysolution-exception-list-components/jest.config.js b/packages/kbn-securitysolution-exception-list-components/jest.config.js new file mode 100644 index 0000000000000..37a11c23c75ba --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/jest.config.js @@ -0,0 +1,21 @@ +/* + * 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. + */ + +module.exports = { + preset: '@kbn/test', + rootDir: '../..', + roots: ['/packages/kbn-securitysolution-exception-list-components'], + coverageReporters: ['text', 'html'], + collectCoverageFrom: [ + '/packages/kbn-securitysolution-exception-list-components/**/*.{ts,tsx}', + '!/packages/kbn-securitysolution-exception-list-components/**/*.test', + ], + setupFilesAfterEnv: [ + '/packages/kbn-securitysolution-exception-list-components/setup_test.ts', + ], +}; diff --git a/packages/kbn-securitysolution-exception-list-components/kibana.jsonc b/packages/kbn-securitysolution-exception-list-components/kibana.jsonc new file mode 100644 index 0000000000000..081c50d35af0d --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/kibana.jsonc @@ -0,0 +1,7 @@ +{ + "type": "shared-common", + "id": "@kbn/securitysolution-exception-list-components", + "owner": "@elastic/security-solution-platform", + "runtimeDeps": [], + "typeDeps": [], +} diff --git a/packages/kbn-securitysolution-exception-list-components/package.json b/packages/kbn-securitysolution-exception-list-components/package.json new file mode 100644 index 0000000000000..263863d725c1e --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/package.json @@ -0,0 +1,8 @@ +{ + "name": "@kbn/securitysolution-exception-list-components", + "private": true, + "version": "1.0.0", + "main": "./target_node/index.js", + "browser": "./target_web/index.js", + "license": "SSPL-1.0 OR Elastic License 2.0" +} diff --git a/packages/kbn-securitysolution-exception-list-components/setup_test.ts b/packages/kbn-securitysolution-exception-list-components/setup_test.ts new file mode 100644 index 0000000000000..bb55d97ec9302 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/setup_test.ts @@ -0,0 +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 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. + */ +// eslint-disable-next-line import/no-extraneous-dependencies +import '@testing-library/jest-dom'; diff --git a/packages/kbn-securitysolution-exception-list-components/src/assets/images/illustration_product_no_results_magnifying_glass.svg b/packages/kbn-securitysolution-exception-list-components/src/assets/images/illustration_product_no_results_magnifying_glass.svg new file mode 100644 index 0000000000000..b9a0df1630b20 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/assets/images/illustration_product_no_results_magnifying_glass.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/kbn-securitysolution-exception-list-components/src/custom.d.ts b/packages/kbn-securitysolution-exception-list-components/src/custom.d.ts new file mode 100644 index 0000000000000..9169166fe7af9 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/custom.d.ts @@ -0,0 +1,13 @@ +/* + * 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 '*.svg' { + const content: string; + // eslint-disable-next-line import/no-default-export + export default content; +} diff --git a/packages/kbn-securitysolution-exception-list-components/src/empty_viewer_state/empty_viewer_state.test.tsx b/packages/kbn-securitysolution-exception-list-components/src/empty_viewer_state/empty_viewer_state.test.tsx new file mode 100644 index 0000000000000..43943e0e8fb97 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/empty_viewer_state/empty_viewer_state.test.tsx @@ -0,0 +1,138 @@ +/* + * 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. + */ + +import React from 'react'; +import { render } from '@testing-library/react'; + +import { EmptyViewerState } from './empty_viewer_state'; +import { ListTypeText, ViewerStatus } from '../types'; + +describe('EmptyViewerState', () => { + it('it should render "error" with the default title and body', () => { + const wrapper = render( + + ); + + expect(wrapper.getByTestId('errorViewerState')).toBeTruthy(); + expect(wrapper.getByTestId('errorTitle')).toHaveTextContent('Unable to load exception items'); + expect(wrapper.getByTestId('errorBody')).toHaveTextContent( + 'There was an error loading the exception items. Contact your administrator for help.' + ); + }); + it('it should render "error" when sending the title and body props', () => { + const wrapper = render( + + ); + + expect(wrapper.getByTestId('errorViewerState')).toBeTruthy(); + expect(wrapper.getByTestId('errorTitle')).toHaveTextContent('Error title'); + expect(wrapper.getByTestId('errorBody')).toHaveTextContent('Error body'); + }); + it('it should render loading', () => { + const wrapper = render( + + ); + + expect(wrapper.getByTestId('loadingViewerState')).toBeTruthy(); + }); + it('it should render empty search with the default title and body', () => { + const wrapper = render( + + ); + + expect(wrapper.getByTestId('emptySearchViewerState')).toBeTruthy(); + expect(wrapper.getByTestId('emptySearchTitle')).toHaveTextContent( + 'No results match your search criteria' + ); + expect(wrapper.getByTestId('emptySearchBody')).toHaveTextContent('Try modifying your search'); + }); + it('it should render empty search when sending title and body props', () => { + const wrapper = render( + + ); + + expect(wrapper.getByTestId('emptySearchViewerState')).toBeTruthy(); + expect(wrapper.getByTestId('emptySearchTitle')).toHaveTextContent('Empty search title'); + expect(wrapper.getByTestId('emptySearchBody')).toHaveTextContent('Empty search body'); + }); + it('it should render no items screen when sending title and body props', () => { + const wrapper = render( + + ); + + const { getByTestId } = wrapper; + expect(getByTestId('emptyBody')).toHaveTextContent('There are no endpoint exceptions.'); + expect(getByTestId('emptyStateButton')).toHaveTextContent('Add endpoint exception'); + expect(getByTestId('emptyViewerState')).toBeTruthy(); + }); + it('it should render no items with default title and body props', () => { + const wrapper = render( + + ); + + const { getByTestId } = wrapper; + expect(getByTestId('emptyViewerState')).toBeTruthy(); + expect(getByTestId('emptyTitle')).toHaveTextContent('Add exceptions to this rule'); + expect(getByTestId('emptyBody')).toHaveTextContent( + 'There is no exception in your rule. Create your first rule exception.' + ); + expect(getByTestId('emptyStateButton')).toHaveTextContent('Create rule exception'); + }); + it('it should render no items screen with default title and body props and listType endPoint', () => { + const wrapper = render( + + ); + + const { getByTestId } = wrapper; + expect(getByTestId('emptyViewerState')).toBeTruthy(); + expect(getByTestId('emptyTitle')).toHaveTextContent('Add exceptions to this rule'); + expect(getByTestId('emptyBody')).toHaveTextContent( + 'There is no exception in your rule. Create your first rule exception.' + ); + expect(getByTestId('emptyStateButton')).toHaveTextContent('Create endpoint exception'); + }); +}); diff --git a/packages/kbn-securitysolution-exception-list-components/src/empty_viewer_state/empty_viewer_state.tsx b/packages/kbn-securitysolution-exception-list-components/src/empty_viewer_state/empty_viewer_state.tsx new file mode 100644 index 0000000000000..060d2ecc15061 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/empty_viewer_state/empty_viewer_state.tsx @@ -0,0 +1,131 @@ +/* + * 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. + */ + +import React, { useMemo } from 'react'; +import type { FC } from 'react'; +import { css } from '@emotion/react'; +import { + EuiLoadingContent, + EuiImage, + EuiEmptyPrompt, + EuiButton, + useEuiTheme, + EuiPanel, +} from '@elastic/eui'; +import type { ExpressionColor } from '@elastic/eui/src/components/expression/expression'; +import type { EuiFacetGroupLayout } from '@elastic/eui/src/components/facet/facet_group'; +import { euiThemeVars } from '@kbn/ui-theme'; +import { ListTypeText, ViewerStatus } from '../types'; +import * as i18n from '../translations'; +import illustration from '../assets/images/illustration_product_no_results_magnifying_glass.svg'; + +interface EmptyViewerStateProps { + title?: string; + body?: string; + buttonText?: string; + listType?: ListTypeText; + isReadOnly: boolean; + viewerStatus: ViewerStatus; + onCreateExceptionListItem?: () => void | null; +} + +const panelCss = css` + margin: ${euiThemeVars.euiSizeL} 0; + padding: ${euiThemeVars.euiSizeL} 0; +`; +const EmptyViewerStateComponent: FC = ({ + title, + body, + buttonText, + listType, + isReadOnly, + viewerStatus, + onCreateExceptionListItem, +}) => { + const { euiTheme } = useEuiTheme(); + + const euiEmptyPromptProps = useMemo(() => { + switch (viewerStatus) { + case ViewerStatus.ERROR: { + return { + color: 'danger' as ExpressionColor, + iconType: 'alert', + title: ( +

    {title || i18n.EMPTY_VIEWER_STATE_ERROR_TITLE}

    + ), + body:

    {body || i18n.EMPTY_VIEWER_STATE_ERROR_BODY}

    , + 'data-test-subj': 'errorViewerState', + }; + } + case ViewerStatus.EMPTY: + return { + color: 'subdued' as ExpressionColor, + iconType: 'plusInCircle', + iconColor: euiTheme.colors.darkestShade, + title: ( +

    {title || i18n.EMPTY_VIEWER_STATE_EMPTY_TITLE}

    + ), + body:

    {body || i18n.EMPTY_VIEWER_STATE_EMPTY_BODY}

    , + 'data-test-subj': 'emptyViewerState', + actions: [ + + {buttonText || i18n.EMPTY_VIEWER_STATE_EMPTY_VIEWER_BUTTON(listType || 'rule')} + , + ], + }; + case ViewerStatus.EMPTY_SEARCH: + return { + color: 'plain' as ExpressionColor, + layout: 'horizontal' as EuiFacetGroupLayout, + hasBorder: true, + hasShadow: false, + icon: , + title: ( +

    + {title || i18n.EMPTY_VIEWER_STATE_EMPTY_SEARCH_TITLE} +

    + ), + body: ( +

    + {body || i18n.EMPTY_VIEWER_STATE_EMPTY_SEARCH_BODY} +

    + ), + 'data-test-subj': 'emptySearchViewerState', + }; + } + }, [ + viewerStatus, + euiTheme.colors.darkestShade, + title, + body, + onCreateExceptionListItem, + isReadOnly, + buttonText, + listType, + ]); + + if (viewerStatus === ViewerStatus.LOADING || viewerStatus === ViewerStatus.SEARCHING) + return ; + + return ( + + + + ); +}; + +export const EmptyViewerState = React.memo(EmptyViewerStateComponent); + +EmptyViewerState.displayName = 'EmptyViewerState'; diff --git a/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/comments/comments.tsx b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/comments/comments.tsx new file mode 100644 index 0000000000000..ca08d10f0a049 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/comments/comments.tsx @@ -0,0 +1,45 @@ +/* + * 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. + */ + +import React, { memo } from 'react'; +import type { EuiCommentProps } from '@elastic/eui'; +import { EuiAccordion, EuiCommentList, EuiFlexItem, EuiPanel, EuiText } from '@elastic/eui'; +import { css } from '@emotion/react'; +import { euiThemeVars } from '@kbn/ui-theme'; +import * as i18n from '../translations'; + +const accordionCss = css` + color: ${euiThemeVars.euiColorPrimary}; +`; + +export interface ExceptionItemCardCommentsProps { + comments: EuiCommentProps[]; +} + +export const ExceptionItemCardComments = memo(({ comments }) => { + return ( + + + {i18n.exceptionItemCardCommentsAccordion(comments.length)} + + } + arrowDisplay="none" + data-test-subj="exceptionsViewerCommentAccordion" + > + + + + + + ); +}); + +ExceptionItemCardComments.displayName = 'ExceptionItemCardComments'; diff --git a/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/conditions.config.ts b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/conditions.config.ts new file mode 100644 index 0000000000000..08514a64feac0 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/conditions.config.ts @@ -0,0 +1,34 @@ +/* + * 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. + */ + +import { ListOperatorTypeEnum } from '@kbn/securitysolution-io-ts-list-types'; +import * as i18n from '../translations'; + +export const OS_LABELS = Object.freeze({ + linux: i18n.OS_LINUX, + mac: i18n.OS_MAC, + macos: i18n.OS_MAC, + windows: i18n.OS_WINDOWS, +}); + +export const OPERATOR_TYPE_LABELS_INCLUDED = Object.freeze({ + [ListOperatorTypeEnum.NESTED]: i18n.CONDITION_OPERATOR_TYPE_NESTED, + [ListOperatorTypeEnum.MATCH_ANY]: i18n.CONDITION_OPERATOR_TYPE_MATCH_ANY, + [ListOperatorTypeEnum.MATCH]: i18n.CONDITION_OPERATOR_TYPE_MATCH, + [ListOperatorTypeEnum.WILDCARD]: i18n.CONDITION_OPERATOR_TYPE_WILDCARD_MATCHES, + [ListOperatorTypeEnum.EXISTS]: i18n.CONDITION_OPERATOR_TYPE_EXISTS, + [ListOperatorTypeEnum.LIST]: i18n.CONDITION_OPERATOR_TYPE_LIST, +}); + +export const OPERATOR_TYPE_LABELS_EXCLUDED = Object.freeze({ + [ListOperatorTypeEnum.MATCH_ANY]: i18n.CONDITION_OPERATOR_TYPE_NOT_MATCH_ANY, + [ListOperatorTypeEnum.MATCH]: i18n.CONDITION_OPERATOR_TYPE_NOT_MATCH, + [ListOperatorTypeEnum.WILDCARD]: i18n.CONDITION_OPERATOR_TYPE_WILDCARD_DOES_NOT_MATCH, + [ListOperatorTypeEnum.EXISTS]: i18n.CONDITION_OPERATOR_TYPE_DOES_NOT_EXIST, + [ListOperatorTypeEnum.LIST]: i18n.CONDITION_OPERATOR_TYPE_NOT_IN_LIST, +}); diff --git a/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/conditions.styles.tsx b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/conditions.styles.tsx new file mode 100644 index 0000000000000..3ad2d7ef21fba --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/conditions.styles.tsx @@ -0,0 +1,36 @@ +/* + * 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. + */ +import { cx } from '@emotion/css'; +import { css } from '@emotion/react'; +import { euiThemeVars } from '@kbn/ui-theme'; + +// TODO check font Roboto Mono +export const nestedGroupSpaceCss = css` + margin-left: ${euiThemeVars.euiSizeXL}; + margin-bottom: ${euiThemeVars.euiSizeXS}; + padding-top: ${euiThemeVars.euiSizeXS}; +`; + +export const borderCss = cx( + 'eui-xScroll', + ` + border: 1px; + border-color: #d3dae6; + border-style: solid; +` +); + +export const valueContainerCss = css` + display: flex; + align-items: center; + margin-left: ${euiThemeVars.euiSizeS}; +`; +export const expressionContainerCss = css` + display: flex; + align-items: center; +`; diff --git a/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/conditions.test.tsx b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/conditions.test.tsx new file mode 100644 index 0000000000000..ae4b76a4a7dc0 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/conditions.test.tsx @@ -0,0 +1,350 @@ +/* + * 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. + */ + +import { render } from '@testing-library/react'; +import React from 'react'; + +import { ExceptionItemCardConditions } from './conditions'; + +interface TestEntry { + field: string; + operator: 'included' | 'excluded'; + type: unknown; + value?: string | string[]; + entries?: TestEntry[]; + list?: { id: string; type: string }; +} +const getEntryKey = ( + entry: TestEntry, + index: string, + list?: { id: string; type: string } | null +) => { + if (list && Object.keys(list)) { + const { field, type, list: entryList } = entry; + const { id } = entryList || {}; + return `${field}${type}${id || ''}${index}`; + } + const { field, type, value } = entry; + return `${field}${type}${value || ''}${index}`; +}; + +describe('ExceptionItemCardConditions', () => { + beforeEach(() => { + jest.clearAllMocks(); + jest.resetAllMocks(); + }); + it('it includes os condition if one exists', () => { + const entries: TestEntry[] = [ + { + field: 'host.name', + operator: 'included', + type: 'match', + value: 'host', + }, + { + field: 'threat.indicator.port', + operator: 'included', + type: 'exists', + }, + { + entries: [ + { + field: 'valid', + operator: 'included', + type: 'match', + value: 'true', + }, + ], + field: 'file.Ext.code_signature', + type: 'nested', + operator: 'included', + }, + ]; + const wrapper = render( + + ); + expect(wrapper.getByTestId('exceptionItemConditionsOs')).toHaveTextContent('OSIS Linux'); + + expect( + wrapper.getByTestId(`exceptionItemConditions${getEntryKey(entries[0], '0')}EntryContent`) + ).toHaveTextContent('host.nameIS host'); + + expect( + wrapper.getByTestId(`exceptionItemConditions${getEntryKey(entries[1], '1')}EntryContent`) + ).toHaveTextContent('AND threat.indicator.portexists'); + + expect( + wrapper.getByTestId(`exceptionItemConditions${getEntryKey(entries[2], '2')}EntryContent`) + ).toHaveTextContent('AND file.Ext.code_signature'); + + if (entries[2] && entries[2].entries) { + expect( + wrapper.getByTestId( + `exceptionItemConditions${getEntryKey(entries[2].entries[0], '0')}EntryContent` + ) + ).toHaveTextContent('validIS true'); + } + }); + + it('it renders item conditions', () => { + const entries: TestEntry[] = [ + { + field: 'host.name', + operator: 'included', + type: 'match', + value: 'host', + }, + { + field: 'host.name', + operator: 'excluded', + type: 'match', + value: 'host', + }, + { + field: 'host.name', + operator: 'included', + type: 'match_any', + value: ['foo', 'bar'], + }, + { + field: 'host.name', + operator: 'excluded', + type: 'match_any', + value: ['foo', 'bar'], + }, + { + field: 'user.name', + operator: 'included', + type: 'wildcard', + value: 'foo*', + }, + { + field: 'user.name', + operator: 'excluded', + type: 'wildcard', + value: 'foo*', + }, + { + field: 'threat.indicator.port', + operator: 'included', + type: 'exists', + }, + { + field: 'threat.indicator.port', + operator: 'excluded', + type: 'exists', + }, + { + entries: [ + { + field: 'valid', + operator: 'included', + type: 'match', + value: 'true', + }, + ], + field: 'file.Ext.code_signature', + type: 'nested', + operator: 'included', + }, + ]; + const wrapper = render( + + ); + expect(wrapper.queryByTestId('exceptionItemConditionsOs')).not.toBeInTheDocument(); + + expect( + wrapper.getByTestId(`exceptionItemConditions${getEntryKey(entries[0], '0')}EntryContent`) + ).toHaveTextContent('host.nameIS host'); + // Match; + expect( + wrapper.getByTestId(`exceptionItemConditions${getEntryKey(entries[1], '1')}EntryContent`) + ).toHaveTextContent('AND host.nameIS NOT host'); + // MATCH_ANY; + expect( + wrapper.getByTestId(`exceptionItemConditions${getEntryKey(entries[2], '2')}EntryContent`) + ).toHaveTextContent('AND host.nameis one of foobar'); + expect( + wrapper.getByTestId(`exceptionItemConditions${getEntryKey(entries[3], '3')}EntryContent`) + ).toHaveTextContent('AND host.nameis not one of foobar'); + // WILDCARD; + expect( + wrapper.getByTestId(`exceptionItemConditions${getEntryKey(entries[4], '4')}EntryContent`) + ).toHaveTextContent('AND user.nameMATCHES foo*'); + expect( + wrapper.getByTestId(`exceptionItemConditions${getEntryKey(entries[5], '5')}EntryContent`) + ).toHaveTextContent('AND user.nameDOES NOT MATCH foo*'); + // EXISTS; + expect( + wrapper.getByTestId(`exceptionItemConditions${getEntryKey(entries[6], '6')}EntryContent`) + ).toHaveTextContent('AND threat.indicator.portexists'); + expect( + wrapper.getByTestId(`exceptionItemConditions${getEntryKey(entries[7], '7')}EntryContent`) + ).toHaveTextContent('AND threat.indicator.portdoes not exist'); + // NESTED; + expect( + wrapper.getByTestId(`exceptionItemConditions${getEntryKey(entries[8], '8')}EntryContent`) + ).toHaveTextContent('AND file.Ext.code_signature'); + if (entries[8] && entries[8].entries) { + expect( + wrapper.getByTestId( + `exceptionItemConditions${getEntryKey(entries[8].entries[0], '0')}EntryContent` + ) + ).toHaveTextContent('validIS true'); + } + }); + it('it renders list conditions', () => { + const entries: TestEntry[] = [ + { + field: 'host.name', + list: { + id: 'ips.txt', + type: 'keyword', + }, + operator: 'included', + type: 'list', + }, + { + field: 'host.name', + list: { + id: 'ips.txt', + type: 'keyword', + }, + operator: 'excluded', + type: 'list', + }, + ]; + const wrapper = render( + + ); + // /exceptionItemConditionshost.namelist0EntryContent + expect( + wrapper.getByTestId( + `exceptionItemConditions${getEntryKey(entries[0], '0', entries[0].list)}EntryContent` + ) + ).toHaveTextContent('host.nameincluded in ips.txt'); + + expect( + wrapper.getByTestId( + `exceptionItemConditions${getEntryKey(entries[1], '1', entries[1].list)}EntryContent` + ) + ).toHaveTextContent('AND host.nameis not included in ips.txt'); + }); +}); diff --git a/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/conditions.tsx b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/conditions.tsx new file mode 100644 index 0000000000000..8b85a7343afc1 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/conditions.tsx @@ -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 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 React, { memo } from 'react'; +import { EuiPanel } from '@elastic/eui'; + +import { borderCss } from './conditions.styles'; +import { EntryContent } from './entry_content/entry_content'; +import { OsCondition } from './os_conditions/os_conditions'; +import type { CriteriaConditionsProps, Entry } from './types'; + +export const ExceptionItemCardConditions = memo( + ({ os, entries, dataTestSubj }) => { + return ( + + {os?.length ? : null} + {entries.map((entry: Entry, index: number) => { + const nestedEntries = 'entries' in entry ? entry.entries : []; + return ( +
    + + {nestedEntries?.length + ? nestedEntries.map((nestedEntry: Entry, nestedIndex: number) => ( + + )) + : null} +
    + ); + })} +     + ); + } +); +ExceptionItemCardConditions.displayName = 'ExceptionItemCardConditions'; diff --git a/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/entry_content/entry_content.helper.tsx b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/entry_content/entry_content.helper.tsx new file mode 100644 index 0000000000000..6a64bcc810c08 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/entry_content/entry_content.helper.tsx @@ -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 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 React from 'react'; +import { EuiExpression, EuiBadge } from '@elastic/eui'; +import type { ListOperatorTypeEnum } from '@kbn/securitysolution-io-ts-list-types'; +import { ValueWithSpaceWarning } from '../../../..'; +import { OPERATOR_TYPE_LABELS_EXCLUDED, OPERATOR_TYPE_LABELS_INCLUDED } from '../conditions.config'; +import type { Entry } from '../types'; + +const getEntryValue = (type: string, value?: string | string[]) => { + if (type === 'match_any' && Array.isArray(value)) { + return value.map((currentValue) => {currentValue}); + } + return value ?? ''; +}; + +export const getEntryOperator = (type: ListOperatorTypeEnum, operator: string) => { + if (type === 'nested') return ''; + return operator === 'included' + ? OPERATOR_TYPE_LABELS_INCLUDED[type] ?? type + : OPERATOR_TYPE_LABELS_EXCLUDED[type] ?? type; +}; + +export const getValue = (entry: Entry) => { + if (entry.type === 'list') return entry.list.id; + + return 'value' in entry ? entry.value : ''; +}; + +export const getValueExpression = ( + type: ListOperatorTypeEnum, + operator: string, + value: string | string[] +) => ( + <> + + + +); diff --git a/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/entry_content/entry_content.tsx b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/entry_content/entry_content.tsx new file mode 100644 index 0000000000000..6c321a6d0ce04 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/entry_content/entry_content.tsx @@ -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 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 React, { memo } from 'react'; +import { EuiExpression, EuiToken, EuiFlexGroup } from '@elastic/eui'; +import { ListOperatorTypeEnum } from '@kbn/securitysolution-io-ts-list-types'; +import { + nestedGroupSpaceCss, + valueContainerCss, + expressionContainerCss, +} from '../conditions.styles'; +import type { Entry } from '../types'; +import * as i18n from '../../translations'; +import { getValue, getValueExpression } from './entry_content.helper'; + +export const EntryContent = memo( + ({ + entry, + index, + isNestedEntry = false, + dataTestSubj, + }: { + entry: Entry; + index: number; + isNestedEntry?: boolean; + dataTestSubj?: string; + }) => { + const { field, type } = entry; + const value = getValue(entry); + const operator = 'operator' in entry ? entry.operator : ''; + + const entryKey = `${field}${type}${value}${index}`; + return ( +
    +
    + {isNestedEntry ? ( + + + +
    + + {getValueExpression(type as ListOperatorTypeEnum, operator, value)} +
    +     + ) : ( + <> + + + {getValueExpression(type as ListOperatorTypeEnum, operator, value)} + + )} +
    +
    + ); + } +); +EntryContent.displayName = 'EntryContent'; diff --git a/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/os_conditions/os_conditions.tsx b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/os_conditions/os_conditions.tsx new file mode 100644 index 0000000000000..701529ae6717d --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/os_conditions/os_conditions.tsx @@ -0,0 +1,34 @@ +/* + * 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. + */ + +import React, { memo, useMemo } from 'react'; +import { EuiExpression } from '@elastic/eui'; + +import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types'; +import { OS_LABELS } from '../conditions.config'; +import * as i18n from '../../translations'; + +export interface OsConditionsProps { + dataTestSubj: string; + os: ExceptionListItemSchema['os_types']; +} + +export const OsCondition = memo(({ os, dataTestSubj }) => { + const osLabel = useMemo(() => { + return os.map((osValue) => OS_LABELS[osValue] ?? osValue).join(', '); + }, [os]); + return osLabel ? ( +
    + + + + +
    + ) : null; +}); +OsCondition.displayName = 'OsCondition'; diff --git a/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/types.ts b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/types.ts new file mode 100644 index 0000000000000..09067e84cafc7 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/types.ts @@ -0,0 +1,32 @@ +/* + * 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. + */ + +import type { + EntryExists, + EntryList, + EntryMatch, + EntryMatchAny, + EntryMatchWildcard, + EntryNested, + ExceptionListItemSchema, +} from '@kbn/securitysolution-io-ts-list-types'; + +export type Entry = + | EntryExists + | EntryList + | EntryMatch + | EntryMatchAny + | EntryMatchWildcard + | EntryNested; + +export type Entries = ExceptionListItemSchema['entries']; +export interface CriteriaConditionsProps { + entries: Entries; + dataTestSubj: string; + os?: ExceptionListItemSchema['os_types']; +} diff --git a/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/exception_item_card.tsx b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/exception_item_card.tsx new file mode 100644 index 0000000000000..c3705750d015d --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/exception_item_card.tsx @@ -0,0 +1,136 @@ +/* + * 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. + */ + +import React, { useMemo, useCallback, FC } from 'react'; +import { EuiPanel, EuiFlexGroup, EuiFlexItem, EuiCommentProps } from '@elastic/eui'; +import type { + CommentsArray, + ExceptionListItemSchema, + ExceptionListTypeEnum, +} from '@kbn/securitysolution-io-ts-list-types'; + +import * as i18n from './translations'; +import { + ExceptionItemCardHeader, + ExceptionItemCardConditions, + ExceptionItemCardMetaInfo, + ExceptionItemCardComments, +} from '.'; + +import type { ExceptionListItemIdentifiers } from '../types'; + +export interface ExceptionItemProps { + dataTestSubj?: string; + disableActions?: boolean; + exceptionItem: ExceptionListItemSchema; + listType: ExceptionListTypeEnum; + ruleReferences: any[]; // rulereferences + editActionLabel?: string; + deleteActionLabel?: string; + securityLinkAnchorComponent: React.ElementType; // This property needs to be removed to avoid the Prop Drilling, once we move all the common components from x-pack/security-solution/common + formattedDateComponent: React.ElementType; // This property needs to be removed to avoid the Prop Drilling, once we move all the common components from x-pack/security-solution/common + getFormattedComments: (comments: CommentsArray) => EuiCommentProps[]; // This property needs to be removed to avoid the Prop Drilling, once we move all the common components from x-pack/security-solution/common + onDeleteException: (arg: ExceptionListItemIdentifiers) => void; + onEditException: (item: ExceptionListItemSchema) => void; +} + +const ExceptionItemCardComponent: FC = ({ + disableActions = false, + exceptionItem, + listType, + ruleReferences, + dataTestSubj, + editActionLabel, + deleteActionLabel, + securityLinkAnchorComponent, + formattedDateComponent, + getFormattedComments, + onDeleteException, + onEditException, +}) => { + const handleDelete = useCallback((): void => { + onDeleteException({ + id: exceptionItem.id, + name: exceptionItem.name, + namespaceType: exceptionItem.namespace_type, + }); + }, [onDeleteException, exceptionItem.id, exceptionItem.name, exceptionItem.namespace_type]); + + const handleEdit = useCallback((): void => { + onEditException(exceptionItem); + }, [onEditException, exceptionItem]); + + const formattedComments = useMemo((): EuiCommentProps[] => { + return getFormattedComments(exceptionItem.comments); + }, [exceptionItem.comments, getFormattedComments]); + + const actions: Array<{ + key: string; + icon: string; + label: string | boolean; + onClick: () => void; + }> = useMemo( + () => [ + { + key: 'edit', + icon: 'controlsHorizontal', + label: editActionLabel || i18n.exceptionItemCardEditButton(listType), + onClick: handleEdit, + }, + { + key: 'delete', + icon: 'trash', + label: deleteActionLabel || listType === i18n.exceptionItemCardDeleteButton(listType), + onClick: handleDelete, + }, + ], + [editActionLabel, listType, deleteActionLabel, handleDelete, handleEdit] + ); + return ( + + + + + + + + + + + + {formattedComments.length > 0 && ( + + )} + + + ); +}; + +ExceptionItemCardComponent.displayName = 'ExceptionItemCardComponent'; + +export const ExceptionItemCard = React.memo(ExceptionItemCardComponent); + +ExceptionItemCard.displayName = 'ExceptionItemCard'; diff --git a/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/header/header.test.tsx b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/header/header.test.tsx new file mode 100644 index 0000000000000..78feab598c145 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/header/header.test.tsx @@ -0,0 +1,76 @@ +/* + * 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. + */ + +import React from 'react'; +import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock'; + +import * as i18n from '../translations'; +import { ExceptionItemCardHeader } from './header'; +import { fireEvent, render } from '@testing-library/react'; +import { ExceptionListTypeEnum } from '@kbn/securitysolution-io-ts-list-types'; + +const handleEdit = jest.fn(); +const handleDelete = jest.fn(); +const actions = [ + { + key: 'edit', + icon: 'pencil', + label: i18n.exceptionItemCardEditButton(ExceptionListTypeEnum.DETECTION), + onClick: handleEdit, + }, + { + key: 'delete', + icon: 'trash', + label: i18n.exceptionItemCardDeleteButton(ExceptionListTypeEnum.DETECTION), + onClick: handleDelete, + }, +]; +describe('ExceptionItemCardHeader', () => { + it('it renders item name', () => { + const wrapper = render( + + ); + + expect(wrapper.getByTestId('exceptionItemHeaderTitle')).toHaveTextContent('some name'); + }); + + it('it displays actions', () => { + const wrapper = render( + + ); + + // click on popover + fireEvent.click(wrapper.getByTestId('exceptionItemHeaderActionButton')); + fireEvent.click(wrapper.getByTestId('exceptionItemHeaderActionItemedit')); + expect(handleEdit).toHaveBeenCalled(); + + fireEvent.click(wrapper.getByTestId('exceptionItemHeaderActionItemdelete')); + expect(handleDelete).toHaveBeenCalled(); + }); + + it('it disables actions if disableActions is true', () => { + const wrapper = render( + + ); + + expect(wrapper.getByTestId('exceptionItemHeaderActionButton')).toBeDisabled(); + }); +}); diff --git a/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/header/header.tsx b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/header/header.tsx new file mode 100644 index 0000000000000..d58cb8d99b7a1 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/header/header.tsx @@ -0,0 +1,83 @@ +/* + * 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. + */ + +import React, { memo, useMemo, useState } from 'react'; +import type { EuiContextMenuPanelProps } from '@elastic/eui'; +import { + EuiButtonIcon, + EuiContextMenuPanel, + EuiFlexGroup, + EuiFlexItem, + EuiPopover, + EuiTitle, + EuiContextMenuItem, +} from '@elastic/eui'; +import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types'; + +export interface ExceptionItemCardHeaderProps { + item: ExceptionListItemSchema; + actions: Array<{ key: string; icon: string; label: string | boolean; onClick: () => void }>; + disableActions?: boolean; + dataTestSubj: string; +} + +export const ExceptionItemCardHeader = memo( + ({ item, actions, disableActions = false, dataTestSubj }) => { + const [isPopoverOpen, setIsPopoverOpen] = useState(false); + + const onItemActionsClick = () => setIsPopoverOpen((isOpen) => !isOpen); + const onClosePopover = () => setIsPopoverOpen(false); + + const itemActions = useMemo((): EuiContextMenuPanelProps['items'] => { + return actions.map((action) => ( + { + onClosePopover(); + action.onClick(); + }} + > + {action.label} + + )); + }, [dataTestSubj, actions]); + + return ( + + + +

    {item.name}

    +     +     + + + } + panelPaddingSize="none" + isOpen={isPopoverOpen} + closePopover={onClosePopover} + data-test-subj={`${dataTestSubj}Items`} + > + + + +     + ); + } +); + +ExceptionItemCardHeader.displayName = 'ExceptionItemCardHeader'; diff --git a/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/index.test.tsx b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/index.test.tsx new file mode 100644 index 0000000000000..e97b03607bb6a --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/index.test.tsx @@ -0,0 +1,172 @@ +/* + * 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. + */ + +import React from 'react'; +import { fireEvent, render } from '@testing-library/react'; + +import { ExceptionItemCard } from '.'; +import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock'; +import { getCommentsArrayMock } from '@kbn/lists-plugin/common/schemas/types/comment.mock'; +import { ExceptionListTypeEnum } from '@kbn/securitysolution-io-ts-list-types'; + +const ruleReferences: unknown[] = [ + { + exception_lists: [ + { + id: '123', + list_id: 'i_exist', + namespace_type: 'single', + type: 'detection', + }, + { + id: '456', + list_id: 'i_exist_2', + namespace_type: 'single', + type: 'detection', + }, + ], + id: '1a2b3c', + name: 'Simple Rule Query', + rule_id: 'rule-2', + }, +]; +describe('ExceptionItemCard', () => { + it('it renders header, item meta information and conditions', () => { + const exceptionItem = { ...getExceptionListItemSchemaMock(), comments: [] }; + + const wrapper = render( + null} + formattedDateComponent={() => null} + getFormattedComments={() => []} + /> + ); + + expect(wrapper.getByTestId('exceptionItemCardHeaderContainer')).toBeInTheDocument(); + // expect(wrapper.getByTestId('exceptionItemCardMetaInfo')).toBeInTheDocument(); + expect(wrapper.getByTestId('exceptionItemCardConditions')).toBeInTheDocument(); + // expect(wrapper.queryByTestId('exceptionsViewerCommentAccordion')).not.toBeInTheDocument(); + }); + + it('it renders header, item meta information, conditions, and comments if any exist', () => { + const exceptionItem = { ...getExceptionListItemSchemaMock(), comments: getCommentsArrayMock() }; + + const wrapper = render( + null} + formattedDateComponent={() => null} + getFormattedComments={() => []} + /> + ); + + expect(wrapper.getByTestId('exceptionItemCardHeaderContainer')).toBeInTheDocument(); + // expect(wrapper.getByTestId('exceptionItemCardMetaInfo')).toBeInTheDocument(); + expect(wrapper.getByTestId('exceptionItemCardConditions')).toBeInTheDocument(); + // expect(wrapper.getByTestId('exceptionsViewerCommentAccordion')).toBeInTheDocument(); + }); + + it('it does not render edit or delete action buttons when "disableActions" is "true"', () => { + const exceptionItem = getExceptionListItemSchemaMock(); + + const wrapper = render( + null} + formattedDateComponent={() => null} + getFormattedComments={() => []} + /> + ); + expect(wrapper.queryByTestId('itemActionButton')).not.toBeInTheDocument(); + }); + + it('it invokes "onEditException" when edit button clicked', () => { + const mockOnEditException = jest.fn(); + const exceptionItem = getExceptionListItemSchemaMock(); + + const wrapper = render( + null} + formattedDateComponent={() => null} + getFormattedComments={() => []} + /> + ); + + fireEvent.click(wrapper.getByTestId('exceptionItemCardHeaderActionButton')); + fireEvent.click(wrapper.getByTestId('exceptionItemCardHeaderActionItemedit')); + expect(mockOnEditException).toHaveBeenCalledWith(getExceptionListItemSchemaMock()); + }); + + it('it invokes "onDeleteException" when delete button clicked', () => { + const mockOnDeleteException = jest.fn(); + const exceptionItem = getExceptionListItemSchemaMock(); + + const wrapper = render( + null} + formattedDateComponent={() => null} + getFormattedComments={() => []} + /> + ); + fireEvent.click(wrapper.getByTestId('exceptionItemCardHeaderActionButton')); + fireEvent.click(wrapper.getByTestId('exceptionItemCardHeaderActionItemdelete')); + + expect(mockOnDeleteException).toHaveBeenCalledWith({ + id: '1', + name: 'some name', + namespaceType: 'single', + }); + }); + + // TODO Fix this Test + // it('it renders comment accordion closed to begin with', () => { + // const exceptionItem = getExceptionListItemSchemaMock(); + // exceptionItem.comments = getCommentsArrayMock(); + // const wrapper = render( + // + // ); + + // expect(wrapper.queryByTestId('accordion-comment-list')).not.toBeVisible(); + // }); +}); diff --git a/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/index.ts b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/index.ts new file mode 100644 index 0000000000000..c0fd3fafc86d5 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/index.ts @@ -0,0 +1,13 @@ +/* + * 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. + */ + +export * from './conditions/conditions'; +export * from './header/header'; +export * from './meta/meta'; +export * from './comments/comments'; +export * from './exception_item_card'; diff --git a/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/meta/details_info/details_info.tsx b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/meta/details_info/details_info.tsx new file mode 100644 index 0000000000000..3d075f50096d0 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/meta/details_info/details_info.tsx @@ -0,0 +1,59 @@ +/* + * 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. + */ + +import React, { memo } from 'react'; +import { EuiBadge, EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui'; +import { css } from '@emotion/react'; +import { euiThemeVars } from '@kbn/ui-theme'; +import * as i18n from '../../translations'; + +interface MetaInfoDetailsProps { + fieldName: string; + label: string; + lastUpdate: JSX.Element | string; + lastUpdateValue: string; + dataTestSubj: string; +} + +const euiBadgeFontFamily = css` + font-family: ${euiThemeVars.euiFontFamily}; +`; +export const MetaInfoDetails = memo( + ({ label, lastUpdate, lastUpdateValue, dataTestSubj }) => { + return ( + + + + {label} + + + + + {lastUpdate} + + + + + {i18n.EXCEPTION_ITEM_CARD_META_BY} + + + + + + + {lastUpdateValue} + + + + + + ); + } +); + +MetaInfoDetails.displayName = 'MetaInfoDetails'; diff --git a/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/meta/meta.test.tsx b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/meta/meta.test.tsx new file mode 100644 index 0000000000000..14bdef771d6b3 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/meta/meta.test.tsx @@ -0,0 +1,155 @@ +/* + * 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. + */ + +import React from 'react'; +import { render } from '@testing-library/react'; +import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock'; + +import { ExceptionItemCardMetaInfo } from './meta'; +import { RuleReference } from '../../types'; + +const ruleReferences = [ + { + exception_lists: [ + { + id: '123', + list_id: 'i_exist', + namespace_type: 'single', + type: 'detection', + }, + { + id: '456', + list_id: 'i_exist_2', + namespace_type: 'single', + type: 'detection', + }, + ], + id: '1a2b3c', + name: 'Simple Rule Query', + rule_id: 'rule-2', + }, +]; +describe('ExceptionItemCardMetaInfo', () => { + it('it should render creation info with sending custom formattedDateComponent', () => { + const wrapper = render( + null} + formattedDateComponent={({ fieldName, value }) => ( + <> +

    {new Date(value).toDateString()}

    + + )} + /> + ); + + expect(wrapper.getByTestId('exceptionItemMetaCreatedBylastUpdate')).toHaveTextContent( + 'Mon Apr 20 2020' + ); + expect(wrapper.getByTestId('exceptionItemMetaCreatedBylastUpdateValue')).toHaveTextContent( + 'some user' + ); + }); + + it('it should render udate info with sending custom formattedDateComponent', () => { + const wrapper = render( + null} + formattedDateComponent={({ fieldName, value }) => ( + <> +

    {new Date(value).toDateString()}

    + + )} + /> + ); + expect(wrapper.getByTestId('exceptionItemMetaUpdatedBylastUpdate')).toHaveTextContent( + 'Mon Apr 20 2020' + ); + expect(wrapper.getByTestId('exceptionItemMetaUpdatedBylastUpdateValue')).toHaveTextContent( + 'some user' + ); + }); + + it('it should render references info', () => { + const wrapper = render( + null} + formattedDateComponent={() => null} + /> + ); + + expect(wrapper.getByTestId('exceptionItemMetaAffectedRulesButton')).toHaveTextContent( + 'Affects 1 rule' + ); + }); + + it('it renders references info when multiple references exist', () => { + const wrapper = render( + null} + formattedDateComponent={() => null} + /> + ); + + expect(wrapper.getByTestId('exceptionItemMetaAffectedRulesButton')).toHaveTextContent( + 'Affects 2 rules' + ); + }); +}); diff --git a/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/meta/meta.tsx b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/meta/meta.tsx new file mode 100644 index 0000000000000..91e0a9cdd19b8 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/meta/meta.tsx @@ -0,0 +1,123 @@ +/* + * 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. + */ + +import React, { memo, useMemo, useState } from 'react'; +import type { EuiContextMenuPanelProps } from '@elastic/eui'; +import { + EuiContextMenuItem, + EuiContextMenuPanel, + EuiFlexGroup, + EuiFlexItem, + EuiToolTip, + EuiButtonEmpty, + EuiPopover, +} from '@elastic/eui'; +import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types'; + +import { css } from '@emotion/react'; +import * as i18n from '../translations'; +import type { RuleReference } from '../../types'; +import { MetaInfoDetails } from './details_info/details_info'; + +const itemCss = css` + border-right: 1px solid #d3dae6; + padding: 4px 12px 4px 0; +`; + +export interface ExceptionItemCardMetaInfoProps { + item: ExceptionListItemSchema; + references: RuleReference[]; + dataTestSubj: string; + formattedDateComponent: React.ElementType; // This property needs to be removed to avoid the Prop Drilling, once we move all the common components from x-pack/security-solution/common + securityLinkAnchorComponent: React.ElementType; // This property needs to be removed to avoid the Prop Drilling, once we move all the common components from x-pack/security-solution/common +} + +export const ExceptionItemCardMetaInfo = memo( + ({ item, references, dataTestSubj, securityLinkAnchorComponent, formattedDateComponent }) => { + const [isPopoverOpen, setIsPopoverOpen] = useState(false); + + const onAffectedRulesClick = () => setIsPopoverOpen((isOpen) => !isOpen); + const onClosePopover = () => setIsPopoverOpen(false); + + const FormattedDateComponent = formattedDateComponent; + const itemActions = useMemo((): EuiContextMenuPanelProps['items'] => { + if (references == null || securityLinkAnchorComponent === null) { + return []; + } + + const SecurityLinkAnchor = securityLinkAnchorComponent; + return references.map((reference) => ( + + + + + + )); + }, [references, securityLinkAnchorComponent, dataTestSubj]); + + return ( + + {FormattedDateComponent !== null && ( + <> + + + } + lastUpdateValue={item.created_by} + dataTestSubj={`${dataTestSubj}CreatedBy`} + /> + + + + + } + lastUpdateValue={item.updated_by} + dataTestSubj={`${dataTestSubj}UpdatedBy`} + /> + + + )} + + + {i18n.AFFECTED_RULES(references.length)} + + } + panelPaddingSize="none" + isOpen={isPopoverOpen} + closePopover={onClosePopover} + data-test-subj={`${dataTestSubj}Items`} + > + + + + + ); + } +); +ExceptionItemCardMetaInfo.displayName = 'ExceptionItemCardMetaInfo'; diff --git a/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/translations.ts b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/translations.ts new file mode 100644 index 0000000000000..2fa7524291025 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/translations.ts @@ -0,0 +1,166 @@ +/* + * 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. + */ + +import { i18n } from '@kbn/i18n'; + +export const exceptionItemCardEditButton = (listType: string) => + i18n.translate('exceptionList-components.exceptions.exceptionItem.card.editItemButton', { + values: { listType }, + defaultMessage: 'Edit {listType} exception', + }); + +export const exceptionItemCardDeleteButton = (listType: string) => + i18n.translate('exceptionList-components.exceptions.exceptionItem.card.deleteItemButton', { + values: { listType }, + defaultMessage: 'Delete {listType} exception', + }); + +export const EXCEPTION_ITEM_CARD_CREATED_LABEL = i18n.translate( + 'exceptionList-components.exceptions.exceptionItem.card.createdLabel', + { + defaultMessage: 'Created', + } +); + +export const EXCEPTION_ITEM_CARD_UPDATED_LABEL = i18n.translate( + 'exceptionList-components.exceptions.exceptionItem.card.updatedLabel', + { + defaultMessage: 'Updated', + } +); + +export const EXCEPTION_ITEM_CARD_META_BY = i18n.translate( + 'exceptionList-components.exceptions.exceptionItem.card.metaDetailsBy', + { + defaultMessage: 'by', + } +); + +export const exceptionItemCardCommentsAccordion = (comments: number) => + i18n.translate('exceptionList-components.exceptions.exceptionItem.card.showCommentsLabel', { + values: { comments }, + defaultMessage: 'Show {comments, plural, =1 {comment} other {comments}} ({comments})', + }); + +export const CONDITION_OPERATOR_TYPE_MATCH = i18n.translate( + 'exceptionList-components.exceptions.exceptionItem.card.conditions.matchOperator', + { + defaultMessage: 'IS', + } +); + +export const CONDITION_OPERATOR_TYPE_NOT_MATCH = i18n.translate( + 'exceptionList-components.exceptions.exceptionItem.card.conditions.matchOperator.not', + { + defaultMessage: 'IS NOT', + } +); + +export const CONDITION_OPERATOR_TYPE_WILDCARD_MATCHES = i18n.translate( + 'exceptionList-components.exceptions.exceptionItem.card.conditions.wildcardMatchesOperator', + { + defaultMessage: 'MATCHES', + } +); + +export const CONDITION_OPERATOR_TYPE_WILDCARD_DOES_NOT_MATCH = i18n.translate( + 'exceptionList-components.exceptions.exceptionItem.card.conditions.wildcardDoesNotMatchOperator', + { + defaultMessage: 'DOES NOT MATCH', + } +); + +export const CONDITION_OPERATOR_TYPE_NESTED = i18n.translate( + 'exceptionList-components.exceptions.exceptionItem.card.conditions.nestedOperator', + { + defaultMessage: 'has', + } +); + +export const CONDITION_OPERATOR_TYPE_MATCH_ANY = i18n.translate( + 'exceptionList-components.exceptions.exceptionItem.card.conditions.matchAnyOperator', + { + defaultMessage: 'is one of', + } +); + +export const CONDITION_OPERATOR_TYPE_NOT_MATCH_ANY = i18n.translate( + 'exceptionList-components.exceptions.exceptionItem.card.conditions.matchAnyOperator.not', + { + defaultMessage: 'is not one of', + } +); + +export const CONDITION_OPERATOR_TYPE_EXISTS = i18n.translate( + 'exceptionList-components.exceptions.exceptionItem.card.conditions.existsOperator', + { + defaultMessage: 'exists', + } +); + +export const CONDITION_OPERATOR_TYPE_DOES_NOT_EXIST = i18n.translate( + 'exceptionList-components.exceptions.exceptionItem.card.conditions.existsOperator.not', + { + defaultMessage: 'does not exist', + } +); + +export const CONDITION_OPERATOR_TYPE_LIST = i18n.translate( + 'exceptionList-components.exceptions.exceptionItem.card.conditions.listOperator', + { + defaultMessage: 'included in', + } +); + +export const CONDITION_OPERATOR_TYPE_NOT_IN_LIST = i18n.translate( + 'exceptionList-components.exceptions.exceptionItem.card.conditions.listOperator.not', + { + defaultMessage: 'is not included in', + } +); + +export const CONDITION_AND = i18n.translate( + 'exceptionList-components.exceptions.exceptionItem.card.conditions.and', + { + defaultMessage: 'AND', + } +); + +export const CONDITION_OS = i18n.translate( + 'exceptionList-components.exceptions.exceptionItem.card.conditions.os', + { + defaultMessage: 'OS', + } +); + +export const OS_WINDOWS = i18n.translate( + 'exceptionList-components.exceptions.exceptionItem.card.conditions.windows', + { + defaultMessage: 'Windows', + } +); + +export const OS_LINUX = i18n.translate( + 'exceptionList-components.exceptions.exceptionItem.card.conditions.linux', + { + defaultMessage: 'Linux', + } +); + +export const OS_MAC = i18n.translate( + 'exceptionList-components.exceptions.exceptionItem.card.conditions.macos', + { + defaultMessage: 'Mac', + } +); + +export const AFFECTED_RULES = (numRules: number) => + i18n.translate('exceptionList-components.exceptions.card.exceptionItem.affectedRules', { + values: { numRules }, + defaultMessage: 'Affects {numRules} {numRules, plural, =1 {rule} other {rules}}', + }); diff --git a/packages/kbn-securitysolution-exception-list-components/src/exception_items/exception_items.test.tsx b/packages/kbn-securitysolution-exception-list-components/src/exception_items/exception_items.test.tsx new file mode 100644 index 0000000000000..3fe2d7eb6d0b3 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/exception_items/exception_items.test.tsx @@ -0,0 +1,103 @@ +/* + * 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. + */ + +import React from 'react'; + +import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock'; +import { ExceptionListTypeEnum } from '@kbn/securitysolution-io-ts-list-types'; + +import { ExceptionItems } from './exception_items'; + +import { ViewerStatus } from '../types'; +import { render } from '@testing-library/react'; + +const onCreateExceptionListItem = jest.fn(); +const onDeleteException = jest.fn(); +const onEditExceptionItem = jest.fn(); +const onPaginationChange = jest.fn(); + +const pagination = { pageIndex: 0, pageSize: 0, totalItemCount: 0 }; + +describe('ExceptionsViewerItems', () => { + describe('Viewing EmptyViewerState', () => { + it('it renders empty prompt if "viewerStatus" is "empty"', () => { + const wrapper = render( + null} + formattedDateComponent={() => null} + exceptionsUtilityComponent={() => null} + getFormattedComments={() => []} + /> + ); + // expect(wrapper).toMatchSnapshot(); + expect(wrapper.getByTestId('emptyViewerState')).toBeInTheDocument(); + expect(wrapper.queryByTestId('exceptionsContainer')).not.toBeInTheDocument(); + }); + + it('it renders no search results found prompt if "viewerStatus" is "empty_search"', () => { + const wrapper = render( + null} + formattedDateComponent={() => null} + exceptionsUtilityComponent={() => null} + getFormattedComments={() => []} + /> + ); + // expect(wrapper).toMatchSnapshot(); + expect(wrapper.getByTestId('emptySearchViewerState')).toBeInTheDocument(); + expect(wrapper.queryByTestId('exceptionsContainer')).not.toBeInTheDocument(); + }); + + it('it renders exceptions if "viewerStatus" and "null"', () => { + const wrapper = render( + null} + formattedDateComponent={() => null} + exceptionsUtilityComponent={() => null} + getFormattedComments={() => []} + /> + ); + // expect(wrapper).toMatchSnapshot(); + expect(wrapper.getByTestId('exceptionsContainer')).toBeTruthy(); + }); + }); + // TODO Add Exception Items and Pagination interactions +}); diff --git a/packages/kbn-securitysolution-exception-list-components/src/exception_items/exception_items.tsx b/packages/kbn-securitysolution-exception-list-components/src/exception_items/exception_items.tsx new file mode 100644 index 0000000000000..80ab3d99f6eb8 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/exception_items/exception_items.tsx @@ -0,0 +1,139 @@ +/* + * 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. + */ + +import React from 'react'; +import { css } from '@emotion/react'; +import type { FC } from 'react'; +import { EuiCommentProps, EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; + +import type { Pagination as PaginationType } from '@elastic/eui'; + +import type { + CommentsArray, + ExceptionListItemSchema, + ExceptionListTypeEnum, +} from '@kbn/securitysolution-io-ts-list-types'; + +import { euiThemeVars } from '@kbn/ui-theme'; +import { EmptyViewerState, ExceptionItemCard, Pagination } from '../..'; + +import type { + RuleReferences, + ExceptionListItemIdentifiers, + ViewerStatus, + GetExceptionItemProps, +} from '../types'; + +const exceptionItemCss = css` + margin: ${euiThemeVars.euiSize} 0; + &div:first-child { + margin: ${euiThemeVars.euiSizeXS} 0 ${euiThemeVars.euiSize}; + } +`; + +interface ExceptionItemsProps { + lastUpdated: string | number | null; + viewerStatus: ViewerStatus; + isReadOnly: boolean; + emptyViewerTitle?: string; + emptyViewerBody?: string; + emptyViewerButtonText?: string; + exceptions: ExceptionListItemSchema[]; + listType: ExceptionListTypeEnum; + ruleReferences: RuleReferences; + pagination: PaginationType; + securityLinkAnchorComponent: React.ElementType; // This property needs to be removed to avoid the Prop Drilling, once we move all the common components from x-pack/security-solution/common + formattedDateComponent: React.ElementType; // This property needs to be removed to avoid the Prop Drilling, once we move all the common components from x-pack/security-solution/common + exceptionsUtilityComponent: React.ElementType; // This property needs to be removed to avoid the Prop Drilling, once we move all the common components from x-pack/security-solution/common + getFormattedComments: (comments: CommentsArray) => EuiCommentProps[]; // This property needs to be removed to avoid the Prop Drilling, once we move all the common components from x-pack/security-solution/common + onCreateExceptionListItem?: () => void; + onDeleteException: (arg: ExceptionListItemIdentifiers) => void; + onEditExceptionItem: (item: ExceptionListItemSchema) => void; + onPaginationChange: (arg: GetExceptionItemProps) => void; +} + +const ExceptionItemsComponent: FC = ({ + lastUpdated, + viewerStatus, + isReadOnly, + exceptions, + listType, + ruleReferences, + emptyViewerTitle, + emptyViewerBody, + emptyViewerButtonText, + pagination, + securityLinkAnchorComponent, + exceptionsUtilityComponent, + formattedDateComponent, + getFormattedComments, + onPaginationChange, + onDeleteException, + onEditExceptionItem, + onCreateExceptionListItem, +}) => { + const ExceptionsUtility = exceptionsUtilityComponent; + if (!exceptions.length || viewerStatus) + return ( + + ); + return ( + <> + + + + + {exceptions.map((exception) => ( + + + + ))} + + + + + + ); +}; + +ExceptionItemsComponent.displayName = 'ExceptionItemsComponent'; + +export const ExceptionItems = React.memo(ExceptionItemsComponent); + +ExceptionItems.displayName = 'ExceptionsItems'; diff --git a/packages/kbn-securitysolution-exception-list-components/src/pagination/pagination.test.tsx b/packages/kbn-securitysolution-exception-list-components/src/pagination/pagination.test.tsx new file mode 100644 index 0000000000000..4d97f198aa2b9 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/pagination/pagination.test.tsx @@ -0,0 +1,78 @@ +/* + * 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. + */ + +import { fireEvent, render } from '@testing-library/react'; +import React from 'react'; + +import { Pagination } from './pagination'; + +describe('Pagination', () => { + it('it invokes "onPaginationChange" when per page item is clicked', () => { + const mockOnPaginationChange = jest.fn(); + const wrapper = render( + + ); + + fireEvent.click(wrapper.getByTestId('tablePaginationPopoverButton')); + fireEvent.click(wrapper.getByTestId('tablePagination-50-rows')); + + expect(mockOnPaginationChange).toHaveBeenCalledWith({ + pagination: { pageIndex: 0, pageSize: 50, totalItemCount: 1 }, + }); + }); + + it('it invokes "onPaginationChange" when next clicked', () => { + const mockOnPaginationChange = jest.fn(); + const wrapper = render( + + ); + + fireEvent.click(wrapper.getByTestId('pagination-button-next')); + + expect(mockOnPaginationChange).toHaveBeenCalledWith({ + pagination: { pageIndex: 1, pageSize: 5, totalItemCount: 160 }, + }); + }); + + it('it invokes "onPaginationChange" when page clicked', () => { + const mockOnPaginationChange = jest.fn(); + const wrapper = render( + + ); + + fireEvent.click(wrapper.getByTestId('pagination-button-2')); + + expect(mockOnPaginationChange).toHaveBeenCalledWith({ + pagination: { pageIndex: 2, pageSize: 50, totalItemCount: 160 }, + }); + }); +}); diff --git a/packages/kbn-securitysolution-exception-list-components/src/pagination/pagination.tsx b/packages/kbn-securitysolution-exception-list-components/src/pagination/pagination.tsx new file mode 100644 index 0000000000000..30b029480e173 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/pagination/pagination.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 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 React from 'react'; +import type { FC } from 'react'; +import { EuiTablePagination } from '@elastic/eui'; + +import type { PaginationProps } from '../types'; +import { usePagination } from './use_pagination'; + +const PaginationComponent: FC = ({ + dataTestSubj, + ariaLabel, + pagination, + onPaginationChange, +}) => { + const { + pageIndex, + pageCount, + pageSize, + pageSizeOptions, + + handleItemsPerPageChange, + handlePageIndexChange, + } = usePagination({ pagination, onPaginationChange }); + + return ( + + ); +}; + +PaginationComponent.displayName = 'PaginationComponent'; + +export const Pagination = React.memo(PaginationComponent); + +Pagination.displayName = 'Pagination'; diff --git a/packages/kbn-securitysolution-exception-list-components/src/pagination/use_pagination.test.ts b/packages/kbn-securitysolution-exception-list-components/src/pagination/use_pagination.test.ts new file mode 100644 index 0000000000000..d190c88f10617 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/pagination/use_pagination.test.ts @@ -0,0 +1,67 @@ +/* + * 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. + */ + +import { act, renderHook } from '@testing-library/react-hooks'; +import { usePagination } from './use_pagination'; + +const onPaginationChange = jest.fn(); + +describe('usePagination', () => { + test('should return the correct EuiTablePagination props when all the pagination object properties are falsy', () => { + const pagination = { pageIndex: 0, pageSize: 0, totalItemCount: 0 }; + + const { result } = renderHook(() => usePagination({ pagination, onPaginationChange })); + const { pageCount, pageIndex, pageSize, pageSizeOptions } = result.current; + expect(pageCount).toEqual(0); + expect(pageIndex).toEqual(0); + expect(pageSize).toEqual(0); + expect(pageSizeOptions).toEqual(undefined); + }); + test('should return the correct pageCount when pagination properties are invalid', () => { + const pagination = { pageIndex: 0, pageSize: 10, totalItemCount: 0 }; + + const { result } = renderHook(() => usePagination({ pagination, onPaginationChange })); + const { pageCount } = result.current; + expect(pageCount).toEqual(0); + }); + test('should return the correct EuiTablePagination props when all the pagination object properties are turthy', () => { + const pagination = { pageIndex: 0, pageSize: 10, totalItemCount: 100 }; + + const { result } = renderHook(() => usePagination({ pagination, onPaginationChange })); + const { pageCount, pageIndex, pageSize } = result.current; + expect(pageCount).toEqual(10); + expect(pageIndex).toEqual(0); + expect(pageSize).toEqual(10); + }); + test('should call onPaginationChange with correct pageIndex when the Page changes', () => { + const pagination = { pageIndex: 0, pageSize: 10, totalItemCount: 100 }; + + const { result } = renderHook(() => usePagination({ pagination, onPaginationChange })); + const { handlePageIndexChange } = result.current; + + act(() => { + handlePageIndexChange(2); + }); + expect(onPaginationChange).toHaveBeenCalledWith({ + pagination: { pageIndex: 2, pageSize: 10, totalItemCount: 100 }, + }); + }); + test('should call onPaginationChange with correct pageSize when the number of items per change changes', () => { + const pagination = { pageIndex: 0, pageSize: 10, totalItemCount: 100 }; + + const { result } = renderHook(() => usePagination({ pagination, onPaginationChange })); + const { handleItemsPerPageChange } = result.current; + + act(() => { + handleItemsPerPageChange(100); + }); + expect(onPaginationChange).toHaveBeenCalledWith({ + pagination: { pageIndex: 0, pageSize: 100, totalItemCount: 100 }, + }); + }); +}); diff --git a/packages/kbn-securitysolution-exception-list-components/src/pagination/use_pagination.ts b/packages/kbn-securitysolution-exception-list-components/src/pagination/use_pagination.ts new file mode 100644 index 0000000000000..d235658263687 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/pagination/use_pagination.ts @@ -0,0 +1,55 @@ +/* + * 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. + */ + +import { useCallback, useMemo } from 'react'; +import type { PaginationProps } from '../types'; + +export const usePagination = ({ pagination, onPaginationChange }: PaginationProps) => { + const { pageIndex, totalItemCount, pageSize, pageSizeOptions } = pagination; + + const pageCount = useMemo( + () => (isFinite(totalItemCount / pageSize) ? Math.ceil(totalItemCount / pageSize) : 0), + [pageSize, totalItemCount] + ); + + const handleItemsPerPageChange = useCallback( + (nextPageSize: number) => { + onPaginationChange({ + pagination: { + pageIndex, + pageSize: nextPageSize, + totalItemCount, + }, + }); + }, + [pageIndex, totalItemCount, onPaginationChange] + ); + + const handlePageIndexChange = useCallback( + (nextPageIndex: number) => { + onPaginationChange({ + pagination: { + pageIndex: nextPageIndex, + pageSize, + totalItemCount, + }, + }); + }, + [pageSize, totalItemCount, onPaginationChange] + ); + + return { + pageCount, + pageIndex, + pageSize, + pageSizeOptions, + + handleItemsPerPageChange, + handlePageIndexChange, + }; +}; diff --git a/packages/kbn-securitysolution-exception-list-components/src/search_bar/search_bar.test.tsx b/packages/kbn-securitysolution-exception-list-components/src/search_bar/search_bar.test.tsx new file mode 100644 index 0000000000000..ac82bb3b6e850 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/search_bar/search_bar.test.tsx @@ -0,0 +1,90 @@ +/* + * 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. + */ + +import React from 'react'; +import { fireEvent, render } from '@testing-library/react'; + +import { ExceptionListTypeEnum } from '@kbn/securitysolution-io-ts-list-types'; + +import { SearchBar } from './search_bar'; + +describe('SearchBar', () => { + it('it does not display add exception button if user is read only', () => { + const wrapper = render( + + ); + + expect(wrapper.queryByTestId('searchBarButton')).not.toBeInTheDocument(); + }); + + it('it invokes "onAddExceptionClick" when user selects to add an exception item', () => { + const mockOnAddExceptionClick = jest.fn(); + const wrapper = render( + + ); + + const searchBtn = wrapper.getByTestId('searchBarButton'); + + fireEvent.click(searchBtn); + expect(searchBtn).toHaveTextContent('Add rule exception'); + expect(mockOnAddExceptionClick).toHaveBeenCalledWith('detection'); + }); + + it('it invokes "onAddExceptionClick" when user selects to add an endpoint exception item', () => { + const mockOnAddExceptionClick = jest.fn(); + const wrapper = render( + + ); + + const searchBtn = wrapper.getByTestId('searchBarButton'); + + fireEvent.click(searchBtn); + expect(searchBtn).toHaveTextContent('Add endpoint exception'); + expect(mockOnAddExceptionClick).toHaveBeenCalledWith('endpoint'); + }); + it('it invokes the "handlOnSearch" when the user add search query', () => { + const mockHandleOnSearch = jest.fn(); + const wrapper = render( + + ); + + const searchInput = wrapper.getByTestId('searchBar'); + fireEvent.change(searchInput, { target: { value: 'query' } }); + expect(mockHandleOnSearch).toBeCalledWith({ search: 'query' }); + }); +}); diff --git a/packages/kbn-securitysolution-exception-list-components/src/search_bar/search_bar.tsx b/packages/kbn-securitysolution-exception-list-components/src/search_bar/search_bar.tsx new file mode 100644 index 0000000000000..bb8dc6ee62559 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/search_bar/search_bar.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 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 React, { useCallback } from 'react'; +import type { FC } from 'react'; + +import type { SearchFilterConfig } from '@elastic/eui'; +import { EuiFlexGroup, EuiFlexItem, EuiButton, EuiSearchBar } from '@elastic/eui'; +import type { ExceptionListTypeEnum } from '@kbn/securitysolution-io-ts-list-types'; +import type { GetExceptionItemProps } from '../types'; + +const ITEMS_SCHEMA = { + strict: true, + fields: { + created_by: { + type: 'string', + }, + description: { + type: 'string', + }, + id: { + type: 'string', + }, + item_id: { + type: 'string', + }, + list_id: { + type: 'string', + }, + name: { + type: 'string', + }, + os_types: { + type: 'string', + }, + tags: { + type: 'string', + }, + }, +}; +interface SearchBarProps { + addExceptionButtonText?: string; + placeholdertext?: string; + canAddException?: boolean; // TODO what is the default value + + // TODO: REFACTOR: not to send the listType and handle it in the Parent + // Exception list type used to determine what type of item is + // being created when "onAddExceptionClick" is invoked + listType: ExceptionListTypeEnum; + isSearching?: boolean; + dataTestSubj?: string; + filters?: SearchFilterConfig[]; // TODO about filters + onSearch: (arg: GetExceptionItemProps) => void; + onAddExceptionClick: (type: ExceptionListTypeEnum) => void; +} +const SearchBarComponent: FC = ({ + addExceptionButtonText, + placeholdertext, + canAddException, + listType, + isSearching, + dataTestSubj, + filters = [], + onSearch, + onAddExceptionClick, +}) => { + const handleOnSearch = useCallback( + ({ queryText }): void => { + onSearch({ search: queryText }); + }, + [onSearch] + ); + + const handleAddException = useCallback(() => { + // TODO: ASK YARA why we need to send the listType + onAddExceptionClick(listType); + }, [onAddExceptionClick, listType]); + + return ( + + + + + {!canAddException && ( + + + {addExceptionButtonText} + + + )} + + ); +}; + +SearchBarComponent.displayName = 'SearchBarComponent'; + +export const SearchBar = React.memo(SearchBarComponent); + +SearchBar.displayName = 'SearchBar'; diff --git a/packages/kbn-securitysolution-exception-list-components/src/translations.ts b/packages/kbn-securitysolution-exception-list-components/src/translations.ts new file mode 100644 index 0000000000000..c919ef423c545 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/translations.ts @@ -0,0 +1,57 @@ +/* + * 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. + */ + +import { i18n } from '@kbn/i18n'; + +export const EMPTY_VIEWER_STATE_EMPTY_TITLE = i18n.translate( + 'exceptionList-components.empty.viewer.state.empty.title', + { + defaultMessage: 'Add exceptions to this rule', + } +); + +export const EMPTY_VIEWER_STATE_EMPTY_BODY = i18n.translate( + 'exceptionList-components.empty.viewer.state.empty.body', + { + defaultMessage: 'There is no exception in your rule. Create your first rule exception.', + } +); +export const EMPTY_VIEWER_STATE_EMPTY_SEARCH_TITLE = i18n.translate( + 'exceptionList-components.empty.viewer.state.empty_search.search.title', + { + defaultMessage: 'No results match your search criteria', + } +); + +export const EMPTY_VIEWER_STATE_EMPTY_SEARCH_BODY = i18n.translate( + 'exceptionList-components.empty.viewer.state.empty_search.body', + { + defaultMessage: 'Try modifying your search', + } +); + +export const EMPTY_VIEWER_STATE_EMPTY_VIEWER_BUTTON = (exceptionType: string) => + i18n.translate('exceptionList-components.empty.viewer.state.empty.viewer_button', { + values: { exceptionType }, + defaultMessage: 'Create {exceptionType} exception', + }); + +export const EMPTY_VIEWER_STATE_ERROR_TITLE = i18n.translate( + 'exceptionList-components.empty.viewer.state.error_title', + { + defaultMessage: 'Unable to load exception items', + } +); + +export const EMPTY_VIEWER_STATE_ERROR_BODY = i18n.translate( + 'exceptionList-components.empty.viewer.state.error_body', + { + defaultMessage: + 'There was an error loading the exception items. Contact your administrator for help.', + } +); diff --git a/packages/kbn-securitysolution-exception-list-components/src/types/index.ts b/packages/kbn-securitysolution-exception-list-components/src/types/index.ts new file mode 100644 index 0000000000000..dbb402ca78451 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/types/index.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 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 { ExceptionListSchema } from '@kbn/securitysolution-io-ts-list-types'; + +import type { Pagination } from '@elastic/eui'; +import type { NamespaceType } from '@kbn/securitysolution-io-ts-list-types'; + +export interface GetExceptionItemProps { + pagination?: Pagination; + search?: string; + filters?: string; +} + +export interface PaginationProps { + dataTestSubj?: string; + ariaLabel?: string; + pagination: Pagination; + onPaginationChange: (arg: GetExceptionItemProps) => void; +} + +export enum ViewerStatus { + ERROR = 'error', + EMPTY = 'empty', + EMPTY_SEARCH = 'empty_search', + LOADING = 'loading', + SEARCHING = 'searching', + DELETING = 'deleting', +} + +export interface ExceptionListSummaryProps { + pagination: Pagination; + // Corresponds to last time exception items were fetched + lastUpdated: string | number | null; +} + +export type ViewerFlyoutName = 'addException' | 'editException' | null; + +export interface RuleReferences { + [key: string]: any[]; // TODO fix +} + +export interface ExceptionListItemIdentifiers { + id: string; + name: string; + namespaceType: NamespaceType; +} + +export enum ListTypeText { + ENDPOINT = 'endpoint', + DETECTION = 'empty', + RULE_DEFAULT = 'empty_search', +} + +export interface RuleReference { + name: string; + id: string; + ruleId: string; + exceptionLists: ExceptionListSchema[]; +} diff --git a/packages/kbn-securitysolution-exception-list-components/src/value_with_space_warning/index.ts b/packages/kbn-securitysolution-exception-list-components/src/value_with_space_warning/index.ts new file mode 100644 index 0000000000000..472a80575f27d --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/value_with_space_warning/index.ts @@ -0,0 +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 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. + */ + +export { ValueWithSpaceWarning } from './value_with_space_warning'; diff --git a/packages/kbn-securitysolution-exception-list-components/src/value_with_space_warning/use_value_with_space_warning.test.ts b/packages/kbn-securitysolution-exception-list-components/src/value_with_space_warning/use_value_with_space_warning.test.ts new file mode 100644 index 0000000000000..8f6788d710a19 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/value_with_space_warning/use_value_with_space_warning.test.ts @@ -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 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 { renderHook } from '@testing-library/react-hooks'; +import { useValueWithSpaceWarning } from './use_value_with_space_warning'; + +describe('useValueWithSpaceWarning', () => { + it('should return true when value is string and contains space', () => { + const { result } = renderHook(() => useValueWithSpaceWarning({ value: ' space before' })); + + const { showSpaceWarningIcon, warningText } = result.current; + expect(showSpaceWarningIcon).toBeTruthy(); + expect(warningText).toBeTruthy(); + }); + it('should return true when value is string and does not contain space', () => { + const { result } = renderHook(() => useValueWithSpaceWarning({ value: 'no space' })); + + const { showSpaceWarningIcon, warningText } = result.current; + expect(showSpaceWarningIcon).toBeFalsy(); + expect(warningText).toBeTruthy(); + }); + it('should return true when value is array and one of the elements contains space', () => { + const { result } = renderHook(() => + useValueWithSpaceWarning({ value: [' space before', 'no space'] }) + ); + + const { showSpaceWarningIcon, warningText } = result.current; + expect(showSpaceWarningIcon).toBeTruthy(); + expect(warningText).toBeTruthy(); + }); + it('should return true when value is array and none contains space', () => { + const { result } = renderHook(() => + useValueWithSpaceWarning({ value: ['no space', 'no space'] }) + ); + + const { showSpaceWarningIcon, warningText } = result.current; + expect(showSpaceWarningIcon).toBeFalsy(); + expect(warningText).toBeTruthy(); + }); + it('should return the tooltipIconText', () => { + const { result } = renderHook(() => + useValueWithSpaceWarning({ value: ' space before', tooltipIconText: 'Warning Text' }) + ); + + const { showSpaceWarningIcon, warningText } = result.current; + expect(showSpaceWarningIcon).toBeTruthy(); + expect(warningText).toEqual('Warning Text'); + }); +}); diff --git a/packages/kbn-securitysolution-exception-list-components/src/value_with_space_warning/use_value_with_space_warning.ts b/packages/kbn-securitysolution-exception-list-components/src/value_with_space_warning/use_value_with_space_warning.ts new file mode 100644 index 0000000000000..bf407d2798c78 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/value_with_space_warning/use_value_with_space_warning.ts @@ -0,0 +1,32 @@ +/* + * 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. + */ + +import { paramContainsSpace, autoCompletei18n } from '@kbn/securitysolution-autocomplete'; + +interface UseValueWithSpaceWarningResult { + showSpaceWarningIcon: boolean; + warningText: string; +} +interface UseValueWithSpaceWarningProps { + value: string | string[]; + tooltipIconText?: string; +} + +export const useValueWithSpaceWarning = ({ + value, + tooltipIconText, +}: UseValueWithSpaceWarningProps): UseValueWithSpaceWarningResult => { + const showSpaceWarningIcon = Array.isArray(value) + ? value.find(paramContainsSpace) + : paramContainsSpace(value); + + return { + showSpaceWarningIcon: !!showSpaceWarningIcon, + warningText: tooltipIconText || autoCompletei18n.FIELD_SPACE_WARNING, + }; +}; diff --git a/packages/kbn-securitysolution-exception-list-components/src/value_with_space_warning/value_with_space_warning.test.tsx b/packages/kbn-securitysolution-exception-list-components/src/value_with_space_warning/value_with_space_warning.test.tsx new file mode 100644 index 0000000000000..e19a54be48aa4 --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/value_with_space_warning/value_with_space_warning.test.tsx @@ -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 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 React from 'react'; +import { fireEvent, render } from '@testing-library/react'; + +import { ValueWithSpaceWarning } from '.'; + +import * as useValueWithSpaceWarningMock from './use_value_with_space_warning'; + +jest.mock('./use_value_with_space_warning'); + +describe('ValueWithSpaceWarning', () => { + beforeEach(() => { + // @ts-ignore + useValueWithSpaceWarningMock.useValueWithSpaceWarning = jest + .fn() + .mockReturnValue({ showSpaceWarningIcon: true, warningText: 'Warning Text' }); + }); + it('should not render if value is falsy', () => { + const container = render(); + expect(container.queryByTestId('valueWithSpaceWarningTooltip')).toBeFalsy(); + }); + it('should not render if showSpaceWarning is falsy', () => { + // @ts-ignore + useValueWithSpaceWarningMock.useValueWithSpaceWarning = jest + .fn() + .mockReturnValue({ showSpaceWarningIcon: false, warningText: '' }); + + const container = render(); + expect(container.queryByTestId('valueWithSpaceWarningTooltip')).toBeFalsy(); + }); + it('should render if showSpaceWarning is truthy', () => { + const container = render(); + expect(container.getByTestId('valueWithSpaceWarningTooltip')).toBeInTheDocument(); + }); + it('should show the tooltip when the icon is clicked', async () => { + const container = render(); + + fireEvent.mouseOver(container.getByTestId('valueWithSpaceWarningTooltip')); + expect(await container.findByText('Warning Text')).toBeInTheDocument(); + }); +}); diff --git a/packages/kbn-securitysolution-exception-list-components/src/value_with_space_warning/value_with_space_warning.tsx b/packages/kbn-securitysolution-exception-list-components/src/value_with_space_warning/value_with_space_warning.tsx new file mode 100644 index 0000000000000..9cff0649efb9e --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/src/value_with_space_warning/value_with_space_warning.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 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 React from 'react'; +import type { FC } from 'react'; +import { css } from '@emotion/css'; +import { euiThemeVars } from '@kbn/ui-theme'; + +import { EuiIcon, EuiToolTip } from '@elastic/eui'; +import { useValueWithSpaceWarning } from './use_value_with_space_warning'; + +interface ValueWithSpaceWarningProps { + value: string[] | string; + tooltipIconType?: string; + tooltipIconText?: string; +} +const containerCss = css` + display: inline; + margin-left: ${euiThemeVars.euiSizeXS}; +`; +export const ValueWithSpaceWarning: FC = ({ + value, + tooltipIconType = 'iInCircle', + tooltipIconText, +}) => { + const { showSpaceWarningIcon, warningText } = useValueWithSpaceWarning({ + value, + tooltipIconText, + }); + if (!showSpaceWarningIcon || !value) return null; + return ( +
    + + + +
    + ); +}; diff --git a/packages/kbn-securitysolution-exception-list-components/tsconfig.json b/packages/kbn-securitysolution-exception-list-components/tsconfig.json new file mode 100644 index 0000000000000..412652e0a8f9d --- /dev/null +++ b/packages/kbn-securitysolution-exception-list-components/tsconfig.json @@ -0,0 +1,21 @@ +{ + "extends": "../../tsconfig.bazel.json", + "compilerOptions": { + "declaration": true, + "declarationMap": true, + "emitDeclarationOnly": true, + "outDir": "target_types", + "stripInternal": false, + "types": [ + "jest", + "node", + "react", + "@emotion/react/types/css-prop" + ] + }, + "include": [ + "**/*.ts", + "**/*.tsx", + "**/*.d.ts" + ] +} diff --git a/x-pack/plugins/security_solution/public/jest.config.js b/x-pack/plugins/security_solution/public/jest.config.js index 5eb349b2c16e9..afa3e1b47efd4 100644 --- a/x-pack/plugins/security_solution/public/jest.config.js +++ b/x-pack/plugins/security_solution/public/jest.config.js @@ -14,7 +14,17 @@ module.exports = { coverageDirectory: '/target/kibana-coverage/jest/x-pack/plugins/security_solution/public', coverageReporters: ['text', 'html'], - collectCoverageFrom: ['/x-pack/plugins/security_solution/public/**/*.{ts,tsx}'], + collectCoverageFrom: [ + '/x-pack/plugins/security_solution/public/**/*.{ts,tsx}', + '!/x-pack/plugins/security_solution/public/*.test.{ts,tsx}', + '!/x-pack/plugins/security_solution/public/{__test__,__snapshots__,__examples__,*mock*,tests,test_helpers,integration_tests,types}/**/*', + '!/x-pack/plugins/security_solution/public/*mock*.{ts,tsx}', + '!/x-pack/plugins/security_solution/public/*.test.{ts,tsx}', + '!/x-pack/plugins/security_solution/public/*.d.ts', + '!/x-pack/plugins/security_solution/public/*.config.ts', + '!/x-pack/plugins/security_solution/public/index.{js,ts,tsx}', + ], + // See: https://github.com/elastic/kibana/issues/117255, the moduleNameMapper creates mocks to avoid memory leaks from kibana core. moduleNameMapper: { 'core/server$': '/x-pack/plugins/security_solution/server/__mocks__/core.mock.ts', diff --git a/yarn.lock b/yarn.lock index 085f55146d4ed..4996c786772dd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3566,6 +3566,10 @@ version "0.0.0" uid "" +"@kbn/securitysolution-exception-list-components@link:bazel-bin/packages/kbn-securitysolution-exception-list-components": + version "0.0.0" + uid "" + "@kbn/securitysolution-hook-utils@link:bazel-bin/packages/kbn-securitysolution-hook-utils": version "0.0.0" uid "" @@ -7683,6 +7687,10 @@ version "0.0.0" uid "" +"@types/kbn__securitysolution-exception-list-components@link:bazel-bin/packages/kbn-securitysolution-exception-list-components/npm_module_types": + version "0.0.0" + uid "" + "@types/kbn__securitysolution-hook-utils@link:bazel-bin/packages/kbn-securitysolution-hook-utils/npm_module_types": version "0.0.0" uid "" From 8c855d9fc286489921a058ce0999a5673ba47e04 Mon Sep 17 00:00:00 2001 From: Rickyanto Ang Date: Wed, 28 Sep 2022 11:44:26 -0700 Subject: [PATCH 57/95] [8.5][Session View][Test] Added Unit test for Beta tag removal+ Price tier changes (#141874) * added test case for timeline-body-actions * added test for action button count * [CI] Auto-commit changed files from 'node scripts/eslint --no-cache --fix' Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com> --- .../events_tab/events_query_tab_body.test.tsx | 44 +++++++++++ .../components/sessions_viewer/index.test.tsx | 57 ++++++++++++++ .../timeline/body/actions/index.test.tsx | 76 ++++++++++++++++++- 3 files changed, 176 insertions(+), 1 deletion(-) diff --git a/x-pack/plugins/security_solution/public/common/components/events_tab/events_query_tab_body.test.tsx b/x-pack/plugins/security_solution/public/common/components/events_tab/events_query_tab_body.test.tsx index 2058cd4a7c614..0b13363a653a0 100644 --- a/x-pack/plugins/security_solution/public/common/components/events_tab/events_query_tab_body.test.tsx +++ b/x-pack/plugins/security_solution/public/common/components/events_tab/events_query_tab_body.test.tsx @@ -14,6 +14,12 @@ import type { EventsQueryTabBodyComponentProps } from './events_query_tab_body'; import { EventsQueryTabBody, ALERTS_EVENTS_HISTOGRAM_ID } from './events_query_tab_body'; import { useGlobalFullScreen } from '../../containers/use_full_screen'; import * as tGridActions from '@kbn/timelines-plugin/public/store/t_grid/actions'; +import { licenseService } from '../../hooks/use_license'; + +const mockGetDefaultControlColumn = jest.fn(); +jest.mock('../../../timelines/components/timeline/body/control_columns', () => ({ + getDefaultControlColumn: (props: number) => mockGetDefaultControlColumn(props), +})); jest.mock('../../lib/kibana', () => { const original = jest.requireActual('../../lib/kibana'); @@ -47,6 +53,19 @@ jest.mock('../../containers/use_full_screen', () => ({ }), })); +jest.mock('../../hooks/use_license', () => { + const licenseServiceInstance = { + isPlatinumPlus: jest.fn(), + isEnterprise: jest.fn(() => false), + }; + return { + licenseService: licenseServiceInstance, + useLicense: () => { + return licenseServiceInstance; + }, + }; +}); + describe('EventsQueryTabBody', () => { const commonProps: EventsQueryTabBodyComponentProps = { indexNames: ['test-index'], @@ -69,6 +88,7 @@ describe('EventsQueryTabBody', () => { ); expect(queryByText('MockedStatefulEventsViewer')).toBeInTheDocument(); + expect(mockGetDefaultControlColumn).toHaveBeenCalledWith(4); }); it('renders the matrix histogram when globalFullScreen is false', () => { @@ -147,4 +167,28 @@ describe('EventsQueryTabBody', () => { expect(spy).toHaveBeenCalled(); }); + + it('only have 4 columns on Action bar for non-Enterprise user', () => { + render( + + + + ); + + expect(mockGetDefaultControlColumn).toHaveBeenCalledWith(4); + }); + + it('shows 5 columns on Action bar for Enterprise user', () => { + const licenseServiceMock = licenseService as jest.Mocked; + + licenseServiceMock.isEnterprise.mockReturnValue(true); + + render( + + + + ); + + expect(mockGetDefaultControlColumn).toHaveBeenCalledWith(5); + }); }); diff --git a/x-pack/plugins/security_solution/public/common/components/sessions_viewer/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/sessions_viewer/index.test.tsx index a89a618972326..47a1bc4fa6514 100644 --- a/x-pack/plugins/security_solution/public/common/components/sessions_viewer/index.test.tsx +++ b/x-pack/plugins/security_solution/public/common/components/sessions_viewer/index.test.tsx @@ -14,6 +14,7 @@ import { TimelineId } from '@kbn/timelines-plugin/common'; import type { SessionsComponentsProps } from './types'; import type { TimelineModel } from '../../../timelines/store/timeline/model'; import { useGetUserCasesPermissions } from '../../lib/kibana'; +import { licenseService } from '../../hooks/use_license'; jest.mock('../../lib/kibana'); @@ -47,10 +48,28 @@ type Props = Partial & { entityType: EntityType; }; +const mockGetDefaultControlColumn = jest.fn(); +jest.mock('../../../timelines/components/timeline/body/control_columns', () => ({ + getDefaultControlColumn: (props: number) => mockGetDefaultControlColumn(props), +})); + const TEST_PREFIX = 'security_solution:sessions_viewer:sessions_view'; const callFilters = jest.fn(); +jest.mock('../../hooks/use_license', () => { + const licenseServiceInstance = { + isPlatinumPlus: jest.fn(), + isEnterprise: jest.fn(() => false), + }; + return { + licenseService: licenseServiceInstance, + useLicense: () => { + return licenseServiceInstance; + }, + }; +}); + // creating a dummy component for testing TGrid to avoid mocking all the implementation details // but still test if the TGrid will render properly const SessionsViewerTGrid: React.FC = ({ columns, start, end, id, filters, entityType }) => { @@ -144,4 +163,42 @@ describe('SessionsView', () => { ]); }); }); + it('Action tab should have 4 columns for non Enterprise users', async () => { + render( + + + + ); + + await waitFor(() => { + expect(mockGetDefaultControlColumn).toHaveBeenCalledWith(4); + }); + }); + + it('Action tab should have 5 columns for Enterprise or above users', async () => { + const licenseServiceMock = licenseService as jest.Mocked; + + licenseServiceMock.isEnterprise.mockReturnValue(true); + render( + + + + ); + + await waitFor(() => { + expect(mockGetDefaultControlColumn).toHaveBeenCalledWith(5); + }); + }); + + it('Action tab should have 5 columns when accessed via K8S dahsboard', async () => { + render( + + + + ); + + await waitFor(() => { + expect(mockGetDefaultControlColumn).toHaveBeenCalledWith(5); + }); + }); }); diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.test.tsx index 004850ede7d88..7bc64b9900640 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.test.tsx +++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.test.tsx @@ -7,12 +7,13 @@ import { mount } from 'enzyme'; import React from 'react'; - +import { TimelineId } from '../../../../../../common/types/timeline'; import { TestProviders, mockTimelineModel, mockTimelineData } from '../../../../../common/mock'; import { Actions, isAlert } from '.'; import { useIsExperimentalFeatureEnabled } from '../../../../../common/hooks/use_experimental_features'; import { mockCasesContract } from '@kbn/cases-plugin/public/mocks'; import { useShallowEqualSelector } from '../../../../../common/hooks/use_selector'; +import { licenseService } from '../../../../../common/hooks/use_license'; jest.mock('../../../../../detections/components/user_info', () => ({ useUserData: jest.fn().mockReturnValue([{ canUserCRUD: true, hasIndexWrite: true }]), @@ -63,6 +64,19 @@ jest.mock('../../../../../common/lib/kibana', () => { }; }); +jest.mock('../../../../../common/hooks/use_license', () => { + const licenseServiceInstance = { + isPlatinumPlus: jest.fn(), + isEnterprise: jest.fn(() => false), + }; + return { + licenseService: licenseServiceInstance, + useLicense: () => { + return licenseServiceInstance; + }, + }; +}); + const defaultProps = { ariaRowindex: 2, checked: false, @@ -122,6 +136,7 @@ describe('Actions', () => { expect(wrapper.find('[data-test-subj="select-event"]').exists()).toBe(false); }); + describe('Alert context menu enabled?', () => { test('it disables for eventType=raw', () => { const wrapper = mount( @@ -225,6 +240,65 @@ describe('Actions', () => { expect(wrapper.find('[data-test-subj="view-in-analyzer"]').exists()).toBe(false); }); + + test('it should not show session view button on action tabs for basic users', () => { + const ecsData = { + ...mockTimelineData[0].ecs, + event: { kind: ['alert'] }, + agent: { type: ['endpoint'] }, + process: { entry_leader: { entity_id: ['test_id'] } }, + }; + + const wrapper = mount( + + + + ); + + expect(wrapper.find('[data-test-subj="session-view-button"]').exists()).toEqual(false); + }); + + test('it should show session view button on action tabs when user access the session viewer via K8S dashboard', () => { + const ecsData = { + ...mockTimelineData[0].ecs, + event: { kind: ['alert'] }, + agent: { type: ['endpoint'] }, + process: { entry_leader: { entity_id: ['test_id'] } }, + }; + + const wrapper = mount( + + + + ); + + expect(wrapper.find('[data-test-subj="session-view-button"]').exists()).toEqual(true); + }); + + test('it should show session view button on action tabs for enterprise users', () => { + const licenseServiceMock = licenseService as jest.Mocked; + + licenseServiceMock.isEnterprise.mockReturnValue(true); + + const ecsData = { + ...mockTimelineData[0].ecs, + event: { kind: ['alert'] }, + agent: { type: ['endpoint'] }, + process: { entry_leader: { entity_id: ['test_id'] } }, + }; + + const wrapper = mount( + + + + ); + + expect(wrapper.find('[data-test-subj="session-view-button"]').exists()).toEqual(true); + }); }); describe('isAlert', () => { From aff59ee0161c5ade3033afdf69a5ac57c5ed4e4b Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Wed, 28 Sep 2022 20:50:55 +0200 Subject: [PATCH 58/95] Add infrastructure category (#142115) --- src/plugins/custom_integrations/common/index.ts | 1 + x-pack/plugins/fleet/common/types/models/package_spec.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/src/plugins/custom_integrations/common/index.ts b/src/plugins/custom_integrations/common/index.ts index a3ab30a526ca6..e52a5deac59e5 100755 --- a/src/plugins/custom_integrations/common/index.ts +++ b/src/plugins/custom_integrations/common/index.ts @@ -23,6 +23,7 @@ export const INTEGRATION_CATEGORY_DISPLAY = { datastore: 'Datastore', elastic_stack: 'Elastic Stack', google_cloud: 'Google Cloud', + infrastructure: 'Infrastructure', kubernetes: 'Kubernetes', languages: 'Languages', message_queue: 'Message queue', diff --git a/x-pack/plugins/fleet/common/types/models/package_spec.ts b/x-pack/plugins/fleet/common/types/models/package_spec.ts index 4463bb81097e2..52f993499ea4e 100644 --- a/x-pack/plugins/fleet/common/types/models/package_spec.ts +++ b/x-pack/plugins/fleet/common/types/models/package_spec.ts @@ -42,6 +42,7 @@ export type PackageSpecCategory = | 'datastore' | 'elastic_stack' | 'google_cloud' + | 'infrastructure' | 'kubernetes' | 'languages' | 'message_queue' From 1717d61a76134b50df31dba437c4142310b70ab9 Mon Sep 17 00:00:00 2001 From: Julia Bardi <90178898+juliaElastic@users.noreply.github.com> Date: Wed, 28 Sep 2022 20:51:14 +0200 Subject: [PATCH 59/95] [Fleet] moved Agent activity and Add agent buttons to a new row above search bar (#142046) * moved Agent activity and Add agent buttons to a new row above search bar * moved show bulk action button visibility logic one level up --- .../components/bulk_actions.tsx | 59 ++++----- ...est.tsx => search_and_filter_bar.test.tsx} | 53 ++++++-- .../components/search_and_filter_bar.tsx | 121 +++++++++--------- 3 files changed, 132 insertions(+), 101 deletions(-) rename x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/{bulk_actions.test.tsx => search_and_filter_bar.test.tsx} (67%) diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/bulk_actions.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/bulk_actions.tsx index 10ced1a5c0323..356753a0d0045 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/bulk_actions.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/bulk_actions.tsx @@ -6,7 +6,6 @@ */ import React, { useMemo, useState } from 'react'; -import styled from 'styled-components'; import { EuiFlexGroup, EuiFlexItem, @@ -32,9 +31,6 @@ import { getCommonTags } from '../utils'; import type { SelectionMode } from './types'; import { TagsAddRemove } from './tags_add_remove'; -const FlexItem = styled(EuiFlexItem)` - height: ${(props) => props.theme.eui.euiSizeL}; -`; export interface Props { totalAgents: number; totalInactiveAgents: number; @@ -233,38 +229,31 @@ export const AgentBulkActions: React.FunctionComponent = ({ /> )} - {(selectionMode === 'manual' && selectedAgents.length) || - (selectionMode === 'query' && totalAgents > 0) ? ( - <> - - - - - } - isOpen={isMenuOpen} - closePopover={closeMenu} - panelPaddingSize="none" - anchorPosition="downLeft" + + - - - - - ) : ( - - )} + + + } + isOpen={isMenuOpen} + closePopover={closeMenu} + panelPaddingSize="none" + anchorPosition="downLeft" + > + + + ); diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/bulk_actions.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.test.tsx similarity index 67% rename from x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/bulk_actions.test.tsx rename to x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.test.tsx index 71e673fd30e19..33fd16419a1bd 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/bulk_actions.test.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.test.tsx @@ -20,8 +20,7 @@ import { FleetStatusProvider, ConfigContext, KibanaVersionContext } from '../../ import { getMockTheme } from '../../../../../../mocks'; -import { AgentBulkActions } from './bulk_actions'; -import type { Props } from './bulk_actions'; +import { SearchAndFilterBar } from './search_and_filter_bar'; const mockTheme = getMockTheme({ eui: { @@ -29,13 +28,19 @@ const mockTheme = getMockTheme({ }, }); -const TestComponent = (props: Props) => ( +jest.mock('../../../../components', () => { + return { + SearchBar: () =>
    , + }; +}); + +const TestComponent = (props: any) => ( - + @@ -43,10 +48,10 @@ const TestComponent = (props: Props) => ( ); -describe('AgentBulkActions', () => { +describe('SearchAndFilterBar', () => { it('should show no Actions button when no agent is selected', async () => { const selectedAgents: Agent[] = []; - const props: Props = { + const props: any = { totalAgents: 10, totalInactiveAgents: 2, selectionMode: 'manual', @@ -54,8 +59,12 @@ describe('AgentBulkActions', () => { selectedAgents, refreshAgents: () => undefined, visibleAgents: [], - allTags: [], + tags: [], agentPolicies: [], + selectedStatus: [], + selectedTags: [], + selectedAgentPolicies: [], + showAgentActivityTour: {}, }; const testBed = registerTestBed(TestComponent)(props); const { exists } = testBed; @@ -76,7 +85,7 @@ describe('AgentBulkActions', () => { local_metadata: {}, }, ]; - const props: Props = { + const props: any = { totalAgents: 10, totalInactiveAgents: 2, selectionMode: 'manual', @@ -84,8 +93,34 @@ describe('AgentBulkActions', () => { selectedAgents, refreshAgents: () => undefined, visibleAgents: [], - allTags: [], + tags: [], + agentPolicies: [], + selectedStatus: [], + selectedTags: [], + selectedAgentPolicies: [], + showAgentActivityTour: {}, + }; + const testBed = registerTestBed(TestComponent)(props); + const { exists } = testBed; + + expect(exists('agentBulkActionsButton')).not.toBeNull(); + }); + + it('should show an Actions button when agents selected in query mode', async () => { + const props: any = { + totalAgents: 10, + totalInactiveAgents: 2, + selectionMode: 'query', + currentQuery: '', + selectedAgents: [], + refreshAgents: () => undefined, + visibleAgents: [], + tags: [], agentPolicies: [], + selectedStatus: [], + selectedTags: [], + selectedAgentPolicies: [], + showAgentActivityTour: {}, }; const testBed = registerTestBed(TestComponent)(props); const { exists } = testBed; diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.tsx index e90e1ae713227..9b16136df2d96 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.tsx @@ -69,6 +69,10 @@ const ClearAllTagsFilterItem = styled(EuiFilterSelectItem)` padding: ${(props) => props.theme.eui.euiSizeS}; `; +const FlexEndEuiFlexItem = styled(EuiFlexItem)` + align-self: flex-end; +`; + export const SearchAndFilterBar: React.FunctionComponent<{ agentPolicies: AgentPolicy[]; draftKuery: string; @@ -151,7 +155,51 @@ export const SearchAndFilterBar: React.FunctionComponent<{ return ( <> {/* Search and filter bar */} - + + + + + + + + + } + > + + + + + + + + } + > + + + + + + + @@ -328,63 +376,22 @@ export const SearchAndFilterBar: React.FunctionComponent<{ - {selectedAgents.length === 0 && ( - - - } - > - - - - + {(selectionMode === 'manual' && selectedAgents.length) || + (selectionMode === 'query' && totalAgents > 0) ? ( + + - )} - - - - {selectedAgents.length === 0 && ( - - - } - > - - - - - - )} - - - + ) : null} From 2d44c3597864288390951704f9beddd7212c199e Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Wed, 28 Sep 2022 20:09:50 +0100 Subject: [PATCH 60/95] skip flaky suite (#107034) --- test/plugin_functional/test_suites/telemetry/telemetry.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/plugin_functional/test_suites/telemetry/telemetry.ts b/test/plugin_functional/test_suites/telemetry/telemetry.ts index 3b087c2705c10..1c68abd5426d3 100644 --- a/test/plugin_functional/test_suites/telemetry/telemetry.ts +++ b/test/plugin_functional/test_suites/telemetry/telemetry.ts @@ -14,7 +14,8 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide const browser = getService('browser'); const PageObjects = getPageObjects(['common']); - describe('Telemetry service', () => { + // FLAKY: https://github.com/elastic/kibana/issues/107034 + describe.skip('Telemetry service', () => { const checkCanSendTelemetry = (): Promise => { return browser.executeAsync((cb) => { (window as unknown as Record Promise>) From 0e6d079bfe058fa6e02eb29ec195957f1896e595 Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Wed, 28 Sep 2022 20:12:29 +0100 Subject: [PATCH 61/95] skip flaky suite (#140546) --- .../test/security_solution_endpoint/apps/endpoint/responder.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/responder.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/responder.ts index 9caf231089860..ddcbbc6251fdf 100644 --- a/x-pack/test/security_solution_endpoint/apps/endpoint/responder.ts +++ b/x-pack/test/security_solution_endpoint/apps/endpoint/responder.ts @@ -116,7 +116,8 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { }); }); - describe('from timeline', () => { + // FLAKY: https://github.com/elastic/kibana/issues/140546 + describe.skip('from timeline', () => { let timeline: TimelineResponse; before(async () => { From f5b6a2c43ba88232b9789b96d562b230a3ebc362 Mon Sep 17 00:00:00 2001 From: Devon Thomson Date: Wed, 28 Sep 2022 15:16:51 -0400 Subject: [PATCH 62/95] [Portable Dashboards] Remove Saved Object Class (#138774) * Removed dashboard saved object class, replaced with dashboard saved object service --- .../public/services/plugin_services.stub.ts | 11 +- .../public/services/plugin_services.ts | 11 +- .../embeddable/embeddable_references.test.ts | 76 ----- .../embeddable/embeddable_references.ts | 69 ---- .../dashboard/common/embeddable/types.ts | 16 - src/plugins/dashboard/common/index.ts | 32 +- .../dashboard_panel_converters.test.ts} | 2 +- .../dashboard_panel_converters.ts} | 16 +- .../dashboard_container_references.test.ts} | 2 +- .../dashboard_container_references.ts} | 0 ...dashboard_saved_object_references.test.ts} | 4 +- .../dashboard_saved_object_references.ts} | 108 +++--- src/plugins/dashboard/common/types.ts | 138 ++++---- .../actions/add_to_library_action.test.tsx | 2 +- .../actions/add_to_library_action.tsx | 3 +- .../actions/clone_panel_action.test.tsx | 2 +- .../actions/clone_panel_action.tsx | 5 +- .../actions/copy_to_dashboard_action.tsx | 3 +- .../actions/copy_to_dashboard_modal.tsx | 4 +- .../actions/expand_panel_action.tsx | 4 +- .../filters_notification_badge.test.tsx | 21 +- .../public/application/actions/index.ts | 93 +++-- .../library_notification_action.test.tsx | 11 +- .../actions/library_notification_action.tsx | 6 +- .../actions/library_notification_popover.tsx | 4 +- .../actions/replace_panel_action.tsx | 3 +- .../unlink_from_library_action.test.tsx | 4 +- .../actions/unlink_from_library_action.tsx | 3 +- .../public/application/dashboard_app.tsx | 30 +- .../public/application/dashboard_router.tsx | 111 +++--- .../embeddable/dashboard_constants.ts | 13 - .../embeddable/dashboard_container.tsx | 2 +- .../dashboard_container_factory.tsx | 16 +- .../embeddable/grid/dashboard_grid.tsx | 6 +- .../public/application/embeddable/index.ts | 7 - .../panel/create_panel_state.test.ts | 2 +- .../embeddable/panel/create_panel_state.ts | 2 +- .../panel/dashboard_panel_placement.ts | 4 +- .../embeddable/placeholder/index.ts | 5 +- .../placeholder/placeholder_embeddable.tsx | 4 +- .../placeholder_embeddable_factory.ts | 3 +- .../hooks/use_dashboard_app_state.test.tsx | 126 +++---- .../hooks/use_dashboard_app_state.ts | 169 ++++------ .../lib/build_dashboard_container.ts | 8 +- .../lib/convert_dashboard_panels.ts | 32 -- .../lib/convert_dashboard_state.ts | 69 +--- .../lib/dashboard_control_group.ts | 32 +- ... => dashboard_session_restoration.test.ts} | 9 +- .../lib/dashboard_session_restoration.ts | 15 +- .../application/lib/dashboard_tagging.ts | 31 -- .../application/lib/diff_dashboard_state.ts | 71 +++- .../public/application/lib/filter_utils.ts | 23 +- .../dashboard/public/application/lib/index.ts | 32 +- .../lib/load_dashboard_by_title.ts | 31 -- .../load_dashboard_history_location_state.ts | 4 +- .../lib/load_saved_dashboard_state.ts | 74 ---- .../application/lib/migrate_app_state.test.ts | 164 --------- .../application/lib/migrate_app_state.ts | 87 ----- .../public/application/lib/save_dashboard.ts | 120 ------- .../lib/sync_dashboard_container_input.ts | 14 +- .../lib/sync_dashboard_filter_state.ts | 52 +-- .../lib/sync_dashboard_url_state.ts | 46 ++- .../public/application/lib/url.test.ts | 35 -- .../dashboard/public/application/lib/url.ts | 24 -- .../listing/dashboard_listing.test.tsx | 121 +++---- .../application/listing/dashboard_listing.tsx | 81 +++-- .../dashboard_unsaved_listing.test.tsx | 89 ++--- .../listing/dashboard_unsaved_listing.tsx | 49 ++- .../state/dashboard_state_slice.ts | 13 +- .../test_helpers/get_saved_dashboard_mock.ts | 36 -- .../public/application/test_helpers/index.ts | 2 - .../test_helpers/make_default_services.ts | 48 --- .../application/top_nav/dashboard_top_nav.tsx | 240 +++++++------ .../top_nav/show_share_modal.test.tsx | 8 +- .../application/top_nav/show_share_modal.tsx | 31 +- .../dashboard/public/dashboard_constants.ts | 35 ++ .../dashboard/public/dashboard_strings.ts | 16 +- src/plugins/dashboard/public/index.ts | 7 +- src/plugins/dashboard/public/locator.ts | 2 +- src/plugins/dashboard/public/plugin.tsx | 129 ++----- .../saved_dashboards/saved_dashboard.ts | 200 ----------- .../saved_dashboards/saved_dashboards.ts | 36 -- .../dashboard_saved_object.stub.ts | 77 +++++ .../dashboard_saved_object_service.ts | 62 ++++ .../check_for_duplicate_dashboard_title.ts | 62 ++++ .../lib/find_dashboard_saved_objects.ts | 93 +++++ .../load_dashboard_state_from_saved_object.ts | 201 +++++++++++ .../save_dashboard_state_to_saved_object.ts | 182 ++++++++++ .../services/dashboard_saved_object/types.ts | 63 ++++ .../services/embeddable/embeddable.stub.ts | 6 +- .../services/embeddable/embeddable_service.ts | 23 +- .../public/services/embeddable/types.ts | 17 +- .../public/services/plugin_services.stub.ts | 4 +- .../public/services/plugin_services.ts | 22 +- .../public/services/saved_object_loader.ts | 180 ---------- .../saved_objects/saved_objects.stub.ts | 21 -- .../saved_objects/saved_objects_service.ts | 26 -- .../public/services/saved_objects/types.ts | 13 - .../saved_objects_tagging.stub.ts | 5 +- .../saved_objects_tagging_service.ts | 12 +- .../services/saved_objects_tagging/types.ts | 5 +- .../dashboard/public/services/types.ts | 7 +- src/plugins/dashboard/public/types.ts | 30 +- .../dashboard_container_embeddable_factory.ts | 5 +- .../saved_objects/dashboard_migrations.ts | 318 ------------------ ...dashboard.ts => dashboard_saved_object.ts} | 2 +- .../dashboard/server/saved_objects/index.ts | 2 +- .../server/saved_objects/is_dashboard_doc.ts | 37 -- ...dashboard_saved_object_migrations.test.ts} | 14 +- .../dashboard_saved_object_migrations.ts | 48 +++ .../migrate_by_value_dashboard_panels.ts | 97 ++++++ .../migrate_extract_panel_references.ts | 56 +++ .../migrations/migrate_hidden_titles.ts | 65 ++++ .../migrate_index_pattern_reference.test.ts} | 2 +- .../migrate_index_pattern_reference.ts} | 0 .../migrate_match_all_query.test.ts | 0 .../migrate_match_all_query.ts | 2 +- .../migrations/migrate_to_730}/index.ts | 5 +- .../migrate_to_730_panels.test.ts | 7 +- .../migrate_to_730}/migrate_to_730_panels.ts | 21 +- .../migrate_to_730/migrations_700.ts | 90 +++++ .../migrate_to_730}/migrations_730.test.ts | 13 +- .../migrate_to_730}/migrations_730.ts | 35 +- .../move_filters_to_query.test.ts | 0 .../migrate_to_730}/move_filters_to_query.ts | 0 .../migrations/migrate_to_730/readme.md | 3 + .../migrations/migrate_to_730/types.ts | 182 ++++++++++ .../server/usage/dashboard_telemetry.test.ts | 12 +- .../server/usage/dashboard_telemetry.ts | 4 +- .../dashboard_telemetry_collection_task.ts | 13 +- .../usage/find_by_value_embeddables.test.ts | 8 +- .../server/usage/find_by_value_embeddables.ts | 4 +- .../apps/dashboard/group3/bwc_shared_urls.ts | 33 +- .../apps/dashboard/group3/dashboard_state.ts | 2 +- .../apps/dashboard/group4/dashboard_empty.ts | 2 +- .../functional/page_objects/dashboard_page.ts | 26 ++ .../add_swimlane_to_dashboard_controls.tsx | 4 +- .../use_dashboards_table.tsx | 4 +- .../application/services/dashboard_service.ts | 5 +- .../translations/translations/fr-FR.json | 1 - .../translations/translations/ja-JP.json | 1 - .../translations/translations/zh-CN.json | 1 - .../feature_controls/dashboard_security.ts | 155 +++------ .../feature_controls/dashboard_spaces.ts | 67 ++-- 144 files changed, 2575 insertions(+), 3151 deletions(-) delete mode 100644 src/plugins/dashboard/common/embeddable/embeddable_references.test.ts delete mode 100644 src/plugins/dashboard/common/embeddable/embeddable_references.ts delete mode 100644 src/plugins/dashboard/common/embeddable/types.ts rename src/plugins/dashboard/common/{embeddable/embeddable_saved_object_converters.test.ts => lib/dashboard_panel_converters.test.ts} (98%) rename src/plugins/dashboard/common/{embeddable/embeddable_saved_object_converters.ts => lib/dashboard_panel_converters.ts} (75%) rename src/plugins/dashboard/common/{embeddable/dashboard_container_persistable_state.test.ts => persistable_state/dashboard_container_references.test.ts} (99%) rename src/plugins/dashboard/common/{embeddable/dashboard_container_persistable_state.ts => persistable_state/dashboard_container_references.ts} (100%) rename src/plugins/dashboard/common/{saved_dashboard_references.test.ts => persistable_state/dashboard_saved_object_references.test.ts} (98%) rename src/plugins/dashboard/common/{saved_dashboard_references.ts => persistable_state/dashboard_saved_object_references.ts} (96%) delete mode 100644 src/plugins/dashboard/public/application/embeddable/dashboard_constants.ts delete mode 100644 src/plugins/dashboard/public/application/lib/convert_dashboard_panels.ts rename src/plugins/dashboard/public/application/lib/{session_restoration.test.ts => dashboard_session_restoration.test.ts} (89%) delete mode 100644 src/plugins/dashboard/public/application/lib/dashboard_tagging.ts delete mode 100644 src/plugins/dashboard/public/application/lib/load_dashboard_by_title.ts delete mode 100644 src/plugins/dashboard/public/application/lib/load_saved_dashboard_state.ts delete mode 100644 src/plugins/dashboard/public/application/lib/migrate_app_state.test.ts delete mode 100644 src/plugins/dashboard/public/application/lib/migrate_app_state.ts delete mode 100644 src/plugins/dashboard/public/application/lib/save_dashboard.ts delete mode 100644 src/plugins/dashboard/public/application/lib/url.test.ts delete mode 100644 src/plugins/dashboard/public/application/lib/url.ts delete mode 100644 src/plugins/dashboard/public/application/test_helpers/get_saved_dashboard_mock.ts delete mode 100644 src/plugins/dashboard/public/application/test_helpers/make_default_services.ts delete mode 100644 src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts delete mode 100644 src/plugins/dashboard/public/saved_dashboards/saved_dashboards.ts create mode 100644 src/plugins/dashboard/public/services/dashboard_saved_object/dashboard_saved_object.stub.ts create mode 100644 src/plugins/dashboard/public/services/dashboard_saved_object/dashboard_saved_object_service.ts create mode 100644 src/plugins/dashboard/public/services/dashboard_saved_object/lib/check_for_duplicate_dashboard_title.ts create mode 100644 src/plugins/dashboard/public/services/dashboard_saved_object/lib/find_dashboard_saved_objects.ts create mode 100644 src/plugins/dashboard/public/services/dashboard_saved_object/lib/load_dashboard_state_from_saved_object.ts create mode 100644 src/plugins/dashboard/public/services/dashboard_saved_object/lib/save_dashboard_state_to_saved_object.ts create mode 100644 src/plugins/dashboard/public/services/dashboard_saved_object/types.ts delete mode 100644 src/plugins/dashboard/public/services/saved_object_loader.ts delete mode 100644 src/plugins/dashboard/public/services/saved_objects/saved_objects.stub.ts delete mode 100644 src/plugins/dashboard/public/services/saved_objects/saved_objects_service.ts delete mode 100644 src/plugins/dashboard/public/services/saved_objects/types.ts delete mode 100644 src/plugins/dashboard/server/saved_objects/dashboard_migrations.ts rename src/plugins/dashboard/server/saved_objects/{dashboard.ts => dashboard_saved_object.ts} (97%) delete mode 100644 src/plugins/dashboard/server/saved_objects/is_dashboard_doc.ts rename src/plugins/dashboard/server/saved_objects/{dashboard_migrations.test.ts => migrations/dashboard_saved_object_migrations.test.ts} (99%) create mode 100644 src/plugins/dashboard/server/saved_objects/migrations/dashboard_saved_object_migrations.ts create mode 100644 src/plugins/dashboard/server/saved_objects/migrations/migrate_by_value_dashboard_panels.ts create mode 100644 src/plugins/dashboard/server/saved_objects/migrations/migrate_extract_panel_references.ts create mode 100644 src/plugins/dashboard/server/saved_objects/migrations/migrate_hidden_titles.ts rename src/plugins/dashboard/server/saved_objects/{replace_index_pattern_reference.test.ts => migrations/migrate_index_pattern_reference.test.ts} (94%) rename src/plugins/dashboard/server/saved_objects/{replace_index_pattern_reference.ts => migrations/migrate_index_pattern_reference.ts} (100%) rename src/plugins/dashboard/server/saved_objects/{ => migrations}/migrate_match_all_query.test.ts (100%) rename src/plugins/dashboard/server/saved_objects/{ => migrations}/migrate_match_all_query.ts (100%) rename src/plugins/dashboard/{public/saved_dashboards => server/saved_objects/migrations/migrate_to_730}/index.ts (73%) rename src/plugins/dashboard/{common => server/saved_objects/migrations/migrate_to_730}/migrate_to_730_panels.test.ts (99%) rename src/plugins/dashboard/{common => server/saved_objects/migrations/migrate_to_730}/migrate_to_730_panels.ts (98%) create mode 100644 src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/migrations_700.ts rename src/plugins/dashboard/server/saved_objects/{ => migrations/migrate_to_730}/migrations_730.test.ts (96%) rename src/plugins/dashboard/server/saved_objects/{ => migrations/migrate_to_730}/migrations_730.ts (69%) rename src/plugins/dashboard/server/saved_objects/{ => migrations/migrate_to_730}/move_filters_to_query.test.ts (100%) rename src/plugins/dashboard/server/saved_objects/{ => migrations/migrate_to_730}/move_filters_to_query.ts (100%) create mode 100644 src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/readme.md create mode 100644 src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/types.ts diff --git a/src/plugins/controls/public/services/plugin_services.stub.ts b/src/plugins/controls/public/services/plugin_services.stub.ts index 485891ff6ef94..08be260ce052c 100644 --- a/src/plugins/controls/public/services/plugin_services.stub.ts +++ b/src/plugins/controls/public/services/plugin_services.stub.ts @@ -27,16 +27,15 @@ import { themeServiceFactory } from './theme/theme.story'; import { registry as stubRegistry } from './plugin_services.story'; export const providers: PluginServiceProviders = { - http: new PluginServiceProvider(httpServiceFactory), + controls: new PluginServiceProvider(controlsServiceFactory), data: new PluginServiceProvider(dataServiceFactory), - overlays: new PluginServiceProvider(overlaysServiceFactory), dataViews: new PluginServiceProvider(dataViewsServiceFactory), + http: new PluginServiceProvider(httpServiceFactory), + optionsList: new PluginServiceProvider(optionsListServiceFactory), + overlays: new PluginServiceProvider(overlaysServiceFactory), settings: new PluginServiceProvider(settingsServiceFactory), - unifiedSearch: new PluginServiceProvider(unifiedSearchServiceFactory), theme: new PluginServiceProvider(themeServiceFactory), - - controls: new PluginServiceProvider(controlsServiceFactory), - optionsList: new PluginServiceProvider(optionsListServiceFactory), + unifiedSearch: new PluginServiceProvider(unifiedSearchServiceFactory), }; export const pluginServices = new PluginServices(); diff --git a/src/plugins/controls/public/services/plugin_services.ts b/src/plugins/controls/public/services/plugin_services.ts index 4debd0e8c9eba..f1811063e39a5 100644 --- a/src/plugins/controls/public/services/plugin_services.ts +++ b/src/plugins/controls/public/services/plugin_services.ts @@ -30,16 +30,15 @@ export const providers: PluginServiceProviders< ControlsServices, KibanaPluginServiceParams > = { - http: new PluginServiceProvider(httpServiceFactory), + controls: new PluginServiceProvider(controlsServiceFactory), data: new PluginServiceProvider(dataServiceFactory), - unifiedSearch: new PluginServiceProvider(unifiedSearchServiceFactory), - overlays: new PluginServiceProvider(overlaysServiceFactory), dataViews: new PluginServiceProvider(dataViewsServiceFactory), + http: new PluginServiceProvider(httpServiceFactory), + optionsList: new PluginServiceProvider(optionsListServiceFactory, ['data', 'http']), + overlays: new PluginServiceProvider(overlaysServiceFactory), settings: new PluginServiceProvider(settingsServiceFactory), theme: new PluginServiceProvider(themeServiceFactory), - - optionsList: new PluginServiceProvider(optionsListServiceFactory, ['data', 'http']), - controls: new PluginServiceProvider(controlsServiceFactory), + unifiedSearch: new PluginServiceProvider(unifiedSearchServiceFactory), }; export const pluginServices = new PluginServices(); diff --git a/src/plugins/dashboard/common/embeddable/embeddable_references.test.ts b/src/plugins/dashboard/common/embeddable/embeddable_references.test.ts deleted file mode 100644 index 3a6475b60251c..0000000000000 --- a/src/plugins/dashboard/common/embeddable/embeddable_references.test.ts +++ /dev/null @@ -1,76 +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. - */ - -import { - ExtractDeps, - extractPanelsReferences, - InjectDeps, - injectPanelsReferences, -} from './embeddable_references'; -import { createEmbeddablePersistableStateServiceMock } from '@kbn/embeddable-plugin/common/mocks'; -import { SavedDashboardPanel } from '../types'; -import { EmbeddableStateWithType } from '@kbn/embeddable-plugin/common'; - -const embeddablePersistableStateService = createEmbeddablePersistableStateServiceMock(); -const deps: InjectDeps & ExtractDeps = { - embeddablePersistableStateService, -}; - -test('inject/extract panel references', () => { - embeddablePersistableStateService.extract.mockImplementationOnce((state) => { - const { HARDCODED_ID, ...restOfState } = state as unknown as Record; - return { - state: restOfState as EmbeddableStateWithType, - references: [{ id: HARDCODED_ID as string, name: 'refName', type: 'type' }], - }; - }); - - embeddablePersistableStateService.inject.mockImplementationOnce((state, references) => { - const ref = references.find((r) => r.name === 'refName'); - return { - ...state, - HARDCODED_ID: ref!.id, - }; - }); - - const savedDashboardPanel: SavedDashboardPanel = { - type: 'search', - embeddableConfig: { - HARDCODED_ID: 'IMPORTANT_HARDCODED_ID', - }, - id: 'savedObjectId', - panelIndex: '123', - gridData: { - x: 0, - y: 0, - h: 15, - w: 15, - i: '123', - }, - version: '7.0.0', - }; - - const [{ panel: extractedPanel, references }] = extractPanelsReferences( - [savedDashboardPanel], - deps - ); - expect(extractedPanel.embeddableConfig).toEqual({}); - expect(references).toMatchInlineSnapshot(` - Array [ - Object { - "id": "IMPORTANT_HARDCODED_ID", - "name": "refName", - "type": "type", - }, - ] - `); - - const [injectedPanel] = injectPanelsReferences([extractedPanel], references, deps); - - expect(injectedPanel).toEqual(savedDashboardPanel); -}); diff --git a/src/plugins/dashboard/common/embeddable/embeddable_references.ts b/src/plugins/dashboard/common/embeddable/embeddable_references.ts deleted file mode 100644 index 6664f70d3392a..0000000000000 --- a/src/plugins/dashboard/common/embeddable/embeddable_references.ts +++ /dev/null @@ -1,69 +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. - */ - -import { omit } from 'lodash'; -import { SavedObjectReference } from '@kbn/core/types'; -import { EmbeddablePersistableStateService } from '@kbn/embeddable-plugin/common/types'; -import { - convertSavedDashboardPanelToPanelState, - convertPanelStateToSavedDashboardPanel, -} from './embeddable_saved_object_converters'; -import { SavedDashboardPanel } from '../types'; - -export interface InjectDeps { - embeddablePersistableStateService: EmbeddablePersistableStateService; -} - -export function injectPanelsReferences( - panels: SavedDashboardPanel[], - references: SavedObjectReference[], - deps: InjectDeps -): SavedDashboardPanel[] { - const result: SavedDashboardPanel[] = []; - for (const panel of panels) { - const embeddableState = convertSavedDashboardPanelToPanelState(panel); - embeddableState.explicitInput = omit( - deps.embeddablePersistableStateService.inject( - { ...embeddableState.explicitInput, type: panel.type }, - references - ), - 'type' - ); - result.push(convertPanelStateToSavedDashboardPanel(embeddableState, panel.version)); - } - return result; -} - -export interface ExtractDeps { - embeddablePersistableStateService: EmbeddablePersistableStateService; -} - -export function extractPanelsReferences( - panels: SavedDashboardPanel[], - deps: ExtractDeps -): Array<{ panel: SavedDashboardPanel; references: SavedObjectReference[] }> { - const result: Array<{ panel: SavedDashboardPanel; references: SavedObjectReference[] }> = []; - - for (const panel of panels) { - const embeddable = convertSavedDashboardPanelToPanelState(panel); - const { state: embeddableInputWithExtractedReferences, references } = - deps.embeddablePersistableStateService.extract({ - ...embeddable.explicitInput, - type: embeddable.type, - }); - embeddable.explicitInput = omit(embeddableInputWithExtractedReferences, 'type'); - - const newPanel = convertPanelStateToSavedDashboardPanel(embeddable, panel.version); - result.push({ - panel: newPanel, - references, - }); - } - - return result; -} diff --git a/src/plugins/dashboard/common/embeddable/types.ts b/src/plugins/dashboard/common/embeddable/types.ts deleted file mode 100644 index d786078766f78..0000000000000 --- a/src/plugins/dashboard/common/embeddable/types.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 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. - */ - -// eslint-disable-next-line @typescript-eslint/consistent-type-definitions -export type GridData = { - w: number; - h: number; - x: number; - y: number; - i: string; -}; diff --git a/src/plugins/dashboard/common/index.ts b/src/plugins/dashboard/common/index.ts index 73e01693977d9..81833f8a8f18e 100644 --- a/src/plugins/dashboard/common/index.ts +++ b/src/plugins/dashboard/common/index.ts @@ -6,24 +6,28 @@ * Side Public License, v 1. */ -export type { GridData } from './embeddable/types'; -export type { - RawSavedDashboardPanel730ToLatest, - DashboardDoc730ToLatest, - DashboardDoc700To720, - DashboardDocPre700, -} from './bwc/types'; export type { + GridData, + DashboardPanelMap, + SavedDashboardPanel, + DashboardAttributes, + DashboardPanelState, DashboardContainerStateWithType, - SavedDashboardPanelTo60, - SavedDashboardPanel610, - SavedDashboardPanel620, - SavedDashboardPanel630, - SavedDashboardPanel640To720, - SavedDashboardPanel730ToLatest, } from './types'; -export { migratePanelsTo730 } from './migrate_to_730_panels'; +export { + injectReferences, + extractReferences, +} from './persistable_state/dashboard_saved_object_references'; + +export { createInject, createExtract } from './persistable_state/dashboard_container_references'; + +export { + convertPanelStateToSavedDashboardPanel, + convertSavedDashboardPanelToPanelState, + convertSavedPanelsToPanelMap, + convertPanelMapToSavedPanels, +} from './lib/dashboard_panel_converters'; export const UI_SETTINGS = { ENABLE_LABS_UI: 'labs:dashboard:enable_ui', diff --git a/src/plugins/dashboard/common/embeddable/embeddable_saved_object_converters.test.ts b/src/plugins/dashboard/common/lib/dashboard_panel_converters.test.ts similarity index 98% rename from src/plugins/dashboard/common/embeddable/embeddable_saved_object_converters.test.ts rename to src/plugins/dashboard/common/lib/dashboard_panel_converters.test.ts index 9ec93fa85fc54..2ebca116f3f12 100644 --- a/src/plugins/dashboard/common/embeddable/embeddable_saved_object_converters.test.ts +++ b/src/plugins/dashboard/common/lib/dashboard_panel_converters.test.ts @@ -9,7 +9,7 @@ import { convertSavedDashboardPanelToPanelState, convertPanelStateToSavedDashboardPanel, -} from './embeddable_saved_object_converters'; +} from './dashboard_panel_converters'; import { SavedDashboardPanel, DashboardPanelState } from '../types'; import { EmbeddableInput } from '@kbn/embeddable-plugin/common/types'; diff --git a/src/plugins/dashboard/common/embeddable/embeddable_saved_object_converters.ts b/src/plugins/dashboard/common/lib/dashboard_panel_converters.ts similarity index 75% rename from src/plugins/dashboard/common/embeddable/embeddable_saved_object_converters.ts rename to src/plugins/dashboard/common/lib/dashboard_panel_converters.ts index aa9519a5a48b9..2652c7f9a40a7 100644 --- a/src/plugins/dashboard/common/embeddable/embeddable_saved_object_converters.ts +++ b/src/plugins/dashboard/common/lib/dashboard_panel_converters.ts @@ -8,7 +8,7 @@ import { omit } from 'lodash'; import { EmbeddableInput, SavedObjectEmbeddableInput } from '@kbn/embeddable-plugin/common'; -import { DashboardPanelState, SavedDashboardPanel } from '../types'; +import { DashboardPanelMap, DashboardPanelState, SavedDashboardPanel } from '../types'; export function convertSavedDashboardPanelToPanelState< TEmbeddableInput extends EmbeddableInput | SavedObjectEmbeddableInput = SavedObjectEmbeddableInput @@ -42,3 +42,17 @@ export function convertPanelStateToSavedDashboardPanel( ...(panelState.panelRefName !== undefined && { panelRefName: panelState.panelRefName }), }; } + +export const convertSavedPanelsToPanelMap = (panels?: SavedDashboardPanel[]): DashboardPanelMap => { + const panelsMap: DashboardPanelMap = {}; + panels?.forEach((panel, idx) => { + panelsMap![panel.panelIndex ?? String(idx)] = convertSavedDashboardPanelToPanelState(panel); + }); + return panelsMap; +}; + +export const convertPanelMapToSavedPanels = (panels: DashboardPanelMap, version: string) => { + return Object.values(panels).map((panel) => + convertPanelStateToSavedDashboardPanel(panel, version) + ); +}; diff --git a/src/plugins/dashboard/common/embeddable/dashboard_container_persistable_state.test.ts b/src/plugins/dashboard/common/persistable_state/dashboard_container_references.test.ts similarity index 99% rename from src/plugins/dashboard/common/embeddable/dashboard_container_persistable_state.test.ts rename to src/plugins/dashboard/common/persistable_state/dashboard_container_references.test.ts index ee13926486f8b..47215e5e32008 100644 --- a/src/plugins/dashboard/common/embeddable/dashboard_container_persistable_state.test.ts +++ b/src/plugins/dashboard/common/persistable_state/dashboard_container_references.test.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { createExtract, createInject } from './dashboard_container_persistable_state'; +import { createExtract, createInject } from './dashboard_container_references'; import { createEmbeddablePersistableStateServiceMock } from '@kbn/embeddable-plugin/common/mocks'; import { DashboardContainerStateWithType } from '../types'; diff --git a/src/plugins/dashboard/common/embeddable/dashboard_container_persistable_state.ts b/src/plugins/dashboard/common/persistable_state/dashboard_container_references.ts similarity index 100% rename from src/plugins/dashboard/common/embeddable/dashboard_container_persistable_state.ts rename to src/plugins/dashboard/common/persistable_state/dashboard_container_references.ts diff --git a/src/plugins/dashboard/common/saved_dashboard_references.test.ts b/src/plugins/dashboard/common/persistable_state/dashboard_saved_object_references.test.ts similarity index 98% rename from src/plugins/dashboard/common/saved_dashboard_references.test.ts rename to src/plugins/dashboard/common/persistable_state/dashboard_saved_object_references.test.ts index 84bfe6ea48d3a..e28a429d6d004 100644 --- a/src/plugins/dashboard/common/saved_dashboard_references.test.ts +++ b/src/plugins/dashboard/common/persistable_state/dashboard_saved_object_references.test.ts @@ -11,9 +11,9 @@ import { injectReferences, InjectDeps, ExtractDeps, -} from './saved_dashboard_references'; +} from './dashboard_saved_object_references'; -import { createExtract, createInject } from './embeddable/dashboard_container_persistable_state'; +import { createExtract, createInject } from './dashboard_container_references'; import { createEmbeddablePersistableStateServiceMock } from '@kbn/embeddable-plugin/common/mocks'; const embeddablePersistableStateServiceMock = createEmbeddablePersistableStateServiceMock(); diff --git a/src/plugins/dashboard/common/saved_dashboard_references.ts b/src/plugins/dashboard/common/persistable_state/dashboard_saved_object_references.ts similarity index 96% rename from src/plugins/dashboard/common/saved_dashboard_references.ts rename to src/plugins/dashboard/common/persistable_state/dashboard_saved_object_references.ts index e3a3193dd85a1..a3126a381d944 100644 --- a/src/plugins/dashboard/common/saved_dashboard_references.ts +++ b/src/plugins/dashboard/common/persistable_state/dashboard_saved_object_references.ts @@ -6,23 +6,33 @@ * Side Public License, v 1. */ import semverGt from 'semver/functions/gt'; -import { SavedObjectAttributes, SavedObjectReference } from '@kbn/core/types'; -import { EmbeddablePersistableStateService } from '@kbn/embeddable-plugin/common/types'; + import { - PersistableControlGroupInput, RawControlGroupAttributes, + PersistableControlGroupInput, } from '@kbn/controls-plugin/common'; -import { DashboardContainerStateWithType, DashboardPanelState } from './types'; +import { SavedObjectAttributes, SavedObjectReference } from '@kbn/core/types'; +import { EmbeddablePersistableStateService } from '@kbn/embeddable-plugin/common/types'; + +import { + SavedDashboardPanel, + DashboardPanelState, + DashboardContainerStateWithType, +} from '../types'; import { convertPanelStateToSavedDashboardPanel, convertSavedDashboardPanelToPanelState, -} from './embeddable/embeddable_saved_object_converters'; -import { SavedDashboardPanel } from './types'; +} from '../lib/dashboard_panel_converters'; export interface ExtractDeps { embeddablePersistableStateService: EmbeddablePersistableStateService; } -export interface SavedObjectAttributesAndReferences { + +export interface InjectDeps { + embeddablePersistableStateService: EmbeddablePersistableStateService; +} + +interface SavedObjectAttributesAndReferences { attributes: SavedObjectAttributes; references: SavedObjectReference[]; } @@ -79,7 +89,7 @@ function panelStatesToPanels( let originalPanel = originalPanels.find((p) => p.panelIndex === id); if (!originalPanel) { - // Maybe original panel doesn't have a panel index and it's just straight up based on it's index + // Maybe original panel doesn't have a panel index and it's just straight up based on its index const numericId = parseInt(id, 10); originalPanel = isNaN(numericId) ? originalPanel : originalPanels[numericId]; } @@ -91,6 +101,45 @@ function panelStatesToPanels( }); } +export function injectReferences( + { attributes, references = [] }: SavedObjectAttributesAndReferences, + deps: InjectDeps +): SavedObjectAttributes { + // Skip if panelsJSON is missing otherwise this will cause saved object import to fail when + // importing objects without panelsJSON. At development time of this, there is no guarantee each saved + // object has panelsJSON in all previous versions of kibana. + if (typeof attributes.panelsJSON !== 'string') { + return attributes; + } + const parsedPanels = JSON.parse(attributes.panelsJSON); + // Same here, prevent failing saved object import if ever panels aren't an array. + if (!Array.isArray(parsedPanels)) { + return attributes; + } + + const { panels, state } = dashboardAttributesToState(attributes); + + const injectedState = deps.embeddablePersistableStateService.inject( + state, + references + ) as DashboardContainerStateWithType; + const injectedPanels = panelStatesToPanels(injectedState.panels, panels); + + const newAttributes = { + ...attributes, + panelsJSON: JSON.stringify(injectedPanels), + } as SavedObjectAttributes; + + if (injectedState.controlGroupInput) { + newAttributes.controlGroupInput = { + ...(attributes.controlGroupInput as SavedObjectAttributes), + panelsJSON: JSON.stringify(injectedState.controlGroupInput.panels), + }; + } + + return newAttributes; +} + export function extractReferences( { attributes, references = [] }: SavedObjectAttributesAndReferences, deps: ExtractDeps @@ -137,49 +186,6 @@ export function extractReferences( }; } -export interface InjectDeps { - embeddablePersistableStateService: EmbeddablePersistableStateService; -} - -export function injectReferences( - { attributes, references = [] }: SavedObjectAttributesAndReferences, - deps: InjectDeps -): SavedObjectAttributes { - // Skip if panelsJSON is missing otherwise this will cause saved object import to fail when - // importing objects without panelsJSON. At development time of this, there is no guarantee each saved - // object has panelsJSON in all previous versions of kibana. - if (typeof attributes.panelsJSON !== 'string') { - return attributes; - } - const parsedPanels = JSON.parse(attributes.panelsJSON); - // Same here, prevent failing saved object import if ever panels aren't an array. - if (!Array.isArray(parsedPanels)) { - return attributes; - } - - const { panels, state } = dashboardAttributesToState(attributes); - - const injectedState = deps.embeddablePersistableStateService.inject( - state, - references - ) as DashboardContainerStateWithType; - const injectedPanels = panelStatesToPanels(injectedState.panels, panels); - - const newAttributes = { - ...attributes, - panelsJSON: JSON.stringify(injectedPanels), - } as SavedObjectAttributes; - - if (injectedState.controlGroupInput) { - newAttributes.controlGroupInput = { - ...(attributes.controlGroupInput as SavedObjectAttributes), - panelsJSON: JSON.stringify(injectedState.controlGroupInput.panels), - }; - } - - return newAttributes; -} - function pre730ExtractReferences( { attributes, references = [] }: SavedObjectAttributesAndReferences, deps: ExtractDeps diff --git a/src/plugins/dashboard/common/types.ts b/src/plugins/dashboard/common/types.ts index 941f9437e54e6..ff5a1cbc17552 100644 --- a/src/plugins/dashboard/common/types.ts +++ b/src/plugins/dashboard/common/types.ts @@ -11,28 +11,13 @@ import { EmbeddableStateWithType, PanelState, } from '@kbn/embeddable-plugin/common/types'; -import { SavedObjectEmbeddableInput } from '@kbn/embeddable-plugin/common/lib/saved_object_embeddable'; -import { PersistableControlGroupInput } from '@kbn/controls-plugin/common'; +import { Serializable } from '@kbn/utility-types'; import { - RawSavedDashboardPanelTo60, - RawSavedDashboardPanel610, - RawSavedDashboardPanel620, - RawSavedDashboardPanel630, - RawSavedDashboardPanel640To720, - RawSavedDashboardPanel730ToLatest, -} from './bwc/types'; - -import { GridData } from './embeddable/types'; - -export type PanelId = string; -export type SavedObjectId = string; - -export interface DashboardPanelState< - TEmbeddableInput extends EmbeddableInput | SavedObjectEmbeddableInput = SavedObjectEmbeddableInput -> extends PanelState { - readonly gridData: GridData; - panelRefName?: string; -} + PersistableControlGroupInput, + RawControlGroupAttributes, +} from '@kbn/controls-plugin/common'; +import { RefreshInterval } from '@kbn/data-plugin/common'; +import { SavedObjectEmbeddableInput } from '@kbn/embeddable-plugin/common/lib/saved_object_embeddable'; export interface DashboardCapabilities { showWriteControls: boolean; @@ -43,62 +28,77 @@ export interface DashboardCapabilities { } /** - * This should always represent the latest dashboard panel shape, after all possible migrations. + * The attributes of the dashboard saved object. This interface should be the + * source of truth for the latest dashboard attributes shape after all migrations. */ -export type SavedDashboardPanel = SavedDashboardPanel730ToLatest; - -export type SavedDashboardPanel640To720 = Pick< - RawSavedDashboardPanel640To720, - Exclude -> & { - readonly id: string; - readonly type: string; -}; +export interface DashboardAttributes { + controlGroupInput?: RawControlGroupAttributes; + refreshInterval?: RefreshInterval; + timeRestore: boolean; + optionsJSON?: string; + useMargins?: boolean; + description: string; + panelsJSON: string; + timeFrom?: string; + version: number; + timeTo?: string; + title: string; + kibanaSavedObjectMeta: { + searchSourceJSON: string; + }; +} -export type SavedDashboardPanel630 = Pick< - RawSavedDashboardPanel630, - Exclude -> & { - readonly id: string; - readonly type: string; -}; +/** -------------------------------------------------------------------- + * Dashboard panel types + -----------------------------------------------------------------------*/ -export type SavedDashboardPanel620 = Pick< - RawSavedDashboardPanel620, - Exclude -> & { - readonly id: string; - readonly type: string; -}; +/** + * The dashboard panel format expected by the embeddable container. + */ +export interface DashboardPanelState< + TEmbeddableInput extends EmbeddableInput | SavedObjectEmbeddableInput = SavedObjectEmbeddableInput +> extends PanelState { + readonly gridData: GridData; + panelRefName?: string; +} -export type SavedDashboardPanel610 = Pick< - RawSavedDashboardPanel610, - Exclude -> & { - readonly id: string; - readonly type: string; -}; +/** + * A saved dashboard panel parsed directly from the Dashboard Attributes panels JSON + */ +export interface SavedDashboardPanel { + embeddableConfig: { [key: string]: Serializable }; // parsed into the panel's explicitInput + id?: string; // the saved object id for by reference panels + type: string; // the embeddable type + panelRefName?: string; + gridData: GridData; + panelIndex: string; + version: string; + title?: string; +} -export type SavedDashboardPanelTo60 = Pick< - RawSavedDashboardPanelTo60, - Exclude -> & { - readonly id: string; - readonly type: string; -}; +/** + * Grid type for React Grid Layout + */ +export interface GridData { + w: number; + h: number; + x: number; + y: number; + i: string; +} -// id becomes optional starting in 7.3.0 -export type SavedDashboardPanel730ToLatest = Pick< - RawSavedDashboardPanel730ToLatest, - Exclude -> & { - readonly id?: string; - readonly type: string; -}; +export interface DashboardPanelMap { + [key: string]: DashboardPanelState; +} -// Making this interface because so much of the Container type from embeddable is tied up in public -// Once that is all available from common, we should be able to move the dashboard_container type to our common as well +/** -------------------------------------------------------------------- + * Dashboard container types + -----------------------------------------------------------------------*/ +/** + * Types below this line are copied here because so many important types are tied up in public. These types should be + * moved from public into common. + */ export interface DashboardContainerStateWithType extends EmbeddableStateWithType { panels: { [panelId: string]: DashboardPanelState; diff --git a/src/plugins/dashboard/public/application/actions/add_to_library_action.test.tsx b/src/plugins/dashboard/public/application/actions/add_to_library_action.test.tsx index ac467e35729f8..aa3419e37890c 100644 --- a/src/plugins/dashboard/public/application/actions/add_to_library_action.test.tsx +++ b/src/plugins/dashboard/public/application/actions/add_to_library_action.test.tsx @@ -6,7 +6,6 @@ * Side Public License, v 1. */ -import { AddToLibraryAction } from '.'; import { DashboardContainer } from '../embeddable/dashboard_container'; import { getSampleDashboardInput } from '../test_helpers'; import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks'; @@ -27,6 +26,7 @@ import { CONTACT_CARD_EMBEDDABLE, } from '@kbn/embeddable-plugin/public/lib/test_samples/embeddables'; import { pluginServices } from '../../services/plugin_services'; +import { AddToLibraryAction } from './add_to_library_action'; const embeddableFactory = new ContactCardEmbeddableFactory((() => null) as any, {} as any); pluginServices.getServices().embeddable.getEmbeddableFactory = jest diff --git a/src/plugins/dashboard/public/application/actions/add_to_library_action.tsx b/src/plugins/dashboard/public/application/actions/add_to_library_action.tsx index 8c6577012161d..0510d35519ff2 100644 --- a/src/plugins/dashboard/public/application/actions/add_to_library_action.tsx +++ b/src/plugins/dashboard/public/application/actions/add_to_library_action.tsx @@ -18,8 +18,9 @@ import { import { Action, IncompatibleActionError } from '@kbn/ui-actions-plugin/public'; import { dashboardAddToLibraryAction } from '../../dashboard_strings'; -import { type DashboardPanelState, DASHBOARD_CONTAINER_TYPE, type DashboardContainer } from '..'; +import { type DashboardPanelState, type DashboardContainer } from '..'; import { pluginServices } from '../../services/plugin_services'; +import { DASHBOARD_CONTAINER_TYPE } from '../../dashboard_constants'; export const ACTION_ADD_TO_LIBRARY = 'saveToLibrary'; diff --git a/src/plugins/dashboard/public/application/actions/clone_panel_action.test.tsx b/src/plugins/dashboard/public/application/actions/clone_panel_action.test.tsx index 5bb331e58fe38..0fb63049ebe32 100644 --- a/src/plugins/dashboard/public/application/actions/clone_panel_action.test.tsx +++ b/src/plugins/dashboard/public/application/actions/clone_panel_action.test.tsx @@ -12,7 +12,7 @@ import { getSampleDashboardInput, getSampleDashboardPanel } from '../test_helper import { coreMock } from '@kbn/core/public/mocks'; import { CoreStart } from '@kbn/core/public'; -import { ClonePanelAction } from '.'; +import { ClonePanelAction } from './clone_panel_action'; import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks'; import { ContactCardEmbeddable, diff --git a/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx b/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx index 02862e7c75e86..11a96733337f0 100644 --- a/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx +++ b/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx @@ -27,9 +27,10 @@ import { placePanelBeside, IPanelPlacementBesideArgs, } from '../embeddable/panel/dashboard_panel_placement'; -import { dashboardClonePanelAction } from '../../dashboard_strings'; -import { type DashboardPanelState, DASHBOARD_CONTAINER_TYPE, type DashboardContainer } from '..'; import { pluginServices } from '../../services/plugin_services'; +import { dashboardClonePanelAction } from '../../dashboard_strings'; +import { DASHBOARD_CONTAINER_TYPE } from '../../dashboard_constants'; +import { type DashboardPanelState, type DashboardContainer } from '..'; export const ACTION_CLONE_PANEL = 'clonePanel'; diff --git a/src/plugins/dashboard/public/application/actions/copy_to_dashboard_action.tsx b/src/plugins/dashboard/public/application/actions/copy_to_dashboard_action.tsx index 8f602db5e4529..cdd8d726e9fa6 100644 --- a/src/plugins/dashboard/public/application/actions/copy_to_dashboard_action.tsx +++ b/src/plugins/dashboard/public/application/actions/copy_to_dashboard_action.tsx @@ -14,9 +14,10 @@ import type { IEmbeddable } from '@kbn/embeddable-plugin/public'; import type { PresentationUtilPluginStart } from '@kbn/presentation-util-plugin/public'; import { dashboardCopyToDashboardAction } from '../../dashboard_strings'; -import { DASHBOARD_CONTAINER_TYPE, DashboardContainer } from '../embeddable'; +import { DashboardContainer } from '../embeddable'; import { CopyToDashboardModal } from './copy_to_dashboard_modal'; import { pluginServices } from '../../services/plugin_services'; +import { DASHBOARD_CONTAINER_TYPE } from '../../dashboard_constants'; export const ACTION_COPY_TO_DASHBOARD = 'copyToDashboard'; diff --git a/src/plugins/dashboard/public/application/actions/copy_to_dashboard_modal.tsx b/src/plugins/dashboard/public/application/actions/copy_to_dashboard_modal.tsx index 7f9a99ed27231..af91631d20b39 100644 --- a/src/plugins/dashboard/public/application/actions/copy_to_dashboard_modal.tsx +++ b/src/plugins/dashboard/public/application/actions/copy_to_dashboard_modal.tsx @@ -25,8 +25,8 @@ import { import { IEmbeddable, PanelNotFoundError } from '@kbn/embeddable-plugin/public'; import { LazyDashboardPicker, withSuspense } from '@kbn/presentation-util-plugin/public'; import { dashboardCopyToDashboardAction } from '../../dashboard_strings'; -import { createDashboardEditUrl, DashboardConstants, DashboardContainer } from '../..'; -import { DashboardPanelState } from '..'; +import { createDashboardEditUrl, DashboardConstants } from '../..'; +import { type DashboardContainer, DashboardPanelState } from '..'; import { pluginServices } from '../../services/plugin_services'; interface CopyToDashboardModalProps { diff --git a/src/plugins/dashboard/public/application/actions/expand_panel_action.tsx b/src/plugins/dashboard/public/application/actions/expand_panel_action.tsx index c5da566b90a6a..79ab109ddce51 100644 --- a/src/plugins/dashboard/public/application/actions/expand_panel_action.tsx +++ b/src/plugins/dashboard/public/application/actions/expand_panel_action.tsx @@ -9,9 +9,9 @@ import type { IEmbeddable } from '@kbn/embeddable-plugin/public'; import { Action, IncompatibleActionError } from '@kbn/ui-actions-plugin/public'; -import type { DashboardContainerInput } from '../..'; +import { DashboardContainerInput, DASHBOARD_CONTAINER_TYPE } from '../..'; import { dashboardExpandPanelAction } from '../../dashboard_strings'; -import { DASHBOARD_CONTAINER_TYPE, type DashboardContainer } from '../embeddable'; +import { type DashboardContainer } from '../embeddable'; export const ACTION_EXPAND_PANEL = 'togglePanel'; diff --git a/src/plugins/dashboard/public/application/actions/filters_notification_badge.test.tsx b/src/plugins/dashboard/public/application/actions/filters_notification_badge.test.tsx index 275a5625e5e0b..3b3fb5dde0497 100644 --- a/src/plugins/dashboard/public/application/actions/filters_notification_badge.test.tsx +++ b/src/plugins/dashboard/public/application/actions/filters_notification_badge.test.tsx @@ -6,27 +6,26 @@ * Side Public License, v 1. */ -import { getSampleDashboardInput } from '../test_helpers'; -import { DashboardContainer } from '../embeddable/dashboard_container'; - -import { FiltersNotificationBadge } from '.'; -import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks'; -import { type Query, type AggregateQuery, Filter } from '@kbn/es-query'; import { - ErrorEmbeddable, - FilterableEmbeddable, IContainer, + ErrorEmbeddable, isErrorEmbeddable, + FilterableEmbeddable, } from '@kbn/embeddable-plugin/public'; - import { ContactCardEmbeddable, - ContactCardEmbeddableFactory, + CONTACT_CARD_EMBEDDABLE, ContactCardEmbeddableInput, ContactCardEmbeddableOutput, - CONTACT_CARD_EMBEDDABLE, + ContactCardEmbeddableFactory, } from '@kbn/embeddable-plugin/public/lib/test_samples/embeddables'; +import { type Query, type AggregateQuery, Filter } from '@kbn/es-query'; +import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks'; + +import { getSampleDashboardInput } from '../test_helpers'; import { pluginServices } from '../../services/plugin_services'; +import { DashboardContainer } from '../embeddable/dashboard_container'; +import { FiltersNotificationBadge } from './filters_notification_badge'; const mockEmbeddableFactory = new ContactCardEmbeddableFactory((() => null) as any, {} as any); pluginServices.getServices().embeddable.getEmbeddableFactory = jest diff --git a/src/plugins/dashboard/public/application/actions/index.ts b/src/plugins/dashboard/public/application/actions/index.ts index 5c95e3c42cccd..a238ce05e1017 100644 --- a/src/plugins/dashboard/public/application/actions/index.ts +++ b/src/plugins/dashboard/public/application/actions/index.ts @@ -6,23 +6,76 @@ * Side Public License, v 1. */ -export type { ExpandPanelActionContext } from './expand_panel_action'; -export { ExpandPanelAction, ACTION_EXPAND_PANEL } from './expand_panel_action'; -export type { ReplacePanelActionContext } from './replace_panel_action'; -export { ReplacePanelAction, ACTION_REPLACE_PANEL } from './replace_panel_action'; -export type { ClonePanelActionContext } from './clone_panel_action'; -export { ClonePanelAction, ACTION_CLONE_PANEL } from './clone_panel_action'; -export type { AddToLibraryActionContext } from './add_to_library_action'; -export { AddToLibraryAction, ACTION_ADD_TO_LIBRARY } from './add_to_library_action'; -export type { UnlinkFromLibraryActionContext } from './unlink_from_library_action'; -export { UnlinkFromLibraryAction, ACTION_UNLINK_FROM_LIBRARY } from './unlink_from_library_action'; -export type { CopyToDashboardActionContext } from './copy_to_dashboard_action'; -export { CopyToDashboardAction, ACTION_COPY_TO_DASHBOARD } from './copy_to_dashboard_action'; -export type { LibraryNotificationActionContext } from './library_notification_action'; -export { - LibraryNotificationAction, - ACTION_LIBRARY_NOTIFICATION, -} from './library_notification_action'; -export { FiltersNotificationBadge, BADGE_FILTERS_NOTIFICATION } from './filters_notification_badge'; -export type { ExportContext } from './export_csv_action'; -export { ExportCSVAction, ACTION_EXPORT_CSV } from './export_csv_action'; +import { + CONTEXT_MENU_TRIGGER, + PANEL_BADGE_TRIGGER, + PANEL_NOTIFICATION_TRIGGER, +} from '@kbn/embeddable-plugin/public'; +import { CoreStart } from '@kbn/core/public'; +import { getSavedObjectFinder } from '@kbn/saved-objects-plugin/public'; + +import { ExportCSVAction } from './export_csv_action'; +import { ClonePanelAction } from './clone_panel_action'; +import { DashboardStartDependencies } from '../../plugin'; +import { ExpandPanelAction } from './expand_panel_action'; +import { ReplacePanelAction } from './replace_panel_action'; +import { AddToLibraryAction } from './add_to_library_action'; +import { CopyToDashboardAction } from './copy_to_dashboard_action'; +import { UnlinkFromLibraryAction } from './unlink_from_library_action'; +import { FiltersNotificationBadge } from './filters_notification_badge'; +import { LibraryNotificationAction } from './library_notification_action'; + +interface BuildAllDashboardActionsProps { + core: CoreStart; + allowByValueEmbeddables?: boolean; + plugins: DashboardStartDependencies; +} + +export const buildAllDashboardActions = async ({ + core, + plugins, + allowByValueEmbeddables, +}: BuildAllDashboardActionsProps) => { + const { uiSettings } = core; + const { uiActions, share, presentationUtil } = plugins; + + const clonePanelAction = new ClonePanelAction(core.savedObjects); + uiActions.registerAction(clonePanelAction); + uiActions.attachAction(CONTEXT_MENU_TRIGGER, clonePanelAction.id); + + const SavedObjectFinder = getSavedObjectFinder(core.savedObjects, uiSettings); + const changeViewAction = new ReplacePanelAction(SavedObjectFinder); + uiActions.registerAction(changeViewAction); + uiActions.attachAction(CONTEXT_MENU_TRIGGER, changeViewAction.id); + + const panelLevelFiltersNotification = new FiltersNotificationBadge(); + uiActions.registerAction(panelLevelFiltersNotification); + uiActions.attachAction(PANEL_BADGE_TRIGGER, panelLevelFiltersNotification.id); + + const expandPanelAction = new ExpandPanelAction(); + uiActions.registerAction(expandPanelAction); + uiActions.attachAction(CONTEXT_MENU_TRIGGER, expandPanelAction.id); + + if (share) { + const ExportCSVPlugin = new ExportCSVAction(); + uiActions.addTriggerAction(CONTEXT_MENU_TRIGGER, ExportCSVPlugin); + } + + if (allowByValueEmbeddables) { + const addToLibraryAction = new AddToLibraryAction(); + uiActions.registerAction(addToLibraryAction); + uiActions.attachAction(CONTEXT_MENU_TRIGGER, addToLibraryAction.id); + + const unlinkFromLibraryAction = new UnlinkFromLibraryAction(); + uiActions.registerAction(unlinkFromLibraryAction); + uiActions.attachAction(CONTEXT_MENU_TRIGGER, unlinkFromLibraryAction.id); + + const libraryNotificationAction = new LibraryNotificationAction(unlinkFromLibraryAction); + uiActions.registerAction(libraryNotificationAction); + uiActions.attachAction(PANEL_NOTIFICATION_TRIGGER, libraryNotificationAction.id); + + const copyToDashboardAction = new CopyToDashboardAction(presentationUtil.ContextProvider); + uiActions.registerAction(copyToDashboardAction); + uiActions.attachAction(CONTEXT_MENU_TRIGGER, copyToDashboardAction.id); + } +}; diff --git a/src/plugins/dashboard/public/application/actions/library_notification_action.test.tsx b/src/plugins/dashboard/public/application/actions/library_notification_action.test.tsx index f1202de4ac1b6..f30cba538b8d1 100644 --- a/src/plugins/dashboard/public/application/actions/library_notification_action.test.tsx +++ b/src/plugins/dashboard/public/application/actions/library_notification_action.test.tsx @@ -6,11 +6,6 @@ * Side Public License, v 1. */ -import { getSampleDashboardInput } from '../test_helpers'; -import { DashboardContainer } from '../embeddable/dashboard_container'; - -import { LibraryNotificationAction, UnlinkFromLibraryAction } from '.'; -import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks'; import { ErrorEmbeddable, IContainer, @@ -25,7 +20,13 @@ import { ContactCardEmbeddableOutput, CONTACT_CARD_EMBEDDABLE, } from '@kbn/embeddable-plugin/public/lib/test_samples/embeddables'; +import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks'; + +import { getSampleDashboardInput } from '../test_helpers'; import { pluginServices } from '../../services/plugin_services'; +import { DashboardContainer } from '../embeddable/dashboard_container'; +import { UnlinkFromLibraryAction } from './unlink_from_library_action'; +import { LibraryNotificationAction } from './library_notification_action'; const mockEmbeddableFactory = new ContactCardEmbeddableFactory((() => null) as any, {} as any); pluginServices.getServices().embeddable.getEmbeddableFactory = jest diff --git a/src/plugins/dashboard/public/application/actions/library_notification_action.tsx b/src/plugins/dashboard/public/application/actions/library_notification_action.tsx index a5abe8161e9ad..a05b78994b31d 100644 --- a/src/plugins/dashboard/public/application/actions/library_notification_action.tsx +++ b/src/plugins/dashboard/public/application/actions/library_notification_action.tsx @@ -17,10 +17,10 @@ import { import { KibanaThemeProvider, reactToUiComponent } from '@kbn/kibana-react-plugin/public'; import { Action, IncompatibleActionError } from '@kbn/ui-actions-plugin/public'; -import { UnlinkFromLibraryAction } from '.'; -import { LibraryNotificationPopover } from './library_notification_popover'; -import { dashboardLibraryNotification } from '../../dashboard_strings'; import { pluginServices } from '../../services/plugin_services'; +import { UnlinkFromLibraryAction } from './unlink_from_library_action'; +import { dashboardLibraryNotification } from '../../dashboard_strings'; +import { LibraryNotificationPopover } from './library_notification_popover'; export const ACTION_LIBRARY_NOTIFICATION = 'ACTION_LIBRARY_NOTIFICATION'; diff --git a/src/plugins/dashboard/public/application/actions/library_notification_popover.tsx b/src/plugins/dashboard/public/application/actions/library_notification_popover.tsx index 81d2f2a0557ec..38c8452eadde5 100644 --- a/src/plugins/dashboard/public/application/actions/library_notification_popover.tsx +++ b/src/plugins/dashboard/public/application/actions/library_notification_popover.tsx @@ -17,8 +17,10 @@ import { EuiPopoverTitle, EuiText, } from '@elastic/eui'; -import { LibraryNotificationActionContext, UnlinkFromLibraryAction } from '.'; + import { dashboardLibraryNotification } from '../../dashboard_strings'; +import { UnlinkFromLibraryAction } from './unlink_from_library_action'; +import { LibraryNotificationActionContext } from './library_notification_action'; export interface LibraryNotificationProps { context: LibraryNotificationActionContext; diff --git a/src/plugins/dashboard/public/application/actions/replace_panel_action.tsx b/src/plugins/dashboard/public/application/actions/replace_panel_action.tsx index f39988842e3fc..52f6a345a181e 100644 --- a/src/plugins/dashboard/public/application/actions/replace_panel_action.tsx +++ b/src/plugins/dashboard/public/application/actions/replace_panel_action.tsx @@ -8,9 +8,10 @@ import { type IEmbeddable, ViewMode } from '@kbn/embeddable-plugin/public'; import { Action, IncompatibleActionError } from '@kbn/ui-actions-plugin/public'; -import { DASHBOARD_CONTAINER_TYPE, type DashboardContainer } from '../embeddable'; +import type { DashboardContainer } from '../embeddable'; import { openReplacePanelFlyout } from './open_replace_panel_flyout'; import { dashboardReplacePanelAction } from '../../dashboard_strings'; +import { DASHBOARD_CONTAINER_TYPE } from '../../dashboard_constants'; export const ACTION_REPLACE_PANEL = 'replacePanel'; diff --git a/src/plugins/dashboard/public/application/actions/unlink_from_library_action.test.tsx b/src/plugins/dashboard/public/application/actions/unlink_from_library_action.test.tsx index 854383edd4e14..080c358a86fdf 100644 --- a/src/plugins/dashboard/public/application/actions/unlink_from_library_action.test.tsx +++ b/src/plugins/dashboard/public/application/actions/unlink_from_library_action.test.tsx @@ -23,10 +23,10 @@ import { CONTACT_CARD_EMBEDDABLE, } from '@kbn/embeddable-plugin/public/lib/test_samples/embeddables'; -import { UnlinkFromLibraryAction } from '.'; import { getSampleDashboardInput } from '../test_helpers'; -import { DashboardContainer } from '../embeddable/dashboard_container'; import { pluginServices } from '../../services/plugin_services'; +import { UnlinkFromLibraryAction } from './unlink_from_library_action'; +import { DashboardContainer } from '../embeddable/dashboard_container'; let container: DashboardContainer; let embeddable: ContactCardEmbeddable & ReferenceOrValueEmbeddable; diff --git a/src/plugins/dashboard/public/application/actions/unlink_from_library_action.tsx b/src/plugins/dashboard/public/application/actions/unlink_from_library_action.tsx index e399411e77fee..b7c53a78becc2 100644 --- a/src/plugins/dashboard/public/application/actions/unlink_from_library_action.tsx +++ b/src/plugins/dashboard/public/application/actions/unlink_from_library_action.tsx @@ -17,8 +17,9 @@ import { } from '@kbn/embeddable-plugin/public'; import { Action, IncompatibleActionError } from '@kbn/ui-actions-plugin/public'; import { dashboardUnlinkFromLibraryAction } from '../../dashboard_strings'; -import { type DashboardPanelState, DASHBOARD_CONTAINER_TYPE, type DashboardContainer } from '..'; +import { type DashboardPanelState, type DashboardContainer } from '..'; import { pluginServices } from '../../services/plugin_services'; +import { DASHBOARD_CONTAINER_TYPE } from '../../dashboard_constants'; export const ACTION_UNLINK_FROM_LIBRARY = 'unlinkFromLibrary'; diff --git a/src/plugins/dashboard/public/application/dashboard_app.tsx b/src/plugins/dashboard/public/application/dashboard_app.tsx index 302cb43794229..b05944c99292b 100644 --- a/src/plugins/dashboard/public/application/dashboard_app.tsx +++ b/src/plugins/dashboard/public/application/dashboard_app.tsx @@ -9,24 +9,23 @@ import { History } from 'history'; import React, { useEffect, useMemo, useRef, useState } from 'react'; -import { EmbeddableRenderer, ViewMode } from '@kbn/embeddable-plugin/public'; import { useExecutionContext } from '@kbn/kibana-react-plugin/public'; +import { EmbeddableRenderer, ViewMode } from '@kbn/embeddable-plugin/public'; import { createKbnUrlStateStorage, withNotifyOnErrors } from '@kbn/kibana-utils-plugin/public'; -import { useDashboardSelector } from './state'; -import { useDashboardAppState } from './hooks'; import { dashboardFeatureCatalog, getDashboardBreadcrumb, getDashboardTitle, leaveConfirmStrings, } from '../dashboard_strings'; -import { createDashboardEditUrl } from '../dashboard_constants'; -import { DashboardTopNav, isCompleteDashboardAppState } from './top_nav/dashboard_top_nav'; -import { DashboardEmbedSettings, DashboardRedirect } from '../types'; -import { DashboardAppNoDataPage } from './dashboard_app_no_data'; +import { useDashboardAppState } from './hooks'; +import { useDashboardSelector } from './state'; import { pluginServices } from '../services/plugin_services'; +import { DashboardAppNoDataPage } from './dashboard_app_no_data'; +import { DashboardEmbedSettings, DashboardRedirect } from '../types'; import { useDashboardMountContext } from './hooks/dashboard_mount_context'; +import { DashboardTopNav, isCompleteDashboardAppState } from './top_nav/dashboard_top_nav'; export interface DashboardAppProps { history: History; savedDashboardId?: string; @@ -43,13 +42,12 @@ export function DashboardApp({ const { onAppLeave } = useDashboardMountContext(); const { chrome: { setBreadcrumbs, setIsVisible }, + screenshotMode: { isScreenshotMode }, coreContext: { executionContext }, - data: { search }, embeddable: { getStateTransfer }, notifications: { toasts }, - screenshotMode: { isScreenshotMode }, settings: { uiSettings }, - spaces: { getLegacyUrlConflict }, + data: { search }, } = pluginServices.getServices(); const [showNoDataPage, setShowNoDataPage] = useState(false); @@ -160,17 +158,7 @@ export function DashboardApp({ dashboardAppState={dashboardAppState} /> - {dashboardAppState.savedDashboard.outcome === 'conflict' && - dashboardAppState.savedDashboard.id && - dashboardAppState.savedDashboard.aliasId - ? getLegacyUrlConflict?.({ - currentObjectId: dashboardAppState.savedDashboard.id, - otherObjectId: dashboardAppState.savedDashboard.aliasId, - otherObjectPath: `#${createDashboardEditUrl( - dashboardAppState.savedDashboard.aliasId - )}${history.location.search}`, - }) - : null} + {dashboardAppState.createConflictWarning?.()}
    createKbnUrlStateStorage({ history, @@ -172,51 +162,48 @@ export async function mountApp({ core, element, appUnMounted, mountContext }: Da }); const app = ( - // TODO: Remove KibanaContextProvider as part of https://github.com/elastic/kibana/pull/138774 - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + ); diff --git a/src/plugins/dashboard/public/application/embeddable/dashboard_constants.ts b/src/plugins/dashboard/public/application/embeddable/dashboard_constants.ts deleted file mode 100644 index 2f7854e81ad95..0000000000000 --- a/src/plugins/dashboard/public/application/embeddable/dashboard_constants.ts +++ /dev/null @@ -1,13 +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. - */ - -export const DASHBOARD_GRID_COLUMN_COUNT = 48; -export const DASHBOARD_GRID_HEIGHT = 20; -export const DEFAULT_PANEL_WIDTH = DASHBOARD_GRID_COLUMN_COUNT / 2; -export const DEFAULT_PANEL_HEIGHT = 15; -export const DASHBOARD_CONTAINER_TYPE = 'dashboard'; diff --git a/src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx b/src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx index 4f7483cf06f35..036c77fc6257c 100644 --- a/src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx +++ b/src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx @@ -32,7 +32,7 @@ import type { Query } from '@kbn/es-query'; import type { RefreshInterval } from '@kbn/data-plugin/public'; import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public'; -import { DASHBOARD_CONTAINER_TYPE } from './dashboard_constants'; +import { DASHBOARD_CONTAINER_TYPE } from '../../dashboard_constants'; import { createPanelState } from './panel'; import { DashboardPanelState } from './types'; import { DashboardViewport } from './viewport/dashboard_viewport'; diff --git a/src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx b/src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx index 27670ee104367..58a2c63492c09 100644 --- a/src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx +++ b/src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx @@ -7,16 +7,14 @@ */ import { i18n } from '@kbn/i18n'; -import { EmbeddablePersistableStateService } from '@kbn/embeddable-plugin/common'; - import { identity, pickBy } from 'lodash'; + import { ControlGroupContainer, ControlGroupInput, ControlGroupOutput, CONTROL_GROUP_TYPE, } from '@kbn/controls-plugin/public'; -import { getDefaultControlGroupInput } from '@kbn/controls-plugin/common'; import { Container, ErrorEmbeddable, @@ -25,14 +23,13 @@ import { EmbeddableFactoryDefinition, } from '@kbn/embeddable-plugin/public'; +import { getDefaultControlGroupInput } from '@kbn/controls-plugin/common'; +import { EmbeddablePersistableStateService } from '@kbn/embeddable-plugin/common'; + import { DashboardContainerInput } from '../..'; -import { DASHBOARD_CONTAINER_TYPE } from './dashboard_constants'; +import { createExtract, createInject } from '../../../common'; import type { DashboardContainer } from './dashboard_container'; -import { - createExtract, - createInject, -} from '../../../common/embeddable/dashboard_container_persistable_state'; -import { pluginServices } from '../../services/plugin_services'; +import { DASHBOARD_CONTAINER_TYPE } from '../../dashboard_constants'; export type DashboardContainerFactory = EmbeddableFactory< DashboardContainerInput, @@ -80,6 +77,7 @@ export class DashboardContainerFactoryDefinition initialInput: DashboardContainerInput, parent?: Container ): Promise => { + const { pluginServices } = await import('../../services/plugin_services'); const { embeddable: { getEmbeddableFactory }, } = pluginServices.getServices(); diff --git a/src/plugins/dashboard/public/application/embeddable/grid/dashboard_grid.tsx b/src/plugins/dashboard/public/application/embeddable/grid/dashboard_grid.tsx index 64afdcdb2e609..7fda6eb1a3f35 100644 --- a/src/plugins/dashboard/public/application/embeddable/grid/dashboard_grid.tsx +++ b/src/plugins/dashboard/public/application/embeddable/grid/dashboard_grid.tsx @@ -22,9 +22,9 @@ import { DashboardContainer, DashboardLoadedInfo } from '../dashboard_container' import { GridData } from '../../../../common'; import { DashboardGridItem } from './dashboard_grid_item'; import { DashboardLoadedEventStatus, DashboardPanelState } from '../types'; -import { DASHBOARD_GRID_COLUMN_COUNT, DASHBOARD_GRID_HEIGHT } from '../dashboard_constants'; +import { DASHBOARD_GRID_COLUMN_COUNT, DASHBOARD_GRID_HEIGHT } from '../../../dashboard_constants'; import { pluginServices } from '../../../services/plugin_services'; -import { dashboardLoadingErrorStrings } from '../../../dashboard_strings'; +import { dashboardSavedObjectErrorStrings } from '../../../dashboard_strings'; let lastValidGridSize = 0; @@ -153,7 +153,7 @@ class DashboardGridUi extends React.Component { } catch (error) { console.error(error); // eslint-disable-line no-console isLayoutInvalid = true; - toasts.addDanger(dashboardLoadingErrorStrings.getDashboardGridError(error.message)); + toasts.addDanger(dashboardSavedObjectErrorStrings.getDashboardGridError(error.message)); } this.setState({ layout, diff --git a/src/plugins/dashboard/public/application/embeddable/index.ts b/src/plugins/dashboard/public/application/embeddable/index.ts index ce8bb5b7169ac..1979ae5ad7bf6 100644 --- a/src/plugins/dashboard/public/application/embeddable/index.ts +++ b/src/plugins/dashboard/public/application/embeddable/index.ts @@ -13,11 +13,4 @@ export { createPanelState } from './panel'; export * from './types'; -export { - DASHBOARD_GRID_COLUMN_COUNT, - DEFAULT_PANEL_HEIGHT, - DEFAULT_PANEL_WIDTH, - DASHBOARD_CONTAINER_TYPE, -} from './dashboard_constants'; - export { createDashboardContainerByValueRenderer } from './dashboard_container_by_value_renderer'; diff --git a/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.test.ts b/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.test.ts index 10c3044ea912a..4c926675e1e94 100644 --- a/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.test.ts +++ b/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.test.ts @@ -8,7 +8,7 @@ import { EmbeddableInput } from '@kbn/embeddable-plugin/public'; import { CONTACT_CARD_EMBEDDABLE } from '@kbn/embeddable-plugin/public/lib/test_samples'; -import { DEFAULT_PANEL_HEIGHT, DEFAULT_PANEL_WIDTH } from '../dashboard_constants'; +import { DEFAULT_PANEL_HEIGHT, DEFAULT_PANEL_WIDTH } from '../../../dashboard_constants'; import { DashboardPanelState } from '../types'; import { createPanelState } from './create_panel_state'; diff --git a/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.ts b/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.ts index 5aa9066ea1eba..e5d4f69c914ce 100644 --- a/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.ts +++ b/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.ts @@ -7,7 +7,7 @@ */ import { PanelState, EmbeddableInput } from '@kbn/embeddable-plugin/public'; -import { DEFAULT_PANEL_HEIGHT, DEFAULT_PANEL_WIDTH } from '../dashboard_constants'; +import { DEFAULT_PANEL_HEIGHT, DEFAULT_PANEL_WIDTH } from '../../../dashboard_constants'; import { DashboardPanelState } from '../types'; import { IPanelPlacementArgs, diff --git a/src/plugins/dashboard/public/application/embeddable/panel/dashboard_panel_placement.ts b/src/plugins/dashboard/public/application/embeddable/panel/dashboard_panel_placement.ts index 9d90b711a6843..77b51874319ba 100644 --- a/src/plugins/dashboard/public/application/embeddable/panel/dashboard_panel_placement.ts +++ b/src/plugins/dashboard/public/application/embeddable/panel/dashboard_panel_placement.ts @@ -8,8 +8,8 @@ import _ from 'lodash'; import { PanelNotFoundError } from '@kbn/embeddable-plugin/public'; -import { GridData } from '../../../../common'; -import { DashboardPanelState, DASHBOARD_GRID_COLUMN_COUNT } from '..'; +import { DashboardPanelState, GridData } from '../../../../common'; +import { DASHBOARD_GRID_COLUMN_COUNT } from '../../../dashboard_constants'; export type PanelPlacementMethod = ( args: PlacementArgs diff --git a/src/plugins/dashboard/public/application/embeddable/placeholder/index.ts b/src/plugins/dashboard/public/application/embeddable/placeholder/index.ts index af4327f0fcd98..1d1aba84e7c3a 100644 --- a/src/plugins/dashboard/public/application/embeddable/placeholder/index.ts +++ b/src/plugins/dashboard/public/application/embeddable/placeholder/index.ts @@ -6,5 +6,6 @@ * Side Public License, v 1. */ -export * from './placeholder_embeddable'; -export * from './placeholder_embeddable_factory'; +export { PlaceholderEmbeddableFactory } from './placeholder_embeddable_factory'; + +export const PLACEHOLDER_EMBEDDABLE = 'placeholder'; diff --git a/src/plugins/dashboard/public/application/embeddable/placeholder/placeholder_embeddable.tsx b/src/plugins/dashboard/public/application/embeddable/placeholder/placeholder_embeddable.tsx index a7fa1e793ebf0..de468d86c89fe 100644 --- a/src/plugins/dashboard/public/application/embeddable/placeholder/placeholder_embeddable.tsx +++ b/src/plugins/dashboard/public/application/embeddable/placeholder/placeholder_embeddable.tsx @@ -13,9 +13,9 @@ import classNames from 'classnames'; import { EuiLoadingChart } from '@elastic/eui'; import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public'; import { Embeddable, type EmbeddableInput, type IContainer } from '@kbn/embeddable-plugin/public'; -import { pluginServices } from '../../../services/plugin_services'; -export const PLACEHOLDER_EMBEDDABLE = 'placeholder'; +import { PLACEHOLDER_EMBEDDABLE } from '.'; +import { pluginServices } from '../../../services/plugin_services'; export class PlaceholderEmbeddable extends Embeddable { public readonly type = PLACEHOLDER_EMBEDDABLE; diff --git a/src/plugins/dashboard/public/application/embeddable/placeholder/placeholder_embeddable_factory.ts b/src/plugins/dashboard/public/application/embeddable/placeholder/placeholder_embeddable_factory.ts index 74ce8bf96edbd..26cdddbf17d85 100644 --- a/src/plugins/dashboard/public/application/embeddable/placeholder/placeholder_embeddable_factory.ts +++ b/src/plugins/dashboard/public/application/embeddable/placeholder/placeholder_embeddable_factory.ts @@ -13,7 +13,7 @@ import { EmbeddableInput, IContainer, } from '@kbn/embeddable-plugin/public'; -import { PlaceholderEmbeddable, PLACEHOLDER_EMBEDDABLE } from './placeholder_embeddable'; +import { PLACEHOLDER_EMBEDDABLE } from '.'; export class PlaceholderEmbeddableFactory implements EmbeddableFactoryDefinition { public readonly type = PLACEHOLDER_EMBEDDABLE; @@ -29,6 +29,7 @@ export class PlaceholderEmbeddableFactory implements EmbeddableFactoryDefinition } public async create(initialInput: EmbeddableInput, parent?: IContainer) { + const { PlaceholderEmbeddable } = await import('./placeholder_embeddable'); return new PlaceholderEmbeddable(initialInput, parent); } diff --git a/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.test.tsx b/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.test.tsx index c462df50ef27f..76a3ae7a053a4 100644 --- a/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.test.tsx +++ b/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.test.tsx @@ -9,27 +9,20 @@ import React from 'react'; import { Provider } from 'react-redux'; import { createBrowserHistory } from 'history'; + +import type { Filter } from '@kbn/es-query'; +import { DataView } from '@kbn/data-views-plugin/public'; +import { EmbeddableFactory, ViewMode } from '@kbn/embeddable-plugin/public'; import { renderHook, act, RenderHookResult } from '@testing-library/react-hooks'; import { createKbnUrlStateStorage, defer } from '@kbn/kibana-utils-plugin/public'; -import { DataView } from '@kbn/data-views-plugin/public'; +import { DashboardAppState } from '../../types'; +import { getSampleDashboardInput } from '../test_helpers'; import { DashboardConstants } from '../../dashboard_constants'; -import { SavedObjectLoader } from '../../services/saved_object_loader'; -import { DashboardAppServices, DashboardAppState } from '../../types'; +import { pluginServices } from '../../services/plugin_services'; import { DashboardContainer } from '../embeddable/dashboard_container'; -import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public'; import { dashboardStateStore, setDescription, setViewMode } from '../state'; import { useDashboardAppState, UseDashboardStateProps } from './use_dashboard_app_state'; -import { - getSampleDashboardInput, - getSavedDashboardMock, - makeDefaultServices, -} from '../test_helpers'; - -import type { Filter } from '@kbn/es-query'; -import { pluginServices } from '../../services/plugin_services'; -import { EmbeddableFactory, ViewMode } from '@kbn/embeddable-plugin/public'; -import { DashboardServices } from '../../services/types'; interface SetupEmbeddableFactoryReturn { finalizeEmbeddableCreation: () => void; @@ -40,7 +33,6 @@ interface SetupEmbeddableFactoryReturn { interface RenderDashboardStateHookReturn { embeddableFactoryResult: SetupEmbeddableFactoryReturn; renderHookResult: RenderHookResult, DashboardAppState>; - services: DashboardAppServices; props: UseDashboardStateProps; } @@ -55,28 +47,7 @@ const createDashboardAppStateProps = (): UseDashboardStateProps => ({ setShowNoDataPage: () => {}, }); -const createDashboardAppStateServices = () => { - const defaults = makeDefaultServices(); - - const defaultDataView = { id: 'foo', fields: [{ name: 'bar' }] } as DataView; - - (pluginServices.getServices().data.dataViews.getDefaultDataView as jest.Mock).mockResolvedValue( - defaultDataView - ); - (pluginServices.getServices().data.dataViews.getDefaultId as jest.Mock).mockResolvedValue( - defaultDataView.id - ); - (pluginServices.getServices().data.query.filterManager.getFilters as jest.Mock).mockReturnValue( - [] - ); - - return defaults; -}; - -const setupEmbeddableFactory = ( - services: DashboardAppServices, - id: string -): SetupEmbeddableFactoryReturn => { +const setupEmbeddableFactory = (id: string): SetupEmbeddableFactoryReturn => { const dashboardContainer = new DashboardContainer({ ...getSampleDashboardInput(), id }); const deferEmbeddableCreate = defer(); pluginServices.getServices().embeddable.getEmbeddableFactory = jest.fn().mockImplementation( @@ -100,15 +71,22 @@ const setupEmbeddableFactory = ( const renderDashboardAppStateHook = ({ partialProps, - partialServices, }: { partialProps?: Partial; - partialServices?: Partial; }): RenderDashboardStateHookReturn => { + const defaultDataView = { id: 'foo', fields: [{ name: 'bar' }] } as DataView; + (pluginServices.getServices().data.dataViews.getDefaultDataView as jest.Mock).mockResolvedValue( + defaultDataView + ); + (pluginServices.getServices().data.dataViews.getDefaultId as jest.Mock).mockResolvedValue( + defaultDataView.id + ); + (pluginServices.getServices().data.query.filterManager.getFilters as jest.Mock).mockReturnValue( + [] + ); + const props = { ...createDashboardAppStateProps(), ...(partialProps ?? {}) }; - const services = { ...createDashboardAppStateServices(), ...(partialServices ?? {}) }; - const embeddableFactoryResult = setupEmbeddableFactory(services, originalDashboardEmbeddableId); - const DashboardServicesProvider = pluginServices.getContextProvider(); + const embeddableFactoryResult = setupEmbeddableFactory(originalDashboardEmbeddableId); const renderHookResult = renderHook( (replaceProps: Partial) => { @@ -116,18 +94,11 @@ const renderDashboardAppStateHook = ({ }, { wrapper: ({ children }) => { - return ( - - {/* Can't get rid of KibanaContextProvider here yet because of saved dashboard tests below */} - - {children} - - - ); + return {children}; }, } ); - return { embeddableFactoryResult, renderHookResult, services, props }; + return { embeddableFactoryResult, renderHookResult, props }; }; describe('Dashboard container lifecycle', () => { @@ -146,7 +117,7 @@ describe('Dashboard container lifecycle', () => { }); test('Old dashboard container is destroyed when new dashboardId is given', async () => { - const { renderHookResult, embeddableFactoryResult, services } = renderDashboardAppStateHook({}); + const { renderHookResult, embeddableFactoryResult } = renderDashboardAppStateHook({}); const getResult = () => renderHookResult.result.current; // on initial render dashboard container is undefined @@ -158,7 +129,7 @@ describe('Dashboard container lifecycle', () => { expect(embeddableFactoryResult.dashboardDestroySpy).not.toBeCalled(); const newDashboardId = 'wow_a_new_dashboard_id'; - const embeddableFactoryNew = setupEmbeddableFactory(services, newDashboardId); + const embeddableFactoryNew = setupEmbeddableFactory(newDashboardId); renderHookResult.rerender({ savedDashboardId: newDashboardId }); embeddableFactoryNew.finalizeEmbeddableCreation(); @@ -170,7 +141,7 @@ describe('Dashboard container lifecycle', () => { }); test('Dashboard container is destroyed if dashboard id is changed before container is resolved', async () => { - const { renderHookResult, embeddableFactoryResult, services } = renderDashboardAppStateHook({}); + const { renderHookResult, embeddableFactoryResult } = renderDashboardAppStateHook({}); const getResult = () => renderHookResult.result.current; // on initial render dashboard container is undefined @@ -178,7 +149,7 @@ describe('Dashboard container lifecycle', () => { await act(() => Promise.resolve()); // wait for the original savedDashboard to be loaded... const newDashboardId = 'wow_a_new_dashboard_id'; - const embeddableFactoryNew = setupEmbeddableFactory(services, newDashboardId); + const embeddableFactoryNew = setupEmbeddableFactory(newDashboardId); renderHookResult.rerender({ savedDashboardId: newDashboardId }); await act(() => Promise.resolve()); // wait for the new savedDashboard to be loaded... @@ -199,38 +170,33 @@ describe('Dashboard container lifecycle', () => { // FLAKY: https://github.com/elastic/kibana/issues/105018 describe.skip('Dashboard initial state', () => { it('Extracts state from Dashboard Saved Object', async () => { + const savedTitle = 'testDash1'; + ( + pluginServices.getServices().dashboardSavedObject + .loadDashboardStateFromSavedObject as jest.Mock + ).mockResolvedValue({ title: savedTitle }); + const { renderHookResult, embeddableFactoryResult } = renderDashboardAppStateHook({}); const getResult = () => renderHookResult.result.current; - // saved dashboard isn't applied until after the dashboard embeddable has been created. - expect(getResult().savedDashboard).toBeUndefined(); - embeddableFactoryResult.finalizeEmbeddableCreation(); await renderHookResult.waitForNextUpdate(); - expect(getResult().savedDashboard).toBeDefined(); - expect(getResult().savedDashboard?.title).toEqual( - getResult().getLatestDashboardState?.().title - ); + expect(savedTitle).toEqual(getResult().getLatestDashboardState?.().title); }); it('Sets initial time range and filters from saved dashboard', async () => { - const savedDashboards = {} as SavedObjectLoader; - savedDashboards.get = jest.fn().mockImplementation((id?: string) => - Promise.resolve( - getSavedDashboardMock({ - getFilters: () => [{ meta: { test: 'filterMeTimbers' } } as unknown as Filter], - timeRestore: true, - timeFrom: 'now-13d', - timeTo: 'now', - id, - }) - ) - ); - const partialServices: Partial = { savedDashboards }; - const { renderHookResult, embeddableFactoryResult, services } = renderDashboardAppStateHook({ - partialServices, + ( + pluginServices.getServices().dashboardSavedObject + .loadDashboardStateFromSavedObject as jest.Mock + ).mockResolvedValue({ + filters: [{ meta: { test: 'filterMeTimbers' } } as unknown as Filter], + timeRestore: true, + timeFrom: 'now-13d', + timeTo: 'now', }); + + const { renderHookResult, embeddableFactoryResult } = renderDashboardAppStateHook({}); const getResult = () => renderHookResult.result.current; embeddableFactoryResult.finalizeEmbeddableCreation(); @@ -238,15 +204,13 @@ describe.skip('Dashboard initial state', () => { expect(getResult().getLatestDashboardState?.().timeRestore).toEqual(true); expect( - (services as DashboardAppServices & { data: DashboardServices['data'] }).data.query.timefilter - .timefilter.setTime + pluginServices.getServices().data.query.timefilter.timefilter.setTime ).toHaveBeenCalledWith({ from: 'now-13d', to: 'now', }); expect( - (services as DashboardAppServices & { data: DashboardServices['data'] }).data.query - .filterManager.setAppFilters + pluginServices.getServices().data.query.filterManager.setAppFilters ).toHaveBeenCalledWith([{ meta: { test: 'filterMeTimbers' } } as unknown as Filter]); }); diff --git a/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.ts b/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.ts index 932bfdd016b38..850c6f575904c 100644 --- a/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.ts +++ b/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.ts @@ -6,50 +6,45 @@ * Side Public License, v 1. */ +import { omit } from 'lodash'; import { History } from 'history'; import { debounceTime, switchMap } from 'rxjs/operators'; import { useCallback, useEffect, useMemo, useState } from 'react'; import { BehaviorSubject, combineLatest, Observable, Subject } from 'rxjs'; import { ViewMode } from '@kbn/embeddable-plugin/public'; -import { useKibana } from '@kbn/kibana-react-plugin/public'; import type { IKbnUrlStateStorage } from '@kbn/kibana-utils-plugin/public'; -import { DashboardConstants } from '../..'; -import { getNewDashboardTitle } from '../../dashboard_strings'; -import { setDashboardState, useDashboardDispatch, useDashboardSelector } from '../state'; -import type { - DashboardBuildContext, - DashboardAppServices, - DashboardAppState, - DashboardState, -} from '../../types'; -import { DashboardAppLocatorParams } from '../../locator'; import { - loadDashboardHistoryLocationState, - tryDestroyDashboardContainer, - syncDashboardContainerInput, - savedObjectToDashboardState, + diffDashboardState, + syncDashboardUrlState, syncDashboardDataViews, - syncDashboardFilterState, - loadSavedDashboardState, buildDashboardContainer, - syncDashboardUrlState, - diffDashboardState, - areTimeRangesEqual, - areRefreshIntervalsEqual, + syncDashboardFilterState, + syncDashboardContainerInput, + tryDestroyDashboardContainer, + loadDashboardHistoryLocationState, } from '../lib'; -import { isDashboardAppInNoDataState } from '../dashboard_app_no_data'; +import { + dashboardStateLoadWasSuccessful, + LoadDashboardFromSavedObjectReturn, +} from '../../services/dashboard_saved_object/lib/load_dashboard_state_from_saved_object'; +import { DashboardConstants } from '../..'; +import { DashboardAppLocatorParams } from '../../locator'; +import { dashboardSavedObjectErrorStrings, getNewDashboardTitle } from '../../dashboard_strings'; import { pluginServices } from '../../services/plugin_services'; import { useDashboardMountContext } from './dashboard_mount_context'; +import { isDashboardAppInNoDataState } from '../dashboard_app_no_data'; +import { setDashboardState, useDashboardDispatch, useDashboardSelector } from '../state'; +import type { DashboardBuildContext, DashboardAppState, DashboardState } from '../../types'; export interface UseDashboardStateProps { history: History; showNoDataPage: boolean; savedDashboardId?: string; isEmbeddedExternally: boolean; - setShowNoDataPage: (showNoData: boolean) => void; kbnUrlStateStorage: IKbnUrlStateStorage; + setShowNoDataPage: (showNoData: boolean) => void; } export const useDashboardAppState = ({ @@ -79,25 +74,23 @@ export const useDashboardAppState = ({ const [lastSavedState, setLastSavedState] = useState(); const $onLastSavedStateChange = useMemo(() => new Subject(), []); - const { - services: { savedDashboards }, - } = useKibana(); - /** * Unpack services and context */ const { scopedHistory } = useDashboardMountContext(); const { + embeddable, + notifications: { toasts }, chrome: { docTitle }, dashboardCapabilities, dashboardSessionStorage, + spaces: { redirectLegacyUrl }, data: { query, search, dataViews }, - embeddable, initializerContext: { kibanaVersion }, screenshotMode: { isScreenshotMode, getScreenshotContext }, - spaces: { redirectLegacyUrl }, - notifications, + dashboardSavedObject: { loadDashboardStateFromSavedObject }, } = pluginServices.getServices(); + const { getStateTransfer } = embeddable; /** @@ -120,7 +113,6 @@ export const useDashboardAppState = ({ */ const dashboardBuildContext: DashboardBuildContext = { history, - savedDashboards, kbnUrlStateStorage, isEmbeddedExternally, dispatchDashboardStateChange, @@ -149,33 +141,25 @@ export const useDashboardAppState = ({ /** * Load and unpack state from dashboard saved object. */ - const loadSavedDashboardResult = await loadSavedDashboardState({ - ...dashboardBuildContext, - savedDashboardId, - }); - if (canceled || !loadSavedDashboardResult) return; - const { savedDashboard, savedDashboardState } = loadSavedDashboardResult; - - // If the saved dashboard is an alias match, then we will redirect - if (savedDashboard.outcome === 'aliasMatch' && savedDashboard.id && savedDashboard.aliasId) { - // We want to keep the "query" params on our redirect. - // But, these aren't true query params, they are technically part of the hash - // So, to get the new path, we will just replace the current id in the hash - // with the alias id - const path = scopedHistory().location.hash.replace( - savedDashboard.id, - savedDashboard.aliasId - ); - const aliasPurpose = savedDashboard.aliasPurpose; - if (isScreenshotMode()) { - scopedHistory().replace(path); - } else { - await redirectLegacyUrl?.({ path, aliasPurpose }); - } - // Return so we don't run any more of the hook and let it rerun after the redirect that just happened + let loadSavedDashboardResult: LoadDashboardFromSavedObjectReturn; + try { + loadSavedDashboardResult = await loadDashboardStateFromSavedObject({ + getScopedHistory: scopedHistory, + id: savedDashboardId, + }); + } catch (error) { + // redirect back to landing page if dashboard could not be loaded. + toasts.addDanger(dashboardSavedObjectErrorStrings.getDashboardLoadError(error.message)); + history.push(DashboardConstants.LANDING_PAGE_PATH); + return; + } + if (canceled || !dashboardStateLoadWasSuccessful(loadSavedDashboardResult)) { return; } + const { dashboardState: savedDashboardState, createConflictWarning } = + loadSavedDashboardResult; + /** * Combine initial state from the saved object, session storage, and URL, then dispatch it to Redux. */ @@ -187,12 +171,11 @@ export const useDashboardAppState = ({ const { initialDashboardStateFromUrl, stopWatchingAppStateInUrl } = syncDashboardUrlState({ ...dashboardBuildContext, - savedDashboard, }); const printLayoutDetected = isScreenshotMode() && getScreenshotContext('layout') === 'print'; - const initialDashboardState = { + const initialDashboardState: DashboardState = { ...savedDashboardState, ...dashboardSessionStorageState, ...initialDashboardStateFromUrl, @@ -208,10 +191,9 @@ export const useDashboardAppState = ({ /** * Start syncing dashboard state with the Query, Filters and Timepicker from the Query Service. */ - const { applyFilters, stopSyncingDashboardFilterState } = syncDashboardFilterState({ + const { stopSyncingDashboardFilterState } = syncDashboardFilterState({ ...dashboardBuildContext, initialDashboardState, - savedDashboard, }); /** @@ -222,10 +204,9 @@ export const useDashboardAppState = ({ ...dashboardBuildContext, initialDashboardState, incomingEmbeddable, - savedDashboard, executionContext: { type: 'dashboard', - description: savedDashboard.title, + description: initialDashboardState.title, }, }); @@ -256,15 +237,13 @@ export const useDashboardAppState = ({ const stopSyncingContainerInput = syncDashboardContainerInput({ ...dashboardBuildContext, dashboardContainer, - savedDashboard, - applyFilters, }); /** * Any time the redux state, or the last saved state changes, compare them, set the unsaved * changes state, and and push the unsaved changes to session storage. */ - const { timefilter } = query.timefilter; + const lastSavedSubscription = combineLatest([ $onLastSavedStateChange, dashboardAppState.$onDashboardStateChange, @@ -281,31 +260,24 @@ export const useDashboardAppState = ({ newState: current, }).then((unsavedChanges) => { if (observer.closed) return; - const savedTimeChanged = - lastSaved.timeRestore && - (!areTimeRangesEqual( - { - from: savedDashboard?.timeFrom, - to: savedDashboard?.timeTo, - }, - timefilter.getTime() - ) || - !areRefreshIntervalsEqual( - savedDashboard?.refreshInterval, - timefilter.getRefreshInterval() - )); - /** * changes to the dashboard should only be considered 'unsaved changes' when * editing the dashboard */ const hasUnsavedChanges = - current.viewMode === ViewMode.EDIT && - (Object.keys(unsavedChanges).length > 0 || savedTimeChanged); + current.viewMode === ViewMode.EDIT && Object.keys(unsavedChanges).length > 0; setDashboardAppState((s) => ({ ...s, hasUnsavedChanges })); unsavedChanges.viewMode = current.viewMode; // always push view mode into session store. - dashboardSessionStorage.setState(savedDashboardId, unsavedChanges); + + /** + * Current behaviour expects time range not to be backed up. + * TODO: Revisit this. It seems like we should treat all state the same. + */ + dashboardSessionStorage.setState( + savedDashboardId, + omit(unsavedChanges, ['timeRange', 'refreshInterval']) + ); }); }); }) @@ -319,11 +291,7 @@ export const useDashboardAppState = ({ setLastSavedState(savedDashboardState); dashboardBuildContext.$checkForUnsavedChanges.next(undefined); const updateLastSavedState = () => { - setLastSavedState( - savedObjectToDashboardState({ - savedDashboard, - }) - ); + setLastSavedState(dashboardBuildContext.getLatestDashboardState()); }; /** @@ -332,10 +300,9 @@ export const useDashboardAppState = ({ docTitle.change(savedDashboardState.title || getNewDashboardTitle()); setDashboardAppState((s) => ({ ...s, - applyFilters, - savedDashboard, dashboardContainer, updateLastSavedState, + createConflictWarning, getLatestDashboardState: dashboardBuildContext.getLatestDashboardState, })); @@ -359,47 +326,43 @@ export const useDashboardAppState = ({ }, [ dashboardAppState.$triggerDashboardRefresh, dashboardAppState.$onDashboardStateChange, + loadDashboardStateFromSavedObject, dispatchDashboardStateChange, $onLastSavedStateChange, dashboardSessionStorage, dashboardCapabilities, isEmbeddedExternally, + getScreenshotContext, kbnUrlStateStorage, + setShowNoDataPage, + redirectLegacyUrl, savedDashboardId, + isScreenshotMode, getStateTransfer, - savedDashboards, + showNoDataPage, scopedHistory, - notifications, - dataViews, kibanaVersion, + dataViews, embeddable, docTitle, history, + toasts, search, query, - showNoDataPage, - setShowNoDataPage, - redirectLegacyUrl, - getScreenshotContext, - isScreenshotMode, ]); /** * rebuild reset to last saved state callback whenever last saved state changes */ const resetToLastSavedState = useCallback(() => { - if ( - !lastSavedState || - !dashboardAppState.savedDashboard || - !dashboardAppState.getLatestDashboardState - ) { + if (!lastSavedState || !dashboardAppState.getLatestDashboardState) { return; } if (dashboardAppState.getLatestDashboardState().timeRestore) { const { timefilter } = query.timefilter; - const { timeFrom: from, timeTo: to, refreshInterval } = dashboardAppState.savedDashboard; - if (from && to) timefilter.setTime({ from, to }); + const { timeRange, refreshInterval } = lastSavedState; + if (timeRange) timefilter.setTime(timeRange); if (refreshInterval) timefilter.setRefreshInterval(refreshInterval); } dispatchDashboardStateChange( diff --git a/src/plugins/dashboard/public/application/lib/build_dashboard_container.ts b/src/plugins/dashboard/public/application/lib/build_dashboard_container.ts index 8ad2b7ddc52e2..2d5304e002d54 100644 --- a/src/plugins/dashboard/public/application/lib/build_dashboard_container.ts +++ b/src/plugins/dashboard/public/application/lib/build_dashboard_container.ts @@ -16,8 +16,7 @@ import { isErrorEmbeddable, } from '@kbn/embeddable-plugin/public'; -import { DashboardSavedObject } from '../../saved_dashboards'; -import { DashboardContainer, DASHBOARD_CONTAINER_TYPE } from '../embeddable'; +import { DashboardContainer } from '../embeddable'; import { DashboardBuildContext, DashboardState, DashboardContainerInput } from '../../types'; import { enableDashboardSearchSessions, @@ -25,9 +24,9 @@ import { stateToDashboardContainerInput, } from '.'; import { pluginServices } from '../../services/plugin_services'; +import { DASHBOARD_CONTAINER_TYPE } from '../../dashboard_constants'; type BuildDashboardContainerProps = DashboardBuildContext & { - savedDashboard: DashboardSavedObject; initialDashboardState: DashboardState; incomingEmbeddable?: EmbeddablePackageState; executionContext?: KibanaExecutionContext; @@ -41,7 +40,6 @@ export const buildDashboardContainer = async ({ initialDashboardState, isEmbeddedExternally, incomingEmbeddable, - savedDashboard, history, executionContext, }: BuildDashboardContainerProps) => { @@ -55,7 +53,6 @@ export const buildDashboardContainer = async ({ // set up search session enableDashboardSearchSessions({ - savedDashboard, initialDashboardState, getLatestDashboardState, canStoreSearchSession, @@ -95,7 +92,6 @@ export const buildDashboardContainer = async ({ dashboardState: initialDashboardState, incomingEmbeddable, searchSessionId, - savedDashboard, executionContext, }); diff --git a/src/plugins/dashboard/public/application/lib/convert_dashboard_panels.ts b/src/plugins/dashboard/public/application/lib/convert_dashboard_panels.ts deleted file mode 100644 index 8e74245137f8e..0000000000000 --- a/src/plugins/dashboard/public/application/lib/convert_dashboard_panels.ts +++ /dev/null @@ -1,32 +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. - */ - -import { - convertSavedDashboardPanelToPanelState, - convertPanelStateToSavedDashboardPanel, -} from '../../../common/embeddable/embeddable_saved_object_converters'; -import { pluginServices } from '../../services/plugin_services'; -import type { SavedDashboardPanel, DashboardPanelMap } from '../../types'; - -export const convertSavedPanelsToPanelMap = (panels?: SavedDashboardPanel[]): DashboardPanelMap => { - const panelsMap: DashboardPanelMap = {}; - panels?.forEach((panel, idx) => { - panelsMap![panel.panelIndex ?? String(idx)] = convertSavedDashboardPanelToPanelState(panel); - }); - return panelsMap; -}; - -export const convertPanelMapToSavedPanels = (panels: DashboardPanelMap) => { - const { - initializerContext: { kibanaVersion }, - } = pluginServices.getServices(); - - return Object.values(panels).map((panel) => - convertPanelStateToSavedDashboardPanel(panel, kibanaVersion) - ); -}; diff --git a/src/plugins/dashboard/public/application/lib/convert_dashboard_state.ts b/src/plugins/dashboard/public/application/lib/convert_dashboard_state.ts index c9e954a081ca2..14e0f4ac4c171 100644 --- a/src/plugins/dashboard/public/application/lib/convert_dashboard_state.ts +++ b/src/plugins/dashboard/public/application/lib/convert_dashboard_state.ts @@ -6,37 +6,21 @@ * Side Public License, v 1. */ -import _ from 'lodash'; +import { cloneDeep, omit } from 'lodash'; import type { KibanaExecutionContext } from '@kbn/core/public'; -import type { ControlGroupInput } from '@kbn/controls-plugin/public'; -import { type EmbeddablePackageState, ViewMode } from '@kbn/embeddable-plugin/public'; -import { - compareFilters, - COMPARE_ALL_OPTIONS, - Filter, - isFilterPinned, - TimeRange, -} from '@kbn/es-query'; import { mapAndFlattenFilters } from '@kbn/data-plugin/public'; +import { type EmbeddablePackageState } from '@kbn/embeddable-plugin/public'; +import { Filter, isFilterPinned, compareFilters, COMPARE_ALL_OPTIONS } from '@kbn/es-query'; -import type { DashboardSavedObject } from '../../saved_dashboards'; -import { getTagsFromSavedDashboard, migrateAppState } from '.'; -import { convertPanelStateToSavedDashboardPanel } from '../../../common/embeddable/embeddable_saved_object_converters'; -import type { DashboardState, RawDashboardState, DashboardContainerInput } from '../../types'; -import { convertSavedPanelsToPanelMap } from './convert_dashboard_panels'; -import { deserializeControlGroupFromDashboardSavedObject } from './dashboard_control_group'; import { pluginServices } from '../../services/plugin_services'; - -interface SavedObjectToDashboardStateProps { - savedDashboard: DashboardSavedObject; -} +import { convertPanelStateToSavedDashboardPanel } from '../../../common'; +import type { DashboardState, RawDashboardState, DashboardContainerInput } from '../../types'; interface StateToDashboardContainerInputProps { searchSessionId?: string; isEmbeddedExternally?: boolean; dashboardState: DashboardState; - savedDashboard: DashboardSavedObject; incomingEmbeddable?: EmbeddablePackageState; executionContext?: KibanaExecutionContext; } @@ -44,40 +28,6 @@ interface StateToDashboardContainerInputProps { interface StateToRawDashboardStateProps { state: DashboardState; } -/** - * Converts a dashboard saved object to a dashboard state by extracting raw state from the given Dashboard - * Saved Object migrating the panel states to the latest version, then converting each panel from a saved - * dashboard panel to a panel state. - */ -export const savedObjectToDashboardState = ({ - savedDashboard, -}: SavedObjectToDashboardStateProps): DashboardState => { - const { - dashboardCapabilities: { showWriteControls }, - } = pluginServices.getServices(); - - const rawState = migrateAppState({ - fullScreenMode: false, - title: savedDashboard.title, - query: savedDashboard.getQuery(), - filters: savedDashboard.getFilters(), - timeRestore: savedDashboard.timeRestore, - description: savedDashboard.description || '', - tags: getTagsFromSavedDashboard(savedDashboard), - panels: savedDashboard.panelsJSON ? JSON.parse(savedDashboard.panelsJSON) : [], - viewMode: savedDashboard.id || showWriteControls ? ViewMode.EDIT : ViewMode.VIEW, - options: savedDashboard.optionsJSON ? JSON.parse(savedDashboard.optionsJSON) : {}, - }); - - if (rawState.timeRestore) { - rawState.timeRange = { from: savedDashboard.timeFrom, to: savedDashboard.timeTo } as TimeRange; - } - - rawState.controlGroupInput = deserializeControlGroupFromDashboardSavedObject( - savedDashboard - ) as ControlGroupInput; - return { ...rawState, panels: convertSavedPanelsToPanelMap(rawState.panels) }; -}; /** * Converts a dashboard state object to dashboard container input @@ -85,7 +35,6 @@ export const savedObjectToDashboardState = ({ export const stateToDashboardContainerInput = ({ isEmbeddedExternally, searchSessionId, - savedDashboard, dashboardState, executionContext, }: StateToDashboardContainerInputProps): DashboardContainerInput => { @@ -111,7 +60,7 @@ export const stateToDashboardContainerInput = ({ filters: dashboardFilters, } = dashboardState; - const migratedDashboardFilters = mapAndFlattenFilters(_.cloneDeep(dashboardFilters)); + const migratedDashboardFilters = mapAndFlattenFilters(cloneDeep(dashboardFilters)); return { refreshConfig: timefilter.getRefreshInterval(), filters: filterManager @@ -124,7 +73,7 @@ export const stateToDashboardContainerInput = ({ ) ), isFullScreenMode: fullScreenMode, - id: savedDashboard.id || '', + id: dashboardState.savedObjectId ?? '', isEmbeddedExternally, ...(options || {}), controlGroupInput, @@ -136,7 +85,7 @@ export const stateToDashboardContainerInput = ({ query, title, timeRange: { - ..._.cloneDeep(timefilter.getTime()), + ...cloneDeep(timefilter.getTime()), }, timeslice, timeRestore, @@ -161,5 +110,5 @@ export const stateToRawDashboardState = ({ const savedDashboardPanels = Object.values(state.panels).map((panel) => convertPanelStateToSavedDashboardPanel(panel, kibanaVersion) ); - return { ..._.omit(state, 'panels'), panels: savedDashboardPanels }; + return { ...omit(state, 'panels'), panels: savedDashboardPanels }; }; diff --git a/src/plugins/dashboard/public/application/lib/dashboard_control_group.ts b/src/plugins/dashboard/public/application/lib/dashboard_control_group.ts index a9f474ed85dd0..4f44d0cf250d1 100644 --- a/src/plugins/dashboard/public/application/lib/dashboard_control_group.ts +++ b/src/plugins/dashboard/public/application/lib/dashboard_control_group.ts @@ -14,16 +14,15 @@ import { debounceTime, distinctUntilChanged, distinctUntilKeyChanged } from 'rxj import { ControlGroupInput, - controlGroupInputToRawControlGroupAttributes, getDefaultControlGroupInput, persistableControlGroupInputIsEqual, - rawControlGroupAttributesToControlGroupInput, + controlGroupInputToRawControlGroupAttributes, } from '@kbn/controls-plugin/common'; import { ControlGroupContainer } from '@kbn/controls-plugin/public'; import { DashboardContainer } from '..'; import { DashboardState } from '../../types'; -import { DashboardContainerInput, DashboardSavedObject } from '../..'; +import { DashboardContainerInput } from '../..'; interface DiffChecks { [key: string]: (a?: unknown, b?: unknown) => boolean; @@ -169,32 +168,17 @@ export const syncDashboardControlGroup = async ({ }; }; -export const serializeControlGroupToDashboardSavedObject = ( - dashboardSavedObject: DashboardSavedObject, - dashboardState: DashboardState +export const serializeControlGroupInput = ( + controlGroupInput: DashboardState['controlGroupInput'] ) => { // only save to saved object if control group is not default if ( - persistableControlGroupInputIsEqual( - dashboardState.controlGroupInput, - getDefaultControlGroupInput() - ) + !controlGroupInput || + persistableControlGroupInputIsEqual(controlGroupInput, getDefaultControlGroupInput()) ) { - dashboardSavedObject.controlGroupInput = undefined; - return; + return undefined; } - if (dashboardState.controlGroupInput) { - dashboardSavedObject.controlGroupInput = controlGroupInputToRawControlGroupAttributes( - dashboardState.controlGroupInput - ); - } -}; - -export const deserializeControlGroupFromDashboardSavedObject = ( - dashboardSavedObject: DashboardSavedObject -): Omit | undefined => { - if (!dashboardSavedObject.controlGroupInput) return; - return rawControlGroupAttributesToControlGroupInput(dashboardSavedObject.controlGroupInput); + return controlGroupInputToRawControlGroupAttributes(controlGroupInput); }; export const combineDashboardFiltersWithControlGroupFilters = ( diff --git a/src/plugins/dashboard/public/application/lib/session_restoration.test.ts b/src/plugins/dashboard/public/application/lib/dashboard_session_restoration.test.ts similarity index 89% rename from src/plugins/dashboard/public/application/lib/session_restoration.test.ts rename to src/plugins/dashboard/public/application/lib/dashboard_session_restoration.test.ts index aeb83dd8a6e4c..56ee2ac55f445 100644 --- a/src/plugins/dashboard/public/application/lib/session_restoration.test.ts +++ b/src/plugins/dashboard/public/application/lib/dashboard_session_restoration.test.ts @@ -6,16 +6,13 @@ * Side Public License, v 1. */ -import { getSavedDashboardMock } from '../test_helpers'; -import { createSessionRestorationDataProvider, savedObjectToDashboardState } from '.'; +import { DashboardState } from '../../types'; +import { createSessionRestorationDataProvider } from '.'; import { pluginServices } from '../../services/plugin_services'; describe('createSessionRestorationDataProvider', () => { const searchSessionInfoProvider = createSessionRestorationDataProvider({ - getAppState: () => - savedObjectToDashboardState({ - savedDashboard: getSavedDashboardMock(), - }), + getAppState: () => ({ panels: {} } as unknown as DashboardState), getDashboardTitle: () => 'Dashboard', getDashboardId: () => 'Id', }); diff --git a/src/plugins/dashboard/public/application/lib/dashboard_session_restoration.ts b/src/plugins/dashboard/public/application/lib/dashboard_session_restoration.ts index b2cedeee4ee04..113c39d0717ba 100644 --- a/src/plugins/dashboard/public/application/lib/dashboard_session_restoration.ts +++ b/src/plugins/dashboard/public/application/lib/dashboard_session_restoration.ts @@ -17,12 +17,11 @@ import { import { getQueryParams } from '@kbn/kibana-utils-plugin/public'; import type { DashboardState } from '../../types'; -import type { DashboardSavedObject } from '../../saved_dashboards'; -import { DashboardAppLocatorParams, DashboardConstants } from '../..'; -import { getDashboardTitle } from '../../dashboard_strings'; -import { stateToRawDashboardState } from './convert_dashboard_state'; import { DASHBOARD_APP_LOCATOR } from '../../locator'; +import { getDashboardTitle } from '../../dashboard_strings'; import { pluginServices } from '../../services/plugin_services'; +import { DashboardAppLocatorParams, DashboardConstants } from '../..'; +import { stateToRawDashboardState } from './convert_dashboard_state'; export const getSearchSessionIdFromURL = (history: History): string | undefined => getQueryParams(history.location)[DashboardConstants.SEARCH_SESSION_ID] as string | undefined; @@ -52,10 +51,8 @@ export function enableDashboardSearchSessions({ canStoreSearchSession, initialDashboardState, getLatestDashboardState, - savedDashboard, }: { canStoreSearchSession: boolean; - savedDashboard: DashboardSavedObject; initialDashboardState: DashboardState; getLatestDashboardState: () => DashboardState; }) { @@ -63,13 +60,13 @@ export function enableDashboardSearchSessions({ const dashboardTitle = getDashboardTitle( initialDashboardState.title, initialDashboardState.viewMode, - !savedDashboard.id + !getLatestDashboardState().savedObjectId ); data.search.session.enableStorage( createSessionRestorationDataProvider({ getDashboardTitle: () => dashboardTitle, - getDashboardId: () => savedDashboard?.id || '', + getDashboardId: () => getLatestDashboardState().savedObjectId ?? '', getAppState: getLatestDashboardState, }), { @@ -106,7 +103,7 @@ function getLocatorParams({ return { timeRange: shouldRestoreSearchSession ? timefilter.getAbsoluteTime() : timefilter.getTime(), searchSessionId: shouldRestoreSearchSession ? data.search.session.getSessionId() : undefined, - panels: getDashboardId() ? undefined : appState.panels, + panels: getDashboardId() ? undefined : (appState.panels as DashboardAppLocatorParams['panels']), query: queryString.formatQuery(appState.query) as Query, filters: filterManager.getFilters(), savedQuery: appState.savedQuery, diff --git a/src/plugins/dashboard/public/application/lib/dashboard_tagging.ts b/src/plugins/dashboard/public/application/lib/dashboard_tagging.ts deleted file mode 100644 index 0a8ec17aeb2f1..0000000000000 --- a/src/plugins/dashboard/public/application/lib/dashboard_tagging.ts +++ /dev/null @@ -1,31 +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. - */ - -import type { TagDecoratedSavedObject } from '@kbn/saved-objects-tagging-oss-plugin/public'; -import type { SavedObject } from '@kbn/saved-objects-plugin/public'; - -import { DashboardSavedObject } from '../..'; -import { pluginServices } from '../../services/plugin_services'; - -// TS is picky with type guards, we can't just inline `() => false` -function defaultTaggingGuard(_obj: SavedObject): _obj is TagDecoratedSavedObject { - return false; -} - -export const getTagsFromSavedDashboard = (savedDashboard: DashboardSavedObject) => { - const hasTaggingCapabilities = getHasTaggingCapabilitiesGuard(); - return hasTaggingCapabilities(savedDashboard) ? savedDashboard.getTags() : []; -}; - -export const getHasTaggingCapabilitiesGuard = () => { - const { - savedObjectsTagging: { hasTagDecoration }, - } = pluginServices.getServices(); - - return hasTagDecoration || defaultTaggingGuard; -}; diff --git a/src/plugins/dashboard/public/application/lib/diff_dashboard_state.ts b/src/plugins/dashboard/public/application/lib/diff_dashboard_state.ts index ca913199a3ba2..1c57d1bd2afa9 100644 --- a/src/plugins/dashboard/public/application/lib/diff_dashboard_state.ts +++ b/src/plugins/dashboard/public/application/lib/diff_dashboard_state.ts @@ -6,14 +6,25 @@ * Side Public License, v 1. */ -import { xor, omit, isEmpty } from 'lodash'; import fastIsEqual from 'fast-deep-equal'; -import { compareFilters, COMPARE_ALL_OPTIONS, type Filter, isFilterPinned } from '@kbn/es-query'; +import { xor, omit, isEmpty, pick } from 'lodash'; + +import { + compareFilters, + COMPARE_ALL_OPTIONS, + type Filter, + isFilterPinned, + TimeRange, +} from '@kbn/es-query'; +import { RefreshInterval } from '@kbn/data-plugin/common'; import { IEmbeddable } from '@kbn/embeddable-plugin/public'; - import { persistableControlGroupInputIsEqual } from '@kbn/controls-plugin/common'; + import { DashboardContainerInput } from '../..'; -import { DashboardOptions, DashboardPanelMap, DashboardState } from '../../types'; +import { areTimesEqual } from './filter_utils'; +import { DashboardPanelMap } from '../embeddable'; +import { DashboardOptions, DashboardState } from '../../types'; +import { pluginServices } from '../../services/plugin_services'; const stateKeystoIgnore = [ 'expandedPanelId', @@ -96,15 +107,67 @@ export const diffDashboardState = async ({ newState.controlGroupInput ); + const timeStatediff = getTimeSettingsAreEqual({ + currentTimeRestore: newState.timeRestore, + lastSaved: { ...pick(originalState, ['timeRange', 'timeRestore', 'refreshInterval']) }, + }) + ? {} + : pick(newState, ['timeRange', 'timeRestore', 'refreshInterval']); + return { ...commonStateDiff, ...(panelsAreEqual ? {} : { panels: newState.panels }), ...(filtersAreEqual ? {} : { filters: newState.filters }), ...(optionsAreEqual ? {} : { options: newState.options }), ...(controlGroupIsEqual ? {} : { controlGroupInput: newState.controlGroupInput }), + ...timeStatediff, }; }; +interface TimeStateDiffArg { + timeRange?: TimeRange; + timeRestore?: boolean; + refreshInterval?: RefreshInterval; +} + +export const getTimeSettingsAreEqual = ({ + lastSaved, + currentTimeRestore, +}: { + lastSaved?: TimeStateDiffArg; + currentTimeRestore?: boolean; +}) => { + const { + data: { + query: { + timefilter: { timefilter }, + }, + }, + } = pluginServices.getServices(); + + if (currentTimeRestore !== lastSaved?.timeRestore) return false; + if (!currentTimeRestore) return true; + + const currentRange = timefilter.getTime(); + const lastRange = lastSaved?.timeRange ?? timefilter.getTimeDefaults(); + if ( + !areTimesEqual(currentRange.from, lastRange.from) || + !areTimesEqual(currentRange.to, lastRange.to) + ) { + return false; + } + + const currentInterval = timefilter.getRefreshInterval(); + const lastInterval = lastSaved?.refreshInterval ?? timefilter.getRefreshIntervalDefaults(); + if ( + currentInterval.pause !== lastInterval.pause || + currentInterval.value !== lastInterval.value + ) { + return false; + } + return true; +}; + const getFiltersAreEqual = ( filtersA: Filter[], filtersB: Filter[], diff --git a/src/plugins/dashboard/public/application/lib/filter_utils.ts b/src/plugins/dashboard/public/application/lib/filter_utils.ts index 9b9a1270fd3ba..fb2762c7dc587 100644 --- a/src/plugins/dashboard/public/application/lib/filter_utils.ts +++ b/src/plugins/dashboard/public/application/lib/filter_utils.ts @@ -8,12 +8,7 @@ import _ from 'lodash'; import moment, { Moment } from 'moment'; -import type { Optional } from '@kbn/utility-types'; -import type { RefreshInterval } from '@kbn/data-plugin/public'; -import type { Filter, TimeRange } from '@kbn/es-query'; - -type TimeRangeCompare = Optional; -type RefreshIntervalCompare = Optional; +import type { Filter } from '@kbn/es-query'; /** * Converts the time to a utc formatted string. If the time is not valid (e.g. it might be in a relative format like @@ -32,22 +27,6 @@ export const convertTimeToUTCString = (time?: string | Moment): undefined | stri } }; -export const areTimeRangesEqual = (rangeA: TimeRangeCompare, rangeB: TimeRangeCompare): boolean => - areTimesEqual(rangeA.from, rangeB.from) && areTimesEqual(rangeA.to, rangeB.to); - -export const areRefreshIntervalsEqual = ( - refreshA?: RefreshIntervalCompare, - refreshB?: RefreshIntervalCompare -): boolean => refreshA?.pause === refreshB?.pause && refreshA?.value === refreshB?.value; - -/** - * Compares the two times, making sure they are in both compared in string format. Absolute times - * are sometimes stored as moment objects, but converted to strings when reloaded. Relative times are - * strings that are not convertible to moment objects. - * @param timeA {string|Moment} - * @param timeB {string|Moment} - * @returns {boolean} - */ export const areTimesEqual = (timeA?: string | Moment, timeB?: string | Moment) => { return convertTimeToUTCString(timeA) === convertTimeToUTCString(timeB); }; diff --git a/src/plugins/dashboard/public/application/lib/index.ts b/src/plugins/dashboard/public/application/lib/index.ts index 1b4ab12d2bc1b..0f364a31061d3 100644 --- a/src/plugins/dashboard/public/application/lib/index.ts +++ b/src/plugins/dashboard/public/application/lib/index.ts @@ -6,28 +6,24 @@ * Side Public License, v 1. */ -export * from './filter_utils'; -export { getDashboardIdFromUrl } from './url'; -export { saveDashboard } from './save_dashboard'; -export { migrateAppState } from './migrate_app_state'; -export { addHelpMenuToAppChrome } from './help_menu_util'; -export { diffDashboardState } from './diff_dashboard_state'; -export { getTagsFromSavedDashboard } from './dashboard_tagging'; -export { syncDashboardUrlState } from './sync_dashboard_url_state'; -export { loadSavedDashboardState } from './load_saved_dashboard_state'; -export { attemptLoadDashboardByTitle } from './load_dashboard_by_title'; -export { syncDashboardFilterState } from './sync_dashboard_filter_state'; -export { syncDashboardDataViews } from './sync_dashboard_data_views'; -export { syncDashboardContainerInput } from './sync_dashboard_container_input'; -export { loadDashboardHistoryLocationState } from './load_dashboard_history_location_state'; -export { buildDashboardContainer, tryDestroyDashboardContainer } from './build_dashboard_container'; export { - stateToDashboardContainerInput, - savedObjectToDashboardState, -} from './convert_dashboard_state'; + areTimesEqual, + convertTimeToUTCString, + cleanFiltersForSerialize, + cleanFiltersForComparison, +} from './filter_utils'; export { createSessionRestorationDataProvider, enableDashboardSearchSessions, getSearchSessionIdFromURL, getSessionURLObservable, } from './dashboard_session_restoration'; +export { addHelpMenuToAppChrome } from './help_menu_util'; +export { diffDashboardState } from './diff_dashboard_state'; +export { syncDashboardUrlState } from './sync_dashboard_url_state'; +export { syncDashboardDataViews } from './sync_dashboard_data_views'; +export { syncDashboardFilterState } from './sync_dashboard_filter_state'; +export { stateToDashboardContainerInput } from './convert_dashboard_state'; +export { syncDashboardContainerInput } from './sync_dashboard_container_input'; +export { loadDashboardHistoryLocationState } from './load_dashboard_history_location_state'; +export { buildDashboardContainer, tryDestroyDashboardContainer } from './build_dashboard_container'; diff --git a/src/plugins/dashboard/public/application/lib/load_dashboard_by_title.ts b/src/plugins/dashboard/public/application/lib/load_dashboard_by_title.ts deleted file mode 100644 index bff9f8600c0ed..0000000000000 --- a/src/plugins/dashboard/public/application/lib/load_dashboard_by_title.ts +++ /dev/null @@ -1,31 +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. - */ - -import { DashboardSavedObject } from '../..'; -import { pluginServices } from '../../services/plugin_services'; - -export async function attemptLoadDashboardByTitle( - title: string -): Promise<{ id: string } | undefined> { - const { - savedObjects: { client }, - } = pluginServices.getServices(); - - const results = await client.find({ - search: `"${title}"`, - searchFields: ['title'], - type: 'dashboard', - }); - // The search isn't an exact match, lets see if we can find a single exact match to use - const matchingDashboards = results.savedObjects.filter( - (dashboard) => dashboard.attributes.title.toLowerCase() === title.toLowerCase() - ); - if (matchingDashboards.length === 1) { - return { id: matchingDashboards[0].id }; - } -} diff --git a/src/plugins/dashboard/public/application/lib/load_dashboard_history_location_state.ts b/src/plugins/dashboard/public/application/lib/load_dashboard_history_location_state.ts index ce06ef443d69f..9a7d1791c6c94 100644 --- a/src/plugins/dashboard/public/application/lib/load_dashboard_history_location_state.ts +++ b/src/plugins/dashboard/public/application/lib/load_dashboard_history_location_state.ts @@ -6,9 +6,9 @@ * Side Public License, v 1. */ -import { ForwardedDashboardState } from '../../locator'; import { DashboardState } from '../../types'; -import { convertSavedPanelsToPanelMap } from './convert_dashboard_panels'; +import { ForwardedDashboardState } from '../../locator'; +import { convertSavedPanelsToPanelMap } from '../../../common'; export const loadDashboardHistoryLocationState = ( state?: ForwardedDashboardState diff --git a/src/plugins/dashboard/public/application/lib/load_saved_dashboard_state.ts b/src/plugins/dashboard/public/application/lib/load_saved_dashboard_state.ts deleted file mode 100644 index 6a7eba0884abe..0000000000000 --- a/src/plugins/dashboard/public/application/lib/load_saved_dashboard_state.ts +++ /dev/null @@ -1,74 +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. - */ - -import { ViewMode } from '@kbn/embeddable-plugin/public'; -import { getDashboard60Warning, dashboardLoadingErrorStrings } from '../../dashboard_strings'; -import { savedObjectToDashboardState } from './convert_dashboard_state'; -import { DashboardState, DashboardBuildContext } from '../../types'; -import { DashboardConstants, DashboardSavedObject } from '../..'; -import { migrateLegacyQuery } from './migrate_legacy_query'; -import { cleanFiltersForSerialize } from './filter_utils'; -import { pluginServices } from '../../services/plugin_services'; - -interface LoadSavedDashboardStateReturn { - savedDashboardState: DashboardState; - savedDashboard: DashboardSavedObject; -} - -/** - * Loads, migrates, and returns state from a dashboard saved object. - */ -export const loadSavedDashboardState = async ({ - history, - savedDashboards, - savedDashboardId, -}: DashboardBuildContext & { savedDashboardId?: string }): Promise< - LoadSavedDashboardStateReturn | undefined -> => { - const { - dashboardCapabilities: { showWriteControls }, - data: { - query: { queryString }, - }, - notifications: { toasts }, - } = pluginServices.getServices(); - - // BWC - remove for 8.0 - if (savedDashboardId === 'create') { - history.replace({ - ...history.location, // preserve query, - pathname: DashboardConstants.CREATE_NEW_DASHBOARD_URL, - }); - - toasts.addWarning(getDashboard60Warning()); - return; - } - try { - const savedDashboard = (await savedDashboards.get({ - id: savedDashboardId, - useResolve: true, - })) as DashboardSavedObject; - const savedDashboardState = savedObjectToDashboardState({ - savedDashboard, - }); - - const isViewMode = !showWriteControls || Boolean(savedDashboard.id); - savedDashboardState.viewMode = isViewMode ? ViewMode.VIEW : ViewMode.EDIT; - savedDashboardState.filters = cleanFiltersForSerialize(savedDashboardState.filters); - savedDashboardState.query = migrateLegacyQuery( - savedDashboardState.query || queryString.getDefaultQuery() - ); - - return { savedDashboardState, savedDashboard }; - } catch (error) { - // E.g. a corrupt or deleted dashboard - toasts.addDanger(dashboardLoadingErrorStrings.getDashboardLoadError(error.message)); - history.push(DashboardConstants.LANDING_PAGE_PATH); - return; - } -}; diff --git a/src/plugins/dashboard/public/application/lib/migrate_app_state.test.ts b/src/plugins/dashboard/public/application/lib/migrate_app_state.test.ts deleted file mode 100644 index 578439070e970..0000000000000 --- a/src/plugins/dashboard/public/application/lib/migrate_app_state.test.ts +++ /dev/null @@ -1,164 +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. - */ - -import { pluginServices } from '../../services/plugin_services'; -import { SavedDashboardPanel } from '../../types'; -import { migrateAppState } from './migrate_app_state'; - -pluginServices.getServices().initializerContext.kibanaVersion = '8.0'; - -test('migrate app state from 6.0', async () => { - const appState = { - uiState: { - 'P-1': { vis: { defaultColors: { '0+-+100': 'rgb(0,104,55)' } } }, - }, - panels: [ - { - col: 1, - id: 'Visualization-MetricChart', - panelIndex: 1, - row: 1, - size_x: 6, - size_y: 3, - type: 'visualization', - }, - ], - }; - migrateAppState(appState as any); - expect(appState.uiState).toBeUndefined(); - - const newPanel = appState.panels[0] as unknown as SavedDashboardPanel; - - expect(newPanel.gridData.w).toBe(24); - expect(newPanel.gridData.h).toBe(15); - expect(newPanel.gridData.x).toBe(0); - expect(newPanel.gridData.y).toBe(0); - - expect((newPanel.embeddableConfig as any).vis.defaultColors['0+-+100']).toBe('rgb(0,104,55)'); -}); - -test('migrate sort from 6.1', async () => { - const appState = { - uiState: { - 'P-1': { vis: { defaultColors: { '0+-+100': 'rgb(0,104,55)' } } }, - }, - panels: [ - { - col: 1, - id: 'Visualization-MetricChart', - panelIndex: 1, - row: 1, - size_x: 6, - size_y: 3, - type: 'visualization', - sort: 'sort', - }, - ], - useMargins: false, - }; - migrateAppState(appState as any); - expect(appState.uiState).toBeUndefined(); - - const newPanel = appState.panels[0] as unknown as SavedDashboardPanel; - expect(newPanel.gridData.w).toBe(24); - expect(newPanel.gridData.h).toBe(15); - expect((newPanel as any).sort).toBeUndefined(); - - expect((newPanel.embeddableConfig as any).sort).toBe('sort'); - expect((newPanel.embeddableConfig as any).vis.defaultColors['0+-+100']).toBe('rgb(0,104,55)'); -}); - -test('migrates 6.0 even when uiState does not exist', async () => { - const appState = { - panels: [ - { - col: 1, - id: 'Visualization-MetricChart', - panelIndex: 1, - row: 1, - size_x: 6, - size_y: 3, - type: 'visualization', - sort: 'sort', - }, - ], - }; - migrateAppState(appState as any); - expect((appState as any).uiState).toBeUndefined(); - - const newPanel = appState.panels[0] as unknown as SavedDashboardPanel; - expect(newPanel.gridData.w).toBe(24); - expect(newPanel.gridData.h).toBe(15); - expect((newPanel as any).sort).toBeUndefined(); - - expect((newPanel.embeddableConfig as any).sort).toBe('sort'); -}); - -test('6.2 migration adjusts w & h without margins', async () => { - const appState = { - panels: [ - { - id: 'Visualization-MetricChart', - panelIndex: 1, - gridData: { - h: 3, - w: 7, - x: 2, - y: 5, - }, - type: 'visualization', - sort: 'sort', - version: '6.2.0', - }, - ], - useMargins: false, - }; - migrateAppState(appState as any); - expect((appState as any).uiState).toBeUndefined(); - - const newPanel = appState.panels[0] as unknown as SavedDashboardPanel; - expect(newPanel.gridData.w).toBe(28); - expect(newPanel.gridData.h).toBe(15); - expect(newPanel.gridData.x).toBe(8); - expect(newPanel.gridData.y).toBe(25); - expect((newPanel as any).sort).toBeUndefined(); - - expect((newPanel.embeddableConfig as any).sort).toBe('sort'); -}); - -test('6.2 migration adjusts w & h with margins', async () => { - const appState = { - panels: [ - { - id: 'Visualization-MetricChart', - panelIndex: 1, - gridData: { - h: 3, - w: 7, - x: 2, - y: 5, - }, - type: 'visualization', - sort: 'sort', - version: '6.2.0', - }, - ], - useMargins: true, - }; - migrateAppState(appState as any); - expect((appState as any).uiState).toBeUndefined(); - - const newPanel = appState.panels[0] as unknown as SavedDashboardPanel; - expect(newPanel.gridData.w).toBe(28); - expect(newPanel.gridData.h).toBe(12); - expect(newPanel.gridData.x).toBe(8); - expect(newPanel.gridData.y).toBe(20); - expect((newPanel as any).sort).toBeUndefined(); - - expect((newPanel.embeddableConfig as any).sort).toBe('sort'); -}); diff --git a/src/plugins/dashboard/public/application/lib/migrate_app_state.ts b/src/plugins/dashboard/public/application/lib/migrate_app_state.ts deleted file mode 100644 index e077aab89ea8b..0000000000000 --- a/src/plugins/dashboard/public/application/lib/migrate_app_state.ts +++ /dev/null @@ -1,87 +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. - */ - -import semverSatisfies from 'semver/functions/satisfies'; - -import { i18n } from '@kbn/i18n'; -import { METRIC_TYPE } from '@kbn/analytics'; -import type { SerializableRecord } from '@kbn/utility-types'; - -import { RawDashboardState, SavedDashboardPanel } from '../../types'; -import type { - SavedDashboardPanelTo60, - SavedDashboardPanel730ToLatest, - SavedDashboardPanel610, - SavedDashboardPanel630, - SavedDashboardPanel640To720, - SavedDashboardPanel620, -} from '../../../common'; -import { migratePanelsTo730 } from '../../../common'; -import { pluginServices } from '../../services/plugin_services'; - -/** - * Attempts to migrate the state stored in the URL into the latest version of it. - * - * Once we hit a major version, we can remove support for older style URLs and get rid of this logic. - */ -export function migrateAppState( - appState: { [key: string]: any } & RawDashboardState -): RawDashboardState { - if (!appState.panels) { - throw new Error( - i18n.translate('dashboard.panel.invalidData', { - defaultMessage: 'Invalid data in url', - }) - ); - } - - const { - usageCollection: { reportUiCounter }, - initializerContext: { kibanaVersion }, - } = pluginServices.getServices(); - - const panelNeedsMigration = ( - appState.panels as Array< - | SavedDashboardPanelTo60 - | SavedDashboardPanel610 - | SavedDashboardPanel620 - | SavedDashboardPanel630 - | SavedDashboardPanel640To720 - | SavedDashboardPanel730ToLatest - > - ).some((panel) => { - if ((panel as { version?: string }).version === undefined) return true; - - const version = (panel as SavedDashboardPanel730ToLatest).version; - - if (reportUiCounter) { - // This will help us figure out when to remove support for older style URLs. - reportUiCounter('DashboardPanelVersionInUrl', METRIC_TYPE.LOADED, `${version}`); - } - - return semverSatisfies(version, '<7.3'); - }); - - if (panelNeedsMigration) { - appState.panels = migratePanelsTo730( - appState.panels as Array< - | SavedDashboardPanelTo60 - | SavedDashboardPanel610 - | SavedDashboardPanel620 - | SavedDashboardPanel630 - | SavedDashboardPanel640To720 - >, - kibanaVersion, - appState.useMargins as boolean, - appState.uiState as { [key: string]: SerializableRecord } - ) as SavedDashboardPanel[]; - delete appState.uiState; - } - - return appState; -} diff --git a/src/plugins/dashboard/public/application/lib/save_dashboard.ts b/src/plugins/dashboard/public/application/lib/save_dashboard.ts deleted file mode 100644 index f3347ca3f2041..0000000000000 --- a/src/plugins/dashboard/public/application/lib/save_dashboard.ts +++ /dev/null @@ -1,120 +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. - */ - -import _ from 'lodash'; - -import { isFilterPinned } from '@kbn/es-query'; -import type { RefreshInterval } from '@kbn/data-plugin/public'; -import type { SavedObjectSaveOpts } from '@kbn/saved-objects-plugin/public'; - -import { convertTimeToUTCString } from '.'; -import type { DashboardSavedObject } from '../../saved_dashboards'; -import { dashboardSaveToastStrings } from '../../dashboard_strings'; -import { getHasTaggingCapabilitiesGuard } from './dashboard_tagging'; -import type { DashboardRedirect, DashboardState } from '../../types'; -import { serializeControlGroupToDashboardSavedObject } from './dashboard_control_group'; -import { convertPanelStateToSavedDashboardPanel } from '../../../common/embeddable/embeddable_saved_object_converters'; -import { pluginServices } from '../../services/plugin_services'; - -export type SavedDashboardSaveOpts = SavedObjectSaveOpts & { stayInEditMode?: boolean }; - -interface SaveDashboardProps { - redirectTo: DashboardRedirect; - currentState: DashboardState; - saveOptions: SavedDashboardSaveOpts; - savedDashboard: DashboardSavedObject; -} - -export const saveDashboard = async ({ - redirectTo, - saveOptions, - currentState, - savedDashboard, -}: SaveDashboardProps): Promise<{ id?: string; redirected?: boolean; error?: any }> => { - const { - data: { - query: { - timefilter: { timefilter }, - }, - }, - dashboardSessionStorage, - initializerContext: { kibanaVersion }, - notifications, - } = pluginServices.getServices(); - - const lastDashboardId = savedDashboard.id; - const hasTaggingCapabilities = getHasTaggingCapabilitiesGuard(); - - const { panels, title, tags, description, timeRestore, options } = currentState; - - const savedDashboardPanels = Object.values(panels).map((panel) => - convertPanelStateToSavedDashboardPanel(panel, kibanaVersion) - ); - - savedDashboard.title = title; - savedDashboard.description = description; - savedDashboard.timeRestore = timeRestore; - savedDashboard.optionsJSON = JSON.stringify(options); - savedDashboard.panelsJSON = JSON.stringify(savedDashboardPanels); - - // control group input - serializeControlGroupToDashboardSavedObject(savedDashboard, currentState); - - if (hasTaggingCapabilities(savedDashboard)) { - savedDashboard.setTags(tags); - } - - const { from, to } = timefilter.getTime(); - savedDashboard.timeFrom = savedDashboard.timeRestore ? convertTimeToUTCString(from) : undefined; - savedDashboard.timeTo = savedDashboard.timeRestore ? convertTimeToUTCString(to) : undefined; - - const timeRestoreObj: RefreshInterval = _.pick(timefilter.getRefreshInterval(), [ - 'display', - 'pause', - 'section', - 'value', - ]) as RefreshInterval; - savedDashboard.refreshInterval = savedDashboard.timeRestore ? timeRestoreObj : undefined; - - // only save unpinned filters - const unpinnedFilters = savedDashboard.getFilters().filter((filter) => !isFilterPinned(filter)); - savedDashboard.searchSource.setField('filter', unpinnedFilters); - - try { - const newId = await savedDashboard.save(saveOptions); - if (newId) { - notifications.toasts.addSuccess({ - title: dashboardSaveToastStrings.getSuccessString(currentState.title), - 'data-test-subj': 'saveDashboardSuccess', - }); - - /** - * If the dashboard id has been changed, redirect to the new ID to keep the url param in sync. - */ - if (newId !== lastDashboardId) { - dashboardSessionStorage.clearState(lastDashboardId); - redirectTo({ - id: newId, - editMode: true, - useReplace: true, - destination: 'dashboard', - }); - return { redirected: true, id: newId }; - } - } - return { id: newId }; - } catch (error) { - notifications.toasts.addDanger( - dashboardSaveToastStrings.getFailureString(currentState.title, error.message), - { - 'data-test-subj': 'saveDashboardFailure', - } - ); - return { error }; - } -}; diff --git a/src/plugins/dashboard/public/application/lib/sync_dashboard_container_input.ts b/src/plugins/dashboard/public/application/lib/sync_dashboard_container_input.ts index 67e098186f9e9..9e97beaad276f 100644 --- a/src/plugins/dashboard/public/application/lib/sync_dashboard_container_input.ts +++ b/src/plugins/dashboard/public/application/lib/sync_dashboard_container_input.ts @@ -10,12 +10,11 @@ import _ from 'lodash'; import { Subscription } from 'rxjs'; import { debounceTime, tap } from 'rxjs/operators'; -import { compareFilters, COMPARE_ALL_OPTIONS, type Filter } from '@kbn/es-query'; +import { compareFilters, COMPARE_ALL_OPTIONS } from '@kbn/es-query'; import { replaceUrlHashQuery } from '@kbn/kibana-utils-plugin/public'; -import type { Query } from '@kbn/es-query'; import type { DashboardContainer } from '../embeddable'; -import { DashboardConstants, type DashboardSavedObject } from '../..'; +import { DashboardConstants } from '../..'; import { setControlGroupState, setExpandedPanelId, @@ -36,16 +35,13 @@ import { pluginServices } from '../../services/plugin_services'; type SyncDashboardContainerCommon = DashboardBuildContext & { dashboardContainer: DashboardContainer; - savedDashboard: DashboardSavedObject; }; type ApplyStateChangesToContainerProps = SyncDashboardContainerCommon & { force: boolean; }; -type ApplyContainerChangesToStateProps = SyncDashboardContainerCommon & { - applyFilters: (query: Query, filters: Filter[]) => void; -}; +type ApplyContainerChangesToStateProps = SyncDashboardContainerCommon; type SyncDashboardContainerProps = SyncDashboardContainerCommon & ApplyContainerChangesToStateProps; @@ -94,7 +90,6 @@ export const syncDashboardContainerInput = ( }; export const applyContainerChangesToState = ({ - applyFilters, dashboardContainer, getLatestDashboardState, dispatchDashboardStateChange, @@ -112,7 +107,6 @@ export const applyContainerChangesToState = ({ if (!compareFilters(input.filters, filterManager.getFilters(), COMPARE_ALL_OPTIONS)) { // Add filters modifies the object passed to it, hence the clone deep. filterManager.addFilters(_.cloneDeep(input.filters)); - applyFilters(latestState.query, input.filters); } if (!_.isEqual(input.panels, latestState.panels)) { @@ -144,7 +138,6 @@ export const applyContainerChangesToState = ({ export const applyStateChangesToContainer = ({ force, history, - savedDashboard, dashboardContainer, kbnUrlStateStorage, isEmbeddedExternally, @@ -161,7 +154,6 @@ export const applyStateChangesToContainer = ({ const currentDashboardStateAsInput = stateToDashboardContainerInput({ dashboardState: latestState, isEmbeddedExternally, - savedDashboard, }); const differences = diffDashboardContainerInput( dashboardContainer.getInput(), diff --git a/src/plugins/dashboard/public/application/lib/sync_dashboard_filter_state.ts b/src/plugins/dashboard/public/application/lib/sync_dashboard_filter_state.ts index d02e674936aef..0bce899e22fcd 100644 --- a/src/plugins/dashboard/public/application/lib/sync_dashboard_filter_state.ts +++ b/src/plugins/dashboard/public/application/lib/sync_dashboard_filter_state.ts @@ -8,25 +8,22 @@ import _ from 'lodash'; import { merge } from 'rxjs'; -import { debounceTime, finalize, map, switchMap, tap } from 'rxjs/operators'; +import { finalize, map, switchMap, tap } from 'rxjs/operators'; import { connectToQueryState, GlobalQueryStateFromUrl, - syncQueryStateWithUrl, + syncGlobalQueryStateWithUrl, waitUntilNextSessionCompletes$, } from '@kbn/data-plugin/public'; import type { Filter, Query } from '@kbn/es-query'; import { cleanFiltersForSerialize } from '.'; -import { setQuery } from '../state'; import type { DashboardBuildContext, DashboardState } from '../../types'; -import type { DashboardSavedObject } from '../../saved_dashboards'; import { setFiltersAndQuery } from '../state/dashboard_state_slice'; import { pluginServices } from '../../services/plugin_services'; type SyncDashboardFilterStateProps = DashboardBuildContext & { initialDashboardState: DashboardState; - savedDashboard: DashboardSavedObject; }; /** @@ -35,7 +32,6 @@ type SyncDashboardFilterStateProps = DashboardBuildContext & { * and the dashboard Redux store. */ export const syncDashboardFilterState = ({ - savedDashboard, kbnUrlStateStorage, initialDashboardState, $checkForUnsavedChanges, @@ -46,25 +42,17 @@ export const syncDashboardFilterState = ({ const { data: { query: queryService, search }, } = pluginServices.getServices(); - const { filterManager, queryString, timefilter } = queryService; + const { queryString, timefilter } = queryService; const { timefilter: timefilterService } = timefilter; // apply initial dashboard filter state. applyDashboardFilterState({ currentDashboardState: initialDashboardState, kbnUrlStateStorage, - savedDashboard, }); - // this callback will be used any time new filters and query need to be applied. - const applyFilters = (query: Query, filters: Filter[]) => { - savedDashboard.searchSource.setField('query', query); - savedDashboard.searchSource.setField('filter', filters); - dispatchDashboardStateChange(setQuery(query)); - }; - // starts syncing `_g` portion of url with query services - const { stop: stopSyncingQueryServiceStateWithUrl } = syncQueryStateWithUrl( + const { stop: stopSyncingQueryServiceStateWithUrl } = syncGlobalQueryStateWithUrl( queryService, kbnUrlStateStorage ); @@ -81,7 +69,6 @@ export const syncDashboardFilterState = ({ set: ({ filters, query }) => { intermediateFilterState.filters = cleanFiltersForSerialize(filters ?? []) || []; intermediateFilterState.query = query || queryString.getDefaultQuery(); - applyFilters(intermediateFilterState.query, intermediateFilterState.filters); dispatchDashboardStateChange(setFiltersAndQuery(intermediateFilterState)); }, state$: $onDashboardStateChange.pipe( @@ -97,11 +84,6 @@ export const syncDashboardFilterState = ({ } ); - // apply filters when the filter manager changes - const filterManagerSubscription = merge(filterManager.getUpdates$(), queryString.getUpdates$()) - .pipe(debounceTime(100)) - .subscribe(() => applyFilters(queryString.getQuery() as Query, filterManager.getFilters())); - const timeRefreshSubscription = merge( timefilterService.getRefreshIntervalUpdate$(), timefilterService.getTimeUpdate$() @@ -127,26 +109,23 @@ export const syncDashboardFilterState = ({ .subscribe(); const stopSyncingDashboardFilterState = () => { - filterManagerSubscription.unsubscribe(); forceRefreshSubscription.unsubscribe(); timeRefreshSubscription.unsubscribe(); stopSyncingQueryServiceStateWithUrl(); stopSyncingAppFilters(); }; - return { applyFilters, stopSyncingDashboardFilterState }; + return { stopSyncingDashboardFilterState }; }; interface ApplyDashboardFilterStateProps { kbnUrlStateStorage: DashboardBuildContext['kbnUrlStateStorage']; currentDashboardState: DashboardState; - savedDashboard: DashboardSavedObject; } export const applyDashboardFilterState = ({ currentDashboardState, kbnUrlStateStorage, - savedDashboard, }: ApplyDashboardFilterStateProps) => { const { data: { @@ -155,13 +134,9 @@ export const applyDashboardFilterState = ({ } = pluginServices.getServices(); const { timefilter: timefilterService } = timefilter; - // apply filters to the query service and to the saved dashboard + // apply filters and query to the query service filterManager.setAppFilters(_.cloneDeep(currentDashboardState.filters)); - savedDashboard.searchSource.setField('filter', currentDashboardState.filters); - - // apply query to the query service and to the saved dashboard queryString.setQuery(currentDashboardState.query); - savedDashboard.searchSource.setField('query', currentDashboardState.query); /** * If a global time range is not set explicitly and the time range was saved with the dashboard, apply @@ -169,18 +144,11 @@ export const applyDashboardFilterState = ({ */ if (currentDashboardState.timeRestore) { const globalQueryState = kbnUrlStateStorage.get('_g'); - if (!globalQueryState?.time) { - if (savedDashboard.timeFrom && savedDashboard.timeTo) { - timefilterService.setTime({ - from: savedDashboard.timeFrom, - to: savedDashboard.timeTo, - }); - } + if (!globalQueryState?.time && currentDashboardState.timeRange) { + timefilterService.setTime(currentDashboardState.timeRange); } - if (!globalQueryState?.refreshInterval) { - if (savedDashboard.refreshInterval) { - timefilterService.setRefreshInterval(savedDashboard.refreshInterval); - } + if (!globalQueryState?.refreshInterval && currentDashboardState.refreshInterval) { + timefilterService.setRefreshInterval(currentDashboardState.refreshInterval); } } }; diff --git a/src/plugins/dashboard/public/application/lib/sync_dashboard_url_state.ts b/src/plugins/dashboard/public/application/lib/sync_dashboard_url_state.ts index 947e3f5d69de7..31101ae3679f0 100644 --- a/src/plugins/dashboard/public/application/lib/sync_dashboard_url_state.ts +++ b/src/plugins/dashboard/public/application/lib/sync_dashboard_url_state.ts @@ -8,41 +8,52 @@ import _ from 'lodash'; import { debounceTime } from 'rxjs/operators'; +import semverSatisfies from 'semver/functions/satisfies'; import { replaceUrlHashQuery } from '@kbn/kibana-utils-plugin/public'; -import { migrateAppState } from '.'; -import { DashboardSavedObject } from '../..'; + import { setDashboardState } from '../state'; import { migrateLegacyQuery } from './migrate_legacy_query'; -import { applyDashboardFilterState } from './sync_dashboard_filter_state'; +import { pluginServices } from '../../services/plugin_services'; import { DASHBOARD_STATE_STORAGE_KEY } from '../../dashboard_constants'; -import type { - DashboardBuildContext, - DashboardPanelMap, - DashboardState, - RawDashboardState, -} from '../../types'; -import { convertSavedPanelsToPanelMap } from './convert_dashboard_panels'; +import { applyDashboardFilterState } from './sync_dashboard_filter_state'; +import { dashboardSavedObjectErrorStrings } from '../../dashboard_strings'; +import { convertSavedPanelsToPanelMap, DashboardPanelMap } from '../../../common'; +import type { DashboardBuildContext, DashboardState, RawDashboardState } from '../../types'; -type SyncDashboardUrlStateProps = DashboardBuildContext & { savedDashboard: DashboardSavedObject }; +/** + * We no longer support loading panels from a version older than 7.3 in the URL. + * @returns whether or not there is a panel in the URL state saved with a version before 7.3 + */ +export const isPanelVersionTooOld = (panels: RawDashboardState['panels']) => { + for (const panel of panels) { + if (!panel.version || semverSatisfies(panel.version, '<7.3')) return true; + } + return false; +}; export const syncDashboardUrlState = ({ dispatchDashboardStateChange, getLatestDashboardState, kbnUrlStateStorage, - savedDashboard, -}: SyncDashboardUrlStateProps) => { +}: DashboardBuildContext) => { /** * Loads any dashboard state from the URL, and removes the state from the URL. */ const loadAndRemoveDashboardState = (): Partial => { + const { + notifications: { toasts }, + } = pluginServices.getServices(); const rawAppStateInUrl = kbnUrlStateStorage.get(DASHBOARD_STATE_STORAGE_KEY); if (!rawAppStateInUrl) return {}; - let panelsMap: DashboardPanelMap = {}; + let panelsMap: DashboardPanelMap | undefined; if (rawAppStateInUrl.panels && rawAppStateInUrl.panels.length > 0) { - const rawState = migrateAppState(rawAppStateInUrl); - panelsMap = convertSavedPanelsToPanelMap(rawState.panels); + if (isPanelVersionTooOld(rawAppStateInUrl.panels)) { + toasts.addWarning(dashboardSavedObjectErrorStrings.getPanelTooOldError()); + } else { + panelsMap = convertSavedPanelsToPanelMap(rawAppStateInUrl.panels); + } } const migratedQuery = rawAppStateInUrl.query @@ -58,7 +69,7 @@ export const syncDashboardUrlState = ({ return { ..._.omit(rawAppStateInUrl, ['panels', 'query']), ...(migratedQuery ? { query: migratedQuery } : {}), - ...(rawAppStateInUrl.panels ? { panels: panelsMap } : {}), + ...(panelsMap ? { panels: panelsMap } : {}), }; }; @@ -75,7 +86,6 @@ export const syncDashboardUrlState = ({ applyDashboardFilterState({ currentDashboardState: updatedDashboardState, kbnUrlStateStorage, - savedDashboard, }); if (Object.keys(stateFromUrl).length === 0) return; diff --git a/src/plugins/dashboard/public/application/lib/url.test.ts b/src/plugins/dashboard/public/application/lib/url.test.ts deleted file mode 100644 index fc7e51b8c2e3e..0000000000000 --- a/src/plugins/dashboard/public/application/lib/url.test.ts +++ /dev/null @@ -1,35 +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. - */ - -import { getDashboardIdFromUrl } from './url'; - -test('getDashboardIdFromUrl', () => { - let url = - "http://localhost:5601/wev/app/dashboards#/create?_g=(refreshInterval:(pause:!t,value:0),time:(from:now-15m,to:now))&_a=(description:'',filters:!()"; - expect(getDashboardIdFromUrl(url)).toEqual(undefined); - - url = - "http://localhost:5601/wev/app/dashboards#/view/625357282?_a=(description:'',filters:!()&_g=(refreshInterval:(pause:!t,value:0),time:(from:now-15m,to:now))"; - expect(getDashboardIdFromUrl(url)).toEqual('625357282'); - - url = 'http://myserver.mydomain.com:5601/wev/app/dashboards#/view/777182'; - expect(getDashboardIdFromUrl(url)).toEqual('777182'); - - url = - "http://localhost:5601/app/dashboards#/create?_g=(refreshInterval:(pause:!t,value:0),time:(from:now-15m,to:now))&_a=(description:'',filters:!()"; - expect(getDashboardIdFromUrl(url)).toEqual(undefined); - - url = '/view/test/?_g=(refreshInterval:'; - expect(getDashboardIdFromUrl(url)).toEqual('test'); - - url = 'view/test/?_g=(refreshInterval:'; - expect(getDashboardIdFromUrl(url)).toEqual('test'); - - url = '/other-app/test/'; - expect(getDashboardIdFromUrl(url)).toEqual(undefined); -}); diff --git a/src/plugins/dashboard/public/application/lib/url.ts b/src/plugins/dashboard/public/application/lib/url.ts deleted file mode 100644 index 0ff2809a92667..0000000000000 --- a/src/plugins/dashboard/public/application/lib/url.ts +++ /dev/null @@ -1,24 +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. - */ - -/** - * Returns dashboard id from URL - * literally looks from id after `dashboard/` string and before `/`, `?` and end of string - * @param url to extract dashboardId from - * input: http://localhost:5601/lib/app/kibana#/dashboard?param1=x¶m2=y¶m3=z - * output: undefined - * input: http://localhost:5601/lib/app/kibana#/dashboard/39292992?param1=x¶m2=y¶m3=z - * output: 39292992 - */ -export function getDashboardIdFromUrl(url: string): string | undefined { - const [, dashboardId] = url.match(/view\/(.*?)(\/|\?|$)/) ?? [ - undefined, // full match - undefined, // group with dashboardId - ]; - return dashboardId ?? undefined; -} diff --git a/src/plugins/dashboard/public/application/listing/dashboard_listing.test.tsx b/src/plugins/dashboard/public/application/listing/dashboard_listing.test.tsx index 5712b4c6ee2f8..4a77249aeb39c 100644 --- a/src/plugins/dashboard/public/application/listing/dashboard_listing.test.tsx +++ b/src/plugins/dashboard/public/application/listing/dashboard_listing.test.tsx @@ -9,19 +9,15 @@ import React from 'react'; import { mount } from 'enzyme'; -import { I18nProvider, FormattedRelative } from '@kbn/i18n-react'; -import { SimpleSavedObject } from '@kbn/core/public'; -import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public'; -import { createKbnUrlStateStorage } from '@kbn/kibana-utils-plugin/public'; import { TableListViewKibanaDependencies, TableListViewKibanaProvider, } from '@kbn/content-management-table-list'; +import { I18nProvider, FormattedRelative } from '@kbn/i18n-react'; +import { createKbnUrlStateStorage } from '@kbn/kibana-utils-plugin/public'; -import { DashboardAppServices } from '../../types'; -import { DashboardListing, DashboardListingProps } from './dashboard_listing'; -import { makeDefaultServices } from '../test_helpers'; import { pluginServices } from '../../services/plugin_services'; +import { DashboardListing, DashboardListingProps } from './dashboard_listing'; import { DASHBOARD_PANELS_UNSAVED_ID } from '../../services/dashboard_session_storage/dashboard_session_storage_service'; function makeDefaultProps(): DashboardListingProps { @@ -31,14 +27,7 @@ function makeDefaultProps(): DashboardListingProps { }; } -function mountWith({ - props: incomingProps, - services: incomingServices, -}: { - props?: DashboardListingProps; - services?: DashboardAppServices; -}) { - const services = incomingServices ?? makeDefaultServices(); +function mountWith({ props: incomingProps }: { props?: DashboardListingProps }) { const props = incomingProps ?? makeDefaultProps(); const wrappingComponent: React.FC<{ children: React.ReactNode; @@ -47,35 +36,32 @@ function mountWith({ return ( - {/* Can't get rid of KibanaContextProvider here yet because of 'call to action when no dashboards exist' tests below */} - - null, - }, + null, }, - } as unknown as TableListViewKibanaDependencies['savedObjectsTagging'] - } - FormattedRelative={FormattedRelative} - toMountPoint={() => () => () => undefined} - > - {children} - - + }, + } as unknown as TableListViewKibanaDependencies['savedObjectsTagging'] + } + FormattedRelative={FormattedRelative} + toMountPoint={() => () => () => undefined} + > + {children} + ); }; const component = mount(, { wrappingComponent }); - return { component, props, services }; + return { component, props }; } describe('after fetch', () => { @@ -89,14 +75,14 @@ describe('after fetch', () => { }); test('renders call to action when no dashboards exist', async () => { - const services = makeDefaultServices(); - services.savedDashboards.find = () => { - return Promise.resolve({ - total: 0, - hits: [], - }); - }; - const { component } = mountWith({ services }); + ( + pluginServices.getServices().dashboardSavedObject.findDashboards.findSavedObjects as jest.Mock + ).mockResolvedValue({ + total: 0, + hits: [], + }); + + const { component } = mountWith({}); // Ensure all promises resolve await new Promise((resolve) => process.nextTick(resolve)); // Ensure the state changes are reflected @@ -105,18 +91,18 @@ describe('after fetch', () => { }); test('renders call to action with continue when no dashboards exist but one is in progress', async () => { - const services = makeDefaultServices(); - services.savedDashboards.find = () => { - return Promise.resolve({ - total: 0, - hits: [], - }); - }; pluginServices.getServices().dashboardSessionStorage.getDashboardIdsWithUnsavedChanges = jest .fn() .mockReturnValueOnce([DASHBOARD_PANELS_UNSAVED_ID]) .mockReturnValue(['dashboardUnsavedOne', 'dashboardUnsavedTwo']); - const { component } = mountWith({ services }); + ( + pluginServices.getServices().dashboardSavedObject.findDashboards.findSavedObjects as jest.Mock + ).mockResolvedValue({ + total: 0, + hits: [], + }); + + const { component } = mountWith({}); // Ensure all promises resolve await new Promise((resolve) => process.nextTick(resolve)); // Ensure the state changes are reflected @@ -139,17 +125,9 @@ describe('after fetch', () => { const title = 'search by title'; const props = makeDefaultProps(); props.title = title; - pluginServices.getServices().savedObjects.client.find = () => { - return Promise.resolve({ - perPage: 10, - total: 2, - page: 0, - savedObjects: [ - { attributes: { title: `${title}_number1` }, id: 'hello there' } as SimpleSavedObject, - { attributes: { title: `${title}_number2` }, id: 'goodbye' } as SimpleSavedObject, - ], - }); - }; + ( + pluginServices.getServices().dashboardSavedObject.findDashboards.findByTitle as jest.Mock + ).mockResolvedValue(undefined); const { component } = mountWith({ props }); // Ensure all promises resolve await new Promise((resolve) => process.nextTick(resolve)); @@ -163,14 +141,9 @@ describe('after fetch', () => { const title = 'search by title'; const props = makeDefaultProps(); props.title = title; - pluginServices.getServices().savedObjects.client.find = () => { - return Promise.resolve({ - perPage: 10, - total: 1, - page: 0, - savedObjects: [{ attributes: { title }, id: 'you_found_me' } as SimpleSavedObject], - }); - }; + ( + pluginServices.getServices().dashboardSavedObject.findDashboards.findByTitle as jest.Mock + ).mockResolvedValue({ id: 'you_found_me' }); const { component } = mountWith({ props }); // Ensure all promises resolve await new Promise((resolve) => process.nextTick(resolve)); diff --git a/src/plugins/dashboard/public/application/listing/dashboard_listing.tsx b/src/plugins/dashboard/public/application/listing/dashboard_listing.tsx index 40753c556a56a..1e78b94303478 100644 --- a/src/plugins/dashboard/public/application/listing/dashboard_listing.tsx +++ b/src/plugins/dashboard/public/application/listing/dashboard_listing.tsx @@ -6,7 +6,10 @@ * Side Public License, v 1. */ +import useMount from 'react-use/lib/useMount'; import { FormattedMessage } from '@kbn/i18n-react'; +import React, { useCallback, useEffect, useMemo, useState } from 'react'; + import { EuiLink, EuiButton, @@ -15,30 +18,29 @@ import { EuiFlexItem, EuiButtonEmpty, } from '@elastic/eui'; -import React, { useCallback, useEffect, useMemo, useState } from 'react'; -import type { SavedObjectsFindOptionsReference } from '@kbn/core/public'; -import useMount from 'react-use/lib/useMount'; -import type { SavedObjectReference } from '@kbn/core/types'; -import { useExecutionContext, useKibana } from '@kbn/kibana-react-plugin/public'; +import { useExecutionContext } from '@kbn/kibana-react-plugin/public'; import { syncGlobalQueryStateWithUrl } from '@kbn/data-plugin/public'; +import type { SavedObjectsFindOptionsReference, SimpleSavedObject } from '@kbn/core/public'; import type { IKbnUrlStateStorage } from '@kbn/kibana-utils-plugin/public'; import { TableListView, type UserContentCommonSchema } from '@kbn/content-management-table-list'; -import { attemptLoadDashboardByTitle } from '../lib'; -import { DashboardAppServices, DashboardRedirect } from '../../types'; import { getDashboardBreadcrumb, - dashboardListingTable, + dashboardListingTableStrings, noItemsStrings, dashboardUnsavedListingStrings, getNewDashboardTitle, + dashboardSavedObjectErrorStrings, } from '../../dashboard_strings'; +import { DashboardConstants } from '../..'; +import { DashboardRedirect } from '../../types'; +import { pluginServices } from '../../services/plugin_services'; import { DashboardUnsavedListing } from './dashboard_unsaved_listing'; -import { confirmCreateWithUnsaved, confirmDiscardUnsavedChanges } from './confirm_overlays'; import { getDashboardListItemLink } from './get_dashboard_list_item_link'; +import { confirmCreateWithUnsaved, confirmDiscardUnsavedChanges } from './confirm_overlays'; import { DashboardAppNoDataPage, isDashboardAppInNoDataState } from '../dashboard_app_no_data'; -import { pluginServices } from '../../services/plugin_services'; import { DASHBOARD_PANELS_UNSAVED_ID } from '../../services/dashboard_session_storage/dashboard_session_storage_service'; +import { DashboardAttributes } from '../embeddable'; const SAVED_OBJECTS_LIMIT_SETTING = 'savedObjects:listingLimit'; const SAVED_OBJECTS_PER_PAGE_SETTING = 'savedObjects:perPage'; @@ -52,17 +54,18 @@ interface DashboardSavedObjectUserContent extends UserContentCommonSchema { } const toTableListViewSavedObject = ( - savedObject: Record + savedObject: SimpleSavedObject ): DashboardSavedObjectUserContent => { + const { title, description, timeRestore } = savedObject.attributes; return { - id: savedObject.id as string, - updatedAt: savedObject.updatedAt! as string, - references: savedObject.references as SavedObjectReference[], type: 'dashboard', + id: savedObject.id, + updatedAt: savedObject.updatedAt!, + references: savedObject.references, attributes: { - title: (savedObject.title as string) ?? '', - description: savedObject.description as string, - timeRestore: savedObject.timeRestore as boolean, + title, + description, + timeRestore, }, }; }; @@ -80,19 +83,16 @@ export const DashboardListing = ({ initialFilter, kbnUrlStateStorage, }: DashboardListingProps) => { - const { - services: { savedDashboards }, - } = useKibana(); - const { application, + data: { query }, + dashboardSessionStorage, + settings: { uiSettings }, + notifications: { toasts }, chrome: { setBreadcrumbs }, coreContext: { executionContext }, dashboardCapabilities: { showWriteControls }, - dashboardSessionStorage, - data: { query }, - savedObjects: { client }, - settings: { uiSettings }, + dashboardSavedObject: { findDashboards, savedObjectsClient }, } = pluginServices.getServices(); const [showNoDataPage, setShowNoDataPage] = useState(false); @@ -125,7 +125,7 @@ export const DashboardListing = ({ kbnUrlStateStorage ); if (title) { - attemptLoadDashboardByTitle(title).then((result) => { + findDashboards.findByTitle(title).then((result) => { if (!result) return; redirectTo({ destination: 'dashboard', @@ -138,7 +138,7 @@ export const DashboardListing = ({ return () => { stopSyncingQueryServiceStateWithUrl(); }; - }, [title, client, redirectTo, query, kbnUrlStateStorage]); + }, [title, redirectTo, query, kbnUrlStateStorage, findDashboards]); const listingLimit = uiSettings.get(SAVED_OBJECTS_LIMIT_SETTING); const initialPageSize = uiSettings.get(SAVED_OBJECTS_PER_PAGE_SETTING); @@ -262,10 +262,11 @@ export const DashboardListing = ({ const fetchItems = useCallback( (searchTerm: string, references?: SavedObjectsFindOptionsReference[]) => { - return savedDashboards - .find(searchTerm, { - hasReference: references, + return findDashboards + .findSavedObjects({ + search: searchTerm, size: listingLimit, + hasReference: references, }) .then(({ total, hits }) => { return { @@ -274,16 +275,24 @@ export const DashboardListing = ({ }; }); }, - [listingLimit, savedDashboards] + [findDashboards, listingLimit] ); const deleteItems = useCallback( - (dashboards: Array<{ id: string }>) => { - dashboards.map((d) => dashboardSessionStorage.clearState(d.id)); + async (dashboardsToDelete: Array<{ id: string }>) => { + await Promise.all( + dashboardsToDelete.map(({ id }) => { + dashboardSessionStorage.clearState(id); + return savedObjectsClient.delete(DashboardConstants.DASHBOARD_SAVED_OBJECT_TYPE, id); + }) + ).catch((error) => { + toasts.addError(error, { + title: dashboardSavedObjectErrorStrings.getErrorDeletingDashboardToast(), + }); + }); setUnsavedDashboardIds(dashboardSessionStorage.getDashboardIdsWithUnsavedChanges()); - return savedDashboards.delete(dashboards.map((d) => d.id)); }, - [savedDashboards, dashboardSessionStorage] + [savedObjectsClient, dashboardSessionStorage, toasts] ); const editItem = useCallback( @@ -292,7 +301,7 @@ export const DashboardListing = ({ [redirectTo] ); - const { getEntityName, getTableListTitle, getEntityNamePlural } = dashboardListingTable; + const { getEntityName, getTableListTitle, getEntityNamePlural } = dashboardListingTableStrings; return ( <> {showNoDataPage && ( diff --git a/src/plugins/dashboard/public/application/listing/dashboard_unsaved_listing.test.tsx b/src/plugins/dashboard/public/application/listing/dashboard_unsaved_listing.test.tsx index 1feec9bbdc42f..34a78c5181b92 100644 --- a/src/plugins/dashboard/public/application/listing/dashboard_unsaved_listing.test.tsx +++ b/src/plugins/dashboard/public/application/listing/dashboard_unsaved_listing.test.tsx @@ -11,87 +11,46 @@ import { mount } from 'enzyme'; import { I18nProvider } from '@kbn/i18n-react'; import { waitFor } from '@testing-library/react'; import { findTestSubject } from '@elastic/eui/lib/test'; -import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public'; -import { DashboardSavedObject } from '../..'; -import { DashboardAppServices } from '../../types'; -import { makeDefaultServices } from '../test_helpers'; -import { SavedObjectLoader } from '../../services/saved_object_loader'; import { DashboardUnsavedListing, DashboardUnsavedListingProps } from './dashboard_unsaved_listing'; import { DASHBOARD_PANELS_UNSAVED_ID } from '../../services/dashboard_session_storage/dashboard_session_storage_service'; import { pluginServices } from '../../services/plugin_services'; -const mockedDashboards: { [key: string]: DashboardSavedObject } = { - dashboardUnsavedOne: { - id: `dashboardUnsavedOne`, - title: `Dashboard Unsaved One`, - } as DashboardSavedObject, - dashboardUnsavedTwo: { - id: `dashboardUnsavedTwo`, - title: `Dashboard Unsaved Two`, - } as DashboardSavedObject, - dashboardUnsavedThree: { - id: `dashboardUnsavedThree`, - title: `Dashboard Unsaved Three`, - } as DashboardSavedObject, -}; - -function makeServices(): DashboardAppServices { - const services = makeDefaultServices(); - const savedDashboards = {} as SavedObjectLoader; - savedDashboards.get = jest - .fn() - .mockImplementation((id: string) => Promise.resolve(mockedDashboards[id])); - return { - ...services, - savedDashboards, - }; -} - const makeDefaultProps = (): DashboardUnsavedListingProps => ({ redirectTo: jest.fn(), unsavedDashboardIds: ['dashboardUnsavedOne', 'dashboardUnsavedTwo', 'dashboardUnsavedThree'], refreshUnsavedDashboards: jest.fn(), }); -function mountWith({ - services: incomingServices, - props: incomingProps, -}: { - services?: DashboardAppServices; - props?: DashboardUnsavedListingProps; -}) { - const services = incomingServices ?? makeServices(); +function mountWith({ props: incomingProps }: { props?: DashboardUnsavedListingProps }) { const props = incomingProps ?? makeDefaultProps(); const wrappingComponent: React.FC<{ children: React.ReactNode; }> = ({ children }) => { - return ( - - {/* Only the old savedObjects service is used for `DashboardUnsavedListing`, so will need to wrap this in - `DashboardServicesProvider` instead once that is removed as part of https://github.com/elastic/kibana/pull/138774*/} - {children} - - ); + return {children}; }; const component = mount(, { wrappingComponent }); - return { component, props, services }; + return { component, props }; } describe('Unsaved listing', () => { it('Gets information for each unsaved dashboard', async () => { - const { services } = mountWith({}); + mountWith({}); await waitFor(() => { - expect(services.savedDashboards.get).toHaveBeenCalledTimes(3); + expect( + pluginServices.getServices().dashboardSavedObject.findDashboards.findByIds + ).toHaveBeenCalledTimes(1); }); }); - it('Does not attempt to get unsaved dashboard id', async () => { + it('Does not attempt to get newly created dashboard', async () => { const props = makeDefaultProps(); props.unsavedDashboardIds = ['dashboardUnsavedOne', DASHBOARD_PANELS_UNSAVED_ID]; - const { services } = mountWith({ props }); + mountWith({ props }); await waitFor(() => { - expect(services.savedDashboards.get).toHaveBeenCalledTimes(1); + expect( + pluginServices.getServices().dashboardSavedObject.findDashboards.findByIds + ).toHaveBeenCalledWith(['dashboardUnsavedOne']); }); }); @@ -146,14 +105,22 @@ describe('Unsaved listing', () => { }); it('removes unsaved changes from any dashboard which errors on fetch', async () => { - const services = makeServices(); + ( + pluginServices.getServices().dashboardSavedObject.findDashboards.findByIds as jest.Mock + ).mockResolvedValue([ + { + id: 'failCase1', + status: 'error', + error: { error: 'oh no', message: 'bwah', statusCode: 100 }, + }, + { + id: 'failCase2', + status: 'error', + error: { error: 'oh no', message: 'bwah', statusCode: 100 }, + }, + ]); + const props = makeDefaultProps(); - services.savedDashboards.get = jest.fn().mockImplementation((id: string) => { - if (id === 'failCase1' || id === 'failCase2') { - return Promise.reject(new Error()); - } - return Promise.resolve(mockedDashboards[id]); - }); props.unsavedDashboardIds = [ 'dashboardUnsavedOne', @@ -162,7 +129,7 @@ describe('Unsaved listing', () => { 'failCase1', 'failCase2', ]; - const { component } = mountWith({ services, props }); + const { component } = mountWith({ props }); waitFor(() => { component.update(); expect(pluginServices.getServices().dashboardSessionStorage.clearState).toHaveBeenCalledWith( diff --git a/src/plugins/dashboard/public/application/listing/dashboard_unsaved_listing.tsx b/src/plugins/dashboard/public/application/listing/dashboard_unsaved_listing.tsx index a5c5b1b224a32..3aa862fe30264 100644 --- a/src/plugins/dashboard/public/application/listing/dashboard_unsaved_listing.tsx +++ b/src/plugins/dashboard/public/application/listing/dashboard_unsaved_listing.tsx @@ -6,8 +6,6 @@ * Side Public License, v 1. */ -import React, { useCallback, useEffect, useState } from 'react'; - import { EuiButtonEmpty, EuiCallOut, @@ -17,14 +15,14 @@ import { EuiSpacer, EuiTitle, } from '@elastic/eui'; -import { useKibana } from '@kbn/kibana-react-plugin/public'; +import React, { useCallback, useEffect, useState } from 'react'; -import type { DashboardSavedObject } from '../..'; -import { dashboardUnsavedListingStrings, getNewDashboardTitle } from '../../dashboard_strings'; -import type { DashboardAppServices, DashboardRedirect } from '../../types'; -import { confirmDiscardUnsavedChanges } from './confirm_overlays'; +import type { DashboardRedirect } from '../../types'; import { pluginServices } from '../../services/plugin_services'; +import { confirmDiscardUnsavedChanges } from './confirm_overlays'; +import { dashboardUnsavedListingStrings, getNewDashboardTitle } from '../../dashboard_strings'; import { DASHBOARD_PANELS_UNSAVED_ID } from '../../services/dashboard_session_storage/dashboard_session_storage_service'; +import { DashboardAttributes } from '../embeddable'; const DashboardUnsavedItem = ({ id, @@ -102,7 +100,7 @@ const DashboardUnsavedItem = ({ }; interface UnsavedItemMap { - [key: string]: DashboardSavedObject; + [key: string]: DashboardAttributes; } export interface DashboardUnsavedListingProps { @@ -117,10 +115,9 @@ export const DashboardUnsavedListing = ({ refreshUnsavedDashboards, }: DashboardUnsavedListingProps) => { const { - services: { savedDashboards }, - } = useKibana(); - - const { dashboardSessionStorage } = pluginServices.getServices(); + dashboardSessionStorage, + dashboardSavedObject: { savedObjectsClient, findDashboards }, + } = pluginServices.getServices(); const [items, setItems] = useState({}); @@ -146,28 +143,24 @@ export const DashboardUnsavedListing = ({ return; } let canceled = false; - const dashPromises = unsavedDashboardIds - .filter((id) => id !== DASHBOARD_PANELS_UNSAVED_ID) - .map((dashboardId) => { - return (savedDashboards.get(dashboardId) as Promise).catch( - () => dashboardId - ); - }); - Promise.all(dashPromises).then((dashboards: Array) => { + const existingDashboardsWithUnsavedChanges = unsavedDashboardIds.filter( + (id) => id !== DASHBOARD_PANELS_UNSAVED_ID + ); + findDashboards.findByIds(existingDashboardsWithUnsavedChanges).then((results) => { const dashboardMap = {}; if (canceled) { return; } let hasError = false; - const newItems = dashboards.reduce((map, dashboard) => { - if (typeof dashboard === 'string') { + const newItems = results.reduce((map, result) => { + if (result.status === 'error') { hasError = true; - dashboardSessionStorage.clearState(dashboard); + dashboardSessionStorage.clearState(result.id); return map; } return { ...map, - [dashboard.id || DASHBOARD_PANELS_UNSAVED_ID]: dashboard, + [result.id || DASHBOARD_PANELS_UNSAVED_ID]: result.attributes, }; }, dashboardMap); if (hasError) { @@ -179,7 +172,13 @@ export const DashboardUnsavedListing = ({ return () => { canceled = true; }; - }, [savedDashboards, dashboardSessionStorage, refreshUnsavedDashboards, unsavedDashboardIds]); + }, [ + refreshUnsavedDashboards, + dashboardSessionStorage, + unsavedDashboardIds, + savedObjectsClient, + findDashboards, + ]); return unsavedDashboardIds.length === 0 ? null : ( <> diff --git a/src/plugins/dashboard/public/application/state/dashboard_state_slice.ts b/src/plugins/dashboard/public/application/state/dashboard_state_slice.ts index f28d095c9b9b4..669bde5c3eb65 100644 --- a/src/plugins/dashboard/public/application/state/dashboard_state_slice.ts +++ b/src/plugins/dashboard/public/application/state/dashboard_state_slice.ts @@ -7,11 +7,14 @@ */ import { createSlice, PayloadAction } from '@reduxjs/toolkit'; -import { PersistableControlGroupInput } from '@kbn/controls-plugin/common'; -import { ViewMode } from '@kbn/embeddable-plugin/public'; +import { ViewMode } from '@kbn/embeddable-plugin/public'; +import { RefreshInterval } from '@kbn/data-plugin/common'; import type { Filter, Query, TimeRange } from '@kbn/es-query'; -import type { DashboardOptions, DashboardPanelMap, DashboardState } from '../../types'; +import { PersistableControlGroupInput } from '@kbn/controls-plugin/common'; + +import { DashboardPanelMap } from '../../../common'; +import type { DashboardOptions, DashboardState } from '../../types'; export const dashboardStateSlice = createSlice({ name: 'dashboardState', @@ -33,11 +36,15 @@ export const dashboardStateSlice = createSlice({ description: string; tags?: string[]; timeRestore: boolean; + timeRange?: TimeRange; + refreshInterval?: RefreshInterval; }> ) => { state.title = action.payload.title; state.description = action.payload.description; state.timeRestore = action.payload.timeRestore; + state.timeRange = action.payload.timeRange; + state.refreshInterval = action.payload.refreshInterval; if (action.payload.tags) { state.tags = action.payload.tags; } diff --git a/src/plugins/dashboard/public/application/test_helpers/get_saved_dashboard_mock.ts b/src/plugins/dashboard/public/application/test_helpers/get_saved_dashboard_mock.ts deleted file mode 100644 index 69da1dbbe56a2..0000000000000 --- a/src/plugins/dashboard/public/application/test_helpers/get_saved_dashboard_mock.ts +++ /dev/null @@ -1,36 +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. - */ - -import { dataPluginMock } from '@kbn/data-plugin/public/mocks'; -import { DashboardSavedObject } from '../../saved_dashboards'; - -export function getSavedDashboardMock( - config?: Partial -): DashboardSavedObject { - const searchSource = dataPluginMock.createStartContract(); - - return { - id: '123', - title: 'my dashboard', - panelsJSON: '[]', - searchSource: searchSource.search.searchSource.create(), - copyOnSave: false, - timeRestore: false, - timeTo: 'now', - timeFrom: 'now-15m', - optionsJSON: '', - lastSavedTitle: '', - destroy: () => {}, - save: () => { - return Promise.resolve('123'); - }, - getQuery: () => ({ query: '', language: 'kuery' }), - getFilters: () => [], - ...config, - } as DashboardSavedObject; -} diff --git a/src/plugins/dashboard/public/application/test_helpers/index.ts b/src/plugins/dashboard/public/application/test_helpers/index.ts index 7c8ae86074a46..c4d149e8c10b2 100644 --- a/src/plugins/dashboard/public/application/test_helpers/index.ts +++ b/src/plugins/dashboard/public/application/test_helpers/index.ts @@ -7,6 +7,4 @@ */ export { getSampleDashboardInput, getSampleDashboardPanel } from './get_sample_dashboard_input'; -export { getSavedDashboardMock } from './get_saved_dashboard_mock'; -export { makeDefaultServices } from './make_default_services'; export { setupIntersectionObserverMock } from './intersection_observer_mock'; diff --git a/src/plugins/dashboard/public/application/test_helpers/make_default_services.ts b/src/plugins/dashboard/public/application/test_helpers/make_default_services.ts deleted file mode 100644 index 3ffe9dc3b70e9..0000000000000 --- a/src/plugins/dashboard/public/application/test_helpers/make_default_services.ts +++ /dev/null @@ -1,48 +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. - */ - -import { - SavedObjectLoader, - type SavedObjectLoaderFindOptions, -} from '../../services/saved_object_loader'; -import { DashboardAppServices } from '../../types'; -import { getSavedDashboardMock } from './get_saved_dashboard_mock'; - -// TODO: Remove as part of https://github.com/elastic/kibana/pull/138774 -export function makeDefaultServices(): DashboardAppServices { - const savedDashboards = {} as SavedObjectLoader; - savedDashboards.find = (search: string, sizeOrOptions: number | SavedObjectLoaderFindOptions) => { - const size = typeof sizeOrOptions === 'number' ? sizeOrOptions : sizeOrOptions.size ?? 10; - const hits = []; - for (let i = 0; i < size; i++) { - hits.push({ - id: `dashboard${i}`, - title: `dashboard${i} - ${search} - title`, - description: `dashboard${i} desc`, - references: [], - timeRestore: true, - type: '', - url: '', - updatedAt: '', - panelsJSON: '', - lastSavedTitle: '', - }); - } - return Promise.resolve({ - total: size, - hits, - }); - }; - savedDashboards.get = jest - .fn() - .mockImplementation((id?: string) => Promise.resolve(getSavedDashboardMock({ id }))); - - return { - savedDashboards, - }; -} 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 86fd56c2ec6a0..97630c48dc784 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 @@ -6,46 +6,32 @@ * Side Public License, v 1. */ -import { METRIC_TYPE } from '@kbn/analytics'; -import { Required } from '@kbn/utility-types'; -import { EuiHorizontalRule } from '@elastic/eui'; import UseUnmount from 'react-use/lib/useUnmount'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; -import type { OverlayRef } from '@kbn/core/public'; -import type { TopNavMenuProps } from '@kbn/navigation-plugin/public'; -import type { BaseVisType, VisTypeAlias } from '@kbn/visualizations-plugin/public'; import { - AddFromLibraryButton, + withSuspense, LazyLabsFlyout, - PrimaryActionButton, + SolutionToolbar, QuickButtonGroup, QuickButtonProps, - SolutionToolbar, - withSuspense, + PrimaryActionButton, + AddFromLibraryButton, } from '@kbn/presentation-util-plugin/public'; -import type { SavedQuery } from '@kbn/data-plugin/common'; -import { isErrorEmbeddable, openAddPanelFlyout, ViewMode } from '@kbn/embeddable-plugin/public'; import { - getSavedObjectFinder, - type SaveResult, showSaveModal, + type SaveResult, + getSavedObjectFinder, } from '@kbn/saved-objects-plugin/public'; +import { METRIC_TYPE } from '@kbn/analytics'; +import { Required } from '@kbn/utility-types'; +import { EuiHorizontalRule } from '@elastic/eui'; +import type { OverlayRef } from '@kbn/core/public'; +import type { SavedQuery } from '@kbn/data-plugin/common'; +import type { TopNavMenuProps } from '@kbn/navigation-plugin/public'; +import type { BaseVisType, VisTypeAlias } from '@kbn/visualizations-plugin/public'; +import { isErrorEmbeddable, openAddPanelFlyout, ViewMode } from '@kbn/embeddable-plugin/public'; -import { saveDashboard } from '../lib'; -import { TopNavIds } from './top_nav_ids'; -import { EditorMenu } from './editor_menu'; -import { UI_SETTINGS } from '../../../common'; -import { DashboardSaveModal } from './save_modal'; -import { showCloneModal } from './show_clone_modal'; -import { ShowShareModal } from './show_share_modal'; -import { getTopNavConfig } from './get_top_nav_config'; -import { showOptionsPopover } from './show_options_popover'; -import { DashboardConstants } from '../../dashboard_constants'; -import { confirmDiscardUnsavedChanges } from '../listing/confirm_overlays'; -import type { DashboardAppState, DashboardSaveOptions, NavAction } from '../../types'; -import type { DashboardEmbedSettings, DashboardRedirect } from '../../types'; -import { getCreateVisualizationButtonTitle, unsavedChangesBadge } from '../../dashboard_strings'; import { setFullScreenMode, setHidePanelTitles, @@ -58,8 +44,21 @@ import { useDashboardDispatch, useDashboardSelector, } from '../state'; +import { TopNavIds } from './top_nav_ids'; +import { EditorMenu } from './editor_menu'; +import { UI_SETTINGS } from '../../../common'; +import { DashboardSaveModal } from './save_modal'; +import { showCloneModal } from './show_clone_modal'; +import { ShowShareModal } from './show_share_modal'; +import { getTopNavConfig } from './get_top_nav_config'; +import { showOptionsPopover } from './show_options_popover'; import { pluginServices } from '../../services/plugin_services'; +import { DashboardEmbedSettings, DashboardRedirect, DashboardState } from '../../types'; +import { confirmDiscardUnsavedChanges } from '../listing/confirm_overlays'; import { useDashboardMountContext } from '../hooks/dashboard_mount_context'; +import { DashboardConstants, getFullEditPath } from '../../dashboard_constants'; +import { DashboardAppState, DashboardSaveOptions, NavAction } from '../../types'; +import { getCreateVisualizationButtonTitle, unsavedChangesBadge } from '../../dashboard_strings'; export interface DashboardTopNavState { chromeIsVisible: boolean; @@ -70,18 +69,13 @@ export interface DashboardTopNavState { type CompleteDashboardAppState = Required< DashboardAppState, - 'getLatestDashboardState' | 'dashboardContainer' | 'savedDashboard' | 'applyFilters' + 'getLatestDashboardState' | 'dashboardContainer' >; export const isCompleteDashboardAppState = ( state: DashboardAppState ): state is CompleteDashboardAppState => { - return ( - Boolean(state.getLatestDashboardState) && - Boolean(state.dashboardContainer) && - Boolean(state.savedDashboard) && - Boolean(state.applyFilters) - ); + return Boolean(state.getLatestDashboardState) && Boolean(state.dashboardContainer); }; export interface DashboardTopNavProps { @@ -101,24 +95,28 @@ export function DashboardTopNav({ }: DashboardTopNavProps) { const { setHeaderActionMenu } = useDashboardMountContext(); const { + dashboardSavedObject: { + checkForDuplicateDashboardTitle, + saveDashboardStateToSavedObject, + savedObjectsClient, + }, chrome: { getIsVisible$: getChromeIsVisible$, recentlyAccessed: chromeRecentlyAccessed, docTitle, }, coreContext: { i18nContext }, - dashboardCapabilities, + share, + overlays, + notifications, + usageCollection, data: { query, search }, - embeddable: { getEmbeddableFactory, getEmbeddableFactories, getStateTransfer }, - initializerContext: { allowByValueEmbeddables }, navigation: { TopNavMenu }, - notifications, - overlays, - savedObjects, - savedObjectsTagging: { hasTagDecoration, hasApi }, settings: { uiSettings, theme }, - share, - usageCollection, + initializerContext: { allowByValueEmbeddables }, + dashboardCapabilities: { showWriteControls, saveQuery: showSaveQuery }, + savedObjectsTagging: { hasApi: hasSavedObjectsTagging }, + embeddable: { getEmbeddableFactory, getEmbeddableFactories, getStateTransfer }, visualizations: { get: getVisualization, getAliases: getVisTypeAliases }, } = pluginServices.getServices(); @@ -144,24 +142,18 @@ export function DashboardTopNav({ const visibleSubscription = getChromeIsVisible$().subscribe((chromeIsVisible) => { setState((s) => ({ ...s, chromeIsVisible })); }); - const { id, title, getFullEditPath } = dashboardAppState.savedDashboard; - if (id && title) { + const { savedObjectId, title, viewMode } = dashboardState; + if (savedObjectId && title) { chromeRecentlyAccessed.add( - getFullEditPath(dashboardState.viewMode === ViewMode.EDIT), + getFullEditPath(savedObjectId, viewMode === ViewMode.EDIT), title, - id + savedObjectId ); } return () => { visibleSubscription.unsubscribe(); }; - }, [ - getChromeIsVisible$, - chromeRecentlyAccessed, - allowByValueEmbeddables, - dashboardState.viewMode, - dashboardAppState.savedDashboard, - ]); + }, [allowByValueEmbeddables, chromeRecentlyAccessed, dashboardState, getChromeIsVisible$]); const addFromLibrary = useCallback(() => { if (!isErrorEmbeddable(dashboardAppState.dashboardContainer)) { @@ -173,7 +165,7 @@ export function DashboardTopNav({ getFactory: getEmbeddableFactory, notifications, overlays, - SavedObjectFinder: getSavedObjectFinder(savedObjects, uiSettings), + SavedObjectFinder: getSavedObjectFinder({ client: savedObjectsClient }, uiSettings), reportUiCounter: usageCollection.reportUiCounter, theme, }), @@ -181,14 +173,14 @@ export function DashboardTopNav({ } }, [ dashboardAppState.dashboardContainer, + usageCollection.reportUiCounter, getEmbeddableFactories, getEmbeddableFactory, + savedObjectsClient, notifications, - savedObjects, overlays, - theme, uiSettings, - usageCollection, + theme, ]); const createNewVisType = useCallback( @@ -258,48 +250,71 @@ export function DashboardTopNav({ onTitleDuplicate, isTitleDuplicateConfirmed, }: DashboardSaveOptions): Promise => { + const { + timefilter: { timefilter }, + } = query; + const saveOptions = { confirmOverwrite: false, isTitleDuplicateConfirmed, onTitleDuplicate, + saveAsCopy: newCopyOnSave, }; - const stateFromSaveModal = { + const stateFromSaveModal: Pick< + DashboardState, + 'title' | 'description' | 'timeRestore' | 'timeRange' | 'refreshInterval' | 'tags' + > = { title: newTitle, + tags: [] as string[], description: newDescription, timeRestore: newTimeRestore, - tags: [] as string[], + timeRange: newTimeRestore ? timefilter.getTime() : undefined, + refreshInterval: newTimeRestore ? timefilter.getRefreshInterval() : undefined, }; - if (hasApi && newTags) { - // remove `hasAPI` once the savedObjectsTagging service is optional + if (hasSavedObjectsTagging && newTags) { + // remove `hasSavedObjectsTagging` once the savedObjectsTagging service is optional stateFromSaveModal.tags = newTags; } - dashboardAppState.savedDashboard.copyOnSave = newCopyOnSave; - const saveResult = await saveDashboard({ + if ( + !(await checkForDuplicateDashboardTitle({ + title: newTitle, + onTitleDuplicate, + lastSavedTitle: currentState.title, + copyOnSave: newCopyOnSave, + isTitleDuplicateConfirmed, + })) + ) { + // do not save if title is duplicate and is unconfirmed + return {}; + } + + const saveResult = await saveDashboardStateToSavedObject({ redirectTo, saveOptions, - savedDashboard: dashboardAppState.savedDashboard, currentState: { ...currentState, ...stateFromSaveModal }, }); if (saveResult.id && !saveResult.redirected) { dispatchDashboardStateChange(setStateFromSaveModal(stateFromSaveModal)); - dashboardAppState.updateLastSavedState?.(); - docTitle.change(stateFromSaveModal.title); + setTimeout(() => { + /** + * set timeout so dashboard state subject can update with the new title before updating the last saved state. + * TODO: Remove this timeout once the last saved state is also handled in Redux. + **/ + dashboardAppState.updateLastSavedState?.(); + docTitle.change(stateFromSaveModal.title); + }, 1); } - return saveResult.id ? { id: saveResult.id } : { error: saveResult.error }; + return saveResult.id ? { id: saveResult.id } : { error: new Error(saveResult.error) }; }; - const lastDashboardId = dashboardAppState.savedDashboard.id; - const savedTags = hasTagDecoration?.(dashboardAppState.savedDashboard) - ? dashboardAppState.savedDashboard.getTags() - : []; - const currentTagsSet = new Set([...savedTags, ...currentState.tags]); + const lastDashboardId = currentState.savedObjectId; const dashboardSaveModal = ( {}} - tags={Array.from(currentTagsSet)} + tags={currentState.tags} title={currentState.title} timeRestore={currentState.timeRestore} description={currentState.description} @@ -309,24 +324,25 @@ export function DashboardTopNav({ closeAllFlyouts(); showSaveModal(dashboardSaveModal, i18nContext); }, [ + saveDashboardStateToSavedObject, + checkForDuplicateDashboardTitle, dispatchDashboardStateChange, - hasApi, - hasTagDecoration, + hasSavedObjectsTagging, dashboardAppState, - i18nContext, - docTitle, closeAllFlyouts, + i18nContext, redirectTo, + docTitle, + query, ]); const runQuickSave = useCallback(async () => { setState((s) => ({ ...s, isSaveInProgress: true })); const currentState = dashboardAppState.getLatestDashboardState(); - const saveResult = await saveDashboard({ + const saveResult = await saveDashboardStateToSavedObject({ redirectTo, currentState, saveOptions: {}, - savedDashboard: dashboardAppState.savedDashboard, }); if (saveResult.id && !saveResult.redirected) { dashboardAppState.updateLastSavedState?.(); @@ -336,7 +352,7 @@ export function DashboardTopNav({ if (!mounted) return; setState((s) => ({ ...s, isSaveInProgress: false })); }, DashboardConstants.CHANGE_CHECK_DEBOUNCE); - }, [dashboardAppState, redirectTo, mounted]); + }, [dashboardAppState, saveDashboardStateToSavedObject, redirectTo, mounted]); const runClone = useCallback(() => { const currentState = dashboardAppState.getLatestDashboardState(); @@ -345,22 +361,33 @@ export function DashboardTopNav({ isTitleDuplicateConfirmed: boolean, onTitleDuplicate: () => void ) => { - dashboardAppState.savedDashboard.copyOnSave = true; - const saveOptions = { - confirmOverwrite: false, - isTitleDuplicateConfirmed, - onTitleDuplicate, - }; - const saveResult = await saveDashboard({ + if ( + !(await checkForDuplicateDashboardTitle({ + title: newTitle, + onTitleDuplicate, + lastSavedTitle: currentState.title, + copyOnSave: true, + isTitleDuplicateConfirmed, + })) + ) { + // do not clone if title is duplicate and is unconfirmed + return {}; + } + + const saveResult = await saveDashboardStateToSavedObject({ redirectTo, - saveOptions, - savedDashboard: dashboardAppState.savedDashboard, + saveOptions: { saveAsCopy: true }, currentState: { ...currentState, title: newTitle }, }); return saveResult.id ? { id: saveResult.id } : { error: saveResult.error }; }; showCloneModal({ onClone, title: currentState.title }); - }, [dashboardAppState, redirectTo]); + }, [ + checkForDuplicateDashboardTitle, + saveDashboardStateToSavedObject, + dashboardAppState, + redirectTo, + ]); const showOptions = useCallback( (anchorElement: HTMLElement) => { @@ -394,7 +421,6 @@ export function DashboardTopNav({ ShowShareModal({ anchorElement, currentDashboardState: currentState, - savedDashboard: dashboardAppState.savedDashboard, isDirty: Boolean(dashboardAppState.hasUnsavedChanges), }); }, @@ -442,7 +468,7 @@ export function DashboardTopNav({ }); const getNavBarProps = (): TopNavMenuProps => { - const { hasUnsavedChanges, savedDashboard } = dashboardAppState; + const { hasUnsavedChanges } = dashboardAppState; const shouldShowNavBarComponent = (forceShow: boolean): boolean => (forceShow || state.chromeIsVisible) && !dashboardState.fullScreenMode; @@ -464,11 +490,11 @@ export function DashboardTopNav({ dashboardAppState.getLatestDashboardState().viewMode, dashboardTopNavActions, { - showWriteControls: dashboardCapabilities.showWriteControls, - isDirty: Boolean(dashboardAppState.hasUnsavedChanges), - isSaveInProgress: state.isSaveInProgress, - isNewDashboard: !savedDashboard.id, isLabsEnabled, + showWriteControls, + isSaveInProgress: state.isSaveInProgress, + isNewDashboard: !dashboardState.savedObjectId, + isDirty: Boolean(dashboardAppState.hasUnsavedChanges), } ); @@ -485,22 +511,22 @@ export function DashboardTopNav({ return { badges, - appName: 'dashboard', - config: showTopNavMenu ? topNav : undefined, - className: isFullScreenMode ? 'kbnTopNavMenu-isFullScreen' : undefined, screenTitle, - showSearchBar, showQueryBar, + showSearchBar, + showFilterBar, + showSaveQuery, showQueryInput, showDatePicker, - showFilterBar, - setMenuMountPoint: embedSettings ? undefined : setHeaderActionMenu, - indexPatterns: dashboardAppState.dataViews, - showSaveQuery: dashboardCapabilities.saveQuery, + appName: 'dashboard', useDefaultBehaviors: true, + visible: printMode !== true, savedQuery: state.savedQuery, savedQueryId: dashboardState.savedQuery, - visible: printMode !== true, + indexPatterns: dashboardAppState.dataViews, + config: showTopNavMenu ? topNav : undefined, + setMenuMountPoint: embedSettings ? undefined : setHeaderActionMenu, + className: isFullScreenMode ? 'kbnTopNavMenu-isFullScreen' : undefined, onQuerySubmit: (_payload, isUpdate) => { if (isUpdate === false) { dashboardAppState.$triggerDashboardRefresh.next({ force: true }); diff --git a/src/plugins/dashboard/public/application/top_nav/show_share_modal.test.tsx b/src/plugins/dashboard/public/application/top_nav/show_share_modal.test.tsx index ad9d85926a94b..7e76ef1789a38 100644 --- a/src/plugins/dashboard/public/application/top_nav/show_share_modal.test.tsx +++ b/src/plugins/dashboard/public/application/top_nav/show_share_modal.test.tsx @@ -10,10 +10,9 @@ import { Capabilities } from '@kbn/core/public'; import { DashboardState } from '../../types'; import { DashboardAppLocatorParams } from '../..'; +import { pluginServices } from '../../services/plugin_services'; import { stateToRawDashboardState } from '../lib/convert_dashboard_state'; -import { getSavedDashboardMock } from '../test_helpers'; import { showPublicUrlSwitch, ShowShareModal, ShowShareModalProps } from './show_share_modal'; -import { pluginServices } from '../../services/plugin_services'; describe('showPublicUrlSwitch', () => { test('returns false if "dashboard" app is not available', () => { @@ -75,9 +74,8 @@ describe('ShowShareModal', () => { .mockReturnValue(unsavedState); return { isDirty: true, - savedDashboard: getSavedDashboardMock(), anchorElement: document.createElement('div'), - currentDashboardState: { panels: {} } as unknown as DashboardState, + currentDashboardState: { panels: {} } as DashboardState, }; }; @@ -139,7 +137,7 @@ describe('ShowShareModal', () => { }); unsavedStateKeys.forEach((key) => { expect(shareLocatorParams[key]).toStrictEqual( - (rawDashboardState as Partial)[key] + (rawDashboardState as unknown as Partial)[key] ); }); }); diff --git a/src/plugins/dashboard/public/application/top_nav/show_share_modal.tsx b/src/plugins/dashboard/public/application/top_nav/show_share_modal.tsx index f93061f56d6ec..0f7d119427dd7 100644 --- a/src/plugins/dashboard/public/application/top_nav/show_share_modal.tsx +++ b/src/plugins/dashboard/public/application/top_nav/show_share_modal.tsx @@ -9,28 +9,26 @@ import moment from 'moment'; import React, { ReactElement, useState } from 'react'; -import { EuiCheckboxGroup } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; +import { EuiCheckboxGroup } from '@elastic/eui'; import type { Capabilities } from '@kbn/core/public'; -import type { SerializableControlGroupInput } from '@kbn/controls-plugin/common'; import { ViewMode } from '@kbn/embeddable-plugin/public'; import { setStateToKbnUrl, unhashUrl } from '@kbn/kibana-utils-plugin/public'; +import type { SerializableControlGroupInput } from '@kbn/controls-plugin/common'; -import type { DashboardSavedObject } from '../..'; -import { shareModalStrings } from '../../dashboard_strings'; -import { DashboardAppLocatorParams, DASHBOARD_APP_LOCATOR } from '../../locator'; import type { DashboardState } from '../../types'; import { dashboardUrlParams } from '../dashboard_router'; -import { stateToRawDashboardState } from '../lib/convert_dashboard_state'; -import { convertPanelMapToSavedPanels } from '../lib/convert_dashboard_panels'; +import { shareModalStrings } from '../../dashboard_strings'; +import { convertPanelMapToSavedPanels } from '../../../common'; import { pluginServices } from '../../services/plugin_services'; +import { stateToRawDashboardState } from '../lib/convert_dashboard_state'; +import { DashboardAppLocatorParams, DASHBOARD_APP_LOCATOR } from '../../locator'; const showFilterBarId = 'showFilterBar'; export interface ShowShareModalProps { isDirty: boolean; anchorElement: HTMLElement; - savedDashboard: DashboardSavedObject; currentDashboardState: DashboardState; } @@ -45,7 +43,6 @@ export const showPublicUrlSwitch = (anonymousUserCapabilities: Capabilities) => export function ShowShareModal({ isDirty, anchorElement, - savedDashboard, currentDashboardState, }: ShowShareModalProps) { const { @@ -59,6 +56,7 @@ export function ShowShareModal({ }, }, share: { toggleShareContextMenu }, + initializerContext: { kibanaVersion }, } = pluginServices.getServices(); if (!toggleShareContextMenu) return; // TODO: Make this logic cleaner once share is an optional service @@ -124,7 +122,9 @@ export function ShowShareModal({ DashboardAppLocatorParams, 'options' | 'query' | 'savedQuery' | 'filters' | 'panels' | 'controlGroupInput' > = {}; - const unsavedDashboardState = dashboardSessionStorage.getState(savedDashboard.id); + const { savedObjectId, title } = currentDashboardState; + const unsavedDashboardState = dashboardSessionStorage.getState(savedObjectId); + if (unsavedDashboardState) { unsavedStateForLocator = { query: unsavedDashboardState.query, @@ -133,13 +133,16 @@ export function ShowShareModal({ savedQuery: unsavedDashboardState.savedQuery, controlGroupInput: unsavedDashboardState.controlGroupInput as SerializableControlGroupInput, panels: unsavedDashboardState.panels - ? convertPanelMapToSavedPanels(unsavedDashboardState.panels) + ? (convertPanelMapToSavedPanels( + unsavedDashboardState.panels, + kibanaVersion + ) as DashboardAppLocatorParams['panels']) : undefined, }; } const locatorParams: DashboardAppLocatorParams = { - dashboardId: savedDashboard.id, + dashboardId: savedObjectId, preserveSavedFilters: true, refreshInterval: undefined, // We don't share refresh interval externally viewMode: ViewMode.VIEW, // For share locators we always load the dashboard in view mode @@ -161,11 +164,11 @@ export function ShowShareModal({ { useHash: false, storeInHashQuery: true }, unhashUrl(window.location.href) ), - objectId: savedDashboard.id, + objectId: savedObjectId, objectType: 'dashboard', sharingData: { title: - savedDashboard.title || + title || i18n.translate('dashboard.share.defaultDashboardTitle', { defaultMessage: 'Dashboard [{date}]', values: { date: moment().toISOString(true) }, diff --git a/src/plugins/dashboard/public/dashboard_constants.ts b/src/plugins/dashboard/public/dashboard_constants.ts index badc14ddaee66..9bbe97681032d 100644 --- a/src/plugins/dashboard/public/dashboard_constants.ts +++ b/src/plugins/dashboard/public/dashboard_constants.ts @@ -6,9 +6,18 @@ * Side Public License, v 1. */ +import { ViewMode } from '@kbn/embeddable-plugin/common'; +import type { DashboardState } from './types'; + export const DASHBOARD_STATE_STORAGE_KEY = '_a'; export const GLOBAL_STATE_STORAGE_KEY = '_g'; +export const DASHBOARD_GRID_COLUMN_COUNT = 48; +export const DASHBOARD_GRID_HEIGHT = 20; +export const DEFAULT_PANEL_WIDTH = DASHBOARD_GRID_COLUMN_COUNT / 2; +export const DEFAULT_PANEL_HEIGHT = 15; +export const DASHBOARD_CONTAINER_TYPE = 'dashboard'; + export const DashboardConstants = { LANDING_PAGE_PATH: '/list', CREATE_NEW_DASHBOARD_URL: '/create', @@ -18,11 +27,37 @@ export const DashboardConstants = { ADD_EMBEDDABLE_TYPE: 'addEmbeddableType', DASHBOARDS_ID: 'dashboards', DASHBOARD_ID: 'dashboard', + DASHBOARD_SAVED_OBJECT_TYPE: 'dashboard', SEARCH_SESSION_ID: 'searchSessionId', CHANGE_CHECK_DEBOUNCE: 100, CHANGE_APPLY_DEBOUNCE: 50, }; +export const defaultDashboardState: DashboardState = { + viewMode: ViewMode.EDIT, // new dashboards start in edit mode. + fullScreenMode: false, + timeRestore: false, + query: { query: '', language: 'kuery' }, + description: '', + filters: [], + panels: {}, + title: '', + tags: [], + options: { + useMargins: true, + syncColors: false, + syncTooltips: false, + hidePanelTitles: false, + }, +}; + +export const getFullPath = (aliasId?: string, id?: string) => + `/app/dashboards#${createDashboardEditUrl(aliasId || id)}`; + +export const getFullEditPath = (id?: string, editMode?: boolean) => { + return `/app/dashboards#${createDashboardEditUrl(id, editMode)}`; +}; + export function createDashboardEditUrl(id?: string, editMode?: boolean) { if (!id) { return `${DashboardConstants.CREATE_NEW_DASHBOARD_URL}`; diff --git a/src/plugins/dashboard/public/dashboard_strings.ts b/src/plugins/dashboard/public/dashboard_strings.ts index 5679ac28f838b..6474c7dc2bba6 100644 --- a/src/plugins/dashboard/public/dashboard_strings.ts +++ b/src/plugins/dashboard/public/dashboard_strings.ts @@ -382,7 +382,7 @@ export const panelStorageErrorStrings = { }), }; -export const dashboardLoadingErrorStrings = { +export const dashboardSavedObjectErrorStrings = { getDashboardLoadError: (message: string) => i18n.translate('dashboard.loadingError.errorMessage', { defaultMessage: 'Error encountered while loading saved dashboard: {message}', @@ -393,6 +393,14 @@ export const dashboardLoadingErrorStrings = { defaultMessage: 'Unable to load dashboard: {message}', values: { message }, }), + getErrorDeletingDashboardToast: () => + i18n.translate('dashboard.deleteError.toastDescription', { + defaultMessage: 'Error encountered while deleting dashboard', + }), + getPanelTooOldError: () => + i18n.translate('dashboard.loadURLError.PanelTooOld', { + defaultMessage: 'Cannot load panels from a URL created in a version older than 7.3', + }), }; /* @@ -432,7 +440,7 @@ export const emptyScreenStrings = { /* Dashboard Listing Page */ -export const dashboardListingTable = { +export const dashboardListingTableStrings = { getEntityName: () => i18n.translate('dashboard.listing.table.entityName', { defaultMessage: 'dashboard', @@ -450,8 +458,8 @@ export const dashboardUnsavedListingStrings = { defaultMessage: 'You have unsaved changes in the following {dash}:', values: { dash: plural - ? dashboardListingTable.getEntityNamePlural() - : dashboardListingTable.getEntityName(), + ? dashboardListingTableStrings.getEntityNamePlural() + : dashboardListingTableStrings.getEntityName(), }, }), getLoadingTitle: () => diff --git a/src/plugins/dashboard/public/index.ts b/src/plugins/dashboard/public/index.ts index 7cb54db209c1d..598940bbd666c 100644 --- a/src/plugins/dashboard/public/index.ts +++ b/src/plugins/dashboard/public/index.ts @@ -9,11 +9,7 @@ import { PluginInitializerContext } from '@kbn/core/public'; import { DashboardPlugin } from './plugin'; -export { - DashboardContainer, - DashboardContainerFactoryDefinition, - DASHBOARD_CONTAINER_TYPE, -} from './application'; +export { DASHBOARD_CONTAINER_TYPE } from './dashboard_constants'; export { DashboardConstants, createDashboardEditUrl } from './dashboard_constants'; export type { DashboardSetup, DashboardStart, DashboardFeatureFlagConfig } from './plugin'; @@ -23,7 +19,6 @@ export { cleanEmptyKeys, } from './locator'; -export type { DashboardSavedObject } from './saved_dashboards'; export type { SavedDashboardPanel, DashboardContainerInput } from './types'; export function plugin(initializerContext: PluginInitializerContext) { diff --git a/src/plugins/dashboard/public/locator.ts b/src/plugins/dashboard/public/locator.ts index e3cd3f159f738..a66015afcb00b 100644 --- a/src/plugins/dashboard/public/locator.ts +++ b/src/plugins/dashboard/public/locator.ts @@ -94,7 +94,7 @@ export type DashboardAppLocatorParams = { /** * List of dashboard panels */ - panels?: SavedDashboardPanel[]; + panels?: Array; // used SerializableRecord here to force the GridData type to be read as serializable /** * Saved query ID diff --git a/src/plugins/dashboard/public/plugin.tsx b/src/plugins/dashboard/public/plugin.tsx index 9d1df9d2acb12..a0d35e2c7be48 100644 --- a/src/plugins/dashboard/public/plugin.tsx +++ b/src/plugins/dashboard/public/plugin.tsx @@ -9,73 +9,56 @@ import { BehaviorSubject } from 'rxjs'; import { filter, map } from 'rxjs/operators'; -import { Start as InspectorStartContract } from '@kbn/inspector-plugin/public'; -import type { UrlForwardingSetup, UrlForwardingStart } from '@kbn/url-forwarding-plugin/public'; -import { APP_WRAPPER_CLASS } from '@kbn/core/public'; import { App, Plugin, - type CoreSetup, - type CoreStart, AppUpdater, ScopedHistory, + type CoreSetup, + type CoreStart, AppMountParameters, DEFAULT_APP_CATEGORIES, PluginInitializerContext, SavedObjectsClientContract, } from '@kbn/core/public'; -import { - CONTEXT_MENU_TRIGGER, - EmbeddableSetup, - EmbeddableStart, - PANEL_BADGE_TRIGGER, - PANEL_NOTIFICATION_TRIGGER, -} from '@kbn/embeddable-plugin/public'; import type { ScreenshotModePluginSetup, ScreenshotModePluginStart, } from '@kbn/screenshot-mode-plugin/public'; -import type { SpacesPluginStart } from '@kbn/spaces-plugin/public'; -import type { HomePublicPluginSetup } from '@kbn/home-plugin/public'; -import { replaceUrlHashQuery } from '@kbn/kibana-utils-plugin/public'; -import { createKbnUrlTracker } from '@kbn/kibana-utils-plugin/public'; -import type { VisualizationsStart } from '@kbn/visualizations-plugin/public'; -import type { DataViewEditorStart } from '@kbn/data-view-editor-plugin/public'; import type { UsageCollectionSetup, UsageCollectionStart, } from '@kbn/usage-collection-plugin/public'; +import { APP_WRAPPER_CLASS } from '@kbn/core/public'; +import { replaceUrlHashQuery } from '@kbn/kibana-utils-plugin/public'; +import { createKbnUrlTracker } from '@kbn/kibana-utils-plugin/public'; + +import type { SpacesPluginStart } from '@kbn/spaces-plugin/public'; +import type { HomePublicPluginSetup } from '@kbn/home-plugin/public'; +import type { SavedObjectsStart } from '@kbn/saved-objects-plugin/public'; +import type { VisualizationsStart } from '@kbn/visualizations-plugin/public'; +import type { DataViewEditorStart } from '@kbn/data-view-editor-plugin/public'; import type { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public'; import type { SharePluginSetup, SharePluginStart } from '@kbn/share-plugin/public'; +import type { Start as InspectorStartContract } from '@kbn/inspector-plugin/public'; import type { UiActionsSetup, UiActionsStart } from '@kbn/ui-actions-plugin/public'; +import type { EmbeddableSetup, EmbeddableStart } from '@kbn/embeddable-plugin/public'; import type { PresentationUtilPluginStart } from '@kbn/presentation-util-plugin/public'; +import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public'; import type { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public'; +import type { UrlForwardingSetup, UrlForwardingStart } from '@kbn/url-forwarding-plugin/public'; import type { SavedObjectTaggingOssPluginStart } from '@kbn/saved-objects-tagging-oss-plugin/public'; -import { getSavedObjectFinder, type SavedObjectsStart } from '@kbn/saved-objects-plugin/public'; -import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public'; import { - ClonePanelAction, - createDashboardContainerByValueRenderer, - DASHBOARD_CONTAINER_TYPE, - DashboardContainerFactory, + type DashboardContainerFactory, DashboardContainerFactoryDefinition, - ExpandPanelAction, - ReplacePanelAction, - UnlinkFromLibraryAction, - AddToLibraryAction, - LibraryNotificationAction, - CopyToDashboardAction, -} from './application'; -import { SavedObjectLoader } from './services/saved_object_loader'; -import { DashboardAppLocatorDefinition, DashboardAppLocator } from './locator'; -import { createSavedDashboardLoader } from './saved_dashboards'; -import { DashboardConstants } from './dashboard_constants'; -import { PlaceholderEmbeddableFactory } from './application/embeddable/placeholder'; -import { ExportCSVAction } from './application/actions/export_csv_action'; -import { dashboardFeatureCatalog } from './dashboard_strings'; -import { FiltersNotificationBadge } from './application/actions/filters_notification_badge'; + createDashboardContainerByValueRenderer, +} from './application/embeddable'; import type { DashboardMountContextProps } from './types'; +import { dashboardFeatureCatalog } from './dashboard_strings'; +import { type DashboardAppLocator, DashboardAppLocatorDefinition } from './locator'; +import { PlaceholderEmbeddableFactory } from './application/embeddable/placeholder'; +import { DashboardConstants, DASHBOARD_CONTAINER_TYPE } from './dashboard_constants'; export interface DashboardFeatureFlagConfig { allowByValueEmbeddables: boolean; @@ -118,7 +101,6 @@ export interface DashboardSetup { } export interface DashboardStart { - getSavedDashboardLoader: () => SavedObjectLoader; getDashboardContainerByValueRenderer: () => ReturnType< typeof createDashboardContainerByValueRenderer >; @@ -159,9 +141,14 @@ export class DashboardPlugin new DashboardAppLocatorDefinition({ useHashedUrl: core.uiSettings.get('state:storeInSessionStorage'), getDashboardFilterFields: async (dashboardId: string) => { - const [, , selfStart] = await core.getStartServices(); - const dashboard = await selfStart.getSavedDashboardLoader().get(dashboardId); - return dashboard?.searchSource?.getField('filter') ?? []; + const { pluginServices } = await import('./services/plugin_services'); + const { + dashboardSavedObject: { loadDashboardStateFromSavedObject }, + } = pluginServices.getServices(); + return ( + (await loadDashboardStateFromSavedObject({ id: dashboardId })).dashboardState + ?.filters ?? [] + ); }, }) ); @@ -305,58 +292,16 @@ export class DashboardPlugin } public start(core: CoreStart, plugins: DashboardStartDependencies): DashboardStart { - const { uiSettings } = core; - const { uiActions, share, presentationUtil } = plugins; - this.startDashboardKibanaServices(core, plugins, this.initializerContext).then(() => { - const clonePanelAction = new ClonePanelAction(core.savedObjects); - uiActions.registerAction(clonePanelAction); - uiActions.attachAction(CONTEXT_MENU_TRIGGER, clonePanelAction.id); - - const SavedObjectFinder = getSavedObjectFinder(core.savedObjects, uiSettings); - const changeViewAction = new ReplacePanelAction(SavedObjectFinder); - uiActions.registerAction(changeViewAction); - uiActions.attachAction(CONTEXT_MENU_TRIGGER, changeViewAction.id); - - const panelLevelFiltersNotification = new FiltersNotificationBadge(); - uiActions.registerAction(panelLevelFiltersNotification); - uiActions.attachAction(PANEL_BADGE_TRIGGER, panelLevelFiltersNotification.id); - - if (share) { - const ExportCSVPlugin = new ExportCSVAction(); - uiActions.addTriggerAction(CONTEXT_MENU_TRIGGER, ExportCSVPlugin); - } - - if (this.dashboardFeatureFlagConfig?.allowByValueEmbeddables) { - const addToLibraryAction = new AddToLibraryAction(); - uiActions.registerAction(addToLibraryAction); - uiActions.attachAction(CONTEXT_MENU_TRIGGER, addToLibraryAction.id); - - const unlinkFromLibraryAction = new UnlinkFromLibraryAction(); - uiActions.registerAction(unlinkFromLibraryAction); - uiActions.attachAction(CONTEXT_MENU_TRIGGER, unlinkFromLibraryAction.id); - - const libraryNotificationAction = new LibraryNotificationAction(unlinkFromLibraryAction); - uiActions.registerAction(libraryNotificationAction); - uiActions.attachAction(PANEL_NOTIFICATION_TRIGGER, libraryNotificationAction.id); - - const copyToDashboardAction = new CopyToDashboardAction(presentationUtil.ContextProvider); - uiActions.registerAction(copyToDashboardAction); - uiActions.attachAction(CONTEXT_MENU_TRIGGER, copyToDashboardAction.id); - } - }); - - const expandPanelAction = new ExpandPanelAction(); // this action does't rely on any services - uiActions.registerAction(expandPanelAction); - uiActions.attachAction(CONTEXT_MENU_TRIGGER, expandPanelAction.id); - - const savedDashboardLoader = createSavedDashboardLoader({ - savedObjectsClient: core.savedObjects.client, - savedObjects: plugins.savedObjects, - embeddableStart: plugins.embeddable, + this.startDashboardKibanaServices(core, plugins, this.initializerContext).then(async () => { + const { buildAllDashboardActions } = await import('./application/actions'); + buildAllDashboardActions({ + core, + plugins, + allowByValueEmbeddables: this.dashboardFeatureFlagConfig?.allowByValueEmbeddables, + }); }); return { - getSavedDashboardLoader: () => savedDashboardLoader, getDashboardContainerByValueRenderer: () => { const dashboardContainerFactory = plugins.embeddable.getEmbeddableFactory(DASHBOARD_CONTAINER_TYPE); diff --git a/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts b/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts deleted file mode 100644 index c23b6eb2a87e0..0000000000000 --- a/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts +++ /dev/null @@ -1,200 +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. - */ - -import { assign, cloneDeep } from 'lodash'; -import { SavedObjectsClientContract } from '@kbn/core/public'; -import type { ResolvedSimpleSavedObject } from '@kbn/core/public'; -import { SavedObjectAttributes, SavedObjectReference } from '@kbn/core/types'; -import { RawControlGroupAttributes } from '@kbn/controls-plugin/common'; -import { EmbeddableStart } from '@kbn/embeddable-plugin/public'; -import { ISearchSource } from '@kbn/data-plugin/common'; -import { RefreshInterval } from '@kbn/data-plugin/public'; -import { Query, Filter } from '@kbn/es-query'; -import type { SavedObject, SavedObjectsStart } from '@kbn/saved-objects-plugin/public'; - -import { createDashboardEditUrl } from '../dashboard_constants'; -import { extractReferences, injectReferences } from '../../common/saved_dashboard_references'; - -import { DashboardOptions } from '../types'; - -export interface DashboardSavedObject extends SavedObject { - id?: string; - timeRestore: boolean; - timeTo?: string; - timeFrom?: string; - description?: string; - panelsJSON: string; - optionsJSON?: string; - // TODO: write a migration to rid of this, it's only around for bwc. - uiStateJSON?: string; - lastSavedTitle: string; - refreshInterval?: RefreshInterval; - searchSource: ISearchSource; - getQuery(): Query; - getFilters(): Filter[]; - getFullEditPath: (editMode?: boolean) => string; - outcome?: ResolvedSimpleSavedObject['outcome']; - aliasId?: ResolvedSimpleSavedObject['alias_target_id']; - aliasPurpose?: ResolvedSimpleSavedObject['alias_purpose']; - - controlGroupInput?: Omit; -} - -const defaults = { - title: '', - hits: 0, - description: '', - panelsJSON: '[]', - optionsJSON: JSON.stringify({ - // for BWC reasons we can't default dashboards that already exist without this setting to true. - useMargins: true, - syncColors: false, - syncTooltips: false, - hidePanelTitles: false, - } as DashboardOptions), - version: 1, - timeRestore: false, - timeTo: undefined, - timeFrom: undefined, - refreshInterval: undefined, -}; - -// Used only by the savedDashboards service, usually no reason to change this -export function createSavedDashboardClass( - savedObjectStart: SavedObjectsStart, - embeddableStart: EmbeddableStart, - savedObjectsClient: SavedObjectsClientContract -): new (id: string) => DashboardSavedObject { - class SavedDashboard extends savedObjectStart.SavedObjectClass { - // save these objects with the 'dashboard' type - public static type = 'dashboard'; - - // if type:dashboard has no mapping, we push this mapping into ES - public static mapping = { - title: 'text', - hits: 'integer', - description: 'text', - panelsJSON: 'text', - optionsJSON: 'text', - version: 'integer', - timeRestore: 'boolean', - timeTo: 'keyword', - timeFrom: 'keyword', - refreshInterval: { - type: 'object', - properties: { - display: { type: 'keyword' }, - pause: { type: 'boolean' }, - section: { type: 'integer' }, - value: { type: 'integer' }, - }, - }, - controlGroupInput: { - type: 'object', - properties: { - controlStyle: { type: 'keyword' }, - panelsJSON: { type: 'text' }, - }, - }, - }; - public static fieldOrder = ['title', 'description']; - public static searchSource = true; - public showInRecentlyAccessed = true; - - public outcome?: ResolvedSimpleSavedObject['outcome']; - public aliasId?: ResolvedSimpleSavedObject['alias_target_id']; - public aliasPurpose?: ResolvedSimpleSavedObject['alias_purpose']; - - constructor(arg: { id: string; useResolve: boolean } | string) { - super({ - type: SavedDashboard.type, - mapping: SavedDashboard.mapping, - searchSource: SavedDashboard.searchSource, - extractReferences: (opts: { - attributes: SavedObjectAttributes; - references: SavedObjectReference[]; - }) => extractReferences(opts, { embeddablePersistableStateService: embeddableStart }), - injectReferences: (so: DashboardSavedObject, references: SavedObjectReference[]) => { - const newAttributes = injectReferences( - { attributes: so._serialize().attributes, references }, - { - embeddablePersistableStateService: embeddableStart, - } - ); - Object.assign(so, newAttributes); - }, - - // if this is null/undefined then the SavedObject will be assigned the defaults - id: typeof arg === 'object' ? arg.id : arg, - - // default values that will get assigned if the doc is new - defaults, - }); - - const id: string = typeof arg === 'object' ? arg.id : arg; - const useResolve = typeof arg === 'object' ? arg.useResolve : false; - - this.getFullPath = () => `/app/dashboards#${createDashboardEditUrl(this.aliasId || this.id)}`; - - // Overwrite init if we want to use resolve - if (useResolve || true) { - this.init = async () => { - const esType = SavedDashboard.type; - // ensure that the esType is defined - if (!esType) throw new Error('You must define a type name to use SavedObject objects.'); - - if (!id) { - // just assign the defaults and be done - assign(this, defaults); - await this.hydrateIndexPattern!(); - - return this; - } - - const { - outcome, - alias_target_id: aliasId, - alias_purpose: aliasPurpose, - saved_object: resp, - } = await savedObjectsClient.resolve(esType, id); - - const respMapped = { - _id: resp.id, - _type: resp.type, - _source: cloneDeep(resp.attributes), - references: resp.references, - found: !!resp._version, - }; - - this.outcome = outcome; - this.aliasId = aliasId; - this.aliasPurpose = aliasPurpose; - await this.applyESResp(respMapped); - - return this; - }; - } - } - - getQuery() { - return this.searchSource!.getOwnField('query') || { query: '', language: 'kuery' }; - } - - getFilters() { - return this.searchSource!.getOwnField('filter') || []; - } - - getFullEditPath = (editMode?: boolean) => { - return `/app/dashboards#${createDashboardEditUrl(this.id, editMode)}`; - }; - } - - // Unfortunately this throws a typescript error without the casting. I think it's due to the - // convoluted way SavedObjects are created. - return SavedDashboard as unknown as new (id: string) => DashboardSavedObject; -} diff --git a/src/plugins/dashboard/public/saved_dashboards/saved_dashboards.ts b/src/plugins/dashboard/public/saved_dashboards/saved_dashboards.ts deleted file mode 100644 index a154fdad96562..0000000000000 --- a/src/plugins/dashboard/public/saved_dashboards/saved_dashboards.ts +++ /dev/null @@ -1,36 +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. - */ - -import { SavedObjectsClientContract } from '@kbn/core/public'; -import { EmbeddableStart } from '@kbn/embeddable-plugin/public'; -import type { SavedObjectsStart } from '@kbn/saved-objects-plugin/public'; - -import { SavedObjectLoader } from '../services/saved_object_loader'; -import { createSavedDashboardClass } from './saved_dashboard'; - -interface Services { - savedObjectsClient: SavedObjectsClientContract; - savedObjects: SavedObjectsStart; - embeddableStart: EmbeddableStart; -} - -/** - * @param services - */ -export function createSavedDashboardLoader({ - savedObjects, - savedObjectsClient, - embeddableStart, -}: Services) { - const SavedDashboard = createSavedDashboardClass( - savedObjects, - embeddableStart, - savedObjectsClient - ); - return new SavedObjectLoader(SavedDashboard, savedObjectsClient); -} diff --git a/src/plugins/dashboard/public/services/dashboard_saved_object/dashboard_saved_object.stub.ts b/src/plugins/dashboard/public/services/dashboard_saved_object/dashboard_saved_object.stub.ts new file mode 100644 index 0000000000000..c23a76746404d --- /dev/null +++ b/src/plugins/dashboard/public/services/dashboard_saved_object/dashboard_saved_object.stub.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 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 { savedObjectsServiceMock } from '@kbn/core/public/mocks'; +import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public'; +import { DashboardAttributes } from '../../application'; +import { FindDashboardSavedObjectsResponse } from './lib/find_dashboard_saved_objects'; + +import { DashboardSavedObjectService } from './types'; +import { LoadDashboardFromSavedObjectReturn } from './lib/load_dashboard_state_from_saved_object'; + +type DashboardSavedObjectServiceFactory = PluginServiceFactory; + +export const dashboardSavedObjectServiceFactory: DashboardSavedObjectServiceFactory = () => { + const { client: savedObjectsClient } = savedObjectsServiceMock.createStartContract(); + return { + loadDashboardStateFromSavedObject: jest.fn().mockImplementation(() => + Promise.resolve({ + dashboardState: {}, + } as LoadDashboardFromSavedObjectReturn) + ), + saveDashboardStateToSavedObject: jest.fn(), + findDashboards: { + findSavedObjects: jest.fn().mockImplementation(({ search, size }) => { + const sizeToUse = size ?? 10; + const hits: FindDashboardSavedObjectsResponse['hits'] = []; + for (let i = 0; i < sizeToUse; i++) { + hits.push({ + type: 'dashboard', + id: `dashboard${i}`, + attributes: { + description: `dashboard${i} desc`, + title: `dashboard${i} - ${search} - title`, + }, + } as FindDashboardSavedObjectsResponse['hits'][0]); + } + return Promise.resolve({ + total: sizeToUse, + hits, + }); + }), + findByIds: jest.fn().mockImplementation(() => + Promise.resolve([ + { + id: `dashboardUnsavedOne`, + status: 'success', + attributes: { + title: `Dashboard Unsaved One`, + } as unknown as DashboardAttributes, + }, + { + id: `dashboardUnsavedTwo`, + status: 'success', + attributes: { + title: `Dashboard Unsaved Two`, + } as unknown as DashboardAttributes, + }, + { + id: `dashboardUnsavedThree`, + status: 'success', + attributes: { + title: `Dashboard Unsaved Three`, + } as unknown as DashboardAttributes, + }, + ]) + ), + findByTitle: jest.fn(), + }, + checkForDuplicateDashboardTitle: jest.fn(), + savedObjectsClient, + }; +}; diff --git a/src/plugins/dashboard/public/services/dashboard_saved_object/dashboard_saved_object_service.ts b/src/plugins/dashboard/public/services/dashboard_saved_object/dashboard_saved_object_service.ts new file mode 100644 index 0000000000000..7fb558309936e --- /dev/null +++ b/src/plugins/dashboard/public/services/dashboard_saved_object/dashboard_saved_object_service.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 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 type { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public'; + +import type { DashboardStartDependencies } from '../../plugin'; +import { checkForDuplicateDashboardTitle } from './lib/check_for_duplicate_dashboard_title'; +import { + findDashboardIdByTitle, + findDashboardSavedObjects, + findDashboardSavedObjectsByIds, +} from './lib/find_dashboard_saved_objects'; +import { loadDashboardStateFromSavedObject } from './lib/load_dashboard_state_from_saved_object'; +import { saveDashboardStateToSavedObject } from './lib/save_dashboard_state_to_saved_object'; +import type { DashboardSavedObjectRequiredServices, DashboardSavedObjectService } from './types'; + +export type DashboardSavedObjectServiceFactory = KibanaPluginServiceFactory< + DashboardSavedObjectService, + DashboardStartDependencies, + DashboardSavedObjectRequiredServices +>; + +export const dashboardSavedObjectServiceFactory: DashboardSavedObjectServiceFactory = ( + { coreStart }, + requiredServices +) => { + const { + savedObjects: { client: savedObjectsClient }, + } = coreStart; + + return { + loadDashboardStateFromSavedObject: ({ id, getScopedHistory }) => + loadDashboardStateFromSavedObject({ + id, + getScopedHistory, + savedObjectsClient, + ...requiredServices, + }), + saveDashboardStateToSavedObject: ({ currentState, redirectTo, saveOptions }) => + saveDashboardStateToSavedObject({ + redirectTo, + saveOptions, + currentState, + savedObjectsClient, + ...requiredServices, + }), + findDashboards: { + findSavedObjects: ({ hasReference, search, size }) => + findDashboardSavedObjects({ hasReference, search, size, savedObjectsClient }), + findByIds: (ids) => findDashboardSavedObjectsByIds(savedObjectsClient, ids), + findByTitle: (title) => findDashboardIdByTitle(title, savedObjectsClient), + }, + checkForDuplicateDashboardTitle: (props) => + checkForDuplicateDashboardTitle(props, savedObjectsClient), + savedObjectsClient, + }; +}; diff --git a/src/plugins/dashboard/public/services/dashboard_saved_object/lib/check_for_duplicate_dashboard_title.ts b/src/plugins/dashboard/public/services/dashboard_saved_object/lib/check_for_duplicate_dashboard_title.ts new file mode 100644 index 0000000000000..e03345e78c41f --- /dev/null +++ b/src/plugins/dashboard/public/services/dashboard_saved_object/lib/check_for_duplicate_dashboard_title.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 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 type { SavedObjectsClientContract } from '@kbn/core/public'; + +import { DashboardConstants } from '../../..'; +import type { DashboardAttributes } from '../../../application'; + +export interface DashboardDuplicateTitleCheckProps { + title: string; + copyOnSave: boolean; + lastSavedTitle: string; + onTitleDuplicate: () => void; + isTitleDuplicateConfirmed: boolean; +} + +/** + * check for an existing dashboard with the same title in ES + * returns Promise when there is no duplicate, or runs the provided onTitleDuplicate + * function when the title already exists + */ +export async function checkForDuplicateDashboardTitle( + { + title, + copyOnSave, + lastSavedTitle, + onTitleDuplicate, + isTitleDuplicateConfirmed, + }: DashboardDuplicateTitleCheckProps, + savedObjectsClient: SavedObjectsClientContract +): Promise { + // Don't check for duplicates if user has already confirmed save with duplicate title + if (isTitleDuplicateConfirmed) { + return true; + } + + // Don't check if the user isn't updating the title, otherwise that would become very annoying to have + // to confirm the save every time, except when copyOnSave is true, then we do want to check. + if (title === lastSavedTitle && !copyOnSave) { + return true; + } + const response = await savedObjectsClient.find({ + perPage: 10, + fields: ['title'], + search: `"${title}"`, + searchFields: ['title'], + type: DashboardConstants.DASHBOARD_SAVED_OBJECT_TYPE, + }); + const duplicate = response.savedObjects.find( + (obj) => obj.get('title').toLowerCase() === title.toLowerCase() + ); + if (!duplicate) { + return true; + } + onTitleDuplicate?.(); + return false; +} diff --git a/src/plugins/dashboard/public/services/dashboard_saved_object/lib/find_dashboard_saved_objects.ts b/src/plugins/dashboard/public/services/dashboard_saved_object/lib/find_dashboard_saved_objects.ts new file mode 100644 index 0000000000000..c24511f56d3e2 --- /dev/null +++ b/src/plugins/dashboard/public/services/dashboard_saved_object/lib/find_dashboard_saved_objects.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 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 { + SavedObjectError, + SavedObjectsClientContract, + SavedObjectsFindOptionsReference, + SimpleSavedObject, +} from '@kbn/core/public'; + +import { DashboardConstants } from '../../..'; +import type { DashboardAttributes } from '../../../application'; + +export interface FindDashboardSavedObjectsArgs { + hasReference?: SavedObjectsFindOptionsReference[]; + savedObjectsClient: SavedObjectsClientContract; + search: string; + size: number; +} + +export interface FindDashboardSavedObjectsResponse { + total: number; + hits: Array>; +} + +export async function findDashboardSavedObjects({ + savedObjectsClient, + hasReference, + search, + size, +}: FindDashboardSavedObjectsArgs): Promise { + const { total, savedObjects } = await savedObjectsClient.find({ + type: DashboardConstants.DASHBOARD_SAVED_OBJECT_TYPE, + search: search ? `${search}*` : undefined, + searchFields: ['title^3', 'description'], + defaultSearchOperator: 'AND' as 'AND', + perPage: size, + hasReference, + page: 1, + }); + return { + total, + hits: savedObjects, + }; +} + +export type FindDashboardBySavedObjectIdsResult = { id: string } & ( + | { status: 'success'; attributes: DashboardAttributes } + | { status: 'error'; error: SavedObjectError } +); + +export async function findDashboardSavedObjectsByIds( + savedObjectsClient: SavedObjectsClientContract, + ids: string[] +): Promise { + const { savedObjects } = await savedObjectsClient.bulkGet( + ids.map((id) => ({ id, type: DashboardConstants.DASHBOARD_SAVED_OBJECT_TYPE })) + ); + + return savedObjects.map((savedObjectResult) => { + if (savedObjectResult.error) + return { status: 'error', error: savedObjectResult.error, id: savedObjectResult.id }; + const { attributes, id } = savedObjectResult; + return { + id, + status: 'success', + attributes: attributes as DashboardAttributes, + }; + }); +} + +export async function findDashboardIdByTitle( + title: string, + savedObjectsClient: SavedObjectsClientContract +): Promise<{ id: string } | undefined> { + const results = await savedObjectsClient.find({ + search: `"${title}"`, + searchFields: ['title'], + type: 'dashboard', + }); + // The search isn't an exact match, lets see if we can find a single exact match to use + const matchingDashboards = results.savedObjects.filter( + (dashboard) => dashboard.attributes.title.toLowerCase() === title.toLowerCase() + ); + if (matchingDashboards.length === 1) { + return { id: matchingDashboards[0].id }; + } +} diff --git a/src/plugins/dashboard/public/services/dashboard_saved_object/lib/load_dashboard_state_from_saved_object.ts b/src/plugins/dashboard/public/services/dashboard_saved_object/lib/load_dashboard_state_from_saved_object.ts new file mode 100644 index 0000000000000..963814013dc30 --- /dev/null +++ b/src/plugins/dashboard/public/services/dashboard_saved_object/lib/load_dashboard_state_from_saved_object.ts @@ -0,0 +1,201 @@ +/* + * 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. + */ +import { ReactElement } from 'react'; + +import { Filter } from '@kbn/es-query'; +import { ViewMode } from '@kbn/embeddable-plugin/public'; +import { SavedObjectNotFound } from '@kbn/kibana-utils-plugin/public'; +import { rawControlGroupAttributesToControlGroupInput } from '@kbn/controls-plugin/common'; +import { parseSearchSourceJSON, injectSearchSourceReferences } from '@kbn/data-plugin/public'; +import { SavedObjectAttributes, SavedObjectsClientContract, ScopedHistory } from '@kbn/core/public'; + +import { migrateLegacyQuery } from '../../../application/lib/migrate_legacy_query'; + +import { + DashboardConstants, + defaultDashboardState, + createDashboardEditUrl, +} from '../../../dashboard_constants'; +import type { DashboardAttributes } from '../../../application'; +import { DashboardSavedObjectRequiredServices } from '../types'; +import { DashboardOptions, DashboardState } from '../../../types'; +import { cleanFiltersForSerialize } from '../../../application/lib'; +import { convertSavedPanelsToPanelMap, injectReferences } from '../../../../common'; + +export type LoadDashboardFromSavedObjectProps = DashboardSavedObjectRequiredServices & { + id?: string; + getScopedHistory?: () => ScopedHistory; + savedObjectsClient: SavedObjectsClientContract; +}; + +export interface LoadDashboardFromSavedObjectReturn { + redirectedToAlias?: boolean; + dashboardState?: DashboardState; + createConflictWarning?: () => ReactElement | undefined; +} + +type SuccessfulLoadDashboardFromSavedObjectReturn = LoadDashboardFromSavedObjectReturn & { + dashboardState: DashboardState; +}; + +export const dashboardStateLoadWasSuccessful = ( + incoming?: LoadDashboardFromSavedObjectReturn +): incoming is SuccessfulLoadDashboardFromSavedObjectReturn => { + return Boolean(incoming && incoming?.dashboardState && !incoming.redirectedToAlias); +}; + +export const loadDashboardStateFromSavedObject = async ({ + savedObjectsTagging, + savedObjectsClient, + getScopedHistory, + screenshotMode, + embeddable, + spaces, + data, + id, +}: LoadDashboardFromSavedObjectProps): Promise => { + const { + search: dataSearchService, + query: { queryString }, + } = data; + + /** + * This is a newly created dashboard, so there is no saved object state to load. + */ + if (!id) return { dashboardState: defaultDashboardState }; + + /** + * Load the saved object + */ + const { + outcome, + alias_purpose: aliasPurpose, + alias_target_id: aliasId, + saved_object: rawDashboardSavedObject, + } = await savedObjectsClient.resolve( + DashboardConstants.DASHBOARD_SAVED_OBJECT_TYPE, + id + ); + if (!rawDashboardSavedObject._version) { + throw new SavedObjectNotFound(DashboardConstants.DASHBOARD_SAVED_OBJECT_TYPE, id); + } + + /** + * Inject saved object references back into the saved object attributes + */ + const { references, attributes: rawAttributes } = rawDashboardSavedObject; + const attributes = (() => { + if (!references || references.length === 0) return rawAttributes; + return injectReferences( + { references, attributes: rawAttributes as unknown as SavedObjectAttributes }, + { + embeddablePersistableStateService: embeddable, + } + ) as unknown as DashboardAttributes; + })(); + + /** + * Handle saved object resolve alias outcome by redirecting + */ + const scopedHistory = getScopedHistory?.(); + if (scopedHistory && outcome === 'aliasMatch' && id && aliasId) { + const path = scopedHistory.location.hash.replace(id, aliasId); + if (screenshotMode.isScreenshotMode()) { + scopedHistory.replace(path); + } else { + await spaces.redirectLegacyUrl?.({ path, aliasPurpose }); + } + return { redirectedToAlias: true }; + } + + /** + * Create conflict warning component if there is a saved object id conflict + */ + const createConflictWarning = + scopedHistory && outcome === 'conflict' && aliasId + ? () => + spaces.getLegacyUrlConflict?.({ + currentObjectId: id, + otherObjectId: aliasId, + otherObjectPath: `#${createDashboardEditUrl(aliasId)}${scopedHistory.location.search}`, + }) + : undefined; + + /** + * Create search source and pull filters and query from it. + */ + const searchSourceJSON = attributes.kibanaSavedObjectMeta.searchSourceJSON; + const searchSource = await (async () => { + if (!searchSourceJSON) { + return await dataSearchService.searchSource.create(); + } + try { + let searchSourceValues = parseSearchSourceJSON(searchSourceJSON); + searchSourceValues = injectSearchSourceReferences(searchSourceValues as any, references); + return await dataSearchService.searchSource.create(searchSourceValues); + } catch (error: any) { + return await dataSearchService.searchSource.create(); + } + })(); + + const filters = cleanFiltersForSerialize((searchSource?.getOwnField('filter') as Filter[]) ?? []); + + const query = migrateLegacyQuery( + searchSource?.getOwnField('query') || queryString.getDefaultQuery() // TODO SAVED DASHBOARDS determine if migrateLegacyQuery is still needed + ); + + const { + refreshInterval, + description, + timeRestore, + optionsJSON, + panelsJSON, + timeFrom, + timeTo, + title, + } = attributes; + + const timeRange = + timeRestore && timeFrom && timeTo + ? { + from: timeFrom, + to: timeTo, + } + : undefined; + + /** + * Parse panels and options from JSON + */ + const options: DashboardOptions = optionsJSON ? JSON.parse(optionsJSON) : undefined; + const panels = convertSavedPanelsToPanelMap(panelsJSON ? JSON.parse(panelsJSON) : []); + + return { + createConflictWarning, + dashboardState: { + ...defaultDashboardState, + + savedObjectId: id, + refreshInterval, + timeRestore, + description, + timeRange, + options, + filters, + panels, + title, + query, + + viewMode: ViewMode.VIEW, // dashboards loaded from saved object default to view mode. If it was edited recently, the view mode from session storage will override this. + tags: savedObjectsTagging.getTagIdsFromReferences?.(references) ?? [], + + controlGroupInput: + attributes.controlGroupInput && + rawControlGroupAttributesToControlGroupInput(attributes.controlGroupInput), + }, + }; +}; diff --git a/src/plugins/dashboard/public/services/dashboard_saved_object/lib/save_dashboard_state_to_saved_object.ts b/src/plugins/dashboard/public/services/dashboard_saved_object/lib/save_dashboard_state_to_saved_object.ts new file mode 100644 index 0000000000000..11c6988d22f96 --- /dev/null +++ b/src/plugins/dashboard/public/services/dashboard_saved_object/lib/save_dashboard_state_to_saved_object.ts @@ -0,0 +1,182 @@ +/* + * 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. + */ + +import { pick } from 'lodash'; + +import { isFilterPinned } from '@kbn/es-query'; +import { SavedObjectsClientContract } from '@kbn/core/public'; +import { SavedObjectAttributes } from '@kbn/core-saved-objects-common'; + +import { extractSearchSourceReferences, RefreshInterval } from '@kbn/data-plugin/public'; +import { SavedObjectSaveOpts } from '@kbn/saved-objects-plugin/public'; + +import type { DashboardAttributes } from '../../../application'; +import { DashboardSavedObjectRequiredServices } from '../types'; +import { DashboardConstants } from '../../../dashboard_constants'; +import { convertTimeToUTCString } from '../../../application/lib'; +import { DashboardRedirect, DashboardState } from '../../../types'; +import { dashboardSaveToastStrings } from '../../../dashboard_strings'; +import { convertPanelMapToSavedPanels, extractReferences } from '../../../../common'; +import { serializeControlGroupInput } from '../../../application/lib/dashboard_control_group'; + +export type SavedDashboardSaveOpts = SavedObjectSaveOpts & { saveAsCopy?: boolean }; + +export type SaveDashboardProps = DashboardSavedObjectRequiredServices & { + currentState: DashboardState; + redirectTo: DashboardRedirect; + saveOptions: SavedDashboardSaveOpts; + savedObjectsClient: SavedObjectsClientContract; +}; + +export interface SaveDashboardReturn { + id?: string; + error?: string; + redirected?: boolean; +} + +export const saveDashboardStateToSavedObject = async ({ + data, + redirectTo, + embeddable, + saveOptions, + currentState, + savedObjectsClient, + savedObjectsTagging, + dashboardSessionStorage, + notifications: { toasts }, + initializerContext: { kibanaVersion }, +}: SaveDashboardProps): Promise => { + const { + search: dataSearchService, + query: { + timefilter: { timefilter }, + }, + } = data; + + const { + tags, + query, + title, + panels, + filters, + options, + timeRestore, + description, + savedObjectId, + controlGroupInput, + } = currentState; + + /** + * Stringify filters and query into search source JSON + */ + const { searchSourceJSON, searchSourceReferences } = await (async () => { + const searchSource = await dataSearchService.searchSource.create(); + searchSource.setField( + 'filter', // save only unpinned filters + filters.filter((filter) => !isFilterPinned(filter)) + ); + searchSource.setField('query', query); + + const rawSearchSourceFields = searchSource.getSerializedFields(); + const [fields, references] = extractSearchSourceReferences(rawSearchSourceFields); + return { searchSourceReferences: references, searchSourceJSON: JSON.stringify(fields) }; + })(); + + /** + * Stringify options and panels + */ + const optionsJSON = JSON.stringify(options); + const panelsJSON = JSON.stringify(convertPanelMapToSavedPanels(panels, kibanaVersion)); + + /** + * Parse global time filter settings + */ + const { from, to } = timefilter.getTime(); + const timeFrom = timeRestore ? convertTimeToUTCString(from) : undefined; + const timeTo = timeRestore ? convertTimeToUTCString(to) : undefined; + const refreshInterval = timeRestore + ? (pick(timefilter.getRefreshInterval(), [ + 'display', + 'pause', + 'section', + 'value', + ]) as RefreshInterval) + : undefined; + + const rawDashboardAttributes: DashboardAttributes = { + controlGroupInput: serializeControlGroupInput(controlGroupInput), + kibanaSavedObjectMeta: { searchSourceJSON }, + refreshInterval, + timeRestore, + optionsJSON, + description, + panelsJSON, + timeFrom, + title, + timeTo, + version: 1, // todo - where does version come from? Why is it needed? + }; + + /** + * Extract references from raw attributes and tags into the references array. + */ + const { attributes, references: dashboardReferences } = extractReferences( + { + attributes: rawDashboardAttributes as unknown as SavedObjectAttributes, + references: searchSourceReferences, + }, + { embeddablePersistableStateService: embeddable } + ); + const references = savedObjectsTagging.updateTagsReferences + ? savedObjectsTagging.updateTagsReferences(dashboardReferences, tags) + : dashboardReferences; + + /** + * Save the saved object using the saved objects client + */ + const idToSaveTo = saveOptions.saveAsCopy ? undefined : savedObjectId; + try { + const { id: newId } = await savedObjectsClient.create( + DashboardConstants.DASHBOARD_SAVED_OBJECT_TYPE, + attributes, + { + id: idToSaveTo, + overwrite: true, + references, + } + ); + + if (newId) { + toasts.addSuccess({ + title: dashboardSaveToastStrings.getSuccessString(currentState.title), + 'data-test-subj': 'saveDashboardSuccess', + }); + + /** + * If the dashboard id has been changed, redirect to the new ID to keep the url param in sync. + */ + if (newId !== savedObjectId) { + dashboardSessionStorage.clearState(savedObjectId); + redirectTo({ + id: newId, + editMode: true, + useReplace: true, + destination: 'dashboard', + }); + return { redirected: true, id: newId }; + } + } + return { id: newId }; + } catch (error) { + toasts.addDanger({ + title: dashboardSaveToastStrings.getFailureString(currentState.title, error.message), + 'data-test-subj': 'saveDashboardFailure', + }); + return { error }; + } +}; diff --git a/src/plugins/dashboard/public/services/dashboard_saved_object/types.ts b/src/plugins/dashboard/public/services/dashboard_saved_object/types.ts new file mode 100644 index 0000000000000..dd817c751aa8d --- /dev/null +++ b/src/plugins/dashboard/public/services/dashboard_saved_object/types.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 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 { SavedObjectsClientContract } from '@kbn/core/public'; + +import { DashboardDataService } from '../data/types'; +import { DashboardSpacesService } from '../spaces/types'; +import { DashboardEmbeddableService } from '../embeddable/types'; +import { DashboardNotificationsService } from '../notifications/types'; +import { DashboardScreenshotModeService } from '../screenshot_mode/types'; +import { DashboardInitializerContextService } from '../initializer_context/types'; +import { DashboardSavedObjectsTaggingService } from '../saved_objects_tagging/types'; +import { DashboardSessionStorageServiceType } from '../dashboard_session_storage/types'; + +import { + LoadDashboardFromSavedObjectProps, + LoadDashboardFromSavedObjectReturn, +} from './lib/load_dashboard_state_from_saved_object'; +import { + SaveDashboardProps, + SaveDashboardReturn, +} from './lib/save_dashboard_state_to_saved_object'; +import { + FindDashboardBySavedObjectIdsResult, + FindDashboardSavedObjectsArgs, + FindDashboardSavedObjectsResponse, +} from './lib/find_dashboard_saved_objects'; +import { DashboardDuplicateTitleCheckProps } from './lib/check_for_duplicate_dashboard_title'; + +export interface DashboardSavedObjectRequiredServices { + screenshotMode: DashboardScreenshotModeService; + embeddable: DashboardEmbeddableService; + spaces: DashboardSpacesService; + data: DashboardDataService; + initializerContext: DashboardInitializerContextService; + notifications: DashboardNotificationsService; + savedObjectsTagging: DashboardSavedObjectsTaggingService; + dashboardSessionStorage: DashboardSessionStorageServiceType; +} + +export interface DashboardSavedObjectService { + loadDashboardStateFromSavedObject: ( + props: Pick + ) => Promise; + + saveDashboardStateToSavedObject: ( + props: Pick + ) => Promise; + findDashboards: { + findSavedObjects: ( + props: Pick + ) => Promise; + findByIds: (ids: string[]) => Promise; + findByTitle: (title: string) => Promise<{ id: string } | undefined>; + }; + checkForDuplicateDashboardTitle: (meta: DashboardDuplicateTitleCheckProps) => Promise; + savedObjectsClient: SavedObjectsClientContract; +} diff --git a/src/plugins/dashboard/public/services/embeddable/embeddable.stub.ts b/src/plugins/dashboard/public/services/embeddable/embeddable.stub.ts index 18f952d4620e2..a1a6b2973664f 100644 --- a/src/plugins/dashboard/public/services/embeddable/embeddable.stub.ts +++ b/src/plugins/dashboard/public/services/embeddable/embeddable.stub.ts @@ -16,9 +16,13 @@ export const embeddableServiceFactory: EmbeddableServiceFactory = () => { const pluginMock = embeddablePluginMock.createStartContract(); return { - getEmbeddableFactory: pluginMock.getEmbeddableFactory, getEmbeddableFactories: pluginMock.getEmbeddableFactories, + getEmbeddableFactory: pluginMock.getEmbeddableFactory, getStateTransfer: pluginMock.getStateTransfer, + getAllMigrations: pluginMock.getAllMigrations, EmbeddablePanel: pluginMock.EmbeddablePanel, + telemetry: pluginMock.telemetry, + extract: pluginMock.extract, + inject: pluginMock.inject, }; }; diff --git a/src/plugins/dashboard/public/services/embeddable/embeddable_service.ts b/src/plugins/dashboard/public/services/embeddable/embeddable_service.ts index 258c11f697bc5..c796bbde2d7da 100644 --- a/src/plugins/dashboard/public/services/embeddable/embeddable_service.ts +++ b/src/plugins/dashboard/public/services/embeddable/embeddable_service.ts @@ -6,7 +6,10 @@ * Side Public License, v 1. */ +import { pick } from 'lodash'; + import type { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public'; + import type { DashboardStartDependencies } from '../../plugin'; import type { DashboardEmbeddableService } from './types'; @@ -15,14 +18,16 @@ export type EmbeddableServiceFactory = KibanaPluginServiceFactory< DashboardStartDependencies >; export const embeddableServiceFactory: EmbeddableServiceFactory = ({ startPlugins }) => { - const { - embeddable: { getEmbeddableFactory, getEmbeddableFactories, getStateTransfer, EmbeddablePanel }, - } = startPlugins; + const { embeddable } = startPlugins; - return { - getEmbeddableFactory, - getEmbeddableFactories, - getStateTransfer, - EmbeddablePanel, - }; + return pick(embeddable, [ + 'getEmbeddableFactory', + 'getEmbeddableFactories', + 'getStateTransfer', + 'EmbeddablePanel', + 'getAllMigrations', + 'telemetry', + 'extract', + 'inject', + ]); }; diff --git a/src/plugins/dashboard/public/services/embeddable/types.ts b/src/plugins/dashboard/public/services/embeddable/types.ts index ef24db7c2e624..40d0ae02bfa7c 100644 --- a/src/plugins/dashboard/public/services/embeddable/types.ts +++ b/src/plugins/dashboard/public/services/embeddable/types.ts @@ -8,9 +8,14 @@ import type { EmbeddableStart } from '@kbn/embeddable-plugin/public'; -export interface DashboardEmbeddableService { - getEmbeddableFactory: EmbeddableStart['getEmbeddableFactory']; - getEmbeddableFactories: EmbeddableStart['getEmbeddableFactories']; - getStateTransfer: EmbeddableStart['getStateTransfer']; - EmbeddablePanel: EmbeddableStart['EmbeddablePanel']; -} +export type DashboardEmbeddableService = Pick< + EmbeddableStart, + | 'getEmbeddableFactories' + | 'getEmbeddableFactory' + | 'getAllMigrations' + | 'getStateTransfer' + | 'EmbeddablePanel' + | 'telemetry' + | 'extract' + | 'inject' +>; diff --git a/src/plugins/dashboard/public/services/plugin_services.stub.ts b/src/plugins/dashboard/public/services/plugin_services.stub.ts index c703b8b6767ac..b8c39909dd61a 100644 --- a/src/plugins/dashboard/public/services/plugin_services.stub.ts +++ b/src/plugins/dashboard/public/services/plugin_services.stub.ts @@ -29,7 +29,6 @@ import { initializerContextServiceFactory } from './initializer_context/initiali import { navigationServiceFactory } from './navigation/navigation.stub'; import { notificationsServiceFactory } from './notifications/notifications.stub'; import { overlaysServiceFactory } from './overlays/overlays.stub'; -import { savedObjectsServiceFactory } from './saved_objects/saved_objects.stub'; import { savedObjectsTaggingServiceFactory } from './saved_objects_tagging/saved_objects_tagging.stub'; import { screenshotModeServiceFactory } from './screenshot_mode/screenshot_mode.stub'; import { settingsServiceFactory } from './settings/settings.stub'; @@ -38,8 +37,10 @@ import { usageCollectionServiceFactory } from './usage_collection/usage_collecti import { spacesServiceFactory } from './spaces/spaces.stub'; import { urlForwardingServiceFactory } from './url_forwarding/url_fowarding.stub'; import { visualizationsServiceFactory } from './visualizations/visualizations.stub'; +import { dashboardSavedObjectServiceFactory } from './dashboard_saved_object/dashboard_saved_object.stub'; export const providers: PluginServiceProviders = { + dashboardSavedObject: new PluginServiceProvider(dashboardSavedObjectServiceFactory), analytics: new PluginServiceProvider(analyticsServiceFactory), application: new PluginServiceProvider(applicationServiceFactory), chrome: new PluginServiceProvider(chromeServiceFactory), @@ -55,7 +56,6 @@ export const providers: PluginServiceProviders = { navigation: new PluginServiceProvider(navigationServiceFactory), notifications: new PluginServiceProvider(notificationsServiceFactory), overlays: new PluginServiceProvider(overlaysServiceFactory), - savedObjects: new PluginServiceProvider(savedObjectsServiceFactory), savedObjectsTagging: new PluginServiceProvider(savedObjectsTaggingServiceFactory), screenshotMode: new PluginServiceProvider(screenshotModeServiceFactory), settings: new PluginServiceProvider(settingsServiceFactory), diff --git a/src/plugins/dashboard/public/services/plugin_services.ts b/src/plugins/dashboard/public/services/plugin_services.ts index 421b5e75c482c..b4ee1b566a8ac 100644 --- a/src/plugins/dashboard/public/services/plugin_services.ts +++ b/src/plugins/dashboard/public/services/plugin_services.ts @@ -30,7 +30,6 @@ import { navigationServiceFactory } from './navigation/navigation_service'; import { notificationsServiceFactory } from './notifications/notifications_service'; import { overlaysServiceFactory } from './overlays/overlays_service'; import { screenshotModeServiceFactory } from './screenshot_mode/screenshot_mode_service'; -import { savedObjectsServiceFactory } from './saved_objects/saved_objects_service'; import { savedObjectsTaggingServiceFactory } from './saved_objects_tagging/saved_objects_tagging_service'; import { settingsServiceFactory } from './settings/settings_service'; import { shareServiceFactory } from './share/share_services'; @@ -39,17 +38,29 @@ import { urlForwardingServiceFactory } from './url_forwarding/url_forwarding_ser import { visualizationsServiceFactory } from './visualizations/visualizations_service'; import { usageCollectionServiceFactory } from './usage_collection/usage_collection_service'; import { analyticsServiceFactory } from './analytics/analytics_service'; +import { dashboardSavedObjectServiceFactory } from './dashboard_saved_object/dashboard_saved_object_service'; const providers: PluginServiceProviders = { + dashboardSavedObject: new PluginServiceProvider(dashboardSavedObjectServiceFactory, [ + 'dashboardSessionStorage', + 'savedObjectsTagging', + 'initializerContext', + 'screenshotMode', + 'notifications', + 'embeddable', + 'spaces', + 'data', + ]), + dashboardSessionStorage: new PluginServiceProvider(dashboardSessionStorageServiceFactory, [ + 'notifications', + 'spaces', + ]), + analytics: new PluginServiceProvider(analyticsServiceFactory), application: new PluginServiceProvider(applicationServiceFactory), chrome: new PluginServiceProvider(chromeServiceFactory), coreContext: new PluginServiceProvider(coreContextServiceFactory), dashboardCapabilities: new PluginServiceProvider(dashboardCapabilitiesServiceFactory), - dashboardSessionStorage: new PluginServiceProvider(dashboardSessionStorageServiceFactory, [ - 'notifications', - 'spaces', - ]), data: new PluginServiceProvider(dataServiceFactory), dataViewEditor: new PluginServiceProvider(dataViewEditorServiceFactory), documentationLinks: new PluginServiceProvider(documentationLinksServiceFactory), @@ -59,7 +70,6 @@ const providers: PluginServiceProviders SavedObject; - public type: string; - public lowercaseType: string; - public loaderProperties: Record; - - constructor( - SavedObjectClass: any, - private readonly savedObjectsClient: SavedObjectsClientContract - ) { - this.type = SavedObjectClass.type; - this.Class = SavedObjectClass; - this.lowercaseType = this.type.toLowerCase(); - - this.loaderProperties = { - name: `${this.lowercaseType}s`, - noun: upperFirst(this.type), - nouns: `${this.lowercaseType}s`, - }; - } - - /** - * Retrieve a saved object by id or create new one. - * Returns a promise that completes when the object finishes - * initializing. - * @param opts - * @returns {Promise} - */ - async get(opts?: Record | string) { - // can accept object as argument in accordance to SavedVis class - // see src/plugins/saved_objects/public/saved_object/saved_object_loader.ts - // @ts-ignore - const obj = new this.Class(opts); - return obj.init(); - } - - urlFor(id: string) { - return `#/${this.lowercaseType}/${encodeURIComponent(id)}`; - } - - async delete(ids: string | string[]) { - const idsUsed = !Array.isArray(ids) ? [ids] : ids; - - const deletions = idsUsed.map((id) => { - // @ts-ignore - const savedObject = new this.Class(id); - return savedObject.delete(); - }); - await Promise.all(deletions); - } - - /** - * Updates source to contain an id, url and references fields, and returns the updated - * source object. - * @param source - * @param id - * @param references - * @returns {source} The modified source object, with an id and url field. - */ - mapHitSource( - source: Record, - id: string, - references: SavedObjectReference[] = [], - updatedAt?: string - ): Record { - return { - ...source, - id, - url: this.urlFor(id), - references, - updatedAt, - }; - } - - /** - * Updates hit.attributes to contain an id and url field, and returns the updated - * attributes object. - * @param hit - * @returns {hit.attributes} The modified hit.attributes object, with an id and url field. - */ - mapSavedObjectApiHits({ - attributes, - id, - references = [], - updatedAt, - }: { - attributes: Record; - id: string; - references?: SavedObjectReference[]; - updatedAt?: string; - }) { - return this.mapHitSource(attributes, id, references, updatedAt); - } - - /** - * TODO: Rather than use a hardcoded limit, implement pagination. See - * https://github.com/elastic/kibana/issues/8044 for reference. - * - * @param search - * @param size - * @param fields - * @returns {Promise} - */ - private findAll( - search: string = '', - { size = 100, fields, hasReference }: SavedObjectLoaderFindOptions - ) { - return this.savedObjectsClient - .find>({ - type: this.lowercaseType, - search: search ? `${search}*` : undefined, - perPage: size, - page: 1, - searchFields: ['title^3', 'description'], - defaultSearchOperator: 'AND', - fields, - hasReference, - } as SavedObjectsFindOptions) - .then((resp) => { - return { - total: resp.total, - hits: resp.savedObjects.map((savedObject) => this.mapSavedObjectApiHits(savedObject)), - }; - }); - } - - find(search: string = '', sizeOrOptions: number | SavedObjectLoaderFindOptions = 100) { - const options: SavedObjectLoaderFindOptions = - typeof sizeOrOptions === 'number' - ? { - size: sizeOrOptions, - } - : sizeOrOptions; - - return this.findAll(search, options).then((resp) => { - return { - total: resp.total, - hits: resp.hits.filter((savedObject) => !savedObject.error), - }; - }); - } -} diff --git a/src/plugins/dashboard/public/services/saved_objects/saved_objects.stub.ts b/src/plugins/dashboard/public/services/saved_objects/saved_objects.stub.ts deleted file mode 100644 index f26e36392603f..0000000000000 --- a/src/plugins/dashboard/public/services/saved_objects/saved_objects.stub.ts +++ /dev/null @@ -1,21 +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. - */ - -import { savedObjectsServiceMock } from '@kbn/core-saved-objects-browser-mocks'; -import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public'; -import { DashboardSavedObjectsService } from './types'; - -type SavedObjectsServiceFactory = PluginServiceFactory; - -export const savedObjectsServiceFactory: SavedObjectsServiceFactory = () => { - const pluginMock = savedObjectsServiceMock.createStartContract(); - - return { - client: pluginMock.client, - }; -}; diff --git a/src/plugins/dashboard/public/services/saved_objects/saved_objects_service.ts b/src/plugins/dashboard/public/services/saved_objects/saved_objects_service.ts deleted file mode 100644 index 3fff4d9e1c361..0000000000000 --- a/src/plugins/dashboard/public/services/saved_objects/saved_objects_service.ts +++ /dev/null @@ -1,26 +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. - */ - -import type { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public'; -import type { DashboardStartDependencies } from '../../plugin'; -import type { DashboardSavedObjectsService } from './types'; - -export type SavedObjectsServiceFactory = KibanaPluginServiceFactory< - DashboardSavedObjectsService, - DashboardStartDependencies ->; - -export const savedObjectsServiceFactory: SavedObjectsServiceFactory = ({ coreStart }) => { - const { - savedObjects: { client }, - } = coreStart; - - return { - client, - }; -}; diff --git a/src/plugins/dashboard/public/services/saved_objects/types.ts b/src/plugins/dashboard/public/services/saved_objects/types.ts deleted file mode 100644 index d7d06131f32cb..0000000000000 --- a/src/plugins/dashboard/public/services/saved_objects/types.ts +++ /dev/null @@ -1,13 +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. - */ - -import type { CoreStart } from '@kbn/core/public'; - -export interface DashboardSavedObjectsService { - client: CoreStart['savedObjects']['client']; -} diff --git a/src/plugins/dashboard/public/services/saved_objects_tagging/saved_objects_tagging.stub.ts b/src/plugins/dashboard/public/services/saved_objects_tagging/saved_objects_tagging.stub.ts index d526eedbc1e47..1a1bcd6ca93bf 100644 --- a/src/plugins/dashboard/public/services/saved_objects_tagging/saved_objects_tagging.stub.ts +++ b/src/plugins/dashboard/public/services/saved_objects_tagging/saved_objects_tagging.stub.ts @@ -20,9 +20,10 @@ export const savedObjectsTaggingServiceFactory: SavedObjectsTaggingServiceFactor // I'm not defining components so that I don't have to update the snapshot of `save_modal.test` // However, if it's ever necessary, it can be done via: `components: pluginMock.components`, - getSearchBarFilter: pluginMock.getSearchBarFilter, - getTableColumnDefinition: pluginMock.getTableColumnDefinition, hasTagDecoration: pluginMock.hasTagDecoration, parseSearchQuery: pluginMock.parseSearchQuery, + getSearchBarFilter: pluginMock.getSearchBarFilter, + getTagIdsFromReferences: pluginMock.getTagIdsFromReferences, + getTableColumnDefinition: pluginMock.getTableColumnDefinition, }; }; diff --git a/src/plugins/dashboard/public/services/saved_objects_tagging/saved_objects_tagging_service.ts b/src/plugins/dashboard/public/services/saved_objects_tagging/saved_objects_tagging_service.ts index 7e252ed79d7b7..a100282b4cff2 100644 --- a/src/plugins/dashboard/public/services/saved_objects_tagging/saved_objects_tagging_service.ts +++ b/src/plugins/dashboard/public/services/saved_objects_tagging/saved_objects_tagging_service.ts @@ -27,19 +27,23 @@ export const savedObjectsTaggingServiceFactory: SavedObjectsTaggingServiceFactor const { ui: { components, + parseSearchQuery, + hasTagDecoration, getSearchBarFilter, + updateTagsReferences, + getTagIdsFromReferences, getTableColumnDefinition, - hasTagDecoration, - parseSearchQuery, }, } = taggingApi; return { hasApi: true, components, - getSearchBarFilter, - getTableColumnDefinition, hasTagDecoration, parseSearchQuery, + getSearchBarFilter, + updateTagsReferences, + getTagIdsFromReferences, + getTableColumnDefinition, }; }; diff --git a/src/plugins/dashboard/public/services/saved_objects_tagging/types.ts b/src/plugins/dashboard/public/services/saved_objects_tagging/types.ts index 803db5ff46d9a..ba08a53709346 100644 --- a/src/plugins/dashboard/public/services/saved_objects_tagging/types.ts +++ b/src/plugins/dashboard/public/services/saved_objects_tagging/types.ts @@ -12,9 +12,10 @@ export interface DashboardSavedObjectsTaggingService { hasApi: boolean; // remove this once the entire service is optional components?: SavedObjectsTaggingApi['ui']['components']; - getSearchBarFilter?: SavedObjectsTaggingApi['ui']['getSearchBarFilter']; - getTableColumnDefinition?: SavedObjectsTaggingApi['ui']['getTableColumnDefinition']; hasTagDecoration?: SavedObjectsTaggingApi['ui']['hasTagDecoration']; parseSearchQuery?: SavedObjectsTaggingApi['ui']['parseSearchQuery']; + getSearchBarFilter?: SavedObjectsTaggingApi['ui']['getSearchBarFilter']; + updateTagsReferences?: SavedObjectsTaggingApi['ui']['updateTagsReferences']; getTagIdsFromReferences?: SavedObjectsTaggingApi['ui']['getTagIdsFromReferences']; + getTableColumnDefinition?: SavedObjectsTaggingApi['ui']['getTableColumnDefinition']; } diff --git a/src/plugins/dashboard/public/services/types.ts b/src/plugins/dashboard/public/services/types.ts index 3309ce0575971..5d14b59e8a125 100644 --- a/src/plugins/dashboard/public/services/types.ts +++ b/src/plugins/dashboard/public/services/types.ts @@ -15,6 +15,7 @@ import { DashboardApplicationService } from './application/types'; import { DashboardChromeService } from './chrome/types'; import { DashboardCoreContextService } from './core_context/types'; import { DashboardCapabilitiesService } from './dashboard_capabilities/types'; +import { DashboardSavedObjectService } from './dashboard_saved_object/types'; import { DashboardSessionStorageServiceType } from './dashboard_session_storage/types'; import { DashboardDataService } from './data/types'; import { DashboardDataViewEditorService } from './data_view_editor/types'; @@ -25,7 +26,6 @@ import { DashboardInitializerContextService } from './initializer_context/types' import { DashboardNavigationService } from './navigation/types'; import { DashboardNotificationsService } from './notifications/types'; import { DashboardOverlaysService } from './overlays/types'; -import { DashboardSavedObjectsService } from './saved_objects/types'; import { DashboardSavedObjectsTaggingService } from './saved_objects_tagging/types'; import { DashboardScreenshotModeService } from './screenshot_mode/types'; import { DashboardSettingsService } from './settings/types'; @@ -39,12 +39,14 @@ export type DashboardPluginServiceParams = KibanaPluginServiceParams void; -export interface SavedDashboardPanelMap { - [key: string]: SavedDashboardPanel; -} - -export interface DashboardPanelMap { - [key: string]: DashboardPanelState; -} /** * DashboardState contains all pieces of tracked state for an individual dashboard @@ -48,11 +41,13 @@ export interface DashboardState { description: string; savedQuery?: string; timeRestore: boolean; + timeRange?: TimeRange; + savedObjectId?: string; fullScreenMode: boolean; expandedPanelId?: string; options: DashboardOptions; panels: DashboardPanelMap; - timeRange?: TimeRange; + refreshInterval?: RefreshInterval; timeslice?: [number, number]; controlGroupInput?: PersistableControlGroupInput; @@ -95,19 +90,17 @@ export interface DashboardAppState { dataViews?: DataView[]; updateLastSavedState?: () => void; resetToLastSavedState?: () => void; - savedDashboard?: DashboardSavedObject; dashboardContainer?: DashboardContainer; + createConflictWarning?: () => ReactElement | undefined; getLatestDashboardState?: () => DashboardState; $triggerDashboardRefresh: Subject<{ force?: boolean }>; $onDashboardStateChange: BehaviorSubject; - applyFilters?: (query: Query, filters: Filter[]) => void; } /** * The shared services and tools used to build a dashboard from a saved object ID. */ -// TODO: Remove reference to DashboardAppServices as part of https://github.com/elastic/kibana/pull/138774 -export type DashboardBuildContext = Pick & { +export interface DashboardBuildContext { locatorState?: DashboardAppLocatorParams; history: History; isEmbeddedExternally: boolean; @@ -118,7 +111,7 @@ export type DashboardBuildContext = Pick; $onDashboardStateChange: BehaviorSubject; executionContext?: KibanaExecutionContext; -}; +} // eslint-disable-next-line @typescript-eslint/consistent-type-definitions export type DashboardOptions = { @@ -156,8 +149,3 @@ export interface DashboardMountContextProps { onAppLeave: AppMountParameters['onAppLeave']; setHeaderActionMenu: AppMountParameters['setHeaderActionMenu']; } - -// TODO: Remove DashboardAppServices as part of https://github.com/elastic/kibana/pull/138774 -export interface DashboardAppServices { - savedDashboards: SavedObjectLoader; -} diff --git a/src/plugins/dashboard/server/embeddable/dashboard_container_embeddable_factory.ts b/src/plugins/dashboard/server/embeddable/dashboard_container_embeddable_factory.ts index 31c236da607a4..df183f631a3ec 100644 --- a/src/plugins/dashboard/server/embeddable/dashboard_container_embeddable_factory.ts +++ b/src/plugins/dashboard/server/embeddable/dashboard_container_embeddable_factory.ts @@ -8,10 +8,7 @@ import { EmbeddablePersistableStateService } from '@kbn/embeddable-plugin/common'; import { EmbeddableRegistryDefinition } from '@kbn/embeddable-plugin/server'; -import { - createExtract, - createInject, -} from '../../common/embeddable/dashboard_container_persistable_state'; +import { createExtract, createInject } from '../../common'; export const dashboardPersistableStateServiceFactory = ( persistableStateService: EmbeddablePersistableStateService diff --git a/src/plugins/dashboard/server/saved_objects/dashboard_migrations.ts b/src/plugins/dashboard/server/saved_objects/dashboard_migrations.ts deleted file mode 100644 index b3625bec3e8a9..0000000000000 --- a/src/plugins/dashboard/server/saved_objects/dashboard_migrations.ts +++ /dev/null @@ -1,318 +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. - */ - -import { Serializable } from '@kbn/utility-types'; -import { get, flow, mapValues } from 'lodash'; -import { - SavedObjectAttributes, - SavedObjectMigrationFn, - SavedObjectMigrationMap, -} from '@kbn/core/server'; - -import { EmbeddableSetup } from '@kbn/embeddable-plugin/server'; -import { SavedObjectEmbeddableInput } from '@kbn/embeddable-plugin/common'; -import { DATA_VIEW_SAVED_OBJECT_TYPE } from '@kbn/data-plugin/common'; -import { - mergeMigrationFunctionMaps, - MigrateFunction, - MigrateFunctionsObject, -} from '@kbn/kibana-utils-plugin/common'; -import { - CONTROL_GROUP_TYPE, - rawControlGroupAttributesToSerializable, - serializableToRawControlGroupAttributes, -} from '@kbn/controls-plugin/common'; -import { migrations730 } from './migrations_730'; -import { SavedDashboardPanel } from '../../common/types'; -import { migrateMatchAllQuery } from './migrate_match_all_query'; -import { DashboardDoc700To720, DashboardDoc730ToLatest } from '../../common'; -import { injectReferences, extractReferences } from '../../common/saved_dashboard_references'; -import { - convertPanelStateToSavedDashboardPanel, - convertSavedDashboardPanelToPanelState, -} from '../../common/embeddable/embeddable_saved_object_converters'; -import { replaceIndexPatternReference } from './replace_index_pattern_reference'; - -function migrateIndexPattern(doc: DashboardDoc700To720) { - const searchSourceJSON = get(doc, 'attributes.kibanaSavedObjectMeta.searchSourceJSON'); - if (typeof searchSourceJSON !== 'string') { - return; - } - let searchSource; - try { - searchSource = JSON.parse(searchSourceJSON); - } catch (e) { - // Let it go, the data is invalid and we'll leave it as is - return; - } - if (searchSource.index) { - searchSource.indexRefName = 'kibanaSavedObjectMeta.searchSourceJSON.index'; - doc.references.push({ - name: searchSource.indexRefName, - type: DATA_VIEW_SAVED_OBJECT_TYPE, - id: searchSource.index, - }); - delete searchSource.index; - } - if (searchSource.filter) { - searchSource.filter.forEach((filterRow: any, i: number) => { - if (!filterRow.meta || !filterRow.meta.index) { - return; - } - filterRow.meta.indexRefName = `kibanaSavedObjectMeta.searchSourceJSON.filter[${i}].meta.index`; - doc.references.push({ - name: filterRow.meta.indexRefName, - type: DATA_VIEW_SAVED_OBJECT_TYPE, - id: filterRow.meta.index, - }); - delete filterRow.meta.index; - }); - } - doc.attributes.kibanaSavedObjectMeta.searchSourceJSON = JSON.stringify(searchSource); -} - -const migrations700: SavedObjectMigrationFn = (doc): DashboardDoc700To720 => { - // Set new "references" attribute - doc.references = doc.references || []; - - // Migrate index pattern - migrateIndexPattern(doc as DashboardDoc700To720); - // Migrate panels - const panelsJSON = get(doc, 'attributes.panelsJSON'); - if (typeof panelsJSON !== 'string') { - return doc as DashboardDoc700To720; - } - let panels; - try { - panels = JSON.parse(panelsJSON); - } catch (e) { - // Let it go, the data is invalid and we'll leave it as is - return doc as DashboardDoc700To720; - } - if (!Array.isArray(panels)) { - return doc as DashboardDoc700To720; - } - panels.forEach((panel, i) => { - if (!panel.type || !panel.id) { - return; - } - panel.panelRefName = `panel_${i}`; - doc.references!.push({ - name: `panel_${i}`, - type: panel.type, - id: panel.id, - }); - delete panel.type; - delete panel.id; - }); - doc.attributes.panelsJSON = JSON.stringify(panels); - return doc as DashboardDoc700To720; -}; - -/** - * In 7.8.0 we introduced dashboard drilldowns which are stored inside dashboard saved object as part of embeddable state - * In 7.11.0 we created an embeddable references/migrations system that allows to properly extract embeddable persistable state - * https://github.com/elastic/kibana/issues/71409 - * The idea of this migration is to inject all the embeddable panel references and then run the extraction again. - * As the result of the extraction: - * 1. In addition to regular `panel_` we will get new references which are extracted by `embeddablePersistableStateService` (dashboard drilldown references) - * 2. `panel_` references will be regenerated - * All other references like index-patterns are forwarded non touched - * @param deps - */ -function createExtractPanelReferencesMigration( - deps: DashboardSavedObjectTypeMigrationsDeps -): SavedObjectMigrationFn { - return (doc) => { - const references = doc.references ?? []; - - /** - * Remembering this because dashboard's extractReferences won't return those - * All other references like `panel_` will be overwritten - */ - const oldNonPanelReferences = references.filter((ref) => !ref.name.startsWith('panel_')); - - const injectedAttributes = injectReferences( - { - attributes: doc.attributes as unknown as SavedObjectAttributes, - references, - }, - { embeddablePersistableStateService: deps.embeddable } - ); - - const { attributes, references: newPanelReferences } = extractReferences( - { attributes: injectedAttributes, references: [] }, - { embeddablePersistableStateService: deps.embeddable } - ); - - return { - ...doc, - references: [...oldNonPanelReferences, ...newPanelReferences], - attributes, - }; - }; -} - -type ValueOrReferenceInput = SavedObjectEmbeddableInput & { - attributes?: Serializable; - savedVis?: Serializable; -}; - -/** - * Before 7.10, hidden panel titles were stored as a blank string on the title attribute. In 7.10, this was replaced - * with a usage of the existing hidePanelTitles key. Even though blank string titles still technically work - * in versions > 7.10, they are less explicit than using the hidePanelTitles key. This migration transforms all - * blank string titled panels to panels with the titles explicitly hidden. - */ -export const migrateExplicitlyHiddenTitles: SavedObjectMigrationFn = (doc) => { - const { attributes } = doc; - - // Skip if panelsJSON is missing - if (typeof attributes?.panelsJSON !== 'string') return doc; - - try { - const panels = JSON.parse(attributes.panelsJSON) as SavedDashboardPanel[]; - // Same here, prevent failing saved object import if ever panels aren't an array. - if (!Array.isArray(panels)) return doc; - - const newPanels: SavedDashboardPanel[] = []; - panels.forEach((panel) => { - // Convert each panel into the dashboard panel state - const originalPanelState = - convertSavedDashboardPanelToPanelState(panel); - newPanels.push( - convertPanelStateToSavedDashboardPanel( - { - ...originalPanelState, - explicitInput: { - ...originalPanelState.explicitInput, - ...(originalPanelState.explicitInput.title === '' && - !originalPanelState.explicitInput.hidePanelTitles - ? { hidePanelTitles: true } - : {}), - }, - }, - panel.version - ) - ); - }); - return { - ...doc, - attributes: { - ...attributes, - panelsJSON: JSON.stringify(newPanels), - }, - }; - } catch { - return doc; - } -}; - -// Runs the embeddable migrations on each panel -const migrateByValuePanels = - (migrate: MigrateFunction, version: string): SavedObjectMigrationFn => - (doc: any) => { - const { attributes } = doc; - - if (attributes?.controlGroupInput) { - const controlGroupInput = rawControlGroupAttributesToSerializable( - attributes.controlGroupInput - ); - const migratedControlGroupInput = migrate({ - ...controlGroupInput, - type: CONTROL_GROUP_TYPE, - }); - attributes.controlGroupInput = - serializableToRawControlGroupAttributes(migratedControlGroupInput); - } - - // Skip if panelsJSON is missing otherwise this will cause saved object import to fail when - // importing objects without panelsJSON. At development time of this, there is no guarantee each saved - // object has panelsJSON in all previous versions of kibana. - if (typeof attributes?.panelsJSON !== 'string') { - return doc; - } - - const panels = JSON.parse(attributes.panelsJSON) as SavedDashboardPanel[]; - // Same here, prevent failing saved object import if ever panels aren't an array. - if (!Array.isArray(panels)) { - return doc; - } - const newPanels: SavedDashboardPanel[] = []; - panels.forEach((panel) => { - // Convert each panel into a state that can be passed to EmbeddablesSetup.migrate - const originalPanelState = - convertSavedDashboardPanelToPanelState(panel); - - // saved vis is used to store by value input for Visualize. This should eventually be renamed to `attributes` to align with Lens and Maps - if ( - originalPanelState.explicitInput.attributes || - originalPanelState.explicitInput.savedVis - ) { - // If this panel is by value, migrate the state using embeddable migrations - const migratedInput = migrate({ - ...originalPanelState.explicitInput, - type: originalPanelState.type, - }); - // Convert the embeddable state back into the panel shape - newPanels.push( - convertPanelStateToSavedDashboardPanel( - { - ...originalPanelState, - explicitInput: { ...migratedInput, id: migratedInput.id as string }, - }, - version - ) - ); - } else { - newPanels.push(panel); - } - }); - return { - ...doc, - attributes: { - ...attributes, - panelsJSON: JSON.stringify(newPanels), - }, - }; - }; - -export interface DashboardSavedObjectTypeMigrationsDeps { - embeddable: EmbeddableSetup; -} - -export const createDashboardSavedObjectTypeMigrations = ( - deps: DashboardSavedObjectTypeMigrationsDeps -): SavedObjectMigrationMap => { - const embeddableMigrations = mapValues( - deps.embeddable.getAllMigrations(), - migrateByValuePanels - ) as MigrateFunctionsObject; - - const dashboardMigrations = { - /** - * We need to have this migration twice, once with a version prior to 7.0.0 once with a version - * after it. The reason for that is, that this migration has been introduced once 7.0.0 was already - * released. Thus a user who already had 7.0.0 installed already got the 7.0.0 migrations below running, - * so we need a version higher than that. But this fix was backported to the 6.7 release, meaning if we - * would only have the 7.0.1 migration in here a user on the 6.7 release will migrate their saved objects - * to the 7.0.1 state, and thus when updating their Kibana to 7.0, will never run the 7.0.0 migrations introduced - * in that version. So we apply this twice, once with 6.7.2 and once with 7.0.1 while the backport to 6.7 - * only contained the 6.7.2 migration and not the 7.0.1 migration. - */ - '6.7.2': flow(migrateMatchAllQuery), - '7.0.0': flow(migrations700), - '7.3.0': flow(migrations730), - '7.9.3': flow(migrateMatchAllQuery), - '7.11.0': flow(createExtractPanelReferencesMigration(deps)), - '7.14.0': flow(replaceIndexPatternReference), - '7.17.3': flow(migrateExplicitlyHiddenTitles), - }; - - return mergeMigrationFunctionMaps(dashboardMigrations, embeddableMigrations); -}; diff --git a/src/plugins/dashboard/server/saved_objects/dashboard.ts b/src/plugins/dashboard/server/saved_objects/dashboard_saved_object.ts similarity index 97% rename from src/plugins/dashboard/server/saved_objects/dashboard.ts rename to src/plugins/dashboard/server/saved_objects/dashboard_saved_object.ts index 953852bee59cf..b8474149ca87b 100644 --- a/src/plugins/dashboard/server/saved_objects/dashboard.ts +++ b/src/plugins/dashboard/server/saved_objects/dashboard_saved_object.ts @@ -10,7 +10,7 @@ import { SavedObjectsType } from '@kbn/core/server'; import { createDashboardSavedObjectTypeMigrations, DashboardSavedObjectTypeMigrationsDeps, -} from './dashboard_migrations'; +} from './migrations/dashboard_saved_object_migrations'; export const createDashboardSavedObjectType = ({ migrationDeps, diff --git a/src/plugins/dashboard/server/saved_objects/index.ts b/src/plugins/dashboard/server/saved_objects/index.ts index af3de2dfca529..c16af55945f9d 100644 --- a/src/plugins/dashboard/server/saved_objects/index.ts +++ b/src/plugins/dashboard/server/saved_objects/index.ts @@ -6,4 +6,4 @@ * Side Public License, v 1. */ -export { createDashboardSavedObjectType } from './dashboard'; +export { createDashboardSavedObjectType } from './dashboard_saved_object'; diff --git a/src/plugins/dashboard/server/saved_objects/is_dashboard_doc.ts b/src/plugins/dashboard/server/saved_objects/is_dashboard_doc.ts deleted file mode 100644 index cea39fc45b0fe..0000000000000 --- a/src/plugins/dashboard/server/saved_objects/is_dashboard_doc.ts +++ /dev/null @@ -1,37 +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. - */ - -import { SavedObjectUnsanitizedDoc } from '@kbn/core/server'; -import { DashboardDoc730ToLatest } from '../../common'; - -function isDoc( - doc: { [key: string]: unknown } | SavedObjectUnsanitizedDoc -): doc is SavedObjectUnsanitizedDoc { - return ( - typeof doc.id === 'string' && - typeof doc.type === 'string' && - doc.attributes !== null && - typeof doc.attributes === 'object' && - doc.references !== null && - typeof doc.references === 'object' - ); -} - -export function isDashboardDoc( - doc: { [key: string]: unknown } | DashboardDoc730ToLatest -): doc is DashboardDoc730ToLatest { - if (!isDoc(doc)) { - return false; - } - - if (typeof (doc as DashboardDoc730ToLatest).attributes.panelsJSON !== 'string') { - return false; - } - - return true; -} diff --git a/src/plugins/dashboard/server/saved_objects/dashboard_migrations.test.ts b/src/plugins/dashboard/server/saved_objects/migrations/dashboard_saved_object_migrations.test.ts similarity index 99% rename from src/plugins/dashboard/server/saved_objects/dashboard_migrations.test.ts rename to src/plugins/dashboard/server/saved_objects/migrations/dashboard_saved_object_migrations.test.ts index 0cefab5104d7d..1a2655c481835 100644 --- a/src/plugins/dashboard/server/saved_objects/dashboard_migrations.test.ts +++ b/src/plugins/dashboard/server/saved_objects/migrations/dashboard_saved_object_migrations.test.ts @@ -6,17 +6,15 @@ * Side Public License, v 1. */ -import { SavedObjectReference, SavedObjectUnsanitizedDoc } from '@kbn/core/server'; +import { SerializableRecord } from '@kbn/utility-types'; import { savedObjectsServiceMock } from '@kbn/core/server/mocks'; import { createEmbeddableSetupMock } from '@kbn/embeddable-plugin/server/mocks'; -import { createDashboardSavedObjectTypeMigrations } from './dashboard_migrations'; -import { DashboardDoc730ToLatest } from '../../common'; -import { - createExtract, - createInject, -} from '../../common/embeddable/dashboard_container_persistable_state'; +import { SavedObjectReference, SavedObjectUnsanitizedDoc } from '@kbn/core/server'; + +import { createExtract, createInject } from '../../../common'; import { EmbeddableStateWithType } from '@kbn/embeddable-plugin/common'; -import { SerializableRecord } from '@kbn/utility-types'; +import { createDashboardSavedObjectTypeMigrations } from './dashboard_saved_object_migrations'; +import { DashboardDoc730ToLatest } from './migrate_to_730/types'; const embeddableSetupMock = createEmbeddableSetupMock(); const extract = createExtract(embeddableSetupMock); diff --git a/src/plugins/dashboard/server/saved_objects/migrations/dashboard_saved_object_migrations.ts b/src/plugins/dashboard/server/saved_objects/migrations/dashboard_saved_object_migrations.ts new file mode 100644 index 0000000000000..2f93c038065bb --- /dev/null +++ b/src/plugins/dashboard/server/saved_objects/migrations/dashboard_saved_object_migrations.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 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 { flow, mapValues } from 'lodash'; + +import { + mergeMigrationFunctionMaps, + MigrateFunctionsObject, +} from '@kbn/kibana-utils-plugin/common'; +import { EmbeddableSetup } from '@kbn/embeddable-plugin/server'; +import { SavedObjectMigrationFn, SavedObjectMigrationMap } from '@kbn/core/server'; + +import { migrations730, migrations700 } from './migrate_to_730'; +import { migrateMatchAllQuery } from './migrate_match_all_query'; +import { migrateExplicitlyHiddenTitles } from './migrate_hidden_titles'; +import { replaceIndexPatternReference } from './migrate_index_pattern_reference'; +import { migrateByValueDashboardPanels } from './migrate_by_value_dashboard_panels'; +import { createExtractPanelReferencesMigration } from './migrate_extract_panel_references'; + +export interface DashboardSavedObjectTypeMigrationsDeps { + embeddable: EmbeddableSetup; +} + +export const createDashboardSavedObjectTypeMigrations = ( + deps: DashboardSavedObjectTypeMigrationsDeps +): SavedObjectMigrationMap => { + const embeddableMigrations = mapValues( + deps.embeddable.getAllMigrations(), + migrateByValueDashboardPanels + ) as MigrateFunctionsObject; + + const dashboardMigrations = { + '6.7.2': flow(migrateMatchAllQuery), + '7.0.0': flow(migrations700), + '7.3.0': flow(migrations730), + '7.9.3': flow(migrateMatchAllQuery), + '7.11.0': flow(createExtractPanelReferencesMigration(deps)), + '7.14.0': flow(replaceIndexPatternReference), + '7.17.3': flow(migrateExplicitlyHiddenTitles), + }; + + return mergeMigrationFunctionMaps(dashboardMigrations, embeddableMigrations); +}; diff --git a/src/plugins/dashboard/server/saved_objects/migrations/migrate_by_value_dashboard_panels.ts b/src/plugins/dashboard/server/saved_objects/migrations/migrate_by_value_dashboard_panels.ts new file mode 100644 index 0000000000000..3bad12b537103 --- /dev/null +++ b/src/plugins/dashboard/server/saved_objects/migrations/migrate_by_value_dashboard_panels.ts @@ -0,0 +1,97 @@ +/* + * 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. + */ + +import { + CONTROL_GROUP_TYPE, + rawControlGroupAttributesToSerializable, + serializableToRawControlGroupAttributes, +} from '@kbn/controls-plugin/common'; +import { Serializable } from '@kbn/utility-types'; +import { SavedObjectMigrationFn } from '@kbn/core/server'; +import { MigrateFunction } from '@kbn/kibana-utils-plugin/common'; +import { SavedObjectEmbeddableInput } from '@kbn/embeddable-plugin/common'; + +import { + convertPanelStateToSavedDashboardPanel, + convertSavedDashboardPanelToPanelState, + SavedDashboardPanel, +} from '../../../common'; + +type ValueOrReferenceInput = SavedObjectEmbeddableInput & { + attributes?: Serializable; + savedVis?: Serializable; +}; + +// Runs the embeddable migrations on each panel +export const migrateByValueDashboardPanels = + (migrate: MigrateFunction, version: string): SavedObjectMigrationFn => + (doc: any) => { + const { attributes } = doc; + + if (attributes?.controlGroupInput) { + const controlGroupInput = rawControlGroupAttributesToSerializable( + attributes.controlGroupInput + ); + const migratedControlGroupInput = migrate({ + ...controlGroupInput, + type: CONTROL_GROUP_TYPE, + }); + attributes.controlGroupInput = + serializableToRawControlGroupAttributes(migratedControlGroupInput); + } + + // Skip if panelsJSON is missing otherwise this will cause saved object import to fail when + // importing objects without panelsJSON. At development time of this, there is no guarantee each saved + // object has panelsJSON in all previous versions of kibana. + if (typeof attributes?.panelsJSON !== 'string') { + return doc; + } + + const panels = JSON.parse(attributes.panelsJSON) as SavedDashboardPanel[]; + // Same here, prevent failing saved object import if ever panels aren't an array. + if (!Array.isArray(panels)) { + return doc; + } + const newPanels: SavedDashboardPanel[] = []; + panels.forEach((panel) => { + // Convert each panel into a state that can be passed to EmbeddablesSetup.migrate + const originalPanelState = + convertSavedDashboardPanelToPanelState(panel); + + // saved vis is used to store by value input for Visualize. This should eventually be renamed to `attributes` to align with Lens and Maps + if ( + originalPanelState.explicitInput.attributes || + originalPanelState.explicitInput.savedVis + ) { + // If this panel is by value, migrate the state using embeddable migrations + const migratedInput = migrate({ + ...originalPanelState.explicitInput, + type: originalPanelState.type, + }); + // Convert the embeddable state back into the panel shape + newPanels.push( + convertPanelStateToSavedDashboardPanel( + { + ...originalPanelState, + explicitInput: { ...migratedInput, id: migratedInput.id as string }, + }, + version + ) + ); + } else { + newPanels.push(panel); + } + }); + return { + ...doc, + attributes: { + ...attributes, + panelsJSON: JSON.stringify(newPanels), + }, + }; + }; diff --git a/src/plugins/dashboard/server/saved_objects/migrations/migrate_extract_panel_references.ts b/src/plugins/dashboard/server/saved_objects/migrations/migrate_extract_panel_references.ts new file mode 100644 index 0000000000000..5a8de73af988b --- /dev/null +++ b/src/plugins/dashboard/server/saved_objects/migrations/migrate_extract_panel_references.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 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 { SavedObjectAttributes, SavedObjectMigrationFn } from '@kbn/core/server'; + +import { DashboardAttributes, extractReferences, injectReferences } from '../../../common'; +import { DashboardSavedObjectTypeMigrationsDeps } from './dashboard_saved_object_migrations'; + +/** + * In 7.8.0 we introduced dashboard drilldowns which are stored inside dashboard saved object as part of embeddable state + * In 7.11.0 we created an embeddable references/migrations system that allows to properly extract embeddable persistable state + * https://github.com/elastic/kibana/issues/71409 + * The idea of this migration is to inject all the embeddable panel references and then run the extraction again. + * As the result of the extraction: + * 1. In addition to regular `panel_` we will get new references which are extracted by `embeddablePersistableStateService` (dashboard drilldown references) + * 2. `panel_` references will be regenerated + * All other references like index-patterns are forwarded non touched + * @param deps + */ +export function createExtractPanelReferencesMigration( + deps: DashboardSavedObjectTypeMigrationsDeps +): SavedObjectMigrationFn { + return (doc) => { + const references = doc.references ?? []; + + /** + * Remembering this because dashboard's extractReferences won't return those + * All other references like `panel_` will be overwritten + */ + const oldNonPanelReferences = references.filter((ref) => !ref.name.startsWith('panel_')); + + const injectedAttributes = injectReferences( + { + attributes: doc.attributes as unknown as SavedObjectAttributes, + references, + }, + { embeddablePersistableStateService: deps.embeddable } + ); + + const { attributes, references: newPanelReferences } = extractReferences( + { attributes: injectedAttributes, references: [] }, + { embeddablePersistableStateService: deps.embeddable } + ); + + return { + ...doc, + references: [...oldNonPanelReferences, ...newPanelReferences], + attributes, + }; + }; +} diff --git a/src/plugins/dashboard/server/saved_objects/migrations/migrate_hidden_titles.ts b/src/plugins/dashboard/server/saved_objects/migrations/migrate_hidden_titles.ts new file mode 100644 index 0000000000000..8a9a917231204 --- /dev/null +++ b/src/plugins/dashboard/server/saved_objects/migrations/migrate_hidden_titles.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 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 { SavedObjectMigrationFn } from '@kbn/core/server'; +import { EmbeddableInput } from '@kbn/embeddable-plugin/common'; + +import { + convertSavedDashboardPanelToPanelState, + convertPanelStateToSavedDashboardPanel, + SavedDashboardPanel, +} from '../../../common'; + +/** + * Before 7.10, hidden panel titles were stored as a blank string on the title attribute. In 7.10, this was replaced + * with a usage of the existing hidePanelTitles key. Even though blank string titles still technically work + * in versions > 7.10, they are less explicit than using the hidePanelTitles key. This migration transforms all + * blank string titled panels to panels with the titles explicitly hidden. + */ +export const migrateExplicitlyHiddenTitles: SavedObjectMigrationFn = (doc) => { + const { attributes } = doc; + + // Skip if panelsJSON is missing + if (typeof attributes?.panelsJSON !== 'string') return doc; + + try { + const panels = JSON.parse(attributes.panelsJSON) as SavedDashboardPanel[]; + // Same here, prevent failing saved object import if ever panels aren't an array. + if (!Array.isArray(panels)) return doc; + + const newPanels: SavedDashboardPanel[] = []; + panels.forEach((panel) => { + // Convert each panel into the dashboard panel state + const originalPanelState = convertSavedDashboardPanelToPanelState(panel); + newPanels.push( + convertPanelStateToSavedDashboardPanel( + { + ...originalPanelState, + explicitInput: { + ...originalPanelState.explicitInput, + ...(originalPanelState.explicitInput.title === '' && + !originalPanelState.explicitInput.hidePanelTitles + ? { hidePanelTitles: true } + : {}), + }, + }, + panel.version + ) + ); + }); + return { + ...doc, + attributes: { + ...attributes, + panelsJSON: JSON.stringify(newPanels), + }, + }; + } catch { + return doc; + } +}; diff --git a/src/plugins/dashboard/server/saved_objects/replace_index_pattern_reference.test.ts b/src/plugins/dashboard/server/saved_objects/migrations/migrate_index_pattern_reference.test.ts similarity index 94% rename from src/plugins/dashboard/server/saved_objects/replace_index_pattern_reference.test.ts rename to src/plugins/dashboard/server/saved_objects/migrations/migrate_index_pattern_reference.test.ts index 13db82790c9d0..a9682bdb8719d 100644 --- a/src/plugins/dashboard/server/saved_objects/replace_index_pattern_reference.test.ts +++ b/src/plugins/dashboard/server/saved_objects/migrations/migrate_index_pattern_reference.test.ts @@ -7,7 +7,7 @@ */ import type { SavedObjectMigrationContext, SavedObjectMigrationFn } from '@kbn/core/server'; -import { replaceIndexPatternReference } from './replace_index_pattern_reference'; +import { replaceIndexPatternReference } from './migrate_index_pattern_reference'; describe('replaceIndexPatternReference', () => { const savedObjectMigrationContext = null as unknown as SavedObjectMigrationContext; diff --git a/src/plugins/dashboard/server/saved_objects/replace_index_pattern_reference.ts b/src/plugins/dashboard/server/saved_objects/migrations/migrate_index_pattern_reference.ts similarity index 100% rename from src/plugins/dashboard/server/saved_objects/replace_index_pattern_reference.ts rename to src/plugins/dashboard/server/saved_objects/migrations/migrate_index_pattern_reference.ts diff --git a/src/plugins/dashboard/server/saved_objects/migrate_match_all_query.test.ts b/src/plugins/dashboard/server/saved_objects/migrations/migrate_match_all_query.test.ts similarity index 100% rename from src/plugins/dashboard/server/saved_objects/migrate_match_all_query.test.ts rename to src/plugins/dashboard/server/saved_objects/migrations/migrate_match_all_query.test.ts diff --git a/src/plugins/dashboard/server/saved_objects/migrate_match_all_query.ts b/src/plugins/dashboard/server/saved_objects/migrations/migrate_match_all_query.ts similarity index 100% rename from src/plugins/dashboard/server/saved_objects/migrate_match_all_query.ts rename to src/plugins/dashboard/server/saved_objects/migrations/migrate_match_all_query.ts index 147aa47a7a6e9..a7c1f0ff6bdb5 100644 --- a/src/plugins/dashboard/server/saved_objects/migrate_match_all_query.ts +++ b/src/plugins/dashboard/server/saved_objects/migrations/migrate_match_all_query.ts @@ -6,9 +6,9 @@ * Side Public License, v 1. */ -import { SavedObjectMigrationFn } from '@kbn/core/server'; import { get } from 'lodash'; import { DEFAULT_QUERY_LANGUAGE } from '@kbn/data-plugin/common'; +import { SavedObjectMigrationFn } from '@kbn/core/server'; /** * This migration script is related to: diff --git a/src/plugins/dashboard/public/saved_dashboards/index.ts b/src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/index.ts similarity index 73% rename from src/plugins/dashboard/public/saved_dashboards/index.ts rename to src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/index.ts index 7a17aa6f2c0e0..2cf0813583235 100644 --- a/src/plugins/dashboard/public/saved_dashboards/index.ts +++ b/src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/index.ts @@ -6,6 +6,5 @@ * Side Public License, v 1. */ -export * from '../../common/saved_dashboard_references'; -export * from './saved_dashboard'; -export * from './saved_dashboards'; +export { migrations730 } from './migrations_730'; +export { migrations700 } from './migrations_700'; diff --git a/src/plugins/dashboard/common/migrate_to_730_panels.test.ts b/src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/migrate_to_730_panels.test.ts similarity index 99% rename from src/plugins/dashboard/common/migrate_to_730_panels.test.ts rename to src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/migrate_to_730_panels.test.ts index bdcd3bf8cedc0..4eacf9b93d85d 100644 --- a/src/plugins/dashboard/common/migrate_to_730_panels.test.ts +++ b/src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/migrate_to_730_panels.test.ts @@ -8,13 +8,14 @@ import { migratePanelsTo730 } from './migrate_to_730_panels'; import { + SavedDashboardPanel730ToLatest, + RawSavedDashboardPanel640To720, RawSavedDashboardPanelTo60, RawSavedDashboardPanel630, - RawSavedDashboardPanel640To720, RawSavedDashboardPanel610, RawSavedDashboardPanel620, -} from './bwc/types'; -import { SavedDashboardPanelTo60, SavedDashboardPanel730ToLatest } from './types'; + SavedDashboardPanelTo60, +} from './types'; test('6.0 migrates uiState, sort, scales, and gridData', async () => { const uiState = { diff --git a/src/plugins/dashboard/common/migrate_to_730_panels.ts b/src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/migrate_to_730_panels.ts similarity index 98% rename from src/plugins/dashboard/common/migrate_to_730_panels.ts rename to src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/migrate_to_730_panels.ts index f40240bd7247c..531a0715038d5 100644 --- a/src/plugins/dashboard/common/migrate_to_730_panels.ts +++ b/src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/migrate_to_730_panels.ts @@ -6,25 +6,25 @@ * Side Public License, v 1. */ +import uuid from 'uuid'; +import semverSatisfies from 'semver/functions/satisfies'; + import { i18n } from '@kbn/i18n'; import type { SerializableRecord } from '@kbn/utility-types'; -import semverSatisfies from 'semver/functions/satisfies'; -import uuid from 'uuid'; + import { - GridData, - SavedDashboardPanelTo60, SavedDashboardPanel620, SavedDashboardPanel630, SavedDashboardPanel610, -} from '.'; -import { - RawSavedDashboardPanelTo60, + SavedDashboardPanelTo60, RawSavedDashboardPanel630, - RawSavedDashboardPanel640To720, - RawSavedDashboardPanel730ToLatest, RawSavedDashboardPanel610, RawSavedDashboardPanel620, -} from './bwc/types'; + RawSavedDashboardPanelTo60, + RawSavedDashboardPanel640To720, + RawSavedDashboardPanel730ToLatest, +} from './types'; +import { GridData } from '../../../../common'; const PANEL_HEIGHT_SCALE_FACTOR = 5; const PANEL_HEIGHT_SCALE_FACTOR_WITH_MARGINS = 4; @@ -266,7 +266,6 @@ export function migratePanelsTo730( | RawSavedDashboardPanel620 | RawSavedDashboardPanel630 | RawSavedDashboardPanel640To720 - // We run these on post processed panels too for url BWC | SavedDashboardPanelTo60 | SavedDashboardPanel610 | SavedDashboardPanel620 diff --git a/src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/migrations_700.ts b/src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/migrations_700.ts new file mode 100644 index 0000000000000..d1954e8266d88 --- /dev/null +++ b/src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/migrations_700.ts @@ -0,0 +1,90 @@ +/* + * 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. + */ + +import { get } from 'lodash'; + +import { SavedObjectMigrationFn } from '@kbn/core/server'; +import { DATA_VIEW_SAVED_OBJECT_TYPE } from '@kbn/data-views-plugin/common'; + +import { DashboardDoc700To720 } from './types'; + +function migrateIndexPattern(doc: DashboardDoc700To720) { + const searchSourceJSON = get(doc, 'attributes.kibanaSavedObjectMeta.searchSourceJSON'); + if (typeof searchSourceJSON !== 'string') { + return; + } + let searchSource; + try { + searchSource = JSON.parse(searchSourceJSON); + } catch (e) { + // Let it go, the data is invalid and we'll leave it as is + return; + } + if (searchSource.index) { + searchSource.indexRefName = 'kibanaSavedObjectMeta.searchSourceJSON.index'; + doc.references.push({ + name: searchSource.indexRefName, + type: DATA_VIEW_SAVED_OBJECT_TYPE, + id: searchSource.index, + }); + delete searchSource.index; + } + if (searchSource.filter) { + searchSource.filter.forEach((filterRow: any, i: number) => { + if (!filterRow.meta || !filterRow.meta.index) { + return; + } + filterRow.meta.indexRefName = `kibanaSavedObjectMeta.searchSourceJSON.filter[${i}].meta.index`; + doc.references.push({ + name: filterRow.meta.indexRefName, + type: DATA_VIEW_SAVED_OBJECT_TYPE, + id: filterRow.meta.index, + }); + delete filterRow.meta.index; + }); + } + doc.attributes.kibanaSavedObjectMeta.searchSourceJSON = JSON.stringify(searchSource); +} + +export const migrations700: SavedObjectMigrationFn = (doc): DashboardDoc700To720 => { + // Set new "references" attribute + doc.references = doc.references || []; + + // Migrate index pattern + migrateIndexPattern(doc as DashboardDoc700To720); + // Migrate panels + const panelsJSON = get(doc, 'attributes.panelsJSON'); + if (typeof panelsJSON !== 'string') { + return doc as DashboardDoc700To720; + } + let panels; + try { + panels = JSON.parse(panelsJSON); + } catch (e) { + // Let it go, the data is invalid and we'll leave it as is + return doc as DashboardDoc700To720; + } + if (!Array.isArray(panels)) { + return doc as DashboardDoc700To720; + } + panels.forEach((panel, i) => { + if (!panel.type || !panel.id) { + return; + } + panel.panelRefName = `panel_${i}`; + doc.references!.push({ + name: `panel_${i}`, + type: panel.type, + id: panel.id, + }); + delete panel.type; + delete panel.id; + }); + doc.attributes.panelsJSON = JSON.stringify(panels); + return doc as DashboardDoc700To720; +}; diff --git a/src/plugins/dashboard/server/saved_objects/migrations_730.test.ts b/src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/migrations_730.test.ts similarity index 96% rename from src/plugins/dashboard/server/saved_objects/migrations_730.test.ts rename to src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/migrations_730.test.ts index 2fc999b067496..6314546b5933a 100644 --- a/src/plugins/dashboard/server/saved_objects/migrations_730.test.ts +++ b/src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/migrations_730.test.ts @@ -7,12 +7,17 @@ */ import { savedObjectsServiceMock } from '@kbn/core/server/mocks'; -import { createDashboardSavedObjectTypeMigrations } from './dashboard_migrations'; -import { migrations730 } from './migrations_730'; -import { DashboardDoc700To720, DashboardDoc730ToLatest, DashboardDocPre700 } from '../../common'; -import { RawSavedDashboardPanel730ToLatest } from '../../common'; import { createEmbeddableSetupMock } from '@kbn/embeddable-plugin/server/mocks'; +import { + DashboardDocPre700, + DashboardDoc700To720, + DashboardDoc730ToLatest, + RawSavedDashboardPanel730ToLatest, +} from './types'; +import { migrations730 } from './migrations_730'; +import { createDashboardSavedObjectTypeMigrations } from '../dashboard_saved_object_migrations'; + const mockContext = savedObjectsServiceMock.createMigrationContext(); const migrations = createDashboardSavedObjectTypeMigrations({ embeddable: createEmbeddableSetupMock(), diff --git a/src/plugins/dashboard/server/saved_objects/migrations_730.ts b/src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/migrations_730.ts similarity index 69% rename from src/plugins/dashboard/server/saved_objects/migrations_730.ts rename to src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/migrations_730.ts index 3cc34d8513a45..dcd1c2f2cb878 100644 --- a/src/plugins/dashboard/server/saved_objects/migrations_730.ts +++ b/src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/migrations_730.ts @@ -7,11 +7,38 @@ */ import { inspect } from 'util'; -import { SavedObjectMigrationContext } from '@kbn/core/server'; -import { DashboardDoc730ToLatest } from '../../common'; -import { isDashboardDoc } from './is_dashboard_doc'; +import { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from '@kbn/core/server'; + import { moveFiltersToQuery } from './move_filters_to_query'; -import { migratePanelsTo730, DashboardDoc700To720 } from '../../common'; +import { migratePanelsTo730 } from './migrate_to_730_panels'; +import { DashboardDoc730ToLatest, DashboardDoc700To720 } from './types'; + +function isDoc( + doc: { [key: string]: unknown } | SavedObjectUnsanitizedDoc +): doc is SavedObjectUnsanitizedDoc { + return ( + typeof doc.id === 'string' && + typeof doc.type === 'string' && + doc.attributes !== null && + typeof doc.attributes === 'object' && + doc.references !== null && + typeof doc.references === 'object' + ); +} + +export function isDashboardDoc( + doc: { [key: string]: unknown } | DashboardDoc730ToLatest +): doc is DashboardDoc730ToLatest { + if (!isDoc(doc)) { + return false; + } + + if (typeof (doc as DashboardDoc730ToLatest).attributes.panelsJSON !== 'string') { + return false; + } + + return true; +} export const migrations730 = (doc: DashboardDoc700To720, { log }: SavedObjectMigrationContext) => { if (!isDashboardDoc(doc)) { diff --git a/src/plugins/dashboard/server/saved_objects/move_filters_to_query.test.ts b/src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/move_filters_to_query.test.ts similarity index 100% rename from src/plugins/dashboard/server/saved_objects/move_filters_to_query.test.ts rename to src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/move_filters_to_query.test.ts diff --git a/src/plugins/dashboard/server/saved_objects/move_filters_to_query.ts b/src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/move_filters_to_query.ts similarity index 100% rename from src/plugins/dashboard/server/saved_objects/move_filters_to_query.ts rename to src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/move_filters_to_query.ts diff --git a/src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/readme.md b/src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/readme.md new file mode 100644 index 0000000000000..50f1b3283ca3f --- /dev/null +++ b/src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/readme.md @@ -0,0 +1,3 @@ +## Legacy Pre 7.3 Migrations + +This folder contains legacy migrations that migrate dashboard saved object from any previous version into Kibana 7.3.0. The migrations in this folder need to be able to handle state from any older version of dashboard from as early as 5.0 because Saved Object Migrations did not exist, and in-place migrations were used instead. After 7.3.0, saved object migrations are in place, so it can be assumed that any saved migration that is registered there will receive state from the version before. diff --git a/src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/types.ts b/src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/types.ts new file mode 100644 index 0000000000000..2257b05c0a64e --- /dev/null +++ b/src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/types.ts @@ -0,0 +1,182 @@ +/* + * 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. + */ + +import type { Serializable } from '@kbn/utility-types'; +import { SavedObjectReference } from '@kbn/core/server'; + +import type { + GridData, + DashboardAttributes as CurrentDashboardAttributes, // Dashboard attributes from common are the source of truth for the current version. +} from '../../../../common'; + +interface SavedObjectAttributes { + kibanaSavedObjectMeta: { + searchSourceJSON: string; + }; +} + +interface Doc { + references: SavedObjectReference[]; + attributes: Attributes; + id: string; + type: string; +} + +interface DocPre700 { + attributes: Attributes; + id: string; + type: string; +} + +interface DashboardAttributesTo720 extends SavedObjectAttributes { + panelsJSON: string; + description: string; + uiStateJSON?: string; + version: number; + timeRestore: boolean; + useMargins?: boolean; + title: string; + optionsJSON?: string; +} + +export type DashboardDoc730ToLatest = Doc; + +export type DashboardDoc700To720 = Doc; + +export type DashboardDocPre700 = DocPre700; + +// Note that these types are prefixed with `Raw` because there are some post processing steps +// that happen before the saved objects even reach the client. Namely, injecting type and id +// parameters back into the panels, where the raw saved objects actually have them stored elsewhere. +// +// Ideally, everywhere in the dashboard code would use references at the top level instead of +// embedded in the panels. The reason this is stored at the top level is so the references can be uniformly +// updated across all saved object types that have references. + +// Starting in 7.3 we introduced the possibility of embeddables existing without an id +// parameter. If there was no id, then type remains on the panel. So it either will have a name, +// or a type property. +export type RawSavedDashboardPanel730ToLatest = Pick< + RawSavedDashboardPanel640To720, + Exclude +> & { + // Should be either type, and not name (not backed by a saved object), or name but not type (backed by a + // saved object and type and id are stored on references). Had trouble with oring the two types + // because of optional properties being marked as required: https://github.com/microsoft/TypeScript/issues/20722 + readonly type?: string; + readonly name?: string; + + panelIndex: string; + panelRefName?: string; +}; + +// NOTE!! +// All of these types can actually exist in 7.2! The names are pretty confusing because we did +// in place migrations for so long. For example, `RawSavedDashboardPanelTo60` is what a panel +// created in 6.0 will look like after it's been migrated up to 7.2, *not* what it would look like in 6.0. +// That's why it actually doesn't have id or type, but has a name property, because that was a migration +// added in 7.0. + +// Hopefully since we finally have a formal saved object migration system and we can do less in place +// migrations, this will be easier to understand moving forward. + +// Starting in 6.4 we added an in-place edit on panels to remove columns and sort properties and put them +// inside the embeddable config (https://github.com/elastic/kibana/pull/17446). +// Note that this was not added as a saved object migration until 7.3, so there can still exist panels in +// this shape in v 7.2. +export type RawSavedDashboardPanel640To720 = Pick< + RawSavedDashboardPanel630, + Exclude +>; + +// In 6.3.0 we expanded the number of grid columns and rows: https://github.com/elastic/kibana/pull/16763 +// We added in-place migrations to multiply older x,y,h,w numbers. Note the typescript shape here is the same +// because it's just multiplying existing fields. +// Note that this was not added as a saved object migration until 7.3, so there can still exist panels in 7.2 +// that need to be modified. +export type RawSavedDashboardPanel630 = RawSavedDashboardPanel620; + +// In 6.2 we added an inplace migration, moving uiState into each panel's new embeddableConfig property. +// Source: https://github.com/elastic/kibana/pull/14949 +export type RawSavedDashboardPanel620 = RawSavedDashboardPanel610 & { + embeddableConfig: { [key: string]: Serializable }; + version: string; +}; + +// In 6.1 we switched from an angular grid to react grid layout (https://github.com/elastic/kibana/pull/13853) +// This used gridData instead of size_x, size_y, row and col. We also started tracking the version this panel +// was created in to make future migrations easier. +// Note that this was not added as a saved object migration until 7.3, so there can still exist panels in +// this shape in v 7.2. +export type RawSavedDashboardPanel610 = Pick< + RawSavedDashboardPanelTo60, + Exclude +> & { gridData: GridData; version: string }; + +export interface RawSavedDashboardPanelTo60 { + readonly columns?: string[]; + readonly sort?: string; + readonly size_x?: number; + readonly size_y?: number; + readonly row: number; + readonly col: number; + panelIndex?: number | string; // earlier versions allowed this to be number or string. Some very early versions seem to be missing this entirely + readonly name: string; + + // This is where custom panel titles are stored prior to Embeddable API v2 + title?: string; +} + +export type SavedDashboardPanel640To720 = Pick< + RawSavedDashboardPanel640To720, + Exclude +> & { + readonly id: string; + readonly type: string; +}; + +export type SavedDashboardPanel630 = Pick< + RawSavedDashboardPanel630, + Exclude +> & { + readonly id: string; + readonly type: string; +}; + +export type SavedDashboardPanel620 = Pick< + RawSavedDashboardPanel620, + Exclude +> & { + readonly id: string; + readonly type: string; +}; + +export type SavedDashboardPanel610 = Pick< + RawSavedDashboardPanel610, + Exclude +> & { + readonly id: string; + readonly type: string; +}; + +export type SavedDashboardPanelTo60 = Pick< + RawSavedDashboardPanelTo60, + Exclude +> & { + readonly id: string; + readonly type: string; +}; + +// id becomes optional starting in 7.3.0 +export type SavedDashboardPanel730ToLatest = Pick< + RawSavedDashboardPanel730ToLatest, + Exclude +> & { + readonly id?: string; + readonly type: string; +}; diff --git a/src/plugins/dashboard/server/usage/dashboard_telemetry.test.ts b/src/plugins/dashboard/server/usage/dashboard_telemetry.test.ts index ea981be3515f8..25a4986208d31 100644 --- a/src/plugins/dashboard/server/usage/dashboard_telemetry.test.ts +++ b/src/plugins/dashboard/server/usage/dashboard_telemetry.test.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { SavedDashboardPanel730ToLatest } from '../../common'; +import { SavedDashboardPanel } from '../../common'; import { getEmptyDashboardData, collectPanelsByType } from './dashboard_telemetry'; import { EmbeddableStateWithType } from '@kbn/embeddable-plugin/common'; import { createEmbeddablePersistableStateServiceMock } from '@kbn/embeddable-plugin/common/mocks'; @@ -18,7 +18,7 @@ const visualizationType1ByValue = { }, }, type: 'visualization', -} as unknown as SavedDashboardPanel730ToLatest; +} as unknown as SavedDashboardPanel; const visualizationType2ByValue = { embeddableConfig: { @@ -27,7 +27,7 @@ const visualizationType2ByValue = { }, }, type: 'visualization', -} as unknown as SavedDashboardPanel730ToLatest; +} as unknown as SavedDashboardPanel; const visualizationType2ByReference = { ...visualizationType2ByValue, @@ -41,7 +41,7 @@ const lensTypeAByValue = { visualizationType: 'a', }, }, -} as unknown as SavedDashboardPanel730ToLatest; +} as unknown as SavedDashboardPanel; const lensTypeAByReference = { ...lensTypeAByValue, @@ -60,7 +60,7 @@ const lensXYSeriesA = { }, }, }, -} as unknown as SavedDashboardPanel730ToLatest; +} as unknown as SavedDashboardPanel; const lensXYSeriesB = { type: 'lens', @@ -90,7 +90,7 @@ const lensXYSeriesB = { }, }, }, -} as unknown as SavedDashboardPanel730ToLatest; +} as unknown as SavedDashboardPanel; const embeddablePersistableStateService = createEmbeddablePersistableStateServiceMock(); diff --git a/src/plugins/dashboard/server/usage/dashboard_telemetry.ts b/src/plugins/dashboard/server/usage/dashboard_telemetry.ts index ce41c50834689..1e8a0192ec38a 100644 --- a/src/plugins/dashboard/server/usage/dashboard_telemetry.ts +++ b/src/plugins/dashboard/server/usage/dashboard_telemetry.ts @@ -16,7 +16,7 @@ import { } from '@kbn/controls-plugin/common'; import { initializeControlGroupTelemetry } from '@kbn/controls-plugin/server'; import { TaskManagerStartContract } from '@kbn/task-manager-plugin/server'; -import { SavedDashboardPanel730ToLatest } from '../../common'; +import type { SavedDashboardPanel } from '../../common'; import { TASK_ID, DashboardTelemetryTaskState } from './dashboard_telemetry_collection_task'; export interface DashboardCollectorData { panels: { @@ -55,7 +55,7 @@ export const getEmptyPanelTypeData = () => ({ }); export const collectPanelsByType = ( - panels: SavedDashboardPanel730ToLatest[], + panels: SavedDashboardPanel[], collectorData: DashboardCollectorData, embeddableService: EmbeddablePersistableStateService ) => { diff --git a/src/plugins/dashboard/server/usage/dashboard_telemetry_collection_task.ts b/src/plugins/dashboard/server/usage/dashboard_telemetry_collection_task.ts index 823b5fadaaeae..1ca13b4308586 100644 --- a/src/plugins/dashboard/server/usage/dashboard_telemetry_collection_task.ts +++ b/src/plugins/dashboard/server/usage/dashboard_telemetry_collection_task.ts @@ -14,17 +14,13 @@ import { TaskManagerStartContract, } from '@kbn/task-manager-plugin/server'; import { EmbeddableSetup } from '@kbn/embeddable-plugin/server'; -import { SavedDashboardPanel730ToLatest } from '../../common'; -import { - injectReferences, - SavedObjectAttributesAndReferences, -} from '../../common/saved_dashboard_references'; import { controlsCollectorFactory, collectPanelsByType, getEmptyDashboardData, DashboardCollectorData, } from './dashboard_telemetry'; +import { injectReferences, SavedDashboardPanel } from '../../common'; // This task is responsible for running daily and aggregating all the Dashboard telemerty data // into a single document. This is an effort to make sure the load of fetching/parsing all of the @@ -32,6 +28,11 @@ import { const TELEMETRY_TASK_TYPE = 'dashboard_telemetry'; export const TASK_ID = `Dashboard-${TELEMETRY_TASK_TYPE}`; +interface SavedObjectAttributesAndReferences { + attributes: SavedObjectAttributes; + references: SavedObjectReference[]; +} + export interface DashboardTelemetryTaskState { runs: number; telemetry: DashboardCollectorData; @@ -102,7 +103,7 @@ export function dashboardTaskRunner(logger: Logger, core: CoreSetup, embeddable: try { const panels = JSON.parse( attributes.panelsJSON as string - ) as unknown as SavedDashboardPanel730ToLatest[]; + ) as unknown as SavedDashboardPanel[]; collectPanelsByType(panels, dashboardData, embeddable); } catch (e) { diff --git a/src/plugins/dashboard/server/usage/find_by_value_embeddables.test.ts b/src/plugins/dashboard/server/usage/find_by_value_embeddables.test.ts index 8a3cdd71539f8..c5e8da8acbd4a 100644 --- a/src/plugins/dashboard/server/usage/find_by_value_embeddables.test.ts +++ b/src/plugins/dashboard/server/usage/find_by_value_embeddables.test.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { SavedDashboardPanel730ToLatest } from '../../common'; +import type { SavedDashboardPanel } from '../../common'; import { findByValueEmbeddables } from './find_by_value_embeddables'; const visualizationByValue = { @@ -14,18 +14,18 @@ const visualizationByValue = { value: 'visualization-by-value', }, type: 'visualization', -} as unknown as SavedDashboardPanel730ToLatest; +} as unknown as SavedDashboardPanel; const mapByValue = { embeddableConfig: { value: 'map-by-value', }, type: 'map', -} as unknown as SavedDashboardPanel730ToLatest; +} as unknown as SavedDashboardPanel; const embeddableByRef = { panelRefName: 'panel_ref_1', -} as unknown as SavedDashboardPanel730ToLatest; +} as unknown as SavedDashboardPanel; describe('findByValueEmbeddables', () => { it('finds the by value embeddables for the given type', async () => { diff --git a/src/plugins/dashboard/server/usage/find_by_value_embeddables.ts b/src/plugins/dashboard/server/usage/find_by_value_embeddables.ts index 694fe2007f844..502ba828944d4 100644 --- a/src/plugins/dashboard/server/usage/find_by_value_embeddables.ts +++ b/src/plugins/dashboard/server/usage/find_by_value_embeddables.ts @@ -7,7 +7,7 @@ */ import { ISavedObjectsRepository, SavedObjectAttributes } from '@kbn/core/server'; -import { SavedDashboardPanel730ToLatest } from '../../common'; +import type { SavedDashboardPanel } from '../../common'; export const findByValueEmbeddables = async ( savedObjectClient: Pick, @@ -22,7 +22,7 @@ export const findByValueEmbeddables = async ( try { return JSON.parse( dashboard.attributes.panelsJSON as string - ) as unknown as SavedDashboardPanel730ToLatest[]; + ) as unknown as SavedDashboardPanel[]; } catch (exception) { return []; } diff --git a/test/functional/apps/dashboard/group3/bwc_shared_urls.ts b/test/functional/apps/dashboard/group3/bwc_shared_urls.ts index 35d13b715c14c..0b06e28af0f11 100644 --- a/test/functional/apps/dashboard/group3/bwc_shared_urls.ts +++ b/test/functional/apps/dashboard/group3/bwc_shared_urls.ts @@ -12,9 +12,7 @@ import { FtrProviderContext } from '../../../ftr_provider_context'; export default function ({ getService, getPageObjects }: FtrProviderContext) { const PageObjects = getPageObjects(['dashboard', 'header']); - const dashboardExpect = getService('dashboardExpect'); - const pieChart = getService('pieChart'); - const elasticChart = getService('elasticChart'); + const toasts = getService('toasts'); const browser = getService('browser'); const log = getService('log'); const queryBar = getService('queryBar'); @@ -42,11 +40,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { `legendOpen:!t))),` + `viewMode:edit)`; - const enableNewChartLibraryDebug = async () => { - await elasticChart.setNewChartUiDebugFlag(); - await queryBar.submitQuery(); - }; - describe('bwc shared urls', function describeIndexTests() { before(async function () { await PageObjects.dashboard.initTests(); @@ -81,13 +74,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { log.debug(`Navigating to ${url}`); await browser.get(url, true); await PageObjects.header.waitUntilLoadingHasFinished(); - await elasticChart.setNewChartUiDebugFlag(true); const query = await queryBar.getQueryString(); expect(query).to.equal('memory:>220000'); - await pieChart.expectEmptyPieChart(); - await dashboardExpect.panelCount(2); + const warningToast = await toasts.getToastElement(1); + expect(await warningToast.getVisibleText()).to.contain('Cannot load panels'); + await PageObjects.dashboard.waitForRenderComplete(); }); }); @@ -99,15 +92,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { const url = `${kibanaLegacyBaseUrl}#/dashboard?${urlQuery}`; log.debug(`Navigating to ${url}`); await browser.get(url, true); - enableNewChartLibraryDebug(); await PageObjects.header.waitUntilLoadingHasFinished(); const query = await queryBar.getQueryString(); expect(query).to.equal('memory:>220000'); - await pieChart.expectPieSliceCount(5); - await dashboardExpect.panelCount(2); + const warningToast = await toasts.getToastElement(1); + expect(await warningToast.getVisibleText()).to.contain('Cannot load panels'); await PageObjects.dashboard.waitForRenderComplete(); - await dashboardExpect.selectedLegendColorCount('#F9D9F9', 5); }); it('loads a saved dashboard', async function () { @@ -120,15 +111,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { log.debug(`Navigating to ${url}`); await browser.get(url, true); await PageObjects.header.waitUntilLoadingHasFinished(); - enableNewChartLibraryDebug(); const query = await queryBar.getQueryString(); expect(query).to.equal('memory:>220000'); - await pieChart.expectPieSliceCount(5); - await dashboardExpect.panelCount(2); await PageObjects.dashboard.waitForRenderComplete(); - await dashboardExpect.selectedLegendColorCount('#F9D9F9', 5); }); it('loads a saved dashboard with query via dashboard_no_match', async function () { @@ -143,7 +130,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { const query = await queryBar.getQueryString(); expect(query).to.equal('boop'); - await dashboardExpect.panelCount(2); await PageObjects.dashboard.waitForRenderComplete(); }); @@ -154,33 +140,26 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { log.debug(`Navigating to ${url}`); await browser.get(url, true); - await elasticChart.setNewChartUiDebugFlag(true); await PageObjects.header.waitUntilLoadingHasFinished(); - await dashboardExpect.selectedLegendColorCount('#000000', 5); }); it('back button works for old dashboards after state migrations', async () => { await PageObjects.dashboard.preserveCrossAppState(); const oldId = await PageObjects.dashboard.getDashboardIdFromCurrentUrl(); await PageObjects.dashboard.waitForRenderComplete(); - await dashboardExpect.selectedLegendColorCount('#000000', 5); const url = `${kibanaLegacyBaseUrl}#/dashboard?${urlQuery}`; log.debug(`Navigating to ${url}`); await browser.get(url); - await elasticChart.setNewChartUiDebugFlag(true); await PageObjects.header.waitUntilLoadingHasFinished(); await PageObjects.dashboard.waitForRenderComplete(); - await dashboardExpect.selectedLegendColorCount('#F9D9F9', 5); await browser.goBack(); await PageObjects.header.waitUntilLoadingHasFinished(); const newId = await PageObjects.dashboard.getDashboardIdFromCurrentUrl(); expect(newId).to.be.equal(oldId); await PageObjects.dashboard.waitForRenderComplete(); - await elasticChart.setNewChartUiDebugFlag(true); await queryBar.submitQuery(); - await dashboardExpect.selectedLegendColorCount('#000000', 5); }); }); }); diff --git a/test/functional/apps/dashboard/group3/dashboard_state.ts b/test/functional/apps/dashboard/group3/dashboard_state.ts index bc3f2ed2774a0..2c79f1fd61d23 100644 --- a/test/functional/apps/dashboard/group3/dashboard_state.ts +++ b/test/functional/apps/dashboard/group3/dashboard_state.ts @@ -9,7 +9,7 @@ import expect from '@kbn/expect'; import chroma from 'chroma-js'; -import { DEFAULT_PANEL_WIDTH } from '@kbn/dashboard-plugin/public/application/embeddable/dashboard_constants'; +import { DEFAULT_PANEL_WIDTH } from '@kbn/dashboard-plugin/public/dashboard_constants'; import { PIE_CHART_VIS_NAME, AREA_CHART_VIS_NAME } from '../../../page_objects/dashboard_page'; import { FtrProviderContext } from '../../../ftr_provider_context'; diff --git a/test/functional/apps/dashboard/group4/dashboard_empty.ts b/test/functional/apps/dashboard/group4/dashboard_empty.ts index fe5a74bebbc25..02437b0685694 100644 --- a/test/functional/apps/dashboard/group4/dashboard_empty.ts +++ b/test/functional/apps/dashboard/group4/dashboard_empty.ts @@ -54,7 +54,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] }); // create the new data view from the dashboards/create route in order to test that the dashboard is loaded properly as soon as the data view is created... - await PageObjects.common.navigateToUrl('dashboard', '/create'); + await PageObjects.common.navigateToApp('dashboard', { hash: '/create' }); const button = await testSubjects.find('createDataViewButton'); button.click(); diff --git a/test/functional/page_objects/dashboard_page.ts b/test/functional/page_objects/dashboard_page.ts index 7a579f4e4f84b..bad1f6bdebf2b 100644 --- a/test/functional/page_objects/dashboard_page.ts +++ b/test/functional/page_objects/dashboard_page.ts @@ -12,6 +12,7 @@ export const LINE_CHART_VIS_NAME = 'Visualization漢字 LineChart'; import expect from '@kbn/expect'; import { FtrService } from '../ftr_provider_context'; +import { CommonPageObject } from './common_page'; interface SaveDashboardOptions { /** @@ -430,6 +431,31 @@ export class DashboardPageObject extends FtrService { await this.switchToEditMode(); } + public async gotoDashboardURL({ + id, + args, + editMode, + }: { + id?: string; + editMode?: boolean; + args?: Parameters['navigateToActualUrl']>[2]; + } = {}) { + let dashboardLocation = `/create`; + if (id) { + const edit = editMode ? `?_a=(viewMode:edit)` : ''; + dashboardLocation = `/view/${id}${edit}`; + } + this.common.navigateToActualUrl('dashboard', dashboardLocation, args); + } + + public async gotoDashboardListingURL({ + args, + }: { + args?: Parameters['navigateToActualUrl']>[2]; + } = {}) { + await this.common.navigateToActualUrl('dashboard', '/list', args); + } + public async renameDashboard(dashboardName: string) { this.log.debug(`Naming dashboard ` + dashboardName); await this.testSubjects.click('dashboardRenameButton'); diff --git a/x-pack/plugins/ml/public/application/explorer/dashboard_controls/add_swimlane_to_dashboard_controls.tsx b/x-pack/plugins/ml/public/application/explorer/dashboard_controls/add_swimlane_to_dashboard_controls.tsx index 7f109defdff79..93fa7e908f35a 100644 --- a/x-pack/plugins/ml/public/application/explorer/dashboard_controls/add_swimlane_to_dashboard_controls.tsx +++ b/x-pack/plugins/ml/public/application/explorer/dashboard_controls/add_swimlane_to_dashboard_controls.tsx @@ -15,7 +15,7 @@ import { } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n-react'; import { i18n } from '@kbn/i18n'; -import { DashboardSavedObject } from '@kbn/dashboard-plugin/public'; +import { DashboardAttributes } from '@kbn/dashboard-plugin/common'; import type { Query } from '@kbn/es-query'; import { SEARCH_QUERY_LANGUAGE } from '../../../../common/constants/search'; import { getDefaultSwimlanePanelTitle } from '../../../embeddables/anomaly_swimlane/anomaly_swimlane_embeddable'; @@ -30,7 +30,7 @@ export interface DashboardItem { id: string; title: string; description: string | undefined; - attributes: DashboardSavedObject; + attributes: DashboardAttributes; } export type EuiTableProps = EuiInMemoryTableProps; diff --git a/x-pack/plugins/ml/public/application/explorer/dashboard_controls/use_dashboards_table.tsx b/x-pack/plugins/ml/public/application/explorer/dashboard_controls/use_dashboards_table.tsx index ac023017d43f5..8bb7705938d84 100644 --- a/x-pack/plugins/ml/public/application/explorer/dashboard_controls/use_dashboards_table.tsx +++ b/x-pack/plugins/ml/public/application/explorer/dashboard_controls/use_dashboards_table.tsx @@ -8,7 +8,7 @@ import type { EuiInMemoryTableProps } from '@elastic/eui'; import { useCallback, useEffect, useMemo, useState } from 'react'; import { debounce } from 'lodash'; -import type { DashboardSavedObject } from '@kbn/dashboard-plugin/public'; +import type { DashboardAttributes } from '@kbn/dashboard-plugin/common'; import { useDashboardService } from '../../services/dashboard_service'; import { useMlKibana } from '../../contexts/kibana'; @@ -16,7 +16,7 @@ export interface DashboardItem { id: string; title: string; description: string | undefined; - attributes: DashboardSavedObject; + attributes: DashboardAttributes; } export type EuiTableProps = EuiInMemoryTableProps; diff --git a/x-pack/plugins/ml/public/application/services/dashboard_service.ts b/x-pack/plugins/ml/public/application/services/dashboard_service.ts index ff7b696551f41..abd97722f86bc 100644 --- a/x-pack/plugins/ml/public/application/services/dashboard_service.ts +++ b/x-pack/plugins/ml/public/application/services/dashboard_service.ts @@ -7,7 +7,8 @@ import { SavedObjectsClientContract } from '@kbn/core/public'; import { useMemo } from 'react'; -import { DashboardSavedObject, DashboardAppLocator } from '@kbn/dashboard-plugin/public'; +import { DashboardAppLocator } from '@kbn/dashboard-plugin/public'; +import type { DashboardAttributes } from '@kbn/dashboard-plugin/common'; import { ViewMode } from '@kbn/embeddable-plugin/public'; import { useMlKibana } from '../contexts/kibana'; @@ -22,7 +23,7 @@ export function dashboardServiceProvider( * Fetches dashboards */ async fetchDashboards(query?: string) { - return await savedObjectClient.find({ + return await savedObjectClient.find({ type: 'dashboard', perPage: 1000, search: query ? `${query}*` : '', diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json index ce86f1de798de..612838bf5ea5f 100644 --- a/x-pack/plugins/translations/translations/fr-FR.json +++ b/x-pack/plugins/translations/translations/fr-FR.json @@ -988,7 +988,6 @@ "dashboard.panel.copyToDashboard.goToDashboard": "Copier et accéder au tableau de bord", "dashboard.panel.copyToDashboard.newDashboardOptionLabel": "Nouveau tableau de bord", "dashboard.panel.copyToDashboard.title": "Copier dans le tableau de bord", - "dashboard.panel.invalidData": "Données non valides dans l'url", "dashboard.panel.LibraryNotification": "Notification de la bibliothèque Visualize", "dashboard.panel.libraryNotification.ariaLabel": "Afficher les informations de la bibliothèque et dissocier ce panneau", "dashboard.panel.libraryNotification.toolTip": "La modification de ce panneau pourrait affecter d’autres tableaux de bord. Pour modifier ce panneau uniquement, dissociez-le de la bibliothèque.", diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index 5b56cc076172c..1ace6b0a76659 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -986,7 +986,6 @@ "dashboard.panel.copyToDashboard.goToDashboard": "コピーしてダッシュボードを開く", "dashboard.panel.copyToDashboard.newDashboardOptionLabel": "新規ダッシュボード", "dashboard.panel.copyToDashboard.title": "ダッシュボードにコピー", - "dashboard.panel.invalidData": "URL の無効なデータ", "dashboard.panel.LibraryNotification": "Visualize ライブラリ通知", "dashboard.panel.libraryNotification.ariaLabel": "ライブラリ情報を表示し、このパネルのリンクを解除します", "dashboard.panel.libraryNotification.toolTip": "このパネルを編集すると、他のダッシュボードに影響する場合があります。このパネルのみを変更するには、ライブラリからリンクを解除します。", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index 09fb50c164e9c..2cdc7fa516263 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -988,7 +988,6 @@ "dashboard.panel.copyToDashboard.goToDashboard": "复制并前往仪表板", "dashboard.panel.copyToDashboard.newDashboardOptionLabel": "新仪表板", "dashboard.panel.copyToDashboard.title": "复制到仪表板", - "dashboard.panel.invalidData": "url 中的数据无效", "dashboard.panel.LibraryNotification": "可视化库通知", "dashboard.panel.libraryNotification.ariaLabel": "查看库信息并取消链接此面板", "dashboard.panel.libraryNotification.toolTip": "编辑此面板可能会影响其他仪表板。要仅更改此面板，请取消其与库的链接。", diff --git a/x-pack/test/functional/apps/dashboard/group1/feature_controls/dashboard_security.ts b/x-pack/test/functional/apps/dashboard/group1/feature_controls/dashboard_security.ts index 8f7fc4fe73062..3a33f14d682a6 100644 --- a/x-pack/test/functional/apps/dashboard/group1/feature_controls/dashboard_security.ts +++ b/x-pack/test/functional/apps/dashboard/group1/feature_controls/dashboard_security.ts @@ -6,10 +6,6 @@ */ import expect from '@kbn/expect'; -import { - createDashboardEditUrl, - DashboardConstants, -} from '@kbn/dashboard-plugin/public/dashboard_constants'; import { FtrProviderContext } from '../../../../ftr_provider_context'; export default function ({ getPageObjects, getService }: FtrProviderContext) { @@ -32,6 +28,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { const savedQueryManagementComponent = getService('savedQueryManagementComponent'); const kbnServer = getService('kibanaServer'); + const navigationArgs = { + ensureCurrentUrl: false, + shouldLoginIfPrompted: false, + }; + describe('dashboard feature controls security', () => { before(async () => { await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); @@ -97,14 +98,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { }); it(`landing page shows "Create new Dashboard" button`, async () => { - await PageObjects.common.navigateToActualUrl( - 'dashboard', - DashboardConstants.LANDING_PAGE_PATH, - { - ensureCurrentUrl: false, - shouldLoginIfPrompted: false, - } - ); + await PageObjects.dashboard.gotoDashboardListingURL({ + args: navigationArgs, + }); await testSubjects.existOrFail('dashboardLandingPage', { timeout: config.get('timeouts.waitFor'), }); @@ -116,28 +112,17 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { }); it(`create new dashboard shows addNew button`, async () => { - await PageObjects.common.navigateToActualUrl( - 'dashboard', - DashboardConstants.CREATE_NEW_DASHBOARD_URL, - { - ensureCurrentUrl: false, - shouldLoginIfPrompted: false, - } - ); + await PageObjects.dashboard.gotoDashboardURL({ args: navigationArgs }); await testSubjects.existOrFail('emptyDashboardWidget', { timeout: config.get('timeouts.waitFor'), }); }); it(`can view existing Dashboard`, async () => { - await PageObjects.common.navigateToActualUrl( - 'dashboard', - createDashboardEditUrl('i-exist'), - { - ensureCurrentUrl: false, - shouldLoginIfPrompted: false, - } - ); + await PageObjects.dashboard.gotoDashboardURL({ + id: 'i-exist', + args: navigationArgs, + }); await testSubjects.existOrFail('embeddablePanelHeading-APie', { timeout: config.get('timeouts.waitFor'), }); @@ -307,14 +292,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { }); it(`landing page doesn't show "Create new Dashboard" button`, async () => { - await PageObjects.common.navigateToActualUrl( - 'dashboard', - DashboardConstants.LANDING_PAGE_PATH, - { - ensureCurrentUrl: false, - shouldLoginIfPrompted: false, - } - ); + await PageObjects.dashboard.gotoDashboardListingURL({ + args: navigationArgs, + }); await testSubjects.existOrFail('dashboardLandingPage', { timeout: config.get('timeouts.waitFor'), }); @@ -322,38 +302,24 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { }); it(`shows read-only badge`, async () => { - await PageObjects.common.navigateToActualUrl( - 'dashboard', - DashboardConstants.LANDING_PAGE_PATH, - { - ensureCurrentUrl: false, - shouldLoginIfPrompted: false, - } - ); + await PageObjects.dashboard.gotoDashboardListingURL({ + args: navigationArgs, + }); await globalNav.badgeExistsOrFail('Read only'); }); it(`create new dashboard shows the read only warning`, async () => { - await PageObjects.common.navigateToActualUrl( - 'dashboard', - DashboardConstants.CREATE_NEW_DASHBOARD_URL, - { - ensureCurrentUrl: false, - shouldLoginIfPrompted: false, - } - ); + await PageObjects.dashboard.gotoDashboardURL({ + args: navigationArgs, + }); await testSubjects.existOrFail('dashboardEmptyReadOnly', { timeout: 20000 }); }); it(`can view existing Dashboard`, async () => { - await PageObjects.common.navigateToActualUrl( - 'dashboard', - createDashboardEditUrl('i-exist'), - { - ensureCurrentUrl: false, - shouldLoginIfPrompted: false, - } - ); + await PageObjects.dashboard.gotoDashboardURL({ + id: 'i-exist', + args: navigationArgs, + }); await testSubjects.existOrFail('embeddablePanelHeading-APie', { timeout: config.get('timeouts.waitFor'), }); @@ -438,14 +404,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { }); it(`landing page doesn't show "Create new Dashboard" button`, async () => { - await PageObjects.common.navigateToActualUrl( - 'dashboard', - DashboardConstants.LANDING_PAGE_PATH, - { - ensureCurrentUrl: false, - shouldLoginIfPrompted: false, - } - ); + await PageObjects.dashboard.gotoDashboardListingURL({ + args: navigationArgs, + }); await testSubjects.existOrFail('dashboardLandingPage', { timeout: 10000 }); await testSubjects.missingOrFail('newItemButton'); }); @@ -455,26 +416,14 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { }); it(`create new dashboard shows the read only warning`, async () => { - await PageObjects.common.navigateToActualUrl( - 'dashboard', - DashboardConstants.CREATE_NEW_DASHBOARD_URL, - { - ensureCurrentUrl: false, - shouldLoginIfPrompted: false, - } - ); + await PageObjects.dashboard.gotoDashboardURL({ + args: navigationArgs, + }); await testSubjects.existOrFail('dashboardEmptyReadOnly', { timeout: 20000 }); }); it(`can view existing Dashboard`, async () => { - await PageObjects.common.navigateToActualUrl( - 'dashboard', - createDashboardEditUrl('i-exist'), - { - ensureCurrentUrl: false, - shouldLoginIfPrompted: false, - } - ); + await PageObjects.dashboard.gotoDashboardURL({ id: 'i-exist', args: navigationArgs }); await testSubjects.existOrFail('embeddablePanelHeading-APie', { timeout: 10000 }); }); @@ -552,50 +501,24 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { }); it(`landing page shows 403`, async () => { - await PageObjects.common.navigateToActualUrl( - 'dashboard', - DashboardConstants.LANDING_PAGE_PATH, - { - ensureCurrentUrl: false, - shouldLoginIfPrompted: false, - } - ); + await PageObjects.dashboard.gotoDashboardListingURL({ + args: navigationArgs, + }); await PageObjects.error.expectForbidden(); }); it(`create new dashboard shows 403`, async () => { - await PageObjects.common.navigateToActualUrl( - 'dashboard', - DashboardConstants.CREATE_NEW_DASHBOARD_URL, - { - ensureCurrentUrl: false, - shouldLoginIfPrompted: false, - } - ); + await PageObjects.dashboard.gotoDashboardURL({ args: navigationArgs }); await PageObjects.error.expectForbidden(); }); it(`edit dashboard for object which doesn't exist shows 403`, async () => { - await PageObjects.common.navigateToActualUrl( - 'dashboard', - createDashboardEditUrl('i-dont-exist'), - { - ensureCurrentUrl: false, - shouldLoginIfPrompted: false, - } - ); + await PageObjects.dashboard.gotoDashboardURL({ id: 'i-dont-exist', args: navigationArgs }); await PageObjects.error.expectForbidden(); }); it(`edit dashboard for object which exists shows 403`, async () => { - await PageObjects.common.navigateToActualUrl( - 'dashboard', - createDashboardEditUrl('i-exist'), - { - ensureCurrentUrl: false, - shouldLoginIfPrompted: false, - } - ); + await PageObjects.dashboard.gotoDashboardURL({ id: 'i-exist', args: navigationArgs }); await PageObjects.error.expectForbidden(); }); }); diff --git a/x-pack/test/functional/apps/dashboard/group1/feature_controls/dashboard_spaces.ts b/x-pack/test/functional/apps/dashboard/group1/feature_controls/dashboard_spaces.ts index a702b7a716a15..ef8c83ec667ba 100644 --- a/x-pack/test/functional/apps/dashboard/group1/feature_controls/dashboard_spaces.ts +++ b/x-pack/test/functional/apps/dashboard/group1/feature_controls/dashboard_spaces.ts @@ -6,10 +6,6 @@ */ import expect from '@kbn/expect'; -import { - createDashboardEditUrl, - DashboardConstants, -} from '@kbn/dashboard-plugin/public/dashboard_constants'; import { FtrProviderContext } from '../../../../ftr_provider_context'; export default function ({ getPageObjects, getService }: FtrProviderContext) { @@ -53,15 +49,13 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { }); it(`landing page shows "Create new Dashboard" button`, async () => { - await PageObjects.common.navigateToActualUrl( - 'dashboard', - DashboardConstants.LANDING_PAGE_PATH, - { + await PageObjects.dashboard.gotoDashboardListingURL({ + args: { basePath: '/s/custom_space', ensureCurrentUrl: false, shouldLoginIfPrompted: false, - } - ); + }, + }); await testSubjects.existOrFail('dashboardLandingPage', { timeout: config.get('timeouts.waitFor'), }); @@ -69,30 +63,27 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { }); it(`create new dashboard shows addNew button`, async () => { - await PageObjects.common.navigateToActualUrl( - 'dashboard', - DashboardConstants.CREATE_NEW_DASHBOARD_URL, - { + await PageObjects.dashboard.gotoDashboardURL({ + args: { basePath: '/s/custom_space', ensureCurrentUrl: false, shouldLoginIfPrompted: false, - } - ); + }, + }); await testSubjects.existOrFail('emptyDashboardWidget', { timeout: config.get('timeouts.waitFor'), }); }); it(`can view existing Dashboard`, async () => { - await PageObjects.common.navigateToActualUrl( - 'dashboard', - createDashboardEditUrl('8fba09d8-df3f-5aa1-83cc-65f7fbcbc0d9'), - { + await PageObjects.dashboard.gotoDashboardURL({ + id: '8fba09d8-df3f-5aa1-83cc-65f7fbcbc0d9', + args: { basePath: '/s/custom_space', ensureCurrentUrl: false, shouldLoginIfPrompted: false, - } - ); + }, + }); await testSubjects.existOrFail('embeddablePanelHeading-APie', { timeout: config.get('timeouts.waitFor'), }); @@ -125,41 +116,37 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { }); it(`create new dashboard shows 404`, async () => { - await PageObjects.common.navigateToActualUrl( - 'dashboard', - DashboardConstants.CREATE_NEW_DASHBOARD_URL, - { + await PageObjects.dashboard.gotoDashboardURL({ + args: { basePath: '/s/custom_space', ensureCurrentUrl: false, shouldLoginIfPrompted: false, - } - ); + }, + }); await PageObjects.error.expectNotFound(); }); it(`edit dashboard for object which doesn't exist shows 404`, async () => { - await PageObjects.common.navigateToActualUrl( - 'dashboard', - createDashboardEditUrl('i-dont-exist'), - { + await PageObjects.dashboard.gotoDashboardURL({ + id: 'i-dont-exist', + args: { basePath: '/s/custom_space', ensureCurrentUrl: false, shouldLoginIfPrompted: false, - } - ); + }, + }); await PageObjects.error.expectNotFound(); }); it(`edit dashboard for object which exists shows 404`, async () => { - await PageObjects.common.navigateToActualUrl( - 'dashboard', - createDashboardEditUrl('i-exist'), - { + await PageObjects.dashboard.gotoDashboardURL({ + id: 'i-exist', + args: { basePath: '/s/custom_space', ensureCurrentUrl: false, shouldLoginIfPrompted: false, - } - ); + }, + }); await PageObjects.error.expectNotFound(); }); }); From 670b6adb3ee48890d5d9d0bcff7ef48cd75c7571 Mon Sep 17 00:00:00 2001 From: Kaarina Tungseth Date: Wed, 28 Sep 2022 15:10:51 -0500 Subject: [PATCH 63/95] [DOCS] Adds time slider control (#141832) * [DOCS] Adds time slider control * Review comment Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../dashboard_timeSliderControl_8.5.0.gif | Bin 0 -> 1196260 bytes ...imeSliderControl_advanceBackward_8.5.0.png | Bin 0 -> 1522 bytes ...timeSliderControl_advanceForward_8.5.0.png | Bin 0 -> 1531 bytes ...hboard_timeSliderControl_animate_8.5.0.png | Bin 0 -> 1559 bytes .../make-dashboards-interactive.asciidoc | 55 ++++++++++++++---- 5 files changed, 45 insertions(+), 10 deletions(-) create mode 100644 docs/user/dashboard/images/dashboard_timeSliderControl_8.5.0.gif create mode 100644 docs/user/dashboard/images/dashboard_timeSliderControl_advanceBackward_8.5.0.png create mode 100644 docs/user/dashboard/images/dashboard_timeSliderControl_advanceForward_8.5.0.png create mode 100644 docs/user/dashboard/images/dashboard_timeSliderControl_animate_8.5.0.png diff --git a/docs/user/dashboard/images/dashboard_timeSliderControl_8.5.0.gif b/docs/user/dashboard/images/dashboard_timeSliderControl_8.5.0.gif new file mode 100644 index 0000000000000000000000000000000000000000..89ca09dccc71e321a95088334240cef55405facc GIT binary patch literal 1196260 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

    =xb~|T2g=bESQ?7eYA-bL9bV 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

    -m*E_u&jRwH#Wmuys@8t;$?6IfuyCt&gy zz)woPFx3K#f+OCwifw@+5=+Wf8|#o=3lm{-<$|F$8qM_fF$b8nQqeed2R>?Zjh1^U zq>Z8HZ9$+`0&52~9_T$njMi@+zF|VVKm0^dzG#V>S|0!Xb3W7G-tawY5~xV$wTaN0 zPv`Gd>h+eta+Ue;W|V(&l_-%dF`CnNU61qf{>oJ){fI%u)9~_9Znn=@riG<>n($cIg#WE%9XR zk`nKeSM3up?W5uAQB(yxw)H`~+eG1bU$%PHPk=uzebUVRSONHjGW~k0k7LUEpO5Jn zj_Fvc0;b{v=MA zhF(<+yhWf7Ix!AZcBNA>_C=TyhqY6&h|{RGlYz$aVlt^y#D@)kv3;}~z>Xh!J~l+n z=Pr0Lyt+J`o7p57k0NC8j=vVabnHn|#Xu=qzjQpB%4WBK%P7^(NOfj+wK$~3cWmS& z#jvG)(6?&T@pT2w_-lc2h2I4RA*t&ncunQwPf9NbeR_x&Ux?^sTS z+7XTubP3bkSra7JGa~o>f7WIm8NHWqPXYItK zYt-KBGgk|ZR<9e?D;u3Mz(kLG-Z|7Nj@IJ)E)mKM=C#!diw!xATZS_>GHgkMbOEAw zH4GxP6kr+RfLZ9)oYeiIm)MFUH#BnAZpCH=b9#kHMGP-sib;!B`5tVux>Umju9&Hd z-XUx_t*gpXOpsU{Fza=AzZP+#i>@_0GT!q>g!c018kO5>($?CX#K7v*{6pqC0fGR> z;5@tkbluNlI#^(>rWU_|U~*l83I!gwO|o_pH4kH0*{!5FtsHYz>-%HY|80EY{{4Cg zc=Ojf>8;r&Ri=i7+ShHGX^H6d?aVbC$t^C?4U(8{NAxjrCvrfNhTzK<)7lo)oE### zjitKDlD(~BK@$YU9xdPIrQ4auTH}A{owH;V%cCs73MX1R$#BxfAEjdhAx2VlSuE#@_GP7q{l`Hl^=sAeWQ)2(Q z#aH`{eWva`r>bEW$piN)CVBG%uk3@@E(bmn*+P{}owjq#bW}kb2NGL&lTHqYfFs0l zgL_oyE#(&k@|Go6doZJ98eOIWTqkE)fz1LS4{>0g@Q5peYGqsj+d zuBOGRvtwe}?lBH<$pb9|2rO?zYo=Cu+0j%bopcyo!NYeVC3D1wdSGovgxEY$p#5*W z5+-B>xBTBDIKlOXo|0ZJi%YbGt{|y1vu{*xuG#7hlakG_pS0Q@jAIlqFK%_7nC1-QhG}?{XdeHd!-u!<(VB|APTdsD$G;{ZZ%HNWA*sYF_8R zgiO9(-%6(u_v0JR%>k=T_vqM8(EC3(NFmeTyb=^Fw#|QdC1_Y4aY6)7N};kK1-3i| zA_m>B(hGMw6Vhkac7PxMJoys*G|BF(|6XD9R=8y4;DYo~AKT9VLBwDk3ooi?5GM8b zMdV4-y0aUnIl>l~sKP^Om850EZY^T$vCNoa9um%&Dk1u6KMhgwnb?yv{jgYpV_yt}|Dx?98IGk%d zXx*mYLN^$TY8SrQFn4`0E`Hsfi;D9+x+(tE0vw;Gc_5inr(D*1DIxTj!CHf_jf4>y z!7Vua%Yb&BQ7xTwSI{j59n-=9q+`}X}`B8GpeP5i@c zg~)0X*XK=GH-1Wx&-4G zSr$D~yu0W-JWr;LF%oktErP@;UQpKtW9L_F=p3ULYAQDl7crmw_;=XGe{dlGK18TxiJ+Fh% z4GpDLP8Hn1hYPSthE1!SNxw6E&?yRz^}1|y)j%jzEotaVesBLs^asO;;3EN&4o(us z@l|9DwX9CMjA@GZds_|$t713alRZ0(@LWuxp>B{9mJ8(!R4c*-Q~GY_>7!OTm}xBr z0mmN5%sDg?!;+A-*^>OJ^HZG{sl`XQ7&HdW^6ZG#oR^h74ewG4QI1dX3)5mh zGn8eos14?R=ndXG2Y`&aVE>=-gwoCUH}*>;0&#F6spdXNuHk^0-6M9X8*KVE=TQ1! zOy4@45dcw(PlK|J=Oezw9DImYlDb6?-;{x|w7@*$FtOJY@W?C}WWyYHh}Aa(h+Cyc zSQ7TI?R7_ZS~ZF5ob7NOQE9YIUEmCNL4-5JLy-Lg5{0>4ygnL5;_4w1Ps3Ukn?pQs zN=@|dHLXPT8XM6{8CA&#bZj0Z1L;c|Vyxyx1)9SO8H9N_04|$^DAn6-9@A;~&3ZQ@>(4@+c;e4WW9UXJ!Z+8dnv5|4VAw3RkvjX#9Ba1~-9M$g$ zD_&rKBDOaB$qeTo+NvH5$4%YZa4kCu9=^ z8;czkC!&!ymo0)poufd0tri5joeHfK$xD+CEM|dwakPl*w3)^QMm8kCY)394IPb30JEo{L03fWe7I&a0tV72m0-gG5g-^RKD!QP#=6>kyeZHDp6KTcn#3U~Wl>l$ z!+9pNJ4PbLA)%7|ud!x2!wYX7{V2VX+Ngb{UVt$x0ScEo+&T)Rm}I%&#t8&7w5Al^ z3c0eqk~b%emscr%a&Q~%-DPDEn;5%54s($7xVN`_m$ay>)TkyMry8F4!gc?*dWbsV zww~bB7?Bc>f8+RRvHPD@6c(}?deuHZhgjVijy zj$gEIVu$`P;WrGHJ0vlMPW{=$A&PmLI}RzQ+N~OxXq3aFOCpbB$_S>z>->J7Ab{Y0tpH`;RD>*!<1G zFX@>M;wata9J4Mg8w+TISbSz>F2CkB!;hGj&*v`q!G&+mYfOF-3|pYNRTEQ961g-# zm&F9tuv$xSdgGYc!+G2;RF5o#@K(MX?1Xi#!%(T^#V$9mk9_Xv@LQT(vZoD;ZE^~<_77-WTq0Q@1!-KKzr^sp(bzgVN(XvY2DEFF%ph zCUOtNAIWeD#EnSc{Y3_XIYX-R_u})UfO^FJc`QOR{k`qw2;$-9D^Ac4L` zTVzLrB$#XtH>4yQY^3gdcq(3i;bTu8VFh$Bya(G%EhWfE(T-&ic(DXQ5hk^z2+_3# zBD;-V8cMtphFpS!LIQ#*EP|6PLZ7(!uy%*$AB4UIL*59J9Px%hWJ2x#j^Lt}!eS6N zVR01U3BuutOOzpo;i;+N>CNGpOX1l!;kgtM`N9$ZQEf_%C~uCaSc=FB2&F9P3*A4=9rVEn6sN0iy?w@;n*v~SbF4nUeois zIreTT_TeTLg%YVzh_vU8!(tD`E(`aFi`z29Cb*5GijM+B;z^9+$-Lu_S>q{M;%S!S zk+Xd$Wdegp0u!YZGj7zlR{}DELoW^G`a6Q#x5dQZ!{Yb;D2zz^$g&+Nx*R6H{85@R zQC1{To;@b)$H%9`fi_M$w~3mRN!lVwx<*O*-bsdONyaTnU2nrp(*oQ4qnd7# ztc{Xwj{L2>lkHoQ9m8XIM9fi2V_%D;xQmc@Eg9Gtq=;YGcBBya+@|1R5E_ z)8Ophsq*p3!AYt6OL!5KX|%hk34c|a($a2{H*T;}m(#Lu({hJnS+1UWcER(!(@QC% zqtenVmeZ>!{o;S6;~yr~wR~7`=57r4|Ev_yGW?-oIirg*vqvPe&nR=i`@cnS*UgDR zr0P>55Kp75zF!$j%RW3;UNf&^0%o$_W6wLSQbPXwdH(;uq%G{9x50n13_moK{NLUN zNLH|6z5V*X@LsekO@HIP{+>N(5}`k9Zfth=OV)ZZ^3UwS;pts3iXoIJ=qVnj`B-x; zQqsnVzQHL{);5wV;IQF%!GAEBD`$Jn_1EmdSE&Fwd-%EJUiH6b5C6}0WV!MO+i2ut z#g||=hM45NE1VKTrgv5fpG+4dze=Dxq-H>ZG4bTjUddJnjRzZz3S9^VRTx6p8mz*S zyfh`p?sJtB!7xCPCGmJc(JB%#_9H*apnIS|bqj;tS{RQIiT9$G7>X0xxI1LBJNo-P zUpzaJWZ0y$mu%|6UL>Pzxi^t&o&3rs1TU+MB@I$kzn@OrQD&3jnoVh&^>QYhHA6#E zUp+NHfblRlkY({jPS~}#U4GQxvj-ksRX@F39RlHa8|6f~%Iki(5O(kNX6KZ$2 zf4@eKB2aQZC3ZeYwrRDIYOSpL5tv|%Bi{yG7k{w~`TB4r)+Sgf=@{yA?*-{`hrx_aH9yWq~3Co9RA^i7v5K%8{Q^KSO3&RM3~6szu27rj;G zANqOH?m~zpLmA@0*~dD5_;XL7nA|YEITbxaFWo9GjI-CS&*3*xuOGc#CVfh?Kfj?$ ziY6~pr27;q^HSrdTz;FW%kb=Hb-`QdlsmV|Q{^-Zg$?}<-ubh%K}j#2l*Dl?-6Eo3 zsLQY?;pgt>Vvjl;B-P)%_gXdV6_bNQjuOE!a^SrmA8-HOO>kia?W+g z?0o7>yua+6l=wqkOZ4T>*{2-U(g2c&fD-RTE5$oVDcK!!pE<5|vIkwC@UTUM-?!!= z#8pbMM06QvR80t~23ptm{#Q_DCK6nc!&Hc@bua@ew&)ZeK$VZK!A_D`{>2vLmb;^| zsTm3&ItFDK_Tz$nP)DpdYs>UMjt{V=#-XYbh-Hnjrpvvgu;CDbaLQ^y>3s)ZN_r*m zZE&)yBo1A0>^$Yw4~~2u9457)#UQ*;tK(IXDQ05>Q5WntBAZ4bLH^{#kneiFfIKCX z@HkxPCA1(?@oHB`&_|a$Hk)BrBf&8FF+|?wynC0CmNZYB?lf`r&oECqQ=*nR#`E+! zf|N0ch{jBCl3dw}>J!%gXWj?CmOd&>Bdzf;<@Yol5knQ-`B-=wbj)}sL zbVF2$BCCDt5?OsgW4d6m>-$?TEk<>;p%@j>$1+HY{P!{j{aVg%`Wz4mHg$6 zNbvtm4^;Fq2o+acu-dYP{VX9GY zr4Z|-P%1UdK%rxl^a`|_2J0?YC|(wdS+gWD-ors-w4AS$zM`MJ>ytq6EkriGl>-qd zn@Y&)U4~UNqGdX~ZnBAMb(OEyOVhPb#x-0aA!E2#;!-3rp(%9@E*4h8wi4Q2?7T}5 zo-*Wke)BtabYi4dim=k|naavc`gKF8TBW_g=*mLt^?%2EA!V%=c!Wb|*Ppwd&hbc7 zo4%=PY#vgpa!nas+ZSET9rCJjFHu=PHvZMRM2IU{CpK~Fx|p$XeBhJ&wqaD=!u!Qsu&@*Oj?Zx`&&ANk{?Hli6uJ$`xanh4uZ=Jm+a_zf>F50m@1<&0 zGk-H6?4?IsVeLJM6UYC$Ew#y=RJFFQ~msni~XE*U4(fd-DoRzu9 z{Z3@q?4d3-fGd(O<95tW-7UDcV*g27YSXw=OuaOZi-<^0C{aoM54Sg4FC;t%>QjH# z=Zc-I%DgL?3{h{$&k@{unt@5){9=TOwj)bcC%wu4OGB}Vn>L}6;NaOIN31}{(P5kq zw3X|pn`rUzVT}*qn#%IYMD3gL>hFc-iN>k`rL`IP(&@G)!pAw^K8LCK9r*dQY zeEj_r(WE1ijE5h{%+d+L+XsIN5>6tc6r!S`77r073#VRF?^9S z5XboSG)`L~Gl)&WiTSX4v#G2~+B^YC>O3ki;NW?6D_0N_AWl=9jI-Tvx+)4MAyC!E z?0$r01hjWef9sM3C?y^Y!qi5Yhv=Kkhgcah=JBm|HYUufis9{qGYGfE8o@-r1v-6O z^FkUK1+=X5JC}pa!?T+o1*G5vSL}X-rcFF0;smndVQ`ZFHIRUX8M(rbhUS?-T6c-O z32jQZLXc7mz|ZdW0Fu<1Y!~N`84vVC&{iH=dU09UZ6jkoibN^l?VDIB2C~9}D8v%u zZk+7?9w_b!OByV}g7%2X`xzCR?cruYSXR zRbEdiNS!0SLa2-3i(b1WFPa1NDUjEb>h{?pfSXCyWzc2pJ6!hWU^lX)%Skp6+@w$X zv#`u}sUL|Z5SjjyKa-?piQd&MbC7vV3yhA=Ni)uTtFdNhGP+GQJSgXmD1>T)J-JZdxNq@HmoFl6 zGpbrP$F7I%(B9lnLJg)I++>!kI;y&D@R{0( zWY|8=I@)5Q?ql+LoO=kkN?{c-tJiY);It2If%3buXn0{j)TY5q zZCTU{X&B|)3nSGYW^g_{h*4zWhw34~<6Wex8DJ6rWibsO(#M3yxg~AdELS}gCjOM; zqZGo@3rr2_3&RrG#5ZatKE&Pi&f!y!DOP-%rg;&e7lljqIZQsu`9HD5?5-?|=F4M= zF*u|QEf>+wQ3W*XUR@lgrO~R6ijz;YLD$|pvELaK>9LiDWO%CM!c+?x$cKj{>FVO+ zqL>)z*@u;lFB3M03Rxb7E2;TFbXIGyP;ye~oZSJ|g0TV_@gt>Y54~1Q-FbkgSDg3K zWpeXa5wdBgVlH`<(&hf_(O*rwWB$}3l48D;;W1Mdfz)wF7XE_aFE%S9r+xbe<(;c4G6Y{k}bH9XH;px2HpGOo7>2}p#s;`X;O zeVQ^gz3bp49NN8Hyb&%3M~*yTzEF`v5pdRg{PB}Dn<5ks9G%}+fQ`zoB)>zp1 z{_(DlfBGxt`*NA2hb9t-rTl`3wPLd-Os&F_d~|6*^tv`q&k;A`0vF#-8lCfe@X4Kh z^n}kswfoN#+aJe9fnoX$I9s3WWK0&P>&Sdc-g3XPdS@Jn*i33#@Zxq9%UJYd+WFk| zKKHrKJClvGw~bR>l`f~oQTt?aEk&60?r!+TyONWwQ*601rPHCFB!whxah$470rjE5 z`|XSYId`Bs^Qbw7#~tqoi8x*a{9gI><>o(0onJ_Su$KtbKo3R6$EWK!fjjvdevfau zK_I-~t9JJdf0PRO9gFyn4a<-wp7QJSPYh&K1?$Az7GI8F7VqWV-YEb@C*5Xf1X71=5%`S_O>9HB#qM8BHa*2=onSAbMH3Lto z0LeU4S+i|oMUk$E&4pf$&W^5vNcRheXB|VT6o&XUaJ)S^$?Q2lX!^$y!1I5;T#mx)4sf`XBk{ zxg=kCduj1%gMXa%;0|JqkRH2*b2cNXyN6@8GlZ?V{^-~_&|kDXT31u-Ve0~0qCOF4 znOBB8`wNPwBWC;=+FW@gnyeZ=C|hWzMDSTgqd&4;d71QFFu{eT4XI?!x4G^E1nQ|1 z;AIrhljfZ_vb6^GV<t}K>yS_RpsTMh-7C29hOjsM-A4Fb2 z+@=|@8RwLR$uE7#w6n{!>CB{t16uG`zah~Oup`C048RT0GAa#Hj8`t03pxbD#RWp1 zG{dECf@D&IjF+@*mqMJpLIQUc6)j!SVNTSjOw&cIKNkYfEl>yf9)s-&Q#M1<^Pok5 zTS}Z5Op*Kp&bw8Fi%^mP5IIDiCFlSZAhIQug=xWU(LmF+guX*SGP+R2Ga(EMk)oSG zY>N*Ve0&Lf${s@yD6v646L2U1C<-g9&OB3OleRBk$3?n~7q2JBpA8dZVa-(0oMZ|a=|IXq=@-wR05Mo((7+MH$ zegn86(D~R}NI!U~m-V^W!W_4?fh|k!j9OAfqtMmDL?vBYWX#v33$A4ma}7|}H&WLg z0;oto5?CZD+o^K|sCOjl{y>^mbe(ZrUUSArWAdRA*#cYWXjGeMQYbj+TGV-3a$Y(i zDU5)OO*Gb4gpm^Yt!64widYUH!S*w07o5~2PgH=FX2NH0tK|GcI_-)#%>%}iWkIAH zNUbo(C0z#W8m4z%MXRGFHD5WwE)pnTqM`}VqOe(Gp`vyO0GM_tXsBo#hXDH&)yOue z?20NH#x!_|YcG;+UCP2$=2+;>cU~9!y)CiU3`rK+-n z+6bWP!^N_d++Yo)q=8vS%zrO~hoNAoKoa5{4Wm1o3Y7^@H}6#*|4~!XI3@Y_GT<Vo-DLq7lv-sFQs9N1JlJ)Ig2WKRNVeUcGD1&&TrXJ$~Y%GISg z06CG8i#9x~gz#jG5|5M1quc z+8o!;2oS}KgDM7g_OL3lAgb^Izlb27Hzvubt$qS|+`-6uv?<{}U5R^wEH+rBOC(i|U?TM+#`vgOgZ&+?Bl5n8r8vry+YV2exI9wV@Q9Q^AU!T*$lU9c4k2a2GO$`S)n+4;Oa!+H3iIwyy09b-OKJy_^o zool;0Du&cWGbmmxr@LulmHE6^jT(|qOCA@5FaWpg;4Nizm|s@lyF#Zjh+BvyUpRa* z%Wq#w7Q@Br^pMT_CdTz>`15rei~7@7>8qV?XziRo6H+<5a2$b9WeSIkuFf{fyLUie z1{hD)6$jNDBY@WL2r?R94`1>kL=^{R>YV;ABb9LnZ&Go5^ zv&BwSRbzq0yYkaf zbDFUy4LIv6RD7vTQZyvpNc#I#c2gD!dUys48(^&7PhXwr5QD1!Y$j>csaEVX?)PX(w*?9HzzWDSQEs zua{D7=3C<=KAB;gGk*1UgQK_uUTx9JQ{|LjxP-@-q2c43XT3DeX@<4sAH3c^qAd--U&@wPDvMsq zBM~h)Ev!6Uf=+YPjV~^)tzv_h2~pRQXwBkI0TX+VMXr_3(`6j36^gC3H15LH#K3Cq zH)iEroQ1OJ@pPddO%D-U>%gvm>gn>9#LzmS;o*CLl0+ggYs0552;>18Wc>vK8jn{odeICQi6`0Zv5ljy3nHg}S;zwXFOuh&E`3Ay+9>;r=r&h~qz4fRped*{3SIvY&ib9orlMY4b;iGQYe~!O>{p7bx;(bprpuoj zaE=1kwJld`%e6tz!eETCs5nXOEcGrOo4noMK0wgs{I`E{D0xc0hB89 zh(&4Qj3GY0sHZCaBioOGRj~h&pOBBLDEB>Qas=Eb0w?di=Zk{XMU+w-BOQ&nq=4X-IB+2%iY9Y`eo?=PpGpaP zj^5pa1@3E>?ITG9^kVWUB`TY?NIrpiI(E*PWa;?odCK^dhYPZaV7%~=UbKK8HbmgS zl%ENmfS%AN701cm9!=+r?I7K5*;19h#4?$`pD+Fsm^Anq*rl$nNDqNrJlul`I)L1g6U z>=2pvToy!BhxbB!2eaQhQF$I%uJqPpAK1GcswN*W0Fv^j=Nmz}nFOhGh)6Vnb8KvDP3x<$UEPJ&h1%|EY zXUrR!CBkPraaP!_a7SlaIk&SZt&qDbo0n-8vd2k>DJ8jnfttjom2p>-pB5oji3oAZ ztJiCcaN4!|$+fP=L(~1pclb2T+7@ndq+DLxc|nz8<+mvgw=&C^+( zH{BN$(yA(7u_>$GLMu4(J@0wM+{HkotM29SFDky#ifVJNIs$lAAf)_cY&3j0jO({; zc0kzLrE1a#fkXMIC9cCVtQ5#4{ktadUg!bM2ryo#2zy$5&!ilwAuaKx6T33!Oxptz*kGW>P9F6i~e*9yluyp*_*TLr3c2g>^_3&u; zP#17{-kj*&SX5(}ADTd6HsPD)sao^TBgGVyE#dp!OIAq`mRsw@Jd9#e(BjI5rnkemA(@c;YznjyvB7P zTF@;ZGXLtqD4AWLHrm*}sFW^@k77BF*DUR_HV?}2#5gZZlusKygDmoQ>stNv!wrL7 zV74uJv)jjO(MY>%C6cIz0lVISIh(Q*D|GTqw$b6hGPm@Fw?mtitnl*X{7Y|EMgii% z*Ia`cfsA^lJa}*2rflnSVfl>4nby&AuBct@LP8I$Z9J2cOTR=jj+a* z-i07glnn9mfFp^*cLJ}F#Wys`@UZW%tX;#u`EEZ6m&TVypNU6cv2H)k-X)~@+(n~O zwJ%+!1;Cq!pZ($G=kg&?c@}95dj_Qd;|`1oC%PIEcJg=TZ}tYJ5UUWq_v#yR46;rzGW?*2KQ?w}28_UP2w7^D~y!nTjoMSL__9#91l#431>5JM)xQUJ;G(?>Pa+#QT zr76YCC$v5$_rV__EL6plU1Hi$uzA;UhF&lb$8zuN8G0ZnRRzf0pfgO?Jf}he<_Wy% z=(WtmVz;sSmOr8vuPjfSy@xo;XQNK8^7%%G0Pr^(mpAOas~SH1Ol;g$cRvlQ9+-YSGT_^Kqw53n-AVH_L{}&|7MU>lf#-zbsQV zR{#h&n7E+P_!0tj(|((}7PMw%lvUO<&xrgRE>3QA!t#q3N~%_LN#RG2 zcX+v5qVt^kaQHrQK=zgt{y*N{!Y}IeTiB){LXXE=bZO_|Ap`8zSnoHb+2_@FQd+4YFO4(qOczX z$rHyLI=#9eV@k-3fJT<-5@#&4Y2-#8)&Lv7%C3*=Qm-MWOu0|!$n&C$&j~zw@oe-7 z9Har~dyH1&SHe+A#ty3FowXYCQ6XjblN(C<(tr>#oQzhZvwTv$X4QFO)lC5 zqgB1dQ@-c28T%%#7~H@x%Fb`wGh-U{8qBj)%7r`$_1~m^xftpXI*Bw|yy%9{R7ztA z_d;(jsF4C@N>$v1R)Fz7+Aa0$fHwuGbj($p*-OXV9{Wt+m~ z6j)KqN8W!;2~G)l>G(sD&M7#7oxm#NeMGJR(+>hWA72^>C&&*2y!+}tYyu67Pl?Gd z`N79+CR&tINVmVu2q(7XOXNLU$wq4w)69vGLu%xO=3QyRWhQq)&wPSh>udnpoNj5; z!(~f5X-m=hAs?-@Y2yUoo(PloCi!EYBvVz1w!(^s(K%QTdykxD-$RQ%it2N0q*SkG zd`dIRoMNr{KQ2oI)MP2qckMz-4QcmWBfVGYN9E|nIIrRGlK(t4(augC7|2*^x{43j7`k!L1R@?lvR$nnh6Id7aTdpdR18?xrX2dW~T z?>i*~+I;!uVzLVQ4;u_JL%CBWC~UR$GzadIB$=gkOVn zrr0hs`QY?eq+lVc6BXaHLy(9E`k{sUy^^4@x3pNEp@1$;L&dj{r^F}3*Y)kg^4TjE zDnLvRt4eg~A3ePb-l6qB*8tE;tFte$S_ZA!tbQt_@0+8|J`CP}kHkjLUG1JSWKd`R zadb5X^D?A7S2OrQgoN-GNwhHvSN8Z1DKf3iq2w5Lo}D)TvhFHv{~L3%V)$o!<+(@E zKkt7fJH~heao}yG`}stQ1)ZMdOO-8Znyqo<5aejb{N42oRoe{Y=txnE`M{8=u^Z6+?=#U4kP=>lY1thSIe)DOtF=OeVv+kKHIn50|COnuk0C7nNlS1iSVUqh-XC4U~bBhXG7nM3iu1D^^7^z_Wao zS~5r`5~d4}Y{fB8KeX#UE9RK*%kesZgj`fQUBqN1w&>u12{IO*Rpmu_dti_pWDrYx z3m|e9#jzbJpgU;7itef;qIZlzi55%jn`ML~k5oYP(-C`UR1UKpOE8JtwLVq#4c?yH zP(H6H7HxW9Ysc5#winBT!R14+3^^p);h!soR;USZw>&7Blo64bsyK~gD{3obn8c6Z z2OB!A4n$0j6lsj&>9$-N84l^2G~WnXcX7qqOKMoFBubzBw<|$&21V^Fg_dNXk1@XP zKDH?bc+5cFFD9KI4G+^U!YzhM^}5+fsTbOm5dg#XA|h~ot^|)>P1Nl#F5}BXM#cQ_3C9=- zKCmpqE5(XLCT&Z}T(Of5ON8qu7f+MH@XETv{Or>RP9@(kSLHa!Zhb*k2vT|b-Ne}ywAHr9+lVMP-HF2s&w30~NDLOYS zzS&yB5CA<2L-JBfpk1q6aOtypDcO*2+ItZuW_2;wFpEW=uWn?1W9q?X+!*)xlGsDd z5~spgLakiUZ4+@Z33J2lX@mq#2eQXEu66w`-0BItiRKtlar43M-p*=m%}{@xR_SM^1Sew-pYUpoJL z7PO)xQ@+~k@3Wu?uQiG?j7*qrTfEih^tadg4%Nhl!tm}Fs_9J=s+wyIy=oqA`k)$# zqh^Dl&n2}L)PE)*bu^-3Z{CVi?8Es{5_y;ju+%kJwjeo89N#n%fMSjHwm0OHE*>Fj zpD>2?)6So@8IXEZOlgj$AJjz)9JwiB_85Qx>i&Uf_&2{OhIp=b#KVGs&zRe!C^%Tg zh4agD*ITDwrBqk9!UFGE(aZ#rXwho2!mGk(7>jmvrviWqfDOR2cdxYoWK*F9(nOER zv~9T&uImT}Y%ghPs^PaEm1!CnEF!sw7Z;2vz052X?|VfQ0_cj#v_<*4Shf=6NJNOW zE6*@uZ9@={4C@qjY1{2ogDFpa=~I3mJyEl;tLbEPDET8T`L?3nEC&l^n>54# z39}C86av-6@GkPt0g}H^P5)tlBn4yWF#^>j`o4rRQWnUc6~^}J$s7RfOL=+e7rhF2 z&MSo1+6zAPN~r!1uQi)x)aqx7lmt{(AE4)yiPbbGHxKD7vF?k_O6@MTANvni#z3`+M!{@7rmo3|AU+Dlhe>Y+3yNAyCOx86ul`Kiv?rSvJ?8SlfF#|KNYx%6k< zAM@@p_c5g!Vx$wL1Q3wsL zd7&^1OO?|Ql@(z@(Y{tsvZu0es6ii2)DBU0ojJOA#!GB^c}RSdChf{%7(blNHulbI zor<$5m@qoXM4}a`X(ZHssU~+tK1d#qr*ojpm1We)_+6@&#ZHQ9pM!R9!Mmc% zfmbh3Dm8qL32YMXa8X%8Z(H7mF<5d~m|zPdwaYr36_UOs3%`jOFY_HtW%ainf0DYn z&@8&GizSw0PWrX7kN3Pj%l)a`sv9O6xfN*#lA>0kd!(4bnB@u!<~;_#WbLCql@v}3 zi%<(ZzQK5!^j4S@5{S15?n(06yAHz+u@Co7^aTIOF{dVtj#03`Omh$tzCCq+_#%QW zHPjkH-t8Vf$z5nF(*_&i(u!hteMa30vpt*;H}ETU9@gXS|cDkEPRgD ze!Kl-*W?@3gW1ppsuH60&;4B3v*@F(bo}cq(geOJAKyQJpL!zyP@hpdP6k#APzSoY zqi=F}Vhs_`NlZ(vu>m2Aw*A891CAE5vWL7o_~HgKU6MN38@FiE*^v*O$hC}%T0=nI zt|&e^K;FO%WJ)Q!TCGFG?jeUcmcJ62m3A95G3h2|`Z}~hMF&QO8j5FPHVA%8oTX9R zO96jwpgHK5&2>Wqw`7GRXou2$6kGp4Wuy~V#fEA?EN5&gZ`n+NqnvLqzm(Pe55*GQMU~y>d9_P=#eeY{@ zuqdd0PT<}2_^ojLvue0o@- z2Xgn32z+{9_cO)tmp{BsxKI#H{}v{8^MOXj4ZvBcdyjB%0H>kKEMP0a-sfhEhCl=X zgLhAGVX#Vq$KghZc6G-X%1+|ALFMXx5X9hw?YxT{Whr|B9z4L~oiK?=r;_tb!7Fwt zHOwA9D8dh3_ot7EZhu>*{{5B4i@<*RSu||z>>~XS0r*(Y7vU{!^$QPa7bPPPSIw#G zr3O)OeyrLzTa}swsWjYsAJ29w$?#Z8WvwWabe%ld0uyM(FSsO{;yRgr9EU+c!aUZ@ z+~YWI)P0iC)49txeKn~QKs#dj^xQzpaKCE^p_@lst**!7_w z{KxvYZn!}q?0GroOGgalpNg9`ZD_~@j3i1IGEw=OLr4{~C7H#?DF*fdh>Wx;&O^aPWHKKCaqm1Noy`6Cknvkb`3^qE zHSmeKH-vLH@-7R5HWYwI2BEhYF0c6#P{^Nyp$S(YA#d$?5s&yw9~Q(e*)CrqStcVm zGZChp7Zn>_prmP@ze@@JKdx5pvqb zWc~U$kw5mt3{w<*Q4W$U@lEtesIJn2MKb7! zGOW#`VVN0GZ5c7F-sp*;vE)=?NDJBr|GHz0V3% zl8}X2=tgOo1>RE0%+L@^%qjw=vby1biewLy;wX->SVstJd#t2Wr zQjjsA+O`r&AH^h=912e^F-VU47$KelYm+f6oe|8DJ1N4OlxIXh8{~PEZh7m3-zB}x>PJXLd6mlyfH)c$^8zBBWbl?%l-y3@pZ%mgW4yLZeI%nQRtWz+OR?1mqGg?fd=D zN&s%9*vO@T`qD!(NIep`EUY+;4cv3ZTw|6U4yQ1@5dtbMm($M{Cq1r6dmLkp%`D|m z;muQ&eqE8zreE--py)X$`*Fns29~@m#!8B0y(5C!$FCkjIm+0W2V5%$Xez@k%2I-H z;X$|)KyWeyIKY+?8O2PgQ)$$PhL%_rE!%uD)~TF`wpPtag3-HPZo@D{i@1@+T0P$7%1~nTgo#7H;#wtzTt~xDkBZy`(rT18uTNVCFC2kZSXuY-OC0O* z;X$?YGEG*;4Tkkiz{JLQftpNg7T^yc#R`joSVjsq^Nj<$B|B^NtMJdsples4W(T1& ze~f`!1CDw9Lu6d_KCG(zN)Xgf0h!zpht%h5OZ41p1}z@(Y+`F*4SHhJ-ZHRuo#?q^ zYhYoOqMXgK<{M{joEXti-CHH-F@*-97sfm%fB@!B2RY@w|PZc^4Y z+c-NdXYp$WcyO1c7T)^~V(-3A_x{QqKkx?}+6VOAj3{jCIHW-;OdojU;(zUr3Z>R65CTCl^Xf? z36L2@x}jFToz_6AFJ_oGP+E=rwih404;cvJ9=igD)M23&;8Q*YIVqB>RDp%WL86p= z=}JJr(EvsPk_HFmw;3SaSQLKWQ28u?zcVFt5%?lP$XAWw;uGW@J9s_6TH+YZpJy1X zH5?6hYqZ`-L)$0|)0Q$=B6>a!GPyB`5l>Rnj+-TE5WWFMRgqnn|SJtcoxi}^QgFCT7jjbFiJ09}V6%A2&6HwICYv4uFa>{Bs2lMuHzb1_o}?voN5 zo%+W#xN1|o9Kb`hshRz;7s1eL~GaZqvy3CyzS8+A2W$YM`I86S-6C_fEoPL15esaY!X;Tr>q0JahH=@(8}y#Sgzm9OW&eI?bMhBW?Amd5qSf_=Uy@hg4`XcBOW+Fy_`*J^MS$}gmF?a!W78_K!96=X6#q+*( z6(xjjMXpeVuxq)mZ^ad5;9lQYq#Kr-18_=$iWYH1kXJ|XXvYMw@htE(;JF`M#vZ_O zyIt-tcqpfQXaPK}c>28wvs1L@~Gby}&`u?k`giO~=OAg8S2g3G; zbP324vYZu(2a9z`IPsj|THr>WSS?s`LjsDE{A2w-6o)cy1MJ*w;Pf$)ckQa4abDup z?qtSy&P`bVyLFloQP4Ua?bgez&4-EjrM_&kuL$Q|v&75^O&hj2sF*Q5c#YYJ6b}i% z9Dw*uD@uQ?CBN>ss>j>=KxEHIoB3{AoQFa-CrK{cX`b|h0^+B`=dX$%+y6B+CUaXF zS@S7Ad+svvy-R|J#vallfD#^ndqN;?-;%f+cjVAV8Q*&raiOUq5gPEN5p>#V*=|YO zTd@6eM*P*!vW1`bWcHMzK4f(7tq>$QDe$tO#w*i(#Cp z+idMz2ZKK}cQDuIu?XI#9Mdo6Z+vx?`I0O7%EV#?jKa_%x$lh3z-&s_RI@)rb-=rU zcS{)(j6yzgpLwi?eMNH1=$OLhXn*eZiDM>P{2@4fGY?w0N9Xy~#O+XN`9Sn|_gd>P zNS-Ap>0nDePsY#Nlp3HnlFJeA-X~yf%JL{ro)fS{ z(}YPgLC6G~InMiVMnisgotOOo2lh0t3QG%q0_pn7!Ret3Q`r~jHAcmo?0LUZWO z#xDgNyEGAa0KBrzp5ew0)x(VxI1{Aim3RQGd}P#8heMGb*o}U|(X%8t9Z&x91b&1y zQk|tAPs0?5m4J!Y*n5n_a~f)sLm7exUq7e#Wb{zuMEVJk)CJfrf<4lC-u3>%F_06U zf0mXS=|An*d43Vuj-%^x>HP$FC3F$u0u*<-Am6}lnYko{ryW6n|6E|lMQptt|K57L zVYbNc3jzGO^#*@qZ1LHJmL}rP+h^xW^*6ZHAAI?pVIY^~Eo%6&4ru~=%~68#9M-?Q zeMP)DbU%G}o+Lug!KTJ{TW`Ocmh9uyHdJBvh2PQO*ACqtn6onT|54VEKlp z{AxWo7z0#3r^CT%kOaL~I+`1S65Ed%%{Y5D&57cxQ=qUznOYPjKIQ!+e$y9qJ3)?# z$tp2-si@dqs)6W{yuU!?c8WMcCMt2rvOS%qshw#eVityFqhOI{zZ-{@TVaz0FSobJ zW^40h%Jfig-c?*5ZN-xjquMjb3)&si%n!Da`&LjW4QeGwG;(fs$qZw+ zG;UtmQPdu8-tIh`T6t7X@vgF1`FL)ZEBy@y$5AiZowrZ7EBdH^Emt5T99Qw_+dK>> z%i|#uqoR5NGI+@G2n{>h$tbD5+Q}FR{rSK+hftHwW4wZ!dIescr|x5q-{qVr3JW#W z4+9JvHK(b*#<(jmL{py3@Xh;s%E)2jHOVUQHJw?#zDa%!@p<->z|_$8;Jb>Y$M*Ln z)OWlE5E>-GJ{f)rn4l?O^5=IMPimOg2k#Jg_4kj~r@7urUYIrBAHCV-ELWw-^RyQO zWx0H}gP0`~w$kZqX4bHFB-$1u2;#gyXW5zx?-g1~0tMh1>jO>q8cH~oEO*&zWL|Ft zR1bby3m_-##C(lI)aU4(FhL-pf2 zwo-cO*|@)_R{qYuOi#UVm^`p^ia?F17jtO{S3PJ+3T2cOla4{w&3uAj)Po)x!R>$V z3W_z~BGcnJ`rsof3>{7O&UTD0JIl%S&kFB@FLhkSskl>+G5yisjuweTiTW_C~6a^`YoE6yXp_UT_7|Gjc1f7!)xn z*H1(7e{3`AvnJo#Taik@CJAW9R7N`SSY{e}rMuI|W{TYyx{N2wy{;xgxEs?v1 zdM?={i$Zln(S3P47MMSiY-Y)5OVb3`Sb3B+%C7}>;mHbh@A3J( zYa(TQkG??3+5U8F^g_1T5|!qS*wE(~S$c-ZuEting{@~&-}wo&D#st4YQC!a0f>8hmLY~K95Y&afe z9jTgON$raz;HU<_oH6%{jvf#75% z2hWY@R&G>=yI&x4Ym{Qp#C|8WM|lt6zpYF!ks4 z#Q@E&iMc)nVu9U2Xljt-g+@*)1@E9ahoCdih;9@Ci* zO?S7zJ~eKee7C@ENUs{;o?PU=jYUmPfyv}dR$K+{)XbcaUmHpft;FCigDF^YHL!R3 zNqAl^!r#ycV&;eq?5>X)=4LStxN$kQw9nVXILlwl$WDrjfAAu&ATSG=r% z*Yly8(set8?fUjjFZu50)|($R1o}Za1wJb5Aq=xuzAGbH!=eXT2wjF^$g8syrlGS7^=_pkKe&XG`?74nJK&)!S>tQP_8$ zz9#raanZi=lXoi&r}JA)V%X`=Z}Ns>>xLd@)C9MJHA@|yxzv?nNI)g*<%2Izr0m}G+>SV7lP{Ttb3fA zqrovr8PM>Rg&2Chf{Zo@0u-qaJ_VU*JtOkDgIiIwLiIpU%FpCuX_N@WRbD;1;xRT$ zxf=#FSYIxQ#G zj<25|zW3?0*0L}N_wot%$q0WQVW?zqf4UJbbuN4oA|pb^4Pp!nLp08w zokBw6mAFN~VaYy`8Kd;U8Ie63wBBYgL)yq3;d}YQzr1~a!mVm9qw4P9Rw1s!!e_68 zGLwOl2BNTYEQwYToMWukQ30&k=pl$u##S_DB8lN^si{#R8Yn5_Ma-Zb(0(?$Edn?_ z3c-cNa4`ViUJ}SMc&*yS<`fZsv-X1@MXzLlrWQjMTI2Y5<9+#JHzSBWQRBN?d1pN)wij2g87N#A+u9PO z7r!mkvtEWt?XMlDLQN;~oZ83^R$4v2u1$8deEazCv)RLI?C)O}4TC49x;ifYM74Ha zoqnFLd@|kL_2c4bYvQFwPxrq?wE~#R*Mo5dKd*-X6<9VNm)y`KJR`I*Sm1&ipJ-rH zgc+m@(52aJMzWNaZ$@!6f8LDd9{#teRzx;Sg1|8;F;#3QsR{0FCu=GoY)Q6D3OlI= zHWha`roEkXvoO}(I~>z)rd?^pf5LE3Z^8?I@t;1y|F%%?mHx_R^LcmTaSGBLzEqT# z{zA2WK|H|^r?GvlYWm{|{?(rrY7F-MzuS@ozwS4BF`*wc^`yxjcpu&*AG}`m`nR^E z!;YijJ6lpI%)ILo?BLXWbN=;P4-)2|*({M$I0Dt`(&jW!bbxa_2vv^Bu_LmrI{uAn zW#7S;pnalXk@C;N3y3JZ4*t)h>S|UI2BcTXQTmfA{1!bRc9QMzn`m6Bz^QgAVT+$ABT?c@J0Izb?0Wuv3+Ew0xC@kK6Bf)B)*X z-Wb6in;mVZpJs}F3DZ>q-#0pbL>yH)*LB3S2&t5t|7GHCmmkN-zd5Q>KPL{+?x@1; zgj!G(D%g53GTk6eFuqLr8mu7GcEcBB5-}4>K{Z$qdM`LbJ3MwwapQk7$OouOzaQ!7{*D2$dGRBHQ_i_zFs$J}>W9DVX?_a9;}(Uh#P zTQb|<tiE+*lht|-roN-axI`*l>|Dl05wV=6l6&98JF zYdYQK9cz1?Upv-uEH&cP)8j?&H>j{q>^I7b;2_9hdX5LL7i}sJn*VWBots3qS9J6zkX7CaJ~{>je60? zXp8-U9Tl1HLR&xz9)2O!z8_1}JEC&Y!u1>{KzF76eod=ZCC}l#&G>tazAjJ#nCgy{ zeBS+?rRSE*JMGp}SDMB1UOt-k;@yi$2TN&8VKcT54Uth=ncj2vO|M`U`DMBKC<@jb+op&iu3ftT)77}+ex+gFtm7EFVm+k! z#T`2ZCJ2Q%Q1Qt5~aHK=i6#@HJrK1}yWEOowgv?X+UYTijzvt(NO zA0vE(yps{)3^_DE6opfLt6a3La=v&*K*$V**IH* zo%;Vef@-k_DP__N>)EtfxJz-&qT7|+ScXAViS8n3gO;WUTFI{nx)TTSP_d?QPzS+w zvj3q*WYO}bq_E13`o&&UVB33osOzv-lEHheb@#KkFG)rKo63vR5a99h(kM2)v!=TU zng##$vsYPR9$QjLMsI(Wf{38*p^kNf&fgvDIj$Nh8tCpLBB;t;1eI4-{dW=cuOe?NYAc_h@iiI_TtNV z%WHebkP_Gxfy)Y5+`V-LsnfmnrrW>9m3Kkhuu>4yaTf|7%<*WQnYlS_S|nyTo0(qb zD;rgMQfWWGIEN$9e8?cHA*A!f5l?i?O5$K1*)N%U(Ue}bxyK@1!f6@vWp(pQa~M%s z-_sr^?>GlFlZy}j7jTJmk$?;AODShe=gW<0`*z&T9sH@wtpuqu^=-238;#kS0^S6+ z6c_YK&n$R|>L-KDsuPcbt$vX`{e#$cNRg1l-@HBQe4uOQ66=m9+TbV}%U0u7 z)1gPHmKhqJMQ`wD7gpe^nZpfFuMm$0jK!ZEMJJ+^xZ%$TD(n0#mY=Jt0N;Cbfa>}v z9D-X2goi5)(oukfEQJff>43&X#Z%O49w2%1Dfs4tG z{Qyc*=GtMD9z__)_HtAxItZ^yp^XEpylIwJ(ygVfAl{xbVgGz~l5VN!SOvsKG%=Pf zwMdmyNz)}*w^RnLl#Mt-zIuG_<*n5#dMv=-iF({ft|(pqXNp@_FcAKa6gOk`@8XRA zfxDJ%*vX*L;`MJhZu_-R+Qwp|)xaGb_rI>j{z`GhXCKib;JAUFWxwARey6xPm4}a= z5dpgH{|?8!eT4c~iu=9fw83#Y;9u34sYmF^U)31n!9nnUuNs39MLmK+Goiql+q8&lwF#99{-6;EA zIVCSy%}m?oJ)n0^8>_9{UXaMAT>O$#0tuh<3Qf_sHv@0zail!eJ~OCyCT()RV-iPMK53v3`v{X?u{ch+q7vd6nvn zvsKzlY=(=Kj zN$=dXLf>who1|QlKFsO6bg3T_c}OU~ZOObj$3sW^`<0YLT*> zo#Rav^JSX9A(#J)2FYJn^6t5B;*MAS%Vl$?lYV%|t1g#qXTO*>`La-V(Gd5rquF=? zzQ43KDdyB}arzvGTD`ONcxyD7{mE44zp73|gXE8@)4RJQ008ei>FT@+OusD=o?a7+ zKmTtwNS4#pVMKa%8==HYTa%C(;2ARc>aV38@NdCx~{?Q=Gy@g}2mxoVX+h;X9vmvhJ`IoP?z5i;E zkfij3Zy74frMQIec-8;D>im^69p34r|7?)_&1LhC2FZWSnf|Cc|GbjT5?H*dt+#wT zQbnG2nWKj(!tv~IB357#eK^C3bl;&XXgdhRw-CpX%nbQdy{vv0{H@C34GKSa;I zRXdHFVT?VFC$msX6nOvQvvIK3lf*E|X=4m)pzvPPPkAS3ScQ$04=c z=N=zsrNzg+J#FE5_X~qb@i*=zfC3KIj4-&Wx55-nA0)$Z=|&=xY-_G|bG#3)KK-GS zzH`}NHpGg`{IiXNf@tI1{Jv04%yoahpC=SZ1mpeZZ5(>)LbVF_Uvj9w+Bjjba-G7S zJf=XD`zlR;Ed9tYtLJORo(7%#>;3%I%>5Zptog{_OFv`ozyER83SC(5zs|Y4-7Wp3 z+X28RvNwd3GIATe=wf74$MG;T7z1T=#ErqA)I7$s?~Ow;?Zud=ig=1swo}9SyM* zJte&`rwOOy50Hc^}m|?50=L4yw z-oCY#hTP~BO0(Z=17CCmgsXkkLU7ZZ$HR)goP z1Tq6SE0*>q^9;>E$#mP5dO&j(9|DK40P$IK&Vpqys9+)C7@?U7q2f35<Hh~;H_wXm@a9Z6@ z{+P!q)Cz;FZ?~o1adiUy;A*L}ZD0#D9?$dL%Hv_WgUTguaHim5Z|~La3Lwx#(ZuX0 z_WN4M&nRQ^_VfoIxbBpOKOCMc z)QkevVUY&c4sz(jj8c3yU4;%WtKC~(uWh4CcTzQb|B!gQAzJU0q<<=Rc=`DVfh5|Q zB&JIILdvOrZCcpFC6?nba@cY}xD)HGP{j<(m&xq;si{hc=OTXG_{-0Z_{W{jC_eak z_Ez8J=l4b1+MnmE-rs&+tcO3iy_^iEPq+fRof32cN>WL#gxj8^$)8j{()wvR8{e}> zbTAEjE_&d#RN#Eq!Tt6kMA;A{ED-h)uzuMTT1d zIDUkGCT&AYbra67FxpSzwHrvrlZ(Nc#Nq>;2^D^0?m1`<99~zTJvy1egFh=rOynen zGVKFitcM2CZ*Ci5u`0-In*muV&~#>8`=!duf$R#OHI=W!iE?}8!ytAJ(@(c$rqR4%R?EyH^&N$i*b6dtfrAS(?Ta zbq;u<>f_yQ%upTuPW<3>#h(Mj>NM|UQVbKOW0a%mM2$%)eSr?x#i~_k>B*GV2@ciq z>FL^|1o`zi&Lna=-Qtm)QoQ`<6}-8`U_h!$)364o71o+-LWGPpoJLSQN(R4Qm#33e z(fJ`-tU82IVQmjh(X>zt-#wI7zF5<-f1c?ODSQvf5P!;$A(YfaSr-Fq!lhq}W+z7p zL1V!4TMY)uh-lH_X|voyxA3{x207Wl;|x5Fw57Pl(Sn2BIf5QQtc`(|d@X=jSQ9;Y z?5N08pGb+XHm&-LFUt8DVi{JcB{*)`dLR2myt%(p;z_g52B!fN;)wMF{n-7-zi1^Y zZPmD2W69{2wYN%^c&jDfGb5lQLeLHF3(I03o=_ymv2CZpKaux4v+akMRbLFfmXjSVvqP z@va7XdX{EXD=DTM>4$J%v`t$BJpFJ!>`f81$$C0JYnk})g~Ge-5IG>3VU%c`r-ICiN6^t zPBA67E|KYKpA?$WWj|SS-Cp6QS&kdoK$Nyw7$J^XukX$v6Na(6=9^6-Odm$hxcaDC z_s6S|hmC=Zr9q4+aa2EAN3gGsQ=}0r%(2p@_*jr+qeCQLesvjh6uz$o%zvx!l zjYw>H^DfhMX;kFOJ<&1=zuq0@2DpmJ#N_QP3H5@vjL5Ei*{o_6h6`DEg*E1`+=$LL zTTgFIc*tfoF5bU)J!2=^R7i?P7#OrQM9s=y#GE@NCRN4GDml}&E5E01%XlAVs>E9} z^omPpkRsh0kd)PFg;BpuQyqX4P4_*XdJzGD*Za)sG3jV@@6`g)@iUnON3d>k+`IZX zK!f6iLrVVgBE|7Ai?g|$>PsssY59mGBJF5y3OVHuhk`9|+CxhchShCTKs#%b)3Y)^ z84PofDUDe&*3H1$d9xBan`Q!bF;?7xLW}ea=aEN`Sj+*HPy0mmQLvEz2GF}ze$fdW zOl?d<1aEF*lynZ0?W7}`ZtcUNa`%Y#r=x@m`6w;FIEfdM+hipLym?TQ$VP_7AtsP3 zwWbVK65~ms_%fzT&g-c$J!;PljKIQpxW6wg{b1B8c~&+{I}hPo`ZS9ZSbGu|9CQSZ z$A2jRhNv>G`bbIR<7Ql6 zqrCh&i`66NSLxdMgtWw`ep)xjKCP?f6j&l1MvM4_V~z|PO*YZHE!z0{Keq^rrm<5| zo&W=ND~U>gHhM%aNy7^o4@KGrxVU@L7q(wiGD2s-dgI(n`a{|6HaPbhmd2}ArR6Dv zKI;_+B*^3_#Xn+&ZODfbGay^&g=xHiKYH41!`TD-ZqycBT9a^7&Cw@IQqrx5|GK)` z>`NJX*ErXW@>ocd6uUK@2s-kEu{x5YU_T{VQjtPs; zy~aZ<(6#WFh7g6Ln4YS*vp`@s_kU0^v$2d?O`=Z8O-eh*W>d}?qE(*}f6Y4HeNg60!KACLMy)#3qK zK9gY96@AOHqRAun3`7D34WGG$Sp^eqpgismqqHQIvI7S&n+A+L`iNqMf~+cePT)@l zg${(b&N1xFIDZTdz)p0*NDM=VZ*UjZTVrm}mF^<(H3P9TBC!f0v0F*L97Vpg14-+H zlNRYL1g%Oh!QIayK{_HYGJsKJ;6!>N5+MW zmH7m8OtgMvbx$_p8#MO*tS4okzpR0U(o#x(zdegDs51k&f=NxLt%#|RhN(EMdd~$VIEYA3QD6D%_TO)%Hsc#VR$NiVq$Ig3rA7aJA9M_ z-solZS{gCb<0x!<;GZx}WdJkBfS88Ba|U3dG6<>DPE%?mX(m zaeEuYU^EhpYY6%*K6ZOPP8K2Vbv|&JC{}@x!Xj5OShA~v@GXY$nD299w;W7!w%AeN zJb84%0th(6^1X~_*Bn~SuB z+RMJ?v-)I3R*yGvLfg0`n4w@^#{@jkR1y`%M(oTOEfX4Dml#u&(zz8W92X9u5_KTq z`?PtZJ;S+e1A;y1UUFmOXya1J(2^{ZvyTHmT@tXd&=X+C2+-yenU^y05SW^mJDw7x z!F?q%4Ov=f0vA8wU$#(cJr^ZL4r46H;x8zwpDl2wRrzA);NU^GGK~4uOwKmrK`nAv z(i!aHS8l)nY4x`aEv*baD)F=^qKUvIDb?ThF=lDuMYbwq|R3g>qi~V3dkC{_Dvt@ zayX zXAW3_Yq*&-T0rB)uOInI$CHDHTV8_AwahY!QdO8(Xyq{)GA*)gtnX>7MS^hLh0*Lm zx_*T65Q1#`44!(cVSP|>!z*vUV6ql))gYUVE9RIDct;Z;74(`J8j~!XYbebo($Tur zsN==cHZkxz7pGkvW;_~YczMxM{-eECmW>I!gG8=5_q@3&yTd{lJp35wTiMY&p=~Y% zS`_L4fmGg`wZ~%rKa9PHBOL15^{os>AH75yy~iNB=#1Vw(FM_oC`q)z=%bfJqLT>z z&oVCHH!nckde98o00h8B;2kb-&=5n>wlXQHlJ%^s)ezw?&oE8u2t2`ATvL0~kR}U8fw{>2ocu zW!48@lnO)gTE8sljMk8TF&UaD)$eh_2NfiavWWCqBWjQ3cX5gLe9K^JQ%zpgM`_cn z(p5q?n<-%9NGaC1QXNN|&if%c?A z*pl4rskm{Yl#5}*_+zRS)=bB)?hj4y)Vzm_Jn_d{^xsi&&kYJJD~@111AlGNpSuoR z&=@M?)?JQM{&F2S?h2Z28OG%soo*Szk<)p2C9ygvaMyh)fq2fCY{2V(zJFfsELd02?1HUZN$u0 zn=pXXMRSt$sKk&^UbA)D5D;MYZJIuG`Z;$be=?LJg)`cgkfLx(>s&7WTS+PVCz1Gx zQlrQNdqO?mIYjwXBH^6Dw~~X@S*>`G5$jwLJvbp}P8a}nwVWk@sE&%vjE=cLlcyOo zp}OD<^QGv`x@fGUAVmUrm-*t`FQ43O9uL}C9FT>o8y+&?c~M+`Y(i2H4E76 zO)RB8C7rqiZ*_2=AP~K)O`did%HO0cbCq~*tV4emaUy|LaEGPCIb)pfRZd)kQ4!2opiXj>(kC-^dQZVj!F>L*w;)r6kI z5KKJ`4Ilp1&!adb9|&wva*^H8J^x+L7Pc-R4`Uyj#J7PTL^NKT*;O|}2X)|kM%0C^ z+sP}kp_z^$-%ZEy0GtoXpDeW7CP*1Ub^xQG+nqNUJu!Do1KXIM5qxL|A-#yf6@#0F?Rq&8fBW6ckcBy8mn4QmpcToO?bNlFMV zvhpVZ_?$8c3u%3hVS|OAcMgVN;jf)1yg!fmehv=?J*WhIt<))DDV@S3Qd_xb)WeRt zOX6{e4NSsigbc%5(k(TXm_gl1^_Ch- z+>~N6_9r!V_Q)2J2v%}5Fdkk~jbSmYxUP@gQqSc6oGN~fjW2I6h9wy14B2jXkPGF% zqWWegT!8WZmt-JhULhYCeN4v=(PvM`W--z{*SC2UOaw08Yam>d3gr)~a9Hr;gVuXZ zq>%v+UN;4A?Jxi`1P@k%&(Me;1d-X)mf}XRKfM%&jP;VfVDGuCWrn~$+&HI0@$)#M za+pOlTfCFy-%%7WJG$(HnM0dclfNN%;t$;x8y|PqHXpohjM>@8UZy8?_u8cCzE zu-)v&3D>IUt-O>QB>pvezOB0UN*Z|__nxyaAqNJxE+ggv@%k0dY+|OpN-B}Je}LRg zgiih#50<)8L4ppbSYidg$P_cL@8?M`m%-B*rNi`cEdcYI{qgqE zoJp`Rk4TtVKkvh-zYAoafRS9{$FUm9Go)j*%DZ^_Q1~fCmkA$la9{pgcw+2cD$FTA~QYMYQE!P%wr zI4E!Ey2axu3)^3NhOn0gZ-$LX)eQ5BOeQ#uNvRypEPRc}1uR3aoe`Gx72!v()of#h zz#QdD2Zn~T16UcRfXgCgvuga>e3`OE><5u^mi2r-cN{a=<3_{J7%lwRG&W)@`9SrC zSn|YqFg{5!b6%NL|E*w3S7Amwl>rWL6LaLDC9&zS6SX&Epwh!!g=2~Whj0;Ed0+DE zEWVb=n(CbbV!^m=q`HG5=k)8fEisq4NFow&S|eppW$H(9xNZI6+hfbRhL7^Nq2At_ zxkfMD1UIWr61)q&ndoZ(p~9=^+i7RxFN&h-%*tq$bEcai5zi-$x66rDd|6-gDz3g} zCiTY18xmDf&l}=Pq5H(@2|qGuIMks8%wQ7}#`k!jmeKfB*~{dU-rVSPXE~zg=(< zzU+mt-*u$F+d^2#JKF`TJQSIiXV!q9gGhcLY{W*b$jZ-2Gw7wWCb3&7! zd-RF~mE!oEfB@ibSLT`ReH;i_{KscPy4D>g_GMisdXj>%v!A%3?{pJQ)N&;j(YrQJ zkL0}R>{%o+lwpOQ4o}WIWyn2M*J*NnI`!)QOn6dizYd#M=nRT3!7sMqanWFHy6nNLxV-T^_aZnOsMyuZGwub~6v zv|rNk-m}#LMRU^hJ3myZKp-rb3qiCrSrT|LFMdR;zUtgJc5UKHvP!^Z#S3wyxEq5Y z!RrCgLKNf+pJ>LNJA#m<-Es^ucl@7|3!Ku8NfT#`ZTkDhqfLPi*<~d*!Nj?R1kQ?R zNu%HCH*;w_@wFC?E8t&>u}HH@1$ZtK2fR*rwdf~ku`Up=pVz&}i-QU+{7Af!?qS@h zh3{3=YG+lzioGKGRh`7x#WxL!kh5j-_t(M_JnxA@BB;pyQ)(cM3W2U!7|Np|5M+}w z<%_U1*MjRKg~U-zK2N1Sk*pXK9A{mo5Ey9L6DOA4(2vb8tso9iM1$TKdO!;$KLqH&T7S50j-MjhfNATD z%V^)>AzoH05AKyM4t_ViXioA-7-Fnk8sd8=d>0@i#!Qny`|w^1$%pmGuKv%qp(!kp z;fRbEct+(`QYa{BJAm~t9#SJlSC_J1|55S`E(*NLc*CvOIO=c|puZkNb%GSTivg)h z{=BofAT?8mHhGkggulge594!T%W=Bp_$D7xp`)LsT6WpklnY0+6=W8w$4EM5^;mq6 z#q97U&5op4cNuj~8Ea)E<`=&0i@QdL2Gb0_cCf;^VSB+nnYXTNk0vPxWR!{WHE{^i zCj-XntMH{op4GChM6$bk7Z&YKQ|j07#;9O!!mCc5HihR|RPN7oZPJnP^a)KhLVPR9 z=@)e*X{P%w7M;Lh;W20!;AZM&c9~}lR`us|?PeG%OjGR<$}qxCKTv#-o+I0%`P9Xa z$CZyKwk59%3cHF zR++kITT;e){!EdDgvSf5q}&r~R;IgwiVWx^8XikYswLm^`-d0cT1)-LQPJ~v<{r=R zJFSdpVOvr*@1_YEfz>8i7QoHBkyQF@zMle>Eq)3StfR;0Bf%ODn&*m zNER(l_Oh(~vOuQ!5T837n0ggOsMy$}55FHM33uWnIlYsSSA-=6l--lTgORV(iiMqL zCd$innaKF%MRi~@EkinjXXQKtW%2CsNdR(7qZLn%W!iV~FY|z)CVv0Gl8B3rm>m}K zV>no&BXhLs6TT=7fzT7+i|p_ccR0}VFo!cvJ`^o_p&O1QXJ%~nq+4#h2b;w{;ffRl z)ISTZ<+M1nE_ZZ^+a@CVnnr>Ra-4~yprXMZtTrcYZVBD9}5+&9V)?0?uGhO5yw{Qsfi9lKBima zk}JRi%s+1S^$PgB91|x(z`5%(abzZ0IMHx~8ZaK2yw%DVqz~_ryabFh^BE%~<15jh zR&@exKDIMKr{*~xadz7tehObL3PxjnG^!#k7><16^Rl%xPaagsN)9)l#VUa`TH9he z#73vZc7Aw79qxqrVfO;jpKZKt*2YBL6Ilu6o#SW^Bvn!}q4$Tg0OEWE2Q^1%+4i|k;p z;z!u2@KPtDmmJ>vZm{_GclPe1?ljL2GDJ= zB%-W1K1c>$jiSrJnIy+m`GpU$ z)y=4eyMESZrk@1%7uoB`d>(6HEgy&*fb#5oaMIRVoV zDVZDF9#q3Ior>ZVv3>(qWlJftrJ^o}Uy%q1Rs)Y{N|LLmfL^rsIRWCU;mQTAlGdt20hXF+* z*n%}#jV80kyow%Dm_!f3k#41V5x*$zA96tQP;J|k4u(L&!}@6YxlZ`(rY9O4D(a{N z3~D88m(|x!V$zOy-(<{H0k01G$U>2xz3Q(Q^9GVxZ=Alh_-pj!Gd9^ z>|5HCJNAV9FWJm^V)RV8L#brn@UfWhn?YL$`2(5CZP9QAn=sKO=lf#b&{+zX(_8fC zSTM{tym@RqP|kaP9n}S zm!c2|sAE<>hdsHI@@)vtAHw6_Y8U}GB8UJZLL)Q`pBiUd>Ip=&8892VO8ba7RwoNNT1}ycR%x-&fNiX9jk58 zY5BQkV?=@39%T7O3BDn_O6s29tZ9SoZAqz|PxW-IPk!x^R&OTI+(Xu!MwwYaNd>fQ z!{kn_RCik}b#mrSM9d8#Bu+?@kU!f#%A{?-SB{1_R$-up`i- zL+521R&Ar5_?Az&B8c|Y3VLXa8}5(L)j*1+k5YiUG&Q!ISdhT^cJb9Uy7ip; z;FApZTtWEeyb$j!Y#JfskQ#E{4V72+vw3XCs+%y*NH0EYm)goFRRUU$)f`v%?`s0( zZZ-rcfmQ%}D_$&P{)l^0L>U1K;j)`QoE1i{?MnmU>S(x5PFr?@Z5(&Ls2Oa*(Cjhq zf3fsmh;%Ja+#i630qy-F%yS*BiydIOD^AaA7GfRRNehf&*azLMcKKg|O}e$6UhEBw zA57f06I#{wTXtTEiYSZftKPopeHaS-+gUR)>g4O-pEs0>rMCY(YyR5}C4ye-twn$J ze@?zMW5G9Dg8?-qe?g`|Q~nH@s;dC$z!d*Rru-vhTDR-|Y9aV!waHw)z5*38&6xlE zw~%R+4;B0U-#3(sRLB~3#IbBY;`WBpw9wwAC6Jr! ziwc>tyC$seFQG!FD|qg=H+``Wi5(`dXKo4d%i=ObUw>OcN$h<|=F^g7P4Cpi3viuJ?YLnb3C9K0`9;UbW8 zViw%~q$E*dQ!zEmC$h6Mfee?5Yck%}&{3vva@Z2zQysDO=n7!%nhZN-ZH8R^o7z~} zqBw&Mxs?c~3?D^O*lUFK(kz*<7ucC0Nl5|~GA)&cZfT!!HqOMGI&vYBk-jv=a@Ir! zU(%eoYZpZptVJEO!H@q_6dv#;!&Yl^B+2G0S7`lYjHnWURH)~?3Vma?g0b1b-a3MQop{TEN?=T5yju;PHN-vdhXzcfazy zQQqp?RoNwfWt$Ca_on%LZ)MxPy`kK@DtiOQa;Q51vGXD@Eh~f2~Kl-)LFB!+m9&|B!|zm#glJ8W~`(5&SvdP<_b*B zGs@5AUF)UECW5op&K6mUG=DDnZ7eghz}C;4@iGpHi)> zSG1)fVI(}Ncqyw#(43%v_K_ampk=7cqeVg*=?}4b9om6jgDl4HLc_yaAS}+41x)Xc zJLSBU{eAEY!Inawlq8ZlOa1kGt1FqMED-NiBUz zz-2S85@;isRtbns#-q7S?xi;fo30L=4Omi*p@;q z)?)OWe8F^ErE&t7iNa@`vKVvBs$<(a@t(Eh=8C1Vpt;nsBHw&IEId`dCWP)j`7?Ap zZf&eEz0+^x(O6!+9QV}_1zLc7K%TQ4d(0REw>Owd$wdu^Sx=ThF;9a+)kJ-OrNT@} zbw3WsM{g@O*?6~{!iLOeQ_Z-^n=D57#Uslj?wRH<6fsPBS(?eF8I8(-3X1Ez7psAw zZWsG<{0m0AIW_T4?~_!764dct5a=^GX?0}IJKcQ}DjORd+G(bIr9~Khy;;w*7jC@P zKe*@Ske7!a@_yL3Ke?0XR{EWJ6m3cSsd*nK`&k8c7LOmi&t&VEvXT2M+^K%uJRCR! zo{FzfE^ba@l=sU%ZX9w0E|j_T#kBxC2ee`u>R1J(5;6M@~GIVYGJGlhW4nl%!t+E7}Ow(|g zeYpt)Uo{B)02+0pdmkZCNq2Ji-7#I~*S-Q)T|4N z$FEM5dC%Cjnz_h?;1c!;u1iNFGEH5waR{$RHVz1~hkfKcaIhUh19$VOM{0^>t~bi% zA%}1q!;*1qZ7k-ghLLqg)E^Il_rG6^ghVR1O*=_RY12q{zwud`fTo$y3QXM`t4!hXp zynQnCsBG2DEdc?Sn9fUhP!>O~79FW53qd>v7S4Wr#ahEfy6?oeFh4u|;X{4=x2L68 z(~FKT%0rnqJUO=foJ8uIW^!I()Lbojxk6gDmwGJ=W2QUNMSTYdHH;WJrcRYLA>%_i zxHxozYQj80dRU$ZhgYjww%9!>Gl!{~7VI}?F*h-KUL|NYi&P$}AJL(Q2&;+BEM$-9 zz?1XCH0`lTekxWUWrh>>w=G{}TZD&CN>6fpsy6Sd0C~c+PV-;b;{duM#xm}+W#7SZ z6uGHyGq%Mk#_65fo~xb0C;PFX@r#vfJZ~b&$0wz3ol$M&QoE_*>_c;_v~;i}C=cDY zu?%ZZ4dTCi=>8;Hql3pP(Qn>P=&bF|bNjygPqPi25Vn-CqnMK7>o5DM9V)MUBidV{ zWGezzu2~LpIBXz-jF;mtmIVrBek~0U(X|D+;w4O8`jNiBti6^Hf2^Ib^@uAd&|Hqm z5VZL%V&l>{xanuz_R<4^)C6flMi_>TbXuVd$!PE!!;>Q@h z2pGi$K5wrcS=deZVa_q`1?*hkPG4i?rWO;O{^r?r(xBN#&GufuYhxNTC}^6Bls<~& z%9!*#BLo~Of#2t5n#`ADNCP;MdBqk&K}}sh=FPTdN>vp^GR>W1kB}*nlwB^MFErWTA!$1K%*lRjAXfYoJ>b)3tsp_sAs70cItVQTmj{p7;?*LAIM4drfFLH|eP^%$FoaUnrQ` zl!SH;LS#xxZbuklO{h{$C_uqdRLRZKNP2gdcDjSE5>Ab6N*Rp=$KKyax_88Ju!@FJ z2~erVz+eIabxyX+oTn_Xkyc{H;1^`hh8)W&o#Z0K(;YFqUb!Ucyj&eL;~o+q-l&74C*Fijv;6Z zhqxFW{=v4`7#%pZeJP=)_t==wh(^&==2C+((21-eVM0lz!kNNexVWbnSh?tLs_}0s z@v(F;UeaW(e<3bnLh~qOdeMW8#+15bLT(UEcgHdCen7HLkL;=ra8*NkfcbPx!RnC9p{R2&lLakob*Zd++vE)8(9|J zuTt$_36dnQ;?f=B-kE8zciOeg#>Fm6s9>gX;Yr&~b4}%>3?1lw%%7o^CvShvu-z({6PLP~sdrfjA6))1 z^@hr|Zh7=)t*n)O-5p4a>w>6;f2P3PsEJVuM!)RAP}8k~u^DNmZvNnwe6zp1+85atZ6Nqx59gBCr zyzu-;V*m-?NW&@wfbS18?JWn2{GF$!};4hszt5X&q51Ff~q%HtefC zwXVyzx)SlzZ}+PQZ!tM21@rF|SkNo!1A?+|_3Vwui4B{ApX_p1i_89}6xjP}w}VID ztgr>oqT9c-Df~{(S1R}N?pJye%J3fbkYC|z_EMK%(>2jN88q!-_#Mnt*>k%MW(q

    ;>Cli(9 zkEtxL{ex)>Z8rCQ>nOLgxvJi{vv~o--m~9LHH*G8ZaS{E5wjz#Np<-;MdWIz)1fXl4?>vF6ROJY>XxOLyfs@dr*kvmsZ3XCi_J zgUa4$2**aI;tV56dwkPwuRQ6ZKKJ{5#jW(%)U&Tbsll2%E81h51xMKFVYcz1pP3Ucnf01+02tiQi^pKo3POLioKGBWhOB{-;BbU!_Lb! zN%EHUU^RHxcS2`--_f#)Gie<@L9lsmCTmPECU0@W@$tv8EVf9ur}H8Ys6R=}A0_w? z7BCnJMMlKg5G0mkd;L{#d~3=~myt3236<+ln#A7evL-Bqm9R;;}3CU;^Hiory3ZIlptq2px#j6 z;O4N@InCGOdcZXm0*SX3He|qZU=gGo*REJE;M9DhroP^vCXb)Pzh$g$_jl-HIxp|X zQ|Ii}hSuy|ZUgH|>wL$M(sahPV~;O<^ZHQb_x zvc74SV)1cJ+02S}hD^sbe{c)Wvajthy*JqpfBSr_@)rWm!sp4BeeC zEL-{RidXsTo^}wX#wy00^A4a^Wf;}qY603P{|j>Cp+!owX$RZCD`>WA5^g_(%A2hc=3)TJ=R!%E!FEgn! zx*by}nwz>K{ndAu*&3&bx0d)*@8pABf3t}XR2%S*=9f@Ln^jvN8TQTZF{O>UKt}B^ zuzpK(tDwnTZV8CzxD6}&eCj+{q_Eh(HQGurM+&yzugQKYMezd&GntkLYf&_}U&8dA zz8%l-d5sUOj)L=$7es`MmJ(wvC`8t)Ow^c~&FOlcb33Ml))J79%jj-tZsvHujkcJ* z6%@^lF)#e`{3IyxeS14{w=3dgB?K`1(JB;pV>hHdN-l2}22$=L^ChMAvyPy46q|{l z_1giP&^_l|S1}bAUj8pcmV4A9Tr5FxF+u9AfkmJe@3CfQeQ=hg> zRvirVqV=8nRc~o-2ZqCe#D4!b&Fwa<9P) zU*Ii08B(8mN9MJ8yhtxB&r@47tVnFH36bDIG4>YDEqrzK+h2}#k=ra~-2+o@#*4Na zS-z58HIP2iu{Ebp5~Z!;)1P!f6{`I)rv7ELxh=6^qCX#{hRMjEQ%6!gKVOeaL|55> zv)llspA$=bltDbK2-wV)5e(S+Pgwc)m{K4V;);03=&P|`JL7)!tzo<3$|`;T;OcwF zop;KIJyagoC^qq3s*ZubWGjhz#mvmxIqK#;UO)Tk?@fGjzM0{1bFowM{^k-;(Q$Ki z_~|b4`gBHyod0Y)xP|`m=XWF$jUX2d2ik!_dl&-L$o)4WD=rtn0qw;5Cn75kr~>^H zk(GyMjLKFH1R=G?_z@}z)NZOgTuopiI}9UbK6UCf)JF8Gem= zlFB9Ta>X~I0Fw@vNF|^;#_HeJ%W0Y!W|n~(j@_; znOYX-0kBZH5~zdAYYOM;Za`{(xkr*brp{N?od0L z^A<3PY!T4G)M|llBuHsB4B=bKqIGe6?3^voas>LS%0ICOXeqc}>klZz(b25rNi`er6c z;%gax8WQj8yHSKw;k%l!)TKZ931=|~=^o0fkpf+cN5l#P|NJ?lsC|?CwfoRx*A2~Z zB(-Qoeq)ybk=Xu+ST>b!AFnp$_r2M^xBiqkW&Hy%`9mIX*a0}XquU8&(IBhv_?2Sa zL`T7SWMXf6&nuMT7HL9h_0;vF$I!&EG8GvonGvW!abIR7GL>8YggX1!z~lk>(okco zXzE4Nacp2_HmS-j{oj>RH(=OF&XQ~sl$h~=F^EZLXpy^k)Am^GseO6 zXLBZxq!F{u9Frnbw;hjvf0DlaTnWM9KVOAWp_o%}j*9bjGu5H<4N0mA!Ohh0uUdj> z4~bkPlwA%kGKquvFXIvt-7leekJ2x9Nl+=ty?5Wc%(vg^*Y@CvOjleTwEP_2Xldh1 z67P;{JsFnGP~5#brbz?woZwyviF=d@Wz(MmIuoSxcHF;9dsO38{Q9X>XMt`GNqK*N zd;_U4atX&|1Oqu6nHKn-biGI3(8do+Hp1~4k=TEEl9V{0b=|@Eu4b4lP`P@I%CJK& z-5x)3nxNg}^xPN{f-2_A~2va904ga_BOTuZwdA`9`c z*A$eI{yW{w35Cx{t86mk`g*cKRna=B{bU8u-gJ$s7!$>QikiPLr=ZH@B=6&#Zl9z- zaOv6d!v$Z!?eLdgYDQ>qoA$@}XlNs34>QQ*!T`~dS;+(!a1up%7~+O&NqwGG z^_2lB`z|7j#Opj;{iZubnoAb~w2jxxK2DKaV?~`fszua}^R25v8RF&p^G4lKj>(3C zuW7Q^+HnSZ7K6Z;nDij7V)ARwNOuEq4a)H%gB_C;S$3yay7o@eTbv)Svgf*g)q0y2 z@Fwxh*J`?tk4p8~!uK1YK5Iz)8u^rPfk1*)QXgC!<)T-wai5p7Tu*wRkguWNEr8Zgg1QF@Zc6UJxq-@KYybWrDjktTU(0VqJYbUhK}E0odngS zQm2Us52g-b0z&no4oM6ru2&iH8eB{$I+(>D-wW-P4UuJE#q->RGSP~ajTSdi+~Gn? zEA;LJurnEBU1DN9DO!=On3)04<^quoFq#9VQ6q}85PQu~EIe6LOcN%W{6Jm|LTj`E z=G6+K%1A|r_4o)EN_Ru%GIZKi3&qCp(Oe3FI&#Iw4|Sgf1jxxh?raaUI{J z#S`NzLIAM!m&$8@J@YmBAzGJTQ90PmJ;CJGvBT2ix=Dh>I3{U007$nXzV-CJyi19C zG`|rT!40yYKpzyo`(5p5F4$z1vDb4<2E=4?VT;$Q<3(bc(rg77ooZir5rqv9K>SoA z>paBlk(I54oy()*-ourVqJwKhLDbw$=aq1kmOJ+l=RKTSRWZhc>y*vsy#fhUaSt^% zXcx{uiVasKJQ>_zxH|tNOH_@B()a_Hu2r3!af?g8=+{Z8PA$>c;x@k+Fd42+uOD;} zZt5m5qkt0z%xxu5>nUhs06^3Rj;Vl|7Mbr%Q8LdLz9c&7@lE#Cy!tt~eg6vO{U7+; zEncHh_3f6rTkhjp%!I8h*))cDUR%hbxvOg4G@j{*d5?U^nR+F^F^8zGRE3b+q634n zfvN7T@z7VJ=F6$dgt~Xy>f5F#z97t`?zi#cwdV7eGaW=9Dx>&pb;yD=?C+l?#Fg(e zur<$(CVZ$Z(R3@BYMLi)68XTjx##w;jz_+I_mr!}9j*GNyZWkgNqj5<5E6tz+Y4{74^mLCFd*SiX_Gnaw5ZAYqGPycyoWxsVbPOf-Gvv>Kk9!qIZ%7V3Q5%+* zF^&NKizmAS7oqjd{&6d9$e7TtRWnu=^-Er(95ic8WBk{IoC|nb*Fxxw3F14`Y{(YT z0lA-qJ)abf=_ak^P!04i#M&T&G5(boj``YBhgF0suND1uz?f;wy5fv&@CTCLUa}NqceQ5xeh+b7x-ei2+0F}jVy0y0WIu^@9}kJ1>95q1bWAw0lvw(E!A zR@i@*`M<5OtP;8B)6s~R_Ot;nWY1V#5R!5Kf=K=ih&0b7pB#oFN#@I|feJoR3@qiH zQ`F97JJlhb^vVEj|vXAON`75KWx~{fD>OnUDCte}Tq~U*Hc$X*#*M$K@|Tq%M+p^7g`&p1NHf_XhHY$0fsv zJ&N8N*7|o;X;2W=M3O{O;3!%r z?tg_y{zYT_wg2SbR@l$J-=)o*d6^3Cz`l9%T}CVd{RV8ooNp8gD#+DY%P*ag$Jdz2 z8N8cv0$d=uSH*M-oQfm>L7)dnF9mxJON_|$#l6N2sh>1pCj6bUV2w|V4TDAePx?PU zKrQn-ZmlrYL0ej~%mdCS$?G*DPk++1!m5vu64jyK{U-$M!i?T(JF*2Y7WNZQb1$S0 zLVRBI@o0&6?=t&!u2Z}Z!IIoIrSd5B5ogMkkvXTGb%ze(x(_T|d3xIWe$C{UPIQjLlCFbBMbN`2 zCL4kd5*WWoEsDaxwYX!tOZLQR73YRC3SCVYA)ncafh{(&GMXHh(0@-9Hx^c3uE5;(Meo=t2e}XTo}ItvGwF zYq-!q#bJOKbB{oFHu&j}$OagXX_~E$?06dcK?BTw*XPx{%Wm3?kR83#iAponhdt?T`2&EE_?3YGzKy_2Yq?O|m%=3&3@zl{B$ zOEZvL4QTb?SK^2L-z5W6oP^AGVhTirw4{?oPWUduVOSJ{=lXA~rQA1IIEgSOMfZBNz(@F;AK{q4t~mEA7L*1& zR%QvFuiF@l_5Xny8TAp}eKK{|1^LRot|y7YP$OrDaLQ-4a+u7m{tm|8bhY@NHV=g7 zG8FkDi(Qk%MfpETb>{@gApPhC0r$D?Rb0Fv;_L=DnQ~ zXB*K?KYc9@EnDh_J7+2Y5I<#@v4f@R;{yRgDp&&g$@_-2-*n1$R zq1%rvd?)yxlkElByC#}<<89G@4NKsN-+lj9ojExF zm~?6P_81P>vC6S*Tuz+7fJMG?T)d&CL}K@?iDcFfd}#w(10gEIo1+KJ5&6rVAGAch_jcoi3`EHoFDh@6v(BL1oC#-e7wtwCpp*n z!k@X*ZY-FZrL$0Rl9)hN`ZOtM zk;qq)=;@w(Vl3xEske9TLSRbl_XctRYNP4%yG&2Rb`+3nItgZldKmPj@(!1YsbPxG z?e=vJcL|@xVkOcGf(2shmSm5?eQn2lmaU9X8Uhe7@s9gc;TojbI2K9u0q;IEEpZbLQQ~#SnV4;j=s;ON+CN`*jVA!l{%N&&+y7l z)+#Ra*Ya_a4Fec`*%*!Trj>W*NWp#0ySwS_et8SW>A==HK!xpgmG;l3CylKDoPcj- zv$fwc+B;MA#OLv?uLd#{4XmNG++W9sHGvQ<3u}_jbEc2fz&HC&f1{&jNnXNI2XmQ9s$L;}KO+IY( z+pHs9;oZG54WK(LWeN0_{od@m^Nu{~q;$_Bv+wH&=`0^Zhj-9@<4qR_WIsD#u$V;{ zeCTvy0nox+cokfPi3Acj>8(wT)Ly&JMnqExGm!Xf0Mx3RzoVe=jo3*e48`YAWbIe z*PQdQLJsm@3dtWOLg%E${nppH7K=RZ$bM%aX`rYl^w#IEX{oKz-I)<|O#x6CO*{!B zaLX0w#$NSII+M}+CAQAYznmf0&~CN9Pp~E_Li#P8CDcnV_K?1lR^28YM{S-TBlg9MSfjE?zag zIe9mI5xY~9-1moU&Q3_nCG*kxw~W#&NyATp9NK(m)y6s#@*G#Iz{RvjFIrthIPN_d zB?6axhJG_%sIwlt_B%an%`o1*j6QtDpfuzEm5ur7ilN>@`K-2KjLgUi*Qdx?zGcra zV?28n>VOlCSKfUsEjvob=LV0LrOX&xzj{1;!jSX)M`e`y2vu<8ELq~ghY{&Rz4t-* z!#Cf`fvn$u(O-wQtS2m7Om>H41;jzk&Mi-qC8NdzBMgF>&RU*-NB2DnWqQs(^csj% z7A3#Y7_Q70l7?$p={|wqn@ANF@s0K{K-jyjMgUbph@XWFL(^{oL-rO z+*LO+5l9w(&KT`aYc}cM`Y=j)Jvt4@lp{~Gl|kg8NbIN|=tC0TY8)m|<${my-7<#d zU`yjH6cZ+FPM6PKiOz}CiOopj)Hw;crwhP@JTuiLs3>K~$o&6kyQ`o!AGTfe5G(`> z?!_Uvy9R>0dy7kv;#wp?Ah=tLTY*A>LUCH4cqs)+DHMu36xSlz{NL}LPxjht&#Z%W z!T~4DWQKY2-1mL`F7VT}s18++oXq$fBRB~lLE6@<)C`JU!jTP4&U8p7j!IrIOA&>} zZ9x>W@}BMn(XY(WH~mN%X-df%U|1W`403tKhJm2Av!i>TbRof92T6T{o{U)|jom@| zet=~yAT3WHlxfUdlAd;|mb3*=F@UCTx}-0!A_;HO8Anx*s4~)&Qd!LBSFMfn2ItZ;7(Cp)G^#*Mz@S5=c#0l4JY{7XpXz7%0WdI z1~iAXPYD3YKFrGTQzw}`#$_khSruV#699>IfFb_ibJo0fXpWZo;23jaW#%jqxNaLb z(s?%n#FQ`2$#je+{6B?W^vAF3_y0e~PX9~MlIvs_{y^ww2~kYHhVNRBYcvCMN6zV?)-fWwK^tt< zE2iVhe#_7&RIHeIM4*`g*aXvgyrKjn8JVUNz8^v%62C!}Vxi$eOO_egMw zC}=3~RH=8dSAr8aviSz+Tv2YFKI;Za(^;{4B7AT~YbCiK$49 z>#we)*ONu8CU-P_0p%o~S7}AqfmNDprbA(mZl{GBt|uJW9iZ!$%`Q-44_#x+bg<`yOpVuwx!-+9v(@i=pB7YqwgUmsUC zsLW;gU2l_DE9p1g1s)WHfH|h^TU!T;IU&F#*97?vo;>h-$0E~W4Q$MS) zpWZ{wk%maV8(#W*z*ke0^{aUMU6*3%ewL|JA*%Vg)BvS!ccfz2PieJ7o=>-DnqBz+ z2)&=O&mQa;GAEya26`@Mi3Y;1H{MXZ{MQ!w#r{7N9)U3Yf40a(>35gg4WAyar8l}S zR~CxVaN1kZNFKMyjZ?ibP4k zSfozkEl(`Z{&Il(?>24yrI8{PO)$t~!>x%o&ap_p0vCwY7%*=K#sVa>M?E&&79{+k z5h8MFETtfMJ0Wk^2$pF*Vem{UHwAF2{SAwY!*Ru7U@Sp965No2YMC*KOEmc{t}*7O zX_SF81l+oJ2*W^QkZ_x-2(Y>tkke5e|9y3eV;xz9dA34Aq#&FJ?&AG7ZfHx8c^ONS zaWP{o79uv9$9S5Hu?k108BJs5gV_(d$7iI?Q)YU*X~p+Xv2CO=d-AS=(0>gk1XR4y zW*%@sQ4KhxamWllQBB)a+<@K z+0}`oSU5_)GX_#&LMsenMDj^o?*0xZUb=$CYo?6>-fSxBr+U%u>sa8G&#J^x9imcb z02FXoIrnb{#qKHNEKra5uPE65-d;81jw=n2C1AB=r}}coQ3}rop?H0+h4NA)R7NKxRJhaY0Kf9&5=GvfJNd|_a1efYh1DR#h$#n z)2auxXo3%qJ9}zLiW<3P+-;X*=0^C$8f-HToM>q|iBdGs?61hkbzZS}eN=Dtc<+(w z_v%|=PP5WqwyiThSZBgV0o8;>;w&TT$oE|diTosc$>X;i3i)0iDScivT@wuL>F{T( zhDqg;%_pJjw)ay`9LF~3ahzNtspxf1Fs=qIzc{H4ooVhQP?AbWLrFwHTe|!ln5#e( z(|%h}?`ckRfdyY`$G9!u*{k9U9Eoo?3Q}a2cssT08cng2#ySP1q`%ku=o7r`7KS6T zD3~gFc_$;K(yAF^_OSCizqfh%*IUx>S$_K~-$)pxGG75eDM8v9Q#v_ z5|EKlg=Sr`^s033?B`-pF;>u(GRV54(9M1fPm%LKUmLR4y{%NI0r4YR0rw#*~r+SaXK)%l|YmlKS&JBdifUK5P&jE;R*O6a~Ce3DHVRUMKTz19IVvFhN zO}0&N&Y@VgyMFdHbCS?WTn~1ptO|KxuNH}IfOe37-(@1U4OnFktkfX_^`W@8vp)FY zLV{#bV{1 z#2aD?YGOLIEF5nN30Gnk5|$cOqRmMTNVJv~3G1boUhocu(-e(%KBI4+G!fzzu8;XW z+{VZx3s;|4ii-4Y2e|J{@10(u05frOFtN(WYY7|pchp&ghGV$XR4DI!1|D_>m#^~b zbQN@mSo=BE#_o0g}V~RR%Wx83E?=p zdDbx2rz1Af-Eh2%Y2k_Vr8DoeS1De%vU@XyQNm?{t1%ZTe&s999dO;J)LkP~5*5NnVMT$kWYCF2qc z;q<+x=`F?RtHkenO>(0Dx}~J(bNS~!H@RPg&n*bcvekBv%hi8XI1s<_?yQg!c|r;z z{#8>zCRlbZTsFIs&YfAMAi^k9rSvwP^lei$64gn6WJcx0MN+RGDl!TV^upD6j~D2L zlPglQ2CXI#)U7G4s?ew%5++K0PI{?VL%aHhlS!p6i2S96oU|>;tG`4N%z`E~e9yVS zivnON38D`+!L0hVLm_pFe@RwP1k-C7e~H4*Y>0wiJ)`*UeV}3$fn|W9&%yyPs;gxj z?F83s+H%6{wrJk*Hr3%y)#1MP{=WCLsTK_0tsNk)=r$q5$AmfyzU9wPq3#s>21>;- zm+SfEhOOUdTv6pCMS*8Yo}@=uaZUVXi2mex*e6wmN*dz$G4dS?(ymv;^3VrcG;~->sBc`%pIvN#_s>HVdQPz7eBswkmy3)r1!;3Etd(k1N;|SQ}oL zAXlAG+eATJJJeEx-H2hE%nWUAZ7q5+B6}24>If}v5la$mQ9P;<3hR51VcF_rDMI-+ z%p<5(FRRu4wiUKvRbLt{5kkiBmYjHjSGcLw%M!Mv&_Gnm5y1%#-sPc#n1)Oj#w>ut zys;KTa37Uv`L6c%SImL?L=sUf4V=sa4rUlolLtMP6a>cW+m2vM;x`WO!}i+%x5O%Q zOkO_R3ZW)NiI%uSrqeBF10L5Noa{``TU(&0UaF|)P{eDOWxp5!CP36bkG zmZ~#*^ghwJ&^yc~W&_RFsPiTp4RGWdAjGfUj-`%EUimmUhjwM|k7IN3)W|;(6(P zYjB$}M=iNAp@MoNuYIx~v*7qi4B4tPZJ4fXh|$EJrd<+No?%SCA!;RJTtiGwF9Rl$ z2KmT9<_`oU%`Ejyf}aOtlsCa^oZWbWBjBb1zy%SJ3p-+xr=x(a)?wa<@maRPwR+PHtpTuV%3A+kqULd)SQC*BzzdUyEN=4GDpYp3L8K=!iA3 z;EX$i2?Hv`msHQ@IWjPr;FpZy=bEYzt?`{7G>~qB)c2MrY^;P$<8JxjxzArg-V}#v zk3T~{x**5IiLm39o5k5vNy4u3Z0YmCD~wY$)TyH`li07vmGCAf@RF#pr@(*snbg5o z-4n@GS%a5pBy+K0sC3(fwEmDi1Xi@pk{$ay0g!?(o@`ks4sj)JQ;@wWNS>fheNb0L z7SvXvvp2)SnZcv-d**HiT#5O^tUiz(Z-$on$8Hw$UJFxkiGOX38J3{GMj<%Y&*+_3 zpt<%8q|6yZAEbCsq#@eV8!~H3Fzf3Wl>ci+L!u|z8Ei}cL%+U0w`IoPdN!oKKD{tV zpJo<>Zd7UWBgF%pY+Yns&*bI-CZ=I^D%0R3`5BNKsDStd@YXZpcu8MAQyn&&iu2n0 z>#q>rpACgZDYBqHSHEmz{iWI$l<9-IlKor4eyVDN73#sGYoJk&FZCXa8a;U0Srk%! z%+3enx704pD0e?-B{*8;Wt7Phwr#?Shlt`Z|6Onb9uqG}mN;5$nM2401zTR@ZLkL{ z-E#`PI{5A2KZGJM@jx!^do1I48y<1+dN>e_zwsdqUm_r0S^Wb(xnELlUV^nPfr!;W zgiZ^+t03>8NEH_a4wr4e)$im+7>B=a=t-udLc-v+pXQd_VQTl*33mX3`}}oxGM7QL zRnLLdH#4+SzZFUCZS?wN?3|jp8qBJiPZ`x7CZby&pEn z`L^Rwd@v6(HQ9-Ecb!e8lr6*)BkglloW9@qtEO^?%UDdC4v5{|h1~;L>jfLZP4ZRw zCH|D6oy-{~=P)2W!;|OJ5+O)Dp*+IWIf~9+2uo=%?)$hl)`icr)<91WY8# z9&^G%<@@#IrNBMFHFao${XN1_5lqoMg*hd^aJWSo?GiB*7voJq+XddWA;2S2yS7_K z8fiNA(SJx$Ivs47w1I4mfW_#oW*?>*zr{^C@9iK28FY5eZ$tO^o?+VhJW(>~^)@6z zk?#In+Fn3&b%1vH&QYmw#m-uNC%g5ekOA& zVP=g=$^8*vSLE4gktwEbk- zyvogAC|h`(4=HfdGY@+AV|>1Y-I6h%t3BtH0CmsuzYG(RuU?C6W@2pQnjhH1Zeo^K z^Pf)~0QJ3>_{C&fU;t(Qf+1+uW5mcQz}z}FP;~TVLHT9vCveI;*2p29rcXi&C^X;# zkt|14;$r$dlq9Sz>h5(nKyDD5^Ee^`cK`(CnOqx;*#{*d9v>pD8lsR8yW!(}8!yUJ3v_kz)l+(gH~P4p(#)^h>w8CX?Gi z?Wkh>lU>_PDA-jg6;c+ohD&9Wwg%&@)$0ecn~g`sXVp=SfViuwPgH1q2fS73L+jGx zDf7WTY82*1fOwWn7zr+WkJmIFyiuSpIb!j+Ttl3FN+?skeS;)RtCy@%05X~S6S4^ME*~fidp@nh#{l%*O_r~pC9C8 zPnAzDOl_2z)Us@Q!7h2W*osc(PPxfj<}Sq^6!T7Do1&RoKK}NzOri+?5|b~HzHw+* zB3Fw|atk0qC~jz4TL8xAKNO)KrOr#0z4DYPt*$RjDXcAUC2~#l=3_`}Jl1_QA zQBai<$FyB@=fd*&;2p;Y&X9cjUWux0$AlEIS8gS-e`!#bwXKMpx6MN|ZkEX1Ulg?s zOzf|kJkST-wS-C~@P#J*q>}`sTFdYmRurxdWi&w|OTD$UUkm*JrmBTg?D+dju_W}c z>~MeYJMR&OT*uQ<^QJ`-7F!6azs0&l&nNh%qEt<`{h5M-hO>d zt|AbrUb3pR=KPv|qE|^fnP!$T*t{{@{RbFQf zRKVN=*x=#k@tHvrH0YRZXWXLM16557^GQ@v6q$l3L#2K#T&V~J~BHD6L5Ug6U9$s z2T@$dcA&e*DWeUmURrdL6(58n@e7k($mBx7ncS6{T1fwM6BZS=^gwkwk`33_GD|Z8 zt{+q%J_m<_V-zmIF)+q{k{m|FrWv%uY9J%6xndLDK3G#}tc*OZR*}M@gg~_Q1#`Il zPujC6+OdPwh$Jzu^B*`aDfDiSYdcaUKvj#5~j&| zf>fcildgA`6`ivU`BCo7RhWy^xhp3vDp8gf6dc_YY#=SXUOit6Mlvxo$5${8Dp)jO z!Fi7vI;enr4=3%3PDYfJD8JqSudcR9H!)kt z$bia@Cq(A%@Nz1In*P_Z1{0n#kev&*hJZ_DFgm{OO%$PP>oL5Z!`O>cR`Rc@951O%16 zM;TW)xiubOSSCU8XV=Jy;8swa0#YBmDN#XbWjihw0HWw8fze9Xz!=p-O@^NQ^e#md zDDl)L@Cv-^5YazG*Kg9iYAKx`h)1!erWzxT2F?!WGDP!@OtRlIn`fwJ1XR2H64;}Z<_JF726kG(U zyVxE3d%XI1z|zlBXLEVcJdqKVcousZ*LBIpgIuTI0Z#=aUXb(=tT59(%_U)NBT=V> zf{BTW>iqhR+7$(2L2KqtsB_*s51`uTS`f*bpblWi3tn2c73DNP9HAjYD|w++T2+o= z%-s`huQAHJk$}d|AGzM?bQ9e$NhXT0Q@ty0XD-syu{pNSgv@=8n8Cq}%YO*+Y~6;> z9x%wn=TGFzZd9&RN(pa6gn6&}9bzSJK0$Kchcg&#qL=r3x4U3Ph$o#{ak{&@2*=rj1G9Azt2?hX(_FeABHl}MC?S=+mJ`gj(tT+#8czu}bn z`u%Yy)yl;z|BE%mHE9z=A;bIwE2KD?!#*;?CWcXy5!g8u)&RKsjJA_=Wfv5dD@cpQ zfP=33>1K_V{ULss1#Y?ed*z63^DO z!I*dDXxtFB5iC2jOv(x%3Mkowb?P06#XhCEd$KarMd5{Z$0*r^{jKj57)DS1i!c~r z$^JA=$~T04{++rSt!)hb9Pheg_z0gx;w${^L39+=wSs|8nj+a}e4xGp6!|{SdeKsE zzg^O7y7Dr7cn~62i35H(J`gvI-Oc=cp4C+Emst|USi!DBQ=*enGi=PbyAx#NE(^|L z*f@F0fy6V@q5nell9x*AvvJ7yWdwsKQ{qk^Bt~vIo~(ygl|ya%{)x@3IP8KPK{lf; zb!bb7*`MQz>YZIE^cje;!pQReV0pPsasQ|CTBFIS?9l7)dXdBB^Lc4S5dz2Fa@NcD z{6IBj3#i{Hgd+$(P#-Idmj?!n+mFeyQ#|7BYYEsk*M?rX=0YJ3ZTbb%O=K}u+N ztVup*ALZx8Z%$am&;V#ja<9#xjV{m$0JocFZ){_K{$!;xBL+i|0=0C!gIi+rYosD1 zGAk4vMF&Q*EaH7g%q7CaBP@`P3BsX+U?Nz!?mBU~?m&EW-IN0#skLx<3y^8d7{|Wc zz?r@uHW*j8QYw)h8KFu&dWwxyk?<0!EF1o~JnWtlkO!zFT7c)fW?jX#lEU~$ZoeKy znRo>)Tm!?m^lJ4gSxCtlDGW$g1_Vp=E>4UNnN5l;*m*56kkG`4b`uHA;6{=|0JqNFtz&@6kZNg2r@J_h#yEVdZsa6Js)X=5t+J;OkP8X;9{my82{Il4p#TGl z7)ek}Ox0J_5&{)bmPWWURAeLeKtuZtxJ zv%tW6br%GS~j_xfy zhUGfkU#%c6BMAp;jbTWJ`E|TsSMJvvt)LojlmW`=eTvEJerpBf8^J@3rm4S{AY*ii zHstxz*se8xu9eg+M!li+`gnwX4n2fXJF}#`yH_-B5>3Mjd3Z1k4~mRf8Hg@Xh39og zA%|kGfe5QaoRiq0afXA6`22Om>lTsZmhl%c6SH`4zpd%UyL`!jh#u2w|2X9vvcbSI zp1hJqYI*?`+C~46O*BU0{&GkX&Pt3d0Or-jx0O>y+r%gy$7${WK*>PHov5S&wN|}} zN;QR@u@Pzei7a4^T%OK=^kk-5oCBIJ1HEoY2@WDnA$AAZH;^DAj10bxF_?>0M2o@m zN5USF!L*U_^P&3~Ac|~K24nJ75SD=(rcgUvdTI)(CS7qChq}Jg7gNS{lA0=0<6l|n z({0C`gv8v4;4+Z|83m%(wcfXS=|BE?({bHD>jv?UcaL-EjF8++uCF4417d{)jx&ju z?uqs=P#{&}%XEGPk6iBGT1v7;{5|p38W=*NhVhMwqJ>7Uks3El294KvDhI zQ$b8dA9#!(8v|dN_0j`BsSXZyR;0-K8v{!Lb!hM5dDvb%dgYPdv#RUmcHpuz#!y^i zWcd{D`Rq6R8u4~?L9!|=Z=5cpS?u)4#ZeL$;1{@6KBPzobhN4dtg zkR?_&LF+z&#Us~)%e;JK2s&aq_L3#se?sT2S*2GeS0uWM7Rw;5dC}MM4+qi#J+Z+yiotu2M~rY=12cu`!o1v z`^k2_i{pcd?hY}f7mMGl7q_}C;c8Zfb#s@DOh_6p+@P-1|;+q+eu#P0L&_q|DJM8 zNZ7|9J^t;xN}B_IdXh{ycN`x_j~u>zpAXStAr*yYJT3oYvd=c$-4k!_g~^2$wRiU$ zc^rEhmV{Hka;*3*9+=QjmlWEJJ?a&w*&cOF4t(kbUz^4Pm@Hp7>X_CoVTys?>|3WP zFS@wA7eMC8Pi=REm;ADuhG@%fyoejRH!kC;G{9!d=)F4km`>yRrs^%!d0OkYmZkb zE$ z;*A`~*#S19sS=wcl2g#)ju3>?w}#>=wuz1tRH7x46N#Q~m{iwhSe#!|A?rGaj`7E! zpS-v}LFkIdM%HT2jxnt<0~}iYHunels046iVv)s@>wOp4ZaelT+MAi}CeFeohKi_i5>irCrC>i>z?>J;OwTWjefDq|54_LAb3P3JX zxggZAYv-^|3*ymf5c6Sl`u5*Z-iO9c4?i?iaCtDIstTKsF4ocENRn17&m5qK7hGGR zFO*^%V|LqT3-4$@nzUq5K?(Q6g<}^QPOsTqsvOcL1sOMPJgn}TeQE3yK9TS-!8|L< zf6E0K8Jm*URY-yCVMV4L&Rb8elndb0XD^h8Zx|5#&LK>q&T%zP1itZ9C0=yJpW3Z< zN+_1=>A>o1D0JwqbQ}52#!s{BUXzsCUG ze0YD7Anl(2i7NT?OUD6)pu!8d`4e5jGLVO(r(;-RhD-_4nA_rQZO;|0#X~gWE%G6Y z8n@!V0bw+9`s+owkWN}&A$!ocOl?bZ=JrWXzh=Q7|0 z)={V3F{lGba0WwyIgmJiRxL|jyzO}bx0#OJc^0>FL`Z?O>^+L{I(c}vYe0o{vDDYV zgYzQt1w8VY5kr`<9q_(o-vjGUxaeLV;|KE~8&zJn=TCrLy-qPfj|te*2*!9;1UCQG zsYei|#Ghun( zW(bZr$jYq*B)8-%w{$AB?JH4yCZ&2NggTSlwpaUks?y*ar6;WAe5UZtPej~T$Mno3 z+j*QfF1YT!4CmZy5ho93)Fw94NV_5Tq|0>I|mcmUL^6 z?qx@!*2uUVsvN%L`B$v`FmbU`vO1_b6Qe@<061~&x{~Q*0y0({a=cR9w?2swN#q0D zWx0T+(cg*%@aBWSx$?+f|C7RLnL!|^7x=e`5my`)zaoG)mXlmuTyCeLqZx0b!f_Y9l6r1P%$2fNg;JHoiraxIMVI-vGkC*%U<41L9m+5IooN^D*PxGB< ztq1=&v=p1-IP0M6pIG>iM^F6?h?`-@1MFDjg|M!|CFnz#zImUptm}lmzwLl;rH6%j ziWZfs93K#L*`bEq^fc_EYOmG{r2cdmUG33&0o`mcVQj}3&J8n{*DNFa|~TcDY=R8Tw;z{W;xtj+q9KBpiw_l~0&ekl1)mS!`~JwaL`N33RTf8!)R{r$6BJ zBQ~up-0ez3U_D*GZaK|gO|yf?>_gYVD9`hAh(W?(ueI&DZVD_Aw~%Y#rol|m3uqmz zxp%=mSLOsJEc@k8Y2d@RG2U-%U_aMR%sWPZbGfE!>`4^$d!*6R%&Of;VImythjJ5d0KN2tS=V|uc;8B~Jj183ry*ej-aCdnbB(OhHI`Th?B*Qw8i_o#A> zftz#WZp!-W{p?4<*Q+UNDL{s&jDG?h3|QIY^&Nxo;9A4=rsSVy4{uR@gdn_vQ= zw&$QMizrAz7AZX?N#@vKekE6xUK2)+iuW#CvC739M~QON7J;h}fjLmX(=kTl6vQfmN30 z^sV|z`}#!V47+7@XW1_mK9zGcsB->06^Ditw+AO)7<+&l*(dhWQ`*F2v=c%N#Pp13 z(@Nu)#_}@R1F(fH`@k3Z+-ed!9{SL`6M1@;a}ZDa{`hVm9tbm)R|EePJ} z4ccCiR?8j>ITLN9IcJ$|WJDX^1iX|ApYD%2qi)@fERxEQE_eAb2Wd-d?NB_6JR6ly z3R24A2L6UHNkm6Re|26UGazJfwXfn-+0bjo5UpIaOBFXlD8DqAT?Bk(JFGrS6|c;q zXMRH+`yhK=A2zhBeo2;*aysbp4aq%VahXT@q00co($*V9De@M4dEkS)UzE#{ zkYtZT7uhE-hn}KY;uP^TSl^&?I@6fsjKyCh~Fm2EkN> zNo39!)RPezGGR}xk*T<21T@`#MdLUn6!IzoB|$K;zOnS86%Cj+Lv1-H*0a87RdXkw zJOTPUG(irlJ*f4y?Z+KSYP61{NG$LzLddB3huGpssa5%hrjmW;fU!b?ECy8)%H&~s znj+mJYI%e3cCR`)wS9yCkA&5W@vZ45FlNHHWf?yS8WDM)QIvr?CSOUHB z36qTxX8NkVSxB@bW6+DV7m29$LB@?6XxJK|z@so}+c9{CU{KPM*$r-i! zB=5MVrL~of&pENEZpy3crpWU@)}j>|xHDmK&yU*aG7%So1-`M5$2OwN)Vix-(5zH? zlsLW>?stO$Zc|4B;`8+?c--yxEA68wm13H~}3*CtvwN;InKL9`WHOUbt%>~q&I zGy*d>WN>U_2nsJUT%t7Vn+GWao74A0`^ttv51$*0lt(}SItrKS?f0N?ui`Nf4e(24 zGaNQT5^l4CX&BT;aOmY$Qu+*x$~03>zcF@^c}q^4GY2{F8NRnD$nwZD8G@weC2RN3 z(X~~5lF3o)oIJCyKvFTGJrT+nUSDA~92nN}9C0h=aa=_P8X*gln@aXMcP}}GREvc2 z`h?a@5x8%43iY#-5sG|)oF5n3u}s=XwtEXZm@L=}0zPC>?IaH}Y3fWX5&Oh(E{TsX z)A}kE=;7xMy$evJ^JLU+OIq*s5b}MX zd)KAZ3k`24Z`j8Jush2JYTjw(1FT3^=0pFNo)l`a+AbkCflP|7Ix#Wd1iYhI9_-%- zMdBaN>R%ity;y#D65oyLIg0;axq_{_k05$Tqxnobzh!dWjq{T#lp~*O`cgcU>D`gx zJ@3k2mGkcTx|87Hxs_PMYfja7K6d?{p~XS<+-3O0rUz>jf(^eR2~C;0jaA#YPy(_* zxUb9c9h2B6#8-L)pBAQ#9Z6i0g9JHh)3!D^&|GBJJiP8b(|vvyX11bx-bsW+Tfj2Y z-Stk1m}1gKyrxtcn`=s}n=# zLOVSv#{}h4{;K-(&$PV51p$;I(f^2absO_2T+5f@XF)tT;eQU8 zEx9=Q@2ccuj$!;{6Kwr|dTAMsTiL1<1Kwximu?A1%P&9z($8jstC%{iCA(Kw(?V9B zt^BVcoxA_DkPgHDi($e2&icP)SVYRdR_T>%{1ehKPQHAQ?fDPt@pA&bW^3Jivy^&_ z!k5;6hjjkwRC&*Qxc5js^8X?f=)0lU`bQ*2{^P1$myv#CqtPsq5!0DcG{qDW^1Z^@ z{8rM34X{vK$(Vc;i32)Tmt*k(mJLPPU9D5ZEDxJYRApDcmN4N9k0G7wVZ5P7SB)?L z7Pn3Bt(nVb2lL+@Z+2V$hhaHd`TQ8t(fvmx-ueFa**~2sj~V<&>haUZ``hcY{ZFqh zo}n^su^|6s>VeOs&sg(pq=7V#BC(3cXJSlch5yLZGnrZ18citd-uX_%vgQP3$^v8U z*AjSYXC@%Z?Ls3mk0Noo>ZZh0Z}M(aABzDuFtRr_;Kmov8OAJ@fQ1baNJ~&}y_jPw zW)#uL3i*&(jumZ$WV3n`7Ca}m2*j++Q#e^2gRLCfnq-SS_^LuDOM>;KnR8fD3tv85 zGeK7m=HFPO2oh!`BS6m~DhQ1kh*GLlXPWdO&vPn~Ni`M%*n{7m>l>jkuDxpdR@h!m z<@*?}8m+MByADfvsNk))Ei_cF_3fTOF3rvJz5RyX3Cx4WPasX6CT4nC_jlt%E&H}_ zNF2Vkw28f@`Y>nl=&CIS?Em?9rhd;MS#-0Cc8M2Nrw;BqsFi-C%_g~zdak$L9zD8h zcv)2cMLhyJ>W=&I#Sgp;BS&)01LPjQBRU6RoAv|ORV6cnsPG2$pSkn|`)Ow48E{bJtMql;Z z*&|8dcg}Y!-!LAtYz>0%KM=-sqA|9p%vOc$*5A{=0ywF*=Uw!li&vsX>TL`(by2mg zlNcScPh`&p`~sn3ecFNgfeaHyV}NwtNg^6Z%cHkx+|h2C5cuO}dC&FZ&5lvLj#R8= zhu7cUY!aOybMXeg+k=)j*unpz9uE^W`FM|dyEbkWeqg`2Q~iu*baygtDH3@4Rh7sf zYTA?`V`uph#iCmRs4yid6puA6(e?tKr67Jj2E z0|EYnvRDHvLV@V2n-8kJ*iy%E@V}|YHB4U$5qxYsjFdXZG}%ccy)rC-syPg-SSgt# z?d8>v16T{-O)ABAu1+JHKK>WOa&s=3a1Mqr7%VHI6pe_x@6)usEpY*OEqwz?%umVD zafs8`-ida&F>4o$knb8K@R)39NV~@aqu(bBRpH0tbJD2HAiEy4PE;owRSM}0hH?ws zQh?C%7=zfBSS@YFomaS15Afk(^0;Kk?jxLulg#q4uDf7n7c+iM{vt_V$k;L-+|xFC zs-E%E;nsml)x1k5!-s`#p2ri zGYyX8sD9V9YCDS1hts#fL(7gk`{zS++xB=}AO$V?TI*%|$d5wK3^!&EfvXO5#GuZ( zWI?s!PsT(CG8gQi--jXMb)NTpA-@=(;(P@F?|EKCI+Q-e;ce?V_Q2zrqgnp@>+0k6 z*9Mi^4fgw`HzNHPMlNZ(w9Gm(@*}o;?0&H=%C1h&JM()GM z>E*I68Aln_#N+>Q)$(N|!ry1LDX(){c7)V+`6#pZAGnOYrsMZ)KZb zCFgFP4hB8>x=M}kBnV2B!rS-?;5EO z{BIc=T+Pz|PLcj!mCOG1$ZT&~|3^n=2YLR3_#-;s&K*8$A1_f#3@|@@wmbFs$lS_% z_q*dqqy3ks5((ergPVQ#b*y7bdLC=YDCKzXPVl0A61a7dC4D|0O+QKne-yQ*B$&DK zWVv=#zdTwUBSxW8&ac?uquzJTmoJtW;kz5{uOE&~pb;n#E}a8v83JFRj$wcQ>8>ry2a3nS*Zn&3!gohPk3Yl#A# zNWCNu5Ul*gqfd7d(B3Mme`|QrkB!2lTM<)yPjrj7hIWU z?$hCzW*v3ImLYf{JSF2&RkQUdmvvOZJcl0TGM|3+N5sF=)wwA6aK~AH?Xeg`H~P}3 zT62Z9cBd?XYrv%}LWOJhf5>Hf|EeK-T%lmjW!98eC7AP~8uy+nHVmPD?bX?hj&WJH zX|(3oc34>9Pq}RD&)9!5G+!uTs5__scw|;$@5R{|TI0_szgVscE$;l6 zT;}uxc+_3eq%x$5RLP7Ni#3{BFRWphtE#md&%wtj`^~2CLo=yb0%J#D|bmUbJqdYsMVjcGxcn& z`_xGok%!-u8biI`v=;v#zwdhT9_Md_KF2V0$~#*Vf5Z2#f2<)(b$l^bQ=@e`&rryd zE$-6x=dzFRVSQ}ja7VgoyLO8Z{{JDD(TSzp zY-zhr+-$2g5&Ydz59X`k-T^J7?^Y}ihE(u0O#VH9mi{G{i2wfXR_FQAVV71ritnX% z2hoc=%@~G;mzu5oM=#X^QR`=Ck8+v$Nnee_{pF(NFPZn}_zuVWzrSlgXl>^SHnW_Zfu}> z)nL*Gj5x>!lQt^IEP+a607&?vEkYZSWJ9ar)U*acM!(8LO#ZT+z&+NaEq3o35 z9QsCoWJCa^Z!SDHp9y+`U{G_;OqzS_+9mv5Eu-x;twZqHi`QEFk$@pIUHKNWQ};ww zSBlFQSV6Z3bT!<`pFSn0b!|gcx-7m6hw!gS3T&Fn4;n^+0K()~0l_t*xUgs3 zobjlpoYpV5dOAe0py(Dw^T8}OoxG-;xmr9*EVz=6Od`$Cwabo4+1K6-hI2b>h>pDZ zn&i5!yxmJ!z&B&J_l==hL5f(7i`vE@P@Glm-E7c)n1*4^_owzveOxBVTK=|%&y0`+7^HZV1VTs1kL;o>KcR_UL)*dpF)RlZ zpFBTzY;X$1FBll)^Dql?Jw35-d0tBOMS}PChZ>PPKGl=uIUZj(55!9?szDPXnx&op zhqkxuifh4xev!tl8+UgL?%G)65(pMUgS&Koi}R)ZznHA z`10^NcKcXhQ>2YyiF8mU8$B77^h7e1Z#N2nYm1EqX-JH?rS!-!K)m} z3Nx_pI{e9XAsyPf@%2Y%ueRrPly=uq_i^uQTf0-n(f2dltBxP5)p8`Iq@J$?TW0f*JEPb{S~FR@vmk2LVbu@FNgiQD)^S}3W>02v z2REsFAv>yjCMj2%dir*;`0^^!PNJ1xMc0xYHiBDKbyNgx-`9;vX{=kJVX*kRc`NqA z&GDXV%}Z4M8db6u&-^NUtxK{9k@r%LlBeN$wGD!I#@9DG)Y}weyJ+#NH@7djp1OV- zIsD>z;FATNHZey2A<6VBh2-Z+pR4nMDIC#S83Ug)iz7QyDlPfLJQbFba$QKNCj)Mpd^;iO<0M%%l*lL@^#n)yDFUEBeM zLxwpia1ydPeu!5CltP#SFee2l4_l~*$-+O^3CZ1djjV8$@Qq<}5!%KwOgxF}U^doS zV=yW9)_5e}oW(|z&?2)Y44ScP5+nKmgJuXLE7HfIGq&IbD9LM&Cuqo{6@s-S7B-Xg z%pai{ZhKoWwi9g7HnU|T&fByoH6zsu!7PejvTLD8e|2^tcWbYtAlb_5MP62!m9-O3U%#a9FKAE3(|I(P zKAev*XvUul^;%Y{WnEgE>NUQgh{M`Q%Ykyadhzs>+OlN0=b7^l2}g~KZX-ucE5ReS zCQlx8c1+D7Ft$_K`iBH$tqN+A^ov?UEAG(u;G;Lmmp@}Z!$H{`IsrH~4qd2Jv>zIv(dNM|`?A5*)6hPj#b`MxVW*Aeb}w7o9f6 zRzQ{CL_fT*!Rlgp;k{$#CIhqp?s}QO0Vd_XNkIdyzw>5d2)(eh-oJ*ionQ;~k>3j4 zH)2h+!)@b6wp3@6-el3gO)F-+E*N*?6p?|%WI4?g{boBsgFO$b@dC*q^mx6gt5tM? z_PazhfyuHoBVaG$?~MH%TKZMxA4~8~a3_I}){v7OSnfKQM68OqU&%5UW-$ zP${-zxG{asALId?1lu_GsbyUrOJf-#{XXFmp%Y)MbB#mjCvSIlTEyOt| zEQ)13sVWt;6QIu^tuX`Va6<>}jZI@IJ!eFPr&VqJ=~EvLQTK_p#$xJObHg#Ig)Tf} zoops}j!(Wx-9o1P17|WYKuP?)*Kxm&W_$pr$g&|xz)Jm|0t9^vrU3<@$<+_)QY92N zly!C9p+qH|x==N7gsE_Re&$JyEa~V0L()v72JxLx~ihQq&p0tbKe#$sQeT@+d= zt*nd-*x22cp6~4{EzOi+-^6DV>90Jl@gmPOr9r_SM0ayoghw%BEB-oqgixKWs@;L_ zk6kEaT_0<0lQ&vJ@CMq#?^GByE7G_grRBlTQNlGyqs2x%d%W3bJQXDE)Kyq&-cJ^M zA7-Op5S=?a)YRLjBA>7x>c30JHaJ$9mzS3K6ZK&ZQu9|>k-)0(bM6;~)bL`-N4R~C~!n%hw(T1z86oE^xa z+JIZ=42;w!%$U%iw7p(h4rZcTNo>#33TN&q8VXlRsdRWp%ASA*AlH;CP@>sn`?y~o zch(;^#tx)q@`T!J>>YAgk&|tet&iEq&7{4`k63-^8S{7+;hF!F>5`7J^ z%x988OPac*7aO}W*+C;@x6)krPc4;G7W!U7^zYZ@X9FDV_eH)@YI_-2RT7SF zy*x_Q3$dN3_Z}&59y@q>zS#2VaiLz-Ci-^67Q)^*=1_6?t(}@p-VU}MqRon;Xuo5FSZ-RjC;9sW_*M)DFsnp zw2?q`fnVWlz*PKua9D&{YyxJZr1hTnHToe_7+ZQCryAPf>brEHy^dEMQJl1l2mA z*to6c+Nlf(V@>zPVQ~O<@Vf5b*Cz?FZbjH01&oMqoK(J5%6!i}O%#5ZEpfH~bC`5x zz5{w4gz$c-+Ur-AlSD%oW>RkcHsQL$=SyhK`%mQ7Yf%FpJC#t~`PEgbjvCWcJfAQl z!;&d71Q5p=6T!kYv1_+zVx6ywk#9wUYub!&K%IWnQ*R%c_qaEHQGR~wa{|~-M zaDl@eNSPgrsW|wqPyY`q2%rx{mzEmWf)Qy0@#-AW{sy+}0ebc!NM%<>-wfzG2n@Ce!jN@* zM+NT{1_3Vm$pwE=k)o4BTw{-i0Q=w+Vi2)1>M$(vHIQ-z(>#Eg9ze_jig-SEs$9+Q zaUo2aVLsE+NHyV@e;1Y#upPbj-zU1AmY)jMIbDCuUjGw)^ndN>Db^PJ+llV~XHvpn z{l=`{v)3PZA8Bm=MOeZ}32lu>zh|#u=%e4W*Hmil&8LsE*RLL-p*xe0G`2|{kiSNW z^>?+Cna>1EJ?hZ!jQ{mS_x%xl^oOtn5L!^b+arg~USk&VtH0b5Ylsr3le0+Um)D0R z24_c|#kh-j>V->F61qfaGCfPAm7#l>p>?S2y@_K}?$|Z<+T<6)^Ary5&5vd?vHAd8TlUC)P9&f89lA)!VYVBE|ZT=xFO_MEQ(9l2p#{Wc0fYI2b zjnH;;gccyXxuJ}2=fcAU_L((tB>wOlOAS|^m$78r+Wht#MM`q=lCAbjONxdyi^>}J z_dizm@30<}*U$Y)WBXHBBD2{zT(xuk2U5b%J=#Yao3r?8?LSU*|2BKw&-SDJVh(nI z`twA0@Z&Qa3OfvaL}YW)^^X(XNe{d~FR&M1*M>WNrTXoou>6yh;9X$XzdQIXDe`QX z)_U}8gsu(qe3b9&zmXFDiawIN_$9M3{jb?;y*Cw?bI<=JEQ?2s763?qzk2ORu;2d8 ze>hJYN&l~pDi|>Lzk2P$(WpxGB~$-SBBbjr`#t&on?(3{o_@xd9=19xU|R6|Jk6bE zG+(%v)a>#2Q8oSQDU;1DZ1Vl)fF;qL0YSv7Vm-ba=CvQc9a`RmeN_GV+eZ!Y|NT)F zK%@2>n5+I7czj5HFWakS1jlPyVT0(Ai!7vHZEerg$ zP)x@`4N+)D0L*JA+*AvrRirbHG~Nr&*X0%1%o8J6ZqC;|ALZSQ`?g%P881S+XX>*h z%d(aDbVYV6iBBYOD_QFyp)h4t_IC3F?6=SO^tsla*~?d1fB)_K&zWYuy9!$t_{I(> zvG&E@XUcB)m9U$K#=T#X7b`Jbq8^40STBSvJ=3Ztaq{g+$A6k-kxnx=$cjTRblxp1 zZ``+nGzmeaC&Q}d&?zb!w_C|8TVY;%6>Rd|=IvF<+f1__R(C}hiBJ?5h}2M;=sUH% zcIXuJtFBzzRp)yCDapfmPlFUq`kRo=e*@-52eE2z-zD4H8_uQMr#f5K1B8CgiOy%4 zqF;l$Jqh+4;*ehfx)q^nA%?P;I4<1g*Ybx+NQJguIyoO*RbKT|Z#e^pd+e+idvKbD zon)F$_s;AXQ-)-ed3*M70_dp{>jvaif8h+GUH(c4BA%j~WRg|rNSb1fV!Qkzi4}D@ zXTmcG^V&l=uI5csR2v1&i|_GTt;mpq8YyK0+`hSds~=f%-8sVReR~c41N-HXVS{7m zq0mOI7yf09^0--Uq-Yhi5_7#w3~AD?yoFIhyvet+LOAbs3sSrn$BIOUKB|n^&CKgN z@@KtWo#WiRJe*{?pTJ<%$C@^7MtSn<4-%nX1DeR$sNiSazIcN1M1BK%K!>t?C8g%2 zCen+-=cmDMdix6rT}X5M%0b%GZA$)bY;-QjyGvrnnNXb40savs=br67!* zp&k=n2sG3>zXq~L6pOgA0ce0i#7+Q0wLhx1DxeNrk<-lSC*HDzjKM?W7wQm5ENvvu zbrXmF(%cgpHq`xGsQ921;7tNsENqS_YhF^6V`D>eWq0vMnb;gc4>98_o+P8W5wjTC#}1OSS;-+n=NAYJ5!#O~ zs+n!(*U7I@bJkoi#B459sc&y;{a{q!e~<{3-oy^Jf?`;g%SIpwnub^ypL|%72Z; zG~&|rGKUI}!ehHOze%Z$l?!N{XEi17O_iUb@X%gMlX+$rI?x_FoEA@L8+T@gE5<-n#Kt<`{dQrwz zQ2l1-4D(i`VrM}ar%Al40*N@=Dt+!;V{4M2Bx=7Q>^$ANcvzS|XV~;SEg+ z_52*LQmq&lab6fL__A#|{18w0_UMUfXI%0X`VI3klIlRYUw0Ly9uwM2SkK4wbr&kX z2sXBQpm;*nPjuOWcIjnT+4d|f>tH8>6;+hmkEHXK*Iis|GH$g=M&pGZe1b2>1qAvG zi6`hk4c?}NyjR&A`SsP2i1RGqxX6?Tsd-4_*gl@Xc%8Yamb7CkE2&A01UDOv%H6oe zx@al3L;{WWr39YDT7b@;R0VYG)yGYj!RJ5`vJmoZASC)nT?FNZWzlm+Wu4E)Z)yvK zCrg&==-?~Ztv(`Rp zR!Zk6tvkQ4Gi8V+>P@VYvQsN@->~|U*h7l2E>o?Dwd(ea>1(!~Sye(5r9N+)_=tC7 zeOSJMEZ#SXWZ|>=rpQCvH@y>+VHHgSuxdG(!qT?)L?ML&oh{Dzf{8O#Z)c|6C4N4+ zypwy!7#?#4Lq5KYK&bEJ`#4wKO*|(`Dw&)s9Dg=|>{}NPIph^!Fjem=!ca*sj#lKE z@H?Upq(gX!oOs4mX&Xqy3ptckV|Z0HXPaaTK_kfx5(8R&>mW4LzlsH9m{_>}4`P7^ z?EXI-*nbxbBcA`65z49wm?{1<%l75tZ?QnY7Qs)J!q-0A0L!vj%p|)u#Ioy9qGW0S za(^>InT#PUO@m-5Plhyj+}~L?VT3z)HH#V_v3Ur6Mla^I;@X?S2bosI{$EPRCqF5KJg9y|x$~iovm$;1+%q3sjty z9c}J;OP~K|mhJCCdDRc~kq`4v2UZ$grDO>=p1=h|#fc>`H;8)px?56Ck1pO-;8tgn znWnL1l|XKucTk$J(?tP1(NgkMm`Xa|L=otE(IcP>p$}1=Jgf!MNggLg3nJR)17mP+ z2aOY0k%p!zqDW@VG**{{KnYN>U;}O3rfjnqi?G=77FWW1`wcRf*qI}G<<*{x~NEOGI z?LUfzN1^`Wsh4NS_3&-5GqDKf)87N+O^_iu@Q89|0B!xccDB$Z`OTV(?{4N_2n$47k}rO zV_$6-++T$9AbpBWZ3a_u`Pndg(;@C_&aX`zn&!+TRM^};?Xn?9+Zok0M_pUz8ZS;# z{7Inig#KiNY9N-;Pij7SZ}mlQ#N2s~dc!L-tibdA{Fkb@y;$TT1}{!9w!@30d7Rs# z`fux=5g(TG$MUa7JC9&uLGl>DDYW8Z64(fq!$|bd&`!6qe0edMK)DtK?QxfJ#sRpY zK|AlKyFb03rr1IcR=`~V#63)LXq1g7NgkJYr0*urylingN6m^A%rShZI+|~J*__yI z!tnEmoanRW4}z(nDRegK*=FYpm7KWA!B>ICS5J*5-h*v}v&XN#d*OTBiZ+BvB%Jko$agGjIu7IM|^|jBkEMU-VFbhP#i@F9s(t-~!#xh9?@7y2WSlL4x5h;&8jr z{=^nbn_^Ylo&->{$0DF@cL6_{%Wygch3CY^K~qnH2tY3`_}0P1i<2}$8xSn}!JdTB z(m-)cV+hoZS#~6n>$NO<9n(Lg;om#h9HOnkdPIhb4y_putFPtFV(DXJ z=%!sI*)#&2VoE>rj9?q9rDcZ^LA@7Zb&l8Zn#n`oJkK3@N!!N(ZI)$M-Uzqyrcc!Z zF)D?k;Z?f=LorxrggS^hy)Wt>x$<|7WUo_82Jw0gU5yDOqN-(+=$78l$Fl)?rApQY|`&}A~i)}SeX3& zxDVuli^ernkSh$B>_i{S08c8UG@tGgJ4=hsfXb4B&?xwTScG!ArxcGjoe)o7%0C^r{0B&~9~s>>T<51p1WxL4(t$U>^H3epO$rADNwq8K86CW@B>jb_B48VXdi zfX8E-yn^jW`+)*c<1+nCYN6cnT7Vkz3|SrV!5}oou~QspJzWZS+F<3g*pU3eJQKC3 zaN*J6Y#DNY8Y>{g-OwLB@EsAeGdp@^78}=*yeY+MXQltA^oZwNZ}8-6Y(Gz)f`0Xv z6MR7e}mOIYg>BY^gEA)#<)CeMwnWj6`4K_OhNFLxrt~#6L5%3&F zlgYCi(GII+41)qINS9%Bhd3>_A;!4!d}1R2ng6>dm;kFD zZV-mN-LFi}MNh$J&j#m$dFCaVb{$Cd9X;0#;|NhwKLy)iXZh%j-C8;jGwmdkrB#2_nd-e+{Ol_cAQ_%DMM0kcabUo;ZpGv z`(bo@-n{w&eCu$0epFgP4Ox zkkgODbV&l7@jlU}T+UQO0juTyv4(R*l&xQ4D-bh>3!7>Gf_LKYRVSxLdMM z>qe4^j$CH9U2B)_fj&&~ynzZ9KKH4^l{uTQ(ryH5B%sONFB87;79Qa`Ijea;3?Ro* zG5^pVI&G-RM4ys0de(50@ zW`5#HfU0_M?!!MHAQ4I>bQ3_i<_Fdbl>a~>O$=Uf4^+8%dsZa-@fn2A0<1VF(|3YK z6lAA#=0QsH9=7L=L#&EKqoR3()7l$^K_k*#&u_5{jN#TW+yzP)Gj-Rifc%2DLx2Js zK>__L<~Jd%@WGhea>xp}ddVSJnxRdJpaD}*K4Ue;%Mu_CuWo2FNLL7$mk@?kgK;E7 zIO*bw8mE*IiaQ4vj`nwt6%!^MPyd5-T$AGcAJUOr(p7rs@2nEKmqSB!#S__5ztMsg zGR*P`tS^S^OaEOu{?liAtU>&Nm;Xx*qV2cO^xu#7|L;9kTd(na<&?eg<%@%P`^9g6 z)*wQlx~Q2sH-D=^=w`nVXnw3gz@(#(PuRmBH3*A;NJm_~?*Skkl(oP{{`uG7)n5rT zL9pZf+P~0(Va!D(uo}egOy?tB{*UARb_onEc(uFnN2XJg0BjohqS=@fN8xv-Qy%6s zX+N`s(P;mEy#MX7IvoXWry2NZV5d9uvoKlOk6XeroxzQ3lINRyZ!}4Nv6QGkTnImU ztOg0L>hSPs{NV`Cn8N#h)u|SE>y+gQemF}S5C3+!@cVfG=&}A?I`$=<1xQ&G;n~=jcE2^213AM-B7lA34IZ?O-*CrwerZPIJVpaV;3!X-n?``o+ic zksLo+&0J)|S}#rd6-!EC3%DjAlJBdMN~*j(n>S=!0L=!$z18&HuyP zrBvaYiqgN)Xn#w`vk|Vg0{hWdPD;*Wf&pl%!YJxjwbt!Q*5smEQ%{&tdb^GGYLCEVaQ+c^2JbQ z`9JXTR0hgI5iIO$6Kg!2(Y9;@-eWi6@#(ispB+d=~b?T9?+;ld`mJ(ew#wO@`G03fc ze>wlA3YO_~hvt7?K?(7^X;|2Z9@s3-t`(g7=#xHoe9-UxtF7iE>9328IopTkxUtU< zP;0_F1R*j9_DJ9Qh2Tk`Q2IT$2F;4^3Zh9}9hyO`!D`7Wl8JLCR%21XEPC>h7_lS} zhL>knSsRKh0MEMQ2XVn_5GaLRB#VF4Ai_|vpfAiFF-F&JG~6J)Vpt%acR47w}w@kcZJ_CGvijJp0;aGaVZ@4uSa0cV)p(^-@MW@f{>R$272W$l0O zT3IL$ht^Fg_Ne1F6-IejRz3oeo-H+;Dos<7^Y1=(t@H^v{4n{fsx_t=qRndcjUT^H z$;})v1G$D&BoHtNSVAraC`MtyaZVC2U@DLT-457n6o3*~<2>;|M3ztDSD6<7^3lvr zt|AJjW;VY4yhVpE;B)-EH}qht3L`Lj`4-|M7((^fwfd#-16DvZL-Q{3IEQtuUd^Yw zhkhN)R3Ku>lTdc&?-2a%3y4qYl0uO;n|+3Si%97ku|T&L7+Ilh{d!uIY*D26QW9S}e>>e_@k_MKRz}MtlH+#ij^69>77Y=E%$aRT zyJO4UT&V`sU8!U3-8W!h17e&I<{FDeZm4;gr53M58W1PD+Gtxg-v)Nb5rff|h5XeL z$)&6EpdtjXprHowcuvH!Y%1PE!}uSO{q*Db5TsWRbU1&VBNkEV>*JXXY!|RrLm}rS zZ2p#}HuXuaHGz_G1c@9fIf~ktP3&mI*;4+6Y_tH9#vaG;tLI z1kROU*M)Q|X}3jT4UwJ(5sh+8Zfh>(Ztu-8OXO3U94WG&+Lf|MZThFZxTQbUMYC{w z&4hQDe{l^-xMH5i&+ydOj!@hXosNoKw=+n8WSq52L0v|vnGh5YtB<1-bopjWWa{8o zXa+`%;_Fq)00wEwZ?3}3Y*k~~=P6?ivc|>t4YKA{Yf!3<>$;14CEX^Mt1847?n(Sw*D59t(57)IP%pP_O5bL@ei zRc<4KpbtO3$=%EINJY=CQ=yD%IS}5&tWpR1HQguxnC3gtkwg4JfN(_6U>D-s*Z`dR z*GP)-T|rzx8sfy)Dgw=UWb^=17GAV%WG$(m3zPEqPlwj+24&)M*n?{47fD&za<3392~J`7WpZX#$JsX$!$He%Cu6GZw?<6Jxe>#@==zNKhvTh0N2B>{QF&|Kf?vkP?LHNj|o} z1qW-G%(4K9meOoucLdaeQC^FSXh|4=@(qFZh!dCgYD$B8KN0q~3_+W3596qJz~<7} zEU~@!oumMrRB2p;5AU!`VlWx7S(3uyiMZ%}3=4MU`3wpfU*?hjA`jh`^^A>MJbkwf z!+PqLO()l06mmwfsJvmF@rgYvD$u5i5)vU8zvX*RJft9j-c97^v?+)OukOXJLF;3~ z6N@lJg^Jw$v`-FD{DDPVO>tP_t%ob+g>R@XR5~Ux*tPr>5}W>r6*1Zn%11!l$~<^+ zwmyl&4h%E1VO^{CBGnS7^Rm|qZ$Y`q+SF}12U4_YYW=P@W!MXHVietKK`O5^&W678 z

    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%0D+S8GHjz{$m3pA5#63_48l-nu-4e>m{1C`j#Hw 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

    B#DCq5?XWNTzUz_8W7GNCy|r$~w5)z#W&%x? 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

    xFVa|J~k@_UEG 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

    &r7mW)N!*yWWO@NBkr%O#*QIKQzFOgS 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

    >usmlwilXfU8qx?jJo zV;)iX-`0zw`~cSfM&SQXYkl)01NeccHRpIRkv?)%gcOQc&6-c=8l@yUAJya6LhO$S z*WEKRQ^G(EM){m9jz@Cr4>wt#a#(kRbBUvm6Z1%``;wm#zs9%OhzP%|7tuZ78nq?; z$dh!PE?p1E&ch*)^n|TZ3FJgVZJ@{T(oSvj)%asvDd@Hhr@dtk`L0+F;sRq1E-{^y z(YuSw6G+kY7YJu7t&*DM%7k#Nx|l3#59BMwQ+asOKbvBvDT zrmqj89yBxgbA4~w(^UE1dgRHhkAGjbrT6Z5hH|GBKr82lPZ?@oy-Dg8!wCne3+;Ad z+EsSDz!TwO-8(*3^x?3m7H4hFOgVAwE3qtw^=u7aYXZN&6_RLP8Ftxk8t)F=AFli| zh({E8i|EP_jIMQta@?=I$8F9R4kqpk+)SEKH)Wk9{%rgDhk}{qGcKxIQNoAQ_FllA zOox)!hchk>-~J}>pWeGauOVhJD(B0Mdj)avqx6n?VPq=_O8cL=Et*-eHRG=v|TM^)& z@~ZjtJ2C&;*{ubDTg&GKj)=2?kjpsEU3nCjG(v#7BtZseqcD0vEPNYOHy6DAID!Ul zzjlnva|4}xE%_dFy7TU8@Y%rtt^Lq2uRZnR@nuK;gX4W`oRfGWfVnC}me59x$`Rvq ztQ>-?N>h~FNrVbvJ#f=Gif!Q)5P~W(T;52`1|l&yE$RC1rR1Hnj@f$7DH<+ExE=%vOu=yS>q0*eHuuEp|E#6PCU4d+9HZZNMr zVE2Hqk=^U`wjF~>sBm*I_Vq^e<|i-kbIlo$Y3$Th{L%RP1&sUerE>8TL!6cb^`7o= zz3Rx*qI=YDqGK;s9NQ;#)>SXjWWXnu6V2_`H&BELO>d=oq4SAv(5~A)vs?RxNJpf$ z12b9HaNL@PlQfSeh0fC}?E@8gn?)n8+?mrVG}k*chCP2{an9>Ezw3ED6P$^-2DQs( zw&Nxd_lOq|R>BRYr_ntpY6^3?vJ{F24L@h>%h8@O2Wb%2nbW)hGF_s(hJx5VX8?2k zKg_-LTh#5|?=1~OP0=+lbV)OW!qDAF2uceA(kV*A(4C@mN`s_9m$V3ofV7lIiGaX7 zgV%Mf`&#!}d+oiCXFvOR{(oa;qA!oR_M8 z`Z$)>^q!W@t6T%L(wlV+7=Ny!{%mqM$N!L$i7Q+OPso610Xy-w^LxIaYzR-B3(GXB z!hm39s=Qh`L{RggNr&5DxQe0nQYEUmkG3-*F|87t$Wd$RAt((%SfU@xeOG+tWvTaA zl|x*f`CY4LZyqKY*lP}%(X14|7~Mp@l}!AFUmw>O(oiEkSZozoq+Dg{tz6hXaXcR! z|GulN9&Qyzy8zaEf#g7XFDr)q>E-7u}h1* zpTtOo&&1Zedx!(#sUZi#pncLWC`10>mhRIT9?gy=9tyE}()vr|Rbm>z^HO-sUCN87n?MC*p0aCND-AjbkblQ9)%#N!o7|UeWWLqbQ0Z|(>&7@dA(yL`(leEj#z0a4(}G? ztg+MnvSoP2uSd$>Yg@{B1IvKR9j>hc>oNuAtKO~+)RZxs;zqQmBC))Kj6(jDutKL6snB*0yMwcW>sK782v2FX|ImD)$ zaFP`HQ}g0i1*;UDz-Qy8`$11Ir^d5KN~b?l?*wFvb0Y0BC|h_SPEt;_k0(g9CmLt0 z?uEOoEn9c@#}d8~PE*KHc-_=8p!^o%n!vfniq6%NWPjnV(PW}n)iehuliSLhuv-_N zY>v*}r8f5@p=JLL9J>29i8lwqN2IMQk=J?j9Btb}aNs9+d79=-@_dsi={Tm0pYpl& zCH%p!w%JQPb!UtJ=%bVmArpnT<&WasbsHNK-mqL;JyyS{ zhPby6)w5kimS#9giHJs*qb10?h#UH&K0K( zS_q#0s<6pPn?W@&fv25)`$N|ci8&m(`EjVJ{|kBbnrw11{>0hUr?7z1Tg7_snkMPu z401BErqaGt=H0CtL%ZG{uhzOuXbf?h{(gm4By&r&jJcnZ1-m*UKwO3o&)Xf}lTkNj z1}+dQ{L&6~66qcjJ11wQJtd$BGopP8F{A=Ld0lAu?V~Yn=aYUnWh&-JI0djYPn?Cw zAUexnv6KJ;H=OU{-rdZ>hwCiMp}{KH&f+*?x7|$90)Q+*GaPVWY8T0Dn8C{#hKm_i z`WBU84wl>$Gr=zWtaW|&pA1?80OnJ2Mb1F2iBNcQD0VUp8KI8)EW^juu$h9ebiPr%hESo_=KsH9~cVS{jw&}bRm8)$*BdSOEM4uXJSZl4a*=VAABu(&cdA=Lw* zPDA=U7M(m4MdvKIc$4zEC~zS!pxzi>acZqyXQ3(@ixKn<8dKVF!u@CB?&zBFgLQ4N zB6s@ZR%SuqFsk+axH+)0Rb6aXPsk2J{En4x4PH#94P6#a@J&|WECP7r6U(M=f|Wjr zF@j~YGoi>{f2t^M04ssegks&60&J4RET>KrMNc-!$i(IA9jw!@NKv>6DZZg1FsoXu z6I;@$JEc#_FbD$UlI9pg2&T>;JmpERAj!Oga6!)$X(B24aw(`us!CR>T5Ia-<&;j5 z6b+g*Jt7JVcX3XmIE)Fb{f3GjHAqSoNZiL>Es#zum`HR$l+~2{8sEIg-FsEk?8F#Y zB9{&kG%FkjdPo4rgVNCgrY>7)7#CN&P9i?YqNjkZ7y!fkfUCXi8BxGz5+G$;V6Fr(S2crSS@Rn%yJZt`Mmd`)IGeyN%f~M(n&lY| z7FP=mNY;>tBa7viK$;~MIWFj*P=zFzAN|8WfAlXntbU^k|J?AShs{F%c+`<&5B>d7 z_j|)nPif=?p;Ch~qbLGm%7_v*kxA2jgsPauq? zdRgv98b;(@^|{%#(;LVv^5+nRE`$HK1%Xi`vj{~N{wJz1RW;@I^$=zKJ?96@|KpE3 z%n;=ga(1-ob_Hx%l!y6)AK-1+UGGJ-vOM)&R=23ThLn|nFP&v;vnPD?47=ZnC zG>BA*)6(_C;ChI{-l88tZ@Q@;$)Lr#;H* zbdCqj!@pHq63=-2uSMQL_}rU$#ot2amBQGE=*gqSxW|*@mAJQxOw#4Hir>;iZP&WnVmehqF*~y;aL58Z`-k^?w^0q$MV{ph*U{>j^dr_u96vR>=*% zCfnE;FI7kGrJh}++_X+#dGIoxV7FyPpKi1ycz7`ATO55j#M}LqOr)=g_fJ|n;wwFKm*mggzi8=Hq#IpIq3rIH z8sgs?_0<2}5XFaJtI3jpkH59b*6{a_zPJ9v{=ucso-=X09p1mp9$bsO7iM2QC0P7i zwuL-OSoRy`{?mexdxzv~=tL;2doAQ-M-M<^c;(QXIc8SCqlg4aj;Iiajc$o5zyB|h zx0KQcQ&P?CW)Bko@ATh=#P@;Uoz01d&zc1fhQF4y6dF^Dgu4&56O~JhJYZT7!e%}i zqa!@CF#F+XC6oAbZZ*uueecGLEBp6S*^YT@uLCEKATKO`FB}5%x_{-~ARtTS;ZewWEXmV6NVX_X|b=`U4Rnw(S zD3j}eSt!GSR!_hqB_6nrQjws4c>9PI_L@C-8#i9y;gQUzixNb?s@BW={G3gZ!Sl(e z7hd%#(t81=zAIeX`@`^@V4RhqO_Nz|)Nr@-`(OhBDj)Sv(8gT;i3d*e1RS@^4~+*A zHgfp>8uq{==>VNiGVDS?460Kql)6VoA$l|>KGKyq=999~&}8~(y(xcOxx+jGS;Ua1 zB>k%~&A*$3qJb}s@tAYq++G3Yf0%^uV&n=XbISF8h!Zz#8~!#4d5KRSqc(7@%4%tC zD#?*MsyDI|Ywg0z38QFDC9;99^m=?L$|3jAAkkL6o@(F0=(*XUJDJo9wTmGr6A!Bw zU02<8Y|OisXg3|Tk2n?oJk`O%9QK$0W~!6l9r^FQiVow9{}ksM$|3r|`nSXWZwdfz z^K|)%JU0?!!q0W@awq{sl} zP7`EuC|L7Da6T0-N6=Our-#BKR9;B2a-*0daFaL_!w!m9S7P}2Q3WWGY5P@;s|C!& zoOC@iF+uu&JTWKAQ)M#!ON~KOY@H}>k?z25Ec~K;BipHI3!{y@R%6T~S4k5M(s1H# z`A%*r+#r2f+xE14>2VdV< zR@J`eUqrYK@+%H(k8#`#s1M`O>Ul86R-M?c2`V;T?cuBzV8L*pyxhVe1*WE>#O?db zEn_`kQs!{My6Y9f(|b8I58Hodcm4K)?xgbYG|E; zgtTYp7N6azya-%_3hYL8WahTXaW(P*kB+}65x$+9x)cVHNj(ZJ3oCVWiLb6bz=-@> z-uCblXc4dHXTqcM{8^{Wn|O-_MBLE&X|}_sK(%OWG{y zRWY!?9|zHV4_qzd(=PmY7G|L!sWy(M7*{}8x1Byn@-f_8r<53W8b;%~pP<*WLSUEJ z%>g(FHCGrT%I(O#^)#p<7&Rs{Zh+Le(w-h8mEipnUOdi^~iG*?MqU@(w=!-X% zZ*Ql$W*!%@hZCw{4tv+K#$tgdTpA|aAF>J>OT;v{Nj-fE1)f3WjM9wInM(c0+$KWl5l@(fI~jz}`x3WCcbWcc*Bm zsLIuF=k6+CMu2qf#VJd zCQit^CRI^Io~vCuQ7Dy@Ek~!OO>ORnVcDPC<)S*Fo(iB_w4+ITVg|Y@FQCyjQJh|} zWb9(;w>EAW-z;SQTg$*LLX0-f>^0F(XG+y-x$MvLQS()>j^0kTj{M-g5DP~CWbN?~ zrKAJNBlSh|I{f+Wic}!z`?D_*`{FEn z;Wy|WT4G&?_C7B~w3{7}1FXZksHLdtNGc)g&{}F{(MJO@_jeN+x@WtX1_cvrNvy$CSp(dU21rR*O7vtyD_Td0m}XsL z{8DA#^6V>1fx%PJo)SZ9!B}#S+zbU|?CEqiu^*2NZ)D6`qeqVb7Ewp;AX&|oLTnx=b%BPmZ|X*e zSY#{x(o-pSw0XvoW6E7tH~O-$;C9J=A9vc7a#=#r7Oib0xlCTXfqR2v#f<_OmxUUr zEcw}O#;6dSRxbn2dB>tK(FcZ>o=sIxC{6&6mA_Inww#fyyFH_mb(}tFoq1j`-H`<= zwQYV~=LbHD7w7)YNGP%~@_n^T9(FJtH4063i9^*b`MT{iQyr>>u>N8)VkAMZYaK+% z<6@KfRrHb9ACyj(&VkE)d&2=nN&04REHp<|qrR2W+f$r@%eOqpuBwlIMX#B~1HT!o z^&Ew-nYplYqedbh9R=>wzkKmgrGYBhG0`2uTsbiSC^~W-fIeY4IOBo6x&jhi=I|aY z$BxJo!@OKXmCtkr=}!Ii+CFFuI>Om z!xk}?U&{WS^ta*)dk`+)9*?f9!BvLr(V{bA*W|Bh0*vhO_f+hz?$LKqDIaKT2dLzc z_~pl>@6x+T!=%9HF|M?7)HMUPEjT_PX9*Soz*~(F?SSP{o9{5BucD0$r9Ds2A#RkU zYLN_(phf8i$-~H#;QJSuQ1masf@JjS$Q7uWd~L_d3t05C3iMc-K;&}@hH3CdWM~CNu$!(A@eFuPIm}}jDlh>4NfoYh%7P9Gd5}bB$Prc)>2u4+kWJ1L zL;uny1VtJ}pr}CREez7sRPwXn;r=jJd+PSuFgN2!TfqqL%*gu(5qIPw{W;kJW(~ED zB4I0lr<>HW`w&uPlwN)K8oDl6%93=H1BgF>QjlXeu|%y}T1E~)o$aI6C!+EY(M875 zQuU~k%;<`iXoT_O-28w_W7PUbPm-@rdIXS>^e_O(mogJVL>+@~ev3f$okXSJj zDjaDj;9z>Vq+9$qmK(_S`|$I!U*2Y;5{su$TFZ1(H}wl6;o|lR`d5yaBVITt+(jIU3bDM=(t@}qFOC*cQLTL*t#PvH$tJ?c!!!b%-8Ad4g<)jLbT z%}*u5O4Vuw8K03a+dVblg2+pN^s+#^RO!^rsj^6eGLAGmRnR;8H0(N3=S;u*TRyNl z7q3CkbYjNix{UGhbi{!TNoPD$r-4biCIUm=3ceF|2Gn!_xvEkJoW>xH9xb|N1skVP zB?SYQeJAsMlT<0Pwm|uxfH_==Wi(n-C{|bed*y>{Bod4nd6`C*apSBEE552~D=O~> z;BADIhqIasglyaP@P2#h&n@iTTn5UAnc@Yv-)Djv2T*Z-^0dfjH6{srdC8wXJ!iop ztJ`{Ri)MeZX7XauCKS0sI`8lTSC`~-5iDTv1rb;7aTKV~;RR79#er(>;`p;44!~s- zre6;5pEN91`?-YKc}|m=fHwHmr#yl>9N>ALd~g7EFc~mA9}t}H)Q5{Lh>y0wqot*! zjwZvXzgZ*;XeCL|iA2VE1&Vbffg1!V`{eyWtXZHuJ3BI)j}P9A!*FRHWa-#HIUy5h zOAv|%*>=E+xma)j5a}V1Lk4gwuMlqOzhaWNYgf#aM5FCrw9-T-ifR#e@Tw4a|k7n zf=H#5H3{$KI!*=Z2L8CeqHejM3faBomsJxLf^HQ!%jNh7#o|d7UioBbd^YfQiF-k1 z;z0p6h;#zRaRjT9v19;r00%!g)N_Lq1Ry)(mE&rR#?hur7!6i(L7rQIT4xCv_7gko zO2vHQuiKC&8jv?I(*jVVKT(BbsgwYf*(DdvWY=&YYlSCrLk}te?F{g!nP+@45T+b)fAkvPBbH|t-nl{LR z@GHGEB+e6p0qL$HpXm)_}(xXi>xzZw|o>clyT(aaT6a!>FMoOAap)Iin# zN=?KZKeBhTDDCcCEO_I|O|-zIR-%8g}?H_>|RT{HzCP{V3nPJJen(V8zvM(&15 z-m)seC~!I3`9S!Yz(zx>8oXBGuJ;U$?_cv+zMLhd?b#=Ye3S zEUJ}WI4T0b48Ys6U#vClZ@8D+TSebBD$==8HXrY3zI<=D5JMt9_pWjP;B@j1_ceI` zF*NR3$BuQg>O>J)z|9MFV1WSe^-c>(rvve12V@sq1p}_|08d{+15FysQ5}IwfXAj? z>TYk`k^b>|An-+}!^A5^E+FGBwY*g3ZD~e_7#|Uf?n1&&0xX<(*&aO0J3=pe?ps!8 zN8Qw?eIUOJiM|7<5vg0N>$VMP#?vMGG3#eQ+_PZQQyET_mk2%~cKOWgR3g~dFaxWD z0fli&KDIL$VOnGBJ$bs_SXOsxSYMT$kedy^@Tp|5Tkk(c9~dFcUYw%>BZvEg({pFV zSOqkg9C-&_bqBQF^KKCJXPZR=%ObQa9*$)nQ!sITEHQc?&~yRV zz|WPr3;1YJIY;D5Q_)o{JuHo6$m4}Aj`#fF9L7hg<)7Z9WlxFL7+#rntzL?rGNUTq zAmyZIS>V+oof-Hs(Vfgg)oTGB3h*12hH@X4^>aZbb}7C)QHH_@5>K2vVt_lm_5h&~ z;bj^X)k}1i?2j=rYd<(U6o8fEz)t36ouEub1wq!bO>)`!E4=TsVK?2hE^v z_&6CURfZG1NNO^qWZcGbg7X`YCC-CyAtpZSEklFLq*>BTlXYW1IwucR{b851YMN69%P;hT-|F$PIi5`QfL*mByUsm4eXbWc;s;W;#ip2gg61}k$WC=TkhFdh1w zD*VZ8(Yi`h)olD5_^pNKahJ2H=AZm0y77WPDX}NB9K^I|JOnIH7{>yOm1f9wC&}E1 zX9;F-Ea!;oh_#dkV3xPvngPq_Tp>{%)jA}v-XvANNop4W)HJ#fWd@;DO1L_ch$lV+ zEpHQc&R0Bv^w!2^xY13q@kOlthkmxT&{Qs!) z_fIh|hjFI=^&!!aNa4so5b<#*SGV2_{qvCM4^Jd!BXBJ*@+tmvNJIs1`NI?Whr9^w zk=z`%g7HM&<@HpA!G%2oRWKWYqfR;O4BzXRS0`x+MqZ@Z)cp=viK!qk9AW>HC-Q$D z^NP}ZgvR?LR%zQV+`@<12uOVG#0-i45%VgLaa=T8*Out5ocR*$dM2y}@}WPz54xH^ z=)Q0IL{C9*{XzhB%P7;5oJrAXl|0fM(HU_k!_!h5G;O~=20l8~A7JCWvd|P%Bw0z2 zamT=~;qK7YusEDE;W2(ir54;|Hgi2(k@1TTlSsgD>L_A1|!U`QmjmBXedwk0AYyKUMkv^KqNQw6EpdP zJ@?+yjC}zZ8RmOh5qS=_nt)#8lr8>%p}JMJcBmUCxye~dB_z}=e}{7#TK8T|x@C1N z4edG68`yi%JwV}3Z3=)p@gg5`sVwHN%SfjlB@kPP+2dzI0o=9PXmc)Fa-%l)m6p#W zgYrp6#@pm{y+y+1GR#WGJsds=xA!RE;X%|Z83c2A_LY-Ib$RTmB&KkO2zE;k(BWdD zleX6>3eTALT67YCc^Xh{bban+(1 zMx*N}Iz|pjIMj}2yD`{J+{`)JR~_qH?n@PLiX-s~FYaZ{9d2^H9DnyvYfhsgp@Pq@FTJUko2&y|21aoR3o^NmIpe8GZx()InTs@{lNPU7D6{YRWA{Sc?Ys;R7-b#`pmy;mtX$%EeBpwxq zMp-lL`1VP(4J1en!R6)=iGI}X96@@8ED&KOoJ;FivWj%rFEN(lUCu;Es|^cXfoim; zP)df)5C@eitqblZQz;2G!qihOB&V7lI!VQASuV<#e3<@rA_I=c(h=CQniw9&iX=If zHKX+qZ=A|Q`hR-iJ}?P0fvSiksA@J^B&+3+tjn)Z_m{c~^DKD|h>jHu>b@w-nS*jj ziW4P!)qg08rG)4L{p8}h>>zF zpCSF{bH}CPmt45ig3*AW8@RLx2O@OcRN>SLleXf3exYO{INh~EXM`JB8*TW~F72gJ zC%5A3Xka~KPbL2k0Mqo)bW_`pD%Uv2yIf-AK;t}Y1n`dOPf03|kRIBMIkx+@hY_8$ zcf_m^n9kqJfdGNOI)5e~0t)Ig`ABXF?a;{Xzlu?oNRp-Q{*;q5&``XfI>Mf2nhg_? zsEH%Bzk6Llh*r#O`m2I4%^Y%BKY>A%3i?NL;t%xE`zAUV@I7+39?51!w`$GbBd z{t-?(Xg*KY>v)=!pt-qhzO&s^N0=Y!KjR2Z1K2cee026&RsVABi9BUXP@Qi7bU~Y* z*gus;Oo)xuE%Nc*h}(Bh75^kZ66{W3NfiB~x^cq02$t~yzJM>j%VaS&-H(rJQBv4e z$oSJ93L5Ju-Qg8zMsu&gQx%{4^sBTytnCSn2c~W6iFW-I>g{CP&w@M7deZ8x30*+rhP ztkn-&(>Z(dk$Yj!>3sOv!HAsXs~k4CUE}{znoE&Osq;b3F7PAM8E#4#w&QaViWx9+ zvihrV^u1;yR<3ZB$547un$R;ihq-zT=X2WhCeKf2Mc$7@X7yt2_dhYZdAl_-K=&QLI+r=OJc0AO{pxF9p&o1L6CeGXC-N})J%mgYEf6wjGnK~< zpRT)FkQz6HO4^b(KDx(&I%ZoKPo%=4d3uTZ^VCaCm8zPn z1pEDl8)o9D8JE!G+Lx?5-3*PNLQ^dD;cO$0RPk?K7Bs}oEZy>`iN?DfANA$Y8yHqX z`_khO*RC*2*sTQqX&6p)r_|K}>sYU1=8dzVyH}jn_xof-Zo1#N|027iB!TU=_W2|Z z9#x62)g`2HsxUN#%=``2%d!E%J7wCyxw1~ zk6pQmJ{#vyVKH{v+$4UeHa+(CBwyp=+s=cZ=$44npQ7N+17h4;hg&Yic zBvOJ`%!EHb=Q3k^{<{1*hQ9iRNd`~{UCWE??>;mN+D!5hyz_)`HmG00i;OxLj0lDr z2LmREDKmqam;FjQgK1BLVbmckh!9re5O&`X&dd<*mJr_A5dPB;0qRgoD*x^Y2i?*@ z_A-YaHxY+U0#Z4+2n)#efkPZVJz$@lyp%F@-vT z$Gf^m?~^Qta8c*XD6YT9L#_c3F4%qllZ_!o^W{-wU7>R5US8|!Y282fQL}kBiiih8 zmZFQ=d#tGj%@z4aJgoYd=s2WePA?vmyieny_u;GaS%(brOkXT;pO1YcH(JV>ulrdu zp5WZv=G1;@y(Qa>JtEYmT051Xw^yC%CO$s=&ad#P?9rXDB&hNh)%uml8rjhGrjK=_mD{LTWt{JJZKTjB zHRCUw8C0TVvIBAub=v>}%iFn=6d!bknc`WNs438&Hf+YD_m-YQ@9F{ir5{T-C29C% zlB)V}MPJ_iHE0NWhBm7oF}a8A1|gdFF*3zzUaV>IW?7G3zAI0+DGIt)eFbKp`H5)` z^~xXGTt)(VD4(|!-F;??#toL58K?SP3^gCG;~^WEjUij{hj5yJ%KZe0(Rj}U12<(| zm*)FAT{5`fxmb~QA#Z*TgoA7=fhV&#w40*Zlli&KI%X4?l)JAJZ*`UFu)%o)&=Z+S z>3cH9FC)+;50XY0(UPl zgiM*l)+Cu?UR`YMo2NhF36)LT+b?VT(EgJQZ|Z{Oslt~m@QuuOyYTgwVntMlrUl#; zW4O!&wL$2h)iE*YOgAS9Z0B>Ls$x%Fxje1Z+V>n*61uUz8PKE9`&Wpc@)DkcAD_$a zVMLUm{!u?CA0Oajb!IJrm0cM&&m=9-yEg1DzD0W-!u!gX4a~~9!-F5#s!@h4cdIj7 za0!=&Rlac~+|%pH3D{o>spKrJ#Kc2B6OJ-q@FIg8=$?%%(LG~$7UYnP3f_AKP5#Uo z+H*0+;eYvzF6)p8%B!py+8x;tzKcC7_L)RT`w{c2Ut=n`3oMc1My`Q~>Xf`hbk0H%UsN(E1VnqxmGmKDrSc zt@oL~J2v+Xv_24URn@By9jtqOEi0`)#{eMiflaFW`G4&;&M<;@u|KVfs%Bk=N+DUd z_S$8ypxTt*-~N2@>3a{k!G%1%U|`}gk#0ibkERDTmnZWd_PiwTc7J~Tebyy4;OAy( z&DHsKBt#2I+j$fC3ZeVhuVHFVTjtmAK5DkQGV(Mz-hI5E!P{N=6x`CWk97@z$ip>) zybG-?HyLST(z>#gA=CP!k4mHW`fJ*L*oG7XQmLRTEwPtTAl6b5A=eGfb_v6Y!o))c z<0Zcrk4kk^A0YD)7n0}iq z3u$Kt`oyY}2xL&{u_ChlR*3x=>Q36}{ek{tLksLc5>^<2Nw6I4VIoQzlLO}(kYzti zieR#g_OB#MI4~XLA`i)ScwQ5QqNBQI_dVZMEL1M>Wb%;%Dd;>SIu2?7|N}i{!f_}0BCS0mI^6*8E*7We700{lZ ze81x%|Hy&QM78mikN^pnLq$Ge01(+>ti_!=L+ASFME=>M+#BCe_&EOrfcU@KM>V{C zt_;)R9F%TXyF)*rp<=7)xa*qt=g;6jOqSOGh@V3a5-E}B5MD_`0V@PPP|9)<|?c~*e=%eb+VKb5Zw?1mMXQ}$a zwkgJBIa2N2{QiH`N7Wi{*?Y3hilK^~D*=iBo5_;kUjY!;ebmYcdmZYMnU=nAbAJ@+ zOA#tY#&Q@w_6jhev77xbX*dP|u~+ugN@JDwb4y-HdtJQGFa`i|+AsU3$r3*ETuG}w z`LCbB_(v&5PW0@^#fNbS|z5VNKEQn0x z$=UA6->FGmm`k%7>)&0Pmh!IXU5VdCx!`sFe=5r5zX~*Br5z^R`ygY4M{_2B_I)%t z9rrtiGSssmjzo{FcHPFL9=5jIVIY52hKZs|!B2uQ#8k@EB$oYZ@t(XXR$hr<)D`j@i)MO!6R} zXAqMmc+|ao$P^!Cg+WI_FyT6wiLEs9W3ec*S%s3*IV=M z?>0>`zj?~YwCS-c8_4r$ozZ`%pCUgOcD|#>vfC8sekFkhxuo@LbF^Z`P_?`t`gPD35+NAmwmjY%}NVt;=)m4zh0f{BX1q>UkBJH6tV3YPCr2v)|ZLYKrtwrJ@ZuACrdF z>W-2}KGBmCoDN!Av&7CaBqKKuGKRscS^eOI3atexIiY1+LliQ`9+C7;W?iVbpr)O@ z_I<6j51fXA_3t0#Jo1RVWz?aj^MDRu^HHV{5ln+TX<5CAtS#~A_sJM{Bt--`NsguC z6Df}CPM>!7^ZV4Q1GB2>)8p?Lj5Me_XbTZg>+Vvt6w2VXAVKTV%bJs7A=Qdpu=eYouvcgNXqYjmm&)PT922Ecqe-~4Ej++D|od_ovef# zJvv)wd!j6&q|BGPB*ROT3fd^jc;vtQj8ef?LV!%&11a!u_k62y=F#IxO^%}0O+2K* z=;pgG*ANE|KB-XajpEm#NmS^Z!*S)CPmUQi(alE~$sXp?^!a}Ib1CxXwPf!L=$N!k zUjY!7je$4>-8t>PIG%Aq|Ash_O9vT-;lXNeFjYU0aHQ6GxUUYIdM_Cu%|^YFO_I!U!Guwk|R0Ny+-VrXy>Q}AHrxj{@IhWjnhNXulW(oH+JAAuOo zCws6-E@seyO-YRhKwD!j&8N6eNb3hXVlkP@=rvz0%%%BKtc}a`;NMb{uJzAuOpxVi2=HFhL*@?_;f`3B{{HK#V5MBAl zNgjALN#Wu1x61Qi3d!X+Q>zV&K9+U_S z3cud$cY00&i|1~{^I!>T;>%g@m*pv0xP}q7o*&k$o?UfFln+kC%2X|lrehnek@e~E zX2||};G$Z0R||HpZDlN0J5XZb@C<7-x1GmsH_IgX5j0*8sQd7bbbR*ZCAH`K1qQLt zIfzf`l#x92Tdq^Quc`>2X`53oaC<&5sAJ-OKA;=dno9gKls}E9#4_U@g?fj%>6@^G z7%PVuK;4PSrv(m)$cr;O2b_JNEd2~xyK=J(ikZ6cJmwci@{%`aapwN0 zJhK%mPBHNByW)9KFVqp!siz7g$^@8oDM`c%tZ0Mw=r`v%w4g#NCd%g??-{OAF}Fow zs&SZgFkjvKuyy0r>GY1}6KiHPLaltLdDj)r#1gNg?Zh?JbnupfY&tPHe3`brMV z`bue~1|aj()iI6$%>8ofgdQ=#vBWypE0!DUoo8>}v6eubL9(Ji^rXvvyS%KVjYYe7 zsRN(PNC4f{&A@l|p_k7|7GEnlAQiYwAtRe2M0!VWCR$(Nu8#)3GlA9}-{FCq;3YK2Fx;OykFmsi{aST(W*ns$?>e@L3EAuz0|1KpHb;SEN$6T#FO$pI$TLQj$aW z3~*k_cK1tf;fTdnr3S{#6U{|o%-SJ#oF~rzSgXtc(9dz zmrS`hyI(rCpZ#k2dk~=pY^y^z-q{J~DSp!884w$Z_Z!D!afFJLAoX8+3|q@1P*&*z zXJc?Y8uDTDMR8X}2JTueufRflyr;1i> z5S~a7!%;B?$78VY6X;G*v38K~HyqFZiU-0D<=mVY9M4opYI~WI_sk1J zu2)Ti3~XOP(1OWy;B_KR-@$z#mw}gy-KW)amy1^Bb{ST@h>&EEY-6qOQ?w zdIfa2cC{nz&ELP6NcsLjLg+~0xqt6jkL*|YyC8+p*KI#`9!U}QqfROZJ!iXP&`eB= zFZ_dm z4?ol9isIYaa55mXAw}MVim1sILp>vri-gBfnYeByK%97y{s`CQoyU;SBG z>HUeVnpdK&T=K6d-N%VN{ExrN)Dw9+BFpbhEjpq_054N;9a=T-r!lj#Ar(_u?lyL$ z^JHcX0*<+mCsY2VY1qX|iMIJlYdbROCQ3>4MT{bj$k6$RBX4Lf9rrr(KekUb5Q^{C zs*uR=9z-51?k?V=cua9nMRiXjS?ZyljiCCmm-N9PW41)%t+7#$d;Z&ar-vF}KRO+a z{DEfsTT{x}U2pLki2&yNcKqRq67G*FT`2|8Db4%eJf}^0M!aSWAdQVG`fyya4>4CM zCo)UaZJHmQh;c{fJs=8vnx0>)eqJ}FzWx02cihZV@gX|@LV+NHVtp7gMVN7FBHgj2 zW&YWN7m)Wa^bHym3&jonH~$=kVOXfOfhBqpb(p_;ed)F8$9v84>)SF>my7L&5R&ho zt)#jvE)MaYyj&$6R@T;e_oq5L5b}ENAAj|RZsaQu1xG!U+t%d0lpB~{%w7FZuXLpN zVYG}kC_KtACM5UnjDGM|P9Qini2HnpN&m1&psbA7|G9o1F2?{O%_2U8`hxTuKDeGl z&(-FQp9NBOv-6p$tTm zf_qq+M#Fh|QKCy33Uj=GD4tyl;|*jlw_05kX>ftu+AE-H5)aGKem@04L2!JLEE|Cn z=+@=|x!5GT9fTzxBGIJ~!nzX#N{zy!pQKWWQ;snfiK6dL?hl26;h_P#ENCp1apQ?- zmE4c5>K*d4%U;}`RyBi!5R|e0p$$;8V$-8=_aL7b6zb@O&%fjJQ z^$VR$YdbC$paAe#U!&PPm9Q$cR9w#U&CNWSJu2Wz(zFo25q&tZZIqPX!(6FGI~INv z;YFB#lIvU6QhY3S{rANmV^HqQi4XOepZbIJ*n32=1$PuGxf9(3M1yrcZQXfd^Dc~D zC)ZrYp~4nCiL#BY|Zh)z%`Dj3cszOqEE1Me;FF#A~=!hgN_D%No~ z(PnKXXT5AU)VYoHgnzmVfzksny_r6jv|0pck zWLz77q;`OFKEVGW<9?YhM4-g5q~jf>vyfsB+YFm~n~=Y#k#hIF4a4lBE~zA&L)kTI zq0?1#K_!vH$d-PZ=%@Np1%)F)$s@5tta{b$@L*nRnu=ra>wYU5cY+OBoUf#X<{6Dv z@ba0#iJzMEZ(s#1TMUote0pfWUr*fx6H_kr%q!{@y73M2PahFp?Y@0a_pIem)g z#(}%$VD_T#g|Ww@6zs-dBZ zTrJ-wnZ0TY*EZ@PuTXQ&ua)Up=LjUiWL-O3W)g2HO5M-rrzVK2xjFE~u33fBJCCy1 zql|uh_SMg}fW$Wh_n1H5xL6fF+yzsl@cQMxR$9tC8?|14r#2{!8oGic!h1fmw4KWg zGo+`dC?86gq_ciHCm-+Tq^g6z`ARi;w2+|iQVm=jl^P74;1zT4AKV4xHe z%p5j}jyxv_d3?mAdNz&Y)9mr2V%7Jml=Ufr)GJC-Y~LW7DFARSh=bV&4+~($5e%IQ zBuFCq85s<)2_jzhmP`stSr2CG1f=T#NjITG#k$eq_dj(5a65yHu>um@d|NC1xQ?Ij-u)>F78M@ydDVVC0Jng z1}H!$c36-+*Mdg#(AbERF)q`xsD=LAo%j`YtSuIqdS;YZSS$z5&3E<;!<*E5tnotz z@zNOBf@`EI7U>Kje2$YKV4TXdD`4FwM(2Rz12r^}5KPcV7b-yLQyVwW2}Kh^woj?L z5UzVIEMHY5v@KEL6p2~ZH;5c4o}*Zrnv?227}_pJZBztH68@f!T$UC7 z4`4KU8875ueewIhK_}t&1_v8T$8!Iu&~nP7l>P#v{hx;5z0VZ>UxDC#;48qq0)lhr z_*?6bntwy^-evFI&tD%ebg^Z9gLwtaHaLD6y=;E7x77U|{X_W$?Celv3Q{?f(OUhp-5&YZV@gz;#BDN5CSCC&IClIai`? zmq-3L2p(LSXWsV{`ENk8j0N6W;%%0mLR*FHSra_8z?Mylj!^5z6a%I5H4HD|uL`Y2 z1lND@66}=P15W0%UA_C{b3CVi^AgIxzW6=c$M6#D-Py?=+M7?)SCrk`kb~d6 z1m}#Wm8lgN=%jm0)Qjtdc=PVzdx8G{;w4lbjY|LI6%e^iUg0(#ysa*h+f0vvPKsuQ zazHfDtH&}_%FbT*-xG>xw0@@MGx%t7|MHm>7sq_eto`4>XjOMfr#SIPWtfKejA;CG z(OHTOKKcRp)_!yqT3_tM{vY<<`Y+10ecP69W(I}^8A=*yhtQ$B8>B&`L_iv(ySt@Z zq@`Vw5|RcY^FN$3=XD;(zHghpQ0Bn;mv~Wz z5Gs$k&A>UYh@7A%67=__+{w`V~6aInEp@(QwFP z$>Sl*biVhFB;g#G2z@<20A~9ahwo}x?7u}g#os=><7oDT4aK(j!VQ@K0GfX+#BW3e zV`)k^f+*Q6aLHQF10T@oi0m%aQgEWCL&g=#5|xjCOoY?}%et^dorMIw3NXKEMe&IA zcrnKGW8V4$pqVnQKPgf0hIpZ^R)y3=U0qn73l19DQIFyK#E>1{0$X&?myzFU`AkC= zrS3XKQexvzG7PmYoK$NzFSMeAJt-rJU)++Oxwa${2+xP4NhdJsj?41H~*5x{uku-=l_j}2d+|6#bmL<|B?Tj zxOPsxnkt0zl;xJqmxmeCo&CS4tOTdM5k+M*eN# z*e)`ZA}csICE#*oTWY*)uv1D|$=lQNm1%}%MlKgSu2YU@&<-VznzJicz3RgZX8jRR z#`K3U*R?pUKA&L|i#hR22|$*j&%7Q_TEpzMfRJ^x8YPK6J{YH)X1_K3pzq6#Vhdy{ zkj9>cYYwv^+=3QZ5WKGatd7^bhFD)cILHx_J#UPm$~f)~r_$H4QxDYlT9)DqIbN2* zLrGxta2G=@<=8!UC&I*r$ry3y_3IYLxmEE6)kUXT6KQ;Yk;G8*pUMPAxTw~HAr{x* zE_v7dz=K{oCvvGWsv3!dUIgoYy;*8UYuzY`U+PjcspqlwFiAcXNMp+ycSlr;XQI&5 zL}6|lGWeGj@a3Ao(IGmJ?6oZ=imsF1Ind4H%sG$>_1QSv9nok8n!Ss+vJYmBHFJe7 zd9`F9t4L>AhD+lf1yK`&NAi%32io{dvzd$Ip&0L9$>F&d4Ge!UWU9h<8*%y$!h1X~Yo!8_PhXP0&B9$;05cHgMw z{T{Z%ihyfk(yO`cg#;Yb(WeyZ8djiYydV5<{TWiGQyi%g|28ZYbxqY@8F~=> zTCEdF53e`Xl$qcuHjEZ3oT&Zq4}TW#XOS@DkJjxi%W9O)%c zAbA8{QDb1=am9hdclnUMExtHoWOEDq>LG7twFiqzLx+VQ``WC>ixq3X92NeET2>X^ zX$=u7;7jnV#0_X$(%T>(%pm+W4%?|1Rd>4w4uCQ-v{(QJmev#;*WD1lMtPL0Y$C+w zrZ4n7!Sj5v8^8OoTs2+n?DrEGzs}=Ai2YaVSn0yDc^PZrjj`C^oO9DXF7NCsd zOlSCBlv=KmNVEmf!mlRR)qtUn3*u}j1!WEPM7eV3S9V(lLo@_=`Vp87aqNG@Vfi`W_+ zB~i+uJv6M_-jG)3SIT9M*Lfg~yv;)>jt^&>X? zjW7VjC{U_6YG?E)t8C=6(J?IIGj0j`o#X=HffGq7vf$kH|FTO2rVjscmx%r>P6ov{ z84aYd$w%4bZrN)_`WzO+h&IH#ncpO9^<}C_E+ekny-DZkv*w9oca(trYGAoaWB+pl z3zIf}kcq`pbCy9KrKAFA=(lQ&dTio}zuzVPC4kdh!*QES{eAgQ14~#OoJslPu+dTZ zP-nHxt=AvNe2y9m{xX67YXC2U^W^p@kj5VUicR|TlTdOwU|`{KMz4P5I-T*uz~bT>hjnFO`3n%9 zFip(W;1{uD-dYKUe>1TB@>;~|Du8qR3VsEIH&#;aBqe2z-}doRSz)C46$n3PcFAwZ zujbEhUBq>7K%;Fqwv9BM_0cNjc(GVs7FWDL$Lb($>xiwI0FFh~XW5n zl=Q1HV_xBG^n`)eurS~Ber7pv#6bTYQ~h7&^xfY7E~ zVo)8MCy~s~)#QeEFUv7q@T$M045HB`6l{kK%iKXHAY(5-9H1Kq6e@ZgY3nbE8m}x{LTf~{KC-$cR=;Dj7A7fvNCEnPmY5)Ee`Qi*kgSgB`{DSq` zlis%W#n};eQaJF1eyQep+)-<$4u09S-(Sjv3`CzP2M1tZVX7Nt2Y@g1(-m_mQn|mw z!vDiLy+01I;OgUhAi-4~gOwCW`f?xH23!QFJ#F{&vaCL6?1NppEr#BXHTPDAl*Z~u zlG<=hGQ(wCd*v8b=NF?93vj*#Vc7}qFe=sd{SZ#);J32*q&w(HAe8DNpNwf3vM#PX zO-e_j*2=WbvfL?~Bl5Hsm-FZHpo%x!=`3sB7w0sw~7$2Pg>IY6S=&O6KS!$vV{@ z7DgQR;^6LJ8YnSj?klbr^w+s?&^Y?d^n0uAc1Kbn=3MRZ9C>^8=!)Gm1(?J$3oE*K zO0;`AG8B}yC*mxI74Q)7z22r}K3Byo7HcjIcD?}gc&bbD4fWXTQ0$2xJmK9K#AJq3k_-ivbngJ`&CZE=k{9vq==N3(alLd2#9B@w#c;GT(iZSDP0?oc zeuXTPUBEnZa~G`z5wdM+Ac6#JH@G$1T2Ab;yNSd!EbI2_W25BSxug@k9m;@K$9$6v z)~d3Pn5Y)PMLKtEJP30To9^d996G(C1HZhBkNYVHE%^O1dpFsfCZ_PY6~zb!4(@Sc zeF$B&+Hi;Th`)1`I`Sb_f2-7M9==GMv>rUyb#y_t0mL0QNyD3Uayxp*C$>Kf2CK+m1jsij8bkb zrrbeFr&KQzGwZVH5I2O=Li;1>FOfQzfv@N&Asi08uj!8{`(VwQ#Mnm5VY7+Fw~*7E zxR*?HvyoQWn3f5*`ImT5b@B{Q_ZX>GjHvdR>00bXd~zca-h+v}l*{@7)qR;en1#ix zYnr9X*>7YD4)Ofd@F=J1_EWwlfwZcy@(pk7r+>~W<@p%$TIN-9#@EGCZ(MI>!{OxH z;H&}hIW)Pj68<#OpwGN~jHCKSq#P?le{h!F7bdMtwqD{%a;E(Z$3ZW^^L~@H!=S*m z?44*nm6C^DfB(+jM^uXa4jb(?A~p#YM!;DnNQ-&9LW;CXBZR-H5dATm3=VZt6nPUZ z-qVD59~~I|i!!wrDI)=g zhvj!vBg8_L-W5_muehVip)u9=8qUkAKy0qSkfjO@CMP#5_b$z7lM$g?WJnFS@-xt;5pZL^sPSlg zJ-n)0V(zlJ(anAUmn08Wghpj z0g+X8$F2tkUFc*Jq!H$UU<;SDKDaQhH}8J;2d{NPksDg(PtYr$ir*Skn2NmLXt`Y7 zx-_W4?wnjc0%6nsO`&qn!L$sP{$*c(+B}@6wj2tyqqTX0Y=WUSD2{&f&`d0?&|CLc z9gMmKbO~F*FGDLREe-i2O)(>$74rAEtjk+9m_bPO#hn!RuGSims zS4Xz8XN5Oa$UgwjJ&d2`eCYc&$f2~c>QeuBAI#L68C<2ym#@}#}szY9VXj2r!V$HS_>FPdAik(8NX$7 z3g0aBM^h`QPAZqj+~7aqm#({hz3}b@i}9MZ!VF(x*=w0KgV8|?Y(|ebw^PJr=8-Je z`$)O{j1l(&Z^$KiH_hwC*T|QVW93ee0@lmD#0=bgCKTNhv0qrDnl&kQ)K2D+9jlgd zs%yR>Ut1F{54o*z3pB@l#;Sk$Ru_Qx!j}KIX&3hwJcf&`{1=UJgyE#NpgKUFrH z4X|TOQh+X{p-O9*>G30xsW3BKN_9BUUjmz=1q#SMK)H|>WISZj3>V-7*?WcGp0vRa zvO)h0N$ZQKnTQBrBQMp!FXoNJbRqDiggjP&)C5Kdpj;fHY$I;g6U4w(=_dp67xmoX zklBf-JUBS}IBLPgIH#3_Lnk`9m1K1{bYddfpcTRajnQz6YGjL1)B)Ej_|gSMS$4-T z)e~`LfS;|$P}TcXRJdkR#m}01(B4 zq%i~34=9a z?s%zwoo4WcBtU}i^JYRQrURy&6A20vQIviOI!TmvP6x+fG+9a4Pm*Y~LV$PO_>HLk zYs9ZZ?@)Qi!bHLsZNmf0NXFQr7P=DFr;`X#{3(q4$@E$naudmvh8Pl+jBD^za?6zK zZ5U)x0J`Q8z-^IZ5Be+t(P+D8wF}Y%rx~E7t;3Q<($kEhNa1bwvI4Oz*wZoV2}^|W z$kA}9k}0ed?`a#R=C5K<7ll1a$20dxA08lhRtCU~39&V?DSMLXi&6yn(m2s{5t4zr zgDFSk8B9T$et33U*PwP0@m^F=m9~3{hFJw0{u>inFsTd+mn;pbOn}u=$WGIkCXn<$85Q!95b(+3V9+-8Nmv~1Mf@|2dm_cfw{)6488PgO z#qn9Hy$#hq7E6hixUp#CD3#o@NEh)aQLraP%#>VrDKsL-!`aJYx}i1Ue*7h+HXe{bgLQ60^n7(9# z-*A8{qtiK73h`dCkp)HY4%*}+`Qza<7#(#CllbUp&(M=E?802O#De|FNx-TtASsMWvFs`&iyibgs`!-fJ=9N=-$rlP5 z=+KFVQLm+h%UTZ?8%ZOfi?g01XV7Vp#HMg+&o1v8rN{Fwt?)&Pqa4^JCFIsIxvRA$ z*y1V>>L>fw73X+u%mXy`*MxaWHEJlcxrNKbgL7fhBQU&~dJKzxH7@ANS+G}Rztg037_whzA5XNCO4HWy zhO2QuvP)F6OOWA}A(y?jV*n>@B?e!&i(jd?F}Y?n%&T)ia&jQ>+`xrpFvM?=kiS>= zvF%{w++aK*SsLa5whbgsf#hj~LWg;krSEf`Ae-blZ~zyiWw(=bZwP1a_D$UZqDB13 z$RME`VBf(`fUDAR7hH_&Dy}1Ft4?<8BtgG1^xPOy9SiOj2N(O1_IG)Dx=?(M0S}*Z zVxUD5F_`zOKzbT{?w$`?>;9Fo&UDS`f0VkCUz~*K5d-2ZEFq^x?7z(Lv)>JtM{33q8@Yg1$ zXkC65u~_~Z%_*mr3-)V&Q1H^tB-f2_V|-*nQq2jSTX#jToyGOsy^TLX6XHOfWx9d> zZYDv!CKu|$@ov7HF<;R1w4Ny2*cl`2hCc3$!1X?Eo@uK%g4x!CaTv1o8nI*hx8Gz+uq2!r0$Jv$!U+4q zW_0?akJ2+F^ZgdG~Hm>sYnmU85u~rXA|2$FcvF@G(G{VEZJ|;NCYp~ZrR$>{%q|DpHpexJvc}$o3 z#LCv}iJpF`-esM|M>75Jex@X#M9Z;N-85yy47X{bq%bzwt+NuDc;5Uv{xa1$Oib2! z9Ur&D3*e2IHPnX&zCL-ROi?7&i)%dMp&3k@5xbv2IvYQQ6 z9}&=qckUJ%G^hU%)y);lmCh}yiFmfsP-+|*3`cTKnRg&zvn9*>p2WmjgYnAle36eg zB(O(=sgqVfa5E!cMSY&H{NpT`P8egR9v9a7hOx(uF|@0@fyF>|R%=jrb~mV6yV$^M zgJ);k_d5M`;b|-yx>8iX0NnjzIex+sgiiI)>7jMpEg?WMe+$KRQ8k=;)d$K{FVXD7 zDSR?kopNS4;-r4x>2w1~4z@cLl72kh{JAq^g>obuIe$y}fZAU0t>|3lN&H%Pz*U-hzGdX}cv`^%3$5XNd=$8hJ(f1UtLMGGKDytN?eggJUlZ=sW^L zU{E564IBs~EX0-fO7uAI4JEJ}5Z4*(A#1M-+o;pTe?O2&$srTAVJk2Cru%uwwubY2 zhffly8u^~960N*S0STzJ>pEj!5LRgJt)rC0E<4^3gP-_P7X0NNTvZJ*nD|1x+$s!hwB@9+9RdOM`VaTPKx(<4z=QdcYz8vcKhB7gHLTKET1dW?~16uRVb)dX=M!mWUR+k>69zIuQK{pW$=&sKr@=GZ@$%(bmFP)UCr>x zp6K%q(p@S|PuG|I1B?2P8NN~MjJw~?F@S8?#Me*lAzPx3fT;3cOSF$31c4@E44LY_zu1lYF_HK| zR2i+cr7tua*eQ5X%cc2m*YL5kX}#+uoBbTyWcKq|+MoW)f34CbL}a6bxY*V{buv1h-)s6% z8uL+PRZ$HshTn>{hE(47%N#&Z6 z^A@7Hkq2tIt#>({O+VCjNbqx5KDY~!J4&CiYV3PpE+8+!&o8Z816=2qAFWnatlCNs zj&&~AY6xf?^!<%3hX+f4V_AIbvE(T*>{wlKOp?6Z&bH95Qm%}hjh>$*{6N;q*mCag zR&)}r?unpm>#>MSLeR>dKSp1Sn=FtFqkM)!3XGd&+%++l{XU@ZVBW36)C*(7PhaGY zNwW!iG6k)ma7L^1fH69sRxGKBL}MstfyvS^i^yZwFj}CvH3>u1l}n0bKpUj^kew5< ze85=Y9joVYpFG6Iu^&V564*>ST+#0VmWAyM3&KyUheUZ7mVS5D&0>^<(+@pa%G0LkK!@v=$O-R$>CiI?eD%ElxbQiDW9Ub+t4h4-`nR3nGwg7w#A<{6!bGR>nSz6r?~l zDGTWq*#p55>lK?-0L#KYZYmSyA`ijZ?-~HDZrmTOm~~9K3(S^>!l^O>uc`9E{IpCd z#xBw{8C;KhKd@w{)x}V;KwXDeUD~t;^`}YDXLq|_ zf#mU5W!P(fy@n@PLq;&h=oZewHgY=#(mOo;yyJms}+*I_w9;_HG7Ygj&Rce#T{QSwdEXB89$_ zH4riRbsdkx@*pTUDE89v;G1~txkvrG*x04<{@ph1K{nLjp}Hx@k85~~?L>0tTsmV| zDBuoQF6*aT{m$eEmd2VN(H-Am*khtMMq-LLK7MEpa2o%LzR~Bi^MV3XT=x~|uw(rI z9O@@i6QOgq{Z9Yk#kU&0Qn9Tk1S@I>2fKMm>+C3EAkkG`dq?@sm0P_kOgmlz$;J$w zHqQ`1odPV2m)|y=<*(teb)jQx2p!nUi@oWl!uCjj9punsJP1zweDM`YPso5R6s3P^@DN!pK7^4 znd`Rz|NrJH9SmHeBURVY7%f7{(23c9+pe|lWX{;NY68$e_G4^ z%PRe!yVc)h$ETO60%fj0uhRWzj+$G41DpM4xBCBZ4X^)=Tm5R44!G4{f4V&V4qU@^ zfj?Om9p9I`gRFpgCnHJrpIMv#U+9#5`M;Xom1Gs+jg=Jnbc|7Fvr!D92O2ismZJLb zAQs6ZxJ!(Xc;Jz`2(U&4(Z~Y%EkwVBHm2=E{H9UF22^tlX1}RB$bzaUp@7To?x{O0 zoMVh4@>{k0gl(Wk8hi>wO|KC)=eNLcyX!OkPtb=JWkhSv>j(`R(LoI zAxJRhh(6yCM;hj~7)@2mwKtz!fP@4D z%qBV$4JpD1SBM)CI;ZMc=?{S?_v z474|S^2IkX>2Cs}8I}xaJpsrOxe6jibPZuMA?hsjn^bayxeKUJ$T5%)a8a_Vr3S9@ znE3HWR-xeaJoMp9@7+5cKA$C+iW@UTaLRH8Es$Ii_C#_j?_$-~IYLp(wvT5U_$1kL zJi6s5ZZg}v;*PjjR-ynumeYWYzoFYk%rVvI4}%gny7VCM|?Q5N6DHzsm%e3^1{57wJQ| z%zSLwZHsttKyY#5p7s!6@F2MQsXlH|$Lh6QHRj_tyAqDA$)0%?kBy)w7 z;;nu6+yMq9`R-n zmpIy7Z~7RnPw7&rwHv18r|?dA4lNFJ5e=Ja?d87gZoFlJ&bV&XCtlqe*FRzf&U~aR z>e!nhNr-;)s7{$dxHnQ#B?=U?KOlUpLF~KBAh2)vjxDrNIKY63E{rYoDdlvJ(j6O3 zT(pS3T=aMu2J7q425Y?@hT&RU4%Tw6RV#(c;U~wv*Uy6n15DeRbdA^-sBe+cV zqBA1>D5#VN(vWW=6)FZINaZ5hFAOf>XBu}b6?}xLY^zXOfJq8p zCLM8!ew(|BSuWeNas3z;`eelIzSt1Ja=(Llr!sWy_7`uIntPdc{#I(aU8m$kFo_N$ zwrYjc?Ty4R(bPgB?{z5%$7HBhQxVn+Hn|s?@xj5%#q{qL6lk;nH|t>utBC?!g7v0) z@TLm7NQH!f=xDa-paiz-fUx14c<-xSH4%pf*&E^@7z>>%SEQKja)Ij1VI>(lyMjsZ zo2qQVBEILZGH7kU*;3!0#-rKF^l?BNf}bbVI^K|8fAqS5@SqxCZI%{MeQ2Lat?~GQ zSJHpE%gU7D+)eOmTIo9FQC;|#rwRVMA$@9G^^y0gtyvtVhm1TL?kPoJ3lpF}p|(Sh zer|_#sTqW?($!SK{qssvD|kqL4GotIMpTQMTB2`}9c-WKPn`YS%)pEL%sEE7d5QW8 zujF*GtqHKK%(0HxHl52IieFkXN15zasUjs3S+u@)^nK*;8u(+n%anev`2}aN>fKG| zVlggmS-83Ka#_P{^++w(SCdH+J-GH$q#P$sS#-Ajp&6**R={rKu)Xr7hp_;5nbv9ZC3tI4A!U zZbM>-9~1Mw?k_ASXhH6Td5iBdS>a8CDMGyel;k`&Qg%p$X`s0=f6m zZR-L>QhIa`?dDYM#8}y1I(i>Ua@CP5-ZZNH-WcU+7`#z}lzscw?x5VA-##Ta{YJ%9 zWEStz{ZkUmCMvvdRor&A3yubi)Ec;X>J7mrG#yO!@loZZmK#=LXCG;jFq*JZ9gi-3 zW~RrQn_EV|IQgCdx|)YqT}YJ~*12^j#RwEZO0lWP{O*k*OCH*k2NF6js^Y)vU~;F} zZ=HR*28?xZ;!Oic&yf;*UdCkcyX&o%ABhrLRd=41I-sn&N$x{T!w;Ov{VAEw$BsR- zx%ZQE&R5t_>TSaSYctBvPZavlJJ!QuFLc^wgi0|;#kkigRw9?>bGk^x4lF0C6~_3z zUqp_VI3fQC=rUyX>%Xf*j|FZ_QIs@h4&J zdoeWP=seQzyxRq_3@7x4F_aHJkxOVxNX$F*I8|Kd?(skyx|ozSy^!O@^A0sA{#N-( z?u(UW&iq3fw+i*>Z7LF_moITgGR46vlC=W<-}6|5^)3^9o}FycRQ3q(SBXtnT+nE~ zl#Z2fL7BZ8)4w~ruGVU%IsQ=U>&{mA*iEf=W#n_P$y=GNQopmPT}FShw$IB^tdQLS zaDO`Z(9^MA0z7N(hn+;Y^TD~-h4T1&pwEETsl4YW3ipR{L9`W26t;}Wi2&agf`vqt zUot$iJ_LCW1af$?_qqgo;Sg`McpmHqF`$QV1cz`ac*eDaM6(9pnP&7{W0bD&?v-?9 zTMAT70+Cn{OHMyl%QU?QW|9Z;R$f7Bw#1vxrrO7$a7dW54Ix$%7FIn5r&bv65|M;~ zXI24IlvapfGO>UG`PMGTyw&ub2BS`J=%x^!@oE?vDQKgK5XXXV4k87 zUQ~B5w2;{Sm^6;uJ<--OWtub|H*)J<2$yCk-+C0kXH>31G-FXDWf95FwP-GWzX$bU z6T#6Dw$c5XL|ma*{uPi+XCjwY{qS|l8aC$ME{38(hVEmEeuWr?C0MjS#!w(m3thsE$m_}3H97%&TUN#(%F04%YNWaP}}`YL2(IuT8Jf#;R;Vv=g8M}4_eU@tdgicuS+c-C-kwBr&SnWy2l#r$8gC+QxrX# z*e7|Lz#6d44Ca{Bi$@BzmK(X4{82=sVoMQ~9iw8xvVveKY46IT>PLNv+_4y1b0 z)*aIX%M)q9!Ck~woqWQ=$ntI#Ly;Z4I+TY2$yqm4+V?j7C}LdjDAzkJ^MYN~mCC5| z7=%`35bs^UJc-YYT`25=ivvl7o<7WS&Zo+LfZYyu+MvvLCMfNSZsSX#+a#%mfp^%! zM5oa43|BlKQ%+IvUXb_9tz=SK?2c(i`sh$IVsFPeWWvvX4V;g zfEr?`cMat4!Jc08*Z6oHuvZ&Wv#}e|y3a7Uv|rD%DDnPKzKtr34)bB~>8@a8)eh#b zm~Uo#ufX(BiBZ(P@^N8Bo{wT7zEeNAthmaGP`7ISzTZ!GHQV>noq?-DCD-?4ch3rN zMd_W$r>Zt!BCDcs{0IYErvP{ z&xfG9HsZ?E%(i6mIZd4CnyOoLQfGA9zBwKY0aylPGt|)1T~k}?houFzC5!Hukmvjs z%?zC23D`5?`bNdQ=V~3cx-?EAzDzg!n_Y5DALX>T%QpC(wFJ_%28+Rb#hh)$S|f8> z?OoVA`!n#xz%_LQU(+feXe}6pp`pw8*&X0pIpF+)1Y7)cVqDQYywIrfhQuv+`qR5u z_1uJ$X7*=o&iw2+_3fD5cV%^2u zO&>37GtXBrb{GKkVbt+*G^q`=J`SlT! zxKgfw1a~R`Wdt5yW5;k$Cp4g^FDUrsR{xLgB-p{!rU|L;9+^uhFg>p6L=Knu z&3#WO6%Sogf80^h8%~QpgBn~BRyJbc1~w4Z4r2r- z03x#rnlN5eN>Dz2)L$HS2wx@3KkrIIc(%651j!mt_H)ZZ(c%$^OMyWiWfcP%zl}LQ zju+qQ247+3&t=4`ICgf0keWc5NK^FZ8hYqT7uG6CFERZH#t%w1)q_hNapT3rJ?s0# zi6RVfi3uq#K!W1(1biX%5pBqJ__f<`z$vJrM`Y}Y;~1|EO-HoWf*V6D9D7c zC!Ao`SSy$l{1A2A%Y)V65_LPz)O7&FnffLSyA)`9Q3M=VgwxKtbz_6}$fUP@i{}a# z=%%u}r76@KCyRxE_b`&qF>?(>EDPfXrV6&ZQDQ80Nn`%9b^4Z>j)}x42mpVH_s%i4 zM}g19vptS;0~f!C?f|*l+i!Aze8wvbN-#N1AsQC~eK#9?Iz@@$x}+?c)$z zupcEKu0v}GXtfTzzF9L;(s<;0HEQ0|_a{3ODZdDKL2?r|j-ovq>t-lRi$4D)&?8P!&2C zQ!#^@ioA$m@raY$S_X9S-p!yTnMkh5oU3ZoC#~U%5|=B?qLNmh{MA~OX^-j7_o1t5 z)FZJh>t1~4z>xsz!#sq-I>@UF!=beZox1MYJ50;C$8?89>(zmBoV;kb&=4Z>i9l>6 zUXb1H7k^4sJN}a{tviE~#Ea8%GMrrkX)}UPvQ{!_4>wZo&i$O{c7(qv{C%xzjb2l! z5od3yaN~WIX-UCP%%X0k%eSXv-W-3yEY^C}0HTVg#%4XEZ8K>??k}F2s;B5jLS=8V zm@7oDx9Pu_N~^okZEtY}=fZxT8y{C~t!X(hbmJfqBMav?*Xxhv;@gZc^GIw_<(ZzQ zMj+_@%pSE)#z$uNyl(XMU8^fm#jo?+N5LQGPt(~~6<$4zP&N+IX$Bt8HGs|Z=UP>0 zU8Hz63tj7b`>nJgN!RfCIRpJH_N|&fKb{wk+P}Zpb|05R63lmDPYD?o{+#Cqv%FLo zEeiMpn;2p_i6xf#%S5J;4%rzJ|L$=Q<(RXv^izx3%Pt1^`mWxK_GBpUO0NfZRpi4C z<>wa|_?%N;L?$82^D~fop{r`tuWaHP1+&)#aU0leO&oVz?K~OGSu&=|KiHu?>It!8 zy?ZjuoE7X^5xdIc`;qZA?;s6$31iv$)Zr8a zW_rI=xD8+vA4&~7(>SN9Pk3Gk6j2b_TCaSbh}Fd@UaO*l3w)zYsfiSO$G1`z-u6mm zJxa8TVM8S+TWA^nyh{H`ihASekF{z}v2C{jwHR^`=ZV#?vRj;KpV8f#n=P=w{%-W<;^7Qe?|XFiN8O<4&^oZ+Vk-oz zkF^GDt9`yS6Z1;5KYA}7hlJqzcN-pZ^l0ADxx8Lf#R!Yi9v)l%`Ra{Ip^-GZy{r!; z4Z`|1p}tZfxo6_c{HV4GY3b;~4-F(L?xC+f47n6LBz;f|C{pjP|55>hZ0e1-PqoAw z3p!tHnS(l}2h@%lJXNP{D11lBs=qcl;Cw;cskBaUF|umE5Dm=yB7@EUsYAQ`tI?;n zPdMtwJv4d30k=DsINzE(H+k>9{&;qu!7LZ0nYKSssa=^Idot#Gc~Ag)v5sa%hD+Di zSNw2nM*F9zf;mWR+ned^<8qnWbAYShIexZqw`_xnVGnT)=R6Ge6T`qQMK4k~TGq3@_``+#(Zt9(_U){@we-*34VRo? z`7Em*du+N+Loi>PnnSL&J{5=@?N>r2{gT`+H#N8iJNfg-4rOH?m(Dl+`B}=vx#v0Z zyiW#$c07Wm2iNG~4(jp?9E|DJFU3&9k54tDi)kD5w=V##LjporZ94c-&nvndPCefS zs@B&g+Rc_POrjLqn||GZ&zRubb~KBe=u|0u49M^|-dx&j7Sqp%`QFvCzYEdt-;ucY zw)8a_>&CXb3;K?1y`(7Wq_NE6L&bc}4ix2L`COw=G9>dX*oR-;&$b--##aZ zA?mPTG4DR6=~7IcOVhiH!!;uj`F>gS^aycm8hT`^dp{3G+S`6QmQHh0CfU>;hd)9XklE@xLEnnFju7YSr&<`x)#*>-A2a0A@zTNc}B6%KY(in*=7a9?+Od3pH z9ii%pBR|EZ$ne-C5Il!(61$`XK@qwtGAKiPBT3bu7^7s^Gt3j>YHT+&imWf3`&r=7 zHw%cHTtQ?^ibg_!9Rk-7Q;>7lt>58_+De7u;`>17NUPsR7Hiz_TBRd(LRKU!_pVGj za=XFeNk?W7Dej~9n?K+c0`{eIXk+4j1_DnwnIxCTSu$E1OKyKQOd+OUH4wmMLP9Mw z5J$WbfJ!3LI__yN_R$7{<_v>4yZ?|i{Vvi`C$SUbW3K|kk%5%}NaRdld}hiZeT;1O zJjGTu{~drcg-xWAFv{CyC9NWkuI(gnYA}oeh||oB@8gNR{R*m1CynzXKj9Vf)(wngR~zt!q}w%lJio##B0<(-8|Xxhqz!_bUQ=I&u{phuT2D8*&JAL8{JxagDE?aScvD()xTK>>AMWz zu>ZuF!nKfyX1zq58LTkg*h0elzk{j&ZUZh@h=7NNn6X^h94uq~cQI&V8I@rZ5_r_j zah-~LG3JC!N*o$!xW;4Xu)!sf&UJ|Xx@xR*EECB|7mhHrm=*?*O=o(gL{5P(Ch#oN2nCtllVxh;QNhnm=#A&jesb{gpk>0ks#eBd77260mOgE6x

    1W~L8JZr@bkjl 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

    dR_zaOM+vT$0o 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Î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 )Z<+d2 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

    A7;ffp}&zL!CA2|MYJ^c<1t9~fl4$%K&72A21X zWVP9Ztl|wVC<t+KJb*hAq={sGiNsT&0v>ylNjJM4Mit9m0Oi zhEJ$S`fAGd+icQm0hkbX^vqlu9Cp z(-z_vDgY_?{>)H@N*Jo3w4lxf=cZmhwZU4YkXSDW%VM&8TZQ@HFeXkx%!Ws%E2Jyl zv2~!%;pz~MJ+EG;u)S9Od-C*(s?YRYybUnMMU8@EnL3BS_4*&P;=9e5Wc#*tb7ybb z1C_2Pt*58rj%^sBYg+B|3PDxv_Q7-DtXLHbgg!JZYrUkr@ky(jO!f747rpPX6BsUb z*m=caU_1bZi$CpzKU`3Wy*vdcThkn=Ppj45_`2@;7VG5Lbx;=b!QdccNkP2k@(%l8 z`o(I?&jY$Q4PE7@{pNPgNRi)0co^I+4zO6A4T!9HwZ|ROpWmBsctLb|+~w_t@W*@E zbh%fy^-&w&bvx_JDjIw#96cLC*y(v@e};=S;w~lhuj?!b-inT0G%?@wTEKFiip@f7 zn;ot^M&%r?g3a)7HQw5ze^eDOB-X56Gw8l-^XF5|O%^a=zV+N!w`Hq?K(|GvErO;w z;xbFn@-Cr(#`B0s(;Eh5%>SX@`!~*5XU6iG8G~fZjD0&I zk)>iZF-e8&sVpNxokrPZmtDrbg^@k`KB(+wEQR(|hfqk?7NX`ms>gjg=RW6qpZjtD z4e!VG{^5FE*Ylb!VSa`Sj&pqIfyQ0tLc{(}XD!-&&4-k-0#k2UrfJ9C*liYmVDzqh zTku`oc}bm`2fOq-C%gHDv573EvWDRzG?v;r(9If%v7}8%K2ItVdQ2*?dBE_T$hKE( ztUG;z{@^s>AS-S-!nn+W&rKt5N8JbrMnw}Da9Ve?u9KfknFTDJAc*$rHLo(XkBEu_ z09$r0mvcK2njYPy6^@uwJtLe9Qb$-E31js2P5eu}WTrdKb@XUI`_ zoRIwW(Dc!VF=!_(0-#_@5|`2i9IW*ELq?`B*W!3@wRbDUFRbV|3lO#%yZ{A#b`a5x z8@t0HtKy^-o#h5?##Ymq%Zf_gWrL>|SJ6imqNv9lZf)#a zMwjiQOZ2km6Z`b9`SKWRhJyPz8zqBCqzII%cyEy87*@`TAaYO$HnviWwY(wi-MS-9 zh{5@K$ zvg}0lr?I5~Wa*qNrv($Gk=mLX?Rx5_=UrELVI@(_XV~rJ6|dwXDg9jnL*Sz`<&;7( zwId6Xio~li$Zly*2|UUzkXUNYW5WruVw73z zvqv$7$1Uxo?W$bcH5gymAfnV>b)|Wm&vEgEZ))Eab9R|$wS?}v@tm;bw~78$*Qx#u z*%b$J;S5P2?%W8Q$EOY2e$lY>{freq+DVal25N3wY#ZSk9elaHthgLs9k7!yvhhqv z3U$Q>Z#$9nN*d4nYhjlWU6Fd+LULo~Q8pVL9YKje2XbWz=d#mIJ^qrcQVUxV#{FLS zIvFEmL5qZjmP2#~P;{%o>yO+L&nuq@15v|?2i)NF<$FEqBFdI7LpJFn!u`5@b(4OI z)8acfX!@Ca_<;2(E6w|oi!BSD=J$_o@>nGA-m#1Dy7Q!DSW(<3$0=O9S$RTEI&-ZD zwPPVDE=NtwA&$IzeJFH zLYokM375h)Hy2}w9j7s$*K{t*%;4a(T;LAsg!$jwOU~!oi?; z^P5@NysLdBLLj#zOInt!Ii5zv2CnvugAII{xfLn}3y`ram9}@q75*<0&s!-~T~GT^ zXMPHWAJ%%Twem6EL(Of#F#N2bNw!{=^r7{Z?k8-~538;fxELt-VGF3UPY%4}b6Ze7 z%K_UP+-}m>qBlcTy|JT?<1S+K^K?H-D_^I1a+are{^jYrJ_HurdFbc`F~Ip(mZe*~ zd2x+{>kMlp@|#Q13CX?JlN4623h;7RQblngGjxOBpiAp48q=(X%7&+H6M@I!y&bzR z9}2#JDrM>1TYTF$I17JL#emoY1(&2w&(B8_ZfT!++!Em)IbLj66?WGC7ue&z z{n;NyQqt+u2H8=JSlq6=Zx$)H)Er@Kcb8f^xBBtubV^ZIZk4EbU_L;CGmBaVnw1;DvCc1BN>Ua^TC*W%mIL>Ncyf|B#Mkjz z*r33v&=^>_o-APGEvRY*7vvWDw7h42IZS31qFwK!VZtI^>IG^6>|Ef+1aZJ5f z^g*7b2`?r_h$LNYFYrnNSVx&UkxWEUZboHT!6*%Uwi@~wHlF@>pkdCA%H8p0< zFnFgg97)HD&0+gzB`i7wM8S%R&F8|bG|GA~qtN&}l?bLe#|B0d^x{S;|o zfUHB+FC>8>srQVthTpbROPR6FY>#>Hqxhr?|Zc|WRfaz}ckwS=vjsAeP(PZbz- z1PW_JJ*ij<6_aKS$9tPbSY(kMy);;1U+vIavwLp8x*F5zKLpF(QJ1xVOcyX=1J$N5 zE^=2Nw%MD^SARG=FfvB~p4J)-^hNqZ2-n#exFGJaUz3tJ7%UJDSZ*EVx^oEBgp{gl zk%sCFHD}8+qU5}RDNH@aI?usIHu&#)qZa3o`;~$9XaV<3?DJ>|b!Fg*u^N{=0QM7r z`e9vUzIBB^Q`=W*gvw zrm1ExNvd2AOgScR@KW+VBN4fF8tU>$WBbgn1i=6j`0QAr*l2;Wim0g{EUqAd(_Xs6 z=_+Fmj+#a7`HUH&U!>P+rmVShnz$E$v^ea~Uo^bHiFIEtKL37)R^Gt^ak3^-MZQU0 z^Rzc`S<4kxYpXGkjPfjnQ%cYbT;4{iE9Z*!qZ-#l$VJpjYMkM*AWei{2V{K%I<8U- zjGZ{A1)TLsl9n%JBgG7i=HK)KE`rnh^?|B1UB9v-tz;mOoDL;N-<;>|#n?nn%a{29 zyV>}x=XhN$D>zM5)f^*biE#O6Cs#GiANo`>EA3o*IUw>}e}n(d%GRUruUjkTj_JleFsOfH0SS zDW|=GTw(QN7!+jB*|}1LfPtkaytSX9F3@W>ThYsY7zF|OOnI?LB5z9;sdJ#}nF$}> z$5mvNu%YiefXftQlvqe@);6tTz02!o4;3BQL;*W7Ab-q3H=?n9bxLz>tV*Q-1p>y! zdvxYnksCfiu#F$FL-O!*R#DunP`jN?4%$sM7#Q(LQ%hnK*sqB=2y<$Koql_QF;dUp zRXN-10_ub^60;=gcy+UCRvH`QDEMT72A|Mo++`#@R^a1=P^cT?&^TOi(Ds@(9G_CR zi%j8UBTFqKsOIHoDzj)45WE+cT5i560KDP-8T;GMb6b%?Vw_qlD zFArL~lUvzT_|!q|4sBM}MfZ<9ry>;?~wmwcQhnmbi+V=L~WkQR}Cg^bVtC*$}1N0#n5CryaRHb_{FTh7mF9&Qa;y9A!2HceJV5?yT#^ z#hK~`^o+dTqrfVz`BqH7q9;*BUc4+jFSs*XUeq`#+bE=CRYe}yLKph)H%GU;eQ2_G4OeIS9Hpy(RTb@jxz^(~q-UPfA4BmF4ebvQrD3pLq3u0YdbEfIy@3o? zTC^?Fd|#i06Re7b&Ry%9XUvng+{v!u+iNEsxrYuKrGrx(($?te87_=O2YzSGqOOZ= z!7h|gYO^tE)vcDl0b0buo2T3lorDDT0fq+nqNMTwk~y;y6y@*2s|Bgf(T#%lNt!@1 zasaxmTtorav%`M6d$6)VSpq<- z|IgV_N}zGarJky_kxM{*=@6;sq#p} zg{gt>gv#$7pl@XFZ9?V$fB`OvxY^dcM76{TZX9iIS(&2gj3azxsB3=_Y@6t25|@|< z_}`t|Ps_h!fa{<4-O*vh2}Zr|4rb@0b$=&&bI-r|4`xMJKu+na7>C*wevD!tO-N(+ zqYTrF>f6D#*Qwpx9iXxo9(sacL9%F?-E`8a^WD?Q#`;f1_Jd61esq9rf6Q9^qcn@* z2KQ{fG!>MP94=j6nrNxW47UB5gyzL0RPtk)&TV0u>%9A14%4|6X$_OT8S{d%YAtvB z9q4UZb>F#RCZY0KYW}wae2?qvV=BFZ)L0!lh<>vEuhT5sWN*PEN2$cjFeV1L>Vtcm z&}}B6^8KT?vb#S1>j3|~1N0YZ7SWl5E4}bRs0#Z8DP#pV>}xR9KT+w>uOpGXbzSUj z>5Wz90si@n@b2w2OQTb0y%%j^VeJnjw0F6EhI`+=chHdKS-5XzS$PA)!~io%Xl_p~ zJ+`|RLwG{GWN4`5)b`ro8wu^ltc64~?;hr?#a?_@PDJo~^%G0HHoHT=lhCTxU!_lW zt^3yC`39$$WN#||>%{fluQY5d?n>32KK)cixfRtiOJkzu7u!EAZZ37Cx413GrgklyGaR_CuyRs-aBFSE;P(zt^_P#&y|>MZ@o?{Tzf%vq zemdx%Vk#5!cgp1Q#{Kn8yonLhx!w{vFy zT$yYoM}}L~j`?GQT5^xJHN6}EeyxA$+NzbR8EaAR}* zZzHEJ7!2PJ8xd=3d}^Cf*u-&c+eQ?(T8ndebyzBwsZ7PDzqAqmww*VV@`s$+x51ge zRi^Xds^?{IwsU4O&gifI4(R?jWy%xtbFapfY8HIfcim>kx;k}Ld}GJb{~2?ismv1O zcI33Sz}DYt&$Is)(4F{5K=qF~v#oR`xaBsZ@Lu`JK2iQAn|^~UJawjFaa$*te}T$? pj%@b77=M> literal 0 HcmV?d00001 diff --git a/docs/user/dashboard/images/dashboard_timeSliderControl_advanceBackward_8.5.0.png b/docs/user/dashboard/images/dashboard_timeSliderControl_advanceBackward_8.5.0.png new file mode 100644 index 0000000000000000000000000000000000000000..e1c2e9921f687c1e5e29f950840787d05bc19696 GIT binary patch literal 1522 zcmeAS@N?(olHy`uVBq!ia0vp^d_XL~!3HGNrubPgFfhhvIy(n=Iy)-_6y>L7=A<$( zXiO}fVCdl#DAHzsn#1{oqSBIs3l&c&#RcXjDkYk9ghkx`oGP^Zz;pKrJ`i1k)OhB?HLzeYR1`rP&$zlH7p zT;V^LcCGik?3=fDPu{8VxuSjbG*h9;G08L*c|#``&eQsx^}pQge>JUHsFAeEtILG- zC11zl6B9)ECLd1V*uO#TvZ=}Md;8zt_;8IcVG-NfrESx1v|i4Au`|1(_V)$N?N*lI zyH?i6Uk@yP7VfsiYPb5rxA!*9`@L{4OTOyqD$VF?(UH%>7Y5a^3&^IP-6YIw0SxhJ zsS%!OzP=1vKsE;hE29ttGmymygba*Q46I-_1A`Z%G@Kp8r~y^O#K6#=$-n|t69uF} zzypYZx}h}lq&5b2AWsO0TNW_ERr4)ihO-5Latw~a&Yqq?Iyku~H8rm|BfsQ-_2zv* z0nP%C$YKTtZeb8+WSBKaf`Ng_Ix{4qB*NFnDmgz_FEJ%QDOIl`w*X`ggH44MkeQoW zlBiITo0C^;Rbi_HR$&EXgM{^!6u?SKvTc4x_5`cX3~Hd$?2OH9z_wsWAlwPj7+RcKhTlY&1l+5lI3`Bgg|*{zaKU%Mw8$Xb04TAqG`%qYnyRq~M0c zC0G;~nRZ+@`tXEd#}%W#DiN4W13X>$uqf80N32UD;2ssKf;q6rsV zIP?xYX1UYQcARn2l_zX%w_KPeG4EJl$db5T_x9;?O44F63jHaSWo7#+*NN@jQ&=(~ zj@?aZuH#}|<>xY?p^leLeqP*pJ-Apy!E#!vW^&~`_5YF64x8{ksa*FY;E;$b<7K0V zyY!xYX7@Rkye4e@4sIsN2~5{7HH7p%w(yuNa``38@56$9e0{7x`fk1nYj6!VJ1DfI zPUp0fh^vLQ<Hm&5}sw z+4uhOt7lTv#h-7;mHvK^X-@bL0Y=8Jb2IGY`KIPbv^B`s*xM@cIKSa#i_jB)@qPPK z*|SY9j3*roIC;CYP9Bl+5q$IAYKpB;fWDP)@J;2f=Z?(Evi>>Y599tb4eMTSy=Ao| gt-trW{nT?0)NLJ_YP){UnGDK^p00i_>zopr0F~Mp00000 literal 0 HcmV?d00001 diff --git a/docs/user/dashboard/images/dashboard_timeSliderControl_advanceForward_8.5.0.png b/docs/user/dashboard/images/dashboard_timeSliderControl_advanceForward_8.5.0.png new file mode 100644 index 0000000000000000000000000000000000000000..788621037cb073595c8324e9e8ede3f7b7f580a8 GIT binary patch literal 1531 zcmeAS@N?(olHy`uVBq!ia0vp^d_XM3!3HF=W8NDwFfhhvIy(n=Iy)-_6y>L7=A<$( zXiO}fVCdl#DAHzsn#1{oqSBIs3l&c&#RcXjDkYk9ghkx`oGP^Zz;pKrJ`i1k)OhB?HLzeYR1`rP&$zlH7p zT;V^LcCGik?3=fDPu{8VxuSjbG*h9;G08L*c|#``&eQsx^}pQge>JUHsFAeEtILG- zC11zl6B9)ECLd1V*uO#TvZ=}Md;8zt_;8IcVG-NfrESx1v|i4Au`|1(_V)$N?N*lI zyH?i6Uk@yP7VfsiYPb5rxA!*9`@L{4OTOyqD$VF?(UH%>7Y5a^3&^IP-6YIw0SxhJ zsS%!OzP=1vKsE;hE29ttGmymygba*Q46I-_1A`Z%G@Kp8r~y^O#K6#=$-n|t69uF} zzypYZx}h}lq&5b2AWsO0TNW_ERr4)ihO zv%n*=n1O*?7=#%aX3ddcU|_P&42dX-@b$4u&d=3LOvz75)vL%Y0GY#JQ(*;U=BAb; zDpcg=uf-VSp{TPq~=7rWaa{c8t61TV>27DEf^9AcS1CV7N-_D=jQ_T zmDnMo3aS}d5?v$M#t4LsMi$66B1s@=1bM*9zbF%ESt2L|?F?=7F~p$iZS+CGixk|D zxCDy=Bh!w{MjxIq?6|^?9s{Or#z;>W#}Es_vq8K44m$|Q%+J+P|H-mkQPk07$pU3w zA=8x_4PpYaLi-s`y0d8hVG@!xb>(mpdC1)%Fn8&VPq**H)r2Lf3wa&&{8pKto>u;C zjZfVhk!+o9Z0-U71Oo#_mSk$pOD*$SD>Nfa#Pxy+@2+*qo|A;k)s2ol_-*&@ckPaK z-ErHy+Yd5q%ROvzR`kdkF3tVDZXAah=07&fTerTTvaa#^LxG-^+)vglQsUdGdnGG$ z!hWxgJg`l#Kvu(5D^|4yt>rdy`*bC~!OjR#?&QwtSX<2Sr2m0SIDgVCcLg)1LR zUUe*aUiqV<-f{89&g09|=ggVcnN?IF^)hwS9rnX{tB4#IQCv>RpRtbFNFZ!JG({J%?uBuJa3!)Z+a-^rLpUXO@geCwJiWdg} literal 0 HcmV?d00001 diff --git a/docs/user/dashboard/images/dashboard_timeSliderControl_animate_8.5.0.png b/docs/user/dashboard/images/dashboard_timeSliderControl_animate_8.5.0.png new file mode 100644 index 0000000000000000000000000000000000000000..63a93323d6a36773a92907cd713e17bf9eef6621 GIT binary patch literal 1559 zcmeAS@N?(olHy`uVBq!ia0vp^d_XM3!3HF=W8NDwFfhhvIy(n=Iy)-_6y>L7=A<$( zXiO}fVCdl#DAHzsn#1{oqSBIs3l&c&#RcXjDkYk9ghkx`oGP^Zz;pKrJ`i1k)OhB?HLzeYR1`rP&$zlH7p zT;V^LcCGik?3=fDPu{8VxuSjbG*h9;G08L*c|#``&eQsx^}pQge>JUHsFAeEtILG- zC11zl6B9)ECLd1V*uO#TvZ=}Md;8zt_;8IcVG-NfrESx1v|i4Au`|1(_V)$N?N*lI zyH?i6Uk@yP7VfsiYPb5rxA!*9`@L{4OTOyqD$VF?(UH%>7Y5a^3&^IP-6YIw0SxhJ zsS%!OzP=1vKsE;hE29ttGmymygba*Q46I-_1A`Z%G@Kp8r~y^O#K6#=$-n|t69uF} zzypYZx}h}lq&5b2AWsO0TNW_ERr4)ihO zv%n*=n1O*?7=#%aX3ddcU|_P&42dX-@b$4u&d=3LOvz75)vL%Y0GY#JQ(*;U=BAb; zDpcg=uf-VSp{TPq~=7rWaa{c8t61TV>27DEf^9AcS1CV7N-_D=jQ_T zmDnMo3aS}d5?v$M#t4LsMi$66B1s@=1bM*9zbF%ESt2L|?F?=7F~p$iZS+CGixk|D zxCDy=Bh!w{MjxIq?6|^?9s{Or#!^og#}Es_wUbVJ9d;0D`=6QQvsbk1i&jU;QiUe% z*qt94kL=Y~Sm#pkK91!e`v*Z5c?SV;yT+!wC6|MA95sCNJzv#dO3{g0Bf{^K_Uz2h zf5p#yMEvHl%{U|!Y@qn5eu1OyYyQ+1Jz8Az9?yA{cC^Fxap;*Fy0TtHCd_>Et*;-> zs$x5Pkb$pO$@rG*+>IxA-tzN@|BjrZzpbz`z-8&h_RG8h4?z_X&(yqHQt@myXvz0K^2+cIi?aF)4zVHx#s$L4@33r(>tthANuGgb#+?5&!gA( zq<9uT6+WqD$}?-bugIl0#r6!7vo4?IJjxOIEWrC?+x*1KE3fx9;km{hMo@ymZ6b3GoJjk7HF5dsbbn550FmlyRql^wfBh3s1x5J>LDY zXVJ4FosB`=sZ!HAtyqs4ENo+YEEH8zzT@S|!+(>cdXj7OQhYYeKX2ICac()AJ!5ra Vj$){)-33r?^>p=fS?83{1ORqBF8%-j literal 0 HcmV?d00001 diff --git a/docs/user/dashboard/make-dashboards-interactive.asciidoc b/docs/user/dashboard/make-dashboards-interactive.asciidoc index 7c80fa8588538..127c0a4a79e05 100644 --- a/docs/user/dashboard/make-dashboards-interactive.asciidoc +++ b/docs/user/dashboard/make-dashboards-interactive.asciidoc @@ -28,7 +28,7 @@ data-type="inline" *Controls* are interactive panels you add to your dashboards to filter and display only the data you want to explore. -There are two types of controls: +There are three types of controls: * *Options list* — Adds a dropdown that allows you to filter the data with one or more options that you select. + @@ -44,11 +44,17 @@ For example, if you are using the *[Logs] Web Traffic* dashboard from the sample [role="screenshot"] image::images/dashboard_controlsRangeSlider_8.3.0.png[Range slider control for the `hour_of_day` field with a range of `9` to `17` selected] +* *Time slider* — Adds a time range slider that allows you to filter the data within a specified range of time, advance the time range backward and forward, and animate your change in data over the specified time range. ++ +For example, you are using the *[Logs] Web Traffic* dashboard from the sample web logs data, and the global time filter is *Last 7 days*. When you add the time slider, you can click the previous and next buttons to advance the time range backward or forward, and click the play button to watch how the data changes over the last 7 days. +[role="screenshot"] +image::images/dashboard_timeSliderControl_8.5.0.gif[Time slider control for the the Last 7 days] + [float] -[[create-and-add-controls]] -==== Create and add controls +[[create-and-add-options-list-and-range-slider-controls]] +==== Create and add Options list and Range slider controls -To add interactive filters, create controls, then add them to your dashboard. +To add interactive Options list and Range slider controls, create the controls, then add them to your dashboard. . Open or create a new dashboard. @@ -79,8 +85,22 @@ The *Control type* is automatically applied for the field you selected. . Click *Save and close*. [float] -[[filter-the-data-with-options-lists]] -==== Filter the data with Options lists +[[add-time-slider-controls]] +==== Add time slider controls + +To add interactive time slider controls, create the control, then add it to your dashboard. + +. Open or create a new dashboard. + +. In the dashboard toolbar, click *Controls*, then select *Add time slider control*. + +. The time slider control uses the time range from the global time filter. To change the time range in the time slider control, <>. + +. Save the dashboard. + +[float] +[[filter-the-data-with-options-list-controls]] +==== Filter the data with Options list controls Filter the data with one or more options that you select. . Open the Options list dropdown. @@ -94,8 +114,8 @@ The dashboard displays only the data for the options you selected. . To display only the options you selected in the dropdown, click image:images/dashboard_showOnlySelectedOptions_8.3.0.png[The icon to display only the options you have selected in the Options list]. [float] -[[filter-the-data-with-range-sliders]] -==== Filter the data with Range sliders +[[filter-the-data-with-range-slider-controls]] +==== Filter the data with Range slider controls Filter the data within a specified range of values. . On the Range slider, click a value. @@ -106,6 +126,21 @@ The dashboard displays only the data for the range of values you specified. . To clear the specified values, click image:images/dashboard_controlsClearSelections_8.3.0.png[The icon to clear all specified values in the Range slider]. +[float] +[[filter-the-data-with-time-slider-controls]] +==== Filter the data with time slider controls +Filter the data within a specified range of time. + +. To view a different time range, click the time slider, then move the sliders to specify the time range you want to display. + +. To advance the time range forward, click image:images/dashboard_timeSliderControl_advanceForward_8.5.0.png[The icon to advance the time range forward]. + +. To advance the time range backward, click image:images/dashboard_timeSliderControl_advanceBackward_8.5.0.png[The icon to advance the time range backward]. + +. To animate the data changes over time, click image:images/dashboard_timeSliderControl_animate_8.5.0.png[The icon to clear all specified values in the Range slider]. + +. To clear the specified values, click image:images/dashboard_controlsClearSelections_8.3.0.png[The icon to clear all specified values in the Range slider]. + [float] [[configure-controls-settings]] ==== Configure the controls settings @@ -126,9 +161,9 @@ The dashboard displays only the data for the range of values you specified. [float] [[edit-controls]] -==== Edit controls +==== Edit Options list and Range slider control settings -Change the settings for a control. +Change the settings for the Options list and Range slider controls. . Hover over the control you want to edit, then click image:images/dashboard_controlsEditControl_8.3.0.png[The Edit control icon that opens the Edit control flyout]. From ccbac37155d6544a9f579e47052deb6a4eb69786 Mon Sep 17 00:00:00 2001 From: Tomasz Ciecierski Date: Wed, 28 Sep 2022 22:20:26 +0200 Subject: [PATCH 64/95] [Osquery] Fix small issues (#141083) --- .../osquery/cypress/e2e/all/alerts.cy.ts | 69 +-- .../all/cases.spec.ts => e2e/all/cases.cy.ts} | 4 +- x-pack/plugins/osquery/kibana.json | 1 + .../osquery/public/cases/add_to_cases.tsx | 27 + .../public/cases/add_to_cases_button.tsx | 4 +- .../public/discover/pack_view_in_discover.tsx | 49 ++ .../discover/view_results_in_discover.tsx | 141 +++++ .../public/form/results_type_field.tsx | 2 +- .../osquery/public/lens/pack_view_in_lens.tsx | 49 ++ .../public/lens/view_results_in_lens.tsx | 234 ++++++++ .../public/live_queries/form/index.tsx | 4 +- .../form/pack_queries_status_table.tsx | 521 ++---------------- .../live_queries/form/pack_results_header.tsx | 1 + .../osquery/public/packs/form/index.tsx | 2 +- .../public/packs/queries/query_flyout.tsx | 2 +- .../routes/live_queries/details/index.tsx | 29 +- .../public/routes/saved_queries/edit/tabs.tsx | 25 +- .../form/use_saved_query_form.tsx | 5 - .../osquery_action/index.tsx | 33 +- .../osquery_results/osquery_result.test.tsx | 32 +- .../osquery_results/osquery_result.tsx | 21 +- .../osquery_results/osquery_results.test.tsx | 32 +- .../osquery_results/test_utils.tsx | 38 ++ .../public/shared_components/prompts.tsx | 29 + .../server/routes/pack/create_pack_route.ts | 5 +- .../server/routes/pack/update_pack_route.ts | 5 +- .../osquery/server/routes/pack/utils.test.ts | 34 +- .../osquery/server/routes/pack/utils.ts | 21 +- .../saved_query/create_saved_query_route.ts | 4 +- .../markdown_editor/plugins/osquery/index.tsx | 26 +- .../plugins/osquery/not_available_prompt.tsx | 38 ++ .../markdown_editor/plugins/osquery/utils.ts | 31 -- .../test/osquery_cypress/artifact_manager.ts | 2 +- 33 files changed, 843 insertions(+), 677 deletions(-) rename x-pack/plugins/osquery/cypress/{integration/all/cases.spec.ts => e2e/all/cases.cy.ts} (96%) create mode 100644 x-pack/plugins/osquery/public/cases/add_to_cases.tsx create mode 100644 x-pack/plugins/osquery/public/discover/pack_view_in_discover.tsx create mode 100644 x-pack/plugins/osquery/public/discover/view_results_in_discover.tsx create mode 100644 x-pack/plugins/osquery/public/lens/pack_view_in_lens.tsx create mode 100644 x-pack/plugins/osquery/public/lens/view_results_in_lens.tsx create mode 100644 x-pack/plugins/osquery/public/shared_components/prompts.tsx create mode 100644 x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/osquery/not_available_prompt.tsx delete mode 100644 x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/osquery/utils.ts diff --git a/x-pack/plugins/osquery/cypress/e2e/all/alerts.cy.ts b/x-pack/plugins/osquery/cypress/e2e/all/alerts.cy.ts index e5c6b5013b138..34d04289ad676 100644 --- a/x-pack/plugins/osquery/cypress/e2e/all/alerts.cy.ts +++ b/x-pack/plugins/osquery/cypress/e2e/all/alerts.cy.ts @@ -8,7 +8,6 @@ import { ArchiverMethod, runKbnArchiverScript } from '../../tasks/archiver'; import { login } from '../../tasks/login'; import { - checkResults, findAndClickButton, findFormFieldByRowsLabelAndType, inputQuery, @@ -59,6 +58,28 @@ describe('Alert Event Details', () => { cy.getBySel('ruleSwitch').should('have.attr', 'aria-checked', 'true'); }); + it('enables to add detection action with osquery', () => { + cy.visit('/app/security/rules'); + cy.contains(RULE_NAME).click(); + cy.contains('Edit rule settings').click(); + cy.getBySel('edit-rule-actions-tab').wait(500).click(); + cy.contains('Perform no actions').get('select').select('On each rule execution'); + cy.contains('Response actions are run on each rule execution'); + cy.getBySel('.osquery-ResponseActionTypeSelectOption').click(); + cy.get(LIVE_QUERY_EDITOR); + cy.contains('Save changes').click(); + cy.contains('Query is a required field'); + inputQuery('select * from uptime'); + cy.wait(1000); // wait for the validation to trigger - cypress is way faster than users ;) + + // getSavedQueriesDropdown().type(`users{downArrow}{enter}`); + cy.contains('Save changes').click(); + cy.contains(`${RULE_NAME} was saved`).should('exist'); + cy.contains('Edit rule settings').click(); + cy.getBySel('edit-rule-actions-tab').wait(500).click(); + cy.contains('select * from uptime'); + }); + it('should be able to run live query and add to timeline (-depending on the previous test)', () => { const TIMELINE_NAME = 'Untitled timeline'; cy.visit('/app/security/alerts'); @@ -94,38 +115,20 @@ describe('Alert Event Details', () => { cy.contains('Cancel').click(); cy.contains(TIMELINE_NAME).click(); cy.getBySel('draggableWrapperKeyboardHandler').contains('action_id: "'); - }); - it('enables to add detection action with osquery', () => { - cy.visit('/app/security/rules'); - cy.contains(RULE_NAME).click(); - cy.contains('Edit rule settings').click(); - cy.getBySel('edit-rule-actions-tab').wait(500).click(); - cy.contains('Perform no actions').get('select').select('On each rule execution'); - cy.contains('Response actions are run on each rule execution'); - cy.getBySel('.osquery-ResponseActionTypeSelectOption').click(); - cy.get(LIVE_QUERY_EDITOR); - cy.contains('Save changes').click(); - cy.contains('Query is a required field'); - inputQuery('select * from uptime'); - cy.wait(1000); // wait for the validation to trigger - cypress is way faster than users ;) - - // getSavedQueriesDropdown().type(`users{downArrow}{enter}`); - cy.contains('Save changes').click(); - cy.contains(`${RULE_NAME} was saved`).should('exist'); - cy.contains('Edit rule settings').click(); - cy.getBySel('edit-rule-actions-tab').wait(500).click(); - cy.contains('select * from uptime'); + // timeline unsaved changes modal + cy.visit('/app/osquery'); + closeModalIfVisible(); }); // TODO think on how to get these actions triggered faster (because now they are not triggered during the test). - it.skip('sees osquery results from last action', () => { - cy.visit('/app/security/alerts'); - cy.getBySel('header-page-title').contains('Alerts').should('exist'); - cy.getBySel('expand-event').first().click({ force: true }); - cy.contains('Osquery Results').click(); - cy.getBySel('osquery-results').should('exist'); - cy.contains('select * from uptime'); - cy.getBySel('osqueryResultsTable').within(() => { - checkResults(); - }); - }); + // it.skip('sees osquery results from last action', () => { + // cy.visit('/app/security/alerts'); + // cy.getBySel('header-page-title').contains('Alerts').should('exist'); + // cy.getBySel('expand-event').first().click({ force: true }); + // cy.contains('Osquery Results').click(); + // cy.getBySel('osquery-results').should('exist'); + // cy.contains('select * from uptime'); + // cy.getBySel('osqueryResultsTable').within(() => { + // checkResults(); + // }); + // }); }); diff --git a/x-pack/plugins/osquery/cypress/integration/all/cases.spec.ts b/x-pack/plugins/osquery/cypress/e2e/all/cases.cy.ts similarity index 96% rename from x-pack/plugins/osquery/cypress/integration/all/cases.spec.ts rename to x-pack/plugins/osquery/cypress/e2e/all/cases.cy.ts index cb16dd1dfb8fe..ce586e4d49943 100644 --- a/x-pack/plugins/osquery/cypress/integration/all/cases.spec.ts +++ b/x-pack/plugins/osquery/cypress/e2e/all/cases.cy.ts @@ -35,7 +35,7 @@ describe('Add to Cases', () => { cy.contains('Test Obs case').click(); checkResults(); cy.contains('attached Osquery results'); - cy.contains('SELECT * FROM users;'); + cy.contains('select * from uptime;'); cy.contains('View in Discover').should('exist'); cy.contains('View in Lens').should('exist'); cy.contains('Add to Case').should('not.exist'); @@ -66,7 +66,7 @@ describe('Add to Cases', () => { cy.contains('Test Security Case').click(); checkResults(); cy.contains('attached Osquery results'); - cy.contains('SELECT * FROM users;'); + cy.contains('select * from uptime;'); cy.contains('View in Discover').should('exist'); cy.contains('View in Lens').should('exist'); cy.contains('Add to Case').should('not.exist'); diff --git a/x-pack/plugins/osquery/kibana.json b/x-pack/plugins/osquery/kibana.json index 6d956fdce9fe9..63e7718368ce1 100644 --- a/x-pack/plugins/osquery/kibana.json +++ b/x-pack/plugins/osquery/kibana.json @@ -12,6 +12,7 @@ "requiredPlugins": [ "actions", "data", + "licensing", "dataViews", "discover", "features", diff --git a/x-pack/plugins/osquery/public/cases/add_to_cases.tsx b/x-pack/plugins/osquery/public/cases/add_to_cases.tsx new file mode 100644 index 0000000000000..bc46a76edf361 --- /dev/null +++ b/x-pack/plugins/osquery/public/cases/add_to_cases.tsx @@ -0,0 +1,27 @@ +/* + * 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 { useKibana } from '../common/lib/kibana'; +import type { AddToCaseButtonProps } from './add_to_cases_button'; +import { AddToCaseButton } from './add_to_cases_button'; + +const CASES_OWNER: string[] = []; + +export const AddToCaseWrapper: React.FC = React.memo((props) => { + const { cases } = useKibana().services; + const casePermissions = cases.helpers.canUseCases(); + const CasesContext = cases.ui.getCasesContext(); + + return ( + + {' '} + + ); +}); + +AddToCaseWrapper.displayName = 'AddToCaseWrapper'; diff --git a/x-pack/plugins/osquery/public/cases/add_to_cases_button.tsx b/x-pack/plugins/osquery/public/cases/add_to_cases_button.tsx index 9f2df87f35615..7124ebd955490 100644 --- a/x-pack/plugins/osquery/public/cases/add_to_cases_button.tsx +++ b/x-pack/plugins/osquery/public/cases/add_to_cases_button.tsx @@ -19,7 +19,7 @@ const ADD_TO_CASE = i18n.translate( } ); -interface IProps { +export interface AddToCaseButtonProps { queryId: string; agentIds?: string[]; actionId: string; @@ -28,7 +28,7 @@ interface IProps { iconProps?: Record; } -export const AddToCaseButton: React.FC = ({ +export const AddToCaseButton: React.FC = ({ actionId, agentIds = [], queryId = '', diff --git a/x-pack/plugins/osquery/public/discover/pack_view_in_discover.tsx b/x-pack/plugins/osquery/public/discover/pack_view_in_discover.tsx new file mode 100644 index 0000000000000..c6506126c83fe --- /dev/null +++ b/x-pack/plugins/osquery/public/discover/pack_view_in_discover.tsx @@ -0,0 +1,49 @@ +/* + * 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 moment from 'moment-timezone'; +import { usePackQueryLastResults } from '../packs/use_pack_query_last_results'; +import { ViewResultsActionButtonType } from '../live_queries/form/pack_queries_status_table'; +import { ViewResultsInDiscoverAction } from './view_results_in_discover'; + +interface PackViewInActionProps { + item: { + id: string; + interval: number; + action_id?: string; + agents: string[]; + }; + actionId?: string; +} +const PackViewInDiscoverActionComponent: React.FC = ({ item }) => { + const { action_id: actionId, agents: agentIds, interval } = item; + const { data: lastResultsData } = usePackQueryLastResults({ + actionId, + interval, + }); + + const startDate = lastResultsData?.['@timestamp'] + ? moment(lastResultsData?.['@timestamp'][0]).subtract(interval, 'seconds').toISOString() + : `now-${interval}s`; + const endDate = lastResultsData?.['@timestamp'] + ? moment(lastResultsData?.['@timestamp'][0]).toISOString() + : 'now'; + + return ( + + ); +}; + +export const PackViewInDiscoverAction = React.memo(PackViewInDiscoverActionComponent); diff --git a/x-pack/plugins/osquery/public/discover/view_results_in_discover.tsx b/x-pack/plugins/osquery/public/discover/view_results_in_discover.tsx new file mode 100644 index 0000000000000..2106f11b89220 --- /dev/null +++ b/x-pack/plugins/osquery/public/discover/view_results_in_discover.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 React, { useEffect, useState } from 'react'; +import { EuiButtonEmpty, EuiButtonIcon, EuiToolTip } from '@elastic/eui'; +import { i18n } from '@kbn/i18n'; +import { FilterStateStore } from '@kbn/es-query'; +import { useKibana } from '../common/lib/kibana'; +import { useLogsDataView } from '../common/hooks/use_logs_data_view'; +import { ViewResultsActionButtonType } from '../live_queries/form/pack_queries_status_table'; + +interface ViewResultsInDiscoverActionProps { + actionId?: string; + agentIds?: string[]; + buttonType: ViewResultsActionButtonType; + endDate?: string; + startDate?: string; + mode?: string; +} + +const ViewResultsInDiscoverActionComponent: React.FC = ({ + actionId, + agentIds, + buttonType, + endDate, + startDate, +}) => { + const { discover, application } = useKibana().services; + const locator = discover?.locator; + const discoverPermissions = application.capabilities.discover; + const { data: logsDataView } = useLogsDataView({ skip: !actionId }); + + const [discoverUrl, setDiscoverUrl] = useState(''); + + useEffect(() => { + const getDiscoverUrl = async () => { + if (!locator || !logsDataView) return; + + const agentIdsQuery = agentIds?.length + ? { + bool: { + minimum_should_match: 1, + should: agentIds.map((agentId) => ({ match_phrase: { 'agent.id': agentId } })), + }, + } + : null; + + const newUrl = await locator.getUrl({ + indexPatternId: logsDataView.id, + filters: [ + { + meta: { + index: logsDataView.id, + alias: null, + negate: false, + disabled: false, + type: 'phrase', + key: 'action_id', + params: { query: actionId }, + }, + query: { match_phrase: { action_id: actionId } }, + $state: { store: FilterStateStore.APP_STATE }, + }, + ...(agentIdsQuery + ? [ + { + $state: { store: FilterStateStore.APP_STATE }, + meta: { + alias: 'agent IDs', + disabled: false, + index: logsDataView.id, + key: 'query', + negate: false, + type: 'custom', + value: JSON.stringify(agentIdsQuery), + }, + query: agentIdsQuery, + }, + ] + : []), + ], + refreshInterval: { + pause: true, + value: 0, + }, + timeRange: + startDate && endDate + ? { + to: endDate, + from: startDate, + mode: 'absolute', + } + : { + to: 'now', + from: 'now-1d', + mode: 'relative', + }, + }); + setDiscoverUrl(newUrl); + }; + + getDiscoverUrl(); + }, [actionId, agentIds, endDate, startDate, locator, logsDataView]); + + if (!discoverPermissions.show) { + return null; + } + + if (buttonType === ViewResultsActionButtonType.button) { + return ( + + {VIEW_IN_DISCOVER} + + ); + } + + return ( + + + + ); +}; + +const VIEW_IN_DISCOVER = i18n.translate( + 'xpack.osquery.pack.queriesTable.viewDiscoverResultsActionAriaLabel', + { + defaultMessage: 'View in Discover', + } +); + +export const ViewResultsInDiscoverAction = React.memo(ViewResultsInDiscoverActionComponent); diff --git a/x-pack/plugins/osquery/public/form/results_type_field.tsx b/x-pack/plugins/osquery/public/form/results_type_field.tsx index 55bbe69397f97..ccc1961259c38 100644 --- a/x-pack/plugins/osquery/public/form/results_type_field.tsx +++ b/x-pack/plugins/osquery/public/form/results_type_field.tsx @@ -34,7 +34,7 @@ const DIFFERENTIAL_OPTION = { inputDisplay: ( ), }; diff --git a/x-pack/plugins/osquery/public/lens/pack_view_in_lens.tsx b/x-pack/plugins/osquery/public/lens/pack_view_in_lens.tsx new file mode 100644 index 0000000000000..6e1cac3eda86f --- /dev/null +++ b/x-pack/plugins/osquery/public/lens/pack_view_in_lens.tsx @@ -0,0 +1,49 @@ +/* + * 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 moment from 'moment-timezone'; +import { usePackQueryLastResults } from '../packs/use_pack_query_last_results'; +import { ViewResultsActionButtonType } from '../live_queries/form/pack_queries_status_table'; +import { ViewResultsInLensAction } from './view_results_in_lens'; + +interface PackViewInActionProps { + item: { + id: string; + interval: number; + action_id?: string; + agents: string[]; + }; + actionId?: string; +} +const PackViewInLensActionComponent: React.FC = ({ item }) => { + const { action_id: actionId, agents: agentIds, interval } = item; + const { data: lastResultsData } = usePackQueryLastResults({ + actionId, + interval, + }); + + const startDate = lastResultsData?.['@timestamp'] + ? moment(lastResultsData?.['@timestamp'][0]).subtract(interval, 'seconds').toISOString() + : `now-${interval}s`; + const endDate = lastResultsData?.['@timestamp'] + ? moment(lastResultsData?.['@timestamp'][0]).toISOString() + : 'now'; + + return ( + + ); +}; + +export const PackViewInLensAction = React.memo(PackViewInLensActionComponent); diff --git a/x-pack/plugins/osquery/public/lens/view_results_in_lens.tsx b/x-pack/plugins/osquery/public/lens/view_results_in_lens.tsx new file mode 100644 index 0000000000000..080c078f6a290 --- /dev/null +++ b/x-pack/plugins/osquery/public/lens/view_results_in_lens.tsx @@ -0,0 +1,234 @@ +/* + * 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, { useCallback, useMemo } from 'react'; +import { i18n } from '@kbn/i18n'; +import { EuiButtonEmpty, EuiButtonIcon, EuiToolTip } from '@elastic/eui'; +import type { + PersistedIndexPatternLayer, + PieVisualizationState, + TermsIndexPatternColumn, + TypedLensByValueInput, +} from '@kbn/lens-plugin/public'; +import { DOCUMENT_FIELD_NAME as RECORDS_FIELD } from '@kbn/lens-plugin/common/constants'; +import { FilterStateStore } from '@kbn/es-query'; +import { ViewResultsActionButtonType } from '../live_queries/form/pack_queries_status_table'; +import type { LogsDataView } from '../common/hooks/use_logs_data_view'; +import { useKibana } from '../common/lib/kibana'; +import { useLogsDataView } from '../common/hooks/use_logs_data_view'; + +interface ViewResultsInLensActionProps { + actionId?: string; + agentIds?: string[]; + buttonType: ViewResultsActionButtonType; + endDate?: string; + startDate?: string; + mode?: string; +} + +const ViewResultsInLensActionComponent: React.FC = ({ + actionId, + agentIds, + buttonType, + endDate, + startDate, + mode, +}) => { + const lensService = useKibana().services.lens; + const { data: logsDataView } = useLogsDataView({ skip: !actionId }); + + const handleClick = useCallback( + (event) => { + event.preventDefault(); + + if (logsDataView) { + lensService?.navigateToPrefilledEditor( + { + id: '', + timeRange: { + from: startDate ?? 'now-1d', + to: endDate ?? 'now', + mode: mode ?? (startDate || endDate) ? 'absolute' : 'relative', + }, + attributes: getLensAttributes(logsDataView, actionId, agentIds), + }, + { + openInNewTab: true, + skipAppLeave: true, + } + ); + } + }, + [actionId, agentIds, endDate, lensService, logsDataView, mode, startDate] + ); + + const isDisabled = useMemo(() => !actionId || !logsDataView, [actionId, logsDataView]); + + if (buttonType === ViewResultsActionButtonType.button) { + return ( + + {VIEW_IN_LENS} + + ); + } + + return ( + + + + ); +}; + +function getLensAttributes( + logsDataView: LogsDataView, + actionId?: string, + agentIds?: string[] +): TypedLensByValueInput['attributes'] { + const dataLayer: PersistedIndexPatternLayer = { + columnOrder: ['8690befd-fd69-4246-af4a-dd485d2a3b38', 'ed999e9d-204c-465b-897f-fe1a125b39ed'], + columns: { + '8690befd-fd69-4246-af4a-dd485d2a3b38': { + sourceField: 'type', + isBucketed: true, + dataType: 'string', + scale: 'ordinal', + operationType: 'terms', + label: 'Top values of type', + params: { + otherBucket: true, + size: 5, + missingBucket: false, + orderBy: { + columnId: 'ed999e9d-204c-465b-897f-fe1a125b39ed', + type: 'column', + }, + orderDirection: 'desc', + }, + } as TermsIndexPatternColumn, + 'ed999e9d-204c-465b-897f-fe1a125b39ed': { + sourceField: RECORDS_FIELD, + isBucketed: false, + dataType: 'number', + scale: 'ratio', + operationType: 'count', + label: 'Count of records', + }, + }, + incompleteColumns: {}, + }; + + const xyConfig: PieVisualizationState = { + shape: 'pie', + layers: [ + { + layerType: 'data', + legendDisplay: 'default', + nestedLegend: false, + layerId: 'layer1', + metric: 'ed999e9d-204c-465b-897f-fe1a125b39ed', + numberDisplay: 'percent', + primaryGroups: ['8690befd-fd69-4246-af4a-dd485d2a3b38'], + categoryDisplay: 'default', + }, + ], + }; + + const agentIdsQuery = agentIds?.length + ? { + bool: { + minimum_should_match: 1, + should: agentIds?.map((agentId) => ({ match_phrase: { 'agent.id': agentId } })), + }, + } + : undefined; + + return { + visualizationType: 'lnsPie', + title: `Action ${actionId} results`, + references: [ + { + id: logsDataView.id, + name: 'indexpattern-datasource-current-indexpattern', + type: 'index-pattern', + }, + { + id: logsDataView.id, + name: 'indexpattern-datasource-layer-layer1', + type: 'index-pattern', + }, + { + name: 'filter-index-pattern-0', + id: logsDataView.id, + type: 'index-pattern', + }, + ], + state: { + datasourceStates: { + indexpattern: { + layers: { + layer1: dataLayer, + }, + }, + }, + filters: [ + { + $state: { store: FilterStateStore.APP_STATE }, + meta: { + index: 'filter-index-pattern-0', + negate: false, + alias: null, + disabled: false, + params: { + query: actionId, + }, + type: 'phrase', + key: 'action_id', + }, + query: { + match_phrase: { + action_id: actionId, + }, + }, + }, + ...(agentIdsQuery + ? [ + { + $state: { store: FilterStateStore.APP_STATE }, + meta: { + alias: 'agent IDs', + disabled: false, + index: 'filter-index-pattern-0', + key: 'query', + negate: false, + type: 'custom', + value: JSON.stringify(agentIdsQuery), + }, + query: agentIdsQuery, + }, + ] + : []), + ], + query: { language: 'kuery', query: '' }, + visualization: xyConfig, + }, + }; +} + +const VIEW_IN_LENS = i18n.translate( + 'xpack.osquery.pack.queriesTable.viewLensResultsActionAriaLabel', + { + defaultMessage: 'View in Lens', + } +); + +export const ViewResultsInLensAction = React.memo(ViewResultsInLensActionComponent); diff --git a/x-pack/plugins/osquery/public/live_queries/form/index.tsx b/x-pack/plugins/osquery/public/live_queries/form/index.tsx index 4a6a204cec0b4..b870d1385752f 100644 --- a/x-pack/plugins/osquery/public/live_queries/form/index.tsx +++ b/x-pack/plugins/osquery/public/live_queries/form/index.tsx @@ -12,6 +12,7 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useForm as useHookForm, FormProvider } from 'react-hook-form'; import { isEmpty, find, pickBy } from 'lodash'; +import { AddToCaseWrapper } from '../../cases/add_to_cases'; import type { AddToTimelinePayload } from '../../timelines/get_add_to_timeline'; import { QueryPackSelectable } from './query_pack_selectable'; import type { SavedQuerySOFormData } from '../../saved_queries/form/use_saved_query_form'; @@ -25,7 +26,6 @@ import type { AgentSelection } from '../../agents/types'; import { LiveQueryQueryField } from './live_query_query_field'; import { AgentsTableField } from './agents_table_field'; import { savedQueryDataSerializer } from '../../saved_queries/form/use_saved_query_form'; -import { AddToCaseButton } from '../../cases/add_to_cases_button'; import { PackFieldWrapper } from '../../shared_components/osquery_response_action_type/pack_field_wrapper'; export interface LiveQueryFormFields { @@ -213,7 +213,7 @@ const LiveQueryFormComponent: React.FC = ({ (payload) => { if (liveQueryActionId) { return ( - ({ match_phrase: { 'agent.id': agentId } })), - }, - } - : undefined; - - return { - visualizationType: 'lnsPie', - title: `Action ${actionId} results`, - references: [ - { - id: logsDataView.id, - name: 'indexpattern-datasource-current-indexpattern', - type: 'index-pattern', - }, - { - id: logsDataView.id, - name: 'indexpattern-datasource-layer-layer1', - type: 'index-pattern', - }, - { - name: 'filter-index-pattern-0', - id: logsDataView.id, - type: 'index-pattern', - }, - ], - state: { - datasourceStates: { - indexpattern: { - layers: { - layer1: dataLayer, - }, - }, - }, - filters: [ - { - $state: { store: FilterStateStore.APP_STATE }, - meta: { - index: 'filter-index-pattern-0', - negate: false, - alias: null, - disabled: false, - params: { - query: actionId, - }, - type: 'phrase', - key: 'action_id', - }, - query: { - match_phrase: { - action_id: actionId, - }, - }, - }, - ...(agentIdsQuery - ? [ - { - $state: { store: FilterStateStore.APP_STATE }, - meta: { - alias: 'agent IDs', - disabled: false, - index: 'filter-index-pattern-0', - key: 'query', - negate: false, - type: 'custom', - value: JSON.stringify(agentIdsQuery), - }, - query: agentIdsQuery, - }, - ] - : []), - ], - query: { language: 'kuery', query: '' }, - visualization: xyConfig, - }, - }; -} - -const ViewResultsInLensActionComponent: React.FC = ({ - actionId, - agentIds, - buttonType, - endDate, - startDate, - mode, -}) => { - const lensService = useKibana().services.lens; - const isLensAvailable = lensService?.canUseEditor(); - const { data: logsDataView } = useLogsDataView({ skip: !actionId }); - - const handleClick = useCallback( - (event) => { - event.preventDefault(); - - if (logsDataView) { - lensService?.navigateToPrefilledEditor( - { - id: '', - timeRange: { - from: startDate ?? 'now-1d', - to: endDate ?? 'now', - mode: mode ?? (startDate || endDate) ? 'absolute' : 'relative', - }, - attributes: getLensAttributes(logsDataView, actionId, agentIds), - }, - { - openInNewTab: true, - skipAppLeave: true, - } - ); - } - }, - [actionId, agentIds, endDate, lensService, logsDataView, mode, startDate] - ); - - const isDisabled = useMemo(() => !actionId || !logsDataView, [actionId, logsDataView]); - - if (!isLensAvailable) { - return null; - } - - if (buttonType === ViewResultsActionButtonType.button) { - return ( - - {VIEW_IN_LENS} - - ); - } - - return ( - - - - ); -}; - -export const ViewResultsInLensAction = React.memo(ViewResultsInLensActionComponent); - -const ViewResultsInDiscoverActionComponent: React.FC = ({ - actionId, - agentIds, - buttonType, - endDate, - startDate, -}) => { - const { discover, application } = useKibana().services; - const locator = discover?.locator; - const discoverPermissions = application.capabilities.discover; - const { data: logsDataView } = useLogsDataView({ skip: !actionId }); - - const [discoverUrl, setDiscoverUrl] = useState(''); - - useEffect(() => { - const getDiscoverUrl = async () => { - if (!locator || !logsDataView) return; - - const agentIdsQuery = agentIds?.length - ? { - bool: { - minimum_should_match: 1, - should: agentIds.map((agentId) => ({ match_phrase: { 'agent.id': agentId } })), - }, - } - : null; - - const newUrl = await locator.getUrl({ - indexPatternId: logsDataView.id, - filters: [ - { - meta: { - index: logsDataView.id, - alias: null, - negate: false, - disabled: false, - type: 'phrase', - key: 'action_id', - params: { query: actionId }, - }, - query: { match_phrase: { action_id: actionId } }, - $state: { store: FilterStateStore.APP_STATE }, - }, - ...(agentIdsQuery - ? [ - { - $state: { store: FilterStateStore.APP_STATE }, - meta: { - alias: 'agent IDs', - disabled: false, - index: logsDataView.id, - key: 'query', - negate: false, - type: 'custom', - value: JSON.stringify(agentIdsQuery), - }, - query: agentIdsQuery, - }, - ] - : []), - ], - refreshInterval: { - pause: true, - value: 0, - }, - timeRange: - startDate && endDate - ? { - to: endDate, - from: startDate, - mode: 'absolute', - } - : { - to: 'now', - from: 'now-1d', - mode: 'relative', - }, - }); - setDiscoverUrl(newUrl); - }; - - getDiscoverUrl(); - }, [actionId, agentIds, endDate, startDate, locator, logsDataView]); - - if (!discoverPermissions.show) { - return null; - } - - if (buttonType === ViewResultsActionButtonType.button) { - return ( - - {VIEW_IN_DISCOVER} - - ); - } - - return ( - - - - ); -}; - -export const ViewResultsInDiscoverAction = React.memo(ViewResultsInDiscoverActionComponent); - interface DocsColumnResultsProps { count?: number; isLive?: boolean; @@ -450,72 +99,6 @@ const AgentsColumnResults: React.FC = ({ ); -interface PackViewInActionProps { - item: { - id: string; - interval: number; - action_id?: string; - agents: string[]; - }; - actionId?: string; -} - -const PackViewInDiscoverActionComponent: React.FC = ({ item }) => { - const { action_id: actionId, agents: agentIds, interval } = item; - const { data: lastResultsData } = usePackQueryLastResults({ - actionId, - interval, - }); - - const startDate = lastResultsData?.['@timestamp'] - ? moment(lastResultsData?.['@timestamp'][0]).subtract(interval, 'seconds').toISOString() - : `now-${interval}s`; - const endDate = lastResultsData?.['@timestamp'] - ? moment(lastResultsData?.['@timestamp'][0]).toISOString() - : 'now'; - - return ( - - ); -}; - -const PackViewInDiscoverAction = React.memo(PackViewInDiscoverActionComponent); - -const PackViewInLensActionComponent: React.FC = ({ item }) => { - const { action_id: actionId, agents: agentIds, interval } = item; - const { data: lastResultsData } = usePackQueryLastResults({ - actionId, - interval, - }); - - const startDate = lastResultsData?.['@timestamp'] - ? moment(lastResultsData?.['@timestamp'][0]).subtract(interval, 'seconds').toISOString() - : `now-${interval}s`; - const endDate = lastResultsData?.['@timestamp'] - ? moment(lastResultsData?.['@timestamp'][0]).toISOString() - : 'now'; - - return ( - - ); -}; - -const PackViewInLensAction = React.memo(PackViewInLensActionComponent); - type PackQueryStatusItem = Partial<{ action_id: string; id: string; @@ -542,10 +125,12 @@ interface PackQueriesStatusTableProps { actionId, isIcon, isDisabled, + queryId, }: { actionId?: string; isIcon?: boolean; isDisabled?: boolean; + queryId?: string; }) => ReactElement; showResultsHeader?: boolean; } @@ -562,10 +147,6 @@ const PackQueriesStatusTableComponent: React.FC = ( showResultsHeader, }) => { const [itemIdToExpandedRowMap, setItemIdToExpandedRowMap] = useState>({}); - const { cases, timelines, appName } = useKibana().services; - const casePermissions = cases.helpers.canUseCases(); - const CasesContext = cases.ui.getCasesContext(); - const renderIDColumn = useCallback( (id: string) => ( @@ -619,11 +200,15 @@ const PackQueriesStatusTableComponent: React.FC = ( const renderLensResultsAction = useCallback((item) => , []); const handleAddToCase = useCallback( - (payload: { actionId: string; isIcon?: boolean }) => + (payload: { actionId?: string; isIcon?: boolean; queryId: string }) => // eslint-disable-next-line react/display-name () => { if (addToCase) { - return addToCase({ actionId: payload.actionId, isIcon: payload?.isIcon }); + return addToCase({ + actionId: payload.actionId, + isIcon: payload.isIcon, + queryId: payload.queryId, + }); } return <>; @@ -648,7 +233,7 @@ const PackQueriesStatusTableComponent: React.FC = ( agentIds={agentIds} failedAgentsCount={item?.failed ?? 0} addToTimeline={addToTimeline} - addToCase={addToCase && handleAddToCase({ actionId: item.action_id })} + addToCase={addToCase && handleAddToCase({ queryId: item.action_id, actionId })} /> @@ -658,7 +243,7 @@ const PackQueriesStatusTableComponent: React.FC = ( return itemIdToExpandedRowMapValues; }); }, - [startDate, expirationDate, agentIds, addToTimeline, addToCase, handleAddToCase] + [startDate, expirationDate, agentIds, addToTimeline, addToCase, handleAddToCase, actionId] ); const renderToggleResultsAction = useCallback( @@ -677,28 +262,37 @@ const PackQueriesStatusTableComponent: React.FC = ( const getItemId = useCallback((item: PackItem) => get(item, 'id'), []); - const columns = useMemo(() => { - const resultActions = [ - { - render: renderDiscoverResultsAction, - }, - { - render: renderLensResultsAction, - }, - { - available: () => !!addToCase, - render: (item: { action_id: string }) => - addToCase && - addToCase({ actionId: item.action_id, isIcon: true, isDisabled: !item.action_id }), - }, - { - available: () => addToTimeline && timelines && appName === SECURITY_APP_NAME, - render: (item: { action_id: string }) => - addToTimeline && addToTimeline({ query: ['action_id', item.action_id], isIcon: true }), - }, - ]; + const renderResultActions = useCallback( + (row: { action_id: string }) => { + const resultActions = [ + { + render: renderDiscoverResultsAction, + }, + { + render: renderLensResultsAction, + }, + { + render: (item: { action_id: string }) => + addToTimeline && addToTimeline({ query: ['action_id', item.action_id], isIcon: true }), + }, + { + render: (item: { action_id: string }) => + addToCase && + addToCase({ + actionId, + queryId: item.action_id, + isIcon: true, + isDisabled: !item.action_id, + }), + }, + ]; - return [ + return resultActions.map((action) => action.render(row)); + }, + [actionId, addToCase, addToTimeline, renderDiscoverResultsAction, renderLensResultsAction] + ); + const columns = useMemo( + () => [ { field: 'id', name: i18n.translate('xpack.osquery.pack.queriesTable.idColumnTitle', { @@ -734,7 +328,7 @@ const PackQueriesStatusTableComponent: React.FC = ( defaultMessage: 'View results', }), width: '90px', - actions: resultActions, + render: renderResultActions, }, { id: 'actions', @@ -747,21 +341,16 @@ const PackQueriesStatusTableComponent: React.FC = ( }, ], }, - ]; - }, [ - renderDiscoverResultsAction, - renderLensResultsAction, - renderIDColumn, - renderQueryColumn, - renderDocsColumn, - renderAgentsColumn, - renderToggleResultsAction, - addToCase, - addToTimeline, - timelines, - appName, - ]); - + ], + [ + renderIDColumn, + renderQueryColumn, + renderDocsColumn, + renderAgentsColumn, + renderResultActions, + renderToggleResultsAction, + ] + ); const sorting = useMemo( () => ({ sort: { @@ -798,7 +387,7 @@ const PackQueriesStatusTableComponent: React.FC = ( ); return ( - + <> {showResultsHeader && ( )} @@ -811,7 +400,7 @@ const PackQueriesStatusTableComponent: React.FC = ( itemIdToExpandedRowMap={itemIdToExpandedRowMap} isExpandable /> - + ); }; diff --git a/x-pack/plugins/osquery/public/live_queries/form/pack_results_header.tsx b/x-pack/plugins/osquery/public/live_queries/form/pack_results_header.tsx index 854548fdb58e4..b4892a0387e8e 100644 --- a/x-pack/plugins/osquery/public/live_queries/form/pack_results_header.tsx +++ b/x-pack/plugins/osquery/public/live_queries/form/pack_results_header.tsx @@ -35,6 +35,7 @@ const StyledIconsList = styled(EuiFlexItem)` export const PackResultsHeader = ({ actionId, addToCase }: PackResultsHeadersProps) => ( <> + diff --git a/x-pack/plugins/osquery/public/packs/form/index.tsx b/x-pack/plugins/osquery/public/packs/form/index.tsx index 594c539c389cf..ac3892fe9748b 100644 --- a/x-pack/plugins/osquery/public/packs/form/index.tsx +++ b/x-pack/plugins/osquery/public/packs/form/index.tsx @@ -155,7 +155,7 @@ const PackFormComponent: React.FC = ({ - + diff --git a/x-pack/plugins/osquery/public/packs/queries/query_flyout.tsx b/x-pack/plugins/osquery/public/packs/queries/query_flyout.tsx index d709b4f639e6d..65d829e7b7e82 100644 --- a/x-pack/plugins/osquery/public/packs/queries/query_flyout.tsx +++ b/x-pack/plugins/osquery/public/packs/queries/query_flyout.tsx @@ -79,7 +79,7 @@ const QueryFlyoutComponent: React.FC = ({ resetField('version', { defaultValue: savedQuery.version ? [savedQuery.version] : [] }); resetField('interval', { defaultValue: savedQuery.interval ? savedQuery.interval : 3600 }); resetField('snapshot', { defaultValue: savedQuery.snapshot ?? true }); - resetField('removed'); + resetField('removed', { defaultValue: savedQuery.removed }); resetField('ecs_mapping', { defaultValue: savedQuery.ecs_mapping ?? {} }); } }, diff --git a/x-pack/plugins/osquery/public/routes/live_queries/details/index.tsx b/x-pack/plugins/osquery/public/routes/live_queries/details/index.tsx index a4c58074c76e1..bf35a529137f8 100644 --- a/x-pack/plugins/osquery/public/routes/live_queries/details/index.tsx +++ b/x-pack/plugins/osquery/public/routes/live_queries/details/index.tsx @@ -10,13 +10,18 @@ import { FormattedMessage } from '@kbn/i18n-react'; import React, { useCallback, useLayoutEffect, useMemo, useState } from 'react'; import { useParams } from 'react-router-dom'; -import { AddToCaseButton } from '../../../cases/add_to_cases_button'; +import styled from 'styled-components'; +import { AddToCaseWrapper } from '../../../cases/add_to_cases'; import { useRouterNavigate } from '../../../common/lib/kibana'; import { WithHeaderLayout } from '../../../components/layouts'; import { useLiveQueryDetails } from '../../../actions/use_live_query_details'; import { useBreadcrumbs } from '../../../common/hooks/use_breadcrumbs'; import { PackQueriesStatusTable } from '../../../live_queries/form/pack_queries_status_table'; +const StyledTableWrapper = styled(EuiFlexItem)` + padding-left: 10px; +`; + const LiveQueryDetailsPageComponent = () => { const { actionId } = useParams<{ actionId: string }>(); useBreadcrumbs('live_query_details', { liveQueryId: actionId }); @@ -55,7 +60,7 @@ const LiveQueryDetailsPageComponent = () => { }, [data?.status]); const addToCaseButton = useCallback( (payload) => ( - { return ( - + + + ); }; diff --git a/x-pack/plugins/osquery/public/routes/saved_queries/edit/tabs.tsx b/x-pack/plugins/osquery/public/routes/saved_queries/edit/tabs.tsx index 49501bc24b708..f4de8b04cb472 100644 --- a/x-pack/plugins/osquery/public/routes/saved_queries/edit/tabs.tsx +++ b/x-pack/plugins/osquery/public/routes/saved_queries/edit/tabs.tsx @@ -10,13 +10,10 @@ import React, { useMemo } from 'react'; import type { ReactElement } from 'react'; import type { ECSMapping } from '@kbn/osquery-io-ts-types'; -import { useKibana } from '../../../common/lib/kibana'; import type { AddToTimelinePayload } from '../../../timelines/get_add_to_timeline'; import { ResultsTable } from '../../../results/results_table'; import { ActionResultsSummary } from '../../../action_results/action_results_summary'; -const CASES_OWNER: string[] = []; - interface ResultTabsProps { actionId: string; agentIds?: string[]; @@ -38,10 +35,6 @@ const ResultTabsComponent: React.FC = ({ addToTimeline, addToCase, }) => { - const { cases } = useKibana().services; - const casePermissions = cases.helpers.canUseCases(); - const CasesContext = cases.ui.getCasesContext(); - const tabs = useMemo( () => [ { @@ -85,16 +78,14 @@ const ResultTabsComponent: React.FC = ({ ); return ( - - - + ); }; diff --git a/x-pack/plugins/osquery/public/saved_queries/form/use_saved_query_form.tsx b/x-pack/plugins/osquery/public/saved_queries/form/use_saved_query_form.tsx index 3392f2af037c2..76bdd77d17b17 100644 --- a/x-pack/plugins/osquery/public/saved_queries/form/use_saved_query_form.tsx +++ b/x-pack/plugins/osquery/public/saved_queries/form/use_saved_query_form.tsx @@ -72,11 +72,6 @@ export const savedQueryDataSerializer = (payload: SavedQueryFormData): SavedQuer draft.interval = draft.interval + ''; } - if (draft.snapshot) { - delete draft.snapshot; - delete draft.removed; - } - return draft; }); diff --git a/x-pack/plugins/osquery/public/shared_components/osquery_action/index.tsx b/x-pack/plugins/osquery/public/shared_components/osquery_action/index.tsx index 6bb8d6f5a563d..3095428d478dc 100644 --- a/x-pack/plugins/osquery/public/shared_components/osquery_action/index.tsx +++ b/x-pack/plugins/osquery/public/shared_components/osquery_action/index.tsx @@ -6,17 +6,12 @@ */ import { EuiLoadingContent, EuiEmptyPrompt, EuiCode } from '@elastic/eui'; -import React, { useMemo } from 'react'; +import React from 'react'; import { FormattedMessage } from '@kbn/i18n-react'; +import { OsqueryEmptyPrompt, OsqueryNotAvailablePrompt } from '../prompts'; import type { AddToTimelinePayload } from '../../timelines/get_add_to_timeline'; -import { - AGENT_STATUS_ERROR, - EMPTY_PROMPT, - NOT_AVAILABLE, - PERMISSION_DENIED, - SHORT_EMPTY_TITLE, -} from './translations'; +import { AGENT_STATUS_ERROR, PERMISSION_DENIED, SHORT_EMPTY_TITLE } from './translations'; import { useKibana } from '../../common/lib/kibana'; import { LiveQuery } from '../../live_queries'; import { OsqueryIcon } from '../../components/osquery_icon'; @@ -39,22 +34,11 @@ const OsqueryActionComponent: React.FC = ({ }) => { const permissions = useKibana().services.application.capabilities.osquery; - const emptyPrompt = useMemo( - () => ( - } - title={

    {SHORT_EMPTY_TITLE}

    } - titleSize="xs" - body={

    {EMPTY_PROMPT}

    } - /> - ), - [] - ); const { osqueryAvailable, agentFetched, isLoading, policyFetched, policyLoading, agentData } = useIsOsqueryAvailable(agentId); if (agentId && agentFetched && !agentData) { - return emptyPrompt; + return ; } if ( @@ -91,14 +75,7 @@ const OsqueryActionComponent: React.FC = ({ } if (agentId && !osqueryAvailable) { - return ( - } - title={

    {SHORT_EMPTY_TITLE}

    } - titleSize="xs" - body={

    {NOT_AVAILABLE}

    } - /> - ); + return ; } if (agentId && agentData?.status !== 'online') { diff --git a/x-pack/plugins/osquery/public/shared_components/osquery_results/osquery_result.test.tsx b/x-pack/plugins/osquery/public/shared_components/osquery_results/osquery_result.test.tsx index e33207a12d907..772df753c8978 100644 --- a/x-pack/plugins/osquery/public/shared_components/osquery_results/osquery_result.test.tsx +++ b/x-pack/plugins/osquery/public/shared_components/osquery_results/osquery_result.test.tsx @@ -20,7 +20,7 @@ import { DETAILS_ID, DETAILS_QUERY, DETAILS_TIMESTAMP, - mockCasesContext, + getMockedKibanaConfig, } from './test_utils'; jest.mock('../../common/lib/kibana'); @@ -43,34 +43,8 @@ const defaultProps = { queryId: '', }; const mockKibana = (permissionType: unknown = defaultPermissions) => { - useKibanaMock.mockReturnValue({ - services: { - application: { - capabilities: permissionType, - }, - cases: { - helpers: { - canUseCases: jest.fn(), - }, - ui: { - getCasesContext: jest.fn().mockImplementation(() => mockCasesContext), - }, - }, - data: { - dataViews: { - getCanSaveSync: jest.fn(), - hasData: { - hasESData: jest.fn(), - hasUserDataView: jest.fn(), - hasDataView: jest.fn(), - }, - }, - }, - notifications: { - toasts: jest.fn(), - }, - }, - } as unknown as ReturnType); + const mockedKibana = getMockedKibanaConfig(permissionType); + useKibanaMock.mockReturnValue(mockedKibana); }; const renderWithContext = (Element: React.ReactElement) => diff --git a/x-pack/plugins/osquery/public/shared_components/osquery_results/osquery_result.tsx b/x-pack/plugins/osquery/public/shared_components/osquery_results/osquery_result.tsx index 998de8a15cfca..b0d0691c14f7d 100644 --- a/x-pack/plugins/osquery/public/shared_components/osquery_results/osquery_result.tsx +++ b/x-pack/plugins/osquery/public/shared_components/osquery_results/osquery_result.tsx @@ -6,9 +6,10 @@ */ import { EuiComment, EuiSpacer } from '@elastic/eui'; -import React from 'react'; +import React, { useCallback } from 'react'; import { FormattedRelative } from '@kbn/i18n-react'; +import { AddToCaseWrapper } from '../../cases/add_to_cases'; import type { OsqueryActionResultsProps } from './types'; import { useLiveQueryDetails } from '../../actions/use_live_query_details'; import { ATTACHED_QUERY } from '../../agents/translations'; @@ -22,7 +23,6 @@ interface OsqueryResultProps extends Omit export const OsqueryResult = ({ actionId, - queryId, ruleName, addToTimeline, agentIds, @@ -30,10 +30,22 @@ export const OsqueryResult = ({ }: OsqueryResultProps) => { const { data } = useLiveQueryDetails({ actionId, - // isLive, - // ...(queryId ? { queryIds: [queryId] } : {}), }); + const addToCaseButton = useCallback( + (payload) => ( + + ), + [data?.agents, actionId] + ); + return (
    @@ -51,6 +63,7 @@ export const OsqueryResult = ({ expirationDate={data?.expiration} agentIds={agentIds} addToTimeline={addToTimeline} + addToCase={addToCaseButton} /> diff --git a/x-pack/plugins/osquery/public/shared_components/osquery_results/osquery_results.test.tsx b/x-pack/plugins/osquery/public/shared_components/osquery_results/osquery_results.test.tsx index 9e2b74e000705..5190d10dc1c7e 100644 --- a/x-pack/plugins/osquery/public/shared_components/osquery_results/osquery_results.test.tsx +++ b/x-pack/plugins/osquery/public/shared_components/osquery_results/osquery_results.test.tsx @@ -17,7 +17,7 @@ import * as useAllLiveQueries from '../../actions/use_all_live_queries'; import * as useLiveQueryDetails from '../../actions/use_live_query_details'; import { PERMISSION_DENIED } from '../osquery_action/translations'; import * as privileges from '../../action_results/use_action_privileges'; -import { defaultLiveQueryDetails, DETAILS_QUERY, mockCasesContext } from './test_utils'; +import { defaultLiveQueryDetails, DETAILS_QUERY, getMockedKibanaConfig } from './test_utils'; jest.mock('../../common/lib/kibana'); @@ -49,34 +49,8 @@ const defaultPermissions = { }; const mockKibana = (permissionType: unknown = defaultPermissions) => { - useKibanaMock.mockReturnValue({ - services: { - application: { - capabilities: permissionType, - }, - cases: { - helpers: { - canUseCases: jest.fn(), - }, - ui: { - getCasesContext: jest.fn().mockImplementation(() => mockCasesContext), - }, - }, - data: { - dataViews: { - getCanSaveSync: jest.fn(), - hasData: { - hasESData: jest.fn(), - hasUserDataView: jest.fn(), - hasDataView: jest.fn(), - }, - }, - }, - notifications: { - toasts: jest.fn(), - }, - }, - } as unknown as ReturnType); + const mockedKibana = getMockedKibanaConfig(permissionType); + useKibanaMock.mockReturnValue(mockedKibana); }; const renderWithContext = (Element: React.ReactElement) => diff --git a/x-pack/plugins/osquery/public/shared_components/osquery_results/test_utils.tsx b/x-pack/plugins/osquery/public/shared_components/osquery_results/test_utils.tsx index 4de58a4ed9aad..c1c991becc8ac 100644 --- a/x-pack/plugins/osquery/public/shared_components/osquery_results/test_utils.tsx +++ b/x-pack/plugins/osquery/public/shared_components/osquery_results/test_utils.tsx @@ -6,6 +6,7 @@ */ import React from 'react'; +import type { useKibana } from '../../common/lib/kibana'; export const DETAILS_QUERY = 'select * from uptime'; export const DETAILS_ID = 'test-id'; @@ -38,4 +39,41 @@ export const defaultLiveQueryDetails = { }, } as never; +export const getMockedKibanaConfig = (permissionType: unknown) => + ({ + services: { + application: { + capabilities: permissionType, + }, + cases: { + helpers: { + canUseCases: jest.fn().mockImplementation(() => ({ + read: true, + update: true, + push: true, + })), + }, + ui: { + getCasesContext: jest.fn().mockImplementation(() => mockCasesContext), + }, + hooks: { + getUseCasesAddToExistingCaseModal: jest.fn(), + }, + }, + data: { + dataViews: { + getCanSaveSync: jest.fn(), + hasData: { + hasESData: jest.fn(), + hasUserDataView: jest.fn(), + hasDataView: jest.fn(), + }, + }, + }, + notifications: { + toasts: jest.fn(), + }, + }, + } as unknown as ReturnType); + export const mockCasesContext: React.FC = (props) => <>{props?.children ?? null}; diff --git a/x-pack/plugins/osquery/public/shared_components/prompts.tsx b/x-pack/plugins/osquery/public/shared_components/prompts.tsx new file mode 100644 index 0000000000000..992de7c9ab14b --- /dev/null +++ b/x-pack/plugins/osquery/public/shared_components/prompts.tsx @@ -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 React from 'react'; +import { EuiEmptyPrompt } from '@elastic/eui'; +import { OsqueryIcon } from '../components/osquery_icon'; +import { EMPTY_PROMPT, NOT_AVAILABLE, SHORT_EMPTY_TITLE } from './osquery_action/translations'; + +export const OsqueryEmptyPrompt = () => ( + } + title={

    {SHORT_EMPTY_TITLE}

    } + titleSize="xs" + body={

    {EMPTY_PROMPT}

    } + /> +); + +export const OsqueryNotAvailablePrompt = () => ( + } + title={

    {SHORT_EMPTY_TITLE}

    } + titleSize="xs" + body={

    {NOT_AVAILABLE}

    } + /> +); diff --git a/x-pack/plugins/osquery/server/routes/pack/create_pack_route.ts b/x-pack/plugins/osquery/server/routes/pack/create_pack_route.ts index c60c6d476974b..3dda3cdb36b0d 100644 --- a/x-pack/plugins/osquery/server/routes/pack/create_pack_route.ts +++ b/x-pack/plugins/osquery/server/routes/pack/create_pack_route.ts @@ -144,7 +144,10 @@ export const createPackRoute = (router: IRouter, osqueryContext: OsqueryAppConte } set(draft, `inputs[0].config.osquery.value.packs.${packSO.attributes.name}`, { - queries: convertSOQueriesToPack(queries, { removeMultiLines: true }), + queries: convertSOQueriesToPack(queries, { + removeMultiLines: true, + removeResultType: true, + }), }); return draft; diff --git a/x-pack/plugins/osquery/server/routes/pack/update_pack_route.ts b/x-pack/plugins/osquery/server/routes/pack/update_pack_route.ts index c113cbeb36c32..5b0d76131ee28 100644 --- a/x-pack/plugins/osquery/server/routes/pack/update_pack_route.ts +++ b/x-pack/plugins/osquery/server/routes/pack/update_pack_route.ts @@ -285,6 +285,7 @@ export const updatePackRoute = (router: IRouter, osqueryContext: OsqueryAppConte { queries: convertSOQueriesToPack(updatedPackSO.attributes.queries, { removeMultiLines: true, + removeResultType: true, }), } ); @@ -315,7 +316,9 @@ export const updatePackRoute = (router: IRouter, osqueryContext: OsqueryAppConte draft, `inputs[0].config.osquery.value.packs.${updatedPackSO.attributes.name}`, { - queries: updatedPackSO.attributes.queries, + queries: convertSOQueriesToPack(updatedPackSO.attributes.queries, { + removeResultType: true, + }), } ); diff --git a/x-pack/plugins/osquery/server/routes/pack/utils.test.ts b/x-pack/plugins/osquery/server/routes/pack/utils.test.ts index 05aff28073937..3ddb074a6edbd 100644 --- a/x-pack/plugins/osquery/server/routes/pack/utils.test.ts +++ b/x-pack/plugins/osquery/server/routes/pack/utils.test.ts @@ -42,15 +42,45 @@ describe('Pack utils', () => { describe('convertSOQueriesToPack', () => { test('converts to pack with empty ecs_mapping', () => { const convertedQueries = convertSOQueriesToPack(getTestQueries()); - expect(convertedQueries).toStrictEqual(getTestQueries({})); + expect(convertedQueries).toStrictEqual(getTestQueries()); }); test('converts to pack with converting query to single line', () => { const convertedQueries = convertSOQueriesToPack(getTestQueries(), { removeMultiLines: true }); - expect(convertedQueries).toStrictEqual(oneLiner); + expect(convertedQueries).toStrictEqual({ + ...oneLiner, + }); }); test('converts to object with pack names after query.id', () => { const convertedQueries = convertSOQueriesToPack(getTestQueries({ id: 'testId' })); expect(convertedQueries).toStrictEqual(getTestQueries({}, 'testId')); }); + test('converts with results snapshot set false', () => { + const convertedQueries = convertSOQueriesToPack( + getTestQueries({ snapshot: false, removed: true }), + { removeResultType: true } + ); + expect(convertedQueries).toStrictEqual(getTestQueries({ removed: true, snapshot: false })); + }); + test('converts with results snapshot set true and removed false', () => { + const convertedQueries = convertSOQueriesToPack( + getTestQueries({ snapshot: true, removed: true }), + { removeResultType: true } + ); + expect(convertedQueries).toStrictEqual(getTestQueries({})); + }); + test('converts with results snapshot set true but removed false', () => { + const convertedQueries = convertSOQueriesToPack( + getTestQueries({ snapshot: true, removed: false }), + { removeResultType: true } + ); + expect(convertedQueries).toStrictEqual(getTestQueries({})); + }); + test('converts with both results set to false', () => { + const convertedQueries = convertSOQueriesToPack( + getTestQueries({ snapshot: false, removed: false }), + { removeResultType: true } + ); + expect(convertedQueries).toStrictEqual(getTestQueries({ removed: false, snapshot: false })); + }); }); }); diff --git a/x-pack/plugins/osquery/server/routes/pack/utils.ts b/x-pack/plugins/osquery/server/routes/pack/utils.ts index fe1ded84f4466..4342cdb3ead8e 100644 --- a/x-pack/plugins/osquery/server/routes/pack/utils.ts +++ b/x-pack/plugins/osquery/server/routes/pack/utils.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { isEmpty, pick, reduce } from 'lodash'; +import { isEmpty, pick, reduce, isArray } from 'lodash'; import { DEFAULT_PLATFORM } from '../../../common/constants'; import { removeMultilines } from '../../../common/utils/build_query/remove_multilines'; import { convertECSMappingToArray, convertECSMappingToObject } from '../utils'; @@ -37,18 +37,29 @@ export const convertPackQueriesToSO = (queries) => }> ); -// @ts-expect-error update types -export const convertSOQueriesToPack = (queries, options?: { removeMultiLines?: boolean }) => +export const convertSOQueriesToPack = ( + // @ts-expect-error update types + queries, + options?: { removeMultiLines?: boolean; removeResultType?: boolean } +) => reduce( queries, // eslint-disable-next-line @typescript-eslint/naming-convention - (acc, { id: queryId, ecs_mapping, query, platform, ...rest }, key) => { + (acc, { id: queryId, ecs_mapping, query, platform, removed, snapshot, ...rest }, key) => { + const resultType = !snapshot ? { removed, snapshot } : {}; const index = queryId ? queryId : key; acc[index] = { ...rest, query: options?.removeMultiLines ? removeMultilines(query) : query, - ...(!isEmpty(ecs_mapping) ? { ecs_mapping: convertECSMappingToObject(ecs_mapping) } : {}), + ...(!isEmpty(ecs_mapping) + ? isArray(ecs_mapping) + ? { ecs_mapping: convertECSMappingToObject(ecs_mapping) } + : { ecs_mapping } + : {}), ...(platform === DEFAULT_PLATFORM || platform === undefined ? {} : { platform }), + ...(options?.removeResultType + ? resultType + : { ...(snapshot ? { snapshot } : {}), ...(removed ? { removed } : {}) }), }; return acc; diff --git a/x-pack/plugins/osquery/server/routes/saved_query/create_saved_query_route.ts b/x-pack/plugins/osquery/server/routes/saved_query/create_saved_query_route.ts index 206719927281b..4ad6146328a1c 100644 --- a/x-pack/plugins/osquery/server/routes/saved_query/create_saved_query_route.ts +++ b/x-pack/plugins/osquery/server/routes/saved_query/create_saved_query_route.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { isEmpty, pickBy, some } from 'lodash'; +import { isEmpty, pickBy, some, isBoolean } from 'lodash'; import type { IRouter } from '@kbn/core/server'; import { PLUGIN_ID } from '../../../common'; import type { CreateSavedQueryRequestSchemaDecoded } from '../../../common/schemas/routes/saved_query/create_saved_query_request_schema'; @@ -76,7 +76,7 @@ export const createSavedQueryRoute = (router: IRouter, osqueryContext: OsqueryAp updated_by: currentUser, updated_at: new Date().toISOString(), }, - (value) => !isEmpty(value) || value === false + (value) => !isEmpty(value) || isBoolean(value) ) ); diff --git a/x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/osquery/index.tsx b/x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/osquery/index.tsx index 7b96f3886159c..0d0143eab2e32 100644 --- a/x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/osquery/index.tsx +++ b/x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/osquery/index.tsx @@ -29,7 +29,7 @@ import { LabelField } from './label_field'; import OsqueryLogo from './osquery_icon/osquery.svg'; import { OsqueryFlyout } from '../../../../../detections/components/osquery/osquery_flyout'; import { BasicAlertDataContext } from '../../../event_details/investigation_guide_view'; -import { convertECSMappingToObject } from './utils'; +import { OsqueryNotAvailablePrompt } from './not_available_prompt'; const StyledEuiButton = styled(EuiButton)` > span > img { @@ -49,7 +49,12 @@ const OsqueryEditorComponent = ({ }; }>) => { const isEditMode = node != null; - const { osquery } = useKibana().services; + const { + osquery, + application: { + capabilities: { osquery: osqueryPermissions }, + }, + } = useKibana().services; const formMethods = useForm<{ label: string; query: string; @@ -70,7 +75,7 @@ const OsqueryEditorComponent = ({ { query: data.query, label: data.label, - ecs_mapping: convertECSMappingToObject(data.ecs_mapping), + ecs_mapping: data.ecs_mapping, }, (value) => !isEmpty(value) ) @@ -83,6 +88,17 @@ const OsqueryEditorComponent = ({ [onSave] ); + const noOsqueryPermissions = useMemo( + () => + (!osqueryPermissions.runSavedQueries || !osqueryPermissions.readSavedQueries) && + !osqueryPermissions.writeLiveQueries, + [ + osqueryPermissions.readSavedQueries, + osqueryPermissions.runSavedQueries, + osqueryPermissions.writeLiveQueries, + ] + ); + const OsqueryActionForm = useMemo(() => { if (osquery?.LiveQueryField) { const { LiveQueryField } = osquery; @@ -98,6 +114,10 @@ const OsqueryEditorComponent = ({ return null; }, [formMethods, osquery]); + if (noOsqueryPermissions) { + return ; + } + return ( <> diff --git a/x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/osquery/not_available_prompt.tsx b/x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/osquery/not_available_prompt.tsx new file mode 100644 index 0000000000000..90db73811bd4f --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/osquery/not_available_prompt.tsx @@ -0,0 +1,38 @@ +/* + * 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 { EuiCode, EuiEmptyPrompt } from '@elastic/eui'; +import React from 'react'; +import { FormattedMessage } from '@kbn/i18n-react'; + +import { i18n } from '@kbn/i18n'; + +export const PERMISSION_DENIED = i18n.translate( + 'xpack.securitySolution.markdown.osquery.permissionDenied', + { + defaultMessage: 'Permission denied', + } +); + +export const OsqueryNotAvailablePrompt = () => ( + {PERMISSION_DENIED}

    } + titleSize="xs" + body={ +

    + {'osquery'}, + }} + /> +

    + } + /> +); diff --git a/x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/osquery/utils.ts b/x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/osquery/utils.ts deleted file mode 100644 index 77e2f14c51420..0000000000000 --- a/x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/osquery/utils.ts +++ /dev/null @@ -1,31 +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 { isEmpty, reduce } from 'lodash'; - -export const convertECSMappingToObject = ( - ecsMapping: Array<{ - key: string; - result: { - type: string; - value: string; - }; - }> -) => - reduce( - ecsMapping, - (acc, value) => { - if (!isEmpty(value?.key) && !isEmpty(value.result?.type) && !isEmpty(value.result?.value)) { - acc[value.key] = { - [value.result.type]: value.result.value, - }; - } - - return acc; - }, - {} as Record - ); diff --git a/x-pack/test/osquery_cypress/artifact_manager.ts b/x-pack/test/osquery_cypress/artifact_manager.ts index bef18d0177220..7ee2680e21f83 100644 --- a/x-pack/test/osquery_cypress/artifact_manager.ts +++ b/x-pack/test/osquery_cypress/artifact_manager.ts @@ -6,5 +6,5 @@ */ export async function getLatestVersion(): Promise { - return '8.5.0-SNAPSHOT'; + return '8.6.0-SNAPSHOT'; } From 659ba3b69e34f072bdeef626e7830689307c25f2 Mon Sep 17 00:00:00 2001 From: Matthew Kime Date: Wed, 28 Sep 2022 15:33:11 -0500 Subject: [PATCH 65/95] [data views] Allow noop on REST API update (#141875) * allow data view update noop --- .../rest_api_routes/update_data_view.ts | 36 +++++++++---------- .../update_data_view/errors.ts | 6 ++-- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/plugins/data_views/server/rest_api_routes/update_data_view.ts b/src/plugins/data_views/server/rest_api_routes/update_data_view.ts index 0e9f0983ac64d..1ac504ac652b8 100644 --- a/src/plugins/data_views/server/rest_api_routes/update_data_view.ts +++ b/src/plugins/data_views/server/rest_api_routes/update_data_view.ts @@ -9,7 +9,7 @@ import { schema } from '@kbn/config-schema'; import { UsageCounter } from '@kbn/usage-collection-plugin/server'; import { IRouter, StartServicesAccessor } from '@kbn/core/server'; -import { DataViewsService } from '../../common/data_views'; +import { DataViewsService, DataView } from '../../common/data_views'; import { DataViewSpec } from '../../common/types'; import { handleErrors } from './util/handle_errors'; import { fieldSpecSchema, runtimeFieldSchema, serializedFieldFormatSchema } from './util/schemas'; @@ -71,46 +71,46 @@ export const updateDataView = async ({ name, } = spec; - let changeCount = 0; + let isChanged = false; let doRefreshFields = false; if (title !== undefined && title !== dataView.title) { - changeCount++; + isChanged = true; dataView.title = title; } if (timeFieldName !== undefined && timeFieldName !== dataView.timeFieldName) { - changeCount++; + isChanged = true; dataView.timeFieldName = timeFieldName; } if (sourceFilters !== undefined) { - changeCount++; + isChanged = true; dataView.sourceFilters = sourceFilters; } if (fieldFormats !== undefined) { - changeCount++; + isChanged = true; dataView.fieldFormatMap = fieldFormats; } if (type !== undefined) { - changeCount++; + isChanged = true; dataView.type = type; } if (typeMeta !== undefined) { - changeCount++; + isChanged = true; dataView.typeMeta = typeMeta; } if (name !== undefined) { - changeCount++; + isChanged = true; dataView.name = name; } if (fields !== undefined) { - changeCount++; + isChanged = true; doRefreshFields = true; dataView.fields.replaceAll( Object.values(fields || {}).map((field) => ({ @@ -122,19 +122,19 @@ export const updateDataView = async ({ } if (runtimeFieldMap !== undefined) { - changeCount++; + isChanged = true; dataView.replaceAllRuntimeFields(runtimeFieldMap); } - if (changeCount < 1) { - throw new Error('Index pattern change set is empty.'); - } - - await dataViewsService.updateSavedObject(dataView); + if (isChanged) { + const result = (await dataViewsService.updateSavedObject(dataView)) as DataView; - if (doRefreshFields && refreshFields) { - await dataViewsService.refreshFields(dataView); + if (doRefreshFields && refreshFields) { + await dataViewsService.refreshFields(dataView); + } + return result; } + return dataView; }; diff --git a/test/api_integration/apis/data_views/data_views_crud/update_data_view/errors.ts b/test/api_integration/apis/data_views/data_views_crud/update_data_view/errors.ts index 54f61cba1cfbe..670b003a3d24f 100644 --- a/test/api_integration/apis/data_views/data_views_crud/update_data_view/errors.ts +++ b/test/api_integration/apis/data_views/data_views_crud/update_data_view/errors.ts @@ -53,7 +53,7 @@ export default function ({ getService }: FtrProviderContext) { ); }); - it('returns error when update patch is empty', async () => { + it('returns success when update patch is empty', async () => { const title1 = `foo-${Date.now()}-${Math.random()}*`; const response = await supertest.post(config.path).send({ [config.serviceKey]: { @@ -65,9 +65,7 @@ export default function ({ getService }: FtrProviderContext) { [config.serviceKey]: {}, }); - expect(response2.status).to.be(400); - expect(response2.body.statusCode).to.be(400); - expect(response2.body.message).to.be('Index pattern change set is empty.'); + expect(response2.status).to.be(200); }); }); }); From 630c96bfd9c62f0aaad7c0d3c40cacdcaf161de1 Mon Sep 17 00:00:00 2001 From: Dima Arnautov Date: Wed, 28 Sep 2022 23:18:02 +0200 Subject: [PATCH 66/95] [ML] Replace the local storage hook (#141968) * replace useStorage usage * fix test mock * unit tests * update tests * test for storage event --- .../full_time_range_selector.test.tsx | 2 +- .../full_time_range_selector.tsx | 2 +- .../components/job_selector/job_selector.tsx | 2 +- .../application/contexts/ml/use_storage.ts | 50 ------ .../contexts/storage/storage_context.test.tsx | 144 ++++++++++++++++++ .../contexts/storage/storage_context.tsx | 28 +++- .../public/application/explorer/explorer.tsx | 2 +- .../components/getting_started_callout.tsx | 2 +- .../series_controls/series_controls.tsx | 2 +- 9 files changed, 170 insertions(+), 64 deletions(-) delete mode 100644 x-pack/plugins/ml/public/application/contexts/ml/use_storage.ts create mode 100644 x-pack/plugins/ml/public/application/contexts/storage/storage_context.test.tsx diff --git a/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.test.tsx b/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.test.tsx index 0d20267f33ecb..7566d3664af61 100644 --- a/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.test.tsx +++ b/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.test.tsx @@ -20,7 +20,7 @@ jest.mock('./full_time_range_selector_service', () => ({ mockSetFullTimeRange(indexPattern, query), })); -jest.mock('../../contexts/ml/use_storage', () => { +jest.mock('../../contexts/storage', () => { return { useStorage: jest.fn(() => 'exclude-frozen'), }; diff --git a/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx b/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx index 06bb873971ba0..9b9154eb33660 100644 --- a/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx +++ b/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx @@ -23,7 +23,7 @@ import type { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/type import { i18n } from '@kbn/i18n'; import type { DataView } from '@kbn/data-views-plugin/public'; import { setFullTimeRange } from './full_time_range_selector_service'; -import { useStorage } from '../../contexts/ml/use_storage'; +import { useStorage } from '../../contexts/storage'; import { ML_FROZEN_TIER_PREFERENCE } from '../../../../common/types/storage'; import { GetTimeFieldRangeResponse } from '../../services/ml_api_service'; diff --git a/x-pack/plugins/ml/public/application/components/job_selector/job_selector.tsx b/x-pack/plugins/ml/public/application/components/job_selector/job_selector.tsx index 79d33ef9cd2ab..16fbc81b23f12 100644 --- a/x-pack/plugins/ml/public/application/components/job_selector/job_selector.tsx +++ b/x-pack/plugins/ml/public/application/components/job_selector/job_selector.tsx @@ -28,7 +28,7 @@ import { JobSelectorFlyoutProps, } from './job_selector_flyout'; import { MlJobWithTimeRange } from '../../../../common/types/anomaly_detection_jobs'; -import { useStorage } from '../../contexts/ml/use_storage'; +import { useStorage } from '../../contexts/storage'; import { ML_APPLY_TIME_RANGE_CONFIG } from '../../../../common/types/storage'; interface GroupObj { diff --git a/x-pack/plugins/ml/public/application/contexts/ml/use_storage.ts b/x-pack/plugins/ml/public/application/contexts/ml/use_storage.ts deleted file mode 100644 index 761434a7bb3b4..0000000000000 --- a/x-pack/plugins/ml/public/application/contexts/ml/use_storage.ts +++ /dev/null @@ -1,50 +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 { useCallback, useState } from 'react'; -import { isDefined } from '../../../../common/types/guards'; -import { useMlKibana } from '../kibana'; -import type { MlStorageKey } from '../../../../common/types/storage'; -import { TMlStorageMapped } from '../../../../common/types/storage'; - -/** - * Hook for accessing and changing a value in the storage. - * @param key - Storage key - * @param initValue - */ -export function useStorage>( - key: K, - initValue?: T -): [ - typeof initValue extends undefined - ? TMlStorageMapped - : Exclude, undefined>, - (value: TMlStorageMapped) => void -] { - const { - services: { storage }, - } = useMlKibana(); - - const [val, setVal] = useState(storage.get(key) ?? initValue); - - const setStorage = useCallback((value: TMlStorageMapped): void => { - try { - if (isDefined(value)) { - storage.set(key, value); - setVal(value); - } else { - storage.remove(key); - setVal(initValue); - } - } catch (e) { - throw new Error('Unable to update storage with provided value'); - } - // eslint-disable-next-line react-hooks/exhaustive-deps - }, []); - - return [val, setStorage]; -} diff --git a/x-pack/plugins/ml/public/application/contexts/storage/storage_context.test.tsx b/x-pack/plugins/ml/public/application/contexts/storage/storage_context.test.tsx new file mode 100644 index 0000000000000..6aeeb396f38c3 --- /dev/null +++ b/x-pack/plugins/ml/public/application/contexts/storage/storage_context.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 { renderHook, act } from '@testing-library/react-hooks'; +import { MlStorageContextProvider, useStorage } from './storage_context'; +import { MlStorageKey } from '../../../../common/types/storage'; + +const mockSet = jest.fn(); +const mockRemove = jest.fn(); + +jest.mock('../kibana', () => ({ + useMlKibana: () => { + return { + services: { + storage: { + set: mockSet, + get: jest.fn((key: MlStorageKey) => { + switch (key) { + case 'ml.gettingStarted.isDismissed': + return true; + default: + return; + } + }), + remove: mockRemove, + }, + }, + }; + }, +})); + +describe('useStorage', () => { + afterEach(() => { + jest.clearAllMocks(); + }); + + test('returns the default value', () => { + const { result } = renderHook(() => useStorage('ml.jobSelectorFlyout.applyTimeRange', true), { + wrapper: MlStorageContextProvider, + }); + + expect(result.current[0]).toBe(true); + }); + + test('returns the value from storage', () => { + const { result } = renderHook(() => useStorage('ml.gettingStarted.isDismissed', false), { + wrapper: MlStorageContextProvider, + }); + + expect(result.current[0]).toBe(true); + }); + + test('updates the storage value', async () => { + const { result, waitForNextUpdate } = renderHook( + () => useStorage('ml.gettingStarted.isDismissed'), + { + wrapper: MlStorageContextProvider, + } + ); + + const [value, setValue] = result.current; + + expect(value).toBe(true); + + await act(async () => { + setValue(false); + await waitForNextUpdate(); + }); + + expect(result.current[0]).toBe(false); + expect(mockSet).toHaveBeenCalledWith('ml.gettingStarted.isDismissed', false); + }); + + test('removes the storage value', async () => { + const { result, waitForNextUpdate } = renderHook( + () => useStorage('ml.gettingStarted.isDismissed'), + { + wrapper: MlStorageContextProvider, + } + ); + + const [value, setValue] = result.current; + + expect(value).toBe(true); + + await act(async () => { + setValue(undefined); + await waitForNextUpdate(); + }); + + expect(result.current[0]).toBe(undefined); + expect(mockRemove).toHaveBeenCalledWith('ml.gettingStarted.isDismissed'); + }); + + test('updates the value on storage event', async () => { + const { result, waitForNextUpdate } = renderHook( + () => useStorage('ml.gettingStarted.isDismissed'), + { + wrapper: MlStorageContextProvider, + } + ); + + expect(result.current[0]).toBe(true); + + await act(async () => { + window.dispatchEvent( + new StorageEvent('storage', { + key: 'test_key', + newValue: 'test_value', + }) + ); + }); + + expect(result.current[0]).toBe(true); + + await act(async () => { + window.dispatchEvent( + new StorageEvent('storage', { + key: 'ml.gettingStarted.isDismissed', + newValue: null, + }) + ); + await waitForNextUpdate(); + }); + + expect(result.current[0]).toBe(undefined); + + await act(async () => { + window.dispatchEvent( + new StorageEvent('storage', { + key: 'ml.gettingStarted.isDismissed', + newValue: 'false', + }) + ); + await waitForNextUpdate(); + }); + + expect(result.current[0]).toBe(false); + }); +}); diff --git a/x-pack/plugins/ml/public/application/contexts/storage/storage_context.tsx b/x-pack/plugins/ml/public/application/contexts/storage/storage_context.tsx index ccd46c446ed2c..c2b00a176c08c 100644 --- a/x-pack/plugins/ml/public/application/contexts/storage/storage_context.tsx +++ b/x-pack/plugins/ml/public/application/contexts/storage/storage_context.tsx @@ -69,7 +69,8 @@ export const MlStorageContextProvider: FC = ({ children }) => { setState((prev) => { return { ...prev, - [event.key as MlStorageKey]: event.newValue, + [event.key as MlStorageKey]: + typeof event.newValue === 'string' ? JSON.parse(event.newValue) : event.newValue, }; }); } else { @@ -106,21 +107,32 @@ export const MlStorageContextProvider: FC = ({ children }) => { * @param key * @param initValue */ -export function useStorage( +export function useStorage>( key: K, - initValue?: TMlStorageMapped -): [TMlStorageMapped | undefined, (value: TMlStorageMapped) => void] { - const { value, setValue } = useContext(MlStorageContext); + initValue?: T +): [ + typeof initValue extends undefined + ? TMlStorageMapped | undefined + : Exclude, undefined>, + (value: TMlStorageMapped) => void +] { + const { value, setValue, removeValue } = useContext(MlStorageContext); const resultValue = useMemo(() => { - return (value?.[key] ?? initValue) as TMlStorageMapped; + return (value?.[key] ?? initValue) as typeof initValue extends undefined + ? TMlStorageMapped | undefined + : Exclude, undefined>; }, [value, key, initValue]); const setVal = useCallback( (v: TMlStorageMapped) => { - setValue(key, v); + if (isDefined(v)) { + setValue(key, v); + } else { + removeValue(key); + } }, - [setValue, key] + [setValue, removeValue, key] ); return [resultValue, setVal]; diff --git a/x-pack/plugins/ml/public/application/explorer/explorer.tsx b/x-pack/plugins/ml/public/application/explorer/explorer.tsx index b9feffb1ec116..5fcab05f068b8 100644 --- a/x-pack/plugins/ml/public/application/explorer/explorer.tsx +++ b/x-pack/plugins/ml/public/application/explorer/explorer.tsx @@ -78,7 +78,7 @@ import { useMlKibana, useMlLocator } from '../contexts/kibana'; import { useMlContext } from '../contexts/ml'; import { useAnomalyExplorerContext } from './anomaly_explorer_context'; import { ML_ANOMALY_EXPLORER_PANELS } from '../../../common/types/storage'; -import { useStorage } from '../contexts/ml/use_storage'; +import { useStorage } from '../contexts/storage'; interface ExplorerPageProps { jobSelectorProps: JobSelectorProps; diff --git a/x-pack/plugins/ml/public/application/overview/components/getting_started_callout.tsx b/x-pack/plugins/ml/public/application/overview/components/getting_started_callout.tsx index 457bca80ee2c0..7b1f380c90658 100644 --- a/x-pack/plugins/ml/public/application/overview/components/getting_started_callout.tsx +++ b/x-pack/plugins/ml/public/application/overview/components/getting_started_callout.tsx @@ -9,7 +9,7 @@ import React, { FC } from 'react'; import { EuiButton, EuiCallOut, EuiLink, EuiSpacer } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n-react'; import { useMlKibana } from '../../contexts/kibana'; -import { useStorage } from '../../contexts/ml/use_storage'; +import { useStorage } from '../../contexts/storage'; import { ML_GETTING_STARTED_CALLOUT_DISMISSED } from '../../../../common/types/storage'; const feedbackLink = 'https://www.elastic.co/community/'; diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/components/series_controls/series_controls.tsx b/x-pack/plugins/ml/public/application/timeseriesexplorer/components/series_controls/series_controls.tsx index 0df10505e73cc..23084c8d8886d 100644 --- a/x-pack/plugins/ml/public/application/timeseriesexplorer/components/series_controls/series_controls.tsx +++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/components/series_controls/series_controls.tsx @@ -26,7 +26,7 @@ import { PartitionFieldConfig, PartitionFieldsConfig, } from '../../../../../common/types/storage'; -import { useStorage } from '../../../contexts/ml/use_storage'; +import { useStorage } from '../../../contexts/storage'; import { EntityFieldType } from '../../../../../common/types/anomalies'; import { FieldDefinition } from '../../../services/results_service/result_service_rx'; import { getViewableDetectors } from '../../timeseriesexplorer_utils/get_viewable_detectors'; From 598aa024bfabfb7a658afc13ad438dbdd304a32d Mon Sep 17 00:00:00 2001 From: Paulo Henrique Date: Wed, 28 Sep 2022 14:29:56 -0700 Subject: [PATCH 67/95] [8.5][Elastic Defend onboarding] Disabling protections for Cloud (#141879) --- .../endpoint_policy_create_extension.tsx | 55 +------------------ .../handlers/create_default_policy.ts | 31 ++--------- .../handlers/validate_integration_config.ts | 12 ---- .../server/fleet_integration/types.ts | 6 -- 4 files changed, 7 insertions(+), 97 deletions(-) diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_policy_create_extension/endpoint_policy_create_extension.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_policy_create_extension/endpoint_policy_create_extension.tsx index d1223ff14826e..0617707505e52 100644 --- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_policy_create_extension/endpoint_policy_create_extension.tsx +++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_policy_create_extension/endpoint_policy_create_extension.tsx @@ -8,7 +8,6 @@ import React, { memo, useState, useEffect, useRef, useCallback } from 'react'; import { EuiForm, - EuiCheckbox, EuiRadio, EuiSelect, EuiText, @@ -19,7 +18,6 @@ import { import { FormattedMessage } from '@kbn/i18n-react'; import styled from 'styled-components'; import type { PackagePolicyCreateExtensionComponentProps } from '@kbn/fleet-plugin/public'; -import { useLicense } from '../../../../../../common/hooks/use_license'; import { ALL_EVENTS, CLOUD_SECURITY, @@ -28,7 +26,6 @@ import { EDR_ESSENTIAL, ENDPOINT, INTERACTIVE_ONLY, - PREVENT_MALICIOUS_BEHAVIOR, } from './translations'; const PREFIX = 'endpoint_policy_create_extension'; @@ -70,11 +67,8 @@ const HelpTextWithPadding = styled.div` */ export const EndpointPolicyCreateExtension = memo( ({ newPolicy, onChange }) => { - const isPlatinumPlus = useLicense().isPlatinumPlus(); - // / Endpoint Radio Options (NGAV and EDRs) const [endpointPreset, setEndpointPreset] = useState('NGAV'); - const [behaviorProtectionChecked, setBehaviorProtectionChecked] = useState(false); const [selectedCloudEvent, setSelectedCloudEvent] = useState('ALL_EVENTS'); const [selectedEnvironment, setSelectedEnvironment] = useState('endpoint'); const initialRender = useRef(true); @@ -130,11 +124,6 @@ export const EndpointPolicyCreateExtension = memo) => { setSelectedEnvironment(e?.target?.value as Environment); @@ -170,9 +152,6 @@ export const EndpointPolicyCreateExtension = memo) => { setEndpointPreset(e.target.value as EndpointPreset); }, []); - const onChangeMaliciousBehavior = useCallback((e: React.ChangeEvent) => { - setBehaviorProtectionChecked((checked) => !checked); - }, []); const getEndpointPresetsProps = useCallback( (preset: EndpointPreset) => ({ @@ -217,7 +196,7 @@ export const EndpointPolicyCreateExtension = memo ), @@ -327,36 +306,6 @@ export const EndpointPolicyCreateExtension = memo - {isPlatinumPlus && ( - <> - - -

    - -

    -     - - -

    - -

    -     - - - - )} )} diff --git a/x-pack/plugins/security_solution/server/fleet_integration/handlers/create_default_policy.ts b/x-pack/plugins/security_solution/server/fleet_integration/handlers/create_default_policy.ts index 8ffd33e070d98..a2da989a9c08d 100644 --- a/x-pack/plugins/security_solution/server/fleet_integration/handlers/create_default_policy.ts +++ b/x-pack/plugins/security_solution/server/fleet_integration/handlers/create_default_policy.ts @@ -13,11 +13,7 @@ import type { LicenseService } from '../../../common/license/license'; import { isAtLeast } from '../../../common/license/license'; import { ProtectionModes } from '../../../common/endpoint/types'; import type { PolicyConfig } from '../../../common/endpoint/types'; -import type { - AnyPolicyCreateConfig, - PolicyCreateCloudConfig, - PolicyCreateEndpointConfig, -} from '../types'; +import type { AnyPolicyCreateConfig, PolicyCreateEndpointConfig } from '../types'; import { ENDPOINT_CONFIG_PRESET_EDR_ESSENTIAL, ENDPOINT_CONFIG_PRESET_NGAV } from '../constants'; /** @@ -32,7 +28,7 @@ export const createDefaultPolicy = ( : policyConfigFactoryWithoutPaidFeatures(); if (config?.type === 'cloud') { - return getCloudPolicyWithIntegrationConfig(policy, config); + return getCloudPolicyConfig(policy); } return getEndpointPolicyWithIntegrationConfig(policy, config); @@ -95,37 +91,20 @@ const getEndpointPolicyWithIntegrationConfig = ( /** * Retrieve policy for cloud based on the on the cloud integration config */ -const getCloudPolicyWithIntegrationConfig = ( - policy: PolicyConfig, - config: PolicyCreateCloudConfig -): PolicyConfig => { - /** - * Check if the protection is supported, then retrieve Behavior Protection mode based on cloud settings - */ - const getBehaviorProtectionMode = () => { - if (!policy.linux.behavior_protection.supported) { - return ProtectionModes.off; - } - - return config.cloudConfig.preventions.behavior_protection - ? ProtectionModes.prevent - : ProtectionModes.off; - }; - +const getCloudPolicyConfig = (policy: PolicyConfig): PolicyConfig => { + // Disabling all protections, since it's not yet supported on Cloud integrations const protections = { - // Disabling memory_protection, since it's not supported on Cloud integrations memory_protection: { supported: false, mode: ProtectionModes.off, }, malware: { ...policy.linux.malware, - // Disabling Malware protection, since it's not supported on Cloud integrations due to performance reasons mode: ProtectionModes.off, }, behavior_protection: { ...policy.linux.behavior_protection, - mode: getBehaviorProtectionMode(), + mode: ProtectionModes.off, }, }; diff --git a/x-pack/plugins/security_solution/server/fleet_integration/handlers/validate_integration_config.ts b/x-pack/plugins/security_solution/server/fleet_integration/handlers/validate_integration_config.ts index 76bd3e8af93fb..bc58358565817 100644 --- a/x-pack/plugins/security_solution/server/fleet_integration/handlers/validate_integration_config.ts +++ b/x-pack/plugins/security_solution/server/fleet_integration/handlers/validate_integration_config.ts @@ -46,18 +46,6 @@ const validateEndpointIntegrationConfig = ( } }; const validateCloudIntegrationConfig = (config: PolicyCreateCloudConfig, logger: Logger): void => { - if (!config?.cloudConfig?.preventions) { - logger.warn( - 'missing cloudConfig preventions: {preventions : behavior_protection: true / false}' - ); - throwError('invalid value for cloudConfig: missing preventions '); - } - if (typeof config.cloudConfig.preventions.behavior_protection !== 'boolean') { - logger.warn( - `invalid value for cloudConfig preventions behavior_protection: ${config.cloudConfig.preventions.behavior_protection}` - ); - throwError('invalid value for cloudConfig preventions behavior_protection'); - } if (!config?.eventFilters) { logger.warn( `eventFilters is required for cloud integration: {eventFilters : nonInteractiveSession: true / false}` diff --git a/x-pack/plugins/security_solution/server/fleet_integration/types.ts b/x-pack/plugins/security_solution/server/fleet_integration/types.ts index 2d012832f1ae2..0c7a7c17951e6 100644 --- a/x-pack/plugins/security_solution/server/fleet_integration/types.ts +++ b/x-pack/plugins/security_solution/server/fleet_integration/types.ts @@ -18,12 +18,6 @@ export interface PolicyCreateEventFilters { export interface PolicyCreateCloudConfig { type: 'cloud'; - cloudConfig: { - preventions: { - malware: boolean; - behavior_protection: boolean; - }; - }; eventFilters?: PolicyCreateEventFilters; } From 74a12296237adeffdb3980b46e6a293cc7845f94 Mon Sep 17 00:00:00 2001 From: Dominique Clarke Date: Wed, 28 Sep 2022 17:36:32 -0400 Subject: [PATCH 68/95] [Synthetics] Validation for multi url hosts/urls + more (#141668) * synthetics - project monitors - add additional validation for urls/hosts and request.check.body * add normalizing for service.name and ssl.supported_protocols and additional tests * adjust types * adjust tests * adjust types * remove apmServiceName from browser monitors * [CI] Auto-commit changed files from 'node scripts/eslint --no-cache --fix' * adjust tests Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../common/formatters/browser/formatters.ts | 1 - .../common/formatters/common/formatters.ts | 1 + .../monitor_management/monitor_types.ts | 2 +- .../monitor_types_project.ts | 1 - .../fleet_package/browser/normalizers.ts | 1 - .../fleet_package/common/normalizers.ts | 1 + .../synthetics_service/formatters/browser.ts | 1 - .../synthetics_service/formatters/common.ts | 1 + .../normalizers/browser_monitor.test.ts | 16 +- .../normalizers/browser_monitor.ts | 23 +- .../normalizers/common_fields.test.ts | 66 +++++ .../normalizers/common_fields.ts | 65 ++++- .../normalizers/http_monitor.test.ts | 242 ++++++++++++++++ .../normalizers/http_monitor.ts | 63 ++++- .../normalizers/icmp_monitor.test.ts | 227 +++++++++++++++ .../normalizers/icmp_monitor.ts | 33 ++- .../project_monitor/normalizers/index.ts | 20 +- .../normalizers/tcp_monitor.test.ts | 265 ++++++++++++++++++ .../normalizers/tcp_monitor.ts | 39 ++- .../project_monitor_formatter.ts | 13 +- .../apis/uptime/rest/add_monitor_project.ts | 21 +- .../rest/fixtures/project_http_monitor.json | 7 +- .../rest/fixtures/project_icmp_monitor.json | 5 +- .../rest/fixtures/project_tcp_monitor.json | 9 +- 24 files changed, 1029 insertions(+), 94 deletions(-) create mode 100644 x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/common_fields.test.ts create mode 100644 x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/http_monitor.test.ts create mode 100644 x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/icmp_monitor.test.ts create mode 100644 x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/tcp_monitor.test.ts diff --git a/x-pack/plugins/synthetics/common/formatters/browser/formatters.ts b/x-pack/plugins/synthetics/common/formatters/browser/formatters.ts index f05003f650deb..78e55e97d5b0c 100644 --- a/x-pack/plugins/synthetics/common/formatters/browser/formatters.ts +++ b/x-pack/plugins/synthetics/common/formatters/browser/formatters.ts @@ -74,7 +74,6 @@ export const browserFormatters: BrowserFormatMap = { [ConfigKey.IGNORE_HTTPS_ERRORS]: null, [ConfigKey.PROJECT_ID]: null, [ConfigKey.PLAYWRIGHT_OPTIONS]: null, - [ConfigKey.CUSTOM_HEARTBEAT_ID]: null, [ConfigKey.ORIGINAL_SPACE]: null, [ConfigKey.TEXT_ASSERTION]: null, ...commonFormatters, diff --git a/x-pack/plugins/synthetics/common/formatters/common/formatters.ts b/x-pack/plugins/synthetics/common/formatters/common/formatters.ts index 89bf8793302ba..751721e5d7036 100644 --- a/x-pack/plugins/synthetics/common/formatters/common/formatters.ts +++ b/x-pack/plugins/synthetics/common/formatters/common/formatters.ts @@ -29,6 +29,7 @@ export const commonFormatters: CommonFormatMap = { [ConfigKey.MONITOR_SOURCE_TYPE]: null, [ConfigKey.FORM_MONITOR_TYPE]: null, [ConfigKey.JOURNEY_ID]: null, + [ConfigKey.CUSTOM_HEARTBEAT_ID]: null, }; export const arrayToJsonFormatter = (value: string[] = []) => diff --git a/x-pack/plugins/synthetics/common/runtime_types/monitor_management/monitor_types.ts b/x-pack/plugins/synthetics/common/runtime_types/monitor_management/monitor_types.ts index 58e3a31df8a37..46bc0f135452f 100644 --- a/x-pack/plugins/synthetics/common/runtime_types/monitor_management/monitor_types.ts +++ b/x-pack/plugins/synthetics/common/runtime_types/monitor_management/monitor_types.ts @@ -83,6 +83,7 @@ export const CommonFieldsCodec = t.intersection([ [ConfigKey.MONITOR_SOURCE_TYPE]: SourceTypeCodec, [ConfigKey.CONFIG_ID]: t.string, [ConfigKey.JOURNEY_ID]: t.string, + [ConfigKey.CUSTOM_HEARTBEAT_ID]: t.string, }), ]); @@ -218,7 +219,6 @@ export const EncryptedBrowserSimpleFieldsCodec = t.intersection([ [ConfigKey.PLAYWRIGHT_OPTIONS]: t.string, [ConfigKey.PROJECT_ID]: t.string, [ConfigKey.ORIGINAL_SPACE]: t.string, - [ConfigKey.CUSTOM_HEARTBEAT_ID]: t.string, [ConfigKey.TEXT_ASSERTION]: t.string, }), ]), diff --git a/x-pack/plugins/synthetics/common/runtime_types/monitor_management/monitor_types_project.ts b/x-pack/plugins/synthetics/common/runtime_types/monitor_management/monitor_types_project.ts index 6abcf4b832135..cba2f506189e6 100644 --- a/x-pack/plugins/synthetics/common/runtime_types/monitor_management/monitor_types_project.ts +++ b/x-pack/plugins/synthetics/common/runtime_types/monitor_management/monitor_types_project.ts @@ -30,7 +30,6 @@ export const ProjectMonitorCodec = t.intersection([ screenshot: ScreenshotOptionCodec, tags: t.union([t.string, t.array(t.string)]), ignoreHTTPSErrors: t.boolean, - apmServiceName: t.string, playwrightOptions: t.record(t.string, t.unknown), filter: t.interface({ match: t.string, diff --git a/x-pack/plugins/synthetics/public/legacy_uptime/components/fleet_package/browser/normalizers.ts b/x-pack/plugins/synthetics/public/legacy_uptime/components/fleet_package/browser/normalizers.ts index a8b59b16a3460..61f978327b8a5 100644 --- a/x-pack/plugins/synthetics/public/legacy_uptime/components/fleet_package/browser/normalizers.ts +++ b/x-pack/plugins/synthetics/public/legacy_uptime/components/fleet_package/browser/normalizers.ts @@ -109,7 +109,6 @@ export const browserNormalizers: BrowserNormalizerMap = { [ConfigKey.IGNORE_HTTPS_ERRORS]: getBrowserNormalizer(ConfigKey.IGNORE_HTTPS_ERRORS), [ConfigKey.PROJECT_ID]: getBrowserNormalizer(ConfigKey.PROJECT_ID), [ConfigKey.PLAYWRIGHT_OPTIONS]: getBrowserNormalizer(ConfigKey.PLAYWRIGHT_OPTIONS), - [ConfigKey.CUSTOM_HEARTBEAT_ID]: getBrowserNormalizer(ConfigKey.CUSTOM_HEARTBEAT_ID), [ConfigKey.ORIGINAL_SPACE]: getBrowserNormalizer(ConfigKey.ORIGINAL_SPACE), [ConfigKey.TEXT_ASSERTION]: getBrowserNormalizer(ConfigKey.TEXT_ASSERTION), ...commonNormalizers, diff --git a/x-pack/plugins/synthetics/public/legacy_uptime/components/fleet_package/common/normalizers.ts b/x-pack/plugins/synthetics/public/legacy_uptime/components/fleet_package/common/normalizers.ts index 14fab3caeb132..630ac70a8e055 100644 --- a/x-pack/plugins/synthetics/public/legacy_uptime/components/fleet_package/common/normalizers.ts +++ b/x-pack/plugins/synthetics/public/legacy_uptime/components/fleet_package/common/normalizers.ts @@ -93,4 +93,5 @@ export const commonNormalizers: CommonNormalizerMap = { [ConfigKey.MONITOR_SOURCE_TYPE]: getCommonNormalizer(ConfigKey.MONITOR_SOURCE_TYPE), [ConfigKey.FORM_MONITOR_TYPE]: getCommonNormalizer(ConfigKey.FORM_MONITOR_TYPE), [ConfigKey.JOURNEY_ID]: getCommonNormalizer(ConfigKey.JOURNEY_ID), + [ConfigKey.CUSTOM_HEARTBEAT_ID]: getCommonNormalizer(ConfigKey.CUSTOM_HEARTBEAT_ID), }; diff --git a/x-pack/plugins/synthetics/server/synthetics_service/formatters/browser.ts b/x-pack/plugins/synthetics/server/synthetics_service/formatters/browser.ts index 9c9d24a3f58f4..7095e437aea29 100644 --- a/x-pack/plugins/synthetics/server/synthetics_service/formatters/browser.ts +++ b/x-pack/plugins/synthetics/server/synthetics_service/formatters/browser.ts @@ -69,7 +69,6 @@ export const browserFormatters: BrowserFormatMap = { [ConfigKey.PROJECT_ID]: null, [ConfigKey.PLAYWRIGHT_OPTIONS]: (fields) => stringToObjectFormatter(fields[ConfigKey.PLAYWRIGHT_OPTIONS] || ''), - [ConfigKey.CUSTOM_HEARTBEAT_ID]: null, [ConfigKey.ORIGINAL_SPACE]: null, [ConfigKey.TEXT_ASSERTION]: null, ...commonFormatters, diff --git a/x-pack/plugins/synthetics/server/synthetics_service/formatters/common.ts b/x-pack/plugins/synthetics/server/synthetics_service/formatters/common.ts index 16a0829cbb710..f9c3125041b44 100644 --- a/x-pack/plugins/synthetics/server/synthetics_service/formatters/common.ts +++ b/x-pack/plugins/synthetics/server/synthetics_service/formatters/common.ts @@ -31,6 +31,7 @@ export const commonFormatters: CommonFormatMap = { fields[ConfigKey.MONITOR_SOURCE_TYPE] || SourceType.UI, [ConfigKey.FORM_MONITOR_TYPE]: null, [ConfigKey.JOURNEY_ID]: null, + [ConfigKey.CUSTOM_HEARTBEAT_ID]: null, }; export const arrayFormatter = (value: string[] = []) => (value.length ? value : null); diff --git a/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/browser_monitor.test.ts b/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/browser_monitor.test.ts index ed02f1037e32b..9b32b61a59b35 100644 --- a/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/browser_monitor.test.ts +++ b/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/browser_monitor.test.ts @@ -67,9 +67,7 @@ describe('browser normalizers', () => { locations: ['us_central'], tags: ['tag1', 'tag2'], ignoreHTTPSErrors: true, - apmServiceName: 'cart-service', - type: DataStream.BROWSER, - }, + } as ProjectMonitor, // test that normalizers defaults to browser when type is omitted { id: 'test-id-2', screenshot: ScreenshotOption.ON, @@ -86,7 +84,6 @@ describe('browser normalizers', () => { locations: ['us_central', 'us_east'], tags: ['tag3', 'tag4'], ignoreHTTPSErrors: false, - apmServiceName: 'bean-service', type: DataStream.BROWSER, }, { @@ -106,7 +103,6 @@ describe('browser normalizers', () => { privateLocations: ['Germany'], tags: ['tag3', 'tag4'], ignoreHTTPSErrors: false, - apmServiceName: 'bean-service', type: DataStream.BROWSER, }, ]; @@ -118,6 +114,7 @@ describe('browser normalizers', () => { monitors, projectId, namespace: 'test-space', + version: '8.5.0', }); expect(actual).toEqual([ { @@ -145,7 +142,7 @@ describe('browser normalizers', () => { unit: 'm', }, screenshots: 'off', - 'service.name': 'cart-service', + 'service.name': '', 'source.project.content': 'test content 1', tags: ['tag1', 'tag2'], 'throttling.config': '5d/10u/20l', @@ -162,6 +159,7 @@ describe('browser normalizers', () => { timeout: null, }, unsupportedKeys: [], + errors: [], }, { normalizedFields: { @@ -201,7 +199,7 @@ describe('browser normalizers', () => { unit: 'm', }, screenshots: 'on', - 'service.name': 'bean-service', + 'service.name': '', 'source.project.content': 'test content 2', tags: ['tag3', 'tag4'], 'throttling.config': '10d/15u/18l', @@ -217,6 +215,7 @@ describe('browser normalizers', () => { timeout: null, }, unsupportedKeys: [], + errors: [], }, { normalizedFields: { @@ -263,7 +262,7 @@ describe('browser normalizers', () => { unit: 'm', }, screenshots: 'on', - 'service.name': 'bean-service', + 'service.name': '', 'source.project.content': 'test content 3', tags: ['tag3', 'tag4'], 'throttling.config': '10d/15u/18l', @@ -279,6 +278,7 @@ describe('browser normalizers', () => { timeout: null, }, unsupportedKeys: [], + errors: [], }, ]); }); diff --git a/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/browser_monitor.ts b/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/browser_monitor.ts index aae7031435c74..8eba2cd2651db 100644 --- a/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/browser_monitor.ts +++ b/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/browser_monitor.ts @@ -10,20 +10,14 @@ import { ConfigKey, DataStream, FormMonitorType, - Locations, - PrivateLocation, - ProjectMonitor, } from '../../../../common/runtime_types'; -import { getNormalizeCommonFields, getValueInSeconds } from './common_fields'; import { DEFAULT_FIELDS } from '../../../../common/constants/monitor_defaults'; - -export interface NormalizedProjectProps { - locations: Locations; - privateLocations: PrivateLocation[]; - monitor: ProjectMonitor; - projectId: string; - namespace: string; -} +import { + NormalizedProjectProps, + NormalizerResult, + getNormalizeCommonFields, + getValueInSeconds, +} from './common_fields'; export const getNormalizeBrowserFields = ({ locations = [], @@ -31,7 +25,8 @@ export const getNormalizeBrowserFields = ({ monitor, projectId, namespace, -}: NormalizedProjectProps): { normalizedFields: BrowserFields; unsupportedKeys: string[] } => { + version, +}: NormalizedProjectProps): NormalizerResult => { const defaultFields = DEFAULT_FIELDS[DataStream.BROWSER]; const commonFields = getNormalizeCommonFields({ @@ -40,6 +35,7 @@ export const getNormalizeBrowserFields = ({ monitor, projectId, namespace, + version, }); const normalizedFields = { @@ -81,5 +77,6 @@ export const getNormalizeBrowserFields = ({ ...normalizedFields, }, unsupportedKeys: [], + errors: [], }; }; diff --git a/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/common_fields.test.ts b/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/common_fields.test.ts new file mode 100644 index 0000000000000..fee6f0ca2637c --- /dev/null +++ b/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/common_fields.test.ts @@ -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 { flattenAndFormatObject } from './common_fields'; + +describe('normalizeYamlConfig', () => { + it('does not continue flattening when encountering an array', () => { + const array = ['value1', 'value2']; + const supportedKeys: string[] = []; + const nestedObject = { + a: { + nested: { + key: array, + }, + }, + }; + expect(flattenAndFormatObject(nestedObject, '', supportedKeys)).toEqual({ + 'a.nested.key': array, + }); + }); + + it('does not continue flattening when encountering a supported key', () => { + const supportedKeys: string[] = ['a.supported.key']; + const object = { + with: { + further: { + nesting: '', + }, + }, + }; + const nestedObject = { + a: { + supported: { + key: object, + }, + }, + }; + expect(flattenAndFormatObject(nestedObject, '', supportedKeys)).toEqual({ + 'a.supported.key': object, + }); + }); + + it('flattens objects', () => { + const supportedKeys: string[] = []; + const nestedObject = { + a: { + nested: { + key: 'value1', + }, + }, + b: { + nested: { + key: 'value2', + }, + }, + }; + expect(flattenAndFormatObject(nestedObject, '', supportedKeys)).toEqual({ + 'a.nested.key': 'value1', + 'b.nested.key': 'value2', + }); + }); +}); diff --git a/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/common_fields.ts b/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/common_fields.ts index 31aebd0e8586e..56045712606a1 100644 --- a/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/common_fields.ts +++ b/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/common_fields.ts @@ -20,7 +20,27 @@ import { } from '../../../../common/runtime_types'; import { DEFAULT_FIELDS } from '../../../../common/constants/monitor_defaults'; import { DEFAULT_COMMON_FIELDS } from '../../../../common/constants/monitor_defaults'; -import { NormalizedProjectProps } from '.'; + +export interface NormalizedProjectProps { + locations: Locations; + privateLocations: PrivateLocation[]; + monitor: ProjectMonitor; + projectId: string; + namespace: string; + version: string; +} + +export interface Error { + id: string; + reason: string; + details: string; +} + +export interface NormalizerResult { + normalizedFields: MonitorTypeFields; + unsupportedKeys: string[]; + errors: Error[]; +} export const getNormalizeCommonFields = ({ locations = [], @@ -28,7 +48,7 @@ export const getNormalizeCommonFields = ({ monitor, projectId, namespace, -}: NormalizedProjectProps): CommonFields => { +}: NormalizedProjectProps): Partial => { const defaultFields = DEFAULT_COMMON_FIELDS; const normalizedFields = { @@ -45,18 +65,16 @@ export const getNormalizeCommonFields = ({ privateLocations, publicLocations: locations, }), - [ConfigKey.APM_SERVICE_NAME]: - monitor.apmServiceName || defaultFields[ConfigKey.APM_SERVICE_NAME], [ConfigKey.TAGS]: getOptionalListField(monitor.tags) || defaultFields[ConfigKey.TAGS], [ConfigKey.NAMESPACE]: formatKibanaNamespace(namespace) || defaultFields[ConfigKey.NAMESPACE], [ConfigKey.ORIGINAL_SPACE]: namespace || defaultFields[ConfigKey.NAMESPACE], [ConfigKey.CUSTOM_HEARTBEAT_ID]: getCustomHeartbeatId(monitor, projectId, namespace), [ConfigKey.ENABLED]: monitor.enabled ?? defaultFields[ConfigKey.ENABLED], + [ConfigKey.TIMEOUT]: monitor.timeout + ? getValueInSeconds(monitor.timeout) + : defaultFields[ConfigKey.TIMEOUT], }; - return { - ...defaultFields, - ...normalizedFields, - }; + return normalizedFields; }; export const getCustomHeartbeatId = ( @@ -94,6 +112,35 @@ export const getMonitorLocations = ({ ) as BrowserFields[ConfigKey.LOCATIONS]; }; +export const getUnsupportedKeysError = ( + monitor: ProjectMonitor, + unsupportedKeys: string[], + version: string +) => ({ + id: monitor.id, + reason: 'Unsupported Heartbeat option', + details: `The following Heartbeat options are not supported for ${ + monitor.type + } project monitors in ${version}: ${unsupportedKeys.join( + '|' + )}. You monitor was not created or updated.`, +}); + +export const getMultipleUrlsOrHostsError = ( + monitor: ProjectMonitor, + key: 'hosts' | 'urls', + version: string +) => ({ + id: monitor.id, + reason: 'Unsupported Heartbeat option', + details: `Multiple ${key} are not supported for ${ + monitor.type + } project monitors in ${version}. Please set only 1 ${key.slice( + 0, + -1 + )} per monitor. You monitor was not created or updated.`, +}); + export const getValueInSeconds = (value: string) => { const keyMap = { h: 60 * 60, @@ -136,7 +183,7 @@ export const getOptionalArrayField = (value: string[] | string = '') => { * @param {Object} [monitor] * @returns {Object} Returns an object containing synthetics-compatible configuration keys */ -const flattenAndFormatObject = (obj: Record, prefix = '', keys: string[]) => +export const flattenAndFormatObject = (obj: Record, prefix = '', keys: string[]) => Object.keys(obj).reduce>((acc, k) => { const pre = prefix.length ? prefix + '.' : ''; const key = pre + k; diff --git a/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/http_monitor.test.ts b/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/http_monitor.test.ts new file mode 100644 index 0000000000000..922c5ca6dab05 --- /dev/null +++ b/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/http_monitor.test.ts @@ -0,0 +1,242 @@ +/* + * 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 { Locations, LocationStatus, PrivateLocation } from '../../../../common/runtime_types'; +import { normalizeProjectMonitors } from '.'; + +describe('http normalizers', () => { + describe('normalize push monitors', () => { + const projectId = 'test-project-id'; + const locations: Locations = [ + { + id: 'us_central', + label: 'Test Location', + geo: { lat: 33.333, lon: 73.333 }, + url: 'test-url', + isServiceManaged: true, + status: LocationStatus.GA, + }, + { + id: 'us_east', + label: 'Test Location', + geo: { lat: 33.333, lon: 73.333 }, + url: 'test-url', + isServiceManaged: true, + status: LocationStatus.GA, + }, + ]; + const privateLocations: PrivateLocation[] = [ + { + id: 'germany', + label: 'Germany', + isServiceManaged: false, + concurrentMonitors: 1, + agentPolicyId: 'germany', + }, + ]; + const monitors = [ + { + locations: ['localhost'], + type: 'http', + enabled: false, + id: 'my-monitor-2', + name: 'My Monitor 2', + urls: ['http://localhost:9200', 'http://anotherurl:9200'], + schedule: 60, + timeout: '80s', + 'check.request': { + method: 'POST', + body: { + json: 'body', + }, + headers: { + 'a-header': 'a-header-value', + }, + }, + response: { + include_body: 'always', + }, + 'response.include_headers': false, + 'check.response': { + status: [200], + body: ['Saved', 'saved'], + }, + unsupportedKey: { + nestedUnsupportedKey: 'unsupportedValue', + }, + service: { + name: 'test service', + }, + ssl: { + supported_protocols: ['TLSv1.2', 'TLSv1.3'], + }, + }, + { + locations: ['localhost'], + type: 'http', + enabled: false, + id: 'my-monitor-3', + name: 'My Monitor 3', + urls: ['http://localhost:9200'], + schedule: 60, + timeout: '80s', + 'check.request': { + method: 'POST', + body: 'sometextbody', + headers: { + 'a-header': 'a-header-value', + }, + }, + response: { + include_body: 'always', + }, + tags: 'tag2,tag2', + 'response.include_headers': false, + 'check.response': { + status: [200], + body: { + positive: ['Saved', 'saved'], + }, + }, + 'service.name': 'test service', + 'ssl.supported_protocols': 'TLSv1.2,TLSv1.3', + }, + ]; + + it('properly normalizes http monitors', () => { + const actual = normalizeProjectMonitors({ + locations, + privateLocations, + monitors, + projectId, + namespace: 'test-space', + version: '8.5.0', + }); + expect(actual).toEqual([ + { + errors: [ + { + details: + 'Multiple urls are not supported for http project monitors in 8.5.0. Please set only 1 url per monitor. You monitor was not created or updated.', + id: 'my-monitor-2', + reason: 'Unsupported Heartbeat option', + }, + { + details: + 'The following Heartbeat options are not supported for http project monitors in 8.5.0: check.response.body|unsupportedKey.nestedUnsupportedKey. You monitor was not created or updated.', + id: 'my-monitor-2', + reason: 'Unsupported Heartbeat option', + }, + ], + normalizedFields: { + __ui: { + is_tls_enabled: false, + }, + 'check.request.body': { + type: 'json', + value: '{"json":"body"}', + }, + 'check.request.headers': { + 'a-header': 'a-header-value', + }, + 'check.request.method': 'POST', + 'check.response.body.negative': [], + 'check.response.body.positive': [], + 'check.response.headers': {}, + 'check.response.status': ['200'], + config_id: '', + custom_heartbeat_id: 'my-monitor-2-test-project-id-test-space', + enabled: false, + form_monitor_type: 'http', + journey_id: 'my-monitor-2', + locations: [], + max_redirects: '0', + name: 'My Monitor 2', + namespace: 'test_space', + origin: 'project', + original_space: 'test-space', + password: '', + project_id: 'test-project-id', + proxy_url: '', + 'response.include_body': 'always', + 'response.include_headers': false, + schedule: { + number: '60', + unit: 'm', + }, + 'service.name': 'test service', + 'ssl.certificate': '', + 'ssl.certificate_authorities': '', + 'ssl.key': '', + 'ssl.key_passphrase': '', + 'ssl.supported_protocols': ['TLSv1.2', 'TLSv1.3'], + 'ssl.verification_mode': 'full', + tags: [], + timeout: '80', + type: 'http', + urls: 'http://localhost:9200', + username: '', + }, + unsupportedKeys: ['check.response.body', 'unsupportedKey.nestedUnsupportedKey'], + }, + { + errors: [], + normalizedFields: { + __ui: { + is_tls_enabled: false, + }, + 'check.request.body': { + type: 'text', + value: 'sometextbody', + }, + 'check.request.headers': { + 'a-header': 'a-header-value', + }, + 'check.request.method': 'POST', + 'check.response.body.negative': [], + 'check.response.body.positive': ['Saved', 'saved'], + 'check.response.headers': {}, + 'check.response.status': ['200'], + config_id: '', + custom_heartbeat_id: 'my-monitor-3-test-project-id-test-space', + enabled: false, + form_monitor_type: 'http', + journey_id: 'my-monitor-3', + locations: [], + max_redirects: '0', + name: 'My Monitor 3', + namespace: 'test_space', + origin: 'project', + original_space: 'test-space', + password: '', + project_id: 'test-project-id', + proxy_url: '', + 'response.include_body': 'always', + 'response.include_headers': false, + schedule: { + number: '60', + unit: 'm', + }, + 'service.name': 'test service', + 'ssl.certificate': '', + 'ssl.certificate_authorities': '', + 'ssl.key': '', + 'ssl.key_passphrase': '', + 'ssl.supported_protocols': ['TLSv1.2', 'TLSv1.3'], + 'ssl.verification_mode': 'full', + tags: ['tag2', 'tag2'], + timeout: '80', + type: 'http', + urls: 'http://localhost:9200', + username: '', + }, + unsupportedKeys: [], + }, + ]); + }); + }); +}); diff --git a/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/http_monitor.ts b/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/http_monitor.ts index 6f637d818667a..d994e61517822 100644 --- a/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/http_monitor.ts +++ b/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/http_monitor.ts @@ -4,16 +4,26 @@ * 2.0; you may not use this file except in compliance with the Elastic License * 2.0. */ -import { getNormalizeCommonFields } from './common_fields'; -import { NormalizedProjectProps } from './browser_monitor'; +import { get } from 'lodash'; import { DEFAULT_FIELDS } from '../../../../common/constants/monitor_defaults'; import { ConfigKey, DataStream, FormMonitorType, HTTPFields, + Mode, + TLSVersion, } from '../../../../common/runtime_types/monitor_management'; -import { normalizeYamlConfig, getValueInSeconds, getOptionalArrayField } from './common_fields'; +import { + NormalizedProjectProps, + NormalizerResult, + getNormalizeCommonFields, + normalizeYamlConfig, + getOptionalListField, + getOptionalArrayField, + getUnsupportedKeysError, + getMultipleUrlsOrHostsError, +} from './common_fields'; export const getNormalizeHTTPFields = ({ locations = [], @@ -21,18 +31,30 @@ export const getNormalizeHTTPFields = ({ monitor, projectId, namespace, -}: NormalizedProjectProps): { normalizedFields: HTTPFields; unsupportedKeys: string[] } => { + version, +}: NormalizedProjectProps): NormalizerResult => { const defaultFields = DEFAULT_FIELDS[DataStream.HTTP]; + const errors = []; const { yamlConfig, unsupportedKeys } = normalizeYamlConfig(monitor); - const commonFields = getNormalizeCommonFields({ locations, privateLocations, monitor, projectId, namespace, + version, }); + /* Check if monitor has multiple urls */ + const urls = getOptionalListField(monitor.urls); + if (urls.length > 1) { + errors.push(getMultipleUrlsOrHostsError(monitor, 'urls', version)); + } + + if (unsupportedKeys.length) { + errors.push(getUnsupportedKeysError(monitor, unsupportedKeys, version)); + } + const normalizedFields = { ...yamlConfig, ...commonFields, @@ -41,9 +63,13 @@ export const getNormalizeHTTPFields = ({ [ConfigKey.URLS]: getOptionalArrayField(monitor.urls) || defaultFields[ConfigKey.URLS], [ConfigKey.MAX_REDIRECTS]: monitor[ConfigKey.MAX_REDIRECTS] || defaultFields[ConfigKey.MAX_REDIRECTS], - [ConfigKey.TIMEOUT]: monitor.timeout - ? getValueInSeconds(monitor.timeout) - : defaultFields[ConfigKey.TIMEOUT], + [ConfigKey.REQUEST_BODY_CHECK]: getRequestBodyField( + (yamlConfig as Record)[ConfigKey.REQUEST_BODY_CHECK] as string, + defaultFields[ConfigKey.REQUEST_BODY_CHECK] + ), + [ConfigKey.TLS_VERSION]: get(monitor, ConfigKey.TLS_VERSION) + ? (getOptionalListField(get(monitor, ConfigKey.TLS_VERSION)) as TLSVersion[]) + : defaultFields[ConfigKey.TLS_VERSION], }; return { normalizedFields: { @@ -51,5 +77,26 @@ export const getNormalizeHTTPFields = ({ ...normalizedFields, }, unsupportedKeys, + errors, + }; +}; + +export const getRequestBodyField = ( + value: string, + defaultValue: HTTPFields[ConfigKey.REQUEST_BODY_CHECK] +): HTTPFields[ConfigKey.REQUEST_BODY_CHECK] => { + let parsedValue: string; + let type: Mode; + + if (typeof value === 'object') { + parsedValue = JSON.stringify(value); + type = Mode.JSON; + } else { + parsedValue = value; + type = Mode.PLAINTEXT; + } + return { + type, + value: parsedValue || defaultValue.value, }; }; diff --git a/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/icmp_monitor.test.ts b/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/icmp_monitor.test.ts new file mode 100644 index 0000000000000..e32ddf4f328a1 --- /dev/null +++ b/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/icmp_monitor.test.ts @@ -0,0 +1,227 @@ +/* + * 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 { Locations, LocationStatus, PrivateLocation } from '../../../../common/runtime_types'; +import { normalizeProjectMonitors } from '.'; + +describe('http normalizers', () => { + describe('normalize push monitors', () => { + const projectId = 'test-project-id'; + const locations: Locations = [ + { + id: 'us_central', + label: 'Test Location', + geo: { lat: 33.333, lon: 73.333 }, + url: 'test-url', + isServiceManaged: true, + status: LocationStatus.GA, + }, + { + id: 'us_east', + label: 'Test Location', + geo: { lat: 33.333, lon: 73.333 }, + url: 'test-url', + isServiceManaged: true, + status: LocationStatus.GA, + }, + ]; + const privateLocations: PrivateLocation[] = [ + { + id: 'germany', + label: 'Germany', + isServiceManaged: false, + concurrentMonitors: 1, + agentPolicyId: 'germany', + }, + ]; + const monitors = [ + { + locations: ['us_central'], + type: 'icmp', + id: 'Cloudflare-DNS', + name: 'Cloudflare DNS', + hosts: ['1.1.1.1'], + schedule: 1, + tags: ['service:smtp', 'org:google'], + privateLocations: ['Test private location 0'], + timeout: '1m', + wait: '30s', + 'service.name': 'test service', + }, + { + locations: ['us_central'], + type: 'icmp', + id: 'Cloudflare-DNS-2', + name: 'Cloudflare DNS 2', + hosts: '1.1.1.1', + schedule: 1, + tags: 'tag1,tag2', + privateLocations: ['Test private location 0'], + wait: '1m', + service: { + name: 'test service', + }, + }, + { + locations: ['us_central'], + type: 'icmp', + id: 'Cloudflare-DNS-3', + name: 'Cloudflare DNS 3', + hosts: '1.1.1.1,2.2.2.2', + schedule: 1, + tags: 'tag1,tag2', + privateLocations: ['Test private location 0'], + unsupportedKey: { + nestedUnsupportedKey: 'unnsuportedValue', + }, + }, + ]; + + it('properly normalizes http monitors', () => { + const actual = normalizeProjectMonitors({ + locations, + privateLocations, + monitors, + projectId, + namespace: 'test-space', + version: '8.5.0', + }); + expect(actual).toEqual([ + { + errors: [], + normalizedFields: { + config_id: '', + custom_heartbeat_id: 'Cloudflare-DNS-test-project-id-test-space', + enabled: true, + form_monitor_type: 'icmp', + hosts: '1.1.1.1', + journey_id: 'Cloudflare-DNS', + locations: [ + { + geo: { + lat: 33.333, + lon: 73.333, + }, + id: 'us_central', + isServiceManaged: true, + label: 'Test Location', + status: 'ga', + url: 'test-url', + }, + ], + name: 'Cloudflare DNS', + namespace: 'test_space', + origin: 'project', + original_space: 'test-space', + project_id: 'test-project-id', + schedule: { + number: '1', + unit: 'm', + }, + 'service.name': 'test service', + tags: ['service:smtp', 'org:google'], + timeout: '60', + type: 'icmp', + wait: '30', + }, + unsupportedKeys: [], + }, + { + errors: [], + normalizedFields: { + config_id: '', + custom_heartbeat_id: 'Cloudflare-DNS-2-test-project-id-test-space', + enabled: true, + form_monitor_type: 'icmp', + hosts: '1.1.1.1', + journey_id: 'Cloudflare-DNS-2', + locations: [ + { + geo: { + lat: 33.333, + lon: 73.333, + }, + id: 'us_central', + isServiceManaged: true, + label: 'Test Location', + status: 'ga', + url: 'test-url', + }, + ], + name: 'Cloudflare DNS 2', + namespace: 'test_space', + origin: 'project', + original_space: 'test-space', + project_id: 'test-project-id', + schedule: { + number: '1', + unit: 'm', + }, + 'service.name': 'test service', + tags: ['tag1', 'tag2'], + timeout: '16', + type: 'icmp', + wait: '60', + }, + unsupportedKeys: [], + }, + { + errors: [ + { + details: + 'Multiple hosts are not supported for icmp project monitors in 8.5.0. Please set only 1 host per monitor. You monitor was not created or updated.', + id: 'Cloudflare-DNS-3', + reason: 'Unsupported Heartbeat option', + }, + { + details: + 'The following Heartbeat options are not supported for icmp project monitors in 8.5.0: unsupportedKey.nestedUnsupportedKey. You monitor was not created or updated.', + id: 'Cloudflare-DNS-3', + reason: 'Unsupported Heartbeat option', + }, + ], + normalizedFields: { + config_id: '', + custom_heartbeat_id: 'Cloudflare-DNS-3-test-project-id-test-space', + enabled: true, + form_monitor_type: 'icmp', + hosts: '1.1.1.1', + journey_id: 'Cloudflare-DNS-3', + locations: [ + { + geo: { + lat: 33.333, + lon: 73.333, + }, + id: 'us_central', + isServiceManaged: true, + label: 'Test Location', + status: 'ga', + url: 'test-url', + }, + ], + name: 'Cloudflare DNS 3', + namespace: 'test_space', + origin: 'project', + original_space: 'test-space', + project_id: 'test-project-id', + schedule: { + number: '1', + unit: 'm', + }, + 'service.name': '', + tags: ['tag1', 'tag2'], + timeout: '16', + type: 'icmp', + wait: '1', + }, + unsupportedKeys: ['unsupportedKey.nestedUnsupportedKey'], + }, + ]); + }); + }); +}); diff --git a/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/icmp_monitor.ts b/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/icmp_monitor.ts index 282475f94d7cd..ea4eb7dbdba84 100644 --- a/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/icmp_monitor.ts +++ b/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/icmp_monitor.ts @@ -5,8 +5,6 @@ * 2.0. */ -import { getNormalizeCommonFields } from './common_fields'; -import { NormalizedProjectProps } from './browser_monitor'; import { DEFAULT_FIELDS } from '../../../../common/constants/monitor_defaults'; import { ConfigKey, @@ -14,7 +12,17 @@ import { FormMonitorType, ICMPFields, } from '../../../../common/runtime_types/monitor_management'; -import { normalizeYamlConfig, getValueInSeconds, getOptionalArrayField } from './common_fields'; +import { + NormalizerResult, + NormalizedProjectProps, + normalizeYamlConfig, + getNormalizeCommonFields, + getValueInSeconds, + getOptionalArrayField, + getOptionalListField, + getMultipleUrlsOrHostsError, + getUnsupportedKeysError, +} from './common_fields'; export const getNormalizeICMPFields = ({ locations = [], @@ -22,8 +30,10 @@ export const getNormalizeICMPFields = ({ monitor, projectId, namespace, -}: NormalizedProjectProps): { normalizedFields: ICMPFields; unsupportedKeys: string[] } => { + version, +}: NormalizedProjectProps): NormalizerResult => { const defaultFields = DEFAULT_FIELDS[DataStream.ICMP]; + const errors = []; const { yamlConfig, unsupportedKeys } = normalizeYamlConfig(monitor); const commonFields = getNormalizeCommonFields({ @@ -32,8 +42,19 @@ export const getNormalizeICMPFields = ({ monitor, projectId, namespace, + version, }); + /* Check if monitor has multiple hosts */ + const hosts = getOptionalListField(monitor.hosts); + if (hosts.length > 1) { + errors.push(getMultipleUrlsOrHostsError(monitor, 'hosts', version)); + } + + if (unsupportedKeys.length) { + errors.push(getUnsupportedKeysError(monitor, unsupportedKeys, version)); + } + const normalizedFields = { ...yamlConfig, ...commonFields, @@ -41,9 +62,6 @@ export const getNormalizeICMPFields = ({ [ConfigKey.FORM_MONITOR_TYPE]: FormMonitorType.ICMP, [ConfigKey.HOSTS]: getOptionalArrayField(monitor[ConfigKey.HOSTS]) || defaultFields[ConfigKey.HOSTS], - [ConfigKey.TIMEOUT]: monitor.timeout - ? getValueInSeconds(monitor.timeout) - : defaultFields[ConfigKey.TIMEOUT], [ConfigKey.WAIT]: monitor.wait ? getValueInSeconds(monitor.wait) || defaultFields[ConfigKey.WAIT] : defaultFields[ConfigKey.WAIT], @@ -54,5 +72,6 @@ export const getNormalizeICMPFields = ({ ...normalizedFields, }, unsupportedKeys, + errors, }; }; diff --git a/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/index.ts b/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/index.ts index 82b2acfacbf5b..6bac17c0fb542 100644 --- a/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/index.ts +++ b/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/index.ts @@ -14,14 +14,7 @@ import { getNormalizeBrowserFields } from './browser_monitor'; import { getNormalizeICMPFields } from './icmp_monitor'; import { getNormalizeTCPFields } from './tcp_monitor'; import { getNormalizeHTTPFields } from './http_monitor'; - -export interface NormalizedProjectProps { - locations: Locations; - privateLocations: PrivateLocation[]; - monitor: ProjectMonitor; - projectId: string; - namespace: string; -} +import { NormalizedProjectProps } from './common_fields'; export const normalizeProjectMonitor = (props: NormalizedProjectProps) => { const { monitor } = props; @@ -50,14 +43,23 @@ export const normalizeProjectMonitors = ({ monitors = [], projectId, namespace, + version, }: { locations: Locations; privateLocations: PrivateLocation[]; monitors: ProjectMonitor[]; projectId: string; namespace: string; + version: string; }) => { return monitors.map((monitor) => { - return normalizeProjectMonitor({ monitor, locations, privateLocations, projectId, namespace }); + return normalizeProjectMonitor({ + monitor, + locations, + privateLocations, + projectId, + namespace, + version, + }); }); }; diff --git a/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/tcp_monitor.test.ts b/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/tcp_monitor.test.ts new file mode 100644 index 0000000000000..094bf018ba127 --- /dev/null +++ b/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/tcp_monitor.test.ts @@ -0,0 +1,265 @@ +/* + * 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 { Locations, LocationStatus, PrivateLocation } from '../../../../common/runtime_types'; +import { normalizeProjectMonitors } from '.'; + +describe('http normalizers', () => { + describe('normalize push monitors', () => { + const projectId = 'test-project-id'; + const locations: Locations = [ + { + id: 'us_central', + label: 'Test Location', + geo: { lat: 33.333, lon: 73.333 }, + url: 'test-url', + isServiceManaged: true, + status: LocationStatus.GA, + }, + { + id: 'us_east', + label: 'Test Location', + geo: { lat: 33.333, lon: 73.333 }, + url: 'test-url', + isServiceManaged: true, + status: LocationStatus.GA, + }, + ]; + const privateLocations: PrivateLocation[] = [ + { + id: 'germany', + label: 'Germany', + isServiceManaged: false, + concurrentMonitors: 1, + agentPolicyId: 'germany', + }, + ]; + const monitors = [ + { + locations: ['us_central'], + type: 'tcp', + id: 'gmail-smtp', + name: 'GMail SMTP', + hosts: ['smtp.gmail.com:587'], + schedule: 1, + tags: ['service:smtp', 'org:google'], + privateLocations: ['BEEP'], + 'service.name': 'test service', + 'ssl.supported_protocols': ['TLSv1.2', 'TLSv1.3'], + }, + { + locations: ['us_central'], + type: 'tcp', + id: 'always-down', + name: 'Always Down', + hosts: 'localhost:18278', + schedule: 1, + tags: 'tag1,tag2', + privateLocations: ['BEEP'], + service: { + name: 'test service', + }, + ssl: { + supported_protocols: 'TLSv1.2,TLSv1.3', + }, + }, + { + locations: ['us_central'], + type: 'tcp', + id: 'always-down', + name: 'Always Down', + hosts: ['localhost', 'anotherhost'], + ports: ['5698'], + schedule: 1, + tags: 'tag1,tag2', + privateLocations: ['BEEP'], + unsupportedKey: { + nestedUnsupportedKey: 'unnsuportedValue', + }, + }, + ]; + + it('properly normalizes http monitors', () => { + const actual = normalizeProjectMonitors({ + locations, + privateLocations, + monitors, + projectId, + namespace: 'test-space', + version: '8.5.0', + }); + expect(actual).toEqual([ + { + errors: [], + normalizedFields: { + __ui: { + is_tls_enabled: false, + }, + 'check.receive': '', + 'check.send': '', + config_id: '', + custom_heartbeat_id: 'gmail-smtp-test-project-id-test-space', + enabled: true, + form_monitor_type: 'tcp', + hosts: 'smtp.gmail.com:587', + journey_id: 'gmail-smtp', + locations: [ + { + geo: { + lat: 33.333, + lon: 73.333, + }, + id: 'us_central', + isServiceManaged: true, + label: 'Test Location', + status: 'ga', + url: 'test-url', + }, + ], + name: 'GMail SMTP', + namespace: 'test_space', + origin: 'project', + original_space: 'test-space', + project_id: 'test-project-id', + proxy_url: '', + proxy_use_local_resolver: false, + schedule: { + number: '1', + unit: 'm', + }, + 'service.name': 'test service', + 'ssl.certificate': '', + 'ssl.certificate_authorities': '', + 'ssl.key': '', + 'ssl.key_passphrase': '', + 'ssl.supported_protocols': ['TLSv1.2', 'TLSv1.3'], + 'ssl.verification_mode': 'full', + tags: ['service:smtp', 'org:google'], + timeout: '16', + type: 'tcp', + }, + unsupportedKeys: [], + }, + { + errors: [], + normalizedFields: { + __ui: { + is_tls_enabled: false, + }, + 'check.receive': '', + 'check.send': '', + config_id: '', + custom_heartbeat_id: 'always-down-test-project-id-test-space', + enabled: true, + form_monitor_type: 'tcp', + hosts: 'localhost:18278', + journey_id: 'always-down', + locations: [ + { + geo: { + lat: 33.333, + lon: 73.333, + }, + id: 'us_central', + isServiceManaged: true, + label: 'Test Location', + status: 'ga', + url: 'test-url', + }, + ], + name: 'Always Down', + namespace: 'test_space', + origin: 'project', + original_space: 'test-space', + project_id: 'test-project-id', + proxy_url: '', + proxy_use_local_resolver: false, + schedule: { + number: '1', + unit: 'm', + }, + 'service.name': 'test service', + 'ssl.certificate': '', + 'ssl.certificate_authorities': '', + 'ssl.key': '', + 'ssl.key_passphrase': '', + 'ssl.supported_protocols': ['TLSv1.2', 'TLSv1.3'], + 'ssl.verification_mode': 'full', + tags: ['tag1', 'tag2'], + timeout: '16', + type: 'tcp', + }, + unsupportedKeys: [], + }, + { + errors: [ + { + details: + 'Multiple hosts are not supported for tcp project monitors in 8.5.0. Please set only 1 host per monitor. You monitor was not created or updated.', + id: 'always-down', + reason: 'Unsupported Heartbeat option', + }, + { + details: + 'The following Heartbeat options are not supported for tcp project monitors in 8.5.0: ports|unsupportedKey.nestedUnsupportedKey. You monitor was not created or updated.', + id: 'always-down', + reason: 'Unsupported Heartbeat option', + }, + ], + normalizedFields: { + __ui: { + is_tls_enabled: false, + }, + 'check.receive': '', + 'check.send': '', + config_id: '', + custom_heartbeat_id: 'always-down-test-project-id-test-space', + enabled: true, + form_monitor_type: 'tcp', + hosts: 'localhost', + journey_id: 'always-down', + locations: [ + { + geo: { + lat: 33.333, + lon: 73.333, + }, + id: 'us_central', + isServiceManaged: true, + label: 'Test Location', + status: 'ga', + url: 'test-url', + }, + ], + name: 'Always Down', + namespace: 'test_space', + origin: 'project', + original_space: 'test-space', + project_id: 'test-project-id', + proxy_url: '', + proxy_use_local_resolver: false, + schedule: { + number: '1', + unit: 'm', + }, + 'service.name': '', + 'ssl.certificate': '', + 'ssl.certificate_authorities': '', + 'ssl.key': '', + 'ssl.key_passphrase': '', + 'ssl.supported_protocols': ['TLSv1.1', 'TLSv1.2', 'TLSv1.3'], + 'ssl.verification_mode': 'full', + tags: ['tag1', 'tag2'], + timeout: '16', + type: 'tcp', + }, + unsupportedKeys: ['ports', 'unsupportedKey.nestedUnsupportedKey'], + }, + ]); + }); + }); +}); diff --git a/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/tcp_monitor.ts b/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/tcp_monitor.ts index 8a85b2959d804..1045bc5ebff72 100644 --- a/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/tcp_monitor.ts +++ b/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/tcp_monitor.ts @@ -4,18 +4,25 @@ * 2.0; you may not use this file except in compliance with the Elastic License * 2.0. */ - -import { NormalizedProjectProps } from './browser_monitor'; +import { get } from 'lodash'; import { DEFAULT_FIELDS } from '../../../../common/constants/monitor_defaults'; -import { normalizeYamlConfig, getValueInSeconds } from './common_fields'; - import { ConfigKey, DataStream, FormMonitorType, TCPFields, + TLSVersion, } from '../../../../common/runtime_types/monitor_management'; -import { getNormalizeCommonFields, getOptionalArrayField } from './common_fields'; +import { + NormalizedProjectProps, + NormalizerResult, + normalizeYamlConfig, + getNormalizeCommonFields, + getOptionalArrayField, + getOptionalListField, + getMultipleUrlsOrHostsError, + getUnsupportedKeysError, +} from './common_fields'; export const getNormalizeTCPFields = ({ locations = [], @@ -23,8 +30,10 @@ export const getNormalizeTCPFields = ({ monitor, projectId, namespace, -}: NormalizedProjectProps): { normalizedFields: TCPFields; unsupportedKeys: string[] } => { + version, +}: NormalizedProjectProps): NormalizerResult => { const defaultFields = DEFAULT_FIELDS[DataStream.TCP]; + const errors = []; const { yamlConfig, unsupportedKeys } = normalizeYamlConfig(monitor); const commonFields = getNormalizeCommonFields({ @@ -33,8 +42,19 @@ export const getNormalizeTCPFields = ({ monitor, projectId, namespace, + version, }); + /* Check if monitor has multiple hosts */ + const hosts = getOptionalListField(monitor.hosts); + if (hosts.length > 1) { + errors.push(getMultipleUrlsOrHostsError(monitor, 'hosts', version)); + } + + if (unsupportedKeys.length) { + errors.push(getUnsupportedKeysError(monitor, unsupportedKeys, version)); + } + const normalizedFields = { ...yamlConfig, ...commonFields, @@ -42,9 +62,9 @@ export const getNormalizeTCPFields = ({ [ConfigKey.FORM_MONITOR_TYPE]: FormMonitorType.TCP, [ConfigKey.HOSTS]: getOptionalArrayField(monitor[ConfigKey.HOSTS]) || defaultFields[ConfigKey.HOSTS], - [ConfigKey.TIMEOUT]: monitor.timeout - ? getValueInSeconds(monitor.timeout) - : defaultFields[ConfigKey.TIMEOUT], + [ConfigKey.TLS_VERSION]: get(monitor, ConfigKey.TLS_VERSION) + ? (getOptionalListField(get(monitor, ConfigKey.TLS_VERSION)) as TLSVersion[]) + : defaultFields[ConfigKey.TLS_VERSION], }; return { normalizedFields: { @@ -52,5 +72,6 @@ export const getNormalizeTCPFields = ({ ...normalizedFields, }, unsupportedKeys, + errors, }; }; diff --git a/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/project_monitor_formatter.ts b/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/project_monitor_formatter.ts index aa0be87f0e818..1ca27869aa2cc 100644 --- a/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/project_monitor_formatter.ts +++ b/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/project_monitor_formatter.ts @@ -197,22 +197,17 @@ export class ProjectMonitorFormatter { try { await this.validatePermissions({ monitor }); - const { normalizedFields: normalizedMonitor, unsupportedKeys } = normalizeProjectMonitor({ + const { normalizedFields: normalizedMonitor, errors } = normalizeProjectMonitor({ monitor, locations: this.locations, privateLocations: this.privateLocations, projectId: this.projectId, namespace: this.spaceId, + version: this.server.kibanaVersion, }); - if (unsupportedKeys.length) { - this.failedMonitors.push({ - id: monitor.id, - reason: 'Unsupported Heartbeat option', - details: `The following Heartbeat options are not supported for ${ - monitor.type - } project monitors in ${this.server.kibanaVersion}: ${unsupportedKeys.join('|')}`, - }); + if (errors.length) { + this.failedMonitors.push(...errors); this.handleStreamingMessage({ message: `${monitor.id}: failed to create or update monitor`, }); diff --git a/x-pack/test/api_integration/apis/uptime/rest/add_monitor_project.ts b/x-pack/test/api_integration/apis/uptime/rest/add_monitor_project.ts index 1110bbb875c73..105e6521c1da4 100644 --- a/x-pack/test/api_integration/apis/uptime/rest/add_monitor_project.ts +++ b/x-pack/test/api_integration/apis/uptime/rest/add_monitor_project.ts @@ -112,7 +112,12 @@ export default function ({ getService }: FtrProviderContext) { expect(messages[2].failedMonitors).eql([ { id: httpProjectMonitors.monitors[0].id, - details: `The following Heartbeat options are not supported for ${httpProjectMonitors.monitors[0].type} project monitors in ${kibanaVersion}: check.response.body|unsupportedKey.nestedUnsupportedKey`, + details: `Multiple urls are not supported for http project monitors in ${kibanaVersion}. Please set only 1 url per monitor. You monitor was not created or updated.`, + reason: 'Unsupported Heartbeat option', + }, + { + id: httpProjectMonitors.monitors[0].id, + details: `The following Heartbeat options are not supported for ${httpProjectMonitors.monitors[0].type} project monitors in ${kibanaVersion}: check.response.body|unsupportedKey.nestedUnsupportedKey. You monitor was not created or updated.`, reason: 'Unsupported Heartbeat option', }, ]); @@ -200,7 +205,12 @@ export default function ({ getService }: FtrProviderContext) { expect(messages[2].failedMonitors).eql([ { id: tcpProjectMonitors.monitors[2].id, - details: `The following Heartbeat options are not supported for ${tcpProjectMonitors.monitors[0].type} project monitors in ${kibanaVersion}: ports|unsupportedKey.nestedUnsupportedKey`, + details: `Multiple hosts are not supported for tcp project monitors in ${kibanaVersion}. Please set only 1 host per monitor. You monitor was not created or updated.`, + reason: 'Unsupported Heartbeat option', + }, + { + id: tcpProjectMonitors.monitors[2].id, + details: `The following Heartbeat options are not supported for ${tcpProjectMonitors.monitors[0].type} project monitors in ${kibanaVersion}: ports|unsupportedKey.nestedUnsupportedKey. You monitor was not created or updated.`, reason: 'Unsupported Heartbeat option', }, ]); @@ -284,7 +294,12 @@ export default function ({ getService }: FtrProviderContext) { expect(messages[2].failedMonitors).eql([ { id: icmpProjectMonitors.monitors[2].id, - details: `The following Heartbeat options are not supported for ${icmpProjectMonitors.monitors[0].type} project monitors in ${kibanaVersion}: unsupportedKey.nestedUnsupportedKey`, + details: `Multiple hosts are not supported for icmp project monitors in ${kibanaVersion}. Please set only 1 host per monitor. You monitor was not created or updated.`, + reason: 'Unsupported Heartbeat option', + }, + { + id: icmpProjectMonitors.monitors[2].id, + details: `The following Heartbeat options are not supported for ${icmpProjectMonitors.monitors[0].type} project monitors in ${kibanaVersion}: unsupportedKey.nestedUnsupportedKey. You monitor was not created or updated.`, reason: 'Unsupported Heartbeat option', }, ]); diff --git a/x-pack/test/api_integration/apis/uptime/rest/fixtures/project_http_monitor.json b/x-pack/test/api_integration/apis/uptime/rest/fixtures/project_http_monitor.json index fc754cbdcd038..42044c8ba9cf3 100644 --- a/x-pack/test/api_integration/apis/uptime/rest/fixtures/project_http_monitor.json +++ b/x-pack/test/api_integration/apis/uptime/rest/fixtures/project_http_monitor.json @@ -9,7 +9,8 @@ "id": "my-monitor-2", "name": "My Monitor 2", "urls": [ - "http://localhost:9200" + "http://localhost:9200", + "http://anotherurl:9200" ], "schedule": 60, "timeout": "80s", @@ -32,7 +33,6 @@ "saved" ] }, - "content": "", "unsupportedKey": { "nestedUnsupportedKey": "unsupportedValue" } @@ -69,8 +69,7 @@ "saved" ] } - }, - "content": "" + } } ] } \ No newline at end of file diff --git a/x-pack/test/api_integration/apis/uptime/rest/fixtures/project_icmp_monitor.json b/x-pack/test/api_integration/apis/uptime/rest/fixtures/project_icmp_monitor.json index 8dec1b28d50c4..b19e910882582 100644 --- a/x-pack/test/api_integration/apis/uptime/rest/fixtures/project_icmp_monitor.json +++ b/x-pack/test/api_integration/apis/uptime/rest/fixtures/project_icmp_monitor.json @@ -14,7 +14,6 @@ "schedule": 1, "tags": [ "service:smtp", "org:google" ], "privateLocations": [ "Test private location 0" ], - "content": "", "wait": "30s" }, { @@ -26,7 +25,6 @@ "schedule": 1, "tags": "tag1,tag2", "privateLocations": [ "Test private location 0" ], - "content": "", "wait": "1m" }, { @@ -34,11 +32,10 @@ "type": "icmp", "id": "Cloudflare-DNS-3", "name": "Cloudflare DNS 3", - "hosts": "1.1.1.1", + "hosts": "1.1.1.1,2.2.2.2", "schedule": 1, "tags": "tag1,tag2", "privateLocations": [ "Test private location 0" ], - "content": "", "unsupportedKey": { "nestedUnsupportedKey": "unnsuportedValue" } diff --git a/x-pack/test/api_integration/apis/uptime/rest/fixtures/project_tcp_monitor.json b/x-pack/test/api_integration/apis/uptime/rest/fixtures/project_tcp_monitor.json index 30061673079d3..82d6c8c557e77 100644 --- a/x-pack/test/api_integration/apis/uptime/rest/fixtures/project_tcp_monitor.json +++ b/x-pack/test/api_integration/apis/uptime/rest/fixtures/project_tcp_monitor.json @@ -10,8 +10,7 @@ "hosts": [ "smtp.gmail.com:587" ], "schedule": 1, "tags": [ "service:smtp", "org:google" ], - "privateLocations": [ "BEEP" ], - "content": "" + "privateLocations": [ "BEEP" ] }, { "locations": [ "localhost" ], @@ -21,20 +20,18 @@ "hosts": "localhost:18278", "schedule": 1, "tags": "tag1,tag2", - "privateLocations": [ "BEEP" ], - "content": "" + "privateLocations": [ "BEEP" ] }, { "locations": [ "localhost" ], "type": "tcp", "id": "always-down", "name": "Always Down", - "hosts": "localhost", + "hosts": ["localhost", "anotherhost"], "ports": ["5698"], "schedule": 1, "tags": "tag1,tag2", "privateLocations": [ "BEEP" ], - "content": "", "unsupportedKey": { "nestedUnsupportedKey": "unnsuportedValue" } From e0b486051a7b360301e85c55fed995fc64b8273c Mon Sep 17 00:00:00 2001 From: JD Kurma Date: Wed, 28 Sep 2022 18:02:47 -0400 Subject: [PATCH 69/95] fix manifest url + more descriptive name (#142158) --- .../plugins/security_solution/server/lib/telemetry/artifact.ts | 2 +- .../server/lib/telemetry/tasks/configuration.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/artifact.ts b/x-pack/plugins/security_solution/server/lib/telemetry/artifact.ts index 46d0d6e665c4f..07ec2b6f2e49a 100644 --- a/x-pack/plugins/security_solution/server/lib/telemetry/artifact.ts +++ b/x-pack/plugins/security_solution/server/lib/telemetry/artifact.ts @@ -26,7 +26,7 @@ class Artifact implements IArtifact { this.receiver = receiver; this.esClusterInfo = await this.receiver.fetchClusterInfo(); const version = this.esClusterInfo?.version?.number; - this.manifestUrl = `${this.CDN_URL}/downloads/endpoint/manifest/artifacts-${version}.zip`; + this.manifestUrl = `${this.CDN_URL}/downloads/kibana/manifest/artifacts-${version}.zip`; } public async getArtifact(name: string): Promise { diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/configuration.ts b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/configuration.ts index f664fccbf75d8..d266d2f1c7699 100644 --- a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/configuration.ts +++ b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/configuration.ts @@ -29,7 +29,7 @@ export function createTelemetryConfigurationTaskConfig() { taskExecutionPeriod: TaskExecutionPeriod ) => { try { - const artifactName = 'telemetry-configuration-v1'; + const artifactName = 'telemetry-buffer-and-batch-sizes-v1'; const configArtifact = (await artifactService.getArtifact( artifactName )) as unknown as TelemetryConfiguration; From c71ab04eb577b935d80bf15e5afbb9294c799264 Mon Sep 17 00:00:00 2001 From: Oliver Gupte Date: Wed, 28 Sep 2022 18:26:49 -0400 Subject: [PATCH 70/95] [APM] Fixes service count API and modal scroll (#141725) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [APM] Fixes multiple parallel search calls for service count to one call with a filter agg (#141242) * updates the description text when saving a group * fixes scrolling issue in save group modal * adds descripion for service count time range in service group list * [CI] Auto-commit changed files from 'node scripts/eslint --no-cache --fix' * Add comment about only aggregating over metrics documents. * Update x-pack/plugins/apm/server/routes/service_groups/get_services_counts.ts PR feedback Co-authored-by: Cauê Marcondes <55978943+cauemarcondes@users.noreply.github.com> Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com> Co-authored-by: Cauê Marcondes <55978943+cauemarcondes@users.noreply.github.com> --- .../service_group_save/select_services.tsx | 134 +++++++++--------- .../service_list_preview.tsx | 2 +- .../service_groups_list/index.tsx | 6 + .../service_groups/get_services_counts.ts | 56 +++++--- .../apm/server/routes/service_groups/route.ts | 43 ++---- .../translations/translations/fr-FR.json | 1 - .../translations/translations/ja-JP.json | 1 - .../translations/translations/zh-CN.json | 1 - 8 files changed, 120 insertions(+), 124 deletions(-) diff --git a/x-pack/plugins/apm/public/components/app/service_groups/service_group_save/select_services.tsx b/x-pack/plugins/apm/public/components/app/service_groups/service_group_save/select_services.tsx index 251fa03735f16..7a97583bbd4ae 100644 --- a/x-pack/plugins/apm/public/components/app/service_groups/service_group_save/select_services.tsx +++ b/x-pack/plugins/apm/public/components/app/service_groups/service_group_save/select_services.tsx @@ -36,7 +36,7 @@ const CentralizedContainer = styled.div` `; const MAX_CONTAINER_HEIGHT = 600; -const MODAL_HEADER_HEIGHT = 122; +const MODAL_HEADER_HEIGHT = 180; const MODAL_FOOTER_HEIGHT = 80; const suggestedFieldsWhitelist = [ @@ -118,10 +118,73 @@ export function SelectServices({ 'xpack.apm.serviceGroups.selectServicesForm.subtitle', { defaultMessage: - 'Use a query to select services for this group. Services that match this query within the last 24 hours will be assigned to the group.', + 'Use a query to select services for this group. The preview shows services that match this query within the last 24 hours.', } )} + + + { + setKuery(value); + }} + onChange={(value) => { + setStagedKuery(value); + }} + value={kuery} + suggestionFilter={(querySuggestion) => { + if ('field' in querySuggestion) { + const { + field: { + spec: { name: fieldName }, + }, + } = querySuggestion; + + return ( + fieldName.startsWith('label') || + suggestedFieldsWhitelist.includes(fieldName) + ); + } + return true; + }} + /> + + + { + setKuery(stagedKuery); + }} + iconType={!kuery ? 'search' : 'refresh'} + isDisabled={isServiceListPreviewLoading || !stagedKuery} + > + {!kuery + ? i18n.translate( + 'xpack.apm.serviceGroups.selectServicesForm.preview', + { defaultMessage: 'Preview' } + ) + : i18n.translate( + 'xpack.apm.serviceGroups.selectServicesForm.refresh', + { defaultMessage: 'Refresh' } + )} + + + + {kuery && data?.items && ( + + {i18n.translate( + 'xpack.apm.serviceGroups.selectServicesForm.matchingServiceCount', + { + defaultMessage: + '{servicesCount} {servicesCount, plural, =0 {services} one {service} other {services}} match the query', + values: { servicesCount: data?.items.length }, + } + )} + + )} - - - - { - setKuery(value); - }} - onChange={(value) => { - setStagedKuery(value); - }} - value={kuery} - suggestionFilter={(querySuggestion) => { - if ('field' in querySuggestion) { - const { - field: { - spec: { name: fieldName }, - }, - } = querySuggestion; - - return ( - fieldName.startsWith('label') || - suggestedFieldsWhitelist.includes(fieldName) - ); - } - return true; - }} - /> - - - { - setKuery(stagedKuery); - }} - iconType={!kuery ? 'search' : 'refresh'} - isDisabled={isServiceListPreviewLoading || !stagedKuery} - > - {!kuery - ? i18n.translate( - 'xpack.apm.serviceGroups.selectServicesForm.preview', - { defaultMessage: 'Preview' } - ) - : i18n.translate( - 'xpack.apm.serviceGroups.selectServicesForm.refresh', - { defaultMessage: 'Refresh' } - )} - - - - - {kuery && data?.items && ( - - - {i18n.translate( - 'xpack.apm.serviceGroups.selectServicesForm.matchingServiceCount', - { - defaultMessage: - '{servicesCount} {servicesCount, plural, =0 {services} one {service} other {services}} match the query', - values: { servicesCount: data?.items.length }, - } - )} - - - )} {!kuery && ( diff --git a/x-pack/plugins/apm/public/components/app/service_groups/service_group_save/service_list_preview.tsx b/x-pack/plugins/apm/public/components/app/service_groups/service_group_save/service_list_preview.tsx index eb366b84ceefd..66105c106805a 100644 --- a/x-pack/plugins/apm/public/components/app/service_groups/service_group_save/service_list_preview.tsx +++ b/x-pack/plugins/apm/public/components/app/service_groups/service_group_save/service_list_preview.tsx @@ -37,7 +37,7 @@ type SORT_FIELD = 'serviceName' | 'environments' | 'agentName'; export function ServiceListPreview({ items, isLoading }: Props) { const [pageIndex, setPageIndex] = useState(0); - const [pageSize, setPageSize] = useState(5); + const [pageSize, setPageSize] = useState(10); const [sortField, setSortField] = useState(DEFAULT_SORT_FIELD); const [sortDirection, setSortDirection] = useState( DEFAULT_SORT_DIRECTION diff --git a/x-pack/plugins/apm/public/components/app/service_groups/service_groups_list/index.tsx b/x-pack/plugins/apm/public/components/app/service_groups/service_groups_list/index.tsx index d0bf3a9f24b7c..734298dabe9eb 100644 --- a/x-pack/plugins/apm/public/components/app/service_groups/service_groups_list/index.tsx +++ b/x-pack/plugins/apm/public/components/app/service_groups/service_groups_list/index.tsx @@ -156,6 +156,12 @@ export function ServiceGroupsList() { + + {i18n.translate('xpack.apm.serviceGroups.listDescription', { + defaultMessage: + 'Displayed service counts reflect the last 24 hours.', + })} + {items.length ? ( diff --git a/x-pack/plugins/apm/server/routes/service_groups/get_services_counts.ts b/x-pack/plugins/apm/server/routes/service_groups/get_services_counts.ts index 880e3d2488898..c820cdd8445fc 100644 --- a/x-pack/plugins/apm/server/routes/service_groups/get_services_counts.ts +++ b/x-pack/plugins/apm/server/routes/service_groups/get_services_counts.ts @@ -7,50 +7,72 @@ import { ProcessorEvent } from '@kbn/observability-plugin/common'; import { rangeQuery, kqlQuery } from '@kbn/observability-plugin/server'; +import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types'; import { Setup } from '../../lib/helpers/setup_request'; import { SERVICE_NAME } from '../../../common/elasticsearch_fieldnames'; +import { SavedServiceGroup } from '../../../common/service_groups'; export async function getServicesCounts({ setup, - kuery, - maxNumberOfServices, start, end, + serviceGroups, }: { setup: Setup; - kuery: string; - maxNumberOfServices: number; start: number; end: number; + serviceGroups: SavedServiceGroup[]; }) { const { apmEventClient } = setup; - const response = await apmEventClient.search('get_services_count', { + const serviceGroupsKueryMap: Record = + serviceGroups.reduce((acc, sg) => { + return { + ...acc, + [sg.id]: kqlQuery(sg.kuery)[0], + }; + }, {}); + + const params = { apm: { - events: [ - ProcessorEvent.metric, - ProcessorEvent.transaction, - ProcessorEvent.span, - ProcessorEvent.error, - ], + // We're limiting the service count to only metrics documents. If a user + // actively disables system/app metrics and a service only ingests error + // events, that service will not be included in the service groups count. + // This is an edge case that only effects the count preview label. + events: [ProcessorEvent.metric], }, body: { track_total_hits: 0, size: 0, query: { bool: { - filter: [...rangeQuery(start, end), ...kqlQuery(kuery)], + filter: rangeQuery(start, end), }, }, aggs: { - services_count: { - cardinality: { - field: SERVICE_NAME, + service_groups: { + filters: { + filters: serviceGroupsKueryMap, + }, + aggs: { + services_count: { + cardinality: { + field: SERVICE_NAME, + }, + }, }, }, }, }, - }); + }; + const response = await apmEventClient.search('get_services_count', params); - return response?.aggregations?.services_count.value ?? 0; + const buckets: Record = + response?.aggregations?.service_groups.buckets ?? {}; + return Object.keys(buckets).reduce((acc, key) => { + return { + ...acc, + [key]: buckets[key].services_count.value, + }; + }, {}); } diff --git a/x-pack/plugins/apm/server/routes/service_groups/route.ts b/x-pack/plugins/apm/server/routes/service_groups/route.ts index ff37dc1f1c16a..4430aaae760eb 100644 --- a/x-pack/plugins/apm/server/routes/service_groups/route.ts +++ b/x-pack/plugins/apm/server/routes/service_groups/route.ts @@ -7,7 +7,6 @@ import * as t from 'io-ts'; import { apmServiceGroupMaxNumberOfServices } from '@kbn/observability-plugin/common'; -import { keyBy, mapValues } from 'lodash'; import { setupRequest } from '../../lib/helpers/setup_request'; import { createApmServerRoute } from '../apm_routes/create_apm_server_route'; import { kueryRt, rangeRt } from '../default_api_types'; @@ -52,50 +51,26 @@ const serviceGroupsWithServiceCountRoute = createApmServerRoute({ const { context, params } = resources; const { savedObjects: { client: savedObjectsClient }, - uiSettings: { client: uiSettingsClient }, } = await context.core; const { query: { start, end }, } = params; - const [setup, maxNumberOfServices] = await Promise.all([ - setupRequest(resources), - uiSettingsClient.get(apmServiceGroupMaxNumberOfServices), - ]); + const setup = await setupRequest(resources); const serviceGroups = await getServiceGroups({ savedObjectsClient, }); - const serviceGroupsWithServiceCount = await Promise.all( - serviceGroups.map( - async ({ - id, - kuery, - }): Promise<{ id: string; servicesCount: number }> => { - const servicesCount = await getServicesCounts({ - setup, - kuery, - maxNumberOfServices, - start, - end, - }); - - return { - id, - servicesCount, - }; - } - ) - ); - - const servicesCounts = mapValues( - keyBy(serviceGroupsWithServiceCount, 'id'), - 'servicesCount' - ); - - return { servicesCounts }; + return { + servicesCounts: await getServicesCounts({ + setup, + serviceGroups, + start, + end, + }), + }; }, }); diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json index 612838bf5ea5f..e4db41419cb9b 100644 --- a/x-pack/plugins/translations/translations/fr-FR.json +++ b/x-pack/plugins/translations/translations/fr-FR.json @@ -7542,7 +7542,6 @@ "xpack.apm.serviceGroups.selectServicesForm.preview": "Aperçu", "xpack.apm.serviceGroups.selectServicesForm.refresh": "Actualiser", "xpack.apm.serviceGroups.selectServicesForm.saveGroup": "Enregistrer le groupe", - "xpack.apm.serviceGroups.selectServicesForm.subtitle": "Utilisez une requête pour sélectionner les services pour ce groupe. Les services qui correspondent à cette requête dans les dernières 24 heures seront affectés au groupe.", "xpack.apm.serviceGroups.selectServicesForm.title": "Sélectionner des services", "xpack.apm.serviceGroups.selectServicesList.environmentColumnLabel": "Environnements", "xpack.apm.serviceGroups.selectServicesList.nameColumnLabel": "Nom", diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index 1ace6b0a76659..557f4014f1e4c 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -7529,7 +7529,6 @@ "xpack.apm.serviceGroups.selectServicesForm.preview": "プレビュー", "xpack.apm.serviceGroups.selectServicesForm.refresh": "更新", "xpack.apm.serviceGroups.selectServicesForm.saveGroup": "グループを保存", - "xpack.apm.serviceGroups.selectServicesForm.subtitle": "クエリを使用してこのグループのサービスを選択します。過去24時間以内にこのクエリと一致したサービスはグループに割り当てられます。", "xpack.apm.serviceGroups.selectServicesForm.title": "サービスを選択", "xpack.apm.serviceGroups.selectServicesList.environmentColumnLabel": "環境", "xpack.apm.serviceGroups.selectServicesList.nameColumnLabel": "名前", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index 2cdc7fa516263..7fb05ec21f71d 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -7546,7 +7546,6 @@ "xpack.apm.serviceGroups.selectServicesForm.preview": "预览", "xpack.apm.serviceGroups.selectServicesForm.refresh": "刷新", "xpack.apm.serviceGroups.selectServicesForm.saveGroup": "保存组", - "xpack.apm.serviceGroups.selectServicesForm.subtitle": "使用查询为该组选择服务。过去 24 小时内与此查询匹配的服务将分配给该组。", "xpack.apm.serviceGroups.selectServicesForm.title": "选择服务", "xpack.apm.serviceGroups.selectServicesList.environmentColumnLabel": "环境", "xpack.apm.serviceGroups.selectServicesList.nameColumnLabel": "名称", From 92b686a76377e8dc264c0550d278fa134300dfd1 Mon Sep 17 00:00:00 2001 From: Klim Markelov Date: Thu, 29 Sep 2022 00:48:49 +0200 Subject: [PATCH 71/95] Change back the analytics js file url in integration tab (#142114) --- .../analytics_collection_integrate.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_integrate.tsx b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_integrate.tsx index 47f0f161263af..36b527097a304 100644 --- a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_integrate.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_integrate.tsx @@ -49,7 +49,7 @@ export const AnalyticsCollectionIntegrate: React.FC From 07495a440774c5bc8d7af0a0310d4655139952f9 Mon Sep 17 00:00:00 2001 From: Karl Godard Date: Wed, 28 Sep 2022 18:00:20 -0700 Subject: [PATCH 72/95] fixes a few minor issues with playback in xtermjs (#142172) Co-authored-by: Karl Godard --- .../components/tty_player/hooks.test.tsx | 15 +++++++++++ .../public/components/tty_player/hooks.ts | 5 ++-- .../public/components/tty_player/index.tsx | 7 ++++- .../components/tty_search_bar/index.test.tsx | 4 +++ .../components/tty_search_bar/index.tsx | 27 ++++++++++++++----- 5 files changed, 47 insertions(+), 11 deletions(-) diff --git a/x-pack/plugins/session_view/public/components/tty_player/hooks.test.tsx b/x-pack/plugins/session_view/public/components/tty_player/hooks.test.tsx index 004bd5bc757e0..8b2161c3b1216 100644 --- a/x-pack/plugins/session_view/public/components/tty_player/hooks.test.tsx +++ b/x-pack/plugins/session_view/public/components/tty_player/hooks.test.tsx @@ -167,6 +167,21 @@ describe('TTYPlayer/hooks', () => { expect(result.current.currentLine).toBe(initialProps.lines.length - 1); }); + it('should not print the first line twice after playback starts', async () => { + const { result, rerender } = renderHook((props) => useXtermPlayer(props), { + initialProps, + }); + + rerender({ ...initialProps, isPlaying: true }); + act(() => { + // advance render loop + jest.advanceTimersByTime(DEFAULT_TTY_PLAYSPEED_MS); + }); + rerender({ ...initialProps, isPlaying: false }); + + expect(result.current.terminal.buffer.active.getLine(0)?.translateToString(true)).toBe('256'); + }); + it('will allow a plain text search highlight on the last line printed', async () => { const { result: xTermResult } = renderHook((props) => useXtermPlayer(props), { initialProps, diff --git a/x-pack/plugins/session_view/public/components/tty_player/hooks.ts b/x-pack/plugins/session_view/public/components/tty_player/hooks.ts index 08f163903b0a5..680d50283d5f1 100644 --- a/x-pack/plugins/session_view/public/components/tty_player/hooks.ts +++ b/x-pack/plugins/session_view/public/components/tty_player/hooks.ts @@ -281,13 +281,12 @@ export const useXtermPlayer = ({ useEffect(() => { if (isPlaying) { const timer = setTimeout(() => { - render(currentLine, false); - - if (currentLine === lines.length - 1) { + if (!hasNextPage && currentLine === lines.length - 1) { setIsPlaying(false); } else { const nextLine = Math.min(lines.length - 1, currentLine + TTY_LINES_PER_FRAME); setCurrentLine(nextLine); + render(nextLine, false); } }, playSpeed); diff --git a/x-pack/plugins/session_view/public/components/tty_player/index.tsx b/x-pack/plugins/session_view/public/components/tty_player/index.tsx index ba57fc9d845cc..cb2746736c02f 100644 --- a/x-pack/plugins/session_view/public/components/tty_player/index.tsx +++ b/x-pack/plugins/session_view/public/components/tty_player/index.tsx @@ -134,7 +134,12 @@ export const TTYPlayer = ({ - + diff --git a/x-pack/plugins/session_view/public/components/tty_search_bar/index.test.tsx b/x-pack/plugins/session_view/public/components/tty_search_bar/index.test.tsx index 2f952b48e9d56..06fa17a6c151c 100644 --- a/x-pack/plugins/session_view/public/components/tty_search_bar/index.test.tsx +++ b/x-pack/plugins/session_view/public/components/tty_search_bar/index.test.tsx @@ -34,6 +34,7 @@ describe('TTYSearchBar component', () => { lines, seekToLine: jest.fn(), xTermSearchFn: jest.fn(), + setIsPlaying: jest.fn(), }; }); @@ -59,6 +60,7 @@ describe('TTYSearchBar component', () => { expect(props.xTermSearchFn).toHaveBeenCalledTimes(2); expect(props.xTermSearchFn).toHaveBeenNthCalledWith(1, '', 0); expect(props.xTermSearchFn).toHaveBeenNthCalledWith(2, '-h', 6); + expect(props.setIsPlaying).toHaveBeenCalledWith(false); }); it('calls seekToline and xTermSearchFn when currentMatch changes', async () => { @@ -85,6 +87,7 @@ describe('TTYSearchBar component', () => { expect(props.xTermSearchFn).toHaveBeenNthCalledWith(1, '', 0); expect(props.xTermSearchFn).toHaveBeenNthCalledWith(2, '-h', 6); expect(props.xTermSearchFn).toHaveBeenNthCalledWith(3, '-h', 13); + expect(props.setIsPlaying).toHaveBeenCalledTimes(3); }); it('calls xTermSearchFn with empty query when search is cleared', async () => { @@ -101,5 +104,6 @@ describe('TTYSearchBar component', () => { await new Promise((r) => setTimeout(r, 100)); expect(props.xTermSearchFn).toHaveBeenNthCalledWith(3, '', 0); + expect(props.setIsPlaying).toHaveBeenCalledWith(false); }); }); diff --git a/x-pack/plugins/session_view/public/components/tty_search_bar/index.tsx b/x-pack/plugins/session_view/public/components/tty_search_bar/index.tsx index e41b3b967cfac..18b829127ab2d 100644 --- a/x-pack/plugins/session_view/public/components/tty_search_bar/index.tsx +++ b/x-pack/plugins/session_view/public/components/tty_search_bar/index.tsx @@ -19,15 +19,24 @@ export interface TTYSearchBarDeps { lines: IOLine[]; seekToLine(index: number): void; xTermSearchFn(query: string, index: number): void; + setIsPlaying(value: boolean): void; } -export const TTYSearchBar = ({ lines, seekToLine, xTermSearchFn }: TTYSearchBarDeps) => { +const STRIP_NEWLINES_REGEX = /^(\r\n|\r|\n|\n\r)/; + +export const TTYSearchBar = ({ + lines, + seekToLine, + xTermSearchFn, + setIsPlaying, +}: TTYSearchBarDeps) => { const [currentMatch, setCurrentMatch] = useState(null); const [searchQuery, setSearchQuery] = useState(''); const jumpToMatch = useCallback( (match) => { if (match) { + setIsPlaying(false); const goToLine = lines.indexOf(match.line); seekToLine(goToLine); } @@ -40,7 +49,7 @@ export const TTYSearchBar = ({ lines, seekToLine, xTermSearchFn }: TTYSearchBarD clearTimeout(timeout); }; }, - [lines, seekToLine, xTermSearchFn, searchQuery] + [setIsPlaying, lines, seekToLine, xTermSearchFn, searchQuery] ); const searchResults = useMemo(() => { @@ -53,7 +62,7 @@ export const TTYSearchBar = ({ lines, seekToLine, xTermSearchFn }: TTYSearchBarD const cursorMovement = current.value.match(/^\x1b\[\d+;(\d+)(H|d)/); const regex = new RegExp(searchQuery.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'ig'); const lineMatches = stripAnsi(current.value) - .replace(/^\r|\r?\n/, '') + .replace(STRIP_NEWLINES_REGEX, '') .matchAll(regex); if (lineMatches) { @@ -90,10 +99,14 @@ export const TTYSearchBar = ({ lines, seekToLine, xTermSearchFn }: TTYSearchBarD return matches; }, [searchQuery, lines, jumpToMatch, xTermSearchFn]); - const onSearch = useCallback((query) => { - setSearchQuery(query); - setCurrentMatch(null); - }, []); + const onSearch = useCallback( + (query) => { + setIsPlaying(false); + setSearchQuery(query); + setCurrentMatch(null); + }, + [setIsPlaying] + ); const onSetCurrentMatch = useCallback( (index) => { From a192d34a524cfd25d2aa1bf366dcb82c5b2c0424 Mon Sep 17 00:00:00 2001 From: Luke Gmys Date: Thu, 29 Sep 2022 06:10:55 +0200 Subject: [PATCH 73/95] [TIP] Extract useFilters logic to a shared context (#141766) --- .../mocks/mock_indicators_filters_context.tsx | 10 +- .../public/common/mocks/story_providers.tsx | 2 +- .../public/common/mocks/test_providers.tsx | 39 +++--- .../fields_table/fields_table.stories.tsx | 2 +- .../components/flyout/flyout.stories.tsx | 2 +- .../overview_tab/block/block.stories.tsx | 2 +- .../overview_tab/overview_tab.stories.tsx | 2 +- .../flyout/table_tab/table_tab.stories.tsx | 2 +- .../indicators_barchart_wrapper.stories.tsx | 11 +- .../indicators_barchart_wrapper.test.tsx | 10 +- .../indicators_barchart_wrapper.tsx | 19 +-- .../indicators_table.stories.tsx | 2 +- .../indicators_filters}/context.ts | 13 +- .../containers/indicators_filters/index.ts | 10 ++ .../indicators_filters/indicators_filters.tsx | 111 +++++++++++++++--- .../hooks/use_aggregated_indicators.test.tsx | 46 ++++---- .../hooks/use_aggregated_indicators.ts | 14 ++- .../indicators/hooks/use_indicators.test.tsx | 21 ++++ .../indicators/hooks/use_indicators.ts | 7 +- .../hooks/use_indicators_filters_context.ts | 5 +- .../indicators/indicators_page.test.tsx | 2 +- .../modules/indicators/indicators_page.tsx | 82 ++++++++----- .../filter_in/filter_in.stories.tsx | 2 +- .../filter_out/filter_out.stories.tsx | 2 +- .../hooks/use_filters/use_filters.test.tsx | 31 +++-- .../hooks/use_filters/use_filters.ts | 108 ++--------------- 26 files changed, 329 insertions(+), 228 deletions(-) rename x-pack/plugins/threat_intelligence/public/modules/indicators/{ => containers/indicators_filters}/context.ts (55%) create mode 100644 x-pack/plugins/threat_intelligence/public/modules/indicators/containers/indicators_filters/index.ts diff --git a/x-pack/plugins/threat_intelligence/public/common/mocks/mock_indicators_filters_context.tsx b/x-pack/plugins/threat_intelligence/public/common/mocks/mock_indicators_filters_context.tsx index 6e9c0b373a0fe..4b7832631fd16 100644 --- a/x-pack/plugins/threat_intelligence/public/common/mocks/mock_indicators_filters_context.tsx +++ b/x-pack/plugins/threat_intelligence/public/common/mocks/mock_indicators_filters_context.tsx @@ -6,11 +6,19 @@ */ import { FilterManager } from '@kbn/data-plugin/public'; -import { IndicatorsFiltersContextValue } from '../../modules/indicators/context'; +import { IndicatorsFiltersContextValue } from '../../modules/indicators/containers/indicators_filters/context'; export const mockIndicatorsFiltersContext: IndicatorsFiltersContextValue = { filterManager: { getFilters: () => [], setFilters: () => {}, } as unknown as FilterManager, + filters: [], + filterQuery: { + language: 'kuery', + query: '', + }, + handleSavedQuery: () => {}, + handleSubmitQuery: () => {}, + handleSubmitTimeRange: () => {}, }; diff --git a/x-pack/plugins/threat_intelligence/public/common/mocks/story_providers.tsx b/x-pack/plugins/threat_intelligence/public/common/mocks/story_providers.tsx index eea2596327fb7..7cea653c45e5f 100644 --- a/x-pack/plugins/threat_intelligence/public/common/mocks/story_providers.tsx +++ b/x-pack/plugins/threat_intelligence/public/common/mocks/story_providers.tsx @@ -16,7 +16,7 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; import { mockIndicatorsFiltersContext } from './mock_indicators_filters_context'; import { SecuritySolutionContext } from '../../containers/security_solution_context'; import { getSecuritySolutionContextMock } from './mock_security_context'; -import { IndicatorsFiltersContext } from '../../modules/indicators/context'; +import { IndicatorsFiltersContext } from '../../modules/indicators/containers/indicators_filters/context'; import { FieldTypesContext } from '../../containers/field_types_provider'; import { generateFieldTypeMap } from './mock_field_type_map'; import { mockUiSettingsService } from './mock_kibana_ui_settings_service'; diff --git a/x-pack/plugins/threat_intelligence/public/common/mocks/test_providers.tsx b/x-pack/plugins/threat_intelligence/public/common/mocks/test_providers.tsx index a93b6bfe30469..c41f8972fd605 100644 --- a/x-pack/plugins/threat_intelligence/public/common/mocks/test_providers.tsx +++ b/x-pack/plugins/threat_intelligence/public/common/mocks/test_providers.tsx @@ -18,12 +18,13 @@ import { createTGridMocks } from '@kbn/timelines-plugin/public/mock'; import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common'; import { RequestAdapter } from '@kbn/inspector-plugin/common'; import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; +import { MemoryRouter } from 'react-router-dom'; import { KibanaContext } from '../../hooks/use_kibana'; import { SecuritySolutionPluginContext } from '../../types'; import { getSecuritySolutionContextMock } from './mock_security_context'; import { mockUiSetting } from './mock_kibana_ui_settings_service'; import { SecuritySolutionContext } from '../../containers/security_solution_context'; -import { IndicatorsFiltersContext } from '../../modules/indicators/context'; +import { IndicatorsFiltersContext } from '../../modules/indicators/containers/indicators_filters/context'; import { mockIndicatorsFiltersContext } from './mock_indicators_filters_context'; import { FieldTypesContext } from '../../containers/field_types_provider'; import { generateFieldTypeMap } from './mock_field_type_map'; @@ -128,23 +129,25 @@ export const mockedServices = { }; export const TestProvidersComponent: FC = ({ children }) => ( - - - - - - - - - {children} - - - - - - - - + + + + + + + + + + {children} + + + + + + + + + ); export type MockedSearch = jest.Mocked; diff --git a/x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/fields_table/fields_table.stories.tsx b/x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/fields_table/fields_table.stories.tsx index 8d3f13ae01af2..eb0ed8fb045ed 100644 --- a/x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/fields_table/fields_table.stories.tsx +++ b/x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/fields_table/fields_table.stories.tsx @@ -10,7 +10,7 @@ import { mockIndicatorsFiltersContext } from '../../../../../common/mocks/mock_i import { IndicatorFieldsTable } from '.'; import { generateMockIndicator } from '../../../../../../common/types/indicator'; import { StoryProvidersComponent } from '../../../../../common/mocks/story_providers'; -import { IndicatorsFiltersContext } from '../../../context'; +import { IndicatorsFiltersContext } from '../../../containers/indicators_filters'; export default { component: IndicatorFieldsTable, diff --git a/x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/flyout.stories.tsx b/x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/flyout.stories.tsx index 12345056c7a9d..69236e778178b 100644 --- a/x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/flyout.stories.tsx +++ b/x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/flyout.stories.tsx @@ -14,7 +14,7 @@ import { mockUiSettingsService } from '../../../../common/mocks/mock_kibana_ui_s import { mockKibanaTimelinesService } from '../../../../common/mocks/mock_kibana_timelines_service'; import { generateMockIndicator, Indicator } from '../../../../../common/types/indicator'; import { IndicatorsFlyout } from '.'; -import { IndicatorsFiltersContext } from '../../context'; +import { IndicatorsFiltersContext } from '../../containers/indicators_filters'; export default { component: IndicatorsFlyout, diff --git a/x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/overview_tab/block/block.stories.tsx b/x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/overview_tab/block/block.stories.tsx index 1049518f4620f..e30d352c2644f 100644 --- a/x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/overview_tab/block/block.stories.tsx +++ b/x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/overview_tab/block/block.stories.tsx @@ -6,7 +6,7 @@ */ import React from 'react'; -import { IndicatorsFiltersContext } from '../../../../context'; +import { IndicatorsFiltersContext } from '../../../../containers/indicators_filters'; import { StoryProvidersComponent } from '../../../../../../common/mocks/story_providers'; import { generateMockIndicator } from '../../../../../../../common/types/indicator'; import { IndicatorBlock } from '.'; diff --git a/x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/overview_tab/overview_tab.stories.tsx b/x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/overview_tab/overview_tab.stories.tsx index d543b6b6d1125..005edd9c4201d 100644 --- a/x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/overview_tab/overview_tab.stories.tsx +++ b/x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/overview_tab/overview_tab.stories.tsx @@ -10,7 +10,7 @@ import { Story } from '@storybook/react'; import { StoryProvidersComponent } from '../../../../../common/mocks/story_providers'; import { generateMockIndicator, Indicator } from '../../../../../../common/types/indicator'; import { IndicatorsFlyoutOverview } from '.'; -import { IndicatorsFiltersContext } from '../../../context'; +import { IndicatorsFiltersContext } from '../../../containers/indicators_filters'; export default { component: IndicatorsFlyoutOverview, diff --git a/x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/table_tab/table_tab.stories.tsx b/x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/table_tab/table_tab.stories.tsx index 014d57b8ec113..60808a46356a8 100644 --- a/x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/table_tab/table_tab.stories.tsx +++ b/x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/table_tab/table_tab.stories.tsx @@ -14,7 +14,7 @@ import { mockUiSettingsService } from '../../../../../common/mocks/mock_kibana_u import { mockKibanaTimelinesService } from '../../../../../common/mocks/mock_kibana_timelines_service'; import { generateMockIndicator, Indicator } from '../../../../../../common/types/indicator'; import { IndicatorsFlyoutTable } from '.'; -import { IndicatorsFiltersContext } from '../../../context'; +import { IndicatorsFiltersContext } from '../../../containers/indicators_filters'; export default { component: IndicatorsFlyoutTable, diff --git a/x-pack/plugins/threat_intelligence/public/modules/indicators/components/indicators_barchart_wrapper/indicators_barchart_wrapper.stories.tsx b/x-pack/plugins/threat_intelligence/public/modules/indicators/components/indicators_barchart_wrapper/indicators_barchart_wrapper.stories.tsx index 213c750c5d1ed..f08e8f3b2f0e8 100644 --- a/x-pack/plugins/threat_intelligence/public/modules/indicators/components/indicators_barchart_wrapper/indicators_barchart_wrapper.stories.tsx +++ b/x-pack/plugins/threat_intelligence/public/modules/indicators/components/indicators_barchart_wrapper/indicators_barchart_wrapper.stories.tsx @@ -120,7 +120,16 @@ export const Default: Story = () => { - + ); }; diff --git a/x-pack/plugins/threat_intelligence/public/modules/indicators/components/indicators_barchart_wrapper/indicators_barchart_wrapper.test.tsx b/x-pack/plugins/threat_intelligence/public/modules/indicators/components/indicators_barchart_wrapper/indicators_barchart_wrapper.test.tsx index 997cfc7922b9d..48d084b0e832a 100644 --- a/x-pack/plugins/threat_intelligence/public/modules/indicators/components/indicators_barchart_wrapper/indicators_barchart_wrapper.test.tsx +++ b/x-pack/plugins/threat_intelligence/public/modules/indicators/components/indicators_barchart_wrapper/indicators_barchart_wrapper.test.tsx @@ -13,6 +13,7 @@ import { TestProvidersComponent } from '../../../../common/mocks/test_providers' import { IndicatorsBarChartWrapper } from './indicators_barchart_wrapper'; import { DEFAULT_TIME_RANGE } from '../../../query_bar/hooks/use_filters/utils'; import { useFilters } from '../../../query_bar/hooks/use_filters'; +import moment from 'moment'; jest.mock('../../../query_bar/hooks/use_filters'); @@ -47,7 +48,14 @@ describe('', () => { it('should render barchart and field selector dropdown', () => { const component = render( - + ); diff --git a/x-pack/plugins/threat_intelligence/public/modules/indicators/components/indicators_barchart_wrapper/indicators_barchart_wrapper.tsx b/x-pack/plugins/threat_intelligence/public/modules/indicators/components/indicators_barchart_wrapper/indicators_barchart_wrapper.tsx index fab1cfc5473d1..31148685e370d 100644 --- a/x-pack/plugins/threat_intelligence/public/modules/indicators/components/indicators_barchart_wrapper/indicators_barchart_wrapper.tsx +++ b/x-pack/plugins/threat_intelligence/public/modules/indicators/components/indicators_barchart_wrapper/indicators_barchart_wrapper.tsx @@ -9,11 +9,12 @@ import React, { memo } from 'react'; import { EuiFlexGroup, EuiFlexItem, EuiTitle } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n-react'; import { TimeRange } from '@kbn/es-query'; +import { TimeRangeBounds } from '@kbn/data-plugin/common'; import { SecuritySolutionDataViewBase } from '../../../../types'; import { RawIndicatorFieldId } from '../../../../../common/types/indicator'; -import { useAggregatedIndicators } from '../../hooks/use_aggregated_indicators'; import { IndicatorsFieldSelector } from '../indicators_field_selector/indicators_field_selector'; import { IndicatorsBarChart } from '../indicators_barchart/indicators_barchart'; +import { ChartSeries } from '../../services/fetch_aggregated_indicators'; const DEFAULT_FIELD = RawIndicatorFieldId.Feed; @@ -26,6 +27,14 @@ export interface IndicatorsBarChartWrapperProps { * List of fields coming from the Security Solution sourcerer data view, passed down to the {@link IndicatorFieldSelector} to populate the dropdown. */ indexPattern: SecuritySolutionDataViewBase; + + series: ChartSeries[]; + + dateRange: TimeRangeBounds; + + field: string; + + onFieldChange: (value: string) => void; } /** @@ -33,11 +42,7 @@ export interface IndicatorsBarChartWrapperProps { * and handles retrieving aggregated indicator data. */ export const IndicatorsBarChartWrapper = memo( - ({ timeRange, indexPattern }) => { - const { dateRange, indicators, selectedField, onFieldChange } = useAggregatedIndicators({ - timeRange, - }); - + ({ timeRange, indexPattern, series, dateRange, field, onFieldChange }) => { return ( <> @@ -60,7 +65,7 @@ export const IndicatorsBarChartWrapper = memo( {timeRange ? ( - + ) : ( <> )} diff --git a/x-pack/plugins/threat_intelligence/public/modules/indicators/components/indicators_table/indicators_table.stories.tsx b/x-pack/plugins/threat_intelligence/public/modules/indicators/components/indicators_table/indicators_table.stories.tsx index 034fc13630433..6505996a26a7d 100644 --- a/x-pack/plugins/threat_intelligence/public/modules/indicators/components/indicators_table/indicators_table.stories.tsx +++ b/x-pack/plugins/threat_intelligence/public/modules/indicators/components/indicators_table/indicators_table.stories.tsx @@ -11,7 +11,7 @@ import { mockIndicatorsFiltersContext } from '../../../../common/mocks/mock_indi import { StoryProvidersComponent } from '../../../../common/mocks/story_providers'; import { generateMockIndicator, Indicator } from '../../../../../common/types/indicator'; import { IndicatorsTable } from './indicators_table'; -import { IndicatorsFiltersContext } from '../../context'; +import { IndicatorsFiltersContext } from '../../containers/indicators_filters/context'; import { DEFAULT_COLUMNS } from './hooks/use_column_settings'; export default { diff --git a/x-pack/plugins/threat_intelligence/public/modules/indicators/context.ts b/x-pack/plugins/threat_intelligence/public/modules/indicators/containers/indicators_filters/context.ts similarity index 55% rename from x-pack/plugins/threat_intelligence/public/modules/indicators/context.ts rename to x-pack/plugins/threat_intelligence/public/modules/indicators/containers/indicators_filters/context.ts index b6a4d17754f17..b075668c5015e 100644 --- a/x-pack/plugins/threat_intelligence/public/modules/indicators/context.ts +++ b/x-pack/plugins/threat_intelligence/public/modules/indicators/containers/indicators_filters/context.ts @@ -6,13 +6,18 @@ */ import { createContext } from 'react'; -import { FilterManager } from '@kbn/data-plugin/public'; +import { FilterManager, SavedQuery } from '@kbn/data-plugin/public'; +import { Filter, Query, TimeRange } from '@kbn/es-query'; export interface IndicatorsFiltersContextValue { - /** - * FilterManager is used to interact with KQL bar. - */ + timeRange?: TimeRange; + filters: Filter[]; + filterQuery: Query; + handleSavedQuery: (savedQuery: SavedQuery | undefined) => void; + handleSubmitTimeRange: (timeRange?: TimeRange) => void; + handleSubmitQuery: (filterQuery: Query) => void; filterManager: FilterManager; + savedQuery?: SavedQuery; } export const IndicatorsFiltersContext = createContext( diff --git a/x-pack/plugins/threat_intelligence/public/modules/indicators/containers/indicators_filters/index.ts b/x-pack/plugins/threat_intelligence/public/modules/indicators/containers/indicators_filters/index.ts new file mode 100644 index 0000000000000..4ef23e3e95001 --- /dev/null +++ b/x-pack/plugins/threat_intelligence/public/modules/indicators/containers/indicators_filters/index.ts @@ -0,0 +1,10 @@ +/* + * 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 * from './indicators_filters'; + +export * from './context'; diff --git a/x-pack/plugins/threat_intelligence/public/modules/indicators/containers/indicators_filters/indicators_filters.tsx b/x-pack/plugins/threat_intelligence/public/modules/indicators/containers/indicators_filters/indicators_filters.tsx index 0fdd5c60ce5ce..2e8a2b55e4384 100644 --- a/x-pack/plugins/threat_intelligence/public/modules/indicators/containers/indicators_filters/indicators_filters.tsx +++ b/x-pack/plugins/threat_intelligence/public/modules/indicators/containers/indicators_filters/indicators_filters.tsx @@ -5,26 +5,105 @@ * 2.0. */ -import React, { ReactNode, VFC } from 'react'; -import { FilterManager } from '@kbn/data-plugin/public'; -import { IndicatorsFiltersContext, IndicatorsFiltersContextValue } from '../../context'; - -export interface IndicatorsFiltersProps { - /** - * Get {@link FilterManager} from the useFilters hook and save it in context to use within the indicators table. - */ - filterManager: FilterManager; - /** - * Component(s) to be displayed inside - */ - children: ReactNode; -} +import React, { FC, useCallback, useEffect, useMemo, useState } from 'react'; +import { useHistory, useLocation } from 'react-router-dom'; +import { SavedQuery } from '@kbn/data-plugin/common'; +import { Filter, Query, TimeRange } from '@kbn/es-query'; +import deepEqual from 'fast-deep-equal'; +import { IndicatorsFiltersContext, IndicatorsFiltersContextValue } from './context'; +import { useKibana } from '../../../../hooks/use_kibana'; + +import { + DEFAULT_QUERY, + DEFAULT_TIME_RANGE, + encodeState, + FILTERS_QUERYSTRING_NAMESPACE, + stateFromQueryParams, +} from '../../../query_bar/hooks/use_filters/utils'; /** * Container used to wrap components and share the {@link FilterManager} through React context. */ -export const IndicatorsFilters: VFC = ({ filterManager, children }) => { - const contextValue: IndicatorsFiltersContextValue = { filterManager }; +export const IndicatorsFilters: FC = ({ children }) => { + const { pathname: browserPathName, search } = useLocation(); + const history = useHistory(); + const [savedQuery, setSavedQuery] = useState(undefined); + + const { + services: { + data: { + query: { filterManager }, + }, + }, + } = useKibana(); + + // Filters are picked using the UI widgets + const [filters, setFilters] = useState([]); + + // Time range is self explanatory + const [timeRange, setTimeRange] = useState(DEFAULT_TIME_RANGE); + + // filterQuery is raw kql query that user can type in to filter results + const [filterQuery, setFilterQuery] = useState(DEFAULT_QUERY); + + // Serialize filters into query string + useEffect(() => { + const filterStateAsString = encodeState({ filters, filterQuery, timeRange }); + if (!deepEqual(filterManager.getFilters(), filters)) { + filterManager.setFilters(filters); + } + + history.replace({ + pathname: browserPathName, + search: `${FILTERS_QUERYSTRING_NAMESPACE}=${filterStateAsString}`, + }); + }, [browserPathName, filterManager, filterQuery, filters, history, timeRange]); + + // Sync filterManager to local state (after they are changed from the ui) + useEffect(() => { + const subscription = filterManager.getUpdates$().subscribe(() => { + setFilters(filterManager.getFilters()); + }); + + return () => subscription.unsubscribe(); + }, [filterManager]); + + // Update local state with filter values from the url (on initial mount) + useEffect(() => { + const { + filters: filtersFromQuery, + timeRange: timeRangeFromQuery, + filterQuery: filterQueryFromQuery, + } = stateFromQueryParams(search); + + setTimeRange(timeRangeFromQuery); + setFilterQuery(filterQueryFromQuery); + setFilters(filtersFromQuery); + + // We only want to have it done on initial render with initial 'search' value; + // that is why 'search' is ommited from the deps array + + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [filterManager]); + + const onSavedQuery = useCallback( + (newSavedQuery: SavedQuery | undefined) => setSavedQuery(newSavedQuery), + [] + ); + + const contextValue: IndicatorsFiltersContextValue = useMemo( + () => ({ + timeRange, + filters, + filterQuery, + handleSavedQuery: onSavedQuery, + handleSubmitTimeRange: setTimeRange, + handleSubmitQuery: setFilterQuery, + filterManager, + savedQuery, + }), + [filterManager, filterQuery, filters, onSavedQuery, savedQuery, timeRange] + ); return ( diff --git a/x-pack/plugins/threat_intelligence/public/modules/indicators/hooks/use_aggregated_indicators.test.tsx b/x-pack/plugins/threat_intelligence/public/modules/indicators/hooks/use_aggregated_indicators.test.tsx index 6b3feb7406906..85c703cf5dca1 100644 --- a/x-pack/plugins/threat_intelligence/public/modules/indicators/hooks/use_aggregated_indicators.test.tsx +++ b/x-pack/plugins/threat_intelligence/public/modules/indicators/hooks/use_aggregated_indicators.test.tsx @@ -12,33 +12,22 @@ import { mockedTimefilterService, TestProvidersComponent, } from '../../../common/mocks/test_providers'; -import { useFilters } from '../../query_bar/hooks/use_filters'; import { createFetchAggregatedIndicators } from '../services/fetch_aggregated_indicators'; jest.mock('../services/fetch_aggregated_indicators'); -jest.mock('../../query_bar/hooks/use_filters'); const useAggregatedIndicatorsParams: UseAggregatedIndicatorsParam = { timeRange: DEFAULT_TIME_RANGE, + filters: [], + filterQuery: { language: 'kuery', query: '' }, }; -const stub = () => {}; - const renderUseAggregatedIndicators = () => - renderHook((props) => useAggregatedIndicators(props), { + renderHook((props: UseAggregatedIndicatorsParam) => useAggregatedIndicators(props), { initialProps: useAggregatedIndicatorsParams, wrapper: TestProvidersComponent, }); -const initialFiltersValue = { - filters: [], - filterQuery: { language: 'kuery', query: '' }, - filterManager: {} as any, - handleSavedQuery: stub, - handleSubmitQuery: stub, - handleSubmitTimeRange: stub, -}; - describe('useAggregatedIndicators()', () => { beforeEach(jest.clearAllMocks); @@ -56,14 +45,12 @@ describe('useAggregatedIndicators()', () => { (createFetchAggregatedIndicators as MockedCreateFetchAggregatedIndicators).mockReturnValue( aggregatedIndicatorsQuery ); - - (useFilters as jest.MockedFunction).mockReturnValue(initialFiltersValue); }); it('should create and call the aggregatedIndicatorsQuery correctly', async () => { aggregatedIndicatorsQuery.mockResolvedValue([]); - const { rerender } = renderUseAggregatedIndicators(); + const { result, rerender } = renderUseAggregatedIndicators(); // indicators service and the query should be called just once expect( @@ -81,14 +68,12 @@ describe('useAggregatedIndicators()', () => { expect.any(AbortSignal) ); - // After filter values change, the hook will be re-rendered and should call the query function again, with - // updated values - (useFilters as jest.MockedFunction).mockReturnValue({ - ...initialFiltersValue, - filterQuery: { language: 'kuery', query: "threat.indicator.type: 'file'" }, - }); - - await act(async () => rerender()); + await act(async () => + rerender({ + filterQuery: { language: 'kuery', query: "threat.indicator.type: 'file'" }, + filters: [], + }) + ); expect(aggregatedIndicatorsQuery).toHaveBeenCalledTimes(2); expect(aggregatedIndicatorsQuery).toHaveBeenLastCalledWith( @@ -97,5 +82,16 @@ describe('useAggregatedIndicators()', () => { }), expect.any(AbortSignal) ); + expect(result.current).toMatchInlineSnapshot(` + Object { + "dateRange": Object { + "max": "2022-01-02T00:00:00.000Z", + "min": "2022-01-01T00:00:00.000Z", + }, + "onFieldChange": [Function], + "selectedField": "threat.feed.name", + "series": Array [], + } + `); }); }); diff --git a/x-pack/plugins/threat_intelligence/public/modules/indicators/hooks/use_aggregated_indicators.ts b/x-pack/plugins/threat_intelligence/public/modules/indicators/hooks/use_aggregated_indicators.ts index 2609dbda5eb11..98e672ac3ad91 100644 --- a/x-pack/plugins/threat_intelligence/public/modules/indicators/hooks/use_aggregated_indicators.ts +++ b/x-pack/plugins/threat_intelligence/public/modules/indicators/hooks/use_aggregated_indicators.ts @@ -5,12 +5,11 @@ * 2.0. */ -import { TimeRange } from '@kbn/es-query'; +import { useQuery } from '@tanstack/react-query'; +import { Filter, Query, TimeRange } from '@kbn/es-query'; import { useMemo, useState } from 'react'; import { TimeRangeBounds } from '@kbn/data-plugin/common'; -import { useQuery } from '@tanstack/react-query'; import { useInspector } from '../../../hooks/use_inspector'; -import { useFilters } from '../../query_bar/hooks/use_filters'; import { RawIndicatorFieldId } from '../../../../common/types/indicator'; import { useKibana } from '../../../hooks/use_kibana'; import { DEFAULT_TIME_RANGE } from '../../query_bar/hooks/use_filters/utils'; @@ -27,13 +26,15 @@ export interface UseAggregatedIndicatorsParam { * to query indicators for the Indicators barchart. */ timeRange?: TimeRange; + filters: Filter[]; + filterQuery: Query; } export interface UseAggregatedIndicatorsValue { /** * Array of {@link ChartSeries}, ready to be used in the Indicators barchart. */ - indicators: ChartSeries[]; + series: ChartSeries[]; /** * Callback used by the IndicatorsFieldSelector component to query a new set of * aggregated indicators. @@ -54,6 +55,8 @@ const DEFAULT_FIELD = RawIndicatorFieldId.Feed; export const useAggregatedIndicators = ({ timeRange = DEFAULT_TIME_RANGE, + filters, + filterQuery, }: UseAggregatedIndicatorsParam): UseAggregatedIndicatorsValue => { const { services: { @@ -66,7 +69,6 @@ export const useAggregatedIndicators = ({ const { inspectorAdapters } = useInspector(); const [field, setField] = useState(DEFAULT_FIELD); - const { filters, filterQuery } = useFilters(); const aggregatedIndicatorsQuery = useMemo( () => @@ -105,7 +107,7 @@ export const useAggregatedIndicators = ({ return { dateRange, - indicators: data || [], + series: data || [], onFieldChange: setField, selectedField: field, }; diff --git a/x-pack/plugins/threat_intelligence/public/modules/indicators/hooks/use_indicators.test.tsx b/x-pack/plugins/threat_intelligence/public/modules/indicators/hooks/use_indicators.test.tsx index 0b06208130780..7292dbcd1b03a 100644 --- a/x-pack/plugins/threat_intelligence/public/modules/indicators/hooks/use_indicators.test.tsx +++ b/x-pack/plugins/threat_intelligence/public/modules/indicators/hooks/use_indicators.test.tsx @@ -98,6 +98,27 @@ describe('useIndicators()', () => { }), expect.any(AbortSignal) ); + + expect(hookResult.result.current).toMatchInlineSnapshot(` + Object { + "handleRefresh": [Function], + "indicatorCount": 0, + "indicators": Array [], + "isFetching": true, + "isLoading": true, + "onChangeItemsPerPage": [Function], + "onChangePage": [Function], + "pagination": Object { + "pageIndex": 0, + "pageSize": 50, + "pageSizeOptions": Array [ + 10, + 25, + 50, + ], + }, + } + `); }); }); }); diff --git a/x-pack/plugins/threat_intelligence/public/modules/indicators/hooks/use_indicators.ts b/x-pack/plugins/threat_intelligence/public/modules/indicators/hooks/use_indicators.ts index 5303b5dae06cb..1855d411eb8c7 100644 --- a/x-pack/plugins/threat_intelligence/public/modules/indicators/hooks/use_indicators.ts +++ b/x-pack/plugins/threat_intelligence/public/modules/indicators/hooks/use_indicators.ts @@ -8,6 +8,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react'; import { Filter, Query, TimeRange } from '@kbn/es-query'; import { useQuery } from '@tanstack/react-query'; +import { EuiDataGridSorting } from '@elastic/eui'; import { useInspector } from '../../../hooks/use_inspector'; import { Indicator } from '../../../../common/types/indicator'; import { useKibana } from '../../../hooks/use_kibana'; @@ -22,11 +23,15 @@ export interface UseIndicatorsParams { filterQuery: Query; filters: Filter[]; timeRange?: TimeRange; - sorting: any[]; + sorting: EuiDataGridSorting['columns']; } export interface UseIndicatorsValue { handleRefresh: () => void; + + /** + * Array of {@link Indicator} ready to render inside the IndicatorTable component + */ indicators: Indicator[]; indicatorCount: number; pagination: Pagination; diff --git a/x-pack/plugins/threat_intelligence/public/modules/indicators/hooks/use_indicators_filters_context.ts b/x-pack/plugins/threat_intelligence/public/modules/indicators/hooks/use_indicators_filters_context.ts index e8cc4b18474bf..e4c7c48d03d1b 100644 --- a/x-pack/plugins/threat_intelligence/public/modules/indicators/hooks/use_indicators_filters_context.ts +++ b/x-pack/plugins/threat_intelligence/public/modules/indicators/hooks/use_indicators_filters_context.ts @@ -6,7 +6,10 @@ */ import { useContext } from 'react'; -import { IndicatorsFiltersContext, IndicatorsFiltersContextValue } from '../context'; +import { + IndicatorsFiltersContext, + IndicatorsFiltersContextValue, +} from '../containers/indicators_filters/context'; /** * Hook to retrieve {@link IndicatorsFiltersContext} (contains FilterManager) diff --git a/x-pack/plugins/threat_intelligence/public/modules/indicators/indicators_page.test.tsx b/x-pack/plugins/threat_intelligence/public/modules/indicators/indicators_page.test.tsx index 11bdb8fc8e6ed..7740345f468d4 100644 --- a/x-pack/plugins/threat_intelligence/public/modules/indicators/indicators_page.test.tsx +++ b/x-pack/plugins/threat_intelligence/public/modules/indicators/indicators_page.test.tsx @@ -27,7 +27,7 @@ describe('', () => { useAggregatedIndicators as jest.MockedFunction ).mockReturnValue({ dateRange: { min: moment(), max: moment() }, - indicators: [], + series: [], selectedField: '', onFieldChange: () => {}, }); diff --git a/x-pack/plugins/threat_intelligence/public/modules/indicators/indicators_page.tsx b/x-pack/plugins/threat_intelligence/public/modules/indicators/indicators_page.tsx index f51e062e1c3cb..fff2caad5715f 100644 --- a/x-pack/plugins/threat_intelligence/public/modules/indicators/indicators_page.tsx +++ b/x-pack/plugins/threat_intelligence/public/modules/indicators/indicators_page.tsx @@ -7,7 +7,6 @@ import React, { FC, VFC } from 'react'; import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; -import { IndicatorsFilters } from './containers/indicators_filters/indicators_filters'; import { IndicatorsBarChartWrapper } from './components/indicators_barchart_wrapper/indicators_barchart_wrapper'; import { IndicatorsTable } from './components/indicators_table/indicators_table'; import { useIndicators } from './hooks/use_indicators'; @@ -19,14 +18,18 @@ import { useSourcererDataView } from './hooks/use_sourcerer_data_view'; import { FieldTypesProvider } from '../../containers/field_types_provider'; import { InspectorProvider } from '../../containers/inspector'; import { useColumnSettings } from './components/indicators_table/hooks/use_column_settings'; +import { useAggregatedIndicators } from './hooks/use_aggregated_indicators'; +import { IndicatorsFilters } from './containers/indicators_filters'; const queryClient = new QueryClient(); const IndicatorsPageProviders: FC = ({ children }) => ( - - {children} - + + + {children} + + ); @@ -46,43 +49,68 @@ const IndicatorsPageContent: VFC = () => { savedQuery, } = useFilters(); - const { handleRefresh, ...indicators } = useIndicators({ + const { + handleRefresh, + indicatorCount, + indicators, + isLoading, + onChangeItemsPerPage, + onChangePage, + pagination, + } = useIndicators({ filters, filterQuery, timeRange, sorting: columnSettings.sorting.columns, }); + const { dateRange, series, selectedField, onFieldChange } = useAggregatedIndicators({ + timeRange, + filters, + filterQuery, + }); + return ( - - - + + + + + - - - - - + + ); }; diff --git a/x-pack/plugins/threat_intelligence/public/modules/query_bar/components/filter_in/filter_in.stories.tsx b/x-pack/plugins/threat_intelligence/public/modules/query_bar/components/filter_in/filter_in.stories.tsx index 1e6c7d0c2614e..08297774e51f6 100644 --- a/x-pack/plugins/threat_intelligence/public/modules/query_bar/components/filter_in/filter_in.stories.tsx +++ b/x-pack/plugins/threat_intelligence/public/modules/query_bar/components/filter_in/filter_in.stories.tsx @@ -9,7 +9,7 @@ import React from 'react'; import { Story } from '@storybook/react'; import { mockIndicatorsFiltersContext } from '../../../../common/mocks/mock_indicators_filters_context'; import { generateMockIndicator, Indicator } from '../../../../../common/types/indicator'; -import { IndicatorsFiltersContext } from '../../../indicators/context'; +import { IndicatorsFiltersContext } from '../../../indicators/containers/indicators_filters/context'; import { FilterIn } from '.'; export default { diff --git a/x-pack/plugins/threat_intelligence/public/modules/query_bar/components/filter_out/filter_out.stories.tsx b/x-pack/plugins/threat_intelligence/public/modules/query_bar/components/filter_out/filter_out.stories.tsx index a2f0061d36a94..cf625c23754a3 100644 --- a/x-pack/plugins/threat_intelligence/public/modules/query_bar/components/filter_out/filter_out.stories.tsx +++ b/x-pack/plugins/threat_intelligence/public/modules/query_bar/components/filter_out/filter_out.stories.tsx @@ -9,7 +9,7 @@ import React from 'react'; import { Story } from '@storybook/react'; import { mockIndicatorsFiltersContext } from '../../../../common/mocks/mock_indicators_filters_context'; import { generateMockIndicator, Indicator } from '../../../../../common/types/indicator'; -import { IndicatorsFiltersContext } from '../../../indicators/context'; +import { IndicatorsFiltersContext } from '../../../indicators/containers/indicators_filters/context'; import { FilterOut } from '.'; export default { diff --git a/x-pack/plugins/threat_intelligence/public/modules/query_bar/hooks/use_filters/use_filters.test.tsx b/x-pack/plugins/threat_intelligence/public/modules/query_bar/hooks/use_filters/use_filters.test.tsx index b9c16240df4b0..4d34c9ee6ff0f 100644 --- a/x-pack/plugins/threat_intelligence/public/modules/query_bar/hooks/use_filters/use_filters.test.tsx +++ b/x-pack/plugins/threat_intelligence/public/modules/query_bar/hooks/use_filters/use_filters.test.tsx @@ -9,28 +9,37 @@ import { mockUseKibanaForFilters } from '../../../../common/mocks/mock_use_kiban import { renderHook, act, RenderHookResult, Renderer } from '@testing-library/react-hooks'; import { useFilters, UseFiltersValue } from './use_filters'; -import { useHistory, useLocation } from 'react-router-dom'; +import { useLocation, useHistory } from 'react-router-dom'; import { Filter } from '@kbn/es-query'; import { TestProvidersComponent } from '../../../../common/mocks/test_providers'; +import React, { FC } from 'react'; +import { IndicatorsFilters } from '../../../indicators/containers/indicators_filters'; jest.mock('react-router-dom', () => ({ - useLocation: jest.fn().mockReturnValue({ - search: '', - }), + MemoryRouter: ({ children }: any) => <>{children}, + useLocation: jest.fn().mockReturnValue({ pathname: '', search: '' }), useHistory: jest.fn().mockReturnValue({ replace: jest.fn() }), })); +const FiltersWrapper: FC = ({ children }) => ( + + {children}{' '} + +); + +const renderUseFilters = () => renderHook(() => useFilters(), { wrapper: FiltersWrapper }); + describe('useFilters()', () => { let hookResult: RenderHookResult<{}, UseFiltersValue, Renderer>; let mockRef: ReturnType; + afterAll(() => jest.unmock('react-router-dom')); + describe('when mounted', () => { beforeEach(async () => { mockRef = mockUseKibanaForFilters(); - hookResult = renderHook(() => useFilters(), { - wrapper: TestProvidersComponent, - }); + hookResult = renderUseFilters(); }); it('should have valid initial filterQuery value', () => { @@ -44,9 +53,7 @@ describe('useFilters()', () => { '?indicators=(filterQuery:(language:kuery,query:%27threat.indicator.type%20:%20"file"%20%27),filters:!(),timeRange:(from:now/d,to:now/d))', }); - hookResult = renderHook(() => useFilters(), { - wrapper: TestProvidersComponent, - }); + hookResult = renderUseFilters(); expect(hookResult.result.current.filterQuery).toMatchObject({ language: 'kuery', @@ -61,9 +68,7 @@ describe('useFilters()', () => { beforeEach(async () => { mockRef = mockUseKibanaForFilters(); - hookResult = renderHook(() => useFilters(), { - wrapper: TestProvidersComponent, - }); + hookResult = renderUseFilters(); (useHistory as jest.Mock).mockReturnValue({ replace: historyReplace }); diff --git a/x-pack/plugins/threat_intelligence/public/modules/query_bar/hooks/use_filters/use_filters.ts b/x-pack/plugins/threat_intelligence/public/modules/query_bar/hooks/use_filters/use_filters.ts index 73ce49691d5a6..c50a10c17b709 100644 --- a/x-pack/plugins/threat_intelligence/public/modules/query_bar/hooks/use_filters/use_filters.ts +++ b/x-pack/plugins/threat_intelligence/public/modules/query_bar/hooks/use_filters/use_filters.ts @@ -5,110 +5,24 @@ * 2.0. */ -import { Filter, Query, TimeRange } from '@kbn/es-query'; -import { useCallback, useEffect, useState } from 'react'; -import { useHistory, useLocation } from 'react-router-dom'; -import deepEqual from 'fast-deep-equal'; -import type { FilterManager, SavedQuery } from '@kbn/data-plugin/public'; -import { useKibana } from '../../../../hooks/use_kibana'; +import { useContext } from 'react'; import { - DEFAULT_QUERY, - DEFAULT_TIME_RANGE, - encodeState, - FILTERS_QUERYSTRING_NAMESPACE, - stateFromQueryParams, -} from './utils'; + IndicatorsFiltersContext, + IndicatorsFiltersContextValue, +} from '../../../indicators/containers/indicators_filters'; -export interface UseFiltersValue { - timeRange?: TimeRange; - filters: Filter[]; - filterQuery: Query; - handleSavedQuery: (savedQuery: SavedQuery | undefined) => void; - handleSubmitTimeRange: (timeRange?: TimeRange) => void; - handleSubmitQuery: (filterQuery: Query) => void; - filterManager: FilterManager; - savedQuery?: SavedQuery; -} +export type UseFiltersValue = IndicatorsFiltersContextValue; /** * Custom react hook housing logic for KQL bar * @returns Filters and TimeRange for use with KQL bar */ -export const useFilters = (): UseFiltersValue => { - const { pathname: browserPathName, search } = useLocation(); - const history = useHistory(); - const [savedQuery, setSavedQuery] = useState(undefined); +export const useFilters = () => { + const contextValue = useContext(IndicatorsFiltersContext); - const { - services: { - data: { - query: { filterManager }, - }, - }, - } = useKibana(); + if (!contextValue) { + throw new Error('Filters can only be used inside IndicatorFiltersContext'); + } - // Filters are picked using the UI widgets - const [filters, setFilters] = useState([]); - - // Time range is self explanatory - const [timeRange, setTimeRange] = useState(DEFAULT_TIME_RANGE); - - // filterQuery is raw kql query that user can type in to filter results - const [filterQuery, setFilterQuery] = useState(DEFAULT_QUERY); - - // Serialize filters into query string - useEffect(() => { - const filterStateAsString = encodeState({ filters, filterQuery, timeRange }); - if (!deepEqual(filterManager.getFilters(), filters)) { - filterManager.setFilters(filters); - } - - history.replace({ - pathname: browserPathName, - search: `${FILTERS_QUERYSTRING_NAMESPACE}=${filterStateAsString}`, - }); - }, [browserPathName, filterManager, filterQuery, filters, history, timeRange]); - - // Sync filterManager to local state (after they are changed from the ui) - useEffect(() => { - const subscription = filterManager.getUpdates$().subscribe(() => { - setFilters(filterManager.getFilters()); - }); - - return () => subscription.unsubscribe(); - }, [filterManager]); - - // Update local state with filter values from the url (on initial mount) - useEffect(() => { - const { - filters: filtersFromQuery, - timeRange: timeRangeFromQuery, - filterQuery: filterQueryFromQuery, - } = stateFromQueryParams(search); - - setTimeRange(timeRangeFromQuery); - setFilterQuery(filterQueryFromQuery); - setFilters(filtersFromQuery); - - // We only want to have it done on initial render with initial 'search' value; - // that is why 'search' is ommited from the deps array - - // eslint-disable-next-line react-hooks/exhaustive-deps - }, [filterManager]); - - const onSavedQuery = useCallback( - (newSavedQuery: SavedQuery | undefined) => setSavedQuery(newSavedQuery), - [] - ); - - return { - timeRange, - filters, - filterQuery, - handleSavedQuery: onSavedQuery, - handleSubmitTimeRange: setTimeRange, - handleSubmitQuery: setFilterQuery, - filterManager, - savedQuery, - }; + return contextValue; }; From 45e80b2a477f99c63dc3245efa471bd81c12268a Mon Sep 17 00:00:00 2001 From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> Date: Wed, 28 Sep 2022 22:44:53 -0600 Subject: [PATCH 74/95] [api-docs] Daily api_docs build (#142178) --- api_docs/actions.mdx | 2 +- api_docs/advanced_settings.mdx | 2 +- api_docs/aiops.mdx | 2 +- api_docs/alerting.devdocs.json | 139 +- api_docs/alerting.mdx | 4 +- api_docs/apm.devdocs.json | 24 +- api_docs/apm.mdx | 2 +- api_docs/banners.mdx | 2 +- api_docs/bfetch.devdocs.json | 32 +- api_docs/bfetch.mdx | 2 +- api_docs/canvas.mdx | 2 +- api_docs/cases.mdx | 2 +- api_docs/charts.mdx | 2 +- api_docs/cloud.mdx | 2 +- api_docs/cloud_experiments.mdx | 2 +- api_docs/cloud_security_posture.mdx | 2 +- api_docs/console.mdx | 2 +- api_docs/controls.mdx | 2 +- api_docs/core.devdocs.json | 253 +- api_docs/core.mdx | 4 +- api_docs/custom_integrations.devdocs.json | 23 +- api_docs/custom_integrations.mdx | 4 +- api_docs/dashboard.devdocs.json | 3835 ++++++----------- api_docs/dashboard.mdx | 10 +- api_docs/dashboard_enhanced.mdx | 2 +- api_docs/data.mdx | 2 +- api_docs/data_query.devdocs.json | 8 - api_docs/data_query.mdx | 2 +- api_docs/data_search.devdocs.json | 12 +- api_docs/data_search.mdx | 2 +- api_docs/data_view_editor.mdx | 2 +- api_docs/data_view_field_editor.mdx | 2 +- api_docs/data_view_management.mdx | 2 +- api_docs/data_views.mdx | 2 +- api_docs/data_visualizer.mdx | 2 +- api_docs/deprecations_by_api.mdx | 14 +- api_docs/deprecations_by_plugin.mdx | 14 +- api_docs/deprecations_by_team.mdx | 7 +- api_docs/dev_tools.mdx | 2 +- api_docs/discover.devdocs.json | 4 +- api_docs/discover.mdx | 2 +- api_docs/discover_enhanced.mdx | 2 +- api_docs/embeddable.mdx | 2 +- api_docs/embeddable_enhanced.mdx | 2 +- api_docs/encrypted_saved_objects.mdx | 2 +- api_docs/enterprise_search.mdx | 2 +- api_docs/es_ui_shared.mdx | 2 +- api_docs/event_annotation.mdx | 2 +- api_docs/event_log.devdocs.json | 6 +- api_docs/event_log.mdx | 2 +- api_docs/expression_error.mdx | 2 +- api_docs/expression_gauge.mdx | 2 +- api_docs/expression_heatmap.mdx | 2 +- api_docs/expression_image.mdx | 2 +- api_docs/expression_legacy_metric_vis.mdx | 2 +- api_docs/expression_metric.mdx | 2 +- api_docs/expression_metric_vis.mdx | 2 +- api_docs/expression_partition_vis.mdx | 2 +- api_docs/expression_repeat_image.mdx | 2 +- api_docs/expression_reveal_image.mdx | 2 +- api_docs/expression_shape.mdx | 2 +- api_docs/expression_tagcloud.mdx | 2 +- api_docs/expression_x_y.mdx | 2 +- api_docs/expressions.devdocs.json | 8 +- api_docs/expressions.mdx | 2 +- api_docs/features.mdx | 2 +- api_docs/field_formats.mdx | 2 +- api_docs/file_upload.mdx | 2 +- api_docs/files.mdx | 2 +- api_docs/fleet.devdocs.json | 66 +- api_docs/fleet.mdx | 2 +- api_docs/global_search.mdx | 2 +- api_docs/guided_onboarding.mdx | 2 +- api_docs/home.mdx | 2 +- api_docs/index_lifecycle_management.mdx | 2 +- api_docs/index_management.mdx | 2 +- api_docs/infra.mdx | 2 +- api_docs/inspector.mdx | 2 +- api_docs/interactive_setup.mdx | 2 +- api_docs/kbn_ace.mdx | 2 +- api_docs/kbn_aiops_components.mdx | 2 +- api_docs/kbn_aiops_utils.mdx | 2 +- api_docs/kbn_alerts.mdx | 2 +- api_docs/kbn_analytics.mdx | 2 +- api_docs/kbn_analytics_client.mdx | 2 +- ..._analytics_shippers_elastic_v3_browser.mdx | 2 +- ...n_analytics_shippers_elastic_v3_common.mdx | 2 +- ...n_analytics_shippers_elastic_v3_server.mdx | 2 +- api_docs/kbn_analytics_shippers_fullstory.mdx | 2 +- api_docs/kbn_apm_config_loader.mdx | 2 +- api_docs/kbn_apm_synthtrace.mdx | 2 +- api_docs/kbn_apm_utils.mdx | 2 +- api_docs/kbn_axe_config.mdx | 2 +- api_docs/kbn_chart_icons.mdx | 2 +- api_docs/kbn_ci_stats_core.mdx | 2 +- api_docs/kbn_ci_stats_performance_metrics.mdx | 2 +- api_docs/kbn_ci_stats_reporter.devdocs.json | 6 +- api_docs/kbn_ci_stats_reporter.mdx | 2 +- api_docs/kbn_cli_dev_mode.mdx | 2 +- api_docs/kbn_coloring.mdx | 2 +- api_docs/kbn_config.mdx | 2 +- api_docs/kbn_config_mocks.mdx | 2 +- api_docs/kbn_config_schema.mdx | 2 +- .../kbn_content_management_table_list.mdx | 2 +- api_docs/kbn_core_analytics_browser.mdx | 2 +- .../kbn_core_analytics_browser_internal.mdx | 2 +- api_docs/kbn_core_analytics_browser_mocks.mdx | 2 +- api_docs/kbn_core_analytics_server.mdx | 2 +- .../kbn_core_analytics_server_internal.mdx | 2 +- api_docs/kbn_core_analytics_server_mocks.mdx | 2 +- api_docs/kbn_core_application_browser.mdx | 2 +- .../kbn_core_application_browser_internal.mdx | 2 +- .../kbn_core_application_browser_mocks.mdx | 2 +- api_docs/kbn_core_application_common.mdx | 2 +- api_docs/kbn_core_apps_browser_internal.mdx | 2 +- api_docs/kbn_core_apps_browser_mocks.mdx | 2 +- api_docs/kbn_core_base_browser_mocks.mdx | 2 +- api_docs/kbn_core_base_common.mdx | 2 +- api_docs/kbn_core_base_server_internal.mdx | 2 +- api_docs/kbn_core_base_server_mocks.mdx | 2 +- .../kbn_core_capabilities_browser_mocks.mdx | 2 +- api_docs/kbn_core_capabilities_common.mdx | 2 +- api_docs/kbn_core_capabilities_server.mdx | 2 +- .../kbn_core_capabilities_server_mocks.mdx | 2 +- api_docs/kbn_core_chrome_browser.mdx | 2 +- api_docs/kbn_core_chrome_browser_mocks.mdx | 2 +- api_docs/kbn_core_config_server_internal.mdx | 2 +- api_docs/kbn_core_deprecations_browser.mdx | 2 +- ...kbn_core_deprecations_browser_internal.mdx | 2 +- .../kbn_core_deprecations_browser_mocks.mdx | 2 +- api_docs/kbn_core_deprecations_common.mdx | 2 +- api_docs/kbn_core_deprecations_server.mdx | 2 +- .../kbn_core_deprecations_server_internal.mdx | 2 +- .../kbn_core_deprecations_server_mocks.mdx | 2 +- api_docs/kbn_core_doc_links_browser.mdx | 2 +- api_docs/kbn_core_doc_links_browser_mocks.mdx | 2 +- api_docs/kbn_core_doc_links_server.mdx | 2 +- api_docs/kbn_core_doc_links_server_mocks.mdx | 2 +- ...e_elasticsearch_client_server_internal.mdx | 2 +- ...core_elasticsearch_client_server_mocks.mdx | 2 +- api_docs/kbn_core_elasticsearch_server.mdx | 2 +- ...kbn_core_elasticsearch_server_internal.mdx | 2 +- .../kbn_core_elasticsearch_server_mocks.mdx | 2 +- .../kbn_core_environment_server_internal.mdx | 2 +- .../kbn_core_environment_server_mocks.mdx | 2 +- .../kbn_core_execution_context_browser.mdx | 2 +- ...ore_execution_context_browser_internal.mdx | 2 +- ...n_core_execution_context_browser_mocks.mdx | 2 +- .../kbn_core_execution_context_common.mdx | 2 +- .../kbn_core_execution_context_server.mdx | 2 +- ...core_execution_context_server_internal.mdx | 2 +- ...bn_core_execution_context_server_mocks.mdx | 2 +- api_docs/kbn_core_fatal_errors_browser.mdx | 2 +- .../kbn_core_fatal_errors_browser_mocks.mdx | 2 +- api_docs/kbn_core_http_browser.mdx | 2 +- api_docs/kbn_core_http_browser_internal.mdx | 2 +- api_docs/kbn_core_http_browser_mocks.mdx | 2 +- api_docs/kbn_core_http_common.mdx | 2 +- .../kbn_core_http_context_server_mocks.mdx | 2 +- ...equest_handler_context_server.devdocs.json | 283 ++ ...re_http_request_handler_context_server.mdx | 33 + .../kbn_core_http_router_server_internal.mdx | 2 +- .../kbn_core_http_router_server_mocks.mdx | 2 +- api_docs/kbn_core_http_server.mdx | 2 +- api_docs/kbn_core_http_server_internal.mdx | 2 +- api_docs/kbn_core_http_server_mocks.mdx | 2 +- api_docs/kbn_core_i18n_browser.mdx | 2 +- api_docs/kbn_core_i18n_browser_mocks.mdx | 2 +- api_docs/kbn_core_i18n_server.mdx | 2 +- api_docs/kbn_core_i18n_server_internal.mdx | 2 +- api_docs/kbn_core_i18n_server_mocks.mdx | 2 +- .../kbn_core_injected_metadata_browser.mdx | 2 +- ...n_core_injected_metadata_browser_mocks.mdx | 2 +- ...kbn_core_integrations_browser_internal.mdx | 2 +- .../kbn_core_integrations_browser_mocks.mdx | 2 +- api_docs/kbn_core_lifecycle_browser.mdx | 2 +- api_docs/kbn_core_lifecycle_browser_mocks.mdx | 2 +- api_docs/kbn_core_logging_server.mdx | 2 +- api_docs/kbn_core_logging_server_internal.mdx | 2 +- api_docs/kbn_core_logging_server_mocks.mdx | 2 +- ...ore_metrics_collectors_server_internal.mdx | 2 +- ...n_core_metrics_collectors_server_mocks.mdx | 2 +- api_docs/kbn_core_metrics_server.mdx | 2 +- api_docs/kbn_core_metrics_server_internal.mdx | 2 +- api_docs/kbn_core_metrics_server_mocks.mdx | 2 +- api_docs/kbn_core_mount_utils_browser.mdx | 2 +- api_docs/kbn_core_node_server.mdx | 2 +- api_docs/kbn_core_node_server_internal.mdx | 2 +- api_docs/kbn_core_node_server_mocks.mdx | 2 +- api_docs/kbn_core_notifications_browser.mdx | 2 +- ...bn_core_notifications_browser_internal.mdx | 2 +- .../kbn_core_notifications_browser_mocks.mdx | 2 +- api_docs/kbn_core_overlays_browser.mdx | 2 +- .../kbn_core_overlays_browser_internal.mdx | 2 +- api_docs/kbn_core_overlays_browser_mocks.mdx | 2 +- api_docs/kbn_core_plugins_browser.mdx | 2 +- api_docs/kbn_core_plugins_browser_mocks.mdx | 2 +- api_docs/kbn_core_preboot_server.mdx | 2 +- api_docs/kbn_core_preboot_server_mocks.mdx | 2 +- api_docs/kbn_core_rendering_browser_mocks.mdx | 2 +- ...ore_saved_objects_api_browser.devdocs.json | 6 +- .../kbn_core_saved_objects_api_browser.mdx | 2 +- ...core_saved_objects_api_server.devdocs.json | 6 +- .../kbn_core_saved_objects_api_server.mdx | 2 +- ...core_saved_objects_api_server_internal.mdx | 2 +- ...bn_core_saved_objects_api_server_mocks.mdx | 2 +- ...ore_saved_objects_base_server_internal.mdx | 2 +- ...n_core_saved_objects_base_server_mocks.mdx | 2 +- api_docs/kbn_core_saved_objects_browser.mdx | 2 +- ...bn_core_saved_objects_browser_internal.mdx | 2 +- .../kbn_core_saved_objects_browser_mocks.mdx | 2 +- api_docs/kbn_core_saved_objects_common.mdx | 2 +- ..._objects_import_export_server_internal.mdx | 2 +- ...ved_objects_import_export_server_mocks.mdx | 2 +- ...aved_objects_migration_server_internal.mdx | 2 +- ...e_saved_objects_migration_server_mocks.mdx | 2 +- api_docs/kbn_core_saved_objects_server.mdx | 2 +- ...kbn_core_saved_objects_server_internal.mdx | 2 +- .../kbn_core_saved_objects_server_mocks.mdx | 2 +- .../kbn_core_saved_objects_utils_server.mdx | 2 +- api_docs/kbn_core_status_common.mdx | 2 +- api_docs/kbn_core_status_common_internal.mdx | 2 +- api_docs/kbn_core_status_server.mdx | 2 +- api_docs/kbn_core_status_server_internal.mdx | 2 +- api_docs/kbn_core_status_server_mocks.mdx | 2 +- ...core_test_helpers_deprecations_getters.mdx | 2 +- ...n_core_test_helpers_http_setup_browser.mdx | 2 +- api_docs/kbn_core_theme_browser.mdx | 2 +- api_docs/kbn_core_theme_browser_internal.mdx | 2 +- api_docs/kbn_core_theme_browser_mocks.mdx | 2 +- api_docs/kbn_core_ui_settings_browser.mdx | 2 +- .../kbn_core_ui_settings_browser_internal.mdx | 2 +- .../kbn_core_ui_settings_browser_mocks.mdx | 2 +- api_docs/kbn_core_ui_settings_common.mdx | 2 +- api_docs/kbn_core_ui_settings_server.mdx | 2 +- .../kbn_core_ui_settings_server_internal.mdx | 2 +- .../kbn_core_ui_settings_server_mocks.mdx | 2 +- api_docs/kbn_core_usage_data_server.mdx | 2 +- .../kbn_core_usage_data_server_internal.mdx | 2 +- api_docs/kbn_core_usage_data_server_mocks.mdx | 2 +- api_docs/kbn_crypto.mdx | 2 +- api_docs/kbn_crypto_browser.mdx | 2 +- api_docs/kbn_datemath.mdx | 2 +- api_docs/kbn_dev_cli_errors.mdx | 2 +- api_docs/kbn_dev_cli_runner.mdx | 2 +- api_docs/kbn_dev_proc_runner.mdx | 2 +- api_docs/kbn_dev_utils.mdx | 2 +- api_docs/kbn_doc_links.mdx | 2 +- api_docs/kbn_docs_utils.mdx | 2 +- api_docs/kbn_ebt_tools.mdx | 2 +- api_docs/kbn_es_archiver.mdx | 2 +- api_docs/kbn_es_errors.mdx | 2 +- api_docs/kbn_es_query.mdx | 2 +- api_docs/kbn_es_types.mdx | 2 +- api_docs/kbn_eslint_plugin_imports.mdx | 2 +- api_docs/kbn_field_types.mdx | 2 +- api_docs/kbn_find_used_node_modules.mdx | 2 +- .../kbn_ftr_common_functional_services.mdx | 2 +- api_docs/kbn_generate.mdx | 2 +- api_docs/kbn_get_repo_files.mdx | 2 +- api_docs/kbn_handlebars.mdx | 2 +- api_docs/kbn_hapi_mocks.mdx | 2 +- api_docs/kbn_home_sample_data_card.mdx | 2 +- api_docs/kbn_home_sample_data_tab.mdx | 2 +- api_docs/kbn_i18n.mdx | 2 +- api_docs/kbn_import_resolver.mdx | 2 +- api_docs/kbn_interpreter.mdx | 2 +- api_docs/kbn_io_ts_utils.mdx | 2 +- api_docs/kbn_jest_serializers.mdx | 2 +- api_docs/kbn_journeys.mdx | 2 +- api_docs/kbn_kibana_manifest_schema.mdx | 2 +- api_docs/kbn_logging.mdx | 2 +- api_docs/kbn_logging_mocks.mdx | 2 +- api_docs/kbn_managed_vscode_config.mdx | 2 +- api_docs/kbn_mapbox_gl.mdx | 2 +- api_docs/kbn_ml_agg_utils.mdx | 2 +- api_docs/kbn_ml_is_populated_object.mdx | 2 +- api_docs/kbn_ml_string_hash.mdx | 2 +- api_docs/kbn_monaco.mdx | 2 +- api_docs/kbn_optimizer.mdx | 2 +- api_docs/kbn_optimizer_webpack_helpers.mdx | 2 +- api_docs/kbn_osquery_io_ts_types.mdx | 2 +- ..._performance_testing_dataset_extractor.mdx | 2 +- api_docs/kbn_plugin_generator.mdx | 2 +- api_docs/kbn_plugin_helpers.mdx | 2 +- api_docs/kbn_react_field.mdx | 2 +- api_docs/kbn_repo_source_classifier.mdx | 2 +- api_docs/kbn_rule_data_utils.devdocs.json | 6 +- api_docs/kbn_rule_data_utils.mdx | 2 +- .../kbn_securitysolution_autocomplete.mdx | 2 +- api_docs/kbn_securitysolution_es_utils.mdx | 2 +- ...ion_exception_list_components.devdocs.json | 1209 ++++++ ...ritysolution_exception_list_components.mdx | 39 + api_docs/kbn_securitysolution_hook_utils.mdx | 2 +- ..._securitysolution_io_ts_alerting_types.mdx | 2 +- .../kbn_securitysolution_io_ts_list_types.mdx | 2 +- api_docs/kbn_securitysolution_io_ts_types.mdx | 2 +- api_docs/kbn_securitysolution_io_ts_utils.mdx | 2 +- api_docs/kbn_securitysolution_list_api.mdx | 2 +- .../kbn_securitysolution_list_constants.mdx | 2 +- api_docs/kbn_securitysolution_list_hooks.mdx | 2 +- api_docs/kbn_securitysolution_list_utils.mdx | 2 +- api_docs/kbn_securitysolution_rules.mdx | 2 +- api_docs/kbn_securitysolution_t_grid.mdx | 2 +- api_docs/kbn_securitysolution_utils.mdx | 2 +- api_docs/kbn_server_http_tools.mdx | 2 +- api_docs/kbn_server_route_repository.mdx | 2 +- api_docs/kbn_shared_svg.mdx | 2 +- ...ared_ux_avatar_user_profile_components.mdx | 2 +- ...hared_ux_button_exit_full_screen_mocks.mdx | 2 +- api_docs/kbn_shared_ux_button_toolbar.mdx | 2 +- api_docs/kbn_shared_ux_card_no_data.mdx | 2 +- api_docs/kbn_shared_ux_card_no_data_mocks.mdx | 2 +- .../kbn_shared_ux_link_redirect_app_mocks.mdx | 2 +- .../kbn_shared_ux_page_analytics_no_data.mdx | 2 +- ...shared_ux_page_analytics_no_data_mocks.mdx | 2 +- .../kbn_shared_ux_page_kibana_no_data.mdx | 2 +- ...bn_shared_ux_page_kibana_no_data_mocks.mdx | 2 +- .../kbn_shared_ux_page_kibana_template.mdx | 2 +- ...n_shared_ux_page_kibana_template_mocks.mdx | 2 +- api_docs/kbn_shared_ux_page_no_data.mdx | 2 +- .../kbn_shared_ux_page_no_data_config.mdx | 2 +- ...bn_shared_ux_page_no_data_config_mocks.mdx | 2 +- api_docs/kbn_shared_ux_page_no_data_mocks.mdx | 2 +- api_docs/kbn_shared_ux_page_solution_nav.mdx | 2 +- .../kbn_shared_ux_prompt_no_data_views.mdx | 2 +- ...n_shared_ux_prompt_no_data_views_mocks.mdx | 2 +- api_docs/kbn_shared_ux_router.mdx | 2 +- api_docs/kbn_shared_ux_router_mocks.mdx | 2 +- api_docs/kbn_shared_ux_storybook_config.mdx | 2 +- api_docs/kbn_shared_ux_storybook_mock.mdx | 2 +- api_docs/kbn_shared_ux_utility.mdx | 2 +- api_docs/kbn_some_dev_log.mdx | 2 +- api_docs/kbn_sort_package_json.mdx | 2 +- api_docs/kbn_std.mdx | 2 +- api_docs/kbn_stdio_dev_helpers.mdx | 2 +- api_docs/kbn_storybook.mdx | 2 +- api_docs/kbn_telemetry_tools.mdx | 2 +- api_docs/kbn_test.mdx | 2 +- api_docs/kbn_test_jest_helpers.mdx | 2 +- api_docs/kbn_test_subj_selector.mdx | 2 +- api_docs/kbn_tooling_log.mdx | 2 +- api_docs/kbn_type_summarizer.mdx | 2 +- api_docs/kbn_type_summarizer_core.mdx | 2 +- api_docs/kbn_typed_react_router_config.mdx | 2 +- api_docs/kbn_ui_theme.mdx | 2 +- api_docs/kbn_user_profile_components.mdx | 2 +- api_docs/kbn_utility_types.mdx | 2 +- api_docs/kbn_utility_types_jest.mdx | 2 +- api_docs/kbn_utils.mdx | 2 +- api_docs/kbn_yarn_lock_validator.mdx | 2 +- api_docs/kibana_overview.mdx | 2 +- api_docs/kibana_react.mdx | 2 +- api_docs/kibana_utils.mdx | 2 +- api_docs/kubernetes_security.mdx | 2 +- api_docs/lens.mdx | 2 +- api_docs/license_api_guard.devdocs.json | 8 +- api_docs/license_api_guard.mdx | 2 +- api_docs/license_management.mdx | 2 +- api_docs/licensing.mdx | 2 +- api_docs/lists.mdx | 2 +- api_docs/management.mdx | 2 +- api_docs/maps.mdx | 2 +- api_docs/maps_ems.mdx | 2 +- api_docs/ml.mdx | 2 +- api_docs/monitoring.mdx | 2 +- api_docs/monitoring_collection.mdx | 2 +- api_docs/navigation.mdx | 2 +- api_docs/newsfeed.mdx | 2 +- api_docs/observability.devdocs.json | 26 +- api_docs/observability.mdx | 2 +- api_docs/osquery.mdx | 2 +- api_docs/plugin_directory.mdx | 20 +- api_docs/presentation_util.mdx | 2 +- api_docs/profiling.mdx | 2 +- api_docs/remote_clusters.mdx | 2 +- api_docs/reporting.mdx | 2 +- api_docs/rollup.mdx | 2 +- api_docs/rule_registry.devdocs.json | 4 +- api_docs/rule_registry.mdx | 2 +- api_docs/runtime_fields.mdx | 2 +- api_docs/saved_objects.devdocs.json | 35 +- api_docs/saved_objects.mdx | 2 +- api_docs/saved_objects_finder.mdx | 2 +- api_docs/saved_objects_management.mdx | 2 +- api_docs/saved_objects_tagging.mdx | 2 +- api_docs/saved_objects_tagging_oss.mdx | 2 +- api_docs/saved_search.devdocs.json | 2 +- api_docs/saved_search.mdx | 2 +- api_docs/screenshot_mode.devdocs.json | 8 +- api_docs/screenshot_mode.mdx | 2 +- api_docs/screenshotting.mdx | 2 +- api_docs/security.mdx | 2 +- api_docs/security_solution.devdocs.json | 8 +- api_docs/security_solution.mdx | 2 +- api_docs/session_view.mdx | 2 +- api_docs/share.mdx | 2 +- api_docs/snapshot_restore.mdx | 2 +- api_docs/spaces.mdx | 2 +- api_docs/stack_alerts.mdx | 2 +- api_docs/stack_connectors.mdx | 2 +- api_docs/task_manager.mdx | 2 +- api_docs/telemetry.mdx | 2 +- api_docs/telemetry_collection_manager.mdx | 2 +- api_docs/telemetry_collection_xpack.mdx | 2 +- api_docs/telemetry_management_section.mdx | 2 +- api_docs/threat_intelligence.mdx | 2 +- api_docs/timelines.devdocs.json | 4 +- api_docs/timelines.mdx | 2 +- api_docs/transform.mdx | 2 +- api_docs/triggers_actions_ui.devdocs.json | 16 +- api_docs/triggers_actions_ui.mdx | 4 +- api_docs/ui_actions.mdx | 2 +- api_docs/ui_actions_enhanced.mdx | 2 +- api_docs/unified_field_list.mdx | 2 +- api_docs/unified_search.mdx | 2 +- api_docs/unified_search_autocomplete.mdx | 2 +- api_docs/url_forwarding.mdx | 2 +- api_docs/usage_collection.mdx | 2 +- api_docs/ux.mdx | 2 +- api_docs/vis_default_editor.mdx | 2 +- api_docs/vis_type_gauge.mdx | 2 +- api_docs/vis_type_heatmap.mdx | 2 +- api_docs/vis_type_pie.mdx | 2 +- api_docs/vis_type_table.mdx | 2 +- api_docs/vis_type_timelion.mdx | 2 +- api_docs/vis_type_timeseries.mdx | 2 +- api_docs/vis_type_vega.mdx | 2 +- api_docs/vis_type_vislib.mdx | 2 +- api_docs/vis_type_xy.mdx | 2 +- api_docs/visualizations.devdocs.json | 207 +- api_docs/visualizations.mdx | 4 +- 432 files changed, 3973 insertions(+), 3212 deletions(-) create mode 100644 api_docs/kbn_core_http_request_handler_context_server.devdocs.json create mode 100644 api_docs/kbn_core_http_request_handler_context_server.mdx create mode 100644 api_docs/kbn_securitysolution_exception_list_components.devdocs.json create mode 100644 api_docs/kbn_securitysolution_exception_list_components.mdx diff --git a/api_docs/actions.mdx b/api_docs/actions.mdx index 4d0790ec95184..929e069b2bf52 100644 --- a/api_docs/actions.mdx +++ b/api_docs/actions.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/actions title: "actions" image: https://source.unsplash.com/400x175/?github description: API docs for the actions plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions'] --- import actionsObj from './actions.devdocs.json'; diff --git a/api_docs/advanced_settings.mdx b/api_docs/advanced_settings.mdx index 88e4157414a7f..43856104f3281 100644 --- a/api_docs/advanced_settings.mdx +++ b/api_docs/advanced_settings.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/advancedSettings title: "advancedSettings" image: https://source.unsplash.com/400x175/?github description: API docs for the advancedSettings plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings'] --- import advancedSettingsObj from './advanced_settings.devdocs.json'; diff --git a/api_docs/aiops.mdx b/api_docs/aiops.mdx index c3bd7eb349a07..7694fbde6190c 100644 --- a/api_docs/aiops.mdx +++ b/api_docs/aiops.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiops title: "aiops" image: https://source.unsplash.com/400x175/?github description: API docs for the aiops plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiops'] --- import aiopsObj from './aiops.devdocs.json'; diff --git a/api_docs/alerting.devdocs.json b/api_docs/alerting.devdocs.json index a19bdb320740d..9971fcee0a58a 100644 --- a/api_docs/alerting.devdocs.json +++ b/api_docs/alerting.devdocs.json @@ -2666,8 +2666,6 @@ "Alert", "; scheduleActions: (actionGroup: ActionGroupIds, context?: Context) => ", "Alert", - "; scheduleActionsWithSubGroup: (actionGroup: ActionGroupIds, subgroup: string, context?: Context) => ", - "Alert", "; setContext: (context: Context) => ", "Alert", "; getContext: () => Context; hasContext: () => boolean; }" @@ -2832,7 +2830,11 @@ "section": "def-common.IExecutionErrorsResult", "text": "IExecutionErrorsResult" }, - ">; bulkEdit: ; getGlobalExecutionKpiWithAuth: ({ dateStart, dateEnd, filter, }: ", + "GetGlobalExecutionKPIParams", + ") => Promise<{ success: number; unknown: number; failure: number; activeAlerts: number; newAlerts: number; recoveredAlerts: number; erroredActions: number; triggeredActions: number; }>; getRuleExecutionKPI: ({ id, dateStart, dateEnd, filter }: ", + "GetRuleExecutionKPIParams", + ") => Promise<{ success: number; unknown: number; failure: number; activeAlerts: number; newAlerts: number; recoveredAlerts: number; erroredActions: number; triggeredActions: number; }>; bulkEdit: ; }; observability: { setup: { getScopedAnnotationsClient: (requestContext: ", - { - "pluginId": "core", - "scope": "server", - "docId": "kibCorePluginApi", - "section": "def-server.RequestHandlerContext", - "text": "RequestHandlerContext" - }, + "RequestHandlerContext", " & { licensing: Promise<", { "pluginId": "licensing", @@ -5696,13 +5684,7 @@ "label": "context", "description": [], "signature": [ - { - "pluginId": "core", - "scope": "server", - "docId": "kibCorePluginApi", - "section": "def-server.RequestHandlerContext", - "text": "RequestHandlerContext" - }, + "RequestHandlerContext", " & { licensing: Promise<", { "pluginId": "licensing", diff --git a/api_docs/apm.mdx b/api_docs/apm.mdx index d9218c6f9c48f..934ffbbd33801 100644 --- a/api_docs/apm.mdx +++ b/api_docs/apm.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/apm title: "apm" image: https://source.unsplash.com/400x175/?github description: API docs for the apm plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'apm'] --- import apmObj from './apm.devdocs.json'; diff --git a/api_docs/banners.mdx b/api_docs/banners.mdx index b574eadcc22f7..12a25911e2da1 100644 --- a/api_docs/banners.mdx +++ b/api_docs/banners.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/banners title: "banners" image: https://source.unsplash.com/400x175/?github description: API docs for the banners plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'banners'] --- import bannersObj from './banners.devdocs.json'; diff --git a/api_docs/bfetch.devdocs.json b/api_docs/bfetch.devdocs.json index 74f1cf1aee455..f060159bc0f3a 100644 --- a/api_docs/bfetch.devdocs.json +++ b/api_docs/bfetch.devdocs.json @@ -357,13 +357,7 @@ "(path: string, params: (request: ", "KibanaRequest", ", context: ", - { - "pluginId": "core", - "scope": "server", - "docId": "kibCorePluginApi", - "section": "def-server.RequestHandlerContext", - "text": "RequestHandlerContext" - }, + "RequestHandlerContext", ") => ", { "pluginId": "bfetch", @@ -375,13 +369,7 @@ ", method?: \"GET\" | \"POST\" | \"PUT\" | \"DELETE\" | undefined, pluginRouter?: ", "IRouter", "<", - { - "pluginId": "core", - "scope": "server", - "docId": "kibCorePluginApi", - "section": "def-server.RequestHandlerContext", - "text": "RequestHandlerContext" - }, + "RequestHandlerContext", "> | undefined) => void" ], "path": "src/plugins/bfetch/server/plugin.ts", @@ -414,13 +402,7 @@ "(request: ", "KibanaRequest", ", context: ", - { - "pluginId": "core", - "scope": "server", - "docId": "kibCorePluginApi", - "section": "def-server.RequestHandlerContext", - "text": "RequestHandlerContext" - }, + "RequestHandlerContext", ") => ", { "pluginId": "bfetch", @@ -461,13 +443,7 @@ "signature": [ "IRouter", "<", - { - "pluginId": "core", - "scope": "server", - "docId": "kibCorePluginApi", - "section": "def-server.RequestHandlerContext", - "text": "RequestHandlerContext" - }, + "RequestHandlerContext", "> | undefined" ], "path": "src/plugins/bfetch/server/plugin.ts", diff --git a/api_docs/bfetch.mdx b/api_docs/bfetch.mdx index e8fa3ead871d7..c4055d6564051 100644 --- a/api_docs/bfetch.mdx +++ b/api_docs/bfetch.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/bfetch title: "bfetch" image: https://source.unsplash.com/400x175/?github description: API docs for the bfetch plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'bfetch'] --- import bfetchObj from './bfetch.devdocs.json'; diff --git a/api_docs/canvas.mdx b/api_docs/canvas.mdx index 9c484f7dfc615..4ef1b1b03a0ec 100644 --- a/api_docs/canvas.mdx +++ b/api_docs/canvas.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/canvas title: "canvas" image: https://source.unsplash.com/400x175/?github description: API docs for the canvas plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'canvas'] --- import canvasObj from './canvas.devdocs.json'; diff --git a/api_docs/cases.mdx b/api_docs/cases.mdx index 2ec486a4957e7..6df29978541a0 100644 --- a/api_docs/cases.mdx +++ b/api_docs/cases.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cases title: "cases" image: https://source.unsplash.com/400x175/?github description: API docs for the cases plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cases'] --- import casesObj from './cases.devdocs.json'; diff --git a/api_docs/charts.mdx b/api_docs/charts.mdx index b204ddb7b0ee0..718e93231dffe 100644 --- a/api_docs/charts.mdx +++ b/api_docs/charts.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/charts title: "charts" image: https://source.unsplash.com/400x175/?github description: API docs for the charts plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'charts'] --- import chartsObj from './charts.devdocs.json'; diff --git a/api_docs/cloud.mdx b/api_docs/cloud.mdx index fdf2f80ec284b..74692e016ccf0 100644 --- a/api_docs/cloud.mdx +++ b/api_docs/cloud.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloud title: "cloud" image: https://source.unsplash.com/400x175/?github description: API docs for the cloud plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloud'] --- import cloudObj from './cloud.devdocs.json'; diff --git a/api_docs/cloud_experiments.mdx b/api_docs/cloud_experiments.mdx index 33e6421081033..9b5efb2aa51f4 100644 --- a/api_docs/cloud_experiments.mdx +++ b/api_docs/cloud_experiments.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloudExperiments title: "cloudExperiments" image: https://source.unsplash.com/400x175/?github description: API docs for the cloudExperiments plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloudExperiments'] --- import cloudExperimentsObj from './cloud_experiments.devdocs.json'; diff --git a/api_docs/cloud_security_posture.mdx b/api_docs/cloud_security_posture.mdx index 8cdffb406e1d3..1ccfb42f61d02 100644 --- a/api_docs/cloud_security_posture.mdx +++ b/api_docs/cloud_security_posture.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloudSecurityPosture title: "cloudSecurityPosture" image: https://source.unsplash.com/400x175/?github description: API docs for the cloudSecurityPosture plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloudSecurityPosture'] --- import cloudSecurityPostureObj from './cloud_security_posture.devdocs.json'; diff --git a/api_docs/console.mdx b/api_docs/console.mdx index e365d6a87afe3..00e0779286aae 100644 --- a/api_docs/console.mdx +++ b/api_docs/console.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/console title: "console" image: https://source.unsplash.com/400x175/?github description: API docs for the console plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'console'] --- import consoleObj from './console.devdocs.json'; diff --git a/api_docs/controls.mdx b/api_docs/controls.mdx index 69b2dfc22a263..e1427ab3d19f0 100644 --- a/api_docs/controls.mdx +++ b/api_docs/controls.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/controls title: "controls" image: https://source.unsplash.com/400x175/?github description: API docs for the controls plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'controls'] --- import controlsObj from './controls.devdocs.json'; diff --git a/api_docs/core.devdocs.json b/api_docs/core.devdocs.json index 607bae8fad1fc..67fa46292601f 100644 --- a/api_docs/core.devdocs.json +++ b/api_docs/core.devdocs.json @@ -10389,7 +10389,7 @@ "\nThe outcome for a successful `resolve` call is one of the following values:\n\n * `'exactMatch'` -- One document exactly matched the given ID.\n * `'aliasMatch'` -- One document with a legacy URL alias matched the given ID; in this case the `saved_object.id` field is different\n than the given ID.\n * `'conflict'` -- Two documents matched the given ID, one was an exact match and another with a legacy URL alias; in this case the\n `saved_object` object is the exact match, and the `saved_object.id` field is the same as the given ID." ], "signature": [ - "\"exactMatch\" | \"aliasMatch\" | \"conflict\"" + "\"conflict\" | \"exactMatch\" | \"aliasMatch\"" ], "path": "node_modules/@types/kbn__core-saved-objects-api-browser/index.d.ts", "deprecated": false, @@ -10850,6 +10850,14 @@ "plugin": "visualizations", "path": "src/plugins/visualizations/public/embeddable/visualize_embeddable.tsx" }, + { + "plugin": "dashboard", + "path": "src/plugins/dashboard/public/services/dashboard_saved_object/lib/load_dashboard_state_from_saved_object.ts" + }, + { + "plugin": "dashboard", + "path": "src/plugins/dashboard/public/services/dashboard_saved_object/lib/load_dashboard_state_from_saved_object.ts" + }, { "plugin": "infra", "path": "x-pack/plugins/infra/public/hooks/use_find_saved_object.tsx" @@ -11184,11 +11192,15 @@ }, { "plugin": "dashboard", - "path": "src/plugins/dashboard/server/saved_objects/dashboard_migrations.ts" + "path": "src/plugins/dashboard/server/saved_objects/migrations/migrate_extract_panel_references.ts" }, { "plugin": "dashboard", - "path": "src/plugins/dashboard/server/saved_objects/dashboard_migrations.ts" + "path": "src/plugins/dashboard/server/saved_objects/migrations/migrate_extract_panel_references.ts" + }, + { + "plugin": "dashboard", + "path": "src/plugins/dashboard/server/usage/dashboard_telemetry_collection_task.ts" }, { "plugin": "dashboard", @@ -11232,43 +11244,35 @@ }, { "plugin": "dashboard", - "path": "src/plugins/dashboard/common/saved_dashboard_references.ts" - }, - { - "plugin": "dashboard", - "path": "src/plugins/dashboard/common/saved_dashboard_references.ts" + "path": "src/plugins/dashboard/common/persistable_state/dashboard_saved_object_references.ts" }, { "plugin": "dashboard", - "path": "src/plugins/dashboard/common/saved_dashboard_references.ts" + "path": "src/plugins/dashboard/common/persistable_state/dashboard_saved_object_references.ts" }, { "plugin": "dashboard", - "path": "src/plugins/dashboard/common/saved_dashboard_references.ts" + "path": "src/plugins/dashboard/common/persistable_state/dashboard_saved_object_references.ts" }, { "plugin": "dashboard", - "path": "src/plugins/dashboard/common/saved_dashboard_references.ts" + "path": "src/plugins/dashboard/common/persistable_state/dashboard_saved_object_references.ts" }, { "plugin": "dashboard", - "path": "src/plugins/dashboard/common/saved_dashboard_references.ts" + "path": "src/plugins/dashboard/common/persistable_state/dashboard_saved_object_references.ts" }, { "plugin": "dashboard", - "path": "src/plugins/dashboard/common/saved_dashboard_references.ts" + "path": "src/plugins/dashboard/common/persistable_state/dashboard_saved_object_references.ts" }, { "plugin": "dashboard", - "path": "src/plugins/dashboard/common/saved_dashboard_references.ts" + "path": "src/plugins/dashboard/common/persistable_state/dashboard_saved_object_references.ts" }, { "plugin": "dashboard", - "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts" - }, - { - "plugin": "dashboard", - "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts" + "path": "src/plugins/dashboard/common/persistable_state/dashboard_saved_object_references.ts" }, { "plugin": "ml", @@ -11278,6 +11282,14 @@ "plugin": "ml", "path": "x-pack/plugins/ml/common/types/modules.ts" }, + { + "plugin": "dashboard", + "path": "src/plugins/dashboard/public/services/dashboard_saved_object/lib/save_dashboard_state_to_saved_object.ts" + }, + { + "plugin": "dashboard", + "path": "src/plugins/dashboard/public/services/dashboard_saved_object/lib/save_dashboard_state_to_saved_object.ts" + }, { "plugin": "@kbn/core-saved-objects-server-internal", "path": "packages/core/saved-objects/core-saved-objects-server-internal/src/routes/legacy_import_export/lib/collect_references_deep.test.ts" @@ -15356,9 +15368,9 @@ "label": "SavedObjectsFindOptions", "description": [], "signature": [ - "{ type: string | string[]; filter?: any; search?: string | undefined; aggs?: Record | undefined; fields?: string[] | undefined; page?: number | undefined; perPage?: number | undefined; sortField?: string | undefined; searchFields?: string[] | undefined; hasReference?: ", + "> | undefined; page?: number | undefined; perPage?: number | undefined; sortField?: string | undefined; searchFields?: string[] | undefined; hasReference?: ", "SavedObjectsFindOptionsReference", " | ", "SavedObjectsFindOptionsReference", @@ -21534,13 +21546,7 @@ "signature": [ "HttpServicePreboot", "<", - { - "pluginId": "core", - "scope": "server", - "docId": "kibCorePluginApi", - "section": "def-server.RequestHandlerContext", - "text": "RequestHandlerContext" - }, + "RequestHandlerContext", ">" ], "path": "src/core/server/index.ts", @@ -21575,7 +21581,10 @@ "description": [ "\nThe `core` context provided to route handler.\n\nProvides the following clients and services:\n - {@link SavedObjectsClient | savedObjects.client} - Saved Objects client\n which uses the credentials of the incoming request\n - {@link ISavedObjectTypeRegistry | savedObjects.typeRegistry} - Type registry containing\n all the registered types.\n - {@link IScopedClusterClient | elasticsearch.client} - Elasticsearch\n data client which uses the credentials of the incoming request\n - {@link IUiSettingsClient | uiSettings.client} - uiSettings client\n which uses the credentials of the incoming request" ], - "path": "src/core/server/core_route_handler_context.ts", + "signature": [ + "CoreRequestHandlerContext" + ], + "path": "node_modules/@types/kbn__core-http-request-handler-context-server/index.d.ts", "deprecated": false, "trackAdoption": false, "children": [ @@ -21589,7 +21598,7 @@ "signature": [ "SavedObjectsRequestHandlerContext" ], - "path": "src/core/server/core_route_handler_context.ts", + "path": "node_modules/@types/kbn__core-http-request-handler-context-server/index.d.ts", "deprecated": false, "trackAdoption": false }, @@ -21603,7 +21612,7 @@ "signature": [ "ElasticsearchRequestHandlerContext" ], - "path": "src/core/server/core_route_handler_context.ts", + "path": "node_modules/@types/kbn__core-http-request-handler-context-server/index.d.ts", "deprecated": false, "trackAdoption": false }, @@ -21617,7 +21626,7 @@ "signature": [ "UiSettingsRequestHandlerContext" ], - "path": "src/core/server/core_route_handler_context.ts", + "path": "node_modules/@types/kbn__core-http-request-handler-context-server/index.d.ts", "deprecated": false, "trackAdoption": false }, @@ -21631,7 +21640,7 @@ "signature": [ "DeprecationsRequestHandlerContext" ], - "path": "src/core/server/core_route_handler_context.ts", + "path": "node_modules/@types/kbn__core-http-request-handler-context-server/index.d.ts", "deprecated": false, "trackAdoption": false } @@ -21802,13 +21811,7 @@ "signature": [ "HttpServiceSetup", "<", - { - "pluginId": "core", - "scope": "server", - "docId": "kibCorePluginApi", - "section": "def-server.RequestHandlerContext", - "text": "RequestHandlerContext" - }, + "RequestHandlerContext", "> & { resources: ", { "pluginId": "core", @@ -25950,21 +25953,9 @@ ], "signature": [ "(route: ", "RouteConfig", ", handler: ", @@ -39420,6 +39411,37 @@ ], "initialIsOpen": false }, + { + "parentPluginId": "core", + "id": "def-server.PrebootCoreRequestHandlerContext", + "type": "Interface", + "tags": [], + "label": "PrebootCoreRequestHandlerContext", + "description": [], + "signature": [ + "PrebootCoreRequestHandlerContext" + ], + "path": "node_modules/@types/kbn__core-http-request-handler-context-server/index.d.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "core", + "id": "def-server.PrebootCoreRequestHandlerContext.uiSettings", + "type": "Object", + "tags": [], + "label": "uiSettings", + "description": [], + "signature": [ + "PrebootUiSettingsRequestHandlerContext" + ], + "path": "node_modules/@types/kbn__core-http-request-handler-context-server/index.d.ts", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, { "parentPluginId": "core", "id": "def-server.PrebootPlugin", @@ -39523,6 +39545,41 @@ ], "initialIsOpen": false }, + { + "parentPluginId": "core", + "id": "def-server.PrebootRequestHandlerContext", + "type": "Interface", + "tags": [], + "label": "PrebootRequestHandlerContext", + "description": [], + "signature": [ + "PrebootRequestHandlerContext", + " extends ", + "RequestHandlerContextBase" + ], + "path": "node_modules/@types/kbn__core-http-request-handler-context-server/index.d.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "core", + "id": "def-server.PrebootRequestHandlerContext.core", + "type": "Object", + "tags": [], + "label": "core", + "description": [], + "signature": [ + "Promise<", + "PrebootCoreRequestHandlerContext", + ">" + ], + "path": "node_modules/@types/kbn__core-http-request-handler-context-server/index.d.ts", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, { "parentPluginId": "core", "id": "def-server.RegisterDeprecationsConfig", @@ -39588,17 +39645,11 @@ "\nBase context passed to a route handler, containing the `core` context part.\n" ], "signature": [ - { - "pluginId": "core", - "scope": "server", - "docId": "kibCorePluginApi", - "section": "def-server.RequestHandlerContext", - "text": "RequestHandlerContext" - }, + "RequestHandlerContext", " extends ", "RequestHandlerContextBase" ], - "path": "src/core/server/index.ts", + "path": "node_modules/@types/kbn__core-http-request-handler-context-server/index.d.ts", "deprecated": false, "trackAdoption": false, "children": [ @@ -39611,16 +39662,10 @@ "description": [], "signature": [ "Promise<", - { - "pluginId": "core", - "scope": "server", - "docId": "kibCorePluginApi", - "section": "def-server.CoreRequestHandlerContext", - "text": "CoreRequestHandlerContext" - }, + "CoreRequestHandlerContext", ">" ], - "path": "src/core/server/index.ts", + "path": "node_modules/@types/kbn__core-http-request-handler-context-server/index.d.ts", "deprecated": false, "trackAdoption": false } @@ -40487,6 +40532,14 @@ "plugin": "visualizations", "path": "src/plugins/visualizations/public/embeddable/visualize_embeddable.tsx" }, + { + "plugin": "dashboard", + "path": "src/plugins/dashboard/public/services/dashboard_saved_object/lib/load_dashboard_state_from_saved_object.ts" + }, + { + "plugin": "dashboard", + "path": "src/plugins/dashboard/public/services/dashboard_saved_object/lib/load_dashboard_state_from_saved_object.ts" + }, { "plugin": "infra", "path": "x-pack/plugins/infra/public/hooks/use_find_saved_object.tsx" @@ -40821,11 +40874,15 @@ }, { "plugin": "dashboard", - "path": "src/plugins/dashboard/server/saved_objects/dashboard_migrations.ts" + "path": "src/plugins/dashboard/server/saved_objects/migrations/migrate_extract_panel_references.ts" + }, + { + "plugin": "dashboard", + "path": "src/plugins/dashboard/server/saved_objects/migrations/migrate_extract_panel_references.ts" }, { "plugin": "dashboard", - "path": "src/plugins/dashboard/server/saved_objects/dashboard_migrations.ts" + "path": "src/plugins/dashboard/server/usage/dashboard_telemetry_collection_task.ts" }, { "plugin": "dashboard", @@ -40869,43 +40926,35 @@ }, { "plugin": "dashboard", - "path": "src/plugins/dashboard/common/saved_dashboard_references.ts" - }, - { - "plugin": "dashboard", - "path": "src/plugins/dashboard/common/saved_dashboard_references.ts" - }, - { - "plugin": "dashboard", - "path": "src/plugins/dashboard/common/saved_dashboard_references.ts" + "path": "src/plugins/dashboard/common/persistable_state/dashboard_saved_object_references.ts" }, { "plugin": "dashboard", - "path": "src/plugins/dashboard/common/saved_dashboard_references.ts" + "path": "src/plugins/dashboard/common/persistable_state/dashboard_saved_object_references.ts" }, { "plugin": "dashboard", - "path": "src/plugins/dashboard/common/saved_dashboard_references.ts" + "path": "src/plugins/dashboard/common/persistable_state/dashboard_saved_object_references.ts" }, { "plugin": "dashboard", - "path": "src/plugins/dashboard/common/saved_dashboard_references.ts" + "path": "src/plugins/dashboard/common/persistable_state/dashboard_saved_object_references.ts" }, { "plugin": "dashboard", - "path": "src/plugins/dashboard/common/saved_dashboard_references.ts" + "path": "src/plugins/dashboard/common/persistable_state/dashboard_saved_object_references.ts" }, { "plugin": "dashboard", - "path": "src/plugins/dashboard/common/saved_dashboard_references.ts" + "path": "src/plugins/dashboard/common/persistable_state/dashboard_saved_object_references.ts" }, { "plugin": "dashboard", - "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts" + "path": "src/plugins/dashboard/common/persistable_state/dashboard_saved_object_references.ts" }, { "plugin": "dashboard", - "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts" + "path": "src/plugins/dashboard/common/persistable_state/dashboard_saved_object_references.ts" }, { "plugin": "ml", @@ -40915,6 +40964,14 @@ "plugin": "ml", "path": "x-pack/plugins/ml/common/types/modules.ts" }, + { + "plugin": "dashboard", + "path": "src/plugins/dashboard/public/services/dashboard_saved_object/lib/save_dashboard_state_to_saved_object.ts" + }, + { + "plugin": "dashboard", + "path": "src/plugins/dashboard/public/services/dashboard_saved_object/lib/save_dashboard_state_to_saved_object.ts" + }, { "plugin": "@kbn/core-saved-objects-server-internal", "path": "packages/core/saved-objects/core-saved-objects-server-internal/src/routes/legacy_import_export/lib/collect_references_deep.test.ts" @@ -45734,11 +45791,11 @@ }, { "plugin": "dashboard", - "path": "src/plugins/dashboard/server/saved_objects/migrations_730.ts" + "path": "src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/migrations_730.ts" }, { "plugin": "dashboard", - "path": "src/plugins/dashboard/server/saved_objects/migrations_730.ts" + "path": "src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/migrations_730.ts" }, { "plugin": "@kbn/core-saved-objects-migration-server-internal", @@ -46719,7 +46776,7 @@ "\nThe outcome for a successful `resolve` call is one of the following values:\n\n * `'exactMatch'` -- One document exactly matched the given ID.\n * `'aliasMatch'` -- One document with a legacy URL alias matched the given ID; in this case the `saved_object.id` field is different\n than the given ID.\n * `'conflict'` -- Two documents matched the given ID, one was an exact match and another with a legacy URL alias; in this case the\n `saved_object` object is the exact match, and the `saved_object.id` field is the same as the given ID." ], "signature": [ - "\"exactMatch\" | \"aliasMatch\" | \"conflict\"" + "\"conflict\" | \"exactMatch\" | \"aliasMatch\"" ], "path": "node_modules/@types/kbn__core-saved-objects-api-server/index.d.ts", "deprecated": false, @@ -50176,16 +50233,10 @@ "\nMixin allowing plugins to define their own request handler contexts.\n" ], "signature": [ - { - "pluginId": "core", - "scope": "server", - "docId": "kibCorePluginApi", - "section": "def-server.RequestHandlerContext", - "text": "RequestHandlerContext" - }, + "RequestHandlerContext", " & { [Key in keyof T]: T[Key] extends Promise ? T[Key] : Promise; }" ], - "path": "src/core/server/index.ts", + "path": "node_modules/@types/kbn__core-http-request-handler-context-server/index.d.ts", "deprecated": false, "trackAdoption": false, "initialIsOpen": false @@ -53662,9 +53713,9 @@ "label": "SavedObjectsCreatePointInTimeFinderOptions", "description": [], "signature": [ - "{ type: string | string[]; filter?: any; search?: string | undefined; aggs?: Record | undefined; fields?: string[] | undefined; perPage?: number | undefined; sortField?: string | undefined; sortOrder?: ", + "> | undefined; perPage?: number | undefined; sortField?: string | undefined; sortOrder?: ", "SortOrder", " | undefined; searchFields?: string[] | undefined; rootSearchFields?: string[] | undefined; hasReference?: ", "SavedObjectsFindOptionsReference", diff --git a/api_docs/core.mdx b/api_docs/core.mdx index d554613d1ec1e..798c6c53ce345 100644 --- a/api_docs/core.mdx +++ b/api_docs/core.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/core title: "core" image: https://source.unsplash.com/400x175/?github description: API docs for the core plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'core'] --- import coreObj from './core.devdocs.json'; @@ -21,7 +21,7 @@ Contact [Kibana Core](https://github.com/orgs/elastic/teams/kibana-core) for que | Public API count | Any count | Items lacking comments | Missing exports | |-------------------|-----------|------------------------|-----------------| -| 2684 | 0 | 35 | 0 | +| 2688 | 0 | 30 | 0 | ## Client diff --git a/api_docs/custom_integrations.devdocs.json b/api_docs/custom_integrations.devdocs.json index 7a339106c7a6d..03090384a0559 100644 --- a/api_docs/custom_integrations.devdocs.json +++ b/api_docs/custom_integrations.devdocs.json @@ -438,7 +438,7 @@ "label": "categories", "description": [], "signature": [ - "(\"custom\" | \"enterprise_search\" | \"sample_data\" | \"aws\" | \"azure\" | \"cloud\" | \"config_management\" | \"containers\" | \"crm\" | \"datastore\" | \"elastic_stack\" | \"google_cloud\" | \"kubernetes\" | \"languages\" | \"message_queue\" | \"microsoft_365\" | \"monitoring\" | \"network\" | \"notification\" | \"os_system\" | \"productivity\" | \"security\" | \"support\" | \"threat_intel\" | \"ticketing\" | \"version_control\" | \"web\" | \"communications\" | \"file_storage\" | \"language_client\" | \"upload_file\" | \"website_search\" | \"geo\")[]" + "(\"custom\" | \"enterprise_search\" | \"sample_data\" | \"aws\" | \"azure\" | \"cloud\" | \"config_management\" | \"containers\" | \"crm\" | \"datastore\" | \"elastic_stack\" | \"google_cloud\" | \"infrastructure\" | \"kubernetes\" | \"languages\" | \"message_queue\" | \"microsoft_365\" | \"monitoring\" | \"network\" | \"notification\" | \"os_system\" | \"productivity\" | \"security\" | \"support\" | \"threat_intel\" | \"ticketing\" | \"version_control\" | \"web\" | \"communications\" | \"file_storage\" | \"language_client\" | \"upload_file\" | \"website_search\" | \"geo\")[]" ], "path": "src/plugins/custom_integrations/common/index.ts", "deprecated": false, @@ -488,7 +488,7 @@ "\nA category applicable to an Integration." ], "signature": [ - "\"custom\" | \"enterprise_search\" | \"sample_data\" | \"aws\" | \"azure\" | \"cloud\" | \"config_management\" | \"containers\" | \"crm\" | \"datastore\" | \"elastic_stack\" | \"google_cloud\" | \"kubernetes\" | \"languages\" | \"message_queue\" | \"microsoft_365\" | \"monitoring\" | \"network\" | \"notification\" | \"os_system\" | \"productivity\" | \"security\" | \"support\" | \"threat_intel\" | \"ticketing\" | \"version_control\" | \"web\" | \"communications\" | \"file_storage\" | \"language_client\" | \"upload_file\" | \"website_search\" | \"geo\"" + "\"custom\" | \"enterprise_search\" | \"sample_data\" | \"aws\" | \"azure\" | \"cloud\" | \"config_management\" | \"containers\" | \"crm\" | \"datastore\" | \"elastic_stack\" | \"google_cloud\" | \"infrastructure\" | \"kubernetes\" | \"languages\" | \"message_queue\" | \"microsoft_365\" | \"monitoring\" | \"network\" | \"notification\" | \"os_system\" | \"productivity\" | \"security\" | \"support\" | \"threat_intel\" | \"ticketing\" | \"version_control\" | \"web\" | \"communications\" | \"file_storage\" | \"language_client\" | \"upload_file\" | \"website_search\" | \"geo\"" ], "path": "src/plugins/custom_integrations/common/index.ts", "deprecated": false, @@ -728,7 +728,7 @@ "label": "categories", "description": [], "signature": [ - "(\"custom\" | \"enterprise_search\" | \"sample_data\" | \"aws\" | \"azure\" | \"cloud\" | \"config_management\" | \"containers\" | \"crm\" | \"datastore\" | \"elastic_stack\" | \"google_cloud\" | \"kubernetes\" | \"languages\" | \"message_queue\" | \"microsoft_365\" | \"monitoring\" | \"network\" | \"notification\" | \"os_system\" | \"productivity\" | \"security\" | \"support\" | \"threat_intel\" | \"ticketing\" | \"version_control\" | \"web\" | \"communications\" | \"file_storage\" | \"language_client\" | \"upload_file\" | \"website_search\" | \"geo\")[]" + "(\"custom\" | \"enterprise_search\" | \"sample_data\" | \"aws\" | \"azure\" | \"cloud\" | \"config_management\" | \"containers\" | \"crm\" | \"datastore\" | \"elastic_stack\" | \"google_cloud\" | \"infrastructure\" | \"kubernetes\" | \"languages\" | \"message_queue\" | \"microsoft_365\" | \"monitoring\" | \"network\" | \"notification\" | \"os_system\" | \"productivity\" | \"security\" | \"support\" | \"threat_intel\" | \"ticketing\" | \"version_control\" | \"web\" | \"communications\" | \"file_storage\" | \"language_client\" | \"upload_file\" | \"website_search\" | \"geo\")[]" ], "path": "src/plugins/custom_integrations/common/index.ts", "deprecated": false, @@ -838,7 +838,7 @@ "label": "id", "description": [], "signature": [ - "\"custom\" | \"enterprise_search\" | \"sample_data\" | \"aws\" | \"azure\" | \"cloud\" | \"config_management\" | \"containers\" | \"crm\" | \"datastore\" | \"elastic_stack\" | \"google_cloud\" | \"kubernetes\" | \"languages\" | \"message_queue\" | \"microsoft_365\" | \"monitoring\" | \"network\" | \"notification\" | \"os_system\" | \"productivity\" | \"security\" | \"support\" | \"threat_intel\" | \"ticketing\" | \"version_control\" | \"web\" | \"communications\" | \"file_storage\" | \"language_client\" | \"upload_file\" | \"website_search\" | \"geo\"" + "\"custom\" | \"enterprise_search\" | \"sample_data\" | \"aws\" | \"azure\" | \"cloud\" | \"config_management\" | \"containers\" | \"crm\" | \"datastore\" | \"elastic_stack\" | \"google_cloud\" | \"infrastructure\" | \"kubernetes\" | \"languages\" | \"message_queue\" | \"microsoft_365\" | \"monitoring\" | \"network\" | \"notification\" | \"os_system\" | \"productivity\" | \"security\" | \"support\" | \"threat_intel\" | \"ticketing\" | \"version_control\" | \"web\" | \"communications\" | \"file_storage\" | \"language_client\" | \"upload_file\" | \"website_search\" | \"geo\"" ], "path": "src/plugins/custom_integrations/common/index.ts", "deprecated": false, @@ -860,7 +860,7 @@ "\nThe list of all available categories." ], "signature": [ - "(\"custom\" | \"enterprise_search\" | \"sample_data\" | \"aws\" | \"azure\" | \"cloud\" | \"config_management\" | \"containers\" | \"crm\" | \"datastore\" | \"elastic_stack\" | \"google_cloud\" | \"kubernetes\" | \"languages\" | \"message_queue\" | \"microsoft_365\" | \"monitoring\" | \"network\" | \"notification\" | \"os_system\" | \"productivity\" | \"security\" | \"support\" | \"threat_intel\" | \"ticketing\" | \"version_control\" | \"web\" | \"communications\" | \"file_storage\" | \"language_client\" | \"upload_file\" | \"website_search\" | \"geo\")[]" + "(\"custom\" | \"enterprise_search\" | \"sample_data\" | \"aws\" | \"azure\" | \"cloud\" | \"config_management\" | \"containers\" | \"crm\" | \"datastore\" | \"elastic_stack\" | \"google_cloud\" | \"infrastructure\" | \"kubernetes\" | \"languages\" | \"message_queue\" | \"microsoft_365\" | \"monitoring\" | \"network\" | \"notification\" | \"os_system\" | \"productivity\" | \"security\" | \"support\" | \"threat_intel\" | \"ticketing\" | \"version_control\" | \"web\" | \"communications\" | \"file_storage\" | \"language_client\" | \"upload_file\" | \"website_search\" | \"geo\")[]" ], "path": "src/plugins/custom_integrations/common/index.ts", "deprecated": false, @@ -877,7 +877,7 @@ "\nA category applicable to an Integration." ], "signature": [ - "\"custom\" | \"enterprise_search\" | \"sample_data\" | \"aws\" | \"azure\" | \"cloud\" | \"config_management\" | \"containers\" | \"crm\" | \"datastore\" | \"elastic_stack\" | \"google_cloud\" | \"kubernetes\" | \"languages\" | \"message_queue\" | \"microsoft_365\" | \"monitoring\" | \"network\" | \"notification\" | \"os_system\" | \"productivity\" | \"security\" | \"support\" | \"threat_intel\" | \"ticketing\" | \"version_control\" | \"web\" | \"communications\" | \"file_storage\" | \"language_client\" | \"upload_file\" | \"website_search\" | \"geo\"" + "\"custom\" | \"enterprise_search\" | \"sample_data\" | \"aws\" | \"azure\" | \"cloud\" | \"config_management\" | \"containers\" | \"crm\" | \"datastore\" | \"elastic_stack\" | \"google_cloud\" | \"infrastructure\" | \"kubernetes\" | \"languages\" | \"message_queue\" | \"microsoft_365\" | \"monitoring\" | \"network\" | \"notification\" | \"os_system\" | \"productivity\" | \"security\" | \"support\" | \"threat_intel\" | \"ticketing\" | \"version_control\" | \"web\" | \"communications\" | \"file_storage\" | \"language_client\" | \"upload_file\" | \"website_search\" | \"geo\"" ], "path": "src/plugins/custom_integrations/common/index.ts", "deprecated": false, @@ -1097,6 +1097,17 @@ "deprecated": false, "trackAdoption": false }, + { + "parentPluginId": "customIntegrations", + "id": "def-common.INTEGRATION_CATEGORY_DISPLAY.infrastructure", + "type": "string", + "tags": [], + "label": "infrastructure", + "description": [], + "path": "src/plugins/custom_integrations/common/index.ts", + "deprecated": false, + "trackAdoption": false + }, { "parentPluginId": "customIntegrations", "id": "def-common.INTEGRATION_CATEGORY_DISPLAY.kubernetes", diff --git a/api_docs/custom_integrations.mdx b/api_docs/custom_integrations.mdx index b25052db9516d..77c928f34e584 100644 --- a/api_docs/custom_integrations.mdx +++ b/api_docs/custom_integrations.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/customIntegrations title: "customIntegrations" image: https://source.unsplash.com/400x175/?github description: API docs for the customIntegrations plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'customIntegrations'] --- import customIntegrationsObj from './custom_integrations.devdocs.json'; @@ -21,7 +21,7 @@ Contact [Fleet](https://github.com/orgs/elastic/teams/fleet) for questions regar | Public API count | Any count | Items lacking comments | Missing exports | |-------------------|-----------|------------------------|-----------------| -| 103 | 0 | 84 | 1 | +| 104 | 0 | 85 | 1 | ## Client diff --git a/api_docs/dashboard.devdocs.json b/api_docs/dashboard.devdocs.json index 447c0d0af07ee..c185507fd9101 100644 --- a/api_docs/dashboard.devdocs.json +++ b/api_docs/dashboard.devdocs.json @@ -1,33 +1,99 @@ { "id": "dashboard", "client": { - "classes": [ + "classes": [], + "functions": [ { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainer", - "type": "Class", + "id": "def-public.cleanEmptyKeys", + "type": "Function", "tags": [], - "label": "DashboardContainer", + "label": "cleanEmptyKeys", "description": [], "signature": [ + "(stateObj: Record) => Record" + ], + "path": "src/plugins/dashboard/public/locator.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ { - "pluginId": "dashboard", - "scope": "public", - "docId": "kibDashboardPluginApi", - "section": "def-public.DashboardContainer", - "text": "DashboardContainer" - }, - " extends ", + "parentPluginId": "dashboard", + "id": "def-public.cleanEmptyKeys.$1", + "type": "Object", + "tags": [], + "label": "stateObj", + "description": [], + "signature": [ + "Record" + ], + "path": "src/plugins/dashboard/public/locator.ts", + "deprecated": false, + "trackAdoption": false, + "isRequired": true + } + ], + "returnComment": [], + "initialIsOpen": false + }, + { + "parentPluginId": "dashboard", + "id": "def-public.createDashboardEditUrl", + "type": "Function", + "tags": [], + "label": "createDashboardEditUrl", + "description": [], + "signature": [ + "(id: string | undefined, editMode: boolean | undefined) => string" + ], + "path": "src/plugins/dashboard/public/dashboard_constants.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ { - "pluginId": "embeddable", - "scope": "public", - "docId": "kibEmbeddablePluginApi", - "section": "def-public.Container", - "text": "Container" + "parentPluginId": "dashboard", + "id": "def-public.createDashboardEditUrl.$1", + "type": "string", + "tags": [], + "label": "id", + "description": [], + "signature": [ + "string | undefined" + ], + "path": "src/plugins/dashboard/public/dashboard_constants.ts", + "deprecated": false, + "trackAdoption": false, + "isRequired": false }, - "<", - "InheritedChildInput", - ", ", + { + "parentPluginId": "dashboard", + "id": "def-public.createDashboardEditUrl.$2", + "type": "CompoundType", + "tags": [], + "label": "editMode", + "description": [], + "signature": [ + "boolean | undefined" + ], + "path": "src/plugins/dashboard/public/dashboard_constants.ts", + "deprecated": false, + "trackAdoption": false, + "isRequired": false + } + ], + "returnComment": [], + "initialIsOpen": false + } + ], + "interfaces": [ + { + "parentPluginId": "dashboard", + "id": "def-public.DashboardContainerInput", + "type": "Interface", + "tags": [], + "label": "DashboardContainerInput", + "description": [], + "signature": [ { "pluginId": "dashboard", "scope": "public", @@ -35,1674 +101,1479 @@ "section": "def-public.DashboardContainerInput", "text": "DashboardContainerInput" }, - ", ", + " extends ", { "pluginId": "embeddable", "scope": "public", "docId": "kibEmbeddablePluginApi", - "section": "def-public.ContainerOutput", - "text": "ContainerOutput" + "section": "def-public.ContainerInput", + "text": "ContainerInput" }, - ">" + "<{}>" ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx", + "path": "src/plugins/dashboard/public/types.ts", "deprecated": false, "trackAdoption": false, "children": [ { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainer.type", - "type": "string", - "tags": [], - "label": "type", - "description": [], - "signature": [ - "\"dashboard\"" - ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx", - "deprecated": false, - "trackAdoption": false - }, - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardContainer.controlGroup", + "id": "def-public.DashboardContainerInput.controlGroupInput", "type": "Object", "tags": [], - "label": "controlGroup", + "label": "controlGroupInput", "description": [], "signature": [ { "pluginId": "controls", - "scope": "public", + "scope": "common", "docId": "kibControlsPluginApi", - "section": "def-public.ControlGroupContainer", - "text": "ControlGroupContainer" + "section": "def-common.PersistableControlGroupInput", + "text": "PersistableControlGroupInput" }, " | undefined" ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx", + "path": "src/plugins/dashboard/public/types.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainer.getAllDataViews", - "type": "Function", + "id": "def-public.DashboardContainerInput.refreshConfig", + "type": "Object", "tags": [], - "label": "getAllDataViews", - "description": [ - "\nGets all the dataviews that are actively being used in the dashboard" - ], + "label": "refreshConfig", + "description": [], "signature": [ - "() => ", { - "pluginId": "dataViews", + "pluginId": "data", "scope": "common", - "docId": "kibDataViewsPluginApi", - "section": "def-common.DataView", - "text": "DataView" + "docId": "kibDataQueryPluginApi", + "section": "def-common.RefreshInterval", + "text": "RefreshInterval" }, - "[]" + " | undefined" ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx", + "path": "src/plugins/dashboard/public/types.ts", "deprecated": false, - "trackAdoption": false, - "children": [], - "returnComment": [ - "An array of dataviews" - ] + "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainer.setAllDataViews", - "type": "Function", + "id": "def-public.DashboardContainerInput.isEmbeddedExternally", + "type": "CompoundType", "tags": [], - "label": "setAllDataViews", - "description": [ - "\nUse this to set the dataviews that are used in the dashboard when they change/update" - ], + "label": "isEmbeddedExternally", + "description": [], "signature": [ - "(newDataViews: ", - { - "pluginId": "dataViews", - "scope": "common", - "docId": "kibDataViewsPluginApi", - "section": "def-common.DataView", - "text": "DataView" - }, - "[]) => void" + "boolean | undefined" ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx", + "path": "src/plugins/dashboard/public/types.ts", "deprecated": false, - "trackAdoption": false, - "children": [ - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardContainer.setAllDataViews.$1", - "type": "Array", - "tags": [], - "label": "newDataViews", - "description": [ - "The new array of dataviews that will overwrite the old dataviews array" - ], - "signature": [ - { - "pluginId": "dataViews", - "scope": "common", - "docId": "kibDataViewsPluginApi", - "section": "def-common.DataView", - "text": "DataView" - }, - "[]" - ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx", - "deprecated": false, - "trackAdoption": false, - "isRequired": true - } - ], - "returnComment": [] + "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainer.getPanelCount", - "type": "Function", + "id": "def-public.DashboardContainerInput.isFullScreenMode", + "type": "boolean", "tags": [], - "label": "getPanelCount", + "label": "isFullScreenMode", "description": [], - "signature": [ - "() => number" - ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx", + "path": "src/plugins/dashboard/public/types.ts", "deprecated": false, - "trackAdoption": false, - "children": [], - "returnComment": [] + "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainer.getPanelTitles", - "type": "Function", + "id": "def-public.DashboardContainerInput.expandedPanelId", + "type": "string", "tags": [], - "label": "getPanelTitles", + "label": "expandedPanelId", "description": [], "signature": [ - "() => Promise" + "string | undefined" ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx", + "path": "src/plugins/dashboard/public/types.ts", "deprecated": false, - "trackAdoption": false, - "children": [], - "returnComment": [] + "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainer.Unnamed", - "type": "Function", + "id": "def-public.DashboardContainerInput.timeRange", + "type": "Object", "tags": [], - "label": "Constructor", + "label": "timeRange", "description": [], "signature": [ - "any" + "{ from: string; to: string; mode?: \"absolute\" | \"relative\" | undefined; }" ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx", + "path": "src/plugins/dashboard/public/types.ts", "deprecated": false, - "trackAdoption": false, - "children": [ - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardContainer.Unnamed.$1", - "type": "Object", - "tags": [], - "label": "initialInput", - "description": [], - "signature": [ - { - "pluginId": "dashboard", - "scope": "public", - "docId": "kibDashboardPluginApi", - "section": "def-public.DashboardContainerInput", - "text": "DashboardContainerInput" - } - ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx", - "deprecated": false, - "trackAdoption": false, - "isRequired": true - }, - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardContainer.Unnamed.$2", - "type": "Object", - "tags": [], - "label": "parent", - "description": [], - "signature": [ - { - "pluginId": "embeddable", - "scope": "public", - "docId": "kibEmbeddablePluginApi", - "section": "def-public.Container", - "text": "Container" - }, - "<{}, ", - { - "pluginId": "embeddable", - "scope": "public", - "docId": "kibEmbeddablePluginApi", - "section": "def-public.ContainerInput", - "text": "ContainerInput" - }, - "<{}>, ", - { - "pluginId": "embeddable", - "scope": "public", - "docId": "kibEmbeddablePluginApi", - "section": "def-public.ContainerOutput", - "text": "ContainerOutput" - }, - "> | undefined" - ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx", - "deprecated": false, - "trackAdoption": false, - "isRequired": false - }, - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardContainer.Unnamed.$3", - "type": "CompoundType", - "tags": [], - "label": "controlGroup", - "description": [], - "signature": [ - { - "pluginId": "controls", - "scope": "public", - "docId": "kibControlsPluginApi", - "section": "def-public.ControlGroupContainer", - "text": "ControlGroupContainer" - }, - " | ", - { - "pluginId": "embeddable", - "scope": "public", - "docId": "kibEmbeddablePluginApi", - "section": "def-public.ErrorEmbeddable", - "text": "ErrorEmbeddable" - }, - " | undefined" - ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx", - "deprecated": false, - "trackAdoption": false, - "isRequired": false - } - ], - "returnComment": [] + "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainer.createNewPanelState", - "type": "Function", + "id": "def-public.DashboardContainerInput.timeslice", + "type": "Object", "tags": [], - "label": "createNewPanelState", + "label": "timeslice", "description": [], "signature": [ - ">(factory: ", - { - "pluginId": "embeddable", - "scope": "public", - "docId": "kibEmbeddablePluginApi", - "section": "def-public.EmbeddableFactory", - "text": "EmbeddableFactory" - }, - ", partial?: Partial) => ", - "DashboardPanelState", - "" + "[number, number] | undefined" ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx", + "path": "src/plugins/dashboard/public/types.ts", "deprecated": false, - "trackAdoption": false, - "children": [ - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardContainer.createNewPanelState.$1", - "type": "Object", - "tags": [], - "label": "factory", - "description": [], - "signature": [ - { - "pluginId": "embeddable", - "scope": "public", - "docId": "kibEmbeddablePluginApi", - "section": "def-public.EmbeddableFactory", - "text": "EmbeddableFactory" - }, - "" - ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx", - "deprecated": false, - "trackAdoption": false, - "isRequired": true - }, - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardContainer.createNewPanelState.$2", - "type": "Object", - "tags": [], - "label": "partial", - "description": [], - "signature": [ - "Partial" - ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx", - "deprecated": false, - "trackAdoption": false, - "isRequired": true - } - ], - "returnComment": [] + "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainer.showPlaceholderUntil", - "type": "Function", + "id": "def-public.DashboardContainerInput.timeRestore", + "type": "boolean", "tags": [], - "label": "showPlaceholderUntil", + "label": "timeRestore", "description": [], - "signature": [ - "(newStateComplete: Promise>>, placementMethod?: ", - "PanelPlacementMethod", - " | undefined, placementArgs?: TPlacementMethodArgs | undefined) => void" - ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx", + "path": "src/plugins/dashboard/public/types.ts", "deprecated": false, - "trackAdoption": false, - "children": [ - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardContainer.showPlaceholderUntil.$1", - "type": "Object", - "tags": [], - "label": "newStateComplete", - "description": [], - "signature": [ - "Promise>>" - ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx", - "deprecated": false, - "trackAdoption": false, - "isRequired": true - }, - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardContainer.showPlaceholderUntil.$2", - "type": "Function", - "tags": [], - "label": "placementMethod", - "description": [], - "signature": [ - "PanelPlacementMethod", - " | undefined" - ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx", - "deprecated": false, - "trackAdoption": false, - "isRequired": false - }, - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardContainer.showPlaceholderUntil.$3", - "type": "Uncategorized", - "tags": [], - "label": "placementArgs", - "description": [], - "signature": [ - "TPlacementMethodArgs | undefined" - ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx", - "deprecated": false, - "trackAdoption": false, - "isRequired": false - } - ], - "returnComment": [] + "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainer.replacePanel", - "type": "Function", + "id": "def-public.DashboardContainerInput.description", + "type": "string", "tags": [], - "label": "replacePanel", + "label": "description", "description": [], "signature": [ - "(previousPanelState: ", - "DashboardPanelState", - "<", - { - "pluginId": "embeddable", - "scope": "common", - "docId": "kibEmbeddablePluginApi", - "section": "def-common.EmbeddableInput", - "text": "EmbeddableInput" - }, - ">, newPanelState: Partial<", - { - "pluginId": "embeddable", - "scope": "common", - "docId": "kibEmbeddablePluginApi", - "section": "def-common.PanelState", - "text": "PanelState" - }, - "<{ id: string; }>>, generateNewId?: boolean | undefined) => void" + "string | undefined" ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx", + "path": "src/plugins/dashboard/public/types.ts", "deprecated": false, - "trackAdoption": false, - "children": [ - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardContainer.replacePanel.$1", - "type": "Object", - "tags": [], - "label": "previousPanelState", - "description": [], - "signature": [ - "DashboardPanelState", - "<", - { - "pluginId": "embeddable", - "scope": "common", - "docId": "kibEmbeddablePluginApi", - "section": "def-common.EmbeddableInput", - "text": "EmbeddableInput" - }, - ">" - ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx", - "deprecated": false, - "trackAdoption": false, - "isRequired": true - }, - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardContainer.replacePanel.$2", - "type": "Object", - "tags": [], - "label": "newPanelState", - "description": [], - "signature": [ - "Partial<", - { - "pluginId": "embeddable", - "scope": "common", - "docId": "kibEmbeddablePluginApi", - "section": "def-common.PanelState", - "text": "PanelState" - }, - "<{ id: string; }>>" - ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx", - "deprecated": false, - "trackAdoption": false, - "isRequired": true - }, - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardContainer.replacePanel.$3", - "type": "CompoundType", - "tags": [], - "label": "generateNewId", - "description": [], - "signature": [ - "boolean | undefined" - ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx", - "deprecated": false, - "trackAdoption": false, - "isRequired": false - } - ], - "returnComment": [] + "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainer.addOrUpdateEmbeddable", - "type": "Function", + "id": "def-public.DashboardContainerInput.useMargins", + "type": "boolean", "tags": [], - "label": "addOrUpdateEmbeddable", + "label": "useMargins", "description": [], - "signature": [ - " = ", - { - "pluginId": "embeddable", - "scope": "public", - "docId": "kibEmbeddablePluginApi", - "section": "def-public.IEmbeddable", - "text": "IEmbeddable" - }, - ">(type: string, explicitInput: Partial, embeddableId?: string | undefined) => Promise" - ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx", + "path": "src/plugins/dashboard/public/types.ts", "deprecated": false, - "trackAdoption": false, - "children": [ - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardContainer.addOrUpdateEmbeddable.$1", - "type": "string", - "tags": [], - "label": "type", - "description": [], - "signature": [ - "string" - ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx", - "deprecated": false, - "trackAdoption": false, - "isRequired": true - }, - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardContainer.addOrUpdateEmbeddable.$2", - "type": "Object", - "tags": [], - "label": "explicitInput", - "description": [], - "signature": [ - "Partial" - ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx", - "deprecated": false, - "trackAdoption": false, - "isRequired": true - }, - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardContainer.addOrUpdateEmbeddable.$3", - "type": "string", - "tags": [], - "label": "embeddableId", - "description": [], - "signature": [ - "string | undefined" - ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx", - "deprecated": false, - "trackAdoption": false, - "isRequired": false - } - ], - "returnComment": [] + "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainer.render", - "type": "Function", + "id": "def-public.DashboardContainerInput.syncColors", + "type": "CompoundType", "tags": [], - "label": "render", + "label": "syncColors", "description": [], "signature": [ - "(dom: HTMLElement) => void" + "boolean | undefined" ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx", + "path": "src/plugins/dashboard/public/types.ts", "deprecated": false, - "trackAdoption": false, - "children": [ - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardContainer.render.$1", - "type": "Object", - "tags": [], - "label": "dom", - "description": [], - "signature": [ - "HTMLElement" - ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx", - "deprecated": false, - "trackAdoption": false, - "isRequired": true - } - ], - "returnComment": [] + "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainer.destroy", - "type": "Function", + "id": "def-public.DashboardContainerInput.syncTooltips", + "type": "CompoundType", "tags": [], - "label": "destroy", + "label": "syncTooltips", "description": [], "signature": [ - "() => void" + "boolean | undefined" ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx", + "path": "src/plugins/dashboard/public/types.ts", "deprecated": false, - "trackAdoption": false, - "children": [], - "returnComment": [] + "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainer.getInheritedInput", - "type": "Function", + "id": "def-public.DashboardContainerInput.viewMode", + "type": "Enum", "tags": [], - "label": "getInheritedInput", + "label": "viewMode", "description": [], "signature": [ - "(id: string) => ", - "InheritedChildInput" - ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx", - "deprecated": false, - "trackAdoption": false, - "children": [ { - "parentPluginId": "dashboard", - "id": "def-public.DashboardContainer.getInheritedInput.$1", - "type": "string", - "tags": [], - "label": "id", - "description": [], - "signature": [ - "string" - ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx", - "deprecated": false, - "trackAdoption": false, - "isRequired": true + "pluginId": "embeddable", + "scope": "common", + "docId": "kibEmbeddablePluginApi", + "section": "def-common.ViewMode", + "text": "ViewMode" } ], - "returnComment": [] - } - ], - "initialIsOpen": false - }, - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerFactoryDefinition", - "type": "Class", - "tags": [], - "label": "DashboardContainerFactoryDefinition", - "description": [], - "signature": [ - { - "pluginId": "dashboard", - "scope": "public", - "docId": "kibDashboardPluginApi", - "section": "def-public.DashboardContainerFactoryDefinition", - "text": "DashboardContainerFactoryDefinition" - }, - " implements ", - { - "pluginId": "embeddable", - "scope": "public", - "docId": "kibEmbeddablePluginApi", - "section": "def-public.EmbeddableFactoryDefinition", - "text": "EmbeddableFactoryDefinition" - }, - "<", - { - "pluginId": "dashboard", - "scope": "public", - "docId": "kibDashboardPluginApi", - "section": "def-public.DashboardContainerInput", - "text": "DashboardContainerInput" - }, - ", ", - { - "pluginId": "embeddable", - "scope": "public", - "docId": "kibEmbeddablePluginApi", - "section": "def-public.ContainerOutput", - "text": "ContainerOutput" - }, - ", ", - { - "pluginId": "dashboard", - "scope": "public", - "docId": "kibDashboardPluginApi", - "section": "def-public.DashboardContainer", - "text": "DashboardContainer" + "path": "src/plugins/dashboard/public/types.ts", + "deprecated": false, + "trackAdoption": false }, - ", unknown>" - ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx", - "deprecated": false, - "trackAdoption": false, - "children": [ { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerFactoryDefinition.isContainerType", - "type": "boolean", + "id": "def-public.DashboardContainerInput.filters", + "type": "Array", "tags": [], - "label": "isContainerType", + "label": "filters", "description": [], "signature": [ - "true" + "Filter", + "[]" ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx", + "path": "src/plugins/dashboard/public/types.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerFactoryDefinition.type", + "id": "def-public.DashboardContainerInput.title", "type": "string", "tags": [], - "label": "type", + "label": "title", "description": [], - "signature": [ - "\"dashboard\"" - ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx", + "path": "src/plugins/dashboard/public/types.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerFactoryDefinition.inject", - "type": "Function", + "id": "def-public.DashboardContainerInput.query", + "type": "Object", "tags": [], - "label": "inject", + "label": "query", "description": [], "signature": [ - "(state: ", - { - "pluginId": "embeddable", - "scope": "common", - "docId": "kibEmbeddablePluginApi", - "section": "def-common.EmbeddableStateWithType", - "text": "EmbeddableStateWithType" - }, - ", references: ", - "SavedObjectReference", - "[]) => ", - { - "pluginId": "embeddable", - "scope": "common", - "docId": "kibEmbeddablePluginApi", - "section": "def-common.EmbeddableStateWithType", - "text": "EmbeddableStateWithType" - } + "{ query: string | { [key: string]: any; }; language: string; }" ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx", + "path": "src/plugins/dashboard/public/types.ts", "deprecated": false, - "trackAdoption": false, - "returnComment": [], - "children": [ - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerFactoryDefinition.inject.$1", - "type": "Uncategorized", - "tags": [], - "label": "state", - "description": [], - "signature": [ - "P" - ], - "path": "src/plugins/kibana_utils/common/persistable_state/types.ts", - "deprecated": false, - "trackAdoption": false - }, - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerFactoryDefinition.inject.$2", - "type": "Array", - "tags": [], - "label": "references", - "description": [], - "signature": [ - "SavedObjectReference", - "[]" - ], - "path": "src/plugins/kibana_utils/common/persistable_state/types.ts", - "deprecated": false, - "trackAdoption": false - } - ] + "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerFactoryDefinition.extract", - "type": "Function", + "id": "def-public.DashboardContainerInput.panels", + "type": "Object", "tags": [], - "label": "extract", + "label": "panels", "description": [], "signature": [ - "(state: ", + "{ [panelId: string]: ", { - "pluginId": "embeddable", + "pluginId": "dashboard", "scope": "common", - "docId": "kibEmbeddablePluginApi", - "section": "def-common.EmbeddableStateWithType", - "text": "EmbeddableStateWithType" + "docId": "kibDashboardPluginApi", + "section": "def-common.DashboardPanelState", + "text": "DashboardPanelState" }, - ") => { state: ", + "<", { "pluginId": "embeddable", "scope": "common", "docId": "kibEmbeddablePluginApi", - "section": "def-common.EmbeddableStateWithType", - "text": "EmbeddableStateWithType" + "section": "def-common.EmbeddableInput", + "text": "EmbeddableInput" }, - "; references: ", - "SavedObjectReference", - "[]; }" + " & { [k: string]: unknown; }>; }" ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx", + "path": "src/plugins/dashboard/public/types.ts", "deprecated": false, - "trackAdoption": false, - "returnComment": [], - "children": [ - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerFactoryDefinition.extract.$1", - "type": "Uncategorized", - "tags": [], - "label": "state", - "description": [], - "signature": [ - "P" - ], - "path": "src/plugins/kibana_utils/common/persistable_state/types.ts", - "deprecated": false, - "trackAdoption": false - } - ] + "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerFactoryDefinition.Unnamed", - "type": "Function", + "id": "def-public.DashboardContainerInput.executionContext", + "type": "Object", "tags": [], - "label": "Constructor", + "label": "executionContext", "description": [], "signature": [ - "any" + "KibanaExecutionContext", + " | undefined" ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx", + "path": "src/plugins/dashboard/public/types.ts", "deprecated": false, - "trackAdoption": false, - "children": [ - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerFactoryDefinition.Unnamed.$1", - "type": "Object", - "tags": [], - "label": "persistableStateService", - "description": [], - "signature": [ - { - "pluginId": "embeddable", - "scope": "common", - "docId": "kibEmbeddablePluginApi", - "section": "def-common.EmbeddablePersistableStateService", - "text": "EmbeddablePersistableStateService" - } - ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx", - "deprecated": false, - "trackAdoption": false, - "isRequired": true - } + "trackAdoption": false + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "dashboard", + "id": "def-public.DashboardFeatureFlagConfig", + "type": "Interface", + "tags": [], + "label": "DashboardFeatureFlagConfig", + "description": [], + "path": "src/plugins/dashboard/public/plugin.tsx", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "dashboard", + "id": "def-public.DashboardFeatureFlagConfig.allowByValueEmbeddables", + "type": "boolean", + "tags": [], + "label": "allowByValueEmbeddables", + "description": [], + "path": "src/plugins/dashboard/public/plugin.tsx", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "dashboard", + "id": "def-public.SavedDashboardPanel", + "type": "Interface", + "tags": [], + "label": "SavedDashboardPanel", + "description": [ + "\nA saved dashboard panel parsed directly from the Dashboard Attributes panels JSON" + ], + "path": "src/plugins/dashboard/common/types.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "dashboard", + "id": "def-public.SavedDashboardPanel.embeddableConfig", + "type": "Object", + "tags": [], + "label": "embeddableConfig", + "description": [], + "signature": [ + "{ [key: string]: ", + "Serializable", + "; }" ], - "returnComment": [] + "path": "src/plugins/dashboard/common/types.ts", + "deprecated": false, + "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerFactoryDefinition.isEditable", - "type": "Function", + "id": "def-public.SavedDashboardPanel.id", + "type": "string", "tags": [], - "label": "isEditable", + "label": "id", "description": [], "signature": [ - "() => Promise" + "string | undefined" ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx", + "path": "src/plugins/dashboard/common/types.ts", "deprecated": false, - "trackAdoption": false, - "children": [], - "returnComment": [] + "trackAdoption": false + }, + { + "parentPluginId": "dashboard", + "id": "def-public.SavedDashboardPanel.type", + "type": "string", + "tags": [], + "label": "type", + "description": [], + "path": "src/plugins/dashboard/common/types.ts", + "deprecated": false, + "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerFactoryDefinition.getDisplayName", - "type": "Function", + "id": "def-public.SavedDashboardPanel.panelRefName", + "type": "string", "tags": [], - "label": "getDisplayName", + "label": "panelRefName", "description": [], "signature": [ - "() => string" + "string | undefined" ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx", + "path": "src/plugins/dashboard/common/types.ts", "deprecated": false, - "trackAdoption": false, - "children": [], - "returnComment": [] + "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerFactoryDefinition.getDefaultInput", - "type": "Function", + "id": "def-public.SavedDashboardPanel.gridData", + "type": "Object", "tags": [], - "label": "getDefaultInput", + "label": "gridData", "description": [], "signature": [ - "() => Partial<", { "pluginId": "dashboard", - "scope": "public", + "scope": "common", "docId": "kibDashboardPluginApi", - "section": "def-public.DashboardContainerInput", - "text": "DashboardContainerInput" - }, - ">" + "section": "def-common.GridData", + "text": "GridData" + } ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx", + "path": "src/plugins/dashboard/common/types.ts", "deprecated": false, - "trackAdoption": false, - "children": [], - "returnComment": [] + "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerFactoryDefinition.create", - "type": "Function", + "id": "def-public.SavedDashboardPanel.panelIndex", + "type": "string", "tags": [], - "label": "create", + "label": "panelIndex", "description": [], - "signature": [ - "(initialInput: ", - { - "pluginId": "dashboard", - "scope": "public", - "docId": "kibDashboardPluginApi", - "section": "def-public.DashboardContainerInput", - "text": "DashboardContainerInput" - }, - ", parent?: ", - { - "pluginId": "embeddable", - "scope": "public", - "docId": "kibEmbeddablePluginApi", - "section": "def-public.Container", - "text": "Container" - }, - "<{}, ", - { - "pluginId": "embeddable", - "scope": "public", - "docId": "kibEmbeddablePluginApi", - "section": "def-public.ContainerInput", - "text": "ContainerInput" - }, - "<{}>, ", - { - "pluginId": "embeddable", - "scope": "public", - "docId": "kibEmbeddablePluginApi", - "section": "def-public.ContainerOutput", - "text": "ContainerOutput" - }, - "> | undefined) => Promise<", - { - "pluginId": "dashboard", - "scope": "public", - "docId": "kibDashboardPluginApi", - "section": "def-public.DashboardContainer", - "text": "DashboardContainer" - }, - " | ", - { - "pluginId": "embeddable", - "scope": "public", - "docId": "kibEmbeddablePluginApi", - "section": "def-public.ErrorEmbeddable", - "text": "ErrorEmbeddable" - }, - ">" - ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx", + "path": "src/plugins/dashboard/common/types.ts", "deprecated": false, - "trackAdoption": false, - "children": [ - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerFactoryDefinition.create.$1", - "type": "Object", - "tags": [], - "label": "initialInput", - "description": [], - "signature": [ - { - "pluginId": "dashboard", - "scope": "public", - "docId": "kibDashboardPluginApi", - "section": "def-public.DashboardContainerInput", - "text": "DashboardContainerInput" - } - ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx", - "deprecated": false, - "trackAdoption": false, - "isRequired": true - }, - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerFactoryDefinition.create.$2", - "type": "Object", - "tags": [], - "label": "parent", - "description": [], - "signature": [ - { - "pluginId": "embeddable", - "scope": "public", - "docId": "kibEmbeddablePluginApi", - "section": "def-public.Container", - "text": "Container" - }, - "<{}, ", - { - "pluginId": "embeddable", - "scope": "public", - "docId": "kibEmbeddablePluginApi", - "section": "def-public.ContainerInput", - "text": "ContainerInput" - }, - "<{}>, ", - { - "pluginId": "embeddable", - "scope": "public", - "docId": "kibEmbeddablePluginApi", - "section": "def-public.ContainerOutput", - "text": "ContainerOutput" - }, - "> | undefined" - ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx", - "deprecated": false, - "trackAdoption": false, - "isRequired": false - } + "trackAdoption": false + }, + { + "parentPluginId": "dashboard", + "id": "def-public.SavedDashboardPanel.version", + "type": "string", + "tags": [], + "label": "version", + "description": [], + "path": "src/plugins/dashboard/common/types.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "dashboard", + "id": "def-public.SavedDashboardPanel.title", + "type": "string", + "tags": [], + "label": "title", + "description": [], + "signature": [ + "string | undefined" ], - "returnComment": [] + "path": "src/plugins/dashboard/common/types.ts", + "deprecated": false, + "trackAdoption": false } ], "initialIsOpen": false } ], - "functions": [ + "enums": [], + "misc": [ { "parentPluginId": "dashboard", - "id": "def-public.cleanEmptyKeys", - "type": "Function", + "id": "def-public.DASHBOARD_CONTAINER_TYPE", + "type": "string", "tags": [], - "label": "cleanEmptyKeys", + "label": "DASHBOARD_CONTAINER_TYPE", "description": [], "signature": [ - "(stateObj: Record) => Record" + "\"dashboard\"" ], - "path": "src/plugins/dashboard/public/locator.ts", + "path": "src/plugins/dashboard/public/dashboard_constants.ts", "deprecated": false, "trackAdoption": false, - "children": [ - { - "parentPluginId": "dashboard", - "id": "def-public.cleanEmptyKeys.$1", - "type": "Object", - "tags": [], - "label": "stateObj", - "description": [], - "signature": [ - "Record" - ], - "path": "src/plugins/dashboard/public/locator.ts", - "deprecated": false, - "trackAdoption": false, - "isRequired": true - } - ], - "returnComment": [], "initialIsOpen": false }, { "parentPluginId": "dashboard", - "id": "def-public.createDashboardEditUrl", - "type": "Function", + "id": "def-public.DashboardAppLocator", + "type": "Type", "tags": [], - "label": "createDashboardEditUrl", + "label": "DashboardAppLocator", "description": [], "signature": [ - "(id: string | undefined, editMode: boolean | undefined) => string" - ], - "path": "src/plugins/dashboard/public/dashboard_constants.ts", - "deprecated": false, - "trackAdoption": false, - "children": [ { - "parentPluginId": "dashboard", - "id": "def-public.createDashboardEditUrl.$1", - "type": "string", - "tags": [], - "label": "id", - "description": [], - "signature": [ - "string | undefined" - ], - "path": "src/plugins/dashboard/public/dashboard_constants.ts", - "deprecated": false, - "trackAdoption": false, - "isRequired": false + "pluginId": "share", + "scope": "common", + "docId": "kibSharePluginApi", + "section": "def-common.LocatorPublic", + "text": "LocatorPublic" }, + "<", { - "parentPluginId": "dashboard", - "id": "def-public.createDashboardEditUrl.$2", - "type": "CompoundType", - "tags": [], - "label": "editMode", - "description": [], - "signature": [ - "boolean | undefined" - ], - "path": "src/plugins/dashboard/public/dashboard_constants.ts", - "deprecated": false, - "trackAdoption": false, - "isRequired": false - } + "pluginId": "dashboard", + "scope": "public", + "docId": "kibDashboardPluginApi", + "section": "def-public.DashboardAppLocatorParams", + "text": "DashboardAppLocatorParams" + }, + ">" ], - "returnComment": [], + "path": "src/plugins/dashboard/public/locator.ts", + "deprecated": false, + "trackAdoption": false, "initialIsOpen": false - } - ], - "interfaces": [ + }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerInput", - "type": "Interface", + "id": "def-public.DashboardAppLocatorParams", + "type": "Type", "tags": [], - "label": "DashboardContainerInput", - "description": [], + "label": "DashboardAppLocatorParams", + "description": [ + "\nWe use `type` instead of `interface` to avoid having to extend this type with\n`SerializableRecord`. See https://github.com/microsoft/TypeScript/issues/15300." + ], "signature": [ + "{ dashboardId?: string | undefined; timeRange?: ", + "TimeRange", + " | undefined; refreshInterval?: ", { - "pluginId": "dashboard", - "scope": "public", - "docId": "kibDashboardPluginApi", - "section": "def-public.DashboardContainerInput", - "text": "DashboardContainerInput" + "pluginId": "data", + "scope": "common", + "docId": "kibDataQueryPluginApi", + "section": "def-common.RefreshInterval", + "text": "RefreshInterval" }, - " extends ", + " | undefined; filters?: ", + "Filter", + "[] | undefined; query?: ", + "Query", + " | undefined; useHash?: boolean | undefined; preserveSavedFilters?: boolean | undefined; viewMode?: ", { "pluginId": "embeddable", - "scope": "public", + "scope": "common", "docId": "kibEmbeddablePluginApi", - "section": "def-public.ContainerInput", - "text": "ContainerInput" + "section": "def-common.ViewMode", + "text": "ViewMode" }, - "<{}>" + " | undefined; searchSessionId?: string | undefined; panels?: (", + { + "pluginId": "dashboard", + "scope": "common", + "docId": "kibDashboardPluginApi", + "section": "def-common.SavedDashboardPanel", + "text": "SavedDashboardPanel" + }, + " & ", + "SerializableRecord", + ")[] | undefined; savedQuery?: string | undefined; tags?: string[] | undefined; options?: ", + "DashboardOptions", + " | undefined; controlGroupInput?: ", + { + "pluginId": "controls", + "scope": "common", + "docId": "kibControlsPluginApi", + "section": "def-common.SerializableControlGroupInput", + "text": "SerializableControlGroupInput" + }, + " | undefined; }" ], - "path": "src/plugins/dashboard/public/types.ts", + "path": "src/plugins/dashboard/public/locator.ts", + "deprecated": false, + "trackAdoption": false, + "initialIsOpen": false + } + ], + "objects": [ + { + "parentPluginId": "dashboard", + "id": "def-public.DashboardConstants", + "type": "Object", + "tags": [], + "label": "DashboardConstants", + "description": [], + "path": "src/plugins/dashboard/public/dashboard_constants.ts", "deprecated": false, "trackAdoption": false, "children": [ { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerInput.controlGroupInput", - "type": "Object", + "id": "def-public.DashboardConstants.LANDING_PAGE_PATH", + "type": "string", "tags": [], - "label": "controlGroupInput", + "label": "LANDING_PAGE_PATH", "description": [], - "signature": [ - { - "pluginId": "controls", - "scope": "common", - "docId": "kibControlsPluginApi", - "section": "def-common.PersistableControlGroupInput", - "text": "PersistableControlGroupInput" - }, - " | undefined" - ], - "path": "src/plugins/dashboard/public/types.ts", + "path": "src/plugins/dashboard/public/dashboard_constants.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerInput.refreshConfig", - "type": "Object", + "id": "def-public.DashboardConstants.CREATE_NEW_DASHBOARD_URL", + "type": "string", "tags": [], - "label": "refreshConfig", + "label": "CREATE_NEW_DASHBOARD_URL", "description": [], - "signature": [ - { - "pluginId": "data", - "scope": "common", - "docId": "kibDataQueryPluginApi", - "section": "def-common.RefreshInterval", - "text": "RefreshInterval" - }, - " | undefined" - ], - "path": "src/plugins/dashboard/public/types.ts", + "path": "src/plugins/dashboard/public/dashboard_constants.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerInput.isEmbeddedExternally", - "type": "CompoundType", + "id": "def-public.DashboardConstants.VIEW_DASHBOARD_URL", + "type": "string", "tags": [], - "label": "isEmbeddedExternally", + "label": "VIEW_DASHBOARD_URL", "description": [], - "signature": [ - "boolean | undefined" - ], - "path": "src/plugins/dashboard/public/types.ts", + "path": "src/plugins/dashboard/public/dashboard_constants.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerInput.isFullScreenMode", - "type": "boolean", + "id": "def-public.DashboardConstants.PRINT_DASHBOARD_URL", + "type": "string", "tags": [], - "label": "isFullScreenMode", + "label": "PRINT_DASHBOARD_URL", "description": [], - "path": "src/plugins/dashboard/public/types.ts", + "path": "src/plugins/dashboard/public/dashboard_constants.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerInput.expandedPanelId", + "id": "def-public.DashboardConstants.ADD_EMBEDDABLE_ID", "type": "string", "tags": [], - "label": "expandedPanelId", + "label": "ADD_EMBEDDABLE_ID", "description": [], - "signature": [ - "string | undefined" - ], - "path": "src/plugins/dashboard/public/types.ts", + "path": "src/plugins/dashboard/public/dashboard_constants.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerInput.timeRange", - "type": "Object", + "id": "def-public.DashboardConstants.ADD_EMBEDDABLE_TYPE", + "type": "string", "tags": [], - "label": "timeRange", + "label": "ADD_EMBEDDABLE_TYPE", "description": [], - "signature": [ - "{ from: string; to: string; mode?: \"absolute\" | \"relative\" | undefined; }" - ], - "path": "src/plugins/dashboard/public/types.ts", + "path": "src/plugins/dashboard/public/dashboard_constants.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerInput.timeslice", - "type": "Object", + "id": "def-public.DashboardConstants.DASHBOARDS_ID", + "type": "string", "tags": [], - "label": "timeslice", + "label": "DASHBOARDS_ID", "description": [], - "signature": [ - "[number, number] | undefined" - ], - "path": "src/plugins/dashboard/public/types.ts", + "path": "src/plugins/dashboard/public/dashboard_constants.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerInput.timeRestore", - "type": "boolean", + "id": "def-public.DashboardConstants.DASHBOARD_ID", + "type": "string", "tags": [], - "label": "timeRestore", + "label": "DASHBOARD_ID", "description": [], - "path": "src/plugins/dashboard/public/types.ts", + "path": "src/plugins/dashboard/public/dashboard_constants.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerInput.description", + "id": "def-public.DashboardConstants.DASHBOARD_SAVED_OBJECT_TYPE", "type": "string", "tags": [], - "label": "description", + "label": "DASHBOARD_SAVED_OBJECT_TYPE", "description": [], - "signature": [ - "string | undefined" - ], - "path": "src/plugins/dashboard/public/types.ts", + "path": "src/plugins/dashboard/public/dashboard_constants.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerInput.useMargins", - "type": "boolean", + "id": "def-public.DashboardConstants.SEARCH_SESSION_ID", + "type": "string", "tags": [], - "label": "useMargins", + "label": "SEARCH_SESSION_ID", "description": [], - "path": "src/plugins/dashboard/public/types.ts", + "path": "src/plugins/dashboard/public/dashboard_constants.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerInput.syncColors", - "type": "CompoundType", + "id": "def-public.DashboardConstants.CHANGE_CHECK_DEBOUNCE", + "type": "number", "tags": [], - "label": "syncColors", + "label": "CHANGE_CHECK_DEBOUNCE", "description": [], - "signature": [ - "boolean | undefined" - ], - "path": "src/plugins/dashboard/public/types.ts", + "path": "src/plugins/dashboard/public/dashboard_constants.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerInput.syncTooltips", - "type": "CompoundType", + "id": "def-public.DashboardConstants.CHANGE_APPLY_DEBOUNCE", + "type": "number", "tags": [], - "label": "syncTooltips", + "label": "CHANGE_APPLY_DEBOUNCE", "description": [], - "signature": [ - "boolean | undefined" - ], - "path": "src/plugins/dashboard/public/types.ts", + "path": "src/plugins/dashboard/public/dashboard_constants.ts", "deprecated": false, "trackAdoption": false - }, + } + ], + "initialIsOpen": false + } + ], + "setup": { + "parentPluginId": "dashboard", + "id": "def-public.DashboardSetup", + "type": "Interface", + "tags": [], + "label": "DashboardSetup", + "description": [], + "path": "src/plugins/dashboard/public/plugin.tsx", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "dashboard", + "id": "def-public.DashboardSetup.locator", + "type": "Object", + "tags": [], + "label": "locator", + "description": [], + "signature": [ + { + "pluginId": "dashboard", + "scope": "public", + "docId": "kibDashboardPluginApi", + "section": "def-public.DashboardAppLocator", + "text": "DashboardAppLocator" + }, + " | undefined" + ], + "path": "src/plugins/dashboard/public/plugin.tsx", + "deprecated": false, + "trackAdoption": false + } + ], + "lifecycle": "setup", + "initialIsOpen": true + }, + "start": { + "parentPluginId": "dashboard", + "id": "def-public.DashboardStart", + "type": "Interface", + "tags": [], + "label": "DashboardStart", + "description": [], + "path": "src/plugins/dashboard/public/plugin.tsx", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "dashboard", + "id": "def-public.DashboardStart.getDashboardContainerByValueRenderer", + "type": "Function", + "tags": [], + "label": "getDashboardContainerByValueRenderer", + "description": [], + "signature": [ + "() => React.FC" + ], + "path": "src/plugins/dashboard/public/plugin.tsx", + "deprecated": false, + "trackAdoption": false, + "children": [], + "returnComment": [] + }, + { + "parentPluginId": "dashboard", + "id": "def-public.DashboardStart.locator", + "type": "Object", + "tags": [], + "label": "locator", + "description": [], + "signature": [ + { + "pluginId": "dashboard", + "scope": "public", + "docId": "kibDashboardPluginApi", + "section": "def-public.DashboardAppLocator", + "text": "DashboardAppLocator" + }, + " | undefined" + ], + "path": "src/plugins/dashboard/public/plugin.tsx", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "dashboard", + "id": "def-public.DashboardStart.dashboardFeatureFlagConfig", + "type": "Object", + "tags": [], + "label": "dashboardFeatureFlagConfig", + "description": [], + "signature": [ + { + "pluginId": "dashboard", + "scope": "public", + "docId": "kibDashboardPluginApi", + "section": "def-public.DashboardFeatureFlagConfig", + "text": "DashboardFeatureFlagConfig" + } + ], + "path": "src/plugins/dashboard/public/plugin.tsx", + "deprecated": false, + "trackAdoption": false + } + ], + "lifecycle": "start", + "initialIsOpen": true + } + }, + "server": { + "classes": [], + "functions": [ + { + "parentPluginId": "dashboard", + "id": "def-server.findByValueEmbeddables", + "type": "Function", + "tags": [], + "label": "findByValueEmbeddables", + "description": [], + "signature": [ + "(savedObjectClient: Pick<", + "ISavedObjectsRepository", + ", \"find\">, embeddableType: string) => Promise<{ [key: string]: ", + "Serializable", + "; }[]>" + ], + "path": "src/plugins/dashboard/server/usage/find_by_value_embeddables.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerInput.viewMode", - "type": "Enum", + "id": "def-server.findByValueEmbeddables.$1", + "type": "Object", "tags": [], - "label": "viewMode", + "label": "savedObjectClient", "description": [], "signature": [ - { - "pluginId": "embeddable", - "scope": "common", - "docId": "kibEmbeddablePluginApi", - "section": "def-common.ViewMode", - "text": "ViewMode" - } + "Pick<", + "ISavedObjectsRepository", + ", \"find\">" ], - "path": "src/plugins/dashboard/public/types.ts", + "path": "src/plugins/dashboard/server/usage/find_by_value_embeddables.ts", "deprecated": false, - "trackAdoption": false + "trackAdoption": false, + "isRequired": true }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerInput.filters", - "type": "Array", + "id": "def-server.findByValueEmbeddables.$2", + "type": "string", "tags": [], - "label": "filters", + "label": "embeddableType", "description": [], "signature": [ - "Filter", - "[]" + "string" ], - "path": "src/plugins/dashboard/public/types.ts", + "path": "src/plugins/dashboard/server/usage/find_by_value_embeddables.ts", "deprecated": false, - "trackAdoption": false + "trackAdoption": false, + "isRequired": true + } + ], + "returnComment": [], + "initialIsOpen": false + } + ], + "interfaces": [], + "enums": [], + "misc": [], + "objects": [], + "setup": { + "parentPluginId": "dashboard", + "id": "def-server.DashboardPluginSetup", + "type": "Interface", + "tags": [], + "label": "DashboardPluginSetup", + "description": [], + "path": "src/plugins/dashboard/server/types.ts", + "deprecated": false, + "trackAdoption": false, + "children": [], + "lifecycle": "setup", + "initialIsOpen": true + }, + "start": { + "parentPluginId": "dashboard", + "id": "def-server.DashboardPluginStart", + "type": "Interface", + "tags": [], + "label": "DashboardPluginStart", + "description": [], + "path": "src/plugins/dashboard/server/types.ts", + "deprecated": false, + "trackAdoption": false, + "children": [], + "lifecycle": "start", + "initialIsOpen": true + } + }, + "common": { + "classes": [], + "functions": [ + { + "parentPluginId": "dashboard", + "id": "def-common.convertPanelMapToSavedPanels", + "type": "Function", + "tags": [], + "label": "convertPanelMapToSavedPanels", + "description": [], + "signature": [ + "(panels: ", + { + "pluginId": "dashboard", + "scope": "common", + "docId": "kibDashboardPluginApi", + "section": "def-common.DashboardPanelMap", + "text": "DashboardPanelMap" + }, + ", version: string) => ", + { + "pluginId": "dashboard", + "scope": "common", + "docId": "kibDashboardPluginApi", + "section": "def-common.SavedDashboardPanel", + "text": "SavedDashboardPanel" }, + "[]" + ], + "path": "src/plugins/dashboard/common/lib/dashboard_panel_converters.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerInput.title", - "type": "string", + "id": "def-common.convertPanelMapToSavedPanels.$1", + "type": "Object", "tags": [], - "label": "title", + "label": "panels", "description": [], - "path": "src/plugins/dashboard/public/types.ts", + "signature": [ + { + "pluginId": "dashboard", + "scope": "common", + "docId": "kibDashboardPluginApi", + "section": "def-common.DashboardPanelMap", + "text": "DashboardPanelMap" + } + ], + "path": "src/plugins/dashboard/common/lib/dashboard_panel_converters.ts", "deprecated": false, - "trackAdoption": false + "trackAdoption": false, + "isRequired": true }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerInput.query", - "type": "Object", + "id": "def-common.convertPanelMapToSavedPanels.$2", + "type": "string", "tags": [], - "label": "query", + "label": "version", "description": [], "signature": [ - "{ query: string | { [key: string]: any; }; language: string; }" + "string" ], - "path": "src/plugins/dashboard/public/types.ts", + "path": "src/plugins/dashboard/common/lib/dashboard_panel_converters.ts", "deprecated": false, - "trackAdoption": false + "trackAdoption": false, + "isRequired": true + } + ], + "returnComment": [], + "initialIsOpen": false + }, + { + "parentPluginId": "dashboard", + "id": "def-common.convertPanelStateToSavedDashboardPanel", + "type": "Function", + "tags": [], + "label": "convertPanelStateToSavedDashboardPanel", + "description": [], + "signature": [ + "(panelState: ", + { + "pluginId": "dashboard", + "scope": "common", + "docId": "kibDashboardPluginApi", + "section": "def-common.DashboardPanelState", + "text": "DashboardPanelState" + }, + "<", + { + "pluginId": "embeddable", + "scope": "common", + "docId": "kibEmbeddablePluginApi", + "section": "def-common.SavedObjectEmbeddableInput", + "text": "SavedObjectEmbeddableInput" }, + ">, version: string) => ", + { + "pluginId": "dashboard", + "scope": "common", + "docId": "kibDashboardPluginApi", + "section": "def-common.SavedDashboardPanel", + "text": "SavedDashboardPanel" + } + ], + "path": "src/plugins/dashboard/common/lib/dashboard_panel_converters.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerInput.panels", + "id": "def-common.convertPanelStateToSavedDashboardPanel.$1", "type": "Object", "tags": [], - "label": "panels", + "label": "panelState", "description": [], "signature": [ - "{ [panelId: string]: ", - "DashboardPanelState", + { + "pluginId": "dashboard", + "scope": "common", + "docId": "kibDashboardPluginApi", + "section": "def-common.DashboardPanelState", + "text": "DashboardPanelState" + }, "<", { "pluginId": "embeddable", "scope": "common", "docId": "kibEmbeddablePluginApi", - "section": "def-common.EmbeddableInput", - "text": "EmbeddableInput" + "section": "def-common.SavedObjectEmbeddableInput", + "text": "SavedObjectEmbeddableInput" }, - " & { [k: string]: unknown; }>; }" + ">" ], - "path": "src/plugins/dashboard/public/types.ts", + "path": "src/plugins/dashboard/common/lib/dashboard_panel_converters.ts", "deprecated": false, - "trackAdoption": false + "trackAdoption": false, + "isRequired": true }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardContainerInput.executionContext", - "type": "Object", + "id": "def-common.convertPanelStateToSavedDashboardPanel.$2", + "type": "string", "tags": [], - "label": "executionContext", + "label": "version", "description": [], "signature": [ - "KibanaExecutionContext", - " | undefined" + "string" ], - "path": "src/plugins/dashboard/public/types.ts", + "path": "src/plugins/dashboard/common/lib/dashboard_panel_converters.ts", "deprecated": false, - "trackAdoption": false + "trackAdoption": false, + "isRequired": true } ], + "returnComment": [], "initialIsOpen": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardFeatureFlagConfig", - "type": "Interface", + "id": "def-common.convertSavedDashboardPanelToPanelState", + "type": "Function", "tags": [], - "label": "DashboardFeatureFlagConfig", + "label": "convertSavedDashboardPanelToPanelState", "description": [], - "path": "src/plugins/dashboard/public/plugin.tsx", + "signature": [ + "(savedDashboardPanel: ", + { + "pluginId": "dashboard", + "scope": "common", + "docId": "kibDashboardPluginApi", + "section": "def-common.SavedDashboardPanel", + "text": "SavedDashboardPanel" + }, + ") => ", + { + "pluginId": "dashboard", + "scope": "common", + "docId": "kibDashboardPluginApi", + "section": "def-common.DashboardPanelState", + "text": "DashboardPanelState" + }, + "" + ], + "path": "src/plugins/dashboard/common/lib/dashboard_panel_converters.ts", "deprecated": false, "trackAdoption": false, "children": [ { "parentPluginId": "dashboard", - "id": "def-public.DashboardFeatureFlagConfig.allowByValueEmbeddables", - "type": "boolean", + "id": "def-common.convertSavedDashboardPanelToPanelState.$1", + "type": "Object", "tags": [], - "label": "allowByValueEmbeddables", + "label": "savedDashboardPanel", "description": [], - "path": "src/plugins/dashboard/public/plugin.tsx", + "signature": [ + { + "pluginId": "dashboard", + "scope": "common", + "docId": "kibDashboardPluginApi", + "section": "def-common.SavedDashboardPanel", + "text": "SavedDashboardPanel" + } + ], + "path": "src/plugins/dashboard/common/lib/dashboard_panel_converters.ts", "deprecated": false, - "trackAdoption": false + "trackAdoption": false, + "isRequired": true } ], + "returnComment": [], "initialIsOpen": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardSavedObject", - "type": "Interface", + "id": "def-common.convertSavedPanelsToPanelMap", + "type": "Function", "tags": [], - "label": "DashboardSavedObject", + "label": "convertSavedPanelsToPanelMap", "description": [], "signature": [ + "(panels?: ", { "pluginId": "dashboard", - "scope": "public", + "scope": "common", "docId": "kibDashboardPluginApi", - "section": "def-public.DashboardSavedObject", - "text": "DashboardSavedObject" + "section": "def-common.SavedDashboardPanel", + "text": "SavedDashboardPanel" }, - " extends ", + "[] | undefined) => ", { - "pluginId": "savedObjects", - "scope": "public", - "docId": "kibSavedObjectsPluginApi", - "section": "def-public.SavedObject", - "text": "SavedObject" - }, - "<", - "SavedObjectAttributes", - ">" + "pluginId": "dashboard", + "scope": "common", + "docId": "kibDashboardPluginApi", + "section": "def-common.DashboardPanelMap", + "text": "DashboardPanelMap" + } ], - "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts", + "path": "src/plugins/dashboard/common/lib/dashboard_panel_converters.ts", "deprecated": false, "trackAdoption": false, "children": [ { "parentPluginId": "dashboard", - "id": "def-public.DashboardSavedObject.id", - "type": "string", + "id": "def-common.convertSavedPanelsToPanelMap.$1", + "type": "Array", "tags": [], - "label": "id", + "label": "panels", "description": [], "signature": [ - "string | undefined" + { + "pluginId": "dashboard", + "scope": "common", + "docId": "kibDashboardPluginApi", + "section": "def-common.SavedDashboardPanel", + "text": "SavedDashboardPanel" + }, + "[] | undefined" ], - "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts", + "path": "src/plugins/dashboard/common/lib/dashboard_panel_converters.ts", "deprecated": false, - "trackAdoption": false + "trackAdoption": false, + "isRequired": false + } + ], + "returnComment": [], + "initialIsOpen": false + }, + { + "parentPluginId": "dashboard", + "id": "def-common.createExtract", + "type": "Function", + "tags": [], + "label": "createExtract", + "description": [], + "signature": [ + "(persistableStateService: ", + { + "pluginId": "embeddable", + "scope": "common", + "docId": "kibEmbeddablePluginApi", + "section": "def-common.EmbeddablePersistableStateService", + "text": "EmbeddablePersistableStateService" }, + ") => (state: ", { - "parentPluginId": "dashboard", - "id": "def-public.DashboardSavedObject.timeRestore", - "type": "boolean", - "tags": [], - "label": "timeRestore", - "description": [], - "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts", - "deprecated": false, - "trackAdoption": false + "pluginId": "embeddable", + "scope": "common", + "docId": "kibEmbeddablePluginApi", + "section": "def-common.EmbeddableStateWithType", + "text": "EmbeddableStateWithType" + }, + ") => { state: ", + { + "pluginId": "embeddable", + "scope": "common", + "docId": "kibEmbeddablePluginApi", + "section": "def-common.EmbeddableStateWithType", + "text": "EmbeddableStateWithType" }, + "; references: ", + "SavedObjectReference", + "[]; }" + ], + "path": "src/plugins/dashboard/common/persistable_state/dashboard_container_references.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ { "parentPluginId": "dashboard", - "id": "def-public.DashboardSavedObject.timeTo", - "type": "string", + "id": "def-common.createExtract.$1", + "type": "Object", "tags": [], - "label": "timeTo", + "label": "persistableStateService", "description": [], "signature": [ - "string | undefined" - ], - "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts", - "deprecated": false, - "trackAdoption": false - }, + { + "pluginId": "embeddable", + "scope": "common", + "docId": "kibEmbeddablePluginApi", + "section": "def-common.EmbeddablePersistableStateService", + "text": "EmbeddablePersistableStateService" + } + ], + "path": "src/plugins/dashboard/common/persistable_state/dashboard_container_references.ts", + "deprecated": false, + "trackAdoption": false, + "isRequired": true + } + ], + "returnComment": [], + "initialIsOpen": false + }, + { + "parentPluginId": "dashboard", + "id": "def-common.createInject", + "type": "Function", + "tags": [], + "label": "createInject", + "description": [], + "signature": [ + "(persistableStateService: ", + { + "pluginId": "embeddable", + "scope": "common", + "docId": "kibEmbeddablePluginApi", + "section": "def-common.EmbeddablePersistableStateService", + "text": "EmbeddablePersistableStateService" + }, + ") => (state: ", + { + "pluginId": "embeddable", + "scope": "common", + "docId": "kibEmbeddablePluginApi", + "section": "def-common.EmbeddableStateWithType", + "text": "EmbeddableStateWithType" + }, + ", references: ", + "SavedObjectReference", + "[]) => ", + { + "pluginId": "embeddable", + "scope": "common", + "docId": "kibEmbeddablePluginApi", + "section": "def-common.EmbeddableStateWithType", + "text": "EmbeddableStateWithType" + } + ], + "path": "src/plugins/dashboard/common/persistable_state/dashboard_container_references.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ { "parentPluginId": "dashboard", - "id": "def-public.DashboardSavedObject.timeFrom", - "type": "string", + "id": "def-common.createInject.$1", + "type": "Object", "tags": [], - "label": "timeFrom", + "label": "persistableStateService", "description": [], "signature": [ - "string | undefined" + { + "pluginId": "embeddable", + "scope": "common", + "docId": "kibEmbeddablePluginApi", + "section": "def-common.EmbeddablePersistableStateService", + "text": "EmbeddablePersistableStateService" + } + ], + "path": "src/plugins/dashboard/common/persistable_state/dashboard_container_references.ts", + "deprecated": false, + "trackAdoption": false, + "isRequired": true + } + ], + "returnComment": [], + "initialIsOpen": false + }, + { + "parentPluginId": "dashboard", + "id": "def-common.extractReferences", + "type": "Function", + "tags": [], + "label": "extractReferences", + "description": [], + "signature": [ + "({ attributes, references = [] }: SavedObjectAttributesAndReferences, deps: ", + "ExtractDeps", + ") => SavedObjectAttributesAndReferences" + ], + "path": "src/plugins/dashboard/common/persistable_state/dashboard_saved_object_references.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "dashboard", + "id": "def-common.extractReferences.$1", + "type": "Object", + "tags": [], + "label": "{ attributes, references = [] }", + "description": [], + "signature": [ + "SavedObjectAttributesAndReferences" + ], + "path": "src/plugins/dashboard/common/persistable_state/dashboard_saved_object_references.ts", + "deprecated": false, + "trackAdoption": false, + "isRequired": true + }, + { + "parentPluginId": "dashboard", + "id": "def-common.extractReferences.$2", + "type": "Object", + "tags": [], + "label": "deps", + "description": [], + "signature": [ + "ExtractDeps" + ], + "path": "src/plugins/dashboard/common/persistable_state/dashboard_saved_object_references.ts", + "deprecated": false, + "trackAdoption": false, + "isRequired": true + } + ], + "returnComment": [], + "initialIsOpen": false + }, + { + "parentPluginId": "dashboard", + "id": "def-common.injectReferences", + "type": "Function", + "tags": [], + "label": "injectReferences", + "description": [], + "signature": [ + "({ attributes, references = [] }: SavedObjectAttributesAndReferences, deps: ", + "InjectDeps", + ") => ", + "SavedObjectAttributes" + ], + "path": "src/plugins/dashboard/common/persistable_state/dashboard_saved_object_references.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "dashboard", + "id": "def-common.injectReferences.$1", + "type": "Object", + "tags": [], + "label": "{ attributes, references = [] }", + "description": [], + "signature": [ + "SavedObjectAttributesAndReferences" + ], + "path": "src/plugins/dashboard/common/persistable_state/dashboard_saved_object_references.ts", + "deprecated": false, + "trackAdoption": false, + "isRequired": true + }, + { + "parentPluginId": "dashboard", + "id": "def-common.injectReferences.$2", + "type": "Object", + "tags": [], + "label": "deps", + "description": [], + "signature": [ + "InjectDeps" + ], + "path": "src/plugins/dashboard/common/persistable_state/dashboard_saved_object_references.ts", + "deprecated": false, + "trackAdoption": false, + "isRequired": true + } + ], + "returnComment": [], + "initialIsOpen": false + } + ], + "interfaces": [ + { + "parentPluginId": "dashboard", + "id": "def-common.DashboardAttributes", + "type": "Interface", + "tags": [], + "label": "DashboardAttributes", + "description": [ + "\nThe attributes of the dashboard saved object. This interface should be the\nsource of truth for the latest dashboard attributes shape after all migrations." + ], + "path": "src/plugins/dashboard/common/types.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "dashboard", + "id": "def-common.DashboardAttributes.controlGroupInput", + "type": "CompoundType", + "tags": [], + "label": "controlGroupInput", + "description": [], + "signature": [ + { + "pluginId": "controls", + "scope": "common", + "docId": "kibControlsPluginApi", + "section": "def-common.RawControlGroupAttributes", + "text": "RawControlGroupAttributes" + }, + " | undefined" ], - "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts", + "path": "src/plugins/dashboard/common/types.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardSavedObject.description", - "type": "string", + "id": "def-common.DashboardAttributes.refreshInterval", + "type": "Object", "tags": [], - "label": "description", + "label": "refreshInterval", "description": [], "signature": [ - "string | undefined" + { + "pluginId": "data", + "scope": "common", + "docId": "kibDataQueryPluginApi", + "section": "def-common.RefreshInterval", + "text": "RefreshInterval" + }, + " | undefined" ], - "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts", + "path": "src/plugins/dashboard/common/types.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardSavedObject.panelsJSON", - "type": "string", + "id": "def-common.DashboardAttributes.timeRestore", + "type": "boolean", "tags": [], - "label": "panelsJSON", + "label": "timeRestore", "description": [], - "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts", + "path": "src/plugins/dashboard/common/types.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardSavedObject.optionsJSON", + "id": "def-common.DashboardAttributes.optionsJSON", "type": "string", "tags": [], "label": "optionsJSON", @@ -1710,687 +1581,501 @@ "signature": [ "string | undefined" ], - "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts", + "path": "src/plugins/dashboard/common/types.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "dashboard", + "id": "def-common.DashboardAttributes.useMargins", + "type": "CompoundType", + "tags": [], + "label": "useMargins", + "description": [], + "signature": [ + "boolean | undefined" + ], + "path": "src/plugins/dashboard/common/types.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "dashboard", + "id": "def-common.DashboardAttributes.description", + "type": "string", + "tags": [], + "label": "description", + "description": [], + "path": "src/plugins/dashboard/common/types.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "dashboard", + "id": "def-common.DashboardAttributes.panelsJSON", + "type": "string", + "tags": [], + "label": "panelsJSON", + "description": [], + "path": "src/plugins/dashboard/common/types.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardSavedObject.uiStateJSON", + "id": "def-common.DashboardAttributes.timeFrom", "type": "string", "tags": [], - "label": "uiStateJSON", + "label": "timeFrom", "description": [], "signature": [ "string | undefined" ], - "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts", + "path": "src/plugins/dashboard/common/types.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardSavedObject.lastSavedTitle", - "type": "string", + "id": "def-common.DashboardAttributes.version", + "type": "number", "tags": [], - "label": "lastSavedTitle", + "label": "version", "description": [], - "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts", + "path": "src/plugins/dashboard/common/types.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardSavedObject.refreshInterval", - "type": "Object", + "id": "def-common.DashboardAttributes.timeTo", + "type": "string", "tags": [], - "label": "refreshInterval", + "label": "timeTo", "description": [], "signature": [ - { - "pluginId": "data", - "scope": "common", - "docId": "kibDataQueryPluginApi", - "section": "def-common.RefreshInterval", - "text": "RefreshInterval" - }, - " | undefined" + "string | undefined" ], - "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts", + "path": "src/plugins/dashboard/common/types.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "dashboard", + "id": "def-common.DashboardAttributes.title", + "type": "string", + "tags": [], + "label": "title", + "description": [], + "path": "src/plugins/dashboard/common/types.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardSavedObject.searchSource", + "id": "def-common.DashboardAttributes.kibanaSavedObjectMeta", "type": "Object", "tags": [], - "label": "searchSource", + "label": "kibanaSavedObjectMeta", "description": [], "signature": [ - "{ create: () => ", - { - "pluginId": "data", - "scope": "common", - "docId": "kibDataSearchPluginApi", - "section": "def-common.SearchSource", - "text": "SearchSource" - }, - "; history: ", - "SearchRequest", - "[]; setOverwriteDataViewType: (overwriteType: string | false | undefined) => void; setField: (field: K, value: ", - { - "pluginId": "data", - "scope": "common", - "docId": "kibDataSearchPluginApi", - "section": "def-common.SearchSourceFields", - "text": "SearchSourceFields" - }, - "[K]) => ", - { - "pluginId": "data", - "scope": "common", - "docId": "kibDataSearchPluginApi", - "section": "def-common.SearchSource", - "text": "SearchSource" - }, - "; removeField: (field: K) => ", - { - "pluginId": "data", - "scope": "common", - "docId": "kibDataSearchPluginApi", - "section": "def-common.SearchSource", - "text": "SearchSource" - }, - "; setFields: (newFields: ", - { - "pluginId": "data", - "scope": "common", - "docId": "kibDataSearchPluginApi", - "section": "def-common.SearchSourceFields", - "text": "SearchSourceFields" - }, - ") => ", - { - "pluginId": "data", - "scope": "common", - "docId": "kibDataSearchPluginApi", - "section": "def-common.SearchSource", - "text": "SearchSource" - }, - "; getId: () => string; getFields: () => ", - { - "pluginId": "data", - "scope": "common", - "docId": "kibDataSearchPluginApi", - "section": "def-common.SearchSourceFields", - "text": "SearchSourceFields" - }, - "; getField: (field: K, recurse?: boolean) => ", - { - "pluginId": "data", - "scope": "common", - "docId": "kibDataSearchPluginApi", - "section": "def-common.SearchSourceFields", - "text": "SearchSourceFields" - }, - "[K]; getActiveIndexFilter: () => string[]; getOwnField: (field: K) => ", - { - "pluginId": "data", - "scope": "common", - "docId": "kibDataSearchPluginApi", - "section": "def-common.SearchSourceFields", - "text": "SearchSourceFields" - }, - "[K]; createCopy: () => ", - { - "pluginId": "data", - "scope": "common", - "docId": "kibDataSearchPluginApi", - "section": "def-common.SearchSource", - "text": "SearchSource" - }, - "; createChild: (options?: {}) => ", - { - "pluginId": "data", - "scope": "common", - "docId": "kibDataSearchPluginApi", - "section": "def-common.SearchSource", - "text": "SearchSource" - }, - "; setParent: (parent?: ", - { - "pluginId": "data", - "scope": "common", - "docId": "kibDataSearchPluginApi", - "section": "def-common.ISearchSource", - "text": "ISearchSource" - }, - " | undefined, options?: ", - { - "pluginId": "data", - "scope": "common", - "docId": "kibDataSearchPluginApi", - "section": "def-common.SearchSourceOptions", - "text": "SearchSourceOptions" - }, - ") => ", - { - "pluginId": "data", - "scope": "common", - "docId": "kibDataSearchPluginApi", - "section": "def-common.SearchSource", - "text": "SearchSource" - }, - "; getParent: () => ", - { - "pluginId": "data", - "scope": "common", - "docId": "kibDataSearchPluginApi", - "section": "def-common.SearchSource", - "text": "SearchSource" - }, - " | undefined; fetch$: (options?: ", - { - "pluginId": "data", - "scope": "common", - "docId": "kibDataSearchPluginApi", - "section": "def-common.SearchSourceSearchOptions", - "text": "SearchSourceSearchOptions" - }, - ") => ", - "Observable", - "<", + "{ searchSourceJSON: string; }" + ], + "path": "src/plugins/dashboard/common/types.ts", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "dashboard", + "id": "def-common.DashboardContainerStateWithType", + "type": "Interface", + "tags": [], + "label": "DashboardContainerStateWithType", + "description": [ + "--------------------------------------------------------------------\nDashboard container types\n -----------------------------------------------------------------------\n\nTypes below this line are copied here because so many important types are tied up in public. These types should be\nmoved from public into common." + ], + "signature": [ + { + "pluginId": "dashboard", + "scope": "common", + "docId": "kibDashboardPluginApi", + "section": "def-common.DashboardContainerStateWithType", + "text": "DashboardContainerStateWithType" + }, + " extends ", + { + "pluginId": "embeddable", + "scope": "common", + "docId": "kibEmbeddablePluginApi", + "section": "def-common.EmbeddableStateWithType", + "text": "EmbeddableStateWithType" + } + ], + "path": "src/plugins/dashboard/common/types.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "dashboard", + "id": "def-common.DashboardContainerStateWithType.panels", + "type": "Object", + "tags": [], + "label": "panels", + "description": [], + "signature": [ + "{ [panelId: string]: ", { - "pluginId": "data", + "pluginId": "dashboard", "scope": "common", - "docId": "kibDataSearchPluginApi", - "section": "def-common.IKibanaSearchResponse", - "text": "IKibanaSearchResponse" + "docId": "kibDashboardPluginApi", + "section": "def-common.DashboardPanelState", + "text": "DashboardPanelState" }, "<", - "SearchResponse", - ">>>; fetch: (options?: ", - { - "pluginId": "data", - "scope": "common", - "docId": "kibDataSearchPluginApi", - "section": "def-common.SearchSourceSearchOptions", - "text": "SearchSourceSearchOptions" - }, - ") => Promise<", - "SearchResponse", - ">>; onRequestStart: (handler: (searchSource: ", - { - "pluginId": "data", - "scope": "common", - "docId": "kibDataSearchPluginApi", - "section": "def-common.SearchSource", - "text": "SearchSource" - }, - ", options?: ", - { - "pluginId": "data", - "scope": "common", - "docId": "kibDataSearchPluginApi", - "section": "def-common.SearchSourceSearchOptions", - "text": "SearchSourceSearchOptions" - }, - " | undefined) => Promise) => void; getSearchRequestBody: () => any; destroy: () => void; getSerializedFields: (recurse?: boolean) => ", - { - "pluginId": "data", - "scope": "common", - "docId": "kibDataSearchPluginApi", - "section": "def-common.SerializedSearchSourceFields", - "text": "SerializedSearchSourceFields" - }, - "; serialize: () => { searchSourceJSON: string; references: ", - "SavedObjectReference", - "[]; }; toExpressionAst: ({ asDatatable }?: ExpressionAstOptions) => ", { - "pluginId": "expressions", + "pluginId": "embeddable", "scope": "common", - "docId": "kibExpressionsPluginApi", - "section": "def-common.ExpressionAstExpression", - "text": "ExpressionAstExpression" + "docId": "kibEmbeddablePluginApi", + "section": "def-common.EmbeddableInput", + "text": "EmbeddableInput" }, - "; parseActiveIndexPatternFromQueryString: (queryString: string) => string[]; }" + " & { [k: string]: unknown; }>; }" ], - "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts", + "path": "src/plugins/dashboard/common/types.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardSavedObject.getQuery", - "type": "Function", + "id": "def-common.DashboardContainerStateWithType.controlGroupInput", + "type": "Object", "tags": [], - "label": "getQuery", + "label": "controlGroupInput", "description": [], "signature": [ - "() => ", - "Query" + { + "pluginId": "controls", + "scope": "common", + "docId": "kibControlsPluginApi", + "section": "def-common.PersistableControlGroupInput", + "text": "PersistableControlGroupInput" + }, + " | undefined" ], - "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts", + "path": "src/plugins/dashboard/common/types.ts", "deprecated": false, - "trackAdoption": false, - "children": [], - "returnComment": [] - }, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "dashboard", + "id": "def-common.DashboardPanelMap", + "type": "Interface", + "tags": [], + "label": "DashboardPanelMap", + "description": [], + "path": "src/plugins/dashboard/common/types.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ { "parentPluginId": "dashboard", - "id": "def-public.DashboardSavedObject.getFilters", - "type": "Function", + "id": "def-common.DashboardPanelMap.Unnamed", + "type": "IndexSignature", "tags": [], - "label": "getFilters", + "label": "[key: string]: DashboardPanelState", "description": [], "signature": [ - "() => ", - "Filter", - "[]" + "[key: string]: ", + { + "pluginId": "dashboard", + "scope": "common", + "docId": "kibDashboardPluginApi", + "section": "def-common.DashboardPanelState", + "text": "DashboardPanelState" + }, + "<", + { + "pluginId": "embeddable", + "scope": "common", + "docId": "kibEmbeddablePluginApi", + "section": "def-common.SavedObjectEmbeddableInput", + "text": "SavedObjectEmbeddableInput" + }, + ">" ], - "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts", + "path": "src/plugins/dashboard/common/types.ts", "deprecated": false, - "trackAdoption": false, - "children": [], - "returnComment": [] + "trackAdoption": false + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "dashboard", + "id": "def-common.DashboardPanelState", + "type": "Interface", + "tags": [], + "label": "DashboardPanelState", + "description": [ + "--------------------------------------------------------------------\nDashboard panel types\n -----------------------------------------------------------------------\n\nThe dashboard panel format expected by the embeddable container." + ], + "signature": [ + { + "pluginId": "dashboard", + "scope": "common", + "docId": "kibDashboardPluginApi", + "section": "def-common.DashboardPanelState", + "text": "DashboardPanelState" }, + " extends ", + { + "pluginId": "embeddable", + "scope": "common", + "docId": "kibEmbeddablePluginApi", + "section": "def-common.PanelState", + "text": "PanelState" + }, + "" + ], + "path": "src/plugins/dashboard/common/types.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ { "parentPluginId": "dashboard", - "id": "def-public.DashboardSavedObject.getFullEditPath", - "type": "Function", + "id": "def-common.DashboardPanelState.gridData", + "type": "Object", "tags": [], - "label": "getFullEditPath", + "label": "gridData", "description": [], "signature": [ - "(editMode?: boolean | undefined) => string" - ], - "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts", - "deprecated": false, - "trackAdoption": false, - "children": [ { - "parentPluginId": "dashboard", - "id": "def-public.DashboardSavedObject.getFullEditPath.$1", - "type": "CompoundType", - "tags": [], - "label": "editMode", - "description": [], - "signature": [ - "boolean | undefined" - ], - "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts", - "deprecated": false, - "trackAdoption": false, - "isRequired": false + "pluginId": "dashboard", + "scope": "common", + "docId": "kibDashboardPluginApi", + "section": "def-common.GridData", + "text": "GridData" } ], - "returnComment": [] + "path": "src/plugins/dashboard/common/types.ts", + "deprecated": false, + "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardSavedObject.outcome", - "type": "CompoundType", + "id": "def-common.DashboardPanelState.panelRefName", + "type": "string", "tags": [], - "label": "outcome", + "label": "panelRefName", "description": [], "signature": [ - "\"exactMatch\" | \"aliasMatch\" | \"conflict\" | undefined" + "string | undefined" ], - "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts", + "path": "src/plugins/dashboard/common/types.ts", "deprecated": false, "trackAdoption": false - }, + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "dashboard", + "id": "def-common.GridData", + "type": "Interface", + "tags": [], + "label": "GridData", + "description": [ + "\nGrid type for React Grid Layout" + ], + "path": "src/plugins/dashboard/common/types.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ { "parentPluginId": "dashboard", - "id": "def-public.DashboardSavedObject.aliasId", - "type": "string", + "id": "def-common.GridData.w", + "type": "number", "tags": [], - "label": "aliasId", + "label": "w", "description": [], - "signature": [ - "string | undefined" - ], - "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts", + "path": "src/plugins/dashboard/common/types.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardSavedObject.aliasPurpose", - "type": "CompoundType", + "id": "def-common.GridData.h", + "type": "number", "tags": [], - "label": "aliasPurpose", + "label": "h", "description": [], - "signature": [ - "\"savedObjectConversion\" | \"savedObjectImport\" | undefined" - ], - "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts", + "path": "src/plugins/dashboard/common/types.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardSavedObject.controlGroupInput", - "type": "Object", + "id": "def-common.GridData.x", + "type": "number", "tags": [], - "label": "controlGroupInput", + "label": "x", "description": [], - "signature": [ - "Omit<", - { - "pluginId": "controls", - "scope": "common", - "docId": "kibControlsPluginApi", - "section": "def-common.RawControlGroupAttributes", - "text": "RawControlGroupAttributes" - }, - ", \"id\"> | undefined" - ], - "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts", + "path": "src/plugins/dashboard/common/types.ts", "deprecated": false, "trackAdoption": false - } - ], - "initialIsOpen": false - } - ], - "enums": [], - "misc": [ - { - "parentPluginId": "dashboard", - "id": "def-public.DASHBOARD_CONTAINER_TYPE", - "type": "string", - "tags": [], - "label": "DASHBOARD_CONTAINER_TYPE", - "description": [], - "signature": [ - "\"dashboard\"" - ], - "path": "src/plugins/dashboard/public/application/embeddable/dashboard_constants.ts", - "deprecated": false, - "trackAdoption": false, - "initialIsOpen": false - }, - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardAppLocator", - "type": "Type", - "tags": [], - "label": "DashboardAppLocator", - "description": [], - "signature": [ - { - "pluginId": "share", - "scope": "common", - "docId": "kibSharePluginApi", - "section": "def-common.LocatorPublic", - "text": "LocatorPublic" - }, - "<", - { - "pluginId": "dashboard", - "scope": "public", - "docId": "kibDashboardPluginApi", - "section": "def-public.DashboardAppLocatorParams", - "text": "DashboardAppLocatorParams" - }, - ">" - ], - "path": "src/plugins/dashboard/public/locator.ts", - "deprecated": false, - "trackAdoption": false, - "initialIsOpen": false - }, - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardAppLocatorParams", - "type": "Type", - "tags": [], - "label": "DashboardAppLocatorParams", - "description": [ - "\nWe use `type` instead of `interface` to avoid having to extend this type with\n`SerializableRecord`. See https://github.com/microsoft/TypeScript/issues/15300." - ], - "signature": [ - "{ dashboardId?: string | undefined; timeRange?: ", - "TimeRange", - " | undefined; refreshInterval?: ", - { - "pluginId": "data", - "scope": "common", - "docId": "kibDataQueryPluginApi", - "section": "def-common.RefreshInterval", - "text": "RefreshInterval" - }, - " | undefined; filters?: ", - "Filter", - "[] | undefined; query?: ", - "Query", - " | undefined; useHash?: boolean | undefined; preserveSavedFilters?: boolean | undefined; viewMode?: ", - { - "pluginId": "embeddable", - "scope": "common", - "docId": "kibEmbeddablePluginApi", - "section": "def-common.ViewMode", - "text": "ViewMode" }, - " | undefined; searchSessionId?: string | undefined; panels?: ", { - "pluginId": "dashboard", - "scope": "common", - "docId": "kibDashboardPluginApi", - "section": "def-common.SavedDashboardPanel730ToLatest", - "text": "SavedDashboardPanel730ToLatest" + "parentPluginId": "dashboard", + "id": "def-common.GridData.y", + "type": "number", + "tags": [], + "label": "y", + "description": [], + "path": "src/plugins/dashboard/common/types.ts", + "deprecated": false, + "trackAdoption": false }, - "[] | undefined; savedQuery?: string | undefined; tags?: string[] | undefined; options?: ", - "DashboardOptions", - " | undefined; controlGroupInput?: ", { - "pluginId": "controls", - "scope": "common", - "docId": "kibControlsPluginApi", - "section": "def-common.SerializableControlGroupInput", - "text": "SerializableControlGroupInput" - }, - " | undefined; }" + "parentPluginId": "dashboard", + "id": "def-common.GridData.i", + "type": "string", + "tags": [], + "label": "i", + "description": [], + "path": "src/plugins/dashboard/common/types.ts", + "deprecated": false, + "trackAdoption": false + } ], - "path": "src/plugins/dashboard/public/locator.ts", - "deprecated": false, - "trackAdoption": false, "initialIsOpen": false }, { "parentPluginId": "dashboard", - "id": "def-public.SavedDashboardPanel", - "type": "Type", + "id": "def-common.SavedDashboardPanel", + "type": "Interface", "tags": [], "label": "SavedDashboardPanel", "description": [ - "\nThis should always represent the latest dashboard panel shape, after all possible migrations." - ], - "signature": [ - "Pick<", - { - "pluginId": "dashboard", - "scope": "common", - "docId": "kibDashboardPluginApi", - "section": "def-common.RawSavedDashboardPanel730ToLatest", - "text": "RawSavedDashboardPanel730ToLatest" - }, - ", \"type\" | \"title\" | \"panelIndex\" | \"gridData\" | \"version\" | \"embeddableConfig\" | \"panelRefName\"> & { readonly id?: string | undefined; readonly type: string; }" + "\nA saved dashboard panel parsed directly from the Dashboard Attributes panels JSON" ], "path": "src/plugins/dashboard/common/types.ts", "deprecated": false, "trackAdoption": false, - "initialIsOpen": false - } - ], - "objects": [ - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardConstants", - "type": "Object", - "tags": [], - "label": "DashboardConstants", - "description": [], - "path": "src/plugins/dashboard/public/dashboard_constants.ts", - "deprecated": false, - "trackAdoption": false, "children": [ { "parentPluginId": "dashboard", - "id": "def-public.DashboardConstants.LANDING_PAGE_PATH", - "type": "string", - "tags": [], - "label": "LANDING_PAGE_PATH", - "description": [], - "path": "src/plugins/dashboard/public/dashboard_constants.ts", - "deprecated": false, - "trackAdoption": false - }, - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardConstants.CREATE_NEW_DASHBOARD_URL", - "type": "string", + "id": "def-common.SavedDashboardPanel.embeddableConfig", + "type": "Object", "tags": [], - "label": "CREATE_NEW_DASHBOARD_URL", + "label": "embeddableConfig", "description": [], - "path": "src/plugins/dashboard/public/dashboard_constants.ts", + "signature": [ + "{ [key: string]: ", + "Serializable", + "; }" + ], + "path": "src/plugins/dashboard/common/types.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardConstants.VIEW_DASHBOARD_URL", + "id": "def-common.SavedDashboardPanel.id", "type": "string", "tags": [], - "label": "VIEW_DASHBOARD_URL", + "label": "id", "description": [], - "path": "src/plugins/dashboard/public/dashboard_constants.ts", + "signature": [ + "string | undefined" + ], + "path": "src/plugins/dashboard/common/types.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardConstants.PRINT_DASHBOARD_URL", + "id": "def-common.SavedDashboardPanel.type", "type": "string", "tags": [], - "label": "PRINT_DASHBOARD_URL", + "label": "type", "description": [], - "path": "src/plugins/dashboard/public/dashboard_constants.ts", + "path": "src/plugins/dashboard/common/types.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardConstants.ADD_EMBEDDABLE_ID", + "id": "def-common.SavedDashboardPanel.panelRefName", "type": "string", "tags": [], - "label": "ADD_EMBEDDABLE_ID", + "label": "panelRefName", "description": [], - "path": "src/plugins/dashboard/public/dashboard_constants.ts", + "signature": [ + "string | undefined" + ], + "path": "src/plugins/dashboard/common/types.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardConstants.ADD_EMBEDDABLE_TYPE", - "type": "string", + "id": "def-common.SavedDashboardPanel.gridData", + "type": "Object", "tags": [], - "label": "ADD_EMBEDDABLE_TYPE", + "label": "gridData", "description": [], - "path": "src/plugins/dashboard/public/dashboard_constants.ts", + "signature": [ + { + "pluginId": "dashboard", + "scope": "common", + "docId": "kibDashboardPluginApi", + "section": "def-common.GridData", + "text": "GridData" + } + ], + "path": "src/plugins/dashboard/common/types.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardConstants.DASHBOARDS_ID", + "id": "def-common.SavedDashboardPanel.panelIndex", "type": "string", "tags": [], - "label": "DASHBOARDS_ID", + "label": "panelIndex", "description": [], - "path": "src/plugins/dashboard/public/dashboard_constants.ts", + "path": "src/plugins/dashboard/common/types.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardConstants.DASHBOARD_ID", + "id": "def-common.SavedDashboardPanel.version", "type": "string", "tags": [], - "label": "DASHBOARD_ID", + "label": "version", "description": [], - "path": "src/plugins/dashboard/public/dashboard_constants.ts", + "path": "src/plugins/dashboard/common/types.ts", "deprecated": false, "trackAdoption": false }, { "parentPluginId": "dashboard", - "id": "def-public.DashboardConstants.SEARCH_SESSION_ID", + "id": "def-common.SavedDashboardPanel.title", "type": "string", "tags": [], - "label": "SEARCH_SESSION_ID", - "description": [], - "path": "src/plugins/dashboard/public/dashboard_constants.ts", - "deprecated": false, - "trackAdoption": false - }, - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardConstants.CHANGE_CHECK_DEBOUNCE", - "type": "number", - "tags": [], - "label": "CHANGE_CHECK_DEBOUNCE", - "description": [], - "path": "src/plugins/dashboard/public/dashboard_constants.ts", - "deprecated": false, - "trackAdoption": false - }, - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardConstants.CHANGE_APPLY_DEBOUNCE", - "type": "number", - "tags": [], - "label": "CHANGE_APPLY_DEBOUNCE", + "label": "title", "description": [], - "path": "src/plugins/dashboard/public/dashboard_constants.ts", + "signature": [ + "string | undefined" + ], + "path": "src/plugins/dashboard/common/types.ts", "deprecated": false, "trackAdoption": false } @@ -2398,674 +2083,8 @@ "initialIsOpen": false } ], - "setup": { - "parentPluginId": "dashboard", - "id": "def-public.DashboardSetup", - "type": "Interface", - "tags": [], - "label": "DashboardSetup", - "description": [], - "path": "src/plugins/dashboard/public/plugin.tsx", - "deprecated": false, - "trackAdoption": false, - "children": [ - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardSetup.locator", - "type": "Object", - "tags": [], - "label": "locator", - "description": [], - "signature": [ - { - "pluginId": "dashboard", - "scope": "public", - "docId": "kibDashboardPluginApi", - "section": "def-public.DashboardAppLocator", - "text": "DashboardAppLocator" - }, - " | undefined" - ], - "path": "src/plugins/dashboard/public/plugin.tsx", - "deprecated": false, - "trackAdoption": false - } - ], - "lifecycle": "setup", - "initialIsOpen": true - }, - "start": { - "parentPluginId": "dashboard", - "id": "def-public.DashboardStart", - "type": "Interface", - "tags": [], - "label": "DashboardStart", - "description": [], - "path": "src/plugins/dashboard/public/plugin.tsx", - "deprecated": false, - "trackAdoption": false, - "children": [ - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardStart.getSavedDashboardLoader", - "type": "Function", - "tags": [], - "label": "getSavedDashboardLoader", - "description": [], - "signature": [ - "() => ", - "SavedObjectLoader" - ], - "path": "src/plugins/dashboard/public/plugin.tsx", - "deprecated": false, - "trackAdoption": false, - "children": [], - "returnComment": [] - }, - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardStart.getDashboardContainerByValueRenderer", - "type": "Function", - "tags": [], - "label": "getDashboardContainerByValueRenderer", - "description": [], - "signature": [ - "() => React.FC" - ], - "path": "src/plugins/dashboard/public/plugin.tsx", - "deprecated": false, - "trackAdoption": false, - "children": [], - "returnComment": [] - }, - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardStart.locator", - "type": "Object", - "tags": [], - "label": "locator", - "description": [], - "signature": [ - { - "pluginId": "dashboard", - "scope": "public", - "docId": "kibDashboardPluginApi", - "section": "def-public.DashboardAppLocator", - "text": "DashboardAppLocator" - }, - " | undefined" - ], - "path": "src/plugins/dashboard/public/plugin.tsx", - "deprecated": false, - "trackAdoption": false - }, - { - "parentPluginId": "dashboard", - "id": "def-public.DashboardStart.dashboardFeatureFlagConfig", - "type": "Object", - "tags": [], - "label": "dashboardFeatureFlagConfig", - "description": [], - "signature": [ - { - "pluginId": "dashboard", - "scope": "public", - "docId": "kibDashboardPluginApi", - "section": "def-public.DashboardFeatureFlagConfig", - "text": "DashboardFeatureFlagConfig" - } - ], - "path": "src/plugins/dashboard/public/plugin.tsx", - "deprecated": false, - "trackAdoption": false - } - ], - "lifecycle": "start", - "initialIsOpen": true - } - }, - "server": { - "classes": [], - "functions": [ - { - "parentPluginId": "dashboard", - "id": "def-server.findByValueEmbeddables", - "type": "Function", - "tags": [], - "label": "findByValueEmbeddables", - "description": [], - "signature": [ - "(savedObjectClient: Pick<", - "ISavedObjectsRepository", - ", \"find\">, embeddableType: string) => Promise<{ [key: string]: ", - "Serializable", - "; }[]>" - ], - "path": "src/plugins/dashboard/server/usage/find_by_value_embeddables.ts", - "deprecated": false, - "trackAdoption": false, - "children": [ - { - "parentPluginId": "dashboard", - "id": "def-server.findByValueEmbeddables.$1", - "type": "Object", - "tags": [], - "label": "savedObjectClient", - "description": [], - "signature": [ - "Pick<", - "ISavedObjectsRepository", - ", \"find\">" - ], - "path": "src/plugins/dashboard/server/usage/find_by_value_embeddables.ts", - "deprecated": false, - "trackAdoption": false, - "isRequired": true - }, - { - "parentPluginId": "dashboard", - "id": "def-server.findByValueEmbeddables.$2", - "type": "string", - "tags": [], - "label": "embeddableType", - "description": [], - "signature": [ - "string" - ], - "path": "src/plugins/dashboard/server/usage/find_by_value_embeddables.ts", - "deprecated": false, - "trackAdoption": false, - "isRequired": true - } - ], - "returnComment": [], - "initialIsOpen": false - } - ], - "interfaces": [], "enums": [], "misc": [], - "objects": [], - "setup": { - "parentPluginId": "dashboard", - "id": "def-server.DashboardPluginSetup", - "type": "Interface", - "tags": [], - "label": "DashboardPluginSetup", - "description": [], - "path": "src/plugins/dashboard/server/types.ts", - "deprecated": false, - "trackAdoption": false, - "children": [], - "lifecycle": "setup", - "initialIsOpen": true - }, - "start": { - "parentPluginId": "dashboard", - "id": "def-server.DashboardPluginStart", - "type": "Interface", - "tags": [], - "label": "DashboardPluginStart", - "description": [], - "path": "src/plugins/dashboard/server/types.ts", - "deprecated": false, - "trackAdoption": false, - "children": [], - "lifecycle": "start", - "initialIsOpen": true - } - }, - "common": { - "classes": [], - "functions": [ - { - "parentPluginId": "dashboard", - "id": "def-common.migratePanelsTo730", - "type": "Function", - "tags": [], - "label": "migratePanelsTo730", - "description": [], - "signature": [ - "(panels: (", - "RawSavedDashboardPanelTo60", - " | ", - "RawSavedDashboardPanel610", - " | ", - "RawSavedDashboardPanel620", - " | ", - "RawSavedDashboardPanel640To720", - " | ", - { - "pluginId": "dashboard", - "scope": "common", - "docId": "kibDashboardPluginApi", - "section": "def-common.SavedDashboardPanelTo60", - "text": "SavedDashboardPanelTo60" - }, - " | ", - { - "pluginId": "dashboard", - "scope": "common", - "docId": "kibDashboardPluginApi", - "section": "def-common.SavedDashboardPanel610", - "text": "SavedDashboardPanel610" - }, - " | ", - { - "pluginId": "dashboard", - "scope": "common", - "docId": "kibDashboardPluginApi", - "section": "def-common.SavedDashboardPanel620", - "text": "SavedDashboardPanel620" - }, - " | ", - { - "pluginId": "dashboard", - "scope": "common", - "docId": "kibDashboardPluginApi", - "section": "def-common.SavedDashboardPanel630", - "text": "SavedDashboardPanel630" - }, - ")[], version: string, useMargins: boolean, uiState: { [key: string]: ", - "SerializableRecord", - "; } | undefined) => ", - { - "pluginId": "dashboard", - "scope": "common", - "docId": "kibDashboardPluginApi", - "section": "def-common.RawSavedDashboardPanel730ToLatest", - "text": "RawSavedDashboardPanel730ToLatest" - }, - "[]" - ], - "path": "src/plugins/dashboard/common/migrate_to_730_panels.ts", - "deprecated": false, - "trackAdoption": false, - "children": [ - { - "parentPluginId": "dashboard", - "id": "def-common.migratePanelsTo730.$1", - "type": "Array", - "tags": [], - "label": "panels", - "description": [], - "signature": [ - "(", - "RawSavedDashboardPanelTo60", - " | ", - "RawSavedDashboardPanel610", - " | ", - "RawSavedDashboardPanel620", - " | ", - "RawSavedDashboardPanel640To720", - " | ", - { - "pluginId": "dashboard", - "scope": "common", - "docId": "kibDashboardPluginApi", - "section": "def-common.SavedDashboardPanelTo60", - "text": "SavedDashboardPanelTo60" - }, - " | ", - { - "pluginId": "dashboard", - "scope": "common", - "docId": "kibDashboardPluginApi", - "section": "def-common.SavedDashboardPanel610", - "text": "SavedDashboardPanel610" - }, - " | ", - { - "pluginId": "dashboard", - "scope": "common", - "docId": "kibDashboardPluginApi", - "section": "def-common.SavedDashboardPanel620", - "text": "SavedDashboardPanel620" - }, - " | ", - { - "pluginId": "dashboard", - "scope": "common", - "docId": "kibDashboardPluginApi", - "section": "def-common.SavedDashboardPanel630", - "text": "SavedDashboardPanel630" - }, - ")[]" - ], - "path": "src/plugins/dashboard/common/migrate_to_730_panels.ts", - "deprecated": false, - "trackAdoption": false, - "isRequired": true - }, - { - "parentPluginId": "dashboard", - "id": "def-common.migratePanelsTo730.$2", - "type": "string", - "tags": [], - "label": "version", - "description": [], - "signature": [ - "string" - ], - "path": "src/plugins/dashboard/common/migrate_to_730_panels.ts", - "deprecated": false, - "trackAdoption": false, - "isRequired": true - }, - { - "parentPluginId": "dashboard", - "id": "def-common.migratePanelsTo730.$3", - "type": "boolean", - "tags": [], - "label": "useMargins", - "description": [], - "signature": [ - "boolean" - ], - "path": "src/plugins/dashboard/common/migrate_to_730_panels.ts", - "deprecated": false, - "trackAdoption": false, - "isRequired": true - }, - { - "parentPluginId": "dashboard", - "id": "def-common.migratePanelsTo730.$4", - "type": "Object", - "tags": [], - "label": "uiState", - "description": [], - "path": "src/plugins/dashboard/common/migrate_to_730_panels.ts", - "deprecated": false, - "trackAdoption": false, - "children": [ - { - "parentPluginId": "dashboard", - "id": "def-common.migratePanelsTo730.$4.Unnamed", - "type": "IndexSignature", - "tags": [], - "label": "[key: string]: SerializableRecord", - "description": [], - "signature": [ - "[key: string]: ", - "SerializableRecord" - ], - "path": "src/plugins/dashboard/common/migrate_to_730_panels.ts", - "deprecated": false, - "trackAdoption": false - } - ] - } - ], - "returnComment": [], - "initialIsOpen": false - } - ], - "interfaces": [ - { - "parentPluginId": "dashboard", - "id": "def-common.DashboardContainerStateWithType", - "type": "Interface", - "tags": [], - "label": "DashboardContainerStateWithType", - "description": [], - "signature": [ - { - "pluginId": "dashboard", - "scope": "common", - "docId": "kibDashboardPluginApi", - "section": "def-common.DashboardContainerStateWithType", - "text": "DashboardContainerStateWithType" - }, - " extends ", - { - "pluginId": "embeddable", - "scope": "common", - "docId": "kibEmbeddablePluginApi", - "section": "def-common.EmbeddableStateWithType", - "text": "EmbeddableStateWithType" - } - ], - "path": "src/plugins/dashboard/common/types.ts", - "deprecated": false, - "trackAdoption": false, - "children": [ - { - "parentPluginId": "dashboard", - "id": "def-common.DashboardContainerStateWithType.panels", - "type": "Object", - "tags": [], - "label": "panels", - "description": [], - "signature": [ - "{ [panelId: string]: ", - "DashboardPanelState", - "<", - { - "pluginId": "embeddable", - "scope": "common", - "docId": "kibEmbeddablePluginApi", - "section": "def-common.EmbeddableInput", - "text": "EmbeddableInput" - }, - " & { [k: string]: unknown; }>; }" - ], - "path": "src/plugins/dashboard/common/types.ts", - "deprecated": false, - "trackAdoption": false - }, - { - "parentPluginId": "dashboard", - "id": "def-common.DashboardContainerStateWithType.controlGroupInput", - "type": "Object", - "tags": [], - "label": "controlGroupInput", - "description": [], - "signature": [ - { - "pluginId": "controls", - "scope": "common", - "docId": "kibControlsPluginApi", - "section": "def-common.PersistableControlGroupInput", - "text": "PersistableControlGroupInput" - }, - " | undefined" - ], - "path": "src/plugins/dashboard/common/types.ts", - "deprecated": false, - "trackAdoption": false - } - ], - "initialIsOpen": false - } - ], - "enums": [], - "misc": [ - { - "parentPluginId": "dashboard", - "id": "def-common.DashboardDoc700To720", - "type": "Type", - "tags": [], - "label": "DashboardDoc700To720", - "description": [], - "signature": [ - "Doc" - ], - "path": "src/plugins/dashboard/common/bwc/types.ts", - "deprecated": false, - "trackAdoption": false, - "initialIsOpen": false - }, - { - "parentPluginId": "dashboard", - "id": "def-common.DashboardDoc730ToLatest", - "type": "Type", - "tags": [], - "label": "DashboardDoc730ToLatest", - "description": [], - "signature": [ - "Doc" - ], - "path": "src/plugins/dashboard/common/bwc/types.ts", - "deprecated": false, - "trackAdoption": false, - "initialIsOpen": false - }, - { - "parentPluginId": "dashboard", - "id": "def-common.DashboardDocPre700", - "type": "Type", - "tags": [], - "label": "DashboardDocPre700", - "description": [], - "signature": [ - "DocPre700" - ], - "path": "src/plugins/dashboard/common/bwc/types.ts", - "deprecated": false, - "trackAdoption": false, - "initialIsOpen": false - }, - { - "parentPluginId": "dashboard", - "id": "def-common.GridData", - "type": "Type", - "tags": [], - "label": "GridData", - "description": [], - "signature": [ - "{ w: number; h: number; x: number; y: number; i: string; }" - ], - "path": "src/plugins/dashboard/common/embeddable/types.ts", - "deprecated": false, - "trackAdoption": false, - "initialIsOpen": false - }, - { - "parentPluginId": "dashboard", - "id": "def-common.RawSavedDashboardPanel730ToLatest", - "type": "Type", - "tags": [], - "label": "RawSavedDashboardPanel730ToLatest", - "description": [], - "signature": [ - "Pick<", - "RawSavedDashboardPanel640To720", - ", \"title\" | \"panelIndex\" | \"gridData\" | \"version\" | \"embeddableConfig\"> & { readonly type?: string | undefined; readonly name?: string | undefined; panelIndex: string; panelRefName?: string | undefined; }" - ], - "path": "src/plugins/dashboard/common/bwc/types.ts", - "deprecated": false, - "trackAdoption": false, - "initialIsOpen": false - }, - { - "parentPluginId": "dashboard", - "id": "def-common.SavedDashboardPanel610", - "type": "Type", - "tags": [], - "label": "SavedDashboardPanel610", - "description": [], - "signature": [ - "Pick<", - "RawSavedDashboardPanel610", - ", \"columns\" | \"title\" | \"sort\" | \"panelIndex\" | \"gridData\" | \"version\"> & { readonly id: string; readonly type: string; }" - ], - "path": "src/plugins/dashboard/common/types.ts", - "deprecated": false, - "trackAdoption": false, - "initialIsOpen": false - }, - { - "parentPluginId": "dashboard", - "id": "def-common.SavedDashboardPanel620", - "type": "Type", - "tags": [], - "label": "SavedDashboardPanel620", - "description": [], - "signature": [ - "Pick<", - "RawSavedDashboardPanel620", - ", \"columns\" | \"title\" | \"sort\" | \"panelIndex\" | \"gridData\" | \"version\" | \"embeddableConfig\"> & { readonly id: string; readonly type: string; }" - ], - "path": "src/plugins/dashboard/common/types.ts", - "deprecated": false, - "trackAdoption": false, - "initialIsOpen": false - }, - { - "parentPluginId": "dashboard", - "id": "def-common.SavedDashboardPanel630", - "type": "Type", - "tags": [], - "label": "SavedDashboardPanel630", - "description": [], - "signature": [ - "Pick<", - "RawSavedDashboardPanel620", - ", \"columns\" | \"title\" | \"sort\" | \"panelIndex\" | \"gridData\" | \"version\" | \"embeddableConfig\"> & { readonly id: string; readonly type: string; }" - ], - "path": "src/plugins/dashboard/common/types.ts", - "deprecated": false, - "trackAdoption": false, - "initialIsOpen": false - }, - { - "parentPluginId": "dashboard", - "id": "def-common.SavedDashboardPanel640To720", - "type": "Type", - "tags": [], - "label": "SavedDashboardPanel640To720", - "description": [], - "signature": [ - "Pick<", - "RawSavedDashboardPanel640To720", - ", \"title\" | \"panelIndex\" | \"gridData\" | \"version\" | \"embeddableConfig\"> & { readonly id: string; readonly type: string; }" - ], - "path": "src/plugins/dashboard/common/types.ts", - "deprecated": false, - "trackAdoption": false, - "initialIsOpen": false - }, - { - "parentPluginId": "dashboard", - "id": "def-common.SavedDashboardPanel730ToLatest", - "type": "Type", - "tags": [], - "label": "SavedDashboardPanel730ToLatest", - "description": [], - "signature": [ - "Pick<", - { - "pluginId": "dashboard", - "scope": "common", - "docId": "kibDashboardPluginApi", - "section": "def-common.RawSavedDashboardPanel730ToLatest", - "text": "RawSavedDashboardPanel730ToLatest" - }, - ", \"type\" | \"title\" | \"panelIndex\" | \"gridData\" | \"version\" | \"embeddableConfig\" | \"panelRefName\"> & { readonly id?: string | undefined; readonly type: string; }" - ], - "path": "src/plugins/dashboard/common/types.ts", - "deprecated": false, - "trackAdoption": false, - "initialIsOpen": false - }, - { - "parentPluginId": "dashboard", - "id": "def-common.SavedDashboardPanelTo60", - "type": "Type", - "tags": [], - "label": "SavedDashboardPanelTo60", - "description": [], - "signature": [ - "Pick<", - "RawSavedDashboardPanelTo60", - ", \"columns\" | \"title\" | \"sort\" | \"size_x\" | \"size_y\" | \"row\" | \"col\" | \"panelIndex\"> & { readonly id: string; readonly type: string; }" - ], - "path": "src/plugins/dashboard/common/types.ts", - "deprecated": false, - "trackAdoption": false, - "initialIsOpen": false - } - ], "objects": [ { "parentPluginId": "dashboard", diff --git a/api_docs/dashboard.mdx b/api_docs/dashboard.mdx index 609a9e0925333..7a36e763bfeac 100644 --- a/api_docs/dashboard.mdx +++ b/api_docs/dashboard.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dashboard title: "dashboard" image: https://source.unsplash.com/400x175/?github description: API docs for the dashboard plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dashboard'] --- import dashboardObj from './dashboard.devdocs.json'; @@ -21,7 +21,7 @@ Contact [Kibana Presentation](https://github.com/orgs/elastic/teams/kibana-prese | Public API count | Any count | Items lacking comments | Missing exports | |-------------------|-----------|------------------------|-----------------| -| 144 | 0 | 139 | 10 | +| 120 | 0 | 113 | 3 | ## Client @@ -37,9 +37,6 @@ Contact [Kibana Presentation](https://github.com/orgs/elastic/teams/kibana-prese ### Functions -### Classes - - ### Interfaces @@ -68,6 +65,3 @@ Contact [Kibana Presentation](https://github.com/orgs/elastic/teams/kibana-prese ### Interfaces -### Consts, variables and types - - diff --git a/api_docs/dashboard_enhanced.mdx b/api_docs/dashboard_enhanced.mdx index ae6e7c69b3a88..06821933db670 100644 --- a/api_docs/dashboard_enhanced.mdx +++ b/api_docs/dashboard_enhanced.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dashboardEnhanced title: "dashboardEnhanced" image: https://source.unsplash.com/400x175/?github description: API docs for the dashboardEnhanced plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dashboardEnhanced'] --- import dashboardEnhancedObj from './dashboard_enhanced.devdocs.json'; diff --git a/api_docs/data.mdx b/api_docs/data.mdx index b8c91c02caa2d..e5c75be5fa094 100644 --- a/api_docs/data.mdx +++ b/api_docs/data.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/data title: "data" image: https://source.unsplash.com/400x175/?github description: API docs for the data plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'data'] --- import dataObj from './data.devdocs.json'; diff --git a/api_docs/data_query.devdocs.json b/api_docs/data_query.devdocs.json index 23849f6641368..051270f939554 100644 --- a/api_docs/data_query.devdocs.json +++ b/api_docs/data_query.devdocs.json @@ -1855,14 +1855,6 @@ "plugin": "discover", "path": "src/plugins/discover/public/application/main/services/discover_state.ts" }, - { - "plugin": "dashboard", - "path": "src/plugins/dashboard/public/application/lib/sync_dashboard_filter_state.ts" - }, - { - "plugin": "dashboard", - "path": "src/plugins/dashboard/public/application/lib/sync_dashboard_filter_state.ts" - }, { "plugin": "maps", "path": "x-pack/plugins/maps/public/routes/map_page/url_state/global_sync.ts" diff --git a/api_docs/data_query.mdx b/api_docs/data_query.mdx index b81d02840aba1..fdd7cb4298da4 100644 --- a/api_docs/data_query.mdx +++ b/api_docs/data_query.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/data-query title: "data.query" image: https://source.unsplash.com/400x175/?github description: API docs for the data.query plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'data.query'] --- import dataQueryObj from './data_query.devdocs.json'; diff --git a/api_docs/data_search.devdocs.json b/api_docs/data_search.devdocs.json index 415500b499045..3be2133617864 100644 --- a/api_docs/data_search.devdocs.json +++ b/api_docs/data_search.devdocs.json @@ -2794,9 +2794,9 @@ "label": "options", "description": [], "signature": [ - "{ filter?: any; search?: string | undefined; aggs?: Record | undefined; fields?: string[] | undefined; searchAfter?: string[] | undefined; page?: number | undefined; perPage?: number | undefined; sortField?: string | undefined; sortOrder?: ", + "> | undefined; searchAfter?: string[] | undefined; page?: number | undefined; perPage?: number | undefined; sortField?: string | undefined; sortOrder?: ", "SortOrder", " | undefined; searchFields?: string[] | undefined; rootSearchFields?: string[] | undefined; hasReference?: ", "SavedObjectsFindOptionsReference", @@ -3475,13 +3475,7 @@ "label": "DataRequestHandlerContext", "description": [], "signature": [ - { - "pluginId": "core", - "scope": "server", - "docId": "kibCorePluginApi", - "section": "def-server.RequestHandlerContext", - "text": "RequestHandlerContext" - }, + "RequestHandlerContext", " & { search: Promise<", { "pluginId": "data", diff --git a/api_docs/data_search.mdx b/api_docs/data_search.mdx index 12e4806b7ea2b..619cec4220ea7 100644 --- a/api_docs/data_search.mdx +++ b/api_docs/data_search.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/data-search title: "data.search" image: https://source.unsplash.com/400x175/?github description: API docs for the data.search plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'data.search'] --- import dataSearchObj from './data_search.devdocs.json'; diff --git a/api_docs/data_view_editor.mdx b/api_docs/data_view_editor.mdx index 1384a135bfbe8..f0d1bf1f9d458 100644 --- a/api_docs/data_view_editor.mdx +++ b/api_docs/data_view_editor.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataViewEditor title: "dataViewEditor" image: https://source.unsplash.com/400x175/?github description: API docs for the dataViewEditor plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataViewEditor'] --- import dataViewEditorObj from './data_view_editor.devdocs.json'; diff --git a/api_docs/data_view_field_editor.mdx b/api_docs/data_view_field_editor.mdx index 4b95039f7981c..9800b25ff8baf 100644 --- a/api_docs/data_view_field_editor.mdx +++ b/api_docs/data_view_field_editor.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataViewFieldEditor title: "dataViewFieldEditor" image: https://source.unsplash.com/400x175/?github description: API docs for the dataViewFieldEditor plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataViewFieldEditor'] --- import dataViewFieldEditorObj from './data_view_field_editor.devdocs.json'; diff --git a/api_docs/data_view_management.mdx b/api_docs/data_view_management.mdx index 3608114bd15af..d2f23607c286c 100644 --- a/api_docs/data_view_management.mdx +++ b/api_docs/data_view_management.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataViewManagement title: "dataViewManagement" image: https://source.unsplash.com/400x175/?github description: API docs for the dataViewManagement plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataViewManagement'] --- import dataViewManagementObj from './data_view_management.devdocs.json'; diff --git a/api_docs/data_views.mdx b/api_docs/data_views.mdx index c6389cc090a71..3c9d9dc38bae9 100644 --- a/api_docs/data_views.mdx +++ b/api_docs/data_views.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataViews title: "dataViews" image: https://source.unsplash.com/400x175/?github description: API docs for the dataViews plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataViews'] --- import dataViewsObj from './data_views.devdocs.json'; diff --git a/api_docs/data_visualizer.mdx b/api_docs/data_visualizer.mdx index 69bcfa932c46f..86bbfd4e83cfa 100644 --- a/api_docs/data_visualizer.mdx +++ b/api_docs/data_visualizer.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataVisualizer title: "dataVisualizer" image: https://source.unsplash.com/400x175/?github description: API docs for the dataVisualizer plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataVisualizer'] --- import dataVisualizerObj from './data_visualizer.devdocs.json'; diff --git a/api_docs/deprecations_by_api.mdx b/api_docs/deprecations_by_api.mdx index b658b5b795600..547c12c8570c2 100644 --- a/api_docs/deprecations_by_api.mdx +++ b/api_docs/deprecations_by_api.mdx @@ -7,7 +7,7 @@ id: kibDevDocsDeprecationsByApi slug: /kibana-dev-docs/api-meta/deprecated-api-list-by-api title: Deprecated API usage by API description: A list of deprecated APIs, which plugins are still referencing them, and when they need to be removed by. -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana'] --- @@ -24,9 +24,9 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana'] | | alerting, discover, securitySolution | - | | | stackAlerts, alerting, securitySolution, inputControlVis | - | | | actions, alerting | - | -| | savedObjects, embeddable, fleet, visualizations, infra, canvas, graph, securitySolution, actions, alerting, enterpriseSearch, taskManager, dashboard, savedSearch, ml, @kbn/core-saved-objects-server-internal | - | -| | savedObjects, embeddable, fleet, visualizations, infra, canvas, graph, securitySolution, actions, alerting, enterpriseSearch, taskManager, dashboard, savedSearch, ml, @kbn/core-saved-objects-server-internal | - | -| | discover, dashboard, maps, monitoring | - | +| | savedObjects, embeddable, fleet, visualizations, dashboard, infra, canvas, graph, securitySolution, actions, alerting, enterpriseSearch, taskManager, savedSearch, ml, @kbn/core-saved-objects-server-internal | - | +| | savedObjects, embeddable, fleet, visualizations, dashboard, infra, canvas, graph, securitySolution, actions, alerting, enterpriseSearch, taskManager, savedSearch, ml, @kbn/core-saved-objects-server-internal | - | +| | discover, maps, monitoring | - | | | unifiedSearch, discover, maps, infra, graph, securitySolution, stackAlerts, inputControlVis, savedObjects | - | | | data, discover, embeddable | - | | | advancedSettings, discover | - | @@ -34,7 +34,6 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana'] | | securitySolution | - | | | encryptedSavedObjects, actions, data, cloud, ml, logstash, securitySolution | - | | | dashboard, dataVisualizer, stackAlerts, expressionPartitionVis | - | -| | dashboard | - | | | dataViews, maps | - | | | dataViews, maps | - | | | maps | - | @@ -43,6 +42,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana'] | | visTypeTimeseries, graph, dataViewManagement, dataViews | - | | | visTypeTimeseries, graph, dataViewManagement, dataViews | - | | | visTypeTimeseries, graph, dataViewManagement | - | +| | dashboard | - | | | observability, dataVisualizer, fleet, cloudSecurityPosture, discoverEnhanced, osquery, synthetics | - | | | dataViewManagement, dataViews | - | | | dataViews, dataViewManagement | - | @@ -75,10 +75,9 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana'] | | apm, security, securitySolution | 8.8.0 | | | visualizations, dashboard, lens, maps, ml, securitySolution, security, @kbn/core-application-browser-internal, @kbn/core-application-browser-mocks | 8.8.0 | | | securitySolution, @kbn/core-application-browser-internal | 8.8.0 | -| | savedObjectsTaggingOss, dashboard | 8.8.0 | -| | dashboard | 8.8.0 | | | maps, dashboard, @kbn/core-saved-objects-migration-server-internal | 8.8.0 | | | monitoring, kibanaUsageCollection, @kbn/core-apps-browser-internal, @kbn/core-metrics-server-internal, @kbn/core-status-server-internal, @kbn/core-usage-data-server-internal | 8.8.0 | +| | savedObjectsTaggingOss, dashboard | 8.8.0 | | | security, fleet | 8.8.0 | | | security, fleet | 8.8.0 | | | security, fleet | 8.8.0 | @@ -131,6 +130,7 @@ Safe to remove. | | expressions | | | expressions | | | kibanaReact | +| | savedObjects | | | savedObjects | | | licensing | | | licensing | diff --git a/api_docs/deprecations_by_plugin.mdx b/api_docs/deprecations_by_plugin.mdx index dabf6a7945b9a..3943c847158f1 100644 --- a/api_docs/deprecations_by_plugin.mdx +++ b/api_docs/deprecations_by_plugin.mdx @@ -7,7 +7,7 @@ id: kibDevDocsDeprecationsByPlugin slug: /kibana-dev-docs/api-meta/deprecated-api-list-by-plugin title: Deprecated API usage by plugin description: A list of deprecated APIs, which plugins are still referencing them, and when they need to be removed by. -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana'] --- @@ -211,16 +211,14 @@ so TS and code-reference navigation might not highlight them. | | Deprecated API | Reference location(s) | Remove By | | ---------------|-----------|-----------| -| | [sync_dashboard_filter_state.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/application/lib/sync_dashboard_filter_state.ts#:~:text=syncQueryStateWithUrl), [sync_dashboard_filter_state.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/application/lib/sync_dashboard_filter_state.ts#:~:text=syncQueryStateWithUrl) | - | | | [types.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/services/data/types.ts#:~:text=fieldFormats), [data_service.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/services/data/data_service.ts#:~:text=fieldFormats) | - | | | [dashboard_viewport.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/application/embeddable/viewport/dashboard_viewport.tsx#:~:text=ExitFullScreenButton), [dashboard_viewport.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/application/embeddable/viewport/dashboard_viewport.tsx#:~:text=ExitFullScreenButton), [dashboard_viewport.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/application/embeddable/viewport/dashboard_viewport.tsx#:~:text=ExitFullScreenButton) | - | | | [save_modal.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/application/top_nav/save_modal.tsx#:~:text=SavedObjectSaveModal), [save_modal.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/application/top_nav/save_modal.tsx#:~:text=SavedObjectSaveModal) | 8.8.0 | -| | [saved_object_loader.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/services/saved_object_loader.ts#:~:text=SavedObject), [saved_object_loader.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/services/saved_object_loader.ts#:~:text=SavedObject), [saved_object_loader.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/services/saved_object_loader.ts#:~:text=SavedObject), [clone_panel_action.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx#:~:text=SavedObject), [clone_panel_action.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx#:~:text=SavedObject), [clone_panel_action.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx#:~:text=SavedObject), [saved_dashboard.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts#:~:text=SavedObject), [saved_dashboard.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts#:~:text=SavedObject), [dashboard_tagging.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/application/lib/dashboard_tagging.ts#:~:text=SavedObject), [dashboard_tagging.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/application/lib/dashboard_tagging.ts#:~:text=SavedObject) | 8.8.0 | -| | [saved_dashboard.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts#:~:text=SavedObjectClass) | 8.8.0 | +| | [clone_panel_action.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx#:~:text=SavedObject), [clone_panel_action.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx#:~:text=SavedObject), [clone_panel_action.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx#:~:text=SavedObject) | 8.8.0 | | | [types.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/types.ts#:~:text=onAppLeave), [plugin.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/plugin.tsx#:~:text=onAppLeave) | 8.8.0 | -| | [dashboard_migrations.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/saved_objects/dashboard_migrations.ts#:~:text=SavedObjectAttributes), [dashboard_migrations.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/saved_objects/dashboard_migrations.ts#:~:text=SavedObjectAttributes), [dashboard_telemetry_collection_task.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/usage/dashboard_telemetry_collection_task.ts#:~:text=SavedObjectAttributes), [dashboard_telemetry_collection_task.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/usage/dashboard_telemetry_collection_task.ts#:~:text=SavedObjectAttributes), [dashboard_telemetry.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/usage/dashboard_telemetry.ts#:~:text=SavedObjectAttributes), [dashboard_telemetry.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/usage/dashboard_telemetry.ts#:~:text=SavedObjectAttributes), [find_by_value_embeddables.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/usage/find_by_value_embeddables.ts#:~:text=SavedObjectAttributes), [find_by_value_embeddables.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/usage/find_by_value_embeddables.ts#:~:text=SavedObjectAttributes), [saved_dashboard_references.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/common/saved_dashboard_references.ts#:~:text=SavedObjectAttributes), [saved_dashboard_references.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/common/saved_dashboard_references.ts#:~:text=SavedObjectAttributes)+ 8 more | - | -| | [dashboard_migrations.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/saved_objects/dashboard_migrations.ts#:~:text=SavedObjectAttributes), [dashboard_migrations.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/saved_objects/dashboard_migrations.ts#:~:text=SavedObjectAttributes), [dashboard_telemetry_collection_task.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/usage/dashboard_telemetry_collection_task.ts#:~:text=SavedObjectAttributes), [dashboard_telemetry_collection_task.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/usage/dashboard_telemetry_collection_task.ts#:~:text=SavedObjectAttributes), [dashboard_telemetry.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/usage/dashboard_telemetry.ts#:~:text=SavedObjectAttributes), [dashboard_telemetry.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/usage/dashboard_telemetry.ts#:~:text=SavedObjectAttributes), [find_by_value_embeddables.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/usage/find_by_value_embeddables.ts#:~:text=SavedObjectAttributes), [find_by_value_embeddables.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/usage/find_by_value_embeddables.ts#:~:text=SavedObjectAttributes), [saved_dashboard_references.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/common/saved_dashboard_references.ts#:~:text=SavedObjectAttributes), [saved_dashboard_references.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/common/saved_dashboard_references.ts#:~:text=SavedObjectAttributes)+ 8 more | - | -| | [migrations_730.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/saved_objects/migrations_730.ts#:~:text=warning), [migrations_730.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/saved_objects/migrations_730.ts#:~:text=warning) | 8.8.0 | +| | [load_dashboard_state_from_saved_object.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/services/dashboard_saved_object/lib/load_dashboard_state_from_saved_object.ts#:~:text=SavedObjectAttributes), [load_dashboard_state_from_saved_object.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/services/dashboard_saved_object/lib/load_dashboard_state_from_saved_object.ts#:~:text=SavedObjectAttributes), [migrate_extract_panel_references.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/saved_objects/migrations/migrate_extract_panel_references.ts#:~:text=SavedObjectAttributes), [migrate_extract_panel_references.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/saved_objects/migrations/migrate_extract_panel_references.ts#:~:text=SavedObjectAttributes), [dashboard_telemetry_collection_task.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/usage/dashboard_telemetry_collection_task.ts#:~:text=SavedObjectAttributes), [dashboard_telemetry_collection_task.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/usage/dashboard_telemetry_collection_task.ts#:~:text=SavedObjectAttributes), [dashboard_telemetry_collection_task.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/usage/dashboard_telemetry_collection_task.ts#:~:text=SavedObjectAttributes), [dashboard_telemetry.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/usage/dashboard_telemetry.ts#:~:text=SavedObjectAttributes), [dashboard_telemetry.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/usage/dashboard_telemetry.ts#:~:text=SavedObjectAttributes), [find_by_value_embeddables.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/usage/find_by_value_embeddables.ts#:~:text=SavedObjectAttributes)+ 11 more | - | +| | [load_dashboard_state_from_saved_object.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/services/dashboard_saved_object/lib/load_dashboard_state_from_saved_object.ts#:~:text=SavedObjectAttributes), [load_dashboard_state_from_saved_object.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/services/dashboard_saved_object/lib/load_dashboard_state_from_saved_object.ts#:~:text=SavedObjectAttributes), [migrate_extract_panel_references.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/saved_objects/migrations/migrate_extract_panel_references.ts#:~:text=SavedObjectAttributes), [migrate_extract_panel_references.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/saved_objects/migrations/migrate_extract_panel_references.ts#:~:text=SavedObjectAttributes), [dashboard_telemetry_collection_task.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/usage/dashboard_telemetry_collection_task.ts#:~:text=SavedObjectAttributes), [dashboard_telemetry_collection_task.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/usage/dashboard_telemetry_collection_task.ts#:~:text=SavedObjectAttributes), [dashboard_telemetry_collection_task.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/usage/dashboard_telemetry_collection_task.ts#:~:text=SavedObjectAttributes), [dashboard_telemetry.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/usage/dashboard_telemetry.ts#:~:text=SavedObjectAttributes), [dashboard_telemetry.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/usage/dashboard_telemetry.ts#:~:text=SavedObjectAttributes), [find_by_value_embeddables.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/usage/find_by_value_embeddables.ts#:~:text=SavedObjectAttributes)+ 11 more | - | +| | [migrations_730.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/migrations_730.ts#:~:text=warning), [migrations_730.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/migrations_730.ts#:~:text=warning) | 8.8.0 | @@ -525,7 +523,7 @@ so TS and code-reference navigation might not highlight them. | | Deprecated API | Reference location(s) | Remove By | | ---------------|-----------|-----------| -| | [pack_queries_status_table.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/osquery/public/packs/pack_queries_status_table.tsx#:~:text=indexPatternId), [pack_queries_status_table.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/osquery/public/live_queries/form/pack_queries_status_table.tsx#:~:text=indexPatternId), [use_discover_link.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/osquery/public/common/hooks/use_discover_link.tsx#:~:text=indexPatternId) | - | +| | [pack_queries_status_table.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/osquery/public/packs/pack_queries_status_table.tsx#:~:text=indexPatternId), [view_results_in_discover.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/osquery/public/discover/view_results_in_discover.tsx#:~:text=indexPatternId), [use_discover_link.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/osquery/public/common/hooks/use_discover_link.tsx#:~:text=indexPatternId) | - | | | [empty_state.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/osquery/public/components/empty_state.tsx#:~:text=KibanaPageTemplate), [empty_state.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/osquery/public/components/empty_state.tsx#:~:text=KibanaPageTemplate) | - | diff --git a/api_docs/deprecations_by_team.mdx b/api_docs/deprecations_by_team.mdx index 643d002885ef8..da0e278bffa6c 100644 --- a/api_docs/deprecations_by_team.mdx +++ b/api_docs/deprecations_by_team.mdx @@ -7,7 +7,7 @@ id: kibDevDocsDeprecationsDueByTeam slug: /kibana-dev-docs/api-meta/deprecations-due-by-team title: Deprecated APIs due to be removed, by team description: Lists the teams that are referencing deprecated APIs with a remove by date. -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana'] --- @@ -89,10 +89,9 @@ so TS and code-reference navigation might not highlight them. | | Plugin | Deprecated API | Reference location(s) | Remove By | | --------|-------|-----------|-----------| | dashboard | | [save_modal.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/application/top_nav/save_modal.tsx#:~:text=SavedObjectSaveModal), [save_modal.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/application/top_nav/save_modal.tsx#:~:text=SavedObjectSaveModal), [saved_object_save_modal_dashboard.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/presentation_util/public/components/saved_object_save_modal_dashboard.tsx#:~:text=SavedObjectSaveModal), [saved_object_save_modal_dashboard.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/presentation_util/public/components/saved_object_save_modal_dashboard.tsx#:~:text=SavedObjectSaveModal) | 8.8.0 | -| dashboard | | [saved_object_loader.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/services/saved_object_loader.ts#:~:text=SavedObject), [saved_object_loader.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/services/saved_object_loader.ts#:~:text=SavedObject), [saved_object_loader.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/services/saved_object_loader.ts#:~:text=SavedObject), [clone_panel_action.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx#:~:text=SavedObject), [clone_panel_action.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx#:~:text=SavedObject), [clone_panel_action.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx#:~:text=SavedObject), [saved_dashboard.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts#:~:text=SavedObject), [saved_dashboard.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts#:~:text=SavedObject), [dashboard_tagging.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/application/lib/dashboard_tagging.ts#:~:text=SavedObject), [dashboard_tagging.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/application/lib/dashboard_tagging.ts#:~:text=SavedObject) | 8.8.0 | -| dashboard | | [saved_dashboard.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts#:~:text=SavedObjectClass) | 8.8.0 | +| dashboard | | [clone_panel_action.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx#:~:text=SavedObject), [clone_panel_action.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx#:~:text=SavedObject), [clone_panel_action.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx#:~:text=SavedObject) | 8.8.0 | | dashboard | | [types.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/types.ts#:~:text=onAppLeave), [plugin.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/plugin.tsx#:~:text=onAppLeave) | 8.8.0 | -| dashboard | | [migrations_730.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/saved_objects/migrations_730.ts#:~:text=warning), [migrations_730.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/saved_objects/migrations_730.ts#:~:text=warning) | 8.8.0 | +| dashboard | | [migrations_730.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/migrations_730.ts#:~:text=warning), [migrations_730.ts](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/server/saved_objects/migrations/migrate_to_730/migrations_730.ts#:~:text=warning) | 8.8.0 | diff --git a/api_docs/dev_tools.mdx b/api_docs/dev_tools.mdx index ddeb12beb9a7a..b724ab15e695e 100644 --- a/api_docs/dev_tools.mdx +++ b/api_docs/dev_tools.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/devTools title: "devTools" image: https://source.unsplash.com/400x175/?github description: API docs for the devTools plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'devTools'] --- import devToolsObj from './dev_tools.devdocs.json'; diff --git a/api_docs/discover.devdocs.json b/api_docs/discover.devdocs.json index 695319775e984..8c4a6308dd17b 100644 --- a/api_docs/discover.devdocs.json +++ b/api_docs/discover.devdocs.json @@ -346,7 +346,7 @@ }, { "plugin": "osquery", - "path": "x-pack/plugins/osquery/public/live_queries/form/pack_queries_status_table.tsx" + "path": "x-pack/plugins/osquery/public/discover/view_results_in_discover.tsx" }, { "plugin": "osquery", @@ -1101,7 +1101,7 @@ "label": "sharingSavedObjectProps", "description": [], "signature": [ - "{ outcome?: \"exactMatch\" | \"aliasMatch\" | \"conflict\" | undefined; aliasTargetId?: string | undefined; aliasPurpose?: \"savedObjectConversion\" | \"savedObjectImport\" | undefined; errorJSON?: string | undefined; } | undefined" + "{ outcome?: \"conflict\" | \"exactMatch\" | \"aliasMatch\" | undefined; aliasTargetId?: string | undefined; aliasPurpose?: \"savedObjectConversion\" | \"savedObjectImport\" | undefined; errorJSON?: string | undefined; } | undefined" ], "path": "src/plugins/saved_search/public/services/saved_searches/types.ts", "deprecated": false, diff --git a/api_docs/discover.mdx b/api_docs/discover.mdx index 4a2a4abc7d5ef..39b2814d4136c 100644 --- a/api_docs/discover.mdx +++ b/api_docs/discover.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/discover title: "discover" image: https://source.unsplash.com/400x175/?github description: API docs for the discover plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'discover'] --- import discoverObj from './discover.devdocs.json'; diff --git a/api_docs/discover_enhanced.mdx b/api_docs/discover_enhanced.mdx index 104fc1d5cde65..e9974fbb2bf45 100644 --- a/api_docs/discover_enhanced.mdx +++ b/api_docs/discover_enhanced.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/discoverEnhanced title: "discoverEnhanced" image: https://source.unsplash.com/400x175/?github description: API docs for the discoverEnhanced plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'discoverEnhanced'] --- import discoverEnhancedObj from './discover_enhanced.devdocs.json'; diff --git a/api_docs/embeddable.mdx b/api_docs/embeddable.mdx index 3203b4c957545..8bbe0a063796d 100644 --- a/api_docs/embeddable.mdx +++ b/api_docs/embeddable.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/embeddable title: "embeddable" image: https://source.unsplash.com/400x175/?github description: API docs for the embeddable plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'embeddable'] --- import embeddableObj from './embeddable.devdocs.json'; diff --git a/api_docs/embeddable_enhanced.mdx b/api_docs/embeddable_enhanced.mdx index e5e64a70e8012..c53b6a4aba7e9 100644 --- a/api_docs/embeddable_enhanced.mdx +++ b/api_docs/embeddable_enhanced.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/embeddableEnhanced title: "embeddableEnhanced" image: https://source.unsplash.com/400x175/?github description: API docs for the embeddableEnhanced plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'embeddableEnhanced'] --- import embeddableEnhancedObj from './embeddable_enhanced.devdocs.json'; diff --git a/api_docs/encrypted_saved_objects.mdx b/api_docs/encrypted_saved_objects.mdx index 6d488adbda835..6cc990a42eba7 100644 --- a/api_docs/encrypted_saved_objects.mdx +++ b/api_docs/encrypted_saved_objects.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/encryptedSavedObjects title: "encryptedSavedObjects" image: https://source.unsplash.com/400x175/?github description: API docs for the encryptedSavedObjects plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'encryptedSavedObjects'] --- import encryptedSavedObjectsObj from './encrypted_saved_objects.devdocs.json'; diff --git a/api_docs/enterprise_search.mdx b/api_docs/enterprise_search.mdx index 2d3bbbfe7ad85..8f80e15d3886b 100644 --- a/api_docs/enterprise_search.mdx +++ b/api_docs/enterprise_search.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/enterpriseSearch title: "enterpriseSearch" image: https://source.unsplash.com/400x175/?github description: API docs for the enterpriseSearch plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'enterpriseSearch'] --- import enterpriseSearchObj from './enterprise_search.devdocs.json'; diff --git a/api_docs/es_ui_shared.mdx b/api_docs/es_ui_shared.mdx index e6eb098f3c9cd..6a4ca6fcb7735 100644 --- a/api_docs/es_ui_shared.mdx +++ b/api_docs/es_ui_shared.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/esUiShared title: "esUiShared" image: https://source.unsplash.com/400x175/?github description: API docs for the esUiShared plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'esUiShared'] --- import esUiSharedObj from './es_ui_shared.devdocs.json'; diff --git a/api_docs/event_annotation.mdx b/api_docs/event_annotation.mdx index 54a7269ef5325..159a2f7167b0a 100644 --- a/api_docs/event_annotation.mdx +++ b/api_docs/event_annotation.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/eventAnnotation title: "eventAnnotation" image: https://source.unsplash.com/400x175/?github description: API docs for the eventAnnotation plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'eventAnnotation'] --- import eventAnnotationObj from './event_annotation.devdocs.json'; diff --git a/api_docs/event_log.devdocs.json b/api_docs/event_log.devdocs.json index f821ced3a76e0..8361059c91079 100644 --- a/api_docs/event_log.devdocs.json +++ b/api_docs/event_log.devdocs.json @@ -1312,7 +1312,7 @@ "label": "data", "description": [], "signature": [ - "(Readonly<{ error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; tags?: string[] | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; message?: string | undefined; kibana?: Readonly<{ alert?: Readonly<{ rule?: Readonly<{ consumer?: string | undefined; execution?: Readonly<{ status?: string | undefined; metrics?: Readonly<{ number_of_triggered_actions?: string | number | undefined; number_of_generated_actions?: string | number | undefined; alert_counts?: Readonly<{ recovered?: string | number | undefined; active?: string | number | undefined; new?: string | number | undefined; } & {}> | undefined; number_of_searches?: string | number | undefined; total_indexing_duration_ms?: string | number | undefined; es_search_duration_ms?: string | number | undefined; total_search_duration_ms?: string | number | undefined; execution_gap_duration_s?: string | number | undefined; rule_type_run_duration_ms?: string | number | undefined; process_alerts_duration_ms?: string | number | undefined; trigger_actions_duration_ms?: string | number | undefined; process_rule_duration_ms?: string | number | undefined; claim_to_start_duration_ms?: string | number | undefined; prepare_rule_duration_ms?: string | number | undefined; total_run_duration_ms?: string | number | undefined; } & {}> | undefined; uuid?: string | undefined; status_order?: string | number | undefined; } & {}> | undefined; rule_type_id?: string | undefined; } & {}> | undefined; } & {}> | undefined; version?: string | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; task?: Readonly<{ id?: string | undefined; schedule_delay?: string | number | undefined; scheduled?: string | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; namespace?: string | undefined; rel?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; space_ids?: string[] | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; rule?: Readonly<{ name?: string | undefined; description?: string | undefined; category?: string | undefined; id?: string | undefined; version?: string | undefined; license?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; event?: Readonly<{ start?: string | undefined; category?: string[] | undefined; type?: string[] | undefined; id?: string | undefined; outcome?: string | undefined; created?: string | undefined; end?: string | undefined; original?: string | undefined; duration?: string | number | undefined; code?: string | undefined; url?: string | undefined; action?: string | undefined; kind?: string | undefined; hash?: string | undefined; severity?: string | number | undefined; dataset?: string | undefined; ingested?: string | undefined; module?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: string | number | undefined; timezone?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; } & {}> | undefined)[]" + "(Readonly<{ error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; tags?: string[] | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; message?: string | undefined; kibana?: Readonly<{ alert?: Readonly<{ rule?: Readonly<{ consumer?: string | undefined; execution?: Readonly<{ status?: string | undefined; metrics?: Readonly<{ number_of_triggered_actions?: string | number | undefined; number_of_generated_actions?: string | number | undefined; alert_counts?: Readonly<{ recovered?: string | number | undefined; active?: string | number | undefined; new?: string | number | undefined; } & {}> | undefined; number_of_searches?: string | number | undefined; total_indexing_duration_ms?: string | number | undefined; es_search_duration_ms?: string | number | undefined; total_search_duration_ms?: string | number | undefined; execution_gap_duration_s?: string | number | undefined; rule_type_run_duration_ms?: string | number | undefined; process_alerts_duration_ms?: string | number | undefined; trigger_actions_duration_ms?: string | number | undefined; process_rule_duration_ms?: string | number | undefined; claim_to_start_duration_ms?: string | number | undefined; prepare_rule_duration_ms?: string | number | undefined; total_run_duration_ms?: string | number | undefined; total_enrichment_duration_ms?: string | number | undefined; } & {}> | undefined; uuid?: string | undefined; status_order?: string | number | undefined; } & {}> | undefined; rule_type_id?: string | undefined; } & {}> | undefined; } & {}> | undefined; version?: string | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; task?: Readonly<{ id?: string | undefined; schedule_delay?: string | number | undefined; scheduled?: string | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; namespace?: string | undefined; rel?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; space_ids?: string[] | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; rule?: Readonly<{ name?: string | undefined; description?: string | undefined; category?: string | undefined; id?: string | undefined; version?: string | undefined; license?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; event?: Readonly<{ start?: string | undefined; category?: string[] | undefined; type?: string[] | undefined; id?: string | undefined; created?: string | undefined; outcome?: string | undefined; end?: string | undefined; original?: string | undefined; duration?: string | number | undefined; code?: string | undefined; url?: string | undefined; action?: string | undefined; kind?: string | undefined; hash?: string | undefined; severity?: string | number | undefined; dataset?: string | undefined; ingested?: string | undefined; module?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: string | number | undefined; timezone?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; } & {}> | undefined)[]" ], "path": "x-pack/plugins/event_log/server/es/cluster_client_adapter.ts", "deprecated": false, @@ -1332,7 +1332,7 @@ "label": "IEvent", "description": [], "signature": [ - "DeepPartial | undefined; tags?: string[] | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; message?: string | undefined; kibana?: Readonly<{ alert?: Readonly<{ rule?: Readonly<{ consumer?: string | undefined; execution?: Readonly<{ status?: string | undefined; metrics?: Readonly<{ number_of_triggered_actions?: string | number | undefined; number_of_generated_actions?: string | number | undefined; alert_counts?: Readonly<{ recovered?: string | number | undefined; active?: string | number | undefined; new?: string | number | undefined; } & {}> | undefined; number_of_searches?: string | number | undefined; total_indexing_duration_ms?: string | number | undefined; es_search_duration_ms?: string | number | undefined; total_search_duration_ms?: string | number | undefined; execution_gap_duration_s?: string | number | undefined; rule_type_run_duration_ms?: string | number | undefined; process_alerts_duration_ms?: string | number | undefined; trigger_actions_duration_ms?: string | number | undefined; process_rule_duration_ms?: string | number | undefined; claim_to_start_duration_ms?: string | number | undefined; prepare_rule_duration_ms?: string | number | undefined; total_run_duration_ms?: string | number | undefined; } & {}> | undefined; uuid?: string | undefined; status_order?: string | number | undefined; } & {}> | undefined; rule_type_id?: string | undefined; } & {}> | undefined; } & {}> | undefined; version?: string | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; task?: Readonly<{ id?: string | undefined; schedule_delay?: string | number | undefined; scheduled?: string | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; namespace?: string | undefined; rel?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; space_ids?: string[] | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; rule?: Readonly<{ name?: string | undefined; description?: string | undefined; category?: string | undefined; id?: string | undefined; version?: string | undefined; license?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; event?: Readonly<{ start?: string | undefined; category?: string[] | undefined; type?: string[] | undefined; id?: string | undefined; outcome?: string | undefined; created?: string | undefined; end?: string | undefined; original?: string | undefined; duration?: string | number | undefined; code?: string | undefined; url?: string | undefined; action?: string | undefined; kind?: string | undefined; hash?: string | undefined; severity?: string | number | undefined; dataset?: string | undefined; ingested?: string | undefined; module?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: string | number | undefined; timezone?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; } & {}>>> | undefined" + "DeepPartial | undefined; tags?: string[] | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; message?: string | undefined; kibana?: Readonly<{ alert?: Readonly<{ rule?: Readonly<{ consumer?: string | undefined; execution?: Readonly<{ status?: string | undefined; metrics?: Readonly<{ number_of_triggered_actions?: string | number | undefined; number_of_generated_actions?: string | number | undefined; alert_counts?: Readonly<{ recovered?: string | number | undefined; active?: string | number | undefined; new?: string | number | undefined; } & {}> | undefined; number_of_searches?: string | number | undefined; total_indexing_duration_ms?: string | number | undefined; es_search_duration_ms?: string | number | undefined; total_search_duration_ms?: string | number | undefined; execution_gap_duration_s?: string | number | undefined; rule_type_run_duration_ms?: string | number | undefined; process_alerts_duration_ms?: string | number | undefined; trigger_actions_duration_ms?: string | number | undefined; process_rule_duration_ms?: string | number | undefined; claim_to_start_duration_ms?: string | number | undefined; prepare_rule_duration_ms?: string | number | undefined; total_run_duration_ms?: string | number | undefined; total_enrichment_duration_ms?: string | number | undefined; } & {}> | undefined; uuid?: string | undefined; status_order?: string | number | undefined; } & {}> | undefined; rule_type_id?: string | undefined; } & {}> | undefined; } & {}> | undefined; version?: string | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; task?: Readonly<{ id?: string | undefined; schedule_delay?: string | number | undefined; scheduled?: string | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; namespace?: string | undefined; rel?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; space_ids?: string[] | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; rule?: Readonly<{ name?: string | undefined; description?: string | undefined; category?: string | undefined; id?: string | undefined; version?: string | undefined; license?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; event?: Readonly<{ start?: string | undefined; category?: string[] | undefined; type?: string[] | undefined; id?: string | undefined; created?: string | undefined; outcome?: string | undefined; end?: string | undefined; original?: string | undefined; duration?: string | number | undefined; code?: string | undefined; url?: string | undefined; action?: string | undefined; kind?: string | undefined; hash?: string | undefined; severity?: string | number | undefined; dataset?: string | undefined; ingested?: string | undefined; module?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: string | number | undefined; timezone?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; } & {}>>> | undefined" ], "path": "x-pack/plugins/event_log/generated/schemas.ts", "deprecated": false, @@ -1347,7 +1347,7 @@ "label": "IValidatedEvent", "description": [], "signature": [ - "Readonly<{ error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; tags?: string[] | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; message?: string | undefined; kibana?: Readonly<{ alert?: Readonly<{ rule?: Readonly<{ consumer?: string | undefined; execution?: Readonly<{ status?: string | undefined; metrics?: Readonly<{ number_of_triggered_actions?: string | number | undefined; number_of_generated_actions?: string | number | undefined; alert_counts?: Readonly<{ recovered?: string | number | undefined; active?: string | number | undefined; new?: string | number | undefined; } & {}> | undefined; number_of_searches?: string | number | undefined; total_indexing_duration_ms?: string | number | undefined; es_search_duration_ms?: string | number | undefined; total_search_duration_ms?: string | number | undefined; execution_gap_duration_s?: string | number | undefined; rule_type_run_duration_ms?: string | number | undefined; process_alerts_duration_ms?: string | number | undefined; trigger_actions_duration_ms?: string | number | undefined; process_rule_duration_ms?: string | number | undefined; claim_to_start_duration_ms?: string | number | undefined; prepare_rule_duration_ms?: string | number | undefined; total_run_duration_ms?: string | number | undefined; } & {}> | undefined; uuid?: string | undefined; status_order?: string | number | undefined; } & {}> | undefined; rule_type_id?: string | undefined; } & {}> | undefined; } & {}> | undefined; version?: string | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; task?: Readonly<{ id?: string | undefined; schedule_delay?: string | number | undefined; scheduled?: string | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; namespace?: string | undefined; rel?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; space_ids?: string[] | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; rule?: Readonly<{ name?: string | undefined; description?: string | undefined; category?: string | undefined; id?: string | undefined; version?: string | undefined; license?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; event?: Readonly<{ start?: string | undefined; category?: string[] | undefined; type?: string[] | undefined; id?: string | undefined; outcome?: string | undefined; created?: string | undefined; end?: string | undefined; original?: string | undefined; duration?: string | number | undefined; code?: string | undefined; url?: string | undefined; action?: string | undefined; kind?: string | undefined; hash?: string | undefined; severity?: string | number | undefined; dataset?: string | undefined; ingested?: string | undefined; module?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: string | number | undefined; timezone?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; } & {}> | undefined" + "Readonly<{ error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; tags?: string[] | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; message?: string | undefined; kibana?: Readonly<{ alert?: Readonly<{ rule?: Readonly<{ consumer?: string | undefined; execution?: Readonly<{ status?: string | undefined; metrics?: Readonly<{ number_of_triggered_actions?: string | number | undefined; number_of_generated_actions?: string | number | undefined; alert_counts?: Readonly<{ recovered?: string | number | undefined; active?: string | number | undefined; new?: string | number | undefined; } & {}> | undefined; number_of_searches?: string | number | undefined; total_indexing_duration_ms?: string | number | undefined; es_search_duration_ms?: string | number | undefined; total_search_duration_ms?: string | number | undefined; execution_gap_duration_s?: string | number | undefined; rule_type_run_duration_ms?: string | number | undefined; process_alerts_duration_ms?: string | number | undefined; trigger_actions_duration_ms?: string | number | undefined; process_rule_duration_ms?: string | number | undefined; claim_to_start_duration_ms?: string | number | undefined; prepare_rule_duration_ms?: string | number | undefined; total_run_duration_ms?: string | number | undefined; total_enrichment_duration_ms?: string | number | undefined; } & {}> | undefined; uuid?: string | undefined; status_order?: string | number | undefined; } & {}> | undefined; rule_type_id?: string | undefined; } & {}> | undefined; } & {}> | undefined; version?: string | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; task?: Readonly<{ id?: string | undefined; schedule_delay?: string | number | undefined; scheduled?: string | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; namespace?: string | undefined; rel?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; space_ids?: string[] | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; rule?: Readonly<{ name?: string | undefined; description?: string | undefined; category?: string | undefined; id?: string | undefined; version?: string | undefined; license?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; event?: Readonly<{ start?: string | undefined; category?: string[] | undefined; type?: string[] | undefined; id?: string | undefined; created?: string | undefined; outcome?: string | undefined; end?: string | undefined; original?: string | undefined; duration?: string | number | undefined; code?: string | undefined; url?: string | undefined; action?: string | undefined; kind?: string | undefined; hash?: string | undefined; severity?: string | number | undefined; dataset?: string | undefined; ingested?: string | undefined; module?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: string | number | undefined; timezone?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; } & {}> | undefined" ], "path": "x-pack/plugins/event_log/generated/schemas.ts", "deprecated": false, diff --git a/api_docs/event_log.mdx b/api_docs/event_log.mdx index dff00025d47a5..b9be569d3a3e9 100644 --- a/api_docs/event_log.mdx +++ b/api_docs/event_log.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/eventLog title: "eventLog" image: https://source.unsplash.com/400x175/?github description: API docs for the eventLog plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'eventLog'] --- import eventLogObj from './event_log.devdocs.json'; diff --git a/api_docs/expression_error.mdx b/api_docs/expression_error.mdx index ba5e5e742f4c5..6d9a8d244589a 100644 --- a/api_docs/expression_error.mdx +++ b/api_docs/expression_error.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionError title: "expressionError" image: https://source.unsplash.com/400x175/?github description: API docs for the expressionError plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionError'] --- import expressionErrorObj from './expression_error.devdocs.json'; diff --git a/api_docs/expression_gauge.mdx b/api_docs/expression_gauge.mdx index 331af14bbd784..b38b786ca55b9 100644 --- a/api_docs/expression_gauge.mdx +++ b/api_docs/expression_gauge.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionGauge title: "expressionGauge" image: https://source.unsplash.com/400x175/?github description: API docs for the expressionGauge plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionGauge'] --- import expressionGaugeObj from './expression_gauge.devdocs.json'; diff --git a/api_docs/expression_heatmap.mdx b/api_docs/expression_heatmap.mdx index 36ea696e53359..9d856b882a318 100644 --- a/api_docs/expression_heatmap.mdx +++ b/api_docs/expression_heatmap.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionHeatmap title: "expressionHeatmap" image: https://source.unsplash.com/400x175/?github description: API docs for the expressionHeatmap plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionHeatmap'] --- import expressionHeatmapObj from './expression_heatmap.devdocs.json'; diff --git a/api_docs/expression_image.mdx b/api_docs/expression_image.mdx index 97052c63f7476..84225e80ad009 100644 --- a/api_docs/expression_image.mdx +++ b/api_docs/expression_image.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionImage title: "expressionImage" image: https://source.unsplash.com/400x175/?github description: API docs for the expressionImage plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionImage'] --- import expressionImageObj from './expression_image.devdocs.json'; diff --git a/api_docs/expression_legacy_metric_vis.mdx b/api_docs/expression_legacy_metric_vis.mdx index 95950d42e4473..e6902356f091e 100644 --- a/api_docs/expression_legacy_metric_vis.mdx +++ b/api_docs/expression_legacy_metric_vis.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionLegacyMetricVis title: "expressionLegacyMetricVis" image: https://source.unsplash.com/400x175/?github description: API docs for the expressionLegacyMetricVis plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionLegacyMetricVis'] --- import expressionLegacyMetricVisObj from './expression_legacy_metric_vis.devdocs.json'; diff --git a/api_docs/expression_metric.mdx b/api_docs/expression_metric.mdx index ee6b2d7e353f4..60a4d843aad34 100644 --- a/api_docs/expression_metric.mdx +++ b/api_docs/expression_metric.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionMetric title: "expressionMetric" image: https://source.unsplash.com/400x175/?github description: API docs for the expressionMetric plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionMetric'] --- import expressionMetricObj from './expression_metric.devdocs.json'; diff --git a/api_docs/expression_metric_vis.mdx b/api_docs/expression_metric_vis.mdx index c1edcc43088dd..85c6421d292d1 100644 --- a/api_docs/expression_metric_vis.mdx +++ b/api_docs/expression_metric_vis.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionMetricVis title: "expressionMetricVis" image: https://source.unsplash.com/400x175/?github description: API docs for the expressionMetricVis plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionMetricVis'] --- import expressionMetricVisObj from './expression_metric_vis.devdocs.json'; diff --git a/api_docs/expression_partition_vis.mdx b/api_docs/expression_partition_vis.mdx index 672e12f360d34..4d4a23fe3a6ff 100644 --- a/api_docs/expression_partition_vis.mdx +++ b/api_docs/expression_partition_vis.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionPartitionVis title: "expressionPartitionVis" image: https://source.unsplash.com/400x175/?github description: API docs for the expressionPartitionVis plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionPartitionVis'] --- import expressionPartitionVisObj from './expression_partition_vis.devdocs.json'; diff --git a/api_docs/expression_repeat_image.mdx b/api_docs/expression_repeat_image.mdx index 7fbd70637ed36..ff4af965c963e 100644 --- a/api_docs/expression_repeat_image.mdx +++ b/api_docs/expression_repeat_image.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionRepeatImage title: "expressionRepeatImage" image: https://source.unsplash.com/400x175/?github description: API docs for the expressionRepeatImage plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionRepeatImage'] --- import expressionRepeatImageObj from './expression_repeat_image.devdocs.json'; diff --git a/api_docs/expression_reveal_image.mdx b/api_docs/expression_reveal_image.mdx index 09f5c55834635..2d3ede34cf142 100644 --- a/api_docs/expression_reveal_image.mdx +++ b/api_docs/expression_reveal_image.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionRevealImage title: "expressionRevealImage" image: https://source.unsplash.com/400x175/?github description: API docs for the expressionRevealImage plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionRevealImage'] --- import expressionRevealImageObj from './expression_reveal_image.devdocs.json'; diff --git a/api_docs/expression_shape.mdx b/api_docs/expression_shape.mdx index 8414051020d06..114bb08462720 100644 --- a/api_docs/expression_shape.mdx +++ b/api_docs/expression_shape.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionShape title: "expressionShape" image: https://source.unsplash.com/400x175/?github description: API docs for the expressionShape plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionShape'] --- import expressionShapeObj from './expression_shape.devdocs.json'; diff --git a/api_docs/expression_tagcloud.mdx b/api_docs/expression_tagcloud.mdx index 42b6c0963d951..6a87768ff01e5 100644 --- a/api_docs/expression_tagcloud.mdx +++ b/api_docs/expression_tagcloud.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionTagcloud title: "expressionTagcloud" image: https://source.unsplash.com/400x175/?github description: API docs for the expressionTagcloud plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionTagcloud'] --- import expressionTagcloudObj from './expression_tagcloud.devdocs.json'; diff --git a/api_docs/expression_x_y.mdx b/api_docs/expression_x_y.mdx index 340a2de8e8e21..bf0c8f9c49aea 100644 --- a/api_docs/expression_x_y.mdx +++ b/api_docs/expression_x_y.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionXY title: "expressionXY" image: https://source.unsplash.com/400x175/?github description: API docs for the expressionXY plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionXY'] --- import expressionXYObj from './expression_x_y.devdocs.json'; diff --git a/api_docs/expressions.devdocs.json b/api_docs/expressions.devdocs.json index cf0d00e1dd478..bae5e63702f4f 100644 --- a/api_docs/expressions.devdocs.json +++ b/api_docs/expressions.devdocs.json @@ -11507,7 +11507,7 @@ "\nThis type represents the `type` of any `DatatableColumn` in a `Datatable`.\nits duplicated from KBN_FIELD_TYPES" ], "signature": [ - "\"string\" | \"number\" | \"boolean\" | \"object\" | \"date\" | \"null\" | \"ip\" | \"nested\" | \"conflict\" | \"_source\" | \"attachment\" | \"geo_point\" | \"geo_shape\" | \"murmur3\" | \"unknown\" | \"histogram\"" + "\"string\" | \"number\" | \"boolean\" | \"object\" | \"date\" | \"null\" | \"ip\" | \"nested\" | \"_source\" | \"attachment\" | \"geo_point\" | \"geo_shape\" | \"murmur3\" | \"unknown\" | \"conflict\" | \"histogram\"" ], "path": "src/plugins/expressions/common/expression_types/specs/datatable.ts", "deprecated": false, @@ -21037,7 +21037,7 @@ "\nThis type represents the `type` of any `DatatableColumn` in a `Datatable`.\nits duplicated from KBN_FIELD_TYPES" ], "signature": [ - "\"string\" | \"number\" | \"boolean\" | \"object\" | \"date\" | \"null\" | \"ip\" | \"nested\" | \"conflict\" | \"_source\" | \"attachment\" | \"geo_point\" | \"geo_shape\" | \"murmur3\" | \"unknown\" | \"histogram\"" + "\"string\" | \"number\" | \"boolean\" | \"object\" | \"date\" | \"null\" | \"ip\" | \"nested\" | \"_source\" | \"attachment\" | \"geo_point\" | \"geo_shape\" | \"murmur3\" | \"unknown\" | \"conflict\" | \"histogram\"" ], "path": "src/plugins/expressions/common/expression_types/specs/datatable.ts", "deprecated": false, @@ -29210,7 +29210,7 @@ "label": "type", "description": [], "signature": [ - "\"string\" | \"number\" | \"boolean\" | \"object\" | \"date\" | \"null\" | \"ip\" | \"nested\" | \"conflict\" | \"_source\" | \"attachment\" | \"geo_point\" | \"geo_shape\" | \"murmur3\" | \"unknown\" | \"histogram\"" + "\"string\" | \"number\" | \"boolean\" | \"object\" | \"date\" | \"null\" | \"ip\" | \"nested\" | \"_source\" | \"attachment\" | \"geo_point\" | \"geo_shape\" | \"murmur3\" | \"unknown\" | \"conflict\" | \"histogram\"" ], "path": "src/plugins/expressions/common/expression_types/specs/datatable.ts", "deprecated": false, @@ -35226,7 +35226,7 @@ "\nThis type represents the `type` of any `DatatableColumn` in a `Datatable`.\nits duplicated from KBN_FIELD_TYPES" ], "signature": [ - "\"string\" | \"number\" | \"boolean\" | \"object\" | \"date\" | \"null\" | \"ip\" | \"nested\" | \"conflict\" | \"_source\" | \"attachment\" | \"geo_point\" | \"geo_shape\" | \"murmur3\" | \"unknown\" | \"histogram\"" + "\"string\" | \"number\" | \"boolean\" | \"object\" | \"date\" | \"null\" | \"ip\" | \"nested\" | \"_source\" | \"attachment\" | \"geo_point\" | \"geo_shape\" | \"murmur3\" | \"unknown\" | \"conflict\" | \"histogram\"" ], "path": "src/plugins/expressions/common/expression_types/specs/datatable.ts", "deprecated": false, diff --git a/api_docs/expressions.mdx b/api_docs/expressions.mdx index 74c3fd828f44f..cb5617b237f7a 100644 --- a/api_docs/expressions.mdx +++ b/api_docs/expressions.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressions title: "expressions" image: https://source.unsplash.com/400x175/?github description: API docs for the expressions plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressions'] --- import expressionsObj from './expressions.devdocs.json'; diff --git a/api_docs/features.mdx b/api_docs/features.mdx index 7b4880c40f8d6..1c1d57aa91eb1 100644 --- a/api_docs/features.mdx +++ b/api_docs/features.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/features title: "features" image: https://source.unsplash.com/400x175/?github description: API docs for the features plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'features'] --- import featuresObj from './features.devdocs.json'; diff --git a/api_docs/field_formats.mdx b/api_docs/field_formats.mdx index 8c4ebd13fe23d..dc89d286ddfe5 100644 --- a/api_docs/field_formats.mdx +++ b/api_docs/field_formats.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/fieldFormats title: "fieldFormats" image: https://source.unsplash.com/400x175/?github description: API docs for the fieldFormats plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'fieldFormats'] --- import fieldFormatsObj from './field_formats.devdocs.json'; diff --git a/api_docs/file_upload.mdx b/api_docs/file_upload.mdx index c0963ced99a2c..f29f32174d128 100644 --- a/api_docs/file_upload.mdx +++ b/api_docs/file_upload.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/fileUpload title: "fileUpload" image: https://source.unsplash.com/400x175/?github description: API docs for the fileUpload plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'fileUpload'] --- import fileUploadObj from './file_upload.devdocs.json'; diff --git a/api_docs/files.mdx b/api_docs/files.mdx index 96ec1e67bf2bf..3cc10c4a1612a 100644 --- a/api_docs/files.mdx +++ b/api_docs/files.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/files title: "files" image: https://source.unsplash.com/400x175/?github description: API docs for the files plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'files'] --- import filesObj from './files.devdocs.json'; diff --git a/api_docs/fleet.devdocs.json b/api_docs/fleet.devdocs.json index d068e061e494b..3059a8f9c9f84 100644 --- a/api_docs/fleet.devdocs.json +++ b/api_docs/fleet.devdocs.json @@ -7170,13 +7170,7 @@ "text": "NewPackagePolicy" }, ", context: ", - { - "pluginId": "core", - "scope": "server", - "docId": "kibCorePluginApi", - "section": "def-server.RequestHandlerContext", - "text": "RequestHandlerContext" - }, + "RequestHandlerContext", ", request: ", "KibanaRequest", ") => Promise    ) => Promise<", @@ -7611,13 +7593,7 @@ "label": "context", "description": [], "signature": [ - { - "pluginId": "core", - "scope": "server", - "docId": "kibCorePluginApi", - "section": "def-server.RequestHandlerContext", - "text": "RequestHandlerContext" - } + "RequestHandlerContext" ], "path": "x-pack/plugins/fleet/server/types/extensions.ts", "deprecated": false, @@ -7709,13 +7685,7 @@ "text": "PackagePolicy" }, ", context: ", - { - "pluginId": "core", - "scope": "server", - "docId": "kibCorePluginApi", - "section": "def-server.RequestHandlerContext", - "text": "RequestHandlerContext" - }, + "RequestHandlerContext", ", request: ", "KibanaRequest", ") => Promise<", @@ -7761,13 +7731,7 @@ "label": "context", "description": [], "signature": [ - { - "pluginId": "core", - "scope": "server", - "docId": "kibCorePluginApi", - "section": "def-server.RequestHandlerContext", - "text": "RequestHandlerContext" - } + "RequestHandlerContext" ], "path": "x-pack/plugins/fleet/server/types/extensions.ts", "deprecated": false, @@ -7808,13 +7772,7 @@ "text": "UpdatePackagePolicy" }, ", context: ", - { - "pluginId": "core", - "scope": "server", - "docId": "kibCorePluginApi", - "section": "def-server.RequestHandlerContext", - "text": "RequestHandlerContext" - }, + "RequestHandlerContext", ", request: ", "KibanaRequest", ") => Promise<", @@ -7860,13 +7818,7 @@ "label": "context", "description": [], "signature": [ - { - "pluginId": "core", - "scope": "server", - "docId": "kibCorePluginApi", - "section": "def-server.RequestHandlerContext", - "text": "RequestHandlerContext" - } + "RequestHandlerContext" ], "path": "x-pack/plugins/fleet/server/types/extensions.ts", "deprecated": false, @@ -15292,7 +15244,7 @@ "label": "PackageSpecCategory", "description": [], "signature": [ - "\"custom\" | \"aws\" | \"azure\" | \"cloud\" | \"config_management\" | \"containers\" | \"crm\" | \"datastore\" | \"elastic_stack\" | \"google_cloud\" | \"kubernetes\" | \"languages\" | \"message_queue\" | \"monitoring\" | \"network\" | \"notification\" | \"os_system\" | \"productivity\" | \"security\" | \"support\" | \"threat_intel\" | \"ticketing\" | \"version_control\" | \"web\"" + "\"custom\" | \"aws\" | \"azure\" | \"cloud\" | \"config_management\" | \"containers\" | \"crm\" | \"datastore\" | \"elastic_stack\" | \"google_cloud\" | \"infrastructure\" | \"kubernetes\" | \"languages\" | \"message_queue\" | \"monitoring\" | \"network\" | \"notification\" | \"os_system\" | \"productivity\" | \"security\" | \"support\" | \"threat_intel\" | \"ticketing\" | \"version_control\" | \"web\"" ], "path": "x-pack/plugins/fleet/common/types/models/package_spec.ts", "deprecated": false, diff --git a/api_docs/fleet.mdx b/api_docs/fleet.mdx index 6f966dbb5a316..7c5beab0d5c9d 100644 --- a/api_docs/fleet.mdx +++ b/api_docs/fleet.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/fleet title: "fleet" image: https://source.unsplash.com/400x175/?github description: API docs for the fleet plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'fleet'] --- import fleetObj from './fleet.devdocs.json'; diff --git a/api_docs/global_search.mdx b/api_docs/global_search.mdx index 63433541ece2b..6803fa9d095e6 100644 --- a/api_docs/global_search.mdx +++ b/api_docs/global_search.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/globalSearch title: "globalSearch" image: https://source.unsplash.com/400x175/?github description: API docs for the globalSearch plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'globalSearch'] --- import globalSearchObj from './global_search.devdocs.json'; diff --git a/api_docs/guided_onboarding.mdx b/api_docs/guided_onboarding.mdx index c28c8b2fef872..062ffb1effb3c 100644 --- a/api_docs/guided_onboarding.mdx +++ b/api_docs/guided_onboarding.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/guidedOnboarding title: "guidedOnboarding" image: https://source.unsplash.com/400x175/?github description: API docs for the guidedOnboarding plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'guidedOnboarding'] --- import guidedOnboardingObj from './guided_onboarding.devdocs.json'; diff --git a/api_docs/home.mdx b/api_docs/home.mdx index 8c285e037a355..8f772016026cb 100644 --- a/api_docs/home.mdx +++ b/api_docs/home.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/home title: "home" image: https://source.unsplash.com/400x175/?github description: API docs for the home plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'home'] --- import homeObj from './home.devdocs.json'; diff --git a/api_docs/index_lifecycle_management.mdx b/api_docs/index_lifecycle_management.mdx index 2d1523f302cb2..29de31f6cf689 100644 --- a/api_docs/index_lifecycle_management.mdx +++ b/api_docs/index_lifecycle_management.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/indexLifecycleManagement title: "indexLifecycleManagement" image: https://source.unsplash.com/400x175/?github description: API docs for the indexLifecycleManagement plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'indexLifecycleManagement'] --- import indexLifecycleManagementObj from './index_lifecycle_management.devdocs.json'; diff --git a/api_docs/index_management.mdx b/api_docs/index_management.mdx index 46b6303673ab9..3dac89fa09d7f 100644 --- a/api_docs/index_management.mdx +++ b/api_docs/index_management.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/indexManagement title: "indexManagement" image: https://source.unsplash.com/400x175/?github description: API docs for the indexManagement plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'indexManagement'] --- import indexManagementObj from './index_management.devdocs.json'; diff --git a/api_docs/infra.mdx b/api_docs/infra.mdx index d86809062de00..315978011a0b4 100644 --- a/api_docs/infra.mdx +++ b/api_docs/infra.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/infra title: "infra" image: https://source.unsplash.com/400x175/?github description: API docs for the infra plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'infra'] --- import infraObj from './infra.devdocs.json'; diff --git a/api_docs/inspector.mdx b/api_docs/inspector.mdx index 0a75d4c550c42..1eec7a67db10b 100644 --- a/api_docs/inspector.mdx +++ b/api_docs/inspector.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/inspector title: "inspector" image: https://source.unsplash.com/400x175/?github description: API docs for the inspector plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'inspector'] --- import inspectorObj from './inspector.devdocs.json'; diff --git a/api_docs/interactive_setup.mdx b/api_docs/interactive_setup.mdx index 1b2ce0d5a84c2..ba3797cab67d7 100644 --- a/api_docs/interactive_setup.mdx +++ b/api_docs/interactive_setup.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/interactiveSetup title: "interactiveSetup" image: https://source.unsplash.com/400x175/?github description: API docs for the interactiveSetup plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'interactiveSetup'] --- import interactiveSetupObj from './interactive_setup.devdocs.json'; diff --git a/api_docs/kbn_ace.mdx b/api_docs/kbn_ace.mdx index 3ca0d95b596d9..c6dcd6bde7831 100644 --- a/api_docs/kbn_ace.mdx +++ b/api_docs/kbn_ace.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ace title: "@kbn/ace" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/ace plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ace'] --- import kbnAceObj from './kbn_ace.devdocs.json'; diff --git a/api_docs/kbn_aiops_components.mdx b/api_docs/kbn_aiops_components.mdx index 7e469da7a40b8..78c88adbe04a1 100644 --- a/api_docs/kbn_aiops_components.mdx +++ b/api_docs/kbn_aiops_components.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-aiops-components title: "@kbn/aiops-components" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/aiops-components plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/aiops-components'] --- import kbnAiopsComponentsObj from './kbn_aiops_components.devdocs.json'; diff --git a/api_docs/kbn_aiops_utils.mdx b/api_docs/kbn_aiops_utils.mdx index 9e1d8daed9b7c..8e0003a6394ae 100644 --- a/api_docs/kbn_aiops_utils.mdx +++ b/api_docs/kbn_aiops_utils.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-aiops-utils title: "@kbn/aiops-utils" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/aiops-utils plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/aiops-utils'] --- import kbnAiopsUtilsObj from './kbn_aiops_utils.devdocs.json'; diff --git a/api_docs/kbn_alerts.mdx b/api_docs/kbn_alerts.mdx index 294c0b5ebb04b..b936fa218da1b 100644 --- a/api_docs/kbn_alerts.mdx +++ b/api_docs/kbn_alerts.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-alerts title: "@kbn/alerts" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/alerts plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/alerts'] --- import kbnAlertsObj from './kbn_alerts.devdocs.json'; diff --git a/api_docs/kbn_analytics.mdx b/api_docs/kbn_analytics.mdx index e991378eefb61..480d1389d1d53 100644 --- a/api_docs/kbn_analytics.mdx +++ b/api_docs/kbn_analytics.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics title: "@kbn/analytics" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/analytics plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics'] --- import kbnAnalyticsObj from './kbn_analytics.devdocs.json'; diff --git a/api_docs/kbn_analytics_client.mdx b/api_docs/kbn_analytics_client.mdx index 61ec0f495851f..67d5f65e938ae 100644 --- a/api_docs/kbn_analytics_client.mdx +++ b/api_docs/kbn_analytics_client.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics-client title: "@kbn/analytics-client" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/analytics-client plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics-client'] --- import kbnAnalyticsClientObj from './kbn_analytics_client.devdocs.json'; diff --git a/api_docs/kbn_analytics_shippers_elastic_v3_browser.mdx b/api_docs/kbn_analytics_shippers_elastic_v3_browser.mdx index af69ccaa66458..2c75bd5664b65 100644 --- a/api_docs/kbn_analytics_shippers_elastic_v3_browser.mdx +++ b/api_docs/kbn_analytics_shippers_elastic_v3_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics-shippers-elastic-v3-browser title: "@kbn/analytics-shippers-elastic-v3-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/analytics-shippers-elastic-v3-browser plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics-shippers-elastic-v3-browser'] --- import kbnAnalyticsShippersElasticV3BrowserObj from './kbn_analytics_shippers_elastic_v3_browser.devdocs.json'; diff --git a/api_docs/kbn_analytics_shippers_elastic_v3_common.mdx b/api_docs/kbn_analytics_shippers_elastic_v3_common.mdx index c80fb067196d2..af39931531e69 100644 --- a/api_docs/kbn_analytics_shippers_elastic_v3_common.mdx +++ b/api_docs/kbn_analytics_shippers_elastic_v3_common.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics-shippers-elastic-v3-common title: "@kbn/analytics-shippers-elastic-v3-common" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/analytics-shippers-elastic-v3-common plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics-shippers-elastic-v3-common'] --- import kbnAnalyticsShippersElasticV3CommonObj from './kbn_analytics_shippers_elastic_v3_common.devdocs.json'; diff --git a/api_docs/kbn_analytics_shippers_elastic_v3_server.mdx b/api_docs/kbn_analytics_shippers_elastic_v3_server.mdx index c8fd4ef979406..5515fe767880f 100644 --- a/api_docs/kbn_analytics_shippers_elastic_v3_server.mdx +++ b/api_docs/kbn_analytics_shippers_elastic_v3_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics-shippers-elastic-v3-server title: "@kbn/analytics-shippers-elastic-v3-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/analytics-shippers-elastic-v3-server plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics-shippers-elastic-v3-server'] --- import kbnAnalyticsShippersElasticV3ServerObj from './kbn_analytics_shippers_elastic_v3_server.devdocs.json'; diff --git a/api_docs/kbn_analytics_shippers_fullstory.mdx b/api_docs/kbn_analytics_shippers_fullstory.mdx index 102c627e9ef5e..d857977462103 100644 --- a/api_docs/kbn_analytics_shippers_fullstory.mdx +++ b/api_docs/kbn_analytics_shippers_fullstory.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics-shippers-fullstory title: "@kbn/analytics-shippers-fullstory" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/analytics-shippers-fullstory plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics-shippers-fullstory'] --- import kbnAnalyticsShippersFullstoryObj from './kbn_analytics_shippers_fullstory.devdocs.json'; diff --git a/api_docs/kbn_apm_config_loader.mdx b/api_docs/kbn_apm_config_loader.mdx index 88ae4fc21aca0..ec16bbb3798aa 100644 --- a/api_docs/kbn_apm_config_loader.mdx +++ b/api_docs/kbn_apm_config_loader.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-apm-config-loader title: "@kbn/apm-config-loader" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/apm-config-loader plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/apm-config-loader'] --- import kbnApmConfigLoaderObj from './kbn_apm_config_loader.devdocs.json'; diff --git a/api_docs/kbn_apm_synthtrace.mdx b/api_docs/kbn_apm_synthtrace.mdx index 951b6896fa528..cd86d11a33dc4 100644 --- a/api_docs/kbn_apm_synthtrace.mdx +++ b/api_docs/kbn_apm_synthtrace.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-apm-synthtrace title: "@kbn/apm-synthtrace" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/apm-synthtrace plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/apm-synthtrace'] --- import kbnApmSynthtraceObj from './kbn_apm_synthtrace.devdocs.json'; diff --git a/api_docs/kbn_apm_utils.mdx b/api_docs/kbn_apm_utils.mdx index a679b1a252dad..24e76f781315f 100644 --- a/api_docs/kbn_apm_utils.mdx +++ b/api_docs/kbn_apm_utils.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-apm-utils title: "@kbn/apm-utils" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/apm-utils plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/apm-utils'] --- import kbnApmUtilsObj from './kbn_apm_utils.devdocs.json'; diff --git a/api_docs/kbn_axe_config.mdx b/api_docs/kbn_axe_config.mdx index c330c66a3b511..a38a76d26da3c 100644 --- a/api_docs/kbn_axe_config.mdx +++ b/api_docs/kbn_axe_config.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-axe-config title: "@kbn/axe-config" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/axe-config plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/axe-config'] --- import kbnAxeConfigObj from './kbn_axe_config.devdocs.json'; diff --git a/api_docs/kbn_chart_icons.mdx b/api_docs/kbn_chart_icons.mdx index 4cf5662b020cc..96f35a5ca85a3 100644 --- a/api_docs/kbn_chart_icons.mdx +++ b/api_docs/kbn_chart_icons.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-chart-icons title: "@kbn/chart-icons" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/chart-icons plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/chart-icons'] --- import kbnChartIconsObj from './kbn_chart_icons.devdocs.json'; diff --git a/api_docs/kbn_ci_stats_core.mdx b/api_docs/kbn_ci_stats_core.mdx index 4396f3ffe02e1..efc5f97cca9fe 100644 --- a/api_docs/kbn_ci_stats_core.mdx +++ b/api_docs/kbn_ci_stats_core.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ci-stats-core title: "@kbn/ci-stats-core" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/ci-stats-core plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ci-stats-core'] --- import kbnCiStatsCoreObj from './kbn_ci_stats_core.devdocs.json'; diff --git a/api_docs/kbn_ci_stats_performance_metrics.mdx b/api_docs/kbn_ci_stats_performance_metrics.mdx index 1857d82ee013a..7030b63abaa14 100644 --- a/api_docs/kbn_ci_stats_performance_metrics.mdx +++ b/api_docs/kbn_ci_stats_performance_metrics.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ci-stats-performance-metrics title: "@kbn/ci-stats-performance-metrics" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/ci-stats-performance-metrics plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ci-stats-performance-metrics'] --- import kbnCiStatsPerformanceMetricsObj from './kbn_ci_stats_performance_metrics.devdocs.json'; diff --git a/api_docs/kbn_ci_stats_reporter.devdocs.json b/api_docs/kbn_ci_stats_reporter.devdocs.json index f831ac502a939..18389c93d07ca 100644 --- a/api_docs/kbn_ci_stats_reporter.devdocs.json +++ b/api_docs/kbn_ci_stats_reporter.devdocs.json @@ -654,7 +654,7 @@ "\nOverall result of this test group" ], "signature": [ - "\"fail\" | \"pass\" | \"skip\"" + "\"skip\" | \"fail\" | \"pass\"" ], "path": "packages/kbn-ci-stats-reporter/src/ci_stats_test_group_types.ts", "deprecated": false, @@ -755,7 +755,7 @@ "\n\"fail\", \"pass\" or \"skip\", the result of the tests" ], "signature": [ - "\"fail\" | \"pass\" | \"skip\"" + "\"skip\" | \"fail\" | \"pass\"" ], "path": "packages/kbn-ci-stats-reporter/src/ci_stats_test_group_types.ts", "deprecated": false, @@ -1041,7 +1041,7 @@ "label": "CiStatsTestResult", "description": [], "signature": [ - "\"fail\" | \"pass\" | \"skip\"" + "\"skip\" | \"fail\" | \"pass\"" ], "path": "packages/kbn-ci-stats-reporter/src/ci_stats_test_group_types.ts", "deprecated": false, diff --git a/api_docs/kbn_ci_stats_reporter.mdx b/api_docs/kbn_ci_stats_reporter.mdx index f3779a0488fb4..464ef1f629346 100644 --- a/api_docs/kbn_ci_stats_reporter.mdx +++ b/api_docs/kbn_ci_stats_reporter.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ci-stats-reporter title: "@kbn/ci-stats-reporter" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/ci-stats-reporter plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ci-stats-reporter'] --- import kbnCiStatsReporterObj from './kbn_ci_stats_reporter.devdocs.json'; diff --git a/api_docs/kbn_cli_dev_mode.mdx b/api_docs/kbn_cli_dev_mode.mdx index e2d60d46020af..7aac22dfeead6 100644 --- a/api_docs/kbn_cli_dev_mode.mdx +++ b/api_docs/kbn_cli_dev_mode.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-cli-dev-mode title: "@kbn/cli-dev-mode" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/cli-dev-mode plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/cli-dev-mode'] --- import kbnCliDevModeObj from './kbn_cli_dev_mode.devdocs.json'; diff --git a/api_docs/kbn_coloring.mdx b/api_docs/kbn_coloring.mdx index e0475bc85ecd2..edd9cb125e751 100644 --- a/api_docs/kbn_coloring.mdx +++ b/api_docs/kbn_coloring.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-coloring title: "@kbn/coloring" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/coloring plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/coloring'] --- import kbnColoringObj from './kbn_coloring.devdocs.json'; diff --git a/api_docs/kbn_config.mdx b/api_docs/kbn_config.mdx index 32514d096d20f..b82dc689dba2f 100644 --- a/api_docs/kbn_config.mdx +++ b/api_docs/kbn_config.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-config title: "@kbn/config" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/config plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/config'] --- import kbnConfigObj from './kbn_config.devdocs.json'; diff --git a/api_docs/kbn_config_mocks.mdx b/api_docs/kbn_config_mocks.mdx index b93c70c8a0eb5..cebca9163e797 100644 --- a/api_docs/kbn_config_mocks.mdx +++ b/api_docs/kbn_config_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-config-mocks title: "@kbn/config-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/config-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/config-mocks'] --- import kbnConfigMocksObj from './kbn_config_mocks.devdocs.json'; diff --git a/api_docs/kbn_config_schema.mdx b/api_docs/kbn_config_schema.mdx index 78d758c0f2fe3..bd788d6e1868d 100644 --- a/api_docs/kbn_config_schema.mdx +++ b/api_docs/kbn_config_schema.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-config-schema title: "@kbn/config-schema" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/config-schema plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/config-schema'] --- import kbnConfigSchemaObj from './kbn_config_schema.devdocs.json'; diff --git a/api_docs/kbn_content_management_table_list.mdx b/api_docs/kbn_content_management_table_list.mdx index 812ca543dea50..ac56135aa2927 100644 --- a/api_docs/kbn_content_management_table_list.mdx +++ b/api_docs/kbn_content_management_table_list.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-content-management-table-list title: "@kbn/content-management-table-list" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/content-management-table-list plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/content-management-table-list'] --- import kbnContentManagementTableListObj from './kbn_content_management_table_list.devdocs.json'; diff --git a/api_docs/kbn_core_analytics_browser.mdx b/api_docs/kbn_core_analytics_browser.mdx index c29081c8b626d..eefeafb88d5d6 100644 --- a/api_docs/kbn_core_analytics_browser.mdx +++ b/api_docs/kbn_core_analytics_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-browser title: "@kbn/core-analytics-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-analytics-browser plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-browser'] --- import kbnCoreAnalyticsBrowserObj from './kbn_core_analytics_browser.devdocs.json'; diff --git a/api_docs/kbn_core_analytics_browser_internal.mdx b/api_docs/kbn_core_analytics_browser_internal.mdx index 739c7e7af5969..36b99e4215594 100644 --- a/api_docs/kbn_core_analytics_browser_internal.mdx +++ b/api_docs/kbn_core_analytics_browser_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-browser-internal title: "@kbn/core-analytics-browser-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-analytics-browser-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-browser-internal'] --- import kbnCoreAnalyticsBrowserInternalObj from './kbn_core_analytics_browser_internal.devdocs.json'; diff --git a/api_docs/kbn_core_analytics_browser_mocks.mdx b/api_docs/kbn_core_analytics_browser_mocks.mdx index 2c0999666ff1f..abf361ac547be 100644 --- a/api_docs/kbn_core_analytics_browser_mocks.mdx +++ b/api_docs/kbn_core_analytics_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-browser-mocks title: "@kbn/core-analytics-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-analytics-browser-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-browser-mocks'] --- import kbnCoreAnalyticsBrowserMocksObj from './kbn_core_analytics_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_analytics_server.mdx b/api_docs/kbn_core_analytics_server.mdx index f58a16ef732ad..ec45043e4726a 100644 --- a/api_docs/kbn_core_analytics_server.mdx +++ b/api_docs/kbn_core_analytics_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-server title: "@kbn/core-analytics-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-analytics-server plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-server'] --- import kbnCoreAnalyticsServerObj from './kbn_core_analytics_server.devdocs.json'; diff --git a/api_docs/kbn_core_analytics_server_internal.mdx b/api_docs/kbn_core_analytics_server_internal.mdx index ced023377219a..04e49781988c4 100644 --- a/api_docs/kbn_core_analytics_server_internal.mdx +++ b/api_docs/kbn_core_analytics_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-server-internal title: "@kbn/core-analytics-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-analytics-server-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-server-internal'] --- import kbnCoreAnalyticsServerInternalObj from './kbn_core_analytics_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_analytics_server_mocks.mdx b/api_docs/kbn_core_analytics_server_mocks.mdx index cbea4bff1bf86..126ab218962cd 100644 --- a/api_docs/kbn_core_analytics_server_mocks.mdx +++ b/api_docs/kbn_core_analytics_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-server-mocks title: "@kbn/core-analytics-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-analytics-server-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-server-mocks'] --- import kbnCoreAnalyticsServerMocksObj from './kbn_core_analytics_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_application_browser.mdx b/api_docs/kbn_core_application_browser.mdx index b1580098a3652..71e7fae504f5f 100644 --- a/api_docs/kbn_core_application_browser.mdx +++ b/api_docs/kbn_core_application_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-application-browser title: "@kbn/core-application-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-application-browser plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-application-browser'] --- import kbnCoreApplicationBrowserObj from './kbn_core_application_browser.devdocs.json'; diff --git a/api_docs/kbn_core_application_browser_internal.mdx b/api_docs/kbn_core_application_browser_internal.mdx index f704df4a7f345..55beb31993bb2 100644 --- a/api_docs/kbn_core_application_browser_internal.mdx +++ b/api_docs/kbn_core_application_browser_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-application-browser-internal title: "@kbn/core-application-browser-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-application-browser-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-application-browser-internal'] --- import kbnCoreApplicationBrowserInternalObj from './kbn_core_application_browser_internal.devdocs.json'; diff --git a/api_docs/kbn_core_application_browser_mocks.mdx b/api_docs/kbn_core_application_browser_mocks.mdx index 4767d8fa50538..c777505da45db 100644 --- a/api_docs/kbn_core_application_browser_mocks.mdx +++ b/api_docs/kbn_core_application_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-application-browser-mocks title: "@kbn/core-application-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-application-browser-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-application-browser-mocks'] --- import kbnCoreApplicationBrowserMocksObj from './kbn_core_application_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_application_common.mdx b/api_docs/kbn_core_application_common.mdx index 7c6ce13416170..10828fe0de714 100644 --- a/api_docs/kbn_core_application_common.mdx +++ b/api_docs/kbn_core_application_common.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-application-common title: "@kbn/core-application-common" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-application-common plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-application-common'] --- import kbnCoreApplicationCommonObj from './kbn_core_application_common.devdocs.json'; diff --git a/api_docs/kbn_core_apps_browser_internal.mdx b/api_docs/kbn_core_apps_browser_internal.mdx index 17402d105d5b5..978ac4faed760 100644 --- a/api_docs/kbn_core_apps_browser_internal.mdx +++ b/api_docs/kbn_core_apps_browser_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-apps-browser-internal title: "@kbn/core-apps-browser-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-apps-browser-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-apps-browser-internal'] --- import kbnCoreAppsBrowserInternalObj from './kbn_core_apps_browser_internal.devdocs.json'; diff --git a/api_docs/kbn_core_apps_browser_mocks.mdx b/api_docs/kbn_core_apps_browser_mocks.mdx index 48cb4145874c7..16fd9445d124c 100644 --- a/api_docs/kbn_core_apps_browser_mocks.mdx +++ b/api_docs/kbn_core_apps_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-apps-browser-mocks title: "@kbn/core-apps-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-apps-browser-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-apps-browser-mocks'] --- import kbnCoreAppsBrowserMocksObj from './kbn_core_apps_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_base_browser_mocks.mdx b/api_docs/kbn_core_base_browser_mocks.mdx index 28228f4c74761..cdaf427d6802b 100644 --- a/api_docs/kbn_core_base_browser_mocks.mdx +++ b/api_docs/kbn_core_base_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-base-browser-mocks title: "@kbn/core-base-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-base-browser-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-base-browser-mocks'] --- import kbnCoreBaseBrowserMocksObj from './kbn_core_base_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_base_common.mdx b/api_docs/kbn_core_base_common.mdx index 09afb9dd896c7..5bd2a717b5b84 100644 --- a/api_docs/kbn_core_base_common.mdx +++ b/api_docs/kbn_core_base_common.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-base-common title: "@kbn/core-base-common" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-base-common plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-base-common'] --- import kbnCoreBaseCommonObj from './kbn_core_base_common.devdocs.json'; diff --git a/api_docs/kbn_core_base_server_internal.mdx b/api_docs/kbn_core_base_server_internal.mdx index bf845366f8e62..76f931b4d756c 100644 --- a/api_docs/kbn_core_base_server_internal.mdx +++ b/api_docs/kbn_core_base_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-base-server-internal title: "@kbn/core-base-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-base-server-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-base-server-internal'] --- import kbnCoreBaseServerInternalObj from './kbn_core_base_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_base_server_mocks.mdx b/api_docs/kbn_core_base_server_mocks.mdx index bf1d2e6b25458..77aa19a6800c9 100644 --- a/api_docs/kbn_core_base_server_mocks.mdx +++ b/api_docs/kbn_core_base_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-base-server-mocks title: "@kbn/core-base-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-base-server-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-base-server-mocks'] --- import kbnCoreBaseServerMocksObj from './kbn_core_base_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_capabilities_browser_mocks.mdx b/api_docs/kbn_core_capabilities_browser_mocks.mdx index a2eb49783d4be..e6bfe1ecd7db2 100644 --- a/api_docs/kbn_core_capabilities_browser_mocks.mdx +++ b/api_docs/kbn_core_capabilities_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-capabilities-browser-mocks title: "@kbn/core-capabilities-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-capabilities-browser-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-capabilities-browser-mocks'] --- import kbnCoreCapabilitiesBrowserMocksObj from './kbn_core_capabilities_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_capabilities_common.mdx b/api_docs/kbn_core_capabilities_common.mdx index aa1d950326fc9..e9475861b697e 100644 --- a/api_docs/kbn_core_capabilities_common.mdx +++ b/api_docs/kbn_core_capabilities_common.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-capabilities-common title: "@kbn/core-capabilities-common" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-capabilities-common plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-capabilities-common'] --- import kbnCoreCapabilitiesCommonObj from './kbn_core_capabilities_common.devdocs.json'; diff --git a/api_docs/kbn_core_capabilities_server.mdx b/api_docs/kbn_core_capabilities_server.mdx index 3d8690f8d6f7d..d6dc431b07fdc 100644 --- a/api_docs/kbn_core_capabilities_server.mdx +++ b/api_docs/kbn_core_capabilities_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-capabilities-server title: "@kbn/core-capabilities-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-capabilities-server plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-capabilities-server'] --- import kbnCoreCapabilitiesServerObj from './kbn_core_capabilities_server.devdocs.json'; diff --git a/api_docs/kbn_core_capabilities_server_mocks.mdx b/api_docs/kbn_core_capabilities_server_mocks.mdx index 78563e898c03a..fdf7cc31d41f9 100644 --- a/api_docs/kbn_core_capabilities_server_mocks.mdx +++ b/api_docs/kbn_core_capabilities_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-capabilities-server-mocks title: "@kbn/core-capabilities-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-capabilities-server-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-capabilities-server-mocks'] --- import kbnCoreCapabilitiesServerMocksObj from './kbn_core_capabilities_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_chrome_browser.mdx b/api_docs/kbn_core_chrome_browser.mdx index 4b44cbfe07571..73d5385236586 100644 --- a/api_docs/kbn_core_chrome_browser.mdx +++ b/api_docs/kbn_core_chrome_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-chrome-browser title: "@kbn/core-chrome-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-chrome-browser plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-chrome-browser'] --- import kbnCoreChromeBrowserObj from './kbn_core_chrome_browser.devdocs.json'; diff --git a/api_docs/kbn_core_chrome_browser_mocks.mdx b/api_docs/kbn_core_chrome_browser_mocks.mdx index f8052fad772a5..a1f512749d437 100644 --- a/api_docs/kbn_core_chrome_browser_mocks.mdx +++ b/api_docs/kbn_core_chrome_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-chrome-browser-mocks title: "@kbn/core-chrome-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-chrome-browser-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-chrome-browser-mocks'] --- import kbnCoreChromeBrowserMocksObj from './kbn_core_chrome_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_config_server_internal.mdx b/api_docs/kbn_core_config_server_internal.mdx index 79da95fae9e67..42574e3029ea4 100644 --- a/api_docs/kbn_core_config_server_internal.mdx +++ b/api_docs/kbn_core_config_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-config-server-internal title: "@kbn/core-config-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-config-server-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-config-server-internal'] --- import kbnCoreConfigServerInternalObj from './kbn_core_config_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_deprecations_browser.mdx b/api_docs/kbn_core_deprecations_browser.mdx index ad16ad6aea2e6..6bb0bb64c5ba2 100644 --- a/api_docs/kbn_core_deprecations_browser.mdx +++ b/api_docs/kbn_core_deprecations_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-browser title: "@kbn/core-deprecations-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-deprecations-browser plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-browser'] --- import kbnCoreDeprecationsBrowserObj from './kbn_core_deprecations_browser.devdocs.json'; diff --git a/api_docs/kbn_core_deprecations_browser_internal.mdx b/api_docs/kbn_core_deprecations_browser_internal.mdx index 7fe5dba92aa5c..938d8d6b38aff 100644 --- a/api_docs/kbn_core_deprecations_browser_internal.mdx +++ b/api_docs/kbn_core_deprecations_browser_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-browser-internal title: "@kbn/core-deprecations-browser-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-deprecations-browser-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-browser-internal'] --- import kbnCoreDeprecationsBrowserInternalObj from './kbn_core_deprecations_browser_internal.devdocs.json'; diff --git a/api_docs/kbn_core_deprecations_browser_mocks.mdx b/api_docs/kbn_core_deprecations_browser_mocks.mdx index 2547deec251f6..9d33c64bd7f4a 100644 --- a/api_docs/kbn_core_deprecations_browser_mocks.mdx +++ b/api_docs/kbn_core_deprecations_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-browser-mocks title: "@kbn/core-deprecations-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-deprecations-browser-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-browser-mocks'] --- import kbnCoreDeprecationsBrowserMocksObj from './kbn_core_deprecations_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_deprecations_common.mdx b/api_docs/kbn_core_deprecations_common.mdx index d96ff821c4365..7f254dda6eee2 100644 --- a/api_docs/kbn_core_deprecations_common.mdx +++ b/api_docs/kbn_core_deprecations_common.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-common title: "@kbn/core-deprecations-common" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-deprecations-common plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-common'] --- import kbnCoreDeprecationsCommonObj from './kbn_core_deprecations_common.devdocs.json'; diff --git a/api_docs/kbn_core_deprecations_server.mdx b/api_docs/kbn_core_deprecations_server.mdx index 74dee4cd3fdcc..527a5f2be91ee 100644 --- a/api_docs/kbn_core_deprecations_server.mdx +++ b/api_docs/kbn_core_deprecations_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-server title: "@kbn/core-deprecations-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-deprecations-server plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-server'] --- import kbnCoreDeprecationsServerObj from './kbn_core_deprecations_server.devdocs.json'; diff --git a/api_docs/kbn_core_deprecations_server_internal.mdx b/api_docs/kbn_core_deprecations_server_internal.mdx index da6a21361ea25..7b470aeff3555 100644 --- a/api_docs/kbn_core_deprecations_server_internal.mdx +++ b/api_docs/kbn_core_deprecations_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-server-internal title: "@kbn/core-deprecations-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-deprecations-server-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-server-internal'] --- import kbnCoreDeprecationsServerInternalObj from './kbn_core_deprecations_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_deprecations_server_mocks.mdx b/api_docs/kbn_core_deprecations_server_mocks.mdx index 617a402d35fcc..34e0e5fb4d1fe 100644 --- a/api_docs/kbn_core_deprecations_server_mocks.mdx +++ b/api_docs/kbn_core_deprecations_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-server-mocks title: "@kbn/core-deprecations-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-deprecations-server-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-server-mocks'] --- import kbnCoreDeprecationsServerMocksObj from './kbn_core_deprecations_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_doc_links_browser.mdx b/api_docs/kbn_core_doc_links_browser.mdx index 1217a7b8fa20d..97c4d2e6d4b44 100644 --- a/api_docs/kbn_core_doc_links_browser.mdx +++ b/api_docs/kbn_core_doc_links_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-doc-links-browser title: "@kbn/core-doc-links-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-doc-links-browser plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-doc-links-browser'] --- import kbnCoreDocLinksBrowserObj from './kbn_core_doc_links_browser.devdocs.json'; diff --git a/api_docs/kbn_core_doc_links_browser_mocks.mdx b/api_docs/kbn_core_doc_links_browser_mocks.mdx index 0ccaad98b392b..0347b3f309a86 100644 --- a/api_docs/kbn_core_doc_links_browser_mocks.mdx +++ b/api_docs/kbn_core_doc_links_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-doc-links-browser-mocks title: "@kbn/core-doc-links-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-doc-links-browser-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-doc-links-browser-mocks'] --- import kbnCoreDocLinksBrowserMocksObj from './kbn_core_doc_links_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_doc_links_server.mdx b/api_docs/kbn_core_doc_links_server.mdx index 14eccd7c10c34..5cccdf33b5038 100644 --- a/api_docs/kbn_core_doc_links_server.mdx +++ b/api_docs/kbn_core_doc_links_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-doc-links-server title: "@kbn/core-doc-links-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-doc-links-server plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-doc-links-server'] --- import kbnCoreDocLinksServerObj from './kbn_core_doc_links_server.devdocs.json'; diff --git a/api_docs/kbn_core_doc_links_server_mocks.mdx b/api_docs/kbn_core_doc_links_server_mocks.mdx index f5f017918ee4a..e2c4d921a70b3 100644 --- a/api_docs/kbn_core_doc_links_server_mocks.mdx +++ b/api_docs/kbn_core_doc_links_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-doc-links-server-mocks title: "@kbn/core-doc-links-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-doc-links-server-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-doc-links-server-mocks'] --- import kbnCoreDocLinksServerMocksObj from './kbn_core_doc_links_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_elasticsearch_client_server_internal.mdx b/api_docs/kbn_core_elasticsearch_client_server_internal.mdx index 477917148b690..1d786ddcd3496 100644 --- a/api_docs/kbn_core_elasticsearch_client_server_internal.mdx +++ b/api_docs/kbn_core_elasticsearch_client_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-client-server-internal title: "@kbn/core-elasticsearch-client-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-elasticsearch-client-server-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-elasticsearch-client-server-internal'] --- import kbnCoreElasticsearchClientServerInternalObj from './kbn_core_elasticsearch_client_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_elasticsearch_client_server_mocks.mdx b/api_docs/kbn_core_elasticsearch_client_server_mocks.mdx index 399790680e068..25079df745e3c 100644 --- a/api_docs/kbn_core_elasticsearch_client_server_mocks.mdx +++ b/api_docs/kbn_core_elasticsearch_client_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-client-server-mocks title: "@kbn/core-elasticsearch-client-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-elasticsearch-client-server-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-elasticsearch-client-server-mocks'] --- import kbnCoreElasticsearchClientServerMocksObj from './kbn_core_elasticsearch_client_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_elasticsearch_server.mdx b/api_docs/kbn_core_elasticsearch_server.mdx index 318e2f19b36d7..a5712d10acd36 100644 --- a/api_docs/kbn_core_elasticsearch_server.mdx +++ b/api_docs/kbn_core_elasticsearch_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-server title: "@kbn/core-elasticsearch-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-elasticsearch-server plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-elasticsearch-server'] --- import kbnCoreElasticsearchServerObj from './kbn_core_elasticsearch_server.devdocs.json'; diff --git a/api_docs/kbn_core_elasticsearch_server_internal.mdx b/api_docs/kbn_core_elasticsearch_server_internal.mdx index b4e402b1d85a7..2b2107d520826 100644 --- a/api_docs/kbn_core_elasticsearch_server_internal.mdx +++ b/api_docs/kbn_core_elasticsearch_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-server-internal title: "@kbn/core-elasticsearch-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-elasticsearch-server-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-elasticsearch-server-internal'] --- import kbnCoreElasticsearchServerInternalObj from './kbn_core_elasticsearch_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_elasticsearch_server_mocks.mdx b/api_docs/kbn_core_elasticsearch_server_mocks.mdx index 1263eb43812bf..c9aa728e95fb2 100644 --- a/api_docs/kbn_core_elasticsearch_server_mocks.mdx +++ b/api_docs/kbn_core_elasticsearch_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-server-mocks title: "@kbn/core-elasticsearch-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-elasticsearch-server-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-elasticsearch-server-mocks'] --- import kbnCoreElasticsearchServerMocksObj from './kbn_core_elasticsearch_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_environment_server_internal.mdx b/api_docs/kbn_core_environment_server_internal.mdx index efd3c4dce7d8e..630ee26b50242 100644 --- a/api_docs/kbn_core_environment_server_internal.mdx +++ b/api_docs/kbn_core_environment_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-environment-server-internal title: "@kbn/core-environment-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-environment-server-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-environment-server-internal'] --- import kbnCoreEnvironmentServerInternalObj from './kbn_core_environment_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_environment_server_mocks.mdx b/api_docs/kbn_core_environment_server_mocks.mdx index 4b8b92e29d47e..62ed3d4b8afa0 100644 --- a/api_docs/kbn_core_environment_server_mocks.mdx +++ b/api_docs/kbn_core_environment_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-environment-server-mocks title: "@kbn/core-environment-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-environment-server-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-environment-server-mocks'] --- import kbnCoreEnvironmentServerMocksObj from './kbn_core_environment_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_execution_context_browser.mdx b/api_docs/kbn_core_execution_context_browser.mdx index 12f2b1b89aaa5..1c33ab738b0ea 100644 --- a/api_docs/kbn_core_execution_context_browser.mdx +++ b/api_docs/kbn_core_execution_context_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-browser title: "@kbn/core-execution-context-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-execution-context-browser plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-browser'] --- import kbnCoreExecutionContextBrowserObj from './kbn_core_execution_context_browser.devdocs.json'; diff --git a/api_docs/kbn_core_execution_context_browser_internal.mdx b/api_docs/kbn_core_execution_context_browser_internal.mdx index 22703ff1d56c5..8d4402a7a2cda 100644 --- a/api_docs/kbn_core_execution_context_browser_internal.mdx +++ b/api_docs/kbn_core_execution_context_browser_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-browser-internal title: "@kbn/core-execution-context-browser-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-execution-context-browser-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-browser-internal'] --- import kbnCoreExecutionContextBrowserInternalObj from './kbn_core_execution_context_browser_internal.devdocs.json'; diff --git a/api_docs/kbn_core_execution_context_browser_mocks.mdx b/api_docs/kbn_core_execution_context_browser_mocks.mdx index 58d7084730b09..5e923792bc936 100644 --- a/api_docs/kbn_core_execution_context_browser_mocks.mdx +++ b/api_docs/kbn_core_execution_context_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-browser-mocks title: "@kbn/core-execution-context-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-execution-context-browser-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-browser-mocks'] --- import kbnCoreExecutionContextBrowserMocksObj from './kbn_core_execution_context_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_execution_context_common.mdx b/api_docs/kbn_core_execution_context_common.mdx index 9f241f79f3092..f2336d9fdfb05 100644 --- a/api_docs/kbn_core_execution_context_common.mdx +++ b/api_docs/kbn_core_execution_context_common.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-common title: "@kbn/core-execution-context-common" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-execution-context-common plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-common'] --- import kbnCoreExecutionContextCommonObj from './kbn_core_execution_context_common.devdocs.json'; diff --git a/api_docs/kbn_core_execution_context_server.mdx b/api_docs/kbn_core_execution_context_server.mdx index 2d3ce9691dbc3..61e72d43c392a 100644 --- a/api_docs/kbn_core_execution_context_server.mdx +++ b/api_docs/kbn_core_execution_context_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-server title: "@kbn/core-execution-context-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-execution-context-server plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-server'] --- import kbnCoreExecutionContextServerObj from './kbn_core_execution_context_server.devdocs.json'; diff --git a/api_docs/kbn_core_execution_context_server_internal.mdx b/api_docs/kbn_core_execution_context_server_internal.mdx index db3e364e96ff7..1c31d922fc680 100644 --- a/api_docs/kbn_core_execution_context_server_internal.mdx +++ b/api_docs/kbn_core_execution_context_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-server-internal title: "@kbn/core-execution-context-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-execution-context-server-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-server-internal'] --- import kbnCoreExecutionContextServerInternalObj from './kbn_core_execution_context_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_execution_context_server_mocks.mdx b/api_docs/kbn_core_execution_context_server_mocks.mdx index cbeb87f2524be..00772d47658c5 100644 --- a/api_docs/kbn_core_execution_context_server_mocks.mdx +++ b/api_docs/kbn_core_execution_context_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-server-mocks title: "@kbn/core-execution-context-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-execution-context-server-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-server-mocks'] --- import kbnCoreExecutionContextServerMocksObj from './kbn_core_execution_context_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_fatal_errors_browser.mdx b/api_docs/kbn_core_fatal_errors_browser.mdx index e838dfc832fd6..7a8edbe3e3b30 100644 --- a/api_docs/kbn_core_fatal_errors_browser.mdx +++ b/api_docs/kbn_core_fatal_errors_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-fatal-errors-browser title: "@kbn/core-fatal-errors-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-fatal-errors-browser plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-fatal-errors-browser'] --- import kbnCoreFatalErrorsBrowserObj from './kbn_core_fatal_errors_browser.devdocs.json'; diff --git a/api_docs/kbn_core_fatal_errors_browser_mocks.mdx b/api_docs/kbn_core_fatal_errors_browser_mocks.mdx index 6bdcb4cd9e37a..6dd6b8aebce65 100644 --- a/api_docs/kbn_core_fatal_errors_browser_mocks.mdx +++ b/api_docs/kbn_core_fatal_errors_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-fatal-errors-browser-mocks title: "@kbn/core-fatal-errors-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-fatal-errors-browser-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-fatal-errors-browser-mocks'] --- import kbnCoreFatalErrorsBrowserMocksObj from './kbn_core_fatal_errors_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_http_browser.mdx b/api_docs/kbn_core_http_browser.mdx index afb5974de9a1d..8014dbb2ceb6b 100644 --- a/api_docs/kbn_core_http_browser.mdx +++ b/api_docs/kbn_core_http_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-browser title: "@kbn/core-http-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-http-browser plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-browser'] --- import kbnCoreHttpBrowserObj from './kbn_core_http_browser.devdocs.json'; diff --git a/api_docs/kbn_core_http_browser_internal.mdx b/api_docs/kbn_core_http_browser_internal.mdx index 8e28ebbe2ff12..ed565e7b8f3b3 100644 --- a/api_docs/kbn_core_http_browser_internal.mdx +++ b/api_docs/kbn_core_http_browser_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-browser-internal title: "@kbn/core-http-browser-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-http-browser-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-browser-internal'] --- import kbnCoreHttpBrowserInternalObj from './kbn_core_http_browser_internal.devdocs.json'; diff --git a/api_docs/kbn_core_http_browser_mocks.mdx b/api_docs/kbn_core_http_browser_mocks.mdx index 463b56f364292..632f5546a7210 100644 --- a/api_docs/kbn_core_http_browser_mocks.mdx +++ b/api_docs/kbn_core_http_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-browser-mocks title: "@kbn/core-http-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-http-browser-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-browser-mocks'] --- import kbnCoreHttpBrowserMocksObj from './kbn_core_http_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_http_common.mdx b/api_docs/kbn_core_http_common.mdx index bf4cf64d7a58a..92184cbab2784 100644 --- a/api_docs/kbn_core_http_common.mdx +++ b/api_docs/kbn_core_http_common.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-common title: "@kbn/core-http-common" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-http-common plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-common'] --- import kbnCoreHttpCommonObj from './kbn_core_http_common.devdocs.json'; diff --git a/api_docs/kbn_core_http_context_server_mocks.mdx b/api_docs/kbn_core_http_context_server_mocks.mdx index 4047f8a6f4847..52f62aad5c930 100644 --- a/api_docs/kbn_core_http_context_server_mocks.mdx +++ b/api_docs/kbn_core_http_context_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-context-server-mocks title: "@kbn/core-http-context-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-http-context-server-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-context-server-mocks'] --- import kbnCoreHttpContextServerMocksObj from './kbn_core_http_context_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_http_request_handler_context_server.devdocs.json b/api_docs/kbn_core_http_request_handler_context_server.devdocs.json new file mode 100644 index 0000000000000..ebf6567c0a8b4 --- /dev/null +++ b/api_docs/kbn_core_http_request_handler_context_server.devdocs.json @@ -0,0 +1,283 @@ +{ + "id": "@kbn/core-http-request-handler-context-server", + "client": { + "classes": [], + "functions": [], + "interfaces": [], + "enums": [], + "misc": [], + "objects": [] + }, + "server": { + "classes": [], + "functions": [], + "interfaces": [ + { + "parentPluginId": "@kbn/core-http-request-handler-context-server", + "id": "def-server.CoreRequestHandlerContext", + "type": "Interface", + "tags": [], + "label": "CoreRequestHandlerContext", + "description": [ + "\nThe `core` context provided to route handler.\n\nProvides the following clients and services:\n - {@link SavedObjectsClient | savedObjects.client} - Saved Objects client\n which uses the credentials of the incoming request\n - {@link ISavedObjectTypeRegistry | savedObjects.typeRegistry} - Type registry containing\n all the registered types.\n - {@link IScopedClusterClient | elasticsearch.client} - Elasticsearch\n data client which uses the credentials of the incoming request\n - {@link IUiSettingsClient | uiSettings.client} - uiSettings client\n which uses the credentials of the incoming request" + ], + "path": "packages/core/http/core-http-request-handler-context-server/src/request_handler_context.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "@kbn/core-http-request-handler-context-server", + "id": "def-server.CoreRequestHandlerContext.savedObjects", + "type": "Object", + "tags": [], + "label": "savedObjects", + "description": [], + "signature": [ + "SavedObjectsRequestHandlerContext" + ], + "path": "packages/core/http/core-http-request-handler-context-server/src/request_handler_context.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "@kbn/core-http-request-handler-context-server", + "id": "def-server.CoreRequestHandlerContext.elasticsearch", + "type": "Object", + "tags": [], + "label": "elasticsearch", + "description": [], + "signature": [ + "ElasticsearchRequestHandlerContext" + ], + "path": "packages/core/http/core-http-request-handler-context-server/src/request_handler_context.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "@kbn/core-http-request-handler-context-server", + "id": "def-server.CoreRequestHandlerContext.uiSettings", + "type": "Object", + "tags": [], + "label": "uiSettings", + "description": [], + "signature": [ + "UiSettingsRequestHandlerContext" + ], + "path": "packages/core/http/core-http-request-handler-context-server/src/request_handler_context.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "@kbn/core-http-request-handler-context-server", + "id": "def-server.CoreRequestHandlerContext.deprecations", + "type": "Object", + "tags": [], + "label": "deprecations", + "description": [], + "signature": [ + "DeprecationsRequestHandlerContext" + ], + "path": "packages/core/http/core-http-request-handler-context-server/src/request_handler_context.ts", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "@kbn/core-http-request-handler-context-server", + "id": "def-server.PrebootCoreRequestHandlerContext", + "type": "Interface", + "tags": [], + "label": "PrebootCoreRequestHandlerContext", + "description": [], + "path": "packages/core/http/core-http-request-handler-context-server/src/preboot_request_handler_context.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "@kbn/core-http-request-handler-context-server", + "id": "def-server.PrebootCoreRequestHandlerContext.uiSettings", + "type": "Object", + "tags": [], + "label": "uiSettings", + "description": [], + "signature": [ + { + "pluginId": "@kbn/core-http-request-handler-context-server", + "scope": "server", + "docId": "kibKbnCoreHttpRequestHandlerContextServerPluginApi", + "section": "def-server.PrebootUiSettingsRequestHandlerContext", + "text": "PrebootUiSettingsRequestHandlerContext" + } + ], + "path": "packages/core/http/core-http-request-handler-context-server/src/preboot_request_handler_context.ts", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "@kbn/core-http-request-handler-context-server", + "id": "def-server.PrebootRequestHandlerContext", + "type": "Interface", + "tags": [], + "label": "PrebootRequestHandlerContext", + "description": [], + "signature": [ + { + "pluginId": "@kbn/core-http-request-handler-context-server", + "scope": "server", + "docId": "kibKbnCoreHttpRequestHandlerContextServerPluginApi", + "section": "def-server.PrebootRequestHandlerContext", + "text": "PrebootRequestHandlerContext" + }, + " extends ", + "RequestHandlerContextBase" + ], + "path": "packages/core/http/core-http-request-handler-context-server/src/preboot_request_handler_context.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "@kbn/core-http-request-handler-context-server", + "id": "def-server.PrebootRequestHandlerContext.core", + "type": "Object", + "tags": [], + "label": "core", + "description": [], + "signature": [ + "Promise<", + { + "pluginId": "@kbn/core-http-request-handler-context-server", + "scope": "server", + "docId": "kibKbnCoreHttpRequestHandlerContextServerPluginApi", + "section": "def-server.PrebootCoreRequestHandlerContext", + "text": "PrebootCoreRequestHandlerContext" + }, + ">" + ], + "path": "packages/core/http/core-http-request-handler-context-server/src/preboot_request_handler_context.ts", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "@kbn/core-http-request-handler-context-server", + "id": "def-server.PrebootUiSettingsRequestHandlerContext", + "type": "Interface", + "tags": [], + "label": "PrebootUiSettingsRequestHandlerContext", + "description": [], + "path": "packages/core/http/core-http-request-handler-context-server/src/preboot_request_handler_context.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "@kbn/core-http-request-handler-context-server", + "id": "def-server.PrebootUiSettingsRequestHandlerContext.client", + "type": "Object", + "tags": [], + "label": "client", + "description": [], + "signature": [ + "IUiSettingsClient" + ], + "path": "packages/core/http/core-http-request-handler-context-server/src/preboot_request_handler_context.ts", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "@kbn/core-http-request-handler-context-server", + "id": "def-server.RequestHandlerContext", + "type": "Interface", + "tags": [], + "label": "RequestHandlerContext", + "description": [ + "\nBase context passed to a route handler, containing the `core` context part.\n" + ], + "signature": [ + { + "pluginId": "@kbn/core-http-request-handler-context-server", + "scope": "server", + "docId": "kibKbnCoreHttpRequestHandlerContextServerPluginApi", + "section": "def-server.RequestHandlerContext", + "text": "RequestHandlerContext" + }, + " extends ", + "RequestHandlerContextBase" + ], + "path": "packages/core/http/core-http-request-handler-context-server/src/request_handler_context.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "@kbn/core-http-request-handler-context-server", + "id": "def-server.RequestHandlerContext.core", + "type": "Object", + "tags": [], + "label": "core", + "description": [], + "signature": [ + "Promise<", + { + "pluginId": "@kbn/core-http-request-handler-context-server", + "scope": "server", + "docId": "kibKbnCoreHttpRequestHandlerContextServerPluginApi", + "section": "def-server.CoreRequestHandlerContext", + "text": "CoreRequestHandlerContext" + }, + ">" + ], + "path": "packages/core/http/core-http-request-handler-context-server/src/request_handler_context.ts", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + } + ], + "enums": [], + "misc": [ + { + "parentPluginId": "@kbn/core-http-request-handler-context-server", + "id": "def-server.CustomRequestHandlerContext", + "type": "Type", + "tags": [], + "label": "CustomRequestHandlerContext", + "description": [ + "\nMixin allowing plugins to define their own request handler contexts.\n" + ], + "signature": [ + { + "pluginId": "@kbn/core-http-request-handler-context-server", + "scope": "server", + "docId": "kibKbnCoreHttpRequestHandlerContextServerPluginApi", + "section": "def-server.RequestHandlerContext", + "text": "RequestHandlerContext" + }, + " & { [Key in keyof T]: T[Key] extends Promise ? T[Key] : Promise; }" + ], + "path": "packages/core/http/core-http-request-handler-context-server/src/request_handler_context.ts", + "deprecated": false, + "trackAdoption": false, + "initialIsOpen": false + } + ], + "objects": [] + }, + "common": { + "classes": [], + "functions": [], + "interfaces": [], + "enums": [], + "misc": [], + "objects": [] + } +} \ No newline at end of file diff --git a/api_docs/kbn_core_http_request_handler_context_server.mdx b/api_docs/kbn_core_http_request_handler_context_server.mdx new file mode 100644 index 0000000000000..0e41263673dda --- /dev/null +++ b/api_docs/kbn_core_http_request_handler_context_server.mdx @@ -0,0 +1,33 @@ +--- +#### +#### This document is auto-generated and is meant to be viewed inside our experimental, new docs system. +#### Reach out in #docs-engineering for more info. +#### +id: kibKbnCoreHttpRequestHandlerContextServerPluginApi +slug: /kibana-dev-docs/api/kbn-core-http-request-handler-context-server +title: "@kbn/core-http-request-handler-context-server" +image: https://source.unsplash.com/400x175/?github +description: API docs for the @kbn/core-http-request-handler-context-server plugin +date: 2022-09-29 +tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-request-handler-context-server'] +--- +import kbnCoreHttpRequestHandlerContextServerObj from './kbn_core_http_request_handler_context_server.devdocs.json'; + + + +Contact Kibana Core for questions regarding this plugin. + +**Code health stats** + +| Public API count | Any count | Items lacking comments | Missing exports | +|-------------------|-----------|------------------------|-----------------| +| 14 | 0 | 11 | 0 | + +## Server + +### Interfaces + + +### Consts, variables and types + + diff --git a/api_docs/kbn_core_http_router_server_internal.mdx b/api_docs/kbn_core_http_router_server_internal.mdx index 650426f493570..0fdb1bfe43185 100644 --- a/api_docs/kbn_core_http_router_server_internal.mdx +++ b/api_docs/kbn_core_http_router_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-router-server-internal title: "@kbn/core-http-router-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-http-router-server-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-router-server-internal'] --- import kbnCoreHttpRouterServerInternalObj from './kbn_core_http_router_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_http_router_server_mocks.mdx b/api_docs/kbn_core_http_router_server_mocks.mdx index 0df0a232ed7e3..b758dea2dd269 100644 --- a/api_docs/kbn_core_http_router_server_mocks.mdx +++ b/api_docs/kbn_core_http_router_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-router-server-mocks title: "@kbn/core-http-router-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-http-router-server-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-router-server-mocks'] --- import kbnCoreHttpRouterServerMocksObj from './kbn_core_http_router_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_http_server.mdx b/api_docs/kbn_core_http_server.mdx index 404f13d3ca12a..bb3c7c1bd3505 100644 --- a/api_docs/kbn_core_http_server.mdx +++ b/api_docs/kbn_core_http_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-server title: "@kbn/core-http-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-http-server plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-server'] --- import kbnCoreHttpServerObj from './kbn_core_http_server.devdocs.json'; diff --git a/api_docs/kbn_core_http_server_internal.mdx b/api_docs/kbn_core_http_server_internal.mdx index 524b236008cfb..220d5282e1fc4 100644 --- a/api_docs/kbn_core_http_server_internal.mdx +++ b/api_docs/kbn_core_http_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-server-internal title: "@kbn/core-http-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-http-server-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-server-internal'] --- import kbnCoreHttpServerInternalObj from './kbn_core_http_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_http_server_mocks.mdx b/api_docs/kbn_core_http_server_mocks.mdx index 94a0469ff1071..ed120c45d977d 100644 --- a/api_docs/kbn_core_http_server_mocks.mdx +++ b/api_docs/kbn_core_http_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-server-mocks title: "@kbn/core-http-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-http-server-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-server-mocks'] --- import kbnCoreHttpServerMocksObj from './kbn_core_http_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_i18n_browser.mdx b/api_docs/kbn_core_i18n_browser.mdx index aac9e17df421b..9cb11bc93a1fe 100644 --- a/api_docs/kbn_core_i18n_browser.mdx +++ b/api_docs/kbn_core_i18n_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-browser title: "@kbn/core-i18n-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-i18n-browser plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-i18n-browser'] --- import kbnCoreI18nBrowserObj from './kbn_core_i18n_browser.devdocs.json'; diff --git a/api_docs/kbn_core_i18n_browser_mocks.mdx b/api_docs/kbn_core_i18n_browser_mocks.mdx index e83f6e8553d82..1bb71320adbcf 100644 --- a/api_docs/kbn_core_i18n_browser_mocks.mdx +++ b/api_docs/kbn_core_i18n_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-browser-mocks title: "@kbn/core-i18n-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-i18n-browser-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-i18n-browser-mocks'] --- import kbnCoreI18nBrowserMocksObj from './kbn_core_i18n_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_i18n_server.mdx b/api_docs/kbn_core_i18n_server.mdx index a89d07338f781..edbbec7b5aac1 100644 --- a/api_docs/kbn_core_i18n_server.mdx +++ b/api_docs/kbn_core_i18n_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-server title: "@kbn/core-i18n-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-i18n-server plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-i18n-server'] --- import kbnCoreI18nServerObj from './kbn_core_i18n_server.devdocs.json'; diff --git a/api_docs/kbn_core_i18n_server_internal.mdx b/api_docs/kbn_core_i18n_server_internal.mdx index 3575cc0d18a98..408a8656056a7 100644 --- a/api_docs/kbn_core_i18n_server_internal.mdx +++ b/api_docs/kbn_core_i18n_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-server-internal title: "@kbn/core-i18n-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-i18n-server-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-i18n-server-internal'] --- import kbnCoreI18nServerInternalObj from './kbn_core_i18n_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_i18n_server_mocks.mdx b/api_docs/kbn_core_i18n_server_mocks.mdx index ce24eb49860c5..549c463617a54 100644 --- a/api_docs/kbn_core_i18n_server_mocks.mdx +++ b/api_docs/kbn_core_i18n_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-server-mocks title: "@kbn/core-i18n-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-i18n-server-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-i18n-server-mocks'] --- import kbnCoreI18nServerMocksObj from './kbn_core_i18n_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_injected_metadata_browser.mdx b/api_docs/kbn_core_injected_metadata_browser.mdx index 92e9d0e07cfe5..11a4ba2c541e6 100644 --- a/api_docs/kbn_core_injected_metadata_browser.mdx +++ b/api_docs/kbn_core_injected_metadata_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-injected-metadata-browser title: "@kbn/core-injected-metadata-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-injected-metadata-browser plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-injected-metadata-browser'] --- import kbnCoreInjectedMetadataBrowserObj from './kbn_core_injected_metadata_browser.devdocs.json'; diff --git a/api_docs/kbn_core_injected_metadata_browser_mocks.mdx b/api_docs/kbn_core_injected_metadata_browser_mocks.mdx index 17e4abfa2a1aa..579e9087903cf 100644 --- a/api_docs/kbn_core_injected_metadata_browser_mocks.mdx +++ b/api_docs/kbn_core_injected_metadata_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-injected-metadata-browser-mocks title: "@kbn/core-injected-metadata-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-injected-metadata-browser-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-injected-metadata-browser-mocks'] --- import kbnCoreInjectedMetadataBrowserMocksObj from './kbn_core_injected_metadata_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_integrations_browser_internal.mdx b/api_docs/kbn_core_integrations_browser_internal.mdx index d8c9f151e2f4f..c88718d0e930c 100644 --- a/api_docs/kbn_core_integrations_browser_internal.mdx +++ b/api_docs/kbn_core_integrations_browser_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-integrations-browser-internal title: "@kbn/core-integrations-browser-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-integrations-browser-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-integrations-browser-internal'] --- import kbnCoreIntegrationsBrowserInternalObj from './kbn_core_integrations_browser_internal.devdocs.json'; diff --git a/api_docs/kbn_core_integrations_browser_mocks.mdx b/api_docs/kbn_core_integrations_browser_mocks.mdx index 574ff5014691b..6be7ee2210094 100644 --- a/api_docs/kbn_core_integrations_browser_mocks.mdx +++ b/api_docs/kbn_core_integrations_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-integrations-browser-mocks title: "@kbn/core-integrations-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-integrations-browser-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-integrations-browser-mocks'] --- import kbnCoreIntegrationsBrowserMocksObj from './kbn_core_integrations_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_lifecycle_browser.mdx b/api_docs/kbn_core_lifecycle_browser.mdx index 62c8d4f2358e5..863f69b315180 100644 --- a/api_docs/kbn_core_lifecycle_browser.mdx +++ b/api_docs/kbn_core_lifecycle_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-lifecycle-browser title: "@kbn/core-lifecycle-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-lifecycle-browser plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-lifecycle-browser'] --- import kbnCoreLifecycleBrowserObj from './kbn_core_lifecycle_browser.devdocs.json'; diff --git a/api_docs/kbn_core_lifecycle_browser_mocks.mdx b/api_docs/kbn_core_lifecycle_browser_mocks.mdx index 8deee157e3d42..add898c16abe6 100644 --- a/api_docs/kbn_core_lifecycle_browser_mocks.mdx +++ b/api_docs/kbn_core_lifecycle_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-lifecycle-browser-mocks title: "@kbn/core-lifecycle-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-lifecycle-browser-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-lifecycle-browser-mocks'] --- import kbnCoreLifecycleBrowserMocksObj from './kbn_core_lifecycle_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_logging_server.mdx b/api_docs/kbn_core_logging_server.mdx index cf1126fe73e2a..a488e40d01dd0 100644 --- a/api_docs/kbn_core_logging_server.mdx +++ b/api_docs/kbn_core_logging_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-logging-server title: "@kbn/core-logging-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-logging-server plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-logging-server'] --- import kbnCoreLoggingServerObj from './kbn_core_logging_server.devdocs.json'; diff --git a/api_docs/kbn_core_logging_server_internal.mdx b/api_docs/kbn_core_logging_server_internal.mdx index bc4d09292edbf..87082d1e33197 100644 --- a/api_docs/kbn_core_logging_server_internal.mdx +++ b/api_docs/kbn_core_logging_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-logging-server-internal title: "@kbn/core-logging-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-logging-server-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-logging-server-internal'] --- import kbnCoreLoggingServerInternalObj from './kbn_core_logging_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_logging_server_mocks.mdx b/api_docs/kbn_core_logging_server_mocks.mdx index 485e124d97e42..7a746c6278054 100644 --- a/api_docs/kbn_core_logging_server_mocks.mdx +++ b/api_docs/kbn_core_logging_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-logging-server-mocks title: "@kbn/core-logging-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-logging-server-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-logging-server-mocks'] --- import kbnCoreLoggingServerMocksObj from './kbn_core_logging_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_metrics_collectors_server_internal.mdx b/api_docs/kbn_core_metrics_collectors_server_internal.mdx index 4b17dbaac8c84..a413d283cb4c8 100644 --- a/api_docs/kbn_core_metrics_collectors_server_internal.mdx +++ b/api_docs/kbn_core_metrics_collectors_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-collectors-server-internal title: "@kbn/core-metrics-collectors-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-metrics-collectors-server-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-metrics-collectors-server-internal'] --- import kbnCoreMetricsCollectorsServerInternalObj from './kbn_core_metrics_collectors_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_metrics_collectors_server_mocks.mdx b/api_docs/kbn_core_metrics_collectors_server_mocks.mdx index 36c1e8c0f9a42..3ad9c040ab8ff 100644 --- a/api_docs/kbn_core_metrics_collectors_server_mocks.mdx +++ b/api_docs/kbn_core_metrics_collectors_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-collectors-server-mocks title: "@kbn/core-metrics-collectors-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-metrics-collectors-server-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-metrics-collectors-server-mocks'] --- import kbnCoreMetricsCollectorsServerMocksObj from './kbn_core_metrics_collectors_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_metrics_server.mdx b/api_docs/kbn_core_metrics_server.mdx index a1a8ce47aed54..4e9e0445e3f75 100644 --- a/api_docs/kbn_core_metrics_server.mdx +++ b/api_docs/kbn_core_metrics_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-server title: "@kbn/core-metrics-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-metrics-server plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-metrics-server'] --- import kbnCoreMetricsServerObj from './kbn_core_metrics_server.devdocs.json'; diff --git a/api_docs/kbn_core_metrics_server_internal.mdx b/api_docs/kbn_core_metrics_server_internal.mdx index 6b4a55f82676d..0cfd64309de97 100644 --- a/api_docs/kbn_core_metrics_server_internal.mdx +++ b/api_docs/kbn_core_metrics_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-server-internal title: "@kbn/core-metrics-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-metrics-server-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-metrics-server-internal'] --- import kbnCoreMetricsServerInternalObj from './kbn_core_metrics_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_metrics_server_mocks.mdx b/api_docs/kbn_core_metrics_server_mocks.mdx index d1494db236370..40f97497e1cff 100644 --- a/api_docs/kbn_core_metrics_server_mocks.mdx +++ b/api_docs/kbn_core_metrics_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-server-mocks title: "@kbn/core-metrics-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-metrics-server-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-metrics-server-mocks'] --- import kbnCoreMetricsServerMocksObj from './kbn_core_metrics_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_mount_utils_browser.mdx b/api_docs/kbn_core_mount_utils_browser.mdx index ad35d06977cc0..3e4d25261b363 100644 --- a/api_docs/kbn_core_mount_utils_browser.mdx +++ b/api_docs/kbn_core_mount_utils_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-mount-utils-browser title: "@kbn/core-mount-utils-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-mount-utils-browser plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-mount-utils-browser'] --- import kbnCoreMountUtilsBrowserObj from './kbn_core_mount_utils_browser.devdocs.json'; diff --git a/api_docs/kbn_core_node_server.mdx b/api_docs/kbn_core_node_server.mdx index 5b5b8a9421411..9ec6da0be76fe 100644 --- a/api_docs/kbn_core_node_server.mdx +++ b/api_docs/kbn_core_node_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-node-server title: "@kbn/core-node-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-node-server plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-node-server'] --- import kbnCoreNodeServerObj from './kbn_core_node_server.devdocs.json'; diff --git a/api_docs/kbn_core_node_server_internal.mdx b/api_docs/kbn_core_node_server_internal.mdx index bf95da355c9e9..e1be058f66949 100644 --- a/api_docs/kbn_core_node_server_internal.mdx +++ b/api_docs/kbn_core_node_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-node-server-internal title: "@kbn/core-node-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-node-server-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-node-server-internal'] --- import kbnCoreNodeServerInternalObj from './kbn_core_node_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_node_server_mocks.mdx b/api_docs/kbn_core_node_server_mocks.mdx index 3a07f7a676064..2f8dd3d2d3cfc 100644 --- a/api_docs/kbn_core_node_server_mocks.mdx +++ b/api_docs/kbn_core_node_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-node-server-mocks title: "@kbn/core-node-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-node-server-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-node-server-mocks'] --- import kbnCoreNodeServerMocksObj from './kbn_core_node_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_notifications_browser.mdx b/api_docs/kbn_core_notifications_browser.mdx index 130bddee31d14..99c39b3ae3bff 100644 --- a/api_docs/kbn_core_notifications_browser.mdx +++ b/api_docs/kbn_core_notifications_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-notifications-browser title: "@kbn/core-notifications-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-notifications-browser plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-notifications-browser'] --- import kbnCoreNotificationsBrowserObj from './kbn_core_notifications_browser.devdocs.json'; diff --git a/api_docs/kbn_core_notifications_browser_internal.mdx b/api_docs/kbn_core_notifications_browser_internal.mdx index fef5e6c2f9a85..b1abfcae9d1d7 100644 --- a/api_docs/kbn_core_notifications_browser_internal.mdx +++ b/api_docs/kbn_core_notifications_browser_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-notifications-browser-internal title: "@kbn/core-notifications-browser-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-notifications-browser-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-notifications-browser-internal'] --- import kbnCoreNotificationsBrowserInternalObj from './kbn_core_notifications_browser_internal.devdocs.json'; diff --git a/api_docs/kbn_core_notifications_browser_mocks.mdx b/api_docs/kbn_core_notifications_browser_mocks.mdx index 724251e5e502f..6af7ea7a401a6 100644 --- a/api_docs/kbn_core_notifications_browser_mocks.mdx +++ b/api_docs/kbn_core_notifications_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-notifications-browser-mocks title: "@kbn/core-notifications-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-notifications-browser-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-notifications-browser-mocks'] --- import kbnCoreNotificationsBrowserMocksObj from './kbn_core_notifications_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_overlays_browser.mdx b/api_docs/kbn_core_overlays_browser.mdx index 3837e623f29c4..4e53620f210c2 100644 --- a/api_docs/kbn_core_overlays_browser.mdx +++ b/api_docs/kbn_core_overlays_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-overlays-browser title: "@kbn/core-overlays-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-overlays-browser plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-overlays-browser'] --- import kbnCoreOverlaysBrowserObj from './kbn_core_overlays_browser.devdocs.json'; diff --git a/api_docs/kbn_core_overlays_browser_internal.mdx b/api_docs/kbn_core_overlays_browser_internal.mdx index 0f7f597d06d38..3cdf63fa196bf 100644 --- a/api_docs/kbn_core_overlays_browser_internal.mdx +++ b/api_docs/kbn_core_overlays_browser_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-overlays-browser-internal title: "@kbn/core-overlays-browser-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-overlays-browser-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-overlays-browser-internal'] --- import kbnCoreOverlaysBrowserInternalObj from './kbn_core_overlays_browser_internal.devdocs.json'; diff --git a/api_docs/kbn_core_overlays_browser_mocks.mdx b/api_docs/kbn_core_overlays_browser_mocks.mdx index 42846c64f33d6..ed9822ce6524b 100644 --- a/api_docs/kbn_core_overlays_browser_mocks.mdx +++ b/api_docs/kbn_core_overlays_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-overlays-browser-mocks title: "@kbn/core-overlays-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-overlays-browser-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-overlays-browser-mocks'] --- import kbnCoreOverlaysBrowserMocksObj from './kbn_core_overlays_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_plugins_browser.mdx b/api_docs/kbn_core_plugins_browser.mdx index a52c3697e57dd..0e35863807e95 100644 --- a/api_docs/kbn_core_plugins_browser.mdx +++ b/api_docs/kbn_core_plugins_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-plugins-browser title: "@kbn/core-plugins-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-plugins-browser plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-plugins-browser'] --- import kbnCorePluginsBrowserObj from './kbn_core_plugins_browser.devdocs.json'; diff --git a/api_docs/kbn_core_plugins_browser_mocks.mdx b/api_docs/kbn_core_plugins_browser_mocks.mdx index 238252f104b3c..e8513df53c908 100644 --- a/api_docs/kbn_core_plugins_browser_mocks.mdx +++ b/api_docs/kbn_core_plugins_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-plugins-browser-mocks title: "@kbn/core-plugins-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-plugins-browser-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-plugins-browser-mocks'] --- import kbnCorePluginsBrowserMocksObj from './kbn_core_plugins_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_preboot_server.mdx b/api_docs/kbn_core_preboot_server.mdx index d5b97eb1a0cbb..a33965c6f0245 100644 --- a/api_docs/kbn_core_preboot_server.mdx +++ b/api_docs/kbn_core_preboot_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-preboot-server title: "@kbn/core-preboot-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-preboot-server plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-preboot-server'] --- import kbnCorePrebootServerObj from './kbn_core_preboot_server.devdocs.json'; diff --git a/api_docs/kbn_core_preboot_server_mocks.mdx b/api_docs/kbn_core_preboot_server_mocks.mdx index 20a753b66ea99..499f42fd91b2c 100644 --- a/api_docs/kbn_core_preboot_server_mocks.mdx +++ b/api_docs/kbn_core_preboot_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-preboot-server-mocks title: "@kbn/core-preboot-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-preboot-server-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-preboot-server-mocks'] --- import kbnCorePrebootServerMocksObj from './kbn_core_preboot_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_rendering_browser_mocks.mdx b/api_docs/kbn_core_rendering_browser_mocks.mdx index c074d0f80cb88..cedfc5029275d 100644 --- a/api_docs/kbn_core_rendering_browser_mocks.mdx +++ b/api_docs/kbn_core_rendering_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-rendering-browser-mocks title: "@kbn/core-rendering-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-rendering-browser-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-rendering-browser-mocks'] --- import kbnCoreRenderingBrowserMocksObj from './kbn_core_rendering_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_api_browser.devdocs.json b/api_docs/kbn_core_saved_objects_api_browser.devdocs.json index b12a698b21606..bc6024dea788e 100644 --- a/api_docs/kbn_core_saved_objects_api_browser.devdocs.json +++ b/api_docs/kbn_core_saved_objects_api_browser.devdocs.json @@ -76,7 +76,7 @@ "\nThe outcome for a successful `resolve` call is one of the following values:\n\n * `'exactMatch'` -- One document exactly matched the given ID.\n * `'aliasMatch'` -- One document with a legacy URL alias matched the given ID; in this case the `saved_object.id` field is different\n than the given ID.\n * `'conflict'` -- Two documents matched the given ID, one was an exact match and another with a legacy URL alias; in this case the\n `saved_object` object is the exact match, and the `saved_object.id` field is the same as the given ID." ], "signature": [ - "\"exactMatch\" | \"aliasMatch\" | \"conflict\"" + "\"conflict\" | \"exactMatch\" | \"aliasMatch\"" ], "path": "packages/core/saved-objects/core-saved-objects-api-browser/src/apis/resolve.ts", "deprecated": false, @@ -1974,9 +1974,9 @@ "label": "SavedObjectsFindOptions", "description": [], "signature": [ - "{ type: string | string[]; filter?: any; search?: string | undefined; aggs?: Record | undefined; fields?: string[] | undefined; page?: number | undefined; perPage?: number | undefined; sortField?: string | undefined; searchFields?: string[] | undefined; hasReference?: ", + "> | undefined; page?: number | undefined; perPage?: number | undefined; sortField?: string | undefined; searchFields?: string[] | undefined; hasReference?: ", "SavedObjectsFindOptionsReference", " | ", "SavedObjectsFindOptionsReference", diff --git a/api_docs/kbn_core_saved_objects_api_browser.mdx b/api_docs/kbn_core_saved_objects_api_browser.mdx index 949af62592ecb..de5b9aa205cab 100644 --- a/api_docs/kbn_core_saved_objects_api_browser.mdx +++ b/api_docs/kbn_core_saved_objects_api_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-api-browser title: "@kbn/core-saved-objects-api-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-api-browser plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-api-browser'] --- import kbnCoreSavedObjectsApiBrowserObj from './kbn_core_saved_objects_api_browser.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_api_server.devdocs.json b/api_docs/kbn_core_saved_objects_api_server.devdocs.json index 0e040b72d2d3d..1bff25681bdbf 100644 --- a/api_docs/kbn_core_saved_objects_api_server.devdocs.json +++ b/api_docs/kbn_core_saved_objects_api_server.devdocs.json @@ -5949,7 +5949,7 @@ "\nThe outcome for a successful `resolve` call is one of the following values:\n\n * `'exactMatch'` -- One document exactly matched the given ID.\n * `'aliasMatch'` -- One document with a legacy URL alias matched the given ID; in this case the `saved_object.id` field is different\n than the given ID.\n * `'conflict'` -- Two documents matched the given ID, one was an exact match and another with a legacy URL alias; in this case the\n `saved_object` object is the exact match, and the `saved_object.id` field is the same as the given ID." ], "signature": [ - "\"exactMatch\" | \"aliasMatch\" | \"conflict\"" + "\"conflict\" | \"exactMatch\" | \"aliasMatch\"" ], "path": "packages/core/saved-objects/core-saved-objects-api-server/src/apis/resolve.ts", "deprecated": false, @@ -6427,9 +6427,9 @@ "label": "SavedObjectsCreatePointInTimeFinderOptions", "description": [], "signature": [ - "{ type: string | string[]; filter?: any; search?: string | undefined; aggs?: Record | undefined; fields?: string[] | undefined; perPage?: number | undefined; sortField?: string | undefined; sortOrder?: ", + "> | undefined; perPage?: number | undefined; sortField?: string | undefined; sortOrder?: ", "SortOrder", " | undefined; searchFields?: string[] | undefined; rootSearchFields?: string[] | undefined; hasReference?: ", { diff --git a/api_docs/kbn_core_saved_objects_api_server.mdx b/api_docs/kbn_core_saved_objects_api_server.mdx index 6fa09c36e31f1..7628f073dc948 100644 --- a/api_docs/kbn_core_saved_objects_api_server.mdx +++ b/api_docs/kbn_core_saved_objects_api_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-api-server title: "@kbn/core-saved-objects-api-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-api-server plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-api-server'] --- import kbnCoreSavedObjectsApiServerObj from './kbn_core_saved_objects_api_server.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_api_server_internal.mdx b/api_docs/kbn_core_saved_objects_api_server_internal.mdx index 7c588cdc511e2..a91351cf9f732 100644 --- a/api_docs/kbn_core_saved_objects_api_server_internal.mdx +++ b/api_docs/kbn_core_saved_objects_api_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-api-server-internal title: "@kbn/core-saved-objects-api-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-api-server-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-api-server-internal'] --- import kbnCoreSavedObjectsApiServerInternalObj from './kbn_core_saved_objects_api_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_api_server_mocks.mdx b/api_docs/kbn_core_saved_objects_api_server_mocks.mdx index 447e323f6f6c3..fa562b3b2acf5 100644 --- a/api_docs/kbn_core_saved_objects_api_server_mocks.mdx +++ b/api_docs/kbn_core_saved_objects_api_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-api-server-mocks title: "@kbn/core-saved-objects-api-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-api-server-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-api-server-mocks'] --- import kbnCoreSavedObjectsApiServerMocksObj from './kbn_core_saved_objects_api_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_base_server_internal.mdx b/api_docs/kbn_core_saved_objects_base_server_internal.mdx index 9931b55fa4f21..acc5f724b1bc8 100644 --- a/api_docs/kbn_core_saved_objects_base_server_internal.mdx +++ b/api_docs/kbn_core_saved_objects_base_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-base-server-internal title: "@kbn/core-saved-objects-base-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-base-server-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-base-server-internal'] --- import kbnCoreSavedObjectsBaseServerInternalObj from './kbn_core_saved_objects_base_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_base_server_mocks.mdx b/api_docs/kbn_core_saved_objects_base_server_mocks.mdx index deb24928a107a..114ad87c44b3c 100644 --- a/api_docs/kbn_core_saved_objects_base_server_mocks.mdx +++ b/api_docs/kbn_core_saved_objects_base_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-base-server-mocks title: "@kbn/core-saved-objects-base-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-base-server-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-base-server-mocks'] --- import kbnCoreSavedObjectsBaseServerMocksObj from './kbn_core_saved_objects_base_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_browser.mdx b/api_docs/kbn_core_saved_objects_browser.mdx index 3bfa422bdff98..6731e21119771 100644 --- a/api_docs/kbn_core_saved_objects_browser.mdx +++ b/api_docs/kbn_core_saved_objects_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-browser title: "@kbn/core-saved-objects-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-browser plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-browser'] --- import kbnCoreSavedObjectsBrowserObj from './kbn_core_saved_objects_browser.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_browser_internal.mdx b/api_docs/kbn_core_saved_objects_browser_internal.mdx index 1a306a18a3eb1..276569792284a 100644 --- a/api_docs/kbn_core_saved_objects_browser_internal.mdx +++ b/api_docs/kbn_core_saved_objects_browser_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-browser-internal title: "@kbn/core-saved-objects-browser-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-browser-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-browser-internal'] --- import kbnCoreSavedObjectsBrowserInternalObj from './kbn_core_saved_objects_browser_internal.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_browser_mocks.mdx b/api_docs/kbn_core_saved_objects_browser_mocks.mdx index a34e632cf249f..9f0c9ea82ba6c 100644 --- a/api_docs/kbn_core_saved_objects_browser_mocks.mdx +++ b/api_docs/kbn_core_saved_objects_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-browser-mocks title: "@kbn/core-saved-objects-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-browser-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-browser-mocks'] --- import kbnCoreSavedObjectsBrowserMocksObj from './kbn_core_saved_objects_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_common.mdx b/api_docs/kbn_core_saved_objects_common.mdx index 59d4d1841c7fa..bc3ea822a9424 100644 --- a/api_docs/kbn_core_saved_objects_common.mdx +++ b/api_docs/kbn_core_saved_objects_common.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-common title: "@kbn/core-saved-objects-common" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-common plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-common'] --- import kbnCoreSavedObjectsCommonObj from './kbn_core_saved_objects_common.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_import_export_server_internal.mdx b/api_docs/kbn_core_saved_objects_import_export_server_internal.mdx index f0610e31ec803..b5f3e61df18bf 100644 --- a/api_docs/kbn_core_saved_objects_import_export_server_internal.mdx +++ b/api_docs/kbn_core_saved_objects_import_export_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-import-export-server-internal title: "@kbn/core-saved-objects-import-export-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-import-export-server-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-import-export-server-internal'] --- import kbnCoreSavedObjectsImportExportServerInternalObj from './kbn_core_saved_objects_import_export_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_import_export_server_mocks.mdx b/api_docs/kbn_core_saved_objects_import_export_server_mocks.mdx index cd9ba3c71908b..99e95bfdab286 100644 --- a/api_docs/kbn_core_saved_objects_import_export_server_mocks.mdx +++ b/api_docs/kbn_core_saved_objects_import_export_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-import-export-server-mocks title: "@kbn/core-saved-objects-import-export-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-import-export-server-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-import-export-server-mocks'] --- import kbnCoreSavedObjectsImportExportServerMocksObj from './kbn_core_saved_objects_import_export_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_migration_server_internal.mdx b/api_docs/kbn_core_saved_objects_migration_server_internal.mdx index f2dd4437d43e1..5edf8cbfddef4 100644 --- a/api_docs/kbn_core_saved_objects_migration_server_internal.mdx +++ b/api_docs/kbn_core_saved_objects_migration_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-migration-server-internal title: "@kbn/core-saved-objects-migration-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-migration-server-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-migration-server-internal'] --- import kbnCoreSavedObjectsMigrationServerInternalObj from './kbn_core_saved_objects_migration_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_migration_server_mocks.mdx b/api_docs/kbn_core_saved_objects_migration_server_mocks.mdx index 88c329e9ae344..5ed2a4976d1cf 100644 --- a/api_docs/kbn_core_saved_objects_migration_server_mocks.mdx +++ b/api_docs/kbn_core_saved_objects_migration_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-migration-server-mocks title: "@kbn/core-saved-objects-migration-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-migration-server-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-migration-server-mocks'] --- import kbnCoreSavedObjectsMigrationServerMocksObj from './kbn_core_saved_objects_migration_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_server.mdx b/api_docs/kbn_core_saved_objects_server.mdx index df7eaa590f6db..8f12d48e0f7a2 100644 --- a/api_docs/kbn_core_saved_objects_server.mdx +++ b/api_docs/kbn_core_saved_objects_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-server title: "@kbn/core-saved-objects-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-server plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-server'] --- import kbnCoreSavedObjectsServerObj from './kbn_core_saved_objects_server.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_server_internal.mdx b/api_docs/kbn_core_saved_objects_server_internal.mdx index 5534b4652be59..6de1b336be402 100644 --- a/api_docs/kbn_core_saved_objects_server_internal.mdx +++ b/api_docs/kbn_core_saved_objects_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-server-internal title: "@kbn/core-saved-objects-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-server-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-server-internal'] --- import kbnCoreSavedObjectsServerInternalObj from './kbn_core_saved_objects_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_server_mocks.mdx b/api_docs/kbn_core_saved_objects_server_mocks.mdx index ccf532e33ba38..4fb52fecf8710 100644 --- a/api_docs/kbn_core_saved_objects_server_mocks.mdx +++ b/api_docs/kbn_core_saved_objects_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-server-mocks title: "@kbn/core-saved-objects-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-server-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-server-mocks'] --- import kbnCoreSavedObjectsServerMocksObj from './kbn_core_saved_objects_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_saved_objects_utils_server.mdx b/api_docs/kbn_core_saved_objects_utils_server.mdx index 5b78e21ba58ce..71fdb228446e2 100644 --- a/api_docs/kbn_core_saved_objects_utils_server.mdx +++ b/api_docs/kbn_core_saved_objects_utils_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-utils-server title: "@kbn/core-saved-objects-utils-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-saved-objects-utils-server plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-utils-server'] --- import kbnCoreSavedObjectsUtilsServerObj from './kbn_core_saved_objects_utils_server.devdocs.json'; diff --git a/api_docs/kbn_core_status_common.mdx b/api_docs/kbn_core_status_common.mdx index f4f9cc899056b..49314722d46af 100644 --- a/api_docs/kbn_core_status_common.mdx +++ b/api_docs/kbn_core_status_common.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-common title: "@kbn/core-status-common" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-status-common plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-status-common'] --- import kbnCoreStatusCommonObj from './kbn_core_status_common.devdocs.json'; diff --git a/api_docs/kbn_core_status_common_internal.mdx b/api_docs/kbn_core_status_common_internal.mdx index 86d04a0b4ff7f..266265f2ee05f 100644 --- a/api_docs/kbn_core_status_common_internal.mdx +++ b/api_docs/kbn_core_status_common_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-common-internal title: "@kbn/core-status-common-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-status-common-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-status-common-internal'] --- import kbnCoreStatusCommonInternalObj from './kbn_core_status_common_internal.devdocs.json'; diff --git a/api_docs/kbn_core_status_server.mdx b/api_docs/kbn_core_status_server.mdx index 52e756da1a554..8d222376f5bf9 100644 --- a/api_docs/kbn_core_status_server.mdx +++ b/api_docs/kbn_core_status_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-server title: "@kbn/core-status-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-status-server plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-status-server'] --- import kbnCoreStatusServerObj from './kbn_core_status_server.devdocs.json'; diff --git a/api_docs/kbn_core_status_server_internal.mdx b/api_docs/kbn_core_status_server_internal.mdx index 432a7d95007ec..f8cae5c4a5506 100644 --- a/api_docs/kbn_core_status_server_internal.mdx +++ b/api_docs/kbn_core_status_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-server-internal title: "@kbn/core-status-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-status-server-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-status-server-internal'] --- import kbnCoreStatusServerInternalObj from './kbn_core_status_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_status_server_mocks.mdx b/api_docs/kbn_core_status_server_mocks.mdx index 8ccca542c4b7d..0dacdfd5af97c 100644 --- a/api_docs/kbn_core_status_server_mocks.mdx +++ b/api_docs/kbn_core_status_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-server-mocks title: "@kbn/core-status-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-status-server-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-status-server-mocks'] --- import kbnCoreStatusServerMocksObj from './kbn_core_status_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_test_helpers_deprecations_getters.mdx b/api_docs/kbn_core_test_helpers_deprecations_getters.mdx index ab86530abfbbd..99b4036abb6bd 100644 --- a/api_docs/kbn_core_test_helpers_deprecations_getters.mdx +++ b/api_docs/kbn_core_test_helpers_deprecations_getters.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-test-helpers-deprecations-getters title: "@kbn/core-test-helpers-deprecations-getters" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-test-helpers-deprecations-getters plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-test-helpers-deprecations-getters'] --- import kbnCoreTestHelpersDeprecationsGettersObj from './kbn_core_test_helpers_deprecations_getters.devdocs.json'; diff --git a/api_docs/kbn_core_test_helpers_http_setup_browser.mdx b/api_docs/kbn_core_test_helpers_http_setup_browser.mdx index 9de9031c75db8..549cdfe3a58e1 100644 --- a/api_docs/kbn_core_test_helpers_http_setup_browser.mdx +++ b/api_docs/kbn_core_test_helpers_http_setup_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-test-helpers-http-setup-browser title: "@kbn/core-test-helpers-http-setup-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-test-helpers-http-setup-browser plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-test-helpers-http-setup-browser'] --- import kbnCoreTestHelpersHttpSetupBrowserObj from './kbn_core_test_helpers_http_setup_browser.devdocs.json'; diff --git a/api_docs/kbn_core_theme_browser.mdx b/api_docs/kbn_core_theme_browser.mdx index 9c59e5a04b8e4..c429de87e13d9 100644 --- a/api_docs/kbn_core_theme_browser.mdx +++ b/api_docs/kbn_core_theme_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-theme-browser title: "@kbn/core-theme-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-theme-browser plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-theme-browser'] --- import kbnCoreThemeBrowserObj from './kbn_core_theme_browser.devdocs.json'; diff --git a/api_docs/kbn_core_theme_browser_internal.mdx b/api_docs/kbn_core_theme_browser_internal.mdx index 02d479962f929..0888bc8875a22 100644 --- a/api_docs/kbn_core_theme_browser_internal.mdx +++ b/api_docs/kbn_core_theme_browser_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-theme-browser-internal title: "@kbn/core-theme-browser-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-theme-browser-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-theme-browser-internal'] --- import kbnCoreThemeBrowserInternalObj from './kbn_core_theme_browser_internal.devdocs.json'; diff --git a/api_docs/kbn_core_theme_browser_mocks.mdx b/api_docs/kbn_core_theme_browser_mocks.mdx index 71eada8e5603f..254373b7a14d3 100644 --- a/api_docs/kbn_core_theme_browser_mocks.mdx +++ b/api_docs/kbn_core_theme_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-theme-browser-mocks title: "@kbn/core-theme-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-theme-browser-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-theme-browser-mocks'] --- import kbnCoreThemeBrowserMocksObj from './kbn_core_theme_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_ui_settings_browser.mdx b/api_docs/kbn_core_ui_settings_browser.mdx index b8b744e259c54..61ceae147d70f 100644 --- a/api_docs/kbn_core_ui_settings_browser.mdx +++ b/api_docs/kbn_core_ui_settings_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-browser title: "@kbn/core-ui-settings-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-ui-settings-browser plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-browser'] --- import kbnCoreUiSettingsBrowserObj from './kbn_core_ui_settings_browser.devdocs.json'; diff --git a/api_docs/kbn_core_ui_settings_browser_internal.mdx b/api_docs/kbn_core_ui_settings_browser_internal.mdx index a89cdf92e9ac2..9b9365bc3081a 100644 --- a/api_docs/kbn_core_ui_settings_browser_internal.mdx +++ b/api_docs/kbn_core_ui_settings_browser_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-browser-internal title: "@kbn/core-ui-settings-browser-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-ui-settings-browser-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-browser-internal'] --- import kbnCoreUiSettingsBrowserInternalObj from './kbn_core_ui_settings_browser_internal.devdocs.json'; diff --git a/api_docs/kbn_core_ui_settings_browser_mocks.mdx b/api_docs/kbn_core_ui_settings_browser_mocks.mdx index 290774ac1f9eb..baf48b87a0eb3 100644 --- a/api_docs/kbn_core_ui_settings_browser_mocks.mdx +++ b/api_docs/kbn_core_ui_settings_browser_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-browser-mocks title: "@kbn/core-ui-settings-browser-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-ui-settings-browser-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-browser-mocks'] --- import kbnCoreUiSettingsBrowserMocksObj from './kbn_core_ui_settings_browser_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_ui_settings_common.mdx b/api_docs/kbn_core_ui_settings_common.mdx index 004e652235478..1aba4f31960ad 100644 --- a/api_docs/kbn_core_ui_settings_common.mdx +++ b/api_docs/kbn_core_ui_settings_common.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-common title: "@kbn/core-ui-settings-common" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-ui-settings-common plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-common'] --- import kbnCoreUiSettingsCommonObj from './kbn_core_ui_settings_common.devdocs.json'; diff --git a/api_docs/kbn_core_ui_settings_server.mdx b/api_docs/kbn_core_ui_settings_server.mdx index 84190ae50348c..b2fe92199314c 100644 --- a/api_docs/kbn_core_ui_settings_server.mdx +++ b/api_docs/kbn_core_ui_settings_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-server title: "@kbn/core-ui-settings-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-ui-settings-server plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-server'] --- import kbnCoreUiSettingsServerObj from './kbn_core_ui_settings_server.devdocs.json'; diff --git a/api_docs/kbn_core_ui_settings_server_internal.mdx b/api_docs/kbn_core_ui_settings_server_internal.mdx index 2f362f1ede3ff..91c104b8b9de3 100644 --- a/api_docs/kbn_core_ui_settings_server_internal.mdx +++ b/api_docs/kbn_core_ui_settings_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-server-internal title: "@kbn/core-ui-settings-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-ui-settings-server-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-server-internal'] --- import kbnCoreUiSettingsServerInternalObj from './kbn_core_ui_settings_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_ui_settings_server_mocks.mdx b/api_docs/kbn_core_ui_settings_server_mocks.mdx index e214233f02eb7..31ba42e2554fc 100644 --- a/api_docs/kbn_core_ui_settings_server_mocks.mdx +++ b/api_docs/kbn_core_ui_settings_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-server-mocks title: "@kbn/core-ui-settings-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-ui-settings-server-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-server-mocks'] --- import kbnCoreUiSettingsServerMocksObj from './kbn_core_ui_settings_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_core_usage_data_server.mdx b/api_docs/kbn_core_usage_data_server.mdx index b8ac7249cb2af..a25b0cfc501c8 100644 --- a/api_docs/kbn_core_usage_data_server.mdx +++ b/api_docs/kbn_core_usage_data_server.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-usage-data-server title: "@kbn/core-usage-data-server" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-usage-data-server plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-usage-data-server'] --- import kbnCoreUsageDataServerObj from './kbn_core_usage_data_server.devdocs.json'; diff --git a/api_docs/kbn_core_usage_data_server_internal.mdx b/api_docs/kbn_core_usage_data_server_internal.mdx index 4f5cca38779c3..101431a9c73db 100644 --- a/api_docs/kbn_core_usage_data_server_internal.mdx +++ b/api_docs/kbn_core_usage_data_server_internal.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-usage-data-server-internal title: "@kbn/core-usage-data-server-internal" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-usage-data-server-internal plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-usage-data-server-internal'] --- import kbnCoreUsageDataServerInternalObj from './kbn_core_usage_data_server_internal.devdocs.json'; diff --git a/api_docs/kbn_core_usage_data_server_mocks.mdx b/api_docs/kbn_core_usage_data_server_mocks.mdx index bc10003b1203b..710a3c62d5446 100644 --- a/api_docs/kbn_core_usage_data_server_mocks.mdx +++ b/api_docs/kbn_core_usage_data_server_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-usage-data-server-mocks title: "@kbn/core-usage-data-server-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/core-usage-data-server-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-usage-data-server-mocks'] --- import kbnCoreUsageDataServerMocksObj from './kbn_core_usage_data_server_mocks.devdocs.json'; diff --git a/api_docs/kbn_crypto.mdx b/api_docs/kbn_crypto.mdx index d95c8ad7295ed..a8c5ebefe66c9 100644 --- a/api_docs/kbn_crypto.mdx +++ b/api_docs/kbn_crypto.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-crypto title: "@kbn/crypto" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/crypto plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/crypto'] --- import kbnCryptoObj from './kbn_crypto.devdocs.json'; diff --git a/api_docs/kbn_crypto_browser.mdx b/api_docs/kbn_crypto_browser.mdx index 06ce6dd999351..b7a8b4187db82 100644 --- a/api_docs/kbn_crypto_browser.mdx +++ b/api_docs/kbn_crypto_browser.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-crypto-browser title: "@kbn/crypto-browser" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/crypto-browser plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/crypto-browser'] --- import kbnCryptoBrowserObj from './kbn_crypto_browser.devdocs.json'; diff --git a/api_docs/kbn_datemath.mdx b/api_docs/kbn_datemath.mdx index 4bcac88980eb1..77c10c205e812 100644 --- a/api_docs/kbn_datemath.mdx +++ b/api_docs/kbn_datemath.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-datemath title: "@kbn/datemath" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/datemath plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/datemath'] --- import kbnDatemathObj from './kbn_datemath.devdocs.json'; diff --git a/api_docs/kbn_dev_cli_errors.mdx b/api_docs/kbn_dev_cli_errors.mdx index 42846a27d0d57..f79bd78824a01 100644 --- a/api_docs/kbn_dev_cli_errors.mdx +++ b/api_docs/kbn_dev_cli_errors.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dev-cli-errors title: "@kbn/dev-cli-errors" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/dev-cli-errors plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/dev-cli-errors'] --- import kbnDevCliErrorsObj from './kbn_dev_cli_errors.devdocs.json'; diff --git a/api_docs/kbn_dev_cli_runner.mdx b/api_docs/kbn_dev_cli_runner.mdx index 5db4302dd4cd2..156f2ad1e34d0 100644 --- a/api_docs/kbn_dev_cli_runner.mdx +++ b/api_docs/kbn_dev_cli_runner.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dev-cli-runner title: "@kbn/dev-cli-runner" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/dev-cli-runner plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/dev-cli-runner'] --- import kbnDevCliRunnerObj from './kbn_dev_cli_runner.devdocs.json'; diff --git a/api_docs/kbn_dev_proc_runner.mdx b/api_docs/kbn_dev_proc_runner.mdx index 968955efd32a8..c40a114fb200d 100644 --- a/api_docs/kbn_dev_proc_runner.mdx +++ b/api_docs/kbn_dev_proc_runner.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dev-proc-runner title: "@kbn/dev-proc-runner" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/dev-proc-runner plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/dev-proc-runner'] --- import kbnDevProcRunnerObj from './kbn_dev_proc_runner.devdocs.json'; diff --git a/api_docs/kbn_dev_utils.mdx b/api_docs/kbn_dev_utils.mdx index e047906625c28..6c817ebf71e78 100644 --- a/api_docs/kbn_dev_utils.mdx +++ b/api_docs/kbn_dev_utils.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dev-utils title: "@kbn/dev-utils" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/dev-utils plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/dev-utils'] --- import kbnDevUtilsObj from './kbn_dev_utils.devdocs.json'; diff --git a/api_docs/kbn_doc_links.mdx b/api_docs/kbn_doc_links.mdx index c7d4d0fe3d260..055b95affc247 100644 --- a/api_docs/kbn_doc_links.mdx +++ b/api_docs/kbn_doc_links.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-doc-links title: "@kbn/doc-links" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/doc-links plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/doc-links'] --- import kbnDocLinksObj from './kbn_doc_links.devdocs.json'; diff --git a/api_docs/kbn_docs_utils.mdx b/api_docs/kbn_docs_utils.mdx index 30e9b543d9d8d..f6a0a8c29e495 100644 --- a/api_docs/kbn_docs_utils.mdx +++ b/api_docs/kbn_docs_utils.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-docs-utils title: "@kbn/docs-utils" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/docs-utils plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/docs-utils'] --- import kbnDocsUtilsObj from './kbn_docs_utils.devdocs.json'; diff --git a/api_docs/kbn_ebt_tools.mdx b/api_docs/kbn_ebt_tools.mdx index 8590060b07965..fa63acb9d852c 100644 --- a/api_docs/kbn_ebt_tools.mdx +++ b/api_docs/kbn_ebt_tools.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ebt-tools title: "@kbn/ebt-tools" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/ebt-tools plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ebt-tools'] --- import kbnEbtToolsObj from './kbn_ebt_tools.devdocs.json'; diff --git a/api_docs/kbn_es_archiver.mdx b/api_docs/kbn_es_archiver.mdx index 1e69af86cfda4..9f608a801f2c0 100644 --- a/api_docs/kbn_es_archiver.mdx +++ b/api_docs/kbn_es_archiver.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es-archiver title: "@kbn/es-archiver" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/es-archiver plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/es-archiver'] --- import kbnEsArchiverObj from './kbn_es_archiver.devdocs.json'; diff --git a/api_docs/kbn_es_errors.mdx b/api_docs/kbn_es_errors.mdx index 695ed989dfe99..1498ddb5d2636 100644 --- a/api_docs/kbn_es_errors.mdx +++ b/api_docs/kbn_es_errors.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es-errors title: "@kbn/es-errors" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/es-errors plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/es-errors'] --- import kbnEsErrorsObj from './kbn_es_errors.devdocs.json'; diff --git a/api_docs/kbn_es_query.mdx b/api_docs/kbn_es_query.mdx index b329278d82729..537db266a40f5 100644 --- a/api_docs/kbn_es_query.mdx +++ b/api_docs/kbn_es_query.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es-query title: "@kbn/es-query" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/es-query plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/es-query'] --- import kbnEsQueryObj from './kbn_es_query.devdocs.json'; diff --git a/api_docs/kbn_es_types.mdx b/api_docs/kbn_es_types.mdx index 9a2cfbe08a28b..923c644404d7b 100644 --- a/api_docs/kbn_es_types.mdx +++ b/api_docs/kbn_es_types.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es-types title: "@kbn/es-types" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/es-types plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/es-types'] --- import kbnEsTypesObj from './kbn_es_types.devdocs.json'; diff --git a/api_docs/kbn_eslint_plugin_imports.mdx b/api_docs/kbn_eslint_plugin_imports.mdx index 2e0b9742678dc..23893848967a1 100644 --- a/api_docs/kbn_eslint_plugin_imports.mdx +++ b/api_docs/kbn_eslint_plugin_imports.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-eslint-plugin-imports title: "@kbn/eslint-plugin-imports" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/eslint-plugin-imports plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/eslint-plugin-imports'] --- import kbnEslintPluginImportsObj from './kbn_eslint_plugin_imports.devdocs.json'; diff --git a/api_docs/kbn_field_types.mdx b/api_docs/kbn_field_types.mdx index 0373e71bbf94c..a29e11c7f3f5c 100644 --- a/api_docs/kbn_field_types.mdx +++ b/api_docs/kbn_field_types.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-field-types title: "@kbn/field-types" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/field-types plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/field-types'] --- import kbnFieldTypesObj from './kbn_field_types.devdocs.json'; diff --git a/api_docs/kbn_find_used_node_modules.mdx b/api_docs/kbn_find_used_node_modules.mdx index f0a54f4a6740d..c3673495d2d9a 100644 --- a/api_docs/kbn_find_used_node_modules.mdx +++ b/api_docs/kbn_find_used_node_modules.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-find-used-node-modules title: "@kbn/find-used-node-modules" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/find-used-node-modules plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/find-used-node-modules'] --- import kbnFindUsedNodeModulesObj from './kbn_find_used_node_modules.devdocs.json'; diff --git a/api_docs/kbn_ftr_common_functional_services.mdx b/api_docs/kbn_ftr_common_functional_services.mdx index a2bfedd08171e..29968a934531a 100644 --- a/api_docs/kbn_ftr_common_functional_services.mdx +++ b/api_docs/kbn_ftr_common_functional_services.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ftr-common-functional-services title: "@kbn/ftr-common-functional-services" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/ftr-common-functional-services plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ftr-common-functional-services'] --- import kbnFtrCommonFunctionalServicesObj from './kbn_ftr_common_functional_services.devdocs.json'; diff --git a/api_docs/kbn_generate.mdx b/api_docs/kbn_generate.mdx index 2a9f62b4f3f36..535192fd22884 100644 --- a/api_docs/kbn_generate.mdx +++ b/api_docs/kbn_generate.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-generate title: "@kbn/generate" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/generate plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/generate'] --- import kbnGenerateObj from './kbn_generate.devdocs.json'; diff --git a/api_docs/kbn_get_repo_files.mdx b/api_docs/kbn_get_repo_files.mdx index b1b28470de32e..270341543e978 100644 --- a/api_docs/kbn_get_repo_files.mdx +++ b/api_docs/kbn_get_repo_files.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-get-repo-files title: "@kbn/get-repo-files" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/get-repo-files plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/get-repo-files'] --- import kbnGetRepoFilesObj from './kbn_get_repo_files.devdocs.json'; diff --git a/api_docs/kbn_handlebars.mdx b/api_docs/kbn_handlebars.mdx index b675d4d8f4da0..75d249e64bf71 100644 --- a/api_docs/kbn_handlebars.mdx +++ b/api_docs/kbn_handlebars.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-handlebars title: "@kbn/handlebars" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/handlebars plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/handlebars'] --- import kbnHandlebarsObj from './kbn_handlebars.devdocs.json'; diff --git a/api_docs/kbn_hapi_mocks.mdx b/api_docs/kbn_hapi_mocks.mdx index b7abe8b512959..d7346ce1b677d 100644 --- a/api_docs/kbn_hapi_mocks.mdx +++ b/api_docs/kbn_hapi_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-hapi-mocks title: "@kbn/hapi-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/hapi-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/hapi-mocks'] --- import kbnHapiMocksObj from './kbn_hapi_mocks.devdocs.json'; diff --git a/api_docs/kbn_home_sample_data_card.mdx b/api_docs/kbn_home_sample_data_card.mdx index e7a5d6fe0f7ec..b1ce2043e27f1 100644 --- a/api_docs/kbn_home_sample_data_card.mdx +++ b/api_docs/kbn_home_sample_data_card.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-home-sample-data-card title: "@kbn/home-sample-data-card" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/home-sample-data-card plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/home-sample-data-card'] --- import kbnHomeSampleDataCardObj from './kbn_home_sample_data_card.devdocs.json'; diff --git a/api_docs/kbn_home_sample_data_tab.mdx b/api_docs/kbn_home_sample_data_tab.mdx index f716a25e4408f..63510d74b009a 100644 --- a/api_docs/kbn_home_sample_data_tab.mdx +++ b/api_docs/kbn_home_sample_data_tab.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-home-sample-data-tab title: "@kbn/home-sample-data-tab" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/home-sample-data-tab plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/home-sample-data-tab'] --- import kbnHomeSampleDataTabObj from './kbn_home_sample_data_tab.devdocs.json'; diff --git a/api_docs/kbn_i18n.mdx b/api_docs/kbn_i18n.mdx index 25ba31dee6a69..ce7de735a1105 100644 --- a/api_docs/kbn_i18n.mdx +++ b/api_docs/kbn_i18n.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-i18n title: "@kbn/i18n" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/i18n plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/i18n'] --- import kbnI18nObj from './kbn_i18n.devdocs.json'; diff --git a/api_docs/kbn_import_resolver.mdx b/api_docs/kbn_import_resolver.mdx index c36a372e85d74..a96adba4a09b2 100644 --- a/api_docs/kbn_import_resolver.mdx +++ b/api_docs/kbn_import_resolver.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-import-resolver title: "@kbn/import-resolver" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/import-resolver plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/import-resolver'] --- import kbnImportResolverObj from './kbn_import_resolver.devdocs.json'; diff --git a/api_docs/kbn_interpreter.mdx b/api_docs/kbn_interpreter.mdx index 6051ff9b96e16..d35da6c7ae880 100644 --- a/api_docs/kbn_interpreter.mdx +++ b/api_docs/kbn_interpreter.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-interpreter title: "@kbn/interpreter" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/interpreter plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/interpreter'] --- import kbnInterpreterObj from './kbn_interpreter.devdocs.json'; diff --git a/api_docs/kbn_io_ts_utils.mdx b/api_docs/kbn_io_ts_utils.mdx index 0554879f31ad2..623552a19ab96 100644 --- a/api_docs/kbn_io_ts_utils.mdx +++ b/api_docs/kbn_io_ts_utils.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-io-ts-utils title: "@kbn/io-ts-utils" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/io-ts-utils plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/io-ts-utils'] --- import kbnIoTsUtilsObj from './kbn_io_ts_utils.devdocs.json'; diff --git a/api_docs/kbn_jest_serializers.mdx b/api_docs/kbn_jest_serializers.mdx index c005d1ea66f6e..46b40beb8bf35 100644 --- a/api_docs/kbn_jest_serializers.mdx +++ b/api_docs/kbn_jest_serializers.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-jest-serializers title: "@kbn/jest-serializers" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/jest-serializers plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/jest-serializers'] --- import kbnJestSerializersObj from './kbn_jest_serializers.devdocs.json'; diff --git a/api_docs/kbn_journeys.mdx b/api_docs/kbn_journeys.mdx index b2cd34e94a506..e9b4b290f7d14 100644 --- a/api_docs/kbn_journeys.mdx +++ b/api_docs/kbn_journeys.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-journeys title: "@kbn/journeys" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/journeys plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/journeys'] --- import kbnJourneysObj from './kbn_journeys.devdocs.json'; diff --git a/api_docs/kbn_kibana_manifest_schema.mdx b/api_docs/kbn_kibana_manifest_schema.mdx index 1b91d601c2246..3f19d6bc0c359 100644 --- a/api_docs/kbn_kibana_manifest_schema.mdx +++ b/api_docs/kbn_kibana_manifest_schema.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-kibana-manifest-schema title: "@kbn/kibana-manifest-schema" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/kibana-manifest-schema plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/kibana-manifest-schema'] --- import kbnKibanaManifestSchemaObj from './kbn_kibana_manifest_schema.devdocs.json'; diff --git a/api_docs/kbn_logging.mdx b/api_docs/kbn_logging.mdx index 13444331d9fcc..da43bfec51c4d 100644 --- a/api_docs/kbn_logging.mdx +++ b/api_docs/kbn_logging.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-logging title: "@kbn/logging" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/logging plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/logging'] --- import kbnLoggingObj from './kbn_logging.devdocs.json'; diff --git a/api_docs/kbn_logging_mocks.mdx b/api_docs/kbn_logging_mocks.mdx index d6db9caa5dd01..2770d7ccb6ac7 100644 --- a/api_docs/kbn_logging_mocks.mdx +++ b/api_docs/kbn_logging_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-logging-mocks title: "@kbn/logging-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/logging-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/logging-mocks'] --- import kbnLoggingMocksObj from './kbn_logging_mocks.devdocs.json'; diff --git a/api_docs/kbn_managed_vscode_config.mdx b/api_docs/kbn_managed_vscode_config.mdx index 12ab660fc1764..83b9321c6a3f9 100644 --- a/api_docs/kbn_managed_vscode_config.mdx +++ b/api_docs/kbn_managed_vscode_config.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-managed-vscode-config title: "@kbn/managed-vscode-config" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/managed-vscode-config plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/managed-vscode-config'] --- import kbnManagedVscodeConfigObj from './kbn_managed_vscode_config.devdocs.json'; diff --git a/api_docs/kbn_mapbox_gl.mdx b/api_docs/kbn_mapbox_gl.mdx index a0fbd8c5ef3c9..ae4854e96ac2a 100644 --- a/api_docs/kbn_mapbox_gl.mdx +++ b/api_docs/kbn_mapbox_gl.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-mapbox-gl title: "@kbn/mapbox-gl" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/mapbox-gl plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/mapbox-gl'] --- import kbnMapboxGlObj from './kbn_mapbox_gl.devdocs.json'; diff --git a/api_docs/kbn_ml_agg_utils.mdx b/api_docs/kbn_ml_agg_utils.mdx index 6808dca6dbe35..dd5f5c5ace183 100644 --- a/api_docs/kbn_ml_agg_utils.mdx +++ b/api_docs/kbn_ml_agg_utils.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-agg-utils title: "@kbn/ml-agg-utils" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/ml-agg-utils plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-agg-utils'] --- import kbnMlAggUtilsObj from './kbn_ml_agg_utils.devdocs.json'; diff --git a/api_docs/kbn_ml_is_populated_object.mdx b/api_docs/kbn_ml_is_populated_object.mdx index 8da4778d8b81f..4a750b0b7dfad 100644 --- a/api_docs/kbn_ml_is_populated_object.mdx +++ b/api_docs/kbn_ml_is_populated_object.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-is-populated-object title: "@kbn/ml-is-populated-object" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/ml-is-populated-object plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-is-populated-object'] --- import kbnMlIsPopulatedObjectObj from './kbn_ml_is_populated_object.devdocs.json'; diff --git a/api_docs/kbn_ml_string_hash.mdx b/api_docs/kbn_ml_string_hash.mdx index e9cf6c1838c51..1702698262627 100644 --- a/api_docs/kbn_ml_string_hash.mdx +++ b/api_docs/kbn_ml_string_hash.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-string-hash title: "@kbn/ml-string-hash" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/ml-string-hash plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-string-hash'] --- import kbnMlStringHashObj from './kbn_ml_string_hash.devdocs.json'; diff --git a/api_docs/kbn_monaco.mdx b/api_docs/kbn_monaco.mdx index 4ec4c4ef7c9eb..987ec45f387a2 100644 --- a/api_docs/kbn_monaco.mdx +++ b/api_docs/kbn_monaco.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-monaco title: "@kbn/monaco" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/monaco plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/monaco'] --- import kbnMonacoObj from './kbn_monaco.devdocs.json'; diff --git a/api_docs/kbn_optimizer.mdx b/api_docs/kbn_optimizer.mdx index 757c4018832a9..ed7566b575b58 100644 --- a/api_docs/kbn_optimizer.mdx +++ b/api_docs/kbn_optimizer.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-optimizer title: "@kbn/optimizer" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/optimizer plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/optimizer'] --- import kbnOptimizerObj from './kbn_optimizer.devdocs.json'; diff --git a/api_docs/kbn_optimizer_webpack_helpers.mdx b/api_docs/kbn_optimizer_webpack_helpers.mdx index 11961ef3d602b..7c45eeef92b57 100644 --- a/api_docs/kbn_optimizer_webpack_helpers.mdx +++ b/api_docs/kbn_optimizer_webpack_helpers.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-optimizer-webpack-helpers title: "@kbn/optimizer-webpack-helpers" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/optimizer-webpack-helpers plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/optimizer-webpack-helpers'] --- import kbnOptimizerWebpackHelpersObj from './kbn_optimizer_webpack_helpers.devdocs.json'; diff --git a/api_docs/kbn_osquery_io_ts_types.mdx b/api_docs/kbn_osquery_io_ts_types.mdx index a980b80bd7a38..859b6a067644d 100644 --- a/api_docs/kbn_osquery_io_ts_types.mdx +++ b/api_docs/kbn_osquery_io_ts_types.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-osquery-io-ts-types title: "@kbn/osquery-io-ts-types" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/osquery-io-ts-types plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/osquery-io-ts-types'] --- import kbnOsqueryIoTsTypesObj from './kbn_osquery_io_ts_types.devdocs.json'; diff --git a/api_docs/kbn_performance_testing_dataset_extractor.mdx b/api_docs/kbn_performance_testing_dataset_extractor.mdx index b1051ed927c86..aedd0101a45aa 100644 --- a/api_docs/kbn_performance_testing_dataset_extractor.mdx +++ b/api_docs/kbn_performance_testing_dataset_extractor.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-performance-testing-dataset-extractor title: "@kbn/performance-testing-dataset-extractor" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/performance-testing-dataset-extractor plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/performance-testing-dataset-extractor'] --- import kbnPerformanceTestingDatasetExtractorObj from './kbn_performance_testing_dataset_extractor.devdocs.json'; diff --git a/api_docs/kbn_plugin_generator.mdx b/api_docs/kbn_plugin_generator.mdx index 98d5196dc24f1..bfd4b4e6b5afb 100644 --- a/api_docs/kbn_plugin_generator.mdx +++ b/api_docs/kbn_plugin_generator.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-plugin-generator title: "@kbn/plugin-generator" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/plugin-generator plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/plugin-generator'] --- import kbnPluginGeneratorObj from './kbn_plugin_generator.devdocs.json'; diff --git a/api_docs/kbn_plugin_helpers.mdx b/api_docs/kbn_plugin_helpers.mdx index a04f5630c37b4..3ca9f9e155f16 100644 --- a/api_docs/kbn_plugin_helpers.mdx +++ b/api_docs/kbn_plugin_helpers.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-plugin-helpers title: "@kbn/plugin-helpers" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/plugin-helpers plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/plugin-helpers'] --- import kbnPluginHelpersObj from './kbn_plugin_helpers.devdocs.json'; diff --git a/api_docs/kbn_react_field.mdx b/api_docs/kbn_react_field.mdx index af33c58333e71..293fa51905454 100644 --- a/api_docs/kbn_react_field.mdx +++ b/api_docs/kbn_react_field.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-react-field title: "@kbn/react-field" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/react-field plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/react-field'] --- import kbnReactFieldObj from './kbn_react_field.devdocs.json'; diff --git a/api_docs/kbn_repo_source_classifier.mdx b/api_docs/kbn_repo_source_classifier.mdx index 2a373248eac93..aaf5d45ea057c 100644 --- a/api_docs/kbn_repo_source_classifier.mdx +++ b/api_docs/kbn_repo_source_classifier.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-repo-source-classifier title: "@kbn/repo-source-classifier" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/repo-source-classifier plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/repo-source-classifier'] --- import kbnRepoSourceClassifierObj from './kbn_repo_source_classifier.devdocs.json'; diff --git a/api_docs/kbn_rule_data_utils.devdocs.json b/api_docs/kbn_rule_data_utils.devdocs.json index c30477647a1ce..2d6403bd41dfe 100644 --- a/api_docs/kbn_rule_data_utils.devdocs.json +++ b/api_docs/kbn_rule_data_utils.devdocs.json @@ -912,7 +912,7 @@ "label": "AlertConsumers", "description": [], "signature": [ - "\"observability\" | \"logs\" | \"apm\" | \"uptime\" | \"siem\" | \"infrastructure\"" + "\"infrastructure\" | \"observability\" | \"logs\" | \"apm\" | \"uptime\" | \"siem\"" ], "path": "packages/kbn-rule-data-utils/src/alerts_as_data_rbac.ts", "deprecated": false, @@ -1077,7 +1077,7 @@ "label": "TechnicalRuleDataFieldName", "description": [], "signature": [ - "\"tags\" | \"kibana\" | \"@timestamp\" | \"event.action\" | \"kibana.alert.rule.parameters\" | \"kibana.alert.rule.rule_type_id\" | \"kibana.alert.rule.consumer\" | \"kibana.alert.rule.producer\" | \"kibana.space_ids\" | \"kibana.alert.uuid\" | \"kibana.alert.instance.id\" | \"kibana.alert.start\" | \"kibana.alert.end\" | \"kibana.alert.duration.us\" | \"kibana.alert.severity\" | \"kibana.alert.status\" | \"kibana.version\" | \"ecs.version\" | \"kibana.alert.risk_score\" | \"kibana.alert.workflow_status\" | \"kibana.alert.workflow_user\" | \"kibana.alert.workflow_reason\" | \"kibana.alert.system_status\" | \"kibana.alert.action_group\" | \"kibana.alert.reason\" | \"kibana.alert.rule.author\" | \"kibana.alert.rule.category\" | \"kibana.alert.rule.uuid\" | \"kibana.alert.rule.created_at\" | \"kibana.alert.rule.created_by\" | \"kibana.alert.rule.description\" | \"kibana.alert.rule.enabled\" | \"kibana.alert.rule.execution.uuid\" | \"kibana.alert.rule.from\" | \"kibana.alert.rule.interval\" | \"kibana.alert.rule.license\" | \"kibana.alert.rule.name\" | \"kibana.alert.rule.note\" | \"kibana.alert.rule.references\" | \"kibana.alert.rule.rule_id\" | \"kibana.alert.rule.rule_name_override\" | \"kibana.alert.rule.tags\" | \"kibana.alert.rule.to\" | \"kibana.alert.rule.type\" | \"kibana.alert.rule.updated_at\" | \"kibana.alert.rule.updated_by\" | \"kibana.alert.rule.version\" | \"event.kind\" | \"event.module\" | \"kibana.alert.evaluation.threshold\" | \"kibana.alert.evaluation.value\" | \"kibana.alert.building_block_type\" | \"kibana.alert.rule.exceptions_list\" | \"kibana.alert.rule.namespace\" | \"kibana.alert\" | \"kibana.alert.rule\"" + "\"tags\" | \"kibana\" | \"@timestamp\" | \"kibana.alert.rule.rule_type_id\" | \"kibana.alert.rule.consumer\" | \"event.action\" | \"kibana.alert.rule.execution.uuid\" | \"kibana.alert.rule.parameters\" | \"kibana.alert.rule.producer\" | \"kibana.space_ids\" | \"kibana.alert.uuid\" | \"kibana.alert.instance.id\" | \"kibana.alert.start\" | \"kibana.alert.end\" | \"kibana.alert.duration.us\" | \"kibana.alert.severity\" | \"kibana.alert.status\" | \"kibana.version\" | \"ecs.version\" | \"kibana.alert.risk_score\" | \"kibana.alert.workflow_status\" | \"kibana.alert.workflow_user\" | \"kibana.alert.workflow_reason\" | \"kibana.alert.system_status\" | \"kibana.alert.action_group\" | \"kibana.alert.reason\" | \"kibana.alert.rule.author\" | \"kibana.alert.rule.category\" | \"kibana.alert.rule.uuid\" | \"kibana.alert.rule.created_at\" | \"kibana.alert.rule.created_by\" | \"kibana.alert.rule.description\" | \"kibana.alert.rule.enabled\" | \"kibana.alert.rule.from\" | \"kibana.alert.rule.interval\" | \"kibana.alert.rule.license\" | \"kibana.alert.rule.name\" | \"kibana.alert.rule.note\" | \"kibana.alert.rule.references\" | \"kibana.alert.rule.rule_id\" | \"kibana.alert.rule.rule_name_override\" | \"kibana.alert.rule.tags\" | \"kibana.alert.rule.to\" | \"kibana.alert.rule.type\" | \"kibana.alert.rule.updated_at\" | \"kibana.alert.rule.updated_by\" | \"kibana.alert.rule.version\" | \"event.kind\" | \"event.module\" | \"kibana.alert.evaluation.threshold\" | \"kibana.alert.evaluation.value\" | \"kibana.alert.building_block_type\" | \"kibana.alert.rule.exceptions_list\" | \"kibana.alert.rule.namespace\" | \"kibana.alert\" | \"kibana.alert.rule\"" ], "path": "packages/kbn-rule-data-utils/src/technical_field_names.ts", "deprecated": false, @@ -1107,7 +1107,7 @@ "label": "ValidFeatureId", "description": [], "signature": [ - "\"observability\" | \"logs\" | \"apm\" | \"uptime\" | \"siem\" | \"infrastructure\"" + "\"infrastructure\" | \"observability\" | \"logs\" | \"apm\" | \"uptime\" | \"siem\"" ], "path": "packages/kbn-rule-data-utils/src/alerts_as_data_rbac.ts", "deprecated": false, diff --git a/api_docs/kbn_rule_data_utils.mdx b/api_docs/kbn_rule_data_utils.mdx index 61d440950cbf3..4f65db7503fc7 100644 --- a/api_docs/kbn_rule_data_utils.mdx +++ b/api_docs/kbn_rule_data_utils.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-rule-data-utils title: "@kbn/rule-data-utils" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/rule-data-utils plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/rule-data-utils'] --- import kbnRuleDataUtilsObj from './kbn_rule_data_utils.devdocs.json'; diff --git a/api_docs/kbn_securitysolution_autocomplete.mdx b/api_docs/kbn_securitysolution_autocomplete.mdx index 4ca4605d2eb99..5a9078575773a 100644 --- a/api_docs/kbn_securitysolution_autocomplete.mdx +++ b/api_docs/kbn_securitysolution_autocomplete.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-autocomplete title: "@kbn/securitysolution-autocomplete" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/securitysolution-autocomplete plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-autocomplete'] --- import kbnSecuritysolutionAutocompleteObj from './kbn_securitysolution_autocomplete.devdocs.json'; diff --git a/api_docs/kbn_securitysolution_es_utils.mdx b/api_docs/kbn_securitysolution_es_utils.mdx index 99858a653681a..dc5fcdbd1d0f1 100644 --- a/api_docs/kbn_securitysolution_es_utils.mdx +++ b/api_docs/kbn_securitysolution_es_utils.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-es-utils title: "@kbn/securitysolution-es-utils" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/securitysolution-es-utils plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-es-utils'] --- import kbnSecuritysolutionEsUtilsObj from './kbn_securitysolution_es_utils.devdocs.json'; diff --git a/api_docs/kbn_securitysolution_exception_list_components.devdocs.json b/api_docs/kbn_securitysolution_exception_list_components.devdocs.json new file mode 100644 index 0000000000000..97b711804af12 --- /dev/null +++ b/api_docs/kbn_securitysolution_exception_list_components.devdocs.json @@ -0,0 +1,1209 @@ +{ + "id": "@kbn/securitysolution-exception-list-components", + "client": { + "classes": [], + "functions": [], + "interfaces": [], + "enums": [], + "misc": [], + "objects": [] + }, + "server": { + "classes": [], + "functions": [], + "interfaces": [], + "enums": [], + "misc": [], + "objects": [] + }, + "common": { + "classes": [], + "functions": [ + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.EmptyViewerState", + "type": "Function", + "tags": [], + "label": "EmptyViewerState", + "description": [], + "signature": [ + "React.NamedExoticComponent" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/empty_viewer_state/empty_viewer_state.tsx", + "deprecated": false, + "trackAdoption": false, + "returnComment": [], + "children": [ + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.EmptyViewerState.$1", + "type": "Uncategorized", + "tags": [], + "label": "props", + "description": [], + "signature": [ + "P" + ], + "path": "node_modules/@types/react/index.d.ts", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemCard", + "type": "Function", + "tags": [], + "label": "ExceptionItemCard", + "description": [], + "signature": [ + "React.NamedExoticComponent<", + { + "pluginId": "@kbn/securitysolution-exception-list-components", + "scope": "common", + "docId": "kibKbnSecuritysolutionExceptionListComponentsPluginApi", + "section": "def-common.ExceptionItemProps", + "text": "ExceptionItemProps" + }, + ">" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/exception_item_card.tsx", + "deprecated": false, + "trackAdoption": false, + "returnComment": [], + "children": [ + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemCard.$1", + "type": "Uncategorized", + "tags": [], + "label": "props", + "description": [], + "signature": [ + "P" + ], + "path": "node_modules/@types/react/index.d.ts", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemCardComments", + "type": "Function", + "tags": [], + "label": "ExceptionItemCardComments", + "description": [], + "signature": [ + "React.NamedExoticComponent<", + { + "pluginId": "@kbn/securitysolution-exception-list-components", + "scope": "common", + "docId": "kibKbnSecuritysolutionExceptionListComponentsPluginApi", + "section": "def-common.ExceptionItemCardCommentsProps", + "text": "ExceptionItemCardCommentsProps" + }, + ">" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/comments/comments.tsx", + "deprecated": false, + "trackAdoption": false, + "returnComment": [], + "children": [ + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemCardComments.$1", + "type": "Uncategorized", + "tags": [], + "label": "props", + "description": [], + "signature": [ + "P" + ], + "path": "node_modules/@types/react/index.d.ts", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemCardConditions", + "type": "Function", + "tags": [], + "label": "ExceptionItemCardConditions", + "description": [], + "signature": [ + "React.NamedExoticComponent<", + "CriteriaConditionsProps", + ">" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/conditions.tsx", + "deprecated": false, + "trackAdoption": false, + "returnComment": [], + "children": [ + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemCardConditions.$1", + "type": "Uncategorized", + "tags": [], + "label": "props", + "description": [], + "signature": [ + "P" + ], + "path": "node_modules/@types/react/index.d.ts", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemCardHeader", + "type": "Function", + "tags": [], + "label": "ExceptionItemCardHeader", + "description": [], + "signature": [ + "React.NamedExoticComponent<", + { + "pluginId": "@kbn/securitysolution-exception-list-components", + "scope": "common", + "docId": "kibKbnSecuritysolutionExceptionListComponentsPluginApi", + "section": "def-common.ExceptionItemCardHeaderProps", + "text": "ExceptionItemCardHeaderProps" + }, + ">" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/header/header.tsx", + "deprecated": false, + "trackAdoption": false, + "returnComment": [], + "children": [ + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemCardHeader.$1", + "type": "Uncategorized", + "tags": [], + "label": "props", + "description": [], + "signature": [ + "P" + ], + "path": "node_modules/@types/react/index.d.ts", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemCardMetaInfo", + "type": "Function", + "tags": [], + "label": "ExceptionItemCardMetaInfo", + "description": [], + "signature": [ + "React.NamedExoticComponent<", + { + "pluginId": "@kbn/securitysolution-exception-list-components", + "scope": "common", + "docId": "kibKbnSecuritysolutionExceptionListComponentsPluginApi", + "section": "def-common.ExceptionItemCardMetaInfoProps", + "text": "ExceptionItemCardMetaInfoProps" + }, + ">" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/meta/meta.tsx", + "deprecated": false, + "trackAdoption": false, + "returnComment": [], + "children": [ + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemCardMetaInfo.$1", + "type": "Uncategorized", + "tags": [], + "label": "props", + "description": [], + "signature": [ + "P" + ], + "path": "node_modules/@types/react/index.d.ts", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItems", + "type": "Function", + "tags": [], + "label": "ExceptionItems", + "description": [], + "signature": [ + "React.NamedExoticComponent" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_items/exception_items.tsx", + "deprecated": false, + "trackAdoption": false, + "returnComment": [], + "children": [ + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItems.$1", + "type": "Uncategorized", + "tags": [], + "label": "props", + "description": [], + "signature": [ + "P" + ], + "path": "node_modules/@types/react/index.d.ts", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.Pagination", + "type": "Function", + "tags": [], + "label": "Pagination", + "description": [], + "signature": [ + "React.NamedExoticComponent<", + { + "pluginId": "@kbn/securitysolution-exception-list-components", + "scope": "common", + "docId": "kibKbnSecuritysolutionExceptionListComponentsPluginApi", + "section": "def-common.PaginationProps", + "text": "PaginationProps" + }, + ">" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/pagination/pagination.tsx", + "deprecated": false, + "trackAdoption": false, + "returnComment": [], + "children": [ + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.Pagination.$1", + "type": "Uncategorized", + "tags": [], + "label": "props", + "description": [], + "signature": [ + "P" + ], + "path": "node_modules/@types/react/index.d.ts", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.SearchBar", + "type": "Function", + "tags": [], + "label": "SearchBar", + "description": [], + "signature": [ + "React.NamedExoticComponent" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/search_bar/search_bar.tsx", + "deprecated": false, + "trackAdoption": false, + "returnComment": [], + "children": [ + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.SearchBar.$1", + "type": "Uncategorized", + "tags": [], + "label": "props", + "description": [], + "signature": [ + "P" + ], + "path": "node_modules/@types/react/index.d.ts", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ValueWithSpaceWarning", + "type": "Function", + "tags": [], + "label": "ValueWithSpaceWarning", + "description": [], + "signature": [ + "({ value, tooltipIconType, tooltipIconText, }: React.PropsWithChildren) => JSX.Element | null" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/value_with_space_warning/value_with_space_warning.tsx", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ValueWithSpaceWarning.$1", + "type": "CompoundType", + "tags": [], + "label": "{\n value,\n tooltipIconType = 'iInCircle',\n tooltipIconText,\n}", + "description": [], + "signature": [ + "React.PropsWithChildren" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/value_with_space_warning/value_with_space_warning.tsx", + "deprecated": false, + "trackAdoption": false, + "isRequired": true + } + ], + "returnComment": [], + "initialIsOpen": false + } + ], + "interfaces": [ + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemCardCommentsProps", + "type": "Interface", + "tags": [], + "label": "ExceptionItemCardCommentsProps", + "description": [], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/comments/comments.tsx", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemCardCommentsProps.comments", + "type": "Array", + "tags": [], + "label": "comments", + "description": [], + "signature": [ + "EuiCommentProps", + "[]" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/comments/comments.tsx", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemCardHeaderProps", + "type": "Interface", + "tags": [], + "label": "ExceptionItemCardHeaderProps", + "description": [], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/header/header.tsx", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemCardHeaderProps.item", + "type": "Object", + "tags": [], + "label": "item", + "description": [], + "signature": [ + "{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip\" | \"text\" | \"geo_point\" | \"geo_shape\" | \"date_nanos\" | \"long\" | \"double\" | \"date_range\" | \"ip_range\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/header/header.tsx", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemCardHeaderProps.actions", + "type": "Array", + "tags": [], + "label": "actions", + "description": [], + "signature": [ + "{ key: string; icon: string; label: string | boolean; onClick: () => void; }[]" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/header/header.tsx", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemCardHeaderProps.disableActions", + "type": "CompoundType", + "tags": [], + "label": "disableActions", + "description": [], + "signature": [ + "boolean | undefined" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/header/header.tsx", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemCardHeaderProps.dataTestSubj", + "type": "string", + "tags": [], + "label": "dataTestSubj", + "description": [], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/header/header.tsx", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemCardMetaInfoProps", + "type": "Interface", + "tags": [], + "label": "ExceptionItemCardMetaInfoProps", + "description": [], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/meta/meta.tsx", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemCardMetaInfoProps.item", + "type": "Object", + "tags": [], + "label": "item", + "description": [], + "signature": [ + "{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip\" | \"text\" | \"geo_point\" | \"geo_shape\" | \"date_nanos\" | \"long\" | \"double\" | \"date_range\" | \"ip_range\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/meta/meta.tsx", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemCardMetaInfoProps.references", + "type": "Array", + "tags": [], + "label": "references", + "description": [], + "signature": [ + { + "pluginId": "@kbn/securitysolution-exception-list-components", + "scope": "common", + "docId": "kibKbnSecuritysolutionExceptionListComponentsPluginApi", + "section": "def-common.RuleReference", + "text": "RuleReference" + }, + "[]" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/meta/meta.tsx", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemCardMetaInfoProps.dataTestSubj", + "type": "string", + "tags": [], + "label": "dataTestSubj", + "description": [], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/meta/meta.tsx", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemCardMetaInfoProps.formattedDateComponent", + "type": "CompoundType", + "tags": [], + "label": "formattedDateComponent", + "description": [], + "signature": [ + "\"symbol\" | \"object\" | React.ComponentType | \"body\" | \"path\" | \"circle\" | \"filter\" | \"data\" | \"line\" | \"area\" | \"time\" | \"label\" | \"legend\" | \"image\" | \"link\" | \"menu\" | \"stop\" | \"base\" | \"text\" | \"title\" | \"s\" | \"small\" | \"svg\" | \"meta\" | \"script\" | \"summary\" | \"source\" | \"desc\" | \"q\" | \"pattern\" | \"mask\" | \"input\" | \"slot\" | \"style\" | \"head\" | \"section\" | \"big\" | \"sub\" | \"sup\" | \"animate\" | \"progress\" | \"view\" | \"output\" | \"var\" | \"map\" | \"html\" | \"a\" | \"img\" | \"audio\" | \"form\" | \"main\" | \"abbr\" | \"address\" | \"article\" | \"aside\" | \"b\" | \"bdi\" | \"bdo\" | \"blockquote\" | \"br\" | \"button\" | \"canvas\" | \"caption\" | \"cite\" | \"code\" | \"col\" | \"colgroup\" | \"datalist\" | \"dd\" | \"del\" | \"details\" | \"dfn\" | \"dialog\" | \"div\" | \"dl\" | \"dt\" | \"em\" | \"embed\" | \"fieldset\" | \"figcaption\" | \"figure\" | \"footer\" | \"h1\" | \"h2\" | \"h3\" | \"h4\" | \"h5\" | \"h6\" | \"header\" | \"hgroup\" | \"hr\" | \"i\" | \"iframe\" | \"ins\" | \"kbd\" | \"keygen\" | \"li\" | \"mark\" | \"menuitem\" | \"meter\" | \"nav\" | \"noindex\" | \"noscript\" | \"ol\" | \"optgroup\" | \"option\" | \"p\" | \"param\" | \"picture\" | \"pre\" | \"rp\" | \"rt\" | \"ruby\" | \"samp\" | \"select\" | \"span\" | \"strong\" | \"table\" | \"template\" | \"tbody\" | \"td\" | \"textarea\" | \"tfoot\" | \"th\" | \"thead\" | \"tr\" | \"track\" | \"u\" | \"ul\" | \"video\" | \"wbr\" | \"webview\" | \"animateMotion\" | \"animateTransform\" | \"clipPath\" | \"defs\" | \"ellipse\" | \"feBlend\" | \"feColorMatrix\" | \"feComponentTransfer\" | \"feComposite\" | \"feConvolveMatrix\" | \"feDiffuseLighting\" | \"feDisplacementMap\" | \"feDistantLight\" | \"feDropShadow\" | \"feFlood\" | \"feFuncA\" | \"feFuncB\" | \"feFuncG\" | \"feFuncR\" | \"feGaussianBlur\" | \"feImage\" | \"feMerge\" | \"feMergeNode\" | \"feMorphology\" | \"feOffset\" | \"fePointLight\" | \"feSpecularLighting\" | \"feSpotLight\" | \"feTile\" | \"feTurbulence\" | \"foreignObject\" | \"g\" | \"linearGradient\" | \"marker\" | \"metadata\" | \"mpath\" | \"polygon\" | \"polyline\" | \"radialGradient\" | \"rect\" | \"switch\" | \"textPath\" | \"tspan\" | \"use\"" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/meta/meta.tsx", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemCardMetaInfoProps.securityLinkAnchorComponent", + "type": "CompoundType", + "tags": [], + "label": "securityLinkAnchorComponent", + "description": [], + "signature": [ + "\"symbol\" | \"object\" | React.ComponentType | \"body\" | \"path\" | \"circle\" | \"filter\" | \"data\" | \"line\" | \"area\" | \"time\" | \"label\" | \"legend\" | \"image\" | \"link\" | \"menu\" | \"stop\" | \"base\" | \"text\" | \"title\" | \"s\" | \"small\" | \"svg\" | \"meta\" | \"script\" | \"summary\" | \"source\" | \"desc\" | \"q\" | \"pattern\" | \"mask\" | \"input\" | \"slot\" | \"style\" | \"head\" | \"section\" | \"big\" | \"sub\" | \"sup\" | \"animate\" | \"progress\" | \"view\" | \"output\" | \"var\" | \"map\" | \"html\" | \"a\" | \"img\" | \"audio\" | \"form\" | \"main\" | \"abbr\" | \"address\" | \"article\" | \"aside\" | \"b\" | \"bdi\" | \"bdo\" | \"blockquote\" | \"br\" | \"button\" | \"canvas\" | \"caption\" | \"cite\" | \"code\" | \"col\" | \"colgroup\" | \"datalist\" | \"dd\" | \"del\" | \"details\" | \"dfn\" | \"dialog\" | \"div\" | \"dl\" | \"dt\" | \"em\" | \"embed\" | \"fieldset\" | \"figcaption\" | \"figure\" | \"footer\" | \"h1\" | \"h2\" | \"h3\" | \"h4\" | \"h5\" | \"h6\" | \"header\" | \"hgroup\" | \"hr\" | \"i\" | \"iframe\" | \"ins\" | \"kbd\" | \"keygen\" | \"li\" | \"mark\" | \"menuitem\" | \"meter\" | \"nav\" | \"noindex\" | \"noscript\" | \"ol\" | \"optgroup\" | \"option\" | \"p\" | \"param\" | \"picture\" | \"pre\" | \"rp\" | \"rt\" | \"ruby\" | \"samp\" | \"select\" | \"span\" | \"strong\" | \"table\" | \"template\" | \"tbody\" | \"td\" | \"textarea\" | \"tfoot\" | \"th\" | \"thead\" | \"tr\" | \"track\" | \"u\" | \"ul\" | \"video\" | \"wbr\" | \"webview\" | \"animateMotion\" | \"animateTransform\" | \"clipPath\" | \"defs\" | \"ellipse\" | \"feBlend\" | \"feColorMatrix\" | \"feComponentTransfer\" | \"feComposite\" | \"feConvolveMatrix\" | \"feDiffuseLighting\" | \"feDisplacementMap\" | \"feDistantLight\" | \"feDropShadow\" | \"feFlood\" | \"feFuncA\" | \"feFuncB\" | \"feFuncG\" | \"feFuncR\" | \"feGaussianBlur\" | \"feImage\" | \"feMerge\" | \"feMergeNode\" | \"feMorphology\" | \"feOffset\" | \"fePointLight\" | \"feSpecularLighting\" | \"feSpotLight\" | \"feTile\" | \"feTurbulence\" | \"foreignObject\" | \"g\" | \"linearGradient\" | \"marker\" | \"metadata\" | \"mpath\" | \"polygon\" | \"polyline\" | \"radialGradient\" | \"rect\" | \"switch\" | \"textPath\" | \"tspan\" | \"use\"" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/meta/meta.tsx", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemProps", + "type": "Interface", + "tags": [], + "label": "ExceptionItemProps", + "description": [], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/exception_item_card.tsx", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemProps.dataTestSubj", + "type": "string", + "tags": [], + "label": "dataTestSubj", + "description": [], + "signature": [ + "string | undefined" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/exception_item_card.tsx", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemProps.disableActions", + "type": "CompoundType", + "tags": [], + "label": "disableActions", + "description": [], + "signature": [ + "boolean | undefined" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/exception_item_card.tsx", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemProps.exceptionItem", + "type": "Object", + "tags": [], + "label": "exceptionItem", + "description": [], + "signature": [ + "{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip\" | \"text\" | \"geo_point\" | \"geo_shape\" | \"date_nanos\" | \"long\" | \"double\" | \"date_range\" | \"ip_range\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/exception_item_card.tsx", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemProps.listType", + "type": "Enum", + "tags": [], + "label": "listType", + "description": [], + "signature": [ + "ExceptionListTypeEnum" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/exception_item_card.tsx", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemProps.ruleReferences", + "type": "Array", + "tags": [], + "label": "ruleReferences", + "description": [], + "signature": [ + "any[]" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/exception_item_card.tsx", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemProps.editActionLabel", + "type": "string", + "tags": [], + "label": "editActionLabel", + "description": [], + "signature": [ + "string | undefined" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/exception_item_card.tsx", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemProps.deleteActionLabel", + "type": "string", + "tags": [], + "label": "deleteActionLabel", + "description": [], + "signature": [ + "string | undefined" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/exception_item_card.tsx", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemProps.securityLinkAnchorComponent", + "type": "CompoundType", + "tags": [], + "label": "securityLinkAnchorComponent", + "description": [], + "signature": [ + "\"symbol\" | \"object\" | React.ComponentType | \"body\" | \"path\" | \"circle\" | \"filter\" | \"data\" | \"line\" | \"area\" | \"time\" | \"label\" | \"legend\" | \"image\" | \"link\" | \"menu\" | \"stop\" | \"base\" | \"text\" | \"title\" | \"s\" | \"small\" | \"svg\" | \"meta\" | \"script\" | \"summary\" | \"source\" | \"desc\" | \"q\" | \"pattern\" | \"mask\" | \"input\" | \"slot\" | \"style\" | \"head\" | \"section\" | \"big\" | \"sub\" | \"sup\" | \"animate\" | \"progress\" | \"view\" | \"output\" | \"var\" | \"map\" | \"html\" | \"a\" | \"img\" | \"audio\" | \"form\" | \"main\" | \"abbr\" | \"address\" | \"article\" | \"aside\" | \"b\" | \"bdi\" | \"bdo\" | \"blockquote\" | \"br\" | \"button\" | \"canvas\" | \"caption\" | \"cite\" | \"code\" | \"col\" | \"colgroup\" | \"datalist\" | \"dd\" | \"del\" | \"details\" | \"dfn\" | \"dialog\" | \"div\" | \"dl\" | \"dt\" | \"em\" | \"embed\" | \"fieldset\" | \"figcaption\" | \"figure\" | \"footer\" | \"h1\" | \"h2\" | \"h3\" | \"h4\" | \"h5\" | \"h6\" | \"header\" | \"hgroup\" | \"hr\" | \"i\" | \"iframe\" | \"ins\" | \"kbd\" | \"keygen\" | \"li\" | \"mark\" | \"menuitem\" | \"meter\" | \"nav\" | \"noindex\" | \"noscript\" | \"ol\" | \"optgroup\" | \"option\" | \"p\" | \"param\" | \"picture\" | \"pre\" | \"rp\" | \"rt\" | \"ruby\" | \"samp\" | \"select\" | \"span\" | \"strong\" | \"table\" | \"template\" | \"tbody\" | \"td\" | \"textarea\" | \"tfoot\" | \"th\" | \"thead\" | \"tr\" | \"track\" | \"u\" | \"ul\" | \"video\" | \"wbr\" | \"webview\" | \"animateMotion\" | \"animateTransform\" | \"clipPath\" | \"defs\" | \"ellipse\" | \"feBlend\" | \"feColorMatrix\" | \"feComponentTransfer\" | \"feComposite\" | \"feConvolveMatrix\" | \"feDiffuseLighting\" | \"feDisplacementMap\" | \"feDistantLight\" | \"feDropShadow\" | \"feFlood\" | \"feFuncA\" | \"feFuncB\" | \"feFuncG\" | \"feFuncR\" | \"feGaussianBlur\" | \"feImage\" | \"feMerge\" | \"feMergeNode\" | \"feMorphology\" | \"feOffset\" | \"fePointLight\" | \"feSpecularLighting\" | \"feSpotLight\" | \"feTile\" | \"feTurbulence\" | \"foreignObject\" | \"g\" | \"linearGradient\" | \"marker\" | \"metadata\" | \"mpath\" | \"polygon\" | \"polyline\" | \"radialGradient\" | \"rect\" | \"switch\" | \"textPath\" | \"tspan\" | \"use\"" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/exception_item_card.tsx", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemProps.formattedDateComponent", + "type": "CompoundType", + "tags": [], + "label": "formattedDateComponent", + "description": [], + "signature": [ + "\"symbol\" | \"object\" | React.ComponentType | \"body\" | \"path\" | \"circle\" | \"filter\" | \"data\" | \"line\" | \"area\" | \"time\" | \"label\" | \"legend\" | \"image\" | \"link\" | \"menu\" | \"stop\" | \"base\" | \"text\" | \"title\" | \"s\" | \"small\" | \"svg\" | \"meta\" | \"script\" | \"summary\" | \"source\" | \"desc\" | \"q\" | \"pattern\" | \"mask\" | \"input\" | \"slot\" | \"style\" | \"head\" | \"section\" | \"big\" | \"sub\" | \"sup\" | \"animate\" | \"progress\" | \"view\" | \"output\" | \"var\" | \"map\" | \"html\" | \"a\" | \"img\" | \"audio\" | \"form\" | \"main\" | \"abbr\" | \"address\" | \"article\" | \"aside\" | \"b\" | \"bdi\" | \"bdo\" | \"blockquote\" | \"br\" | \"button\" | \"canvas\" | \"caption\" | \"cite\" | \"code\" | \"col\" | \"colgroup\" | \"datalist\" | \"dd\" | \"del\" | \"details\" | \"dfn\" | \"dialog\" | \"div\" | \"dl\" | \"dt\" | \"em\" | \"embed\" | \"fieldset\" | \"figcaption\" | \"figure\" | \"footer\" | \"h1\" | \"h2\" | \"h3\" | \"h4\" | \"h5\" | \"h6\" | \"header\" | \"hgroup\" | \"hr\" | \"i\" | \"iframe\" | \"ins\" | \"kbd\" | \"keygen\" | \"li\" | \"mark\" | \"menuitem\" | \"meter\" | \"nav\" | \"noindex\" | \"noscript\" | \"ol\" | \"optgroup\" | \"option\" | \"p\" | \"param\" | \"picture\" | \"pre\" | \"rp\" | \"rt\" | \"ruby\" | \"samp\" | \"select\" | \"span\" | \"strong\" | \"table\" | \"template\" | \"tbody\" | \"td\" | \"textarea\" | \"tfoot\" | \"th\" | \"thead\" | \"tr\" | \"track\" | \"u\" | \"ul\" | \"video\" | \"wbr\" | \"webview\" | \"animateMotion\" | \"animateTransform\" | \"clipPath\" | \"defs\" | \"ellipse\" | \"feBlend\" | \"feColorMatrix\" | \"feComponentTransfer\" | \"feComposite\" | \"feConvolveMatrix\" | \"feDiffuseLighting\" | \"feDisplacementMap\" | \"feDistantLight\" | \"feDropShadow\" | \"feFlood\" | \"feFuncA\" | \"feFuncB\" | \"feFuncG\" | \"feFuncR\" | \"feGaussianBlur\" | \"feImage\" | \"feMerge\" | \"feMergeNode\" | \"feMorphology\" | \"feOffset\" | \"fePointLight\" | \"feSpecularLighting\" | \"feSpotLight\" | \"feTile\" | \"feTurbulence\" | \"foreignObject\" | \"g\" | \"linearGradient\" | \"marker\" | \"metadata\" | \"mpath\" | \"polygon\" | \"polyline\" | \"radialGradient\" | \"rect\" | \"switch\" | \"textPath\" | \"tspan\" | \"use\"" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/exception_item_card.tsx", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemProps.getFormattedComments", + "type": "Function", + "tags": [], + "label": "getFormattedComments", + "description": [], + "signature": [ + "(comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]) => ", + "EuiCommentProps", + "[]" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/exception_item_card.tsx", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemProps.getFormattedComments.$1", + "type": "Array", + "tags": [], + "label": "comments", + "description": [], + "signature": [ + "({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/exception_item_card.tsx", + "deprecated": false, + "trackAdoption": false, + "isRequired": true + } + ], + "returnComment": [] + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemProps.onDeleteException", + "type": "Function", + "tags": [], + "label": "onDeleteException", + "description": [], + "signature": [ + "(arg: ", + { + "pluginId": "@kbn/securitysolution-exception-list-components", + "scope": "common", + "docId": "kibKbnSecuritysolutionExceptionListComponentsPluginApi", + "section": "def-common.ExceptionListItemIdentifiers", + "text": "ExceptionListItemIdentifiers" + }, + ") => void" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/exception_item_card.tsx", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemProps.onDeleteException.$1", + "type": "Object", + "tags": [], + "label": "arg", + "description": [], + "signature": [ + { + "pluginId": "@kbn/securitysolution-exception-list-components", + "scope": "common", + "docId": "kibKbnSecuritysolutionExceptionListComponentsPluginApi", + "section": "def-common.ExceptionListItemIdentifiers", + "text": "ExceptionListItemIdentifiers" + } + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/exception_item_card.tsx", + "deprecated": false, + "trackAdoption": false, + "isRequired": true + } + ], + "returnComment": [] + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemProps.onEditException", + "type": "Function", + "tags": [], + "label": "onEditException", + "description": [], + "signature": [ + "(item: { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip\" | \"text\" | \"geo_point\" | \"geo_shape\" | \"date_nanos\" | \"long\" | \"double\" | \"date_range\" | \"ip_range\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }) => void" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/exception_item_card.tsx", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionItemProps.onEditException.$1", + "type": "Object", + "tags": [], + "label": "item", + "description": [], + "signature": [ + "{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip\" | \"text\" | \"geo_point\" | \"geo_shape\" | \"date_nanos\" | \"long\" | \"double\" | \"date_range\" | \"ip_range\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/exception_item_card.tsx", + "deprecated": false, + "trackAdoption": false, + "isRequired": true + } + ], + "returnComment": [] + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionListItemIdentifiers", + "type": "Interface", + "tags": [], + "label": "ExceptionListItemIdentifiers", + "description": [], + "path": "packages/kbn-securitysolution-exception-list-components/src/types/index.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionListItemIdentifiers.id", + "type": "string", + "tags": [], + "label": "id", + "description": [], + "path": "packages/kbn-securitysolution-exception-list-components/src/types/index.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionListItemIdentifiers.name", + "type": "string", + "tags": [], + "label": "name", + "description": [], + "path": "packages/kbn-securitysolution-exception-list-components/src/types/index.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionListItemIdentifiers.namespaceType", + "type": "CompoundType", + "tags": [], + "label": "namespaceType", + "description": [], + "signature": [ + "\"single\" | \"agnostic\"" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/types/index.ts", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionListSummaryProps", + "type": "Interface", + "tags": [], + "label": "ExceptionListSummaryProps", + "description": [], + "path": "packages/kbn-securitysolution-exception-list-components/src/types/index.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionListSummaryProps.pagination", + "type": "Object", + "tags": [], + "label": "pagination", + "description": [], + "signature": [ + "Pagination" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/types/index.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ExceptionListSummaryProps.lastUpdated", + "type": "CompoundType", + "tags": [], + "label": "lastUpdated", + "description": [], + "signature": [ + "string | number | null" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/types/index.ts", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.GetExceptionItemProps", + "type": "Interface", + "tags": [], + "label": "GetExceptionItemProps", + "description": [], + "path": "packages/kbn-securitysolution-exception-list-components/src/types/index.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.GetExceptionItemProps.pagination", + "type": "Object", + "tags": [], + "label": "pagination", + "description": [], + "signature": [ + "Pagination", + " | undefined" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/types/index.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.GetExceptionItemProps.search", + "type": "string", + "tags": [], + "label": "search", + "description": [], + "signature": [ + "string | undefined" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/types/index.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.GetExceptionItemProps.filters", + "type": "string", + "tags": [], + "label": "filters", + "description": [], + "signature": [ + "string | undefined" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/types/index.ts", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.PaginationProps", + "type": "Interface", + "tags": [], + "label": "PaginationProps", + "description": [], + "path": "packages/kbn-securitysolution-exception-list-components/src/types/index.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.PaginationProps.dataTestSubj", + "type": "string", + "tags": [], + "label": "dataTestSubj", + "description": [], + "signature": [ + "string | undefined" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/types/index.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.PaginationProps.ariaLabel", + "type": "string", + "tags": [], + "label": "ariaLabel", + "description": [], + "signature": [ + "string | undefined" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/types/index.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.PaginationProps.pagination", + "type": "Object", + "tags": [], + "label": "pagination", + "description": [], + "signature": [ + "Pagination" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/types/index.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.PaginationProps.onPaginationChange", + "type": "Function", + "tags": [], + "label": "onPaginationChange", + "description": [], + "signature": [ + "(arg: ", + { + "pluginId": "@kbn/securitysolution-exception-list-components", + "scope": "common", + "docId": "kibKbnSecuritysolutionExceptionListComponentsPluginApi", + "section": "def-common.GetExceptionItemProps", + "text": "GetExceptionItemProps" + }, + ") => void" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/types/index.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.PaginationProps.onPaginationChange.$1", + "type": "Object", + "tags": [], + "label": "arg", + "description": [], + "signature": [ + { + "pluginId": "@kbn/securitysolution-exception-list-components", + "scope": "common", + "docId": "kibKbnSecuritysolutionExceptionListComponentsPluginApi", + "section": "def-common.GetExceptionItemProps", + "text": "GetExceptionItemProps" + } + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/types/index.ts", + "deprecated": false, + "trackAdoption": false, + "isRequired": true + } + ], + "returnComment": [] + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.RuleReference", + "type": "Interface", + "tags": [], + "label": "RuleReference", + "description": [], + "path": "packages/kbn-securitysolution-exception-list-components/src/types/index.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.RuleReference.name", + "type": "string", + "tags": [], + "label": "name", + "description": [], + "path": "packages/kbn-securitysolution-exception-list-components/src/types/index.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.RuleReference.id", + "type": "string", + "tags": [], + "label": "id", + "description": [], + "path": "packages/kbn-securitysolution-exception-list-components/src/types/index.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.RuleReference.ruleId", + "type": "string", + "tags": [], + "label": "ruleId", + "description": [], + "path": "packages/kbn-securitysolution-exception-list-components/src/types/index.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.RuleReference.exceptionLists", + "type": "Array", + "tags": [], + "label": "exceptionLists", + "description": [], + "signature": [ + "{ _version: string | undefined; created_at: string; created_by: string; description: string; id: string; immutable: boolean; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"endpoint\" | \"detection\" | \"rule_default\" | \"endpoint_trusted_apps\" | \"endpoint_events\" | \"endpoint_host_isolation_exceptions\" | \"endpoint_blocklists\"; updated_at: string; updated_by: string; version: number; }[]" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/types/index.ts", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.RuleReferences", + "type": "Interface", + "tags": [], + "label": "RuleReferences", + "description": [], + "path": "packages/kbn-securitysolution-exception-list-components/src/types/index.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.RuleReferences.Unnamed", + "type": "IndexSignature", + "tags": [], + "label": "[key: string]: any[]", + "description": [], + "signature": [ + "[key: string]: any[]" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/types/index.ts", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + } + ], + "enums": [ + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ListTypeText", + "type": "Enum", + "tags": [], + "label": "ListTypeText", + "description": [], + "path": "packages/kbn-securitysolution-exception-list-components/src/types/index.ts", + "deprecated": false, + "trackAdoption": false, + "initialIsOpen": false + }, + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ViewerStatus", + "type": "Enum", + "tags": [], + "label": "ViewerStatus", + "description": [], + "path": "packages/kbn-securitysolution-exception-list-components/src/types/index.ts", + "deprecated": false, + "trackAdoption": false, + "initialIsOpen": false + } + ], + "misc": [ + { + "parentPluginId": "@kbn/securitysolution-exception-list-components", + "id": "def-common.ViewerFlyoutName", + "type": "Type", + "tags": [], + "label": "ViewerFlyoutName", + "description": [], + "signature": [ + "\"addException\" | \"editException\" | null" + ], + "path": "packages/kbn-securitysolution-exception-list-components/src/types/index.ts", + "deprecated": false, + "trackAdoption": false, + "initialIsOpen": false + } + ], + "objects": [] + } +} \ No newline at end of file diff --git a/api_docs/kbn_securitysolution_exception_list_components.mdx b/api_docs/kbn_securitysolution_exception_list_components.mdx new file mode 100644 index 0000000000000..1bcc5017dfc5e --- /dev/null +++ b/api_docs/kbn_securitysolution_exception_list_components.mdx @@ -0,0 +1,39 @@ +--- +#### +#### This document is auto-generated and is meant to be viewed inside our experimental, new docs system. +#### Reach out in #docs-engineering for more info. +#### +id: kibKbnSecuritysolutionExceptionListComponentsPluginApi +slug: /kibana-dev-docs/api/kbn-securitysolution-exception-list-components +title: "@kbn/securitysolution-exception-list-components" +image: https://source.unsplash.com/400x175/?github +description: API docs for the @kbn/securitysolution-exception-list-components plugin +date: 2022-09-29 +tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-exception-list-components'] +--- +import kbnSecuritysolutionExceptionListComponentsObj from './kbn_securitysolution_exception_list_components.devdocs.json'; + + + +Contact [Owner missing] for questions regarding this plugin. + +**Code health stats** + +| Public API count | Any count | Items lacking comments | Missing exports | +|-------------------|-----------|------------------------|-----------------| +| 76 | 0 | 67 | 1 | + +## Common + +### Functions + + +### Interfaces + + +### Enums + + +### Consts, variables and types + + diff --git a/api_docs/kbn_securitysolution_hook_utils.mdx b/api_docs/kbn_securitysolution_hook_utils.mdx index c74046c4b1fa8..a22707f2957be 100644 --- a/api_docs/kbn_securitysolution_hook_utils.mdx +++ b/api_docs/kbn_securitysolution_hook_utils.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-hook-utils title: "@kbn/securitysolution-hook-utils" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/securitysolution-hook-utils plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-hook-utils'] --- import kbnSecuritysolutionHookUtilsObj from './kbn_securitysolution_hook_utils.devdocs.json'; diff --git a/api_docs/kbn_securitysolution_io_ts_alerting_types.mdx b/api_docs/kbn_securitysolution_io_ts_alerting_types.mdx index 5f200ca33cd52..cdc1b3ea54ed7 100644 --- a/api_docs/kbn_securitysolution_io_ts_alerting_types.mdx +++ b/api_docs/kbn_securitysolution_io_ts_alerting_types.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-io-ts-alerting-types title: "@kbn/securitysolution-io-ts-alerting-types" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/securitysolution-io-ts-alerting-types plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-io-ts-alerting-types'] --- import kbnSecuritysolutionIoTsAlertingTypesObj from './kbn_securitysolution_io_ts_alerting_types.devdocs.json'; diff --git a/api_docs/kbn_securitysolution_io_ts_list_types.mdx b/api_docs/kbn_securitysolution_io_ts_list_types.mdx index 75beb67b94d03..185f8a6c2a54b 100644 --- a/api_docs/kbn_securitysolution_io_ts_list_types.mdx +++ b/api_docs/kbn_securitysolution_io_ts_list_types.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-io-ts-list-types title: "@kbn/securitysolution-io-ts-list-types" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/securitysolution-io-ts-list-types plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-io-ts-list-types'] --- import kbnSecuritysolutionIoTsListTypesObj from './kbn_securitysolution_io_ts_list_types.devdocs.json'; diff --git a/api_docs/kbn_securitysolution_io_ts_types.mdx b/api_docs/kbn_securitysolution_io_ts_types.mdx index 2525d36a83930..ee826f79d080f 100644 --- a/api_docs/kbn_securitysolution_io_ts_types.mdx +++ b/api_docs/kbn_securitysolution_io_ts_types.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-io-ts-types title: "@kbn/securitysolution-io-ts-types" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/securitysolution-io-ts-types plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-io-ts-types'] --- import kbnSecuritysolutionIoTsTypesObj from './kbn_securitysolution_io_ts_types.devdocs.json'; diff --git a/api_docs/kbn_securitysolution_io_ts_utils.mdx b/api_docs/kbn_securitysolution_io_ts_utils.mdx index 1729eb1e31923..79363d1648a7d 100644 --- a/api_docs/kbn_securitysolution_io_ts_utils.mdx +++ b/api_docs/kbn_securitysolution_io_ts_utils.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-io-ts-utils title: "@kbn/securitysolution-io-ts-utils" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/securitysolution-io-ts-utils plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-io-ts-utils'] --- import kbnSecuritysolutionIoTsUtilsObj from './kbn_securitysolution_io_ts_utils.devdocs.json'; diff --git a/api_docs/kbn_securitysolution_list_api.mdx b/api_docs/kbn_securitysolution_list_api.mdx index e7ea35711a930..bad03cd4ead92 100644 --- a/api_docs/kbn_securitysolution_list_api.mdx +++ b/api_docs/kbn_securitysolution_list_api.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-list-api title: "@kbn/securitysolution-list-api" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/securitysolution-list-api plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-list-api'] --- import kbnSecuritysolutionListApiObj from './kbn_securitysolution_list_api.devdocs.json'; diff --git a/api_docs/kbn_securitysolution_list_constants.mdx b/api_docs/kbn_securitysolution_list_constants.mdx index 061d996305ac9..d2e797f19a3e8 100644 --- a/api_docs/kbn_securitysolution_list_constants.mdx +++ b/api_docs/kbn_securitysolution_list_constants.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-list-constants title: "@kbn/securitysolution-list-constants" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/securitysolution-list-constants plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-list-constants'] --- import kbnSecuritysolutionListConstantsObj from './kbn_securitysolution_list_constants.devdocs.json'; diff --git a/api_docs/kbn_securitysolution_list_hooks.mdx b/api_docs/kbn_securitysolution_list_hooks.mdx index 19a2ed45a48ba..aadd62030a1b8 100644 --- a/api_docs/kbn_securitysolution_list_hooks.mdx +++ b/api_docs/kbn_securitysolution_list_hooks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-list-hooks title: "@kbn/securitysolution-list-hooks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/securitysolution-list-hooks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-list-hooks'] --- import kbnSecuritysolutionListHooksObj from './kbn_securitysolution_list_hooks.devdocs.json'; diff --git a/api_docs/kbn_securitysolution_list_utils.mdx b/api_docs/kbn_securitysolution_list_utils.mdx index 247718cc1d2a7..37f5836577b4f 100644 --- a/api_docs/kbn_securitysolution_list_utils.mdx +++ b/api_docs/kbn_securitysolution_list_utils.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-list-utils title: "@kbn/securitysolution-list-utils" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/securitysolution-list-utils plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-list-utils'] --- import kbnSecuritysolutionListUtilsObj from './kbn_securitysolution_list_utils.devdocs.json'; diff --git a/api_docs/kbn_securitysolution_rules.mdx b/api_docs/kbn_securitysolution_rules.mdx index 53f33ec3d564b..7aa2954ee0c08 100644 --- a/api_docs/kbn_securitysolution_rules.mdx +++ b/api_docs/kbn_securitysolution_rules.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-rules title: "@kbn/securitysolution-rules" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/securitysolution-rules plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-rules'] --- import kbnSecuritysolutionRulesObj from './kbn_securitysolution_rules.devdocs.json'; diff --git a/api_docs/kbn_securitysolution_t_grid.mdx b/api_docs/kbn_securitysolution_t_grid.mdx index 0be9d3e0886f9..99fe2b585b0b2 100644 --- a/api_docs/kbn_securitysolution_t_grid.mdx +++ b/api_docs/kbn_securitysolution_t_grid.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-t-grid title: "@kbn/securitysolution-t-grid" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/securitysolution-t-grid plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-t-grid'] --- import kbnSecuritysolutionTGridObj from './kbn_securitysolution_t_grid.devdocs.json'; diff --git a/api_docs/kbn_securitysolution_utils.mdx b/api_docs/kbn_securitysolution_utils.mdx index b3d353cc6987e..e132797fea852 100644 --- a/api_docs/kbn_securitysolution_utils.mdx +++ b/api_docs/kbn_securitysolution_utils.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-utils title: "@kbn/securitysolution-utils" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/securitysolution-utils plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-utils'] --- import kbnSecuritysolutionUtilsObj from './kbn_securitysolution_utils.devdocs.json'; diff --git a/api_docs/kbn_server_http_tools.mdx b/api_docs/kbn_server_http_tools.mdx index aefc65e7066a3..48d0d4756ef6c 100644 --- a/api_docs/kbn_server_http_tools.mdx +++ b/api_docs/kbn_server_http_tools.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-server-http-tools title: "@kbn/server-http-tools" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/server-http-tools plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/server-http-tools'] --- import kbnServerHttpToolsObj from './kbn_server_http_tools.devdocs.json'; diff --git a/api_docs/kbn_server_route_repository.mdx b/api_docs/kbn_server_route_repository.mdx index 25cf89691a720..5c184c9a583cc 100644 --- a/api_docs/kbn_server_route_repository.mdx +++ b/api_docs/kbn_server_route_repository.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-server-route-repository title: "@kbn/server-route-repository" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/server-route-repository plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/server-route-repository'] --- import kbnServerRouteRepositoryObj from './kbn_server_route_repository.devdocs.json'; diff --git a/api_docs/kbn_shared_svg.mdx b/api_docs/kbn_shared_svg.mdx index aaf7c6592481a..249f6a00cf7e6 100644 --- a/api_docs/kbn_shared_svg.mdx +++ b/api_docs/kbn_shared_svg.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-svg title: "@kbn/shared-svg" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-svg plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-svg'] --- import kbnSharedSvgObj from './kbn_shared_svg.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_avatar_user_profile_components.mdx b/api_docs/kbn_shared_ux_avatar_user_profile_components.mdx index b12d28f86530e..e5e0f236974fb 100644 --- a/api_docs/kbn_shared_ux_avatar_user_profile_components.mdx +++ b/api_docs/kbn_shared_ux_avatar_user_profile_components.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-avatar-user-profile-components title: "@kbn/shared-ux-avatar-user-profile-components" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-avatar-user-profile-components plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-avatar-user-profile-components'] --- import kbnSharedUxAvatarUserProfileComponentsObj from './kbn_shared_ux_avatar_user_profile_components.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_button_exit_full_screen_mocks.mdx b/api_docs/kbn_shared_ux_button_exit_full_screen_mocks.mdx index 4fafd24671035..b78abda31ac59 100644 --- a/api_docs/kbn_shared_ux_button_exit_full_screen_mocks.mdx +++ b/api_docs/kbn_shared_ux_button_exit_full_screen_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-button-exit-full-screen-mocks title: "@kbn/shared-ux-button-exit-full-screen-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-button-exit-full-screen-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-button-exit-full-screen-mocks'] --- import kbnSharedUxButtonExitFullScreenMocksObj from './kbn_shared_ux_button_exit_full_screen_mocks.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_button_toolbar.mdx b/api_docs/kbn_shared_ux_button_toolbar.mdx index 401b8763ce31c..dda07aa08205d 100644 --- a/api_docs/kbn_shared_ux_button_toolbar.mdx +++ b/api_docs/kbn_shared_ux_button_toolbar.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-button-toolbar title: "@kbn/shared-ux-button-toolbar" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-button-toolbar plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-button-toolbar'] --- import kbnSharedUxButtonToolbarObj from './kbn_shared_ux_button_toolbar.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_card_no_data.mdx b/api_docs/kbn_shared_ux_card_no_data.mdx index 25b21295a4ebd..92fa45970a95f 100644 --- a/api_docs/kbn_shared_ux_card_no_data.mdx +++ b/api_docs/kbn_shared_ux_card_no_data.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-card-no-data title: "@kbn/shared-ux-card-no-data" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-card-no-data plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-card-no-data'] --- import kbnSharedUxCardNoDataObj from './kbn_shared_ux_card_no_data.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_card_no_data_mocks.mdx b/api_docs/kbn_shared_ux_card_no_data_mocks.mdx index 5867910e33d25..67fd1537b9531 100644 --- a/api_docs/kbn_shared_ux_card_no_data_mocks.mdx +++ b/api_docs/kbn_shared_ux_card_no_data_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-card-no-data-mocks title: "@kbn/shared-ux-card-no-data-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-card-no-data-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-card-no-data-mocks'] --- import kbnSharedUxCardNoDataMocksObj from './kbn_shared_ux_card_no_data_mocks.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_link_redirect_app_mocks.mdx b/api_docs/kbn_shared_ux_link_redirect_app_mocks.mdx index 757324760d8eb..dba90c297e1be 100644 --- a/api_docs/kbn_shared_ux_link_redirect_app_mocks.mdx +++ b/api_docs/kbn_shared_ux_link_redirect_app_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-link-redirect-app-mocks title: "@kbn/shared-ux-link-redirect-app-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-link-redirect-app-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-link-redirect-app-mocks'] --- import kbnSharedUxLinkRedirectAppMocksObj from './kbn_shared_ux_link_redirect_app_mocks.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_page_analytics_no_data.mdx b/api_docs/kbn_shared_ux_page_analytics_no_data.mdx index 19d3fcf3f0acc..eb63fe71719da 100644 --- a/api_docs/kbn_shared_ux_page_analytics_no_data.mdx +++ b/api_docs/kbn_shared_ux_page_analytics_no_data.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-analytics-no-data title: "@kbn/shared-ux-page-analytics-no-data" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-page-analytics-no-data plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-analytics-no-data'] --- import kbnSharedUxPageAnalyticsNoDataObj from './kbn_shared_ux_page_analytics_no_data.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_page_analytics_no_data_mocks.mdx b/api_docs/kbn_shared_ux_page_analytics_no_data_mocks.mdx index f75c2846a0475..312cc6dc442de 100644 --- a/api_docs/kbn_shared_ux_page_analytics_no_data_mocks.mdx +++ b/api_docs/kbn_shared_ux_page_analytics_no_data_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-analytics-no-data-mocks title: "@kbn/shared-ux-page-analytics-no-data-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-page-analytics-no-data-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-analytics-no-data-mocks'] --- import kbnSharedUxPageAnalyticsNoDataMocksObj from './kbn_shared_ux_page_analytics_no_data_mocks.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_page_kibana_no_data.mdx b/api_docs/kbn_shared_ux_page_kibana_no_data.mdx index 89d4d761d558c..fc5ddb138a558 100644 --- a/api_docs/kbn_shared_ux_page_kibana_no_data.mdx +++ b/api_docs/kbn_shared_ux_page_kibana_no_data.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-kibana-no-data title: "@kbn/shared-ux-page-kibana-no-data" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-page-kibana-no-data plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-kibana-no-data'] --- import kbnSharedUxPageKibanaNoDataObj from './kbn_shared_ux_page_kibana_no_data.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_page_kibana_no_data_mocks.mdx b/api_docs/kbn_shared_ux_page_kibana_no_data_mocks.mdx index 2056f2314bce9..00f4e0b05251d 100644 --- a/api_docs/kbn_shared_ux_page_kibana_no_data_mocks.mdx +++ b/api_docs/kbn_shared_ux_page_kibana_no_data_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-kibana-no-data-mocks title: "@kbn/shared-ux-page-kibana-no-data-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-page-kibana-no-data-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-kibana-no-data-mocks'] --- import kbnSharedUxPageKibanaNoDataMocksObj from './kbn_shared_ux_page_kibana_no_data_mocks.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_page_kibana_template.mdx b/api_docs/kbn_shared_ux_page_kibana_template.mdx index 495d91eac2545..22e5de7cb344c 100644 --- a/api_docs/kbn_shared_ux_page_kibana_template.mdx +++ b/api_docs/kbn_shared_ux_page_kibana_template.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-kibana-template title: "@kbn/shared-ux-page-kibana-template" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-page-kibana-template plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-kibana-template'] --- import kbnSharedUxPageKibanaTemplateObj from './kbn_shared_ux_page_kibana_template.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_page_kibana_template_mocks.mdx b/api_docs/kbn_shared_ux_page_kibana_template_mocks.mdx index 7767a12066d24..de0d8b5ff101e 100644 --- a/api_docs/kbn_shared_ux_page_kibana_template_mocks.mdx +++ b/api_docs/kbn_shared_ux_page_kibana_template_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-kibana-template-mocks title: "@kbn/shared-ux-page-kibana-template-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-page-kibana-template-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-kibana-template-mocks'] --- import kbnSharedUxPageKibanaTemplateMocksObj from './kbn_shared_ux_page_kibana_template_mocks.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_page_no_data.mdx b/api_docs/kbn_shared_ux_page_no_data.mdx index e0d65073b737e..b1597719e26ac 100644 --- a/api_docs/kbn_shared_ux_page_no_data.mdx +++ b/api_docs/kbn_shared_ux_page_no_data.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-no-data title: "@kbn/shared-ux-page-no-data" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-page-no-data plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-no-data'] --- import kbnSharedUxPageNoDataObj from './kbn_shared_ux_page_no_data.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_page_no_data_config.mdx b/api_docs/kbn_shared_ux_page_no_data_config.mdx index 8c798dd34a9a4..254ce88f6ed03 100644 --- a/api_docs/kbn_shared_ux_page_no_data_config.mdx +++ b/api_docs/kbn_shared_ux_page_no_data_config.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-no-data-config title: "@kbn/shared-ux-page-no-data-config" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-page-no-data-config plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-no-data-config'] --- import kbnSharedUxPageNoDataConfigObj from './kbn_shared_ux_page_no_data_config.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_page_no_data_config_mocks.mdx b/api_docs/kbn_shared_ux_page_no_data_config_mocks.mdx index 243de44838e10..4b7ce948af067 100644 --- a/api_docs/kbn_shared_ux_page_no_data_config_mocks.mdx +++ b/api_docs/kbn_shared_ux_page_no_data_config_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-no-data-config-mocks title: "@kbn/shared-ux-page-no-data-config-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-page-no-data-config-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-no-data-config-mocks'] --- import kbnSharedUxPageNoDataConfigMocksObj from './kbn_shared_ux_page_no_data_config_mocks.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_page_no_data_mocks.mdx b/api_docs/kbn_shared_ux_page_no_data_mocks.mdx index 38664c4b62fdf..4bebd9fa27f9e 100644 --- a/api_docs/kbn_shared_ux_page_no_data_mocks.mdx +++ b/api_docs/kbn_shared_ux_page_no_data_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-no-data-mocks title: "@kbn/shared-ux-page-no-data-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-page-no-data-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-no-data-mocks'] --- import kbnSharedUxPageNoDataMocksObj from './kbn_shared_ux_page_no_data_mocks.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_page_solution_nav.mdx b/api_docs/kbn_shared_ux_page_solution_nav.mdx index 3f237d268f073..a3b2ddd97a17e 100644 --- a/api_docs/kbn_shared_ux_page_solution_nav.mdx +++ b/api_docs/kbn_shared_ux_page_solution_nav.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-solution-nav title: "@kbn/shared-ux-page-solution-nav" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-page-solution-nav plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-solution-nav'] --- import kbnSharedUxPageSolutionNavObj from './kbn_shared_ux_page_solution_nav.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_prompt_no_data_views.mdx b/api_docs/kbn_shared_ux_prompt_no_data_views.mdx index 3ff43ae1b6263..0a1d772cc031c 100644 --- a/api_docs/kbn_shared_ux_prompt_no_data_views.mdx +++ b/api_docs/kbn_shared_ux_prompt_no_data_views.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-prompt-no-data-views title: "@kbn/shared-ux-prompt-no-data-views" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-prompt-no-data-views plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-prompt-no-data-views'] --- import kbnSharedUxPromptNoDataViewsObj from './kbn_shared_ux_prompt_no_data_views.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_prompt_no_data_views_mocks.mdx b/api_docs/kbn_shared_ux_prompt_no_data_views_mocks.mdx index 48e497a99004b..70d3cf84c5ef6 100644 --- a/api_docs/kbn_shared_ux_prompt_no_data_views_mocks.mdx +++ b/api_docs/kbn_shared_ux_prompt_no_data_views_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-prompt-no-data-views-mocks title: "@kbn/shared-ux-prompt-no-data-views-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-prompt-no-data-views-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-prompt-no-data-views-mocks'] --- import kbnSharedUxPromptNoDataViewsMocksObj from './kbn_shared_ux_prompt_no_data_views_mocks.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_router.mdx b/api_docs/kbn_shared_ux_router.mdx index 15f626088ad23..61fe760de5035 100644 --- a/api_docs/kbn_shared_ux_router.mdx +++ b/api_docs/kbn_shared_ux_router.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-router title: "@kbn/shared-ux-router" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-router plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-router'] --- import kbnSharedUxRouterObj from './kbn_shared_ux_router.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_router_mocks.mdx b/api_docs/kbn_shared_ux_router_mocks.mdx index 2e0d73cc43623..02064c4eacc66 100644 --- a/api_docs/kbn_shared_ux_router_mocks.mdx +++ b/api_docs/kbn_shared_ux_router_mocks.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-router-mocks title: "@kbn/shared-ux-router-mocks" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-router-mocks plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-router-mocks'] --- import kbnSharedUxRouterMocksObj from './kbn_shared_ux_router_mocks.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_storybook_config.mdx b/api_docs/kbn_shared_ux_storybook_config.mdx index e9accf72f5a02..86606778f8dfd 100644 --- a/api_docs/kbn_shared_ux_storybook_config.mdx +++ b/api_docs/kbn_shared_ux_storybook_config.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-storybook-config title: "@kbn/shared-ux-storybook-config" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-storybook-config plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-storybook-config'] --- import kbnSharedUxStorybookConfigObj from './kbn_shared_ux_storybook_config.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_storybook_mock.mdx b/api_docs/kbn_shared_ux_storybook_mock.mdx index 6309733dc1bab..180ae33f7885a 100644 --- a/api_docs/kbn_shared_ux_storybook_mock.mdx +++ b/api_docs/kbn_shared_ux_storybook_mock.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-storybook-mock title: "@kbn/shared-ux-storybook-mock" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-storybook-mock plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-storybook-mock'] --- import kbnSharedUxStorybookMockObj from './kbn_shared_ux_storybook_mock.devdocs.json'; diff --git a/api_docs/kbn_shared_ux_utility.mdx b/api_docs/kbn_shared_ux_utility.mdx index c770dd8671956..7c2f7cc09c77b 100644 --- a/api_docs/kbn_shared_ux_utility.mdx +++ b/api_docs/kbn_shared_ux_utility.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-utility title: "@kbn/shared-ux-utility" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/shared-ux-utility plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-utility'] --- import kbnSharedUxUtilityObj from './kbn_shared_ux_utility.devdocs.json'; diff --git a/api_docs/kbn_some_dev_log.mdx b/api_docs/kbn_some_dev_log.mdx index 4b531126964e6..ef8d669ed27aa 100644 --- a/api_docs/kbn_some_dev_log.mdx +++ b/api_docs/kbn_some_dev_log.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-some-dev-log title: "@kbn/some-dev-log" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/some-dev-log plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/some-dev-log'] --- import kbnSomeDevLogObj from './kbn_some_dev_log.devdocs.json'; diff --git a/api_docs/kbn_sort_package_json.mdx b/api_docs/kbn_sort_package_json.mdx index 8073cadd73d80..0e8f9505b35f7 100644 --- a/api_docs/kbn_sort_package_json.mdx +++ b/api_docs/kbn_sort_package_json.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-sort-package-json title: "@kbn/sort-package-json" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/sort-package-json plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/sort-package-json'] --- import kbnSortPackageJsonObj from './kbn_sort_package_json.devdocs.json'; diff --git a/api_docs/kbn_std.mdx b/api_docs/kbn_std.mdx index c05c4d734c490..c2a9a20196954 100644 --- a/api_docs/kbn_std.mdx +++ b/api_docs/kbn_std.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-std title: "@kbn/std" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/std plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/std'] --- import kbnStdObj from './kbn_std.devdocs.json'; diff --git a/api_docs/kbn_stdio_dev_helpers.mdx b/api_docs/kbn_stdio_dev_helpers.mdx index 660e36ef4374e..9662e0b7958fe 100644 --- a/api_docs/kbn_stdio_dev_helpers.mdx +++ b/api_docs/kbn_stdio_dev_helpers.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-stdio-dev-helpers title: "@kbn/stdio-dev-helpers" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/stdio-dev-helpers plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/stdio-dev-helpers'] --- import kbnStdioDevHelpersObj from './kbn_stdio_dev_helpers.devdocs.json'; diff --git a/api_docs/kbn_storybook.mdx b/api_docs/kbn_storybook.mdx index 93828baf05442..f279425a11288 100644 --- a/api_docs/kbn_storybook.mdx +++ b/api_docs/kbn_storybook.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-storybook title: "@kbn/storybook" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/storybook plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/storybook'] --- import kbnStorybookObj from './kbn_storybook.devdocs.json'; diff --git a/api_docs/kbn_telemetry_tools.mdx b/api_docs/kbn_telemetry_tools.mdx index fc2ed806bd5a7..70dd586f3b9f7 100644 --- a/api_docs/kbn_telemetry_tools.mdx +++ b/api_docs/kbn_telemetry_tools.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-telemetry-tools title: "@kbn/telemetry-tools" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/telemetry-tools plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/telemetry-tools'] --- import kbnTelemetryToolsObj from './kbn_telemetry_tools.devdocs.json'; diff --git a/api_docs/kbn_test.mdx b/api_docs/kbn_test.mdx index fe8a35b282802..2d4b1f7a3e301 100644 --- a/api_docs/kbn_test.mdx +++ b/api_docs/kbn_test.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-test title: "@kbn/test" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/test plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/test'] --- import kbnTestObj from './kbn_test.devdocs.json'; diff --git a/api_docs/kbn_test_jest_helpers.mdx b/api_docs/kbn_test_jest_helpers.mdx index b072b928a5fee..f0c472ec736d5 100644 --- a/api_docs/kbn_test_jest_helpers.mdx +++ b/api_docs/kbn_test_jest_helpers.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-test-jest-helpers title: "@kbn/test-jest-helpers" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/test-jest-helpers plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/test-jest-helpers'] --- import kbnTestJestHelpersObj from './kbn_test_jest_helpers.devdocs.json'; diff --git a/api_docs/kbn_test_subj_selector.mdx b/api_docs/kbn_test_subj_selector.mdx index 2cc7dbb077e4d..421399623af64 100644 --- a/api_docs/kbn_test_subj_selector.mdx +++ b/api_docs/kbn_test_subj_selector.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-test-subj-selector title: "@kbn/test-subj-selector" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/test-subj-selector plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/test-subj-selector'] --- import kbnTestSubjSelectorObj from './kbn_test_subj_selector.devdocs.json'; diff --git a/api_docs/kbn_tooling_log.mdx b/api_docs/kbn_tooling_log.mdx index 4c380a6aada55..8c06707332c23 100644 --- a/api_docs/kbn_tooling_log.mdx +++ b/api_docs/kbn_tooling_log.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-tooling-log title: "@kbn/tooling-log" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/tooling-log plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/tooling-log'] --- import kbnToolingLogObj from './kbn_tooling_log.devdocs.json'; diff --git a/api_docs/kbn_type_summarizer.mdx b/api_docs/kbn_type_summarizer.mdx index 4658f66ec9f02..a03912522beaa 100644 --- a/api_docs/kbn_type_summarizer.mdx +++ b/api_docs/kbn_type_summarizer.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-type-summarizer title: "@kbn/type-summarizer" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/type-summarizer plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/type-summarizer'] --- import kbnTypeSummarizerObj from './kbn_type_summarizer.devdocs.json'; diff --git a/api_docs/kbn_type_summarizer_core.mdx b/api_docs/kbn_type_summarizer_core.mdx index 5c785be7541a2..7d6e18575e25c 100644 --- a/api_docs/kbn_type_summarizer_core.mdx +++ b/api_docs/kbn_type_summarizer_core.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-type-summarizer-core title: "@kbn/type-summarizer-core" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/type-summarizer-core plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/type-summarizer-core'] --- import kbnTypeSummarizerCoreObj from './kbn_type_summarizer_core.devdocs.json'; diff --git a/api_docs/kbn_typed_react_router_config.mdx b/api_docs/kbn_typed_react_router_config.mdx index 058bbf15a8534..3d387dbca9d59 100644 --- a/api_docs/kbn_typed_react_router_config.mdx +++ b/api_docs/kbn_typed_react_router_config.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-typed-react-router-config title: "@kbn/typed-react-router-config" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/typed-react-router-config plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/typed-react-router-config'] --- import kbnTypedReactRouterConfigObj from './kbn_typed_react_router_config.devdocs.json'; diff --git a/api_docs/kbn_ui_theme.mdx b/api_docs/kbn_ui_theme.mdx index ffad848d71c2b..80555e578ee94 100644 --- a/api_docs/kbn_ui_theme.mdx +++ b/api_docs/kbn_ui_theme.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ui-theme title: "@kbn/ui-theme" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/ui-theme plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ui-theme'] --- import kbnUiThemeObj from './kbn_ui_theme.devdocs.json'; diff --git a/api_docs/kbn_user_profile_components.mdx b/api_docs/kbn_user_profile_components.mdx index b7a7e0d49898e..0396c24bc40eb 100644 --- a/api_docs/kbn_user_profile_components.mdx +++ b/api_docs/kbn_user_profile_components.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-user-profile-components title: "@kbn/user-profile-components" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/user-profile-components plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/user-profile-components'] --- import kbnUserProfileComponentsObj from './kbn_user_profile_components.devdocs.json'; diff --git a/api_docs/kbn_utility_types.mdx b/api_docs/kbn_utility_types.mdx index 9c4fac9fc2223..de93a8fe050a9 100644 --- a/api_docs/kbn_utility_types.mdx +++ b/api_docs/kbn_utility_types.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-utility-types title: "@kbn/utility-types" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/utility-types plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/utility-types'] --- import kbnUtilityTypesObj from './kbn_utility_types.devdocs.json'; diff --git a/api_docs/kbn_utility_types_jest.mdx b/api_docs/kbn_utility_types_jest.mdx index a08a1f8c35b21..fe8d933d19a34 100644 --- a/api_docs/kbn_utility_types_jest.mdx +++ b/api_docs/kbn_utility_types_jest.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-utility-types-jest title: "@kbn/utility-types-jest" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/utility-types-jest plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/utility-types-jest'] --- import kbnUtilityTypesJestObj from './kbn_utility_types_jest.devdocs.json'; diff --git a/api_docs/kbn_utils.mdx b/api_docs/kbn_utils.mdx index 484f22d4d3fad..e9e1e8d327dfd 100644 --- a/api_docs/kbn_utils.mdx +++ b/api_docs/kbn_utils.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-utils title: "@kbn/utils" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/utils plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/utils'] --- import kbnUtilsObj from './kbn_utils.devdocs.json'; diff --git a/api_docs/kbn_yarn_lock_validator.mdx b/api_docs/kbn_yarn_lock_validator.mdx index 86360f220dc24..96ce8b5f78b19 100644 --- a/api_docs/kbn_yarn_lock_validator.mdx +++ b/api_docs/kbn_yarn_lock_validator.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-yarn-lock-validator title: "@kbn/yarn-lock-validator" image: https://source.unsplash.com/400x175/?github description: API docs for the @kbn/yarn-lock-validator plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/yarn-lock-validator'] --- import kbnYarnLockValidatorObj from './kbn_yarn_lock_validator.devdocs.json'; diff --git a/api_docs/kibana_overview.mdx b/api_docs/kibana_overview.mdx index db2dd293c3e4b..2a28c3743374d 100644 --- a/api_docs/kibana_overview.mdx +++ b/api_docs/kibana_overview.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kibanaOverview title: "kibanaOverview" image: https://source.unsplash.com/400x175/?github description: API docs for the kibanaOverview plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'kibanaOverview'] --- import kibanaOverviewObj from './kibana_overview.devdocs.json'; diff --git a/api_docs/kibana_react.mdx b/api_docs/kibana_react.mdx index a8b6bbd605637..7ab80f87e401c 100644 --- a/api_docs/kibana_react.mdx +++ b/api_docs/kibana_react.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kibanaReact title: "kibanaReact" image: https://source.unsplash.com/400x175/?github description: API docs for the kibanaReact plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'kibanaReact'] --- import kibanaReactObj from './kibana_react.devdocs.json'; diff --git a/api_docs/kibana_utils.mdx b/api_docs/kibana_utils.mdx index e8b72f7cee2d1..21d349683d8e3 100644 --- a/api_docs/kibana_utils.mdx +++ b/api_docs/kibana_utils.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kibanaUtils title: "kibanaUtils" image: https://source.unsplash.com/400x175/?github description: API docs for the kibanaUtils plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'kibanaUtils'] --- import kibanaUtilsObj from './kibana_utils.devdocs.json'; diff --git a/api_docs/kubernetes_security.mdx b/api_docs/kubernetes_security.mdx index fc9a2e294a610..b7d40f28432aa 100644 --- a/api_docs/kubernetes_security.mdx +++ b/api_docs/kubernetes_security.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kubernetesSecurity title: "kubernetesSecurity" image: https://source.unsplash.com/400x175/?github description: API docs for the kubernetesSecurity plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'kubernetesSecurity'] --- import kubernetesSecurityObj from './kubernetes_security.devdocs.json'; diff --git a/api_docs/lens.mdx b/api_docs/lens.mdx index 75d2cd54a2d8b..0cb5e40b3b4cb 100644 --- a/api_docs/lens.mdx +++ b/api_docs/lens.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/lens title: "lens" image: https://source.unsplash.com/400x175/?github description: API docs for the lens plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'lens'] --- import lensObj from './lens.devdocs.json'; diff --git a/api_docs/license_api_guard.devdocs.json b/api_docs/license_api_guard.devdocs.json index a554c2c4b7895..03acec45780d4 100644 --- a/api_docs/license_api_guard.devdocs.json +++ b/api_docs/license_api_guard.devdocs.json @@ -94,13 +94,7 @@ "description": [], "signature": [ "(handler: ", { "pluginId": "core", diff --git a/api_docs/license_api_guard.mdx b/api_docs/license_api_guard.mdx index 42f4d0805fc3c..63d15a7c40650 100644 --- a/api_docs/license_api_guard.mdx +++ b/api_docs/license_api_guard.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/licenseApiGuard title: "licenseApiGuard" image: https://source.unsplash.com/400x175/?github description: API docs for the licenseApiGuard plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'licenseApiGuard'] --- import licenseApiGuardObj from './license_api_guard.devdocs.json'; diff --git a/api_docs/license_management.mdx b/api_docs/license_management.mdx index ca3e9e1a23c12..88e17bcee6feb 100644 --- a/api_docs/license_management.mdx +++ b/api_docs/license_management.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/licenseManagement title: "licenseManagement" image: https://source.unsplash.com/400x175/?github description: API docs for the licenseManagement plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'licenseManagement'] --- import licenseManagementObj from './license_management.devdocs.json'; diff --git a/api_docs/licensing.mdx b/api_docs/licensing.mdx index 67cd87e28a5ce..c7000d51761c4 100644 --- a/api_docs/licensing.mdx +++ b/api_docs/licensing.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/licensing title: "licensing" image: https://source.unsplash.com/400x175/?github description: API docs for the licensing plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'licensing'] --- import licensingObj from './licensing.devdocs.json'; diff --git a/api_docs/lists.mdx b/api_docs/lists.mdx index c0fba6cbabbb7..9deb279fb73b6 100644 --- a/api_docs/lists.mdx +++ b/api_docs/lists.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/lists title: "lists" image: https://source.unsplash.com/400x175/?github description: API docs for the lists plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'lists'] --- import listsObj from './lists.devdocs.json'; diff --git a/api_docs/management.mdx b/api_docs/management.mdx index 7a332ae0f68be..2cec82774807b 100644 --- a/api_docs/management.mdx +++ b/api_docs/management.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/management title: "management" image: https://source.unsplash.com/400x175/?github description: API docs for the management plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'management'] --- import managementObj from './management.devdocs.json'; diff --git a/api_docs/maps.mdx b/api_docs/maps.mdx index c821d5118393a..2667e8f19bae6 100644 --- a/api_docs/maps.mdx +++ b/api_docs/maps.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/maps title: "maps" image: https://source.unsplash.com/400x175/?github description: API docs for the maps plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'maps'] --- import mapsObj from './maps.devdocs.json'; diff --git a/api_docs/maps_ems.mdx b/api_docs/maps_ems.mdx index 30e6fc5864b60..558352f89505a 100644 --- a/api_docs/maps_ems.mdx +++ b/api_docs/maps_ems.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/mapsEms title: "mapsEms" image: https://source.unsplash.com/400x175/?github description: API docs for the mapsEms plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'mapsEms'] --- import mapsEmsObj from './maps_ems.devdocs.json'; diff --git a/api_docs/ml.mdx b/api_docs/ml.mdx index 83e81edff74a4..b1abe52cefe17 100644 --- a/api_docs/ml.mdx +++ b/api_docs/ml.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/ml title: "ml" image: https://source.unsplash.com/400x175/?github description: API docs for the ml plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'ml'] --- import mlObj from './ml.devdocs.json'; diff --git a/api_docs/monitoring.mdx b/api_docs/monitoring.mdx index 8b27dbc3d7849..b9332eb4163e6 100644 --- a/api_docs/monitoring.mdx +++ b/api_docs/monitoring.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/monitoring title: "monitoring" image: https://source.unsplash.com/400x175/?github description: API docs for the monitoring plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'monitoring'] --- import monitoringObj from './monitoring.devdocs.json'; diff --git a/api_docs/monitoring_collection.mdx b/api_docs/monitoring_collection.mdx index d0c0e4b930125..23c398899ccbf 100644 --- a/api_docs/monitoring_collection.mdx +++ b/api_docs/monitoring_collection.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/monitoringCollection title: "monitoringCollection" image: https://source.unsplash.com/400x175/?github description: API docs for the monitoringCollection plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'monitoringCollection'] --- import monitoringCollectionObj from './monitoring_collection.devdocs.json'; diff --git a/api_docs/navigation.mdx b/api_docs/navigation.mdx index c8d4e9b1fbf7c..bfa907ab09267 100644 --- a/api_docs/navigation.mdx +++ b/api_docs/navigation.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/navigation title: "navigation" image: https://source.unsplash.com/400x175/?github description: API docs for the navigation plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'navigation'] --- import navigationObj from './navigation.devdocs.json'; diff --git a/api_docs/newsfeed.mdx b/api_docs/newsfeed.mdx index 79f080105b7b9..4336085d004ce 100644 --- a/api_docs/newsfeed.mdx +++ b/api_docs/newsfeed.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/newsfeed title: "newsfeed" image: https://source.unsplash.com/400x175/?github description: API docs for the newsfeed plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'newsfeed'] --- import newsfeedObj from './newsfeed.devdocs.json'; diff --git a/api_docs/observability.devdocs.json b/api_docs/observability.devdocs.json index d4d3483ef247c..fd03a2f285ab5 100644 --- a/api_docs/observability.devdocs.json +++ b/api_docs/observability.devdocs.json @@ -7613,13 +7613,7 @@ "label": "context", "description": [], "signature": [ - { - "pluginId": "core", - "scope": "server", - "docId": "kibCorePluginApi", - "section": "def-server.RequestHandlerContext", - "text": "RequestHandlerContext" - }, + "RequestHandlerContext", " & { licensing: Promise<", { "pluginId": "licensing", @@ -7637,13 +7631,7 @@ "text": "AlertingApiRequestHandlerContext" }, ">; core: Promise<", - { - "pluginId": "core", - "scope": "server", - "docId": "kibCorePluginApi", - "section": "def-server.CoreRequestHandlerContext", - "text": "CoreRequestHandlerContext" - }, + "CoreRequestHandlerContext", ">; }" ], "path": "x-pack/plugins/observability/server/routes/types.ts", @@ -7944,7 +7932,7 @@ "label": "ObservabilityConfig", "description": [], "signature": [ - "{ readonly unsafe: Readonly<{} & { slo: Readonly<{} & { enabled: boolean; }>; alertDetails: Readonly<{} & { enabled: boolean; }>; }>; readonly annotations: Readonly<{} & { index: string; enabled: boolean; }>; }" + "{ readonly unsafe: Readonly<{} & { slo: Readonly<{} & { enabled: boolean; }>; alertDetails: Readonly<{} & { enabled: boolean; }>; }>; readonly annotations: Readonly<{} & { enabled: boolean; index: string; }>; }" ], "path": "x-pack/plugins/observability/server/index.ts", "deprecated": false, @@ -9798,13 +9786,7 @@ "description": [], "signature": [ "{ getScopedAnnotationsClient: (requestContext: ", - { - "pluginId": "core", - "scope": "server", - "docId": "kibCorePluginApi", - "section": "def-server.RequestHandlerContext", - "text": "RequestHandlerContext" - }, + "RequestHandlerContext", " & { licensing: Promise<", { "pluginId": "licensing", diff --git a/api_docs/observability.mdx b/api_docs/observability.mdx index 4c2ca8b17a13f..db3f0906e6142 100644 --- a/api_docs/observability.mdx +++ b/api_docs/observability.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/observability title: "observability" image: https://source.unsplash.com/400x175/?github description: API docs for the observability plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'observability'] --- import observabilityObj from './observability.devdocs.json'; diff --git a/api_docs/osquery.mdx b/api_docs/osquery.mdx index 942900853abdb..c569e301708df 100644 --- a/api_docs/osquery.mdx +++ b/api_docs/osquery.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/osquery title: "osquery" image: https://source.unsplash.com/400x175/?github description: API docs for the osquery plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'osquery'] --- import osqueryObj from './osquery.devdocs.json'; diff --git a/api_docs/plugin_directory.mdx b/api_docs/plugin_directory.mdx index bcddc85faf5c2..568f38705df0a 100644 --- a/api_docs/plugin_directory.mdx +++ b/api_docs/plugin_directory.mdx @@ -7,7 +7,7 @@ id: kibDevDocsPluginDirectory slug: /kibana-dev-docs/api-meta/plugin-api-directory title: Directory description: Directory of public APIs available through plugins or packages. -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana'] --- @@ -15,13 +15,13 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana'] | Count | Plugins or Packages with a
    public API | Number of teams | |--------------|----------|------------------------| -| 474 | 395 | 38 | +| 477 | 397 | 38 | ### Public API health stats | API Count | Any Count | Missing comments | Missing exports | |--------------|----------|-----------------|--------| -| 31860 | 179 | 21432 | 1007 | +| 31953 | 179 | 21502 | 1003 | ## Plugin Directory @@ -30,7 +30,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana'] | | [Response Ops](https://github.com/orgs/elastic/teams/response-ops) | - | 214 | 0 | 209 | 19 | | | [Kibana Core](https://github.com/orgs/elastic/teams/kibana-core) | - | 36 | 1 | 32 | 2 | | | [Machine Learning UI](https://github.com/orgs/elastic/teams/ml-ui) | AIOps plugin maintained by ML team. | 9 | 0 | 0 | 2 | -| | [Response Ops](https://github.com/orgs/elastic/teams/response-ops) | - | 370 | 0 | 361 | 22 | +| | [Response Ops](https://github.com/orgs/elastic/teams/response-ops) | - | 379 | 0 | 370 | 24 | | | [APM UI](https://github.com/orgs/elastic/teams/apm-ui) | The user interface for Elastic APM | 38 | 0 | 38 | 52 | | | [Kibana Core](https://github.com/orgs/elastic/teams/kibana-core) | - | 9 | 0 | 9 | 0 | | | [App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | Considering using bfetch capabilities when fetching large amounts of data. This services supports batching HTTP requests and streaming responses back. | 80 | 1 | 71 | 2 | @@ -42,10 +42,10 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana'] | | [Cloud Security Posture](https://github.com/orgs/elastic/teams/cloud-posture-security) | The cloud security posture plugin | 18 | 0 | 2 | 3 | | | [Stack Management](https://github.com/orgs/elastic/teams/kibana-stack-management) | - | 13 | 0 | 13 | 1 | | | [Kibana Presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | The Controls Plugin contains embeddable components intended to create a simple query interface for end users, and a powerful editing suite that allows dashboard authors to build controls | 212 | 0 | 204 | 7 | -| | [Kibana Core](https://github.com/orgs/elastic/teams/kibana-core) | - | 2684 | 0 | 35 | 0 | +| | [Kibana Core](https://github.com/orgs/elastic/teams/kibana-core) | - | 2688 | 0 | 30 | 0 | | crossClusterReplication | [Stack Management](https://github.com/orgs/elastic/teams/kibana-stack-management) | - | 0 | 0 | 0 | 0 | -| | [Fleet](https://github.com/orgs/elastic/teams/fleet) | Add custom data integrations so they can be displayed in the Fleet integrations app | 103 | 0 | 84 | 1 | -| | [Kibana Presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | Adds the Dashboard app to Kibana | 144 | 0 | 139 | 10 | +| | [Fleet](https://github.com/orgs/elastic/teams/fleet) | Add custom data integrations so they can be displayed in the Fleet integrations app | 104 | 0 | 85 | 1 | +| | [Kibana Presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | Adds the Dashboard app to Kibana | 120 | 0 | 113 | 3 | | | [App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | - | 52 | 0 | 51 | 0 | | | [App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | Data services are useful for searching and querying data from Elasticsearch. Helpful utilities include: a re-usable react query bar, KQL autocomplete, async search, Data Views (Index Patterns) and field formatters. | 3213 | 33 | 2509 | 23 | | | [App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | This plugin provides the ability to create data views via a modal flyout inside Kibana apps | 15 | 0 | 7 | 0 | @@ -152,7 +152,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana'] | | [Security solution](https://github.com/orgs/elastic/teams/security-solution) | - | 452 | 1 | 346 | 33 | | | [Machine Learning UI](https://github.com/orgs/elastic/teams/ml-ui) | This plugin provides access to the transforms features provided by Elastic. Transforms enable you to convert existing Elasticsearch indices into summarized indices, which provide opportunities for new insights and analytics. | 4 | 0 | 4 | 1 | | translations | [Kibana Localization](https://github.com/orgs/elastic/teams/kibana-localization) | - | 0 | 0 | 0 | 0 | -| | [Response Ops](https://github.com/orgs/elastic/teams/response-ops) | - | 513 | 1 | 486 | 48 | +| | [Response Ops](https://github.com/orgs/elastic/teams/response-ops) | - | 512 | 1 | 485 | 48 | | | [App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | Adds UI Actions service to Kibana | 132 | 0 | 91 | 11 | | | [App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | Extends UI Actions plugin with more functionality | 206 | 0 | 142 | 9 | | | [Data Discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | Contains functionality for the field list which can be integrated into apps | 61 | 0 | 59 | 2 | @@ -175,7 +175,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana'] | | [Vis Editors](https://github.com/orgs/elastic/teams/kibana-vis-editors) | Registers the vega visualization. Is the elastic version of vega and vega-lite libraries. | 2 | 0 | 2 | 0 | | | [Vis Editors](https://github.com/orgs/elastic/teams/kibana-vis-editors) | Contains the vislib visualizations. These are the classical area/line/bar, pie, gauge/goal and heatmap charts. We want to replace them with elastic-charts. | 26 | 0 | 25 | 1 | | | [Vis Editors](https://github.com/orgs/elastic/teams/kibana-vis-editors) | Contains the new xy-axis chart using the elastic-charts library, which will eventually replace the vislib xy-axis charts including bar, area, and line. | 53 | 0 | 50 | 5 | -| | [Vis Editors](https://github.com/orgs/elastic/teams/kibana-vis-editors) | Contains the shared architecture among all the legacy visualizations, e.g. the visualization type registry or the visualization embeddable. | 679 | 12 | 649 | 18 | +| | [Vis Editors](https://github.com/orgs/elastic/teams/kibana-vis-editors) | Contains the shared architecture among all the legacy visualizations, e.g. the visualization type registry or the visualization embeddable. | 693 | 12 | 663 | 18 | | watcher | [Stack Management](https://github.com/orgs/elastic/teams/kibana-stack-management) | - | 0 | 0 | 0 | 0 | ## Package Directory @@ -261,6 +261,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana'] | | Kibana Core | - | 16 | 0 | 16 | 0 | | | Kibana Core | - | 4 | 0 | 0 | 0 | | | Kibana Core | - | 10 | 1 | 10 | 0 | +| | Kibana Core | - | 14 | 0 | 11 | 0 | | | Kibana Core | - | 25 | 5 | 25 | 1 | | | Kibana Core | - | 7 | 0 | 7 | 1 | | | Kibana Core | - | 392 | 1 | 154 | 0 | @@ -388,6 +389,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana'] | | [Owner missing] | - | 74 | 0 | 71 | 0 | | | [Owner missing] | Security Solution auto complete | 56 | 1 | 41 | 1 | | | [Owner missing] | security solution elastic search utilities to use across plugins such lists, security_solution, cases, etc... | 67 | 0 | 61 | 1 | +| | [Owner missing] | - | 76 | 0 | 67 | 1 | | | [Owner missing] | Security Solution utilities for React hooks | 15 | 0 | 7 | 0 | | | [Owner missing] | io ts utilities and types to be shared with plugins from the security solution project | 145 | 0 | 127 | 0 | | | [Owner missing] | io ts utilities and types to be shared with plugins from the security solution project | 505 | 1 | 492 | 0 | diff --git a/api_docs/presentation_util.mdx b/api_docs/presentation_util.mdx index 191e4e563cb34..099351a2d0f2e 100644 --- a/api_docs/presentation_util.mdx +++ b/api_docs/presentation_util.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/presentationUtil title: "presentationUtil" image: https://source.unsplash.com/400x175/?github description: API docs for the presentationUtil plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'presentationUtil'] --- import presentationUtilObj from './presentation_util.devdocs.json'; diff --git a/api_docs/profiling.mdx b/api_docs/profiling.mdx index fb048ac82442b..2ef17ce2192fa 100644 --- a/api_docs/profiling.mdx +++ b/api_docs/profiling.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/profiling title: "profiling" image: https://source.unsplash.com/400x175/?github description: API docs for the profiling plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'profiling'] --- import profilingObj from './profiling.devdocs.json'; diff --git a/api_docs/remote_clusters.mdx b/api_docs/remote_clusters.mdx index c0b505ed6394d..8a248f78f1fa8 100644 --- a/api_docs/remote_clusters.mdx +++ b/api_docs/remote_clusters.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/remoteClusters title: "remoteClusters" image: https://source.unsplash.com/400x175/?github description: API docs for the remoteClusters plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'remoteClusters'] --- import remoteClustersObj from './remote_clusters.devdocs.json'; diff --git a/api_docs/reporting.mdx b/api_docs/reporting.mdx index 4088e39f97108..9589edc812df2 100644 --- a/api_docs/reporting.mdx +++ b/api_docs/reporting.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/reporting title: "reporting" image: https://source.unsplash.com/400x175/?github description: API docs for the reporting plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'reporting'] --- import reportingObj from './reporting.devdocs.json'; diff --git a/api_docs/rollup.mdx b/api_docs/rollup.mdx index 4f8cf9c8e8dbf..1964dc994cd2e 100644 --- a/api_docs/rollup.mdx +++ b/api_docs/rollup.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/rollup title: "rollup" image: https://source.unsplash.com/400x175/?github description: API docs for the rollup plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'rollup'] --- import rollupObj from './rollup.devdocs.json'; diff --git a/api_docs/rule_registry.devdocs.json b/api_docs/rule_registry.devdocs.json index 424057fd0db70..089f973bc0bf0 100644 --- a/api_docs/rule_registry.devdocs.json +++ b/api_docs/rule_registry.devdocs.json @@ -1917,7 +1917,7 @@ "\nID of the Kibana feature associated with the index.\nUsed by alerts-as-data RBAC.\n\nNote from @dhurley14\nThe purpose of the `feature` param is to force the user to update\nthe data structure which contains the mapping of consumers to alerts\nas data indices. The idea is it is typed such that it forces the\nuser to go to the code and modify it. At least until a better system\nis put in place or we move the alerts as data client out of rule registry.\n" ], "signature": [ - "\"observability\" | \"logs\" | \"apm\" | \"uptime\" | \"siem\" | \"infrastructure\"" + "\"infrastructure\" | \"observability\" | \"logs\" | \"apm\" | \"uptime\" | \"siem\"" ], "path": "x-pack/plugins/rule_registry/server/rule_data_plugin_service/index_options.ts", "deprecated": false, @@ -4270,7 +4270,7 @@ "label": "ParsedTechnicalFields", "description": [], "signature": [ - "{ readonly '@timestamp': string; readonly \"kibana.alert.rule.rule_type_id\": string; readonly \"kibana.alert.rule.consumer\": string; readonly \"kibana.alert.rule.producer\": string; readonly \"kibana.space_ids\": string[]; readonly \"kibana.alert.uuid\": string; readonly \"kibana.alert.instance.id\": string; readonly \"kibana.alert.status\": string; readonly \"kibana.alert.rule.category\": string; readonly \"kibana.alert.rule.uuid\": string; readonly \"kibana.alert.rule.name\": string; readonly tags?: string[] | undefined; readonly 'event.action'?: string | undefined; readonly \"kibana.alert.rule.parameters\"?: { [key: string]: unknown; } | undefined; readonly \"kibana.alert.start\"?: string | undefined; readonly \"kibana.alert.end\"?: string | undefined; readonly \"kibana.alert.duration.us\"?: number | undefined; readonly \"kibana.alert.severity\"?: string | undefined; readonly \"kibana.version\"?: string | undefined; readonly \"ecs.version\"?: string | undefined; readonly \"kibana.alert.risk_score\"?: number | undefined; readonly \"kibana.alert.workflow_status\"?: string | undefined; readonly \"kibana.alert.workflow_user\"?: string | undefined; readonly \"kibana.alert.workflow_reason\"?: string | undefined; readonly \"kibana.alert.system_status\"?: string | undefined; readonly \"kibana.alert.action_group\"?: string | undefined; readonly \"kibana.alert.reason\"?: string | undefined; readonly \"kibana.alert.rule.author\"?: string | undefined; readonly \"kibana.alert.rule.created_at\"?: string | undefined; readonly \"kibana.alert.rule.created_by\"?: string | undefined; readonly \"kibana.alert.rule.description\"?: string | undefined; readonly \"kibana.alert.rule.enabled\"?: string | undefined; readonly \"kibana.alert.rule.execution.uuid\"?: string | undefined; readonly \"kibana.alert.rule.from\"?: string | undefined; readonly \"kibana.alert.rule.interval\"?: string | undefined; readonly \"kibana.alert.rule.license\"?: string | undefined; readonly \"kibana.alert.rule.note\"?: string | undefined; readonly \"kibana.alert.rule.references\"?: string[] | undefined; readonly \"kibana.alert.rule.rule_id\"?: string | undefined; readonly \"kibana.alert.rule.rule_name_override\"?: string | undefined; readonly \"kibana.alert.rule.tags\"?: string[] | undefined; readonly \"kibana.alert.rule.to\"?: string | undefined; readonly \"kibana.alert.rule.type\"?: string | undefined; readonly \"kibana.alert.rule.updated_at\"?: string | undefined; readonly \"kibana.alert.rule.updated_by\"?: string | undefined; readonly \"kibana.alert.rule.version\"?: string | undefined; readonly 'event.kind'?: string | undefined; }" + "{ readonly '@timestamp': string; readonly \"kibana.alert.rule.rule_type_id\": string; readonly \"kibana.alert.rule.consumer\": string; readonly \"kibana.alert.rule.producer\": string; readonly \"kibana.space_ids\": string[]; readonly \"kibana.alert.uuid\": string; readonly \"kibana.alert.instance.id\": string; readonly \"kibana.alert.status\": string; readonly \"kibana.alert.rule.category\": string; readonly \"kibana.alert.rule.uuid\": string; readonly \"kibana.alert.rule.name\": string; readonly tags?: string[] | undefined; readonly 'event.action'?: string | undefined; readonly \"kibana.alert.rule.execution.uuid\"?: string | undefined; readonly \"kibana.alert.rule.parameters\"?: { [key: string]: unknown; } | undefined; readonly \"kibana.alert.start\"?: string | undefined; readonly \"kibana.alert.end\"?: string | undefined; readonly \"kibana.alert.duration.us\"?: number | undefined; readonly \"kibana.alert.severity\"?: string | undefined; readonly \"kibana.version\"?: string | undefined; readonly \"ecs.version\"?: string | undefined; readonly \"kibana.alert.risk_score\"?: number | undefined; readonly \"kibana.alert.workflow_status\"?: string | undefined; readonly \"kibana.alert.workflow_user\"?: string | undefined; readonly \"kibana.alert.workflow_reason\"?: string | undefined; readonly \"kibana.alert.system_status\"?: string | undefined; readonly \"kibana.alert.action_group\"?: string | undefined; readonly \"kibana.alert.reason\"?: string | undefined; readonly \"kibana.alert.rule.author\"?: string | undefined; readonly \"kibana.alert.rule.created_at\"?: string | undefined; readonly \"kibana.alert.rule.created_by\"?: string | undefined; readonly \"kibana.alert.rule.description\"?: string | undefined; readonly \"kibana.alert.rule.enabled\"?: string | undefined; readonly \"kibana.alert.rule.from\"?: string | undefined; readonly \"kibana.alert.rule.interval\"?: string | undefined; readonly \"kibana.alert.rule.license\"?: string | undefined; readonly \"kibana.alert.rule.note\"?: string | undefined; readonly \"kibana.alert.rule.references\"?: string[] | undefined; readonly \"kibana.alert.rule.rule_id\"?: string | undefined; readonly \"kibana.alert.rule.rule_name_override\"?: string | undefined; readonly \"kibana.alert.rule.tags\"?: string[] | undefined; readonly \"kibana.alert.rule.to\"?: string | undefined; readonly \"kibana.alert.rule.type\"?: string | undefined; readonly \"kibana.alert.rule.updated_at\"?: string | undefined; readonly \"kibana.alert.rule.updated_by\"?: string | undefined; readonly \"kibana.alert.rule.version\"?: string | undefined; readonly 'event.kind'?: string | undefined; }" ], "path": "x-pack/plugins/rule_registry/common/parse_technical_fields.ts", "deprecated": false, diff --git a/api_docs/rule_registry.mdx b/api_docs/rule_registry.mdx index 15c672f3f6fee..d4539ef64efa0 100644 --- a/api_docs/rule_registry.mdx +++ b/api_docs/rule_registry.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/ruleRegistry title: "ruleRegistry" image: https://source.unsplash.com/400x175/?github description: API docs for the ruleRegistry plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'ruleRegistry'] --- import ruleRegistryObj from './rule_registry.devdocs.json'; diff --git a/api_docs/runtime_fields.mdx b/api_docs/runtime_fields.mdx index 001d245e9adf3..8112f8684b552 100644 --- a/api_docs/runtime_fields.mdx +++ b/api_docs/runtime_fields.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/runtimeFields title: "runtimeFields" image: https://source.unsplash.com/400x175/?github description: API docs for the runtimeFields plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'runtimeFields'] --- import runtimeFieldsObj from './runtime_fields.devdocs.json'; diff --git a/api_docs/saved_objects.devdocs.json b/api_docs/saved_objects.devdocs.json index 6d40e242e3cd5..71d53634b7540 100644 --- a/api_docs/saved_objects.devdocs.json +++ b/api_docs/saved_objects.devdocs.json @@ -1557,18 +1557,6 @@ "plugin": "savedObjectsTaggingOss", "path": "src/plugins/saved_objects_tagging_oss/public/api.ts" }, - { - "plugin": "dashboard", - "path": "src/plugins/dashboard/public/services/saved_object_loader.ts" - }, - { - "plugin": "dashboard", - "path": "src/plugins/dashboard/public/services/saved_object_loader.ts" - }, - { - "plugin": "dashboard", - "path": "src/plugins/dashboard/public/services/saved_object_loader.ts" - }, { "plugin": "dashboard", "path": "src/plugins/dashboard/public/application/actions/clone_panel_action.tsx" @@ -1580,22 +1568,6 @@ { "plugin": "dashboard", "path": "src/plugins/dashboard/public/application/actions/clone_panel_action.tsx" - }, - { - "plugin": "dashboard", - "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts" - }, - { - "plugin": "dashboard", - "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts" - }, - { - "plugin": "dashboard", - "path": "src/plugins/dashboard/public/application/lib/dashboard_tagging.ts" - }, - { - "plugin": "dashboard", - "path": "src/plugins/dashboard/public/application/lib/dashboard_tagging.ts" } ], "children": [ @@ -3121,12 +3093,7 @@ "deprecated": true, "removeBy": "8.8.0", "trackAdoption": false, - "references": [ - { - "plugin": "dashboard", - "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts" - } - ] + "references": [] }, { "parentPluginId": "savedObjects", diff --git a/api_docs/saved_objects.mdx b/api_docs/saved_objects.mdx index 51bc9b36316c4..613f942ef9065 100644 --- a/api_docs/saved_objects.mdx +++ b/api_docs/saved_objects.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjects title: "savedObjects" image: https://source.unsplash.com/400x175/?github description: API docs for the savedObjects plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedObjects'] --- import savedObjectsObj from './saved_objects.devdocs.json'; diff --git a/api_docs/saved_objects_finder.mdx b/api_docs/saved_objects_finder.mdx index 3a6b9b0a9e738..23cf7d31ca48e 100644 --- a/api_docs/saved_objects_finder.mdx +++ b/api_docs/saved_objects_finder.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjectsFinder title: "savedObjectsFinder" image: https://source.unsplash.com/400x175/?github description: API docs for the savedObjectsFinder plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedObjectsFinder'] --- import savedObjectsFinderObj from './saved_objects_finder.devdocs.json'; diff --git a/api_docs/saved_objects_management.mdx b/api_docs/saved_objects_management.mdx index 8fb7925eb7808..c9cc4aa61ea7c 100644 --- a/api_docs/saved_objects_management.mdx +++ b/api_docs/saved_objects_management.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjectsManagement title: "savedObjectsManagement" image: https://source.unsplash.com/400x175/?github description: API docs for the savedObjectsManagement plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedObjectsManagement'] --- import savedObjectsManagementObj from './saved_objects_management.devdocs.json'; diff --git a/api_docs/saved_objects_tagging.mdx b/api_docs/saved_objects_tagging.mdx index 9a0469a70f642..1450399aefd83 100644 --- a/api_docs/saved_objects_tagging.mdx +++ b/api_docs/saved_objects_tagging.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjectsTagging title: "savedObjectsTagging" image: https://source.unsplash.com/400x175/?github description: API docs for the savedObjectsTagging plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedObjectsTagging'] --- import savedObjectsTaggingObj from './saved_objects_tagging.devdocs.json'; diff --git a/api_docs/saved_objects_tagging_oss.mdx b/api_docs/saved_objects_tagging_oss.mdx index 8abc78f1fdc7e..1ed5aa9d511ea 100644 --- a/api_docs/saved_objects_tagging_oss.mdx +++ b/api_docs/saved_objects_tagging_oss.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjectsTaggingOss title: "savedObjectsTaggingOss" image: https://source.unsplash.com/400x175/?github description: API docs for the savedObjectsTaggingOss plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedObjectsTaggingOss'] --- import savedObjectsTaggingOssObj from './saved_objects_tagging_oss.devdocs.json'; diff --git a/api_docs/saved_search.devdocs.json b/api_docs/saved_search.devdocs.json index df52fe959fea2..8e6b2e5503d3c 100644 --- a/api_docs/saved_search.devdocs.json +++ b/api_docs/saved_search.devdocs.json @@ -661,7 +661,7 @@ "label": "sharingSavedObjectProps", "description": [], "signature": [ - "{ outcome?: \"exactMatch\" | \"aliasMatch\" | \"conflict\" | undefined; aliasTargetId?: string | undefined; aliasPurpose?: \"savedObjectConversion\" | \"savedObjectImport\" | undefined; errorJSON?: string | undefined; } | undefined" + "{ outcome?: \"conflict\" | \"exactMatch\" | \"aliasMatch\" | undefined; aliasTargetId?: string | undefined; aliasPurpose?: \"savedObjectConversion\" | \"savedObjectImport\" | undefined; errorJSON?: string | undefined; } | undefined" ], "path": "src/plugins/saved_search/public/services/saved_searches/types.ts", "deprecated": false, diff --git a/api_docs/saved_search.mdx b/api_docs/saved_search.mdx index a39c3adbc8200..6c1900781f66a 100644 --- a/api_docs/saved_search.mdx +++ b/api_docs/saved_search.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedSearch title: "savedSearch" image: https://source.unsplash.com/400x175/?github description: API docs for the savedSearch plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedSearch'] --- import savedSearchObj from './saved_search.devdocs.json'; diff --git a/api_docs/screenshot_mode.devdocs.json b/api_docs/screenshot_mode.devdocs.json index c6be83e928479..ab834dfc733bc 100644 --- a/api_docs/screenshot_mode.devdocs.json +++ b/api_docs/screenshot_mode.devdocs.json @@ -139,13 +139,7 @@ "label": "ScreenshotModeRequestHandlerContext", "description": [], "signature": [ - { - "pluginId": "core", - "scope": "server", - "docId": "kibCorePluginApi", - "section": "def-server.RequestHandlerContext", - "text": "RequestHandlerContext" - }, + "RequestHandlerContext", " & { screenshotMode: Promise<{ isScreenshot: boolean; }>; }" ], "path": "src/plugins/screenshot_mode/server/types.ts", diff --git a/api_docs/screenshot_mode.mdx b/api_docs/screenshot_mode.mdx index 6eaf962f670fa..883f8e26e2cc0 100644 --- a/api_docs/screenshot_mode.mdx +++ b/api_docs/screenshot_mode.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/screenshotMode title: "screenshotMode" image: https://source.unsplash.com/400x175/?github description: API docs for the screenshotMode plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'screenshotMode'] --- import screenshotModeObj from './screenshot_mode.devdocs.json'; diff --git a/api_docs/screenshotting.mdx b/api_docs/screenshotting.mdx index 8cb0692d0c854..df0feab2c445c 100644 --- a/api_docs/screenshotting.mdx +++ b/api_docs/screenshotting.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/screenshotting title: "screenshotting" image: https://source.unsplash.com/400x175/?github description: API docs for the screenshotting plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'screenshotting'] --- import screenshottingObj from './screenshotting.devdocs.json'; diff --git a/api_docs/security.mdx b/api_docs/security.mdx index e6f2900462223..814d0173f69cf 100644 --- a/api_docs/security.mdx +++ b/api_docs/security.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/security title: "security" image: https://source.unsplash.com/400x175/?github description: API docs for the security plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'security'] --- import securityObj from './security.devdocs.json'; diff --git a/api_docs/security_solution.devdocs.json b/api_docs/security_solution.devdocs.json index 8ad8f2f5fe218..c3ab461b2eb22 100644 --- a/api_docs/security_solution.devdocs.json +++ b/api_docs/security_solution.devdocs.json @@ -768,13 +768,7 @@ "label": "core", "description": [], "signature": [ - { - "pluginId": "core", - "scope": "server", - "docId": "kibCorePluginApi", - "section": "def-server.CoreRequestHandlerContext", - "text": "CoreRequestHandlerContext" - } + "CoreRequestHandlerContext" ], "path": "x-pack/plugins/security_solution/server/types.ts", "deprecated": false, diff --git a/api_docs/security_solution.mdx b/api_docs/security_solution.mdx index c59c106fce254..a86c48a48dfce 100644 --- a/api_docs/security_solution.mdx +++ b/api_docs/security_solution.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/securitySolution title: "securitySolution" image: https://source.unsplash.com/400x175/?github description: API docs for the securitySolution plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'securitySolution'] --- import securitySolutionObj from './security_solution.devdocs.json'; diff --git a/api_docs/session_view.mdx b/api_docs/session_view.mdx index ad4253bd0d7e5..66978ad664e04 100644 --- a/api_docs/session_view.mdx +++ b/api_docs/session_view.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/sessionView title: "sessionView" image: https://source.unsplash.com/400x175/?github description: API docs for the sessionView plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'sessionView'] --- import sessionViewObj from './session_view.devdocs.json'; diff --git a/api_docs/share.mdx b/api_docs/share.mdx index e6f9de45dbb58..0086ad02ab5ac 100644 --- a/api_docs/share.mdx +++ b/api_docs/share.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/share title: "share" image: https://source.unsplash.com/400x175/?github description: API docs for the share plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'share'] --- import shareObj from './share.devdocs.json'; diff --git a/api_docs/snapshot_restore.mdx b/api_docs/snapshot_restore.mdx index 8a45ec4089ad2..7bce31d6e1832 100644 --- a/api_docs/snapshot_restore.mdx +++ b/api_docs/snapshot_restore.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/snapshotRestore title: "snapshotRestore" image: https://source.unsplash.com/400x175/?github description: API docs for the snapshotRestore plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'snapshotRestore'] --- import snapshotRestoreObj from './snapshot_restore.devdocs.json'; diff --git a/api_docs/spaces.mdx b/api_docs/spaces.mdx index 94f8821728343..decf22f6da092 100644 --- a/api_docs/spaces.mdx +++ b/api_docs/spaces.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/spaces title: "spaces" image: https://source.unsplash.com/400x175/?github description: API docs for the spaces plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'spaces'] --- import spacesObj from './spaces.devdocs.json'; diff --git a/api_docs/stack_alerts.mdx b/api_docs/stack_alerts.mdx index cb3df93effb09..e68ecfcdfb999 100644 --- a/api_docs/stack_alerts.mdx +++ b/api_docs/stack_alerts.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/stackAlerts title: "stackAlerts" image: https://source.unsplash.com/400x175/?github description: API docs for the stackAlerts plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'stackAlerts'] --- import stackAlertsObj from './stack_alerts.devdocs.json'; diff --git a/api_docs/stack_connectors.mdx b/api_docs/stack_connectors.mdx index a71b61831fb69..5363b913fbe0c 100644 --- a/api_docs/stack_connectors.mdx +++ b/api_docs/stack_connectors.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/stackConnectors title: "stackConnectors" image: https://source.unsplash.com/400x175/?github description: API docs for the stackConnectors plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'stackConnectors'] --- import stackConnectorsObj from './stack_connectors.devdocs.json'; diff --git a/api_docs/task_manager.mdx b/api_docs/task_manager.mdx index b84502a5d8c55..7377ef34d529c 100644 --- a/api_docs/task_manager.mdx +++ b/api_docs/task_manager.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/taskManager title: "taskManager" image: https://source.unsplash.com/400x175/?github description: API docs for the taskManager plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'taskManager'] --- import taskManagerObj from './task_manager.devdocs.json'; diff --git a/api_docs/telemetry.mdx b/api_docs/telemetry.mdx index dfdbd20746f57..1a95f8384f249 100644 --- a/api_docs/telemetry.mdx +++ b/api_docs/telemetry.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/telemetry title: "telemetry" image: https://source.unsplash.com/400x175/?github description: API docs for the telemetry plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'telemetry'] --- import telemetryObj from './telemetry.devdocs.json'; diff --git a/api_docs/telemetry_collection_manager.mdx b/api_docs/telemetry_collection_manager.mdx index edb998b57d6f5..355a38255c9c3 100644 --- a/api_docs/telemetry_collection_manager.mdx +++ b/api_docs/telemetry_collection_manager.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/telemetryCollectionManager title: "telemetryCollectionManager" image: https://source.unsplash.com/400x175/?github description: API docs for the telemetryCollectionManager plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'telemetryCollectionManager'] --- import telemetryCollectionManagerObj from './telemetry_collection_manager.devdocs.json'; diff --git a/api_docs/telemetry_collection_xpack.mdx b/api_docs/telemetry_collection_xpack.mdx index c23dd99eb95e3..e607fc3598bd1 100644 --- a/api_docs/telemetry_collection_xpack.mdx +++ b/api_docs/telemetry_collection_xpack.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/telemetryCollectionXpack title: "telemetryCollectionXpack" image: https://source.unsplash.com/400x175/?github description: API docs for the telemetryCollectionXpack plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'telemetryCollectionXpack'] --- import telemetryCollectionXpackObj from './telemetry_collection_xpack.devdocs.json'; diff --git a/api_docs/telemetry_management_section.mdx b/api_docs/telemetry_management_section.mdx index 5e8ae624dfe82..f538309dd4628 100644 --- a/api_docs/telemetry_management_section.mdx +++ b/api_docs/telemetry_management_section.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/telemetryManagementSection title: "telemetryManagementSection" image: https://source.unsplash.com/400x175/?github description: API docs for the telemetryManagementSection plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'telemetryManagementSection'] --- import telemetryManagementSectionObj from './telemetry_management_section.devdocs.json'; diff --git a/api_docs/threat_intelligence.mdx b/api_docs/threat_intelligence.mdx index 80ac38a8ed990..bcebf8f8b9342 100644 --- a/api_docs/threat_intelligence.mdx +++ b/api_docs/threat_intelligence.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/threatIntelligence title: "threatIntelligence" image: https://source.unsplash.com/400x175/?github description: API docs for the threatIntelligence plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'threatIntelligence'] --- import threatIntelligenceObj from './threat_intelligence.devdocs.json'; diff --git a/api_docs/timelines.devdocs.json b/api_docs/timelines.devdocs.json index 5875aa47c1309..4b5ec5ce28970 100644 --- a/api_docs/timelines.devdocs.json +++ b/api_docs/timelines.devdocs.json @@ -3192,7 +3192,7 @@ "IFieldSubType", " | undefined; type?: string | undefined; })[]; id: string; title: string; filters?: ", "Filter", - "[] | undefined; dataViewId: string | null; sort: ", + "[] | undefined; dataViewId: string | null; savedObjectId: string | null; sort: ", "SortColumnTimeline", "[]; version: string | null; filterManager?: ", { @@ -3218,7 +3218,7 @@ }, "; description?: string | null | undefined; esTypes?: string[] | undefined; example?: string | number | null | undefined; format?: string | undefined; linkField?: string | undefined; placeholder?: string | undefined; subType?: ", "IFieldSubType", - " | undefined; type?: string | undefined; })[]; savedObjectId: string | null; isLoading: boolean; dataProviders: ", + " | undefined; type?: string | undefined; })[]; isLoading: boolean; dataProviders: ", { "pluginId": "timelines", "scope": "common", diff --git a/api_docs/timelines.mdx b/api_docs/timelines.mdx index ecb0a115ea511..7a96d016a99c9 100644 --- a/api_docs/timelines.mdx +++ b/api_docs/timelines.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/timelines title: "timelines" image: https://source.unsplash.com/400x175/?github description: API docs for the timelines plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'timelines'] --- import timelinesObj from './timelines.devdocs.json'; diff --git a/api_docs/transform.mdx b/api_docs/transform.mdx index 70b733e2c869e..7d3c611c084ba 100644 --- a/api_docs/transform.mdx +++ b/api_docs/transform.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/transform title: "transform" image: https://source.unsplash.com/400x175/?github description: API docs for the transform plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'transform'] --- import transformObj from './transform.devdocs.json'; diff --git a/api_docs/triggers_actions_ui.devdocs.json b/api_docs/triggers_actions_ui.devdocs.json index 316d5941b9d23..d6351e414ae46 100644 --- a/api_docs/triggers_actions_ui.devdocs.json +++ b/api_docs/triggers_actions_ui.devdocs.json @@ -3139,7 +3139,7 @@ "description": [], "signature": [ "BasicFields", - " & { tags?: string[] | undefined; kibana?: string[] | undefined; \"@timestamp\"?: string[] | undefined; \"event.action\"?: string[] | undefined; \"kibana.alert.rule.parameters\"?: string[] | undefined; \"kibana.alert.rule.rule_type_id\"?: string[] | undefined; \"kibana.alert.rule.consumer\"?: string[] | undefined; \"kibana.alert.rule.producer\"?: string[] | undefined; \"kibana.space_ids\"?: string[] | undefined; \"kibana.alert.uuid\"?: string[] | undefined; \"kibana.alert.instance.id\"?: string[] | undefined; \"kibana.alert.start\"?: string[] | undefined; \"kibana.alert.end\"?: string[] | undefined; \"kibana.alert.duration.us\"?: string[] | undefined; \"kibana.alert.severity\"?: string[] | undefined; \"kibana.alert.status\"?: string[] | undefined; \"kibana.version\"?: string[] | undefined; \"ecs.version\"?: string[] | undefined; \"kibana.alert.risk_score\"?: string[] | undefined; \"kibana.alert.workflow_status\"?: string[] | undefined; \"kibana.alert.workflow_user\"?: string[] | undefined; \"kibana.alert.workflow_reason\"?: string[] | undefined; \"kibana.alert.system_status\"?: string[] | undefined; \"kibana.alert.action_group\"?: string[] | undefined; \"kibana.alert.reason\"?: string[] | undefined; \"kibana.alert.rule.author\"?: string[] | undefined; \"kibana.alert.rule.category\"?: string[] | undefined; \"kibana.alert.rule.uuid\"?: string[] | undefined; \"kibana.alert.rule.created_at\"?: string[] | undefined; \"kibana.alert.rule.created_by\"?: string[] | undefined; \"kibana.alert.rule.description\"?: string[] | undefined; \"kibana.alert.rule.enabled\"?: string[] | undefined; \"kibana.alert.rule.execution.uuid\"?: string[] | undefined; \"kibana.alert.rule.from\"?: string[] | undefined; \"kibana.alert.rule.interval\"?: string[] | undefined; \"kibana.alert.rule.license\"?: string[] | undefined; \"kibana.alert.rule.name\"?: string[] | undefined; \"kibana.alert.rule.note\"?: string[] | undefined; \"kibana.alert.rule.references\"?: string[] | undefined; \"kibana.alert.rule.rule_id\"?: string[] | undefined; \"kibana.alert.rule.rule_name_override\"?: string[] | undefined; \"kibana.alert.rule.tags\"?: string[] | undefined; \"kibana.alert.rule.to\"?: string[] | undefined; \"kibana.alert.rule.type\"?: string[] | undefined; \"kibana.alert.rule.updated_at\"?: string[] | undefined; \"kibana.alert.rule.updated_by\"?: string[] | undefined; \"kibana.alert.rule.version\"?: string[] | undefined; \"event.kind\"?: string[] | undefined; \"event.module\"?: string[] | undefined; \"kibana.alert.evaluation.threshold\"?: string[] | undefined; \"kibana.alert.evaluation.value\"?: string[] | undefined; \"kibana.alert.building_block_type\"?: string[] | undefined; \"kibana.alert.rule.exceptions_list\"?: string[] | undefined; \"kibana.alert.rule.namespace\"?: string[] | undefined; \"kibana.alert\"?: string[] | undefined; \"kibana.alert.rule\"?: string[] | undefined; } & { [x: string]: unknown[]; }" + " & { tags?: string[] | undefined; kibana?: string[] | undefined; \"@timestamp\"?: string[] | undefined; \"kibana.alert.rule.rule_type_id\"?: string[] | undefined; \"kibana.alert.rule.consumer\"?: string[] | undefined; \"event.action\"?: string[] | undefined; \"kibana.alert.rule.execution.uuid\"?: string[] | undefined; \"kibana.alert.rule.parameters\"?: string[] | undefined; \"kibana.alert.rule.producer\"?: string[] | undefined; \"kibana.space_ids\"?: string[] | undefined; \"kibana.alert.uuid\"?: string[] | undefined; \"kibana.alert.instance.id\"?: string[] | undefined; \"kibana.alert.start\"?: string[] | undefined; \"kibana.alert.end\"?: string[] | undefined; \"kibana.alert.duration.us\"?: string[] | undefined; \"kibana.alert.severity\"?: string[] | undefined; \"kibana.alert.status\"?: string[] | undefined; \"kibana.version\"?: string[] | undefined; \"ecs.version\"?: string[] | undefined; \"kibana.alert.risk_score\"?: string[] | undefined; \"kibana.alert.workflow_status\"?: string[] | undefined; \"kibana.alert.workflow_user\"?: string[] | undefined; \"kibana.alert.workflow_reason\"?: string[] | undefined; \"kibana.alert.system_status\"?: string[] | undefined; \"kibana.alert.action_group\"?: string[] | undefined; \"kibana.alert.reason\"?: string[] | undefined; \"kibana.alert.rule.author\"?: string[] | undefined; \"kibana.alert.rule.category\"?: string[] | undefined; \"kibana.alert.rule.uuid\"?: string[] | undefined; \"kibana.alert.rule.created_at\"?: string[] | undefined; \"kibana.alert.rule.created_by\"?: string[] | undefined; \"kibana.alert.rule.description\"?: string[] | undefined; \"kibana.alert.rule.enabled\"?: string[] | undefined; \"kibana.alert.rule.from\"?: string[] | undefined; \"kibana.alert.rule.interval\"?: string[] | undefined; \"kibana.alert.rule.license\"?: string[] | undefined; \"kibana.alert.rule.name\"?: string[] | undefined; \"kibana.alert.rule.note\"?: string[] | undefined; \"kibana.alert.rule.references\"?: string[] | undefined; \"kibana.alert.rule.rule_id\"?: string[] | undefined; \"kibana.alert.rule.rule_name_override\"?: string[] | undefined; \"kibana.alert.rule.tags\"?: string[] | undefined; \"kibana.alert.rule.to\"?: string[] | undefined; \"kibana.alert.rule.type\"?: string[] | undefined; \"kibana.alert.rule.updated_at\"?: string[] | undefined; \"kibana.alert.rule.updated_by\"?: string[] | undefined; \"kibana.alert.rule.version\"?: string[] | undefined; \"event.kind\"?: string[] | undefined; \"event.module\"?: string[] | undefined; \"kibana.alert.evaluation.threshold\"?: string[] | undefined; \"kibana.alert.evaluation.value\"?: string[] | undefined; \"kibana.alert.building_block_type\"?: string[] | undefined; \"kibana.alert.rule.exceptions_list\"?: string[] | undefined; \"kibana.alert.rule.namespace\"?: string[] | undefined; \"kibana.alert\"?: string[] | undefined; \"kibana.alert.rule\"?: string[] | undefined; } & { [x: string]: unknown[]; }" ], "path": "x-pack/plugins/triggers_actions_ui/public/types.ts", "deprecated": false, @@ -3585,20 +3585,6 @@ "deprecated": false, "trackAdoption": false }, - { - "parentPluginId": "triggersActionsUi", - "id": "def-public.AlertStatus.actionSubgroup", - "type": "string", - "tags": [], - "label": "actionSubgroup", - "description": [], - "signature": [ - "string | undefined" - ], - "path": "x-pack/plugins/alerting/common/alert_summary.ts", - "deprecated": false, - "trackAdoption": false - }, { "parentPluginId": "triggersActionsUi", "id": "def-public.AlertStatus.activeStartDate", diff --git a/api_docs/triggers_actions_ui.mdx b/api_docs/triggers_actions_ui.mdx index cfa8f8965332e..e40b4b0c4d440 100644 --- a/api_docs/triggers_actions_ui.mdx +++ b/api_docs/triggers_actions_ui.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/triggersActionsUi title: "triggersActionsUi" image: https://source.unsplash.com/400x175/?github description: API docs for the triggersActionsUi plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'triggersActionsUi'] --- import triggersActionsUiObj from './triggers_actions_ui.devdocs.json'; @@ -21,7 +21,7 @@ Contact [Response Ops](https://github.com/orgs/elastic/teams/response-ops) for q | Public API count | Any count | Items lacking comments | Missing exports | |-------------------|-----------|------------------------|-----------------| -| 513 | 1 | 486 | 48 | +| 512 | 1 | 485 | 48 | ## Client diff --git a/api_docs/ui_actions.mdx b/api_docs/ui_actions.mdx index 25fd9d32aac51..9a49946469889 100644 --- a/api_docs/ui_actions.mdx +++ b/api_docs/ui_actions.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/uiActions title: "uiActions" image: https://source.unsplash.com/400x175/?github description: API docs for the uiActions plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'uiActions'] --- import uiActionsObj from './ui_actions.devdocs.json'; diff --git a/api_docs/ui_actions_enhanced.mdx b/api_docs/ui_actions_enhanced.mdx index f85563ce18a73..e1fd951d5e2a2 100644 --- a/api_docs/ui_actions_enhanced.mdx +++ b/api_docs/ui_actions_enhanced.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/uiActionsEnhanced title: "uiActionsEnhanced" image: https://source.unsplash.com/400x175/?github description: API docs for the uiActionsEnhanced plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'uiActionsEnhanced'] --- import uiActionsEnhancedObj from './ui_actions_enhanced.devdocs.json'; diff --git a/api_docs/unified_field_list.mdx b/api_docs/unified_field_list.mdx index 2aae0fbddf27b..254b1228a31fd 100644 --- a/api_docs/unified_field_list.mdx +++ b/api_docs/unified_field_list.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/unifiedFieldList title: "unifiedFieldList" image: https://source.unsplash.com/400x175/?github description: API docs for the unifiedFieldList plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'unifiedFieldList'] --- import unifiedFieldListObj from './unified_field_list.devdocs.json'; diff --git a/api_docs/unified_search.mdx b/api_docs/unified_search.mdx index 261ef25b80e9b..5015d2debdc41 100644 --- a/api_docs/unified_search.mdx +++ b/api_docs/unified_search.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/unifiedSearch title: "unifiedSearch" image: https://source.unsplash.com/400x175/?github description: API docs for the unifiedSearch plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'unifiedSearch'] --- import unifiedSearchObj from './unified_search.devdocs.json'; diff --git a/api_docs/unified_search_autocomplete.mdx b/api_docs/unified_search_autocomplete.mdx index 1e75d7da1deb9..5a40018e6081e 100644 --- a/api_docs/unified_search_autocomplete.mdx +++ b/api_docs/unified_search_autocomplete.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/unifiedSearch-autocomplete title: "unifiedSearch.autocomplete" image: https://source.unsplash.com/400x175/?github description: API docs for the unifiedSearch.autocomplete plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'unifiedSearch.autocomplete'] --- import unifiedSearchAutocompleteObj from './unified_search_autocomplete.devdocs.json'; diff --git a/api_docs/url_forwarding.mdx b/api_docs/url_forwarding.mdx index d2cdaf4d89c84..f57d70892e70d 100644 --- a/api_docs/url_forwarding.mdx +++ b/api_docs/url_forwarding.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/urlForwarding title: "urlForwarding" image: https://source.unsplash.com/400x175/?github description: API docs for the urlForwarding plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'urlForwarding'] --- import urlForwardingObj from './url_forwarding.devdocs.json'; diff --git a/api_docs/usage_collection.mdx b/api_docs/usage_collection.mdx index 5f6baf6d86c5f..f40f15636c943 100644 --- a/api_docs/usage_collection.mdx +++ b/api_docs/usage_collection.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/usageCollection title: "usageCollection" image: https://source.unsplash.com/400x175/?github description: API docs for the usageCollection plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'usageCollection'] --- import usageCollectionObj from './usage_collection.devdocs.json'; diff --git a/api_docs/ux.mdx b/api_docs/ux.mdx index 470423b8266a7..d462e4d19616c 100644 --- a/api_docs/ux.mdx +++ b/api_docs/ux.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/ux title: "ux" image: https://source.unsplash.com/400x175/?github description: API docs for the ux plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'ux'] --- import uxObj from './ux.devdocs.json'; diff --git a/api_docs/vis_default_editor.mdx b/api_docs/vis_default_editor.mdx index ff57731114146..0b2993331260b 100644 --- a/api_docs/vis_default_editor.mdx +++ b/api_docs/vis_default_editor.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visDefaultEditor title: "visDefaultEditor" image: https://source.unsplash.com/400x175/?github description: API docs for the visDefaultEditor plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visDefaultEditor'] --- import visDefaultEditorObj from './vis_default_editor.devdocs.json'; diff --git a/api_docs/vis_type_gauge.mdx b/api_docs/vis_type_gauge.mdx index 1da13d1fcc094..cc20cda9db105 100644 --- a/api_docs/vis_type_gauge.mdx +++ b/api_docs/vis_type_gauge.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeGauge title: "visTypeGauge" image: https://source.unsplash.com/400x175/?github description: API docs for the visTypeGauge plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeGauge'] --- import visTypeGaugeObj from './vis_type_gauge.devdocs.json'; diff --git a/api_docs/vis_type_heatmap.mdx b/api_docs/vis_type_heatmap.mdx index d30f1b6a560aa..609c06b1a92cf 100644 --- a/api_docs/vis_type_heatmap.mdx +++ b/api_docs/vis_type_heatmap.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeHeatmap title: "visTypeHeatmap" image: https://source.unsplash.com/400x175/?github description: API docs for the visTypeHeatmap plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeHeatmap'] --- import visTypeHeatmapObj from './vis_type_heatmap.devdocs.json'; diff --git a/api_docs/vis_type_pie.mdx b/api_docs/vis_type_pie.mdx index f8d894bdaa7de..3f8c15b314a0e 100644 --- a/api_docs/vis_type_pie.mdx +++ b/api_docs/vis_type_pie.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypePie title: "visTypePie" image: https://source.unsplash.com/400x175/?github description: API docs for the visTypePie plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypePie'] --- import visTypePieObj from './vis_type_pie.devdocs.json'; diff --git a/api_docs/vis_type_table.mdx b/api_docs/vis_type_table.mdx index deb819de77df3..5aa2bd8b01f5a 100644 --- a/api_docs/vis_type_table.mdx +++ b/api_docs/vis_type_table.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeTable title: "visTypeTable" image: https://source.unsplash.com/400x175/?github description: API docs for the visTypeTable plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeTable'] --- import visTypeTableObj from './vis_type_table.devdocs.json'; diff --git a/api_docs/vis_type_timelion.mdx b/api_docs/vis_type_timelion.mdx index 042fb74b10af4..2219fc96f2e31 100644 --- a/api_docs/vis_type_timelion.mdx +++ b/api_docs/vis_type_timelion.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeTimelion title: "visTypeTimelion" image: https://source.unsplash.com/400x175/?github description: API docs for the visTypeTimelion plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeTimelion'] --- import visTypeTimelionObj from './vis_type_timelion.devdocs.json'; diff --git a/api_docs/vis_type_timeseries.mdx b/api_docs/vis_type_timeseries.mdx index 2458fbb4d9dee..2608ea12c24f9 100644 --- a/api_docs/vis_type_timeseries.mdx +++ b/api_docs/vis_type_timeseries.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeTimeseries title: "visTypeTimeseries" image: https://source.unsplash.com/400x175/?github description: API docs for the visTypeTimeseries plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeTimeseries'] --- import visTypeTimeseriesObj from './vis_type_timeseries.devdocs.json'; diff --git a/api_docs/vis_type_vega.mdx b/api_docs/vis_type_vega.mdx index 606b4dcf05e16..e535d8ca970e3 100644 --- a/api_docs/vis_type_vega.mdx +++ b/api_docs/vis_type_vega.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeVega title: "visTypeVega" image: https://source.unsplash.com/400x175/?github description: API docs for the visTypeVega plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeVega'] --- import visTypeVegaObj from './vis_type_vega.devdocs.json'; diff --git a/api_docs/vis_type_vislib.mdx b/api_docs/vis_type_vislib.mdx index e56cd5d8f509d..c6bd5fba0b068 100644 --- a/api_docs/vis_type_vislib.mdx +++ b/api_docs/vis_type_vislib.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeVislib title: "visTypeVislib" image: https://source.unsplash.com/400x175/?github description: API docs for the visTypeVislib plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeVislib'] --- import visTypeVislibObj from './vis_type_vislib.devdocs.json'; diff --git a/api_docs/vis_type_xy.mdx b/api_docs/vis_type_xy.mdx index 9ac63dfe30ccc..8caa2a67dab8d 100644 --- a/api_docs/vis_type_xy.mdx +++ b/api_docs/vis_type_xy.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeXy title: "visTypeXy" image: https://source.unsplash.com/400x175/?github description: API docs for the visTypeXy plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeXy'] --- import visTypeXyObj from './vis_type_xy.devdocs.json'; diff --git a/api_docs/visualizations.devdocs.json b/api_docs/visualizations.devdocs.json index adc8f3022cb1a..95b3390b94cea 100644 --- a/api_docs/visualizations.devdocs.json +++ b/api_docs/visualizations.devdocs.json @@ -3042,7 +3042,7 @@ "label": "sharingSavedObjectProps", "description": [], "signature": [ - "{ outcome?: \"exactMatch\" | \"aliasMatch\" | \"conflict\" | undefined; aliasTargetId?: string | undefined; aliasPurpose?: \"savedObjectConversion\" | \"savedObjectImport\" | undefined; errorJSON?: string | undefined; } | undefined" + "{ outcome?: \"conflict\" | \"exactMatch\" | \"aliasMatch\" | undefined; aliasTargetId?: string | undefined; aliasPurpose?: \"savedObjectConversion\" | \"savedObjectImport\" | undefined; errorJSON?: string | undefined; } | undefined" ], "path": "src/plugins/visualizations/public/types.ts", "deprecated": false, @@ -9284,6 +9284,203 @@ ], "initialIsOpen": false }, + { + "parentPluginId": "visualizations", + "id": "def-common.MetricVisConfiguration", + "type": "Interface", + "tags": [], + "label": "MetricVisConfiguration", + "description": [], + "path": "src/plugins/visualizations/common/convert_to_lens/types/configurations.ts", + "deprecated": false, + "trackAdoption": false, + "children": [ + { + "parentPluginId": "visualizations", + "id": "def-common.MetricVisConfiguration.layerId", + "type": "string", + "tags": [], + "label": "layerId", + "description": [], + "path": "src/plugins/visualizations/common/convert_to_lens/types/configurations.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "visualizations", + "id": "def-common.MetricVisConfiguration.layerType", + "type": "string", + "tags": [], + "label": "layerType", + "description": [], + "signature": [ + "\"data\"" + ], + "path": "src/plugins/visualizations/common/convert_to_lens/types/configurations.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "visualizations", + "id": "def-common.MetricVisConfiguration.metricAccessor", + "type": "string", + "tags": [], + "label": "metricAccessor", + "description": [], + "signature": [ + "string | undefined" + ], + "path": "src/plugins/visualizations/common/convert_to_lens/types/configurations.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "visualizations", + "id": "def-common.MetricVisConfiguration.secondaryMetricAccessor", + "type": "string", + "tags": [], + "label": "secondaryMetricAccessor", + "description": [], + "signature": [ + "string | undefined" + ], + "path": "src/plugins/visualizations/common/convert_to_lens/types/configurations.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "visualizations", + "id": "def-common.MetricVisConfiguration.maxAccessor", + "type": "string", + "tags": [], + "label": "maxAccessor", + "description": [], + "signature": [ + "string | undefined" + ], + "path": "src/plugins/visualizations/common/convert_to_lens/types/configurations.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "visualizations", + "id": "def-common.MetricVisConfiguration.breakdownByAccessor", + "type": "string", + "tags": [], + "label": "breakdownByAccessor", + "description": [], + "signature": [ + "string | undefined" + ], + "path": "src/plugins/visualizations/common/convert_to_lens/types/configurations.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "visualizations", + "id": "def-common.MetricVisConfiguration.collapseFn", + "type": "string", + "tags": [], + "label": "collapseFn", + "description": [], + "signature": [ + "string | undefined" + ], + "path": "src/plugins/visualizations/common/convert_to_lens/types/configurations.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "visualizations", + "id": "def-common.MetricVisConfiguration.subtitle", + "type": "string", + "tags": [], + "label": "subtitle", + "description": [], + "signature": [ + "string | undefined" + ], + "path": "src/plugins/visualizations/common/convert_to_lens/types/configurations.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "visualizations", + "id": "def-common.MetricVisConfiguration.secondaryPrefix", + "type": "string", + "tags": [], + "label": "secondaryPrefix", + "description": [], + "signature": [ + "string | undefined" + ], + "path": "src/plugins/visualizations/common/convert_to_lens/types/configurations.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "visualizations", + "id": "def-common.MetricVisConfiguration.progressDirection", + "type": "CompoundType", + "tags": [], + "label": "progressDirection", + "description": [], + "signature": [ + "LayoutDirection", + " | undefined" + ], + "path": "src/plugins/visualizations/common/convert_to_lens/types/configurations.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "visualizations", + "id": "def-common.MetricVisConfiguration.color", + "type": "string", + "tags": [], + "label": "color", + "description": [], + "signature": [ + "string | undefined" + ], + "path": "src/plugins/visualizations/common/convert_to_lens/types/configurations.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "visualizations", + "id": "def-common.MetricVisConfiguration.palette", + "type": "Object", + "tags": [], + "label": "palette", + "description": [], + "signature": [ + "PaletteOutput", + "<", + "CustomPaletteParams", + "> | undefined" + ], + "path": "src/plugins/visualizations/common/convert_to_lens/types/configurations.ts", + "deprecated": false, + "trackAdoption": false + }, + { + "parentPluginId": "visualizations", + "id": "def-common.MetricVisConfiguration.maxCols", + "type": "number", + "tags": [], + "label": "maxCols", + "description": [], + "signature": [ + "number | undefined" + ], + "path": "src/plugins/visualizations/common/convert_to_lens/types/configurations.ts", + "deprecated": false, + "trackAdoption": false + } + ], + "initialIsOpen": false + }, { "parentPluginId": "visualizations", "id": "def-common.MovingAverageParams", @@ -11891,6 +12088,14 @@ "docId": "kibVisualizationsPluginApi", "section": "def-common.TableVisConfiguration", "text": "TableVisConfiguration" + }, + " | ", + { + "pluginId": "visualizations", + "scope": "common", + "docId": "kibVisualizationsPluginApi", + "section": "def-common.MetricVisConfiguration", + "text": "MetricVisConfiguration" } ], "path": "src/plugins/visualizations/common/convert_to_lens/types/configurations.ts", diff --git a/api_docs/visualizations.mdx b/api_docs/visualizations.mdx index e5907aaf8a8a5..6e29fc3d03f29 100644 --- a/api_docs/visualizations.mdx +++ b/api_docs/visualizations.mdx @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visualizations title: "visualizations" image: https://source.unsplash.com/400x175/?github description: API docs for the visualizations plugin -date: 2022-09-28 +date: 2022-09-29 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visualizations'] --- import visualizationsObj from './visualizations.devdocs.json'; @@ -21,7 +21,7 @@ Contact [Vis Editors](https://github.com/orgs/elastic/teams/kibana-vis-editors) | Public API count | Any count | Items lacking comments | Missing exports | |-------------------|-----------|------------------------|-----------------| -| 679 | 12 | 649 | 18 | +| 693 | 12 | 663 | 18 | ## Client From ea046acd24a6ec30789c90b6a5c5c1b1148f65ee Mon Sep 17 00:00:00 2001 From: Uladzislau Lasitsa Date: Thu, 29 Sep 2022 09:32:55 +0300 Subject: [PATCH 75/95] [Agg based pie][Lens]Navigate to lens Agg based pie (#140879) * Added support for converting Agg-based pie to Lens. * Fixed problem with removed index pattern. * Made some changes for uniformity. * Fixed label of go back to. * Fixed legend display if uiState was changed. * Fixed configuration. * Removed as string[]. * Fixed code according to the nit. * Allowed 3 segments and restricted converting of split_row/split_column. * Fixed tests. * Refactored functional tests. * Added functional tests for pie. Co-authored-by: Yaroslav Kuznietsov Co-authored-by: Joe Reuter --- .../pie_vis_function.test.ts.snap | 2 + .../expression_functions/pie_vis_function.ts | 1 + .../common/types/expression_renderers.ts | 1 + .../partition_vis_renderer.tsx | 13 +- src/plugins/vis_types/pie/kibana.json | 4 +- .../configurations/index.test.ts | 104 ++++++++++ .../convert_to_lens/configurations/index.ts | 79 +++++++ .../pie/public/convert_to_lens/index.test.ts | 77 +++++++ .../pie/public/convert_to_lens/index.ts | 79 +++++++ .../pie/public/convert_to_lens/types.ts | 20 ++ src/plugins/vis_types/pie/public/plugin.ts | 13 +- .../pie/public/sample_vis.test.mocks.ts | 3 + src/plugins/vis_types/pie/public/services.ts | 13 ++ .../vis_types/pie/public/vis_type/pie.ts | 7 + .../common/convert_to_lens/constants.ts | 64 ++++++ .../convert_to_lens/types/configurations.ts | 80 +++++--- .../public/convert_to_lens/schemas.ts | 26 ++- .../components/visualize_top_nav.tsx | 10 +- .../workspace_panel/chart_switch.tsx | 6 +- .../indexpattern_suggestions.test.tsx | 6 +- .../indexpattern_suggestions.ts | 1 + .../operations/layer_helpers.ts | 30 ++- .../visualize_agg_based_vis_actions.ts | 2 +- x-pack/plugins/lens/public/types.ts | 8 +- .../datatable/visualization.tsx | 10 +- .../partition/suggestions.test.ts | 24 ++- .../visualizations/partition/suggestions.ts | 13 +- .../partition/visualization.tsx | 43 ++++ .../visualizations/xy/xy_suggestions.ts | 7 +- .../test/functional/apps/lens/group3/index.ts | 2 +- .../group3/open_in_lens/agg_based/index.ts | 14 ++ .../lens/group3/open_in_lens/agg_based/pie.ts | 68 +++++++ .../apps/lens/group3/open_in_lens/index.ts | 15 ++ .../group3/open_in_lens/tsvb/dashboard.ts | 101 +++++++++ .../lens/group3/open_in_lens/tsvb/index.ts | 16 ++ .../lens/group3/open_in_lens/tsvb/metric.ts | 44 ++++ .../group3/open_in_lens/tsvb/timeseries.ts | 87 ++++++++ .../apps/lens/group3/tsvb_open_in_lens.ts | 192 ------------------ 38 files changed, 1010 insertions(+), 275 deletions(-) create mode 100644 src/plugins/vis_types/pie/public/convert_to_lens/configurations/index.test.ts create mode 100644 src/plugins/vis_types/pie/public/convert_to_lens/configurations/index.ts create mode 100644 src/plugins/vis_types/pie/public/convert_to_lens/index.test.ts create mode 100644 src/plugins/vis_types/pie/public/convert_to_lens/index.ts create mode 100644 src/plugins/vis_types/pie/public/convert_to_lens/types.ts create mode 100644 src/plugins/vis_types/pie/public/services.ts create mode 100644 x-pack/test/functional/apps/lens/group3/open_in_lens/agg_based/index.ts create mode 100644 x-pack/test/functional/apps/lens/group3/open_in_lens/agg_based/pie.ts create mode 100644 x-pack/test/functional/apps/lens/group3/open_in_lens/index.ts create mode 100644 x-pack/test/functional/apps/lens/group3/open_in_lens/tsvb/dashboard.ts create mode 100644 x-pack/test/functional/apps/lens/group3/open_in_lens/tsvb/index.ts create mode 100644 x-pack/test/functional/apps/lens/group3/open_in_lens/tsvb/metric.ts create mode 100644 x-pack/test/functional/apps/lens/group3/open_in_lens/tsvb/timeseries.ts delete mode 100644 x-pack/test/functional/apps/lens/group3/tsvb_open_in_lens.ts diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/__snapshots__/pie_vis_function.test.ts.snap b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/__snapshots__/pie_vis_function.test.ts.snap index 0f64f4c0a4779..3fd9966e7524e 100644 --- a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/__snapshots__/pie_vis_function.test.ts.snap +++ b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/__snapshots__/pie_vis_function.test.ts.snap @@ -26,6 +26,7 @@ Object { "as": "partitionVis", "type": "render", "value": Object { + "canNavigateToLens": false, "params": Object { "listenOnChange": true, }, @@ -160,6 +161,7 @@ Object { "as": "partitionVis", "type": "render", "value": Object { + "canNavigateToLens": false, "params": Object { "listenOnChange": true, }, diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/pie_vis_function.ts b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/pie_vis_function.ts index 5b69fbc6194fd..119d45f579ebf 100644 --- a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/pie_vis_function.ts +++ b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/pie_vis_function.ts @@ -188,6 +188,7 @@ export const pieVisFunction = (): PieVisExpressionFunctionDefinition => ({ visConfig, syncColors: handlers?.isSyncColorsEnabled?.() ?? false, visType: args.isDonut ? ChartTypes.DONUT : ChartTypes.PIE, + canNavigateToLens: Boolean(handlers?.variables?.canNavigateToLens), params: { listenOnChange: true, }, diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/types/expression_renderers.ts b/src/plugins/chart_expressions/expression_partition_vis/common/types/expression_renderers.ts index 2f436de90e138..6a8fd2935ba54 100644 --- a/src/plugins/chart_expressions/expression_partition_vis/common/types/expression_renderers.ts +++ b/src/plugins/chart_expressions/expression_partition_vis/common/types/expression_renderers.ts @@ -108,6 +108,7 @@ export interface RenderValue { visType: ChartTypes; visConfig: PartitionVisParams; syncColors: boolean; + canNavigateToLens?: boolean; } export enum LabelPositions { diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/expression_renderers/partition_vis_renderer.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/expression_renderers/partition_vis_renderer.tsx index 546b70d98c6eb..4b6fe45e4df92 100644 --- a/src/plugins/chart_expressions/expression_partition_vis/public/expression_renderers/partition_vis_renderer.tsx +++ b/src/plugins/chart_expressions/expression_partition_vis/public/expression_renderers/partition_vis_renderer.tsx @@ -49,7 +49,11 @@ export const getPartitionVisRenderer: ( displayName: strings.getDisplayName(), help: strings.getHelpDescription(), reuseDomNode: true, - render: async (domNode, { visConfig, visData, visType, syncColors }, handlers) => { + render: async ( + domNode, + { visConfig, visData, visType, syncColors, canNavigateToLens }, + handlers + ) => { const { core, plugins } = getStartDeps(); handlers.onDestroy(() => { @@ -62,9 +66,12 @@ export const getPartitionVisRenderer: ( const visualizationType = extractVisualizationType(executionContext); if (containerType && visualizationType) { - plugins.usageCollection?.reportUiCounter(containerType, METRIC_TYPE.COUNT, [ + const events = [ `render_${visualizationType}_${visType}`, - ]); + canNavigateToLens ? `render_${visualizationType}_${visType}_convertable` : undefined, + ].filter((event): event is string => Boolean(event)); + + plugins.usageCollection?.reportUiCounter(containerType, METRIC_TYPE.COUNT, events); } handlers.done(); }; diff --git a/src/plugins/vis_types/pie/kibana.json b/src/plugins/vis_types/pie/kibana.json index abed576cc6732..4c5ee6b50579e 100644 --- a/src/plugins/vis_types/pie/kibana.json +++ b/src/plugins/vis_types/pie/kibana.json @@ -3,8 +3,8 @@ "version": "kibana", "ui": true, "server": true, - "requiredPlugins": ["charts", "data", "expressions", "visualizations", "usageCollection", "expressionPartitionVis"], - "requiredBundles": ["visDefaultEditor"], + "requiredPlugins": ["charts", "data", "expressions", "visualizations", "usageCollection", "expressionPartitionVis", "dataViews"], + "requiredBundles": ["visDefaultEditor", "kibanaUtils"], "extraPublicDirs": ["common/index"], "owner": { "name": "Vis Editors", diff --git a/src/plugins/vis_types/pie/public/convert_to_lens/configurations/index.test.ts b/src/plugins/vis_types/pie/public/convert_to_lens/configurations/index.test.ts new file mode 100644 index 0000000000000..0a10a5bd7c0c0 --- /dev/null +++ b/src/plugins/vis_types/pie/public/convert_to_lens/configurations/index.test.ts @@ -0,0 +1,104 @@ +/* + * 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. + */ + +import { getConfiguration } from '.'; +import { samplePieVis } from '../../sample_vis.test.mocks'; + +describe('getConfiguration', () => { + beforeEach(() => { + jest.clearAllMocks(); + }); + + test('should return correct configuration', () => { + samplePieVis.uiState.get.mockReturnValueOnce(undefined); + expect( + getConfiguration('test1', samplePieVis as any, { + metrics: ['metric-1'], + buckets: ['bucket-1'], + }) + ).toEqual({ + layers: [ + { + categoryDisplay: undefined, + emptySizeRatio: undefined, + layerId: 'test1', + layerType: 'data', + legendDisplay: 'show', + legendMaxLines: 1, + legendPosition: 'right', + legendSize: 'large', + metric: 'metric-1', + nestedLegend: true, + numberDisplay: 'percent', + percentDecimals: 2, + primaryGroups: ['bucket-1'], + secondaryGroups: [], + showValuesInLegend: true, + truncateLegend: true, + }, + ], + shape: 'donut', + palette: undefined, + }); + }); + + test('should return legendDisplay = show if uiState contains truthy value', () => { + samplePieVis.uiState.get.mockReturnValueOnce(true); + expect( + getConfiguration( + 'test1', + { ...samplePieVis, params: { ...samplePieVis.params, legendDisplay: 'hide' } } as any, + { + metrics: ['metric-1'], + buckets: ['bucket-1'], + } + ) + ).toEqual({ + layers: [expect.objectContaining({ legendDisplay: 'show' })], + shape: 'donut', + palette: undefined, + }); + }); + + test('should return legendDisplay = hide if uiState contains falsy value', () => { + samplePieVis.uiState.get.mockReturnValueOnce(false); + expect( + getConfiguration( + 'test1', + { ...samplePieVis, params: { ...samplePieVis.params, legendDisplay: 'show' } } as any, + { + metrics: ['metric-1'], + buckets: ['bucket-1'], + } + ) + ).toEqual({ + layers: [expect.objectContaining({ legendDisplay: 'hide' })], + shape: 'donut', + palette: undefined, + }); + }); + + test('should return value of legendDisplay if uiState contains undefined value', () => { + samplePieVis.uiState.get.mockReturnValueOnce(undefined); + const legendDisplay = 'show'; + expect( + getConfiguration( + 'test1', + { ...samplePieVis, params: { ...samplePieVis.params, legendDisplay } } as any, + { + metrics: ['metric-1'], + buckets: ['bucket-1'], + } + ) + ).toEqual({ + layers: [expect.objectContaining({ legendDisplay })], + shape: 'donut', + palette: undefined, + }); + }); +}); diff --git a/src/plugins/vis_types/pie/public/convert_to_lens/configurations/index.ts b/src/plugins/vis_types/pie/public/convert_to_lens/configurations/index.ts new file mode 100644 index 0000000000000..9a3420581c1fd --- /dev/null +++ b/src/plugins/vis_types/pie/public/convert_to_lens/configurations/index.ts @@ -0,0 +1,79 @@ +/* + * 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. + */ + +import { LegendDisplay, PartitionVisParams } from '@kbn/expression-partition-vis-plugin/common'; +import { + CategoryDisplayTypes, + NumberDisplayTypes, + PartitionVisConfiguration, +} from '@kbn/visualizations-plugin/common/convert_to_lens'; +import { Vis } from '@kbn/visualizations-plugin/public'; + +const getLayers = ( + layerId: string, + vis: Vis, + metrics: string[], + buckets: string[] +): PartitionVisConfiguration['layers'] => { + const legendOpen = vis.uiState.get('vis.legendOpen'); + const legendDisplayFromUiState = + legendOpen !== undefined ? (legendOpen ? LegendDisplay.SHOW : LegendDisplay.HIDE) : undefined; + + const showValuesInLegend = + vis.params.labels.values ?? + vis.params.showValuesInLegend ?? + vis.type.visConfig.defaults.showValuesInLegend; + + return [ + { + layerId, + layerType: 'data' as const, + primaryGroups: buckets, + secondaryGroups: [], + metric: metrics[0], + numberDisplay: + showValuesInLegend === false + ? NumberDisplayTypes.HIDDEN + : vis.params.labels.valuesFormat ?? vis.type.visConfig.defaults.labels.valuesFormat, + categoryDisplay: vis.params.labels.show + ? vis.params.labels.position ?? vis.type.visConfig.defaults.labels.position + : CategoryDisplayTypes.HIDE, + legendDisplay: + legendDisplayFromUiState ?? + vis.params.legendDisplay ?? + vis.type.visConfig.defaults.legendDisplay, + legendPosition: vis.params.legendPosition ?? vis.type.visConfig.defaults.legendPosition, + showValuesInLegend, + nestedLegend: vis.params.nestedLegend ?? vis.type.visConfig.defaults.nestedLegend, + percentDecimals: + vis.params.labels.percentDecimals ?? vis.type.visConfig.defaults.labels.percentDecimals, + emptySizeRatio: vis.params.emptySizeRatio ?? vis.type.visConfig.defaults.emptySizeRatio, + legendMaxLines: vis.params.maxLegendLines ?? vis.type.visConfig.defaults.maxLegendLines, + legendSize: vis.params.legendSize ?? vis.type.visConfig.defaults.legendSize, + truncateLegend: vis.params.truncateLegend ?? vis.type.visConfig.defaults.truncateLegend, + }, + ]; +}; + +export const getConfiguration = ( + layerId: string, + vis: Vis, + { + metrics, + buckets, + }: { + metrics: string[]; + buckets: string[]; + } +): PartitionVisConfiguration => { + return { + shape: vis.params.isDonut ? 'donut' : 'pie', + layers: getLayers(layerId, vis, metrics, buckets), + palette: vis.params.palette, + }; +}; diff --git a/src/plugins/vis_types/pie/public/convert_to_lens/index.test.ts b/src/plugins/vis_types/pie/public/convert_to_lens/index.test.ts new file mode 100644 index 0000000000000..c1e39d741f84d --- /dev/null +++ b/src/plugins/vis_types/pie/public/convert_to_lens/index.test.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 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 { convertToLens } from '.'; +import { samplePieVis } from '../sample_vis.test.mocks'; + +const mockGetColumnsFromVis = jest.fn(); +const mockGetConfiguration = jest.fn().mockReturnValue({}); + +jest.mock('../services', () => ({ + getDataViewsStart: jest.fn(() => ({ get: () => ({}), getDefault: () => ({}) })), +})); + +jest.mock('@kbn/visualizations-plugin/public', () => ({ + convertToLensModule: Promise.resolve({ + getColumnsFromVis: jest.fn(() => mockGetColumnsFromVis()), + }), + getDataViewByIndexPatternId: jest.fn(() => ({ id: 'index-pattern' })), +})); + +jest.mock('./configurations', () => ({ + getConfiguration: jest.fn(() => mockGetConfiguration()), +})); + +describe('convertToLens', () => { + afterEach(() => { + jest.clearAllMocks(); + }); + + test('should return null if getColumnsFromVis returns null', async () => { + mockGetColumnsFromVis.mockReturnValue(null); + const result = await convertToLens(samplePieVis as any, {} as any); + expect(mockGetColumnsFromVis).toBeCalledTimes(1); + expect(result).toBeNull(); + }); + + test('should return null if more than three split slice levels', async () => { + mockGetColumnsFromVis.mockReturnValue({ + buckets: ['1', '2', '3', '4'], + }); + const result = await convertToLens(samplePieVis as any, {} as any); + expect(mockGetColumnsFromVis).toBeCalledTimes(1); + expect(result).toBeNull(); + }); + + test('should return null if no one split slices', async () => { + mockGetColumnsFromVis.mockReturnValue({ + buckets: [], + }); + const result = await convertToLens(samplePieVis as any, {} as any); + expect(mockGetColumnsFromVis).toBeCalledTimes(1); + expect(result).toBeNull(); + }); + + test('should state for valid vis', async () => { + mockGetColumnsFromVis.mockReturnValue({ + buckets: ['2'], + columns: [{ columnId: '2' }, { columnId: '1' }], + }); + const result = await convertToLens(samplePieVis as any, {} as any); + expect(mockGetColumnsFromVis).toBeCalledTimes(1); + expect(mockGetConfiguration).toBeCalledTimes(1); + expect(result?.type).toEqual('lnsPie'); + expect(result?.layers.length).toEqual(1); + expect(result?.layers[0]).toEqual( + expect.objectContaining({ + columnOrder: [], + columns: [{ columnId: '2' }, { columnId: '1' }], + }) + ); + }); +}); diff --git a/src/plugins/vis_types/pie/public/convert_to_lens/index.ts b/src/plugins/vis_types/pie/public/convert_to_lens/index.ts new file mode 100644 index 0000000000000..5b1973507c7df --- /dev/null +++ b/src/plugins/vis_types/pie/public/convert_to_lens/index.ts @@ -0,0 +1,79 @@ +/* + * 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. + */ + +import { Column, ColumnWithMeta } from '@kbn/visualizations-plugin/common'; +import { + convertToLensModule, + getDataViewByIndexPatternId, +} from '@kbn/visualizations-plugin/public'; +import uuid from 'uuid'; +import { getDataViewsStart } from '../services'; +import { getConfiguration } from './configurations'; +import { ConvertPieToLensVisualization } from './types'; + +export const isColumnWithMeta = (column: Column): column is ColumnWithMeta => { + if ((column as ColumnWithMeta).meta) { + return true; + } + return false; +}; + +export const excludeMetaFromColumn = (column: Column) => { + if (isColumnWithMeta(column)) { + const { meta, ...rest } = column; + return rest; + } + return column; +}; + +export const convertToLens: ConvertPieToLensVisualization = async (vis, timefilter) => { + if (!timefilter) { + return null; + } + + const dataViews = getDataViewsStart(); + const dataView = await getDataViewByIndexPatternId(vis.data.indexPattern?.id, dataViews); + + if (!dataView) { + return null; + } + + const { getColumnsFromVis } = await convertToLensModule; + const result = getColumnsFromVis(vis, timefilter, dataView, { + buckets: [], + splits: ['segment'], + unsupported: ['split_row', 'split_column'], + }); + + if (result === null) { + return null; + } + + // doesn't support more than three split slice levels + // doesn't support pie without at least one split slice + if (result.buckets.length > 3 || !result.buckets.length) { + return null; + } + + const layerId = uuid(); + + const indexPatternId = dataView.id!; + return { + type: 'lnsPie', + layers: [ + { + indexPatternId, + layerId, + columns: result.columns.map(excludeMetaFromColumn), + columnOrder: [], + }, + ], + configuration: getConfiguration(layerId, vis, result), + indexPatternIds: [indexPatternId], + }; +}; diff --git a/src/plugins/vis_types/pie/public/convert_to_lens/types.ts b/src/plugins/vis_types/pie/public/convert_to_lens/types.ts new file mode 100644 index 0000000000000..b190a4c891304 --- /dev/null +++ b/src/plugins/vis_types/pie/public/convert_to_lens/types.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 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 { TimefilterContract } from '@kbn/data-plugin/public'; +import { PartitionVisParams } from '@kbn/expression-partition-vis-plugin/common'; +import { + NavigateToLensContext, + PartitionVisConfiguration, +} from '@kbn/visualizations-plugin/common'; +import { Vis } from '@kbn/visualizations-plugin/public'; + +export type ConvertPieToLensVisualization = ( + vis: Vis, + timefilter?: TimefilterContract +) => Promise | null>; diff --git a/src/plugins/vis_types/pie/public/plugin.ts b/src/plugins/vis_types/pie/public/plugin.ts index 480cf0c49db63..b4a8c0e3a2a69 100644 --- a/src/plugins/vis_types/pie/public/plugin.ts +++ b/src/plugins/vis_types/pie/public/plugin.ts @@ -6,13 +6,15 @@ * Side Public License, v 1. */ -import { CoreSetup, DocLinksStart, ThemeServiceStart } from '@kbn/core/public'; +import { CoreSetup, CoreStart, DocLinksStart, ThemeServiceStart } from '@kbn/core/public'; import { VisualizationsSetup } from '@kbn/visualizations-plugin/public'; import { ChartsPluginSetup } from '@kbn/charts-plugin/public'; import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public'; +import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public'; import { DataPublicPluginStart } from '@kbn/data-plugin/public'; import { LEGACY_PIE_CHARTS_LIBRARY } from '../common'; import { pieVisType } from './vis_type'; +import { setDataViewsStart } from './services'; /** @internal */ export interface VisTypePieSetupDependencies { @@ -21,6 +23,11 @@ export interface VisTypePieSetupDependencies { usageCollection: UsageCollectionSetup; } +/** @internal */ +export interface VisTypePieStartDependencies { + dataViews: DataViewsPublicPluginStart; +} + /** @internal */ export interface VisTypePiePluginStartDependencies { data: DataPublicPluginStart; @@ -53,5 +60,7 @@ export class VisTypePiePlugin { return {}; } - start() {} + start(core: CoreStart, { dataViews }: VisTypePieStartDependencies) { + setDataViewsStart(dataViews); + } } diff --git a/src/plugins/vis_types/pie/public/sample_vis.test.mocks.ts b/src/plugins/vis_types/pie/public/sample_vis.test.mocks.ts index 3525b7b6fbc05..035432de9ad23 100644 --- a/src/plugins/vis_types/pie/public/sample_vis.test.mocks.ts +++ b/src/plugins/vis_types/pie/public/sample_vis.test.mocks.ts @@ -9,6 +9,8 @@ import { LegendDisplay } from '@kbn/expression-partition-vis-plugin/common'; import { LegendSize } from '@kbn/visualizations-plugin/common'; +const mockUiStateGet = jest.fn().mockReturnValue(() => false); + export const samplePieVis = { type: { name: 'pie', @@ -1353,5 +1355,6 @@ export const samplePieVis = { vis: { legendOpen: false, }, + get: mockUiStateGet, }, }; diff --git a/src/plugins/vis_types/pie/public/services.ts b/src/plugins/vis_types/pie/public/services.ts new file mode 100644 index 0000000000000..736ad70d49419 --- /dev/null +++ b/src/plugins/vis_types/pie/public/services.ts @@ -0,0 +1,13 @@ +/* + * 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. + */ + +import { createGetterSetter } from '@kbn/kibana-utils-plugin/public'; +import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public'; + +export const [getDataViewsStart, setDataViewsStart] = + createGetterSetter('dataViews'); diff --git a/src/plugins/vis_types/pie/public/vis_type/pie.ts b/src/plugins/vis_types/pie/public/vis_type/pie.ts index 6d48507cf47a3..8d4b7b6828e39 100644 --- a/src/plugins/vis_types/pie/public/vis_type/pie.ts +++ b/src/plugins/vis_types/pie/public/vis_type/pie.ts @@ -21,6 +21,7 @@ import { DEFAULT_PERCENT_DECIMALS } from '../../common'; import { PieTypeProps } from '../types'; import { toExpressionAst } from '../to_ast'; import { getPieOptions } from '../editor/components'; +import { convertToLens } from '../convert_to_lens'; export const getPieVisTypeDefinition = ({ showElasticChartsOptions = false, @@ -123,4 +124,10 @@ export const getPieVisTypeDefinition = ({ }, hierarchicalData: true, requiresSearch: true, + navigateToLens: async (vis, timefilter) => (vis ? convertToLens(vis, timefilter) : null), + getExpressionVariables: async (vis, timeFilter) => { + return { + canNavigateToLens: Boolean(vis?.params ? await convertToLens(vis, timeFilter) : null), + }; + }, }); diff --git a/src/plugins/visualizations/common/convert_to_lens/constants.ts b/src/plugins/visualizations/common/convert_to_lens/constants.ts index fa92b881033c7..12ed815bc7247 100644 --- a/src/plugins/visualizations/common/convert_to_lens/constants.ts +++ b/src/plugins/visualizations/common/convert_to_lens/constants.ts @@ -36,6 +36,70 @@ export const OperationsWithReferences = { export const Operations = { ...OperationsWithSourceField, ...OperationsWithReferences } as const; +export const PartitionChartTypes = { + PIE: 'pie', + DONUT: 'donut', + TREEMAP: 'treemap', + MOSAIC: 'mosaic', + WAFFLE: 'waffle', +} as const; + +export const CategoryDisplayTypes = { + DEFAULT: 'default', + INSIDE: 'inside', + HIDE: 'hide', +} as const; + +export const NumberDisplayTypes = { + HIDDEN: 'hidden', + PERCENT: 'percent', + VALUE: 'value', +} as const; + +export const LegendDisplayTypes = { + DEFAULT: 'default', + SHOW: 'show', + HIDE: 'hide', +} as const; + +export const LayerTypes = { + DATA: 'data', + REFERENCELINE: 'referenceLine', + ANNOTATIONS: 'annotations', +} as const; + +export const XYCurveTypes = { + LINEAR: 'LINEAR', + CURVE_MONOTONE_X: 'CURVE_MONOTONE_X', + CURVE_STEP_AFTER: 'CURVE_STEP_AFTER', +} as const; + +export const YAxisModes = { + AUTO: 'auto', + LEFT: 'left', + RIGHT: 'right', + BOTTOM: 'bottom', +} as const; + +export const SeriesTypes = { + BAR: 'bar', + LINE: 'line', + AREA: 'area', + BAR_STACKED: 'bar_stacked', + AREA_STACKED: 'area_stacked', + BAR_HORIZONTAL: 'bar_horizontal', + BAR_PERCENTAGE_STACKED: 'bar_percentage_stacked', + BAR_HORIZONTAL_STACKED: 'bar_horizontal_stacked', + AREA_PERCENTAGE_STACKED: 'area_percentage_stacked', + BAR_HORIZONTAL_PERCENTAGE_STACKED: 'bar_horizontal_percentage_stacked', +} as const; + +export const FillTypes = { + NONE: 'none', + ABOVE: 'above', + BELOW: 'below', +} as const; + export const RANGE_MODES = { Range: 'range', Histogram: 'histogram', diff --git a/src/plugins/visualizations/common/convert_to_lens/types/configurations.ts b/src/plugins/visualizations/common/convert_to_lens/types/configurations.ts index fc1e440db3506..a6a771d07e7a6 100644 --- a/src/plugins/visualizations/common/convert_to_lens/types/configurations.ts +++ b/src/plugins/visualizations/common/convert_to_lens/types/configurations.ts @@ -11,43 +11,27 @@ import { $Values } from '@kbn/utility-types'; import type { CustomPaletteParams, PaletteOutput } from '@kbn/coloring'; import { KibanaQueryOutput } from '@kbn/data-plugin/common'; import { LegendSize } from '../../constants'; - -export const XYCurveTypes = { - LINEAR: 'LINEAR', - CURVE_MONOTONE_X: 'CURVE_MONOTONE_X', - CURVE_STEP_AFTER: 'CURVE_STEP_AFTER', -} as const; - -export const YAxisModes = { - AUTO: 'auto', - LEFT: 'left', - RIGHT: 'right', - BOTTOM: 'bottom', -} as const; - -export const SeriesTypes = { - BAR: 'bar', - LINE: 'line', - AREA: 'area', - BAR_STACKED: 'bar_stacked', - AREA_STACKED: 'area_stacked', - BAR_HORIZONTAL: 'bar_horizontal', - BAR_PERCENTAGE_STACKED: 'bar_percentage_stacked', - BAR_HORIZONTAL_STACKED: 'bar_horizontal_stacked', - AREA_PERCENTAGE_STACKED: 'area_percentage_stacked', - BAR_HORIZONTAL_PERCENTAGE_STACKED: 'bar_horizontal_percentage_stacked', -} as const; - -export const FillTypes = { - NONE: 'none', - ABOVE: 'above', - BELOW: 'below', -} as const; +import { + CategoryDisplayTypes, + PartitionChartTypes, + NumberDisplayTypes, + LegendDisplayTypes, + FillTypes, + SeriesTypes, + YAxisModes, + XYCurveTypes, + LayerTypes, +} from '../constants'; export type FillType = $Values; export type SeriesType = $Values; export type YAxisMode = $Values; export type XYCurveType = $Values; +export type PartitionChartType = $Values; +export type CategoryDisplayType = $Values; +export type NumberDisplayType = $Values; +export type LegendDisplayType = $Values; +export type LayerType = $Values; export interface AxisExtentConfig { mode: 'full' | 'custom' | 'dataBounds'; @@ -217,4 +201,34 @@ export interface MetricVisConfiguration { maxCols?: number; } -export type Configuration = XYConfiguration | TableVisConfiguration | MetricVisConfiguration; +export interface PartitionLayerState { + layerId: string; + layerType: LayerType; + primaryGroups: string[]; + secondaryGroups?: string[]; + metric?: string; + collapseFns?: Record; + numberDisplay: NumberDisplayType; + categoryDisplay: CategoryDisplayType; + legendDisplay: LegendDisplayType; + legendPosition?: Position; + showValuesInLegend?: boolean; + nestedLegend?: boolean; + percentDecimals?: number; + emptySizeRatio?: number; + legendMaxLines?: number; + legendSize?: LegendSize; + truncateLegend?: boolean; +} + +export interface PartitionVisConfiguration { + shape: PartitionChartType; + layers: PartitionLayerState[]; + palette?: PaletteOutput; +} + +export type Configuration = + | XYConfiguration + | TableVisConfiguration + | PartitionVisConfiguration + | MetricVisConfiguration; diff --git a/src/plugins/visualizations/public/convert_to_lens/schemas.ts b/src/plugins/visualizations/public/convert_to_lens/schemas.ts index 372e434ca8868..e9b467074b6f1 100644 --- a/src/plugins/visualizations/public/convert_to_lens/schemas.ts +++ b/src/plugins/visualizations/public/convert_to_lens/schemas.ts @@ -24,14 +24,26 @@ import { sortColumns, } from './utils'; +const areVisSchemasValid = (visSchemas: Schemas, unsupported: Array) => { + const usedUnsupportedSchemas = unsupported.filter( + (schema) => visSchemas[schema] && visSchemas[schema]?.length + ); + return !usedUnsupportedSchemas.length; +}; + export const getColumnsFromVis = ( vis: Vis, timefilter: TimefilterContract, dataView: DataView, - { splits, buckets }: { splits: Array; buckets: Array } = { - splits: [], - buckets: [], - }, + { + splits = [], + buckets = [], + unsupported = [], + }: { + splits?: Array; + buckets?: Array; + unsupported?: Array; + } = {}, config?: { dropEmptyRowsInDateHistogram?: boolean; } @@ -41,7 +53,7 @@ export const getColumnsFromVis = ( timeRange: timefilter.getAbsoluteTime(), }); - if (!isValidVis(visSchemas)) { + if (!isValidVis(visSchemas) || !areVisSchemasValid(visSchemas, unsupported)) { return null; } @@ -111,8 +123,8 @@ export const getColumnsFromVis = ( const columnsWithoutReferenced = getColumnsWithoutReferenced(columns); return { - metrics: getColumnIds(metrics), - buckets: getColumnIds([...bucketColumns, ...splitBucketColumns, ...customBucketColumns]), + metrics: getColumnIds(columnsWithoutReferenced.filter((с) => !с.isBucketed)), + buckets: getColumnIds(columnsWithoutReferenced.filter((c) => c.isBucketed)), bucketCollapseFn: getBucketCollapseFn(visSchemas.metric, customBucketColumns), columnsWithoutReferenced, columns, diff --git a/src/plugins/visualizations/public/visualize_app/components/visualize_top_nav.tsx b/src/plugins/visualizations/public/visualize_app/components/visualize_top_nav.tsx index 500a5e5b34d41..055b326b8f19f 100644 --- a/src/plugins/visualizations/public/visualize_app/components/visualize_top_nav.tsx +++ b/src/plugins/visualizations/public/visualize_app/components/visualize_top_nav.tsx @@ -96,6 +96,7 @@ const TopNav = ({ [doReload] ); + const uiStateJSON = useMemo(() => vis.uiState.toJSON(), [vis.uiState]); useEffect(() => { const asyncGetTriggerContext = async () => { if (vis.type.navigateToLens) { @@ -107,7 +108,14 @@ const TopNav = ({ } }; asyncGetTriggerContext(); - }, [services.data.query.timefilter.timefilter, vis, vis.type, vis.params, vis.data.indexPattern]); + }, [ + services.data.query.timefilter.timefilter, + vis, + vis.type, + vis.params, + uiStateJSON?.vis, + vis.data.indexPattern, + ]); const displayEditInLensItem = Boolean(vis.type.navigateToLens && editInLensConfig); const config = useMemo(() => { diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch.tsx index 2e81f9443ff15..dc09baf01fb2a 100644 --- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch.tsx +++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch.tsx @@ -534,12 +534,8 @@ function getTopSuggestion( ); }); - // We prefer unchanged or reduced suggestions when switching - // charts since that allows you to switch from A to B and back - // to A with the greatest chance of preserving your original state. return ( - suggestions.find((s) => s.changeType === 'unchanged') || - suggestions.find((s) => s.changeType === 'reduced') || + suggestions.find((s) => s.changeType === 'unchanged' || s.changeType === 'reduced') || suggestions[0] ); } diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx index 860c272d9ee19..382c11bda545a 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx +++ b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx @@ -1774,7 +1774,7 @@ describe('IndexPattern Data Source suggestions', () => { state: expect.objectContaining({ layers: { test: expect.objectContaining({ - columnOrder: ['column-id-3', 'column-id-2', 'column-id-1'], + columnOrder: ['column-id-2', 'column-id-3', 'column-id-1'], columns: { 'column-id-1': expect.objectContaining({ operationType: 'count', @@ -1804,10 +1804,10 @@ describe('IndexPattern Data Source suggestions', () => { isMultiRow: true, columns: [ expect.objectContaining({ - columnId: 'column-id-3', + columnId: 'column-id-2', }), expect.objectContaining({ - columnId: 'column-id-2', + columnId: 'column-id-3', }), expect.objectContaining({ columnId: 'column-id-1', diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.ts b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.ts index fed70d2970b1e..8503c369f4ec2 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.ts +++ b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.ts @@ -341,6 +341,7 @@ function createNewLayerWithMetricAggregationFromVizEditor( newLayer = insertNewColumn({ ...column, layer: newLayer, + respectOrder: true, }); } }); diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.ts index 2d8b41ce866b4..b3f1b3bc7d5f3 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.ts +++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.ts @@ -68,6 +68,7 @@ interface ColumnChange { columnParams?: Record; initialParams?: { params: Record }; // TODO: bind this to the op parameter references?: Array>; + respectOrder?: boolean; } interface ColumnCopy { @@ -362,6 +363,7 @@ export function insertNewColumn({ columnParams, initialParams, references, + respectOrder, }: ColumnChange): IndexPatternLayer { const operationDefinition = operationDefinitionMap[op]; @@ -394,7 +396,14 @@ export function insertNewColumn({ : operationDefinition.buildColumn({ ...baseOptions, layer }); return updateDefaultLabels( - addOperationFn(layer, buildColumnFn, columnId, visualizationGroups, targetGroup), + addOperationFn( + layer, + buildColumnFn, + columnId, + visualizationGroups, + targetGroup, + respectOrder + ), indexPattern ); } @@ -445,7 +454,14 @@ export function insertNewColumn({ ) : operationDefinition.buildColumn({ ...baseOptions, layer: tempLayer, referenceIds }); return updateDefaultLabels( - addOperationFn(tempLayer, buildColumnFn, columnId, visualizationGroups, targetGroup), + addOperationFn( + tempLayer, + buildColumnFn, + columnId, + visualizationGroups, + targetGroup, + respectOrder + ), indexPattern ); } @@ -468,7 +484,8 @@ export function insertNewColumn({ operationDefinition.buildColumn({ ...baseOptions, layer, field: invalidField }), columnId, visualizationGroups, - targetGroup + targetGroup, + respectOrder ), indexPattern ); @@ -508,7 +525,7 @@ export function insertNewColumn({ const isBucketed = Boolean(possibleOperation.isBucketed); const addOperationFn = isBucketed ? addBucket : addMetric; return updateDefaultLabels( - addOperationFn(layer, newColumn, columnId, visualizationGroups, targetGroup), + addOperationFn(layer, newColumn, columnId, visualizationGroups, targetGroup, respectOrder), indexPattern ); } @@ -1154,7 +1171,8 @@ function addBucket( column: BaseIndexPatternColumn, addedColumnId: string, visualizationGroups: VisualizationDimensionGroupConfig[], - targetGroup?: string + targetGroup?: string, + respectOrder?: boolean ): IndexPatternLayer { const [buckets, metrics] = partition( layer.columnOrder, @@ -1166,7 +1184,7 @@ function addBucket( ); let updatedColumnOrder: string[] = []; - if (oldDateHistogramIndex > -1 && column.operationType === 'terms') { + if (oldDateHistogramIndex > -1 && column.operationType === 'terms' && !respectOrder) { // Insert the new terms bucket above the first date histogram updatedColumnOrder = [ ...buckets.slice(0, oldDateHistogramIndex), diff --git a/x-pack/plugins/lens/public/trigger_actions/visualize_agg_based_vis_actions.ts b/x-pack/plugins/lens/public/trigger_actions/visualize_agg_based_vis_actions.ts index 2d2b329a7ea67..a5300d550f2c7 100644 --- a/x-pack/plugins/lens/public/trigger_actions/visualize_agg_based_vis_actions.ts +++ b/x-pack/plugins/lens/public/trigger_actions/visualize_agg_based_vis_actions.ts @@ -35,7 +35,7 @@ export const visualizeAggBasedVisAction = (application: ApplicationStart) => type: ACTION_CONVERT_TO_LENS, payload, originatingApp: i18n.translate('xpack.lens.AggBasedLabel', { - defaultMessage: 'Aggregation based visualization', + defaultMessage: 'aggregation based visualization', }), }, }); diff --git a/x-pack/plugins/lens/public/types.ts b/x-pack/plugins/lens/public/types.ts index af2dcc601c996..fc1dc5ed1661c 100644 --- a/x-pack/plugins/lens/public/types.ts +++ b/x-pack/plugins/lens/public/types.ts @@ -17,7 +17,7 @@ import type { IInterpreterRenderHandlers, Datatable, } from '@kbn/expressions-plugin/public'; -import type { NavigateToLensContext } from '@kbn/visualizations-plugin/common'; +import type { Configuration, NavigateToLensContext } from '@kbn/visualizations-plugin/common'; import { Adapters } from '@kbn/inspector-plugin/public'; import type { Query } from '@kbn/es-query'; import type { @@ -217,13 +217,13 @@ export interface InitializationOptions { isFullEditor?: boolean; } -export type VisualizeEditorContext = { +export type VisualizeEditorContext = { savedObjectId?: string; embeddableId?: string; vizEditorOriginatingAppUrl?: string; originatingApp?: string; isVisualizeAction: boolean; -} & NavigateToLensContext; +} & NavigateToLensContext; export interface GetDropPropsArgs { state: T; @@ -1129,7 +1129,7 @@ export interface Visualization { getSuggestionFromConvertToLensContext?: ( props: VisualizationStateFromContextChangeProps - ) => Suggestion; + ) => Suggestion | undefined; } // Use same technique as TriggerContext diff --git a/x-pack/plugins/lens/public/visualizations/datatable/visualization.tsx b/x-pack/plugins/lens/public/visualizations/datatable/visualization.tsx index 72bf5812b7157..4ef58c22969ec 100644 --- a/x-pack/plugins/lens/public/visualizations/datatable/visualization.tsx +++ b/x-pack/plugins/lens/public/visualizations/datatable/visualization.tsx @@ -161,11 +161,19 @@ export const getDatatableVisualization = ({ }, }); + const changeType = table.changeType; + const changeFactor = + changeType === 'reduced' || changeType === 'layers' + ? 0.3 + : changeType === 'unchanged' + ? 0.5 + : 1; + return [ { title, // table with >= 10 columns will have a score of 0.4, fewer columns reduce score - score: (Math.min(table.columns.length, 10) / 10) * 0.4, + score: (Math.min(table.columns.length, 10) / 10) * 0.4 * changeFactor, state: { ...(state || {}), layerId: table.layerId, diff --git a/x-pack/plugins/lens/public/visualizations/partition/suggestions.test.ts b/x-pack/plugins/lens/public/visualizations/partition/suggestions.test.ts index eea673dc531d3..dc0ce54b5bc09 100644 --- a/x-pack/plugins/lens/public/visualizations/partition/suggestions.test.ts +++ b/x-pack/plugins/lens/public/visualizations/partition/suggestions.test.ts @@ -93,7 +93,7 @@ describe('suggestions', () => { ).toHaveLength(0); }); - it('should reject date operations', () => { + it('should hide date operations', () => { expect( suggestions({ table: { @@ -118,11 +118,17 @@ describe('suggestions', () => { }, state: undefined, keptLayerIds: ['first'], - }) - ).toHaveLength(0); + }).map((s) => [s.hide, s.score]) + ).toEqual([ + [true, 0], + [true, 0], + [true, 0], + [true, 0], + [true, 0], + ]); }); - it('should reject histogram operations', () => { + it('should hide histogram operations', () => { expect( suggestions({ table: { @@ -147,8 +153,14 @@ describe('suggestions', () => { }, state: undefined, keptLayerIds: ['first'], - }) - ).toHaveLength(0); + }).map((s) => [s.hide, s.score]) + ).toEqual([ + [true, 0], + [true, 0], + [true, 0], + [true, 0], + [true, 0], + ]); }); it('should not reject histogram operations in case of switching between partition charts', () => { diff --git a/x-pack/plugins/lens/public/visualizations/partition/suggestions.ts b/x-pack/plugins/lens/public/visualizations/partition/suggestions.ts index 36e367ca3ad6f..9f2d0920983ad 100644 --- a/x-pack/plugins/lens/public/visualizations/partition/suggestions.ts +++ b/x-pack/plugins/lens/public/visualizations/partition/suggestions.ts @@ -29,15 +29,10 @@ function hasIntervalScale(columns: TableSuggestionColumn[]) { } function shouldReject({ table, keptLayerIds, state }: SuggestionRequest) { - // Histograms are not good for pi. But we should not reject them on switching between partition charts. - const shouldRejectIntervals = - state?.shape && isPartitionShape(state.shape) ? false : hasIntervalScale(table.columns); - return ( keptLayerIds.length > 1 || (keptLayerIds.length && table.layerId !== keptLayerIds[0]) || table.changeType === 'reorder' || - shouldRejectIntervals || table.columns.some((col) => col.operation.isStaticValue) ); } @@ -111,6 +106,10 @@ export function suggestions({ const results: Array> = []; + // Histograms are not good for pi. But we should not hide suggestion on switching between partition charts. + const shouldHideSuggestion = + state?.shape && isPartitionShape(state.shape) ? false : hasIntervalScale(table.columns); + if ( groups.length <= PartitionChartsMeta.pie.maxBuckets && !hasCustomSuggestionsExists(subVisualizationId) @@ -309,11 +308,11 @@ export function suggestions({ return [...results] .map((suggestion) => ({ ...suggestion, - score: suggestion.score + 0.05 * groups.length, + score: shouldHideSuggestion ? 0 : suggestion.score + 0.05 * groups.length, })) .sort((a, b) => b.score - a.score) .map((suggestion) => ({ ...suggestion, - hide: incompleteConfiguration || suggestion.hide, + hide: shouldHideSuggestion || incompleteConfiguration || suggestion.hide, })); } diff --git a/x-pack/plugins/lens/public/visualizations/partition/visualization.tsx b/x-pack/plugins/lens/public/visualizations/partition/visualization.tsx index 6a58d46b34caa..a60578aa1f0ba 100644 --- a/x-pack/plugins/lens/public/visualizations/partition/visualization.tsx +++ b/x-pack/plugins/lens/public/visualizations/partition/visualization.tsx @@ -14,11 +14,14 @@ import { ThemeServiceStart } from '@kbn/core/public'; import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public'; import { VIS_EVENT_TO_TRIGGER } from '@kbn/visualizations-plugin/public'; import { EuiSpacer } from '@elastic/eui'; +import { PartitionVisConfiguration } from '@kbn/visualizations-plugin/common/convert_to_lens'; import type { Visualization, OperationMetadata, AccessorConfig, VisualizationDimensionGroupConfig, + Suggestion, + VisualizeEditorContext, } from '../../types'; import { getSortedGroups, toExpression, toPreviewExpression } from './to_expression'; import { CategoryDisplay, layerTypes, LegendDisplay, NumberDisplay } from '../../../common'; @@ -27,6 +30,17 @@ import { PartitionChartsMeta } from './partition_charts_meta'; import { DimensionEditor, PieToolbar } from './toolbar'; import { checkTableForContainsSmallValues } from './render_helpers'; import { PieChartTypes, PieLayerState, PieVisualizationState } from '../../../common'; +import { IndexPatternLayer } from '../..'; + +interface DatatableDatasourceState { + [prop: string]: unknown; + layers: IndexPatternLayer[]; +} + +export interface PartitionSuggestion extends Suggestion { + datasourceState: DatatableDatasourceState; + visualizationState: PieVisualizationState; +} function newLayerState(layerId: string): PieLayerState { return { @@ -42,6 +56,12 @@ function newLayerState(layerId: string): PieLayerState { }; } +function isPartitionVisConfiguration( + context: VisualizeEditorContext +): context is VisualizeEditorContext { + return context.type === 'lnsPie'; +} + const bucketedOperations = (op: OperationMetadata) => op.isBucketed; const numberMetricOperations = (op: OperationMetadata) => !op.isBucketed && op.dataType === 'number' && !op.isStaticValue; @@ -422,6 +442,29 @@ export const getPieVisualization = ({ return warningMessages; }, + getSuggestionFromConvertToLensContext(props) { + const context = props.context; + if (!isPartitionVisConfiguration(context)) { + return; + } + if (!props.suggestions.length) { + return; + } + const suggestionByShape = (props.suggestions as PartitionSuggestion[]).find( + (suggestion) => suggestion.visualizationState.shape === context.configuration.shape + ); + if (!suggestionByShape) { + return; + } + return { + ...suggestionByShape, + visualizationState: { + ...suggestionByShape.visualizationState, + ...context.configuration, + }, + }; + }, + getErrorMessages(state) { const hasTooManyBucketDimensions = state.layers .map( diff --git a/x-pack/plugins/lens/public/visualizations/xy/xy_suggestions.ts b/x-pack/plugins/lens/public/visualizations/xy/xy_suggestions.ts index 1184712ae033a..b63bfeb5fbd9b 100644 --- a/x-pack/plugins/lens/public/visualizations/xy/xy_suggestions.ts +++ b/x-pack/plugins/lens/public/visualizations/xy/xy_suggestions.ts @@ -615,7 +615,12 @@ function getScore( changeType: TableChangeType ) { // Unchanged table suggestions half the score because the underlying data doesn't change - const changeFactor = changeType === 'unchanged' ? 0.5 : 1; + const changeFactor = + changeType === 'reduced' || changeType === 'layers' + ? 0.3 + : changeType === 'unchanged' + ? 0.5 + : 1; // chart with multiple y values and split series will have a score of 1, single y value and no split series reduce score return (((yValues.length > 1 ? 2 : 1) + (splitBy ? 1 : 0)) / 3) * changeFactor; } diff --git a/x-pack/test/functional/apps/lens/group3/index.ts b/x-pack/test/functional/apps/lens/group3/index.ts index 44365d5333d16..627e9d560ca21 100644 --- a/x-pack/test/functional/apps/lens/group3/index.ts +++ b/x-pack/test/functional/apps/lens/group3/index.ts @@ -86,7 +86,7 @@ export default ({ getService, loadTestFile, getPageObjects }: FtrProviderContext loadTestFile(require.resolve('./error_handling')); loadTestFile(require.resolve('./lens_tagging')); loadTestFile(require.resolve('./lens_reporting')); - loadTestFile(require.resolve('./tsvb_open_in_lens')); + loadTestFile(require.resolve('./open_in_lens')); // keep these two last in the group in this order because they are messing with the default saved objects loadTestFile(require.resolve('./rollup')); loadTestFile(require.resolve('./no_data')); diff --git a/x-pack/test/functional/apps/lens/group3/open_in_lens/agg_based/index.ts b/x-pack/test/functional/apps/lens/group3/open_in_lens/agg_based/index.ts new file mode 100644 index 0000000000000..b279f0d8a93cd --- /dev/null +++ b/x-pack/test/functional/apps/lens/group3/open_in_lens/agg_based/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; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { FtrProviderContext } from '../../../../../ftr_provider_context'; + +export default function ({ loadTestFile }: FtrProviderContext) { + describe('Agg based Vis to Lens', function () { + loadTestFile(require.resolve('./pie')); + }); +} diff --git a/x-pack/test/functional/apps/lens/group3/open_in_lens/agg_based/pie.ts b/x-pack/test/functional/apps/lens/group3/open_in_lens/agg_based/pie.ts new file mode 100644 index 0000000000000..1640a6a14631d --- /dev/null +++ b/x-pack/test/functional/apps/lens/group3/open_in_lens/agg_based/pie.ts @@ -0,0 +1,68 @@ +/* + * 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 { FtrProviderContext } from '../../../../../ftr_provider_context'; + +export default function ({ getPageObjects, getService }: FtrProviderContext) { + const { visualize, visEditor, lens, timePicker, header } = getPageObjects([ + 'visualize', + 'lens', + 'visEditor', + 'timePicker', + 'header', + ]); + + const testSubjects = getService('testSubjects'); + const pieChart = getService('pieChart'); + + describe('Pie', function describeIndexTests() { + const isNewChartsLibraryEnabled = true; + + before(async () => { + await visualize.initTests(isNewChartsLibraryEnabled); + }); + + beforeEach(async () => { + await visualize.navigateToNewAggBasedVisualization(); + await visualize.clickPieChart(); + await visualize.clickNewSearch(); + await timePicker.setDefaultAbsoluteRange(); + }); + + it('should hide the "Edit Visualization in Lens" menu item if no split slices were defined', async () => { + const button = await testSubjects.exists('visualizeEditInLensButton'); + expect(button).to.eql(false); + }); + + it('should show the "Edit Visualization in Lens" menu item', async () => { + await visEditor.clickBucket('Split slices'); + await visEditor.selectAggregation('Terms'); + await visEditor.selectField('machine.os.raw'); + await header.waitUntilLoadingHasFinished(); + await visEditor.clickGo(isNewChartsLibraryEnabled); + + const button = await testSubjects.exists('visualizeEditInLensButton'); + expect(button).to.eql(true); + }); + + it('should convert to Lens', async () => { + const expectedTableData = ['ios', 'osx', 'win 7', 'win 8', 'win xp']; + await visEditor.clickBucket('Split slices'); + await visEditor.selectAggregation('Terms'); + await visEditor.selectField('machine.os.raw'); + await header.waitUntilLoadingHasFinished(); + await visEditor.clickGo(isNewChartsLibraryEnabled); + + const button = await testSubjects.find('visualizeEditInLensButton'); + await button.click(); + await lens.waitForVisualization('partitionVisChart'); + + await pieChart.expectPieChartLabels(expectedTableData, isNewChartsLibraryEnabled); + }); + }); +} diff --git a/x-pack/test/functional/apps/lens/group3/open_in_lens/index.ts b/x-pack/test/functional/apps/lens/group3/open_in_lens/index.ts new file mode 100644 index 0000000000000..b1d5a1cbb3c52 --- /dev/null +++ b/x-pack/test/functional/apps/lens/group3/open_in_lens/index.ts @@ -0,0 +1,15 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { FtrProviderContext } from '../../../../ftr_provider_context'; + +export default function ({ loadTestFile }: FtrProviderContext) { + describe('Open in Lens', function () { + loadTestFile(require.resolve('./tsvb')); + loadTestFile(require.resolve('./agg_based')); + }); +} diff --git a/x-pack/test/functional/apps/lens/group3/open_in_lens/tsvb/dashboard.ts b/x-pack/test/functional/apps/lens/group3/open_in_lens/tsvb/dashboard.ts new file mode 100644 index 0000000000000..bd74e109326bf --- /dev/null +++ b/x-pack/test/functional/apps/lens/group3/open_in_lens/tsvb/dashboard.ts @@ -0,0 +1,101 @@ +/* + * 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 { FtrProviderContext } from '../../../../../ftr_provider_context'; + +export default function ({ getPageObjects, getService }: FtrProviderContext) { + const { visualize, visualBuilder, lens, timeToVisualize, dashboard, canvas } = getPageObjects([ + 'visualBuilder', + 'visualize', + 'lens', + 'timeToVisualize', + 'dashboard', + 'canvas', + ]); + + const testSubjects = getService('testSubjects'); + const retry = getService('retry'); + const panelActions = getService('dashboardPanelActions'); + const dashboardAddPanel = getService('dashboardAddPanel'); + + describe('Dashboard to TSVB to Lens', function describeIndexTests() { + before(async () => { + await visualize.initTests(); + }); + + it('should convert a by value TSVB viz to a Lens viz', async () => { + await visualize.navigateToNewVisualization(); + await visualize.clickVisualBuilder(); + await visualBuilder.checkVisualBuilderIsPresent(); + await visualBuilder.resetPage(); + await testSubjects.click('visualizeSaveButton'); + + await timeToVisualize.saveFromModal('My TSVB to Lens viz 1', { + addToDashboard: 'new', + saveToLibrary: false, + }); + + await dashboard.waitForRenderComplete(); + const originalEmbeddableCount = await canvas.getEmbeddableCount(); + await panelActions.openContextMenu(); + await panelActions.clickEdit(); + + const button = await testSubjects.find('visualizeEditInLensButton'); + await button.click(); + await lens.waitForVisualization('xyVisChart'); + await retry.try(async () => { + const dimensions = await testSubjects.findAll('lns-dimensionTrigger'); + expect(await dimensions[1].getVisibleText()).to.be('Count of records'); + }); + + await lens.saveAndReturn(); + await retry.try(async () => { + const embeddableCount = await canvas.getEmbeddableCount(); + expect(embeddableCount).to.eql(originalEmbeddableCount); + }); + await panelActions.removePanel(); + }); + + it('should convert a by reference TSVB viz to a Lens viz', async () => { + await dashboardAddPanel.clickEditorMenuButton(); + await dashboardAddPanel.clickVisType('metrics'); + await testSubjects.click('visualizesaveAndReturnButton'); + // save it to library + const originalPanel = await testSubjects.find('embeddablePanelHeading-'); + await panelActions.saveToLibrary('My TSVB to Lens viz 2', originalPanel); + + await dashboard.waitForRenderComplete(); + const originalEmbeddableCount = await canvas.getEmbeddableCount(); + await panelActions.openContextMenu(); + await panelActions.clickEdit(); + + const button = await testSubjects.find('visualizeEditInLensButton'); + await button.click(); + await lens.waitForVisualization('legacyMtrVis'); + await retry.try(async () => { + const dimensions = await testSubjects.findAll('lns-dimensionTrigger'); + expect(await dimensions[1].getVisibleText()).to.be('Count of records'); + }); + + await lens.saveAndReturn(); + await retry.try(async () => { + const embeddableCount = await canvas.getEmbeddableCount(); + expect(embeddableCount).to.eql(originalEmbeddableCount); + }); + + const panel = await testSubjects.find(`embeddablePanelHeading-`); + const descendants = await testSubjects.findAllDescendant( + 'embeddablePanelNotification-ACTION_LIBRARY_NOTIFICATION', + panel + ); + expect(descendants.length).to.equal(0); + + await panelActions.removePanel(); + }); + }); +} diff --git a/x-pack/test/functional/apps/lens/group3/open_in_lens/tsvb/index.ts b/x-pack/test/functional/apps/lens/group3/open_in_lens/tsvb/index.ts new file mode 100644 index 0000000000000..c786ed22c6a1a --- /dev/null +++ b/x-pack/test/functional/apps/lens/group3/open_in_lens/tsvb/index.ts @@ -0,0 +1,16 @@ +/* + * 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 { FtrProviderContext } from '../../../../../ftr_provider_context'; + +export default function ({ loadTestFile }: FtrProviderContext) { + describe('TSVB to Lens', function () { + loadTestFile(require.resolve('./metric')); + loadTestFile(require.resolve('./timeseries')); + loadTestFile(require.resolve('./dashboard')); + }); +} diff --git a/x-pack/test/functional/apps/lens/group3/open_in_lens/tsvb/metric.ts b/x-pack/test/functional/apps/lens/group3/open_in_lens/tsvb/metric.ts new file mode 100644 index 0000000000000..273473b67a31e --- /dev/null +++ b/x-pack/test/functional/apps/lens/group3/open_in_lens/tsvb/metric.ts @@ -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 expect from '@kbn/expect'; +import { FtrProviderContext } from '../../../../../ftr_provider_context'; + +export default function ({ getPageObjects, getService }: FtrProviderContext) { + const { visualize, visualBuilder, lens } = getPageObjects(['visualBuilder', 'visualize', 'lens']); + + const testSubjects = getService('testSubjects'); + + describe('Metric', function describeIndexTests() { + before(async () => { + await visualize.initTests(); + }); + + beforeEach(async () => { + await visualize.navigateToNewVisualization(); + await visualize.clickVisualBuilder(); + await visualBuilder.checkVisualBuilderIsPresent(); + await visualBuilder.resetPage(); + await visualBuilder.clickMetric(); + await visualBuilder.clickDataTab('metric'); + }); + + it('should show the "Edit Visualization in Lens" menu item', async () => { + const button = await testSubjects.exists('visualizeEditInLensButton'); + expect(button).to.eql(true); + }); + + it('should convert to Lens', async () => { + const button = await testSubjects.find('visualizeEditInLensButton'); + await button.click(); + await lens.waitForVisualization('mtrVis'); + + const metricData = await lens.getMetricVisualizationData(); + expect(metricData[0].title).to.eql('Count of records'); + }); + }); +} diff --git a/x-pack/test/functional/apps/lens/group3/open_in_lens/tsvb/timeseries.ts b/x-pack/test/functional/apps/lens/group3/open_in_lens/tsvb/timeseries.ts new file mode 100644 index 0000000000000..17e3a6b1bee8a --- /dev/null +++ b/x-pack/test/functional/apps/lens/group3/open_in_lens/tsvb/timeseries.ts @@ -0,0 +1,87 @@ +/* + * 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 { FtrProviderContext } from '../../../../../ftr_provider_context'; + +export default function ({ getPageObjects, getService }: FtrProviderContext) { + const { visualize, visualBuilder, lens, header } = getPageObjects([ + 'visualBuilder', + 'visualize', + 'header', + 'lens', + ]); + + const testSubjects = getService('testSubjects'); + const retry = getService('retry'); + const find = getService('find'); + const filterBar = getService('filterBar'); + const queryBar = getService('queryBar'); + + describe('Time Series', function describeIndexTests() { + before(async () => { + await visualize.initTests(); + }); + + it('should show the "Edit Visualization in Lens" menu item for a count aggregation', async () => { + await visualize.navigateToNewVisualization(); + await visualize.clickVisualBuilder(); + await visualBuilder.checkVisualBuilderIsPresent(); + await visualBuilder.resetPage(); + const isMenuItemVisible = await find.existsByCssSelector( + '[data-test-subj="visualizeEditInLensButton"]' + ); + expect(isMenuItemVisible).to.be(true); + }); + + it('visualizes field to Lens and loads fields to the dimesion editor', async () => { + const button = await testSubjects.find('visualizeEditInLensButton'); + await button.click(); + await lens.waitForVisualization('xyVisChart'); + await retry.try(async () => { + const dimensions = await testSubjects.findAll('lns-dimensionTrigger'); + expect(dimensions).to.have.length(2); + expect(await dimensions[0].getVisibleText()).to.be('@timestamp'); + expect(await dimensions[1].getVisibleText()).to.be('Count of records'); + }); + }); + + it('navigates back to TSVB when the Back button is clicked', async () => { + const goBackBtn = await testSubjects.find('lnsApp_goBackToAppButton'); + goBackBtn.click(); + await visualBuilder.checkVisualBuilderIsPresent(); + await retry.try(async () => { + const actualCount = await visualBuilder.getRhythmChartLegendValue(); + expect(actualCount).to.be('56'); + }); + }); + + it('should preserve app filters in lens', async () => { + await filterBar.addFilter('extension', 'is', 'css'); + await header.waitUntilLoadingHasFinished(); + const button = await testSubjects.find('visualizeEditInLensButton'); + await button.click(); + await lens.waitForVisualization('xyVisChart'); + + expect(await filterBar.hasFilter('extension', 'css')).to.be(true); + }); + + it('should preserve query in lens', async () => { + const goBackBtn = await testSubjects.find('lnsApp_goBackToAppButton'); + goBackBtn.click(); + await visualBuilder.checkVisualBuilderIsPresent(); + await queryBar.setQuery('machine.os : ios'); + await queryBar.submitQuery(); + await header.waitUntilLoadingHasFinished(); + const button = await testSubjects.find('visualizeEditInLensButton'); + await button.click(); + await lens.waitForVisualization('xyVisChart'); + + expect(await queryBar.getQueryString()).to.equal('machine.os : ios'); + }); + }); +} diff --git a/x-pack/test/functional/apps/lens/group3/tsvb_open_in_lens.ts b/x-pack/test/functional/apps/lens/group3/tsvb_open_in_lens.ts deleted file mode 100644 index 173ab1c4fdf04..0000000000000 --- a/x-pack/test/functional/apps/lens/group3/tsvb_open_in_lens.ts +++ /dev/null @@ -1,192 +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 expect from '@kbn/expect'; - -import { FtrProviderContext } from '../../../ftr_provider_context'; - -export default function ({ getPageObjects, getService }: FtrProviderContext) { - const { visualize, visualBuilder, header, lens, timeToVisualize, dashboard, canvas } = - getPageObjects([ - 'visualBuilder', - 'visualize', - 'header', - 'lens', - 'timeToVisualize', - 'dashboard', - 'canvas', - ]); - const testSubjects = getService('testSubjects'); - const find = getService('find'); - const dashboardAddPanel = getService('dashboardAddPanel'); - const panelActions = getService('dashboardPanelActions'); - const retry = getService('retry'); - const filterBar = getService('filterBar'); - const queryBar = getService('queryBar'); - - describe('TSVB to Lens', function describeIndexTests() { - before(async () => { - await visualize.initTests(); - }); - - describe('Time Series', () => { - it('should show the "Edit Visualization in Lens" menu item for a count aggregation', async () => { - await visualize.navigateToNewVisualization(); - await visualize.clickVisualBuilder(); - await visualBuilder.checkVisualBuilderIsPresent(); - await visualBuilder.resetPage(); - const isMenuItemVisible = await find.existsByCssSelector( - '[data-test-subj="visualizeEditInLensButton"]' - ); - expect(isMenuItemVisible).to.be(true); - }); - - it('visualizes field to Lens and loads fields to the dimesion editor', async () => { - const button = await testSubjects.find('visualizeEditInLensButton'); - await button.click(); - await lens.waitForVisualization('xyVisChart'); - await retry.try(async () => { - const dimensions = await testSubjects.findAll('lns-dimensionTrigger'); - expect(dimensions).to.have.length(2); - expect(await dimensions[0].getVisibleText()).to.be('@timestamp'); - expect(await dimensions[1].getVisibleText()).to.be('Count of records'); - }); - }); - - it('navigates back to TSVB when the Back button is clicked', async () => { - const goBackBtn = await testSubjects.find('lnsApp_goBackToAppButton'); - goBackBtn.click(); - await visualBuilder.checkVisualBuilderIsPresent(); - await retry.try(async () => { - const actualCount = await visualBuilder.getRhythmChartLegendValue(); - expect(actualCount).to.be('56'); - }); - }); - - it('should preserve app filters in lens', async () => { - await filterBar.addFilter('extension', 'is', 'css'); - await header.waitUntilLoadingHasFinished(); - const button = await testSubjects.find('visualizeEditInLensButton'); - await button.click(); - await lens.waitForVisualization('xyVisChart'); - - expect(await filterBar.hasFilter('extension', 'css')).to.be(true); - }); - - it('should preserve query in lens', async () => { - const goBackBtn = await testSubjects.find('lnsApp_goBackToAppButton'); - goBackBtn.click(); - await visualBuilder.checkVisualBuilderIsPresent(); - await queryBar.setQuery('machine.os : ios'); - await queryBar.submitQuery(); - await header.waitUntilLoadingHasFinished(); - const button = await testSubjects.find('visualizeEditInLensButton'); - await button.click(); - await lens.waitForVisualization('xyVisChart'); - - expect(await queryBar.getQueryString()).to.equal('machine.os : ios'); - }); - }); - - describe('Metric', () => { - beforeEach(async () => { - await visualize.navigateToNewVisualization(); - await visualize.clickVisualBuilder(); - await visualBuilder.checkVisualBuilderIsPresent(); - await visualBuilder.resetPage(); - await visualBuilder.clickMetric(); - await visualBuilder.clickDataTab('metric'); - }); - - it('should show the "Edit Visualization in Lens" menu item', async () => { - const button = await testSubjects.exists('visualizeEditInLensButton'); - expect(button).to.eql(true); - }); - - it('should convert to Lens', async () => { - const button = await testSubjects.find('visualizeEditInLensButton'); - await button.click(); - await lens.waitForVisualization('mtrVis'); - - const metricData = await lens.getMetricVisualizationData(); - expect(metricData[0].title).to.eql('Count of records'); - }); - }); - - describe('Dashboard to TSVB to Lens', () => { - it('should convert a by value TSVB viz to a Lens viz', async () => { - await visualize.navigateToNewVisualization(); - await visualize.clickVisualBuilder(); - await visualBuilder.checkVisualBuilderIsPresent(); - await visualBuilder.resetPage(); - await testSubjects.click('visualizeSaveButton'); - - await timeToVisualize.saveFromModal('My TSVB to Lens viz 1', { - addToDashboard: 'new', - saveToLibrary: false, - }); - - await dashboard.waitForRenderComplete(); - const originalEmbeddableCount = await canvas.getEmbeddableCount(); - await panelActions.openContextMenu(); - await panelActions.clickEdit(); - - const button = await testSubjects.find('visualizeEditInLensButton'); - await button.click(); - await lens.waitForVisualization('xyVisChart'); - await retry.try(async () => { - const dimensions = await testSubjects.findAll('lns-dimensionTrigger'); - expect(await dimensions[1].getVisibleText()).to.be('Count of records'); - }); - - await lens.saveAndReturn(); - await retry.try(async () => { - const embeddableCount = await canvas.getEmbeddableCount(); - expect(embeddableCount).to.eql(originalEmbeddableCount); - }); - await panelActions.removePanel(); - }); - - it('should convert a by reference TSVB viz to a Lens viz', async () => { - await dashboardAddPanel.clickEditorMenuButton(); - await dashboardAddPanel.clickVisType('metrics'); - await testSubjects.click('visualizesaveAndReturnButton'); - // save it to library - const originalPanel = await testSubjects.find('embeddablePanelHeading-'); - await panelActions.saveToLibrary('My TSVB to Lens viz 2', originalPanel); - - await dashboard.waitForRenderComplete(); - const originalEmbeddableCount = await canvas.getEmbeddableCount(); - await panelActions.openContextMenu(); - await panelActions.clickEdit(); - - const button = await testSubjects.find('visualizeEditInLensButton'); - await button.click(); - await lens.waitForVisualization('legacyMtrVis'); - await retry.try(async () => { - const dimensions = await testSubjects.findAll('lns-dimensionTrigger'); - expect(await dimensions[1].getVisibleText()).to.be('Count of records'); - }); - - await lens.saveAndReturn(); - await retry.try(async () => { - const embeddableCount = await canvas.getEmbeddableCount(); - expect(embeddableCount).to.eql(originalEmbeddableCount); - }); - - const panel = await testSubjects.find(`embeddablePanelHeading-`); - const descendants = await testSubjects.findAllDescendant( - 'embeddablePanelNotification-ACTION_LIBRARY_NOTIFICATION', - panel - ); - expect(descendants.length).to.equal(0); - - await panelActions.removePanel(); - }); - }); - }); -} From 6a0b2fd717e53c177fcc9fe3bad02c0f726e5d78 Mon Sep 17 00:00:00 2001 From: Michael Dokolin Date: Thu, 29 Sep 2022 08:38:58 +0200 Subject: [PATCH 76/95] [Expressions] Fix expressions chain invocation not to unsubscribe on error (#142105) --- .../common/execution/execution.test.ts | 57 +++++++ .../expressions/common/execution/execution.ts | 145 +++++++++--------- 2 files changed, 129 insertions(+), 73 deletions(-) diff --git a/src/plugins/expressions/common/execution/execution.test.ts b/src/plugins/expressions/common/execution/execution.test.ts index 75a95035bb89f..a5e03084a6977 100644 --- a/src/plugins/expressions/common/execution/execution.test.ts +++ b/src/plugins/expressions/common/execution/execution.test.ts @@ -488,6 +488,63 @@ describe('Execution', () => { expect(spy.fn).toHaveBeenCalledTimes(0); }); + + test('continues execution when error state is gone', async () => { + testScheduler.run(({ cold, expectObservable, flush }) => { + const a = 1; + const b = 2; + const c = 3; + const observable$ = cold('abc|', { a, b, c }); + const flakyFn = jest + .fn() + .mockImplementationOnce((value) => value) + .mockImplementationOnce(() => { + throw new Error('Some error.'); + }) + .mockImplementationOnce((value) => value); + const spyFn = jest.fn((value) => value); + + const executor = createUnitTestExecutor(); + executor.registerFunction({ + name: 'observable', + args: {}, + help: '', + fn: () => observable$, + }); + executor.registerFunction({ + name: 'flaky', + args: {}, + help: '', + fn: (value) => flakyFn(value), + }); + executor.registerFunction({ + name: 'spy', + args: {}, + help: '', + fn: (value) => spyFn(value), + }); + + const result = executor.run('observable | flaky | spy', null, {}); + + expectObservable(result).toBe('abc|', { + a: { partial: true, result: a }, + b: { + partial: true, + result: { + type: 'error', + error: expect.objectContaining({ message: '[flaky] > Some error.' }), + }, + }, + c: { partial: false, result: c }, + }); + + flush(); + + expect(spyFn).toHaveBeenCalledTimes(2); + expect(spyFn).toHaveBeenNthCalledWith(1, a); + expect(spyFn).toHaveBeenNthCalledWith(2, c); + }); + }); }); describe('state', () => { diff --git a/src/plugins/expressions/common/execution/execution.ts b/src/plugins/expressions/common/execution/execution.ts index b4ef83389ce28..68cebaa65569b 100644 --- a/src/plugins/expressions/common/execution/execution.ts +++ b/src/plugins/expressions/common/execution/execution.ts @@ -295,87 +295,86 @@ export class Execution< } invokeChain( - chainArr: ExpressionAstFunction[], + [head, ...tail]: ExpressionAstFunction[], input: unknown - ): Observable { + ): Observable { + if (!head) { + return of(input as ChainOutput); + } + return of(input).pipe( - ...(chainArr.map((link) => - switchMap((currentInput) => { - const { function: fnName, arguments: fnArgs } = link; - const fn = getByAlias( - this.state.get().functions, - fnName, - this.execution.params.namespace - ); + switchMap((currentInput) => { + const { function: fnName, arguments: fnArgs } = head; + const fn = getByAlias(this.state.get().functions, fnName, this.execution.params.namespace); + + if (!fn) { + throw createError({ + name: 'fn not found', + message: i18n.translate('expressions.execution.functionNotFound', { + defaultMessage: `Function {fnName} could not be found.`, + values: { + fnName, + }, + }), + }); + } - if (!fn) { - throw createError({ - name: 'fn not found', - message: i18n.translate('expressions.execution.functionNotFound', { - defaultMessage: `Function {fnName} could not be found.`, - values: { - fnName, - }, - }), - }); - } + if (fn.disabled) { + throw createError({ + name: 'fn is disabled', + message: i18n.translate('expressions.execution.functionDisabled', { + defaultMessage: `Function {fnName} is disabled.`, + values: { + fnName, + }, + }), + }); + } - if (fn.disabled) { - throw createError({ - name: 'fn is disabled', - message: i18n.translate('expressions.execution.functionDisabled', { - defaultMessage: `Function {fnName} is disabled.`, - values: { - fnName, - }, - }), - }); - } + if (fn.deprecated) { + this.logger?.warn(`Function '${fnName}' is deprecated`); + } - if (fn.deprecated) { - this.logger?.warn(`Function '${fnName}' is deprecated`); - } + if (this.execution.params.debug) { + head.debug = { + args: {}, + duration: 0, + fn: fn.name, + input: currentInput, + success: true, + }; + } - if (this.execution.params.debug) { - link.debug = { - args: {}, - duration: 0, - fn: fn.name, - input: currentInput, - success: true, - }; - } + const timeStart = this.execution.params.debug ? now() : 0; + + // `resolveArgs` returns an object because the arguments themselves might + // actually have `then` or `subscribe` methods which would be treated as a `Promise` + // or an `Observable` accordingly. + return this.resolveArgs(fn, currentInput, fnArgs).pipe( + tap((args) => this.execution.params.debug && Object.assign(head.debug, { args })), + switchMap((args) => this.invokeFunction(fn, currentInput, args)), + switchMap((output) => (getType(output) === 'error' ? throwError(output) : of(output))), + tap((output) => this.execution.params.debug && Object.assign(head.debug, { output })), + switchMap((output) => this.invokeChain(tail, output)), + catchError((rawError) => { + const error = createError(rawError); + error.error.message = `[${fnName}] > ${error.error.message}`; + + if (this.execution.params.debug) { + Object.assign(head.debug, { error, rawError, success: false }); + } - const timeStart = this.execution.params.debug ? now() : 0; - - // `resolveArgs` returns an object because the arguments themselves might - // actually have `then` or `subscribe` methods which would be treated as a `Promise` - // or an `Observable` accordingly. - return this.resolveArgs(fn, currentInput, fnArgs).pipe( - tap((args) => this.execution.params.debug && Object.assign(link.debug, { args })), - switchMap((args) => this.invokeFunction(fn, currentInput, args)), - switchMap((output) => (getType(output) === 'error' ? throwError(output) : of(output))), - tap((output) => this.execution.params.debug && Object.assign(link.debug, { output })), - catchError((rawError) => { - const error = createError(rawError); - error.error.message = `[${fnName}] > ${error.error.message}`; - - if (this.execution.params.debug) { - Object.assign(link.debug, { error, rawError, success: false }); - } - - return throwError(error); - }), - finalize(() => { - if (this.execution.params.debug) { - Object.assign(link.debug, { duration: now() - timeStart }); - } - }) - ); - }) - ) as Parameters['pipe']>), + return of(error); + }), + finalize(() => { + if (this.execution.params.debug) { + Object.assign(head.debug, { duration: now() - timeStart }); + } + }) + ); + }), catchError((error) => of(error)) - ) as Observable; + ); } invokeFunction( From e3bf5539a1a55e06b4076906c8c1420d2d00ae37 Mon Sep 17 00:00:00 2001 From: Giorgos Bamparopoulos Date: Thu, 29 Sep 2022 09:05:12 +0100 Subject: [PATCH 77/95] [APM] Add e2e tests for storage explorer (#141959) * Refactor APM user creation and add tests for storage explorer --- .../storage_explorer/storage_explorer.cy.ts | 192 ++++++++++++++++++ .../apm/ftr_e2e/cypress/support/commands.ts | 12 +- .../apm/ftr_e2e/cypress/support/types.d.ts | 1 + .../apm/ftr_e2e/cypress_test_runner.ts | 14 +- x-pack/plugins/apm/ftr_e2e/tsconfig.json | 1 + .../index_lifecycle_phase_select.tsx | 1 + .../storage_details_per_service.tsx | 11 +- .../create_apm_users/create_apm_users_cli.ts | 34 +++- .../create_apm_users}/authentication.ts | 80 +------- .../create_apm_users/create_apm_users.ts | 39 ++-- .../create_apm_users/helpers/call_kibana.ts | 2 +- .../helpers/create_custom_role.ts | 60 ++++++ .../helpers/create_or_update_user.ts | 0 .../create_apm_users/helpers/get_version.ts | 2 +- .../observability/e2e/synthetics_runner.ts | 16 +- .../e2e/journeys/data_view_permissions.ts | 2 +- .../common/bootstrap_apm_synthtrace.ts | 2 +- .../test/apm_api_integration/common/config.ts | 64 ++---- .../settings/agent_keys/agent_keys.spec.ts | 2 +- 19 files changed, 370 insertions(+), 165 deletions(-) create mode 100644 x-pack/plugins/apm/ftr_e2e/cypress/e2e/power_user/storage_explorer/storage_explorer.cy.ts rename x-pack/{test/apm_api_integration/common => plugins/apm/server/test_helpers/create_apm_users}/authentication.ts (61%) rename x-pack/plugins/apm/{scripts => server/test_helpers}/create_apm_users/create_apm_users.ts (69%) rename x-pack/plugins/apm/{scripts => server/test_helpers}/create_apm_users/helpers/call_kibana.ts (97%) create mode 100644 x-pack/plugins/apm/server/test_helpers/create_apm_users/helpers/create_custom_role.ts rename x-pack/plugins/apm/{scripts => server/test_helpers}/create_apm_users/helpers/create_or_update_user.ts (100%) rename x-pack/plugins/apm/{scripts => server/test_helpers}/create_apm_users/helpers/get_version.ts (96%) diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/power_user/storage_explorer/storage_explorer.cy.ts b/x-pack/plugins/apm/ftr_e2e/cypress/e2e/power_user/storage_explorer/storage_explorer.cy.ts new file mode 100644 index 0000000000000..e989ea5cf0faf --- /dev/null +++ b/x-pack/plugins/apm/ftr_e2e/cypress/e2e/power_user/storage_explorer/storage_explorer.cy.ts @@ -0,0 +1,192 @@ +/* + * 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 url from 'url'; +import { synthtrace } from '../../../../synthtrace'; +import { opbeans } from '../../../fixtures/synthtrace/opbeans'; +import { checkA11y } from '../../../support/commands'; + +const timeRange = { + rangeFrom: '2021-10-10T00:00:00.000Z', + rangeTo: '2021-10-10T00:15:00.000Z', +}; + +const storageExplorerHref = url.format({ + pathname: '/app/apm/storage-explorer', + query: timeRange, +}); + +const mainApiRequestsToIntercept = [ + { + endpoint: '/internal/apm/storage_chart', + aliasName: 'storageChartRequest', + }, + { + endpoint: '/internal/apm/storage_explorer_summary_stats', + aliasName: 'summaryStatsRequest', + }, + { + endpoint: '/internal/apm/storage_explorer', + aliasName: 'storageExlorerRequest', + }, +]; + +const mainAliasNames = mainApiRequestsToIntercept.map( + ({ aliasName }) => `@${aliasName}` +); + +describe('Storage Explorer', () => { + before(() => { + const { rangeFrom, rangeTo } = timeRange; + synthtrace.index( + opbeans({ + from: new Date(rangeFrom).getTime(), + to: new Date(rangeTo).getTime(), + }) + ); + }); + + after(() => { + synthtrace.clean(); + }); + + describe('When navigating to storage explorer without the required permissions', () => { + beforeEach(() => { + cy.loginAsViewerUser(); + cy.visitKibana(storageExplorerHref); + }); + + it('displays a prompt for permissions', () => { + cy.contains('You need permission'); + }); + }); + + describe('When navigating to storage explorer with the required permissions', () => { + beforeEach(() => { + cy.loginAsMonitorUser(); + cy.visitKibana(storageExplorerHref); + }); + + it('has no detectable a11y violations on load', () => { + cy.contains('h1', 'Storage explorer'); + // set skipFailures to true to not fail the test when there are accessibility failures + checkA11y({ skipFailures: true }); + }); + + it('has a list of summary stats', () => { + cy.contains('Total APM size'); + cy.contains('Daily data generation'); + cy.contains('Traces per minute'); + cy.contains('Number of services'); + }); + + it('renders the storage timeseries chart', () => { + cy.get('[data-test-subj="storageExplorerTimeseriesChart"]'); + }); + + it('has a list of services and environments', () => { + cy.contains('opbeans-node'); + cy.contains('opbeans-java'); + cy.contains('opbeans-rum'); + cy.get('td:contains(production)').should('have.length', 3); + }); + + it('when clicking on a service it loads the service overview for that service', () => { + cy.contains('opbeans-node').click({ force: true }); + cy.url().should('include', '/apm/services/opbeans-node/overview'); + cy.contains('h1', 'opbeans-node'); + }); + }); + + describe('Calls APIs', () => { + beforeEach(() => { + mainApiRequestsToIntercept.forEach(({ endpoint, aliasName }) => { + cy.intercept({ pathname: endpoint }).as(aliasName); + }); + + cy.loginAsMonitorUser(); + cy.visitKibana(storageExplorerHref); + }); + + it('with the correct environment when changing the environment', () => { + cy.wait(mainAliasNames); + + cy.get('[data-test-subj="environmentFilter"]').type('production'); + + cy.contains('button', 'production').click({ force: true }); + + cy.expectAPIsToHaveBeenCalledWith({ + apisIntercepted: mainAliasNames, + value: 'environment=production', + }); + }); + + it('when clicking the refresh button', () => { + cy.wait(mainAliasNames); + cy.contains('Refresh').click(); + cy.wait(mainAliasNames); + }); + + it('when selecting a different time range and clicking the update button', () => { + cy.wait(mainAliasNames); + + cy.selectAbsoluteTimeRange( + moment(timeRange.rangeFrom).subtract(5, 'm').toISOString(), + moment(timeRange.rangeTo).subtract(5, 'm').toISOString() + ); + cy.contains('Update').click(); + cy.wait(mainAliasNames); + + cy.contains('Refresh').click(); + cy.wait(mainAliasNames); + }); + + it('with the correct lifecycle phase when changing the lifecycle phase', () => { + cy.wait(mainAliasNames); + + cy.get('[data-test-subj="storageExplorerLifecyclePhaseSelect"]').click(); + cy.contains('button', 'Warm').click(); + + cy.expectAPIsToHaveBeenCalledWith({ + apisIntercepted: mainAliasNames, + value: 'indexLifecyclePhase=warm', + }); + }); + }); + + describe('Storage details per service', () => { + beforeEach(() => { + const apiRequestsToIntercept = [ + ...mainApiRequestsToIntercept, + { + endpoint: '/internal/apm/services/opbeans-node/storage_details', + aliasName: 'storageDetailsRequest', + }, + ]; + + apiRequestsToIntercept.forEach(({ endpoint, aliasName }) => { + cy.intercept({ pathname: endpoint }).as(aliasName); + }); + + cy.loginAsMonitorUser(); + cy.visitKibana(storageExplorerHref); + }); + + it('shows storage details', () => { + cy.wait(mainAliasNames); + cy.contains('opbeans-node'); + + cy.get('[data-test-subj="storageDetailsButton_opbeans-node"]').click(); + cy.get('[data-test-subj="loadingSpinner"]').should('be.visible'); + cy.wait('@storageDetailsRequest'); + + cy.contains('Service storage details'); + cy.get('[data-test-subj="storageExplorerTimeseriesChart"]'); + cy.get('[data-test-subj="serviceStorageDetailsTable"]'); + }); + }); +}); diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/support/commands.ts b/x-pack/plugins/apm/ftr_e2e/cypress/support/commands.ts index 692926d3049ca..7830e791c3655 100644 --- a/x-pack/plugins/apm/ftr_e2e/cypress/support/commands.ts +++ b/x-pack/plugins/apm/ftr_e2e/cypress/support/commands.ts @@ -9,13 +9,21 @@ import { Interception } from 'cypress/types/net-stubbing'; import 'cypress-axe'; import moment from 'moment'; import { AXE_CONFIG, AXE_OPTIONS } from '@kbn/axe-config'; +import { ApmUsername } from '../../../server/test_helpers/create_apm_users/authentication'; Cypress.Commands.add('loginAsViewerUser', () => { - return cy.loginAs({ username: 'viewer', password: 'changeme' }); + return cy.loginAs({ username: ApmUsername.viewerUser, password: 'changeme' }); }); Cypress.Commands.add('loginAsEditorUser', () => { - return cy.loginAs({ username: 'editor', password: 'changeme' }); + return cy.loginAs({ username: ApmUsername.editorUser, password: 'changeme' }); +}); + +Cypress.Commands.add('loginAsMonitorUser', () => { + return cy.loginAs({ + username: ApmUsername.apmMonitorIndices, + password: 'changeme', + }); }); Cypress.Commands.add( diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/support/types.d.ts b/x-pack/plugins/apm/ftr_e2e/cypress/support/types.d.ts index 27720210b668a..2235847e584a4 100644 --- a/x-pack/plugins/apm/ftr_e2e/cypress/support/types.d.ts +++ b/x-pack/plugins/apm/ftr_e2e/cypress/support/types.d.ts @@ -9,6 +9,7 @@ declare namespace Cypress { interface Chainable { loginAsViewerUser(): Cypress.Chainable>; loginAsEditorUser(): Cypress.Chainable>; + loginAsMonitorUser(): Cypress.Chainable>; loginAs(params: { username: string; password: string; diff --git a/x-pack/plugins/apm/ftr_e2e/cypress_test_runner.ts b/x-pack/plugins/apm/ftr_e2e/cypress_test_runner.ts index 8af466b872629..eba57b28ec0b9 100644 --- a/x-pack/plugins/apm/ftr_e2e/cypress_test_runner.ts +++ b/x-pack/plugins/apm/ftr_e2e/cypress_test_runner.ts @@ -11,7 +11,7 @@ import { esTestConfig } from '@kbn/test'; import { apm, createLogger, LogLevel } from '@kbn/apm-synthtrace'; import path from 'path'; import { FtrProviderContext } from './ftr_provider_context'; -import { createApmUsers } from '../scripts/create_apm_users/create_apm_users'; +import { createApmUsers } from '../server/test_helpers/create_apm_users/create_apm_users'; export async function cypressTestRunner({ getService }: FtrProviderContext) { const config = getService('config'); @@ -26,12 +26,6 @@ export async function cypressTestRunner({ getService }: FtrProviderContext) { const username = config.get('servers.elasticsearch.username'); const password = config.get('servers.elasticsearch.password'); - // Creates APM users - await createApmUsers({ - elasticsearch: { username, password }, - kibana: { hostname: kibanaUrl }, - }); - const esNode = Url.format({ protocol: config.get('servers.elasticsearch.protocol'), port: config.get('servers.elasticsearch.port'), @@ -39,6 +33,12 @@ export async function cypressTestRunner({ getService }: FtrProviderContext) { auth: `${username}:${password}`, }); + // Creates APM users + await createApmUsers({ + elasticsearch: { node: esNode, username, password }, + kibana: { hostname: kibanaUrl }, + }); + const esRequestTimeout = config.get('timeouts.esRequestTimeout'); const kibanaClient = new apm.ApmSynthtraceKibanaClient( createLogger(LogLevel.info) diff --git a/x-pack/plugins/apm/ftr_e2e/tsconfig.json b/x-pack/plugins/apm/ftr_e2e/tsconfig.json index 84a66afe4588d..730971a284ed5 100644 --- a/x-pack/plugins/apm/ftr_e2e/tsconfig.json +++ b/x-pack/plugins/apm/ftr_e2e/tsconfig.json @@ -18,5 +18,6 @@ "references": [ { "path": "../../../test/tsconfig.json" }, { "path": "../../../../test/tsconfig.json" }, + { "path": "../tsconfig.json" }, ] } diff --git a/x-pack/plugins/apm/public/components/app/storage_explorer/index_lifecycle_phase_select.tsx b/x-pack/plugins/apm/public/components/app/storage_explorer/index_lifecycle_phase_select.tsx index 124579e0562e2..10554b4ff8278 100644 --- a/x-pack/plugins/apm/public/components/app/storage_explorer/index_lifecycle_phase_select.tsx +++ b/x-pack/plugins/apm/public/components/app/storage_explorer/index_lifecycle_phase_select.tsx @@ -130,6 +130,7 @@ export function IndexLifecyclePhaseSelect() { }} hasDividers style={{ minWidth: 200 }} + data-test-subj="storageExplorerLifecyclePhaseSelect" /> ); } diff --git a/x-pack/plugins/apm/public/components/app/storage_explorer/services_table/storage_details_per_service.tsx b/x-pack/plugins/apm/public/components/app/storage_explorer/services_table/storage_details_per_service.tsx index 3d9cd14c8e958..0a101d3357684 100644 --- a/x-pack/plugins/apm/public/components/app/storage_explorer/services_table/storage_details_per_service.tsx +++ b/x-pack/plugins/apm/public/components/app/storage_explorer/services_table/storage_details_per_service.tsx @@ -186,7 +186,10 @@ export function StorageDetailsPerService({ - + - + {processorEventStats.map( ({ processorEventLabel, docs, size }) => ( <> diff --git a/x-pack/plugins/apm/scripts/create_apm_users/create_apm_users_cli.ts b/x-pack/plugins/apm/scripts/create_apm_users/create_apm_users_cli.ts index 194639128b4cf..24cda99fd669b 100644 --- a/x-pack/plugins/apm/scripts/create_apm_users/create_apm_users_cli.ts +++ b/x-pack/plugins/apm/scripts/create_apm_users/create_apm_users_cli.ts @@ -8,13 +8,17 @@ /* eslint-disable no-console */ import { argv } from 'yargs'; -import { AbortError, isAxiosError } from './helpers/call_kibana'; -import { createApmUsers } from './create_apm_users'; -import { getKibanaVersion } from './helpers/get_version'; +import { + AbortError, + isAxiosError, +} from '../../server/test_helpers/create_apm_users/helpers/call_kibana'; +import { createApmUsers } from '../../server/test_helpers/create_apm_users/create_apm_users'; +import { getKibanaVersion } from '../../server/test_helpers/create_apm_users/helpers/get_version'; async function init() { const esUserName = (argv.username as string) || 'elastic'; const esPassword = argv.password as string | undefined; + const esUrl = argv.esUrl as string | undefined; const kibanaBaseUrl = argv.kibanaUrl as string | undefined; if (!esPassword) { @@ -24,6 +28,20 @@ async function init() { process.exit(); } + if (!esUrl) { + console.error( + 'Please specify the url for elasticsearch: `--es-url http://localhost:9200` ' + ); + process.exit(); + } + + if (!esUrl.startsWith('https://') && !esUrl.startsWith('http://')) { + console.error( + 'Elasticsearch url must be prefixed with http(s):// `--es-url http://localhost:9200`' + ); + process.exit(); + } + if (!kibanaBaseUrl) { console.error( 'Please specify the url for Kibana: `--kibana-url http://localhost:5601` ' @@ -42,7 +60,11 @@ async function init() { } const kibana = { hostname: kibanaBaseUrl }; - const elasticsearch = { username: esUserName, password: esPassword }; + const elasticsearch = { + node: esUrl, + username: esUserName, + password: esPassword, + }; console.log({ kibana, elasticsearch }); @@ -50,9 +72,7 @@ async function init() { console.log(`Connected to Kibana ${version}`); const users = await createApmUsers({ elasticsearch, kibana }); - const credentials = users - .map((u) => ` - ${u.username} / ${esPassword}`) - .join('\n'); + const credentials = users.map((u) => ` - ${u} / ${esPassword}`).join('\n'); console.log( `\nYou can now login to ${kibana.hostname} with:\n${credentials}` diff --git a/x-pack/test/apm_api_integration/common/authentication.ts b/x-pack/plugins/apm/server/test_helpers/create_apm_users/authentication.ts similarity index 61% rename from x-pack/test/apm_api_integration/common/authentication.ts rename to x-pack/plugins/apm/server/test_helpers/create_apm_users/authentication.ts index 93bae236d5dc5..f3d15ee6db21e 100644 --- a/x-pack/test/apm_api_integration/common/authentication.ts +++ b/x-pack/plugins/apm/server/test_helpers/create_apm_users/authentication.ts @@ -5,15 +5,7 @@ * 2.0. */ -import { Client } from '@elastic/elasticsearch'; -import { PrivilegeType } from '@kbn/apm-plugin/common/privilege_type'; -import { ToolingLog } from '@kbn/tooling-log'; -import { omit } from 'lodash'; -import { KbnClientRequesterError } from '@kbn/test'; -import { AxiosError } from 'axios'; -import { SecurityServiceProvider } from '../../../../test/common/services/security'; - -type SecurityService = Awaited>; +import { PrivilegeType } from '../../../common/privilege_type'; export enum ApmUsername { noAccessUser = 'no_access_user', @@ -34,7 +26,7 @@ export enum ApmCustomRolename { apmMonitorIndices = 'apm_monitor_indices', } -const customRoles = { +export const customRoles = { [ApmCustomRolename.apmReadUserWithoutMlAccess]: { elasticsearch: { cluster: [], @@ -97,7 +89,7 @@ const customRoles = { }, }; -const users: Record< +export const users: Record< ApmUsername, { builtInRoleNames?: string[]; customRoleNames?: ApmCustomRolename[] } > = { @@ -132,70 +124,4 @@ const users: Record< }, }; -function logErrorResponse(logger: ToolingLog, e: Error) { - if (e instanceof KbnClientRequesterError) { - logger.error(`KbnClientRequesterError: ${JSON.stringify(e.axiosError?.response?.data)}`); - } else if (e instanceof AxiosError) { - logger.error(`AxiosError: ${JSON.stringify(e.response?.data)}`); - } else { - logger.error(`Unknown error: ${e.constructor.name}`); - } -} - -export async function createApmUser({ - username, - security, - es, - logger, -}: { - username: ApmUsername; - security: SecurityService; - es: Client; - logger: ToolingLog; -}) { - const user = users[username]; - - if (!user) { - throw new Error(`No configuration found for ${username}`); - } - - const { builtInRoleNames = [], customRoleNames = [] } = user; - - try { - // create custom roles - await Promise.all( - customRoleNames.map(async (roleName) => createCustomRole({ roleName, security, es })) - ); - - // create user - await security.user.create(username, { - full_name: username, - password: APM_TEST_PASSWORD, - roles: [...builtInRoleNames, ...customRoleNames], - }); - } catch (e) { - logErrorResponse(logger, e); - throw e; - } -} - -async function createCustomRole({ - roleName, - security, - es, -}: { - roleName: ApmCustomRolename; - security: SecurityService; - es: Client; -}) { - const role = customRoles[roleName]; - - // Add application privileges with es client as they are not supported by - // security.user.create. They are preserved when updating the role below - if ('applications' in role) { - await es.security.putRole({ name: roleName, body: role }); - } - await security.role.create(roleName, omit(role, 'applications')); -} - export const APM_TEST_PASSWORD = 'changeme'; diff --git a/x-pack/plugins/apm/scripts/create_apm_users/create_apm_users.ts b/x-pack/plugins/apm/server/test_helpers/create_apm_users/create_apm_users.ts similarity index 69% rename from x-pack/plugins/apm/scripts/create_apm_users/create_apm_users.ts rename to x-pack/plugins/apm/server/test_helpers/create_apm_users/create_apm_users.ts index 7532392c9a8b4..8e9e39373752b 100644 --- a/x-pack/plugins/apm/scripts/create_apm_users/create_apm_users.ts +++ b/x-pack/plugins/apm/server/test_helpers/create_apm_users/create_apm_users.ts @@ -5,10 +5,13 @@ * 2.0. */ +import { asyncForEach } from '@kbn/std'; import { AbortError, callKibana } from './helpers/call_kibana'; import { createOrUpdateUser } from './helpers/create_or_update_user'; - +import { ApmUsername, users } from './authentication'; +import { createCustomRole } from './helpers/create_custom_role'; export interface Elasticsearch { + node: string; username: string; password: string; } @@ -28,6 +31,7 @@ export async function createApmUsers({ elasticsearch, kibana, }); + if (!isCredentialsValid) { throw new AbortError('Invalid username/password'); } @@ -36,24 +40,33 @@ export async function createApmUsers({ elasticsearch, kibana, }); + if (!isSecurityEnabled) { throw new AbortError('Security must be enabled!'); } - // user definitions - const users = [ - { username: 'viewer', roles: ['viewer'] }, - { username: 'editor', roles: ['editor'] }, - ]; + const apmUsers = Object.values(ApmUsername); + await asyncForEach(apmUsers, async (username) => { + const user = users[username]; + const { builtInRoleNames = [], customRoleNames = [] } = user; + + // create custom roles + await Promise.all( + customRoleNames.map(async (roleName) => + createCustomRole({ elasticsearch, kibana, roleName }) + ) + ); - // create users - await Promise.all( - users.map(async (user) => - createOrUpdateUser({ elasticsearch, kibana, user }) - ) - ); + // create user + const roles = builtInRoleNames.concat(customRoleNames); + await createOrUpdateUser({ + elasticsearch, + kibana, + user: { username, roles }, + }); + }); - return users; + return apmUsers; } async function getIsSecurityEnabled({ diff --git a/x-pack/plugins/apm/scripts/create_apm_users/helpers/call_kibana.ts b/x-pack/plugins/apm/server/test_helpers/create_apm_users/helpers/call_kibana.ts similarity index 97% rename from x-pack/plugins/apm/scripts/create_apm_users/helpers/call_kibana.ts rename to x-pack/plugins/apm/server/test_helpers/create_apm_users/helpers/call_kibana.ts index 1e6bd2e02c416..72312645a644e 100644 --- a/x-pack/plugins/apm/scripts/create_apm_users/helpers/call_kibana.ts +++ b/x-pack/plugins/apm/server/test_helpers/create_apm_users/helpers/call_kibana.ts @@ -13,7 +13,7 @@ export async function callKibana({ kibana, options, }: { - elasticsearch: Elasticsearch; + elasticsearch: Omit; kibana: Kibana; options: AxiosRequestConfig; }): Promise { diff --git a/x-pack/plugins/apm/server/test_helpers/create_apm_users/helpers/create_custom_role.ts b/x-pack/plugins/apm/server/test_helpers/create_apm_users/helpers/create_custom_role.ts new file mode 100644 index 0000000000000..ac906fcbfb5e2 --- /dev/null +++ b/x-pack/plugins/apm/server/test_helpers/create_apm_users/helpers/create_custom_role.ts @@ -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 { Client } from '@elastic/elasticsearch'; +import { omit } from 'lodash'; +import { Elasticsearch, Kibana } from '../create_apm_users'; +import { callKibana } from './call_kibana'; +import { customRoles, ApmCustomRolename } from '../authentication'; + +export async function createCustomRole({ + elasticsearch, + kibana, + roleName, +}: { + elasticsearch: Elasticsearch; + kibana: Kibana; + roleName: ApmCustomRolename; +}) { + const role = customRoles[roleName]; + + // Add application privileges with es client as they are not supported by + // the security API. They are preserved when updating the role below + if ('applications' in role) { + const esClient = getEsClient(elasticsearch); + await esClient.security.putRole({ name: roleName, body: role }); + } + + await callKibana({ + elasticsearch, + kibana, + options: { + method: 'PUT', + url: `/api/security/role/${roleName}`, + data: { + ...omit(role, 'applications'), + }, + }, + }); +} + +export function getEsClient(elasticsearch: Elasticsearch) { + const { node, username, password } = elasticsearch; + const client = new Client({ + node, + tls: { + rejectUnauthorized: false, + }, + requestTimeout: 120000, + auth: { + username, + password, + }, + }); + + return client; +} diff --git a/x-pack/plugins/apm/scripts/create_apm_users/helpers/create_or_update_user.ts b/x-pack/plugins/apm/server/test_helpers/create_apm_users/helpers/create_or_update_user.ts similarity index 100% rename from x-pack/plugins/apm/scripts/create_apm_users/helpers/create_or_update_user.ts rename to x-pack/plugins/apm/server/test_helpers/create_apm_users/helpers/create_or_update_user.ts diff --git a/x-pack/plugins/apm/scripts/create_apm_users/helpers/get_version.ts b/x-pack/plugins/apm/server/test_helpers/create_apm_users/helpers/get_version.ts similarity index 96% rename from x-pack/plugins/apm/scripts/create_apm_users/helpers/get_version.ts rename to x-pack/plugins/apm/server/test_helpers/create_apm_users/helpers/get_version.ts index a809efe7402ea..a00747ae78582 100644 --- a/x-pack/plugins/apm/scripts/create_apm_users/helpers/get_version.ts +++ b/x-pack/plugins/apm/server/test_helpers/create_apm_users/helpers/get_version.ts @@ -13,7 +13,7 @@ export async function getKibanaVersion({ elasticsearch, kibana, }: { - elasticsearch: Elasticsearch; + elasticsearch: Omit; kibana: Kibana; }) { try { diff --git a/x-pack/plugins/observability/e2e/synthetics_runner.ts b/x-pack/plugins/observability/e2e/synthetics_runner.ts index 25c236c6da585..a24771c091c09 100644 --- a/x-pack/plugins/observability/e2e/synthetics_runner.ts +++ b/x-pack/plugins/observability/e2e/synthetics_runner.ts @@ -10,7 +10,7 @@ import Url from 'url'; import { run as syntheticsRun } from '@elastic/synthetics'; import { PromiseType } from 'utility-types'; -import { createApmUsers } from '@kbn/apm-plugin/scripts/create_apm_users/create_apm_users'; +import { createApmUsers } from '@kbn/apm-plugin/server/test_helpers/create_apm_users/create_apm_users'; import { esArchiverUnload } from './tasks/es_archiver'; @@ -23,6 +23,7 @@ export interface ArgParams { export class SyntheticsRunner { public getService: any; public kibanaUrl: string; + private elasticsearchUrl: string; public testFilesLoaded: boolean = false; @@ -31,6 +32,7 @@ export class SyntheticsRunner { constructor(getService: any, params: ArgParams) { this.getService = getService; this.kibanaUrl = this.getKibanaUrl(); + this.elasticsearchUrl = this.getElasticsearchUrl(); this.params = params; } @@ -40,7 +42,7 @@ export class SyntheticsRunner { async createTestUsers() { await createApmUsers({ - elasticsearch: { username: 'elastic', password: 'changeme' }, + elasticsearch: { node: this.elasticsearchUrl, username: 'elastic', password: 'changeme' }, kibana: { hostname: this.kibanaUrl }, }); } @@ -79,6 +81,16 @@ export class SyntheticsRunner { }); } + getElasticsearchUrl() { + const config = this.getService('config'); + + return Url.format({ + protocol: config.get('servers.elasticsearch.protocol'), + hostname: config.get('servers.elasticsearch.hostname'), + port: config.get('servers.elasticsearch.port'), + }); + } + async run() { if (!this.testFilesLoaded) { throw new Error('Test files not loaded'); diff --git a/x-pack/plugins/synthetics/e2e/journeys/data_view_permissions.ts b/x-pack/plugins/synthetics/e2e/journeys/data_view_permissions.ts index aa29b92b7ea25..e5714234de690 100644 --- a/x-pack/plugins/synthetics/e2e/journeys/data_view_permissions.ts +++ b/x-pack/plugins/synthetics/e2e/journeys/data_view_permissions.ts @@ -6,7 +6,7 @@ */ import { journey, step, expect, before } from '@elastic/synthetics'; -import { callKibana } from '@kbn/apm-plugin/scripts/create_apm_users/helpers/call_kibana'; +import { callKibana } from '@kbn/apm-plugin/server/test_helpers/create_apm_users/helpers/call_kibana'; import { byTestId, waitForLoadingToFinish } from '@kbn/observability-plugin/e2e/utils'; import { loginPageProvider } from '../page_objects/login'; diff --git a/x-pack/test/apm_api_integration/common/bootstrap_apm_synthtrace.ts b/x-pack/test/apm_api_integration/common/bootstrap_apm_synthtrace.ts index 96d0cbf3f8e7b..0a790d261ef49 100644 --- a/x-pack/test/apm_api_integration/common/bootstrap_apm_synthtrace.ts +++ b/x-pack/test/apm_api_integration/common/bootstrap_apm_synthtrace.ts @@ -7,7 +7,7 @@ import { apm, createLogger, LogLevel } from '@kbn/apm-synthtrace'; import { esTestConfig } from '@kbn/test'; -import { APM_TEST_PASSWORD } from './authentication'; +import { APM_TEST_PASSWORD } from '@kbn/apm-plugin/server/test_helpers/create_apm_users/authentication'; import { InheritedFtrProviderContext } from './ftr_provider_context'; export async function bootstrapApmSynthtrace( diff --git a/x-pack/test/apm_api_integration/common/config.ts b/x-pack/test/apm_api_integration/common/config.ts index e01c5fbf40541..431b445d3a1a0 100644 --- a/x-pack/test/apm_api_integration/common/config.ts +++ b/x-pack/test/apm_api_integration/common/config.ts @@ -8,11 +8,12 @@ import { FtrConfigProviderContext } from '@kbn/test'; import supertest from 'supertest'; import { format, UrlObject } from 'url'; -import { Client } from '@elastic/elasticsearch'; -import { ToolingLog } from '@kbn/tooling-log'; -import { SecurityServiceProvider } from '../../../../test/common/services/security'; +import { + ApmUsername, + APM_TEST_PASSWORD, +} from '@kbn/apm-plugin/server/test_helpers/create_apm_users/authentication'; +import { createApmUsers } from '@kbn/apm-plugin/server/test_helpers/create_apm_users/create_apm_users'; import { InheritedFtrProviderContext, InheritedServices } from './ftr_provider_context'; -import { createApmUser, APM_TEST_PASSWORD, ApmUsername } from './authentication'; import { APMFtrConfigName } from '../configs'; import { createApmApiClient } from './apm_api_supertest'; import { RegistryProvider } from './registry'; @@ -25,17 +26,8 @@ export interface ApmFtrConfig { kibanaConfig?: Record; } -type SecurityService = Awaited>; - function getLegacySupertestClient(kibanaServer: UrlObject, username: ApmUsername) { return async (context: InheritedFtrProviderContext) => { - const security = context.getService('security'); - const es = context.getService('es'); - const logger = context.getService('log'); - await security.init(); - - await createApmUser({ security, username, es, logger }); - const url = format({ ...kibanaServer, auth: `${username}:${APM_TEST_PASSWORD}`, @@ -47,19 +39,11 @@ function getLegacySupertestClient(kibanaServer: UrlObject, username: ApmUsername async function getApmApiClient({ kibanaServer, - security, username, - es, - logger, }: { kibanaServer: UrlObject; - security: SecurityService; username: ApmUsername; - es: Client; - logger: ToolingLog; }) { - await createApmUser({ security, username, es, logger }); - const url = format({ ...kibanaServer, auth: `${username}:${APM_TEST_PASSWORD}`, @@ -81,6 +65,8 @@ export function createTestConfig(config: ApmFtrConfig) { const services = xPackAPITestsConfig.get('services') as InheritedServices; const servers = xPackAPITestsConfig.get('servers'); const kibanaServer = servers.kibana as UrlObject; + const kibanaServerUrl = format(kibanaServer); + const esServer = servers.elasticsearch as UrlObject; return { testFiles: [require.resolve('../tests')], @@ -91,72 +77,50 @@ export function createTestConfig(config: ApmFtrConfig) { apmFtrConfig: () => config, registry: RegistryProvider, synthtraceEsClient: (context: InheritedFtrProviderContext) => { - const kibanaServerUrl = format(kibanaServer); return bootstrapApmSynthtrace(context, kibanaServerUrl); }, apmApiClient: async (context: InheritedFtrProviderContext) => { - const security = context.getService('security'); - const es = context.getService('es'); - const logger = context.getService('log'); + const { username, password } = servers.kibana; + const esUrl = format(esServer); - await security.init(); + // Creates APM users + await createApmUsers({ + elasticsearch: { node: esUrl, username, password }, + kibana: { hostname: kibanaServerUrl }, + }); return { noAccessUser: await getApmApiClient({ kibanaServer, - security, username: ApmUsername.noAccessUser, - es, - logger, }), readUser: await getApmApiClient({ kibanaServer, - security, username: ApmUsername.viewerUser, - es, - logger, }), writeUser: await getApmApiClient({ kibanaServer, - security, username: ApmUsername.editorUser, - es, - logger, }), annotationWriterUser: await getApmApiClient({ kibanaServer, - security, username: ApmUsername.apmAnnotationsWriteUser, - es, - logger, }), noMlAccessUser: await getApmApiClient({ kibanaServer, - security, username: ApmUsername.apmReadUserWithoutMlAccess, - es, - logger, }), manageOwnAgentKeysUser: await getApmApiClient({ kibanaServer, - security, username: ApmUsername.apmManageOwnAgentKeys, - es, - logger, }), createAndAllAgentKeysUser: await getApmApiClient({ kibanaServer, - security, username: ApmUsername.apmManageOwnAndCreateAgentKeys, - es, - logger, }), monitorIndicesUser: await getApmApiClient({ kibanaServer, - security, username: ApmUsername.apmMonitorIndices, - es, - logger, }), }; }, diff --git a/x-pack/test/apm_api_integration/tests/settings/agent_keys/agent_keys.spec.ts b/x-pack/test/apm_api_integration/tests/settings/agent_keys/agent_keys.spec.ts index c0d6500fd298c..19459d2a4ec16 100644 --- a/x-pack/test/apm_api_integration/tests/settings/agent_keys/agent_keys.spec.ts +++ b/x-pack/test/apm_api_integration/tests/settings/agent_keys/agent_keys.spec.ts @@ -7,9 +7,9 @@ import expect from '@kbn/expect'; import { first } from 'lodash'; import { PrivilegeType } from '@kbn/apm-plugin/common/privilege_type'; +import { ApmUsername } from '@kbn/apm-plugin/server/test_helpers/create_apm_users/authentication'; import { FtrProviderContext } from '../../../common/ftr_provider_context'; import { ApmApiError, ApmApiSupertest } from '../../../common/apm_api_supertest'; -import { ApmUsername } from '../../../common/authentication'; export default function ApiTest({ getService }: FtrProviderContext) { const registry = getService('registry'); From 2b4f5d9a640212a85675554c87be36e74e508b83 Mon Sep 17 00:00:00 2001 From: Dmitry Tomashevich <39378793+dimaanj@users.noreply.github.com> Date: Thu, 29 Sep 2022 11:19:58 +0300 Subject: [PATCH 78/95] [Graph] Align Inspect requests experience with common approach (#141222) * [Graph] hide inspect button when there is no relevant request content * [Graph] fix functional * [Graph] add common inspector * [Discover] fix checks * [Discover] apply suggestion --- x-pack/plugins/graph/kibana.json | 3 +- x-pack/plugins/graph/public/application.tsx | 2 + .../graph/public/apps/workspace_route.tsx | 14 ++- .../graph/public/components/inspect_panel.tsx | 98 ------------------- .../workspace_layout.test.tsx | 9 ++ .../workspace_layout/workspace_layout.tsx | 16 ++- .../workspace_top_nav_menu.tsx | 22 ++++- .../graph/public/helpers/use_graph_loader.ts | 86 ++++++++++++---- .../graph/public/helpers/use_inspector.ts | 38 +++++++ x-pack/plugins/graph/public/plugin.ts | 3 + .../translations/translations/fr-FR.json | 3 - .../translations/translations/ja-JP.json | 3 - .../translations/translations/zh-CN.json | 3 - x-pack/test/accessibility/apps/graph.ts | 6 -- 14 files changed, 156 insertions(+), 150 deletions(-) delete mode 100644 x-pack/plugins/graph/public/components/inspect_panel.tsx create mode 100644 x-pack/plugins/graph/public/helpers/use_inspector.ts diff --git a/x-pack/plugins/graph/kibana.json b/x-pack/plugins/graph/kibana.json index 641e595893c0a..6db4ca194d7d1 100644 --- a/x-pack/plugins/graph/kibana.json +++ b/x-pack/plugins/graph/kibana.json @@ -9,7 +9,8 @@ "data", "navigation", "savedObjects", - "unifiedSearch" + "unifiedSearch", + "inspector" ], "optionalPlugins": [ "home", diff --git a/x-pack/plugins/graph/public/application.tsx b/x-pack/plugins/graph/public/application.tsx index 1976b12621f4f..bbb14a96ac5eb 100644 --- a/x-pack/plugins/graph/public/application.tsx +++ b/x-pack/plugins/graph/public/application.tsx @@ -27,6 +27,7 @@ import { LicensingPluginStart } from '@kbn/licensing-plugin/public'; import { NavigationPublicPluginStart as NavigationStart } from '@kbn/navigation-plugin/public'; import { Storage } from '@kbn/kibana-utils-plugin/public'; import { FormattedRelative } from '@kbn/i18n-react'; +import { Start as InspectorPublicPluginStart } from '@kbn/inspector-plugin/public'; import { TableListViewKibanaProvider } from '@kbn/content-management-table-list'; import './index.scss'; @@ -70,6 +71,7 @@ export interface GraphDependencies { uiSettings: IUiSettingsClient; history: ScopedHistory; spaces?: SpacesApi; + inspect: InspectorPublicPluginStart; } export type GraphServices = Omit; diff --git a/x-pack/plugins/graph/public/apps/workspace_route.tsx b/x-pack/plugins/graph/public/apps/workspace_route.tsx index 051c0fa66ab89..9b1fde2e7cb25 100644 --- a/x-pack/plugins/graph/public/apps/workspace_route.tsx +++ b/x-pack/plugins/graph/public/apps/workspace_route.tsx @@ -43,6 +43,7 @@ export const WorkspaceRoute = ({ setHeaderActionMenu, spaces, indexPatterns: getIndexPatternProvider, + inspect, }, }: WorkspaceRouteProps) => { /** @@ -64,11 +65,6 @@ export const WorkspaceRoute = ({ [getIndexPatternProvider.get] ); - const { loading, callNodeProxy, callSearchNodeProxy, handleSearchQueryError } = useGraphLoader({ - toastNotifications, - coreStart, - }); - const services = useMemo( () => ({ appName: 'graph', @@ -80,6 +76,12 @@ export const WorkspaceRoute = ({ [coreStart, data, storage, unifiedSearch] ); + const { loading, requestAdapter, callNodeProxy, callSearchNodeProxy, handleSearchQueryError } = + useGraphLoader({ + toastNotifications, + coreStart, + }); + const [store] = useState(() => createGraphStore({ basePath: getBasePath(), @@ -150,6 +152,8 @@ export const WorkspaceRoute = ({ overlays={overlays} savedWorkspace={savedWorkspace} indexPatternProvider={indexPatternProvider} + inspect={inspect} + requestAdapter={requestAdapter} /> diff --git a/x-pack/plugins/graph/public/components/inspect_panel.tsx b/x-pack/plugins/graph/public/components/inspect_panel.tsx deleted file mode 100644 index e6197bac16ba7..0000000000000 --- a/x-pack/plugins/graph/public/components/inspect_panel.tsx +++ /dev/null @@ -1,98 +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 React, { useMemo, useState } from 'react'; -import { EuiTab, EuiTabs, EuiText } from '@elastic/eui'; -import { monaco, XJsonLang } from '@kbn/monaco'; -import { FormattedMessage } from '@kbn/i18n-react'; -import { CodeEditor } from '@kbn/kibana-react-plugin/public'; -import type { DataView } from '@kbn/data-views-plugin/public'; - -interface InspectPanelProps { - showInspect: boolean; - indexPattern?: DataView; - lastRequest?: string; - lastResponse?: string; -} - -const CODE_EDITOR_OPTIONS: monaco.editor.IStandaloneEditorConstructionOptions = { - automaticLayout: true, - fontSize: 12, - lineNumbers: 'on', - minimap: { - enabled: false, - }, - overviewRulerBorder: false, - readOnly: true, - scrollbar: { - alwaysConsumeMouseWheel: false, - }, - scrollBeyondLastLine: false, - wordWrap: 'on', - wrappingIndent: 'indent', -}; - -const dummyCallback = () => {}; - -export const InspectPanel = ({ - showInspect, - lastRequest, - lastResponse, - indexPattern, -}: InspectPanelProps) => { - const [selectedTabId, setSelectedTabId] = useState('request'); - - const onRequestClick = () => setSelectedTabId('request'); - const onResponseClick = () => setSelectedTabId('response'); - - const editorContent = useMemo( - () => (selectedTabId === 'request' ? lastRequest : lastResponse), - [lastRequest, lastResponse, selectedTabId] - ); - - if (showInspect) { - return ( -
    -
    -
    - -
    - -
    - - http://host:port/{indexPattern?.id}/_graph/explore - - - - - - - - - - -
    -
    -
    - ); - } - - return null; -}; diff --git a/x-pack/plugins/graph/public/components/workspace_layout/workspace_layout.test.tsx b/x-pack/plugins/graph/public/components/workspace_layout/workspace_layout.test.tsx index cb43b5ec5d688..72cd35997b876 100644 --- a/x-pack/plugins/graph/public/components/workspace_layout/workspace_layout.test.tsx +++ b/x-pack/plugins/graph/public/components/workspace_layout/workspace_layout.test.tsx @@ -10,6 +10,7 @@ import { shallow } from 'enzyme'; import { WorkspaceLayoutComponent } from '.'; import { coreMock } from '@kbn/core/public/mocks'; import { spacesPluginMock } from '@kbn/spaces-plugin/public/mocks'; +import { Start as InspectorStart, RequestAdapter } from '@kbn/inspector-plugin/public'; import { NavigationPublicPluginStart as NavigationStart } from '@kbn/navigation-plugin/public'; import { GraphSavePolicy, @@ -51,6 +52,14 @@ describe('workspace_layout', () => { aliasTargetId: '', } as SharingSavedObjectProps, spaces: spacesPluginMock.createStartContract(), + inspect: { open: jest.fn() } as unknown as InspectorStart, + requestAdapter: { + start: () => ({ + stats: jest.fn(), + json: jest.fn(), + }), + reset: jest.fn(), + } as unknown as RequestAdapter, workspace: {} as unknown as Workspace, }; it('should display conflict notification if outcome is conflict', () => { diff --git a/x-pack/plugins/graph/public/components/workspace_layout/workspace_layout.tsx b/x-pack/plugins/graph/public/components/workspace_layout/workspace_layout.tsx index 3eede479bd801..5de95636a61dd 100644 --- a/x-pack/plugins/graph/public/components/workspace_layout/workspace_layout.tsx +++ b/x-pack/plugins/graph/public/components/workspace_layout/workspace_layout.tsx @@ -11,6 +11,7 @@ import { EuiSpacer } from '@elastic/eui'; import { connect } from 'react-redux'; import { useLocation } from 'react-router-dom'; import type { DataView } from '@kbn/data-views-plugin/public'; +import { RequestAdapter } from '@kbn/inspector-plugin/common'; import { SearchBar } from '../search_bar'; import { GraphState, @@ -20,7 +21,6 @@ import { import { FieldManager } from '../field_manager'; import { ControlType, IndexPatternProvider, TermIntersect, WorkspaceNode } from '../../types'; import { WorkspaceTopNavMenu } from './workspace_top_nav_menu'; -import { InspectPanel } from '../inspect_panel'; import { GuidancePanel } from '../guidance_panel'; import { GraphTitle } from '../graph_title'; import { GraphWorkspaceSavedObject, Workspace } from '../../types'; @@ -49,6 +49,7 @@ type WorkspaceLayoutProps = Pick< | 'canEditDrillDownUrls' | 'overlays' | 'spaces' + | 'inspect' > & { renderCounter: number; workspace?: Workspace; @@ -56,6 +57,7 @@ type WorkspaceLayoutProps = Pick< savedWorkspace: GraphWorkspaceSavedObject; indexPatternProvider: IndexPatternProvider; sharingSavedObjectProps?: SharingSavedObjectProps; + requestAdapter: RequestAdapter; }; interface WorkspaceLayoutStateProps { @@ -80,9 +82,10 @@ export const WorkspaceLayoutComponent = ({ setHeaderActionMenu, sharingSavedObjectProps, spaces, + inspect, + requestAdapter, }: WorkspaceLayoutProps & WorkspaceLayoutStateProps) => { const [currentIndexPattern, setCurrentIndexPattern] = useState(); - const [showInspect, setShowInspect] = useState(false); const [pickerOpen, setPickerOpen] = useState(false); const [mergeCandidates, setMergeCandidates] = useState([]); const [control, setControl] = useState('none'); @@ -188,20 +191,15 @@ export const WorkspaceLayoutComponent = ({ graphSavePolicy={graphSavePolicy} navigation={navigation} capabilities={capabilities} + inspect={inspect} + requestAdapter={requestAdapter} coreStart={coreStart} canEditDrillDownUrls={canEditDrillDownUrls} - setShowInspect={setShowInspect} confirmWipeWorkspace={confirmWipeWorkspace} setHeaderActionMenu={setHeaderActionMenu} isInitialized={isInitialized} /> - {isInitialized && }
    >; confirmWipeWorkspace: ( onConfirm: () => void, text?: string, @@ -30,9 +31,11 @@ interface WorkspaceTopNavMenuProps { graphSavePolicy: GraphSavePolicy; navigation: NavigationStart; capabilities: Capabilities; + inspect: InspectorPublicPluginStart; coreStart: CoreStart; canEditDrillDownUrls: boolean; isInitialized: boolean; + requestAdapter: RequestAdapter; } export const WorkspaceTopNavMenu = (props: WorkspaceTopNavMenuProps) => { @@ -40,6 +43,12 @@ export const WorkspaceTopNavMenu = (props: WorkspaceTopNavMenuProps) => { const location = useLocation(); const history = useHistory(); const allSavingDisabled = props.graphSavePolicy === 'none'; + const isInspectDisabled = !props.workspace?.lastRequest || !props.workspace.lastRequest; + + const { onOpenInspector } = useInspector({ + inspect: props.inspect, + requestAdapter: props.requestAdapter, + }); // ===== Menubar configuration ========= const { TopNavMenu } = props.navigation.ui; @@ -107,7 +116,7 @@ export const WorkspaceTopNavMenu = (props: WorkspaceTopNavMenuProps) => { topNavMenu.push({ key: 'inspect', disableButton() { - return props.workspace === null; + return isInspectDisabled; }, label: i18n.translate('xpack.graph.topNavMenu.inspectLabel', { defaultMessage: 'Inspect', @@ -116,7 +125,14 @@ export const WorkspaceTopNavMenu = (props: WorkspaceTopNavMenuProps) => { defaultMessage: 'Inspect', }), run: () => { - props.setShowInspect((prevShowInspect) => !prevShowInspect); + onOpenInspector(); + }, + tooltip: () => { + if (isInspectDisabled) { + return i18n.translate('xpack.graph.topNavMenu.inspectButton.disabledTooltip', { + defaultMessage: 'Perform a search or expand a node to enable Inspect', + }); + } }, testId: 'graphInspectButton', }); diff --git a/x-pack/plugins/graph/public/helpers/use_graph_loader.ts b/x-pack/plugins/graph/public/helpers/use_graph_loader.ts index 5b4f3bbbf1e47..0d50039ab9797 100644 --- a/x-pack/plugins/graph/public/helpers/use_graph_loader.ts +++ b/x-pack/plugins/graph/public/helpers/use_graph_loader.ts @@ -5,10 +5,12 @@ * 2.0. */ -import { useCallback, useState } from 'react'; +import { useCallback, useMemo, useState } from 'react'; import type { CoreStart, ToastsStart } from '@kbn/core/public'; import type { IHttpFetchError, ResponseErrorBody } from '@kbn/core-http-browser'; import { i18n } from '@kbn/i18n'; +import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey'; +import { RequestAdapter } from '@kbn/inspector-plugin/public'; import type { ExploreRequest, GraphExploreCallback, @@ -24,6 +26,7 @@ interface UseGraphLoaderProps { export const useGraphLoader = ({ toastNotifications, coreStart }: UseGraphLoaderProps) => { const [loading, setLoading] = useState(false); + const requestAdapter = useMemo(() => new RequestAdapter(), []); const handleHttpError = useCallback( (error: IHttpFetchError) => { @@ -52,21 +55,56 @@ export const useGraphLoader = ({ toastNotifications, coreStart }: UseGraphLoader [toastNotifications] ); + const getRequestInspector = useCallback( + (indexName: string) => { + const inspectRequest = requestAdapter.start( + i18n.translate('xpack.graph.inspectAdapter.graphExploreRequest.name', { + defaultMessage: 'Data', + }), + { + description: i18n.translate( + 'xpack.graph.inspectAdapter.graphExploreRequest.description', + { + defaultMessage: 'This request queries Elasticsearch to fetch the data for the Graph.', + } + ), + } + ); + inspectRequest.stats({ + indexPattern: { + label: i18n.translate( + 'xpack.graph.inspectAdapter.graphExploreRequest.dataView.description.label', + { defaultMessage: 'Data view' } + ), + value: indexName, + description: i18n.translate( + 'xpack.graph.inspectAdapter.graphExploreRequest.dataView.description', + { defaultMessage: 'The data view that connected to the Elasticsearch indices.' } + ), + }, + }); + return inspectRequest; + }, + [requestAdapter] + ); + // Replacement function for graphClientWorkspace's comms so // that it works with Kibana. const callNodeProxy = useCallback( (indexName: string, query: ExploreRequest, responseHandler: GraphExploreCallback) => { - const request = { - body: JSON.stringify({ - index: indexName, - query, - }), - }; + const dsl = { index: indexName, query }; + const request = { body: JSON.stringify(dsl) }; setLoading(true); + + requestAdapter.reset(); + const inspectRequest = getRequestInspector(indexName); + inspectRequest.json(dsl); + return coreStart.http - .post<{ resp: { timed_out: unknown } }>('../api/graph/graphExplore', request) + .post<{ resp: estypes.GraphExploreResponse }>('../api/graph/graphExplore', request) .then(function (data) { const response = data.resp; + if (response?.timed_out) { toastNotifications.addWarning( i18n.translate('xpack.graph.exploreGraph.timedOutWarningText', { @@ -74,38 +112,48 @@ export const useGraphLoader = ({ toastNotifications, coreStart }: UseGraphLoader }) ); } + inspectRequest.stats({}).ok({ json: response }); responseHandler(response); }) - .catch(handleHttpError) + .catch((e) => { + inspectRequest.error({ json: e }); + handleHttpError(e); + }) .finally(() => setLoading(false)); }, - [coreStart.http, handleHttpError, toastNotifications] + [coreStart.http, getRequestInspector, handleHttpError, requestAdapter, toastNotifications] ); // Helper function for the graphClientWorkspace to perform a query const callSearchNodeProxy = useCallback( (indexName: string, query: SearchRequest, responseHandler: GraphSearchCallback) => { - const request = { - body: JSON.stringify({ - index: indexName, - body: query, - }), - }; + const dsl = { index: indexName, body: query }; + const request = { body: JSON.stringify(dsl) }; setLoading(true); + + requestAdapter.reset(); + const inspectRequest = getRequestInspector(indexName); + inspectRequest.json(dsl); + coreStart.http - .post<{ resp: unknown }>('../api/graph/searchProxy', request) + .post<{ resp: estypes.GraphExploreResponse }>('../api/graph/searchProxy', request) .then(function (data) { const response = data.resp; + inspectRequest.stats({}).ok({ json: response }); responseHandler(response); }) - .catch(handleHttpError) + .catch((e) => { + inspectRequest.error({ json: e }); + handleHttpError(e); + }) .finally(() => setLoading(false)); }, - [coreStart.http, handleHttpError] + [coreStart.http, getRequestInspector, handleHttpError, requestAdapter] ); return { loading, + requestAdapter, callNodeProxy, callSearchNodeProxy, handleSearchQueryError, diff --git a/x-pack/plugins/graph/public/helpers/use_inspector.ts b/x-pack/plugins/graph/public/helpers/use_inspector.ts new file mode 100644 index 0000000000000..d6f237e625c3d --- /dev/null +++ b/x-pack/plugins/graph/public/helpers/use_inspector.ts @@ -0,0 +1,38 @@ +/* + * 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 { useCallback, useEffect, useState } from 'react'; +import { + Start as InspectorPublicPluginStart, + InspectorSession, + RequestAdapter, +} from '@kbn/inspector-plugin/public'; + +export const useInspector = ({ + inspect, + requestAdapter, +}: { + inspect: InspectorPublicPluginStart; + requestAdapter: RequestAdapter; +}) => { + const [inspectorSession, setInspectorSession] = useState(); + + useEffect(() => { + return () => { + if (inspectorSession) { + inspectorSession.close(); + } + }; + }, [inspectorSession]); + + const onOpenInspector = useCallback(() => { + const session = inspect.open({ requests: requestAdapter }, {}); + setInspectorSession(session); + }, [inspect, requestAdapter]); + + return { onOpenInspector }; +}; diff --git a/x-pack/plugins/graph/public/plugin.ts b/x-pack/plugins/graph/public/plugin.ts index d4f8471426cc5..96dac017eeabb 100644 --- a/x-pack/plugins/graph/public/plugin.ts +++ b/x-pack/plugins/graph/public/plugin.ts @@ -19,6 +19,7 @@ import { DEFAULT_APP_CATEGORIES, } from '@kbn/core/public'; +import { Start as InspectorPublicPluginStart } from '@kbn/inspector-plugin/public'; import { Storage } from '@kbn/kibana-utils-plugin/public'; import { NavigationPublicPluginStart as NavigationStart } from '@kbn/navigation-plugin/public'; import { DataPublicPluginStart } from '@kbn/data-plugin/public'; @@ -40,6 +41,7 @@ export interface GraphPluginStartDependencies { data: DataPublicPluginStart; unifiedSearch: UnifiedSearchPublicPluginStart; savedObjects: SavedObjectsStart; + inspector: InspectorPublicPluginStart; home?: HomePublicPluginStart; spaces?: SpacesApi; } @@ -110,6 +112,7 @@ export class GraphPlugin savedObjects: pluginsStart.savedObjects, uiSettings: core.uiSettings, spaces: pluginsStart.spaces, + inspect: pluginsStart.inspector, }); }, }); diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json index e4db41419cb9b..cdaa18f14c6e5 100644 --- a/x-pack/plugins/translations/translations/fr-FR.json +++ b/x-pack/plugins/translations/translations/fr-FR.json @@ -13917,9 +13917,6 @@ "xpack.graph.icon.tachometer": "Tachymètre", "xpack.graph.icon.user": "Utilisateur", "xpack.graph.icon.users": "Utilisateurs", - "xpack.graph.inspect.requestTabTitle": "Requête", - "xpack.graph.inspect.responseTabTitle": "Réponse", - "xpack.graph.inspect.title": "Inspecter", "xpack.graph.leaveWorkspace.confirmButtonLabel": "Quitter", "xpack.graph.leaveWorkspace.confirmText": "Si vous quittez maintenant, vous perdez les modifications non enregistrées.", "xpack.graph.leaveWorkspace.modalTitle": "Modifications non enregistrées", diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index 557f4014f1e4c..a7d49509c7756 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -13903,9 +13903,6 @@ "xpack.graph.icon.tachometer": "タコメーター", "xpack.graph.icon.user": "ユーザー", "xpack.graph.icon.users": "ユーザー", - "xpack.graph.inspect.requestTabTitle": "リクエスト", - "xpack.graph.inspect.responseTabTitle": "応答", - "xpack.graph.inspect.title": "検査", "xpack.graph.leaveWorkspace.confirmButtonLabel": "それでも移動", "xpack.graph.leaveWorkspace.confirmText": "今移動すると、保存されていない変更が失われます。", "xpack.graph.leaveWorkspace.modalTitle": "保存されていない変更", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index 7fb05ec21f71d..25bd585b13431 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -13923,9 +13923,6 @@ "xpack.graph.icon.tachometer": "转速表", "xpack.graph.icon.user": "用户", "xpack.graph.icon.users": "用户", - "xpack.graph.inspect.requestTabTitle": "请求", - "xpack.graph.inspect.responseTabTitle": "响应", - "xpack.graph.inspect.title": "检查", "xpack.graph.leaveWorkspace.confirmButtonLabel": "离开", "xpack.graph.leaveWorkspace.confirmText": "如果现在离开，将丢失未保存的更改。", "xpack.graph.leaveWorkspace.modalTitle": "未保存的更改", diff --git a/x-pack/test/accessibility/apps/graph.ts b/x-pack/test/accessibility/apps/graph.ts index d13ed5a58f871..85a77f4816273 100644 --- a/x-pack/test/accessibility/apps/graph.ts +++ b/x-pack/test/accessibility/apps/graph.ts @@ -63,12 +63,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await testSubjects.click('saveCancelButton'); }); - it('Graph inspect panel', async function () { - await testSubjects.click('graphInspectButton'); - await a11y.testAppSnapshot(); - await testSubjects.click('graphInspectButton'); - }); - it('Graph settings - advanced settings tab', async function () { await testSubjects.click('graphSettingsButton'); await a11y.testAppSnapshot(); From a3414f6e2ff705699c3b09497fecc4d9ae049e37 Mon Sep 17 00:00:00 2001 From: Kyle Pollich Date: Thu, 29 Sep 2022 04:39:22 -0400 Subject: [PATCH 79/95] [Fleet] Sample README implementation for Language Clients (#141935) * wip * Adjust language clients APIs * Comment out sample card * Fix checks * Fix translations * Add breadcrumbs and expand sample page Co-authored-by: criamico Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../common/language_integrations.ts | 14 ++ .../fleet_integration/overview_component.tsx | 24 --- .../sample/sample_client_readme.tsx | 200 ++++++++++++++++++ .../custom_integrations/public/mocks.tsx | 2 +- .../custom_integrations/public/plugin.tsx | 15 +- .../custom_integrations/public/types.ts | 2 +- .../fleet/.storybook/context/index.tsx | 2 +- .../detail/custom_languages_overview.tsx | 8 +- 8 files changed, 223 insertions(+), 44 deletions(-) delete mode 100644 src/plugins/custom_integrations/public/components/fleet_integration/overview_component.tsx create mode 100644 src/plugins/custom_integrations/public/components/fleet_integration/sample/sample_client_readme.tsx diff --git a/src/plugins/custom_integrations/common/language_integrations.ts b/src/plugins/custom_integrations/common/language_integrations.ts index c9821281f2854..9ba914c02fd0d 100644 --- a/src/plugins/custom_integrations/common/language_integrations.ts +++ b/src/plugins/custom_integrations/common/language_integrations.ts @@ -145,4 +145,18 @@ export const languageIntegrations: LanguageIntegration[] = [ integrationsAppUrl: `/app/integrations/language_clients/java/overview`, exportLanguageUiComponent: false, }, + // Uncomment to show the sample language client card + README UI + // { + // id: 'sample', + // title: i18n.translate('customIntegrations.languageclients.SampleTitle', { + // defaultMessage: 'Sample Language Client', + // }), + // icon: 'es.svg', + // description: i18n.translate('customIntegrations.languageclients.SampleDescription', { + // defaultMessage: 'Sample language client', + // }), + // docUrlTemplate: '', + // integrationsAppUrl: `/app/integrations/language_clients/sample/overview`, + // exportLanguageUiComponent: true, + // }, ]; diff --git a/src/plugins/custom_integrations/public/components/fleet_integration/overview_component.tsx b/src/plugins/custom_integrations/public/components/fleet_integration/overview_component.tsx deleted file mode 100644 index c5b8584e1e4a9..0000000000000 --- a/src/plugins/custom_integrations/public/components/fleet_integration/overview_component.tsx +++ /dev/null @@ -1,24 +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. - */ - -import React from 'react'; -import { EuiTitle } from '@elastic/eui'; - -/* -Example of Overview component to be shown inside Integrations app -*/ -export interface ReadmeProps { - packageName: string; -} -export const OverviewComponent: React.FC = ({ packageName }) => { - return ( - -

    {packageName} client - Overview

    -     - ); -}; diff --git a/src/plugins/custom_integrations/public/components/fleet_integration/sample/sample_client_readme.tsx b/src/plugins/custom_integrations/public/components/fleet_integration/sample/sample_client_readme.tsx new file mode 100644 index 0000000000000..c2ca0d62da689 --- /dev/null +++ b/src/plugins/custom_integrations/public/components/fleet_integration/sample/sample_client_readme.tsx @@ -0,0 +1,200 @@ +/* + * 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. + */ + +import React, { useState } from 'react'; + +// eslint-disable-next-line @kbn/eslint/module_migration +import styled from 'styled-components'; +import cuid from 'cuid'; + +import { + EuiButton, + EuiCode, + EuiCodeBlock, + EuiFlexGroup, + EuiFlexItem, + EuiPage, + EuiPageBody, + EuiPageHeader, + EuiPageSection, + EuiSpacer, + EuiText, + EuiTitle, + EuiPanel, + EuiImage, +} from '@elastic/eui'; +import { FormattedMessage } from '@kbn/i18n-react'; +import { euiThemeVars } from '@kbn/ui-theme'; +import icon from '../../../assets/language_clients/es.svg'; + +const CenterColumn = styled(EuiFlexItem)` + max-width: 740px; +`; + +const FixedHeader = styled.div` + width: 100%; + height: 196px; + border-bottom: 1px solid ${euiThemeVars.euiColorLightShade}; +`; + +const IconPanel = styled(EuiPanel)` + padding: ${(props) => props.theme.eui.euiSizeXL}; + width: ${(props) => + parseFloat(props.theme.eui.euiSize) * 6 + parseFloat(props.theme.eui.euiSizeXL) * 2}px; + svg, + img { + height: ${(props) => parseFloat(props.theme.eui.euiSize) * 6}px; + width: ${(props) => parseFloat(props.theme.eui.euiSize) * 6}px; + } + .euiFlexItem { + height: ${(props) => parseFloat(props.theme.eui.euiSize) * 6}px; + justify-content: center; + } +`; + +const TopFlexGroup = styled(EuiFlexGroup)` + max-width: 1150px; + margin-left: auto; + margin-right: auto; + padding: calc(${euiThemeVars.euiSizeXL} * 2) ${euiThemeVars.euiSizeM} 0 ${euiThemeVars.euiSizeM}; +`; + +export const SampleClientReadme = () => { + const [apiKey, setApiKey] = useState(null); + + return ( + <> + + + + + + + + + +

    + +

    +     +     +     +     + + + + + + + + + + } + /> + + + + +

    + +

    +     + + + + + {`# Grab the sample language client from NPM and install it in your project \n`} + {`$ npm install @elastic/elasticsearch-sample`} + +     + + + +

    + +

    +     + + + + + + + + + + setApiKey(cuid())} disabled={!!apiKey}> + Generate API key + + + + {apiKey && ( + + + {apiKey} + + + )} + +     + + + +

    + +

    +     + + + elastic.config.json, + }} + /> + + + + + + {` +{ + "apiKey": "${apiKey || 'YOUR_API_KEY'} +} + + `} + +     +     +     +     +     + + ); +}; diff --git a/src/plugins/custom_integrations/public/mocks.tsx b/src/plugins/custom_integrations/public/mocks.tsx index 038fdb1780458..2503008ea90ec 100644 --- a/src/plugins/custom_integrations/public/mocks.tsx +++ b/src/plugins/custom_integrations/public/mocks.tsx @@ -24,7 +24,7 @@ function createCustomIntegrationsStart(): jest.Mocked { const services = servicesFactory({ startPlugins: {}, coreStart: coreMock.createStart() }); return { - languageClientsUiComponents: new Map(), + languageClientsUiComponents: {}, ContextProvider: jest.fn(({ children }) => ( {children} diff --git a/src/plugins/custom_integrations/public/plugin.tsx b/src/plugins/custom_integrations/public/plugin.tsx index 90a796955a595..827d31ce3749d 100755 --- a/src/plugins/custom_integrations/public/plugin.tsx +++ b/src/plugins/custom_integrations/public/plugin.tsx @@ -19,12 +19,10 @@ import { ROUTES_APPEND_CUSTOM_INTEGRATIONS, ROUTES_REPLACEMENT_CUSTOM_INTEGRATIONS, } from '../common'; -import { languageIntegrations } from '../common/language_integrations'; - -import { OverviewComponent } from './components/fleet_integration/overview_component'; import { CustomIntegrationsServicesProvider } from './services'; import { servicesFactory } from './services/kibana'; +import { SampleClientReadme } from './components/fleet_integration/sample/sample_client_readme'; export class CustomIntegrationsPlugin implements Plugin @@ -48,16 +46,7 @@ export class CustomIntegrationsPlugin ): CustomIntegrationsStart { const services = servicesFactory({ coreStart, startPlugins }); - const languageClientsUiComponents = new Map(); - - // Set the language clients components to render in Fleet plugin under Integrations app - // Export component only if the integration has exportLanguageUiComponent = true - languageIntegrations - .filter((int) => int.exportLanguageUiComponent) - .map((int) => { - const ReadmeComponent = () => ; - languageClientsUiComponents.set(`language_client.${int.id}`, ReadmeComponent); - }); + const languageClientsUiComponents = { sample: SampleClientReadme }; const ContextProvider: React.FC = ({ children }) => ( diff --git a/src/plugins/custom_integrations/public/types.ts b/src/plugins/custom_integrations/public/types.ts index db8acc3e2e07e..60b8aefe23dd1 100755 --- a/src/plugins/custom_integrations/public/types.ts +++ b/src/plugins/custom_integrations/public/types.ts @@ -15,7 +15,7 @@ export interface CustomIntegrationsSetup { export interface CustomIntegrationsStart { ContextProvider: React.FC; - languageClientsUiComponents: Map; + languageClientsUiComponents: Record; } // eslint-disable-next-line @typescript-eslint/no-empty-interface diff --git a/x-pack/plugins/fleet/.storybook/context/index.tsx b/x-pack/plugins/fleet/.storybook/context/index.tsx index 7ef04979969e0..1d5416cf0483d 100644 --- a/x-pack/plugins/fleet/.storybook/context/index.tsx +++ b/x-pack/plugins/fleet/.storybook/context/index.tsx @@ -72,7 +72,7 @@ export const StorybookContext: React.FC<{ storyContext?: Parameters }, customIntegrations: { ContextProvider: getStorybookContextProvider(), - languageClientsUiComponents: new Map(), + languageClientsUiComponents: {}, }, docLinks: getDocLinks(), http: getHttp(), diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/custom_languages_overview.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/custom_languages_overview.tsx index 93e7c6e0fac22..c8c1914599f08 100644 --- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/custom_languages_overview.tsx +++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/custom_languages_overview.tsx @@ -6,9 +6,10 @@ */ import React from 'react'; import { useParams, Redirect } from 'react-router-dom'; +import { capitalize } from 'lodash'; import { getCustomIntegrationsStart } from '../../../../../../services/custom_integrations'; -import { useLink } from '../../../../../../hooks'; +import { useLink, useBreadcrumbs } from '../../../../hooks'; export interface CustomLanguageClientsParams { pkgkey: string; } @@ -20,10 +21,9 @@ export interface CustomLanguageClientsParams { export const CustomLanguagesOverview = () => { const { pkgkey } = useParams(); const { getPath } = useLink(); + useBreadcrumbs('integration_details_overview', { pkgTitle: capitalize(pkgkey) }); - const Component = getCustomIntegrationsStart().languageClientsUiComponents.get( - `language_client.${pkgkey}` - ); + const Component = getCustomIntegrationsStart().languageClientsUiComponents[pkgkey]; return Component ? : ; }; From 9ad2a9c16c75ed9ca7ce7204e0b86085ef5c2673 Mon Sep 17 00:00:00 2001 From: Marco Liberati Date: Thu, 29 Sep 2022 10:58:43 +0200 Subject: [PATCH 80/95] [Lens] Replace layer dimension groups required flag with more generic one (#141675) * :fire: remove required flag in favour of requiredMinDimensionCount * :ok_hand: Integrate feedback + add more test cases * Update x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.test.tsx --- .../config_panel/layer_panel.test.tsx | 106 +++++++++++++----- .../editor_frame/config_panel/layer_panel.tsx | 35 +++--- x-pack/plugins/lens/public/types.ts | 1 - .../datatable/visualization.tsx | 2 +- .../gauge/visualization.test.ts | 16 +-- .../visualizations/gauge/visualization.tsx | 4 +- .../heatmap/visualization.test.ts | 18 +-- .../visualizations/heatmap/visualization.tsx | 6 +- .../legacy_metric/visualization.tsx | 2 +- .../__snapshots__/visualization.test.ts.snap | 8 +- .../visualizations/metric/visualization.tsx | 8 +- .../partition/visualization.tsx | 4 +- .../visualizations/xy/annotations/helpers.tsx | 2 +- .../xy/reference_line_helpers.tsx | 2 +- .../visualizations/xy/visualization.test.ts | 6 +- .../visualizations/xy/visualization.tsx | 9 +- 16 files changed, 138 insertions(+), 91 deletions(-) diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.test.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.test.tsx index baece355d1d54..74394e89f0d63 100644 --- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.test.tsx +++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.test.tsx @@ -243,7 +243,7 @@ describe('LayerPanel', () => { filterOperations: () => true, supportsMoreColumns: true, dataTestSubj: 'lnsGroup', - required: true, + requiredMinDimensionCount: 1, }, ], }); @@ -303,37 +303,83 @@ describe('LayerPanel', () => { expect(groups.findWhere((e) => e.prop('error') === '')).toHaveLength(1); }); - it('should render the required warning when only one group is configured (with requiredMinDimensionCount)', async () => { - mockVisualization.getConfiguration.mockReturnValue({ - groups: [ - { - groupLabel: 'A', - groupId: 'a', - accessors: [{ columnId: 'x' }], - filterOperations: () => true, - supportsMoreColumns: false, - dataTestSubj: 'lnsGroup', - }, - { - groupLabel: 'B', - groupId: 'b', - accessors: [{ columnId: 'y' }], - filterOperations: () => true, - supportsMoreColumns: true, - dataTestSubj: 'lnsGroup', - requiredMinDimensionCount: 2, - }, - ], - }); - - const { instance } = await mountWithProvider(); + it.each` + minDimensions | accessors | errors + ${1} | ${0} | ${1} + ${2} | ${0} | ${2} + ${2} | ${1} | ${2} + `( + 'should render the required warning for $errors fields when only one group is configured with requiredMinDimensionCount: $minDimensions and $accessors accessors', + async ({ minDimensions, accessors, errors }) => { + mockVisualization.getConfiguration.mockReturnValue({ + groups: [ + { + groupLabel: 'A', + groupId: 'a', + accessors: [{ columnId: 'x' }], + filterOperations: () => true, + supportsMoreColumns: false, + dataTestSubj: 'lnsGroup', + }, + { + groupLabel: 'B', + groupId: 'b', + accessors: [{ columnId: 'y' }].slice(0, accessors), + filterOperations: () => true, + supportsMoreColumns: true, + dataTestSubj: 'lnsGroup', + requiredMinDimensionCount: minDimensions, + }, + ], + }); + const { instance } = await mountWithProvider(); + + const errorMessage = errors === 1 ? 'Requires field' : 'Requires 2 fields'; + + const group = instance.find(EuiFormRow).findWhere((e) => e.prop('error') === errorMessage); + + expect(group).toHaveLength(1); + } + ); + + it.each` + minDimensions | accessors + ${0} | ${0} + ${0} | ${1} + ${1} | ${1} + ${1} | ${2} + ${2} | ${2} + `( + 'should not render the required warning when only one group is configured with requiredMinDimensionCount: $minDimensions and $accessors accessors', + async ({ minDimensions, accessors }) => { + mockVisualization.getConfiguration.mockReturnValue({ + groups: [ + { + groupLabel: 'A', + groupId: 'a', + accessors: [{ columnId: 'x' }], + filterOperations: () => true, + supportsMoreColumns: false, + dataTestSubj: 'lnsGroup', + }, + { + groupLabel: 'B', + groupId: 'b', + accessors: [{ columnId: 'y' }, { columnId: 'z' }].slice(0, accessors), + filterOperations: () => true, + supportsMoreColumns: true, + dataTestSubj: 'lnsGroup', + requiredMinDimensionCount: minDimensions, + }, + ], + }); + const { instance } = await mountWithProvider(); - const group = instance - .find(EuiFormRow) - .findWhere((e) => e.prop('error') === 'Requires 2 fields'); + const group = instance.find(EuiFormRow).findWhere((e) => e.prop('error')); - expect(group).toHaveLength(1); - }); + expect(group).toHaveLength(0); + } + ); it('should render the datasource and visualization panels inside the dimension container', async () => { mockVisualization.getConfiguration.mockReturnValueOnce({ diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx index ed6d6b8c0553d..cc748df7c3ecd 100644 --- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx +++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx @@ -381,20 +381,25 @@ export function LayerPanel( let errorText: string = ''; if (!isEmptyLayer) { - if (group.requiredMinDimensionCount) { - errorText = i18n.translate( - 'xpack.lens.editorFrame.requiresTwoOrMoreFieldsWarningLabel', - { - defaultMessage: 'Requires {requiredMinDimensionCount} fields', - values: { - requiredMinDimensionCount: group.requiredMinDimensionCount, - }, - } - ); - } else if (group.required && group.accessors.length === 0) { - errorText = i18n.translate('xpack.lens.editorFrame.requiresFieldWarningLabel', { - defaultMessage: 'Requires field', - }); + if ( + group.requiredMinDimensionCount && + group.requiredMinDimensionCount > group.accessors.length + ) { + if (group.requiredMinDimensionCount > 1) { + errorText = i18n.translate( + 'xpack.lens.editorFrame.requiresTwoOrMoreFieldsWarningLabel', + { + defaultMessage: 'Requires {requiredMinDimensionCount} fields', + values: { + requiredMinDimensionCount: group.requiredMinDimensionCount, + }, + } + ); + } else { + errorText = i18n.translate('xpack.lens.editorFrame.requiresFieldWarningLabel', { + defaultMessage: 'Requires field', + }); + } } else if (group.dimensionsTooMany && group.dimensionsTooMany > 0) { errorText = i18n.translate( 'xpack.lens.editorFrame.tooManyDimensionsSingularWarningLabel', @@ -408,7 +413,7 @@ export function LayerPanel( ); } } - const isOptional = !group.required && !group.suggestedValue; + const isOptional = !group.requiredMinDimensionCount && !group.suggestedValue; return ( !op.isBucketed, - required: true, + requiredMinDimensionCount: 1, dataTestSubj: 'lnsDatatable_metrics', enableDimensionEditor: true, }, diff --git a/x-pack/plugins/lens/public/visualizations/gauge/visualization.test.ts b/x-pack/plugins/lens/public/visualizations/gauge/visualization.test.ts index 94c9ce28987bf..e999cac9dd0e6 100644 --- a/x-pack/plugins/lens/public/visualizations/gauge/visualization.test.ts +++ b/x-pack/plugins/lens/public/visualizations/gauge/visualization.test.ts @@ -105,7 +105,7 @@ describe('gauge', () => { accessors: [{ columnId: 'metric-accessor', triggerIcon: 'none' }], filterOperations: isNumericDynamicMetric, supportsMoreColumns: false, - required: true, + requiredMinDimensionCount: 1, dataTestSubj: 'lnsGauge_metricDimensionPanel', enableDimensionEditor: true, enableFormatSelector: true, @@ -155,7 +155,7 @@ describe('gauge', () => { accessors: [{ columnId: 'goal-accessor' }], filterOperations: isNumericMetric, supportsMoreColumns: false, - required: false, + requiredMinDimensionCount: 0, dataTestSubj: 'lnsGauge_goalDimensionPanel', enableFormatSelector: false, supportStaticValue: true, @@ -187,7 +187,7 @@ describe('gauge', () => { accessors: [], filterOperations: isNumericDynamicMetric, supportsMoreColumns: true, - required: true, + requiredMinDimensionCount: 1, dataTestSubj: 'lnsGauge_metricDimensionPanel', enableDimensionEditor: true, enableFormatSelector: true, @@ -237,7 +237,7 @@ describe('gauge', () => { accessors: [], filterOperations: isNumericMetric, supportsMoreColumns: true, - required: false, + requiredMinDimensionCount: 0, dataTestSubj: 'lnsGauge_goalDimensionPanel', enableFormatSelector: false, supportStaticValue: true, @@ -275,7 +275,7 @@ describe('gauge', () => { accessors: [{ columnId: 'metric-accessor', triggerIcon: 'none' }], filterOperations: isNumericDynamicMetric, supportsMoreColumns: false, - required: true, + requiredMinDimensionCount: 1, dataTestSubj: 'lnsGauge_metricDimensionPanel', enableDimensionEditor: true, enableFormatSelector: true, @@ -325,7 +325,7 @@ describe('gauge', () => { accessors: [{ columnId: 'goal-accessor' }], filterOperations: isNumericMetric, supportsMoreColumns: false, - required: false, + requiredMinDimensionCount: 0, dataTestSubj: 'lnsGauge_goalDimensionPanel', enableFormatSelector: false, supportStaticValue: true, @@ -368,7 +368,7 @@ describe('gauge', () => { accessors: [{ columnId: 'metric-accessor', triggerIcon: 'none' }], filterOperations: isNumericDynamicMetric, supportsMoreColumns: false, - required: true, + requiredMinDimensionCount: 1, dataTestSubj: 'lnsGauge_metricDimensionPanel', enableDimensionEditor: true, enableFormatSelector: true, @@ -422,7 +422,7 @@ describe('gauge', () => { accessors: [{ columnId: 'goal-accessor' }], filterOperations: isNumericMetric, supportsMoreColumns: false, - required: false, + requiredMinDimensionCount: 0, dataTestSubj: 'lnsGauge_goalDimensionPanel', enableFormatSelector: false, supportStaticValue: true, diff --git a/x-pack/plugins/lens/public/visualizations/gauge/visualization.tsx b/x-pack/plugins/lens/public/visualizations/gauge/visualization.tsx index 37d10918d4129..19fd46459b2b7 100644 --- a/x-pack/plugins/lens/public/visualizations/gauge/visualization.tsx +++ b/x-pack/plugins/lens/public/visualizations/gauge/visualization.tsx @@ -275,7 +275,7 @@ export const getGaugeVisualization = ({ : [], filterOperations: isNumericDynamicMetric, supportsMoreColumns: !metricAccessor, - required: true, + requiredMinDimensionCount: 1, dataTestSubj: 'lnsGauge_metricDimensionPanel', enableDimensionEditor: true, }, @@ -352,7 +352,7 @@ export const getGaugeVisualization = ({ accessors: state.goalAccessor ? [{ columnId: state.goalAccessor }] : [], filterOperations: isNumericMetric, supportsMoreColumns: !state.goalAccessor, - required: false, + requiredMinDimensionCount: 0, dataTestSubj: 'lnsGauge_goalDimensionPanel', }, ], diff --git a/x-pack/plugins/lens/public/visualizations/heatmap/visualization.test.ts b/x-pack/plugins/lens/public/visualizations/heatmap/visualization.test.ts index ee6a7030a0c9d..38cfa9bf10b54 100644 --- a/x-pack/plugins/lens/public/visualizations/heatmap/visualization.test.ts +++ b/x-pack/plugins/lens/public/visualizations/heatmap/visualization.test.ts @@ -136,7 +136,7 @@ describe('heatmap', () => { accessors: [{ columnId: 'x-accessor' }], filterOperations: filterOperationsAxis, supportsMoreColumns: false, - required: true, + requiredMinDimensionCount: 1, dataTestSubj: 'lnsHeatmap_xDimensionPanel', }, { @@ -146,7 +146,7 @@ describe('heatmap', () => { accessors: [{ columnId: 'y-accessor' }], filterOperations: filterOperationsAxis, supportsMoreColumns: false, - required: false, + requiredMinDimensionCount: 0, dataTestSubj: 'lnsHeatmap_yDimensionPanel', }, { @@ -165,7 +165,7 @@ describe('heatmap', () => { ], filterOperations: isCellValueSupported, supportsMoreColumns: false, - required: true, + requiredMinDimensionCount: 1, dataTestSubj: 'lnsHeatmap_cellPanel', enableDimensionEditor: true, }, @@ -194,7 +194,7 @@ describe('heatmap', () => { accessors: [{ columnId: 'x-accessor' }], filterOperations: filterOperationsAxis, supportsMoreColumns: false, - required: true, + requiredMinDimensionCount: 1, dataTestSubj: 'lnsHeatmap_xDimensionPanel', }, { @@ -204,7 +204,7 @@ describe('heatmap', () => { accessors: [], filterOperations: filterOperationsAxis, supportsMoreColumns: true, - required: false, + requiredMinDimensionCount: 0, dataTestSubj: 'lnsHeatmap_yDimensionPanel', }, { @@ -217,7 +217,7 @@ describe('heatmap', () => { accessors: [], filterOperations: isCellValueSupported, supportsMoreColumns: true, - required: true, + requiredMinDimensionCount: 1, dataTestSubj: 'lnsHeatmap_cellPanel', enableDimensionEditor: true, }, @@ -250,7 +250,7 @@ describe('heatmap', () => { accessors: [{ columnId: 'x-accessor' }], filterOperations: filterOperationsAxis, supportsMoreColumns: false, - required: true, + requiredMinDimensionCount: 1, dataTestSubj: 'lnsHeatmap_xDimensionPanel', }, { @@ -260,7 +260,7 @@ describe('heatmap', () => { accessors: [{ columnId: 'y-accessor' }], filterOperations: filterOperationsAxis, supportsMoreColumns: false, - required: false, + requiredMinDimensionCount: 0, dataTestSubj: 'lnsHeatmap_yDimensionPanel', }, { @@ -278,7 +278,7 @@ describe('heatmap', () => { ], filterOperations: isCellValueSupported, supportsMoreColumns: false, - required: true, + requiredMinDimensionCount: 1, dataTestSubj: 'lnsHeatmap_cellPanel', enableDimensionEditor: true, }, diff --git a/x-pack/plugins/lens/public/visualizations/heatmap/visualization.tsx b/x-pack/plugins/lens/public/visualizations/heatmap/visualization.tsx index 09548df0a67e4..1fc48b4d71c3e 100644 --- a/x-pack/plugins/lens/public/visualizations/heatmap/visualization.tsx +++ b/x-pack/plugins/lens/public/visualizations/heatmap/visualization.tsx @@ -181,7 +181,7 @@ export const getHeatmapVisualization = ({ accessors: state.xAccessor ? [{ columnId: state.xAccessor }] : [], filterOperations: filterOperationsAxis, supportsMoreColumns: !state.xAccessor, - required: true, + requiredMinDimensionCount: 1, dataTestSubj: 'lnsHeatmap_xDimensionPanel', }, { @@ -191,7 +191,7 @@ export const getHeatmapVisualization = ({ accessors: state.yAccessor ? [{ columnId: state.yAccessor }] : [], filterOperations: filterOperationsAxis, supportsMoreColumns: !state.yAccessor, - required: false, + requiredMinDimensionCount: 0, dataTestSubj: 'lnsHeatmap_yDimensionPanel', }, { @@ -224,7 +224,7 @@ export const getHeatmapVisualization = ({ filterOperations: isCellValueSupported, supportsMoreColumns: !state.valueAccessor, enableDimensionEditor: true, - required: true, + requiredMinDimensionCount: 1, dataTestSubj: 'lnsHeatmap_cellPanel', }, ], diff --git a/x-pack/plugins/lens/public/visualizations/legacy_metric/visualization.tsx b/x-pack/plugins/lens/public/visualizations/legacy_metric/visualization.tsx index f1b1ffd1f00b4..02a4cd23ad4f8 100644 --- a/x-pack/plugins/lens/public/visualizations/legacy_metric/visualization.tsx +++ b/x-pack/plugins/lens/public/visualizations/legacy_metric/visualization.tsx @@ -258,7 +258,7 @@ export const getLegacyMetricVisualization = ({ filterOperations: (op: OperationMetadata) => !op.isBucketed && legacyMetricSupportedTypes.has(op.dataType), enableDimensionEditor: true, - required: true, + requiredMinDimensionCount: 1, }, ], }; diff --git a/x-pack/plugins/lens/public/visualizations/metric/__snapshots__/visualization.test.ts.snap b/x-pack/plugins/lens/public/visualizations/metric/__snapshots__/visualization.test.ts.snap index 8c565cbed53be..7d1df68158266 100644 --- a/x-pack/plugins/lens/public/visualizations/metric/__snapshots__/visualization.test.ts.snap +++ b/x-pack/plugins/lens/public/visualizations/metric/__snapshots__/visualization.test.ts.snap @@ -24,7 +24,7 @@ Object { "paramEditorCustomProps": Object { "headingLabel": "Value", }, - "required": true, + "requiredMinDimensionCount": 1, "supportsMoreColumns": false, }, Object { @@ -46,7 +46,7 @@ Object { "paramEditorCustomProps": Object { "headingLabel": "Value", }, - "required": false, + "requiredMinDimensionCount": 0, "supportsMoreColumns": false, }, Object { @@ -70,7 +70,7 @@ Object { "headingLabel": "Value", }, "prioritizedOperation": "max", - "required": false, + "requiredMinDimensionCount": 0, "supportStaticValue": true, "supportsMoreColumns": false, }, @@ -91,7 +91,7 @@ Object { "groupId": "breakdownBy", "groupLabel": "Break down by", "layerId": "first", - "required": false, + "requiredMinDimensionCount": 0, "supportsMoreColumns": false, }, ], diff --git a/x-pack/plugins/lens/public/visualizations/metric/visualization.tsx b/x-pack/plugins/lens/public/visualizations/metric/visualization.tsx index b58068b3ec202..81f7f08fe3223 100644 --- a/x-pack/plugins/lens/public/visualizations/metric/visualization.tsx +++ b/x-pack/plugins/lens/public/visualizations/metric/visualization.tsx @@ -315,7 +315,7 @@ export const getMetricVisualization = ({ enableDimensionEditor: true, enableFormatSelector: true, formatSelectorOptions: formatterOptions, - required: true, + requiredMinDimensionCount: 1, }, { groupId: GROUP_ID.SECONDARY_METRIC, @@ -341,7 +341,7 @@ export const getMetricVisualization = ({ enableDimensionEditor: true, enableFormatSelector: true, formatSelectorOptions: formatterOptions, - required: false, + requiredMinDimensionCount: 0, }, { groupId: GROUP_ID.MAX, @@ -367,7 +367,7 @@ export const getMetricVisualization = ({ formatSelectorOptions: formatterOptions, supportStaticValue: true, prioritizedOperation: 'max', - required: false, + requiredMinDimensionCount: 0, groupTooltip: i18n.translate('xpack.lens.metric.maxTooltip', { defaultMessage: 'If the maximum value is specified, the minimum value is fixed at zero.', @@ -393,7 +393,7 @@ export const getMetricVisualization = ({ enableDimensionEditor: true, enableFormatSelector: true, formatSelectorOptions: formatterOptions, - required: false, + requiredMinDimensionCount: 0, }, ], }; diff --git a/x-pack/plugins/lens/public/visualizations/partition/visualization.tsx b/x-pack/plugins/lens/public/visualizations/partition/visualization.tsx index a60578aa1f0ba..2a8bdc2dd4ab0 100644 --- a/x-pack/plugins/lens/public/visualizations/partition/visualization.tsx +++ b/x-pack/plugins/lens/public/visualizations/partition/visualization.tsx @@ -168,7 +168,7 @@ export const getPieVisualization = ({ } const primaryGroupConfigBaseProps = { - required: true, + requiredMinDimensionCount: 1, groupId: 'primaryGroups', accessors, enableDimensionEditor: true, @@ -284,7 +284,7 @@ export const getPieVisualization = ({ accessors: layer.metric ? [{ columnId: layer.metric }] : [], supportsMoreColumns: !layer.metric, filterOperations: numberMetricOperations, - required: true, + requiredMinDimensionCount: 1, dataTestSubj: 'lnsPie_sizeByDimensionPanel', }); diff --git a/x-pack/plugins/lens/public/visualizations/xy/annotations/helpers.tsx b/x-pack/plugins/lens/public/visualizations/xy/annotations/helpers.tsx index 34aff26582771..baaed78ec0237 100644 --- a/x-pack/plugins/lens/public/visualizations/xy/annotations/helpers.tsx +++ b/x-pack/plugins/lens/public/visualizations/xy/annotations/helpers.tsx @@ -414,7 +414,7 @@ export const getAnnotationsConfiguration = ({ invalidMessage: i18n.translate('xpack.lens.xyChart.addAnnotationsLayerLabelDisabledHelp', { defaultMessage: 'Annotations require a time based chart to work. Add a date histogram.', }), - required: false, + requiredMinDimensionCount: 0, supportsMoreColumns: true, supportFieldFormat: false, enableDimensionEditor: true, diff --git a/x-pack/plugins/lens/public/visualizations/xy/reference_line_helpers.tsx b/x-pack/plugins/lens/public/visualizations/xy/reference_line_helpers.tsx index 362b63c46eb2d..84f0a35d3b95e 100644 --- a/x-pack/plugins/lens/public/visualizations/xy/reference_line_helpers.tsx +++ b/x-pack/plugins/lens/public/visualizations/xy/reference_line_helpers.tsx @@ -461,7 +461,7 @@ export const getReferenceConfiguration = ({ accessors: config.map(({ forAccessor, color }) => getSingleColorConfig(forAccessor, color)), filterOperations: isNumericMetric, supportsMoreColumns: true, - required: false, + requiredMinDimensionCount: 0, enableDimensionEditor: true, supportStaticValue: true, paramEditorCustomProps: { diff --git a/x-pack/plugins/lens/public/visualizations/xy/visualization.test.ts b/x-pack/plugins/lens/public/visualizations/xy/visualization.test.ts index 818df64fba94f..556a89c9a8553 100644 --- a/x-pack/plugins/lens/public/visualizations/xy/visualization.test.ts +++ b/x-pack/plugins/lens/public/visualizations/xy/visualization.test.ts @@ -1047,7 +1047,7 @@ describe('xy_visualization', () => { frame, layerId: 'first', }).groups; - expect(splitGroup.required).toBe(true); + expect(splitGroup.requiredMinDimensionCount).toBe(1); }); test.each([ @@ -1087,7 +1087,7 @@ describe('xy_visualization', () => { frame, layerId: 'first', }).groups; - expect(splitGroup.required).toBe(false); + expect(splitGroup.requiredMinDimensionCount).toBe(0); } ); @@ -1236,7 +1236,7 @@ describe('xy_visualization', () => { frame, layerId: 'first', }).groups; - expect(splitGroup.required).toBe(true); + expect(splitGroup.requiredMinDimensionCount).toBe(1); } ); }); diff --git a/x-pack/plugins/lens/public/visualizations/xy/visualization.tsx b/x-pack/plugins/lens/public/visualizations/xy/visualization.tsx index 61bdd4151219c..34ab6c88ffa19 100644 --- a/x-pack/plugins/lens/public/visualizations/xy/visualization.tsx +++ b/x-pack/plugins/lens/public/visualizations/xy/visualization.tsx @@ -276,10 +276,6 @@ export const getXyVisualization = ({ accessors: sortedAccessors, }); - if (isReferenceLayer(layer)) { - return getReferenceConfiguration({ state, frame, layer, sortedAccessors }); - } - const dataLayer: XYDataLayerConfig = layer; const dataLayers = getDataLayers(state.layers); @@ -332,7 +328,7 @@ export const getXyVisualization = ({ accessors: mappedAccessors, filterOperations: isNumericDynamicMetric, supportsMoreColumns: true, - required: true, + requiredMinDimensionCount: 1, dataTestSubj: 'lnsXY_yDimensionPanel', enableDimensionEditor: true, }, @@ -357,7 +353,8 @@ export const getXyVisualization = ({ filterOperations: isBucketed, supportsMoreColumns: !dataLayer.splitAccessor, dataTestSubj: 'lnsXY_splitDimensionPanel', - required: dataLayer.seriesType.includes('percentage') && hasOnlyOneAccessor, + requiredMinDimensionCount: + dataLayer.seriesType.includes('percentage') && hasOnlyOneAccessor ? 1 : 0, enableDimensionEditor: true, }, ], From ef73713337ea217ff8c4602696f2b0328f3e50b2 Mon Sep 17 00:00:00 2001 From: Joe Reuter Date: Thu, 29 Sep 2022 11:01:48 +0200 Subject: [PATCH 81/95] clear state transfer on navigating away (#141969) --- x-pack/plugins/lens/public/app_plugin/mounter.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/x-pack/plugins/lens/public/app_plugin/mounter.tsx b/x-pack/plugins/lens/public/app_plugin/mounter.tsx index 7cf1331282d4e..ef1933dbd5ca1 100644 --- a/x-pack/plugins/lens/public/app_plugin/mounter.tsx +++ b/x-pack/plugins/lens/public/app_plugin/mounter.tsx @@ -386,5 +386,6 @@ export async function mountApp( lensServices.inspector.close(); unlistenParentHistory(); lensStore.dispatch(navigateAway()); + stateTransfer.clearEditorState?.(APP_ID); }; } From 226efc0c1f54d634880d5399ce2b85b384f6a19f Mon Sep 17 00:00:00 2001 From: Joe Reuter Date: Thu, 29 Sep 2022 11:02:11 +0200 Subject: [PATCH 82/95] [Lens] Quickfunction help (#141399) * quickfunction help * adjust copy * Update x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/calculations/differences.tsx Co-authored-by: Marta Bondyra <4283304+mbondyra@users.noreply.github.com> Co-authored-by: Marta Bondyra <4283304+mbondyra@users.noreply.github.com> Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../dimension_panel/dimension_editor.tsx | 91 ++++++++++++++++++- .../definitions/calculations/counter_rate.tsx | 8 ++ .../calculations/cumulative_sum.tsx | 8 ++ .../definitions/calculations/differences.tsx | 8 ++ .../calculations/moving_average.tsx | 8 ++ .../operations/definitions/cardinality.tsx | 8 ++ .../operations/definitions/count.tsx | 5 + .../operations/definitions/date_histogram.tsx | 8 ++ .../definitions/filters/filters.tsx | 8 ++ .../operations/definitions/index.ts | 1 + .../operations/definitions/last_value.tsx | 8 ++ .../operations/definitions/metrics.tsx | 40 ++++++++ .../operations/definitions/percentile.tsx | 8 ++ .../definitions/percentile_ranks.tsx | 8 ++ .../operations/definitions/ranges/ranges.tsx | 5 + .../operations/definitions/terms/index.tsx | 5 + 16 files changed, 224 insertions(+), 3 deletions(-) diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.tsx index fbd9a5650013d..5a975482e6250 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.tsx +++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.tsx @@ -20,6 +20,11 @@ import { useEuiTheme, EuiFlexGroup, EuiFlexItem, + EuiPopover, + EuiPopoverTitle, + EuiPanel, + EuiBasicTable, + EuiButtonIcon, } from '@elastic/eui'; import ReactDOM from 'react-dom'; import type { IndexPatternDimensionEditorProps } from './dimension_panel'; @@ -116,6 +121,10 @@ export function DimensionEditor(props: DimensionEditorProps) { selectedColumn && operationDefinitionMap[selectedColumn.operationType]; const [temporaryState, setTemporaryState] = useState('none'); + const [isHelpOpen, setIsHelpOpen] = useState(false); + + const onHelpClick = () => setIsHelpOpen((prevIsHelpOpen) => !prevIsHelpOpen); + const closeHelp = () => setIsHelpOpen(false); const temporaryQuickFunction = Boolean(temporaryState === quickFunctionsName); const temporaryStaticValue = Boolean(temporaryState === staticValueOperationName); @@ -596,12 +605,88 @@ export function DimensionEditor(props: DimensionEditorProps) { ...services, }; + const helpButton = ; + + const columnsSidebar = [ + { + field: 'function', + name: i18n.translate('xpack.lens.indexPattern.functionTable.functionHeader', { + defaultMessage: 'Function', + }), + width: '150px', + }, + { + field: 'description', + name: i18n.translate('xpack.lens.indexPattern.functionTable.descriptionHeader', { + defaultMessage: 'Description', + }), + }, + ]; + + const items = sideNavItems + .filter((item) => operationDefinitionMap[item.id!].quickFunctionDocumentation) + .map((item) => { + const operationDefinition = operationDefinitionMap[item.id!]!; + return { + id: item.id!, + function: operationDefinition.displayName, + description: operationDefinition.quickFunctionDocumentation!, + }; + }); + const quickFunctions = ( <> + + + + {i18n.translate('xpack.lens.indexPattern.quickFunctions.popoverTitle', { + defaultMessage: 'Quick functions', + })} + + + + + + + + {i18n.translate('xpack.lens.indexPattern.functionsLabel', { + defaultMessage: 'Functions', + })} + + + } fullWidth > ); }, + quickFunctionDocumentation: i18n.translate( + 'xpack.lens.indexPattern.dateHistogram.documentation.quick', + { + defaultMessage: ` +The date or date range values distributed into intervals. + `, + } + ), }; function parseInterval(currentInterval: string) { diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filters.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filters.tsx index da06ea8ae1bf4..b972129109e1e 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filters.tsx +++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filters.tsx @@ -158,6 +158,14 @@ export const filtersOperation: OperationDefinition< }, getMaxPossibleNumValues: (column) => column.params.filters.length, + quickFunctionDocumentation: i18n.translate( + 'xpack.lens.indexPattern.filters.documentation.quick', + { + defaultMessage: ` + Divides values into predefined subsets. + `, + } + ), }; export const FilterList = ({ diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/index.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/index.ts index 5ce13adbf5ca8..6c79d314d10fa 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/index.ts +++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/index.ts @@ -364,6 +364,7 @@ interface BaseOperationDefinitionProps< description: string; section: 'elasticsearch' | 'calculation'; }; + quickFunctionDocumentation?: string; /** * React component for operation field specific behaviour */ diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/last_value.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/last_value.tsx index 2709d22b2a323..4206cd8109760 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/last_value.tsx +++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/last_value.tsx @@ -428,4 +428,12 @@ Example: Get the current status of server A: `, }), }, + quickFunctionDocumentation: i18n.translate( + 'xpack.lens.indexPattern.lastValue.documentation.quick', + { + defaultMessage: ` +The value of a field from the last document, ordered by the default time field of the data view. + `, + } + ), }; diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/metrics.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/metrics.tsx index 09dc8576a042a..e8c8c54c1cefe 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/metrics.tsx +++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/metrics.tsx @@ -60,6 +60,7 @@ function buildMetricOperation>({ hideZeroOption, aggConfigParams, documentationDescription, + quickFunctionDocumentation, }: { type: T['operationType']; displayName: string; @@ -71,6 +72,7 @@ function buildMetricOperation>({ hideZeroOption?: boolean; aggConfigParams?: Record; documentationDescription?: string; + quickFunctionDocumentation?: string; }) { const labelLookup = (name: string, column?: BaseIndexPatternColumn) => { const label = ofName(name); @@ -240,6 +242,7 @@ Example: Get the {metric} of price for orders from the UK: }, }), }, + quickFunctionDocumentation, shiftable: true, } as OperationDefinition; } @@ -265,6 +268,12 @@ export const minOperation = buildMetricOperation({ defaultMessage: 'A single-value metrics aggregation that returns the minimum value among the numeric values extracted from the aggregated documents.', }), + quickFunctionDocumentation: i18n.translate( + 'xpack.lens.indexPattern.min.quickFunctionDescription', + { + defaultMessage: 'The minimum value of a number field.', + } + ), supportsDate: true, }); @@ -282,6 +291,12 @@ export const maxOperation = buildMetricOperation({ defaultMessage: 'A single-value metrics aggregation that returns the maximum value among the numeric values extracted from the aggregated documents.', }), + quickFunctionDocumentation: i18n.translate( + 'xpack.lens.indexPattern.max.quickFunctionDescription', + { + defaultMessage: 'The maximum value of a number field.', + } + ), supportsDate: true, }); @@ -300,6 +315,12 @@ export const averageOperation = buildMetricOperation({ defaultMessage: 'A single-value metric aggregation that computes the average of numeric values that are extracted from the aggregated documents', }), + quickFunctionDocumentation: i18n.translate( + 'xpack.lens.indexPattern.avg.quickFunctionDescription', + { + defaultMessage: 'The average value of a number field.', + } + ), }); export const standardDeviationOperation = buildMetricOperation( @@ -334,6 +355,13 @@ To get the variance of price for orders from the UK, use \`square(standard_devia `, } ), + quickFunctionDocumentation: i18n.translate( + 'xpack.lens.indexPattern.standardDeviation.quickFunctionDescription', + { + defaultMessage: + 'The standard deviation of the values of a number field which is the amount of variation of the fields values.', + } + ), } ); @@ -354,6 +382,12 @@ export const sumOperation = buildMetricOperation({ 'A single-value metrics aggregation that sums up numeric values that are extracted from the aggregated documents.', }), hideZeroOption: true, + quickFunctionDocumentation: i18n.translate( + 'xpack.lens.indexPattern.sum.quickFunctionDescription', + { + defaultMessage: 'The total amount of the values of a number field.', + } + ), }); export const medianOperation = buildMetricOperation({ @@ -371,4 +405,10 @@ export const medianOperation = buildMetricOperation({ defaultMessage: 'A single-value metrics aggregation that computes the median value that are extracted from the aggregated documents.', }), + quickFunctionDocumentation: i18n.translate( + 'xpack.lens.indexPattern.median.quickFunctionDescription', + { + defaultMessage: 'The median value of a number field.', + } + ), }); diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/percentile.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/percentile.tsx index 3bc91b91ed3d6..ec4a3d569e7da 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/percentile.tsx +++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/percentile.tsx @@ -417,4 +417,12 @@ Example: Get the number of bytes larger than 95 % of values: `, }), }, + quickFunctionDocumentation: i18n.translate( + 'xpack.lens.indexPattern.percentile.documentation.quick', + { + defaultMessage: ` + The largest value that is smaller than n percent of the values that occur in all documents. + `, + } + ), }; diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/percentile_ranks.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/percentile_ranks.tsx index 7cb8d7ea64aea..45bd05f37372f 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/percentile_ranks.tsx +++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/percentile_ranks.tsx @@ -266,4 +266,12 @@ Example: Get the percentage of values which are below of 100: `, }), }, + quickFunctionDocumentation: i18n.translate( + 'xpack.lens.indexPattern.percentileRanks.documentation.quick', + { + defaultMessage: ` +The percentage of values that are below a specific value. For example, when a value is greater than or equal to 95% of the calculated values, the value is the 95th percentile rank. + `, + } + ), }; diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.tsx index aa84c727ae507..52c9471aefe0e 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.tsx +++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.tsx @@ -267,4 +267,9 @@ export const rangeOperation: OperationDefinition< /> ); }, + quickFunctionDocumentation: i18n.translate('xpack.lens.indexPattern.ranges.documentation.quick', { + defaultMessage: ` + Buckets values along defined numeric ranges. + `, + }), }; diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/index.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/index.tsx index 9017e91bff089..1f4b4846906d4 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/index.tsx +++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/index.tsx @@ -557,6 +557,11 @@ export const termsOperation: OperationDefinition< ); }, + quickFunctionDocumentation: i18n.translate('xpack.lens.indexPattern.terms.documentation.quick', { + defaultMessage: ` +The top values of a specified field ranked by the chosen metric. + `, + }), paramEditor: function ParamEditor({ layer, paramEditorUpdater, From 574e96a868ccd05be0fde59b09ef8cd03e7e6a15 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 29 Sep 2022 11:38:30 +0200 Subject: [PATCH 83/95] Update dependency vega-lite to ^5.5.0 (#137794) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Marta Bondyra <4283304+mbondyra@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index eedb8db4b605a..3bbcabba0cdd6 100644 --- a/package.json +++ b/package.json @@ -642,7 +642,7 @@ "uuid": "3.3.2", "vega": "^5.22.1", "vega-interpreter": "^1.0.4", - "vega-lite": "^5.3.0", + "vega-lite": "^5.5.0", "vega-schema-url-parser": "^2.2.0", "vega-spec-injector": "^0.0.2", "vega-tooltip": "^0.28.0", diff --git a/yarn.lock b/yarn.lock index 4996c786772dd..804502ebeb4c7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -27950,10 +27950,10 @@ vega-label@~1.2.0: vega-scenegraph "^4.9.2" vega-util "^1.15.2" -vega-lite@^5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/vega-lite/-/vega-lite-5.3.0.tgz#b9b9ecd80e869e823e6848c67d0a8ad94954bdee" - integrity sha512-6giodZ/bJnWyLq6Gj4OyiDt7EndoGyC9f5xDQjo82yPpUiO4MuG9iiPMqR1SPKmG9/qPBf+klWQR0v/7Mgju0Q== +vega-lite@^5.5.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/vega-lite/-/vega-lite-5.5.0.tgz#07345713d538cd63278748ec119c261722be66ff" + integrity sha512-MQBJt/iaUegvhRTS/hZVWfMOSF5ai4awlR2qtwTgHd84bErf9v7GtaZ9ArhJqXCb+FizvZ2jatmoYCzovgAhkg== dependencies: "@types/clone" "~2.1.1" array-flat-polyfill "^1.0.1" From d915169c5038ef962347448229d095532c463f12 Mon Sep 17 00:00:00 2001 From: Angela Chuang <6295984+angorayc@users.noreply.github.com> Date: Thu, 29 Sep 2022 10:43:27 +0100 Subject: [PATCH 84/95] [Security Solution] Update visualizationType (#141235) * update visualizationType * update labels * add snapshots for charts --- .../__snapshots__/authentication.test.ts.snap | 276 ++++++++++++++++++ .../__snapshots__/external_alert.test.ts.snap | 231 +++++++++++++++ .../common/authentication.test.ts | 45 +++ .../lens_attributes/common/authentication.ts | 8 +- .../common/external_alert.test.ts | 45 +++ .../lens_attributes/common/external_alert.ts | 5 +- .../hosts/__snapshots__/event.test.ts.snap | 205 +++++++++++++ .../__snapshots__/kpi_host_area.test.ts.snap | 196 +++++++++++++ .../kpi_host_metric.test.ts.snap | 143 +++++++++ .../kpi_unique_ips_area.test.ts.snap | 255 ++++++++++++++++ .../kpi_unique_ips_bar.test.ts.snap | 265 +++++++++++++++++ ...unique_ips_destination_metric.test.ts.snap | 143 +++++++++ .../kpi_unique_ips_source_metric.test.ts.snap | 143 +++++++++ .../lens_attributes/hosts/event.test.ts | 45 +++ .../hosts/kpi_host_area.test.ts | 45 +++ .../lens_attributes/hosts/kpi_host_area.ts | 3 +- .../hosts/kpi_host_metric.test.ts | 45 +++ .../lens_attributes/hosts/kpi_host_metric.ts | 2 +- .../hosts/kpi_unique_ips_area.test.ts | 45 +++ .../hosts/kpi_unique_ips_bar.test.ts | 45 +++ .../hosts/kpi_unique_ips_bar.ts | 6 +- .../kpi_unique_ips_destination_metric.test.ts | 45 +++ .../kpi_unique_ips_destination_metric.ts | 2 +- .../kpi_unique_ips_source_metric.test.ts | 45 +++ .../hosts/kpi_unique_ips_source_metric.ts | 2 +- .../dns_top_domains.test.ts.snap | 245 ++++++++++++++++ .../kpi_dns_queries.test.ts.snap | 189 ++++++++++++ .../kpi_network_events.test.ts.snap | 193 ++++++++++++ .../kpi_tls_handshakes.test.ts.snap | 212 ++++++++++++++ .../kpi_unique_flow_ids.test.ts.snap | 176 +++++++++++ .../kpi_unique_private_ips_area.test.ts.snap | 261 +++++++++++++++++ .../kpi_unique_private_ips_bar.test.ts.snap | 276 ++++++++++++++++++ ...rivate_ips_destination_metric.test.ts.snap | 149 ++++++++++ ...que_private_ips_source_metric.test.ts.snap | 149 ++++++++++ .../network/dns_top_domains.test.ts | 45 +++ .../network/dns_top_domains.ts | 5 +- .../network/kpi_dns_queries.test.ts | 45 +++ .../network/kpi_dns_queries.ts | 2 +- .../network/kpi_network_events.test.ts | 45 +++ .../network/kpi_network_events.ts | 2 +- .../network/kpi_tls_handshakes.test.ts | 45 +++ .../network/kpi_tls_handshakes.ts | 2 +- .../network/kpi_unique_flow_ids.test.ts | 45 +++ .../network/kpi_unique_flow_ids.ts | 2 +- .../kpi_unique_private_ips_area.test.ts | 45 +++ .../network/kpi_unique_private_ips_area.ts | 5 +- .../kpi_unique_private_ips_bar.test.ts | 45 +++ .../network/kpi_unique_private_ips_bar.ts | 6 +- ...que_private_ips_destination_metric.test.ts | 45 +++ ...i_unique_private_ips_destination_metric.ts | 2 +- ...i_unique_private_ips_source_metric.test.ts | 45 +++ .../kpi_unique_private_ips_source_metric.ts | 2 +- .../kpi_total_users_area.test.ts.snap | 151 ++++++++++ .../kpi_total_users_metric.test.ts.snap | 97 ++++++ ...authentication_metric_failure.test.ts.snap | 126 ++++++++ ...kpi_user_authentications_area.test.ts.snap | 240 +++++++++++++++ .../kpi_user_authentications_bar.test.ts.snap | 240 +++++++++++++++ ...uthentications_metric_success.test.ts.snap | 127 ++++++++ .../users/kpi_total_users_area.test.ts | 45 +++ .../users/kpi_total_users_area.ts | 3 +- .../users/kpi_total_users_metric.test.ts | 45 +++ .../users/kpi_total_users_metric.ts | 4 +- ...user_authentication_metric_failure.test.ts | 45 +++ .../kpi_user_authentication_metric_failure.ts | 2 +- .../kpi_user_authentications_area.test.ts | 45 +++ .../users/kpi_user_authentications_area.ts | 5 +- .../kpi_user_authentications_bar.test.ts | 45 +++ ...ser_authentications_metric_success.test.ts | 45 +++ ...kpi_user_authentications_metric_success.ts | 2 +- .../visualization_actions/mocks.tsx | 65 +++++ .../visualization_actions/translations.ts | 32 ++ .../use_lens_attributes.test.tsx | 65 +---- 72 files changed, 5909 insertions(+), 93 deletions(-) create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/__snapshots__/authentication.test.ts.snap create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/__snapshots__/external_alert.test.ts.snap create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/authentication.test.ts create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/external_alert.test.ts create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/__snapshots__/event.test.ts.snap create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/__snapshots__/kpi_host_area.test.ts.snap create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/__snapshots__/kpi_host_metric.test.ts.snap create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/__snapshots__/kpi_unique_ips_area.test.ts.snap create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/__snapshots__/kpi_unique_ips_bar.test.ts.snap create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/__snapshots__/kpi_unique_ips_destination_metric.test.ts.snap create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/__snapshots__/kpi_unique_ips_source_metric.test.ts.snap create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/event.test.ts create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_host_area.test.ts create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_host_metric.test.ts create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_unique_ips_area.test.ts create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_unique_ips_bar.test.ts create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_unique_ips_destination_metric.test.ts create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_unique_ips_source_metric.test.ts create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/dns_top_domains.test.ts.snap create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/kpi_dns_queries.test.ts.snap create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/kpi_network_events.test.ts.snap create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/kpi_tls_handshakes.test.ts.snap create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/kpi_unique_flow_ids.test.ts.snap create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/kpi_unique_private_ips_area.test.ts.snap create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/kpi_unique_private_ips_bar.test.ts.snap create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/kpi_unique_private_ips_destination_metric.test.ts.snap create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/kpi_unique_private_ips_source_metric.test.ts.snap create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/dns_top_domains.test.ts create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_dns_queries.test.ts create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_network_events.test.ts create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_tls_handshakes.test.ts create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_flow_ids.test.ts create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_area.test.ts create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_bar.test.ts create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_destination_metric.test.ts create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_source_metric.test.ts create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/__snapshots__/kpi_total_users_area.test.ts.snap create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/__snapshots__/kpi_total_users_metric.test.ts.snap create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/__snapshots__/kpi_user_authentication_metric_failure.test.ts.snap create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/__snapshots__/kpi_user_authentications_area.test.ts.snap create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/__snapshots__/kpi_user_authentications_bar.test.ts.snap create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/__snapshots__/kpi_user_authentications_metric_success.test.ts.snap create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_total_users_area.test.ts create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_total_users_metric.test.ts create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_user_authentication_metric_failure.test.ts create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_user_authentications_area.test.ts create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_user_authentications_bar.test.ts create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_user_authentications_metric_success.test.ts create mode 100644 x-pack/plugins/security_solution/public/common/components/visualization_actions/mocks.tsx diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/__snapshots__/authentication.test.ts.snap b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/__snapshots__/authentication.test.ts.snap new file mode 100644 index 0000000000000..747487203066b --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/__snapshots__/authentication.test.ts.snap @@ -0,0 +1,276 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`authenticationLensAttributes should render 1`] = ` +Object { + "description": "", + "references": Array [ + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-current-indexpattern", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-layer-3fd0c5d5-f762-4a27-8c56-14eee0223e13", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-layer-bef502be-e5ff-442f-9e3e-229f86ca2afa", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "6f4dbdc7-35b6-4e20-ac53-1272167e3919", + "type": "index-pattern", + }, + ], + "state": Object { + "datasourceStates": Object { + "indexpattern": Object { + "layers": Object { + "3fd0c5d5-f762-4a27-8c56-14eee0223e13": Object { + "columnOrder": Array [ + "b41a2958-650b-470a-84c4-c6fd8f0c6d37", + "5417777d-d9d9-4268-9cdc-eb29b873bd65", + ], + "columns": Object { + "5417777d-d9d9-4268-9cdc-eb29b873bd65": Object { + "customLabel": true, + "dataType": "number", + "filter": Object { + "language": "kuery", + "query": "event.outcome : \\"success\\"", + }, + "isBucketed": false, + "label": "Success", + "operationType": "count", + "scale": "ratio", + "sourceField": "___records___", + }, + "b41a2958-650b-470a-84c4-c6fd8f0c6d37": Object { + "dataType": "date", + "isBucketed": true, + "label": "@timestamp", + "operationType": "date_histogram", + "params": Object { + "interval": "auto", + }, + "scale": "interval", + "sourceField": "@timestamp", + }, + }, + "incompleteColumns": Object {}, + }, + "bef502be-e5ff-442f-9e3e-229f86ca2afa": Object { + "columnOrder": Array [ + "cded27f7-8ef8-458c-8d9b-70db48ae340d", + "a3bf9dc1-c8d2-42d6-9e60-31892a4c509e", + ], + "columns": Object { + "a3bf9dc1-c8d2-42d6-9e60-31892a4c509e": Object { + "customLabel": true, + "dataType": "number", + "filter": Object { + "language": "kuery", + "query": "event.outcome : \\"failure\\"", + }, + "isBucketed": false, + "label": "Failure", + "operationType": "count", + "scale": "ratio", + "sourceField": "___records___", + }, + "cded27f7-8ef8-458c-8d9b-70db48ae340d": Object { + "dataType": "date", + "isBucketed": true, + "label": "@timestamp", + "operationType": "date_histogram", + "params": Object { + "interval": "auto", + }, + "scale": "interval", + "sourceField": "@timestamp", + }, + }, + "incompleteColumns": Object {}, + }, + }, + }, + }, + "filters": Array [ + Object { + "$state": Object { + "store": "appState", + }, + "meta": Object { + "alias": null, + "disabled": false, + "index": "6f4dbdc7-35b6-4e20-ac53-1272167e3919", + "key": "query", + "negate": false, + "type": "custom", + "value": "{\\"bool\\":{\\"must\\":[{\\"term\\":{\\"event.category\\":\\"authentication\\"}}]}}", + }, + "query": Object { + "bool": Object { + "must": Array [ + Object { + "term": Object { + "event.category": "authentication", + }, + }, + ], + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.id", + "negate": false, + "params": Object { + "query": "123", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.id": "123", + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.name", + "negate": false, + "params": Object { + "query": "mockHost", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.name": "mockHost", + }, + }, + }, + Object { + "meta": Object { + "alias": "", + "disabled": false, + "key": "bool", + "negate": false, + "type": "custom", + "value": "{\\"query\\": {\\"bool\\": {\\"filter\\": [{\\"bool\\": {\\"should\\": [{\\"exists\\": {\\"field\\": \\"host.name\\"}}],\\"minimum_should_match\\": 1}}]}}}", + }, + "query": Object { + "bool": Object { + "filter": Array [ + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "exists": Object { + "field": "host.name", + }, + }, + ], + }, + }, + ], + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "_index", + "negate": false, + "params": Array [ + "auditbeat-mytest-*", + ], + "type": "phrases", + }, + "query": Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "match_phrase": Object { + "_index": "auditbeat-mytest-*", + }, + }, + ], + }, + }, + }, + ], + "query": Object { + "language": "kql", + "query": "host.name: *", + }, + "visualization": Object { + "axisTitlesVisibilitySettings": Object { + "x": false, + "yLeft": false, + "yRight": true, + }, + "layers": Array [ + Object { + "accessors": Array [ + "5417777d-d9d9-4268-9cdc-eb29b873bd65", + ], + "layerId": "3fd0c5d5-f762-4a27-8c56-14eee0223e13", + "layerType": "data", + "position": "top", + "seriesType": "bar_stacked", + "showGridlines": false, + "xAccessor": "b41a2958-650b-470a-84c4-c6fd8f0c6d37", + "yConfig": Array [ + Object { + "color": "#54b399", + "forAccessor": "5417777d-d9d9-4268-9cdc-eb29b873bd65", + }, + ], + }, + Object { + "accessors": Array [ + "a3bf9dc1-c8d2-42d6-9e60-31892a4c509e", + ], + "layerId": "bef502be-e5ff-442f-9e3e-229f86ca2afa", + "layerType": "data", + "seriesType": "bar_stacked", + "xAccessor": "cded27f7-8ef8-458c-8d9b-70db48ae340d", + "yConfig": Array [ + Object { + "color": "#da8b45", + "forAccessor": "a3bf9dc1-c8d2-42d6-9e60-31892a4c509e", + }, + ], + }, + ], + "legend": Object { + "isVisible": true, + "position": "right", + }, + "preferredSeriesType": "bar_stacked", + "title": "Empty XY chart", + "valueLabels": "hide", + "yLeftExtent": Object { + "mode": "full", + }, + "yRightExtent": Object { + "mode": "full", + }, + }, + }, + "title": "Authentication", + "visualizationType": "lnsXY", +} +`; diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/__snapshots__/external_alert.test.ts.snap b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/__snapshots__/external_alert.test.ts.snap new file mode 100644 index 0000000000000..ac42b228012fe --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/__snapshots__/external_alert.test.ts.snap @@ -0,0 +1,231 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`getExternalAlertLensAttributes should render 1`] = ` +Object { + "description": "", + "references": Array [ + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-current-indexpattern", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-layer-a3c54471-615f-4ff9-9fda-69b5b2ea3eef", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "723c4653-681b-4105-956e-abef287bf025", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "a04472fc-94a3-4b8d-ae05-9d30ea8fbd6a", + "type": "index-pattern", + }, + ], + "state": Object { + "datasourceStates": Object { + "indexpattern": Object { + "layers": Object { + "a3c54471-615f-4ff9-9fda-69b5b2ea3eef": Object { + "columnOrder": Array [ + "42334c6e-98d9-47a2-b4cb-a445abb44c93", + "37bdf546-3c11-4b08-8c5d-e37debc44f1d", + "0a923af2-c880-4aa3-aa93-a0b9c2801f6d", + ], + "columns": Object { + "0a923af2-c880-4aa3-aa93-a0b9c2801f6d": Object { + "dataType": "number", + "isBucketed": false, + "label": "Count of records", + "operationType": "count", + "scale": "ratio", + "sourceField": "___records___", + }, + "37bdf546-3c11-4b08-8c5d-e37debc44f1d": Object { + "dataType": "date", + "isBucketed": true, + "label": "@timestamp", + "operationType": "date_histogram", + "params": Object { + "interval": "auto", + }, + "scale": "interval", + "sourceField": "@timestamp", + }, + "42334c6e-98d9-47a2-b4cb-a445abb44c93": Object { + "dataType": "string", + "isBucketed": true, + "label": "Top values of event.dataset", + "operationType": "terms", + "params": Object { + "missingBucket": false, + "orderBy": Object { + "columnId": "0a923af2-c880-4aa3-aa93-a0b9c2801f6d", + "type": "column", + }, + "orderDirection": "desc", + "otherBucket": true, + "parentFormat": Object { + "id": "terms", + }, + "size": 10, + }, + "scale": "ordinal", + "sourceField": "event.dataset", + }, + }, + "incompleteColumns": Object {}, + }, + }, + }, + }, + "filters": Array [ + Object { + "$state": Object { + "store": "appState", + }, + "meta": Object { + "alias": null, + "disabled": false, + "index": "a04472fc-94a3-4b8d-ae05-9d30ea8fbd6a", + "key": "event.kind", + "negate": false, + "params": Object { + "query": "alert", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "event.kind": "alert", + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.id", + "negate": false, + "params": Object { + "query": "123", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.id": "123", + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.name", + "negate": false, + "params": Object { + "query": "mockHost", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.name": "mockHost", + }, + }, + }, + Object { + "meta": Object { + "alias": "", + "disabled": false, + "key": "bool", + "negate": false, + "type": "custom", + "value": "{\\"query\\": {\\"bool\\": {\\"filter\\": [{\\"bool\\": {\\"should\\": [{\\"exists\\": {\\"field\\": \\"host.name\\"}}],\\"minimum_should_match\\": 1}}]}}}", + }, + "query": Object { + "bool": Object { + "filter": Array [ + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "exists": Object { + "field": "host.name", + }, + }, + ], + }, + }, + ], + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "_index", + "negate": false, + "params": Array [ + "auditbeat-mytest-*", + ], + "type": "phrases", + }, + "query": Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "match_phrase": Object { + "_index": "auditbeat-mytest-*", + }, + }, + ], + }, + }, + }, + ], + "query": Object { + "language": "kql", + "query": "host.name: *", + }, + "visualization": Object { + "layers": Array [ + Object { + "accessors": Array [ + "0a923af2-c880-4aa3-aa93-a0b9c2801f6d", + ], + "layerId": "a3c54471-615f-4ff9-9fda-69b5b2ea3eef", + "layerType": "data", + "position": "top", + "seriesType": "bar_stacked", + "showGridlines": false, + "splitAccessor": "42334c6e-98d9-47a2-b4cb-a445abb44c93", + "xAccessor": "37bdf546-3c11-4b08-8c5d-e37debc44f1d", + }, + ], + "legend": Object { + "isVisible": true, + "position": "right", + }, + "preferredSeriesType": "bar_stacked", + "title": "Empty XY chart", + "valueLabels": "hide", + "yLeftExtent": Object { + "mode": "full", + }, + "yRightExtent": Object { + "mode": "full", + }, + }, + }, + "title": "External alerts", + "visualizationType": "lnsXY", +} +`; diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/authentication.test.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/authentication.test.ts new file mode 100644 index 0000000000000..808789db397e9 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/authentication.test.ts @@ -0,0 +1,45 @@ +/* + * 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 { renderHook } from '@testing-library/react-hooks'; +import { wrapper } from '../../mocks'; + +import { useLensAttributes } from '../../use_lens_attributes'; + +import { authenticationLensAttributes } from './authentication'; + +jest.mock('../../../../containers/sourcerer', () => ({ + useSourcererDataView: jest.fn().mockReturnValue({ + selectedPatterns: ['auditbeat-mytest-*'], + dataViewId: 'security-solution-my-test', + }), +})); + +jest.mock('../../../../utils/route/use_route_spy', () => ({ + useRouteSpy: jest.fn().mockReturnValue([ + { + detailName: 'mockHost', + pageName: 'hosts', + tabName: 'events', + }, + ]), +})); + +describe('authenticationLensAttributes', () => { + it('should render', () => { + const { result } = renderHook( + () => + useLensAttributes({ + lensAttributes: authenticationLensAttributes, + stackByField: 'event.dataset', + }), + { wrapper } + ); + + expect(result?.current).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/authentication.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/authentication.ts index 199f78d372cd8..15d7f029ae612 100644 --- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/authentication.ts +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/authentication.ts @@ -5,6 +5,10 @@ * 2.0. */ +import { + AUTHENCICATION_FAILURE_CHART_LABEL, + AUTHENCICATION_SUCCESS_CHART_LABEL, +} from '../../translations'; import type { LensAttributes } from '../../types'; export const authenticationLensAttributes: LensAttributes = { @@ -110,7 +114,7 @@ export const authenticationLensAttributes: LensAttributes = { }, }, '5417777d-d9d9-4268-9cdc-eb29b873bd65': { - label: 'Success', + label: AUTHENCICATION_SUCCESS_CHART_LABEL, dataType: 'number', operationType: 'count', isBucketed: false, @@ -143,7 +147,7 @@ export const authenticationLensAttributes: LensAttributes = { }, }, 'a3bf9dc1-c8d2-42d6-9e60-31892a4c509e': { - label: 'Failure', + label: AUTHENCICATION_FAILURE_CHART_LABEL, dataType: 'number', operationType: 'count', isBucketed: false, diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/external_alert.test.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/external_alert.test.ts new file mode 100644 index 0000000000000..da890c4d49fe0 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/external_alert.test.ts @@ -0,0 +1,45 @@ +/* + * 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 { renderHook } from '@testing-library/react-hooks'; +import { wrapper } from '../../mocks'; + +import { useLensAttributes } from '../../use_lens_attributes'; + +import { getExternalAlertLensAttributes } from './external_alert'; + +jest.mock('../../../../containers/sourcerer', () => ({ + useSourcererDataView: jest.fn().mockReturnValue({ + selectedPatterns: ['auditbeat-mytest-*'], + dataViewId: 'security-solution-my-test', + }), +})); + +jest.mock('../../../../utils/route/use_route_spy', () => ({ + useRouteSpy: jest.fn().mockReturnValue([ + { + detailName: 'mockHost', + pageName: 'hosts', + tabName: 'events', + }, + ]), +})); + +describe('getExternalAlertLensAttributes', () => { + it('should render', () => { + const { result } = renderHook( + () => + useLensAttributes({ + getLensAttributes: getExternalAlertLensAttributes, + stackByField: 'event.dataset', + }), + { wrapper } + ); + + expect(result?.current).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/external_alert.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/external_alert.ts index e24db03b3302f..a815d442b043e 100644 --- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/external_alert.ts +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/external_alert.ts @@ -5,6 +5,7 @@ * 2.0. */ +import { COUNT, TOP_VALUE } from '../../translations'; import type { GetLensAttributes, LensAttributes } from '../../types'; export const getExternalAlertLensAttributes: GetLensAttributes = ( @@ -86,7 +87,7 @@ export const getExternalAlertLensAttributes: GetLensAttributes = ( }, }, '0a923af2-c880-4aa3-aa93-a0b9c2801f6d': { - label: 'Count of records', + label: COUNT, dataType: 'number', operationType: 'count', isBucketed: false, @@ -94,7 +95,7 @@ export const getExternalAlertLensAttributes: GetLensAttributes = ( sourceField: '___records___', }, '42334c6e-98d9-47a2-b4cb-a445abb44c93': { - label: `Top values of ${stackByField}`, // could be event.category + label: TOP_VALUE(`${stackByField}`), // could be event.category dataType: 'string', operationType: 'terms', scale: 'ordinal', diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/__snapshots__/event.test.ts.snap b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/__snapshots__/event.test.ts.snap new file mode 100644 index 0000000000000..7f3fdb6c66107 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/__snapshots__/event.test.ts.snap @@ -0,0 +1,205 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`getEventsHistogramLensAttributes should render 1`] = ` +Object { + "description": "", + "references": Array [ + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-current-indexpattern", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-layer-0039eb0c-9a1a-4687-ae54-0f4e239bec75", + "type": "index-pattern", + }, + ], + "state": Object { + "datasourceStates": Object { + "indexpattern": Object { + "layers": Object { + "0039eb0c-9a1a-4687-ae54-0f4e239bec75": Object { + "columnOrder": Array [ + "34919782-4546-43a5-b668-06ac934d3acd", + "aac9d7d0-13a3-480a-892b-08207a787926", + "e09e0380-0740-4105-becc-0a4ca12e3944", + ], + "columns": Object { + "34919782-4546-43a5-b668-06ac934d3acd": Object { + "dataType": "string", + "isBucketed": true, + "label": "Top values of event.dataset", + "operationType": "terms", + "params": Object { + "missingBucket": false, + "orderBy": Object { + "columnId": "e09e0380-0740-4105-becc-0a4ca12e3944", + "type": "column", + }, + "orderDirection": "asc", + "otherBucket": true, + "parentFormat": Object { + "id": "terms", + }, + "size": 10, + }, + "scale": "ordinal", + "sourceField": "event.dataset", + }, + "aac9d7d0-13a3-480a-892b-08207a787926": Object { + "dataType": "date", + "isBucketed": true, + "label": "@timestamp", + "operationType": "date_histogram", + "params": Object { + "interval": "auto", + }, + "scale": "interval", + "sourceField": "@timestamp", + }, + "e09e0380-0740-4105-becc-0a4ca12e3944": Object { + "dataType": "number", + "isBucketed": false, + "label": "Count of records", + "operationType": "count", + "scale": "ratio", + "sourceField": "___records___", + }, + }, + "incompleteColumns": Object {}, + }, + }, + }, + }, + "filters": Array [ + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.id", + "negate": false, + "params": Object { + "query": "123", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.id": "123", + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.name", + "negate": false, + "params": Object { + "query": "mockHost", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.name": "mockHost", + }, + }, + }, + Object { + "meta": Object { + "alias": "", + "disabled": false, + "key": "bool", + "negate": false, + "type": "custom", + "value": "{\\"query\\": {\\"bool\\": {\\"filter\\": [{\\"bool\\": {\\"should\\": [{\\"exists\\": {\\"field\\": \\"host.name\\"}}],\\"minimum_should_match\\": 1}}]}}}", + }, + "query": Object { + "bool": Object { + "filter": Array [ + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "exists": Object { + "field": "host.name", + }, + }, + ], + }, + }, + ], + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "_index", + "negate": false, + "params": Array [ + "auditbeat-mytest-*", + ], + "type": "phrases", + }, + "query": Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "match_phrase": Object { + "_index": "auditbeat-mytest-*", + }, + }, + ], + }, + }, + }, + ], + "query": Object { + "language": "kql", + "query": "host.name: *", + }, + "visualization": Object { + "axisTitlesVisibilitySettings": Object { + "x": false, + "yLeft": false, + "yRight": true, + }, + "layers": Array [ + Object { + "accessors": Array [ + "e09e0380-0740-4105-becc-0a4ca12e3944", + ], + "layerId": "0039eb0c-9a1a-4687-ae54-0f4e239bec75", + "layerType": "data", + "position": "top", + "seriesType": "bar_stacked", + "showGridlines": false, + "splitAccessor": "34919782-4546-43a5-b668-06ac934d3acd", + "xAccessor": "aac9d7d0-13a3-480a-892b-08207a787926", + }, + ], + "legend": Object { + "isVisible": true, + "position": "right", + }, + "preferredSeriesType": "bar_stacked", + "title": "Empty XY chart", + "valueLabels": "hide", + "yLeftExtent": Object { + "mode": "full", + }, + "yRightExtent": Object { + "mode": "full", + }, + }, + }, + "title": "Host - events", + "visualizationType": "lnsXY", +} +`; diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/__snapshots__/kpi_host_area.test.ts.snap b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/__snapshots__/kpi_host_area.test.ts.snap new file mode 100644 index 0000000000000..c5e4e272ec9c4 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/__snapshots__/kpi_host_area.test.ts.snap @@ -0,0 +1,196 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`kpiHostAreaLensAttributes should render 1`] = ` +Object { + "description": "", + "references": Array [ + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-current-indexpattern", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-layer-416b6fad-1923-4f6a-a2df-b223bb287e30", + "type": "index-pattern", + }, + ], + "state": Object { + "datasourceStates": Object { + "indexpattern": Object { + "layers": Object { + "416b6fad-1923-4f6a-a2df-b223bb287e30": Object { + "columnOrder": Array [ + "5eea817b-67b7-4268-8ecb-7688d1094721", + "b00c65ea-32be-4163-bfc8-f795b1ef9d06", + ], + "columns": Object { + "5eea817b-67b7-4268-8ecb-7688d1094721": Object { + "dataType": "date", + "isBucketed": true, + "label": "@timestamp", + "operationType": "date_histogram", + "params": Object { + "interval": "auto", + }, + "scale": "interval", + "sourceField": "@timestamp", + }, + "b00c65ea-32be-4163-bfc8-f795b1ef9d06": Object { + "customLabel": true, + "dataType": "number", + "isBucketed": false, + "label": "Unique count of host.name", + "operationType": "unique_count", + "scale": "ratio", + "sourceField": "host.name", + }, + }, + "incompleteColumns": Object {}, + }, + }, + }, + }, + "filters": Array [ + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.id", + "negate": false, + "params": Object { + "query": "123", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.id": "123", + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.name", + "negate": false, + "params": Object { + "query": "mockHost", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.name": "mockHost", + }, + }, + }, + Object { + "meta": Object { + "alias": "", + "disabled": false, + "key": "bool", + "negate": false, + "type": "custom", + "value": "{\\"query\\": {\\"bool\\": {\\"filter\\": [{\\"bool\\": {\\"should\\": [{\\"exists\\": {\\"field\\": \\"host.name\\"}}],\\"minimum_should_match\\": 1}}]}}}", + }, + "query": Object { + "bool": Object { + "filter": Array [ + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "exists": Object { + "field": "host.name", + }, + }, + ], + }, + }, + ], + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "_index", + "negate": false, + "params": Array [ + "auditbeat-mytest-*", + ], + "type": "phrases", + }, + "query": Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "match_phrase": Object { + "_index": "auditbeat-mytest-*", + }, + }, + ], + }, + }, + }, + ], + "query": Object { + "language": "kql", + "query": "host.name: *", + }, + "visualization": Object { + "axisTitlesVisibilitySettings": Object { + "x": false, + "yLeft": false, + "yRight": false, + }, + "fittingFunction": "None", + "gridlinesVisibilitySettings": Object { + "x": true, + "yLeft": true, + "yRight": true, + }, + "labelsOrientation": Object { + "x": 0, + "yLeft": 0, + "yRight": 0, + }, + "layers": Array [ + Object { + "accessors": Array [ + "b00c65ea-32be-4163-bfc8-f795b1ef9d06", + ], + "layerId": "416b6fad-1923-4f6a-a2df-b223bb287e30", + "layerType": "data", + "seriesType": "area", + "xAccessor": "5eea817b-67b7-4268-8ecb-7688d1094721", + }, + ], + "legend": Object { + "isVisible": true, + "position": "right", + }, + "preferredSeriesType": "area", + "tickLabelsVisibilitySettings": Object { + "x": true, + "yLeft": true, + "yRight": true, + }, + "valueLabels": "hide", + "yLeftExtent": Object { + "mode": "full", + }, + "yRightExtent": Object { + "mode": "full", + }, + }, + }, + "title": "[Host] Hosts - area", + "visualizationType": "lnsXY", +} +`; diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/__snapshots__/kpi_host_metric.test.ts.snap b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/__snapshots__/kpi_host_metric.test.ts.snap new file mode 100644 index 0000000000000..3669de2d30109 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/__snapshots__/kpi_host_metric.test.ts.snap @@ -0,0 +1,143 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`kpiHostMetricLensAttributes should render 1`] = ` +Object { + "description": "", + "references": Array [ + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-current-indexpattern", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-layer-416b6fad-1923-4f6a-a2df-b223bb287e30", + "type": "index-pattern", + }, + ], + "state": Object { + "datasourceStates": Object { + "indexpattern": Object { + "layers": Object { + "416b6fad-1923-4f6a-a2df-b223bb287e30": Object { + "columnOrder": Array [ + "b00c65ea-32be-4163-bfc8-f795b1ef9d06", + ], + "columns": Object { + "b00c65ea-32be-4163-bfc8-f795b1ef9d06": Object { + "customLabel": true, + "dataType": "number", + "isBucketed": false, + "label": " ", + "operationType": "unique_count", + "scale": "ratio", + "sourceField": "host.name", + }, + }, + "incompleteColumns": Object {}, + }, + }, + }, + }, + "filters": Array [ + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.id", + "negate": false, + "params": Object { + "query": "123", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.id": "123", + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.name", + "negate": false, + "params": Object { + "query": "mockHost", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.name": "mockHost", + }, + }, + }, + Object { + "meta": Object { + "alias": "", + "disabled": false, + "key": "bool", + "negate": false, + "type": "custom", + "value": "{\\"query\\": {\\"bool\\": {\\"filter\\": [{\\"bool\\": {\\"should\\": [{\\"exists\\": {\\"field\\": \\"host.name\\"}}],\\"minimum_should_match\\": 1}}]}}}", + }, + "query": Object { + "bool": Object { + "filter": Array [ + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "exists": Object { + "field": "host.name", + }, + }, + ], + }, + }, + ], + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "_index", + "negate": false, + "params": Array [ + "auditbeat-mytest-*", + ], + "type": "phrases", + }, + "query": Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "match_phrase": Object { + "_index": "auditbeat-mytest-*", + }, + }, + ], + }, + }, + }, + ], + "query": Object { + "language": "kql", + "query": "host.name: *", + }, + "visualization": Object { + "accessor": "b00c65ea-32be-4163-bfc8-f795b1ef9d06", + "layerId": "416b6fad-1923-4f6a-a2df-b223bb287e30", + "layerType": "data", + }, + }, + "title": "[Host] Hosts - metric", + "visualizationType": "lnsLegacyMetric", +} +`; diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/__snapshots__/kpi_unique_ips_area.test.ts.snap b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/__snapshots__/kpi_unique_ips_area.test.ts.snap new file mode 100644 index 0000000000000..acaf78556269f --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/__snapshots__/kpi_unique_ips_area.test.ts.snap @@ -0,0 +1,255 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`kpiUniqueIpsAreaLensAttributes should render 1`] = ` +Object { + "description": "", + "references": Array [ + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-current-indexpattern", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-layer-8be0156b-d423-4a39-adf1-f54d4c9f2e69", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-layer-ca05ecdb-0fa4-49a8-9305-b23d91012a46", + "type": "index-pattern", + }, + ], + "state": Object { + "datasourceStates": Object { + "indexpattern": Object { + "layers": Object { + "8be0156b-d423-4a39-adf1-f54d4c9f2e69": Object { + "columnOrder": Array [ + "a0cb6400-f708-46c3-ad96-24788f12dae4", + "d9a6eb6b-8b78-439e-98e7-a718f8ffbebe", + ], + "columns": Object { + "a0cb6400-f708-46c3-ad96-24788f12dae4": Object { + "dataType": "date", + "isBucketed": true, + "label": "@timestamp", + "operationType": "date_histogram", + "params": Object { + "interval": "auto", + }, + "scale": "interval", + "sourceField": "@timestamp", + }, + "d9a6eb6b-8b78-439e-98e7-a718f8ffbebe": Object { + "customLabel": true, + "dataType": "number", + "isBucketed": false, + "label": "Src.", + "operationType": "unique_count", + "scale": "ratio", + "sourceField": "source.ip", + }, + }, + "incompleteColumns": Object {}, + }, + "ca05ecdb-0fa4-49a8-9305-b23d91012a46": Object { + "columnOrder": Array [ + "f95e74e6-99dd-4b11-8faf-439b4d959df9", + "e7052671-fb9e-481f-8df3-7724c98cfc6f", + ], + "columns": Object { + "e7052671-fb9e-481f-8df3-7724c98cfc6f": Object { + "customLabel": true, + "dataType": "number", + "isBucketed": false, + "label": "Dest.", + "operationType": "unique_count", + "scale": "ratio", + "sourceField": "destination.ip", + }, + "f95e74e6-99dd-4b11-8faf-439b4d959df9": Object { + "dataType": "date", + "isBucketed": true, + "label": "@timestamp", + "operationType": "date_histogram", + "params": Object { + "interval": "auto", + }, + "scale": "interval", + "sourceField": "@timestamp", + }, + }, + "incompleteColumns": Object {}, + }, + }, + }, + }, + "filters": Array [ + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.id", + "negate": false, + "params": Object { + "query": "123", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.id": "123", + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.name", + "negate": false, + "params": Object { + "query": "mockHost", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.name": "mockHost", + }, + }, + }, + Object { + "meta": Object { + "alias": "", + "disabled": false, + "key": "bool", + "negate": false, + "type": "custom", + "value": "{\\"query\\": {\\"bool\\": {\\"filter\\": [{\\"bool\\": {\\"should\\": [{\\"exists\\": {\\"field\\": \\"host.name\\"}}],\\"minimum_should_match\\": 1}}]}}}", + }, + "query": Object { + "bool": Object { + "filter": Array [ + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "exists": Object { + "field": "host.name", + }, + }, + ], + }, + }, + ], + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "_index", + "negate": false, + "params": Array [ + "auditbeat-mytest-*", + ], + "type": "phrases", + }, + "query": Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "match_phrase": Object { + "_index": "auditbeat-mytest-*", + }, + }, + ], + }, + }, + }, + ], + "query": Object { + "language": "kql", + "query": "host.name: *", + }, + "visualization": Object { + "axisTitlesVisibilitySettings": Object { + "x": false, + "yLeft": false, + "yRight": true, + }, + "fittingFunction": "None", + "gridlinesVisibilitySettings": Object { + "x": true, + "yLeft": true, + "yRight": true, + }, + "labelsOrientation": Object { + "x": 0, + "yLeft": 0, + "yRight": 0, + }, + "layers": Array [ + Object { + "accessors": Array [ + "d9a6eb6b-8b78-439e-98e7-a718f8ffbebe", + ], + "layerId": "8be0156b-d423-4a39-adf1-f54d4c9f2e69", + "layerType": "data", + "seriesType": "area", + "xAccessor": "a0cb6400-f708-46c3-ad96-24788f12dae4", + "yConfig": Array [ + Object { + "color": "#d36186", + "forAccessor": "d9a6eb6b-8b78-439e-98e7-a718f8ffbebe", + }, + ], + }, + Object { + "accessors": Array [ + "e7052671-fb9e-481f-8df3-7724c98cfc6f", + ], + "layerId": "ca05ecdb-0fa4-49a8-9305-b23d91012a46", + "layerType": "data", + "seriesType": "area", + "xAccessor": "f95e74e6-99dd-4b11-8faf-439b4d959df9", + "yConfig": Array [ + Object { + "color": "#9170b8", + "forAccessor": "e7052671-fb9e-481f-8df3-7724c98cfc6f", + }, + ], + }, + ], + "legend": Object { + "isVisible": false, + "position": "right", + "showSingleSeries": false, + }, + "preferredSeriesType": "area", + "tickLabelsVisibilitySettings": Object { + "x": true, + "yLeft": true, + "yRight": true, + }, + "valueLabels": "hide", + "yLeftExtent": Object { + "mode": "full", + }, + "yRightExtent": Object { + "mode": "full", + }, + }, + }, + "title": "[Host] Unique IPs - area", + "type": "lens", + "updated_at": "2022-02-09T17:44:03.359Z", + "version": "WzI5MTI5OSwzXQ==", + "visualizationType": "lnsXY", +} +`; diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/__snapshots__/kpi_unique_ips_bar.test.ts.snap b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/__snapshots__/kpi_unique_ips_bar.test.ts.snap new file mode 100644 index 0000000000000..9f702ecb06412 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/__snapshots__/kpi_unique_ips_bar.test.ts.snap @@ -0,0 +1,265 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`kpiUniqueIpsBarLensAttributes should render 1`] = ` +Object { + "description": "", + "references": Array [ + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-current-indexpattern", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-layer-8be0156b-d423-4a39-adf1-f54d4c9f2e69", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-layer-ec84ba70-2adb-4647-8ef0-8ad91a0e6d4e", + "type": "index-pattern", + }, + ], + "state": Object { + "datasourceStates": Object { + "indexpattern": Object { + "layers": Object { + "8be0156b-d423-4a39-adf1-f54d4c9f2e69": Object { + "columnOrder": Array [ + "f8bfa719-5c1c-4bf2-896e-c318d77fc08e", + "32f66676-f4e1-48fd-b7f8-d4de38318601", + ], + "columns": Object { + "32f66676-f4e1-48fd-b7f8-d4de38318601": Object { + "dataType": "number", + "isBucketed": false, + "label": "Unique count of source.ip", + "operationType": "unique_count", + "scale": "ratio", + "sourceField": "source.ip", + }, + "f8bfa719-5c1c-4bf2-896e-c318d77fc08e": Object { + "dataType": "string", + "isBucketed": true, + "label": "Filters", + "operationType": "filters", + "params": Object { + "filters": Array [ + Object { + "input": Object { + "language": "kuery", + "query": "", + }, + "label": "Src.", + }, + ], + }, + "scale": "ordinal", + }, + }, + "incompleteColumns": Object {}, + }, + "ec84ba70-2adb-4647-8ef0-8ad91a0e6d4e": Object { + "columnOrder": Array [ + "c72aad6a-fc9c-43dc-9194-e13ca3ee8aff", + "b7e59b08-96e6-40d1-84fd-e97b977d1c47", + ], + "columns": Object { + "b7e59b08-96e6-40d1-84fd-e97b977d1c47": Object { + "dataType": "number", + "isBucketed": false, + "label": "Unique count of destination.ip", + "operationType": "unique_count", + "scale": "ratio", + "sourceField": "destination.ip", + }, + "c72aad6a-fc9c-43dc-9194-e13ca3ee8aff": Object { + "customLabel": true, + "dataType": "string", + "isBucketed": true, + "label": "Dest.", + "operationType": "filters", + "params": Object { + "filters": Array [ + Object { + "input": Object { + "language": "kuery", + "query": "", + }, + "label": "Dest.", + }, + ], + }, + "scale": "ordinal", + }, + }, + "incompleteColumns": Object {}, + }, + }, + }, + }, + "filters": Array [ + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.id", + "negate": false, + "params": Object { + "query": "123", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.id": "123", + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.name", + "negate": false, + "params": Object { + "query": "mockHost", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.name": "mockHost", + }, + }, + }, + Object { + "meta": Object { + "alias": "", + "disabled": false, + "key": "bool", + "negate": false, + "type": "custom", + "value": "{\\"query\\": {\\"bool\\": {\\"filter\\": [{\\"bool\\": {\\"should\\": [{\\"exists\\": {\\"field\\": \\"host.name\\"}}],\\"minimum_should_match\\": 1}}]}}}", + }, + "query": Object { + "bool": Object { + "filter": Array [ + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "exists": Object { + "field": "host.name", + }, + }, + ], + }, + }, + ], + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "_index", + "negate": false, + "params": Array [ + "auditbeat-mytest-*", + ], + "type": "phrases", + }, + "query": Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "match_phrase": Object { + "_index": "auditbeat-mytest-*", + }, + }, + ], + }, + }, + }, + ], + "query": Object { + "language": "kql", + "query": "host.name: *", + }, + "visualization": Object { + "axisTitlesVisibilitySettings": Object { + "x": false, + "yLeft": false, + "yRight": true, + }, + "fittingFunction": "None", + "gridlinesVisibilitySettings": Object { + "x": true, + "yLeft": true, + "yRight": true, + }, + "labelsOrientation": Object { + "x": 0, + "yLeft": 0, + "yRight": 0, + }, + "layers": Array [ + Object { + "accessors": Array [ + "32f66676-f4e1-48fd-b7f8-d4de38318601", + ], + "layerId": "8be0156b-d423-4a39-adf1-f54d4c9f2e69", + "layerType": "data", + "seriesType": "bar_horizontal_stacked", + "xAccessor": "f8bfa719-5c1c-4bf2-896e-c318d77fc08e", + "yConfig": Array [ + Object { + "color": "#d36186", + "forAccessor": "32f66676-f4e1-48fd-b7f8-d4de38318601", + }, + ], + }, + Object { + "accessors": Array [ + "b7e59b08-96e6-40d1-84fd-e97b977d1c47", + ], + "layerId": "ec84ba70-2adb-4647-8ef0-8ad91a0e6d4e", + "layerType": "data", + "seriesType": "bar_horizontal_stacked", + "xAccessor": "c72aad6a-fc9c-43dc-9194-e13ca3ee8aff", + "yConfig": Array [ + Object { + "color": "#9170b8", + "forAccessor": "b7e59b08-96e6-40d1-84fd-e97b977d1c47", + }, + ], + }, + ], + "legend": Object { + "isVisible": false, + "position": "right", + "showSingleSeries": false, + }, + "preferredSeriesType": "bar_horizontal_stacked", + "tickLabelsVisibilitySettings": Object { + "x": true, + "yLeft": true, + "yRight": true, + }, + "valueLabels": "hide", + "yLeftExtent": Object { + "mode": "full", + }, + "yRightExtent": Object { + "mode": "full", + }, + }, + }, + "title": "[Host] Unique IPs - bar", + "visualizationType": "lnsXY", +} +`; diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/__snapshots__/kpi_unique_ips_destination_metric.test.ts.snap b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/__snapshots__/kpi_unique_ips_destination_metric.test.ts.snap new file mode 100644 index 0000000000000..ebeb85e27a44f --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/__snapshots__/kpi_unique_ips_destination_metric.test.ts.snap @@ -0,0 +1,143 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`kpiUniqueIpsDestinationMetricLensAttributes should render 1`] = ` +Object { + "description": "", + "references": Array [ + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-current-indexpattern", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-layer-8be0156b-d423-4a39-adf1-f54d4c9f2e69", + "type": "index-pattern", + }, + ], + "state": Object { + "datasourceStates": Object { + "indexpattern": Object { + "layers": Object { + "8be0156b-d423-4a39-adf1-f54d4c9f2e69": Object { + "columnOrder": Array [ + "d9a6eb6b-8b78-439e-98e7-a718f8ffbebe", + ], + "columns": Object { + "d9a6eb6b-8b78-439e-98e7-a718f8ffbebe": Object { + "customLabel": true, + "dataType": "number", + "isBucketed": false, + "label": " ", + "operationType": "unique_count", + "scale": "ratio", + "sourceField": "destination.ip", + }, + }, + "incompleteColumns": Object {}, + }, + }, + }, + }, + "filters": Array [ + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.id", + "negate": false, + "params": Object { + "query": "123", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.id": "123", + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.name", + "negate": false, + "params": Object { + "query": "mockHost", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.name": "mockHost", + }, + }, + }, + Object { + "meta": Object { + "alias": "", + "disabled": false, + "key": "bool", + "negate": false, + "type": "custom", + "value": "{\\"query\\": {\\"bool\\": {\\"filter\\": [{\\"bool\\": {\\"should\\": [{\\"exists\\": {\\"field\\": \\"host.name\\"}}],\\"minimum_should_match\\": 1}}]}}}", + }, + "query": Object { + "bool": Object { + "filter": Array [ + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "exists": Object { + "field": "host.name", + }, + }, + ], + }, + }, + ], + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "_index", + "negate": false, + "params": Array [ + "auditbeat-mytest-*", + ], + "type": "phrases", + }, + "query": Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "match_phrase": Object { + "_index": "auditbeat-mytest-*", + }, + }, + ], + }, + }, + }, + ], + "query": Object { + "language": "kql", + "query": "host.name: *", + }, + "visualization": Object { + "accessor": "d9a6eb6b-8b78-439e-98e7-a718f8ffbebe", + "layerId": "8be0156b-d423-4a39-adf1-f54d4c9f2e69", + "layerType": "data", + }, + }, + "title": "[Host] Unique IPs - destination metric", + "visualizationType": "lnsLegacyMetric", +} +`; diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/__snapshots__/kpi_unique_ips_source_metric.test.ts.snap b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/__snapshots__/kpi_unique_ips_source_metric.test.ts.snap new file mode 100644 index 0000000000000..f8ec7bb8c70d7 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/__snapshots__/kpi_unique_ips_source_metric.test.ts.snap @@ -0,0 +1,143 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`kpiUniqueIpsSourceMetricLensAttributes should render 1`] = ` +Object { + "description": "", + "references": Array [ + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-current-indexpattern", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-layer-8be0156b-d423-4a39-adf1-f54d4c9f2e69", + "type": "index-pattern", + }, + ], + "state": Object { + "datasourceStates": Object { + "indexpattern": Object { + "layers": Object { + "8be0156b-d423-4a39-adf1-f54d4c9f2e69": Object { + "columnOrder": Array [ + "d9a6eb6b-8b78-439e-98e7-a718f8ffbebe", + ], + "columns": Object { + "d9a6eb6b-8b78-439e-98e7-a718f8ffbebe": Object { + "customLabel": true, + "dataType": "number", + "isBucketed": false, + "label": " ", + "operationType": "unique_count", + "scale": "ratio", + "sourceField": "source.ip", + }, + }, + "incompleteColumns": Object {}, + }, + }, + }, + }, + "filters": Array [ + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.id", + "negate": false, + "params": Object { + "query": "123", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.id": "123", + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.name", + "negate": false, + "params": Object { + "query": "mockHost", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.name": "mockHost", + }, + }, + }, + Object { + "meta": Object { + "alias": "", + "disabled": false, + "key": "bool", + "negate": false, + "type": "custom", + "value": "{\\"query\\": {\\"bool\\": {\\"filter\\": [{\\"bool\\": {\\"should\\": [{\\"exists\\": {\\"field\\": \\"host.name\\"}}],\\"minimum_should_match\\": 1}}]}}}", + }, + "query": Object { + "bool": Object { + "filter": Array [ + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "exists": Object { + "field": "host.name", + }, + }, + ], + }, + }, + ], + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "_index", + "negate": false, + "params": Array [ + "auditbeat-mytest-*", + ], + "type": "phrases", + }, + "query": Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "match_phrase": Object { + "_index": "auditbeat-mytest-*", + }, + }, + ], + }, + }, + }, + ], + "query": Object { + "language": "kql", + "query": "host.name: *", + }, + "visualization": Object { + "accessor": "d9a6eb6b-8b78-439e-98e7-a718f8ffbebe", + "layerId": "8be0156b-d423-4a39-adf1-f54d4c9f2e69", + "layerType": "data", + }, + }, + "title": "[Host] Unique IPs - source metric", + "visualizationType": "lnsLegacyMetric", +} +`; diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/event.test.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/event.test.ts new file mode 100644 index 0000000000000..107b63716f404 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/event.test.ts @@ -0,0 +1,45 @@ +/* + * 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 { renderHook } from '@testing-library/react-hooks'; +import { wrapper } from '../../mocks'; + +import { useLensAttributes } from '../../use_lens_attributes'; + +import { getEventsHistogramLensAttributes } from './events'; + +jest.mock('../../../../containers/sourcerer', () => ({ + useSourcererDataView: jest.fn().mockReturnValue({ + selectedPatterns: ['auditbeat-mytest-*'], + dataViewId: 'security-solution-my-test', + }), +})); + +jest.mock('../../../../utils/route/use_route_spy', () => ({ + useRouteSpy: jest.fn().mockReturnValue([ + { + detailName: 'mockHost', + pageName: 'hosts', + tabName: 'events', + }, + ]), +})); + +describe('getEventsHistogramLensAttributes', () => { + it('should render', () => { + const { result } = renderHook( + () => + useLensAttributes({ + getLensAttributes: getEventsHistogramLensAttributes, + stackByField: 'event.dataset', + }), + { wrapper } + ); + + expect(result?.current).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_host_area.test.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_host_area.test.ts new file mode 100644 index 0000000000000..5248444872942 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_host_area.test.ts @@ -0,0 +1,45 @@ +/* + * 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 { renderHook } from '@testing-library/react-hooks'; +import { wrapper } from '../../mocks'; + +import { useLensAttributes } from '../../use_lens_attributes'; + +import { kpiHostAreaLensAttributes } from './kpi_host_area'; + +jest.mock('../../../../containers/sourcerer', () => ({ + useSourcererDataView: jest.fn().mockReturnValue({ + selectedPatterns: ['auditbeat-mytest-*'], + dataViewId: 'security-solution-my-test', + }), +})); + +jest.mock('../../../../utils/route/use_route_spy', () => ({ + useRouteSpy: jest.fn().mockReturnValue([ + { + detailName: 'mockHost', + pageName: 'hosts', + tabName: 'events', + }, + ]), +})); + +describe('kpiHostAreaLensAttributes', () => { + it('should render', () => { + const { result } = renderHook( + () => + useLensAttributes({ + lensAttributes: kpiHostAreaLensAttributes, + stackByField: 'event.dataset', + }), + { wrapper } + ); + + expect(result?.current).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_host_area.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_host_area.ts index f4486b77390b2..64f62133e9406 100644 --- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_host_area.ts +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_host_area.ts @@ -5,6 +5,7 @@ * 2.0. */ +import { UNIQUE_COUNT } from '../../translations'; import type { LensAttributes } from '../../types'; export const kpiHostAreaLensAttributes: LensAttributes = { @@ -32,7 +33,7 @@ export const kpiHostAreaLensAttributes: LensAttributes = { customLabel: true, dataType: 'number', isBucketed: false, - label: ' ', + label: UNIQUE_COUNT('host.name'), operationType: 'unique_count', scale: 'ratio', sourceField: 'host.name', diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_host_metric.test.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_host_metric.test.ts new file mode 100644 index 0000000000000..06a884c15e4d6 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_host_metric.test.ts @@ -0,0 +1,45 @@ +/* + * 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 { renderHook } from '@testing-library/react-hooks'; +import { wrapper } from '../../mocks'; + +import { useLensAttributes } from '../../use_lens_attributes'; + +import { kpiHostMetricLensAttributes } from './kpi_host_metric'; + +jest.mock('../../../../containers/sourcerer', () => ({ + useSourcererDataView: jest.fn().mockReturnValue({ + selectedPatterns: ['auditbeat-mytest-*'], + dataViewId: 'security-solution-my-test', + }), +})); + +jest.mock('../../../../utils/route/use_route_spy', () => ({ + useRouteSpy: jest.fn().mockReturnValue([ + { + detailName: 'mockHost', + pageName: 'hosts', + tabName: 'events', + }, + ]), +})); + +describe('kpiHostMetricLensAttributes', () => { + it('should render', () => { + const { result } = renderHook( + () => + useLensAttributes({ + lensAttributes: kpiHostMetricLensAttributes, + stackByField: 'event.dataset', + }), + { wrapper } + ); + + expect(result?.current).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_host_metric.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_host_metric.ts index c5fcae45df0f0..00ab0239acb40 100644 --- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_host_metric.ts +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_host_metric.ts @@ -40,7 +40,7 @@ export const kpiHostMetricLensAttributes: LensAttributes = { }, }, title: '[Host] Hosts - metric', - visualizationType: 'lnsMetric', + visualizationType: 'lnsLegacyMetric', references: [ { id: '{dataViewId}', diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_unique_ips_area.test.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_unique_ips_area.test.ts new file mode 100644 index 0000000000000..63f50b141b5b0 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_unique_ips_area.test.ts @@ -0,0 +1,45 @@ +/* + * 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 { renderHook } from '@testing-library/react-hooks'; +import { wrapper } from '../../mocks'; + +import { useLensAttributes } from '../../use_lens_attributes'; + +import { kpiUniqueIpsAreaLensAttributes } from './kpi_unique_ips_area'; + +jest.mock('../../../../containers/sourcerer', () => ({ + useSourcererDataView: jest.fn().mockReturnValue({ + selectedPatterns: ['auditbeat-mytest-*'], + dataViewId: 'security-solution-my-test', + }), +})); + +jest.mock('../../../../utils/route/use_route_spy', () => ({ + useRouteSpy: jest.fn().mockReturnValue([ + { + detailName: 'mockHost', + pageName: 'hosts', + tabName: 'events', + }, + ]), +})); + +describe('kpiUniqueIpsAreaLensAttributes', () => { + it('should render', () => { + const { result } = renderHook( + () => + useLensAttributes({ + lensAttributes: kpiUniqueIpsAreaLensAttributes, + stackByField: 'event.dataset', + }), + { wrapper } + ); + + expect(result?.current).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_unique_ips_bar.test.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_unique_ips_bar.test.ts new file mode 100644 index 0000000000000..f04f0de2b8be7 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_unique_ips_bar.test.ts @@ -0,0 +1,45 @@ +/* + * 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 { renderHook } from '@testing-library/react-hooks'; +import { wrapper } from '../../mocks'; + +import { useLensAttributes } from '../../use_lens_attributes'; + +import { kpiUniqueIpsBarLensAttributes } from './kpi_unique_ips_bar'; + +jest.mock('../../../../containers/sourcerer', () => ({ + useSourcererDataView: jest.fn().mockReturnValue({ + selectedPatterns: ['auditbeat-mytest-*'], + dataViewId: 'security-solution-my-test', + }), +})); + +jest.mock('../../../../utils/route/use_route_spy', () => ({ + useRouteSpy: jest.fn().mockReturnValue([ + { + detailName: 'mockHost', + pageName: 'hosts', + tabName: 'events', + }, + ]), +})); + +describe('kpiUniqueIpsBarLensAttributes', () => { + it('should render', () => { + const { result } = renderHook( + () => + useLensAttributes({ + lensAttributes: kpiUniqueIpsBarLensAttributes, + stackByField: 'event.dataset', + }), + { wrapper } + ); + + expect(result?.current).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_unique_ips_bar.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_unique_ips_bar.ts index b55fcb64ba49c..cf7dbf21913b5 100644 --- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_unique_ips_bar.ts +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_unique_ips_bar.ts @@ -6,7 +6,7 @@ */ import type { LensAttributes } from '../../types'; -import { SOURCE_CHART_LABEL, DESTINATION_CHART_LABEL } from '../../translations'; +import { SOURCE_CHART_LABEL, DESTINATION_CHART_LABEL, UNIQUE_COUNT } from '../../translations'; export const kpiUniqueIpsBarLensAttributes: LensAttributes = { description: '', @@ -23,7 +23,7 @@ export const kpiUniqueIpsBarLensAttributes: LensAttributes = { '32f66676-f4e1-48fd-b7f8-d4de38318601': { dataType: 'number', isBucketed: false, - label: 'Unique count of source.ip', + label: UNIQUE_COUNT('source.ip'), operationType: 'unique_count', scale: 'ratio', sourceField: 'source.ip', @@ -50,7 +50,7 @@ export const kpiUniqueIpsBarLensAttributes: LensAttributes = { 'b7e59b08-96e6-40d1-84fd-e97b977d1c47': { dataType: 'number', isBucketed: false, - label: 'Unique count of destination.ip', + label: UNIQUE_COUNT('destination.ip'), operationType: 'unique_count', scale: 'ratio', sourceField: 'destination.ip', diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_unique_ips_destination_metric.test.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_unique_ips_destination_metric.test.ts new file mode 100644 index 0000000000000..9dd67a2d5ab40 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_unique_ips_destination_metric.test.ts @@ -0,0 +1,45 @@ +/* + * 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 { renderHook } from '@testing-library/react-hooks'; +import { wrapper } from '../../mocks'; + +import { useLensAttributes } from '../../use_lens_attributes'; + +import { kpiUniqueIpsDestinationMetricLensAttributes } from './kpi_unique_ips_destination_metric'; + +jest.mock('../../../../containers/sourcerer', () => ({ + useSourcererDataView: jest.fn().mockReturnValue({ + selectedPatterns: ['auditbeat-mytest-*'], + dataViewId: 'security-solution-my-test', + }), +})); + +jest.mock('../../../../utils/route/use_route_spy', () => ({ + useRouteSpy: jest.fn().mockReturnValue([ + { + detailName: 'mockHost', + pageName: 'hosts', + tabName: 'events', + }, + ]), +})); + +describe('kpiUniqueIpsDestinationMetricLensAttributes', () => { + it('should render', () => { + const { result } = renderHook( + () => + useLensAttributes({ + lensAttributes: kpiUniqueIpsDestinationMetricLensAttributes, + stackByField: 'event.dataset', + }), + { wrapper } + ); + + expect(result?.current).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_unique_ips_destination_metric.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_unique_ips_destination_metric.ts index ae18c08be800c..5c4aa31f65833 100644 --- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_unique_ips_destination_metric.ts +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_unique_ips_destination_metric.ts @@ -40,7 +40,7 @@ export const kpiUniqueIpsDestinationMetricLensAttributes: LensAttributes = { }, }, title: '[Host] Unique IPs - destination metric', - visualizationType: 'lnsMetric', + visualizationType: 'lnsLegacyMetric', references: [ { id: '{dataViewId}', diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_unique_ips_source_metric.test.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_unique_ips_source_metric.test.ts new file mode 100644 index 0000000000000..6e69495e63a0e --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_unique_ips_source_metric.test.ts @@ -0,0 +1,45 @@ +/* + * 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 { renderHook } from '@testing-library/react-hooks'; +import { wrapper } from '../../mocks'; + +import { useLensAttributes } from '../../use_lens_attributes'; + +import { kpiUniqueIpsSourceMetricLensAttributes } from './kpi_unique_ips_source_metric'; + +jest.mock('../../../../containers/sourcerer', () => ({ + useSourcererDataView: jest.fn().mockReturnValue({ + selectedPatterns: ['auditbeat-mytest-*'], + dataViewId: 'security-solution-my-test', + }), +})); + +jest.mock('../../../../utils/route/use_route_spy', () => ({ + useRouteSpy: jest.fn().mockReturnValue([ + { + detailName: 'mockHost', + pageName: 'hosts', + tabName: 'events', + }, + ]), +})); + +describe('kpiUniqueIpsSourceMetricLensAttributes', () => { + it('should render', () => { + const { result } = renderHook( + () => + useLensAttributes({ + lensAttributes: kpiUniqueIpsSourceMetricLensAttributes, + stackByField: 'event.dataset', + }), + { wrapper } + ); + + expect(result?.current).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_unique_ips_source_metric.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_unique_ips_source_metric.ts index 8a0b778975ab9..4d308b95d796d 100644 --- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_unique_ips_source_metric.ts +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_unique_ips_source_metric.ts @@ -40,7 +40,7 @@ export const kpiUniqueIpsSourceMetricLensAttributes: LensAttributes = { }, }, title: '[Host] Unique IPs - source metric', - visualizationType: 'lnsMetric', + visualizationType: 'lnsLegacyMetric', references: [ { id: '{dataViewId}', diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/dns_top_domains.test.ts.snap b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/dns_top_domains.test.ts.snap new file mode 100644 index 0000000000000..6e0f9c2bbd516 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/dns_top_domains.test.ts.snap @@ -0,0 +1,245 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`dnsTopDomainsLensAttributes should render 1`] = ` +Object { + "description": "Security Solution Network DNS", + "references": Array [ + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-current-indexpattern", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-layer-b1c3efc6-c886-4fba-978f-3b6bb5e7948a", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "filter-index-pattern-0", + "type": "index-pattern", + }, + ], + "state": Object { + "datasourceStates": Object { + "indexpattern": Object { + "layers": Object { + "b1c3efc6-c886-4fba-978f-3b6bb5e7948a": Object { + "columnOrder": Array [ + "e8842815-2a45-4c74-86de-c19a391e2424", + "d1452b87-0e9e-4fc0-a725-3727a18e0b37", + "2a4d5e20-f570-48e4-b9ab-ff3068919377", + ], + "columns": Object { + "2a4d5e20-f570-48e4-b9ab-ff3068919377": Object { + "dataType": "number", + "isBucketed": false, + "label": "Unique count of dns.question.registered_domain", + "operationType": "unique_count", + "scale": "ratio", + "sourceField": "dns.question.registered_domain", + }, + "d1452b87-0e9e-4fc0-a725-3727a18e0b37": Object { + "dataType": "date", + "isBucketed": true, + "label": "@timestamp", + "operationType": "date_histogram", + "params": Object { + "interval": "auto", + }, + "scale": "interval", + "sourceField": "@timestamp", + }, + "e8842815-2a45-4c74-86de-c19a391e2424": Object { + "dataType": "string", + "isBucketed": true, + "label": "Top values of dns.question.name", + "operationType": "terms", + "params": Object { + "missingBucket": false, + "orderBy": Object { + "columnId": "2a4d5e20-f570-48e4-b9ab-ff3068919377", + "type": "column", + }, + "orderDirection": "desc", + "otherBucket": true, + "size": 6, + }, + "scale": "ordinal", + "sourceField": "dns.question.name", + }, + }, + "incompleteColumns": Object {}, + }, + }, + }, + }, + "filters": Array [ + Object { + "$state": Object { + "store": "appState", + }, + "meta": Object { + "alias": null, + "disabled": false, + "indexRefName": "filter-index-pattern-0", + "key": "dns.question.type", + "negate": true, + "params": Object { + "query": "PTR", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "dns.question.type": "PTR", + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.id", + "negate": false, + "params": Object { + "query": "123", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.id": "123", + }, + }, + }, + Object { + "meta": Object { + "alias": "", + "disabled": false, + "key": "bool", + "negate": false, + "type": "custom", + "value": "{\\"bool\\":{\\"filter\\":[{\\"bool\\":{\\"should\\":[{\\"bool\\":{\\"should\\":[{\\"exists\\":{\\"field\\": \\"source.ip\\"}}],\\"minimum_should_match\\":1}},{\\"bool\\":{\\"should\\":[{\\"exists\\":{\\"field\\": \\"destination.ip\\"}}],\\"minimum_should_match\\":1}}],\\"minimum_should_match\\":1}}]}}", + }, + "query": Object { + "bool": Object { + "filter": Array [ + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "exists": Object { + "field": "source.ip", + }, + }, + ], + }, + }, + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "exists": Object { + "field": "destination.ip", + }, + }, + ], + }, + }, + ], + }, + }, + ], + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "_index", + "negate": false, + "params": Array [ + "auditbeat-mytest-*", + ], + "type": "phrases", + }, + "query": Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "match_phrase": Object { + "_index": "auditbeat-mytest-*", + }, + }, + ], + }, + }, + }, + ], + "query": Object { + "language": "kql", + "query": "host.name: *", + }, + "visualization": Object { + "axisTitlesVisibilitySettings": Object { + "x": true, + "yLeft": true, + "yRight": true, + }, + "fittingFunction": "None", + "gridlinesVisibilitySettings": Object { + "x": true, + "yLeft": true, + "yRight": true, + }, + "labelsOrientation": Object { + "x": 0, + "yLeft": 0, + "yRight": 0, + }, + "layers": Array [ + Object { + "accessors": Array [ + "2a4d5e20-f570-48e4-b9ab-ff3068919377", + ], + "layerId": "b1c3efc6-c886-4fba-978f-3b6bb5e7948a", + "layerType": "data", + "position": "top", + "seriesType": "bar", + "showGridlines": false, + "splitAccessor": "e8842815-2a45-4c74-86de-c19a391e2424", + "xAccessor": "d1452b87-0e9e-4fc0-a725-3727a18e0b37", + }, + ], + "legend": Object { + "isVisible": true, + "position": "right", + }, + "preferredSeriesType": "bar", + "tickLabelsVisibilitySettings": Object { + "x": true, + "yLeft": true, + "yRight": true, + }, + "valueLabels": "hide", + "yLeftExtent": Object { + "mode": "full", + }, + "yRightExtent": Object { + "mode": "full", + }, + }, + }, + "title": "Top domains by dns.question.registered_domain", + "visualizationType": "lnsXY", +} +`; diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/kpi_dns_queries.test.ts.snap b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/kpi_dns_queries.test.ts.snap new file mode 100644 index 0000000000000..39f16779abaf4 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/kpi_dns_queries.test.ts.snap @@ -0,0 +1,189 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`kpiDnsQueriesLensAttributes should render 1`] = ` +Object { + "description": "", + "references": Array [ + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-current-indexpattern", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-layer-cea37c70-8f91-43bf-b9fe-72d8c049f6a3", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "196d783b-3779-4c39-898e-6606fe633d05", + "type": "index-pattern", + }, + ], + "state": Object { + "datasourceStates": Object { + "indexpattern": Object { + "layers": Object { + "cea37c70-8f91-43bf-b9fe-72d8c049f6a3": Object { + "columnOrder": Array [ + "0374e520-eae0-4ac1-bcfe-37565e7fc9e3", + ], + "columns": Object { + "0374e520-eae0-4ac1-bcfe-37565e7fc9e3": Object { + "customLabel": true, + "dataType": "number", + "isBucketed": false, + "label": "", + "operationType": "count", + "scale": "ratio", + "sourceField": "___records___", + }, + }, + "incompleteColumns": Object {}, + }, + }, + }, + }, + "filters": Array [ + Object { + "$state": Object { + "store": "appState", + }, + "meta": Object { + "alias": null, + "disabled": false, + "index": "196d783b-3779-4c39-898e-6606fe633d05", + "key": "query", + "negate": false, + "type": "custom", + "value": "{\\"bool\\":{\\"should\\":[{\\"exists\\":{\\"field\\":\\"dns.question.name\\"}},{\\"term\\":{\\"suricata.eve.dns.type\\":{\\"value\\":\\"query\\"}}},{\\"exists\\":{\\"field\\":\\"zeek.dns.query\\"}}],\\"minimum_should_match\\":1}}", + }, + "query": Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "exists": Object { + "field": "dns.question.name", + }, + }, + Object { + "term": Object { + "suricata.eve.dns.type": Object { + "value": "query", + }, + }, + }, + Object { + "exists": Object { + "field": "zeek.dns.query", + }, + }, + ], + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.id", + "negate": false, + "params": Object { + "query": "123", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.id": "123", + }, + }, + }, + Object { + "meta": Object { + "alias": "", + "disabled": false, + "key": "bool", + "negate": false, + "type": "custom", + "value": "{\\"bool\\":{\\"filter\\":[{\\"bool\\":{\\"should\\":[{\\"bool\\":{\\"should\\":[{\\"exists\\":{\\"field\\": \\"source.ip\\"}}],\\"minimum_should_match\\":1}},{\\"bool\\":{\\"should\\":[{\\"exists\\":{\\"field\\": \\"destination.ip\\"}}],\\"minimum_should_match\\":1}}],\\"minimum_should_match\\":1}}]}}", + }, + "query": Object { + "bool": Object { + "filter": Array [ + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "exists": Object { + "field": "source.ip", + }, + }, + ], + }, + }, + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "exists": Object { + "field": "destination.ip", + }, + }, + ], + }, + }, + ], + }, + }, + ], + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "_index", + "negate": false, + "params": Array [ + "auditbeat-mytest-*", + ], + "type": "phrases", + }, + "query": Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "match_phrase": Object { + "_index": "auditbeat-mytest-*", + }, + }, + ], + }, + }, + }, + ], + "query": Object { + "language": "kql", + "query": "host.name: *", + }, + "visualization": Object { + "accessor": "0374e520-eae0-4ac1-bcfe-37565e7fc9e3", + "colorMode": "None", + "layerId": "cea37c70-8f91-43bf-b9fe-72d8c049f6a3", + "layerType": "data", + }, + }, + "title": "[Network] DNS metric", + "visualizationType": "lnsLegacyMetric", +} +`; diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/kpi_network_events.test.ts.snap b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/kpi_network_events.test.ts.snap new file mode 100644 index 0000000000000..03bacfac49ad7 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/kpi_network_events.test.ts.snap @@ -0,0 +1,193 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`kpiNetworkEventsLensAttributes should render 1`] = ` +Object { + "description": "", + "references": Array [ + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-current-indexpattern", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-layer-eaadfec7-deaa-4aeb-a403-3b4e516416d2", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "861af17d-be25-45a3-a82d-d6e697b76e51", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "09617767-f732-410e-af53-bebcbd0bf4b9", + "type": "index-pattern", + }, + ], + "state": Object { + "datasourceStates": Object { + "indexpattern": Object { + "layers": Object { + "eaadfec7-deaa-4aeb-a403-3b4e516416d2": Object { + "columnOrder": Array [ + "370ebd07-5ce0-4f46-a847-0e363c50d037", + ], + "columns": Object { + "370ebd07-5ce0-4f46-a847-0e363c50d037": Object { + "customLabel": true, + "dataType": "number", + "isBucketed": false, + "label": " ", + "operationType": "count", + "scale": "ratio", + "sourceField": "___records___", + }, + }, + "incompleteColumns": Object {}, + }, + }, + }, + }, + "filters": Array [ + Object { + "$state": Object { + "store": "appState", + }, + "meta": Object { + "alias": null, + "disabled": false, + "index": "security-solution-default", + "key": "source.ip", + "negate": false, + "type": "exists", + "value": "exists", + }, + "query": Object { + "exists": Object { + "field": "source.ip", + }, + }, + }, + Object { + "$state": Object { + "store": "appState", + }, + "meta": Object { + "alias": null, + "disabled": false, + "index": "security-solution-default", + "key": "destination.ip", + "negate": false, + "type": "exists", + "value": "exists", + }, + "query": Object { + "exists": Object { + "field": "destination.ip", + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.id", + "negate": false, + "params": Object { + "query": "123", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.id": "123", + }, + }, + }, + Object { + "meta": Object { + "alias": "", + "disabled": false, + "key": "bool", + "negate": false, + "type": "custom", + "value": "{\\"bool\\":{\\"filter\\":[{\\"bool\\":{\\"should\\":[{\\"bool\\":{\\"should\\":[{\\"exists\\":{\\"field\\": \\"source.ip\\"}}],\\"minimum_should_match\\":1}},{\\"bool\\":{\\"should\\":[{\\"exists\\":{\\"field\\": \\"destination.ip\\"}}],\\"minimum_should_match\\":1}}],\\"minimum_should_match\\":1}}]}}", + }, + "query": Object { + "bool": Object { + "filter": Array [ + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "exists": Object { + "field": "source.ip", + }, + }, + ], + }, + }, + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "exists": Object { + "field": "destination.ip", + }, + }, + ], + }, + }, + ], + }, + }, + ], + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "_index", + "negate": false, + "params": Array [ + "auditbeat-mytest-*", + ], + "type": "phrases", + }, + "query": Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "match_phrase": Object { + "_index": "auditbeat-mytest-*", + }, + }, + ], + }, + }, + }, + ], + "query": Object { + "language": "kql", + "query": "host.name: *", + }, + "visualization": Object { + "accessor": "370ebd07-5ce0-4f46-a847-0e363c50d037", + "layerId": "eaadfec7-deaa-4aeb-a403-3b4e516416d2", + "layerType": "data", + }, + }, + "title": "[Network] Network events", + "visualizationType": "lnsLegacyMetric", +} +`; diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/kpi_tls_handshakes.test.ts.snap b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/kpi_tls_handshakes.test.ts.snap new file mode 100644 index 0000000000000..6e695484fdc0f --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/kpi_tls_handshakes.test.ts.snap @@ -0,0 +1,212 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`kpiTlsHandshakesLensAttributes should render 1`] = ` +Object { + "description": "", + "references": Array [ + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-current-indexpattern", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-layer-1f48a633-8eee-45ae-9471-861227e9ca03", + "type": "index-pattern", + }, + ], + "state": Object { + "datasourceStates": Object { + "indexpattern": Object { + "layers": Object { + "1f48a633-8eee-45ae-9471-861227e9ca03": Object { + "columnOrder": Array [ + "21052b6b-5504-4084-a2e2-c17f772345cf", + ], + "columns": Object { + "21052b6b-5504-4084-a2e2-c17f772345cf": Object { + "customLabel": true, + "dataType": "number", + "isBucketed": false, + "label": " ", + "operationType": "count", + "scale": "ratio", + "sourceField": "___records___", + }, + }, + "incompleteColumns": Object {}, + }, + }, + }, + }, + "filters": Array [ + Object { + "$state": Object { + "store": "appState", + }, + "meta": Object { + "alias": null, + "disabled": false, + "index": "32ee22d9-2e77-4aee-8073-87750e92c3ee", + "key": "query", + "negate": false, + "type": "custom", + "value": "{\\"bool\\":{\\"should\\":[{\\"exists\\":{\\"field\\":\\"source.ip\\"}},{\\"exists\\":{\\"field\\":\\"destination.ip\\"}}],\\"minimum_should_match\\":1}}", + }, + "query": Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "exists": Object { + "field": "source.ip", + }, + }, + Object { + "exists": Object { + "field": "destination.ip", + }, + }, + ], + }, + }, + }, + Object { + "$state": Object { + "store": "appState", + }, + "meta": Object { + "alias": null, + "disabled": false, + "index": "1e93f984-9374-4755-a198-de57751533c6", + "key": "query", + "negate": false, + "type": "custom", + "value": "{\\"bool\\":{\\"should\\":[{\\"exists\\":{\\"field\\":\\"tls.version\\"}},{\\"exists\\":{\\"field\\":\\"suricata.eve.tls.version\\"}},{\\"exists\\":{\\"field\\":\\"zeek.ssl.version\\"}}],\\"minimum_should_match\\":1}}", + }, + "query": Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "exists": Object { + "field": "tls.version", + }, + }, + Object { + "exists": Object { + "field": "suricata.eve.tls.version", + }, + }, + Object { + "exists": Object { + "field": "zeek.ssl.version", + }, + }, + ], + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.id", + "negate": false, + "params": Object { + "query": "123", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.id": "123", + }, + }, + }, + Object { + "meta": Object { + "alias": "", + "disabled": false, + "key": "bool", + "negate": false, + "type": "custom", + "value": "{\\"bool\\":{\\"filter\\":[{\\"bool\\":{\\"should\\":[{\\"bool\\":{\\"should\\":[{\\"exists\\":{\\"field\\": \\"source.ip\\"}}],\\"minimum_should_match\\":1}},{\\"bool\\":{\\"should\\":[{\\"exists\\":{\\"field\\": \\"destination.ip\\"}}],\\"minimum_should_match\\":1}}],\\"minimum_should_match\\":1}}]}}", + }, + "query": Object { + "bool": Object { + "filter": Array [ + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "exists": Object { + "field": "source.ip", + }, + }, + ], + }, + }, + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "exists": Object { + "field": "destination.ip", + }, + }, + ], + }, + }, + ], + }, + }, + ], + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "_index", + "negate": false, + "params": Array [ + "auditbeat-mytest-*", + ], + "type": "phrases", + }, + "query": Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "match_phrase": Object { + "_index": "auditbeat-mytest-*", + }, + }, + ], + }, + }, + }, + ], + "query": Object { + "language": "kql", + "query": "host.name: *", + }, + "visualization": Object { + "accessor": "21052b6b-5504-4084-a2e2-c17f772345cf", + "layerId": "1f48a633-8eee-45ae-9471-861227e9ca03", + "layerType": "data", + }, + }, + "title": "[Network] TLS handshakes", + "visualizationType": "lnsLegacyMetric", +} +`; diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/kpi_unique_flow_ids.test.ts.snap b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/kpi_unique_flow_ids.test.ts.snap new file mode 100644 index 0000000000000..1e3f1f63c40c8 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/kpi_unique_flow_ids.test.ts.snap @@ -0,0 +1,176 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`kpiUniqueFlowIdsLensAttributes should render 1`] = ` +Object { + "description": "", + "references": Array [ + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-current-indexpattern", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-layer-5d46d48f-6ce8-46be-a797-17ad50642564", + "type": "index-pattern", + }, + ], + "state": Object { + "datasourceStates": Object { + "indexpattern": Object { + "layers": Object { + "5d46d48f-6ce8-46be-a797-17ad50642564": Object { + "columnOrder": Array [ + "a27f3503-9c73-4fc1-86bb-12461dae4b70", + ], + "columns": Object { + "a27f3503-9c73-4fc1-86bb-12461dae4b70": Object { + "customLabel": true, + "dataType": "number", + "isBucketed": false, + "label": " ", + "operationType": "unique_count", + "scale": "ratio", + "sourceField": "network.community_id", + }, + }, + "incompleteColumns": Object {}, + }, + }, + }, + }, + "filters": Array [ + Object { + "$state": Object { + "store": "appState", + }, + "meta": Object { + "alias": null, + "disabled": false, + "index": "c01edc8a-90ce-4d49-95f0-76954a034eb2", + "key": "query", + "negate": false, + "type": "custom", + "value": "{\\"bool\\":{\\"should\\":[{\\"exists\\":{\\"field\\":\\"source.ip\\"}},{\\"exists\\":{\\"field\\":\\"destination.ip\\"}}],\\"minimum_should_match\\":1}}", + }, + "query": Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "exists": Object { + "field": "source.ip", + }, + }, + Object { + "exists": Object { + "field": "destination.ip", + }, + }, + ], + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.id", + "negate": false, + "params": Object { + "query": "123", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.id": "123", + }, + }, + }, + Object { + "meta": Object { + "alias": "", + "disabled": false, + "key": "bool", + "negate": false, + "type": "custom", + "value": "{\\"bool\\":{\\"filter\\":[{\\"bool\\":{\\"should\\":[{\\"bool\\":{\\"should\\":[{\\"exists\\":{\\"field\\": \\"source.ip\\"}}],\\"minimum_should_match\\":1}},{\\"bool\\":{\\"should\\":[{\\"exists\\":{\\"field\\": \\"destination.ip\\"}}],\\"minimum_should_match\\":1}}],\\"minimum_should_match\\":1}}]}}", + }, + "query": Object { + "bool": Object { + "filter": Array [ + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "exists": Object { + "field": "source.ip", + }, + }, + ], + }, + }, + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "exists": Object { + "field": "destination.ip", + }, + }, + ], + }, + }, + ], + }, + }, + ], + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "_index", + "negate": false, + "params": Array [ + "auditbeat-mytest-*", + ], + "type": "phrases", + }, + "query": Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "match_phrase": Object { + "_index": "auditbeat-mytest-*", + }, + }, + ], + }, + }, + }, + ], + "query": Object { + "language": "kql", + "query": "host.name: *", + }, + "visualization": Object { + "accessor": "a27f3503-9c73-4fc1-86bb-12461dae4b70", + "layerId": "5d46d48f-6ce8-46be-a797-17ad50642564", + "layerType": "data", + }, + }, + "title": "[Network] Unique flow IDs", + "visualizationType": "lnsLegacyMetric", +} +`; diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/kpi_unique_private_ips_area.test.ts.snap b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/kpi_unique_private_ips_area.test.ts.snap new file mode 100644 index 0000000000000..2415dcc6c750c --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/kpi_unique_private_ips_area.test.ts.snap @@ -0,0 +1,261 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`kpiUniquePrivateIpsAreaLensAttributes should render 1`] = ` +Object { + "description": "", + "references": Array [ + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-current-indexpattern", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-layer-38aa6532-6bf9-4c8f-b2a6-da8d32f7d0d7", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-layer-72dc4b99-b07d-4dc9-958b-081d259e11fa", + "type": "index-pattern", + }, + ], + "state": Object { + "datasourceStates": Object { + "indexpattern": Object { + "layers": Object { + "38aa6532-6bf9-4c8f-b2a6-da8d32f7d0d7": Object { + "columnOrder": Array [ + "662cd5e5-82bf-4325-a703-273f84b97e09", + "5f317308-cfbb-4ee5-bfb9-07653184fabf", + ], + "columns": Object { + "5f317308-cfbb-4ee5-bfb9-07653184fabf": Object { + "customLabel": true, + "dataType": "number", + "filter": Object { + "language": "kuery", + "query": "\\"source.ip\\": \\"10.0.0.0/8\\" or \\"source.ip\\": \\"192.168.0.0/16\\" or \\"source.ip\\": \\"172.16.0.0/12\\" or \\"source.ip\\": \\"fd00::/8\\"", + }, + "isBucketed": false, + "label": "Src.", + "operationType": "unique_count", + "scale": "ratio", + "sourceField": "source.ip", + }, + "662cd5e5-82bf-4325-a703-273f84b97e09": Object { + "dataType": "date", + "isBucketed": true, + "label": "@timestamp", + "operationType": "date_histogram", + "params": Object { + "interval": "auto", + }, + "scale": "interval", + "sourceField": "@timestamp", + }, + }, + "incompleteColumns": Object {}, + }, + "72dc4b99-b07d-4dc9-958b-081d259e11fa": Object { + "columnOrder": Array [ + "36444b8c-7e10-4069-8298-6c1b46912be2", + "ac1eb80c-ddde-46c4-a90c-400261926762", + ], + "columns": Object { + "36444b8c-7e10-4069-8298-6c1b46912be2": Object { + "dataType": "date", + "isBucketed": true, + "label": "@timestamp", + "operationType": "date_histogram", + "params": Object { + "interval": "auto", + }, + "scale": "interval", + "sourceField": "@timestamp", + }, + "ac1eb80c-ddde-46c4-a90c-400261926762": Object { + "dataType": "number", + "filter": Object { + "language": "kuery", + "query": "\\"destination.ip\\": \\"10.0.0.0/8\\" or \\"destination.ip\\": \\"192.168.0.0/16\\" or \\"destination.ip\\": \\"172.16.0.0/12\\" or \\"destination.ip\\": \\"fd00::/8\\"", + }, + "isBucketed": false, + "label": "Dest.", + "operationType": "unique_count", + "scale": "ratio", + "sourceField": "destination.ip", + }, + }, + "incompleteColumns": Object {}, + }, + }, + }, + }, + "filters": Array [ + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.id", + "negate": false, + "params": Object { + "query": "123", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.id": "123", + }, + }, + }, + Object { + "meta": Object { + "alias": "", + "disabled": false, + "key": "bool", + "negate": false, + "type": "custom", + "value": "{\\"bool\\":{\\"filter\\":[{\\"bool\\":{\\"should\\":[{\\"bool\\":{\\"should\\":[{\\"exists\\":{\\"field\\": \\"source.ip\\"}}],\\"minimum_should_match\\":1}},{\\"bool\\":{\\"should\\":[{\\"exists\\":{\\"field\\": \\"destination.ip\\"}}],\\"minimum_should_match\\":1}}],\\"minimum_should_match\\":1}}]}}", + }, + "query": Object { + "bool": Object { + "filter": Array [ + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "exists": Object { + "field": "source.ip", + }, + }, + ], + }, + }, + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "exists": Object { + "field": "destination.ip", + }, + }, + ], + }, + }, + ], + }, + }, + ], + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "_index", + "negate": false, + "params": Array [ + "auditbeat-mytest-*", + ], + "type": "phrases", + }, + "query": Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "match_phrase": Object { + "_index": "auditbeat-mytest-*", + }, + }, + ], + }, + }, + }, + ], + "query": Object { + "language": "kql", + "query": "host.name: *", + }, + "visualization": Object { + "axisTitlesVisibilitySettings": Object { + "x": false, + "yLeft": false, + "yRight": true, + }, + "fittingFunction": "None", + "gridlinesVisibilitySettings": Object { + "x": true, + "yLeft": true, + "yRight": true, + }, + "labelsOrientation": Object { + "x": 0, + "yLeft": 0, + "yRight": 0, + }, + "layers": Array [ + Object { + "accessors": Array [ + "5f317308-cfbb-4ee5-bfb9-07653184fabf", + ], + "layerId": "38aa6532-6bf9-4c8f-b2a6-da8d32f7d0d7", + "layerType": "data", + "seriesType": "area", + "xAccessor": "662cd5e5-82bf-4325-a703-273f84b97e09", + "yConfig": Array [ + Object { + "color": "#d36186", + "forAccessor": "5f317308-cfbb-4ee5-bfb9-07653184fabf", + }, + ], + }, + Object { + "accessors": Array [ + "ac1eb80c-ddde-46c4-a90c-400261926762", + ], + "layerId": "72dc4b99-b07d-4dc9-958b-081d259e11fa", + "layerType": "data", + "seriesType": "area", + "xAccessor": "36444b8c-7e10-4069-8298-6c1b46912be2", + "yConfig": Array [ + Object { + "color": "#9170b8", + "forAccessor": "ac1eb80c-ddde-46c4-a90c-400261926762", + }, + ], + }, + ], + "legend": Object { + "isVisible": false, + "position": "right", + "showSingleSeries": false, + }, + "preferredSeriesType": "area", + "tickLabelsVisibilitySettings": Object { + "x": true, + "yLeft": true, + "yRight": true, + }, + "valueLabels": "hide", + "yLeftExtent": Object { + "mode": "full", + }, + "yRightExtent": Object { + "mode": "full", + }, + }, + }, + "title": "[Network] Unique private IPs - area chart", + "visualizationType": "lnsXY", +} +`; diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/kpi_unique_private_ips_bar.test.ts.snap b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/kpi_unique_private_ips_bar.test.ts.snap new file mode 100644 index 0000000000000..2ea658869183c --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/kpi_unique_private_ips_bar.test.ts.snap @@ -0,0 +1,276 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`kpiUniquePrivateIpsBarLensAttributes should render 1`] = ` +Object { + "description": "", + "references": Array [ + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-current-indexpattern", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-layer-e406bf4f-942b-41ac-b516-edb5cef06ec8", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-layer-38aa6532-6bf9-4c8f-b2a6-da8d32f7d0d7", + "type": "index-pattern", + }, + ], + "state": Object { + "datasourceStates": Object { + "indexpattern": Object { + "layers": Object { + "38aa6532-6bf9-4c8f-b2a6-da8d32f7d0d7": Object { + "columnOrder": Array [ + "4607c585-3af3-43b9-804f-e49b27796d79", + "d27e0966-daf9-41f4-9033-230cf1e76dc9", + ], + "columns": Object { + "4607c585-3af3-43b9-804f-e49b27796d79": Object { + "dataType": "string", + "isBucketed": true, + "label": "Filters", + "operationType": "filters", + "params": Object { + "filters": Array [ + Object { + "input": Object { + "language": "kuery", + "query": "", + }, + "label": "Dest.", + }, + ], + }, + "scale": "ordinal", + }, + "d27e0966-daf9-41f4-9033-230cf1e76dc9": Object { + "dataType": "number", + "filter": Object { + "language": "kuery", + "query": "\\"destination.ip\\": \\"10.0.0.0/8\\" or \\"destination.ip\\": \\"192.168.0.0/16\\" or \\"destination.ip\\": \\"172.16.0.0/12\\" or \\"destination.ip\\": \\"fd00::/8\\"", + }, + "isBucketed": false, + "label": "Unique count of destination.ip", + "operationType": "unique_count", + "scale": "ratio", + "sourceField": "destination.ip", + }, + }, + "incompleteColumns": Object {}, + }, + "e406bf4f-942b-41ac-b516-edb5cef06ec8": Object { + "columnOrder": Array [ + "d9c438c5-f776-4436-9d20-d62dc8c03be8", + "5acd4c9d-dc3b-4b21-9632-e4407944c36d", + ], + "columns": Object { + "5acd4c9d-dc3b-4b21-9632-e4407944c36d": Object { + "dataType": "number", + "filter": Object { + "language": "kuery", + "query": "source.ip: \\"10.0.0.0/8\\" or source.ip: \\"192.168.0.0/16\\" or source.ip: \\"172.16.0.0/12\\" or source.ip: \\"fd00::/8\\"", + }, + "isBucketed": false, + "label": "Unique count of source.ip", + "operationType": "unique_count", + "scale": "ratio", + "sourceField": "source.ip", + }, + "d9c438c5-f776-4436-9d20-d62dc8c03be8": Object { + "dataType": "string", + "isBucketed": true, + "label": "Filters", + "operationType": "filters", + "params": Object { + "filters": Array [ + Object { + "input": Object { + "language": "kuery", + "query": "", + }, + "label": "Src.", + }, + ], + }, + "scale": "ordinal", + }, + }, + "incompleteColumns": Object {}, + }, + }, + }, + }, + "filters": Array [ + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.id", + "negate": false, + "params": Object { + "query": "123", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.id": "123", + }, + }, + }, + Object { + "meta": Object { + "alias": "", + "disabled": false, + "key": "bool", + "negate": false, + "type": "custom", + "value": "{\\"bool\\":{\\"filter\\":[{\\"bool\\":{\\"should\\":[{\\"bool\\":{\\"should\\":[{\\"exists\\":{\\"field\\": \\"source.ip\\"}}],\\"minimum_should_match\\":1}},{\\"bool\\":{\\"should\\":[{\\"exists\\":{\\"field\\": \\"destination.ip\\"}}],\\"minimum_should_match\\":1}}],\\"minimum_should_match\\":1}}]}}", + }, + "query": Object { + "bool": Object { + "filter": Array [ + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "exists": Object { + "field": "source.ip", + }, + }, + ], + }, + }, + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "exists": Object { + "field": "destination.ip", + }, + }, + ], + }, + }, + ], + }, + }, + ], + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "_index", + "negate": false, + "params": Array [ + "auditbeat-mytest-*", + ], + "type": "phrases", + }, + "query": Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "match_phrase": Object { + "_index": "auditbeat-mytest-*", + }, + }, + ], + }, + }, + }, + ], + "query": Object { + "language": "kql", + "query": "host.name: *", + }, + "visualization": Object { + "axisTitlesVisibilitySettings": Object { + "x": false, + "yLeft": false, + "yRight": true, + }, + "fittingFunction": "None", + "gridlinesVisibilitySettings": Object { + "x": true, + "yLeft": true, + "yRight": true, + }, + "labelsOrientation": Object { + "x": 0, + "yLeft": 0, + "yRight": 0, + }, + "layers": Array [ + Object { + "accessors": Array [ + "5acd4c9d-dc3b-4b21-9632-e4407944c36d", + ], + "layerId": "e406bf4f-942b-41ac-b516-edb5cef06ec8", + "layerType": "data", + "position": "top", + "seriesType": "bar_horizontal_stacked", + "showGridlines": false, + "xAccessor": "d9c438c5-f776-4436-9d20-d62dc8c03be8", + "yConfig": Array [ + Object { + "color": "#d36186", + "forAccessor": "5acd4c9d-dc3b-4b21-9632-e4407944c36d", + }, + ], + }, + Object { + "accessors": Array [ + "d27e0966-daf9-41f4-9033-230cf1e76dc9", + ], + "layerId": "38aa6532-6bf9-4c8f-b2a6-da8d32f7d0d7", + "layerType": "data", + "seriesType": "bar_horizontal_stacked", + "xAccessor": "4607c585-3af3-43b9-804f-e49b27796d79", + "yConfig": Array [ + Object { + "color": "#9170b8", + "forAccessor": "d27e0966-daf9-41f4-9033-230cf1e76dc9", + }, + ], + }, + ], + "legend": Object { + "isVisible": false, + "position": "right", + "showSingleSeries": false, + }, + "preferredSeriesType": "bar_horizontal_stacked", + "tickLabelsVisibilitySettings": Object { + "x": true, + "yLeft": true, + "yRight": true, + }, + "valueLabels": "hide", + "yLeftExtent": Object { + "mode": "full", + }, + "yRightExtent": Object { + "mode": "full", + }, + }, + }, + "title": "[Network] Unique private IPs - bar chart", + "visualizationType": "lnsXY", +} +`; diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/kpi_unique_private_ips_destination_metric.test.ts.snap b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/kpi_unique_private_ips_destination_metric.test.ts.snap new file mode 100644 index 0000000000000..37311a980c6b4 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/kpi_unique_private_ips_destination_metric.test.ts.snap @@ -0,0 +1,149 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`kpiUniquePrivateIpsDestinationMetricLensAttributes should render 1`] = ` +Object { + "description": "", + "references": Array [ + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-current-indexpattern", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-layer-cea37c70-8f91-43bf-b9fe-72d8c049f6a3", + "type": "index-pattern", + }, + ], + "state": Object { + "datasourceStates": Object { + "indexpattern": Object { + "layers": Object { + "cea37c70-8f91-43bf-b9fe-72d8c049f6a3": Object { + "columnOrder": Array [ + "bd17c23e-4f83-4108-8005-2669170d064b", + ], + "columns": Object { + "bd17c23e-4f83-4108-8005-2669170d064b": Object { + "customLabel": true, + "dataType": "number", + "filter": Object { + "language": "kuery", + "query": "\\"destination.ip\\": \\"10.0.0.0/8\\" or \\"destination.ip\\": \\"192.168.0.0/16\\" or \\"destination.ip\\": \\"172.16.0.0/12\\" or \\"destination.ip\\": \\"fd00::/8\\"", + }, + "isBucketed": false, + "label": "", + "operationType": "unique_count", + "scale": "ratio", + "sourceField": "destination.ip", + }, + }, + "incompleteColumns": Object {}, + }, + }, + }, + }, + "filters": Array [ + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.id", + "negate": false, + "params": Object { + "query": "123", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.id": "123", + }, + }, + }, + Object { + "meta": Object { + "alias": "", + "disabled": false, + "key": "bool", + "negate": false, + "type": "custom", + "value": "{\\"bool\\":{\\"filter\\":[{\\"bool\\":{\\"should\\":[{\\"bool\\":{\\"should\\":[{\\"exists\\":{\\"field\\": \\"source.ip\\"}}],\\"minimum_should_match\\":1}},{\\"bool\\":{\\"should\\":[{\\"exists\\":{\\"field\\": \\"destination.ip\\"}}],\\"minimum_should_match\\":1}}],\\"minimum_should_match\\":1}}]}}", + }, + "query": Object { + "bool": Object { + "filter": Array [ + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "exists": Object { + "field": "source.ip", + }, + }, + ], + }, + }, + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "exists": Object { + "field": "destination.ip", + }, + }, + ], + }, + }, + ], + }, + }, + ], + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "_index", + "negate": false, + "params": Array [ + "auditbeat-mytest-*", + ], + "type": "phrases", + }, + "query": Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "match_phrase": Object { + "_index": "auditbeat-mytest-*", + }, + }, + ], + }, + }, + }, + ], + "query": Object { + "language": "kql", + "query": "host.name: *", + }, + "visualization": Object { + "accessor": "bd17c23e-4f83-4108-8005-2669170d064b", + "layerId": "cea37c70-8f91-43bf-b9fe-72d8c049f6a3", + "layerType": "data", + }, + }, + "title": "[Network] Unique private IPs - destination metric", + "visualizationType": "lnsLegacyMetric", +} +`; diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/kpi_unique_private_ips_source_metric.test.ts.snap b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/kpi_unique_private_ips_source_metric.test.ts.snap new file mode 100644 index 0000000000000..2f7ba7d2997b1 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/__snapshots__/kpi_unique_private_ips_source_metric.test.ts.snap @@ -0,0 +1,149 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`kpiUniquePrivateIpsSourceMetricLensAttributes should render 1`] = ` +Object { + "description": "", + "references": Array [ + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-current-indexpattern", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-layer-cea37c70-8f91-43bf-b9fe-72d8c049f6a3", + "type": "index-pattern", + }, + ], + "state": Object { + "datasourceStates": Object { + "indexpattern": Object { + "layers": Object { + "cea37c70-8f91-43bf-b9fe-72d8c049f6a3": Object { + "columnOrder": Array [ + "bd17c23e-4f83-4108-8005-2669170d064b", + ], + "columns": Object { + "bd17c23e-4f83-4108-8005-2669170d064b": Object { + "customLabel": true, + "dataType": "number", + "filter": Object { + "language": "kuery", + "query": "source.ip: \\"10.0.0.0/8\\" or source.ip: \\"192.168.0.0/16\\" or source.ip: \\"172.16.0.0/12\\" or source.ip: \\"fd00::/8\\"", + }, + "isBucketed": false, + "label": "", + "operationType": "unique_count", + "scale": "ratio", + "sourceField": "source.ip", + }, + }, + "incompleteColumns": Object {}, + }, + }, + }, + }, + "filters": Array [ + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.id", + "negate": false, + "params": Object { + "query": "123", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.id": "123", + }, + }, + }, + Object { + "meta": Object { + "alias": "", + "disabled": false, + "key": "bool", + "negate": false, + "type": "custom", + "value": "{\\"bool\\":{\\"filter\\":[{\\"bool\\":{\\"should\\":[{\\"bool\\":{\\"should\\":[{\\"exists\\":{\\"field\\": \\"source.ip\\"}}],\\"minimum_should_match\\":1}},{\\"bool\\":{\\"should\\":[{\\"exists\\":{\\"field\\": \\"destination.ip\\"}}],\\"minimum_should_match\\":1}}],\\"minimum_should_match\\":1}}]}}", + }, + "query": Object { + "bool": Object { + "filter": Array [ + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "exists": Object { + "field": "source.ip", + }, + }, + ], + }, + }, + Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "exists": Object { + "field": "destination.ip", + }, + }, + ], + }, + }, + ], + }, + }, + ], + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "_index", + "negate": false, + "params": Array [ + "auditbeat-mytest-*", + ], + "type": "phrases", + }, + "query": Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "match_phrase": Object { + "_index": "auditbeat-mytest-*", + }, + }, + ], + }, + }, + }, + ], + "query": Object { + "language": "kql", + "query": "host.name: *", + }, + "visualization": Object { + "accessor": "bd17c23e-4f83-4108-8005-2669170d064b", + "layerId": "cea37c70-8f91-43bf-b9fe-72d8c049f6a3", + "layerType": "data", + }, + }, + "title": "[Network] Unique private IPs - source metric", + "visualizationType": "lnsLegacyMetric", +} +`; diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/dns_top_domains.test.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/dns_top_domains.test.ts new file mode 100644 index 0000000000000..a726a44e34e39 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/dns_top_domains.test.ts @@ -0,0 +1,45 @@ +/* + * 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 { renderHook } from '@testing-library/react-hooks'; +import { wrapper } from '../../mocks'; + +import { useLensAttributes } from '../../use_lens_attributes'; + +import { dnsTopDomainsLensAttributes } from './dns_top_domains'; + +jest.mock('../../../../containers/sourcerer', () => ({ + useSourcererDataView: jest.fn().mockReturnValue({ + selectedPatterns: ['auditbeat-mytest-*'], + dataViewId: 'security-solution-my-test', + }), +})); + +jest.mock('../../../../utils/route/use_route_spy', () => ({ + useRouteSpy: jest.fn().mockReturnValue([ + { + detailName: 'mockHost', + pageName: 'network', + tabName: 'events', + }, + ]), +})); + +describe('dnsTopDomainsLensAttributes', () => { + it('should render', () => { + const { result } = renderHook( + () => + useLensAttributes({ + lensAttributes: dnsTopDomainsLensAttributes, + stackByField: 'event.dataset', + }), + { wrapper } + ); + + expect(result?.current).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/dns_top_domains.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/dns_top_domains.ts index 07a3badc3b96e..ef75bea77c3e0 100644 --- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/dns_top_domains.ts +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/dns_top_domains.ts @@ -5,6 +5,7 @@ * 2.0. */ +import { TOP_VALUE, UNIQUE_COUNT } from '../../translations'; import type { LensAttributes } from '../../types'; /* Exported from Kibana Saved Object */ @@ -104,7 +105,7 @@ export const dnsTopDomainsLensAttributes: LensAttributes = { }, }, '2a4d5e20-f570-48e4-b9ab-ff3068919377': { - label: 'Unique count of dns.question.registered_domain', + label: UNIQUE_COUNT('dns.question.registered_domain'), dataType: 'number', operationType: 'unique_count', scale: 'ratio', @@ -112,7 +113,7 @@ export const dnsTopDomainsLensAttributes: LensAttributes = { isBucketed: false, }, 'e8842815-2a45-4c74-86de-c19a391e2424': { - label: 'Top values of dns.question.name', + label: TOP_VALUE('dns.question.name'), dataType: 'string', operationType: 'terms', scale: 'ordinal', diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_dns_queries.test.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_dns_queries.test.ts new file mode 100644 index 0000000000000..b19b5c1f2f1ba --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_dns_queries.test.ts @@ -0,0 +1,45 @@ +/* + * 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 { renderHook } from '@testing-library/react-hooks'; +import { wrapper } from '../../mocks'; + +import { useLensAttributes } from '../../use_lens_attributes'; + +import { kpiDnsQueriesLensAttributes } from './kpi_dns_queries'; + +jest.mock('../../../../containers/sourcerer', () => ({ + useSourcererDataView: jest.fn().mockReturnValue({ + selectedPatterns: ['auditbeat-mytest-*'], + dataViewId: 'security-solution-my-test', + }), +})); + +jest.mock('../../../../utils/route/use_route_spy', () => ({ + useRouteSpy: jest.fn().mockReturnValue([ + { + detailName: 'mockHost', + pageName: 'network', + tabName: 'events', + }, + ]), +})); + +describe('kpiDnsQueriesLensAttributes', () => { + it('should render', () => { + const { result } = renderHook( + () => + useLensAttributes({ + lensAttributes: kpiDnsQueriesLensAttributes, + stackByField: 'event.dataset', + }), + { wrapper } + ); + + expect(result?.current).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_dns_queries.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_dns_queries.ts index 1d6cddb7f1b61..681cd278214b1 100644 --- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_dns_queries.ts +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_dns_queries.ts @@ -10,7 +10,7 @@ import type { LensAttributes } from '../../types'; export const kpiDnsQueriesLensAttributes: LensAttributes = { title: '[Network] DNS metric', description: '', - visualizationType: 'lnsMetric', + visualizationType: 'lnsLegacyMetric', state: { visualization: { layerId: 'cea37c70-8f91-43bf-b9fe-72d8c049f6a3', diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_network_events.test.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_network_events.test.ts new file mode 100644 index 0000000000000..4ca26f222021a --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_network_events.test.ts @@ -0,0 +1,45 @@ +/* + * 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 { renderHook } from '@testing-library/react-hooks'; +import { wrapper } from '../../mocks'; + +import { useLensAttributes } from '../../use_lens_attributes'; + +import { kpiNetworkEventsLensAttributes } from './kpi_network_events'; + +jest.mock('../../../../containers/sourcerer', () => ({ + useSourcererDataView: jest.fn().mockReturnValue({ + selectedPatterns: ['auditbeat-mytest-*'], + dataViewId: 'security-solution-my-test', + }), +})); + +jest.mock('../../../../utils/route/use_route_spy', () => ({ + useRouteSpy: jest.fn().mockReturnValue([ + { + detailName: 'mockHost', + pageName: 'network', + tabName: 'events', + }, + ]), +})); + +describe('kpiNetworkEventsLensAttributes', () => { + it('should render', () => { + const { result } = renderHook( + () => + useLensAttributes({ + lensAttributes: kpiNetworkEventsLensAttributes, + stackByField: 'event.dataset', + }), + { wrapper } + ); + + expect(result?.current).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_network_events.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_network_events.ts index 013ad35b31ecc..534ffeb2024e6 100644 --- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_network_events.ts +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_network_events.ts @@ -10,7 +10,7 @@ import type { LensAttributes } from '../../types'; export const kpiNetworkEventsLensAttributes: LensAttributes = { title: '[Network] Network events', description: '', - visualizationType: 'lnsMetric', + visualizationType: 'lnsLegacyMetric', state: { visualization: { layerId: 'eaadfec7-deaa-4aeb-a403-3b4e516416d2', diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_tls_handshakes.test.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_tls_handshakes.test.ts new file mode 100644 index 0000000000000..f06f478ca0e2b --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_tls_handshakes.test.ts @@ -0,0 +1,45 @@ +/* + * 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 { renderHook } from '@testing-library/react-hooks'; +import { wrapper } from '../../mocks'; + +import { useLensAttributes } from '../../use_lens_attributes'; + +import { kpiTlsHandshakesLensAttributes } from './kpi_tls_handshakes'; + +jest.mock('../../../../containers/sourcerer', () => ({ + useSourcererDataView: jest.fn().mockReturnValue({ + selectedPatterns: ['auditbeat-mytest-*'], + dataViewId: 'security-solution-my-test', + }), +})); + +jest.mock('../../../../utils/route/use_route_spy', () => ({ + useRouteSpy: jest.fn().mockReturnValue([ + { + detailName: 'mockHost', + pageName: 'network', + tabName: 'events', + }, + ]), +})); + +describe('kpiTlsHandshakesLensAttributes', () => { + it('should render', () => { + const { result } = renderHook( + () => + useLensAttributes({ + lensAttributes: kpiTlsHandshakesLensAttributes, + stackByField: 'event.dataset', + }), + { wrapper } + ); + + expect(result?.current).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_tls_handshakes.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_tls_handshakes.ts index 343c61dbd2be1..367fe6fd40f6f 100644 --- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_tls_handshakes.ts +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_tls_handshakes.ts @@ -9,7 +9,7 @@ import type { LensAttributes } from '../../types'; export const kpiTlsHandshakesLensAttributes: LensAttributes = { title: '[Network] TLS handshakes', description: '', - visualizationType: 'lnsMetric', + visualizationType: 'lnsLegacyMetric', state: { visualization: { layerId: '1f48a633-8eee-45ae-9471-861227e9ca03', diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_flow_ids.test.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_flow_ids.test.ts new file mode 100644 index 0000000000000..64b9be02a1d18 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_flow_ids.test.ts @@ -0,0 +1,45 @@ +/* + * 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 { renderHook } from '@testing-library/react-hooks'; +import { wrapper } from '../../mocks'; + +import { useLensAttributes } from '../../use_lens_attributes'; + +import { kpiUniqueFlowIdsLensAttributes } from './kpi_unique_flow_ids'; + +jest.mock('../../../../containers/sourcerer', () => ({ + useSourcererDataView: jest.fn().mockReturnValue({ + selectedPatterns: ['auditbeat-mytest-*'], + dataViewId: 'security-solution-my-test', + }), +})); + +jest.mock('../../../../utils/route/use_route_spy', () => ({ + useRouteSpy: jest.fn().mockReturnValue([ + { + detailName: 'mockHost', + pageName: 'network', + tabName: 'events', + }, + ]), +})); + +describe('kpiUniqueFlowIdsLensAttributes', () => { + it('should render', () => { + const { result } = renderHook( + () => + useLensAttributes({ + lensAttributes: kpiUniqueFlowIdsLensAttributes, + stackByField: 'event.dataset', + }), + { wrapper } + ); + + expect(result?.current).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_flow_ids.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_flow_ids.ts index 3646e3c0a70bd..5f31645c75eca 100644 --- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_flow_ids.ts +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_flow_ids.ts @@ -10,7 +10,7 @@ import type { LensAttributes } from '../../types'; export const kpiUniqueFlowIdsLensAttributes: LensAttributes = { title: '[Network] Unique flow IDs', description: '', - visualizationType: 'lnsMetric', + visualizationType: 'lnsLegacyMetric', state: { visualization: { layerId: '5d46d48f-6ce8-46be-a797-17ad50642564', diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_area.test.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_area.test.ts new file mode 100644 index 0000000000000..8bb98ddaf95cf --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_area.test.ts @@ -0,0 +1,45 @@ +/* + * 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 { renderHook } from '@testing-library/react-hooks'; +import { wrapper } from '../../mocks'; + +import { useLensAttributes } from '../../use_lens_attributes'; + +import { kpiUniquePrivateIpsAreaLensAttributes } from './kpi_unique_private_ips_area'; + +jest.mock('../../../../containers/sourcerer', () => ({ + useSourcererDataView: jest.fn().mockReturnValue({ + selectedPatterns: ['auditbeat-mytest-*'], + dataViewId: 'security-solution-my-test', + }), +})); + +jest.mock('../../../../utils/route/use_route_spy', () => ({ + useRouteSpy: jest.fn().mockReturnValue([ + { + detailName: 'mockHost', + pageName: 'network', + tabName: 'events', + }, + ]), +})); + +describe('kpiUniquePrivateIpsAreaLensAttributes', () => { + it('should render', () => { + const { result } = renderHook( + () => + useLensAttributes({ + lensAttributes: kpiUniquePrivateIpsAreaLensAttributes, + stackByField: 'event.dataset', + }), + { wrapper } + ); + + expect(result?.current).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_area.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_area.ts index 2d3792e399372..394bc227e871c 100644 --- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_area.ts +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_area.ts @@ -4,6 +4,7 @@ * 2.0; you may not use this file except in compliance with the Elastic License * 2.0. */ +import { DESTINATION_CHART_LABEL, SOURCE_CHART_LABEL } from '../../translations'; import type { LensAttributes } from '../../types'; export const kpiUniquePrivateIpsAreaLensAttributes: LensAttributes = { @@ -97,7 +98,7 @@ export const kpiUniquePrivateIpsAreaLensAttributes: LensAttributes = { }, }, '5f317308-cfbb-4ee5-bfb9-07653184fabf': { - label: 'Src.', + label: SOURCE_CHART_LABEL, dataType: 'number', operationType: 'unique_count', scale: 'ratio', @@ -131,7 +132,7 @@ export const kpiUniquePrivateIpsAreaLensAttributes: LensAttributes = { }, }, 'ac1eb80c-ddde-46c4-a90c-400261926762': { - label: 'Dest.', + label: DESTINATION_CHART_LABEL, dataType: 'number', operationType: 'unique_count', scale: 'ratio', diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_bar.test.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_bar.test.ts new file mode 100644 index 0000000000000..894144d383b58 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_bar.test.ts @@ -0,0 +1,45 @@ +/* + * 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 { renderHook } from '@testing-library/react-hooks'; +import { wrapper } from '../../mocks'; + +import { useLensAttributes } from '../../use_lens_attributes'; + +import { kpiUniquePrivateIpsBarLensAttributes } from './kpi_unique_private_ips_bar'; + +jest.mock('../../../../containers/sourcerer', () => ({ + useSourcererDataView: jest.fn().mockReturnValue({ + selectedPatterns: ['auditbeat-mytest-*'], + dataViewId: 'security-solution-my-test', + }), +})); + +jest.mock('../../../../utils/route/use_route_spy', () => ({ + useRouteSpy: jest.fn().mockReturnValue([ + { + detailName: 'mockHost', + pageName: 'network', + tabName: 'events', + }, + ]), +})); + +describe('kpiUniquePrivateIpsBarLensAttributes', () => { + it('should render', () => { + const { result } = renderHook( + () => + useLensAttributes({ + lensAttributes: kpiUniquePrivateIpsBarLensAttributes, + stackByField: 'event.dataset', + }), + { wrapper } + ); + + expect(result?.current).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_bar.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_bar.ts index bf4ad0e704081..fe4a698aedf5e 100644 --- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_bar.ts +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_bar.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { SOURCE_CHART_LABEL, DESTINATION_CHART_LABEL } from '../../translations'; +import { SOURCE_CHART_LABEL, DESTINATION_CHART_LABEL, UNIQUE_COUNT } from '../../translations'; import type { LensAttributes } from '../../types'; export const kpiUniquePrivateIpsBarLensAttributes: LensAttributes = { @@ -90,7 +90,7 @@ export const kpiUniquePrivateIpsBarLensAttributes: LensAttributes = { 'e406bf4f-942b-41ac-b516-edb5cef06ec8': { columns: { '5acd4c9d-dc3b-4b21-9632-e4407944c36d': { - label: SOURCE_CHART_LABEL, + label: UNIQUE_COUNT('source.ip'), dataType: 'number', isBucketed: false, operationType: 'unique_count', @@ -130,7 +130,7 @@ export const kpiUniquePrivateIpsBarLensAttributes: LensAttributes = { '38aa6532-6bf9-4c8f-b2a6-da8d32f7d0d7': { columns: { 'd27e0966-daf9-41f4-9033-230cf1e76dc9': { - label: DESTINATION_CHART_LABEL, + label: UNIQUE_COUNT('destination.ip'), dataType: 'number', isBucketed: false, operationType: 'unique_count', diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_destination_metric.test.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_destination_metric.test.ts new file mode 100644 index 0000000000000..7d65e042554b3 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_destination_metric.test.ts @@ -0,0 +1,45 @@ +/* + * 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 { renderHook } from '@testing-library/react-hooks'; +import { wrapper } from '../../mocks'; + +import { useLensAttributes } from '../../use_lens_attributes'; + +import { kpiUniquePrivateIpsDestinationMetricLensAttributes } from './kpi_unique_private_ips_destination_metric'; + +jest.mock('../../../../containers/sourcerer', () => ({ + useSourcererDataView: jest.fn().mockReturnValue({ + selectedPatterns: ['auditbeat-mytest-*'], + dataViewId: 'security-solution-my-test', + }), +})); + +jest.mock('../../../../utils/route/use_route_spy', () => ({ + useRouteSpy: jest.fn().mockReturnValue([ + { + detailName: 'mockHost', + pageName: 'network', + tabName: 'events', + }, + ]), +})); + +describe('kpiUniquePrivateIpsDestinationMetricLensAttributes', () => { + it('should render', () => { + const { result } = renderHook( + () => + useLensAttributes({ + lensAttributes: kpiUniquePrivateIpsDestinationMetricLensAttributes, + stackByField: 'event.dataset', + }), + { wrapper } + ); + + expect(result?.current).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_destination_metric.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_destination_metric.ts index a2bccef3b624b..6e3d440619e76 100644 --- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_destination_metric.ts +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_destination_metric.ts @@ -48,7 +48,7 @@ export const kpiUniquePrivateIpsDestinationMetricLensAttributes: LensAttributes }, }, title: '[Network] Unique private IPs - destination metric', - visualizationType: 'lnsMetric', + visualizationType: 'lnsLegacyMetric', references: [ { id: '{dataViewId}', diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_source_metric.test.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_source_metric.test.ts new file mode 100644 index 0000000000000..88042d8663250 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_source_metric.test.ts @@ -0,0 +1,45 @@ +/* + * 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 { renderHook } from '@testing-library/react-hooks'; +import { wrapper } from '../../mocks'; + +import { useLensAttributes } from '../../use_lens_attributes'; + +import { kpiUniquePrivateIpsSourceMetricLensAttributes } from './kpi_unique_private_ips_source_metric'; + +jest.mock('../../../../containers/sourcerer', () => ({ + useSourcererDataView: jest.fn().mockReturnValue({ + selectedPatterns: ['auditbeat-mytest-*'], + dataViewId: 'security-solution-my-test', + }), +})); + +jest.mock('../../../../utils/route/use_route_spy', () => ({ + useRouteSpy: jest.fn().mockReturnValue([ + { + detailName: 'mockHost', + pageName: 'network', + tabName: 'events', + }, + ]), +})); + +describe('kpiUniquePrivateIpsSourceMetricLensAttributes', () => { + it('should render', () => { + const { result } = renderHook( + () => + useLensAttributes({ + lensAttributes: kpiUniquePrivateIpsSourceMetricLensAttributes, + stackByField: 'event.dataset', + }), + { wrapper } + ); + + expect(result?.current).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_source_metric.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_source_metric.ts index a95745c7b96ed..3f1110d706300 100644 --- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_source_metric.ts +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_source_metric.ts @@ -47,7 +47,7 @@ export const kpiUniquePrivateIpsSourceMetricLensAttributes: LensAttributes = { }, }, title: '[Network] Unique private IPs - source metric', - visualizationType: 'lnsMetric', + visualizationType: 'lnsLegacyMetric', references: [ { id: '{dataViewId}', diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/__snapshots__/kpi_total_users_area.test.ts.snap b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/__snapshots__/kpi_total_users_area.test.ts.snap new file mode 100644 index 0000000000000..11df964f2eca1 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/__snapshots__/kpi_total_users_area.test.ts.snap @@ -0,0 +1,151 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`kpiTotalUsersAreaLensAttributes should render 1`] = ` +Object { + "description": "", + "references": Array [ + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-current-indexpattern", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-layer-416b6fad-1923-4f6a-a2df-b223bb287e30", + "type": "index-pattern", + }, + ], + "state": Object { + "datasourceStates": Object { + "indexpattern": Object { + "layers": Object { + "416b6fad-1923-4f6a-a2df-b223bb287e30": Object { + "columnOrder": Array [ + "5eea817b-67b7-4268-8ecb-7688d1094721", + "b00c65ea-32be-4163-bfc8-f795b1ef9d06", + ], + "columns": Object { + "5eea817b-67b7-4268-8ecb-7688d1094721": Object { + "dataType": "date", + "isBucketed": true, + "label": "@timestamp", + "operationType": "date_histogram", + "params": Object { + "interval": "auto", + }, + "scale": "interval", + "sourceField": "@timestamp", + }, + "b00c65ea-32be-4163-bfc8-f795b1ef9d06": Object { + "customLabel": true, + "dataType": "number", + "isBucketed": false, + "label": "Unique count of user.name", + "operationType": "unique_count", + "scale": "ratio", + "sourceField": "user.name", + }, + }, + "incompleteColumns": Object {}, + }, + }, + }, + }, + "filters": Array [ + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.id", + "negate": false, + "params": Object { + "query": "123", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.id": "123", + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "_index", + "negate": false, + "params": Array [ + "auditbeat-mytest-*", + ], + "type": "phrases", + }, + "query": Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "match_phrase": Object { + "_index": "auditbeat-mytest-*", + }, + }, + ], + }, + }, + }, + ], + "query": Object { + "language": "kql", + "query": "host.name: *", + }, + "visualization": Object { + "axisTitlesVisibilitySettings": Object { + "x": false, + "yLeft": false, + "yRight": false, + }, + "fittingFunction": "None", + "gridlinesVisibilitySettings": Object { + "x": true, + "yLeft": true, + "yRight": true, + }, + "labelsOrientation": Object { + "x": 0, + "yLeft": 0, + "yRight": 0, + }, + "layers": Array [ + Object { + "accessors": Array [ + "b00c65ea-32be-4163-bfc8-f795b1ef9d06", + ], + "layerId": "416b6fad-1923-4f6a-a2df-b223bb287e30", + "layerType": "data", + "seriesType": "area", + "xAccessor": "5eea817b-67b7-4268-8ecb-7688d1094721", + }, + ], + "legend": Object { + "isVisible": true, + "position": "right", + }, + "preferredSeriesType": "area", + "tickLabelsVisibilitySettings": Object { + "x": true, + "yLeft": true, + "yRight": true, + }, + "valueLabels": "hide", + "yLeftExtent": Object { + "mode": "full", + }, + "yRightExtent": Object { + "mode": "full", + }, + }, + }, + "title": "[User] Users - area", + "visualizationType": "lnsXY", +} +`; diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/__snapshots__/kpi_total_users_metric.test.ts.snap b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/__snapshots__/kpi_total_users_metric.test.ts.snap new file mode 100644 index 0000000000000..b53e1bd24d303 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/__snapshots__/kpi_total_users_metric.test.ts.snap @@ -0,0 +1,97 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`kpiTotalUsersMetricLensAttributes should render 1`] = ` +Object { + "description": "", + "references": Array [ + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-current-indexpattern", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-layer-416b6fad-1923-4f6a-a2df-b223bb287e30", + "type": "index-pattern", + }, + ], + "state": Object { + "datasourceStates": Object { + "indexpattern": Object { + "layers": Object { + "416b6fad-1923-4f6a-a2df-b223bb287e30": Object { + "columnOrder": Array [ + "3e51b035-872c-4b44-824b-fe069c222e91", + ], + "columns": Object { + "3e51b035-872c-4b44-824b-fe069c222e91": Object { + "dataType": "number", + "isBucketed": false, + "label": " ", + "operationType": "unique_count", + "scale": "ratio", + "sourceField": "user.name", + }, + }, + "incompleteColumns": Object {}, + }, + }, + }, + }, + "filters": Array [ + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.id", + "negate": false, + "params": Object { + "query": "123", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.id": "123", + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "_index", + "negate": false, + "params": Array [ + "auditbeat-mytest-*", + ], + "type": "phrases", + }, + "query": Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "match_phrase": Object { + "_index": "auditbeat-mytest-*", + }, + }, + ], + }, + }, + }, + ], + "query": Object { + "language": "kql", + "query": "host.name: *", + }, + "visualization": Object { + "accessor": "3e51b035-872c-4b44-824b-fe069c222e91", + "layerId": "416b6fad-1923-4f6a-a2df-b223bb287e30", + "layerType": "data", + }, + }, + "title": "[User] Users - metric", + "visualizationType": "lnsLegacyMetric", +} +`; diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/__snapshots__/kpi_user_authentication_metric_failure.test.ts.snap b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/__snapshots__/kpi_user_authentication_metric_failure.test.ts.snap new file mode 100644 index 0000000000000..37c20b7e80265 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/__snapshots__/kpi_user_authentication_metric_failure.test.ts.snap @@ -0,0 +1,126 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`kpiUserAuthenticationsMetricFailureLensAttributes should render 1`] = ` +Object { + "description": "", + "references": Array [ + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-current-indexpattern", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-layer-4590dafb-4ac7-45aa-8641-47a3ff0b817c", + "type": "index-pattern", + }, + ], + "state": Object { + "datasourceStates": Object { + "indexpattern": Object { + "layers": Object { + "4590dafb-4ac7-45aa-8641-47a3ff0b817c": Object { + "columnOrder": Array [ + "0eb97c09-a351-4280-97da-944e4bd30dd7", + ], + "columns": Object { + "0eb97c09-a351-4280-97da-944e4bd30dd7": Object { + "dataType": "number", + "filter": Object { + "language": "kuery", + "query": "event.outcome : \\"failure\\" ", + }, + "isBucketed": false, + "label": "", + "operationType": "count", + "scale": "ratio", + "sourceField": "___records___", + }, + }, + "incompleteColumns": Object {}, + }, + }, + }, + }, + "filters": Array [ + Object { + "$state": Object { + "store": "appState", + }, + "meta": Object { + "alias": null, + "disabled": false, + "indexRefName": "filter-index-pattern-0", + "key": "query", + "negate": false, + "type": "custom", + "value": "{\\"bool\\":{\\"filter\\":[{\\"term\\":{\\"event.category\\":\\"authentication\\"}}]}}", + }, + "query": Object { + "bool": Object { + "filter": Array [ + Object { + "term": Object { + "event.category": "authentication", + }, + }, + ], + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.id", + "negate": false, + "params": Object { + "query": "123", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.id": "123", + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "_index", + "negate": false, + "params": Array [ + "auditbeat-mytest-*", + ], + "type": "phrases", + }, + "query": Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "match_phrase": Object { + "_index": "auditbeat-mytest-*", + }, + }, + ], + }, + }, + }, + ], + "query": Object { + "language": "kql", + "query": "host.name: *", + }, + "visualization": Object { + "accessor": "0eb97c09-a351-4280-97da-944e4bd30dd7", + "layerId": "4590dafb-4ac7-45aa-8641-47a3ff0b817c", + "layerType": "data", + }, + }, + "title": "[Host] User authentications - metric failure ", + "visualizationType": "lnsLegacyMetric", +} +`; diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/__snapshots__/kpi_user_authentications_area.test.ts.snap b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/__snapshots__/kpi_user_authentications_area.test.ts.snap new file mode 100644 index 0000000000000..1954bccfaffbe --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/__snapshots__/kpi_user_authentications_area.test.ts.snap @@ -0,0 +1,240 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`kpiUserAuthenticationsAreaLensAttributes should render 1`] = ` +Object { + "description": "", + "references": Array [ + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-current-indexpattern", + "type": "{dataViewId}", + }, + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-layer-31213ae3-905b-4e88-b987-0cccb1f3209f", + "type": "{dataViewId}", + }, + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-layer-4590dafb-4ac7-45aa-8641-47a3ff0b817c", + "type": "{dataViewId}", + }, + ], + "state": Object { + "datasourceStates": Object { + "indexpattern": Object { + "layers": Object { + "31213ae3-905b-4e88-b987-0cccb1f3209f": Object { + "columnOrder": Array [ + "33a6163d-0c0a-451d-aa38-8ca6010dd5bf", + "2b27c80e-a20d-46f1-8fb2-79626ef4563c", + ], + "columns": Object { + "2b27c80e-a20d-46f1-8fb2-79626ef4563c": Object { + "customLabel": true, + "dataType": "number", + "filter": Object { + "language": "kuery", + "query": "event.outcome: \\"failure\\" ", + }, + "isBucketed": false, + "label": "Fail", + "operationType": "count", + "scale": "ratio", + "sourceField": "___records___", + }, + "33a6163d-0c0a-451d-aa38-8ca6010dd5bf": Object { + "dataType": "date", + "isBucketed": true, + "label": "@timestamp", + "operationType": "date_histogram", + "params": Object { + "interval": "auto", + }, + "scale": "interval", + "sourceField": "@timestamp", + }, + }, + "incompleteColumns": Object {}, + }, + "4590dafb-4ac7-45aa-8641-47a3ff0b817c": Object { + "columnOrder": Array [ + "49a42fe6-ebe8-4adb-8eed-1966a5297b7e", + "0eb97c09-a351-4280-97da-944e4bd30dd7", + ], + "columns": Object { + "0eb97c09-a351-4280-97da-944e4bd30dd7": Object { + "customLabel": true, + "dataType": "number", + "filter": Object { + "language": "kuery", + "query": "event.outcome : \\"success\\" ", + }, + "isBucketed": false, + "label": "Succ.", + "operationType": "count", + "scale": "ratio", + "sourceField": "___records___", + }, + "49a42fe6-ebe8-4adb-8eed-1966a5297b7e": Object { + "dataType": "date", + "isBucketed": true, + "label": "@timestamp", + "operationType": "date_histogram", + "params": Object { + "interval": "auto", + }, + "scale": "interval", + "sourceField": "@timestamp", + }, + }, + "incompleteColumns": Object {}, + }, + }, + }, + }, + "filters": Array [ + Object { + "$state": Object { + "store": "appState", + }, + "meta": Object { + "alias": null, + "disabled": false, + "indexRefName": "filter-index-pattern-0", + "key": "query", + "negate": false, + "type": "custom", + "value": "{\\"bool\\":{\\"filter\\":[{\\"term\\":{\\"event.category\\":\\"authentication\\"}}]}}", + }, + "query": Object { + "bool": Object { + "filter": Array [ + Object { + "term": Object { + "event.category": "authentication", + }, + }, + ], + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.id", + "negate": false, + "params": Object { + "query": "123", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.id": "123", + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "_index", + "negate": false, + "params": Array [ + "auditbeat-mytest-*", + ], + "type": "phrases", + }, + "query": Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "match_phrase": Object { + "_index": "auditbeat-mytest-*", + }, + }, + ], + }, + }, + }, + ], + "query": Object { + "language": "kql", + "query": "host.name: *", + }, + "visualization": Object { + "axisTitlesVisibilitySettings": Object { + "x": true, + "yLeft": false, + "yRight": true, + }, + "fittingFunction": "None", + "gridlinesVisibilitySettings": Object { + "x": true, + "yLeft": true, + "yRight": true, + }, + "labelsOrientation": Object { + "x": 0, + "yLeft": 0, + "yRight": 0, + }, + "layers": Array [ + Object { + "accessors": Array [ + "0eb97c09-a351-4280-97da-944e4bd30dd7", + ], + "layerId": "4590dafb-4ac7-45aa-8641-47a3ff0b817c", + "layerType": "data", + "seriesType": "area", + "xAccessor": "49a42fe6-ebe8-4adb-8eed-1966a5297b7e", + "yConfig": Array [ + Object { + "color": "#54b399", + "forAccessor": "0eb97c09-a351-4280-97da-944e4bd30dd7", + }, + ], + }, + Object { + "accessors": Array [ + "2b27c80e-a20d-46f1-8fb2-79626ef4563c", + ], + "layerId": "31213ae3-905b-4e88-b987-0cccb1f3209f", + "layerType": "data", + "seriesType": "area", + "xAccessor": "33a6163d-0c0a-451d-aa38-8ca6010dd5bf", + "yConfig": Array [ + Object { + "color": "#e7664c", + "forAccessor": "2b27c80e-a20d-46f1-8fb2-79626ef4563c", + }, + ], + }, + ], + "legend": Object { + "isVisible": false, + "position": "right", + "showSingleSeries": false, + }, + "preferredSeriesType": "area", + "tickLabelsVisibilitySettings": Object { + "x": true, + "yLeft": true, + "yRight": true, + }, + "valueLabels": "hide", + "yLeftExtent": Object { + "mode": "full", + }, + "yRightExtent": Object { + "mode": "full", + }, + }, + }, + "title": "[Host] User authentications - area ", + "visualizationType": "lnsXY", +} +`; diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/__snapshots__/kpi_user_authentications_bar.test.ts.snap b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/__snapshots__/kpi_user_authentications_bar.test.ts.snap new file mode 100644 index 0000000000000..5335dca6057a6 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/__snapshots__/kpi_user_authentications_bar.test.ts.snap @@ -0,0 +1,240 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`kpiUserAuthenticationsBarLensAttributes should render 1`] = ` +Object { + "description": "", + "references": Array [ + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-current-indexpattern", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-layer-31213ae3-905b-4e88-b987-0cccb1f3209f", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-layer-b9acd453-f476-4467-ad38-203e37b73e55", + "type": "index-pattern", + }, + ], + "state": Object { + "datasourceStates": Object { + "indexpattern": Object { + "layers": Object { + "31213ae3-905b-4e88-b987-0cccb1f3209f": Object { + "columnOrder": Array [ + "430e690c-9992-414f-9bce-00812d99a5e7", + "938b445a-a291-4bbc-84fe-4f47b69c20e4", + ], + "columns": Object { + "430e690c-9992-414f-9bce-00812d99a5e7": Object { + "dataType": "string", + "isBucketed": true, + "label": "Filters", + "operationType": "filters", + "params": Object { + "filters": Array [ + Object { + "input": Object { + "language": "kuery", + "query": "event.outcome : \\"success\\" ", + }, + "label": "Succ.", + }, + ], + }, + "scale": "ordinal", + }, + "938b445a-a291-4bbc-84fe-4f47b69c20e4": Object { + "dataType": "number", + "isBucketed": false, + "label": "Succ.", + "operationType": "count", + "scale": "ratio", + "sourceField": "___records___", + }, + }, + "incompleteColumns": Object {}, + }, + "b9acd453-f476-4467-ad38-203e37b73e55": Object { + "columnOrder": Array [ + "e959c351-a3a2-4525-b244-9623f215a8fd", + "c8165fc3-7180-4f1b-8c87-bc3ea04c6df7", + ], + "columns": Object { + "c8165fc3-7180-4f1b-8c87-bc3ea04c6df7": Object { + "dataType": "number", + "isBucketed": false, + "label": "Fail", + "operationType": "count", + "scale": "ratio", + "sourceField": "___records___", + }, + "e959c351-a3a2-4525-b244-9623f215a8fd": Object { + "customLabel": true, + "dataType": "string", + "isBucketed": true, + "label": "Fail", + "operationType": "filters", + "params": Object { + "filters": Array [ + Object { + "input": Object { + "language": "kuery", + "query": "event.outcome:\\"failure\\" ", + }, + "label": "Fail", + }, + ], + }, + "scale": "ordinal", + }, + }, + "incompleteColumns": Object {}, + }, + }, + }, + }, + "filters": Array [ + Object { + "$state": Object { + "store": "appState", + }, + "meta": Object { + "alias": null, + "disabled": false, + "indexRefName": "filter-index-pattern-0", + "key": "query", + "negate": false, + "type": "custom", + "value": "{\\"bool\\":{\\"filter\\":[{\\"term\\":{\\"event.category\\":\\"authentication\\"}}]}}", + }, + "query": Object { + "bool": Object { + "filter": Array [ + Object { + "term": Object { + "event.category": "authentication", + }, + }, + ], + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.id", + "negate": false, + "params": Object { + "query": "123", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.id": "123", + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "_index", + "negate": false, + "params": Array [ + "auditbeat-mytest-*", + ], + "type": "phrases", + }, + "query": Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "match_phrase": Object { + "_index": "auditbeat-mytest-*", + }, + }, + ], + }, + }, + }, + ], + "query": Object { + "language": "kql", + "query": "host.name: *", + }, + "visualization": Object { + "axisTitlesVisibilitySettings": Object { + "x": false, + "yLeft": false, + "yRight": true, + }, + "fittingFunction": "None", + "gridlinesVisibilitySettings": Object { + "x": true, + "yLeft": true, + "yRight": true, + }, + "labelsOrientation": Object { + "x": 0, + "yLeft": 0, + "yRight": 0, + }, + "layers": Array [ + Object { + "accessors": Array [ + "938b445a-a291-4bbc-84fe-4f47b69c20e4", + ], + "layerId": "31213ae3-905b-4e88-b987-0cccb1f3209f", + "layerType": "data", + "seriesType": "bar_horizontal_stacked", + "xAccessor": "430e690c-9992-414f-9bce-00812d99a5e7", + "yConfig": Array [], + }, + Object { + "accessors": Array [ + "c8165fc3-7180-4f1b-8c87-bc3ea04c6df7", + ], + "layerId": "b9acd453-f476-4467-ad38-203e37b73e55", + "layerType": "data", + "seriesType": "bar_horizontal_stacked", + "xAccessor": "e959c351-a3a2-4525-b244-9623f215a8fd", + "yConfig": Array [ + Object { + "color": "#e7664c", + "forAccessor": "c8165fc3-7180-4f1b-8c87-bc3ea04c6df7", + }, + ], + }, + ], + "legend": Object { + "isVisible": false, + "position": "right", + "showSingleSeries": false, + }, + "preferredSeriesType": "bar_horizontal_stacked", + "tickLabelsVisibilitySettings": Object { + "x": true, + "yLeft": true, + "yRight": true, + }, + "valueLabels": "hide", + "yLeftExtent": Object { + "mode": "full", + }, + "yRightExtent": Object { + "mode": "full", + }, + }, + }, + "title": "[Host] User authentications - bar ", + "visualizationType": "lnsXY", +} +`; diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/__snapshots__/kpi_user_authentications_metric_success.test.ts.snap b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/__snapshots__/kpi_user_authentications_metric_success.test.ts.snap new file mode 100644 index 0000000000000..4cadcaf19e91e --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/__snapshots__/kpi_user_authentications_metric_success.test.ts.snap @@ -0,0 +1,127 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`kpiUserAuthenticationsMetricSuccessLensAttributes should render 1`] = ` +Object { + "description": "", + "references": Array [ + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-current-indexpattern", + "type": "index-pattern", + }, + Object { + "id": "security-solution-my-test", + "name": "indexpattern-datasource-layer-4590dafb-4ac7-45aa-8641-47a3ff0b817c", + "type": "index-pattern", + }, + ], + "state": Object { + "datasourceStates": Object { + "indexpattern": Object { + "layers": Object { + "4590dafb-4ac7-45aa-8641-47a3ff0b817c": Object { + "columnOrder": Array [ + "0eb97c09-a351-4280-97da-944e4bd30dd7", + ], + "columns": Object { + "0eb97c09-a351-4280-97da-944e4bd30dd7": Object { + "customLabel": true, + "dataType": "number", + "filter": Object { + "language": "kuery", + "query": "event.outcome : \\"success\\" ", + }, + "isBucketed": false, + "label": " ", + "operationType": "count", + "scale": "ratio", + "sourceField": "___records___", + }, + }, + "incompleteColumns": Object {}, + }, + }, + }, + }, + "filters": Array [ + Object { + "$state": Object { + "store": "appState", + }, + "meta": Object { + "alias": null, + "disabled": false, + "indexRefName": "filter-index-pattern-0", + "key": "query", + "negate": false, + "type": "custom", + "value": "{\\"bool\\":{\\"filter\\":[{\\"term\\":{\\"event.category\\":\\"authentication\\"}}]}}", + }, + "query": Object { + "bool": Object { + "filter": Array [ + Object { + "term": Object { + "event.category": "authentication", + }, + }, + ], + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "host.id", + "negate": false, + "params": Object { + "query": "123", + }, + "type": "phrase", + }, + "query": Object { + "match_phrase": Object { + "host.id": "123", + }, + }, + }, + Object { + "meta": Object { + "alias": null, + "disabled": false, + "key": "_index", + "negate": false, + "params": Array [ + "auditbeat-mytest-*", + ], + "type": "phrases", + }, + "query": Object { + "bool": Object { + "minimum_should_match": 1, + "should": Array [ + Object { + "match_phrase": Object { + "_index": "auditbeat-mytest-*", + }, + }, + ], + }, + }, + }, + ], + "query": Object { + "language": "kql", + "query": "host.name: *", + }, + "visualization": Object { + "accessor": "0eb97c09-a351-4280-97da-944e4bd30dd7", + "layerId": "4590dafb-4ac7-45aa-8641-47a3ff0b817c", + "layerType": "data", + }, + }, + "title": "[Host] User authentications - metric success ", + "visualizationType": "lnsLegacyMetric", +} +`; diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_total_users_area.test.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_total_users_area.test.ts new file mode 100644 index 0000000000000..43cb5be3a9735 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_total_users_area.test.ts @@ -0,0 +1,45 @@ +/* + * 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 { renderHook } from '@testing-library/react-hooks'; +import { wrapper } from '../../mocks'; + +import { useLensAttributes } from '../../use_lens_attributes'; + +import { kpiTotalUsersAreaLensAttributes } from './kpi_total_users_area'; + +jest.mock('../../../../containers/sourcerer', () => ({ + useSourcererDataView: jest.fn().mockReturnValue({ + selectedPatterns: ['auditbeat-mytest-*'], + dataViewId: 'security-solution-my-test', + }), +})); + +jest.mock('../../../../utils/route/use_route_spy', () => ({ + useRouteSpy: jest.fn().mockReturnValue([ + { + detailName: 'mockHost', + pageName: 'users', + tabName: 'events', + }, + ]), +})); + +describe('kpiTotalUsersAreaLensAttributes', () => { + it('should render', () => { + const { result } = renderHook( + () => + useLensAttributes({ + lensAttributes: kpiTotalUsersAreaLensAttributes, + stackByField: 'event.dataset', + }), + { wrapper } + ); + + expect(result?.current).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_total_users_area.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_total_users_area.ts index d958f9304b8ab..c97748077a6be 100644 --- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_total_users_area.ts +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_total_users_area.ts @@ -5,6 +5,7 @@ * 2.0. */ +import { UNIQUE_COUNT } from '../../translations'; import type { LensAttributes } from '../../types'; export const kpiTotalUsersAreaLensAttributes: LensAttributes = { @@ -32,7 +33,7 @@ export const kpiTotalUsersAreaLensAttributes: LensAttributes = { customLabel: true, dataType: 'number', isBucketed: false, - label: ' ', + label: UNIQUE_COUNT('user.name'), operationType: 'unique_count', scale: 'ratio', sourceField: 'user.name', diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_total_users_metric.test.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_total_users_metric.test.ts new file mode 100644 index 0000000000000..0a5ec9891d26f --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_total_users_metric.test.ts @@ -0,0 +1,45 @@ +/* + * 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 { renderHook } from '@testing-library/react-hooks'; +import { wrapper } from '../../mocks'; + +import { useLensAttributes } from '../../use_lens_attributes'; + +import { kpiTotalUsersMetricLensAttributes } from './kpi_total_users_metric'; + +jest.mock('../../../../containers/sourcerer', () => ({ + useSourcererDataView: jest.fn().mockReturnValue({ + selectedPatterns: ['auditbeat-mytest-*'], + dataViewId: 'security-solution-my-test', + }), +})); + +jest.mock('../../../../utils/route/use_route_spy', () => ({ + useRouteSpy: jest.fn().mockReturnValue([ + { + detailName: 'mockHost', + pageName: 'users', + tabName: 'events', + }, + ]), +})); + +describe('kpiTotalUsersMetricLensAttributes', () => { + it('should render', () => { + const { result } = renderHook( + () => + useLensAttributes({ + lensAttributes: kpiTotalUsersMetricLensAttributes, + stackByField: 'event.dataset', + }), + { wrapper } + ); + + expect(result?.current).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_total_users_metric.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_total_users_metric.ts index 08e5756337dce..faa6b62e18b65 100644 --- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_total_users_metric.ts +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_total_users_metric.ts @@ -19,7 +19,7 @@ export const kpiTotalUsersMetricLensAttributes: LensAttributes = { '3e51b035-872c-4b44-824b-fe069c222e91': { dataType: 'number', isBucketed: false, - label: 'Unique count of user.name', + label: ' ', operationType: 'unique_count', scale: 'ratio', sourceField: 'user.name', @@ -39,7 +39,7 @@ export const kpiTotalUsersMetricLensAttributes: LensAttributes = { }, }, title: '[User] Users - metric', - visualizationType: 'lnsMetric', + visualizationType: 'lnsLegacyMetric', references: [ { id: '{dataViewId}', diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_user_authentication_metric_failure.test.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_user_authentication_metric_failure.test.ts new file mode 100644 index 0000000000000..e251ccf51c5e5 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_user_authentication_metric_failure.test.ts @@ -0,0 +1,45 @@ +/* + * 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 { renderHook } from '@testing-library/react-hooks'; +import { wrapper } from '../../mocks'; + +import { useLensAttributes } from '../../use_lens_attributes'; + +import { kpiUserAuthenticationsMetricFailureLensAttributes } from './kpi_user_authentication_metric_failure'; + +jest.mock('../../../../containers/sourcerer', () => ({ + useSourcererDataView: jest.fn().mockReturnValue({ + selectedPatterns: ['auditbeat-mytest-*'], + dataViewId: 'security-solution-my-test', + }), +})); + +jest.mock('../../../../utils/route/use_route_spy', () => ({ + useRouteSpy: jest.fn().mockReturnValue([ + { + detailName: 'mockHost', + pageName: 'users', + tabName: 'events', + }, + ]), +})); + +describe('kpiUserAuthenticationsMetricFailureLensAttributes', () => { + it('should render', () => { + const { result } = renderHook( + () => + useLensAttributes({ + lensAttributes: kpiUserAuthenticationsMetricFailureLensAttributes, + stackByField: 'event.dataset', + }), + { wrapper } + ); + + expect(result?.current).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_user_authentication_metric_failure.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_user_authentication_metric_failure.ts index e4690f66998c8..3f421f8a1c30a 100644 --- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_user_authentication_metric_failure.ts +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_user_authentication_metric_failure.ts @@ -10,7 +10,7 @@ import type { LensAttributes } from '../../types'; export const kpiUserAuthenticationsMetricFailureLensAttributes: LensAttributes = { title: '[Host] User authentications - metric failure ', description: '', - visualizationType: 'lnsMetric', + visualizationType: 'lnsLegacyMetric', state: { visualization: { accessor: '0eb97c09-a351-4280-97da-944e4bd30dd7', diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_user_authentications_area.test.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_user_authentications_area.test.ts new file mode 100644 index 0000000000000..b51d3e474a705 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_user_authentications_area.test.ts @@ -0,0 +1,45 @@ +/* + * 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 { renderHook } from '@testing-library/react-hooks'; +import { wrapper } from '../../mocks'; + +import { useLensAttributes } from '../../use_lens_attributes'; + +import { kpiUserAuthenticationsAreaLensAttributes } from './kpi_user_authentications_area'; + +jest.mock('../../../../containers/sourcerer', () => ({ + useSourcererDataView: jest.fn().mockReturnValue({ + selectedPatterns: ['auditbeat-mytest-*'], + dataViewId: 'security-solution-my-test', + }), +})); + +jest.mock('../../../../utils/route/use_route_spy', () => ({ + useRouteSpy: jest.fn().mockReturnValue([ + { + detailName: 'mockHost', + pageName: 'users', + tabName: 'events', + }, + ]), +})); + +describe('kpiUserAuthenticationsAreaLensAttributes', () => { + it('should render', () => { + const { result } = renderHook( + () => + useLensAttributes({ + lensAttributes: kpiUserAuthenticationsAreaLensAttributes, + stackByField: 'event.dataset', + }), + { wrapper } + ); + + expect(result?.current).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_user_authentications_area.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_user_authentications_area.ts index cf9902bb2413a..d96ea21489bb2 100644 --- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_user_authentications_area.ts +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_user_authentications_area.ts @@ -5,6 +5,7 @@ * 2.0. */ +import { FAIL_CHART_LABEL, SUCCESS_CHART_LABEL } from '../../translations'; import type { LensAttributes } from '../../types'; export const kpiUserAuthenticationsAreaLensAttributes: LensAttributes = { @@ -124,7 +125,7 @@ export const kpiUserAuthenticationsAreaLensAttributes: LensAttributes = { query: 'event.outcome: "failure" ', }, isBucketed: false, - label: 'Fail', + label: FAIL_CHART_LABEL, operationType: 'count', scale: 'ratio', sourceField: '___records___', @@ -157,7 +158,7 @@ export const kpiUserAuthenticationsAreaLensAttributes: LensAttributes = { query: 'event.outcome : "success" ', }, isBucketed: false, - label: 'Succ.', + label: SUCCESS_CHART_LABEL, operationType: 'count', scale: 'ratio', sourceField: '___records___', diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_user_authentications_bar.test.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_user_authentications_bar.test.ts new file mode 100644 index 0000000000000..41590d330cd45 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_user_authentications_bar.test.ts @@ -0,0 +1,45 @@ +/* + * 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 { renderHook } from '@testing-library/react-hooks'; +import { wrapper } from '../../mocks'; + +import { useLensAttributes } from '../../use_lens_attributes'; + +import { kpiUserAuthenticationsBarLensAttributes } from './kpi_user_authentications_bar'; + +jest.mock('../../../../containers/sourcerer', () => ({ + useSourcererDataView: jest.fn().mockReturnValue({ + selectedPatterns: ['auditbeat-mytest-*'], + dataViewId: 'security-solution-my-test', + }), +})); + +jest.mock('../../../../utils/route/use_route_spy', () => ({ + useRouteSpy: jest.fn().mockReturnValue([ + { + detailName: 'mockHost', + pageName: 'users', + tabName: 'events', + }, + ]), +})); + +describe('kpiUserAuthenticationsBarLensAttributes', () => { + it('should render', () => { + const { result } = renderHook( + () => + useLensAttributes({ + lensAttributes: kpiUserAuthenticationsBarLensAttributes, + stackByField: 'event.dataset', + }), + { wrapper } + ); + + expect(result?.current).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_user_authentications_metric_success.test.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_user_authentications_metric_success.test.ts new file mode 100644 index 0000000000000..570e03325ec34 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_user_authentications_metric_success.test.ts @@ -0,0 +1,45 @@ +/* + * 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 { renderHook } from '@testing-library/react-hooks'; +import { wrapper } from '../../mocks'; + +import { useLensAttributes } from '../../use_lens_attributes'; + +import { kpiUserAuthenticationsMetricSuccessLensAttributes } from './kpi_user_authentications_metric_success'; + +jest.mock('../../../../containers/sourcerer', () => ({ + useSourcererDataView: jest.fn().mockReturnValue({ + selectedPatterns: ['auditbeat-mytest-*'], + dataViewId: 'security-solution-my-test', + }), +})); + +jest.mock('../../../../utils/route/use_route_spy', () => ({ + useRouteSpy: jest.fn().mockReturnValue([ + { + detailName: 'mockHost', + pageName: 'users', + tabName: 'events', + }, + ]), +})); + +describe('kpiUserAuthenticationsMetricSuccessLensAttributes', () => { + it('should render', () => { + const { result } = renderHook( + () => + useLensAttributes({ + lensAttributes: kpiUserAuthenticationsMetricSuccessLensAttributes, + stackByField: 'event.dataset', + }), + { wrapper } + ); + + expect(result?.current).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_user_authentications_metric_success.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_user_authentications_metric_success.ts index 66f30bf2378a8..3af6f5734d458 100644 --- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_user_authentications_metric_success.ts +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_user_authentications_metric_success.ts @@ -10,7 +10,7 @@ import type { LensAttributes } from '../../types'; export const kpiUserAuthenticationsMetricSuccessLensAttributes: LensAttributes = { title: '[Host] User authentications - metric success ', description: '', - visualizationType: 'lnsMetric', + visualizationType: 'lnsLegacyMetric', state: { visualization: { accessor: '0eb97c09-a351-4280-97da-944e4bd30dd7', diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/mocks.tsx b/x-pack/plugins/security_solution/public/common/components/visualization_actions/mocks.tsx new file mode 100644 index 0000000000000..7f4e7e4e6d6eb --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/mocks.tsx @@ -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 React from 'react'; +import { cloneDeep } from 'lodash/fp'; + +import { + TestProviders, + mockGlobalState, + SUB_PLUGINS_REDUCER, + kibanaObservable, + createSecuritySolutionStorageMock, +} from '../../mock'; +import type { State } from '../../store'; +import { createStore } from '../../store'; + +export const queryFromSearchBar = { + query: 'host.name: *', + language: 'kql', +}; + +export const filterFromSearchBar = [ + { + meta: { + alias: null, + negate: false, + disabled: false, + type: 'phrase', + key: 'host.id', + params: { + query: '123', + }, + }, + query: { + match_phrase: { + 'host.id': '123', + }, + }, + }, +]; + +export const mockCreateStoreWithQueryFilters = () => { + const { storage } = createSecuritySolutionStorageMock(); + + const state: State = mockGlobalState; + + const myState = cloneDeep(state); + + myState.inputs = { + ...myState.inputs, + global: { + ...myState.inputs.global, + query: queryFromSearchBar, + filters: filterFromSearchBar, + }, + }; + return createStore(myState, SUB_PLUGINS_REDUCER, kibanaObservable, storage); +}; + +export const wrapper = ({ children }: { children: React.ReactElement }) => ( + {children} +); diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/translations.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/translations.ts index 9814a98817ef4..4dcceb29323b1 100644 --- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/translations.ts +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/translations.ts @@ -67,9 +67,41 @@ export const SUCCESS_CHART_LABEL = i18n.translate( } ); +export const AUTHENCICATION_SUCCESS_CHART_LABEL = i18n.translate( + 'xpack.securitySolution.visualizationActions.userAuthentications.authentication.successChartLabel', + { + defaultMessage: 'Success', + } +); + export const FAIL_CHART_LABEL = i18n.translate( 'xpack.securitySolution.visualizationActions.userAuthentications.failChartLabel', { defaultMessage: 'Fail', } ); + +export const AUTHENCICATION_FAILURE_CHART_LABEL = i18n.translate( + 'xpack.securitySolution.visualizationActions.userAuthentications.authentication.failureChartLabel', + { + defaultMessage: 'Failure', + } +); + +export const UNIQUE_COUNT = (field: string) => + i18n.translate('xpack.securitySolution.visualizationActions.uniqueCountLabel', { + values: { field }, + + defaultMessage: 'Unique count of {field}', + }); + +export const TOP_VALUE = (field: string) => + i18n.translate('xpack.securitySolution.visualizationActions.topValueLabel', { + values: { field }, + + defaultMessage: 'Top values of {field}', + }); + +export const COUNT = i18n.translate('xpack.securitySolution.visualizationActions.countLabel', { + defaultMessage: 'Count of records', +}); diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_lens_attributes.test.tsx b/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_lens_attributes.test.tsx index 7db97ab5526a4..76e2f54c62cea 100644 --- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_lens_attributes.test.tsx +++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_lens_attributes.test.tsx @@ -6,21 +6,12 @@ */ import { renderHook } from '@testing-library/react-hooks'; -import React from 'react'; -import { cloneDeep } from 'lodash/fp'; -import { - TestProviders, - mockGlobalState, - SUB_PLUGINS_REDUCER, - kibanaObservable, - createSecuritySolutionStorageMock, -} from '../../mock'; import { getExternalAlertLensAttributes } from './lens_attributes/common/external_alert'; import { useLensAttributes } from './use_lens_attributes'; import { hostNameExistsFilter, getHostDetailsPageFilter, getIndexFilters } from './utils'; -import type { State } from '../../store'; -import { createStore } from '../../store'; + +import { filterFromSearchBar, queryFromSearchBar, wrapper } from './mocks'; jest.mock('../../containers/sourcerer', () => ({ useSourcererDataView: jest.fn().mockReturnValue({ @@ -40,51 +31,7 @@ jest.mock('../../utils/route/use_route_spy', () => ({ })); describe('useLensAttributes', () => { - const state: State = mockGlobalState; - const { storage } = createSecuritySolutionStorageMock(); - const queryFromSearchBar = { - query: 'host.name: *', - language: 'kql', - }; - - const filterFromSearchBar = [ - { - meta: { - alias: null, - negate: false, - disabled: false, - type: 'phrase', - key: 'host.id', - params: { - query: '123', - }, - }, - query: { - match_phrase: { - 'host.id': '123', - }, - }, - }, - ]; - let store = createStore(state, SUB_PLUGINS_REDUCER, kibanaObservable, storage); - - beforeEach(() => { - const myState = cloneDeep(state); - myState.inputs = { - ...myState.inputs, - global: { - ...myState.inputs.global, - query: queryFromSearchBar, - filters: filterFromSearchBar, - }, - }; - store = createStore(myState, SUB_PLUGINS_REDUCER, kibanaObservable, storage); - }); - it('should add query', () => { - const wrapper = ({ children }: { children: React.ReactElement }) => ( - {children} - ); const { result } = renderHook( () => useLensAttributes({ @@ -94,13 +41,10 @@ describe('useLensAttributes', () => { { wrapper } ); - expect(result?.current?.state.query).toEqual({ query: 'host.name: *', language: 'kql' }); + expect(result?.current?.state.query).toEqual(queryFromSearchBar); }); it('should add filters', () => { - const wrapper = ({ children }: { children: React.ReactElement }) => ( - {children} - ); const { result } = renderHook( () => useLensAttributes({ @@ -120,9 +64,6 @@ describe('useLensAttributes', () => { }); it('should add data view id to references', () => { - const wrapper = ({ children }: { children: React.ReactElement }) => ( - {children} - ); const { result } = renderHook( () => useLensAttributes({ From 4700107d791ad8402d0fd9d04e9fd33019d80655 Mon Sep 17 00:00:00 2001 From: Pablo Machado Date: Thu, 29 Sep 2022 11:47:18 +0200 Subject: [PATCH 85/95] Add panel loader to entity analytics risk panels (#142122) --- .../entity_analytics/host_risk_score/index.tsx | 11 ++++++++--- .../entity_analytics/user_risk_score/index.tsx | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/x-pack/plugins/security_solution/public/overview/components/entity_analytics/host_risk_score/index.tsx b/x-pack/plugins/security_solution/public/overview/components/entity_analytics/host_risk_score/index.tsx index 794b33c6b33ef..49df0b1b0e456 100644 --- a/x-pack/plugins/security_solution/public/overview/components/entity_analytics/host_risk_score/index.tsx +++ b/x-pack/plugins/security_solution/public/overview/components/entity_analytics/host_risk_score/index.tsx @@ -5,7 +5,7 @@ * 2.0. */ import React, { useEffect, useMemo, useState } from 'react'; -import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiPanel } from '@elastic/eui'; +import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; import { useDispatch } from 'react-redux'; import { RiskScoresDeprecated } from '../../../../common/components/risk_score/risk_score_deprecated'; @@ -35,6 +35,8 @@ import { EntityAnalyticsHostRiskScoreDisable } from '../../../../common/componen import { RiskScoreHeaderTitle } from '../../../../common/components/risk_score/risk_score_onboarding/risk_score_header_title'; import { RiskScoresNoDataDetected } from '../../../../common/components/risk_score/risk_score_onboarding/risk_score_no_data_detected'; import { useRefetchQueries } from '../../../../common/hooks/use_refetch_queries'; +import { Loader } from '../../../../common/components/loader'; +import { Panel } from '../../../../common/components/panel'; const TABLE_QUERY_ID = 'hostRiskDashboardTable'; const HOST_RISK_KPI_QUERY_ID = 'headerHostRiskScoreKpiQuery'; @@ -149,7 +151,7 @@ const EntityAnalyticsHostRiskScoresComponent = () => { return ( - + } titleSize="s" @@ -207,7 +209,10 @@ const EntityAnalyticsHostRiskScoresComponent = () => { )} - + {(isTableLoading || isKpiLoading) && ( + + )} + ); }; diff --git a/x-pack/plugins/security_solution/public/overview/components/entity_analytics/user_risk_score/index.tsx b/x-pack/plugins/security_solution/public/overview/components/entity_analytics/user_risk_score/index.tsx index 3b3905d4604a6..034e62bb37ad3 100644 --- a/x-pack/plugins/security_solution/public/overview/components/entity_analytics/user_risk_score/index.tsx +++ b/x-pack/plugins/security_solution/public/overview/components/entity_analytics/user_risk_score/index.tsx @@ -5,7 +5,7 @@ * 2.0. */ import React, { useEffect, useMemo, useState } from 'react'; -import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiPanel } from '@elastic/eui'; +import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; import { useDispatch } from 'react-redux'; import { RiskScoresDeprecated } from '../../../../common/components/risk_score/risk_score_deprecated'; import { SeverityFilterGroup } from '../../../../common/components/severity/severity_filter_group'; @@ -35,6 +35,8 @@ import { EntityAnalyticsUserRiskScoreDisable } from '../../../../common/componen import { RiskScoreHeaderTitle } from '../../../../common/components/risk_score/risk_score_onboarding/risk_score_header_title'; import { RiskScoresNoDataDetected } from '../../../../common/components/risk_score/risk_score_onboarding/risk_score_no_data_detected'; import { useRefetchQueries } from '../../../../common/hooks/use_refetch_queries'; +import { Loader } from '../../../../common/components/loader'; +import { Panel } from '../../../../common/components/panel'; const TABLE_QUERY_ID = 'userRiskDashboardTable'; const USER_RISK_KPI_QUERY_ID = 'headerUserRiskScoreKpiQuery'; @@ -149,7 +151,7 @@ const EntityAnalyticsUserRiskScoresComponent = () => { return ( - + } titleSize="s" @@ -207,7 +209,10 @@ const EntityAnalyticsUserRiskScoresComponent = () => { )} - + {(isTableLoading || isKpiLoading) && ( + + )} + ); }; From 3f9687e3f06527a873933f29de5e261555041406 Mon Sep 17 00:00:00 2001 From: Maryam Saeidi Date: Thu, 29 Sep 2022 12:22:58 +0200 Subject: [PATCH 86/95] [Actionable observability] Alert summary widget new design (#141236) * Implement new alert summary widget design and remove chart * Fix padding issue * Remove unused translation * Fix type and test errors * Fix types and remove extra aggs logic * Add triggers_actions_ui to storybook list * Fix small alignment issue by removing extra EuiFlexGroup * Fix UI issue for small mobile * Update spacing Co-authored-by: Kevin Delemme Co-authored-by: Kevin Delemme Co-authored-by: Xavier Mouligneau --- .../steps/storybooks/build_and_upload.ts | 1 + src/dev/storybook/aliases.ts | 1 + .../translations/translations/fr-FR.json | 1 - .../translations/translations/ja-JP.json | 1 - .../translations/translations/zh-CN.json | 1 - .../triggers_actions_ui/.storybook/main.js | 8 + .../triggers_actions_ui/.storybook/preview.js | 10 + .../use_load_rule_alerts_aggregations.test.ts | 11 +- .../use_load_rule_alerts_aggregations.ts | 105 +---- .../mock/rule_details/alert_summary/index.ts | 372 ------------------ .../components/alert_summary_widget_error.tsx | 39 ++ .../alert_summary_widget_ui.stories.tsx | 21 + .../components/alert_summary_widget_ui.tsx | 87 ++++ .../alert_summary/components/index.ts | 9 + .../alert_summary/components/types.ts | 12 + .../components/alert_summary/helpers.tsx | 41 -- .../components/alert_summary/index.tsx | 3 +- .../rule_alerts_summary.test.tsx | 173 -------- .../alert_summary/rule_alerts_summary.tsx | 200 +--------- .../components/alert_summary/types.ts | 9 - 20 files changed, 209 insertions(+), 896 deletions(-) create mode 100644 x-pack/plugins/triggers_actions_ui/.storybook/main.js create mode 100644 x-pack/plugins/triggers_actions_ui/.storybook/preview.js create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/components/alert_summary_widget_error.tsx create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/components/alert_summary_widget_ui.stories.tsx create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/components/alert_summary_widget_ui.tsx create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/components/index.ts create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/components/types.ts delete mode 100644 x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/helpers.tsx diff --git a/.buildkite/scripts/steps/storybooks/build_and_upload.ts b/.buildkite/scripts/steps/storybooks/build_and_upload.ts index 8575ee683d82f..dcceca7848910 100644 --- a/.buildkite/scripts/steps/storybooks/build_and_upload.ts +++ b/.buildkite/scripts/steps/storybooks/build_and_upload.ts @@ -41,6 +41,7 @@ const STORYBOOKS = [ 'presentation', 'security_solution', 'shared_ux', + 'triggers_actions_ui', 'ui_actions_enhanced', 'unified_search', ]; diff --git a/src/dev/storybook/aliases.ts b/src/dev/storybook/aliases.ts index 1705c9ac2ec9c..b4224e154def5 100644 --- a/src/dev/storybook/aliases.ts +++ b/src/dev/storybook/aliases.ts @@ -43,6 +43,7 @@ export const storybookAliases = { security_solution: 'x-pack/plugins/security_solution/.storybook', shared_ux: 'packages/shared-ux/storybook/config', threat_intelligence: 'x-pack/plugins/threat_intelligence/.storybook', + triggers_actions_ui: 'x-pack/plugins/triggers_actions_ui/.storybook', ui_actions_enhanced: 'src/plugins/ui_actions_enhanced/.storybook', unified_search: 'src/plugins/unified_search/.storybook', }; diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json index cdaa18f14c6e5..60b692e720ec0 100644 --- a/x-pack/plugins/translations/translations/fr-FR.json +++ b/x-pack/plugins/translations/translations/fr-FR.json @@ -32529,7 +32529,6 @@ "xpack.triggersActionsUI.sections.ruleDetails.alertsList.ruleTypeExcessDurationMessage": "La durée dépasse le temps d'exécution attendu de la règle.", "xpack.triggersActionsUI.sections.ruleDetails.alertsSummary.activeLabel": "Actif", "xpack.triggersActionsUI.sections.ruleDetails.alertsSummary.allAlertsLabel": "Toutes les alertes", - "xpack.triggersActionsUI.sections.ruleDetails.alertsSummary.recentAlertHistoryTitle": "Historique récent des alertes", "xpack.triggersActionsUI.sections.ruleDetails.alertsSummary.title": "Alertes", "xpack.triggersActionsUI.sections.ruleDetails.deleteRuleButtonLabel": "Supprimer la règle", "xpack.triggersActionsUI.sections.ruleDetails.disableRuleButtonLabel": "Désactiver", diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index a7d49509c7756..0aa5fa39b93e0 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -32503,7 +32503,6 @@ "xpack.triggersActionsUI.sections.ruleDetails.alertsList.ruleTypeExcessDurationMessage": "期間がルールの想定実行時間を超えています。", "xpack.triggersActionsUI.sections.ruleDetails.alertsSummary.activeLabel": "アクティブ", "xpack.triggersActionsUI.sections.ruleDetails.alertsSummary.allAlertsLabel": "すべてのアラート", - "xpack.triggersActionsUI.sections.ruleDetails.alertsSummary.recentAlertHistoryTitle": "最近のアラート履歴", "xpack.triggersActionsUI.sections.ruleDetails.alertsSummary.title": "アラート", "xpack.triggersActionsUI.sections.ruleDetails.deleteRuleButtonLabel": "ルールの削除", "xpack.triggersActionsUI.sections.ruleDetails.disableRuleButtonLabel": "無効にする", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index 25bd585b13431..baf98e70b8dd0 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -32540,7 +32540,6 @@ "xpack.triggersActionsUI.sections.ruleDetails.alertsList.ruleTypeExcessDurationMessage": "持续时间超出了规则的预期运行时间。", "xpack.triggersActionsUI.sections.ruleDetails.alertsSummary.activeLabel": "活动", "xpack.triggersActionsUI.sections.ruleDetails.alertsSummary.allAlertsLabel": "所有告警", - "xpack.triggersActionsUI.sections.ruleDetails.alertsSummary.recentAlertHistoryTitle": "最近告警历史记录", "xpack.triggersActionsUI.sections.ruleDetails.alertsSummary.title": "告警", "xpack.triggersActionsUI.sections.ruleDetails.deleteRuleButtonLabel": "删除规则", "xpack.triggersActionsUI.sections.ruleDetails.disableRuleButtonLabel": "禁用", diff --git a/x-pack/plugins/triggers_actions_ui/.storybook/main.js b/x-pack/plugins/triggers_actions_ui/.storybook/main.js new file mode 100644 index 0000000000000..86b48c32f103e --- /dev/null +++ b/x-pack/plugins/triggers_actions_ui/.storybook/main.js @@ -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. + */ + +module.exports = require('@kbn/storybook').defaultConfig; diff --git a/x-pack/plugins/triggers_actions_ui/.storybook/preview.js b/x-pack/plugins/triggers_actions_ui/.storybook/preview.js new file mode 100644 index 0000000000000..3200746243d47 --- /dev/null +++ b/x-pack/plugins/triggers_actions_ui/.storybook/preview.js @@ -0,0 +1,10 @@ +/* + * 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 { EuiThemeProviderDecorator } from '@kbn/kibana-react-plugin/common'; + +export const decorators = [EuiThemeProviderDecorator]; diff --git a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_load_rule_alerts_aggregations.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_load_rule_alerts_aggregations.test.ts index 293c1e992ac18..03be9f6b9bd5a 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_load_rule_alerts_aggregations.test.ts +++ b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_load_rule_alerts_aggregations.test.ts @@ -8,7 +8,7 @@ import { ALERTS_FEATURE_ID } from '@kbn/alerting-plugin/common'; import { renderHook } from '@testing-library/react-hooks'; import { useKibana } from '../../common/lib/kibana'; -import { mockAggsResponse, mockChartData } from '../mock/rule_details/alert_summary'; +import { mockAggsResponse } from '../mock/rule_details/alert_summary'; import { useLoadRuleAlertsAggs } from './use_load_rule_alerts_aggregations'; jest.mock('../../common/lib/kibana'); @@ -21,7 +21,7 @@ describe('useLoadRuleAlertsAggs', () => { useKibanaMock().services.http.get = jest.fn().mockResolvedValue({ index_name: ['mock_index'] }); }); - it('should return the expected chart data from the Elasticsearch Aggs. query', async () => { + it('should return the expected data from the Elasticsearch Aggs. query', async () => { const { result, waitForNextUpdate } = renderHook(() => useLoadRuleAlertsAggs({ features: ALERTS_FEATURE_ID, @@ -31,18 +31,15 @@ describe('useLoadRuleAlertsAggs', () => { expect(result.current).toEqual({ isLoadingRuleAlertsAggs: true, ruleAlertsAggs: { active: 0, recovered: 0 }, - alertsChartData: [], }); await waitForNextUpdate(); - const { ruleAlertsAggs, errorRuleAlertsAggs, alertsChartData } = result.current; + const { ruleAlertsAggs, errorRuleAlertsAggs } = result.current; expect(ruleAlertsAggs).toEqual({ active: 1, recovered: 7, }); - expect(alertsChartData).toEqual(mockChartData()); expect(errorRuleAlertsAggs).toBeFalsy(); - expect(alertsChartData.length).toEqual(33); }); it('should have the correct query body sent to Elasticsearch', async () => { @@ -55,7 +52,7 @@ describe('useLoadRuleAlertsAggs', () => { ); await waitForNextUpdate(); - const body = `{"index":"mock_index","size":0,"query":{"bool":{"must":[{"term":{"kibana.alert.rule.uuid":"${ruleId}"}},{"range":{"@timestamp":{"gte":"now-30d","lt":"now"}}},{"bool":{"should":[{"term":{"kibana.alert.status":"active"}},{"term":{"kibana.alert.status":"recovered"}}]}}]}},"aggs":{"total":{"filters":{"filters":{"totalActiveAlerts":{"term":{"kibana.alert.status":"active"}},"totalRecoveredAlerts":{"term":{"kibana.alert.status":"recovered"}}}}},"statusPerDay":{"date_histogram":{"field":"@timestamp","fixed_interval":"1d","extended_bounds":{"min":"now-30d","max":"now"}},"aggs":{"alertStatus":{"terms":{"field":"kibana.alert.status"}}}}}}`; + const body = `{"index":"mock_index","size":0,"query":{"bool":{"must":[{"term":{"kibana.alert.rule.uuid":"${ruleId}"}},{"range":{"@timestamp":{"gte":"now-30d","lt":"now"}}},{"bool":{"should":[{"term":{"kibana.alert.status":"active"}},{"term":{"kibana.alert.status":"recovered"}}]}}]}},"aggs":{"total":{"filters":{"filters":{"totalActiveAlerts":{"term":{"kibana.alert.status":"active"}},"totalRecoveredAlerts":{"term":{"kibana.alert.status":"recovered"}}}}}}}`; expect(useKibanaMock().services.http.post).toHaveBeenCalledWith( '/internal/rac/alerts/find', diff --git a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_load_rule_alerts_aggregations.ts b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_load_rule_alerts_aggregations.ts index c938b0b2cc13f..3df1722abc006 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_load_rule_alerts_aggregations.ts +++ b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_load_rule_alerts_aggregations.ts @@ -10,7 +10,6 @@ import { AsApiContract } from '@kbn/actions-plugin/common'; import { HttpSetup } from '@kbn/core/public'; import { BASE_RAC_ALERTS_API_PATH } from '@kbn/rule-registry-plugin/common/constants'; import { useKibana } from '../../common/lib/kibana'; -import { AlertChartData } from '../sections/rule_details/components/alert_summary'; interface UseLoadRuleAlertsAggs { features: string; @@ -29,7 +28,6 @@ interface LoadRuleAlertsAggs { recovered: number; }; errorRuleAlertsAggs?: string; - alertsChartData: AlertChartData[]; } interface IndexName { index: string; @@ -40,7 +38,6 @@ export function useLoadRuleAlertsAggs({ features, ruleId }: UseLoadRuleAlertsAgg const [ruleAlertsAggs, setRuleAlertsAggs] = useState({ isLoadingRuleAlertsAggs: true, ruleAlertsAggs: { active: 0, recovered: 0 }, - alertsChartData: [], }); const isCancelledRef = useRef(false); const abortCtrlRef = useRef(new AbortController()); @@ -54,7 +51,7 @@ export function useLoadRuleAlertsAggs({ features, ruleId }: UseLoadRuleAlertsAgg http, features, }); - const { active, recovered, error, alertsChartData } = await fetchRuleAlertsAggByTimeRange({ + const { active, recovered, error } = await fetchRuleAlertsAggByTimeRange({ http, index, ruleId, @@ -68,7 +65,6 @@ export function useLoadRuleAlertsAggs({ features, ruleId }: UseLoadRuleAlertsAgg active, recovered, }, - alertsChartData, isLoadingRuleAlertsAggs: false, })); } @@ -79,7 +75,6 @@ export function useLoadRuleAlertsAggs({ features, ruleId }: UseLoadRuleAlertsAgg ...oldState, isLoadingRuleAlertsAggs: false, errorRuleAlertsAggs: error, - alertsChartData: [], })); } } @@ -92,7 +87,7 @@ export function useLoadRuleAlertsAggs({ features, ruleId }: UseLoadRuleAlertsAgg return ruleAlertsAggs; } -export async function fetchIndexNameAPI({ +async function fetchIndexNameAPI({ http, features, }: { @@ -107,14 +102,7 @@ export async function fetchIndexNameAPI({ }; } -interface RuleAlertsAggs { - active: number; - recovered: number; - error?: string; - alertsChartData: AlertChartData[]; -} - -export async function fetchRuleAlertsAggByTimeRange({ +async function fetchRuleAlertsAggByTimeRange({ http, index, ruleId, @@ -183,109 +171,22 @@ export async function fetchRuleAlertsAggByTimeRange({ }, }, }, - statusPerDay: { - date_histogram: { - field: '@timestamp', - fixed_interval: '1d', - extended_bounds: { - min: 'now-30d', - max: 'now', - }, - }, - aggs: { - alertStatus: { - terms: { - field: 'kibana.alert.status', - }, - }, - }, - }, }, }), }); const active = res?.aggregations?.total.buckets.totalActiveAlerts?.doc_count ?? 0; const recovered = res?.aggregations?.total.buckets.totalRecoveredAlerts?.doc_count ?? 0; - let maxTotalAlertPerDay = 0; - res?.aggregations?.statusPerDay.buckets.forEach( - (dayAlerts: { - key: number; - doc_count: number; - alertStatus: { - buckets: Array<{ - key: 'active' | 'recovered'; - doc_count: number; - }>; - }; - }) => { - if (dayAlerts.doc_count > maxTotalAlertPerDay) { - maxTotalAlertPerDay = dayAlerts.doc_count; - } - } - ); - const alertsChartData = [ - ...res?.aggregations?.statusPerDay.buckets.reduce( - ( - acc: AlertChartData[], - dayAlerts: { - key: number; - doc_count: number; - alertStatus: { - buckets: Array<{ - key: 'active' | 'recovered'; - doc_count: number; - }>; - }; - } - ) => { - // We are adding this to each day to construct the 30 days bars (background bar) when there is no data for a given day or to show the delta today alerts/total alerts. - const totalDayAlerts = { - date: dayAlerts.key, - count: maxTotalAlertPerDay === 0 ? 1 : maxTotalAlertPerDay, - status: 'total', - }; - - if (dayAlerts.doc_count > 0) { - const localAlertChartData = acc; - // If there are alerts in this day, we construct the chart data - dayAlerts.alertStatus.buckets.forEach((alert) => { - localAlertChartData.push({ - date: dayAlerts.key, - count: alert.doc_count, - status: alert.key, - }); - }); - const deltaAlertsCount = maxTotalAlertPerDay - dayAlerts.doc_count; - if (deltaAlertsCount > 0) { - localAlertChartData.push({ - date: dayAlerts.key, - count: deltaAlertsCount, - status: 'total', - }); - } - return localAlertChartData; - } - return [...acc, totalDayAlerts]; - }, - [] - ), - ]; return { active, recovered, - alertsChartData: [ - ...alertsChartData.filter((acd) => acd.status === 'recovered'), - ...alertsChartData.filter((acd) => acd.status === 'active'), - ...alertsChartData.filter((acd) => acd.status === 'total'), - ], }; } catch (error) { return { error, active: 0, recovered: 0, - alertsChartData: [], } as RuleAlertsAggs; } } diff --git a/x-pack/plugins/triggers_actions_ui/public/application/mock/rule_details/alert_summary/index.ts b/x-pack/plugins/triggers_actions_ui/public/application/mock/rule_details/alert_summary/index.ts index b0e5416bbf63d..2d5af068ae55d 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/mock/rule_details/alert_summary/index.ts +++ b/x-pack/plugins/triggers_actions_ui/public/application/mock/rule_details/alert_summary/index.ts @@ -6,7 +6,6 @@ */ import { Rule } from '../../../../types'; -import { AlertChartData } from '../../../sections/rule_details/components/alert_summary'; export const mockRule = (): Rule => { return { @@ -63,383 +62,12 @@ export const mockRule = (): Rule => { }; }; -export function mockChartData(): AlertChartData[] { - return [ - { - date: 1660608000000, - count: 6, - status: 'recovered', - }, - { - date: 1660694400000, - count: 1, - status: 'recovered', - }, - { - date: 1660694400000, - count: 1, - status: 'active', - }, - { - date: 1658102400000, - count: 6, - status: 'total', - }, - { - date: 1658188800000, - count: 6, - status: 'total', - }, - { - date: 1658275200000, - count: 6, - status: 'total', - }, - { - date: 1658361600000, - count: 6, - status: 'total', - }, - { - date: 1658448000000, - count: 6, - status: 'total', - }, - { - date: 1658534400000, - count: 6, - status: 'total', - }, - { - date: 1658620800000, - count: 6, - status: 'total', - }, - { - date: 1658707200000, - count: 6, - status: 'total', - }, - { - date: 1658793600000, - count: 6, - status: 'total', - }, - { - date: 1658880000000, - count: 6, - status: 'total', - }, - { - date: 1658966400000, - count: 6, - status: 'total', - }, - { - date: 1659052800000, - count: 6, - status: 'total', - }, - { - date: 1659139200000, - count: 6, - status: 'total', - }, - { - date: 1659225600000, - count: 6, - status: 'total', - }, - { - date: 1659312000000, - count: 6, - status: 'total', - }, - { - date: 1659398400000, - count: 6, - status: 'total', - }, - { - date: 1659484800000, - count: 6, - status: 'total', - }, - { - date: 1659571200000, - count: 6, - status: 'total', - }, - { - date: 1659657600000, - count: 6, - status: 'total', - }, - { - date: 1659744000000, - count: 6, - status: 'total', - }, - { - date: 1659830400000, - count: 6, - status: 'total', - }, - { - date: 1659916800000, - count: 6, - status: 'total', - }, - { - date: 1660003200000, - count: 6, - status: 'total', - }, - { - date: 1660089600000, - count: 6, - status: 'total', - }, - { - date: 1660176000000, - count: 6, - status: 'total', - }, - { - date: 1660262400000, - count: 6, - status: 'total', - }, - { - date: 1660348800000, - count: 6, - status: 'total', - }, - { - date: 1660435200000, - count: 6, - status: 'total', - }, - { - date: 1660521600000, - count: 6, - status: 'total', - }, - { - date: 1660694400000, - count: 4, - status: 'total', - }, - ]; -} - export const mockAggsResponse = () => { return { aggregations: { total: { buckets: { totalActiveAlerts: { doc_count: 1 }, totalRecoveredAlerts: { doc_count: 7 } }, }, - statusPerDay: { - buckets: [ - { - key_as_string: '2022-07-18T00:00:00.000Z', - key: 1658102400000, - doc_count: 0, - alertStatus: { doc_count_error_upper_bound: 0, sum_other_doc_count: 0, buckets: [] }, - }, - { - key_as_string: '2022-07-19T00:00:00.000Z', - key: 1658188800000, - doc_count: 0, - alertStatus: { doc_count_error_upper_bound: 0, sum_other_doc_count: 0, buckets: [] }, - }, - { - key_as_string: '2022-07-20T00:00:00.000Z', - key: 1658275200000, - doc_count: 0, - alertStatus: { doc_count_error_upper_bound: 0, sum_other_doc_count: 0, buckets: [] }, - }, - { - key_as_string: '2022-07-21T00:00:00.000Z', - key: 1658361600000, - doc_count: 0, - alertStatus: { doc_count_error_upper_bound: 0, sum_other_doc_count: 0, buckets: [] }, - }, - { - key_as_string: '2022-07-22T00:00:00.000Z', - key: 1658448000000, - doc_count: 0, - alertStatus: { doc_count_error_upper_bound: 0, sum_other_doc_count: 0, buckets: [] }, - }, - { - key_as_string: '2022-07-23T00:00:00.000Z', - key: 1658534400000, - doc_count: 0, - alertStatus: { doc_count_error_upper_bound: 0, sum_other_doc_count: 0, buckets: [] }, - }, - { - key_as_string: '2022-07-24T00:00:00.000Z', - key: 1658620800000, - doc_count: 0, - alertStatus: { doc_count_error_upper_bound: 0, sum_other_doc_count: 0, buckets: [] }, - }, - { - key_as_string: '2022-07-25T00:00:00.000Z', - key: 1658707200000, - doc_count: 0, - alertStatus: { doc_count_error_upper_bound: 0, sum_other_doc_count: 0, buckets: [] }, - }, - { - key_as_string: '2022-07-26T00:00:00.000Z', - key: 1658793600000, - doc_count: 0, - alertStatus: { doc_count_error_upper_bound: 0, sum_other_doc_count: 0, buckets: [] }, - }, - { - key_as_string: '2022-07-27T00:00:00.000Z', - key: 1658880000000, - doc_count: 0, - alertStatus: { doc_count_error_upper_bound: 0, sum_other_doc_count: 0, buckets: [] }, - }, - { - key_as_string: '2022-07-28T00:00:00.000Z', - key: 1658966400000, - doc_count: 0, - alertStatus: { doc_count_error_upper_bound: 0, sum_other_doc_count: 0, buckets: [] }, - }, - { - key_as_string: '2022-07-29T00:00:00.000Z', - key: 1659052800000, - doc_count: 0, - alertStatus: { doc_count_error_upper_bound: 0, sum_other_doc_count: 0, buckets: [] }, - }, - { - key_as_string: '2022-07-30T00:00:00.000Z', - key: 1659139200000, - doc_count: 0, - alertStatus: { doc_count_error_upper_bound: 0, sum_other_doc_count: 0, buckets: [] }, - }, - { - key_as_string: '2022-07-31T00:00:00.000Z', - key: 1659225600000, - doc_count: 0, - alertStatus: { doc_count_error_upper_bound: 0, sum_other_doc_count: 0, buckets: [] }, - }, - { - key_as_string: '2022-08-01T00:00:00.000Z', - key: 1659312000000, - doc_count: 0, - alertStatus: { doc_count_error_upper_bound: 0, sum_other_doc_count: 0, buckets: [] }, - }, - { - key_as_string: '2022-08-02T00:00:00.000Z', - key: 1659398400000, - doc_count: 0, - alertStatus: { doc_count_error_upper_bound: 0, sum_other_doc_count: 0, buckets: [] }, - }, - { - key_as_string: '2022-08-03T00:00:00.000Z', - key: 1659484800000, - doc_count: 0, - alertStatus: { doc_count_error_upper_bound: 0, sum_other_doc_count: 0, buckets: [] }, - }, - { - key_as_string: '2022-08-04T00:00:00.000Z', - key: 1659571200000, - doc_count: 0, - alertStatus: { doc_count_error_upper_bound: 0, sum_other_doc_count: 0, buckets: [] }, - }, - { - key_as_string: '2022-08-05T00:00:00.000Z', - key: 1659657600000, - doc_count: 0, - alertStatus: { doc_count_error_upper_bound: 0, sum_other_doc_count: 0, buckets: [] }, - }, - { - key_as_string: '2022-08-06T00:00:00.000Z', - key: 1659744000000, - doc_count: 0, - alertStatus: { doc_count_error_upper_bound: 0, sum_other_doc_count: 0, buckets: [] }, - }, - { - key_as_string: '2022-08-07T00:00:00.000Z', - key: 1659830400000, - doc_count: 0, - alertStatus: { doc_count_error_upper_bound: 0, sum_other_doc_count: 0, buckets: [] }, - }, - { - key_as_string: '2022-08-08T00:00:00.000Z', - key: 1659916800000, - doc_count: 0, - alertStatus: { doc_count_error_upper_bound: 0, sum_other_doc_count: 0, buckets: [] }, - }, - { - key_as_string: '2022-08-09T00:00:00.000Z', - key: 1660003200000, - doc_count: 0, - alertStatus: { doc_count_error_upper_bound: 0, sum_other_doc_count: 0, buckets: [] }, - }, - { - key_as_string: '2022-08-10T00:00:00.000Z', - key: 1660089600000, - doc_count: 0, - alertStatus: { doc_count_error_upper_bound: 0, sum_other_doc_count: 0, buckets: [] }, - }, - { - key_as_string: '2022-08-11T00:00:00.000Z', - key: 1660176000000, - doc_count: 0, - alertStatus: { doc_count_error_upper_bound: 0, sum_other_doc_count: 0, buckets: [] }, - }, - { - key_as_string: '2022-08-12T00:00:00.000Z', - key: 1660262400000, - doc_count: 0, - alertStatus: { doc_count_error_upper_bound: 0, sum_other_doc_count: 0, buckets: [] }, - }, - { - key_as_string: '2022-08-13T00:00:00.000Z', - key: 1660348800000, - doc_count: 0, - alertStatus: { doc_count_error_upper_bound: 0, sum_other_doc_count: 0, buckets: [] }, - }, - { - key_as_string: '2022-08-14T00:00:00.000Z', - key: 1660435200000, - doc_count: 0, - alertStatus: { doc_count_error_upper_bound: 0, sum_other_doc_count: 0, buckets: [] }, - }, - { - key_as_string: '2022-08-15T00:00:00.000Z', - key: 1660521600000, - doc_count: 0, - alertStatus: { doc_count_error_upper_bound: 0, sum_other_doc_count: 0, buckets: [] }, - }, - { - key_as_string: '2022-08-16T00:00:00.000Z', - key: 1660608000000, - doc_count: 6, - alertStatus: { - doc_count_error_upper_bound: 0, - sum_other_doc_count: 0, - buckets: [{ key: 'recovered', doc_count: 6 }], - }, - }, - { - key_as_string: '2022-08-17T00:00:00.000Z', - key: 1660694400000, - doc_count: 2, - alertStatus: { - doc_count_error_upper_bound: 0, - sum_other_doc_count: 0, - buckets: [ - { key: 'active', doc_count: 1 }, - { key: 'recovered', doc_count: 1 }, - ], - }, - }, - ], - }, }, }; }; diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/components/alert_summary_widget_error.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/components/alert_summary_widget_error.tsx new file mode 100644 index 0000000000000..1ee04fe2f69d1 --- /dev/null +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/components/alert_summary_widget_error.tsx @@ -0,0 +1,39 @@ +/* + * 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 { EuiEmptyPrompt } from '@elastic/eui'; +import { FormattedMessage } from '@kbn/i18n-react'; + +export const AlertSummaryWidgetError = () => { + return ( + + + + } + body={ +

    + { + + } +

    + } + /> + ); +}; diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/components/alert_summary_widget_ui.stories.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/components/alert_summary_widget_ui.stories.tsx new file mode 100644 index 0000000000000..ab064893ae6fe --- /dev/null +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/components/alert_summary_widget_ui.stories.tsx @@ -0,0 +1,21 @@ +/* + * 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 { AlertsSummaryWidgetUI as Component } from './alert_summary_widget_ui'; + +export default { + component: Component, + title: 'app/AlertsSummaryWidgetUI', +}; + +export const Overview = { + args: { + active: 15, + recovered: 53, + timeRange: 'Last 30 days', + }, +}; diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/components/alert_summary_widget_ui.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/components/alert_summary_widget_ui.tsx new file mode 100644 index 0000000000000..e4003e803032d --- /dev/null +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/components/alert_summary_widget_ui.tsx @@ -0,0 +1,87 @@ +/* + * 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 { euiLightVars } from '@kbn/ui-theme'; +import { EuiFlexGroup, EuiFlexItem, EuiPanel, EuiSpacer, EuiText, EuiTitle } from '@elastic/eui'; +import React from 'react'; +import { FormattedMessage } from '@kbn/i18n-react'; +import { AlertsSummaryWidgetUIProps } from './types'; + +export const AlertsSummaryWidgetUI = ({ + active, + recovered, + timeRange, +}: AlertsSummaryWidgetUIProps) => { + return ( + + + + + + +
    + +
    +     + {!!timeRange && ( + <> + + + {timeRange} + + + )} +     + + + + + +

    {active + recovered}

    +     + + + +     + + + +

    {recovered}

    +     +     + + + +     + + +

    {active}

    +     + + + +     +     +     +     +     +     +     + ); +}; diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/components/index.ts b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/components/index.ts new file mode 100644 index 0000000000000..e1f4ef4d231e7 --- /dev/null +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/components/index.ts @@ -0,0 +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. + */ + +export { AlertsSummaryWidgetUI } from './alert_summary_widget_ui'; +export { AlertSummaryWidgetError } from './alert_summary_widget_error'; diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/components/types.ts b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/components/types.ts new file mode 100644 index 0000000000000..81437071fcea2 --- /dev/null +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/components/types.ts @@ -0,0 +1,12 @@ +/* + * 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 interface AlertsSummaryWidgetUIProps { + active: number; + recovered: number; + timeRange: JSX.Element | string; +} diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/helpers.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/helpers.tsx deleted file mode 100644 index 167c98a678f52..0000000000000 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/helpers.tsx +++ /dev/null @@ -1,41 +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 { LIGHT_THEME, XYChartSeriesIdentifier } from '@elastic/charts'; -import { AlertChartData } from './types'; - -export const formatChartAlertData = ( - data: AlertChartData[] -): Array<{ x: number; y: number; g: string }> => - data.map((alert) => ({ - x: alert.date, - y: alert.count, - g: alert.status, - })); - -export const getColorSeries = ({ seriesKeys }: XYChartSeriesIdentifier) => { - switch (seriesKeys[0]) { - case 'active': - return LIGHT_THEME.colors.vizColors[2]; - case 'recovered': - return LIGHT_THEME.colors.vizColors[1]; - case 'total': - return '#f5f7fa'; - default: - return null; - } -}; - -/** - * This function may be passed to `Array.find()` to locate the `P1DT` - * configuration (sub) setting, a string array that contains two entries - * like the following example: `['P1DT', 'YYYY-MM-DD']`. - */ -export const isP1DTFormatterSetting = (formatNameFormatterPair?: string[]) => - Array.isArray(formatNameFormatterPair) && - formatNameFormatterPair[0] === 'P1DT' && - formatNameFormatterPair.length === 2; diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/index.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/index.tsx index 80f221f436c49..ede15d4bac294 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/index.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/index.tsx @@ -6,5 +6,4 @@ */ export { RuleAlertsSummary } from './rule_alerts_summary'; -export type { RuleAlertsSummaryProps, AlertChartData, AlertsChartProps } from './types'; -export { formatChartAlertData, getColorSeries } from './helpers'; +export type { RuleAlertsSummaryProps } from './types'; diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/rule_alerts_summary.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/rule_alerts_summary.test.tsx index 39264020f30a3..019d4f2ba549b 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/rule_alerts_summary.test.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/rule_alerts_summary.test.tsx @@ -12,7 +12,6 @@ import { mount, ReactWrapper } from 'enzyme'; import { __IntlProvider as IntlProvider } from '@kbn/i18n-react'; import { ALERTS_FEATURE_ID } from '@kbn/alerting-plugin/common'; import { mockRule } from '../../../../mock/rule_details/alert_summary'; -import { AlertChartData } from './types'; jest.mock('@kbn/kibana-react-plugin/public/ui_settings/use_ui_setting', () => ({ useUiSetting: jest.fn().mockImplementation(() => true), @@ -25,7 +24,6 @@ jest.mock('../../../../hooks/use_load_rule_types', () => ({ jest.mock('../../../../hooks/use_load_rule_alerts_aggregations', () => ({ useLoadRuleAlertsAggs: jest.fn().mockReturnValue({ ruleAlertsAggs: { active: 1, recovered: 7 }, - alertsChartData: mockChartData(), }), })); @@ -80,174 +78,3 @@ describe('Rule Alert Summary', () => { expect(wrapper.find('[data-test-subj="totalAlertsCount"]').text()).toBe('8'); }); }); - -// This function should stay in the same file as the test otherwise the test will fail. -function mockChartData(): AlertChartData[] { - return [ - { - date: 1660608000000, - count: 6, - status: 'recovered', - }, - { - date: 1660694400000, - count: 1, - status: 'recovered', - }, - { - date: 1660694400000, - count: 1, - status: 'active', - }, - { - date: 1658102400000, - count: 6, - status: 'total', - }, - { - date: 1658188800000, - count: 6, - status: 'total', - }, - { - date: 1658275200000, - count: 6, - status: 'total', - }, - { - date: 1658361600000, - count: 6, - status: 'total', - }, - { - date: 1658448000000, - count: 6, - status: 'total', - }, - { - date: 1658534400000, - count: 6, - status: 'total', - }, - { - date: 1658620800000, - count: 6, - status: 'total', - }, - { - date: 1658707200000, - count: 6, - status: 'total', - }, - { - date: 1658793600000, - count: 6, - status: 'total', - }, - { - date: 1658880000000, - count: 6, - status: 'total', - }, - { - date: 1658966400000, - count: 6, - status: 'total', - }, - { - date: 1659052800000, - count: 6, - status: 'total', - }, - { - date: 1659139200000, - count: 6, - status: 'total', - }, - { - date: 1659225600000, - count: 6, - status: 'total', - }, - { - date: 1659312000000, - count: 6, - status: 'total', - }, - { - date: 1659398400000, - count: 6, - status: 'total', - }, - { - date: 1659484800000, - count: 6, - status: 'total', - }, - { - date: 1659571200000, - count: 6, - status: 'total', - }, - { - date: 1659657600000, - count: 6, - status: 'total', - }, - { - date: 1659744000000, - count: 6, - status: 'total', - }, - { - date: 1659830400000, - count: 6, - status: 'total', - }, - { - date: 1659916800000, - count: 6, - status: 'total', - }, - { - date: 1660003200000, - count: 6, - status: 'total', - }, - { - date: 1660089600000, - count: 6, - status: 'total', - }, - { - date: 1660176000000, - count: 6, - status: 'total', - }, - { - date: 1660262400000, - count: 6, - status: 'total', - }, - { - date: 1660348800000, - count: 6, - status: 'total', - }, - { - date: 1660435200000, - count: 6, - status: 'total', - }, - { - date: 1660521600000, - count: 6, - status: 'total', - }, - { - date: 1660694400000, - count: 4, - status: 'total', - }, - ]; -} diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/rule_alerts_summary.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/rule_alerts_summary.tsx index 708b12ceb7b4a..da43783568658 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/rule_alerts_summary.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/rule_alerts_summary.tsx @@ -5,65 +5,17 @@ * 2.0. */ -import { - BarSeries, - Chart, - FilterPredicate, - LIGHT_THEME, - ScaleType, - Settings, - TooltipType, -} from '@elastic/charts'; -import { - EuiEmptyPrompt, - EuiFlexGroup, - EuiFlexItem, - EuiLoadingSpinner, - EuiPanel, - EuiSpacer, - EuiText, - EuiTitle, -} from '@elastic/eui'; +import { EuiLoadingSpinner } from '@elastic/eui'; import { ALERTS_FEATURE_ID } from '@kbn/alerting-plugin/common'; import { FormattedMessage } from '@kbn/i18n-react'; -import React, { useEffect, useMemo, useState } from 'react'; -import { - EUI_CHARTS_THEME_DARK, - EUI_CHARTS_THEME_LIGHT, - EUI_SPARKLINE_THEME_PARTIAL, -} from '@elastic/eui/dist/eui_charts_theme'; -import { useUiSetting } from '@kbn/kibana-react-plugin/public'; -import moment from 'moment'; +import React, { useEffect, useState } from 'react'; import { useLoadRuleAlertsAggs } from '../../../../hooks/use_load_rule_alerts_aggregations'; import { useLoadRuleTypes } from '../../../../hooks/use_load_rule_types'; -import { formatChartAlertData, getColorSeries } from '.'; import { RuleAlertsSummaryProps } from '.'; -import { isP1DTFormatterSetting } from './helpers'; +import { AlertSummaryWidgetError, AlertsSummaryWidgetUI } from './components'; -const Y_ACCESSORS = ['y']; -const X_ACCESSORS = ['x']; -const G_ACCESSORS = ['g']; -const FALLBACK_DATE_FORMAT_SCALED_P1DT = 'YYYY-MM-DD'; export const RuleAlertsSummary = ({ rule, filteredRuleTypes }: RuleAlertsSummaryProps) => { const [features, setFeatures] = useState(''); - const isDarkMode = useUiSetting('theme:darkMode'); - - const scaledDateFormatPreference = useUiSetting('dateFormat:scaled'); - const maybeP1DTFormatter = Array.isArray(scaledDateFormatPreference) - ? scaledDateFormatPreference.find(isP1DTFormatterSetting) - : null; - const p1dtFormat = - Array.isArray(maybeP1DTFormatter) && maybeP1DTFormatter.length === 2 - ? maybeP1DTFormatter[1] - : FALLBACK_DATE_FORMAT_SCALED_P1DT; - - const theme = useMemo( - () => [ - EUI_SPARKLINE_THEME_PARTIAL, - isDarkMode ? EUI_CHARTS_THEME_DARK.theme : EUI_CHARTS_THEME_LIGHT.theme, - ], - [isDarkMode] - ); const { ruleTypes } = useLoadRuleTypes({ filteredRuleTypes, }); @@ -71,21 +23,10 @@ export const RuleAlertsSummary = ({ rule, filteredRuleTypes }: RuleAlertsSummary ruleAlertsAggs: { active, recovered }, isLoadingRuleAlertsAggs, errorRuleAlertsAggs, - alertsChartData, } = useLoadRuleAlertsAggs({ ruleId: rule.id, features, }); - const chartData = useMemo(() => formatChartAlertData(alertsChartData), [alertsChartData]); - const tooltipSettings = useMemo( - () => ({ - type: TooltipType.VerticalCursor, - headerFormatter: ({ value }: { value: number }) => { - return <>{moment(value).format(p1dtFormat)}; - }, - }), - [p1dtFormat] - ); useEffect(() => { const matchedRuleType = ruleTypes.find((type) => type.id === rule.ruleTypeId); @@ -95,133 +36,18 @@ export const RuleAlertsSummary = ({ rule, filteredRuleTypes }: RuleAlertsSummary }, [rule, ruleTypes]); if (isLoadingRuleAlertsAggs) return ; - if (errorRuleAlertsAggs) - return ( - - - - } - body={ -

    - { - - } -

    - } - /> - ); - const isVisibleFunction: FilterPredicate = (series) => series.splitAccessors.get('g') !== 'total'; + if (errorRuleAlertsAggs) return ; return ( - - - - - - -
    - -
    -     - - - - -     - - - - - - - - - -

    {active + recovered}

    -     -     -     - - - - - - -

    {active}

    -     -     -     - - - - - - - -

    {recovered}

    -     -     -     -     -     -     -     -     - - - -
    - -
    -     -     -     - - - - - -     + } + /> ); }; diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/types.ts b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/types.ts index ae4d8696572b0..7ae05d1eaa10e 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/types.ts +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/alert_summary/types.ts @@ -11,12 +11,3 @@ export interface RuleAlertsSummaryProps { rule: Rule; filteredRuleTypes: string[]; } -export interface AlertChartData { - status: 'active' | 'recovered' | 'total'; - count: number; - date: number; -} - -export interface AlertsChartProps { - data: AlertChartData[]; -} From 4bab191faf62b88fde6604353a3d32f0b5aaf3b4 Mon Sep 17 00:00:00 2001 From: Miriam <31922082+MiriamAparicio@users.noreply.github.com> Date: Thu, 29 Sep 2022 11:23:52 +0100 Subject: [PATCH 87/95] [APM] Create infraMetricsClient (#141735) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Create infraMetricsClient * remove infraclient from setup request and create its own * Remove the setupInfraMetrics, use createInfraMetricsClient * fix types * typing createInfraMetrics client * Fix types and simplify `get_host_names` * fix get_service_overview_container_metadata types * pass resources as a param instead Co-authored-by: Søren Louv-Jansen --- .../create_infra_metrics_client.ts | 41 +++++++ .../routes/infrastructure/get_host_names.ts | 113 +++++------------- .../apm/server/routes/infrastructure/route.ts | 11 +- ...get_service_instance_container_metadata.ts | 17 +-- ...get_service_overview_container_metadata.ts | 38 +----- .../apm/server/routes/services/route.ts | 35 ++---- 6 files changed, 93 insertions(+), 162 deletions(-) create mode 100644 x-pack/plugins/apm/server/lib/helpers/create_es_client/create_infra_metrics_client/create_infra_metrics_client.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_infra_metrics_client/create_infra_metrics_client.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_infra_metrics_client/create_infra_metrics_client.ts new file mode 100644 index 0000000000000..4cd9df6bf2137 --- /dev/null +++ b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_infra_metrics_client/create_infra_metrics_client.ts @@ -0,0 +1,41 @@ +/* + * 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 { ESSearchRequest, InferSearchResponseOf } from '@kbn/es-types'; +import { APMRouteHandlerResources } from '../../../../routes/typings'; +import { getInfraMetricIndices } from '../../get_infra_metric_indices'; + +type InfraMetricsSearchParams = Omit; + +export type InfraMetricsClient = ReturnType; + +export function createInfraMetricsClient(resources: APMRouteHandlerResources) { + return { + async search( + opts: TParams + ): Promise> { + const { + savedObjects: { client: savedObjectsClient }, + elasticsearch: { client: esClient }, + } = await resources.context.core; + + const indexName = await getInfraMetricIndices({ + infraPlugin: resources.plugins.infra, + savedObjectsClient, + }); + + const searchParams = { + index: [indexName], + ...opts, + }; + + return esClient.asCurrentUser.search( + searchParams + ) as Promise; + }, + }; +} diff --git a/x-pack/plugins/apm/server/routes/infrastructure/get_host_names.ts b/x-pack/plugins/apm/server/routes/infrastructure/get_host_names.ts index 4890f8ab909eb..8f47c2d1664bf 100644 --- a/x-pack/plugins/apm/server/routes/infrastructure/get_host_names.ts +++ b/x-pack/plugins/apm/server/routes/infrastructure/get_host_names.ts @@ -5,106 +5,55 @@ * 2.0. */ -import { ElasticsearchClient } from '@kbn/core/server'; import { rangeQuery } from '@kbn/observability-plugin/server'; -import { InfraPluginStart, InfraPluginSetup } from '@kbn/infra-plugin/server'; -import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey'; import { CONTAINER_ID, HOST_NAME, } from '../../../common/elasticsearch_fieldnames'; -import { ApmPluginRequestHandlerContext } from '../typings'; -import { getInfraMetricIndices } from '../../lib/helpers/get_infra_metric_indices'; +import { InfraMetricsClient } from '../../lib/helpers/create_es_client/create_infra_metrics_client/create_infra_metrics_client'; -interface Aggs extends estypes.AggregationsMultiBucketAggregateBase { - buckets: Array<{ - key: string; - key_as_string?: string; - }>; -} - -interface InfraPlugin { - setup: InfraPluginSetup; - start: () => Promise; -} - -const getHostNames = async ({ - esClient, +export async function getContainerHostNames({ containerIds, - index, + infraMetricsClient, start, end, }: { - esClient: ElasticsearchClient; containerIds: string[]; - index: string; + infraMetricsClient: InfraMetricsClient; start: number; end: number; -}) => { - const response = await esClient.search({ - index: [index], - body: { - size: 0, - query: { - bool: { - filter: [ - { - terms: { - [CONTAINER_ID]: containerIds, - }, +}): Promise { + if (!containerIds.length) { + return []; + } + + const response = await infraMetricsClient.search({ + size: 0, + query: { + bool: { + filter: [ + { + terms: { + [CONTAINER_ID]: containerIds, }, - ...rangeQuery(start, end), - ], - }, - }, - aggs: { - hostNames: { - terms: { - field: HOST_NAME, - size: 500, }, + ...rangeQuery(start, end), + ], + }, + }, + aggs: { + hostNames: { + terms: { + field: HOST_NAME, + size: 500, }, }, }, }); - return { - hostNames: - response.aggregations?.hostNames?.buckets.map( - (bucket) => bucket.key as string - ) ?? [], - }; -}; + const hostNames = response.aggregations?.hostNames?.buckets.map( + (bucket) => bucket.key as string + ); -export const getContainerHostNames = async ({ - containerIds, - context, - infra, - start, - end, -}: { - containerIds: string[]; - context: ApmPluginRequestHandlerContext; - infra: InfraPlugin; - start: number; - end: number; -}): Promise => { - if (containerIds.length) { - const esClient = (await context.core).elasticsearch.client.asCurrentUser; - const savedObjectsClient = (await context.core).savedObjects.client; - const metricIndices = await getInfraMetricIndices({ - infraPlugin: infra, - savedObjectsClient, - }); - - const containerHostNames = await getHostNames({ - esClient, - containerIds, - index: metricIndices, - start, - end, - }); - return containerHostNames.hostNames; - } - return []; -}; + return hostNames ?? []; +} diff --git a/x-pack/plugins/apm/server/routes/infrastructure/route.ts b/x-pack/plugins/apm/server/routes/infrastructure/route.ts index 756b29d5d4571..678f380bc4fd8 100644 --- a/x-pack/plugins/apm/server/routes/infrastructure/route.ts +++ b/x-pack/plugins/apm/server/routes/infrastructure/route.ts @@ -10,6 +10,7 @@ import { setupRequest } from '../../lib/helpers/setup_request'; import { environmentRt, kueryRt, rangeRt } from '../default_api_types'; import { getInfrastructureData } from './get_infrastructure_data'; import { getContainerHostNames } from './get_host_names'; +import { createInfraMetricsClient } from '../../lib/helpers/create_es_client/create_infra_metrics_client/create_infra_metrics_client'; const infrastructureRoute = createApmServerRoute({ endpoint: @@ -29,12 +30,9 @@ const infrastructureRoute = createApmServerRoute({ podNames: string[]; }> => { const setup = await setupRequest(resources); + const infraMetricsClient = createInfraMetricsClient(resources); - const { - context, - params, - plugins: { infra }, - } = resources; + const { params } = resources; const { path: { serviceName }, @@ -54,8 +52,7 @@ const infrastructureRoute = createApmServerRoute({ // due some limitations on the data we get from apm-metrics indices, if we have a service running in a container we want to query, to get the host.name, filtering by container.id const containerHostNames = await getContainerHostNames({ containerIds, - context, - infra, + infraMetricsClient, start, end, }); diff --git a/x-pack/plugins/apm/server/routes/services/get_service_instance_container_metadata.ts b/x-pack/plugins/apm/server/routes/services/get_service_instance_container_metadata.ts index 729c2f1f1b1eb..ebce4f9338714 100644 --- a/x-pack/plugins/apm/server/routes/services/get_service_instance_container_metadata.ts +++ b/x-pack/plugins/apm/server/routes/services/get_service_instance_container_metadata.ts @@ -5,10 +5,8 @@ * 2.0. */ -import { ElasticsearchClient } from '@kbn/core/server'; import { rangeQuery } from '@kbn/observability-plugin/server'; import { - CONTAINER, CONTAINER_ID, CONTAINER_IMAGE, KUBERNETES, @@ -21,6 +19,7 @@ import { } from '../../../common/elasticsearch_fieldnames'; import { Kubernetes } from '../../../typings/es_schemas/raw/fields/kubernetes'; import { maybe } from '../../../common/utils/maybe'; +import { InfraMetricsClient } from '../../lib/helpers/create_es_client/create_infra_metrics_client/create_infra_metrics_client'; type ServiceInstanceContainerMetadataDetails = | { @@ -29,22 +28,16 @@ type ServiceInstanceContainerMetadataDetails = | undefined; export const getServiceInstanceContainerMetadata = async ({ - esClient, - indexName, + infraMetricsClient, containerId, start, end, }: { - esClient: ElasticsearchClient; - indexName?: string; + infraMetricsClient: InfraMetricsClient; containerId: string; start: number; end: number; }): Promise => { - if (!indexName) { - return undefined; - } - const should = [ { exists: { field: KUBERNETES } }, { exists: { field: CONTAINER_IMAGE } }, @@ -56,9 +49,7 @@ export const getServiceInstanceContainerMetadata = async ({ { exists: { field: KUBERNETES_DEPLOYMENT_NAME } }, ]; - const response = await esClient.search({ - index: [indexName], - _source: [KUBERNETES, CONTAINER], + const response = await infraMetricsClient.search({ size: 1, query: { bool: { diff --git a/x-pack/plugins/apm/server/routes/services/get_service_overview_container_metadata.ts b/x-pack/plugins/apm/server/routes/services/get_service_overview_container_metadata.ts index 5b267e4faa3fc..c1dcfe97e208b 100644 --- a/x-pack/plugins/apm/server/routes/services/get_service_overview_container_metadata.ts +++ b/x-pack/plugins/apm/server/routes/services/get_service_overview_container_metadata.ts @@ -5,10 +5,8 @@ * 2.0. */ -import { ElasticsearchClient } from '@kbn/core/server'; import { rangeQuery } from '@kbn/observability-plugin/server'; import { - CONTAINER, CONTAINER_ID, CONTAINER_IMAGE, KUBERNETES, @@ -19,43 +17,19 @@ import { KUBERNETES_REPLICASET_NAME, KUBERNETES_DEPLOYMENT_NAME, } from '../../../common/elasticsearch_fieldnames'; - -type ServiceOverviewContainerMetadataDetails = - | { - kubernetes: { - deployments?: string[]; - replicasets?: string[]; - namespaces?: string[]; - containerImages?: string[]; - }; - } - | undefined; - -interface ResponseAggregations { - [key: string]: { - buckets: Array<{ - key: string; - }>; - }; -} +import { InfraMetricsClient } from '../../lib/helpers/create_es_client/create_infra_metrics_client/create_infra_metrics_client'; export const getServiceOverviewContainerMetadata = async ({ - esClient, - indexName, + infraMetricsClient, containerIds, start, end, }: { - esClient: ElasticsearchClient; - indexName?: string; + infraMetricsClient: InfraMetricsClient; containerIds: string[]; start: number; end: number; -}): Promise => { - if (!indexName) { - return undefined; - } - +}) => { const should = [ { exists: { field: KUBERNETES } }, { exists: { field: CONTAINER_IMAGE } }, @@ -67,9 +41,7 @@ export const getServiceOverviewContainerMetadata = async ({ { exists: { field: KUBERNETES_DEPLOYMENT_NAME } }, ]; - const response = await esClient.search({ - index: [indexName], - _source: [KUBERNETES, CONTAINER], + const response = await infraMetricsClient.search({ size: 0, query: { bool: { diff --git a/x-pack/plugins/apm/server/routes/services/route.ts b/x-pack/plugins/apm/server/routes/services/route.ts index 6b73d72367d0f..79ff09101aeca 100644 --- a/x-pack/plugins/apm/server/routes/services/route.ts +++ b/x-pack/plugins/apm/server/routes/services/route.ts @@ -55,7 +55,8 @@ import { ServiceHealthStatus } from '../../../common/service_health_status'; import { getServiceGroup } from '../service_groups/get_service_group'; import { offsetRt } from '../../../common/comparison_rt'; import { getRandomSampler } from '../../lib/helpers/get_random_sampler'; -import { getInfraMetricIndices } from '../../lib/helpers/get_infra_metric_indices'; +import { createInfraMetricsClient } from '../../lib/helpers/create_es_client/create_infra_metrics_client/create_infra_metrics_client'; + const servicesRoute = createApmServerRoute({ endpoint: 'GET /internal/apm/services', params: t.type({ @@ -274,7 +275,8 @@ const serviceMetadataDetailsRoute = createApmServerRoute({ import('./get_service_metadata_details').ServiceMetadataDetails > => { const setup = await setupRequest(resources); - const { params, context, plugins } = resources; + const infraMetricsClient = createInfraMetricsClient(resources); + const { params } = resources; const { serviceName } = params.path; const { start, end } = params.query; @@ -295,19 +297,8 @@ const serviceMetadataDetailsRoute = createApmServerRoute({ }); if (serviceMetadataDetails?.container?.ids) { - const { - savedObjects: { client: savedObjectsClient }, - elasticsearch: { client: esClient }, - } = await context.core; - - const indexName = await getInfraMetricIndices({ - infraPlugin: plugins.infra, - savedObjectsClient, - }); - const containerMetadata = await getServiceOverviewContainerMetadata({ - esClient: esClient.asCurrentUser, - indexName, + infraMetricsClient, containerIds: serviceMetadataDetails.container.ids, start, end, @@ -911,7 +902,8 @@ export const serviceInstancesMetadataDetails = createApmServerRoute({ | undefined; }> => { const setup = await setupRequest(resources); - const { params, context, plugins } = resources; + const infraMetricsClient = createInfraMetricsClient(resources); + const { params } = resources; const { serviceName, serviceNodeName } = params.path; const { start, end } = params.query; @@ -925,19 +917,8 @@ export const serviceInstancesMetadataDetails = createApmServerRoute({ }); if (serviceInstanceMetadataDetails?.container?.id) { - const { - savedObjects: { client: savedObjectsClient }, - elasticsearch: { client: esClient }, - } = await context.core; - - const indexName = await getInfraMetricIndices({ - infraPlugin: plugins.infra, - savedObjectsClient, - }); - const containerMetadata = await getServiceInstanceContainerMetadata({ - esClient: esClient.asCurrentUser, - indexName, + infraMetricsClient, containerId: serviceInstanceMetadataDetails.container.id, start, end, From 94fe1e63530d73807fca991898c8caf42e5d4dca Mon Sep 17 00:00:00 2001 From: Yaroslav Kuznietsov Date: Thu, 29 Sep 2022 13:39:14 +0300 Subject: [PATCH 88/95] [Visualizations] Navigate to lens agg based vis library tests. (#141353) * Added tests for convert_to_lens lib at vis_types. Co-authored-by: Uladzislau Lasitsa --- .../convert_to_lens/lib/buckets/index.test.ts | 267 +++++++++ .../lib/convert/column.test.ts | 105 ++++ .../lib/convert/date_histogram.test.ts | 90 +++ .../lib/convert/filters.test.ts | 54 ++ .../lib/convert/formula.test.ts | 54 ++ .../lib/convert/last_value.test.ts | 120 ++++ .../lib/convert/metric.test.ts | 92 ++++ .../lib/convert/parent_pipeline.test.ts | 438 +++++++++++++++ .../lib/convert/parent_pipeline.ts | 3 +- .../lib/convert/percentile.test.ts | 142 +++++ .../lib/convert/percentile_rank.test.ts | 146 +++++ .../convert_to_lens/lib/convert/range.test.ts | 74 +++ .../lib/convert/sibling_pipeline.test.ts | 79 +++ .../lib/convert/std_deviation.test.ts | 115 ++++ .../convert_to_lens/lib/convert/terms.test.ts | 241 ++++++++ .../lib/metrics/formula.test.ts | 474 ++++++++++++++++ .../lib/metrics/metrics.test.ts | 368 +++++++++++++ .../lib/metrics/percentage_formula.test.ts | 98 ++++ .../common/convert_to_lens/lib/utils.test.ts | 521 ++++++++++++++++++ .../common/convert_to_lens/lib/utils.ts | 2 +- .../public/convert_to_lens/schemas.test.ts | 2 +- .../public/convert_to_lens/schemas.ts | 4 +- 22 files changed, 3484 insertions(+), 5 deletions(-) create mode 100644 src/plugins/visualizations/common/convert_to_lens/lib/buckets/index.test.ts create mode 100644 src/plugins/visualizations/common/convert_to_lens/lib/convert/column.test.ts create mode 100644 src/plugins/visualizations/common/convert_to_lens/lib/convert/date_histogram.test.ts create mode 100644 src/plugins/visualizations/common/convert_to_lens/lib/convert/filters.test.ts create mode 100644 src/plugins/visualizations/common/convert_to_lens/lib/convert/formula.test.ts create mode 100644 src/plugins/visualizations/common/convert_to_lens/lib/convert/last_value.test.ts create mode 100644 src/plugins/visualizations/common/convert_to_lens/lib/convert/metric.test.ts create mode 100644 src/plugins/visualizations/common/convert_to_lens/lib/convert/parent_pipeline.test.ts create mode 100644 src/plugins/visualizations/common/convert_to_lens/lib/convert/percentile.test.ts create mode 100644 src/plugins/visualizations/common/convert_to_lens/lib/convert/percentile_rank.test.ts create mode 100644 src/plugins/visualizations/common/convert_to_lens/lib/convert/range.test.ts create mode 100644 src/plugins/visualizations/common/convert_to_lens/lib/convert/sibling_pipeline.test.ts create mode 100644 src/plugins/visualizations/common/convert_to_lens/lib/convert/std_deviation.test.ts create mode 100644 src/plugins/visualizations/common/convert_to_lens/lib/convert/terms.test.ts create mode 100644 src/plugins/visualizations/common/convert_to_lens/lib/metrics/formula.test.ts create mode 100644 src/plugins/visualizations/common/convert_to_lens/lib/metrics/metrics.test.ts create mode 100644 src/plugins/visualizations/common/convert_to_lens/lib/metrics/percentage_formula.test.ts create mode 100644 src/plugins/visualizations/common/convert_to_lens/lib/utils.test.ts diff --git a/src/plugins/visualizations/common/convert_to_lens/lib/buckets/index.test.ts b/src/plugins/visualizations/common/convert_to_lens/lib/buckets/index.test.ts new file mode 100644 index 0000000000000..f0a8e4d32f7c3 --- /dev/null +++ b/src/plugins/visualizations/common/convert_to_lens/lib/buckets/index.test.ts @@ -0,0 +1,267 @@ +/* + * 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. + */ + +import { stubLogstashDataView } from '@kbn/data-views-plugin/common/data_view.stub'; +import { BUCKET_TYPES, METRIC_TYPES } from '@kbn/data-plugin/common'; +import { convertBucketToColumns } from '.'; +import { DateHistogramColumn, FiltersColumn, RangeColumn, TermsColumn } from '../../types'; +import { AggBasedColumn, SchemaConfig } from '../../..'; + +const mockConvertToDateHistogramColumn = jest.fn(); +const mockConvertToFiltersColumn = jest.fn(); +const mockConvertToTermsColumn = jest.fn(); +const mockConvertToRangeColumn = jest.fn(); + +jest.mock('../convert', () => ({ + convertToDateHistogramColumn: jest.fn(() => mockConvertToDateHistogramColumn()), + convertToFiltersColumn: jest.fn(() => mockConvertToFiltersColumn()), + convertToTermsColumn: jest.fn(() => mockConvertToTermsColumn()), + convertToRangeColumn: jest.fn(() => mockConvertToRangeColumn()), +})); + +describe('convertBucketToColumns', () => { + const field = stubLogstashDataView.fields[0].name; + const dateField = stubLogstashDataView.fields.find((f) => f.type === 'date')!.name; + const bucketAggs: SchemaConfig[] = [ + { + accessor: 0, + label: '', + format: { + id: undefined, + params: undefined, + }, + params: {}, + aggType: BUCKET_TYPES.FILTERS, + aggParams: { + filters: [], + }, + }, + { + accessor: 0, + label: '', + format: { + id: undefined, + params: undefined, + }, + params: {}, + aggType: BUCKET_TYPES.DATE_HISTOGRAM, + aggParams: { + field, + }, + }, + { + accessor: 0, + label: '', + format: { + id: undefined, + params: undefined, + }, + params: {}, + aggType: BUCKET_TYPES.TERMS, + aggParams: { + field, + orderBy: '_key', + }, + }, + { + accessor: 0, + label: '', + format: { + id: undefined, + params: undefined, + }, + params: {}, + aggType: BUCKET_TYPES.TERMS, + aggParams: { + field: dateField, + orderBy: '_key', + }, + }, + { + accessor: 0, + label: '', + format: { + id: undefined, + params: undefined, + }, + params: {}, + aggType: BUCKET_TYPES.HISTOGRAM, + aggParams: { + field, + interval: '1h', + }, + }, + { + accessor: 0, + label: '', + format: { + id: undefined, + params: undefined, + }, + params: {}, + aggType: BUCKET_TYPES.RANGE, + aggParams: { + field, + }, + }, + { + accessor: 0, + label: '', + format: { + id: undefined, + params: undefined, + }, + params: {}, + aggType: BUCKET_TYPES.DATE_RANGE, + aggParams: { + field, + }, + }, + ]; + const aggs: Array> = [ + { + accessor: 0, + label: '', + format: { + id: undefined, + params: undefined, + }, + params: {}, + aggType: METRIC_TYPES.AVG, + aggParams: { + field, + }, + }, + ]; + const metricColumns: AggBasedColumn[] = [ + { + columnId: 'column-1', + operationType: 'average', + isBucketed: false, + isSplit: false, + sourceField: field, + dataType: 'number', + params: {}, + meta: { + aggId: '1', + }, + }, + ]; + + afterEach(() => { + jest.clearAllMocks(); + }); + + test.each< + [ + string, + Parameters, + () => void, + Partial | null + ] + >([ + [ + 'null if bucket agg type is not supported', + [{ dataView: stubLogstashDataView, agg: bucketAggs[6], aggs, metricColumns }], + () => {}, + null, + ], + [ + 'null if bucket agg does not have aggParams', + [ + { + dataView: stubLogstashDataView, + agg: { ...bucketAggs[0], aggParams: undefined }, + aggs, + metricColumns, + }, + ], + () => {}, + null, + ], + [ + 'filters column if bucket agg is valid filters agg', + [{ dataView: stubLogstashDataView, agg: bucketAggs[0], aggs, metricColumns }], + () => { + mockConvertToFiltersColumn.mockReturnValue({ + operationType: 'filters', + }); + }, + { + operationType: 'filters', + }, + ], + [ + 'date histogram column if bucket agg is valid date histogram agg', + [{ dataView: stubLogstashDataView, agg: bucketAggs[1], aggs, metricColumns }], + () => { + mockConvertToDateHistogramColumn.mockReturnValue({ + operationType: 'date_histogram', + }); + }, + { + operationType: 'date_histogram', + }, + ], + [ + 'date histogram column if bucket agg is valid terms agg with date field', + [{ dataView: stubLogstashDataView, agg: bucketAggs[3], aggs, metricColumns }], + () => { + mockConvertToDateHistogramColumn.mockReturnValue({ + operationType: 'date_histogram', + }); + }, + { + operationType: 'date_histogram', + }, + ], + [ + 'terms column if bucket agg is valid terms agg with no date field', + [{ dataView: stubLogstashDataView, agg: bucketAggs[2], aggs, metricColumns }], + () => { + mockConvertToTermsColumn.mockReturnValue({ + operationType: 'terms', + }); + }, + { + operationType: 'terms', + }, + ], + [ + 'range column if bucket agg is valid histogram agg', + [{ dataView: stubLogstashDataView, agg: bucketAggs[4], aggs, metricColumns }], + () => { + mockConvertToRangeColumn.mockReturnValue({ + operationType: 'range', + }); + }, + { + operationType: 'range', + }, + ], + [ + 'range column if bucket agg is valid range agg', + [{ dataView: stubLogstashDataView, agg: bucketAggs[5], aggs, metricColumns }], + () => { + mockConvertToRangeColumn.mockReturnValue({ + operationType: 'range', + }); + }, + { + operationType: 'range', + }, + ], + ])('should return %s', (_, input, actions, expected) => { + actions(); + if (expected === null) { + expect(convertBucketToColumns(...input)).toBeNull(); + } else { + expect(convertBucketToColumns(...input)).toEqual(expect.objectContaining(expected)); + } + }); +}); diff --git a/src/plugins/visualizations/common/convert_to_lens/lib/convert/column.test.ts b/src/plugins/visualizations/common/convert_to_lens/lib/convert/column.test.ts new file mode 100644 index 0000000000000..74e9f2a57a9fe --- /dev/null +++ b/src/plugins/visualizations/common/convert_to_lens/lib/convert/column.test.ts @@ -0,0 +1,105 @@ +/* + * 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. + */ + +import { METRIC_TYPES } from '@kbn/data-plugin/public'; +import { stubLogstashDataView } from '@kbn/data-views-plugin/common/data_view.stub'; +import { SchemaConfig } from '../../..'; +import { createColumn } from './column'; +import { GeneralColumnWithMeta } from './types'; + +describe('createColumn', () => { + const field = stubLogstashDataView.fields[0]; + const aggId = `some-id`; + const customLabel = 'some-custom-label'; + const label = 'some label'; + const timeShift = '1h'; + + const agg: SchemaConfig = { + accessor: 0, + label, + format: { + id: undefined, + params: undefined, + }, + params: {}, + aggType: METRIC_TYPES.AVG, + aggId, + aggParams: { + field: field.name, + }, + }; + + const aggWithCustomLabel: SchemaConfig = { + ...agg, + aggParams: { + field: field.name, + customLabel, + }, + }; + + const aggWithTimeShift: SchemaConfig = { + ...agg, + aggParams: { + field: field.name, + timeShift, + }, + }; + + const extraColumnFields = { isBucketed: true, isSplit: true, reducedTimeRange: '1m' }; + + test.each<[string, Parameters, Partial]>([ + [ + 'with default params', + [agg, field], + { + dataType: 'number', + isBucketed: false, + isSplit: false, + label, + meta: { aggId }, + }, + ], + [ + 'with custom label', + [aggWithCustomLabel, field], + { + dataType: 'number', + isBucketed: false, + isSplit: false, + label: customLabel, + meta: { aggId }, + }, + ], + [ + 'with timeShift', + [aggWithTimeShift, field], + { + dataType: 'number', + isBucketed: false, + isSplit: false, + label, + meta: { aggId }, + timeShift, + }, + ], + [ + 'with extra column fields', + [agg, field, extraColumnFields], + { + dataType: 'number', + isBucketed: extraColumnFields.isBucketed, + isSplit: extraColumnFields.isSplit, + reducedTimeRange: extraColumnFields.reducedTimeRange, + label, + meta: { aggId }, + }, + ], + ])('should create column by agg %s', (_, input, expected) => { + expect(createColumn(...input)).toEqual(expect.objectContaining(expected)); + }); +}); diff --git a/src/plugins/visualizations/common/convert_to_lens/lib/convert/date_histogram.test.ts b/src/plugins/visualizations/common/convert_to_lens/lib/convert/date_histogram.test.ts new file mode 100644 index 0000000000000..897e5f876542b --- /dev/null +++ b/src/plugins/visualizations/common/convert_to_lens/lib/convert/date_histogram.test.ts @@ -0,0 +1,90 @@ +/* + * 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. + */ + +import { stubLogstashDataView } from '@kbn/data-views-plugin/common/data_view.stub'; +import { AggParamsDateHistogram } from '@kbn/data-plugin/common'; +import { convertToDateHistogramColumn } from './date_histogram'; +import { DateHistogramColumn } from './types'; +import { DataType } from '../../types'; + +describe('convertToDateHistogramColumn', () => { + const aggId = `some-id`; + const timeShift = '1h'; + const aggParams: AggParamsDateHistogram = { + interval: '1d', + drop_partials: true, + field: stubLogstashDataView.fields[0].name, + }; + + test.each< + [string, Parameters, Partial | null] + >([ + [ + 'date histogram column if field is provided', + [aggId, aggParams, stubLogstashDataView, false, false], + { + dataType: stubLogstashDataView.fields[0].type as DataType, + isBucketed: true, + isSplit: false, + timeShift: undefined, + sourceField: stubLogstashDataView.fields[0].name, + meta: { aggId }, + params: { + interval: '1d', + includeEmptyRows: true, + dropPartials: true, + }, + }, + ], + [ + 'null if field is not provided', + [aggId, { interval: '1d', field: undefined }, stubLogstashDataView, false, false], + null, + ], + [ + 'date histogram column with isSplit and timeShift if specified', + [aggId, { ...aggParams, timeShift }, stubLogstashDataView, true, false], + { + dataType: stubLogstashDataView.fields[0].type as DataType, + isBucketed: true, + isSplit: true, + sourceField: stubLogstashDataView.fields[0].name, + timeShift, + meta: { aggId }, + params: { + interval: '1d', + includeEmptyRows: true, + dropPartials: true, + }, + }, + ], + [ + 'date histogram column with dropEmptyRowsInDateHistogram if specified', + [aggId, aggParams, stubLogstashDataView, true, true], + { + dataType: stubLogstashDataView.fields[0].type as DataType, + isBucketed: true, + isSplit: true, + sourceField: stubLogstashDataView.fields[0].name, + timeShift: undefined, + meta: { aggId }, + params: { + interval: '1d', + includeEmptyRows: false, + dropPartials: true, + }, + }, + ], + ])('should return %s', (_, input, expected) => { + if (expected === null) { + expect(convertToDateHistogramColumn(...input)).toBeNull(); + } else { + expect(convertToDateHistogramColumn(...input)).toEqual(expect.objectContaining(expected)); + } + }); +}); diff --git a/src/plugins/visualizations/common/convert_to_lens/lib/convert/filters.test.ts b/src/plugins/visualizations/common/convert_to_lens/lib/convert/filters.test.ts new file mode 100644 index 0000000000000..1de1dbc9b312d --- /dev/null +++ b/src/plugins/visualizations/common/convert_to_lens/lib/convert/filters.test.ts @@ -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 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 { AggParamsFilters } from '@kbn/data-plugin/common'; +import { convertToFiltersColumn } from './filters'; +import { FiltersColumn } from './types'; + +describe('convertToFiltersColumn', () => { + const aggId = `some-id`; + const timeShift = '1h'; + const filters = [{ input: { language: 'lucene', query: 'some other query' }, label: 'split' }]; + const aggParams: AggParamsFilters = { + filters, + }; + + test.each<[string, Parameters, Partial | null]>([ + [ + 'filters column if filters are provided', + [aggId, aggParams], + { + dataType: 'string', + isBucketed: true, + isSplit: false, + timeShift: undefined, + meta: { aggId }, + params: { filters: aggParams.filters! }, + }, + ], + ['null if filters are not provided', [aggId, {}], null], + [ + 'filters column with isSplit and timeShift if specified', + [aggId, { ...aggParams, timeShift }, true], + { + dataType: 'string', + isBucketed: true, + isSplit: true, + timeShift, + meta: { aggId }, + params: { filters: aggParams.filters! }, + }, + ], + ])('should return %s', (_, input, expected) => { + if (expected === null) { + expect(convertToFiltersColumn(...input)).toBeNull(); + } else { + expect(convertToFiltersColumn(...input)).toEqual(expect.objectContaining(expected)); + } + }); +}); diff --git a/src/plugins/visualizations/common/convert_to_lens/lib/convert/formula.test.ts b/src/plugins/visualizations/common/convert_to_lens/lib/convert/formula.test.ts new file mode 100644 index 0000000000000..bbde6a04f1a2f --- /dev/null +++ b/src/plugins/visualizations/common/convert_to_lens/lib/convert/formula.test.ts @@ -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 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 { IAggConfig, METRIC_TYPES } from '@kbn/data-plugin/common'; +import { stubLogstashDataView } from '@kbn/data-views-plugin/common/data_view.stub'; +import { SchemaConfig } from '../../..'; +import { createFormulaColumn } from './formula'; + +describe('createFormulaColumn', () => { + const aggId = `some-id`; + const label = 'some label'; + const agg: SchemaConfig = { + accessor: 0, + label, + format: { + id: undefined, + params: undefined, + }, + params: {}, + aggType: METRIC_TYPES.CUMULATIVE_SUM, + aggId, + aggParams: { + customMetric: { + id: 'some-id-metric', + enabled: true, + type: { name: METRIC_TYPES.AVG }, + params: { + field: stubLogstashDataView.fields[0], + }, + } as IAggConfig, + }, + }; + test('should return formula column', () => { + expect(createFormulaColumn('test-formula', agg)).toEqual( + expect.objectContaining({ + isBucketed: false, + isSplit: false, + meta: { + aggId, + }, + operationType: 'formula', + params: { + formula: 'test-formula', + }, + references: [], + }) + ); + }); +}); diff --git a/src/plugins/visualizations/common/convert_to_lens/lib/convert/last_value.test.ts b/src/plugins/visualizations/common/convert_to_lens/lib/convert/last_value.test.ts new file mode 100644 index 0000000000000..55ba1e8b5e09d --- /dev/null +++ b/src/plugins/visualizations/common/convert_to_lens/lib/convert/last_value.test.ts @@ -0,0 +1,120 @@ +/* + * 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. + */ + +import { AggParamsTopHit, METRIC_TYPES } from '@kbn/data-plugin/common'; +import { stubLogstashDataView } from '@kbn/data-views-plugin/common/data_view.stub'; +import { SchemaConfig } from '../../..'; +import { convertToLastValueColumn } from './last_value'; +import { FiltersColumn } from './types'; + +const mockGetFieldNameFromField = jest.fn(); +const mockGetFieldByName = jest.fn(); +const mockGetLabel = jest.fn(); + +jest.mock('../utils', () => ({ + getFieldNameFromField: jest.fn(() => mockGetFieldNameFromField()), + getLabel: jest.fn(() => mockGetLabel()), +})); + +describe('convertToLastValueColumn', () => { + const dataView = stubLogstashDataView; + const sortField = dataView.fields[0]; + + const topHitAggParams: AggParamsTopHit = { + sortOrder: { + value: 'desc', + text: 'some text', + }, + sortField, + field: '', + aggregate: 'min', + size: 1, + }; + + const topHitAgg: SchemaConfig = { + accessor: 0, + label: '', + format: { + id: undefined, + params: undefined, + }, + params: {}, + aggType: METRIC_TYPES.TOP_HITS, + aggParams: topHitAggParams, + }; + + beforeEach(() => { + jest.clearAllMocks(); + mockGetFieldNameFromField.mockReturnValue(dataView.fields[0]); + mockGetFieldByName.mockReturnValue(dataView.fields[0]); + mockGetLabel.mockReturnValue('someLabel'); + dataView.getFieldByName = mockGetFieldByName; + }); + + test.each<[string, Parameters, Partial | null]>([ + [ + 'null if top hits size is more than 1', + [{ agg: { ...topHitAgg, aggParams: { ...topHitAgg.aggParams!, size: 2 } }, dataView }], + null, + ], + [ + 'null if top hits sord order is not desc', + [ + { + agg: { + ...topHitAgg, + aggParams: { + ...topHitAgg.aggParams!, + sortOrder: { ...topHitAgg.aggParams!.sortOrder!, value: 'asc' }, + }, + }, + dataView, + }, + ], + null, + ], + ])('should return %s', (_, input, expected) => { + if (expected === null) { + expect(convertToLastValueColumn(...input)).toBeNull(); + } else { + expect(convertToLastValueColumn(...input)).toEqual(expect.objectContaining(expected)); + } + }); + + test('should skip if top hit field is not specified', () => { + mockGetFieldNameFromField.mockReturnValue(null); + expect(convertToLastValueColumn({ agg: topHitAgg, dataView })).toBeNull(); + expect(mockGetFieldNameFromField).toBeCalledTimes(1); + expect(dataView.getFieldByName).toBeCalledTimes(0); + }); + + test('should skip if top hit field is not present in index pattern', () => { + mockGetFieldByName.mockReturnValue(null); + dataView.getFieldByName = mockGetFieldByName; + + expect(convertToLastValueColumn({ agg: topHitAgg, dataView })).toBeNull(); + expect(mockGetFieldNameFromField).toBeCalledTimes(1); + expect(dataView.getFieldByName).toBeCalledTimes(1); + expect(mockGetLabel).toBeCalledTimes(0); + }); + + test('should return top hit column if top hit field is not present in index pattern', () => { + expect(convertToLastValueColumn({ agg: topHitAgg, dataView })).toEqual( + expect.objectContaining({ + dataType: 'number', + label: 'someLabel', + operationType: 'last_value', + params: { showArrayValues: true, sortField: 'bytes' }, + sourceField: 'bytes', + }) + ); + expect(mockGetFieldNameFromField).toBeCalledTimes(1); + expect(dataView.getFieldByName).toBeCalledTimes(1); + expect(mockGetLabel).toBeCalledTimes(1); + }); +}); diff --git a/src/plugins/visualizations/common/convert_to_lens/lib/convert/metric.test.ts b/src/plugins/visualizations/common/convert_to_lens/lib/convert/metric.test.ts new file mode 100644 index 0000000000000..3be17abc46ac1 --- /dev/null +++ b/src/plugins/visualizations/common/convert_to_lens/lib/convert/metric.test.ts @@ -0,0 +1,92 @@ +/* + * 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. + */ + +import { METRIC_TYPES } from '@kbn/data-plugin/common'; +import { stubLogstashDataView } from '@kbn/data-views-plugin/common/data_view.stub'; +import { SchemaConfig } from '../../..'; +import { convertMetricAggregationColumnWithoutSpecialParams } from './metric'; +import { SUPPORTED_METRICS } from './supported_metrics'; + +const mockGetFieldByName = jest.fn(); + +describe('convertToLastValueColumn', () => { + const dataView = stubLogstashDataView; + + const agg: SchemaConfig = { + accessor: 0, + label: '', + format: { + id: undefined, + params: undefined, + }, + params: {}, + aggType: METRIC_TYPES.AVG, + aggParams: { + field: dataView.fields[0].displayName, + }, + }; + + beforeEach(() => { + jest.clearAllMocks(); + mockGetFieldByName.mockReturnValue(dataView.fields[0]); + dataView.getFieldByName = mockGetFieldByName; + }); + + test('should return null metric is not supported', () => { + expect( + convertMetricAggregationColumnWithoutSpecialParams(SUPPORTED_METRICS[METRIC_TYPES.TOP_HITS], { + agg, + dataView, + }) + ).toBeNull(); + }); + + test('should skip if field is not present and is required for the aggregation', () => { + mockGetFieldByName.mockReturnValue(null); + dataView.getFieldByName = mockGetFieldByName; + + expect( + convertMetricAggregationColumnWithoutSpecialParams(SUPPORTED_METRICS[METRIC_TYPES.AVG], { + agg, + dataView, + }) + ).toBeNull(); + expect(dataView.getFieldByName).toBeCalledTimes(1); + }); + + test('should return column if field is not present and is not required for the aggregation', () => { + mockGetFieldByName.mockReturnValue(null); + dataView.getFieldByName = mockGetFieldByName; + + expect( + convertMetricAggregationColumnWithoutSpecialParams(SUPPORTED_METRICS[METRIC_TYPES.COUNT], { + agg, + dataView, + }) + ).toEqual(expect.objectContaining({ operationType: 'count' })); + expect(dataView.getFieldByName).toBeCalledTimes(1); + }); + + test('should return column if field is present and is required for the aggregation', () => { + mockGetFieldByName.mockReturnValue(dataView.fields[0]); + dataView.getFieldByName = mockGetFieldByName; + + expect( + convertMetricAggregationColumnWithoutSpecialParams(SUPPORTED_METRICS[METRIC_TYPES.AVG], { + agg, + dataView, + }) + ).toEqual( + expect.objectContaining({ + dataType: 'number', + operationType: 'average', + }) + ); + expect(dataView.getFieldByName).toBeCalledTimes(1); + }); +}); diff --git a/src/plugins/visualizations/common/convert_to_lens/lib/convert/parent_pipeline.test.ts b/src/plugins/visualizations/common/convert_to_lens/lib/convert/parent_pipeline.test.ts new file mode 100644 index 0000000000000..c28324533c837 --- /dev/null +++ b/src/plugins/visualizations/common/convert_to_lens/lib/convert/parent_pipeline.test.ts @@ -0,0 +1,438 @@ +/* + * 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. + */ + +import { METRIC_TYPES } from '@kbn/data-plugin/common'; +import { stubLogstashDataView } from '@kbn/data-views-plugin/common/data_view.stub'; +import { FormulaColumn, AggBasedColumn } from './types'; +import { SchemaConfig } from '../../..'; +import { + convertToOtherParentPipelineAggColumns, + ParentPipelineAggColumn, + convertToCumulativeSumAggColumn, +} from './parent_pipeline'; + +const mockGetMetricFromParentPipelineAgg = jest.fn(); +const mockGetFormulaForPipelineAgg = jest.fn(); +const mockConvertMetricToColumns = jest.fn(); +const mockGetFieldByName = jest.fn(); +const mockConvertMetricAggregationColumnWithoutSpecialParams = jest.fn(); + +jest.mock('../utils', () => ({ + getMetricFromParentPipelineAgg: jest.fn(() => mockGetMetricFromParentPipelineAgg()), + getLabel: jest.fn(() => 'label'), + getFieldNameFromField: jest.fn(() => 'document'), +})); + +jest.mock('./metric', () => ({ + convertMetricAggregationColumnWithoutSpecialParams: jest.fn(() => + mockConvertMetricAggregationColumnWithoutSpecialParams() + ), +})); + +jest.mock('../metrics', () => ({ + getFormulaForPipelineAgg: jest.fn(() => mockGetFormulaForPipelineAgg()), + convertMetricToColumns: jest.fn(() => mockConvertMetricToColumns()), +})); + +describe('convertToOtherParentPipelineAggColumns', () => { + const field = stubLogstashDataView.fields[0].name; + const aggs: Array> = [ + { + aggId: '1', + aggType: METRIC_TYPES.AVG, + aggParams: { field }, + accessor: 0, + params: {}, + label: 'average', + format: {}, + }, + { + aggId: '1', + aggType: METRIC_TYPES.MOVING_FN, + aggParams: { metricAgg: '2' }, + accessor: 0, + params: {}, + label: 'Moving Average of Average', + format: {}, + }, + ]; + + afterEach(() => { + jest.clearAllMocks(); + }); + + test.each< + [ + string, + Parameters, + () => void, + Partial | [Partial, Partial] | null + ] + >([ + [ + 'null if getMetricFromParentPipelineAgg returns null', + [ + { + dataView: stubLogstashDataView, + aggs, + agg: aggs[1] as SchemaConfig, + }, + ], + () => { + mockGetMetricFromParentPipelineAgg.mockReturnValue(null); + }, + null, + ], + [ + 'null if cutom metric of parent pipeline agg is not supported', + [ + { + dataView: stubLogstashDataView, + aggs, + agg: aggs[1] as SchemaConfig, + }, + ], + () => { + mockGetMetricFromParentPipelineAgg.mockReturnValue({ + aggId: '2-metric', + aggType: METRIC_TYPES.GEO_BOUNDS, + }); + }, + null, + ], + [ + 'null if cutom metric of parent pipeline agg is sibling pipeline agg', + [ + { + dataView: stubLogstashDataView, + aggs, + agg: aggs[1] as SchemaConfig, + }, + ], + () => { + mockGetMetricFromParentPipelineAgg.mockReturnValue({ + aggId: '2-metric', + aggType: METRIC_TYPES.AVG_BUCKET, + }); + }, + null, + ], + [ + 'null if cannot build formula if cutom metric of parent pipeline agg is parent pipeline agg', + [ + { + dataView: stubLogstashDataView, + aggs, + agg: aggs[1] as SchemaConfig, + }, + ], + () => { + mockGetMetricFromParentPipelineAgg.mockReturnValue({ + aggId: '2-metric', + aggType: METRIC_TYPES.MOVING_FN, + }); + mockGetFormulaForPipelineAgg.mockReturnValue(null); + }, + null, + ], + [ + 'formula column if cutom metric of parent pipeline agg is valid parent pipeline agg', + [ + { + dataView: stubLogstashDataView, + aggs, + agg: aggs[1] as SchemaConfig, + }, + ], + () => { + mockGetMetricFromParentPipelineAgg.mockReturnValue({ + aggId: '2-metric', + aggType: METRIC_TYPES.MOVING_FN, + }); + mockGetFormulaForPipelineAgg.mockReturnValue('test-formula'); + }, + { + operationType: 'formula', + params: { + formula: 'test-formula', + }, + }, + ], + [ + 'null if cutom metric of parent pipeline agg is invalid not pipeline agg', + [ + { + dataView: stubLogstashDataView, + aggs, + agg: aggs[1] as SchemaConfig, + }, + ], + () => { + mockGetMetricFromParentPipelineAgg.mockReturnValue({ + aggId: '2-metric', + aggType: METRIC_TYPES.AVG, + }); + mockConvertMetricToColumns.mockReturnValue(null); + }, + null, + ], + [ + 'parent pipeline and metric columns if cutom metric of parent pipeline agg is valid not pipeline agg', + [ + { + dataView: stubLogstashDataView, + aggs, + agg: aggs[1] as SchemaConfig, + }, + ], + () => { + mockGetMetricFromParentPipelineAgg.mockReturnValue({ + aggId: '2-metric', + aggType: METRIC_TYPES.AVG, + }); + mockConvertMetricToColumns.mockReturnValue([ + { + columnId: 'test-id-1', + operationType: 'average', + sourceField: field, + }, + ]); + }, + [ + { operationType: 'moving_average', references: ['test-id-1'] }, + { + columnId: 'test-id-1', + operationType: 'average', + sourceField: field, + }, + ], + ], + ])('should return %s', (_, input, actions, expected) => { + actions(); + if (expected === null) { + expect(convertToOtherParentPipelineAggColumns(...input)).toBeNull(); + } else if (Array.isArray(expected)) { + expect(convertToOtherParentPipelineAggColumns(...input)).toEqual( + expected.map(expect.objectContaining) + ); + } else { + expect(convertToOtherParentPipelineAggColumns(...input)).toEqual( + expect.objectContaining(expected) + ); + } + }); +}); + +describe('convertToCumulativeSumAggColumn', () => { + const field = stubLogstashDataView.fields[0].name; + const aggs: Array> = [ + { + aggId: '1', + aggType: METRIC_TYPES.AVG, + aggParams: { field }, + accessor: 0, + params: {}, + label: 'average', + format: {}, + }, + { + aggId: '1', + aggType: METRIC_TYPES.CUMULATIVE_SUM, + aggParams: { metricAgg: '2' }, + accessor: 0, + params: {}, + label: 'Moving Average of Average', + format: {}, + }, + ]; + + beforeEach(() => { + mockGetFieldByName.mockReturnValue({ + aggregatable: true, + type: 'number', + sourceField: 'bytes', + }); + + stubLogstashDataView.getFieldByName = mockGetFieldByName; + }); + + afterEach(() => { + jest.clearAllMocks(); + }); + + test.each< + [ + string, + Parameters, + () => void, + Partial | [Partial, Partial] | null + ] + >([ + [ + 'null if cumulative sum does not have aggParams', + [ + { + dataView: stubLogstashDataView, + aggs, + agg: { ...aggs[1], aggParams: undefined } as SchemaConfig, + }, + ], + () => { + mockGetMetricFromParentPipelineAgg.mockReturnValue(null); + }, + null, + ], + [ + 'null if getMetricFromParentPipelineAgg returns null', + [ + { + dataView: stubLogstashDataView, + aggs, + agg: aggs[1] as SchemaConfig, + }, + ], + () => { + mockGetMetricFromParentPipelineAgg.mockReturnValue(null); + }, + null, + ], + [ + 'null if cutom metric of parent pipeline agg is not supported', + [ + { + dataView: stubLogstashDataView, + aggs, + agg: aggs[1] as SchemaConfig, + }, + ], + () => { + mockGetMetricFromParentPipelineAgg.mockReturnValue({ + aggId: '2-metric', + aggType: METRIC_TYPES.GEO_BOUNDS, + }); + }, + null, + ], + [ + 'null if cutom metric of parent pipeline agg is sibling pipeline agg', + [ + { + dataView: stubLogstashDataView, + aggs, + agg: aggs[1] as SchemaConfig, + }, + ], + () => { + mockGetMetricFromParentPipelineAgg.mockReturnValue({ + aggId: '2-metric', + aggType: METRIC_TYPES.AVG_BUCKET, + }); + }, + null, + ], + [ + 'null if cannot build formula if cutom metric of parent pipeline agg is parent pipeline agg', + [ + { + dataView: stubLogstashDataView, + aggs, + agg: aggs[1] as SchemaConfig, + }, + ], + () => { + mockGetMetricFromParentPipelineAgg.mockReturnValue({ + aggId: '2-metric', + aggType: METRIC_TYPES.MOVING_FN, + }); + mockGetFormulaForPipelineAgg.mockReturnValue(null); + }, + null, + ], + [ + 'formula column if cutom metric of parent pipeline agg is valid parent pipeline agg', + [ + { + dataView: stubLogstashDataView, + aggs, + agg: aggs[1] as SchemaConfig, + }, + ], + () => { + mockGetMetricFromParentPipelineAgg.mockReturnValue({ + aggId: '2-metric', + aggType: METRIC_TYPES.MOVING_FN, + }); + mockGetFormulaForPipelineAgg.mockReturnValue('test-formula'); + }, + { + operationType: 'formula', + params: { + formula: 'test-formula', + }, + }, + ], + [ + 'null if cutom metric of parent pipeline agg is invalid sum or count agg', + [ + { + dataView: stubLogstashDataView, + aggs, + agg: aggs[1] as SchemaConfig, + }, + ], + () => { + mockGetMetricFromParentPipelineAgg.mockReturnValue({ + aggId: '2-metric', + aggType: METRIC_TYPES.SUM, + }); + mockConvertMetricAggregationColumnWithoutSpecialParams.mockReturnValue(null); + }, + null, + ], + [ + 'cumulative sum and metric columns if cutom metric of parent pipeline agg is valid sum or count agg', + [ + { + dataView: stubLogstashDataView, + aggs, + agg: aggs[1] as SchemaConfig, + }, + ], + () => { + mockGetMetricFromParentPipelineAgg.mockReturnValue({ + aggId: '2-metric', + aggType: METRIC_TYPES.SUM, + }); + mockConvertMetricAggregationColumnWithoutSpecialParams.mockReturnValue({ + columnId: 'test-id-1', + operationType: 'sum', + sourceField: field, + }); + }, + [ + { operationType: 'cumulative_sum', references: ['test-id-1'] }, + { + columnId: 'test-id-1', + operationType: 'sum', + sourceField: field, + }, + ], + ], + ])('should return %s', (_, input, actions, expected) => { + actions(); + if (expected === null) { + expect(convertToCumulativeSumAggColumn(...input)).toBeNull(); + } else if (Array.isArray(expected)) { + expect(convertToCumulativeSumAggColumn(...input)).toEqual( + expected.map(expect.objectContaining) + ); + } else { + expect(convertToCumulativeSumAggColumn(...input)).toEqual(expect.objectContaining(expected)); + } + }); +}); diff --git a/src/plugins/visualizations/common/convert_to_lens/lib/convert/parent_pipeline.ts b/src/plugins/visualizations/common/convert_to_lens/lib/convert/parent_pipeline.ts index c1fd75ae19265..ab41ceb259adb 100644 --- a/src/plugins/visualizations/common/convert_to_lens/lib/convert/parent_pipeline.ts +++ b/src/plugins/visualizations/common/convert_to_lens/lib/convert/parent_pipeline.ts @@ -122,6 +122,7 @@ export const convertToCumulativeSumAggColumn = ( { agg: metric as SchemaConfig, dataView }, reducedTimeRange ); + if (subMetric === null) { return null; } @@ -134,8 +135,8 @@ export const convertToCumulativeSumAggColumn = ( return [ { operationType: op.name, - references: [subMetric?.columnId], ...createColumn(agg), + references: [subMetric?.columnId], params: {}, timeShift: agg.aggParams?.timeShift, } as ParentPipelineAggColumn, diff --git a/src/plugins/visualizations/common/convert_to_lens/lib/convert/percentile.test.ts b/src/plugins/visualizations/common/convert_to_lens/lib/convert/percentile.test.ts new file mode 100644 index 0000000000000..b4cf7f141e928 --- /dev/null +++ b/src/plugins/visualizations/common/convert_to_lens/lib/convert/percentile.test.ts @@ -0,0 +1,142 @@ +/* + * 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. + */ + +import { METRIC_TYPES } from '@kbn/data-plugin/common'; +import { stubLogstashDataView } from '@kbn/data-views-plugin/common/data_view.stub'; +import { SchemaConfig } from '../../..'; +import { convertToPercentileColumn } from './percentile'; +import { PercentileColumn } from './types'; + +const mockGetFieldNameFromField = jest.fn(); +const mockGetFieldByName = jest.fn(); +const mockGetLabel = jest.fn(); +const mockGetLabelForPercentile = jest.fn(); + +jest.mock('../utils', () => ({ + getFieldNameFromField: jest.fn(() => mockGetFieldNameFromField()), + getLabel: jest.fn(() => mockGetLabel()), + getLabelForPercentile: jest.fn(() => mockGetLabelForPercentile()), +})); + +describe('convertToPercentileColumn', () => { + const dataView = stubLogstashDataView; + const field = dataView.fields[0].displayName; + const aggId = 'pr.10'; + const percentile = 10; + const percents = [percentile]; + + const agg: SchemaConfig = { + accessor: 0, + label: '', + format: { + id: undefined, + params: undefined, + }, + params: {}, + aggType: METRIC_TYPES.PERCENTILES, + aggParams: { field, percents }, + aggId, + }; + const singlePercentileRankAgg: SchemaConfig = { + accessor: 0, + label: '', + format: { + id: undefined, + params: undefined, + }, + params: {}, + aggType: METRIC_TYPES.SINGLE_PERCENTILE, + aggParams: { field, percentile }, + aggId, + }; + + beforeEach(() => { + jest.clearAllMocks(); + mockGetFieldNameFromField.mockReturnValue(dataView.fields[0]); + mockGetFieldByName.mockReturnValue(dataView.fields[0]); + mockGetLabel.mockReturnValue('someLabel'); + mockGetLabelForPercentile.mockReturnValue('someOtherLabel'); + dataView.getFieldByName = mockGetFieldByName; + }); + + test.each< + [string, Parameters, Partial | null] + >([ + ['null if no percents', [{ agg: { ...agg, aggId: 'pr' }, dataView }], null], + [ + 'null if no value', + [{ agg: { ...singlePercentileRankAgg, aggParams: undefined }, dataView }], + null, + ], + ['null if no aggId', [{ agg: { ...agg, aggId: undefined }, dataView }], null], + ['null if no aggParams', [{ agg: { ...agg, aggParams: undefined }, dataView }], null], + ['null if aggId is invalid', [{ agg: { ...agg, aggId: 'pr.invalid' }, dataView }], null], + [ + 'null if values are undefined', + [{ agg: { ...agg, aggParams: { percents: undefined, field } }, dataView }], + null, + ], + [ + 'null if values are empty', + [{ agg: { ...agg, aggParams: { percents: [], field } }, dataView }], + null, + ], + ])('should return %s', (_, input, expected) => { + if (expected === null) { + expect(convertToPercentileColumn(...input)).toBeNull(); + } else { + expect(convertToPercentileColumn(...input)).toEqual(expect.objectContaining(expected)); + } + }); + + test('should return null if field is not specified', () => { + mockGetFieldNameFromField.mockReturnValue(null); + expect(convertToPercentileColumn({ agg, dataView })).toBeNull(); + expect(mockGetFieldNameFromField).toBeCalledTimes(1); + expect(dataView.getFieldByName).toBeCalledTimes(0); + }); + + test('should return null if field absent at the index pattern', () => { + mockGetFieldByName.mockReturnValueOnce(null); + dataView.getFieldByName = mockGetFieldByName; + + expect(convertToPercentileColumn({ agg, dataView })).toBeNull(); + expect(mockGetFieldNameFromField).toBeCalledTimes(1); + expect(dataView.getFieldByName).toBeCalledTimes(1); + }); + + test('should return percentile rank column for percentiles', () => { + expect(convertToPercentileColumn({ agg, dataView })).toEqual( + expect.objectContaining({ + dataType: 'number', + label: 'someOtherLabel', + meta: { aggId: 'pr.10' }, + operationType: 'percentile', + params: { percentile: 10 }, + sourceField: 'bytes', + }) + ); + expect(mockGetFieldNameFromField).toBeCalledTimes(1); + expect(dataView.getFieldByName).toBeCalledTimes(1); + }); + + test('should return percentile rank column for single percentile', () => { + expect(convertToPercentileColumn({ agg: singlePercentileRankAgg, dataView })).toEqual( + expect.objectContaining({ + dataType: 'number', + label: 'someOtherLabel', + meta: { aggId: 'pr.10' }, + operationType: 'percentile', + params: { percentile: 10 }, + sourceField: 'bytes', + }) + ); + expect(mockGetFieldNameFromField).toBeCalledTimes(1); + expect(dataView.getFieldByName).toBeCalledTimes(1); + }); +}); diff --git a/src/plugins/visualizations/common/convert_to_lens/lib/convert/percentile_rank.test.ts b/src/plugins/visualizations/common/convert_to_lens/lib/convert/percentile_rank.test.ts new file mode 100644 index 0000000000000..8a696d51d871b --- /dev/null +++ b/src/plugins/visualizations/common/convert_to_lens/lib/convert/percentile_rank.test.ts @@ -0,0 +1,146 @@ +/* + * 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. + */ + +import { METRIC_TYPES } from '@kbn/data-plugin/common'; +import { stubLogstashDataView } from '@kbn/data-views-plugin/common/data_view.stub'; +import { SchemaConfig } from '../../..'; +import { convertToPercentileRankColumn } from './percentile_rank'; +import { PercentileRanksColumn } from './types'; + +const mockGetFieldNameFromField = jest.fn(); +const mockGetFieldByName = jest.fn(); +const mockGetLabel = jest.fn(); +const mockGetLabelForPercentile = jest.fn(); + +jest.mock('../utils', () => ({ + getFieldNameFromField: jest.fn(() => mockGetFieldNameFromField()), + getLabel: jest.fn(() => mockGetLabel()), + getLabelForPercentile: jest.fn(() => mockGetLabelForPercentile()), +})); + +describe('convertToPercentileRankColumn', () => { + const dataView = stubLogstashDataView; + const field = dataView.fields[0].displayName; + const aggId = 'pr.10'; + const value = 10; + const values = [value]; + + const agg: SchemaConfig = { + accessor: 0, + label: '', + format: { + id: undefined, + params: undefined, + }, + params: {}, + aggType: METRIC_TYPES.PERCENTILE_RANKS, + aggParams: { field, values }, + aggId, + }; + const singlePercentileRankAgg: SchemaConfig = { + accessor: 0, + label: '', + format: { + id: undefined, + params: undefined, + }, + params: {}, + aggType: METRIC_TYPES.SINGLE_PERCENTILE_RANK, + aggParams: { field, value }, + aggId, + }; + + beforeEach(() => { + jest.clearAllMocks(); + mockGetFieldNameFromField.mockReturnValue(dataView.fields[0]); + mockGetFieldByName.mockReturnValue(dataView.fields[0]); + mockGetLabel.mockReturnValue('someLabel'); + mockGetLabelForPercentile.mockReturnValue('someOtherLabel'); + dataView.getFieldByName = mockGetFieldByName; + }); + + test.each< + [ + string, + Parameters, + Partial | null + ] + >([ + ['null if no percents', [{ agg: { ...agg, aggId: 'pr' }, dataView }], null], + [ + 'null if no value', + [{ agg: { ...singlePercentileRankAgg, aggParams: undefined }, dataView }], + null, + ], + ['null if no aggId', [{ agg: { ...agg, aggId: undefined }, dataView }], null], + ['null if no aggParams', [{ agg: { ...agg, aggParams: undefined }, dataView }], null], + ['null if aggId is invalid', [{ agg: { ...agg, aggId: 'pr.invalid' }, dataView }], null], + [ + 'null if values are undefined', + [{ agg: { ...agg, aggParams: { values: undefined, field } }, dataView }], + null, + ], + [ + 'null if values are empty', + [{ agg: { ...agg, aggParams: { values: [], field } }, dataView }], + null, + ], + ])('should return %s', (_, input, expected) => { + if (expected === null) { + expect(convertToPercentileRankColumn(...input)).toBeNull(); + } else { + expect(convertToPercentileRankColumn(...input)).toEqual(expect.objectContaining(expected)); + } + }); + + test('should return null if field is not specified', () => { + mockGetFieldNameFromField.mockReturnValue(null); + expect(convertToPercentileRankColumn({ agg, dataView })).toBeNull(); + expect(mockGetFieldNameFromField).toBeCalledTimes(1); + expect(dataView.getFieldByName).toBeCalledTimes(0); + }); + + test('should return null if field absent at the index pattern', () => { + mockGetFieldByName.mockReturnValueOnce(null); + dataView.getFieldByName = mockGetFieldByName; + + expect(convertToPercentileRankColumn({ agg, dataView })).toBeNull(); + expect(mockGetFieldNameFromField).toBeCalledTimes(1); + expect(dataView.getFieldByName).toBeCalledTimes(1); + }); + + test('should return percentile rank column for percentile ranks', () => { + expect(convertToPercentileRankColumn({ agg, dataView })).toEqual( + expect.objectContaining({ + dataType: 'number', + label: 'someOtherLabel', + meta: { aggId: 'pr.10' }, + operationType: 'percentile_rank', + params: { value: 10 }, + sourceField: 'bytes', + }) + ); + expect(mockGetFieldNameFromField).toBeCalledTimes(1); + expect(dataView.getFieldByName).toBeCalledTimes(1); + }); + + test('should return percentile rank column for single percentile rank', () => { + expect(convertToPercentileRankColumn({ agg: singlePercentileRankAgg, dataView })).toEqual( + expect.objectContaining({ + dataType: 'number', + label: 'someOtherLabel', + meta: { aggId: 'pr.10' }, + operationType: 'percentile_rank', + params: { value: 10 }, + sourceField: 'bytes', + }) + ); + expect(mockGetFieldNameFromField).toBeCalledTimes(1); + expect(dataView.getFieldByName).toBeCalledTimes(1); + }); +}); diff --git a/src/plugins/visualizations/common/convert_to_lens/lib/convert/range.test.ts b/src/plugins/visualizations/common/convert_to_lens/lib/convert/range.test.ts new file mode 100644 index 0000000000000..8f535c28c8264 --- /dev/null +++ b/src/plugins/visualizations/common/convert_to_lens/lib/convert/range.test.ts @@ -0,0 +1,74 @@ +/* + * 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. + */ + +import { stubLogstashDataView } from '@kbn/data-views-plugin/common/data_view.stub'; +import { AggParamsRange, AggParamsHistogram } from '@kbn/data-plugin/common'; +import { convertToRangeColumn } from './range'; +import { RangeColumn } from './types'; +import { DataType } from '../../types'; +import { RANGE_MODES } from '../../constants'; + +describe('convertToRangeColumn', () => { + const aggId = `some-id`; + const ranges = [ + { + from: 1, + to: 1000, + label: '1', + }, + ]; + const aggParamsRange: AggParamsRange = { + field: stubLogstashDataView.fields[0].name, + ranges, + }; + const aggParamsHistogram: AggParamsHistogram = { + interval: '1d', + field: stubLogstashDataView.fields[0].name, + }; + + test.each<[string, Parameters, Partial | null]>([ + [ + 'range column if provide valid range agg', + [aggId, aggParamsRange, '', stubLogstashDataView], + { + dataType: stubLogstashDataView.fields[0].type as DataType, + isBucketed: true, + isSplit: false, + sourceField: stubLogstashDataView.fields[0].name, + meta: { aggId }, + params: { + type: RANGE_MODES.Range, + maxBars: 'auto', + ranges, + }, + }, + ], + [ + 'range column if provide valid histogram agg', + [aggId, aggParamsHistogram, '', stubLogstashDataView, true], + { + dataType: stubLogstashDataView.fields[0].type as DataType, + isBucketed: true, + isSplit: true, + sourceField: stubLogstashDataView.fields[0].name, + meta: { aggId }, + params: { + type: RANGE_MODES.Histogram, + maxBars: 'auto', + ranges: [], + }, + }, + ], + ])('should return %s', (_, input, expected) => { + if (expected === null) { + expect(convertToRangeColumn(...input)).toBeNull(); + } else { + expect(convertToRangeColumn(...input)).toEqual(expect.objectContaining(expected)); + } + }); +}); diff --git a/src/plugins/visualizations/common/convert_to_lens/lib/convert/sibling_pipeline.test.ts b/src/plugins/visualizations/common/convert_to_lens/lib/convert/sibling_pipeline.test.ts new file mode 100644 index 0000000000000..759620650b8a6 --- /dev/null +++ b/src/plugins/visualizations/common/convert_to_lens/lib/convert/sibling_pipeline.test.ts @@ -0,0 +1,79 @@ +/* + * 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. + */ + +import { IAggConfig, METRIC_TYPES } from '@kbn/data-plugin/common'; +import { stubLogstashDataView } from '@kbn/data-views-plugin/common/data_view.stub'; +import { SchemaConfig } from '../../..'; +import { convertToSiblingPipelineColumns } from './sibling_pipeline'; + +const mockConvertMetricToColumns = jest.fn(); +const mockConvertToSchemaConfig = jest.fn(); + +jest.mock('../metrics', () => ({ + convertMetricToColumns: jest.fn(() => mockConvertMetricToColumns()), +})); + +jest.mock('../../../vis_schemas', () => ({ + convertToSchemaConfig: jest.fn(() => mockConvertToSchemaConfig()), +})); + +describe('convertToSiblingPipelineColumns', () => { + const dataView = stubLogstashDataView; + const aggId = 'agg-id-1'; + const agg: SchemaConfig = { + accessor: 0, + label: '', + format: { + id: undefined, + params: undefined, + }, + params: {}, + aggType: METRIC_TYPES.AVG_BUCKET, + aggParams: { customMetric: {} as IAggConfig }, + aggId, + }; + + beforeEach(() => { + jest.clearAllMocks(); + mockConvertMetricToColumns.mockReturnValue([{}]); + mockConvertToSchemaConfig.mockReturnValue({}); + }); + + test('should return null if aggParams are not defined', () => { + expect( + convertToSiblingPipelineColumns({ agg: { ...agg, aggParams: undefined }, aggs: [], dataView }) + ).toBeNull(); + expect(mockConvertMetricToColumns).toBeCalledTimes(0); + }); + + test('should return null if customMetric is not defined', () => { + expect( + convertToSiblingPipelineColumns({ + agg: { ...agg, aggParams: { customMetric: undefined } }, + aggs: [], + dataView, + }) + ).toBeNull(); + expect(mockConvertMetricToColumns).toBeCalledTimes(0); + }); + + test('should return null if sibling agg is not supported', () => { + mockConvertMetricToColumns.mockReturnValue(null); + expect(convertToSiblingPipelineColumns({ agg, aggs: [], dataView })).toBeNull(); + expect(mockConvertToSchemaConfig).toBeCalledTimes(1); + expect(mockConvertMetricToColumns).toBeCalledTimes(1); + }); + + test('should return column', () => { + const column = { operationType: 'formula' }; + mockConvertMetricToColumns.mockReturnValue([column]); + expect(convertToSiblingPipelineColumns({ agg, aggs: [], dataView })).toEqual(column); + expect(mockConvertToSchemaConfig).toBeCalledTimes(1); + expect(mockConvertMetricToColumns).toBeCalledTimes(1); + }); +}); diff --git a/src/plugins/visualizations/common/convert_to_lens/lib/convert/std_deviation.test.ts b/src/plugins/visualizations/common/convert_to_lens/lib/convert/std_deviation.test.ts new file mode 100644 index 0000000000000..cbb1f03a6dc2e --- /dev/null +++ b/src/plugins/visualizations/common/convert_to_lens/lib/convert/std_deviation.test.ts @@ -0,0 +1,115 @@ +/* + * 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. + */ + +import { METRIC_TYPES } from '@kbn/data-plugin/common'; +import { stubLogstashDataView } from '@kbn/data-views-plugin/common/data_view.stub'; +import { SchemaConfig } from '../../..'; +import { convertToStdDeviationFormulaColumns } from './std_deviation'; +import { FormulaColumn } from './types'; + +const mockGetFieldNameFromField = jest.fn(); +const mockGetFieldByName = jest.fn(); +const mockGetLabel = jest.fn(); + +jest.mock('../utils', () => ({ + getFieldNameFromField: jest.fn(() => mockGetFieldNameFromField()), + getLabel: jest.fn(() => mockGetLabel()), +})); + +describe('convertToStdDeviationFormulaColumns', () => { + const dataView = stubLogstashDataView; + const stdLowerAggId = 'agg-id.std_lower'; + const stdUpperAggId = 'agg-id.std_upper'; + const label = 'std label'; + const agg: SchemaConfig = { + accessor: 0, + label, + format: { + id: undefined, + params: undefined, + }, + params: {}, + aggType: METRIC_TYPES.STD_DEV, + aggId: stdLowerAggId, + aggParams: { + field: dataView.fields[0].displayName, + }, + }; + + beforeEach(() => { + jest.clearAllMocks(); + mockGetFieldNameFromField.mockReturnValue(dataView.fields[0].displayName); + mockGetFieldByName.mockReturnValue(dataView.fields[0]); + mockGetLabel.mockReturnValue('some label'); + dataView.getFieldByName = mockGetFieldByName; + }); + + test.each< + [string, Parameters, Partial | null] + >([['null if no aggId is passed', [{ agg: { ...agg, aggId: undefined }, dataView }], null]])( + 'should return %s', + (_, input, expected) => { + if (expected === null) { + expect(convertToStdDeviationFormulaColumns(...input)).toBeNull(); + } else { + expect(convertToStdDeviationFormulaColumns(...input)).toEqual( + expect.objectContaining(expected) + ); + } + } + ); + + test('should return null if field is not present', () => { + mockGetFieldNameFromField.mockReturnValue(null); + expect(convertToStdDeviationFormulaColumns({ agg, dataView })).toBeNull(); + expect(mockGetFieldNameFromField).toBeCalledTimes(1); + expect(dataView.getFieldByName).toBeCalledTimes(0); + }); + + test("should return null if field doesn't exist in dataView", () => { + mockGetFieldByName.mockReturnValue(null); + dataView.getFieldByName = mockGetFieldByName; + expect(convertToStdDeviationFormulaColumns({ agg, dataView })).toBeNull(); + expect(mockGetFieldNameFromField).toBeCalledTimes(1); + expect(dataView.getFieldByName).toBeCalledTimes(1); + }); + + test('should return null if agg id is invalid', () => { + expect( + convertToStdDeviationFormulaColumns({ agg: { ...agg, aggId: 'some-id' }, dataView }) + ).toBeNull(); + expect(mockGetFieldNameFromField).toBeCalledTimes(1); + expect(dataView.getFieldByName).toBeCalledTimes(1); + }); + + test('should return formula column for lower std deviation', () => { + expect( + convertToStdDeviationFormulaColumns({ agg: { ...agg, aggId: stdLowerAggId }, dataView }) + ).toEqual( + expect.objectContaining({ + label, + meta: { aggId: 'agg-id.std_lower' }, + operationType: 'formula', + params: { formula: 'average(bytes) - 2 * standard_deviation(bytes)' }, + }) + ); + }); + + test('should return formula column for upper std deviation', () => { + expect( + convertToStdDeviationFormulaColumns({ agg: { ...agg, aggId: stdUpperAggId }, dataView }) + ).toEqual( + expect.objectContaining({ + label, + meta: { aggId: 'agg-id.std_upper' }, + operationType: 'formula', + params: { formula: 'average(bytes) + 2 * standard_deviation(bytes)' }, + }) + ); + }); +}); diff --git a/src/plugins/visualizations/common/convert_to_lens/lib/convert/terms.test.ts b/src/plugins/visualizations/common/convert_to_lens/lib/convert/terms.test.ts new file mode 100644 index 0000000000000..d214ec74b09b1 --- /dev/null +++ b/src/plugins/visualizations/common/convert_to_lens/lib/convert/terms.test.ts @@ -0,0 +1,241 @@ +/* + * 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. + */ + +import { stubLogstashDataView } from '@kbn/data-views-plugin/common/data_view.stub'; +import { AggParamsTerms, IAggConfig, METRIC_TYPES, BUCKET_TYPES } from '@kbn/data-plugin/common'; +import { convertToTermsColumn } from './terms'; +import { AggBasedColumn, TermsColumn } from './types'; +import { SchemaConfig } from '../../..'; + +const mockConvertMetricToColumns = jest.fn(); + +jest.mock('../metrics', () => ({ + convertMetricToColumns: jest.fn(() => mockConvertMetricToColumns()), +})); + +jest.mock('../../../vis_schemas', () => ({ + convertToSchemaConfig: jest.fn(() => ({})), +})); + +describe('convertToDateHistogramColumn', () => { + const aggId = `some-id`; + const aggParams: AggParamsTerms = { + field: stubLogstashDataView.fields[0].name, + orderBy: '_key', + order: { + value: 'asc', + text: '', + }, + size: 5, + }; + const aggs: Array> = [ + { + accessor: 0, + label: '', + format: { + id: undefined, + params: undefined, + }, + params: {}, + aggType: METRIC_TYPES.AVG, + aggParams: { + field: stubLogstashDataView.fields[0].name, + }, + }, + ]; + const metricColumns: AggBasedColumn[] = [ + { + columnId: 'column-1', + operationType: 'average', + isBucketed: false, + isSplit: false, + sourceField: stubLogstashDataView.fields[0].name, + dataType: 'number', + params: {}, + meta: { + aggId: '1', + }, + }, + ]; + + afterEach(() => { + jest.clearAllMocks(); + }); + + test.each< + [string, Parameters, Partial | null, () => void] + >([ + [ + 'null if dataview does not include field from terms params', + [ + aggId, + { + agg: { aggParams: { ...aggParams, field: '' } } as SchemaConfig, + dataView: stubLogstashDataView, + aggs, + metricColumns, + }, + '', + false, + ], + null, + () => {}, + ], + [ + 'terms column with alphabetical orderBy', + [ + aggId, + { + agg: { aggParams } as SchemaConfig, + dataView: stubLogstashDataView, + aggs, + metricColumns, + }, + '', + false, + ], + { + operationType: 'terms', + sourceField: stubLogstashDataView.fields[0].name, + isBucketed: true, + params: { + size: 5, + include: [], + exclude: [], + parentFormat: { id: 'terms' }, + orderBy: { type: 'alphabetical' }, + orderDirection: 'asc', + }, + }, + () => {}, + ], + [ + 'terms column with column orderBy if provided column for orderBy is exist', + [ + aggId, + { + agg: { aggParams: { ...aggParams, orderBy: '1' } } as SchemaConfig, + dataView: stubLogstashDataView, + aggs, + metricColumns, + }, + '', + false, + ], + { + operationType: 'terms', + sourceField: stubLogstashDataView.fields[0].name, + isBucketed: true, + params: { + size: 5, + include: [], + exclude: [], + parentFormat: { id: 'terms' }, + orderBy: { type: 'column', columnId: metricColumns[0].columnId }, + orderAgg: metricColumns[0], + orderDirection: 'asc', + }, + }, + () => {}, + ], + [ + 'null if provided column for orderBy is not exist', + [ + aggId, + { + agg: { aggParams: { ...aggParams, orderBy: '2' } } as SchemaConfig, + dataView: stubLogstashDataView, + aggs, + metricColumns, + }, + '', + false, + ], + null, + () => {}, + ], + [ + 'null if provided custom orderBy without orderAgg', + [ + aggId, + { + agg: { + aggParams: { ...aggParams, orderBy: 'custom', orderAgg: undefined }, + } as SchemaConfig, + dataView: stubLogstashDataView, + aggs, + metricColumns, + }, + '', + false, + ], + null, + () => {}, + ], + [ + 'null if provided custom orderBy and not valid orderAgg', + [ + aggId, + { + agg: { + aggParams: { ...aggParams, orderBy: 'custom', orderAgg: {} as IAggConfig }, + } as SchemaConfig, + dataView: stubLogstashDataView, + aggs, + metricColumns, + }, + '', + false, + ], + null, + () => { + mockConvertMetricToColumns.mockReturnValue(null); + }, + ], + [ + 'terms column with custom orderBy and prepared orderAgg', + [ + aggId, + { + agg: { + aggParams: { ...aggParams, orderBy: 'custom', orderAgg: {} as IAggConfig }, + } as SchemaConfig, + dataView: stubLogstashDataView, + aggs, + metricColumns, + }, + '', + false, + ], + { + operationType: 'terms', + sourceField: stubLogstashDataView.fields[0].name, + isBucketed: true, + params: { + size: 5, + include: [], + exclude: [], + parentFormat: { id: 'terms' }, + orderBy: { type: 'custom' }, + orderAgg: metricColumns[0], + orderDirection: 'asc', + }, + }, + () => { + mockConvertMetricToColumns.mockReturnValue(metricColumns); + }, + ], + ])('should return %s', (_, input, expected, actions) => { + actions(); + if (expected === null) { + expect(convertToTermsColumn(...input)).toBeNull(); + } else { + expect(convertToTermsColumn(...input)).toEqual(expect.objectContaining(expected)); + } + }); +}); diff --git a/src/plugins/visualizations/common/convert_to_lens/lib/metrics/formula.test.ts b/src/plugins/visualizations/common/convert_to_lens/lib/metrics/formula.test.ts new file mode 100644 index 0000000000000..95e128e22b092 --- /dev/null +++ b/src/plugins/visualizations/common/convert_to_lens/lib/metrics/formula.test.ts @@ -0,0 +1,474 @@ +/* + * 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. + */ + +import { stubLogstashDataView } from '@kbn/data-views-plugin/common/data_view.stub'; +import { DataViewField, IAggConfig, METRIC_TYPES } from '@kbn/data-plugin/common'; +import { SchemaConfig } from '../../..'; +import { getFormulaForPipelineAgg, getFormulaForAgg } from './formula'; + +const mockGetMetricFromParentPipelineAgg = jest.fn(); +const mockIsPercentileAgg = jest.fn(); +const mockIsPercentileRankAgg = jest.fn(); +const mockIsPipeline = jest.fn(); +const mockIsStdDevAgg = jest.fn(); +const mockGetFieldByName = jest.fn(); +const originalGetFieldByName = stubLogstashDataView.getFieldByName; + +jest.mock('../utils', () => ({ + getFieldNameFromField: jest.fn((field) => field), + getMetricFromParentPipelineAgg: jest.fn(() => mockGetMetricFromParentPipelineAgg()), + isPercentileAgg: jest.fn(() => mockIsPercentileAgg()), + isPercentileRankAgg: jest.fn(() => mockIsPercentileRankAgg()), + isPipeline: jest.fn(() => mockIsPipeline()), + isStdDevAgg: jest.fn(() => mockIsStdDevAgg()), +})); + +const dataView = stubLogstashDataView; + +const field = stubLogstashDataView.fields[0].name; +const aggs: Array> = [ + { + aggId: '1', + aggType: METRIC_TYPES.CUMULATIVE_SUM, + aggParams: { customMetric: {} as IAggConfig }, + accessor: 0, + params: {}, + label: 'cumulative sum', + format: {}, + }, + { + aggId: '2', + aggType: METRIC_TYPES.AVG_BUCKET, + aggParams: { customMetric: {} as IAggConfig }, + accessor: 0, + params: {}, + label: 'overall average', + format: {}, + }, + { + aggId: '3.10', + aggType: METRIC_TYPES.PERCENTILES, + aggParams: { percents: [0, 10], field }, + accessor: 0, + params: {}, + label: 'percentile', + format: {}, + }, + { + aggId: '4.5', + aggType: METRIC_TYPES.PERCENTILE_RANKS, + aggParams: { values: [0, 5], field }, + accessor: 0, + params: {}, + label: 'percintile rank', + format: {}, + }, + { + aggId: '5.std_upper', + aggType: METRIC_TYPES.STD_DEV, + aggParams: { field }, + accessor: 0, + params: {}, + label: 'std dev', + format: {}, + }, + { + aggId: '6', + aggType: METRIC_TYPES.AVG, + aggParams: { field }, + accessor: 0, + params: {}, + label: 'average', + format: {}, + }, +]; + +describe('getFormulaForPipelineAgg', () => { + afterEach(() => { + jest.clearAllMocks(); + dataView.getFieldByName = originalGetFieldByName; + }); + + test.each<[string, Parameters, () => void, string | null]>([ + [ + 'null if custom metric is invalid', + [{ agg: aggs[0] as SchemaConfig, aggs, dataView }], + () => { + mockGetMetricFromParentPipelineAgg.mockReturnValue(null); + }, + null, + ], + [ + 'null if custom metric type is not supported', + [{ agg: aggs[0] as SchemaConfig, aggs, dataView }], + () => { + mockGetMetricFromParentPipelineAgg.mockReturnValue({ + aggType: METRIC_TYPES.GEO_BOUNDS, + }); + }, + null, + ], + [ + 'correct formula if agg is parent pipeline agg and custom metric is valid and supported pipeline agg', + [{ agg: aggs[0] as SchemaConfig, aggs, dataView }], + () => { + mockGetMetricFromParentPipelineAgg + .mockReturnValueOnce({ + aggType: METRIC_TYPES.MOVING_FN, + aggParams: {}, + aggId: '2', + }) + .mockReturnValueOnce({ + aggType: METRIC_TYPES.AVG, + aggParams: { + field, + }, + aggId: '3', + }); + }, + 'cumulative_sum(moving_average(average(bytes)))', + ], + [ + 'correct formula if agg is parent pipeline agg and custom metric is valid and supported not pipeline agg', + [{ agg: aggs[0] as SchemaConfig, aggs, dataView }], + () => { + mockGetMetricFromParentPipelineAgg.mockReturnValueOnce({ + aggType: METRIC_TYPES.AVG, + aggParams: { + field, + }, + aggId: '2', + }); + }, + 'cumulative_sum(average(bytes))', + ], + [ + 'correct formula if agg is parent pipeline agg and custom metric is valid and supported percentile rank agg', + [{ agg: aggs[0] as SchemaConfig, aggs, dataView }], + () => { + mockGetMetricFromParentPipelineAgg.mockReturnValueOnce({ + aggType: METRIC_TYPES.PERCENTILE_RANKS, + aggParams: { + field, + }, + aggId: '3.10', + }); + }, + 'cumulative_sum(percentile_rank(bytes, value=10))', + ], + [ + 'correct formula if agg is sibling pipeline agg and custom metric is valid and supported agg', + [{ agg: aggs[1] as SchemaConfig, aggs, dataView }], + () => { + mockGetMetricFromParentPipelineAgg.mockReturnValueOnce({ + aggType: METRIC_TYPES.AVG, + aggParams: { + field, + }, + aggId: '3', + }); + }, + 'average(bytes)', + ], + ])('should return %s', (_, input, actions, expected) => { + actions(); + if (expected === null) { + expect(getFormulaForPipelineAgg(...input)).toBeNull(); + } else { + expect(getFormulaForPipelineAgg(...input)).toEqual(expected); + } + }); + + test('null if agg is sibling pipeline agg, custom metric is valid, agg is supported and field type is not supported', () => { + mockGetMetricFromParentPipelineAgg.mockReturnValueOnce({ + aggType: METRIC_TYPES.AVG, + aggParams: { + field, + }, + aggId: '3', + }); + + const field1: DataViewField = { + name: 'bytes', + type: 'geo', + esTypes: ['long'], + aggregatable: true, + searchable: true, + count: 10, + readFromDocValues: true, + scripted: false, + isMapped: true, + } as DataViewField; + + mockGetFieldByName.mockReturnValueOnce(field1); + + dataView.getFieldByName = mockGetFieldByName; + const agg = getFormulaForPipelineAgg({ + agg: aggs[1] as SchemaConfig, + aggs, + dataView, + }); + expect(agg).toBeNull(); + }); + + test('null if agg is sibling pipeline agg, custom metric is valid, agg is supported, field type is supported and field is not aggregatable', () => { + mockGetMetricFromParentPipelineAgg.mockReturnValueOnce({ + aggType: METRIC_TYPES.AVG, + aggParams: { + field, + }, + aggId: '3', + }); + + const field1: DataViewField = { + name: 'str', + type: 'string', + esTypes: ['text'], + aggregatable: false, + searchable: true, + count: 10, + readFromDocValues: true, + scripted: false, + isMapped: true, + } as DataViewField; + + mockGetFieldByName.mockReturnValueOnce(field1); + + dataView.getFieldByName = mockGetFieldByName; + const agg = getFormulaForPipelineAgg({ + agg: aggs[1] as SchemaConfig, + aggs, + dataView, + }); + expect(agg).toBeNull(); + }); +}); + +describe('getFormulaForAgg', () => { + beforeEach(() => { + mockIsPercentileAgg.mockReturnValue(false); + mockIsPipeline.mockReturnValue(false); + mockIsStdDevAgg.mockReturnValue(false); + mockIsPercentileRankAgg.mockReturnValue(false); + }); + + afterEach(() => { + jest.clearAllMocks(); + dataView.getFieldByName = originalGetFieldByName; + }); + + test.each<[string, Parameters, () => void, string | null]>([ + [ + 'null if agg type is not supported', + [ + { + agg: { ...aggs[0], aggType: METRIC_TYPES.GEO_BOUNDS, aggParams: { field } }, + aggs, + dataView, + }, + ], + () => {}, + null, + ], + [ + 'correct pipeline formula if agg is valid pipeline agg', + [{ agg: aggs[0], aggs, dataView }], + () => { + mockIsPipeline.mockReturnValue(true); + mockGetMetricFromParentPipelineAgg.mockReturnValueOnce({ + aggType: METRIC_TYPES.AVG, + aggParams: { + field, + }, + aggId: '2', + }); + }, + 'cumulative_sum(average(bytes))', + ], + [ + 'correct percentile formula if agg is valid percentile agg', + [{ agg: aggs[2], aggs, dataView }], + () => { + mockIsPercentileAgg.mockReturnValue(true); + }, + 'percentile(bytes, percentile=10)', + ], + [ + 'correct percentile rank formula if agg is valid percentile rank agg', + [{ agg: aggs[3], aggs, dataView }], + () => { + mockIsPercentileRankAgg.mockReturnValue(true); + }, + 'percentile_rank(bytes, value=5)', + ], + [ + 'correct standart deviation formula if agg is valid standart deviation agg', + [{ agg: aggs[4], aggs, dataView }], + () => { + mockIsStdDevAgg.mockReturnValue(true); + }, + 'average(bytes) + 2 * standard_deviation(bytes)', + ], + [ + 'correct metric formula if agg is valid other metric agg', + [{ agg: aggs[5], aggs, dataView }], + () => {}, + 'average(bytes)', + ], + ])('should return %s', (_, input, actions, expected) => { + actions(); + if (expected === null) { + expect(getFormulaForAgg(...input)).toBeNull(); + } else { + expect(getFormulaForAgg(...input)).toEqual(expected); + } + }); + + test.each([ + [ + 'null if agg is valid pipeline agg', + aggs[0], + () => { + mockIsPipeline.mockReturnValue(true); + mockGetMetricFromParentPipelineAgg.mockReturnValueOnce({ + aggType: METRIC_TYPES.AVG, + aggParams: { + field, + }, + aggId: '2', + }); + }, + ], + [ + 'null if percentile rank agg is valid percentile agg', + aggs[2], + () => { + mockIsPercentileAgg.mockReturnValue(true); + }, + ], + [ + 'null if agg is valid percentile rank agg', + aggs[3], + () => { + mockIsPercentileRankAgg.mockReturnValue(true); + }, + ], + [ + 'null if agg is valid standart deviation agg', + aggs[4], + () => { + mockIsStdDevAgg.mockReturnValue(true); + }, + ], + ['null if agg is valid other metric agg', aggs[5], () => {}], + ])('should return %s and field type is not supported', (_, agg, actions) => { + actions(); + const field1: DataViewField = { + name: 'bytes', + type: 'geo', + esTypes: ['long'], + aggregatable: true, + searchable: true, + count: 10, + readFromDocValues: true, + scripted: false, + isMapped: true, + } as DataViewField; + + mockGetFieldByName.mockReturnValueOnce(field1); + + dataView.getFieldByName = mockGetFieldByName; + const result = getFormulaForPipelineAgg({ + agg: agg as SchemaConfig< + | METRIC_TYPES.CUMULATIVE_SUM + | METRIC_TYPES.DERIVATIVE + | METRIC_TYPES.MOVING_FN + | METRIC_TYPES.AVG_BUCKET + | METRIC_TYPES.MAX_BUCKET + | METRIC_TYPES.MIN_BUCKET + | METRIC_TYPES.SUM_BUCKET + >, + aggs, + dataView, + }); + expect(result).toBeNull(); + }); + + test.each([ + [ + 'null if agg is valid pipeline agg', + aggs[0], + () => { + mockIsPipeline.mockReturnValue(true); + mockGetMetricFromParentPipelineAgg.mockReturnValueOnce({ + aggType: METRIC_TYPES.AVG, + aggParams: { + field, + }, + aggId: '2', + }); + }, + ], + [ + 'null if percentile rank agg is valid percentile agg', + aggs[2], + () => { + mockIsPercentileAgg.mockReturnValue(true); + }, + ], + [ + 'null if agg is valid percentile rank agg', + aggs[3], + () => { + mockIsPercentileRankAgg.mockReturnValue(true); + }, + ], + [ + 'null if agg is valid standart deviation agg', + aggs[4], + () => { + mockIsStdDevAgg.mockReturnValue(true); + }, + ], + ['null if agg is valid other metric agg', aggs[5], () => {}], + ])( + 'should return %s, field type is supported and field is not aggregatable', + (_, agg, actions) => { + actions(); + const field1: DataViewField = { + name: 'str', + type: 'string', + esTypes: ['text'], + aggregatable: false, + searchable: true, + count: 10, + readFromDocValues: true, + scripted: false, + isMapped: true, + } as DataViewField; + + mockGetFieldByName.mockReturnValueOnce(field1); + + dataView.getFieldByName = mockGetFieldByName; + const result = getFormulaForPipelineAgg({ + agg: agg as SchemaConfig< + | METRIC_TYPES.CUMULATIVE_SUM + | METRIC_TYPES.DERIVATIVE + | METRIC_TYPES.MOVING_FN + | METRIC_TYPES.AVG_BUCKET + | METRIC_TYPES.MAX_BUCKET + | METRIC_TYPES.MIN_BUCKET + | METRIC_TYPES.SUM_BUCKET + >, + aggs, + dataView, + }); + expect(result).toBeNull(); + } + ); +}); diff --git a/src/plugins/visualizations/common/convert_to_lens/lib/metrics/metrics.test.ts b/src/plugins/visualizations/common/convert_to_lens/lib/metrics/metrics.test.ts new file mode 100644 index 0000000000000..659ab80ea03d5 --- /dev/null +++ b/src/plugins/visualizations/common/convert_to_lens/lib/metrics/metrics.test.ts @@ -0,0 +1,368 @@ +/* + * 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. + */ + +import { METRIC_TYPES } from '@kbn/data-plugin/common'; +import { stubLogstashDataView } from '@kbn/data-views-plugin/common/data_view.stub'; +import { SchemaConfig } from '../../..'; +import { convertMetricToColumns } from './metrics'; + +const mockConvertMetricAggregationColumnWithoutSpecialParams = jest.fn(); +const mockConvertToOtherParentPipelineAggColumns = jest.fn(); +const mockConvertToPercentileColumn = jest.fn(); +const mockConvertToPercentileRankColumn = jest.fn(); +const mockConvertToSiblingPipelineColumns = jest.fn(); +const mockConvertToStdDeviationFormulaColumns = jest.fn(); +const mockConvertToLastValueColumn = jest.fn(); +const mockConvertToCumulativeSumAggColumn = jest.fn(); + +jest.mock('../convert', () => ({ + convertMetricAggregationColumnWithoutSpecialParams: jest.fn(() => + mockConvertMetricAggregationColumnWithoutSpecialParams() + ), + convertToOtherParentPipelineAggColumns: jest.fn(() => + mockConvertToOtherParentPipelineAggColumns() + ), + convertToPercentileColumn: jest.fn(() => mockConvertToPercentileColumn()), + convertToPercentileRankColumn: jest.fn(() => mockConvertToPercentileRankColumn()), + convertToSiblingPipelineColumns: jest.fn(() => mockConvertToSiblingPipelineColumns()), + convertToStdDeviationFormulaColumns: jest.fn(() => mockConvertToStdDeviationFormulaColumns()), + convertToLastValueColumn: jest.fn(() => mockConvertToLastValueColumn()), + convertToCumulativeSumAggColumn: jest.fn(() => mockConvertToCumulativeSumAggColumn()), +})); + +describe('convertMetricToColumns invalid cases', () => { + const dataView = stubLogstashDataView; + + beforeEach(() => { + jest.clearAllMocks(); + }); + + beforeAll(() => { + mockConvertMetricAggregationColumnWithoutSpecialParams.mockReturnValue(null); + mockConvertToOtherParentPipelineAggColumns.mockReturnValue(null); + mockConvertToPercentileColumn.mockReturnValue(null); + mockConvertToPercentileRankColumn.mockReturnValue(null); + mockConvertToSiblingPipelineColumns.mockReturnValue(null); + mockConvertToStdDeviationFormulaColumns.mockReturnValue(null); + mockConvertToLastValueColumn.mockReturnValue(null); + mockConvertToCumulativeSumAggColumn.mockReturnValue(null); + }); + + test.each<[string, Parameters, null, jest.Mock | undefined]>([ + [ + 'null if agg is not supported', + [{ aggType: METRIC_TYPES.GEO_BOUNDS } as unknown as SchemaConfig, dataView, []], + null, + undefined, + ], + [ + 'null if supported agg AVG is not valid', + [{ aggType: METRIC_TYPES.AVG } as SchemaConfig, dataView, []], + null, + mockConvertMetricAggregationColumnWithoutSpecialParams, + ], + [ + 'null if supported agg MIN is not valid', + [{ aggType: METRIC_TYPES.MIN } as SchemaConfig, dataView, []], + null, + mockConvertMetricAggregationColumnWithoutSpecialParams, + ], + [ + 'null if supported agg MAX is not valid', + [{ aggType: METRIC_TYPES.MAX } as SchemaConfig, dataView, []], + null, + mockConvertMetricAggregationColumnWithoutSpecialParams, + ], + [ + 'null if supported agg SUM is not valid', + [{ aggType: METRIC_TYPES.SUM } as SchemaConfig, dataView, []], + null, + mockConvertMetricAggregationColumnWithoutSpecialParams, + ], + [ + 'null if supported agg COUNT is not valid', + [{ aggType: METRIC_TYPES.COUNT } as SchemaConfig, dataView, []], + null, + mockConvertMetricAggregationColumnWithoutSpecialParams, + ], + [ + 'null if supported agg CARDINALITY is not valid', + [{ aggType: METRIC_TYPES.CARDINALITY } as SchemaConfig, dataView, []], + null, + mockConvertMetricAggregationColumnWithoutSpecialParams, + ], + [ + 'null if supported agg VALUE_COUNT is not valid', + [{ aggType: METRIC_TYPES.VALUE_COUNT } as SchemaConfig, dataView, []], + null, + mockConvertMetricAggregationColumnWithoutSpecialParams, + ], + [ + 'null if supported agg MEDIAN is not valid', + [{ aggType: METRIC_TYPES.MEDIAN } as SchemaConfig, dataView, []], + null, + mockConvertMetricAggregationColumnWithoutSpecialParams, + ], + [ + 'null if supported agg STD_DEV is not valid', + [{ aggType: METRIC_TYPES.STD_DEV } as SchemaConfig, dataView, []], + null, + mockConvertToStdDeviationFormulaColumns, + ], + [ + 'null if supported agg PERCENTILES is not valid', + [{ aggType: METRIC_TYPES.PERCENTILES } as SchemaConfig, dataView, []], + null, + mockConvertToPercentileColumn, + ], + [ + 'null if supported agg SINGLE_PERCENTILE is not valid', + [{ aggType: METRIC_TYPES.SINGLE_PERCENTILE } as SchemaConfig, dataView, []], + null, + mockConvertToPercentileColumn, + ], + [ + 'null if supported agg PERCENTILE_RANKS is not valid', + [{ aggType: METRIC_TYPES.PERCENTILE_RANKS } as SchemaConfig, dataView, []], + null, + mockConvertToPercentileRankColumn, + ], + [ + 'null if supported agg SINGLE_PERCENTILE_RANK is not valid', + [{ aggType: METRIC_TYPES.SINGLE_PERCENTILE_RANK } as SchemaConfig, dataView, []], + null, + mockConvertToPercentileRankColumn, + ], + [ + 'null if supported agg TOP_HITS is not valid', + [{ aggType: METRIC_TYPES.TOP_HITS } as SchemaConfig, dataView, []], + null, + mockConvertToLastValueColumn, + ], + [ + 'null if supported agg TOP_METRICS is not valid', + [{ aggType: METRIC_TYPES.TOP_METRICS } as SchemaConfig, dataView, []], + null, + mockConvertToLastValueColumn, + ], + [ + 'null if supported agg CUMULATIVE_SUM is not valid', + [{ aggType: METRIC_TYPES.CUMULATIVE_SUM } as SchemaConfig, dataView, []], + null, + mockConvertToCumulativeSumAggColumn, + ], + [ + 'null if supported agg DERIVATIVE is not valid', + [{ aggType: METRIC_TYPES.DERIVATIVE } as SchemaConfig, dataView, []], + null, + mockConvertToOtherParentPipelineAggColumns, + ], + [ + 'null if supported agg MOVING_FN is not valid', + [{ aggType: METRIC_TYPES.MOVING_FN } as SchemaConfig, dataView, []], + null, + mockConvertToOtherParentPipelineAggColumns, + ], + [ + 'null if supported agg SUM_BUCKET is not valid', + [{ aggType: METRIC_TYPES.SUM_BUCKET } as SchemaConfig, dataView, []], + null, + mockConvertToSiblingPipelineColumns, + ], + [ + 'null if supported agg MIN_BUCKET is not valid', + [{ aggType: METRIC_TYPES.MIN_BUCKET } as SchemaConfig, dataView, []], + null, + mockConvertToSiblingPipelineColumns, + ], + [ + 'null if supported agg MAX_BUCKET is not valid', + [{ aggType: METRIC_TYPES.MAX_BUCKET } as SchemaConfig, dataView, []], + null, + mockConvertToSiblingPipelineColumns, + ], + [ + 'null if supported agg AVG_BUCKET is not valid', + [{ aggType: METRIC_TYPES.AVG_BUCKET } as SchemaConfig, dataView, []], + null, + mockConvertToSiblingPipelineColumns, + ], + [ + 'null if supported agg SERIAL_DIFF is not valid', + [{ aggType: METRIC_TYPES.SERIAL_DIFF } as SchemaConfig, dataView, []], + null, + undefined, + ], + ])('should return %s', (_, input, expected, mock) => { + expect(convertMetricToColumns(...input)).toBeNull(); + + if (mock) { + expect(mock).toBeCalledTimes(1); + } + }); +}); +describe('convertMetricToColumns valid cases', () => { + const dataView = stubLogstashDataView; + + beforeEach(() => { + jest.clearAllMocks(); + }); + + const result = [{}]; + + beforeAll(() => { + mockConvertMetricAggregationColumnWithoutSpecialParams.mockReturnValue(result); + mockConvertToOtherParentPipelineAggColumns.mockReturnValue(result); + mockConvertToPercentileColumn.mockReturnValue(result); + mockConvertToPercentileRankColumn.mockReturnValue(result); + mockConvertToSiblingPipelineColumns.mockReturnValue(result); + mockConvertToStdDeviationFormulaColumns.mockReturnValue(result); + mockConvertToLastValueColumn.mockReturnValue(result); + mockConvertToCumulativeSumAggColumn.mockReturnValue(result); + }); + + test.each<[string, Parameters, Array<{}>, jest.Mock]>([ + [ + 'array of columns if supported agg AVG is valid', + [{ aggType: METRIC_TYPES.AVG } as SchemaConfig, dataView, []], + result, + mockConvertMetricAggregationColumnWithoutSpecialParams, + ], + [ + 'array of columns if supported agg MIN is valid', + [{ aggType: METRIC_TYPES.MIN } as SchemaConfig, dataView, []], + result, + mockConvertMetricAggregationColumnWithoutSpecialParams, + ], + [ + 'array of columns if supported agg MAX is valid', + [{ aggType: METRIC_TYPES.MAX } as SchemaConfig, dataView, []], + result, + mockConvertMetricAggregationColumnWithoutSpecialParams, + ], + [ + 'array of columns if supported agg SUM is valid', + [{ aggType: METRIC_TYPES.SUM } as SchemaConfig, dataView, []], + result, + mockConvertMetricAggregationColumnWithoutSpecialParams, + ], + [ + 'array of columns if supported agg COUNT is valid', + [{ aggType: METRIC_TYPES.COUNT } as SchemaConfig, dataView, []], + result, + mockConvertMetricAggregationColumnWithoutSpecialParams, + ], + [ + 'array of columns if supported agg CARDINALITY is valid', + [{ aggType: METRIC_TYPES.CARDINALITY } as SchemaConfig, dataView, []], + result, + mockConvertMetricAggregationColumnWithoutSpecialParams, + ], + [ + 'array of columns if supported agg VALUE_COUNT is valid', + [{ aggType: METRIC_TYPES.VALUE_COUNT } as SchemaConfig, dataView, []], + result, + mockConvertMetricAggregationColumnWithoutSpecialParams, + ], + [ + 'array of columns if supported agg MEDIAN is valid', + [{ aggType: METRIC_TYPES.MEDIAN } as SchemaConfig, dataView, []], + result, + mockConvertMetricAggregationColumnWithoutSpecialParams, + ], + [ + 'array of columns if supported agg STD_DEV is valid', + [{ aggType: METRIC_TYPES.STD_DEV } as SchemaConfig, dataView, []], + result, + mockConvertToStdDeviationFormulaColumns, + ], + [ + 'array of columns if supported agg PERCENTILES is valid', + [{ aggType: METRIC_TYPES.PERCENTILES } as SchemaConfig, dataView, []], + result, + mockConvertToPercentileColumn, + ], + [ + 'array of columns if supported agg SINGLE_PERCENTILE is valid', + [{ aggType: METRIC_TYPES.SINGLE_PERCENTILE } as SchemaConfig, dataView, []], + result, + mockConvertToPercentileColumn, + ], + [ + 'array of columns if supported agg PERCENTILE_RANKS is valid', + [{ aggType: METRIC_TYPES.PERCENTILE_RANKS } as SchemaConfig, dataView, []], + result, + mockConvertToPercentileRankColumn, + ], + [ + 'array of columns if supported agg SINGLE_PERCENTILE_RANK is valid', + [{ aggType: METRIC_TYPES.SINGLE_PERCENTILE_RANK } as SchemaConfig, dataView, []], + result, + mockConvertToPercentileRankColumn, + ], + [ + 'array of columns if supported agg TOP_HITS is valid', + [{ aggType: METRIC_TYPES.TOP_HITS } as SchemaConfig, dataView, []], + result, + mockConvertToLastValueColumn, + ], + [ + 'array of columns if supported agg TOP_METRICS is valid', + [{ aggType: METRIC_TYPES.TOP_METRICS } as SchemaConfig, dataView, []], + result, + mockConvertToLastValueColumn, + ], + [ + 'array of columns if supported agg CUMULATIVE_SUM is valid', + [{ aggType: METRIC_TYPES.CUMULATIVE_SUM } as SchemaConfig, dataView, []], + result, + mockConvertToCumulativeSumAggColumn, + ], + [ + 'array of columns if supported agg DERIVATIVE is valid', + [{ aggType: METRIC_TYPES.DERIVATIVE } as SchemaConfig, dataView, []], + result, + mockConvertToOtherParentPipelineAggColumns, + ], + [ + 'array of columns if supported agg MOVING_FN is valid', + [{ aggType: METRIC_TYPES.MOVING_FN } as SchemaConfig, dataView, []], + result, + mockConvertToOtherParentPipelineAggColumns, + ], + [ + 'array of columns if supported agg SUM_BUCKET is valid', + [{ aggType: METRIC_TYPES.SUM_BUCKET } as SchemaConfig, dataView, []], + result, + mockConvertToSiblingPipelineColumns, + ], + [ + 'array of columns if supported agg MIN_BUCKET is valid', + [{ aggType: METRIC_TYPES.MIN_BUCKET } as SchemaConfig, dataView, []], + result, + mockConvertToSiblingPipelineColumns, + ], + [ + 'array of columns if supported agg MAX_BUCKET is valid', + [{ aggType: METRIC_TYPES.MAX_BUCKET } as SchemaConfig, dataView, []], + result, + mockConvertToSiblingPipelineColumns, + ], + [ + 'array of columns if supported agg AVG_BUCKET is valid', + [{ aggType: METRIC_TYPES.AVG_BUCKET } as SchemaConfig, dataView, []], + result, + mockConvertToSiblingPipelineColumns, + ], + ])('should return %s', (_, input, expected, mock) => { + expect(convertMetricToColumns(...input)).toEqual(expected.map(expect.objectContaining)); + if (mock) { + expect(mock).toBeCalledTimes(1); + } + }); +}); diff --git a/src/plugins/visualizations/common/convert_to_lens/lib/metrics/percentage_formula.test.ts b/src/plugins/visualizations/common/convert_to_lens/lib/metrics/percentage_formula.test.ts new file mode 100644 index 0000000000000..9855ce44b6602 --- /dev/null +++ b/src/plugins/visualizations/common/convert_to_lens/lib/metrics/percentage_formula.test.ts @@ -0,0 +1,98 @@ +/* + * 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. + */ + +import { stubLogstashDataView } from '@kbn/data-views-plugin/common/data_view.stub'; +import { METRIC_TYPES } from '@kbn/data-plugin/common'; +import { getPercentageColumnFormulaColumn } from './percentage_formula'; +import { FormulaColumn } from '../../types'; +import { SchemaConfig } from '../../..'; + +const mockGetFormulaForAgg = jest.fn(); +const mockCreateFormulaColumn = jest.fn(); + +jest.mock('./formula', () => ({ + getFormulaForAgg: jest.fn(() => mockGetFormulaForAgg()), +})); + +jest.mock('../convert', () => ({ + createFormulaColumn: jest.fn((formula) => mockCreateFormulaColumn(formula)), +})); + +describe('getPercentageColumnFormulaColumn', () => { + const dataView = stubLogstashDataView; + const field = stubLogstashDataView.fields[0].name; + const aggs: Array> = [ + { + aggId: '1', + aggType: METRIC_TYPES.AVG, + aggParams: { field }, + accessor: 0, + params: {}, + label: 'average', + format: {}, + }, + ]; + + afterEach(() => { + jest.clearAllMocks(); + }); + + test.each< + [ + string, + Parameters, + () => void, + Partial | null + ] + >([ + [ + 'null if cannot build formula for provided agg', + [{ agg: aggs[0], aggs, dataView }], + () => { + mockGetFormulaForAgg.mockReturnValue(null); + }, + null, + ], + [ + 'null if cannot create formula column for provided arguments', + [{ agg: aggs[0], aggs, dataView }], + () => { + mockGetFormulaForAgg.mockReturnValue('test-formula'); + mockCreateFormulaColumn.mockReturnValue(null); + }, + null, + ], + [ + 'formula column if provided arguments are valid', + [{ agg: aggs[0], aggs, dataView }], + () => { + mockGetFormulaForAgg.mockReturnValue('test-formula'); + mockCreateFormulaColumn.mockImplementation((formula) => ({ + operationType: 'formula', + params: { formula }, + label: 'Average', + })); + }, + { + operationType: 'formula', + params: { + formula: `(test-formula) / overall_sum(test-formula)`, + format: { id: 'percent' }, + }, + label: `Average percentages`, + }, + ], + ])('should return %s', (_, input, actions, expected) => { + actions(); + if (expected === null) { + expect(getPercentageColumnFormulaColumn(...input)).toBeNull(); + } else { + expect(getPercentageColumnFormulaColumn(...input)).toEqual(expect.objectContaining(expected)); + } + }); +}); diff --git a/src/plugins/visualizations/common/convert_to_lens/lib/utils.test.ts b/src/plugins/visualizations/common/convert_to_lens/lib/utils.test.ts new file mode 100644 index 0000000000000..73118b6ad4f03 --- /dev/null +++ b/src/plugins/visualizations/common/convert_to_lens/lib/utils.test.ts @@ -0,0 +1,521 @@ +/* + * 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. + */ + +import { stubLogstashDataView } from '@kbn/data-views-plugin/common/data_view.stub'; +import { IAggConfig, METRIC_TYPES } from '@kbn/data-plugin/common'; +import { AggBasedColumn, ColumnWithMeta, Operations } from '../..'; +import { SchemaConfig } from '../../types'; +import { + getCustomBucketsFromSiblingAggs, + getFieldNameFromField, + getLabel, + getLabelForPercentile, + getMetricFromParentPipelineAgg, + getValidColumns, + isColumnWithMeta, + isMetricAggWithoutParams, + isPercentileAgg, + isPercentileRankAgg, + isPipeline, + isSchemaConfig, + isSiblingPipeline, + isStdDevAgg, +} from './utils'; + +describe('getLabel', () => { + const label = 'some label'; + const customLabel = 'some custom label'; + + const agg: SchemaConfig = { + accessor: 0, + label, + format: { + id: undefined, + params: undefined, + }, + params: {}, + aggType: METRIC_TYPES.AVG, + aggId: 'id', + aggParams: { field: 'some-field' }, + }; + + test('should return label', () => { + const { aggParams, ...aggWithoutAggParams } = agg; + expect(getLabel(aggWithoutAggParams)).toEqual(label); + expect(getLabel(agg)).toEqual(label); + expect(getLabel({ ...agg, aggParams: { ...aggParams!, customLabel: undefined } })).toEqual( + label + ); + }); + + test('should return customLabel', () => { + const aggParams = { ...agg.aggParams!, customLabel }; + const aggWithCustomLabel = { ...agg, aggParams }; + expect(getLabel(aggWithCustomLabel)).toEqual(customLabel); + }); +}); + +describe('getLabelForPercentile', () => { + const label = 'some label'; + const customLabel = 'some custom label'; + + const agg: SchemaConfig = { + accessor: 0, + label, + format: { + id: undefined, + params: undefined, + }, + params: {}, + aggType: METRIC_TYPES.PERCENTILES, + aggId: 'id', + aggParams: { field: 'some-field' }, + }; + + test('should return empty string if no custom label is specified', () => { + const { aggParams, ...aggWithoutAggParams } = agg; + expect(getLabelForPercentile(aggWithoutAggParams)).toEqual(''); + expect(getLabel({ ...agg, aggParams: { ...aggParams!, customLabel: '' } })).toEqual(''); + }); + + test('should return label if custom label is specified', () => { + const aggParams = { ...agg.aggParams!, customLabel }; + const aggWithCustomLabel = { ...agg, aggParams }; + expect(getLabelForPercentile(aggWithCustomLabel)).toEqual(label); + }); +}); + +describe('getValidColumns', () => { + const dataView = stubLogstashDataView; + const columns: AggBasedColumn[] = [ + { + operationType: Operations.AVERAGE, + sourceField: dataView.fields[0].name, + columnId: 'some-id-0', + dataType: 'number', + params: {}, + meta: { aggId: 'aggId-0' }, + isSplit: false, + isBucketed: true, + }, + { + operationType: Operations.SUM, + sourceField: dataView.fields[0].name, + columnId: 'some-id-1', + dataType: 'number', + params: {}, + meta: { aggId: 'aggId-1' }, + isSplit: false, + isBucketed: true, + }, + ]; + test.each<[string, Parameters, AggBasedColumn[] | null]>([ + ['null if array contains null', [[null, ...columns]], null], + ['null if columns is null', [null], null], + ['null if columns is undefined', [undefined], null], + ['columns', [columns], columns], + ['columns if one column is passed', [columns[0]], [columns[0]]], + ])('should return %s', (_, input, expected) => { + if (expected === null) { + expect(getValidColumns(...input)).toBeNull(); + } else { + expect(getValidColumns(...input)).toEqual(expect.objectContaining(expected)); + } + }); +}); + +describe('getFieldNameFromField', () => { + test('should return null if no field is passed', () => { + expect(getFieldNameFromField(undefined)).toBeNull(); + }); + + test('should return field name if field is string', () => { + const fieldName = 'some-field-name'; + expect(getFieldNameFromField(fieldName)).toEqual(fieldName); + }); + + test('should return field name if field is DataViewField', () => { + const field = stubLogstashDataView.fields[0]; + expect(getFieldNameFromField(field)).toEqual(field.name); + }); +}); + +describe('isSchemaConfig', () => { + const iAggConfig = { + id: '', + enabled: false, + params: {}, + } as IAggConfig; + + const schemaConfig: SchemaConfig = { + accessor: 0, + label: '', + format: { + id: undefined, + params: undefined, + }, + params: {}, + aggType: METRIC_TYPES.AVG, + }; + + test('should be false if is IAggConfig', () => { + expect(isSchemaConfig(iAggConfig)).toBeFalsy(); + }); + + test('should be false if is SchemaConfig', () => { + expect(isSchemaConfig(schemaConfig)).toBeTruthy(); + }); +}); + +describe('isColumnWithMeta', () => { + const column: AggBasedColumn = { + sourceField: '', + columnId: '', + operationType: 'terms', + isBucketed: false, + isSplit: false, + dataType: 'string', + } as AggBasedColumn; + + const columnWithMeta: ColumnWithMeta = { + sourceField: '', + columnId: '', + operationType: 'average', + isBucketed: false, + isSplit: false, + dataType: 'string', + params: {}, + meta: { aggId: 'some-agg-id' }, + }; + + test('should return false if column without meta', () => { + expect(isColumnWithMeta(column)).toBeFalsy(); + }); + + test('should return true if column with meta', () => { + expect(isColumnWithMeta(columnWithMeta)).toBeTruthy(); + }); +}); + +describe('isSiblingPipeline', () => { + const metric: Omit = { + accessor: 0, + label: '', + format: { + id: undefined, + params: undefined, + }, + params: {}, + }; + + test.each<[METRIC_TYPES, boolean]>([ + [METRIC_TYPES.AVG_BUCKET, true], + [METRIC_TYPES.SUM_BUCKET, true], + [METRIC_TYPES.MAX_BUCKET, true], + [METRIC_TYPES.MIN_BUCKET, true], + [METRIC_TYPES.CUMULATIVE_SUM, false], + ])('for %s should return %s', (aggType, expected) => { + expect(isSiblingPipeline({ ...metric, aggType } as SchemaConfig)).toBe( + expected + ); + }); +}); + +describe('isPipeline', () => { + const metric: Omit = { + accessor: 0, + label: '', + format: { + id: undefined, + params: undefined, + }, + params: {}, + }; + + test.each<[METRIC_TYPES, boolean]>([ + [METRIC_TYPES.AVG_BUCKET, true], + [METRIC_TYPES.SUM_BUCKET, true], + [METRIC_TYPES.MAX_BUCKET, true], + [METRIC_TYPES.MIN_BUCKET, true], + [METRIC_TYPES.CUMULATIVE_SUM, true], + [METRIC_TYPES.DERIVATIVE, true], + [METRIC_TYPES.MOVING_FN, true], + [METRIC_TYPES.AVG, false], + ])('for %s should return %s', (aggType, expected) => { + expect(isPipeline({ ...metric, aggType } as SchemaConfig)).toBe(expected); + }); +}); + +describe('isMetricAggWithoutParams', () => { + const metric: Omit = { + accessor: 0, + label: '', + format: { + id: undefined, + params: undefined, + }, + params: {}, + }; + + test.each<[METRIC_TYPES, boolean]>([ + [METRIC_TYPES.AVG, true], + [METRIC_TYPES.COUNT, true], + [METRIC_TYPES.MAX, true], + [METRIC_TYPES.MIN, true], + [METRIC_TYPES.SUM, true], + [METRIC_TYPES.MEDIAN, true], + [METRIC_TYPES.CARDINALITY, true], + [METRIC_TYPES.VALUE_COUNT, true], + [METRIC_TYPES.DERIVATIVE, false], + ])('for %s should return %s', (aggType, expected) => { + expect(isMetricAggWithoutParams({ ...metric, aggType } as SchemaConfig)).toBe( + expected + ); + }); +}); + +describe('isPercentileAgg', () => { + const metric: Omit = { + accessor: 0, + label: '', + format: { + id: undefined, + params: undefined, + }, + params: {}, + }; + + test.each<[METRIC_TYPES, boolean]>([ + [METRIC_TYPES.PERCENTILES, true], + [METRIC_TYPES.DERIVATIVE, false], + ])('for %s should return %s', (aggType, expected) => { + expect(isPercentileAgg({ ...metric, aggType } as SchemaConfig)).toBe(expected); + }); +}); + +describe('isPercentileRankAgg', () => { + const metric: Omit = { + accessor: 0, + label: '', + format: { + id: undefined, + params: undefined, + }, + params: {}, + }; + + test.each<[METRIC_TYPES, boolean]>([ + [METRIC_TYPES.PERCENTILE_RANKS, true], + [METRIC_TYPES.PERCENTILES, false], + ])('for %s should return %s', (aggType, expected) => { + expect(isPercentileRankAgg({ ...metric, aggType } as SchemaConfig)).toBe( + expected + ); + }); +}); + +describe('isStdDevAgg', () => { + const metric: Omit = { + accessor: 0, + label: '', + format: { + id: undefined, + params: undefined, + }, + params: {}, + }; + + test.each<[METRIC_TYPES, boolean]>([ + [METRIC_TYPES.STD_DEV, true], + [METRIC_TYPES.PERCENTILES, false], + ])('for %s should return %s', (aggType, expected) => { + expect(isStdDevAgg({ ...metric, aggType } as SchemaConfig)).toBe(expected); + }); +}); + +describe('getCustomBucketsFromSiblingAggs', () => { + const bucket1 = { + id: 'some-id', + params: { type: 'some-type' }, + type: 'type1', + enabled: true, + } as unknown as IAggConfig; + const serialize1 = () => bucket1; + + const bucket2 = { + id: 'some-id-1', + params: { type: 'some-type-1' }, + type: 'type2', + enabled: false, + } as unknown as IAggConfig; + const serialize2 = () => bucket2; + + const bucketWithSerialize1 = { ...bucket1, serialize: serialize1 } as unknown as IAggConfig; + const metric1: SchemaConfig = { + accessor: 0, + label: '', + format: { + id: undefined, + params: undefined, + }, + params: {}, + aggType: METRIC_TYPES.AVG_BUCKET, + aggId: 'some-agg-id', + aggParams: { + customBucket: bucketWithSerialize1, + }, + }; + + const bucketWithSerialize2 = { ...bucket2, serialize: serialize2 } as unknown as IAggConfig; + const metric2: SchemaConfig = { + accessor: 0, + label: '', + format: { + id: undefined, + params: undefined, + }, + params: {}, + aggType: METRIC_TYPES.AVG_BUCKET, + aggId: 'some-agg-id', + aggParams: { + customBucket: bucketWithSerialize2, + }, + }; + const bucket3 = { ...bucket1, id: 'other id' } as unknown as IAggConfig; + const serialize3 = () => bucket3; + + const bucketWithSerialize3 = { ...bucket3, serialize: serialize3 } as unknown as IAggConfig; + const metric3: SchemaConfig = { + accessor: 0, + label: '', + format: { + id: undefined, + params: undefined, + }, + params: {}, + aggType: METRIC_TYPES.AVG_BUCKET, + aggId: 'some-agg-id', + aggParams: { + customBucket: bucketWithSerialize3, + }, + }; + + test("should filter out duplicated custom buckets, ignoring id's", () => { + expect(getCustomBucketsFromSiblingAggs([metric1, metric2, metric3])).toEqual([ + bucketWithSerialize1, + bucketWithSerialize2, + ]); + }); +}); + +const mockConvertToSchemaConfig = jest.fn(); + +jest.mock('../../vis_schemas', () => ({ + convertToSchemaConfig: jest.fn(() => mockConvertToSchemaConfig()), +})); + +describe('getMetricFromParentPipelineAgg', () => { + const metricAggId = 'agg-id-0'; + const aggId = 'agg-id-1'; + const plainAgg: SchemaConfig = { + accessor: 0, + label: 'some-label', + format: { + id: undefined, + params: undefined, + }, + params: {}, + aggType: METRIC_TYPES.AVG, + aggId: metricAggId, + }; + const agg: SchemaConfig = { + accessor: 0, + label: '', + format: { + id: undefined, + params: undefined, + }, + params: {}, + aggType: METRIC_TYPES.AVG_BUCKET, + aggParams: { customMetric: {} as IAggConfig }, + aggId, + }; + + const parentPipelineAgg: SchemaConfig = { + accessor: 0, + label: '', + format: { + id: undefined, + params: undefined, + }, + params: {}, + aggType: METRIC_TYPES.CUMULATIVE_SUM, + aggParams: { metricAgg: 'custom' }, + aggId, + }; + + const metric = { aggType: METRIC_TYPES.CUMULATIVE_SUM }; + beforeEach(() => { + jest.clearAllMocks(); + }); + + beforeAll(() => { + mockConvertToSchemaConfig.mockReturnValue(metric); + }); + + test('should return null if aggParams are undefined', () => { + expect(getMetricFromParentPipelineAgg({ ...agg, aggParams: undefined }, [])).toBeNull(); + expect(mockConvertToSchemaConfig).toBeCalledTimes(0); + }); + + test('should return null if is sibling pipeline agg and custom metric is not defined', () => { + expect( + getMetricFromParentPipelineAgg({ ...agg, aggParams: { customMetric: undefined } }, []) + ).toBeNull(); + expect(mockConvertToSchemaConfig).toBeCalledTimes(0); + }); + + test('should return null if is parent pipeline agg, metricAgg is custom and custom metric is not defined', () => { + expect(getMetricFromParentPipelineAgg(parentPipelineAgg, [])).toBeNull(); + expect(mockConvertToSchemaConfig).toBeCalledTimes(0); + }); + + test('should return metric if is parent pipeline agg, metricAgg is equal to aggId and custom metric is not defined', () => { + const parentPipelineAggWithLink = { + ...parentPipelineAgg, + aggParams: { + metricAgg: metricAggId, + }, + }; + expect( + getMetricFromParentPipelineAgg(parentPipelineAggWithLink, [ + parentPipelineAggWithLink, + plainAgg, + ]) + ).toEqual(plainAgg); + expect(mockConvertToSchemaConfig).toBeCalledTimes(0); + }); + + test('should return metric if sibling pipeline agg with custom metric', () => { + expect(getMetricFromParentPipelineAgg(agg, [agg])).toEqual(metric); + expect(mockConvertToSchemaConfig).toBeCalledTimes(1); + }); + + test('should return metric if parent pipeline agg with custom metric', () => { + expect( + getMetricFromParentPipelineAgg( + { + ...parentPipelineAgg, + aggParams: { ...parentPipelineAgg.aggParams, customMetric: {} as IAggConfig }, + }, + [agg] + ) + ).toEqual(metric); + expect(mockConvertToSchemaConfig).toBeCalledTimes(1); + }); +}); diff --git a/src/plugins/visualizations/common/convert_to_lens/lib/utils.ts b/src/plugins/visualizations/common/convert_to_lens/lib/utils.ts index 39920e525b791..c4e5c5474bf0c 100644 --- a/src/plugins/visualizations/common/convert_to_lens/lib/utils.ts +++ b/src/plugins/visualizations/common/convert_to_lens/lib/utils.ts @@ -150,7 +150,7 @@ export const isStdDevAgg = (metric: SchemaConfig): metric is SchemaConfig { +export const getCustomBucketsFromSiblingAggs = (metrics: SchemaConfig[]) => { return metrics.reduce((acc, metric) => { if ( isSiblingPipeline(metric) && diff --git a/src/plugins/visualizations/public/convert_to_lens/schemas.test.ts b/src/plugins/visualizations/public/convert_to_lens/schemas.test.ts index dccd579d95dba..5b8b7832730b9 100644 --- a/src/plugins/visualizations/public/convert_to_lens/schemas.test.ts +++ b/src/plugins/visualizations/public/convert_to_lens/schemas.test.ts @@ -40,7 +40,7 @@ jest.mock('../../common/convert_to_lens/lib/buckets', () => ({ })); jest.mock('../../common/convert_to_lens/lib/utils', () => ({ - getCutomBucketsFromSiblingAggs: jest.fn(() => mockGetCutomBucketsFromSiblingAggs()), + getCustomBucketsFromSiblingAggs: jest.fn(() => mockGetCutomBucketsFromSiblingAggs()), })); jest.mock('../vis_schemas', () => ({ diff --git a/src/plugins/visualizations/public/convert_to_lens/schemas.ts b/src/plugins/visualizations/public/convert_to_lens/schemas.ts index e9b467074b6f1..56108b1a1d63f 100644 --- a/src/plugins/visualizations/public/convert_to_lens/schemas.ts +++ b/src/plugins/visualizations/public/convert_to_lens/schemas.ts @@ -11,7 +11,7 @@ import { METRIC_TYPES, TimefilterContract } from '@kbn/data-plugin/public'; import { AggBasedColumn, SchemaConfig } from '../../common'; import { convertMetricToColumns } from '../../common/convert_to_lens/lib/metrics'; import { convertBucketToColumns } from '../../common/convert_to_lens/lib/buckets'; -import { getCutomBucketsFromSiblingAggs } from '../../common/convert_to_lens/lib/utils'; +import { getCustomBucketsFromSiblingAggs } from '../../common/convert_to_lens/lib/utils'; import type { Vis } from '../types'; import { getVisSchemas, Schemas } from '../vis_schemas'; import { @@ -57,7 +57,7 @@ export const getColumnsFromVis = ( return null; } - const customBuckets = getCutomBucketsFromSiblingAggs(visSchemas.metric); + const customBuckets = getCustomBucketsFromSiblingAggs(visSchemas.metric); // doesn't support sibbling pipeline aggs with different bucket aggs if (customBuckets.length > 1) { From 384ecc4b7ba272b9f890ba102277d0769a730067 Mon Sep 17 00:00:00 2001 From: Matthias Wilhelm Date: Thu, 29 Sep 2022 12:43:47 +0200 Subject: [PATCH 89/95] [Graph] Unskip a11y functional test (#141798) --- .../public/components/settings/url_template_form.tsx | 10 +++++++++- .../workspace_layout/workspace_top_nav_menu.tsx | 3 +++ x-pack/test/accessibility/apps/graph.ts | 7 +++---- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/x-pack/plugins/graph/public/components/settings/url_template_form.tsx b/x-pack/plugins/graph/public/components/settings/url_template_form.tsx index 57e69d0912a7f..4509a003e839d 100644 --- a/x-pack/plugins/graph/public/components/settings/url_template_form.tsx +++ b/x-pack/plugins/graph/public/components/settings/url_template_form.tsx @@ -261,7 +261,15 @@ export function UrlTemplateForm(props: UrlTemplateFormProps) { defaultMessage: 'Toolbar icon', })} > -
    +
    {urlTemplateIconChoices.map((icon) => ( { ownFocus: true, className: 'gphSettingsFlyout', maxWidth: 520, + 'aria-label': i18n.translate('xpack.graph.settings.ariaLabel', { + defaultMessage: 'Settings', + }), } ); }, diff --git a/x-pack/test/accessibility/apps/graph.ts b/x-pack/test/accessibility/apps/graph.ts index 85a77f4816273..03ca3b2afbfe4 100644 --- a/x-pack/test/accessibility/apps/graph.ts +++ b/x-pack/test/accessibility/apps/graph.ts @@ -79,12 +79,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await browser.pressKeys(browser.keys.ESCAPE); }); - // https://github.com/elastic/kibana/issues/134693 - it.skip('Graph settings drilldown tab - add new drilldown', async function () { + it('Graph settings drilldown tab - add new drilldown', async function () { + await testSubjects.click('graphSettingsButton'); + await testSubjects.click('drillDowns'); await testSubjects.click('graphAddNewTemplate'); await a11y.testAppSnapshot(); - await testSubjects.click('graphRemoveUrlTemplate'); - await testSubjects.click('euiFlyoutCloseButton'); await browser.pressKeys(browser.keys.ESCAPE); }); From 57a3162402b54262bb5f730a36082b42535b1fbf Mon Sep 17 00:00:00 2001 From: Luke Gmys Date: Thu, 29 Sep 2022 13:35:59 +0200 Subject: [PATCH 90/95] [TIP] Fix broken setup instructions in the readme (#140519) --- x-pack/plugins/threat_intelligence/FAQ.md | 15 ---- x-pack/plugins/threat_intelligence/README.md | 73 +++++++++++++++----- 2 files changed, 56 insertions(+), 32 deletions(-) delete mode 100644 x-pack/plugins/threat_intelligence/FAQ.md diff --git a/x-pack/plugins/threat_intelligence/FAQ.md b/x-pack/plugins/threat_intelligence/FAQ.md deleted file mode 100644 index d3f1287713840..0000000000000 --- a/x-pack/plugins/threat_intelligence/FAQ.md +++ /dev/null @@ -1,15 +0,0 @@ -# FAQ - -### Where can I find the UI for the Threat Intelligence plugin? - -Kibana recommends working on a fork of the [elastic/kibana repository](https://github.com/elastic/kibana) (see [here](https://docs.github.com/en/get-started/quickstart/fork-a-repo) to learn about forks). - -### How is the Threat Intelligence code loaded in Kibana? - -The Threat Intelligence plugin is loaded within the [security_solution](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution) plugin. - -### I'm not seeing any data in the Indicators' table - -See this [documentation here](https://github.com/elastic/security-team/blob/main/docs/protections-team/threat-intelligence-services/protections-experience/development-setup.mdx) to get Threat Intelligence feed in Kibana. - -Once you have the feed running, go to `Management > Advanced Settings > Threat indices` and add `filebeat-*` to the list (comma separated). \ No newline at end of file diff --git a/x-pack/plugins/threat_intelligence/README.md b/x-pack/plugins/threat_intelligence/README.md index 945ab9b85a4f1..7395ca0df8a70 100755 --- a/x-pack/plugins/threat_intelligence/README.md +++ b/x-pack/plugins/threat_intelligence/README.md @@ -6,28 +6,55 @@ Elastic Threat Intelligence makes it easy to analyze and investigate potential s The Threat Intelligence UI is displayed in Kibana Security, under the Explore section. -## Quick Start +## Development setup -See the [kibana contributing guide](https://github.com/elastic/kibana/blob/main/CONTRIBUTING.md) for instructions setting up your development environment. +### Kibana development in general -Verify your node version [here](https://github.com/elastic/kibana/blob/main/.node-version). +Best source - [internal Kibana docs](https://docs.elastic.dev/kibana-dev-docs/getting-started/welcome). If you have any issues with setting up your Kibana dev environment [#kibana](https://elastic.slack.com/archives/C0D8P2XK5) Slack channel is a good way to get help. -**Run ES:** +### Essential `kibana.yml` settings -`yarn es snapshot --license trial` +You can make a copy of `kibana.yml` file into `kibana.dev.yml` and make adjustments to the settings. External documentation on the flags available is [here](https://www.elastic.co/guide/en/kibana/current/settings.html) -**Run Kibana:** +It is recommended to set `server.basePath: "/kbn"` to make you local instance persist the base Kibana path. If you don't do it, the base path will be a random string every time you start Kibana. Any other value than `/kbn` will also work. -> **Important:** -> -> See here to get your `kibana.yaml` to enable the Threat Intelligence plugin. +### Getting Threat Intelligence feeds data into Kibana -``` -yarn kbn reset && yarn kbn bootstrap -yarn start --no-base-path -``` +There are many ways to get data for you local development. We first focus on getting Threat Intelligence data specifically. + +### Setting up filebeat threatintel integrations locally + +1. install [mage](https://github.com/magefile/mage). It is a Go build tool used to build `beats`. Installation from the sources requires Go lang set up. A simpler option might be to install it from a package manager available in your system (eg. `brew` on MacOs) or use their [binary distribution](https://github.com/magefile/mage/releases) +1. start Elasticsearch and Kibana +1. clone [beats](https://github.com/elastic/beats) repository +1. inside beats repository, update `x-pack/filebeat/filebeat.yml` with your local Elasticsearch and Kibana connection configs + + ``` + output.elasticsearch: + hosts: ["localhost:9200"] + username: "elastic" + password: "changeme" + + setup.kibana: + host: "localhost:5601" // make sure to run Kibana with --no-base-path option or specify server.basePath in Kibana config and use it here as a path, eg. localhost:5601/kbn + ``` + +1. go into `x-pack/filebeat` (that's where security related modules live) +1. build filebeat `mage build` +1. enable `threatintel` module by running `./filebeat modules enable threatintel` +1. enable specific Threat Intelligence integrations by updating `modules.d/threatintel.yml`. Update `enable` to `true` in every integration you want to enable and configs specific for these integrations. The bare minimum is to enable Abuse.CH feeds `abuseurl`, `abusemalware` and `malwarebazaar`. +1. run `./filebeat setup -E setup.dashboards.directory=build/kibana` to set up predefined dashboards +1. run `./filebeat -e` to start filebeat +1. to validate that the set up works, wait for some Threat Intel data to be ingested and then go in Analytics > Discover in your local Kibana to search `event.category : threat and event.type : indicator`. You should see some documents returned by this search. Abuse.CH feeds are up to date so you should see the results from the last 7 days. + +### More ways to get data -### Performance +There are many more tools available for getting the data for testing or local development, depending on the data type and usecase. + +- Kibana development docs > [Add data](https://docs.elastic.dev/kibana-dev-docs/getting-started/sample-data) +- [Dev/Design/Testing Environments and Frameworks](https://docs.google.com/document/d/1DGCcLMnVKQ_STlkbS4E0m4kbPivNtR8iMlg_IoCuCEw/edit#) gathered by Security Engineering Productivity team + +### Generate fixtures for local testing You can generate large volumes of threat indicators on demand with the following script: @@ -37,17 +64,29 @@ node scripts/generate_indicators.js see the file in order to adjust the amount of indicators generated. The default is one million. -### Useful hints +## Data for E2E tests -Export local instance data to es_archives (will be loaded in cypress tests). +Use es_archives to export data for e2e testing purposes, like so: ``` TEST_ES_PORT=9200 node scripts/es_archiver save x-pack/test/threat_intelligence_cypress/es_archives/threat_intelligence "logs-ti*" ``` +These can be loaded at will with `x-pack/plugins/threat_intelligence/cypress/tasks/es_archiver.ts` task. + +You can use this approach to load separate data dumps for every test case, to cover all critical scenarios. + ## FAQ -See [FAQ.md](https://github.com/elastic/kibana/blob/main/x-pack/plugins/threat_intelligence/FAQ.md) for questions you may have. +### How is the Threat Intelligence code loaded in Kibana? + +The Threat Intelligence plugin is loaded lazily within the [security_solution](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution) plugin, +from `x-pack/plugins/security_solution/public/threat_intelligence` owned by the Protections Experience Team. + +## QA and demo for implemented features + +One way to QA and demo the feature merged into `main` branch is to run the latest `main` locally. +Another option is to deploy a Staging instance. For Staging environment snapshots are being build every night with the latest state of the `main` branch. More documentation can be found [here](https://cloud.elastic.dev/environments/Staging/#automatic-termination-of-staging-deployments) ## Contributing From 16ca2d28957a833cf78abae97609a3f5a1dfd5c0 Mon Sep 17 00:00:00 2001 From: Ying Mao Date: Thu, 29 Sep 2022 07:53:50 -0400 Subject: [PATCH 91/95] [Event Log] Adding event log schema check to CI checks (#142104) * Adding event log check to CI check. * Adding event log check to CI check. * Can I check out ECS * Checking out specific ECS branch * Checking out specific ECS branch * Custom error message * Reverting event log mapping test changes * Pinning to 1.8 * Update .buildkite/scripts/steps/checks/event_log.sh Co-authored-by: Jonathan Budzenski Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> Co-authored-by: Jonathan Budzenski --- .buildkite/scripts/common/util.sh | 7 ++++++- .buildkite/scripts/steps/checks.sh | 1 + .buildkite/scripts/steps/checks/event_log.sh | 15 +++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100755 .buildkite/scripts/steps/checks/event_log.sh diff --git a/.buildkite/scripts/common/util.sh b/.buildkite/scripts/common/util.sh index 1ce05856ec6b7..748babfc0650b 100755 --- a/.buildkite/scripts/common/util.sh +++ b/.buildkite/scripts/common/util.sh @@ -39,6 +39,7 @@ check_for_changed_files() { C_RESET='\033[0m' # Reset color SHOULD_AUTO_COMMIT_CHANGES="${2:-}" + CUSTOM_FIX_MESSAGE="${3:-}" GIT_CHANGES="$(git ls-files --modified -- . ':!:.bazelrc')" if [ "$GIT_CHANGES" ]; then @@ -75,7 +76,11 @@ check_for_changed_files() { else echo -e "\n${RED}ERROR: '$1' caused changes to the following files:${C_RESET}\n" echo -e "$GIT_CHANGES\n" - echo -e "\n${YELLOW}TO FIX: Run '$1' locally, commit the changes and push to your branch${C_RESET}\n" + if [ "$CUSTOM_FIX_MESSAGE" ]; then + echo "$CUSTOM_FIX_MESSAGE" + else + echo -e "\n${YELLOW}TO FIX: Run '$1' locally, commit the changes and push to your branch${C_RESET}\n" + fi exit 1 fi fi diff --git a/.buildkite/scripts/steps/checks.sh b/.buildkite/scripts/steps/checks.sh index 4af63d318c804..0e11ac04eea1d 100755 --- a/.buildkite/scripts/steps/checks.sh +++ b/.buildkite/scripts/steps/checks.sh @@ -8,6 +8,7 @@ export DISABLE_BOOTSTRAP_VALIDATION=false .buildkite/scripts/steps/checks/precommit_hook.sh .buildkite/scripts/steps/checks/ftr_configs.sh .buildkite/scripts/steps/checks/bazel_packages.sh +.buildkite/scripts/steps/checks/event_log.sh .buildkite/scripts/steps/checks/telemetry.sh .buildkite/scripts/steps/checks/ts_projects.sh .buildkite/scripts/steps/checks/jest_configs.sh diff --git a/.buildkite/scripts/steps/checks/event_log.sh b/.buildkite/scripts/steps/checks/event_log.sh new file mode 100755 index 0000000000000..dc9c01902c010 --- /dev/null +++ b/.buildkite/scripts/steps/checks/event_log.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +set -euo pipefail + +source .buildkite/scripts/common/util.sh + +echo --- Check Event Log Schema + +# event log schema is pinned to a specific version of ECS +ECS_STABLE_VERSION=1.8 +git clone --depth 1 -b $ECS_STABLE_VERSION https://github.com/elastic/ecs.git ../ecs + +node x-pack/plugins/event_log/scripts/create_schemas.js + +check_for_changed_files 'node x-pack/plugins/event_log/scripts/create_schemas.js' false 'Follow the directions in x-pack/plugins/event_log/generated/README.md to make schema changes for the event log.' From 13824dd0ddbb88bcbd8995fab85ee325ffa6ae4f Mon Sep 17 00:00:00 2001 From: Julia Bardi <90178898+juliaElastic@users.noreply.github.com> Date: Thu, 29 Sep 2022 13:57:16 +0200 Subject: [PATCH 92/95] added retry_on_conflict and report errors from bulk agent update (#142088) Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../fleet/server/services/agents/crud.ts | 1 + .../server/services/agents/reassign.test.ts | 25 +++++++++++++++++++ .../services/agents/reassign_action_runner.ts | 8 +++++- 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/x-pack/plugins/fleet/server/services/agents/crud.ts b/x-pack/plugins/fleet/server/services/agents/crud.ts index 305bf2b6bacb4..55a244664238b 100644 --- a/x-pack/plugins/fleet/server/services/agents/crud.ts +++ b/x-pack/plugins/fleet/server/services/agents/crud.ts @@ -405,6 +405,7 @@ export async function bulkUpdateAgents( { update: { _id: agentId, + retry_on_conflict: 3, }, }, { diff --git a/x-pack/plugins/fleet/server/services/agents/reassign.test.ts b/x-pack/plugins/fleet/server/services/agents/reassign.test.ts index a54c2cb56c944..3fb9d2ee1f33b 100644 --- a/x-pack/plugins/fleet/server/services/agents/reassign.test.ts +++ b/x-pack/plugins/fleet/server/services/agents/reassign.test.ts @@ -96,4 +96,29 @@ describe('reassignAgents (plural)', () => { }); expect(calledWithActionResults.body?.[1] as any).toEqual(expectedObject); }); + + it('should report errors from ES agent update call', async () => { + const { soClient, esClient, agentInRegularDoc, regularAgentPolicySO2 } = createClientMock(); + esClient.bulk.mockResponse({ + items: [ + { + update: { + _id: agentInRegularDoc._id, + error: new Error('version conflict'), + }, + }, + ], + } as any); + const idsToReassign = [agentInRegularDoc._id]; + await reassignAgents(soClient, esClient, { agentIds: idsToReassign }, regularAgentPolicySO2.id); + + const calledWithActionResults = esClient.bulk.mock.calls[1][0] as estypes.BulkRequest; + const expectedObject = expect.objectContaining({ + '@timestamp': expect.anything(), + action_id: expect.anything(), + agent_id: agentInRegularDoc._id, + error: 'version conflict', + }); + expect(calledWithActionResults.body?.[1] as any).toEqual(expectedObject); + }); }); diff --git a/x-pack/plugins/fleet/server/services/agents/reassign_action_runner.ts b/x-pack/plugins/fleet/server/services/agents/reassign_action_runner.ts index 55c0e00728d16..96405e464b358 100644 --- a/x-pack/plugins/fleet/server/services/agents/reassign_action_runner.ts +++ b/x-pack/plugins/fleet/server/services/agents/reassign_action_runner.ts @@ -72,7 +72,7 @@ export async function reassignBatch( throw new AgentReassignmentError('No agents to reassign, already assigned or hosted agents'); } - await bulkUpdateAgents( + const res = await bulkUpdateAgents( esClient, agentsToUpdate.map((agent) => ({ agentId: agent.id, @@ -83,6 +83,12 @@ export async function reassignBatch( })) ); + res.items + .filter((item) => !item.success) + .forEach((item) => { + errors[item.id] = item.error!; + }); + const actionId = options.actionId ?? uuid(); const errorCount = Object.keys(errors).length; const total = options.total ?? agentsToUpdate.length + errorCount; From 60e5e411070d80815fbbf0f054bf25035dd2770e Mon Sep 17 00:00:00 2001 From: Carlos Crespo Date: Thu, 29 Sep 2022 14:23:50 +0200 Subject: [PATCH 93/95] Fix Legend Options and Node Map layout on mobile view (#142052) * Fix Legend Options and Node Map layout on mobile view * Fix Number of Color bar on mobile Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../components/waffle/legend_controls.tsx | 15 +++++++++++++-- .../inventory_view/components/waffle/map.tsx | 1 + .../components/waffle/palette_preview.tsx | 4 ++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/legend_controls.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/legend_controls.tsx index a9b8b399a6837..77784f855de32 100644 --- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/legend_controls.tsx +++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/legend_controls.tsx @@ -24,6 +24,7 @@ import { } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; +import { euiStyled } from '@kbn/kibana-react-plugin/common'; import React, { SyntheticEvent, useState, useCallback, useEffect } from 'react'; import { first, last } from 'lodash'; import { InfraWaffleMapBounds, InventoryColorPalette, PALETTES } from '../../../../../lib/lib'; @@ -189,9 +190,10 @@ export const LegendControls = ({ button={buttonComponent} anchorPosition="leftCenter" data-test-subj="legendControls" + // panelStyle={{ width: '100%', maxWidth: 375 }} > Legend Options - + - + ); }; + +const StyledEuiForm = euiStyled(EuiForm)` + min-width: 400px; + @media (max-width: 480px) { + min-width: 100%; + max-width: 100%; + width: 100vw; + } +`; diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/map.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/map.tsx index e0d03284d63fc..a4558d6a7e9b0 100644 --- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/map.tsx +++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/map.tsx @@ -105,6 +105,7 @@ const WaffleMapOuterContainer = euiStyled.div<{ bottomMargin: number; staticHeig overflow-x: hidden; overflow-y: auto; margin-bottom: ${(props) => props.bottomMargin}px; + max-width: calc(100vw - 90px); ${(props) => props.staticHeight && 'min-height: 300px;'} `; diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/palette_preview.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/palette_preview.tsx index 132982eae69b9..9dc5f3acd6e57 100644 --- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/palette_preview.tsx +++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/palette_preview.tsx @@ -28,9 +28,9 @@ export const PalettePreview = ({ steps, palette, reverse }: Props) => { }; const Swatch = euiStyled.div` - width: 15px; + max-width: 15px; height: 12px; - flex: 0 0 auto; + flex: 1 1 auto; &:first-child { border-radius: ${(props) => props.theme.eui.euiBorderRadius} 0 0 ${(props) => props.theme.eui.euiBorderRadius}; From e678b7888f64d7b8b80fdeb128c6ac96f87d3709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Istv=C3=A1n=20Zolt=C3=A1n=20Szab=C3=B3?= Date: Thu, 29 Sep 2022 14:32:29 +0200 Subject: [PATCH 94/95] Adds ML URL shortcut to doc link manager (#142091) Co-authored-by: Lisa Cawley --- packages/kbn-doc-links/src/get_doc_links.ts | 53 +++++++++++---------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/packages/kbn-doc-links/src/get_doc_links.ts b/packages/kbn-doc-links/src/get_doc_links.ts index 721fc431a3c2e..3a0b89c1f0d1b 100644 --- a/packages/kbn-doc-links/src/get_doc_links.ts +++ b/packages/kbn-doc-links/src/get_doc_links.ts @@ -31,6 +31,7 @@ export const getDocLinks = ({ kibanaBranch }: GetDocLinkOptions): DocLinks => { const ENTERPRISE_SEARCH_DOCS = `${ELASTIC_WEBSITE_URL}guide/en/enterprise-search/${DOC_LINK_VERSION}/`; const WORKPLACE_SEARCH_DOCS = `${ELASTIC_WEBSITE_URL}guide/en/workplace-search/${DOC_LINK_VERSION}/`; const SEARCH_UI_DOCS = `${DOCS_WEBSITE_URL}search-ui/`; + const MACHINE_LEARNING_DOCS = `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/`; return deepFreeze({ settings: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/settings.html`, @@ -398,39 +399,39 @@ export const getDocLinks = ({ kibanaBranch }: GetDocLinkOptions): DocLinks => { savedObjectsApiList: `${KIBANA_DOCS}saved-objects-api.html#saved-objects-api`, }, ml: { - guide: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/index.html`, - aggregations: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-configuring-aggregation.html`, - anomalyDetection: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-ad-overview.html`, - anomalyDetectionJobs: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-ad-finding-anomalies.html`, - anomalyDetectionConfiguringCategories: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-configuring-categories.html`, - anomalyDetectionBucketSpan: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-ad-run-jobs.html#ml-ad-bucket-span`, - anomalyDetectionCardinality: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-ad-run-jobs.html#ml-ad-cardinality`, - anomalyDetectionCreateJobs: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-ad-run-jobs.html#ml-ad-create-job`, - anomalyDetectionDetectors: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-ad-run-jobs.html#ml-ad-detectors`, - anomalyDetectionInfluencers: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-ad-run-jobs.html#ml-ad-influencers`, + guide: `${MACHINE_LEARNING_DOCS}index.html`, + aggregations: `${MACHINE_LEARNING_DOCS}ml-configuring-aggregation.html`, + anomalyDetection: `${MACHINE_LEARNING_DOCS}ml-ad-overview.html`, + anomalyDetectionJobs: `${MACHINE_LEARNING_DOCS}ml-ad-finding-anomalies.html`, + anomalyDetectionConfiguringCategories: `${MACHINE_LEARNING_DOCS}ml-configuring-categories.html`, + anomalyDetectionBucketSpan: `${MACHINE_LEARNING_DOCS}ml-ad-run-jobs.html#ml-ad-bucket-span`, + anomalyDetectionCardinality: `${MACHINE_LEARNING_DOCS}ml-ad-run-jobs.html#ml-ad-cardinality`, + anomalyDetectionCreateJobs: `${MACHINE_LEARNING_DOCS}ml-ad-run-jobs.html#ml-ad-create-job`, + anomalyDetectionDetectors: `${MACHINE_LEARNING_DOCS}ml-ad-run-jobs.html#ml-ad-detectors`, + anomalyDetectionInfluencers: `${MACHINE_LEARNING_DOCS}ml-ad-run-jobs.html#ml-ad-influencers`, anomalyDetectionJobResource: `${ELASTICSEARCH_DOCS}ml-put-job.html#ml-put-job-path-parms`, anomalyDetectionJobResourceAnalysisConfig: `${ELASTICSEARCH_DOCS}ml-put-job.html#put-analysisconfig`, - anomalyDetectionJobTips: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-ad-run-jobs.html#ml-ad-job-tips`, - alertingRules: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-configuring-alerts.html`, - anomalyDetectionModelMemoryLimits: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-ad-run-jobs.html#ml-ad-model-memory-limits`, - calendars: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-ad-run-jobs.html#ml-ad-calendars`, - classificationEvaluation: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-dfa-classification.html#ml-dfanalytics-classification-evaluation`, - customRules: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-ad-run-jobs.html#ml-ad-rules`, - customUrls: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-configuring-url.html`, - dataFrameAnalytics: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-dfanalytics.html`, - dFAPrepareData: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-dfa-overview.html#prepare-transform-data`, - featureImportance: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-feature-importance.html`, - outlierDetectionRoc: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-dfa-finding-outliers.html#ml-dfanalytics-roc`, - regressionEvaluation: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-dfa-regression.html#ml-dfanalytics-regression-evaluation`, - classificationAucRoc: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-dfa-classification.html#ml-dfanalytics-class-aucroc`, + anomalyDetectionJobTips: `${MACHINE_LEARNING_DOCS}ml-ad-run-jobs.html#ml-ad-job-tips`, + alertingRules: `${MACHINE_LEARNING_DOCS}ml-configuring-alerts.html`, + anomalyDetectionModelMemoryLimits: `${MACHINE_LEARNING_DOCS}ml-ad-run-jobs.html#ml-ad-model-memory-limits`, + calendars: `${MACHINE_LEARNING_DOCS}ml-ad-run-jobs.html#ml-ad-calendars`, + classificationEvaluation: `${MACHINE_LEARNING_DOCS}ml-dfa-classification.html#ml-dfanalytics-classification-evaluation`, + customRules: `${MACHINE_LEARNING_DOCS}ml-ad-run-jobs.html#ml-ad-rules`, + customUrls: `${MACHINE_LEARNING_DOCS}ml-configuring-url.html`, + dataFrameAnalytics: `${MACHINE_LEARNING_DOCS}ml-dfanalytics.html`, + dFAPrepareData: `${MACHINE_LEARNING_DOCS}ml-dfa-overview.html#prepare-transform-data`, + featureImportance: `${MACHINE_LEARNING_DOCS}ml-feature-importance.html`, + outlierDetectionRoc: `${MACHINE_LEARNING_DOCS}ml-dfa-finding-outliers.html#ml-dfanalytics-roc`, + regressionEvaluation: `${MACHINE_LEARNING_DOCS}ml-dfa-regression.html#ml-dfanalytics-regression-evaluation`, + classificationAucRoc: `${MACHINE_LEARNING_DOCS}ml-dfa-classification.html#ml-dfanalytics-class-aucroc`, setUpgradeMode: `${ELASTICSEARCH_DOCS}ml-set-upgrade-mode.html`, - trainedModels: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-trained-models.html`, - startTrainedModelsDeployment: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-nlp-deploy-models.html#ml-nlp-deploy-model`, + trainedModels: `${MACHINE_LEARNING_DOCS}ml-trained-models.html`, + startTrainedModelsDeployment: `${MACHINE_LEARNING_DOCS}ml-nlp-deploy-models.html#ml-nlp-deploy-model`, }, transforms: { guide: `${ELASTICSEARCH_DOCS}transforms.html`, // TODO add valid docs URL - alertingRules: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-configuring-alerts.html`, + alertingRules: `${MACHINE_LEARNING_DOCS}ml-configuring-alerts.html`, }, visualize: { guide: `${KIBANA_DOCS}dashboard.html`, From 7c9875c33c1922bb0a6c4ca436e25dd7f0c95ea7 Mon Sep 17 00:00:00 2001 From: doakalexi <109488926+doakalexi@users.noreply.github.com> Date: Thu, 29 Sep 2022 08:56:47 -0400 Subject: [PATCH 95/95] [Response Ops] [Alerting] Rules and Connectors: Current page in breadcrumbs shows as link (#141838) * Updating breadcrumb function for alerting * Remove href --- .../public/application/lib/breadcrumb.test.ts | 31 +++++++++------- .../public/application/lib/breadcrumb.ts | 35 +++++++++++-------- .../rule_details/components/rule_details.tsx | 7 ++-- 3 files changed, 41 insertions(+), 32 deletions(-) diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/breadcrumb.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/breadcrumb.test.ts index 26a69093ae48d..cbe226ce68aa8 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/lib/breadcrumb.test.ts +++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/breadcrumb.test.ts @@ -5,40 +5,47 @@ * 2.0. */ -import { getAlertingSectionBreadcrumb, getRuleDetailsBreadcrumb } from './breadcrumb'; +import { getAlertingSectionBreadcrumb } from './breadcrumb'; import { i18n } from '@kbn/i18n'; import { routeToConnectors, routeToRules, routeToHome } from '../constants'; describe('getAlertingSectionBreadcrumb', () => { test('if change calls return proper breadcrumb title ', async () => { - expect(getAlertingSectionBreadcrumb('connectors')).toMatchObject({ + expect(getAlertingSectionBreadcrumb('connectors', true)).toMatchObject({ text: i18n.translate('xpack.triggersActionsUI.connectors.breadcrumbTitle', { defaultMessage: 'Connectors', }), href: `${routeToConnectors}`, }); - expect(getAlertingSectionBreadcrumb('rules')).toMatchObject({ + expect(getAlertingSectionBreadcrumb('rules', true)).toMatchObject({ text: i18n.translate('xpack.triggersActionsUI.rules.breadcrumbTitle', { defaultMessage: 'Rules', }), href: `${routeToRules}`, }); - expect(getAlertingSectionBreadcrumb('home')).toMatchObject({ + expect(getAlertingSectionBreadcrumb('home', true)).toMatchObject({ text: i18n.translate('xpack.triggersActionsUI.home.breadcrumbTitle', { defaultMessage: 'Rules and Connectors', }), href: `${routeToHome}`, }); }); -}); - -describe('getRuleDetailsBreadcrumb', () => { - test('if select an alert should return proper breadcrumb title with alert name ', async () => { - expect(getRuleDetailsBreadcrumb('testId', 'testName')).toMatchObject({ - text: i18n.translate('xpack.triggersActionsUI.alertDetails.breadcrumbTitle', { - defaultMessage: 'testName', + test('if boolean is passed in returns proper breadcrumb href ', async () => { + expect(getAlertingSectionBreadcrumb('connectors', true)).toMatchObject({ + text: i18n.translate('xpack.triggersActionsUI.connectors.breadcrumbTitle', { + defaultMessage: 'Connectors', + }), + href: `${routeToConnectors}`, + }); + expect(getAlertingSectionBreadcrumb('rules', false)).toMatchObject({ + text: i18n.translate('xpack.triggersActionsUI.rules.breadcrumbTitle', { + defaultMessage: 'Rules', + }), + }); + expect(getAlertingSectionBreadcrumb('home', false)).toMatchObject({ + text: i18n.translate('xpack.triggersActionsUI.home.breadcrumbTitle', { + defaultMessage: 'Rules and Connectors', }), - href: '/rule/testId', }); }); }); diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/breadcrumb.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/breadcrumb.ts index d26cdbcb3d174..46a15b12bb733 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/lib/breadcrumb.ts +++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/breadcrumb.ts @@ -6,9 +6,12 @@ */ import { i18n } from '@kbn/i18n'; -import { routeToHome, routeToConnectors, routeToRules, routeToRuleDetails } from '../constants'; +import { routeToHome, routeToConnectors, routeToRules } from '../constants'; -export const getAlertingSectionBreadcrumb = (type: string): { text: string; href: string } => { +export const getAlertingSectionBreadcrumb = ( + type: string, + returnHref: boolean = false +): { text: string; href?: string } => { // Home and sections switch (type) { case 'connectors': @@ -16,31 +19,33 @@ export const getAlertingSectionBreadcrumb = (type: string): { text: string; href text: i18n.translate('xpack.triggersActionsUI.connectors.breadcrumbTitle', { defaultMessage: 'Connectors', }), - href: `${routeToConnectors}`, + ...(returnHref + ? { + href: `${routeToConnectors}`, + } + : {}), }; case 'rules': return { text: i18n.translate('xpack.triggersActionsUI.rules.breadcrumbTitle', { defaultMessage: 'Rules', }), - href: `${routeToRules}`, + ...(returnHref + ? { + href: `${routeToRules}`, + } + : {}), }; default: return { text: i18n.translate('xpack.triggersActionsUI.home.breadcrumbTitle', { defaultMessage: 'Rules and Connectors', }), - href: `${routeToHome}`, + ...(returnHref + ? { + href: `${routeToHome}`, + } + : {}), }; } }; - -export const getRuleDetailsBreadcrumb = ( - id: string, - name: string -): { text: string; href: string } => { - return { - text: name, - href: `${routeToRuleDetails.replace(':ruleId', id)}`, - }; -}; diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details.tsx index c17bc40086666..38357d7c56057 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details.tsx @@ -36,7 +36,7 @@ import { hasExecuteActionsCapability, hasManageApiKeysCapability, } from '../../../lib/capabilities'; -import { getAlertingSectionBreadcrumb, getRuleDetailsBreadcrumb } from '../../../lib/breadcrumb'; +import { getAlertingSectionBreadcrumb } from '../../../lib/breadcrumb'; import { getCurrentDocTitle } from '../../../lib/doc_title'; import { Rule, @@ -117,10 +117,7 @@ export const RuleDetails: React.FunctionComponent = ({ // Set breadcrumb and page title useEffect(() => { - setBreadcrumbs([ - getAlertingSectionBreadcrumb('rules'), - getRuleDetailsBreadcrumb(rule.id, rule.name), - ]); + setBreadcrumbs([getAlertingSectionBreadcrumb('rules', true), { text: rule.name }]); chrome.docTitle.change(getCurrentDocTitle('rules')); // eslint-disable-next-line react-hooks/exhaustive-deps }, []);

    rk!lwQj$yx+= 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