From 5c90bacce543f4549b57252f7efa8ea0925c09a5 Mon Sep 17 00:00:00 2001 From: Mikhail Shustov Date: Wed, 16 Jun 2021 10:55:22 +0200 Subject: [PATCH 01/46] do not throw execa error when building ts refs (#102154) --- src/dev/typescript/build_ts_refs.ts | 16 ++++++++++++---- src/dev/typescript/run_type_check_cli.ts | 6 +++++- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/dev/typescript/build_ts_refs.ts b/src/dev/typescript/build_ts_refs.ts index 2e25827996e453..26425b7a3e61df 100644 --- a/src/dev/typescript/build_ts_refs.ts +++ b/src/dev/typescript/build_ts_refs.ts @@ -13,12 +13,20 @@ import { ToolingLog, REPO_ROOT } from '@kbn/dev-utils'; export const REF_CONFIG_PATHS = [Path.resolve(REPO_ROOT, 'tsconfig.refs.json')]; -export async function buildAllTsRefs(log: ToolingLog) { +export async function buildAllTsRefs(log: ToolingLog): Promise<{ failed: boolean }> { for (const path of REF_CONFIG_PATHS) { const relative = Path.relative(REPO_ROOT, path); log.debug(`Building TypeScript projects refs for ${relative}...`); - await execa(require.resolve('typescript/bin/tsc'), ['-b', relative, '--pretty'], { - cwd: REPO_ROOT, - }); + const { failed, stdout } = await execa( + require.resolve('typescript/bin/tsc'), + ['-b', relative, '--pretty'], + { + cwd: REPO_ROOT, + reject: false, + } + ); + log.info(stdout); + if (failed) return { failed }; } + return { failed: false }; } diff --git a/src/dev/typescript/run_type_check_cli.ts b/src/dev/typescript/run_type_check_cli.ts index f95c230f44b9e4..d9e9eb036fe0f2 100644 --- a/src/dev/typescript/run_type_check_cli.ts +++ b/src/dev/typescript/run_type_check_cli.ts @@ -69,7 +69,11 @@ export async function runTypeCheckCli() { process.exit(); } - await buildAllTsRefs(log); + const { failed } = await buildAllTsRefs(log); + if (failed) { + log.error('Unable to build TS project refs'); + process.exit(1); + } const tscArgs = [ // composite project cannot be used with --noEmit From aa97040bb6acb32b67b2a4c005ca905c50c5a5c9 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 16 Jun 2021 10:01:43 +0100 Subject: [PATCH 02/46] [APM-UI][e2e] discard CI builds more often (#102217) --- .ci/end2end.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/end2end.groovy b/.ci/end2end.groovy index 87b64437deafcd..f1095f8035b6c4 100644 --- a/.ci/end2end.groovy +++ b/.ci/end2end.groovy @@ -13,12 +13,12 @@ pipeline { BASE_DIR = 'src/github.com/elastic/kibana' HOME = "${env.WORKSPACE}" E2E_DIR = 'x-pack/plugins/apm/e2e' - PIPELINE_LOG_LEVEL = 'DEBUG' + PIPELINE_LOG_LEVEL = 'INFO' KBN_OPTIMIZER_THEMES = 'v7light' } options { timeout(time: 1, unit: 'HOURS') - buildDiscarder(logRotator(numToKeepStr: '40', artifactNumToKeepStr: '20', daysToKeepStr: '30')) + buildDiscarder(logRotator(numToKeepStr: '30', artifactNumToKeepStr: '10', daysToKeepStr: '30')) timestamps() ansiColor('xterm') disableResume() From 037d7aeb8f11057e0b4696e9f6aeafd321b32220 Mon Sep 17 00:00:00 2001 From: Pablo Machado Date: Wed, 16 Jun 2021 12:23:10 +0200 Subject: [PATCH 03/46] Enhance cases bulk deletion action dialog message (#101403) Differentiate the dialog message on the deletion of one item from the deletion of multiple items. Simplifies CasesTableUtilityBar by handling the selection of multiple and single cases in the same way. --- x-pack/plugins/cases/common/ui/types.ts | 2 +- .../cases/public/common/translations.ts | 12 +++---- .../public/components/all_cases/actions.tsx | 4 +-- .../public/components/all_cases/columns.tsx | 1 - .../components/all_cases/utility_bar.tsx | 33 +++++-------------- .../components/case_action_bar/actions.tsx | 3 +- .../components/confirm_delete_case/index.tsx | 18 ++++------ .../confirm_delete_case/translations.ts | 26 +++++---------- .../containers/use_delete_cases.test.tsx | 6 ++-- 9 files changed, 36 insertions(+), 69 deletions(-) diff --git a/x-pack/plugins/cases/common/ui/types.ts b/x-pack/plugins/cases/common/ui/types.ts index 284f5e706292cc..1dbb633e32adf0 100644 --- a/x-pack/plugins/cases/common/ui/types.ts +++ b/x-pack/plugins/cases/common/ui/types.ts @@ -153,7 +153,7 @@ export interface ActionLicense { export interface DeleteCase { id: string; type: CaseType | null; - title?: string; + title: string; } export interface FieldMappings { diff --git a/x-pack/plugins/cases/public/common/translations.ts b/x-pack/plugins/cases/public/common/translations.ts index 85cfb60b1d6b81..f1bfde4cc44851 100644 --- a/x-pack/plugins/cases/public/common/translations.ts +++ b/x-pack/plugins/cases/public/common/translations.ts @@ -30,13 +30,11 @@ export const CANCEL = i18n.translate('xpack.cases.caseView.cancel', { defaultMessage: 'Cancel', }); -export const DELETE_CASE = i18n.translate('xpack.cases.confirmDeleteCase.deleteCase', { - defaultMessage: 'Delete case', -}); - -export const DELETE_CASES = i18n.translate('xpack.cases.confirmDeleteCase.deleteCases', { - defaultMessage: 'Delete cases', -}); +export const DELETE_CASE = (quantity: number = 1) => + i18n.translate('xpack.cases.confirmDeleteCase.deleteCase', { + values: { quantity }, + defaultMessage: `Delete {quantity, plural, =1 {case} other {cases}}`, + }); export const NAME = i18n.translate('xpack.cases.caseView.name', { defaultMessage: 'Name', diff --git a/x-pack/plugins/cases/public/components/all_cases/actions.tsx b/x-pack/plugins/cases/public/components/all_cases/actions.tsx index 8742b8fea23a42..4820b10308934f 100644 --- a/x-pack/plugins/cases/public/components/all_cases/actions.tsx +++ b/x-pack/plugins/cases/public/components/all_cases/actions.tsx @@ -80,9 +80,9 @@ export const getActions = ({ makeInProgressAction, closeCaseAction, { - description: i18n.DELETE_CASE, + description: i18n.DELETE_CASE(), icon: 'trash', - name: i18n.DELETE_CASE, + name: i18n.DELETE_CASE(), onClick: deleteCaseOnClick, type: 'icon', 'data-test-subj': 'action-delete', 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 947d405d188cf0..a5a299851d975a 100644 --- a/x-pack/plugins/cases/public/components/all_cases/columns.tsx +++ b/x-pack/plugins/cases/public/components/all_cases/columns.tsx @@ -306,7 +306,6 @@ export const useCasesColumns = ({ 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 d0981c38385e96..a2b4c14c0278a8 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 @@ -41,12 +41,8 @@ export const CasesTableUtilityBar: FunctionComponent = ({ refreshCases, selectedCases, }) => { - const [deleteBulk, setDeleteBulk] = useState([]); - const [deleteThisCase, setDeleteThisCase] = useState({ - title: '', - id: '', - type: null, - }); + const [deleteCases, setDeleteCases] = useState([]); + // Delete case const { dispatchResetIsDeleted, @@ -86,24 +82,15 @@ export const CasesTableUtilityBar: FunctionComponent = ({ const toggleBulkDeleteModal = useCallback( (cases: Case[]) => { handleToggleModal(); - if (cases.length === 1) { - const singleCase = cases[0]; - if (singleCase) { - return setDeleteThisCase({ - id: singleCase.id, - title: singleCase.title, - type: singleCase.type, - }); - } - } + const convertToDeleteCases: DeleteCase[] = cases.map(({ id, title, type }) => ({ id, title, type, })); - setDeleteBulk(convertToDeleteCases); + setDeleteCases(convertToDeleteCases); }, - [setDeleteBulk, handleToggleModal] + [setDeleteCases, handleToggleModal] ); const handleUpdateCaseStatus = useCallback( @@ -128,6 +115,7 @@ export const CasesTableUtilityBar: FunctionComponent = ({ ), [selectedCases, filterOptions.status, toggleBulkDeleteModal, handleUpdateCaseStatus] ); + return ( @@ -159,14 +147,11 @@ export const CasesTableUtilityBar: FunctionComponent = ({ 0} + caseQuantity={deleteCases.length} onCancel={handleToggleModal} - onConfirm={handleOnDeleteConfirm.bind( - null, - deleteBulk.length > 0 ? deleteBulk : [deleteThisCase] - )} + onConfirm={handleOnDeleteConfirm.bind(null, deleteCases)} /> ); 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 922ffd09aaac9d..c2578dc3debdb6 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 @@ -41,7 +41,7 @@ const ActionsComponent: React.FC = ({ { disabled, iconType: 'trash', - label: i18n.DELETE_CASE, + label: i18n.DELETE_CASE(), onClick: handleToggleModal, }, ...(currentExternalIncident != null && !isEmpty(currentExternalIncident?.externalUrl) @@ -67,7 +67,6 @@ const ActionsComponent: React.FC = ({ void; onConfirm: () => void; } @@ -20,7 +20,7 @@ interface ConfirmDeleteCaseModalProps { const ConfirmDeleteCaseModalComp: React.FC = ({ caseTitle, isModalVisible, - isPlural, + caseQuantity = 1, onCancel, onConfirm, }) => { @@ -31,20 +31,14 @@ const ConfirmDeleteCaseModalComp: React.FC = ({ - {isPlural ? i18n.CONFIRM_QUESTION_PLURAL : i18n.CONFIRM_QUESTION} + {i18n.CONFIRM_QUESTION(caseQuantity)} ); }; 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 0400c4c7fef413..f8e4ab2a83a738 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,23 +14,15 @@ export const DELETE_TITLE = (caseTitle: string) => defaultMessage: 'Delete "{caseTitle}"', }); -export const DELETE_THIS_CASE = (caseTitle: string) => - i18n.translate('xpack.cases.confirmDeleteCase.deleteThisCase', { - defaultMessage: 'Delete this case', +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 = i18n.translate('xpack.cases.confirmDeleteCase.confirmQuestion', { - defaultMessage: - 'By deleting this case, all related case data will be permanently removed and you will no longer be able to push data to an external incident management system. Are you sure you wish to proceed?', -}); -export const DELETE_SELECTED_CASES = i18n.translate('xpack.cases.confirmDeleteCase.selectedCases', { - defaultMessage: 'Delete selected cases', -}); - -export const CONFIRM_QUESTION_PLURAL = i18n.translate( - 'xpack.cases.confirmDeleteCase.confirmQuestionPlural', - { +export const CONFIRM_QUESTION = (quantity: number) => + i18n.translate('xpack.cases.confirmDeleteCase.confirmQuestion', { + values: { quantity }, defaultMessage: - 'By deleting these cases, all related case data will be permanently removed and you will no longer be able to push data to an external incident management system. Are you sure you wish to proceed?', - } -); + 'By deleting {quantity, plural, =1 {this case} other {these cases}}, all related case data will be permanently removed and you will no longer be able to push data to an external incident management system. Are you sure you wish to proceed?', + }); 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 e86ed0c036974a..691af580b333a8 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 @@ -17,9 +17,9 @@ jest.mock('../common/lib/kibana'); describe('useDeleteCases', () => { const abortCtrl = new AbortController(); const deleteObj = [ - { id: '1', type: CaseType.individual }, - { id: '2', type: CaseType.individual }, - { id: '3', type: CaseType.individual }, + { id: '1', type: CaseType.individual, title: 'case 1' }, + { id: '2', type: CaseType.individual, title: 'case 2' }, + { id: '3', type: CaseType.individual, title: 'case 3' }, ]; const deleteArr = ['1', '2', '3']; it('init', async () => { From 35e10ba77013715e381a2373790d67d94df825f1 Mon Sep 17 00:00:00 2001 From: Pete Harverson Date: Wed, 16 Jun 2021 11:31:10 +0100 Subject: [PATCH 04/46] [ML] Adds optimizations for Logs UI anomaly detection jobs (#102191) * [ML] Adds optimizations for Logs UI anomaly detection jobs * [ML] Increment version for log-entry-categories-count job Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../containers/logs/log_analysis/api/ml_setup_module_api.ts | 4 ++++ .../modules/log_entry_categories/module_descriptor.ts | 1 + .../log_analysis/modules/log_entry_rate/module_descriptor.ts | 1 + .../logs_ui_categories/ml/log_entry_categories_count.json | 4 ++-- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_setup_module_api.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_setup_module_api.ts index ea1567d6056f1d..6304471e818fa9 100644 --- a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_setup_module_api.ts +++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_setup_module_api.ts @@ -21,6 +21,7 @@ interface RequestArgs { jobOverrides?: SetupMlModuleJobOverrides[]; datafeedOverrides?: SetupMlModuleDatafeedOverrides[]; query?: object; + useDedicatedIndex?: boolean; } export const callSetupMlModuleAPI = async (requestArgs: RequestArgs, fetch: HttpHandler) => { @@ -34,6 +35,7 @@ export const callSetupMlModuleAPI = async (requestArgs: RequestArgs, fetch: Http jobOverrides = [], datafeedOverrides = [], query, + useDedicatedIndex = false, } = requestArgs; const response = await fetch(`/api/ml/modules/setup/${moduleId}`, { @@ -48,6 +50,7 @@ export const callSetupMlModuleAPI = async (requestArgs: RequestArgs, fetch: Http jobOverrides, datafeedOverrides, query, + useDedicatedIndex, }) ), }); @@ -78,6 +81,7 @@ const setupMlModuleRequestParamsRT = rt.intersection([ startDatafeed: rt.boolean, jobOverrides: rt.array(setupMlModuleJobOverridesRT), datafeedOverrides: rt.array(setupMlModuleDatafeedOverridesRT), + useDedicatedIndex: rt.boolean, }), rt.exact( rt.partial({ diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/module_descriptor.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/module_descriptor.ts index af2bd1802042a4..6823ed173a740c 100644 --- a/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/module_descriptor.ts +++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/module_descriptor.ts @@ -124,6 +124,7 @@ const setUpModule = async ( jobOverrides, datafeedOverrides, query, + useDedicatedIndex: true, }, fetch ); diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/module_descriptor.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/module_descriptor.ts index 9704afd80e9ea6..c4c939d0ebb9d5 100644 --- a/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/module_descriptor.ts +++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/module_descriptor.ts @@ -116,6 +116,7 @@ const setUpModule = async ( jobOverrides, datafeedOverrides, query, + useDedicatedIndex: true, }, fetch ); diff --git a/x-pack/plugins/ml/server/models/data_recognizer/modules/logs_ui_categories/ml/log_entry_categories_count.json b/x-pack/plugins/ml/server/models/data_recognizer/modules/logs_ui_categories/ml/log_entry_categories_count.json index ad7da3330bb6cd..90f88275cb6d0b 100644 --- a/x-pack/plugins/ml/server/models/data_recognizer/modules/logs_ui_categories/ml/log_entry_categories_count.json +++ b/x-pack/plugins/ml/server/models/data_recognizer/modules/logs_ui_categories/ml/log_entry_categories_count.json @@ -22,7 +22,7 @@ ], "per_partition_categorization": { "enabled": true, - "stop_on_warn": false + "stop_on_warn": true } }, "analysis_limits": { @@ -38,6 +38,6 @@ }, "custom_settings": { "created_by": "ml-module-logs-ui-categories", - "job_revision": 1 + "job_revision": 2 } } From d3c1f7c54d83eb5dbb27f699af16eb8637e82a2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Casper=20H=C3=BCbertz?= Date: Wed, 16 Jun 2021 14:38:04 +0200 Subject: [PATCH 05/46] [Observability] Updating header menu links across Observability apps (#101472) * [Observability] POC aligning menu links across apps * [APM] Changed guttersize * [APM] Replace placeholder button * [Uptime] Remove icon from Settings header link * [APM] Reordered anomaly detection and alerts * [Logs] Remove icon from settings and change guttersize * [Metrics] Remove icon from settings and change guttersize * [Logs] Change button style of `isStreaming` state Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../app/RumDashboard/ActionMenu/index.tsx | 21 +++++++++++++++++-- .../alerting_popover_flyout.tsx | 3 ++- .../anomaly_detection_setup_link.tsx | 9 ++++---- .../shared/apm_header_action_menu/index.tsx | 10 +++------ .../components/metrics_alert_dropdown.tsx | 8 ++++++- .../components/alert_dropdown.tsx | 8 ++++++- .../components/logging/log_datepicker.tsx | 15 +++++-------- .../infra/public/pages/logs/page_content.tsx | 4 ++-- .../infra/public/pages/metrics/index.tsx | 4 ++-- .../anomaly_detection_flyout.tsx | 2 ++ .../common/header/action_menu_content.tsx | 9 ++++---- .../alerts/toggle_alert_flyout_button.tsx | 2 ++ 12 files changed, 61 insertions(+), 34 deletions(-) diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/ActionMenu/index.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/ActionMenu/index.tsx index 6d04996b5f24c5..20d930d28599f9 100644 --- a/x-pack/plugins/apm/public/components/app/RumDashboard/ActionMenu/index.tsx +++ b/x-pack/plugins/apm/public/components/app/RumDashboard/ActionMenu/index.tsx @@ -55,26 +55,43 @@ export function UXActionMenu({ http?.basePath.get() ); + const kibana = useKibana(); + return ( {ANALYZE_MESSAGE}

}> {ANALYZE_DATA} + + + {i18n.translate('xpack.apm.addDataButtonLabel', { + defaultMessage: 'Add data', + })} + + ); diff --git a/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/alerting_popover_flyout.tsx b/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/alerting_popover_flyout.tsx index 95acc55196c543..5b4f4e24af44d5 100644 --- a/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/alerting_popover_flyout.tsx +++ b/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/alerting_popover_flyout.tsx @@ -66,7 +66,8 @@ export function AlertingPopoverAndFlyout({ const button = ( setPopoverOpen((prevState) => !prevState)} diff --git a/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/anomaly_detection_setup_link.tsx b/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/anomaly_detection_setup_link.tsx index ade49bc7e3aa4f..28c000310346d5 100644 --- a/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/anomaly_detection_setup_link.tsx +++ b/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/anomaly_detection_setup_link.tsx @@ -42,14 +42,15 @@ export function AnomalyDetectionSetupLink() { return ( {canGetJobs && hasValidLicense ? ( ) : ( - + )} {ANOMALY_DETECTION_LINK_LABEL} @@ -64,7 +65,7 @@ export function MissingJobsAlert({ environment }: { environment?: string }) { anomalyDetectionJobsStatus, } = useAnomalyDetectionJobsContext(); - const defaultIcon = ; + const defaultIcon = ; if (anomalyDetectionJobsStatus === FETCH_STATUS.LOADING) { return ; @@ -92,7 +93,7 @@ export function MissingJobsAlert({ environment }: { environment?: string }) { return ( - + ); } diff --git a/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/index.tsx b/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/index.tsx index 134941990a0f4c..86f0d3fde1cd5d 100644 --- a/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/index.tsx +++ b/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/index.tsx @@ -40,16 +40,13 @@ export function ApmHeaderActionMenu() { } return ( - - + + {i18n.translate('xpack.apm.settingsLinkLabel', { defaultMessage: 'Settings', })} + {canAccessML && } {isAlertingAvailable && ( )} - {canAccessML && } { panelPaddingSize="none" anchorPosition="downLeft" button={ - + } diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/components/alert_dropdown.tsx b/x-pack/plugins/infra/public/alerting/log_threshold/components/alert_dropdown.tsx index 7cd6295cdcf408..66c77fbf875a45 100644 --- a/x-pack/plugins/infra/public/alerting/log_threshold/components/alert_dropdown.tsx +++ b/x-pack/plugins/infra/public/alerting/log_threshold/components/alert_dropdown.tsx @@ -83,7 +83,13 @@ export const AlertDropdown = () => { + } diff --git a/x-pack/plugins/infra/public/components/logging/log_datepicker.tsx b/x-pack/plugins/infra/public/components/logging/log_datepicker.tsx index b146da53caf6f6..4f396ca7da4951 100644 --- a/x-pack/plugins/infra/public/components/logging/log_datepicker.tsx +++ b/x-pack/plugins/infra/public/components/logging/log_datepicker.tsx @@ -6,7 +6,7 @@ */ import React, { useCallback } from 'react'; -import { EuiFlexGroup, EuiFlexItem, EuiSuperDatePicker, EuiButtonEmpty } from '@elastic/eui'; +import { EuiFlexGroup, EuiFlexItem, EuiSuperDatePicker, EuiButton } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; interface LogDatepickerProps { @@ -49,24 +49,19 @@ export const LogDatepicker: React.FC = ({ {isStreaming ? ( - + - + ) : ( - + - + )} 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 35e24700619f8d..c7b145b4b01431 100644 --- a/x-pack/plugins/infra/public/pages/logs/page_content.tsx +++ b/x-pack/plugins/infra/public/pages/logs/page_content.tsx @@ -76,9 +76,9 @@ export const LogsPageContent: React.FunctionComponent = () => { {setHeaderActionMenu && ( - + - + {settingsTabTitle} diff --git a/x-pack/plugins/infra/public/pages/metrics/index.tsx b/x-pack/plugins/infra/public/pages/metrics/index.tsx index cda72e96012fe4..e52d1e90d7efd2 100644 --- a/x-pack/plugins/infra/public/pages/metrics/index.tsx +++ b/x-pack/plugins/infra/public/pages/metrics/index.tsx @@ -84,9 +84,9 @@ export const InfrastructurePage = ({ match }: RouteComponentProps) => { {setHeaderActionMenu && ( - + - + {settingsTabTitle} diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/anomaly_detection_flyout.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/anomaly_detection_flyout.tsx index 5438209ae9c6b5..d2cd4f87a53422 100644 --- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/anomaly_detection_flyout.tsx +++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/anomaly_detection_flyout.tsx @@ -51,6 +51,8 @@ export const AnomalyDetectionFlyout = () => { return ( <> + @@ -72,12 +72,13 @@ export function ActionMenuContent(): React.ReactElement { {ANALYZE_MESSAGE}

}> {ANALYZE_DATA} diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/toggle_alert_flyout_button.tsx b/x-pack/plugins/uptime/public/components/overview/alerts/toggle_alert_flyout_button.tsx index fe507236569ec3..a1b745d07924ef 100644 --- a/x-pack/plugins/uptime/public/components/overview/alerts/toggle_alert_flyout_button.tsx +++ b/x-pack/plugins/uptime/public/components/overview/alerts/toggle_alert_flyout_button.tsx @@ -124,6 +124,8 @@ export const ToggleAlertFlyoutButtonComponent: React.FC = ({ Date: Wed, 16 Jun 2021 15:15:46 +0200 Subject: [PATCH 06/46] [Security solutions][Endpoint] Break long names on remove trusted apps/event filters dialog (#102307) * Break long names on remove trusted apps/event filters dialog. * Removes wrong class --- .../components/event_filter_delete_modal.tsx | 2 +- .../trusted_app_deletion_dialog.test.tsx.snap | 18 ++++++++++++------ .../view/trusted_app_deletion_dialog.tsx | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/event_filter_delete_modal.tsx b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/event_filter_delete_modal.tsx index 74a023965a57d5..653469d304978c 100644 --- a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/event_filter_delete_modal.tsx +++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/event_filter_delete_modal.tsx @@ -91,7 +91,7 @@ export const EventFilterDeleteModal = memo<{}>(() => { {eventFilter?.name} }} + values={{ name: {eventFilter?.name} }} />

diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/__snapshots__/trusted_app_deletion_dialog.test.tsx.snap b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/__snapshots__/trusted_app_deletion_dialog.test.tsx.snap index 5ab58914ff8b1c..0343ab62b9773d 100644 --- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/__snapshots__/trusted_app_deletion_dialog.test.tsx.snap +++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/__snapshots__/trusted_app_deletion_dialog.test.tsx.snap @@ -56,9 +56,11 @@ exports[`TrustedAppDeletionDialog renders correctly when deletion failed 1`] = ` >

You are removing trusted application " - + trusted app 3 - + ".

@@ -158,9 +160,11 @@ exports[`TrustedAppDeletionDialog renders correctly when deletion is in progress >

You are removing trusted application " - + trusted app 3 - + ".

@@ -265,9 +269,11 @@ exports[`TrustedAppDeletionDialog renders correctly when dialog started 1`] = ` >

You are removing trusted application " - + trusted app 3 - + ".

diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_app_deletion_dialog.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_app_deletion_dialog.tsx index bffd9806103721..3afa2642eba121 100644 --- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_app_deletion_dialog.tsx +++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_app_deletion_dialog.tsx @@ -45,7 +45,7 @@ const getTranslations = (entry: Immutable | undefined) => ({ {entry?.name} }} + values={{ name: {entry?.name} }} /> ), subMessage: ( From 78b803be2b6ce88f79af145c3dffed8a2f7c1206 Mon Sep 17 00:00:00 2001 From: Alexey Antonov Date: Wed, 16 Jun 2021 16:16:56 +0300 Subject: [PATCH 07/46] Add telemetry for editor clicks events (#100664) * Track editor clicks events Closes: #98949 * add create and open telemetries * add telemetry for dashboard * remove hardcoded originatingApp for lens * DashboardConstants.DASHBOARDS_ID -> DashboardConstants.DASHBOARD_ID Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- ...ble-public.addpanelaction._constructor_.md | 3 +- ...lugins-embeddable-public.addpanelaction.md | 2 +- ...ns-embeddable-public.openaddpanelflyout.md | 3 +- .../application/top_nav/dashboard_top_nav.tsx | 6 ++- .../application/top_nav/editor_menu.tsx | 2 +- .../public/lib/panel/embeddable_panel.tsx | 5 +- .../add_panel/add_panel_action.ts | 5 +- .../add_panel/add_panel_flyout.tsx | 32 +++++++++++-- .../add_panel/open_add_panel_flyout.tsx | 4 ++ src/plugins/embeddable/public/public.api.md | 5 +- .../public/finder/saved_object_finder.tsx | 1 + .../visualize_embeddable_factory.tsx | 3 ++ .../vis_types/vis_type_alias_registry.ts | 2 + .../public/wizard/new_vis_modal.tsx | 2 +- src/plugins/visualize/kibana.json | 3 +- .../visualize/public/application/types.ts | 46 +++++++++++-------- .../application/utils/get_table_columns.tsx | 17 ++++++- .../application/utils/get_top_nav_config.tsx | 19 +++++++- src/plugins/visualize/public/plugin.ts | 43 ++++++++++------- src/plugins/visualize/public/services.ts | 10 +++- x-pack/plugins/lens/public/app_plugin/app.tsx | 1 + .../lens/public/app_plugin/mounter.tsx | 3 +- .../app_plugin/save_modal_container.tsx | 8 ++++ .../plugins/lens/public/app_plugin/types.ts | 2 + x-pack/plugins/lens/public/plugin.ts | 3 +- x-pack/plugins/lens/public/vis_type_alias.ts | 1 + 26 files changed, 175 insertions(+), 56 deletions(-) diff --git a/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.addpanelaction._constructor_.md b/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.addpanelaction._constructor_.md index 388f0e064d8661..e51c465e912e68 100644 --- a/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.addpanelaction._constructor_.md +++ b/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.addpanelaction._constructor_.md @@ -9,7 +9,7 @@ Constructs a new instance of the `AddPanelAction` class Signature: ```typescript -constructor(getFactory: EmbeddableStart['getEmbeddableFactory'], getAllFactories: EmbeddableStart['getEmbeddableFactories'], overlays: OverlayStart, notifications: NotificationsStart, SavedObjectFinder: React.ComponentType); +constructor(getFactory: EmbeddableStart['getEmbeddableFactory'], getAllFactories: EmbeddableStart['getEmbeddableFactories'], overlays: OverlayStart, notifications: NotificationsStart, SavedObjectFinder: React.ComponentType, reportUiCounter?: ((appName: string, type: import("@kbn/analytics").UiCounterMetricType, eventNames: string | string[], count?: number | undefined) => void) | undefined); ``` ## Parameters @@ -21,4 +21,5 @@ constructor(getFactory: EmbeddableStart['getEmbeddableFactory'], getAllFactories | overlays | OverlayStart | | | notifications | NotificationsStart | | | SavedObjectFinder | React.ComponentType<any> | | +| reportUiCounter | ((appName: string, type: import("@kbn/analytics").UiCounterMetricType, eventNames: string | string[], count?: number | undefined) => void) | undefined | | diff --git a/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.addpanelaction.md b/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.addpanelaction.md index 74a6c2b2183a2e..947e506f72b435 100644 --- a/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.addpanelaction.md +++ b/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.addpanelaction.md @@ -14,7 +14,7 @@ export declare class AddPanelAction implements Action | Constructor | Modifiers | Description | | --- | --- | --- | -| [(constructor)(getFactory, getAllFactories, overlays, notifications, SavedObjectFinder)](./kibana-plugin-plugins-embeddable-public.addpanelaction._constructor_.md) | | Constructs a new instance of the AddPanelAction class | +| [(constructor)(getFactory, getAllFactories, overlays, notifications, SavedObjectFinder, reportUiCounter)](./kibana-plugin-plugins-embeddable-public.addpanelaction._constructor_.md) | | Constructs a new instance of the AddPanelAction class | ## Properties diff --git a/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.openaddpanelflyout.md b/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.openaddpanelflyout.md index 90caaa3035b348..db45b691b446eb 100644 --- a/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.openaddpanelflyout.md +++ b/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.openaddpanelflyout.md @@ -15,6 +15,7 @@ export declare function openAddPanelFlyout(options: { notifications: NotificationsStart; SavedObjectFinder: React.ComponentType; showCreateNewMenu?: boolean; + reportUiCounter?: UsageCollectionStart['reportUiCounter']; }): OverlayRef; ``` @@ -22,7 +23,7 @@ export declare function openAddPanelFlyout(options: { | Parameter | Type | Description | | --- | --- | --- | -| options | {
embeddable: IContainer;
getFactory: EmbeddableStart['getEmbeddableFactory'];
getAllFactories: EmbeddableStart['getEmbeddableFactories'];
overlays: OverlayStart;
notifications: NotificationsStart;
SavedObjectFinder: React.ComponentType<any>;
showCreateNewMenu?: boolean;
} | | +| options | {
embeddable: IContainer;
getFactory: EmbeddableStart['getEmbeddableFactory'];
getAllFactories: EmbeddableStart['getEmbeddableFactories'];
overlays: OverlayStart;
notifications: NotificationsStart;
SavedObjectFinder: React.ComponentType<any>;
showCreateNewMenu?: boolean;
reportUiCounter?: UsageCollectionStart['reportUiCounter'];
} | | Returns: 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 1cfa39d5e0e79b..e5f89bd6a8e909 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 @@ -132,7 +132,7 @@ export function DashboardTopNav({ const trackUiMetric = usageCollection?.reportUiCounter.bind( usageCollection, - DashboardConstants.DASHBOARDS_ID + DashboardConstants.DASHBOARD_ID ); useEffect(() => { @@ -163,6 +163,7 @@ export function DashboardTopNav({ notifications: core.notifications, overlays: core.overlays, SavedObjectFinder: getSavedObjectFinder(core.savedObjects, uiSettings), + reportUiCounter: usageCollection?.reportUiCounter, }), })); } @@ -174,6 +175,7 @@ export function DashboardTopNav({ core.savedObjects, core.overlays, uiSettings, + usageCollection, ]); const createNewVisType = useCallback( @@ -183,7 +185,7 @@ export function DashboardTopNav({ if (visType) { if (trackUiMetric) { - trackUiMetric(METRIC_TYPE.CLICK, visType.name); + trackUiMetric(METRIC_TYPE.CLICK, `${visType.name}:create`); } if ('aliasPath' in visType) { diff --git a/src/plugins/dashboard/public/application/top_nav/editor_menu.tsx b/src/plugins/dashboard/public/application/top_nav/editor_menu.tsx index 90cf0fcd571a15..74d725bb4d1045 100644 --- a/src/plugins/dashboard/public/application/top_nav/editor_menu.tsx +++ b/src/plugins/dashboard/public/application/top_nav/editor_menu.tsx @@ -51,7 +51,7 @@ export const EditorMenu = ({ dashboardContainer, createNewVisType }: Props) => { const trackUiMetric = usageCollection?.reportUiCounter.bind( usageCollection, - DashboardConstants.DASHBOARDS_ID + DashboardConstants.DASHBOARD_ID ); const createNewAggsBasedVis = useCallback( diff --git a/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx b/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx index 1214625fe530f2..8cf2de8c807439 100644 --- a/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx +++ b/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx @@ -14,6 +14,7 @@ import deepEqual from 'fast-deep-equal'; import { buildContextMenuForActions, UiActionsService, Action } from '../ui_actions'; import { CoreStart, OverlayStart } from '../../../../../core/public'; import { toMountPoint } from '../../../../kibana_react/public'; +import { UsageCollectionStart } from '../../../../usage_collection/public'; import { Start as InspectorStartContract } from '../inspector'; import { @@ -62,6 +63,7 @@ interface Props { SavedObjectFinder: React.ComponentType; stateTransfer?: EmbeddableStateTransfer; hideHeader?: boolean; + reportUiCounter?: UsageCollectionStart['reportUiCounter']; } interface State { @@ -312,7 +314,8 @@ export class EmbeddablePanel extends React.Component { this.props.getAllEmbeddableFactories, this.props.overlays, this.props.notifications, - this.props.SavedObjectFinder + this.props.SavedObjectFinder, + this.props.reportUiCounter ), inspectPanel: new InspectPanelAction(this.props.inspector), removePanel: new RemovePanelAction(), diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.ts b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.ts index 8b6f81a199c445..49be1c3ce01233 100644 --- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.ts +++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.ts @@ -13,6 +13,7 @@ import { EmbeddableStart } from 'src/plugins/embeddable/public/plugin'; import { ViewMode } from '../../../../types'; import { openAddPanelFlyout } from './open_add_panel_flyout'; import { IContainer } from '../../../../containers'; +import { UsageCollectionStart } from '../../../../../../../usage_collection/public'; export const ACTION_ADD_PANEL = 'ACTION_ADD_PANEL'; @@ -29,7 +30,8 @@ export class AddPanelAction implements Action { private readonly getAllFactories: EmbeddableStart['getEmbeddableFactories'], private readonly overlays: OverlayStart, private readonly notifications: NotificationsStart, - private readonly SavedObjectFinder: React.ComponentType + private readonly SavedObjectFinder: React.ComponentType, + private readonly reportUiCounter?: UsageCollectionStart['reportUiCounter'] ) {} public getDisplayName() { @@ -60,6 +62,7 @@ export class AddPanelAction implements Action { overlays: this.overlays, notifications: this.notifications, SavedObjectFinder: this.SavedObjectFinder, + reportUiCounter: this.reportUiCounter, }); } } diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.tsx index 6d6a68d7e5e2aa..eb4f0b30c51102 100644 --- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.tsx +++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.tsx @@ -9,15 +9,17 @@ import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n/react'; import React, { ReactElement } from 'react'; -import { CoreSetup } from 'src/core/public'; +import { METRIC_TYPE } from '@kbn/analytics'; +import { CoreSetup, SavedObjectAttributes, SimpleSavedObject } from 'src/core/public'; import { EuiContextMenuItem, EuiFlyoutBody, EuiFlyoutHeader, EuiTitle } from '@elastic/eui'; -import { EmbeddableStart } from 'src/plugins/embeddable/public'; +import { EmbeddableFactory, EmbeddableStart } from 'src/plugins/embeddable/public'; import { IContainer } from '../../../../containers'; import { EmbeddableFactoryNotFoundError } from '../../../../errors'; import { SavedObjectFinderCreateNew } from './saved_object_finder_create_new'; import { SavedObjectEmbeddableInput } from '../../../../embeddables'; +import { UsageCollectionStart } from '../../../../../../../usage_collection/public'; interface Props { onClose: () => void; @@ -27,6 +29,7 @@ interface Props { notifications: CoreSetup['notifications']; SavedObjectFinder: React.ComponentType; showCreateNewMenu?: boolean; + reportUiCounter?: UsageCollectionStart['reportUiCounter']; } interface State { @@ -84,7 +87,12 @@ export class AddPanelFlyout extends React.Component { } }; - public onAddPanel = async (savedObjectId: string, savedObjectType: string, name: string) => { + public onAddPanel = async ( + savedObjectId: string, + savedObjectType: string, + name: string, + so: SimpleSavedObject + ) => { const factoryForSavedObjectType = [...this.props.getAllFactories()].find( (factory) => factory.savedObjectMetaData && factory.savedObjectMetaData.type === savedObjectType @@ -98,9 +106,27 @@ export class AddPanelFlyout extends React.Component { { savedObjectId } ); + this.doTelemetryForAddEvent(this.props.container.type, factoryForSavedObjectType, so); + this.showToast(name); }; + private doTelemetryForAddEvent( + appName: string, + factoryForSavedObjectType: EmbeddableFactory, + so: SimpleSavedObject + ) { + const { reportUiCounter } = this.props; + + if (reportUiCounter) { + const type = factoryForSavedObjectType.savedObjectMetaData?.getSavedObjectSubType + ? factoryForSavedObjectType.savedObjectMetaData.getSavedObjectSubType(so) + : factoryForSavedObjectType.type; + + reportUiCounter(appName, METRIC_TYPE.CLICK, `${type}:add`); + } + } + private getCreateMenuItems(): ReactElement[] { return [...this.props.getAllFactories()] .filter( diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/open_add_panel_flyout.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/open_add_panel_flyout.tsx index f0c6e81644b3d0..fe54b3d134aa0b 100644 --- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/open_add_panel_flyout.tsx +++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/open_add_panel_flyout.tsx @@ -12,6 +12,7 @@ import { EmbeddableStart } from '../../../../../plugin'; import { toMountPoint } from '../../../../../../../kibana_react/public'; import { IContainer } from '../../../../containers'; import { AddPanelFlyout } from './add_panel_flyout'; +import { UsageCollectionStart } from '../../../../../../../usage_collection/public'; export function openAddPanelFlyout(options: { embeddable: IContainer; @@ -21,6 +22,7 @@ export function openAddPanelFlyout(options: { notifications: NotificationsStart; SavedObjectFinder: React.ComponentType; showCreateNewMenu?: boolean; + reportUiCounter?: UsageCollectionStart['reportUiCounter']; }): OverlayRef { const { embeddable, @@ -30,6 +32,7 @@ export function openAddPanelFlyout(options: { notifications, SavedObjectFinder, showCreateNewMenu, + reportUiCounter, } = options; const flyoutSession = overlays.openFlyout( toMountPoint( @@ -43,6 +46,7 @@ export function openAddPanelFlyout(options: { getFactory={getFactory} getAllFactories={getAllFactories} notifications={notifications} + reportUiCounter={reportUiCounter} SavedObjectFinder={SavedObjectFinder} showCreateNewMenu={showCreateNewMenu} /> diff --git a/src/plugins/embeddable/public/public.api.md b/src/plugins/embeddable/public/public.api.md index 2a577e6167be5f..af708f9a5e6592 100644 --- a/src/plugins/embeddable/public/public.api.md +++ b/src/plugins/embeddable/public/public.api.md @@ -63,6 +63,7 @@ import { TransportRequestPromise } from '@elastic/elasticsearch/lib/Transport'; import { Type } from '@kbn/config-schema'; import { TypeOf } from '@kbn/config-schema'; import { UiComponent } from 'src/plugins/kibana_utils/public'; +import { UiCounterMetricType } from '@kbn/analytics'; import { UnregisterCallback } from 'history'; import { URL } from 'url'; import { UserProvidedValues } from 'src/core/server/types'; @@ -95,7 +96,7 @@ export interface Adapters { // @public (undocumented) export class AddPanelAction implements Action_3 { // Warning: (ae-forgotten-export) The symbol "React" needs to be exported by the entry point index.d.ts - constructor(getFactory: EmbeddableStart_2['getEmbeddableFactory'], getAllFactories: EmbeddableStart_2['getEmbeddableFactories'], overlays: OverlayStart_2, notifications: NotificationsStart_2, SavedObjectFinder: React_2.ComponentType); + constructor(getFactory: EmbeddableStart_2['getEmbeddableFactory'], getAllFactories: EmbeddableStart_2['getEmbeddableFactories'], overlays: OverlayStart_2, notifications: NotificationsStart_2, SavedObjectFinder: React_2.ComponentType, reportUiCounter?: ((appName: string, type: import("@kbn/analytics").UiCounterMetricType, eventNames: string | string[], count?: number | undefined) => void) | undefined); // (undocumented) execute(context: ActionExecutionContext_2): Promise; // (undocumented) @@ -729,6 +730,7 @@ export function openAddPanelFlyout(options: { notifications: NotificationsStart_2; SavedObjectFinder: React.ComponentType; showCreateNewMenu?: boolean; + reportUiCounter?: UsageCollectionStart['reportUiCounter']; }): OverlayRef_2; // Warning: (ae-missing-release-tag) "OutputSpec" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) @@ -890,6 +892,7 @@ export const withEmbeddableSubscription: { getIconForSavedObject(savedObject: SimpleSavedObject): IconType; getTooltipForSavedObject?(savedObject: SimpleSavedObject): string; showSavedObject?(savedObject: SimpleSavedObject): boolean; + getSavedObjectSubType?(savedObject: SimpleSavedObject): string; includeFields?: string[]; } diff --git a/src/plugins/visualizations/public/embeddable/visualize_embeddable_factory.tsx b/src/plugins/visualizations/public/embeddable/visualize_embeddable_factory.tsx index 3ccdfb7e47d70b..872132416352f5 100644 --- a/src/plugins/visualizations/public/embeddable/visualize_embeddable_factory.tsx +++ b/src/plugins/visualizations/public/embeddable/visualize_embeddable_factory.tsx @@ -104,6 +104,9 @@ export class VisualizeEmbeddableFactory } return visType.stage !== 'experimental'; }, + getSavedObjectSubType: (savedObject) => { + return JSON.parse(savedObject.attributes.visState).type; + }, }; constructor(private readonly deps: VisualizeEmbeddableFactoryDeps) {} diff --git a/src/plugins/visualizations/public/vis_types/vis_type_alias_registry.ts b/src/plugins/visualizations/public/vis_types/vis_type_alias_registry.ts index 2be9358e28d1ac..a8b00b15a1ede1 100644 --- a/src/plugins/visualizations/public/vis_types/vis_type_alias_registry.ts +++ b/src/plugins/visualizations/public/vis_types/vis_type_alias_registry.ts @@ -7,6 +7,7 @@ */ import { SavedObject } from '../../../../core/types/saved_objects'; +import { BaseVisType } from './base_vis_type'; export type VisualizationStage = 'experimental' | 'beta' | 'production'; @@ -23,6 +24,7 @@ export interface VisualizationListItem { getSupportedTriggers?: () => string[]; typeTitle: string; image?: string; + type?: BaseVisType | string; } export interface VisualizationsAppExtension { diff --git a/src/plugins/visualizations/public/wizard/new_vis_modal.tsx b/src/plugins/visualizations/public/wizard/new_vis_modal.tsx index 317f9d1bb363db..2620ae01aa15a7 100644 --- a/src/plugins/visualizations/public/wizard/new_vis_modal.tsx +++ b/src/plugins/visualizations/public/wizard/new_vis_modal.tsx @@ -153,7 +153,7 @@ class NewVisModal extends React.Component { + const usageCollection = getUsageCollector(); + + if (usageCollection && visType) { + usageCollection.reportUiCounter(APP_NAME, METRIC_TYPE.CLICK, `${visType}:add`); + } +}; const getBadge = (item: VisualizationListItem) => { if (item.stage === 'beta') { @@ -82,12 +93,16 @@ export const getTableColumns = ( defaultMessage: 'Title', }), sortable: true, - render: (field: string, { editApp, editUrl, title, error }: VisualizationListItem) => + render: (field: string, { editApp, editUrl, title, error, type }: VisualizationListItem) => // In case an error occurs i.e. the vis has wrong type, we render the vis but without the link !error ? ( + {/* eslint-disable-next-line @elastic/eui/href-or-on-click */} { + doTelemetryForAddEvent(typeof type === 'string' ? type : type?.name); + }} data-test-subj={`visListingTitleLink-${title.split(' ').join('-')}`} > {field} diff --git a/src/plugins/visualize/public/application/utils/get_top_nav_config.tsx b/src/plugins/visualize/public/application/utils/get_top_nav_config.tsx index b7c7d63cef98fc..da01f9d44879bb 100644 --- a/src/plugins/visualize/public/application/utils/get_top_nav_config.tsx +++ b/src/plugins/visualize/public/application/utils/get_top_nav_config.tsx @@ -8,6 +8,7 @@ import React from 'react'; import { i18n } from '@kbn/i18n'; +import { METRIC_TYPE } from '@kbn/analytics'; import { Capabilities } from 'src/core/public'; import { TopNavMenuData } from 'src/plugins/navigation/public'; @@ -29,7 +30,7 @@ import { VisualizeAppStateContainer, VisualizeEditorVisInstance, } from '../types'; -import { VisualizeConstants } from '../visualize_constants'; +import { APP_NAME, VisualizeConstants } from '../visualize_constants'; import { getEditBreadcrumbs } from './breadcrumbs'; import { EmbeddableStateTransfer } from '../../../../embeddable/public'; @@ -92,10 +93,22 @@ export const getTopNavConfig = ( dashboard, savedObjectsTagging, presentationUtil, + usageCollection, }: VisualizeServices ) => { const { vis, embeddableHandler } = visInstance; const savedVis = visInstance.savedVis; + + const doTelemetryForSaveEvent = (visType: string) => { + if (usageCollection) { + usageCollection.reportUiCounter( + originatingApp ?? APP_NAME, + METRIC_TYPE.CLICK, + `${visType}:save` + ); + } + }; + /** * Called when the user clicks "Save" button. */ @@ -394,6 +407,8 @@ export const getTopNavConfig = ( return { id: true }; } + doTelemetryForSaveEvent(vis.type.name); + // We're adding the viz to a library so we need to save it and then // add to a dashboard if necessary const response = await doSave(saveOptions); @@ -503,6 +518,8 @@ export const getTopNavConfig = ( } }, run: async () => { + doTelemetryForSaveEvent(vis.type.name); + if (!savedVis?.id) { return createVisReference(); } diff --git a/src/plugins/visualize/public/plugin.ts b/src/plugins/visualize/public/plugin.ts index 4b369e8be86eee..b5ddbdf6d10a3c 100644 --- a/src/plugins/visualize/public/plugin.ts +++ b/src/plugins/visualize/public/plugin.ts @@ -6,10 +6,11 @@ * Side Public License, v 1. */ -import { BehaviorSubject } from 'rxjs'; import { i18n } from '@kbn/i18n'; -import { filter, map } from 'rxjs/operators'; import { createHashHistory } from 'history'; +import { BehaviorSubject } from 'rxjs'; +import { filter, map } from 'rxjs/operators'; + import { AppMountParameters, AppUpdater, @@ -18,29 +19,33 @@ import { Plugin, PluginInitializerContext, ScopedHistory, -} from 'kibana/public'; + DEFAULT_APP_CATEGORIES, +} from '../../../core/public'; -import { PresentationUtilPluginStart } from '../../../../src/plugins/presentation_util/public'; import { Storage, createKbnUrlTracker, createKbnUrlStateStorage, withNotifyOnErrors, } from '../../kibana_utils/public'; -import { DataPublicPluginStart, DataPublicPluginSetup, esFilters } from '../../data/public'; -import { NavigationPublicPluginStart as NavigationStart } from '../../navigation/public'; -import { SharePluginStart, SharePluginSetup } from '../../share/public'; -import { UrlForwardingSetup, UrlForwardingStart } from '../../url_forwarding/public'; -import { VisualizationsStart } from '../../visualizations/public'; + import { VisualizeConstants } from './application/visualize_constants'; +import { DataPublicPluginStart, DataPublicPluginSetup, esFilters } from '../../data/public'; import { FeatureCatalogueCategory, HomePublicPluginSetup } from '../../home/public'; -import { VisualizeServices } from './application/types'; -import { DEFAULT_APP_CATEGORIES } from '../../../core/public'; -import { SavedObjectsStart } from '../../saved_objects/public'; -import { EmbeddableStart } from '../../embeddable/public'; -import { DashboardStart } from '../../dashboard/public'; + +import type { PresentationUtilPluginStart } from '../../../../src/plugins/presentation_util/public'; +import type { NavigationPublicPluginStart as NavigationStart } from '../../navigation/public'; +import type { SharePluginStart, SharePluginSetup } from '../../share/public'; +import type { UrlForwardingSetup, UrlForwardingStart } from '../../url_forwarding/public'; +import type { VisualizationsStart } from '../../visualizations/public'; +import type { VisualizeServices } from './application/types'; +import type { SavedObjectsStart } from '../../saved_objects/public'; +import type { EmbeddableStart } from '../../embeddable/public'; +import type { DashboardStart } from '../../dashboard/public'; import type { SavedObjectTaggingOssPluginStart } from '../../saved_objects_tagging_oss/public'; -import { setVisEditorsRegistry, setUISettings } from './services'; +import type { UsageCollectionStart } from '../../usage_collection/public'; + +import { setVisEditorsRegistry, setUISettings, setUsageCollector } from './services'; import { createVisEditorsRegistry, VisEditorsRegistry } from './vis_editors_registry'; export interface VisualizePluginStartDependencies { @@ -54,6 +59,7 @@ export interface VisualizePluginStartDependencies { dashboard: DashboardStart; savedObjectsTaggingOss?: SavedObjectTaggingOssPluginStart; presentationUtil: PresentationUtilPluginStart; + usageCollection?: UsageCollectionStart; } export interface VisualizePluginSetupDependencies { @@ -202,6 +208,7 @@ export class VisualizePlugin setHeaderActionMenu: params.setHeaderActionMenu, savedObjectsTagging: pluginsStart.savedObjectsTaggingOss?.getTaggingApi(), presentationUtil: pluginsStart.presentationUtil, + usageCollection: pluginsStart.usageCollection, }; params.element.classList.add('visAppWrapper'); @@ -238,8 +245,12 @@ export class VisualizePlugin } as VisualizePluginSetup; } - public start(core: CoreStart, plugins: VisualizePluginStartDependencies) { + public start(core: CoreStart, { usageCollection }: VisualizePluginStartDependencies) { setVisEditorsRegistry(this.visEditorsRegistry); + + if (usageCollection) { + setUsageCollector(usageCollection); + } } stop() { diff --git a/src/plugins/visualize/public/services.ts b/src/plugins/visualize/public/services.ts index 192aac3547eb27..97ff7923379b72 100644 --- a/src/plugins/visualize/public/services.ts +++ b/src/plugins/visualize/public/services.ts @@ -6,12 +6,18 @@ * Side Public License, v 1. */ -import { IUiSettingsClient } from '../../../core/public'; import { createGetterSetter } from '../../../plugins/kibana_utils/public'; -import { VisEditorsRegistry } from './vis_editors_registry'; + +import type { IUiSettingsClient } from '../../../core/public'; +import type { VisEditorsRegistry } from './vis_editors_registry'; +import type { UsageCollectionStart } from '../../usage_collection/public'; export const [getUISettings, setUISettings] = createGetterSetter('UISettings'); +export const [getUsageCollector, setUsageCollector] = createGetterSetter( + 'UsageCollection' +); + export const [ getVisEditorsRegistry, setVisEditorsRegistry, diff --git a/x-pack/plugins/lens/public/app_plugin/app.tsx b/x-pack/plugins/lens/public/app_plugin/app.tsx index 2256a05c51e120..95068204d5eb41 100644 --- a/x-pack/plugins/lens/public/app_plugin/app.tsx +++ b/x-pack/plugins/lens/public/app_plugin/app.tsx @@ -222,6 +222,7 @@ export function App({ persistedDoc: appState.persistedDoc, onAppLeave, redirectTo, + originatingApp: incomingState?.originatingApp, ...lensAppServices, }, saveProps, diff --git a/x-pack/plugins/lens/public/app_plugin/mounter.tsx b/x-pack/plugins/lens/public/app_plugin/mounter.tsx index 46d2009756d2ce..8e59f90c958f91 100644 --- a/x-pack/plugins/lens/public/app_plugin/mounter.tsx +++ b/x-pack/plugins/lens/public/app_plugin/mounter.tsx @@ -52,7 +52,7 @@ export async function getLensServices( startDependencies: LensPluginStartDependencies, attributeService: () => Promise ): Promise { - const { data, navigation, embeddable, savedObjectsTagging } = startDependencies; + const { data, navigation, embeddable, savedObjectsTagging, usageCollection } = startDependencies; const storage = new Storage(localStorage); const stateTransfer = embeddable?.getStateTransfer(); @@ -63,6 +63,7 @@ export async function getLensServices( storage, navigation, stateTransfer, + usageCollection, savedObjectsTagging, attributeService: await attributeService(), http: coreStart.http, diff --git a/x-pack/plugins/lens/public/app_plugin/save_modal_container.tsx b/x-pack/plugins/lens/public/app_plugin/save_modal_container.tsx index 27e8031f5fb6b8..a65c8e6732e448 100644 --- a/x-pack/plugins/lens/public/app_plugin/save_modal_container.tsx +++ b/x-pack/plugins/lens/public/app_plugin/save_modal_container.tsx @@ -9,6 +9,7 @@ import React, { useEffect, useState } from 'react'; import { ChromeStart, NotificationsStart } from 'kibana/public'; import { i18n } from '@kbn/i18n'; import { partition, uniq } from 'lodash'; +import { METRIC_TYPE } from '@kbn/analytics'; import { SaveModal } from './save_modal'; import { LensAppProps, LensAppServices } from './types'; import type { SaveProps } from './app'; @@ -112,6 +113,7 @@ export function SaveModalContainer({ attributeService, redirectTo, redirectToOrigin, + originatingApp, getIsByValueMode: () => false, onAppLeave: () => {}, }, @@ -178,6 +180,7 @@ export const runSaveLensVisualization = async ( lastKnownDoc?: Document; getIsByValueMode: () => boolean; persistedDoc?: Document; + originatingApp?: string; } & ExtraProps & LensAppServices, saveProps: SaveProps, @@ -190,6 +193,7 @@ export const runSaveLensVisualization = async ( const { chrome, initialInput, + originatingApp, lastKnownDoc, persistedDoc, savedObjectsClient, @@ -197,6 +201,7 @@ export const runSaveLensVisualization = async ( notifications, stateTransfer, attributeService, + usageCollection, savedObjectsTagging, getIsByValueMode, redirectToOrigin, @@ -209,6 +214,9 @@ export const runSaveLensVisualization = async ( persistedDoc && savedObjectsTagging ? savedObjectsTagging.ui.getTagIdsFromReferences(persistedDoc.references) : []; + if (usageCollection) { + usageCollection.reportUiCounter(originatingApp || 'visualize', METRIC_TYPE.CLICK, 'lens:save'); + } let references = lastKnownDoc.references; if (savedObjectsTagging) { diff --git a/x-pack/plugins/lens/public/app_plugin/types.ts b/x-pack/plugins/lens/public/app_plugin/types.ts index d1e2d1cbdfc637..b253e76aa14071 100644 --- a/x-pack/plugins/lens/public/app_plugin/types.ts +++ b/x-pack/plugins/lens/public/app_plugin/types.ts @@ -18,6 +18,7 @@ import { SavedObjectsStart, } from '../../../../../src/core/public'; import { DataPublicPluginStart } from '../../../../../src/plugins/data/public'; +import { UsageCollectionStart } from '../../../../../src/plugins/usage_collection/public'; import { DashboardStart } from '../../../../../src/plugins/dashboard/public'; import { LensEmbeddableInput } from '../editor_frame_service/embeddable/embeddable'; import { NavigationPublicPluginStart } from '../../../../../src/plugins/navigation/public'; @@ -97,6 +98,7 @@ export interface LensAppServices { uiSettings: IUiSettingsClient; application: ApplicationStart; notifications: NotificationsStart; + usageCollection?: UsageCollectionStart; stateTransfer: EmbeddableStateTransfer; navigation: NavigationPublicPluginStart; attributeService: LensAttributeService; diff --git a/x-pack/plugins/lens/public/plugin.ts b/x-pack/plugins/lens/public/plugin.ts index 6d90691e2173ae..328bea5def557e 100644 --- a/x-pack/plugins/lens/public/plugin.ts +++ b/x-pack/plugins/lens/public/plugin.ts @@ -6,7 +6,7 @@ */ import { AppMountParameters, CoreSetup, CoreStart } from 'kibana/public'; -import { UsageCollectionSetup } from 'src/plugins/usage_collection/public'; +import { UsageCollectionSetup, UsageCollectionStart } from 'src/plugins/usage_collection/public'; import { DataPublicPluginSetup, DataPublicPluginStart } from '../../../../src/plugins/data/public'; import { EmbeddableSetup, EmbeddableStart } from '../../../../src/plugins/embeddable/public'; import { DashboardStart } from '../../../../src/plugins/dashboard/public'; @@ -81,6 +81,7 @@ export interface LensPluginStartDependencies { savedObjectsTagging?: SavedObjectTaggingPluginStart; presentationUtil: PresentationUtilPluginStart; indexPatternFieldEditor: IndexPatternFieldEditorStart; + usageCollection?: UsageCollectionStart; } export interface LensPublicStart { diff --git a/x-pack/plugins/lens/public/vis_type_alias.ts b/x-pack/plugins/lens/public/vis_type_alias.ts index b9a526c71180cf..5b48ef8b31923a 100644 --- a/x-pack/plugins/lens/public/vis_type_alias.ts +++ b/x-pack/plugins/lens/public/vis_type_alias.ts @@ -42,6 +42,7 @@ export const getLensAliasConfig = (): VisTypeAlias => ({ icon: 'lensApp', stage: 'production', savedObjectType: type, + type: 'lens', typeTitle: i18n.translate('xpack.lens.visTypeAlias.type', { defaultMessage: 'Lens' }), }; }, From a7b0391702c85f7262026a380763845be73d7fa7 Mon Sep 17 00:00:00 2001 From: Stacey Gammon Date: Wed, 16 Jun 2021 09:28:50 -0400 Subject: [PATCH 08/46] Use export type instead of export to reduce bundle size (#101796) * Use export type instead of export to reduce bundle size * Update legacy docs * update docs again Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- ...s-data-public.dataplugin._constructor_.md} | 4 +- ...a-plugin-plugins-data-public.dataplugin.md | 26 ++++++++ ...n-plugins-data-public.dataplugin.setup.md} | 4 +- ...n-plugins-data-public.dataplugin.start.md} | 4 +- ...in-plugins-data-public.dataplugin.stop.md} | 4 +- .../kibana-plugin-plugins-data-public.md | 2 +- src/plugins/data/public/index.ts | 54 ++++++++-------- src/plugins/data/public/mocks.ts | 6 +- src/plugins/data/public/public.api.md | 64 +++++++++---------- x-pack/plugins/graph/public/application.ts | 2 +- 10 files changed, 100 insertions(+), 70 deletions(-) rename docs/development/plugins/data/public/{kibana-plugin-plugins-data-public.plugin._constructor_.md => kibana-plugin-plugins-data-public.dataplugin._constructor_.md} (68%) create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.dataplugin.md rename docs/development/plugins/data/public/{kibana-plugin-plugins-data-public.plugin.setup.md => kibana-plugin-plugins-data-public.dataplugin.setup.md} (76%) rename docs/development/plugins/data/public/{kibana-plugin-plugins-data-public.plugin.start.md => kibana-plugin-plugins-data-public.dataplugin.start.md} (70%) rename docs/development/plugins/data/public/{kibana-plugin-plugins-data-public.plugin.stop.md => kibana-plugin-plugins-data-public.dataplugin.stop.md} (52%) diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.plugin._constructor_.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.dataplugin._constructor_.md similarity index 68% rename from docs/development/plugins/data/public/kibana-plugin-plugins-data-public.plugin._constructor_.md rename to docs/development/plugins/data/public/kibana-plugin-plugins-data-public.dataplugin._constructor_.md index 64108a7c7be33a..3eaf2176edf261 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.plugin._constructor_.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.dataplugin._constructor_.md @@ -1,8 +1,8 @@ -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [Plugin](./kibana-plugin-plugins-data-public.plugin.md) > [(constructor)](./kibana-plugin-plugins-data-public.plugin._constructor_.md) +[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [DataPlugin](./kibana-plugin-plugins-data-public.dataplugin.md) > [(constructor)](./kibana-plugin-plugins-data-public.dataplugin._constructor_.md) -## Plugin.(constructor) +## DataPlugin.(constructor) Constructs a new instance of the `DataPublicPlugin` class diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.dataplugin.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.dataplugin.md new file mode 100644 index 00000000000000..4b2cad7b428821 --- /dev/null +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.dataplugin.md @@ -0,0 +1,26 @@ + + +[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [DataPlugin](./kibana-plugin-plugins-data-public.dataplugin.md) + +## DataPlugin class + +Signature: + +```typescript +export declare class DataPublicPlugin implements Plugin +``` + +## Constructors + +| Constructor | Modifiers | Description | +| --- | --- | --- | +| [(constructor)(initializerContext)](./kibana-plugin-plugins-data-public.dataplugin._constructor_.md) | | Constructs a new instance of the DataPublicPlugin class | + +## Methods + +| Method | Modifiers | Description | +| --- | --- | --- | +| [setup(core, { bfetch, expressions, uiActions, usageCollection, inspector })](./kibana-plugin-plugins-data-public.dataplugin.setup.md) | | | +| [start(core, { uiActions })](./kibana-plugin-plugins-data-public.dataplugin.start.md) | | | +| [stop()](./kibana-plugin-plugins-data-public.dataplugin.stop.md) | | | + diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.plugin.setup.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.dataplugin.setup.md similarity index 76% rename from docs/development/plugins/data/public/kibana-plugin-plugins-data-public.plugin.setup.md rename to docs/development/plugins/data/public/kibana-plugin-plugins-data-public.dataplugin.setup.md index 20181a5208b522..ab1f90c1ac1049 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.plugin.setup.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.dataplugin.setup.md @@ -1,8 +1,8 @@ -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [Plugin](./kibana-plugin-plugins-data-public.plugin.md) > [setup](./kibana-plugin-plugins-data-public.plugin.setup.md) +[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [DataPlugin](./kibana-plugin-plugins-data-public.dataplugin.md) > [setup](./kibana-plugin-plugins-data-public.dataplugin.setup.md) -## Plugin.setup() method +## DataPlugin.setup() method Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.plugin.start.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.dataplugin.start.md similarity index 70% rename from docs/development/plugins/data/public/kibana-plugin-plugins-data-public.plugin.start.md rename to docs/development/plugins/data/public/kibana-plugin-plugins-data-public.dataplugin.start.md index 56934e8a29edd0..4ea7ec8cd4f65f 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.plugin.start.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.dataplugin.start.md @@ -1,8 +1,8 @@ -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [Plugin](./kibana-plugin-plugins-data-public.plugin.md) > [start](./kibana-plugin-plugins-data-public.plugin.start.md) +[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [DataPlugin](./kibana-plugin-plugins-data-public.dataplugin.md) > [start](./kibana-plugin-plugins-data-public.dataplugin.start.md) -## Plugin.start() method +## DataPlugin.start() method Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.plugin.stop.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.dataplugin.stop.md similarity index 52% rename from docs/development/plugins/data/public/kibana-plugin-plugins-data-public.plugin.stop.md rename to docs/development/plugins/data/public/kibana-plugin-plugins-data-public.dataplugin.stop.md index 8b8b63db4e03a2..b7067a01b44679 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.plugin.stop.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.dataplugin.stop.md @@ -1,8 +1,8 @@ -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [Plugin](./kibana-plugin-plugins-data-public.plugin.md) > [stop](./kibana-plugin-plugins-data-public.plugin.stop.md) +[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [DataPlugin](./kibana-plugin-plugins-data-public.dataplugin.md) > [stop](./kibana-plugin-plugins-data-public.dataplugin.stop.md) -## Plugin.stop() method +## DataPlugin.stop() method Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md index 7f5a042e0ab818..7c023e756ebd5e 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md @@ -11,6 +11,7 @@ | [AggConfig](./kibana-plugin-plugins-data-public.aggconfig.md) | | | [AggConfigs](./kibana-plugin-plugins-data-public.aggconfigs.md) | | | [AggParamType](./kibana-plugin-plugins-data-public.aggparamtype.md) | | +| [DataPlugin](./kibana-plugin-plugins-data-public.dataplugin.md) | | | [DuplicateIndexPatternError](./kibana-plugin-plugins-data-public.duplicateindexpatternerror.md) | | | [FieldFormat](./kibana-plugin-plugins-data-public.fieldformat.md) | | | [FilterManager](./kibana-plugin-plugins-data-public.filtermanager.md) | | @@ -19,7 +20,6 @@ | [IndexPatternsService](./kibana-plugin-plugins-data-public.indexpatternsservice.md) | | | [OptionedParamType](./kibana-plugin-plugins-data-public.optionedparamtype.md) | | | [PainlessError](./kibana-plugin-plugins-data-public.painlesserror.md) | | -| [Plugin](./kibana-plugin-plugins-data-public.plugin.md) | | | [SearchInterceptor](./kibana-plugin-plugins-data-public.searchinterceptor.md) | | | [SearchSource](./kibana-plugin-plugins-data-public.searchsource.md) | \* | | [SearchTimeoutError](./kibana-plugin-plugins-data-public.searchtimeouterror.md) | Request Failure - When an entire multi request fails | diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts index ba873952c9841f..078dd3a9b7c5ab 100644 --- a/src/plugins/data/public/index.ts +++ b/src/plugins/data/public/index.ts @@ -276,9 +276,8 @@ export { DuplicateIndexPatternError } from '../common/index_patterns/errors'; * Autocomplete query suggestions: */ -export { +export type { QuerySuggestion, - QuerySuggestionTypes, QuerySuggestionGetFn, QuerySuggestionGetFnArgs, QuerySuggestionBasic, @@ -286,6 +285,7 @@ export { AutocompleteStart, } from './autocomplete'; +export { QuerySuggestionTypes } from './autocomplete'; /* * Search: */ @@ -320,25 +320,23 @@ import { tabifyGetColumns, } from '../common'; -export { +export { AggGroupLabels, AggGroupNames, METRIC_TYPES, BUCKET_TYPES } from '../common'; + +export type { // aggs AggConfigSerialized, - AggGroupLabels, AggGroupName, - AggGroupNames, AggFunctionsMapping, AggParam, AggParamOption, AggParamType, AggConfigOptions, - BUCKET_TYPES, EsaggsExpressionFunctionDefinition, IAggConfig, IAggConfigs, IAggType, IFieldParamType, IMetricAggType, - METRIC_TYPES, OptionedParamType, OptionedValueProp, ParsedInterval, @@ -352,30 +350,23 @@ export { export type { AggConfigs, AggConfig } from '../common'; -export { +export type { // search ES_SEARCH_STRATEGY, EsQuerySortValue, - extractSearchSourceReferences, - getEsPreference, - getSearchParamsFromRequest, IEsSearchRequest, IEsSearchResponse, IKibanaSearchRequest, IKibanaSearchResponse, - injectSearchSourceReferences, ISearchSetup, ISearchStart, ISearchStartSearchSource, ISearchGeneric, ISearchSource, - parseSearchSourceJSON, SearchInterceptor, SearchInterceptorDeps, SearchRequest, SearchSourceFields, - SortDirection, - SearchSessionState, // expression functions and types EsdslExpressionFunctionDefinition, EsRawResponseExpressionTypeDefinition, @@ -386,11 +377,21 @@ export { TimeoutErrorMode, PainlessError, Reason, + WaitUntilNextSessionCompletesOptions, +} from './search'; + +export { + parseSearchSourceJSON, + injectSearchSourceReferences, + extractSearchSourceReferences, + getEsPreference, + getSearchParamsFromRequest, noSearchSessionStorageCapabilityMessage, SEARCH_SESSIONS_MANAGEMENT_ID, waitUntilNextSessionCompletes$, - WaitUntilNextSessionCompletesOptions, isEsError, + SearchSessionState, + SortDirection, } from './search'; export type { @@ -438,33 +439,36 @@ export const search = { * UI components */ -export { - SearchBar, +export type { SearchBarProps, StatefulSearchBarProps, IndexPatternSelectProps, - QueryStringInput, QueryStringInputProps, } from './ui'; +export { QueryStringInput, SearchBar } from './ui'; + /** * Types to be shared externally * @public */ -export { Filter, Query, RefreshInterval, TimeRange } from '../common'; +export type { Filter, Query, RefreshInterval, TimeRange } from '../common'; export { createSavedQueryService, connectToQueryState, syncQueryStateWithUrl, - QueryState, getDefaultQuery, FilterManager, + TimeHistory, +} from './query'; + +export type { + QueryState, SavedQuery, SavedQueryService, SavedQueryTimeFilter, InputTimeRange, - TimeHistory, TimefilterContract, TimeHistoryContract, QueryStateChange, @@ -472,7 +476,7 @@ export { AutoRefreshDoneFn, } from './query'; -export { AggsStart } from './search/aggs'; +export type { AggsStart } from './search/aggs'; export { getTime, @@ -496,7 +500,7 @@ export function plugin(initializerContext: PluginInitializerContext>; -export type Start = jest.Mocked>; +export type Setup = jest.Mocked>; +export type Start = jest.Mocked>; const autocompleteSetupMock: jest.Mocked = { getQuerySuggestions: jest.fn(), diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md index 67534577d99fcf..13352d183370bd 100644 --- a/src/plugins/data/public/public.api.md +++ b/src/plugins/data/public/public.api.md @@ -67,7 +67,7 @@ import { Observable } from 'rxjs'; import { PackageInfo } from '@kbn/config'; import { Path } from 'history'; import { PeerCertificate } from 'tls'; -import { Plugin as Plugin_2 } from 'src/core/public'; +import { Plugin } from 'src/core/public'; import { PluginInitializerContext as PluginInitializerContext_2 } from 'src/core/public'; import { PluginInitializerContext as PluginInitializerContext_3 } from 'kibana/public'; import { PopoverAnchorPosition } from '@elastic/eui'; @@ -621,6 +621,22 @@ export type CustomFilter = Filter & { query: any; }; +// Warning: (ae-forgotten-export) The symbol "DataSetupDependencies" needs to be exported by the entry point index.d.ts +// Warning: (ae-forgotten-export) The symbol "DataStartDependencies" needs to be exported by the entry point index.d.ts +// Warning: (ae-missing-release-tag) "DataPublicPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) +// +// @public (undocumented) +export class DataPlugin implements Plugin { + // Warning: (ae-forgotten-export) The symbol "ConfigSchema" needs to be exported by the entry point index.d.ts + constructor(initializerContext: PluginInitializerContext_2); + // (undocumented) + setup(core: CoreSetup, { bfetch, expressions, uiActions, usageCollection, inspector }: DataSetupDependencies): DataPublicPluginSetup; + // (undocumented) + start(core: CoreStart_2, { uiActions }: DataStartDependencies): DataPublicPluginStart; + // (undocumented) + stop(): void; + } + // Warning: (ae-missing-release-tag) "DataPublicPluginSetup" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) // // @public @@ -2004,27 +2020,11 @@ export type PhrasesFilter = Filter & { meta: PhrasesFilterMeta; }; -// Warning: (ae-forgotten-export) The symbol "DataSetupDependencies" needs to be exported by the entry point index.d.ts -// Warning: (ae-forgotten-export) The symbol "DataStartDependencies" needs to be exported by the entry point index.d.ts -// Warning: (ae-missing-release-tag) "DataPublicPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) -// -// @public (undocumented) -export class Plugin implements Plugin_2 { - // Warning: (ae-forgotten-export) The symbol "ConfigSchema" needs to be exported by the entry point index.d.ts - constructor(initializerContext: PluginInitializerContext_2); - // (undocumented) - setup(core: CoreSetup, { bfetch, expressions, uiActions, usageCollection, inspector }: DataSetupDependencies): DataPublicPluginSetup; - // (undocumented) - start(core: CoreStart_2, { uiActions }: DataStartDependencies): DataPublicPluginStart; - // (undocumented) - stop(): void; - } - // Warning: (ae-forgotten-export) The symbol "PluginInitializerContext" needs to be exported by the entry point index.d.ts // Warning: (ae-missing-release-tag) "plugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) // // @public (undocumented) -export function plugin(initializerContext: PluginInitializerContext): Plugin; +export function plugin(initializerContext: PluginInitializerContext): DataPlugin; // Warning: (ae-missing-release-tag) "Query" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) // @@ -2772,20 +2772,20 @@ export interface WaitUntilNextSessionCompletesOptions { // src/plugins/data/public/index.ts:238:27 - (ae-forgotten-export) The symbol "validateIndexPattern" needs to be exported by the entry point index.d.ts // src/plugins/data/public/index.ts:238:27 - (ae-forgotten-export) The symbol "flattenHitWrapper" needs to be exported by the entry point index.d.ts // src/plugins/data/public/index.ts:238:27 - (ae-forgotten-export) The symbol "formatHitProvider" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:407:20 - (ae-forgotten-export) The symbol "getResponseInspectorStats" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:407:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:407:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:409:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:410:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:419:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:420:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:421:1 - (ae-forgotten-export) The symbol "IpAddress" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:422:1 - (ae-forgotten-export) The symbol "isDateHistogramBucketAggConfig" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:426:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:427:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:430:1 - (ae-forgotten-export) The symbol "parseInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:431:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:434:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:408:20 - (ae-forgotten-export) The symbol "getResponseInspectorStats" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:408:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:408:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:410:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:411:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:420:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:421:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:422:1 - (ae-forgotten-export) The symbol "IpAddress" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:423:1 - (ae-forgotten-export) The symbol "isDateHistogramBucketAggConfig" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:427:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:428:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:431:1 - (ae-forgotten-export) The symbol "parseInterval" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:432:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:435:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts // src/plugins/data/public/query/state_sync/connect_to_query_state.ts:34:5 - (ae-forgotten-export) The symbol "FilterStateStore" needs to be exported by the entry point index.d.ts // src/plugins/data/public/search/session/session_service.ts:56:5 - (ae-forgotten-export) The symbol "UrlGeneratorStateMapping" needs to be exported by the entry point index.d.ts diff --git a/x-pack/plugins/graph/public/application.ts b/x-pack/plugins/graph/public/application.ts index 0b80e18f3fdb27..26e86bbc3d886b 100644 --- a/x-pack/plugins/graph/public/application.ts +++ b/x-pack/plugins/graph/public/application.ts @@ -31,7 +31,7 @@ import { } from 'kibana/public'; // @ts-ignore import { initGraphApp } from './app'; -import { Plugin as DataPlugin, IndexPatternsContract } from '../../../../src/plugins/data/public'; +import { DataPlugin, IndexPatternsContract } from '../../../../src/plugins/data/public'; import { LicensingPluginStart } from '../../licensing/public'; import { checkLicense } from '../common/check_license'; import { NavigationPublicPluginStart as NavigationStart } from '../../../../src/plugins/navigation/public'; From 3236f3fafa83447c99271a4260dd996b2424d128 Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Wed, 16 Jun 2021 06:30:31 -0700 Subject: [PATCH 09/46] skip flaky suite (#102283) --- x-pack/test/api_integration/apis/ml/modules/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/x-pack/test/api_integration/apis/ml/modules/index.ts b/x-pack/test/api_integration/apis/ml/modules/index.ts index dae0044c47ccac..f6c36c61b998ca 100644 --- a/x-pack/test/api_integration/apis/ml/modules/index.ts +++ b/x-pack/test/api_integration/apis/ml/modules/index.ts @@ -13,6 +13,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) { const fleetPackages = ['apache-0.5.0', 'nginx-0.5.0']; // Failing: See https://github.com/elastic/kibana/issues/102282 + // Failing: See https://github.com/elastic/kibana/issues/102283 describe.skip('modules', function () { before(async () => { for (const fleetPackage of fleetPackages) { From 6b99e662cfced09f9cf28b056a1540b658457ce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20S=C3=A1nchez?= Date: Wed, 16 Jun 2021 15:32:26 +0200 Subject: [PATCH 10/46] Updates app_id to use integrations one instead of fleet for back button link (#102312) --- .../components/fleet_event_filters_card.tsx | 10 ++++++---- .../components/fleet_trusted_apps_card.tsx | 12 +++++++----- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_event_filters_card.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_event_filters_card.tsx index be3cba5eb43181..5588cdbe81e3ed 100644 --- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_event_filters_card.tsx +++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_event_filters_card.tsx @@ -20,7 +20,7 @@ import { GetExceptionSummaryResponse, ListPageRouteState, } from '../../../../../../../../common/endpoint/types'; -import { PLUGIN_ID as FLEET_PLUGIN_ID } from '../../../../../../../../../fleet/common'; +import { INTEGRATIONS_PLUGIN_ID } from '../../../../../../../../../fleet/common'; import { MANAGEMENT_APP_ID } from '../../../../../../common/constants'; import { useToasts } from '../../../../../../../common/lib/kibana'; import { LinkWithIcon } from './link_with_icon'; @@ -68,19 +68,21 @@ export const FleetEventFiltersCard = memo( }, [eventFiltersApi, toasts]); const eventFiltersRouteState = useMemo(() => { - const fleetPackageCustomUrlPath = `#${pagePathGetters.integration_details_custom({ pkgkey })}`; + const fleetPackageCustomUrlPath = `#${ + pagePathGetters.integration_details_custom({ pkgkey })[1] + }`; return { backButtonLabel: i18n.translate( 'xpack.securitySolution.endpoint.fleetCustomExtension.backButtonLabel', { defaultMessage: 'Back to Endpoint Integration' } ), onBackButtonNavigateTo: [ - FLEET_PLUGIN_ID, + INTEGRATIONS_PLUGIN_ID, { path: fleetPackageCustomUrlPath, }, ], - backButtonUrl: getUrlForApp(FLEET_PLUGIN_ID, { + backButtonUrl: getUrlForApp(INTEGRATIONS_PLUGIN_ID, { path: fleetPackageCustomUrlPath, }), }; diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_trusted_apps_card.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_trusted_apps_card.tsx index ed3ba10c1e62bb..f1c9cb13a27dc5 100644 --- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_trusted_apps_card.tsx +++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_trusted_apps_card.tsx @@ -20,7 +20,7 @@ import { ListPageRouteState, GetExceptionSummaryResponse, } from '../../../../../../../../common/endpoint/types'; -import { PLUGIN_ID as FLEET_PLUGIN_ID } from '../../../../../../../../../fleet/common'; +import { INTEGRATIONS_PLUGIN_ID } from '../../../../../../../../../fleet/common'; import { MANAGEMENT_APP_ID } from '../../../../../../common/constants'; import { useToasts } from '../../../../../../../common/lib/kibana'; import { LinkWithIcon } from './link_with_icon'; @@ -68,24 +68,26 @@ export const FleetTrustedAppsCard = memo(( const trustedAppsListUrlPath = getTrustedAppsListPath(); const trustedAppRouteState = useMemo(() => { - const fleetPackageCustomUrlPath = `#${pagePathGetters.integration_details_custom({ pkgkey })}`; + const fleetPackageCustomUrlPath = `#${ + pagePathGetters.integration_details_custom({ pkgkey })[1] + }`; + return { backButtonLabel: i18n.translate( 'xpack.securitySolution.endpoint.fleetCustomExtension.backButtonLabel', { defaultMessage: 'Back to Endpoint Integration' } ), onBackButtonNavigateTo: [ - FLEET_PLUGIN_ID, + INTEGRATIONS_PLUGIN_ID, { path: fleetPackageCustomUrlPath, }, ], - backButtonUrl: getUrlForApp(FLEET_PLUGIN_ID, { + backButtonUrl: getUrlForApp(INTEGRATIONS_PLUGIN_ID, { path: fleetPackageCustomUrlPath, }), }; }, [getUrlForApp, pkgkey]); - return ( From 1b7a5a99cbf0f3ef0c4f656cf44e105fd1d4473d Mon Sep 17 00:00:00 2001 From: Paul Tavares <56442535+paul-tavares@users.noreply.github.com> Date: Wed, 16 Jun 2021 09:59:51 -0400 Subject: [PATCH 11/46] [Security Solution][Endpoint] Show Endpoint Host Isolation status on endpoint list (#101961) * Add endpoint isolation status for when multiple actions of different types are pending * Refactored List to break out Agent status code to separate component * Generator improvements for how actions are generated for Endpoints * Add HTTP mock for fleet EPM packages (to silence console errors) * new `.updateCommonInfo()` method to generator (to regenerate stateful data) --- .../data_generators/base_data_generator.ts | 11 ++- .../data_generators/fleet_action_generator.ts | 18 +++- .../common/endpoint/generate_data.ts | 10 ++- .../common/endpoint/index_data.ts | 85 +++++++++++++++--- .../endpoint_host_isolation_status.test.tsx | 56 ++++++++++++ .../endpoint_host_isolation_status.tsx | 66 +++++++++++--- .../endpoint_pending_actions.test.ts | 37 ++++++++ .../lib/endpoint_pending_actions/mocks.ts | 63 +++++++++++++ .../endpoint/http_handler_mock_factory.ts | 30 ++++--- .../management/pages/endpoint_hosts/mocks.ts | 34 ++++++- .../pages/endpoint_hosts/store/action.ts | 7 +- .../pages/endpoint_hosts/store/builders.ts | 3 +- .../pages/endpoint_hosts/store/index.test.ts | 4 + .../endpoint_hosts/store/middleware.test.ts | 76 +++++++++++----- .../pages/endpoint_hosts/store/middleware.ts | 80 +++++++++++++---- .../pages/endpoint_hosts/store/reducer.ts | 17 +++- .../pages/endpoint_hosts/store/selectors.ts | 39 ++++++++ .../management/pages/endpoint_hosts/types.ts | 11 ++- .../components/endpoint_agent_status.test.tsx | 90 +++++++++++++++++++ .../view/components/endpoint_agent_status.tsx | 59 ++++++++++++ .../view/details/endpoint_details.tsx | 18 +--- .../pages/endpoint_hosts/view/index.tsx | 22 ++--- 22 files changed, 718 insertions(+), 118 deletions(-) create mode 100644 x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/endpoint_host_isolation_status.test.tsx create mode 100644 x-pack/plugins/security_solution/public/common/lib/endpoint_pending_actions/endpoint_pending_actions.test.ts create mode 100644 x-pack/plugins/security_solution/public/common/lib/endpoint_pending_actions/mocks.ts create mode 100644 x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/endpoint_agent_status.test.tsx create mode 100644 x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/endpoint_agent_status.tsx diff --git a/x-pack/plugins/security_solution/common/endpoint/data_generators/base_data_generator.ts b/x-pack/plugins/security_solution/common/endpoint/data_generators/base_data_generator.ts index 35c976fbdfb1d1..1f3d4307197f8a 100644 --- a/x-pack/plugins/security_solution/common/endpoint/data_generators/base_data_generator.ts +++ b/x-pack/plugins/security_solution/common/endpoint/data_generators/base_data_generator.ts @@ -48,9 +48,14 @@ export class BaseDataGenerator { return new Date(now - this.randomChoice(DAY_OFFSETS)).toISOString(); } - /** Generate either `true` or `false` */ - protected randomBoolean(): boolean { - return this.random() < 0.5; + /** + * Generate either `true` or `false`. By default, the boolean is calculated by determining if a + * float is less than `0.5`, but that can be adjusted via the input argument + * + * @param isLessThan + */ + protected randomBoolean(isLessThan: number = 0.5): boolean { + return this.random() < isLessThan; } /** generate random OS family value */ diff --git a/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_action_generator.ts b/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_action_generator.ts index af799de782f48c..6cc5ab7f084476 100644 --- a/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_action_generator.ts +++ b/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_action_generator.ts @@ -13,7 +13,7 @@ import { EndpointAction, EndpointActionResponse, ISOLATION_ACTIONS } from '../ty const ISOLATION_COMMANDS: ISOLATION_ACTIONS[] = ['isolate', 'unisolate']; export class FleetActionGenerator extends BaseDataGenerator { - /** Generate an Action */ + /** Generate a random endpoint Action (isolate or unisolate) */ generate(overrides: DeepPartial = {}): EndpointAction { const timeStamp = new Date(this.randomPastDate()); @@ -35,6 +35,14 @@ export class FleetActionGenerator extends BaseDataGenerator { ); } + generateIsolateAction(overrides: DeepPartial = {}): EndpointAction { + return merge(this.generate({ data: { command: 'isolate' } }), overrides); + } + + generateUnIsolateAction(overrides: DeepPartial = {}): EndpointAction { + return merge(this.generate({ data: { command: 'unisolate' } }), overrides); + } + /** Generates an action response */ generateResponse(overrides: DeepPartial = {}): EndpointActionResponse { const timeStamp = new Date(); @@ -56,6 +64,14 @@ export class FleetActionGenerator extends BaseDataGenerator { ); } + randomFloat(): number { + return this.random(); + } + + randomN(max: number): number { + return super.randomN(max); + } + protected randomIsolateCommand() { return this.randomChoice(ISOLATION_COMMANDS); } diff --git a/x-pack/plugins/security_solution/common/endpoint/generate_data.ts b/x-pack/plugins/security_solution/common/endpoint/generate_data.ts index 7e03d9b61fc10e..b08d5649540db7 100644 --- a/x-pack/plugins/security_solution/common/endpoint/generate_data.ts +++ b/x-pack/plugins/security_solution/common/endpoint/generate_data.ts @@ -422,6 +422,14 @@ export class EndpointDocGenerator extends BaseDataGenerator { this.commonInfo.Endpoint.policy.applied.status = this.randomChoice(POLICY_RESPONSE_STATUSES); } + /** + * Update the common host metadata - essentially creating an entire new endpoint metadata record + * when the `.generateHostMetadata()` is subsequently called + */ + public updateCommonInfo() { + this.commonInfo = this.createHostData(); + } + /** * Parses an index and returns the data stream fields extracted from the index. * @@ -439,7 +447,7 @@ export class EndpointDocGenerator extends BaseDataGenerator { private createHostData(): HostInfo { const hostName = this.randomHostname(); - const isIsolated = this.randomBoolean(); + const isIsolated = this.randomBoolean(0.3); return { agent: { diff --git a/x-pack/plugins/security_solution/common/endpoint/index_data.ts b/x-pack/plugins/security_solution/common/endpoint/index_data.ts index 4996d90288ca9a..959db0d964aaec 100644 --- a/x-pack/plugins/security_solution/common/endpoint/index_data.ts +++ b/x-pack/plugins/security_solution/common/endpoint/index_data.ts @@ -13,6 +13,8 @@ import { AxiosResponse } from 'axios'; import { EndpointDocGenerator, Event, TreeOptions } from './generate_data'; import { firstNonNullValue } from './models/ecs_safety_helpers'; import { + AGENT_ACTIONS_INDEX, + AGENT_ACTIONS_RESULTS_INDEX, AGENT_POLICY_API_ROUTES, CreateAgentPolicyRequest, CreateAgentPolicyResponse, @@ -25,7 +27,7 @@ import { PACKAGE_POLICY_API_ROUTES, } from '../../../fleet/common'; import { policyFactory as policyConfigFactory } from './models/policy_config'; -import { HostMetadata } from './types'; +import { EndpointAction, HostMetadata } from './types'; import { KbnClientWithApiKeySupport } from '../../scripts/endpoint/kbn_client_with_api_key_support'; import { FleetAgentGenerator } from './data_generators/fleet_agent_generator'; import { FleetActionGenerator } from './data_generators/fleet_action_generator'; @@ -409,36 +411,97 @@ const indexFleetActionsForHost = async ( ): Promise => { const ES_INDEX_OPTIONS = { headers: { 'X-elastic-product-origin': 'fleet' } }; const agentId = endpointHost.elastic.agent.id; + const total = fleetActionGenerator.randomN(5); - for (let i = 0; i < 5; i++) { + for (let i = 0; i < total; i++) { // create an action - const isolateAction = fleetActionGenerator.generate({ + const action = fleetActionGenerator.generate({ data: { comment: 'data generator: this host is bad' }, }); - isolateAction.agents = [agentId]; + action.agents = [agentId]; await esClient.index( { - index: '.fleet-actions', - body: isolateAction, + index: AGENT_ACTIONS_INDEX, + body: action, }, ES_INDEX_OPTIONS ); // Create an action response for the above - const unIsolateAction = fleetActionGenerator.generateResponse({ - action_id: isolateAction.action_id, + const actionResponse = fleetActionGenerator.generateResponse({ + action_id: action.action_id, agent_id: agentId, - action_data: isolateAction.data, + action_data: action.data, }); await esClient.index( { - index: '.fleet-actions-results', - body: unIsolateAction, + index: AGENT_ACTIONS_RESULTS_INDEX, + body: actionResponse, }, ES_INDEX_OPTIONS ); } + + // Add edge cases (maybe) + if (fleetActionGenerator.randomFloat() < 0.3) { + const randomFloat = fleetActionGenerator.randomFloat(); + + // 60% of the time just add either an Isoalte -OR- an UnIsolate action + if (randomFloat < 0.6) { + let action: EndpointAction; + + if (randomFloat < 0.3) { + // add a pending isolation + action = fleetActionGenerator.generateIsolateAction({ + '@timestamp': new Date().toISOString(), + }); + } else { + // add a pending UN-isolation + action = fleetActionGenerator.generateUnIsolateAction({ + '@timestamp': new Date().toISOString(), + }); + } + + action.agents = [agentId]; + + await esClient.index( + { + index: AGENT_ACTIONS_INDEX, + body: action, + }, + ES_INDEX_OPTIONS + ); + } else { + // Else (40% of the time) add a pending isolate AND pending un-isolate + const action1 = fleetActionGenerator.generateIsolateAction({ + '@timestamp': new Date().toISOString(), + }); + const action2 = fleetActionGenerator.generateUnIsolateAction({ + '@timestamp': new Date().toISOString(), + }); + + action1.agents = [agentId]; + action2.agents = [agentId]; + + await Promise.all([ + esClient.index( + { + index: AGENT_ACTIONS_INDEX, + body: action1, + }, + ES_INDEX_OPTIONS + ), + esClient.index( + { + index: AGENT_ACTIONS_INDEX, + body: action2, + }, + ES_INDEX_OPTIONS + ), + ]); + } + } }; diff --git a/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/endpoint_host_isolation_status.test.tsx b/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/endpoint_host_isolation_status.test.tsx new file mode 100644 index 00000000000000..44405748b6373b --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/endpoint_host_isolation_status.test.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; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React from 'react'; +import { + EndpointHostIsolationStatus, + EndpointHostIsolationStatusProps, +} from './endpoint_host_isolation_status'; +import { AppContextTestRender, createAppRootMockRenderer } from '../../../mock/endpoint'; + +describe('when using the EndpointHostIsolationStatus component', () => { + let render: ( + renderProps?: Partial + ) => ReturnType; + + beforeEach(() => { + const appContext = createAppRootMockRenderer(); + render = (renderProps = {}) => + appContext.render( + + ); + }); + + it('should render `null` if not isolated and nothing is pending', () => { + const renderResult = render(); + expect(renderResult.container.textContent).toBe(''); + }); + + it('should show `Isolated` when no pending actions and isolated', () => { + const { getByTestId } = render({ isIsolated: true }); + expect(getByTestId('test').textContent).toBe('Isolated'); + }); + + it.each([ + ['Isolating pending', { pendingIsolate: 2 }], + ['Unisolating pending', { pendingUnIsolate: 2 }], + ['4 actions pending', { isIsolated: true, pendingUnIsolate: 2, pendingIsolate: 2 }], + ])('should show %s}', (expectedLabel, componentProps) => { + const { getByTestId } = render(componentProps); + expect(getByTestId('test').textContent).toBe(expectedLabel); + // Validate that the text color is set to `subdued` + expect(getByTestId('test-pending').classList.contains('euiTextColor--subdued')).toBe(true); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/endpoint_host_isolation_status.tsx b/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/endpoint_host_isolation_status.tsx index 5cde22de697386..0fe3a8e4337cb2 100644 --- a/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/endpoint_host_isolation_status.tsx +++ b/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/endpoint_host_isolation_status.tsx @@ -6,8 +6,9 @@ */ import React, { memo, useMemo } from 'react'; -import { EuiBadge, EuiTextColor } from '@elastic/eui'; +import { EuiBadge, EuiFlexGroup, EuiFlexItem, EuiTextColor, EuiToolTip } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; +import { useTestIdGenerator } from '../../../../management/components/hooks/use_test_id_generator'; export interface EndpointHostIsolationStatusProps { isIsolated: boolean; @@ -15,6 +16,7 @@ export interface EndpointHostIsolationStatusProps { pendingIsolate?: number; /** the count of pending unisoalte actions */ pendingUnIsolate?: number; + 'data-test-subj'?: string; } /** @@ -23,7 +25,9 @@ export interface EndpointHostIsolationStatusProps { * (`null` is returned) */ export const EndpointHostIsolationStatus = memo( - ({ isIsolated, pendingIsolate = 0, pendingUnIsolate = 0 }) => { + ({ isIsolated, pendingIsolate = 0, pendingUnIsolate = 0, 'data-test-subj': dataTestSubj }) => { + const getTestId = useTestIdGenerator(dataTestSubj); + return useMemo(() => { // If nothing is pending and host is not currently isolated, then render nothing if (!isIsolated && !pendingIsolate && !pendingUnIsolate) { @@ -33,7 +37,7 @@ export const EndpointHostIsolationStatus = memo + + +

+ +
+ + + + + {pendingIsolate} + + + + + + {pendingUnIsolate} + + + } + > + + + + + + ); + } // Show 'pending [un]isolate' depending on what's pending return ( - - + + {pendingIsolate ? ( ); - }, [isIsolated, pendingIsolate, pendingUnIsolate]); + }, [dataTestSubj, getTestId, isIsolated, pendingIsolate, pendingUnIsolate]); } ); diff --git a/x-pack/plugins/security_solution/public/common/lib/endpoint_pending_actions/endpoint_pending_actions.test.ts b/x-pack/plugins/security_solution/public/common/lib/endpoint_pending_actions/endpoint_pending_actions.test.ts new file mode 100644 index 00000000000000..a90f9a3508cd81 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/lib/endpoint_pending_actions/endpoint_pending_actions.test.ts @@ -0,0 +1,37 @@ +/* + * Copyright 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 { KibanaServices } from '../kibana'; +import { coreMock } from '../../../../../../../src/core/public/mocks'; +import { fetchPendingActionsByAgentId } from './endpoint_pending_actions'; +import { pendingActionsHttpMock, pendingActionsResponseMock } from './mocks'; +import { ACTION_STATUS_ROUTE } from '../../../../common/endpoint/constants'; + +jest.mock('../kibana'); + +describe('when using endpoint pending actions api service', () => { + let coreHttp: ReturnType['http']; + + beforeEach(() => { + const coreStartMock = coreMock.createStart(); + coreHttp = coreStartMock.http; + pendingActionsHttpMock(coreHttp); + (KibanaServices.get as jest.Mock).mockReturnValue(coreStartMock); + }); + + it('should call the endpont pending action status API', async () => { + const agentIdList = ['111-111', '222-222']; + const response = await fetchPendingActionsByAgentId(agentIdList); + + expect(response).toEqual(pendingActionsResponseMock()); + expect(coreHttp.get).toHaveBeenCalledWith(ACTION_STATUS_ROUTE, { + query: { + agent_ids: agentIdList, + }, + }); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/lib/endpoint_pending_actions/mocks.ts b/x-pack/plugins/security_solution/public/common/lib/endpoint_pending_actions/mocks.ts new file mode 100644 index 00000000000000..4c3822b07d88c2 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/lib/endpoint_pending_actions/mocks.ts @@ -0,0 +1,63 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { + PendingActionsRequestQuery, + PendingActionsResponse, +} from '../../../../common/endpoint/types'; +import { + httpHandlerMockFactory, + ResponseProvidersInterface, +} from '../../mock/endpoint/http_handler_mock_factory'; +import { ACTION_STATUS_ROUTE } from '../../../../common/endpoint/constants'; + +export const pendingActionsResponseMock = (): PendingActionsResponse => ({ + data: [ + { + agent_id: '111-111', + pending_actions: {}, + }, + { + agent_id: '222-222', + pending_actions: { + isolate: 1, + }, + }, + ], +}); + +export type PendingActionsHttpMockInterface = ResponseProvidersInterface<{ + pendingActions: () => PendingActionsResponse; +}>; + +export const pendingActionsHttpMock = httpHandlerMockFactory([ + { + id: 'pendingActions', + method: 'get', + path: ACTION_STATUS_ROUTE, + /** Will build a response based on the number of agent ids received. */ + handler: (options) => { + const agentIds = (options.query as PendingActionsRequestQuery).agent_ids as string[]; + + if (agentIds.length) { + return { + data: agentIds.map((id, index) => ({ + agent_id: id, + pending_actions: + index % 2 // index's of the array that are not divisible by 2 will will have `isolate: 1` + ? { + isolate: 1, + } + : {}, + })), + }; + } + + return pendingActionsResponseMock(); + }, + }, +]); diff --git a/x-pack/plugins/security_solution/public/common/mock/endpoint/http_handler_mock_factory.ts b/x-pack/plugins/security_solution/public/common/mock/endpoint/http_handler_mock_factory.ts index 2df16fc1e21b0a..dc93ea8168a3f6 100644 --- a/x-pack/plugins/security_solution/public/common/mock/endpoint/http_handler_mock_factory.ts +++ b/x-pack/plugins/security_solution/public/common/mock/endpoint/http_handler_mock_factory.ts @@ -7,12 +7,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import type { - HttpFetchOptions, - HttpFetchOptionsWithPath, - HttpHandler, - HttpStart, -} from 'kibana/public'; +import type { HttpFetchOptions, HttpFetchOptionsWithPath, HttpStart } from 'kibana/public'; import { merge } from 'lodash'; import { act } from '@testing-library/react'; @@ -102,7 +97,7 @@ interface RouteMock) => any; + handler: (options: HttpFetchOptionsWithPath) => any; /** * A function that returns a promise. The API response will be delayed until this promise is * resolved. This can be helpful when wanting to test an intermediate UI state while the API @@ -203,14 +198,25 @@ export const httpHandlerMockFactory = pathMatchesPattern(handler.path, path)); if (routeMock) { - markApiCallAsHandled(responseProvider[routeMock.id].mockDelay); - - await responseProvider[routeMock.id].mockDelay(); - // Use the handler defined for the HTTP Mocked interface (not the one passed on input to // the factory) for retrieving the response value because that one could have had its // response value manipulated by the individual test case. - return responseProvider[routeMock.id](...args); + + markApiCallAsHandled(responseProvider[routeMock.id].mockDelay); + await responseProvider[routeMock.id].mockDelay(); + + const fetchOptions: HttpFetchOptionsWithPath = isHttpFetchOptionsWithPath(args[0]) + ? args[0] + : { + // Ignore below is needed because the http service methods are defined via an overloaded interface. + // If the first argument is NOT fetch with options, then we know that its a string and `args` has + // a potential for being of `.length` 2. + // @ts-ignore + ...(args[1] || {}), + path: args[0], + }; + + return responseProvider[routeMock.id](fetchOptions); } else if (priorMockedFunction) { return priorMockedFunction(...args); } diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/mocks.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/mocks.ts index 3a3ad47f9f5754..de05fa949b487e 100644 --- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/mocks.ts +++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/mocks.ts @@ -23,7 +23,16 @@ import { HOST_METADATA_GET_ROUTE, HOST_METADATA_LIST_ROUTE, } from '../../../../common/endpoint/constants'; -import { AGENT_POLICY_API_ROUTES, GetAgentPoliciesResponse } from '../../../../../fleet/common'; +import { + AGENT_POLICY_API_ROUTES, + EPM_API_ROUTES, + GetAgentPoliciesResponse, + GetPackagesResponse, +} from '../../../../../fleet/common'; +import { + PendingActionsHttpMockInterface, + pendingActionsHttpMock, +} from '../../../common/lib/endpoint_pending_actions/mocks'; type EndpointMetadataHttpMocksInterface = ResponseProvidersInterface<{ metadataList: () => HostResultList; @@ -40,11 +49,15 @@ export const endpointMetadataHttpMocks = httpHandlerMockFactory { - return { + const endpoint = { metadata: generator.generateHostMetadata(), host_status: HostStatus.UNHEALTHY, query_strategy_version: MetadataQueryStrategyVersions.VERSION_2, }; + + generator.updateCommonInfo(); + + return endpoint; }), total: 10, request_page_size: 10, @@ -88,6 +101,7 @@ export const endpointPolicyResponseHttpMock = httpHandlerMockFactory GetAgentPoliciesResponse; + packageList: () => GetPackagesResponse; }>; export const fleetApisHttpMock = httpHandlerMockFactory([ { @@ -113,11 +127,24 @@ export const fleetApisHttpMock = httpHandlerMockFactory & { + payload: EndpointState['endpointPendingActions']; +}; + export type EndpointAction = | ServerReturnedEndpointList | ServerFailedToReturnEndpointList @@ -186,4 +190,5 @@ export type EndpointAction = | ServerFailedToReturnAgenstWithEndpointsTotal | ServerFailedToReturnEndpointsTotal | EndpointIsolationRequest - | EndpointIsolationRequestStateChange; + | EndpointIsolationRequestStateChange + | EndpointPendingActionsStateChanged; diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/builders.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/builders.ts index 273b4279851fd3..d43f361a0e6bb8 100644 --- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/builders.ts +++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/builders.ts @@ -7,7 +7,7 @@ import { Immutable } from '../../../../../common/endpoint/types'; import { DEFAULT_POLL_INTERVAL } from '../../../common/constants'; -import { createUninitialisedResourceState } from '../../../state'; +import { createLoadedResourceState, createUninitialisedResourceState } from '../../../state'; import { EndpointState } from '../types'; export const initialEndpointPageState = (): Immutable => { @@ -53,5 +53,6 @@ export const initialEndpointPageState = (): Immutable => { policyVersionInfo: undefined, hostStatus: undefined, isolationRequestState: createUninitialisedResourceState(), + endpointPendingActions: createLoadedResourceState(new Map()), }; }; diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/index.test.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/index.test.ts index 455c6538bcdf26..7f7c5f84f8bffd 100644 --- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/index.test.ts +++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/index.test.ts @@ -77,6 +77,10 @@ describe('EndpointList store concerns', () => { isolationRequestState: { type: 'UninitialisedResourceState', }, + endpointPendingActions: { + data: new Map(), + type: 'LoadedResourceState', + }, }); }); diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.test.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.test.ts index 130f8a56fd0267..52da30fabf95a1 100644 --- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.test.ts +++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.test.ts @@ -43,6 +43,7 @@ import { hostIsolationResponseMock, } from '../../../../common/lib/endpoint_isolation/mocks'; import { FleetActionGenerator } from '../../../../../common/endpoint/data_generators/fleet_action_generator'; +import { endpointPageHttpMock } from '../mocks'; jest.mock('../../policy/store/services/ingest', () => ({ sendGetAgentConfigList: () => Promise.resolve({ items: [] }), @@ -55,6 +56,7 @@ jest.mock('../../../../common/lib/kibana'); type EndpointListStore = Store, Immutable>; describe('endpoint list middleware', () => { + const getKibanaServicesMock = KibanaServices.get as jest.Mock; let fakeCoreStart: jest.Mocked; let depsStart: DepsStartMock; let fakeHttpServices: jest.Mocked; @@ -69,6 +71,17 @@ describe('endpoint list middleware', () => { return mockEndpointResultList({ request_page_size: 1, request_page_index: 1, total: 10 }); }; + const dispatchUserChangedUrlToEndpointList = (locationOverrides: Partial = {}) => { + dispatch({ + type: 'userChangedUrl', + payload: { + ...history.location, + pathname: getEndpointListPath({ name: 'endpointList' }), + ...locationOverrides, + }, + }); + }; + beforeEach(() => { fakeCoreStart = coreMock.createStart({ basePath: '/mock' }); depsStart = depsStartMock(); @@ -81,6 +94,7 @@ describe('endpoint list middleware', () => { getState = store.getState; dispatch = store.dispatch; history = createBrowserHistory(); + getKibanaServicesMock.mockReturnValue(fakeCoreStart); }); it('handles `userChangedUrl`', async () => { @@ -88,13 +102,7 @@ describe('endpoint list middleware', () => { fakeHttpServices.post.mockResolvedValue(apiResponse); expect(fakeHttpServices.post).not.toHaveBeenCalled(); - dispatch({ - type: 'userChangedUrl', - payload: { - ...history.location, - pathname: getEndpointListPath({ name: 'endpointList' }), - }, - }); + dispatchUserChangedUrlToEndpointList(); await waitForAction('serverReturnedEndpointList'); expect(fakeHttpServices.post).toHaveBeenCalledWith('/api/endpoint/metadata', { body: JSON.stringify({ @@ -111,13 +119,7 @@ describe('endpoint list middleware', () => { expect(fakeHttpServices.post).not.toHaveBeenCalled(); // First change the URL - dispatch({ - type: 'userChangedUrl', - payload: { - ...history.location, - pathname: getEndpointListPath({ name: 'endpointList' }), - }, - }); + dispatchUserChangedUrlToEndpointList(); await waitForAction('serverReturnedEndpointList'); // Then request the Endpoint List @@ -135,7 +137,6 @@ describe('endpoint list middleware', () => { }); describe('handling of IsolateEndpointHost action', () => { - const getKibanaServicesMock = KibanaServices.get as jest.Mock; const dispatchIsolateEndpointHost = (action: ISOLATION_ACTIONS = 'isolate') => { dispatch({ type: 'endpointIsolationRequest', @@ -149,7 +150,6 @@ describe('endpoint list middleware', () => { beforeEach(() => { isolateApiResponseHandlers = hostIsolationHttpMocks(fakeHttpServices); - getKibanaServicesMock.mockReturnValue(fakeCoreStart); }); it('should set Isolation state to loading', async () => { @@ -224,14 +224,7 @@ describe('endpoint list middleware', () => { selected_endpoint: endpointList.hosts[0].metadata.agent.id, }); const dispatchUserChangedUrl = () => { - dispatch({ - type: 'userChangedUrl', - payload: { - ...history.location, - pathname: '/endpoints', - search: `?${search.split('?').pop()}`, - }, - }); + dispatchUserChangedUrlToEndpointList({ search: `?${search.split('?').pop()}` }); }; const fleetActionGenerator = new FleetActionGenerator(Math.random().toString()); @@ -300,4 +293,39 @@ describe('endpoint list middleware', () => { expect(activityLogData).toEqual(getMockEndpointActivityLog()); }); }); + + describe('handle Endpoint Pending Actions state actions', () => { + let mockedApis: ReturnType; + + beforeEach(() => { + mockedApis = endpointPageHttpMock(fakeHttpServices); + }); + + it('should include all agents ids from the list when calling API', async () => { + const loadingPendingActions = waitForAction('endpointPendingActionsStateChanged', { + validate: (action) => isLoadedResourceState(action.payload), + }); + + dispatchUserChangedUrlToEndpointList(); + await loadingPendingActions; + + expect(mockedApis.responseProvider.pendingActions).toHaveBeenCalledWith({ + path: expect.any(String), + query: { + agent_ids: [ + '6db499e5-4927-4350-abb8-d8318e7d0eec', + 'c082dda9-1847-4997-8eda-f1192d95bec3', + '8aa1cd61-cc25-4783-afb5-0eefc4919c07', + '47fe24c1-7370-419a-9732-3ff38bf41272', + '0d2b2fa7-a9cd-49fc-ad5f-0252c642290e', + 'f480092d-0445-4bf3-9c96-8a3d5cb97824', + '3850e676-0940-4c4b-aaca-571bd1bc66d9', + '46efcc7a-086a-47a3-8f09-c4ecd6d2d917', + 'afa55826-b81b-4440-a2ac-0644d77a3fc6', + '25b49e50-cb5c-43df-824f-67b8cf697d9d', + ], + }, + }); + }); + }); }); diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts index aa0afe5ec980a3..4f96223e8b7897 100644 --- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts +++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts @@ -34,8 +34,9 @@ import { getActivityLogData, getActivityLogDataPaging, getLastLoadedActivityLogData, + detailsData, } from './selectors'; -import { EndpointState, PolicyIds } from '../types'; +import { AgentIdsPendingActions, EndpointState, PolicyIds } from '../types'; import { sendGetEndpointSpecificPackagePolicies, sendGetEndpointSecurityPackage, @@ -59,9 +60,13 @@ import { isolateHost, unIsolateHost } from '../../../../common/lib/endpoint_isol import { AppAction } from '../../../../common/store/actions'; import { resolvePathVariables } from '../../../../common/utils/resolve_path_variables'; import { ServerReturnedEndpointPackageInfo } from './action'; +import { fetchPendingActionsByAgentId } from '../../../../common/lib/endpoint_pending_actions'; type EndpointPageStore = ImmutableMiddlewareAPI; +// eslint-disable-next-line no-console +const logError = console.error; + export const endpointMiddlewareFactory: ImmutableMiddlewareFactory = ( coreStart, depsStart @@ -110,6 +115,8 @@ export const endpointMiddlewareFactory: ImmutableMiddlewareFactory => { }) ).total; } catch (error) { - // eslint-disable-next-line no-console - console.error(`error while trying to check for total endpoints`); - // eslint-disable-next-line no-console - console.error(error); + logError(`error while trying to check for total endpoints`); + logError(error); } return 0; }; @@ -524,10 +528,8 @@ const doEndpointsExist = async (http: HttpStart): Promise => { try { return (await endpointsTotal(http)) > 0; } catch (error) { - // eslint-disable-next-line no-console - console.error(`error while trying to check if endpoints exist`); - // eslint-disable-next-line no-console - console.error(error); + logError(`error while trying to check if endpoints exist`); + logError(error); } return false; }; @@ -586,7 +588,51 @@ async function getEndpointPackageInfo( }); } catch (error) { // Ignore Errors, since this should not hinder the user's ability to use the UI - // eslint-disable-next-line no-console - console.error(error); + logError(error); } } + +/** + * retrieves the Endpoint pending actions for all of the existing endpoints being displayed on the list + * or the details tab. + * + * @param store + */ +const loadEndpointsPendingActions = async ({ + getState, + dispatch, +}: EndpointPageStore): Promise => { + const state = getState(); + const detailsEndpoint = detailsData(state); + const listEndpoints = listData(state); + const agentsIds = new Set(); + + // get all agent ids for the endpoints in the list + if (detailsEndpoint) { + agentsIds.add(detailsEndpoint.elastic.agent.id); + } + + for (const endpointInfo of listEndpoints) { + agentsIds.add(endpointInfo.metadata.elastic.agent.id); + } + + if (agentsIds.size === 0) { + return; + } + + try { + const { data: pendingActions } = await fetchPendingActionsByAgentId(Array.from(agentsIds)); + const agentIdToPendingActions: AgentIdsPendingActions = new Map(); + + for (const pendingAction of pendingActions) { + agentIdToPendingActions.set(pendingAction.agent_id, pendingAction.pending_actions); + } + + dispatch({ + type: 'endpointPendingActionsStateChanged', + payload: createLoadedResourceState(agentIdToPendingActions), + }); + } catch (error) { + logError(error); + } +}; diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/reducer.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/reducer.ts index b580664512eb66..9460c27dfe705d 100644 --- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/reducer.ts +++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/reducer.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { EndpointDetailsActivityLogChanged } from './action'; +import { EndpointDetailsActivityLogChanged, EndpointPendingActionsStateChanged } from './action'; import { isOnEndpointPage, hasSelectedEndpoint, @@ -41,6 +41,19 @@ const handleEndpointDetailsActivityLogChanged: CaseReducer = ( + state, + action +) => { + if (isOnEndpointPage(state)) { + return { + ...state, + endpointPendingActions: action.payload, + }; + } + return state; +}; + /* eslint-disable-next-line complexity */ export const endpointListReducer: StateReducer = (state = initialEndpointPageState(), action) => { if (action.type === 'serverReturnedEndpointList') { @@ -141,6 +154,8 @@ export const endpointListReducer: StateReducer = (state = initialEndpointPageSta }; } else if (action.type === 'endpointDetailsActivityLogChanged') { return handleEndpointDetailsActivityLogChanged(state, action); + } else if (action.type === 'endpointPendingActionsStateChanged') { + return handleEndpointPendingActionsStateChanged(state, action); } else if (action.type === 'serverReturnedPoliciesForOnboarding') { return { ...state, diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/selectors.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/selectors.ts index 2b567d1ad53b58..d9be85377c81d7 100644 --- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/selectors.ts +++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/selectors.ts @@ -18,6 +18,7 @@ import { MetadataQueryStrategyVersions, HostStatus, ActivityLog, + HostMetadata, } from '../../../../../common/endpoint/types'; import { EndpointState, EndpointIndexUIQueryParams } from '../types'; import { extractListPaginationParams } from '../../../common/routing'; @@ -36,6 +37,7 @@ import { import { ServerApiError } from '../../../../common/types'; import { isEndpointHostIsolated } from '../../../../common/utils/validators'; +import { EndpointHostIsolationStatusProps } from '../../../../common/components/endpoint/host_isolation'; export const listData = (state: Immutable) => state.hosts; @@ -412,3 +414,40 @@ export const getActivityLogError: ( export const getIsEndpointHostIsolated = createSelector(detailsData, (details) => { return (details && isEndpointHostIsolated(details)) || false; }); + +export const getEndpointPendingActionsState = ( + state: Immutable +): Immutable => { + return state.endpointPendingActions; +}; + +/** + * Returns a function (callback) that can be used to retrieve the props for the `EndpointHostIsolationStatus` + * component for a given Endpoint + */ +export const getEndpointHostIsolationStatusPropsCallback: ( + state: Immutable +) => (endpoint: HostMetadata) => EndpointHostIsolationStatusProps = createSelector( + getEndpointPendingActionsState, + (pendingActionsState) => { + return (endpoint: HostMetadata) => { + let pendingIsolate = 0; + let pendingUnIsolate = 0; + + if (isLoadedResourceState(pendingActionsState)) { + const endpointPendingActions = pendingActionsState.data.get(endpoint.elastic.agent.id); + + if (endpointPendingActions) { + pendingIsolate = endpointPendingActions?.isolate ?? 0; + pendingUnIsolate = endpointPendingActions?.unisolate ?? 0; + } + } + + return { + isIsolated: isEndpointHostIsolated(endpoint), + pendingIsolate, + pendingUnIsolate, + }; + }; + } +); diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts index eed2182d41809d..59aa2bd15dd74a 100644 --- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts +++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts @@ -16,6 +16,7 @@ import { MetadataQueryStrategyVersions, HostStatus, HostIsolationResponse, + EndpointPendingActions, } from '../../../../common/endpoint/types'; import { ServerApiError } from '../../../common/types'; import { GetPackagesResponse } from '../../../../../fleet/common'; @@ -94,10 +95,18 @@ export interface EndpointState { policyVersionInfo?: HostInfo['policy_info']; /** The status of the host, which is mapped to the Elastic Agent status in Fleet */ hostStatus?: HostStatus; - /* Host isolation state */ + /** Host isolation request state for a single endpoint */ isolationRequestState: AsyncResourceState; + /** + * Holds a map of `agentId` to `EndpointPendingActions` that is used by both the list and details view + * Getting pending endpoint actions is "supplemental" data, so there is no need to show other Async + * states other than Loaded + */ + endpointPendingActions: AsyncResourceState; } +export type AgentIdsPendingActions = Map; + /** * packagePolicy contains a list of Package Policy IDs (received via Endpoint metadata policy response) mapped to a boolean whether they exist or not. * agentPolicy contains a list of existing Package Policy Ids mapped to an associated Fleet parent Agent Config. diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/endpoint_agent_status.test.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/endpoint_agent_status.test.tsx new file mode 100644 index 00000000000000..9010bb5785c1d4 --- /dev/null +++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/endpoint_agent_status.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; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React from 'react'; +import { + AppContextTestRender, + createAppRootMockRenderer, +} from '../../../../../common/mock/endpoint'; +import { endpointPageHttpMock } from '../../mocks'; +import { act } from '@testing-library/react'; +import { EndpointAgentStatus, EndpointAgentStatusProps } from './endpoint_agent_status'; +import { HostMetadata, HostStatus } from '../../../../../../common/endpoint/types'; +import { isLoadedResourceState } from '../../../../state'; +import { KibanaServices } from '../../../../../common/lib/kibana'; + +jest.mock('../../../../../common/lib/kibana'); + +describe('When using the EndpointAgentStatus component', () => { + let render: ( + props: EndpointAgentStatusProps + ) => Promise>; + let waitForAction: AppContextTestRender['middlewareSpy']['waitForAction']; + let renderResult: ReturnType; + let httpMocks: ReturnType; + let endpointMeta: HostMetadata; + + beforeEach(() => { + const mockedContext = createAppRootMockRenderer(); + + (KibanaServices.get as jest.Mock).mockReturnValue(mockedContext.startServices); + httpMocks = endpointPageHttpMock(mockedContext.coreStart.http); + waitForAction = mockedContext.middlewareSpy.waitForAction; + endpointMeta = httpMocks.responseProvider.metadataList().hosts[0].metadata; + render = async (props: EndpointAgentStatusProps) => { + renderResult = mockedContext.render(); + return renderResult; + }; + + act(() => { + mockedContext.history.push('/endpoints'); + }); + }); + + it.each([ + ['Healthy', 'healthy'], + ['Unhealthy', 'unhealthy'], + ['Updating', 'updating'], + ['Offline', 'offline'], + ['Inactive', 'inactive'], + ['Unhealthy', 'someUnknownValueHere'], + ])('should show agent status of %s', async (expectedLabel, hostStatus) => { + await render({ hostStatus: hostStatus as HostStatus, endpointMetadata: endpointMeta }); + expect(renderResult.getByTestId('rowHostStatus').textContent).toEqual(expectedLabel); + }); + + describe('and host is isolated or pending isolation', () => { + beforeEach(async () => { + // Ensure pending action api sets pending action for the test endpoint metadata + const pendingActionsResponseProvider = httpMocks.responseProvider.pendingActions.getMockImplementation(); + httpMocks.responseProvider.pendingActions.mockImplementation((...args) => { + const response = pendingActionsResponseProvider!(...args); + response.data.some((pendingAction) => { + if (pendingAction.agent_id === endpointMeta.elastic.agent.id) { + pendingAction.pending_actions.isolate = 1; + return true; + } + return false; + }); + return response; + }); + + const loadingPendingActions = waitForAction('endpointPendingActionsStateChanged', { + validate: (action) => isLoadedResourceState(action.payload), + }); + + await render({ hostStatus: HostStatus.HEALTHY, endpointMetadata: endpointMeta }); + await loadingPendingActions; + }); + + it('should show host pending action', () => { + expect(renderResult.getByTestId('rowIsolationStatus').textContent).toEqual( + 'Isolating pending' + ); + }); + }); +}); diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/endpoint_agent_status.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/endpoint_agent_status.tsx new file mode 100644 index 00000000000000..94db233972d670 --- /dev/null +++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/endpoint_agent_status.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; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { memo } from 'react'; +import { EuiBadge, EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; +import { FormattedMessage } from '@kbn/i18n/react'; +import styled from 'styled-components'; +import { HostInfo, HostMetadata } from '../../../../../../common/endpoint/types'; +import { HOST_STATUS_TO_BADGE_COLOR } from '../host_constants'; +import { EndpointHostIsolationStatus } from '../../../../../common/components/endpoint/host_isolation'; +import { useEndpointSelector } from '../hooks'; +import { getEndpointHostIsolationStatusPropsCallback } from '../../store/selectors'; + +const EuiFlexGroupStyled = styled(EuiFlexGroup)` + .isolation-status { + margin-left: ${({ theme }) => theme.eui.paddingSizes.s}; + } +`; + +export interface EndpointAgentStatusProps { + hostStatus: HostInfo['host_status']; + endpointMetadata: HostMetadata; +} +export const EndpointAgentStatus = memo( + ({ endpointMetadata, hostStatus }) => { + const getEndpointIsolationStatusProps = useEndpointSelector( + getEndpointHostIsolationStatusPropsCallback + ); + + return ( + + + + + + + + + + + ); + } +); + +EndpointAgentStatus.displayName = 'EndpointAgentStatus'; diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoint_details.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoint_details.tsx index 38404a5c6c11ff..64ea575c37d798 100644 --- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoint_details.tsx +++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoint_details.tsx @@ -23,7 +23,7 @@ import { isPolicyOutOfDate } from '../../utils'; import { HostInfo, HostMetadata, HostStatus } from '../../../../../../common/endpoint/types'; import { useEndpointSelector } from '../hooks'; import { policyResponseStatus, uiQueryParams } from '../../store/selectors'; -import { POLICY_STATUS_TO_BADGE_COLOR, HOST_STATUS_TO_BADGE_COLOR } from '../host_constants'; +import { POLICY_STATUS_TO_BADGE_COLOR } from '../host_constants'; import { FormattedDateAndTime } from '../../../../../common/components/endpoint/formatted_date_time'; import { useNavigateByRouterEventHandler } from '../../../../../common/hooks/endpoint/use_navigate_by_router_event_handler'; import { getEndpointDetailsPath } from '../../../../common/routing'; @@ -31,6 +31,7 @@ import { SecurityPageName } from '../../../../../app/types'; import { useFormatUrl } from '../../../../../common/components/link_to'; import { EndpointPolicyLink } from '../components/endpoint_policy_link'; import { OutOfDate } from '../components/out_of_date'; +import { EndpointAgentStatus } from '../components/endpoint_agent_status'; const HostIds = styled(EuiListGroupItem)` margin-top: 0; @@ -88,20 +89,7 @@ export const EndpointDetails = memo( title: i18n.translate('xpack.securitySolution.endpoint.details.agentStatus', { defaultMessage: 'Agent Status', }), - description: ( - - - - - - ), + description: , }, { title: i18n.translate('xpack.securitySolution.endpoint.details.lastSeen', { diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx index 4d1ab0f3de8252..410afb4684cd54 100644 --- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx +++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx @@ -31,11 +31,7 @@ import { EndpointDetailsFlyout } from './details'; import * as selectors from '../store/selectors'; import { useEndpointSelector } from './hooks'; import { isPolicyOutOfDate } from '../utils'; -import { - HOST_STATUS_TO_BADGE_COLOR, - POLICY_STATUS_TO_BADGE_COLOR, - POLICY_STATUS_TO_TEXT, -} from './host_constants'; +import { POLICY_STATUS_TO_BADGE_COLOR, POLICY_STATUS_TO_TEXT } from './host_constants'; import { useNavigateByRouterEventHandler } from '../../../../common/hooks/endpoint/use_navigate_by_router_event_handler'; import { CreateStructuredSelector } from '../../../../common/store'; import { Immutable, HostInfo } from '../../../../../common/endpoint/types'; @@ -59,6 +55,7 @@ import { AdministrationListPage } from '../../../components/administration_list_ import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public'; import { LinkToApp } from '../../../../common/components/endpoint/link_to_app'; import { TableRowActions } from './components/table_row_actions'; +import { EndpointAgentStatus } from './components/endpoint_agent_status'; const MAX_PAGINATED_ITEM = 9999; @@ -97,6 +94,7 @@ const EndpointListNavLink = memo<{ }); EndpointListNavLink.displayName = 'EndpointListNavLink'; +// FIXME: this needs refactoring - we are pulling in all selectors from endpoint, which includes many more than what the list uses const selector = (createStructuredSelector as CreateStructuredSelector)(selectors); export const EndpointList = () => { const history = useHistory(); @@ -279,19 +277,9 @@ export const EndpointList = () => { defaultMessage: 'Agent Status', }), // eslint-disable-next-line react/display-name - render: (hostStatus: HostInfo['host_status']) => { + render: (hostStatus: HostInfo['host_status'], endpointInfo) => { return ( - - - + ); }, }, From 036c157f10081a39ba0a260f191c37794ed90a2a Mon Sep 17 00:00:00 2001 From: Joe Reuter Date: Wed, 16 Jun 2021 16:00:43 +0200 Subject: [PATCH 12/46] [Lens] Unload canvas test properly (#102101) --- x-pack/test/functional/apps/canvas/lens.ts | 4 ++++ .../feature_controls/index_patterns_security.ts | 1 + 2 files changed, 5 insertions(+) diff --git a/x-pack/test/functional/apps/canvas/lens.ts b/x-pack/test/functional/apps/canvas/lens.ts index ed1bf246fae650..67ba40a99684ec 100644 --- a/x-pack/test/functional/apps/canvas/lens.ts +++ b/x-pack/test/functional/apps/canvas/lens.ts @@ -22,6 +22,10 @@ export default function canvasLensTest({ getService, getPageObjects }: FtrProvid }); }); + after(async () => { + await esArchiver.unload('x-pack/test/functional/es_archives/canvas/lens'); + }); + it('renders lens visualization', async () => { await PageObjects.header.waitUntilLoadingHasFinished(); diff --git a/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_security.ts b/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_security.ts index 04f251d247d1b5..52fcac769955c5 100644 --- a/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_security.ts +++ b/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_security.ts @@ -20,6 +20,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('security', () => { before(async () => { await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); }); after(async () => { From a84293b7433d64f4070f886af0c9004e860c0019 Mon Sep 17 00:00:00 2001 From: Kyle Pollich Date: Wed, 16 Jun 2021 10:26:19 -0400 Subject: [PATCH 13/46] [Fleet + Integrations UI] Address UI Regressions in Fleet/Integrations (#102250) * Fix active tabs in integrations UI Fixes #101771 * Remove duplicate base breadcrumb Fixes #101785 * Fix i18n --- .../integrations/hooks/use_breadcrumbs.tsx | 9 +-------- .../sections/epm/screens/home/index.tsx | 18 ++++++++++-------- .../translations/translations/ja-JP.json | 1 - .../translations/translations/zh-CN.json | 1 - 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/x-pack/plugins/fleet/public/applications/integrations/hooks/use_breadcrumbs.tsx b/x-pack/plugins/fleet/public/applications/integrations/hooks/use_breadcrumbs.tsx index 5c1745be0c9e48..19f72fdc69bba5 100644 --- a/x-pack/plugins/fleet/public/applications/integrations/hooks/use_breadcrumbs.tsx +++ b/x-pack/plugins/fleet/public/applications/integrations/hooks/use_breadcrumbs.tsx @@ -22,14 +22,7 @@ const BASE_BREADCRUMB: ChromeBreadcrumb = { const breadcrumbGetters: { [key in Page]?: (values: DynamicPagePathValues) => ChromeBreadcrumb[]; } = { - integrations: () => [ - BASE_BREADCRUMB, - { - text: i18n.translate('xpack.fleet.breadcrumbs.integrationsPageTitle', { - defaultMessage: 'Integrations', - }), - }, - ], + integrations: () => [BASE_BREADCRUMB], integrations_all: () => [ BASE_BREADCRUMB, { diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/index.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/index.tsx index 6c635d5d0c9c00..fbd6e07e07bbdb 100644 --- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/index.tsx +++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/index.tsx @@ -22,16 +22,18 @@ import { CategoryFacets } from './category_facets'; export const EPMHomePage: React.FC = memo(() => { return ( - - - + + + - - + + + + - - - + + + ); }); diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index c67dd383a2ea2c..fcb5710f8208f9 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -8939,7 +8939,6 @@ "xpack.fleet.breadcrumbs.editPackagePolicyPageTitle": "統合の編集", "xpack.fleet.breadcrumbs.enrollmentTokensPageTitle": "登録トークン", "xpack.fleet.breadcrumbs.installedIntegrationsPageTitle": "インストール済み", - "xpack.fleet.breadcrumbs.integrationsPageTitle": "統合", "xpack.fleet.breadcrumbs.overviewPageTitle": "概要", "xpack.fleet.breadcrumbs.policiesPageTitle": "ポリシー", "xpack.fleet.config.invalidPackageVersionError": "有効なサーバーまたはキーワード「latest」でなければなりません", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index 23cde5dd1fcff4..8c865b62d9d1ab 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -9019,7 +9019,6 @@ "xpack.fleet.breadcrumbs.editPackagePolicyPageTitle": "编辑集成", "xpack.fleet.breadcrumbs.enrollmentTokensPageTitle": "注册令牌", "xpack.fleet.breadcrumbs.installedIntegrationsPageTitle": "已安装", - "xpack.fleet.breadcrumbs.integrationsPageTitle": "集成", "xpack.fleet.breadcrumbs.overviewPageTitle": "概览", "xpack.fleet.breadcrumbs.policiesPageTitle": "策略", "xpack.fleet.config.invalidPackageVersionError": "必须是有效的 semver 或关键字 `latest`", From c4af30845e033250cc13f32f1a143a49a29ec289 Mon Sep 17 00:00:00 2001 From: Pete Hampton Date: Wed, 16 Jun 2021 15:33:27 +0100 Subject: [PATCH 14/46] Add additional collection item to security allow list filter. (#102192) --- .../plugins/security_solution/server/lib/telemetry/sender.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts b/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts index baf4fb2d2cfd0d..2b3c002a9b2aeb 100644 --- a/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts +++ b/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts @@ -347,6 +347,9 @@ const allowlistBaseEventFields: AllowlistFields = { direction: true, }, registry: { + data: { + strings: true, + }, hive: true, key: true, path: true, From bdc87409ba3c376fb964983f22b2a6405e8828e9 Mon Sep 17 00:00:00 2001 From: Wylie Conlon Date: Wed, 16 Jun 2021 10:35:55 -0400 Subject: [PATCH 15/46] [Lens] Create mathColumn function to improve performance (#101908) * [Lens] Create mathColumn function to improve performance * Fix empty formula case * Fix tinymath memoization Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../canvas/canvas-function-reference.asciidoc | 57 +++++++-- packages/kbn-tinymath/src/index.js | 9 +- .../expression_functions/specs/index.ts | 1 + .../expression_functions/specs/math_column.ts | 111 ++++++++++++++++++ .../specs/tests/math_column.test.ts | 74 ++++++++++++ .../common/service/expressions_services.ts | 2 + .../definitions/formula/formula.tsx | 21 +--- .../operations/definitions/formula/math.tsx | 19 +-- 8 files changed, 248 insertions(+), 46 deletions(-) create mode 100644 src/plugins/expressions/common/expression_functions/specs/math_column.ts create mode 100644 src/plugins/expressions/common/expression_functions/specs/tests/math_column.test.ts diff --git a/docs/canvas/canvas-function-reference.asciidoc b/docs/canvas/canvas-function-reference.asciidoc index 272cd524c2c200..ac7cbba6e9933a 100644 --- a/docs/canvas/canvas-function-reference.asciidoc +++ b/docs/canvas/canvas-function-reference.asciidoc @@ -71,7 +71,7 @@ Alias: `condition` [[alterColumn_fn]] === `alterColumn` -Converts between core types, including `string`, `number`, `null`, `boolean`, and `date`, and renames columns. See also <> and <>. +Converts between core types, including `string`, `number`, `null`, `boolean`, and `date`, and renames columns. See also <>, <>, and <>. *Expression syntax* [source,js] @@ -1717,11 +1717,16 @@ Adds a column calculated as the result of other columns. Changes are made only w |=== |Argument |Type |Description +|`id` + +|`string`, `null` +|An optional id of the resulting column. When no id is provided, the id will be looked up from the existing column by the provided name argument. If no column with this name exists yet, a new column with this name and an identical id will be added to the table. + |_Unnamed_ *** Aliases: `column`, `name` |`string` -|The name of the resulting column. +|The name of the resulting column. Names are not required to be unique. |`expression` *** @@ -1729,11 +1734,6 @@ Aliases: `exp`, `fn`, `function` |`boolean`, `number`, `string`, `null` |A Canvas expression that is passed to each row as a single row `datatable`. -|`id` - -|`string`, `null` -|An optional id of the resulting column. When not specified or `null` the name argument is used as id. - |`copyMetaFrom` |`string`, `null` @@ -1808,6 +1808,47 @@ Default: `"throw"` *Returns:* `number` | `boolean` | `null` +[float] +[[mathColumn_fn]] +=== `mathColumn` + +Adds a column by evaluating `TinyMath` on each row. This function is optimized for math, so it performs better than the <> with a <>. +*Accepts:* `datatable` + +[cols="3*^<"] +|=== +|Argument |Type |Description + +|id *** +|`string` +|id of the resulting column. Must be unique. + +|name *** +|`string` +|The name of the resulting column. Names are not required to be unique. + +|_Unnamed_ + +Alias: `expression` +|`string` +|A `TinyMath` expression evaluated on each row. See https://www.elastic.co/guide/en/kibana/current/canvas-tinymath-functions.html. + +|`onError` + +|`string` +|In case the `TinyMath` evaluation fails or returns NaN, the return value is specified by onError. For example, `"null"`, `"zero"`, `"false"`, `"throw"`. When `"throw"`, it will throw an exception, terminating expression execution. + +Default: `"throw"` + +|`copyMetaFrom` + +|`string`, `null` +|If set, the meta object from the specified column id is copied over to the specified target column. Throws an exception if the column doesn't exist +|=== + +*Returns:* `datatable` + + [float] [[metric_fn]] === `metric` @@ -2581,7 +2622,7 @@ Default: `false` [[staticColumn_fn]] === `staticColumn` -Adds a column with the same static value in every row. See also <> and <>. +Adds a column with the same static value in every row. See also <>, <>, and <>. *Accepts:* `datatable` diff --git a/packages/kbn-tinymath/src/index.js b/packages/kbn-tinymath/src/index.js index 9f1bb7b8514634..6fde4c202e2a77 100644 --- a/packages/kbn-tinymath/src/index.js +++ b/packages/kbn-tinymath/src/index.js @@ -7,12 +7,11 @@ */ const { get } = require('lodash'); +const memoizeOne = require('memoize-one'); // eslint-disable-next-line import/no-unresolved const { parse: parseFn } = require('../grammar'); const { functions: includedFunctions } = require('./functions'); -module.exports = { parse, evaluate, interpret }; - function parse(input, options) { if (input == null) { throw new Error('Missing expression'); @@ -29,9 +28,11 @@ function parse(input, options) { } } +const memoizedParse = memoizeOne(parse); + function evaluate(expression, scope = {}, injectedFunctions = {}) { scope = scope || {}; - return interpret(parse(expression), scope, injectedFunctions); + return interpret(memoizedParse(expression), scope, injectedFunctions); } function interpret(node, scope, injectedFunctions) { @@ -79,3 +80,5 @@ function isOperable(args) { return typeof arg === 'number' && !isNaN(arg); }); } + +module.exports = { parse: memoizedParse, evaluate, interpret }; diff --git a/src/plugins/expressions/common/expression_functions/specs/index.ts b/src/plugins/expressions/common/expression_functions/specs/index.ts index c6d89f41d0e0d3..e808021f751800 100644 --- a/src/plugins/expressions/common/expression_functions/specs/index.ts +++ b/src/plugins/expressions/common/expression_functions/specs/index.ts @@ -18,3 +18,4 @@ export * from './moving_average'; export * from './ui_setting'; export { mapColumn, MapColumnArguments } from './map_column'; export { math, MathArguments, MathInput } from './math'; +export { mathColumn, MathColumnArguments } from './math_column'; diff --git a/src/plugins/expressions/common/expression_functions/specs/math_column.ts b/src/plugins/expressions/common/expression_functions/specs/math_column.ts new file mode 100644 index 00000000000000..0ff8faf3ce55a1 --- /dev/null +++ b/src/plugins/expressions/common/expression_functions/specs/math_column.ts @@ -0,0 +1,111 @@ +/* + * Copyright 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'; +import { ExpressionFunctionDefinition } from '../types'; +import { math, MathArguments } from './math'; +import { Datatable, DatatableColumn, getType } from '../../expression_types'; + +export type MathColumnArguments = MathArguments & { + id: string; + name?: string; + copyMetaFrom?: string | null; +}; + +export const mathColumn: ExpressionFunctionDefinition< + 'mathColumn', + Datatable, + MathColumnArguments, + Datatable +> = { + name: 'mathColumn', + type: 'datatable', + inputTypes: ['datatable'], + help: i18n.translate('expressions.functions.mathColumnHelpText', { + defaultMessage: + 'Adds a column calculated as the result of other columns. ' + + 'Changes are made only when you provide arguments.' + + 'See also {alterColumnFn} and {staticColumnFn}.', + values: { + alterColumnFn: '`alterColumn`', + staticColumnFn: '`staticColumn`', + }, + }), + args: { + ...math.args, + id: { + types: ['string'], + help: i18n.translate('expressions.functions.mathColumn.args.idHelpText', { + defaultMessage: 'id of the resulting column. Must be unique.', + }), + required: true, + }, + name: { + types: ['string'], + aliases: ['_', 'column'], + help: i18n.translate('expressions.functions.mathColumn.args.nameHelpText', { + defaultMessage: 'The name of the resulting column. Names are not required to be unique.', + }), + required: true, + }, + copyMetaFrom: { + types: ['string', 'null'], + help: i18n.translate('expressions.functions.mathColumn.args.copyMetaFromHelpText', { + defaultMessage: + "If set, the meta object from the specified column id is copied over to the specified target column. If the column doesn't exist it silently fails.", + }), + required: false, + default: null, + }, + }, + fn: (input, args, context) => { + const columns = [...input.columns]; + const existingColumnIndex = columns.findIndex(({ id }) => { + return id === args.id; + }); + if (existingColumnIndex > -1) { + throw new Error('ID must be unique'); + } + + const newRows = input.rows.map((row) => { + return { + ...row, + [args.id]: math.fn( + { + type: 'datatable', + columns: input.columns, + rows: [row], + }, + { + expression: args.expression, + onError: args.onError, + }, + context + ), + }; + }); + const type = newRows.length ? getType(newRows[0][args.id]) : 'null'; + const newColumn: DatatableColumn = { + id: args.id, + name: args.name ?? args.id, + meta: { type, params: { id: type } }, + }; + if (args.copyMetaFrom) { + const metaSourceFrom = columns.find(({ id }) => id === args.copyMetaFrom); + newColumn.meta = { ...newColumn.meta, ...(metaSourceFrom?.meta || {}) }; + } + + columns.push(newColumn); + + return { + type: 'datatable', + columns, + rows: newRows, + } as Datatable; + }, +}; diff --git a/src/plugins/expressions/common/expression_functions/specs/tests/math_column.test.ts b/src/plugins/expressions/common/expression_functions/specs/tests/math_column.test.ts new file mode 100644 index 00000000000000..bc6699a2b689bf --- /dev/null +++ b/src/plugins/expressions/common/expression_functions/specs/tests/math_column.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 { mathColumn } from '../math_column'; +import { functionWrapper, testTable } from './utils'; + +describe('mathColumn', () => { + const fn = functionWrapper(mathColumn); + + it('throws if the id is used', () => { + expect(() => fn(testTable, { id: 'price', name: 'price', expression: 'price * 2' })).toThrow( + `ID must be unique` + ); + }); + + it('applies math to each row by id', () => { + const result = fn(testTable, { id: 'output', name: 'output', expression: 'quantity * price' }); + expect(result.columns).toEqual([ + ...testTable.columns, + { id: 'output', name: 'output', meta: { params: { id: 'number' }, type: 'number' } }, + ]); + expect(result.rows[0]).toEqual({ + in_stock: true, + name: 'product1', + output: 60500, + price: 605, + quantity: 100, + time: 1517842800950, + }); + }); + + it('handles onError', () => { + const args = { + id: 'output', + name: 'output', + expression: 'quantity / 0', + }; + expect(() => fn(testTable, args)).toThrowError(`Cannot divide by 0`); + expect(() => fn(testTable, { ...args, onError: 'throw' })).toThrow(); + expect(fn(testTable, { ...args, onError: 'zero' }).rows[0].output).toEqual(0); + expect(fn(testTable, { ...args, onError: 'false' }).rows[0].output).toEqual(false); + expect(fn(testTable, { ...args, onError: 'null' }).rows[0].output).toEqual(null); + }); + + it('should copy over the meta information from the specified column', async () => { + const result = await fn( + { + ...testTable, + columns: [ + ...testTable.columns, + { + id: 'myId', + name: 'myName', + meta: { type: 'date', params: { id: 'number', params: { digits: 2 } } }, + }, + ], + rows: testTable.rows.map((row) => ({ ...row, myId: Date.now() })), + }, + { id: 'output', name: 'name', copyMetaFrom: 'myId', expression: 'price + 2' } + ); + + expect(result.type).toBe('datatable'); + expect(result.columns[result.columns.length - 1]).toEqual({ + id: 'output', + name: 'name', + meta: { type: 'date', params: { id: 'number', params: { digits: 2 } } }, + }); + }); +}); diff --git a/src/plugins/expressions/common/service/expressions_services.ts b/src/plugins/expressions/common/service/expressions_services.ts index f7afc12aa96bad..b3c01672626614 100644 --- a/src/plugins/expressions/common/service/expressions_services.ts +++ b/src/plugins/expressions/common/service/expressions_services.ts @@ -31,6 +31,7 @@ import { mapColumn, overallMetric, math, + mathColumn, } from '../expression_functions'; /** @@ -344,6 +345,7 @@ export class ExpressionsService implements PersistableStateService Date: Wed, 16 Jun 2021 11:02:55 -0400 Subject: [PATCH 16/46] [Watcher] Migrate to use new page layout (#101956) --- .../translations/translations/ja-JP.json | 2 - .../translations/translations/zh-CN.json | 2 - .../watcher/public/application/app.tsx | 44 +++--- .../components/page_error/page_error.tsx | 2 +- .../page_error/page_error_forbidden.tsx | 3 +- .../page_error/page_error_not_exist.tsx | 22 ++- .../json_watch_edit/json_watch_edit.tsx | 64 +++----- .../monitoring_watch_edit.tsx | 56 ++----- .../threshold_watch_edit.tsx | 27 ++-- .../watch_edit/components/watch_edit.tsx | 53 +++---- .../watch_list/components/watch_list.tsx | 149 ++++++++---------- .../watch_status/components/watch_status.tsx | 146 ++++++++--------- .../public/application/shared_imports.ts | 1 + 13 files changed, 262 insertions(+), 309 deletions(-) diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index fcb5710f8208f9..fb936a58387816 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -24295,8 +24295,6 @@ "xpack.watcher.sections.watchEdit.json.titlePanel.editWatchTitle": "{watchName}を編集", "xpack.watcher.sections.watchEdit.loadingWatchDescription": "ウォッチの読み込み中…", "xpack.watcher.sections.watchEdit.loadingWatchVisualizationDescription": "ウォッチビジュアライゼーションを読み込み中…", - "xpack.watcher.sections.watchEdit.monitoring.edit.calloutDescriptionText": "ウォッチ'{watchName}'はシステムウォッチであるため、編集できません。{watchStatusLink}", - "xpack.watcher.sections.watchEdit.monitoring.edit.calloutTitleText": "このウォッチは編集できません。", "xpack.watcher.sections.watchEdit.monitoring.header.watchLinkTitle": "ウォッチステータスを表示します。", "xpack.watcher.sections.watchEdit.simulate.form.actionModesFieldLabel": "アクションモード", "xpack.watcher.sections.watchEdit.simulate.form.actionOverridesDescription": "ウォッチでアクションを実行またはスキップすることができるようにします。{actionsLink}", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index 8c865b62d9d1ab..998b2a4c672872 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -24665,8 +24665,6 @@ "xpack.watcher.sections.watchEdit.json.titlePanel.editWatchTitle": "编辑 {watchName}", "xpack.watcher.sections.watchEdit.loadingWatchDescription": "正在加载监视……", "xpack.watcher.sections.watchEdit.loadingWatchVisualizationDescription": "正在加载监视可视化……", - "xpack.watcher.sections.watchEdit.monitoring.edit.calloutDescriptionText": "监视“{watchName}”为系统监视，无法编辑。{watchStatusLink}", - "xpack.watcher.sections.watchEdit.monitoring.edit.calloutTitleText": "此监视无法编辑。", "xpack.watcher.sections.watchEdit.monitoring.header.watchLinkTitle": "查看监视状态。", "xpack.watcher.sections.watchEdit.simulate.form.actionModesFieldLabel": "操作模式", "xpack.watcher.sections.watchEdit.simulate.form.actionOverridesDescription": "允许监视执行或跳过操作。{actionsLink}", diff --git a/x-pack/plugins/watcher/public/application/app.tsx b/x-pack/plugins/watcher/public/application/app.tsx index 6c233a44830b54..98d10bce3b6b24 100644 --- a/x-pack/plugins/watcher/public/application/app.tsx +++ b/x-pack/plugins/watcher/public/application/app.tsx @@ -17,7 +17,7 @@ import { import { Router, Switch, Route, Redirect, withRouter, RouteComponentProps } from 'react-router-dom'; -import { EuiCallOut, EuiLink } from '@elastic/eui'; +import { EuiPageContent, EuiEmptyPrompt, EuiLink } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; @@ -62,24 +62,30 @@ export const App = (deps: AppDeps) => { if (!valid) { return ( - - } - color="danger" - iconType="help" - > - {message}{' '} - - - - + + + + + } + body={

{message}

} + actions={[ + + + , + ]} + /> + ); } return ( diff --git a/x-pack/plugins/watcher/public/application/components/page_error/page_error.tsx b/x-pack/plugins/watcher/public/application/components/page_error/page_error.tsx index ca05d390518f26..321b5c0e5e11b7 100644 --- a/x-pack/plugins/watcher/public/application/components/page_error/page_error.tsx +++ b/x-pack/plugins/watcher/public/application/components/page_error/page_error.tsx @@ -25,7 +25,7 @@ export function getPageErrorCode(errorOrErrors: any) { } } -export function PageError({ errorCode, id }: { errorCode?: any; id?: any }) { +export function PageError({ errorCode, id }: { errorCode?: number; id?: string }) { switch (errorCode) { case 404: return ; diff --git a/x-pack/plugins/watcher/public/application/components/page_error/page_error_forbidden.tsx b/x-pack/plugins/watcher/public/application/components/page_error/page_error_forbidden.tsx index c2e93c7f066001..56dc5c7dc22b53 100644 --- a/x-pack/plugins/watcher/public/application/components/page_error/page_error_forbidden.tsx +++ b/x-pack/plugins/watcher/public/application/components/page_error/page_error_forbidden.tsx @@ -13,8 +13,7 @@ import { FormattedMessage } from '@kbn/i18n/react'; export function PageErrorForbidden() { return ( - + {id ? ( + + ) : ( + + )}

} /> diff --git a/x-pack/plugins/watcher/public/application/sections/watch_edit/components/json_watch_edit/json_watch_edit.tsx b/x-pack/plugins/watcher/public/application/sections/watch_edit/components/json_watch_edit/json_watch_edit.tsx index 8b5827fbd0fe0d..80931c3f60c05a 100644 --- a/x-pack/plugins/watcher/public/application/sections/watch_edit/components/json_watch_edit/json_watch_edit.tsx +++ b/x-pack/plugins/watcher/public/application/sections/watch_edit/components/json_watch_edit/json_watch_edit.tsx @@ -7,15 +7,7 @@ import React, { useContext, useState } from 'react'; -import { - EuiFlexGroup, - EuiFlexItem, - EuiPageContent, - EuiSpacer, - EuiTab, - EuiTabs, - EuiTitle, -} from '@elastic/eui'; +import { EuiPageHeader, EuiSpacer, EuiPageContentBody } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { ExecuteDetails } from '../../../../models/execute_details'; import { getActionType } from '../../../../../../common/lib/get_action_type'; @@ -96,36 +88,31 @@ export const JsonWatchEdit = ({ pageTitle }: { pageTitle: string }) => { const hasExecuteWatchErrors = !!Object.keys(executeWatchErrors).find( (errorKey) => executeWatchErrors[errorKey].length >= 1 ); + return ( - - - - -

{pageTitle}

- - - - - {WATCH_TABS.map((tab, index) => ( - { - setSelectedTab(tab.id); - setExecuteDetails( - new ExecuteDetails({ - ...executeDetails, - actionModes: getActionModes(watchActions), - }) - ); - }} - isSelected={tab.id === selectedTab} - key={index} - data-test-subj="tab" - > - {tab.name} - - ))} - + + {pageTitle}} + bottomBorder + tabs={WATCH_TABS.map((tab, index) => ({ + onClick: () => { + setSelectedTab(tab.id); + setExecuteDetails( + new ExecuteDetails({ + ...executeDetails, + actionModes: getActionModes(watchActions), + }) + ); + }, + isSelected: tab.id === selectedTab, + key: index, + 'data-test-subj': 'tab', + label: tab.name, + }))} + /> + + {selectedTab === WATCH_SIMULATE_TAB && ( { watchActions={watchActions} /> )} + {selectedTab === WATCH_EDIT_TAB && } - + ); }; diff --git a/x-pack/plugins/watcher/public/application/sections/watch_edit/components/monitoring_watch_edit/monitoring_watch_edit.tsx b/x-pack/plugins/watcher/public/application/sections/watch_edit/components/monitoring_watch_edit/monitoring_watch_edit.tsx index 930c11340ce5e3..b00e4dc310e27e 100644 --- a/x-pack/plugins/watcher/public/application/sections/watch_edit/components/monitoring_watch_edit/monitoring_watch_edit.tsx +++ b/x-pack/plugins/watcher/public/application/sections/watch_edit/components/monitoring_watch_edit/monitoring_watch_edit.tsx @@ -7,16 +7,7 @@ import React, { useContext } from 'react'; -import { - EuiFlexGroup, - EuiFlexItem, - EuiPageContent, - EuiSpacer, - EuiTitle, - EuiCallOut, - EuiText, - EuiLink, -} from '@elastic/eui'; +import { EuiPageContent, EuiEmptyPrompt, EuiLink } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; import { WatchContext } from '../../watch_context'; import { useAppContext } from '../../../../app_context'; @@ -27,46 +18,31 @@ export const MonitoringWatchEdit = ({ pageTitle }: { pageTitle: string }) => { const { watch } = useContext(WatchContext); const { history } = useAppContext(); - const systemWatchTitle = ( - - ); - const systemWatchMessage = ( - - - ), }} /> ); return ( - - - - -

{pageTitle}

- - - - - - -

{systemWatchMessage}

- - + + {pageTitle}} + body={

{systemWatchMessage}

} + actions={[ + + + , + ]} + /> ); }; diff --git a/x-pack/plugins/watcher/public/application/sections/watch_edit/components/threshold_watch_edit/threshold_watch_edit.tsx b/x-pack/plugins/watcher/public/application/sections/watch_edit/components/threshold_watch_edit/threshold_watch_edit.tsx index 2f89a3bc2be641..6587974363a802 100644 --- a/x-pack/plugins/watcher/public/application/sections/watch_edit/components/threshold_watch_edit/threshold_watch_edit.tsx +++ b/x-pack/plugins/watcher/public/application/sections/watch_edit/components/threshold_watch_edit/threshold_watch_edit.tsx @@ -18,13 +18,14 @@ import { EuiFlexGroup, EuiFlexItem, EuiForm, - EuiPageContent, EuiPopover, EuiPopoverTitle, EuiSelect, EuiSpacer, EuiText, EuiTitle, + EuiPageHeader, + EuiPageContentBody, } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n/react'; @@ -236,19 +237,15 @@ export const ThresholdWatchEdit = ({ pageTitle }: { pageTitle: string }) => { }; return ( - - - - -

{pageTitle}

- - - - {watch.titleDescription} - - - - + + {pageTitle}} + description={watch.titleDescription} + bottomBorder + /> + + + {serverError && ( @@ -957,6 +954,6 @@ export const ThresholdWatchEdit = ({ pageTitle }: { pageTitle: string }) => { close={() => setIsRequestVisible(false)} /> ) : null} - + ); }; diff --git a/x-pack/plugins/watcher/public/application/sections/watch_edit/components/watch_edit.tsx b/x-pack/plugins/watcher/public/application/sections/watch_edit/components/watch_edit.tsx index 525ae077df655f..fa3c7e374f7b56 100644 --- a/x-pack/plugins/watcher/public/application/sections/watch_edit/components/watch_edit.tsx +++ b/x-pack/plugins/watcher/public/application/sections/watch_edit/components/watch_edit.tsx @@ -10,19 +10,20 @@ import { isEqual } from 'lodash'; import { EuiPageContent } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; - import { FormattedMessage } from '@kbn/i18n/react'; -import { Watch } from '../../../models/watch'; + import { WATCH_TYPES } from '../../../../../common/constants'; import { BaseWatch } from '../../../../../common/types/watch_types'; -import { getPageErrorCode, PageError, SectionLoading, SectionError } from '../../../components'; +import { getPageErrorCode, PageError, SectionLoading } from '../../../components'; import { loadWatch } from '../../../lib/api'; import { listBreadcrumb, editBreadcrumb, createBreadcrumb } from '../../../lib/breadcrumbs'; +import { useAppContext } from '../../../app_context'; +import { Watch } from '../../../models/watch'; +import { PageError as GenericPageError } from '../../../shared_imports'; +import { WatchContext } from '../watch_context'; import { JsonWatchEdit } from './json_watch_edit'; import { ThresholdWatchEdit } from './threshold_watch_edit'; import { MonitoringWatchEdit } from './monitoring_watch_edit'; -import { WatchContext } from '../watch_context'; -import { useAppContext } from '../../../app_context'; const getTitle = (watch: BaseWatch) => { if (watch.isNew) { @@ -115,7 +116,7 @@ export const WatchEdit = ({ const loadedWatch = await loadWatch(id); dispatch({ command: 'setWatch', payload: loadedWatch }); } catch (error) { - dispatch({ command: 'setError', payload: error }); + dispatch({ command: 'setError', payload: error.body }); } } else if (type) { const WatchType = Watch.getWatchTypes()[type]; @@ -135,36 +136,34 @@ export const WatchEdit = ({ const errorCode = getPageErrorCode(loadError); if (errorCode) { return ( - + ); - } - - if (loadError) { + } else if (loadError) { return ( - - - } - error={loadError} - /> - + + } + error={loadError} + /> ); } if (!watch) { return ( - - - + + + + + ); } diff --git a/x-pack/plugins/watcher/public/application/sections/watch_list/components/watch_list.tsx b/x-pack/plugins/watcher/public/application/sections/watch_list/components/watch_list.tsx index 0e89871063507e..31accef0b63691 100644 --- a/x-pack/plugins/watcher/public/application/sections/watch_list/components/watch_list.tsx +++ b/x-pack/plugins/watcher/public/application/sections/watch_list/components/watch_list.tsx @@ -11,25 +11,25 @@ import { CriteriaWithPagination, EuiButton, EuiButtonEmpty, - EuiFlexGroup, - EuiFlexItem, EuiInMemoryTable, EuiLink, EuiPageContent, EuiSpacer, EuiText, - EuiTitle, EuiToolTip, EuiEmptyPrompt, EuiButtonIcon, EuiPopover, EuiContextMenuPanel, EuiContextMenuItem, + EuiPageHeader, } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n/react'; import { Moment } from 'moment'; +import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public'; + import { REFRESH_INTERVALS, PAGINATION, WATCH_TYPES } from '../../../../../common/constants'; import { listBreadcrumb } from '../../../lib/breadcrumbs'; import { @@ -37,15 +37,13 @@ import { PageError, DeleteWatchesModal, WatchStatus, - SectionError, SectionLoading, Error, } from '../../../components'; import { useLoadWatches } from '../../../lib/api'; import { goToCreateThresholdAlert, goToCreateAdvancedWatch } from '../../../lib/navigation'; import { useAppContext } from '../../../app_context'; - -import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public'; +import { PageError as GenericPageError } from '../../../shared_imports'; export const WatchList = () => { // hooks @@ -173,21 +171,36 @@ export const WatchList = () => { if (isWatchesLoading) { return ( - - - + + + + + ); } - if (getPageErrorCode(error)) { + const errorCode = getPageErrorCode(error); + if (errorCode) { return ( - - + + ); + } else if (error) { + return ( + + } + error={(error as unknown) as Error} + /> + ); } if (availableWatches && availableWatches.length === 0) { @@ -206,7 +219,7 @@ export const WatchList = () => { ); return ( - + { let content; - if (error) { - content = ( - - } - error={(error as unknown) as Error} - /> - ); - } else if (availableWatches) { + if (availableWatches) { const columns = [ { field: 'id', @@ -463,56 +464,46 @@ export const WatchList = () => { ); } - if (content) { - return ( - - { - if (deleted) { - setDeletedWatches([...deletedWatches, ...watchesToDelete]); - } - setWatchesToDelete([]); - }} - watchesToDelete={watchesToDelete} - /> - - - - -

- -

- - - - - - - - - - - - -

{watcherDescriptionText}

- + return ( + <> + + + + } + bottomBorder + rightSideItems={[ + + + , + ]} + description={watcherDescriptionText} + /> + { + if (deleted) { + setDeletedWatches([...deletedWatches, ...watchesToDelete]); + } + setWatchesToDelete([]); + }} + watchesToDelete={watchesToDelete} + /> - + - {content} - - ); - } - return null; + {content} + + ); }; diff --git a/x-pack/plugins/watcher/public/application/sections/watch_status/components/watch_status.tsx b/x-pack/plugins/watcher/public/application/sections/watch_status/components/watch_status.tsx index 1e3548620339aa..73400b9ccaaa72 100644 --- a/x-pack/plugins/watcher/public/application/sections/watch_status/components/watch_status.tsx +++ b/x-pack/plugins/watcher/public/application/sections/watch_status/components/watch_status.tsx @@ -9,14 +9,10 @@ import React, { useEffect, useState } from 'react'; import { EuiPageContent, EuiSpacer, - EuiTabs, - EuiTab, - EuiFlexGroup, - EuiFlexItem, - EuiTitle, EuiToolTip, EuiBadge, EuiButtonEmpty, + EuiPageHeader, } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n/react'; @@ -88,18 +84,20 @@ export const WatchStatus = ({ if (isWatchDetailLoading) { return ( - - - + + + + + ); } if (errorCode) { return ( - + ); @@ -156,20 +154,11 @@ export const WatchStatus = ({ return ( - - { - if (deleted) { - goToWatchList(); - } - setWatchesToDelete([]); - }} - watchesToDelete={watchesToDelete} - /> - - - -

+ <> + + -

- - - {isSystemWatch ? ( - - - } - > - - - - - - ) : ( - - - + + {isSystemWatch && ( + <> + {' '} + + } + > + + + + + + )} + + } + bottomBorder + rightSideItems={ + isSystemWatch + ? [] + : [ toggleWatchActivation()} isLoading={isTogglingActivation} > {activationButtonText} - - - + , { @@ -223,30 +213,34 @@ export const WatchStatus = ({ id="xpack.watcher.sections.watchHistory.deleteWatchButtonLabel" defaultMessage="Delete" /> - - - - - )} - - - - {WATCH_STATUS_TABS.map((tab, index) => ( - { - setSelectedTab(tab.id); - }} - isSelected={tab.id === selectedTab} - key={index} - data-test-subj="tab" - > - {tab.name} - - ))} - + , + ] + } + tabs={WATCH_STATUS_TABS.map((tab, index) => ({ + onClick: () => { + setSelectedTab(tab.id); + }, + isSelected: tab.id === selectedTab, + key: index, + 'data-test-subj': 'tab', + label: tab.name, + }))} + /> + + {selectedTab === WATCH_ACTIONS_TAB ? : } - + + { + if (deleted) { + goToWatchList(); + } + setWatchesToDelete([]); + }} + watchesToDelete={watchesToDelete} + /> + ); } diff --git a/x-pack/plugins/watcher/public/application/shared_imports.ts b/x-pack/plugins/watcher/public/application/shared_imports.ts index e3eb11eda77b30..44bef3b0c4f5f6 100644 --- a/x-pack/plugins/watcher/public/application/shared_imports.ts +++ b/x-pack/plugins/watcher/public/application/shared_imports.ts @@ -12,4 +12,5 @@ export { sendRequest, useRequest, XJson, + PageError, } from '../../../../../src/plugins/es_ui_shared/public'; From 8abb656d7f929c2a93b143b9e87f6ddc00d1f3a2 Mon Sep 17 00:00:00 2001 From: Liza Katz Date: Wed, 16 Jun 2021 18:15:47 +0300 Subject: [PATCH 17/46] [Kuery] Move json utils (#102058) * Move JSON utils to utils package * Imports from tests * delete * split package * docs * test * test * imports Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- ...bana-plugin-plugins-data-public.eskuery.md | 2 +- ...bana-plugin-plugins-data-server.eskuery.md | 2 +- package.json | 1 + packages/BUILD.bazel | 1 + packages/kbn-common-utils/BUILD.bazel | 82 +++++++++++++++++++ packages/kbn-common-utils/README.md | 3 + packages/kbn-common-utils/jest.config.js | 13 +++ packages/kbn-common-utils/package.json | 9 ++ packages/kbn-common-utils/src/index.ts | 9 ++ packages/kbn-common-utils/src/json/index.ts | 9 ++ .../kbn-common-utils/src/json}/typed_json.ts | 0 packages/kbn-common-utils/tsconfig.json | 18 ++++ .../data/common/es_query/kuery/ast/ast.ts | 2 +- .../es_query/kuery/node_types/named_arg.ts | 2 +- .../common/es_query/kuery/node_types/types.ts | 2 +- src/plugins/data/public/public.api.md | 3 +- src/plugins/data/server/server.api.md | 3 +- src/plugins/kibana_utils/common/index.ts | 1 - src/plugins/kibana_utils/public/index.ts | 3 - .../alerting/common/alert_navigation.ts | 3 +- .../public/alert_navigation_registry/types.ts | 2 +- .../authorization/alerting_authorization.ts | 2 +- .../alerting_authorization_kuery.ts | 2 +- .../server/routes/lib/rewrite_request_case.ts | 2 +- .../graph/public/types/workspace_state.ts | 2 +- x-pack/plugins/infra/common/typed_json.ts | 2 +- .../components/log_stream/log_stream.tsx | 2 +- .../logging/log_text_stream/field_value.tsx | 2 +- .../log_entry_field_column.tsx | 2 +- .../utils/log_column_render_configuration.tsx | 2 +- .../lib/adapters/framework/adapter_types.ts | 2 +- .../log_entries/kibana_log_entries_adapter.ts | 2 +- .../log_entries_domain/log_entries_domain.ts | 3 +- .../snapshot/lib/get_metrics_aggregations.ts | 2 +- .../services/log_entries/message/message.ts | 2 +- .../log_entries/message/rule_types.ts | 2 +- .../infra/server/utils/serialized_query.ts | 2 +- .../server/utils/typed_search_strategy.ts | 2 +- x-pack/plugins/ml/common/types/es_client.ts | 2 +- x-pack/plugins/osquery/common/typed_json.ts | 2 +- .../security_solution/common/typed_json.ts | 2 +- .../public/common/lib/keury/index.ts | 2 +- .../routes/resolver/queries/events.ts | 2 +- .../resolver/tree/queries/descendants.ts | 2 +- .../routes/resolver/tree/queries/lifecycle.ts | 2 +- .../routes/resolver/tree/queries/stats.ts | 2 +- .../routes/resolver/utils/pagination.ts | 2 +- .../server/endpoint/types.ts | 2 +- .../server/utils/serialized_query.ts | 2 +- .../server/monitoring/capacity_estimation.ts | 2 +- .../monitoring_stats_stream.test.ts | 2 +- .../monitoring/monitoring_stats_stream.ts | 2 +- .../runtime_statistics_aggregator.ts | 2 +- .../server/monitoring/task_run_calcultors.ts | 2 +- .../server/monitoring/task_run_statistics.ts | 2 +- .../server/monitoring/workload_statistics.ts | 2 +- .../task_manager/server/routes/health.ts | 2 +- .../uptime/server/lib/alerts/status_check.ts | 2 +- .../server/lib/requests/get_monitor_status.ts | 2 +- .../tests/services/annotations.ts | 2 +- .../basic/tests/annotations.ts | 2 +- .../trial/tests/annotations.ts | 2 +- .../apis/resolver/events.ts | 2 +- yarn.lock | 4 + 64 files changed, 203 insertions(+), 56 deletions(-) create mode 100644 packages/kbn-common-utils/BUILD.bazel create mode 100644 packages/kbn-common-utils/README.md create mode 100644 packages/kbn-common-utils/jest.config.js create mode 100644 packages/kbn-common-utils/package.json create mode 100644 packages/kbn-common-utils/src/index.ts create mode 100644 packages/kbn-common-utils/src/json/index.ts rename {src/plugins/kibana_utils/common => packages/kbn-common-utils/src/json}/typed_json.ts (100%) create mode 100644 packages/kbn-common-utils/tsconfig.json diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.eskuery.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.eskuery.md index 5d92e348d62760..2cde2b74555851 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.eskuery.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.eskuery.md @@ -10,6 +10,6 @@ esKuery: { nodeTypes: import("../common/es_query/kuery/node_types").NodeTypes; fromKueryExpression: (expression: any, parseOptions?: Partial) => import("../common").KueryNode; - toElasticsearchQuery: (node: import("../common").KueryNode, indexPattern?: import("../common").IIndexPattern | undefined, config?: Record | undefined, context?: Record | undefined) => import("../../kibana_utils/common").JsonObject; + toElasticsearchQuery: (node: import("../common").KueryNode, indexPattern?: import("../common").IIndexPattern | undefined, config?: Record | undefined, context?: Record | undefined) => import("@kbn/common-utils").JsonObject; } ``` diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.eskuery.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.eskuery.md index 19cb742785e7b2..4b96d8af756f37 100644 --- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.eskuery.md +++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.eskuery.md @@ -10,6 +10,6 @@ esKuery: { nodeTypes: import("../common/es_query/kuery/node_types").NodeTypes; fromKueryExpression: (expression: any, parseOptions?: Partial) => import("../common").KueryNode; - toElasticsearchQuery: (node: import("../common").KueryNode, indexPattern?: import("../common").IIndexPattern | undefined, config?: Record | undefined, context?: Record | undefined) => import("../../kibana_utils/common").JsonObject; + toElasticsearchQuery: (node: import("../common").KueryNode, indexPattern?: import("../common").IIndexPattern | undefined, config?: Record | undefined, context?: Record | undefined) => import("@kbn/common-utils").JsonObject; } ``` diff --git a/package.json b/package.json index c9c6fa7f582c59..596bcff59797d8 100644 --- a/package.json +++ b/package.json @@ -156,6 +156,7 @@ "@kbn/ui-framework": "link:packages/kbn-ui-framework", "@kbn/ui-shared-deps": "link:packages/kbn-ui-shared-deps", "@kbn/utility-types": "link:bazel-bin/packages/kbn-utility-types", + "@kbn/common-utils": "link:bazel-bin/packages/kbn-common-utils", "@kbn/utils": "link:bazel-bin/packages/kbn-utils", "@loaders.gl/core": "^2.3.1", "@loaders.gl/json": "^2.3.1", diff --git a/packages/BUILD.bazel b/packages/BUILD.bazel index 3e17d471a3cac0..f2510a2386aa2c 100644 --- a/packages/BUILD.bazel +++ b/packages/BUILD.bazel @@ -12,6 +12,7 @@ filegroup( "//packages/kbn-apm-utils:build", "//packages/kbn-babel-code-parser:build", "//packages/kbn-babel-preset:build", + "//packages/kbn-common-utils:build", "//packages/kbn-config:build", "//packages/kbn-config-schema:build", "//packages/kbn-crypto:build", diff --git a/packages/kbn-common-utils/BUILD.bazel b/packages/kbn-common-utils/BUILD.bazel new file mode 100644 index 00000000000000..02446849733537 --- /dev/null +++ b/packages/kbn-common-utils/BUILD.bazel @@ -0,0 +1,82 @@ +load("@npm//@bazel/typescript:index.bzl", "ts_config", "ts_project") +load("@build_bazel_rules_nodejs//:index.bzl", "js_library", "pkg_npm") + +PKG_BASE_NAME = "kbn-common-utils" +PKG_REQUIRE_NAME = "@kbn/common-utils" + +SOURCE_FILES = glob( + [ + "src/**/*.ts", + ], + exclude = ["**/*.test.*"], +) + +SRCS = SOURCE_FILES + +filegroup( + name = "srcs", + srcs = SRCS, +) + +NPM_MODULE_EXTRA_FILES = [ + "package.json", + "README.md" +] + +SRC_DEPS = [ + "//packages/kbn-config-schema", + "@npm//load-json-file", + "@npm//tslib", +] + +TYPES_DEPS = [ + "@npm//@types/jest", + "@npm//@types/node", +] + +DEPS = SRC_DEPS + TYPES_DEPS + +ts_config( + name = "tsconfig", + src = "tsconfig.json", + deps = [ + "//:tsconfig.base.json", + ], +) + +ts_project( + name = "tsc", + args = ['--pretty'], + srcs = SRCS, + deps = DEPS, + declaration = True, + declaration_map = True, + incremental = True, + out_dir = "target", + source_map = True, + root_dir = "src", + tsconfig = ":tsconfig", +) + +js_library( + name = PKG_BASE_NAME, + srcs = NPM_MODULE_EXTRA_FILES, + deps = DEPS + [":tsc"], + package_name = PKG_REQUIRE_NAME, + visibility = ["//visibility:public"], +) + +pkg_npm( + name = "npm_module", + deps = [ + ":%s" % PKG_BASE_NAME, + ] +) + +filegroup( + name = "build", + srcs = [ + ":npm_module", + ], + visibility = ["//visibility:public"], +) diff --git a/packages/kbn-common-utils/README.md b/packages/kbn-common-utils/README.md new file mode 100644 index 00000000000000..7b64c9f18fe89d --- /dev/null +++ b/packages/kbn-common-utils/README.md @@ -0,0 +1,3 @@ +# @kbn/common-utils + +Shared common (client and server sie) utilities shared across packages and plugins. \ No newline at end of file diff --git a/packages/kbn-common-utils/jest.config.js b/packages/kbn-common-utils/jest.config.js new file mode 100644 index 00000000000000..08f1995c474236 --- /dev/null +++ b/packages/kbn-common-utils/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', + rootDir: '../..', + roots: ['/packages/kbn-common-utils'], +}; diff --git a/packages/kbn-common-utils/package.json b/packages/kbn-common-utils/package.json new file mode 100644 index 00000000000000..db99f4d6afb985 --- /dev/null +++ b/packages/kbn-common-utils/package.json @@ -0,0 +1,9 @@ +{ + "name": "@kbn/common-utils", + "main": "./target/index.js", + "browser": "./target/index.js", + "types": "./target/index.d.ts", + "version": "1.0.0", + "license": "SSPL-1.0 OR Elastic License 2.0", + "private": true +} \ No newline at end of file diff --git a/packages/kbn-common-utils/src/index.ts b/packages/kbn-common-utils/src/index.ts new file mode 100644 index 00000000000000..1b8bffe4bf1580 --- /dev/null +++ b/packages/kbn-common-utils/src/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 * from './json'; diff --git a/packages/kbn-common-utils/src/json/index.ts b/packages/kbn-common-utils/src/json/index.ts new file mode 100644 index 00000000000000..96c94df1bb48eb --- /dev/null +++ b/packages/kbn-common-utils/src/json/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 { JsonArray, JsonValue, JsonObject } from './typed_json'; diff --git a/src/plugins/kibana_utils/common/typed_json.ts b/packages/kbn-common-utils/src/json/typed_json.ts similarity index 100% rename from src/plugins/kibana_utils/common/typed_json.ts rename to packages/kbn-common-utils/src/json/typed_json.ts diff --git a/packages/kbn-common-utils/tsconfig.json b/packages/kbn-common-utils/tsconfig.json new file mode 100644 index 00000000000000..98f1b30c0d7ff2 --- /dev/null +++ b/packages/kbn-common-utils/tsconfig.json @@ -0,0 +1,18 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "incremental": true, + "outDir": "target", + "declaration": true, + "declarationMap": true, + "sourceMap": true, + "sourceRoot": "../../../../packages/kbn-common-utils/src", + "types": [ + "jest", + "node" + ] + }, + "include": [ + "src/**/*" + ] +} diff --git a/src/plugins/data/common/es_query/kuery/ast/ast.ts b/src/plugins/data/common/es_query/kuery/ast/ast.ts index 5b22e3b3a3e0ea..be821289699689 100644 --- a/src/plugins/data/common/es_query/kuery/ast/ast.ts +++ b/src/plugins/data/common/es_query/kuery/ast/ast.ts @@ -6,6 +6,7 @@ * Side Public License, v 1. */ +import { JsonObject } from '@kbn/common-utils'; import { nodeTypes } from '../node_types/index'; import { KQLSyntaxError } from '../kuery_syntax_error'; import { KueryNode, DslQuery, KueryParseOptions } from '../types'; @@ -13,7 +14,6 @@ import { IIndexPattern } from '../../../index_patterns/types'; // @ts-ignore import { parse as parseKuery } from './_generated_/kuery'; -import { JsonObject } from '../../../../../kibana_utils/common'; const fromExpression = ( expression: string | DslQuery, diff --git a/src/plugins/data/common/es_query/kuery/node_types/named_arg.ts b/src/plugins/data/common/es_query/kuery/node_types/named_arg.ts index c65f195040b185..b1b202e4323af7 100644 --- a/src/plugins/data/common/es_query/kuery/node_types/named_arg.ts +++ b/src/plugins/data/common/es_query/kuery/node_types/named_arg.ts @@ -7,10 +7,10 @@ */ import _ from 'lodash'; +import { JsonObject } from '@kbn/common-utils'; import * as ast from '../ast'; import { nodeTypes } from '../node_types'; import { NamedArgTypeBuildNode } from './types'; -import { JsonObject } from '../../../../../kibana_utils/common'; export function buildNode(name: string, value: any): NamedArgTypeBuildNode { const argumentNode = diff --git a/src/plugins/data/common/es_query/kuery/node_types/types.ts b/src/plugins/data/common/es_query/kuery/node_types/types.ts index 196890ed0f7a3a..b3247a0ad8dc21 100644 --- a/src/plugins/data/common/es_query/kuery/node_types/types.ts +++ b/src/plugins/data/common/es_query/kuery/node_types/types.ts @@ -10,8 +10,8 @@ * WARNING: these typings are incomplete */ +import { JsonValue } from '@kbn/common-utils'; import { IIndexPattern } from '../../../index_patterns'; -import { JsonValue } from '../../../../../kibana_utils/common'; import { KueryNode } from '..'; export type FunctionName = diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md index 13352d183370bd..d56727b468da6f 100644 --- a/src/plugins/data/public/public.api.md +++ b/src/plugins/data/public/public.api.md @@ -53,6 +53,7 @@ import { ISearchOptions as ISearchOptions_2 } from 'src/plugins/data/public'; import { ISearchSource as ISearchSource_2 } from 'src/plugins/data/public'; import { IStorageWrapper } from 'src/plugins/kibana_utils/public'; import { IUiSettingsClient } from 'src/core/public'; +import { JsonValue } from '@kbn/common-utils'; import { KibanaClient } from '@elastic/elasticsearch/api/kibana'; import { Location } from 'history'; import { LocationDescriptorObject } from 'history'; @@ -856,7 +857,7 @@ export const esFilters: { export const esKuery: { nodeTypes: import("../common/es_query/kuery/node_types").NodeTypes; fromKueryExpression: (expression: any, parseOptions?: Partial) => import("../common").KueryNode; - toElasticsearchQuery: (node: import("../common").KueryNode, indexPattern?: import("../common").IIndexPattern | undefined, config?: Record | undefined, context?: Record | undefined) => import("../../kibana_utils/common").JsonObject; + toElasticsearchQuery: (node: import("../common").KueryNode, indexPattern?: import("../common").IIndexPattern | undefined, config?: Record | undefined, context?: Record | undefined) => import("@kbn/common-utils").JsonObject; }; // Warning: (ae-missing-release-tag) "esQuery" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) diff --git a/src/plugins/data/server/server.api.md b/src/plugins/data/server/server.api.md index 783bd8d2fcd0e1..c2b533bc42dc6f 100644 --- a/src/plugins/data/server/server.api.md +++ b/src/plugins/data/server/server.api.md @@ -38,6 +38,7 @@ import { ISearchOptions as ISearchOptions_2 } from 'src/plugins/data/public'; import { ISearchSource } from 'src/plugins/data/public'; import { IUiSettingsClient } from 'src/core/server'; import { IUiSettingsClient as IUiSettingsClient_3 } from 'kibana/server'; +import { JsonValue } from '@kbn/common-utils'; import { KibanaRequest } from 'src/core/server'; import { KibanaRequest as KibanaRequest_2 } from 'kibana/server'; import { Logger } from 'src/core/server'; @@ -460,7 +461,7 @@ export const esFilters: { export const esKuery: { nodeTypes: import("../common/es_query/kuery/node_types").NodeTypes; fromKueryExpression: (expression: any, parseOptions?: Partial) => import("../common").KueryNode; - toElasticsearchQuery: (node: import("../common").KueryNode, indexPattern?: import("../common").IIndexPattern | undefined, config?: Record | undefined, context?: Record | undefined) => import("../../kibana_utils/common").JsonObject; + toElasticsearchQuery: (node: import("../common").KueryNode, indexPattern?: import("../common").IIndexPattern | undefined, config?: Record | undefined, context?: Record | undefined) => import("@kbn/common-utils").JsonObject; }; // Warning: (ae-missing-release-tag) "esQuery" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) diff --git a/src/plugins/kibana_utils/common/index.ts b/src/plugins/kibana_utils/common/index.ts index 76a7cb2855c6e0..773c0b96d64136 100644 --- a/src/plugins/kibana_utils/common/index.ts +++ b/src/plugins/kibana_utils/common/index.ts @@ -11,7 +11,6 @@ export * from './field_wildcard'; export * from './of'; export * from './ui'; export * from './state_containers'; -export * from './typed_json'; export * from './errors'; export { AbortError, abortSignalToPromise } from './abort_utils'; export { createGetterSetter, Get, Set } from './create_getter_setter'; diff --git a/src/plugins/kibana_utils/public/index.ts b/src/plugins/kibana_utils/public/index.ts index 75c52e1301ea57..3d9b5db0629558 100644 --- a/src/plugins/kibana_utils/public/index.ts +++ b/src/plugins/kibana_utils/public/index.ts @@ -15,9 +15,6 @@ export { fieldWildcardFilter, fieldWildcardMatcher, Get, - JsonArray, - JsonObject, - JsonValue, of, Set, UiComponent, diff --git a/x-pack/plugins/alerting/common/alert_navigation.ts b/x-pack/plugins/alerting/common/alert_navigation.ts index d26afff9e8243f..7c9e428f9a09ee 100644 --- a/x-pack/plugins/alerting/common/alert_navigation.ts +++ b/x-pack/plugins/alerting/common/alert_navigation.ts @@ -5,8 +5,7 @@ * 2.0. */ -import { JsonObject } from '../../../../src/plugins/kibana_utils/common'; - +import { JsonObject } from '@kbn/common-utils'; export interface AlertUrlNavigation { path: string; } diff --git a/x-pack/plugins/alerting/public/alert_navigation_registry/types.ts b/x-pack/plugins/alerting/public/alert_navigation_registry/types.ts index 53540facd9652e..12ac9061426475 100644 --- a/x-pack/plugins/alerting/public/alert_navigation_registry/types.ts +++ b/x-pack/plugins/alerting/public/alert_navigation_registry/types.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { JsonObject } from '../../../../../src/plugins/kibana_utils/common'; +import { JsonObject } from '@kbn/common-utils'; import { SanitizedAlert } from '../../common'; /** diff --git a/x-pack/plugins/alerting/server/authorization/alerting_authorization.ts b/x-pack/plugins/alerting/server/authorization/alerting_authorization.ts index 7506accd8b88ea..52cef9a402e352 100644 --- a/x-pack/plugins/alerting/server/authorization/alerting_authorization.ts +++ b/x-pack/plugins/alerting/server/authorization/alerting_authorization.ts @@ -8,6 +8,7 @@ import Boom from '@hapi/boom'; import { map, mapValues, fromPairs, has } from 'lodash'; import { KibanaRequest } from 'src/core/server'; +import { JsonObject } from '@kbn/common-utils'; import { AlertTypeRegistry } from '../types'; import { SecurityPluginSetup } from '../../../security/server'; import { RegistryAlertType } from '../alert_type_registry'; @@ -19,7 +20,6 @@ import { AlertingAuthorizationFilterOpts, } from './alerting_authorization_kuery'; import { KueryNode } from '../../../../../src/plugins/data/server'; -import { JsonObject } from '../../../../../src/plugins/kibana_utils/common'; export enum AlertingAuthorizationEntity { Rule = 'rule', diff --git a/x-pack/plugins/alerting/server/authorization/alerting_authorization_kuery.ts b/x-pack/plugins/alerting/server/authorization/alerting_authorization_kuery.ts index eb6f1605f2ba5a..5205e6afdf29f3 100644 --- a/x-pack/plugins/alerting/server/authorization/alerting_authorization_kuery.ts +++ b/x-pack/plugins/alerting/server/authorization/alerting_authorization_kuery.ts @@ -6,7 +6,7 @@ */ import { remove } from 'lodash'; -import { JsonObject } from '../../../../../src/plugins/kibana_utils/common'; +import { JsonObject } from '@kbn/common-utils'; import { nodeBuilder, EsQueryConfig } from '../../../../../src/plugins/data/common'; import { toElasticsearchQuery } from '../../../../../src/plugins/data/common/es_query'; import { KueryNode } from '../../../../../src/plugins/data/server'; diff --git a/x-pack/plugins/alerting/server/routes/lib/rewrite_request_case.ts b/x-pack/plugins/alerting/server/routes/lib/rewrite_request_case.ts index 361ba5ff5e55de..f5455d1a630934 100644 --- a/x-pack/plugins/alerting/server/routes/lib/rewrite_request_case.ts +++ b/x-pack/plugins/alerting/server/routes/lib/rewrite_request_case.ts @@ -4,7 +4,7 @@ * 2.0; you may not use this file except in compliance with the Elastic License * 2.0. */ -import { JsonValue } from '../../../../../../src/plugins/kibana_utils/common'; +import { JsonValue } from '@kbn/common-utils'; type RenameAlertToRule = K extends `alertTypeId` ? `ruleTypeId` diff --git a/x-pack/plugins/graph/public/types/workspace_state.ts b/x-pack/plugins/graph/public/types/workspace_state.ts index 73d76cfd9cc572..e511a2eb5c7798 100644 --- a/x-pack/plugins/graph/public/types/workspace_state.ts +++ b/x-pack/plugins/graph/public/types/workspace_state.ts @@ -5,9 +5,9 @@ * 2.0. */ +import { JsonObject } from '@kbn/common-utils'; import { FontawesomeIcon } from '../helpers/style_choices'; import { WorkspaceField, AdvancedSettings } from './app_state'; -import { JsonObject } from '../../../../../src/plugins/kibana_utils/public'; export interface WorkspaceNode { x: number; diff --git a/x-pack/plugins/infra/common/typed_json.ts b/x-pack/plugins/infra/common/typed_json.ts index 5b7bbdcfbc07bd..44409ab433a601 100644 --- a/x-pack/plugins/infra/common/typed_json.ts +++ b/x-pack/plugins/infra/common/typed_json.ts @@ -6,7 +6,7 @@ */ import * as rt from 'io-ts'; -import { JsonArray, JsonObject, JsonValue } from '../../../../src/plugins/kibana_utils/common'; +import { JsonArray, JsonObject, JsonValue } from '@kbn/common-utils'; export { JsonArray, JsonObject, JsonValue }; diff --git a/x-pack/plugins/infra/public/components/log_stream/log_stream.tsx b/x-pack/plugins/infra/public/components/log_stream/log_stream.tsx index 44d78591fbf2f3..0087d559a42e60 100644 --- a/x-pack/plugins/infra/public/components/log_stream/log_stream.tsx +++ b/x-pack/plugins/infra/public/components/log_stream/log_stream.tsx @@ -7,6 +7,7 @@ import React, { useMemo, useCallback, useEffect } from 'react'; import { noop } from 'lodash'; +import { JsonValue } from '@kbn/common-utils'; import { DataPublicPluginStart, esQuery, Filter } from '../../../../../../src/plugins/data/public'; import { euiStyled } from '../../../../../../src/plugins/kibana_react/common'; import { LogEntryCursor } from '../../../common/log_entry'; @@ -17,7 +18,6 @@ import { BuiltEsQuery, useLogStream } from '../../containers/logs/log_stream'; import { ScrollableLogTextStreamView } from '../logging/log_text_stream'; import { LogColumnRenderConfiguration } from '../../utils/log_column_render_configuration'; -import { JsonValue } from '../../../../../../src/plugins/kibana_utils/common'; import { Query } from '../../../../../../src/plugins/data/common'; import { LogStreamErrorBoundary } from './log_stream_error_boundary'; diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/field_value.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/field_value.tsx index 29e511b2467e10..9cffef270219e4 100644 --- a/x-pack/plugins/infra/public/components/logging/log_text_stream/field_value.tsx +++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/field_value.tsx @@ -7,8 +7,8 @@ import stringify from 'json-stable-stringify'; import React from 'react'; +import { JsonArray, JsonValue } from '@kbn/common-utils'; import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common'; -import { JsonArray, JsonValue } from '../../../../../../../src/plugins/kibana_utils/common'; import { ActiveHighlightMarker, highlightFieldValue, HighlightMarker } from './highlighting'; export const FieldValue: React.FC<{ diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.tsx index 4fffa8eb0ee021..33e81756552d8e 100644 --- a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.tsx +++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.tsx @@ -6,7 +6,7 @@ */ import React from 'react'; -import { JsonValue } from '../../../../../../../src/plugins/kibana_utils/common'; +import { JsonValue } from '@kbn/common-utils'; import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common'; import { LogColumn } from '../../../../common/log_entry'; import { isFieldColumn, isHighlightFieldColumn } from '../../../utils/log_entry'; diff --git a/x-pack/plugins/infra/public/utils/log_column_render_configuration.tsx b/x-pack/plugins/infra/public/utils/log_column_render_configuration.tsx index 3758e02e77312b..a6adc716e02fbc 100644 --- a/x-pack/plugins/infra/public/utils/log_column_render_configuration.tsx +++ b/x-pack/plugins/infra/public/utils/log_column_render_configuration.tsx @@ -6,7 +6,7 @@ */ import { ReactNode } from 'react'; -import { JsonValue } from '../../../../../src/plugins/kibana_utils/common'; +import { JsonValue } from '@kbn/common-utils'; /** * Interface for common configuration properties, regardless of the column type. diff --git a/x-pack/plugins/infra/server/lib/adapters/framework/adapter_types.ts b/x-pack/plugins/infra/server/lib/adapters/framework/adapter_types.ts index 1231a19f80ca25..1657d41d0b7936 100644 --- a/x-pack/plugins/infra/server/lib/adapters/framework/adapter_types.ts +++ b/x-pack/plugins/infra/server/lib/adapters/framework/adapter_types.ts @@ -8,6 +8,7 @@ import { GenericParams, SearchResponse } from 'elasticsearch'; import { Lifecycle } from '@hapi/hapi'; import { UsageCollectionSetup } from 'src/plugins/usage_collection/server'; +import { JsonArray, JsonValue } from '@kbn/common-utils'; import { RouteConfig, RouteMethod } from '../../../../../../../src/core/server'; import { PluginSetup as DataPluginSetup, @@ -19,7 +20,6 @@ import { PluginSetupContract as FeaturesPluginSetup } from '../../../../../../pl import { SpacesPluginSetup } from '../../../../../../plugins/spaces/server'; import { PluginSetupContract as AlertingPluginContract } from '../../../../../alerting/server'; import { MlPluginSetup } from '../../../../../ml/server'; -import { JsonArray, JsonValue } from '../../../../../../../src/plugins/kibana_utils/common'; export interface InfraServerPluginSetupDeps { data: DataPluginSetup; diff --git a/x-pack/plugins/infra/server/lib/adapters/log_entries/kibana_log_entries_adapter.ts b/x-pack/plugins/infra/server/lib/adapters/log_entries/kibana_log_entries_adapter.ts index 3aaa747b945a82..9f2e9e2713bbc7 100644 --- a/x-pack/plugins/infra/server/lib/adapters/log_entries/kibana_log_entries_adapter.ts +++ b/x-pack/plugins/infra/server/lib/adapters/log_entries/kibana_log_entries_adapter.ts @@ -11,7 +11,7 @@ import { constant, identity } from 'fp-ts/lib/function'; import { pipe } from 'fp-ts/lib/pipeable'; import * as runtimeTypes from 'io-ts'; import { compact } from 'lodash'; -import { JsonArray } from '../../../../../../../src/plugins/kibana_utils/common'; +import { JsonArray } from '@kbn/common-utils'; import type { InfraPluginRequestHandlerContext } from '../../../types'; import { LogEntriesAdapter, diff --git a/x-pack/plugins/infra/server/lib/domains/log_entries_domain/log_entries_domain.ts b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/log_entries_domain.ts index ad8650bbb0fb65..f8268570710f2c 100644 --- a/x-pack/plugins/infra/server/lib/domains/log_entries_domain/log_entries_domain.ts +++ b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/log_entries_domain.ts @@ -6,7 +6,8 @@ */ import type { estypes } from '@elastic/elasticsearch'; -import { JsonObject } from '../../../../../../../src/plugins/kibana_utils/common'; +import { JsonObject } from '@kbn/common-utils'; + import type { InfraPluginRequestHandlerContext } from '../../../types'; import { diff --git a/x-pack/plugins/infra/server/routes/snapshot/lib/get_metrics_aggregations.ts b/x-pack/plugins/infra/server/routes/snapshot/lib/get_metrics_aggregations.ts index 0878131a69f0e6..33060f428b7ff3 100644 --- a/x-pack/plugins/infra/server/routes/snapshot/lib/get_metrics_aggregations.ts +++ b/x-pack/plugins/infra/server/routes/snapshot/lib/get_metrics_aggregations.ts @@ -6,7 +6,7 @@ */ import { i18n } from '@kbn/i18n'; -import { JsonObject } from '../../../../../../../src/plugins/kibana_utils/common'; +import { JsonObject } from '@kbn/common-utils'; import { InventoryItemType, MetricsUIAggregation, diff --git a/x-pack/plugins/infra/server/services/log_entries/message/message.ts b/x-pack/plugins/infra/server/services/log_entries/message/message.ts index 83d9aa6c8954ca..2deee584f5187a 100644 --- a/x-pack/plugins/infra/server/services/log_entries/message/message.ts +++ b/x-pack/plugins/infra/server/services/log_entries/message/message.ts @@ -5,8 +5,8 @@ * 2.0. */ +import { JsonArray, JsonValue } from '@kbn/common-utils'; import { LogMessagePart } from '../../../../common/log_entry'; -import { JsonArray, JsonValue } from '../../../../../../../src/plugins/kibana_utils/common'; import { LogMessageFormattingCondition, LogMessageFormattingFieldValueConditionValue, diff --git a/x-pack/plugins/infra/server/services/log_entries/message/rule_types.ts b/x-pack/plugins/infra/server/services/log_entries/message/rule_types.ts index 4760382fd9bdd0..56d1b38e7e3902 100644 --- a/x-pack/plugins/infra/server/services/log_entries/message/rule_types.ts +++ b/x-pack/plugins/infra/server/services/log_entries/message/rule_types.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { JsonValue } from '../../../../../../../src/plugins/kibana_utils/common'; +import { JsonValue } from '@kbn/common-utils'; export interface LogMessageFormattingRule { when: LogMessageFormattingCondition; diff --git a/x-pack/plugins/infra/server/utils/serialized_query.ts b/x-pack/plugins/infra/server/utils/serialized_query.ts index 4f813d4fb137f3..4169e123d85322 100644 --- a/x-pack/plugins/infra/server/utils/serialized_query.ts +++ b/x-pack/plugins/infra/server/utils/serialized_query.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { JsonObject } from '../../../../../src/plugins/kibana_utils/common'; +import { JsonObject } from '@kbn/common-utils'; export const parseFilterQuery = ( filterQuery: string | null | undefined diff --git a/x-pack/plugins/infra/server/utils/typed_search_strategy.ts b/x-pack/plugins/infra/server/utils/typed_search_strategy.ts index 546fd90a2da501..2482694474b0ed 100644 --- a/x-pack/plugins/infra/server/utils/typed_search_strategy.ts +++ b/x-pack/plugins/infra/server/utils/typed_search_strategy.ts @@ -7,7 +7,7 @@ import * as rt from 'io-ts'; import stringify from 'json-stable-stringify'; -import { JsonValue } from '../../../../../src/plugins/kibana_utils/common'; +import { JsonValue } from '@kbn/common-utils'; import { jsonValueRT } from '../../common/typed_json'; import { SearchStrategyError } from '../../common/search_strategies/common/errors'; import { ShardFailure } from './elasticsearch_runtime_types'; diff --git a/x-pack/plugins/ml/common/types/es_client.ts b/x-pack/plugins/ml/common/types/es_client.ts index 67adda6b24c18a..29a7a81aa56939 100644 --- a/x-pack/plugins/ml/common/types/es_client.ts +++ b/x-pack/plugins/ml/common/types/es_client.ts @@ -7,9 +7,9 @@ import { estypes } from '@elastic/elasticsearch'; +import { JsonObject } from '@kbn/common-utils'; import { buildEsQuery } from '../../../../../src/plugins/data/common/es_query/es_query'; import type { DslQuery } from '../../../../../src/plugins/data/common/es_query/kuery'; -import type { JsonObject } from '../../../../../src/plugins/kibana_utils/common'; import { isPopulatedObject } from '../util/object_utils'; diff --git a/x-pack/plugins/osquery/common/typed_json.ts b/x-pack/plugins/osquery/common/typed_json.ts index fb24b1dc0db5e3..8ce6907beb80bd 100644 --- a/x-pack/plugins/osquery/common/typed_json.ts +++ b/x-pack/plugins/osquery/common/typed_json.ts @@ -7,7 +7,7 @@ import { DslQuery, Filter } from 'src/plugins/data/common'; -import { JsonObject } from '../../../../src/plugins/kibana_utils/common'; +import { JsonObject } from '@kbn/common-utils'; export type ESQuery = | ESRangeQuery diff --git a/x-pack/plugins/security_solution/common/typed_json.ts b/x-pack/plugins/security_solution/common/typed_json.ts index fb24b1dc0db5e3..8ce6907beb80bd 100644 --- a/x-pack/plugins/security_solution/common/typed_json.ts +++ b/x-pack/plugins/security_solution/common/typed_json.ts @@ -7,7 +7,7 @@ import { DslQuery, Filter } from 'src/plugins/data/common'; -import { JsonObject } from '../../../../src/plugins/kibana_utils/common'; +import { JsonObject } from '@kbn/common-utils'; export type ESQuery = | ESRangeQuery diff --git a/x-pack/plugins/security_solution/public/common/lib/keury/index.ts b/x-pack/plugins/security_solution/public/common/lib/keury/index.ts index bd026f486471f1..a71524f9e02a86 100644 --- a/x-pack/plugins/security_solution/public/common/lib/keury/index.ts +++ b/x-pack/plugins/security_solution/public/common/lib/keury/index.ts @@ -7,6 +7,7 @@ import { isEmpty, isString, flow } from 'lodash/fp'; +import { JsonObject } from '@kbn/common-utils'; import { EsQueryConfig, Query, @@ -15,7 +16,6 @@ import { esKuery, IIndexPattern, } from '../../../../../../../src/plugins/data/public'; -import { JsonObject } from '../../../../../../../src/plugins/kibana_utils/public'; export const convertKueryToElasticSearchQuery = ( kueryExpression: string, diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/queries/events.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/queries/events.ts index 28a220c6f048a6..70e74356188c76 100644 --- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/queries/events.ts +++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/queries/events.ts @@ -6,10 +6,10 @@ */ import type { IScopedClusterClient } from 'kibana/server'; +import { JsonObject } from '@kbn/common-utils'; import { parseFilterQuery } from '../../../../utils/serialized_query'; import { SafeResolverEvent } from '../../../../../common/endpoint/types'; import { PaginationBuilder } from '../utils/pagination'; -import { JsonObject } from '../../../../../../../../src/plugins/kibana_utils/common'; interface TimeRange { from: string; diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/descendants.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/descendants.ts index bf9b3ce6aa8f3a..331f622951515e 100644 --- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/descendants.ts +++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/descendants.ts @@ -7,8 +7,8 @@ import type { ApiResponse, estypes } from '@elastic/elasticsearch'; import { IScopedClusterClient } from 'src/core/server'; +import { JsonObject, JsonValue } from '@kbn/common-utils'; import { FieldsObject, ResolverSchema } from '../../../../../../common/endpoint/types'; -import { JsonObject, JsonValue } from '../../../../../../../../../src/plugins/kibana_utils/common'; import { NodeID, TimeRange, docValueFields, validIDs } from '../utils/index'; interface DescendantsParams { diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/lifecycle.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/lifecycle.ts index f9780d1469756e..7de038ccc9ae45 100644 --- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/lifecycle.ts +++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/lifecycle.ts @@ -6,8 +6,8 @@ */ import { IScopedClusterClient } from 'src/core/server'; +import { JsonObject, JsonValue } from '@kbn/common-utils'; import { FieldsObject, ResolverSchema } from '../../../../../../common/endpoint/types'; -import { JsonObject, JsonValue } from '../../../../../../../../../src/plugins/kibana_utils/common'; import { NodeID, TimeRange, docValueFields, validIDs } from '../utils/index'; interface LifecycleParams { diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/stats.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/stats.ts index 24c97ad88b26ae..f21259980d464f 100644 --- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/stats.ts +++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/stats.ts @@ -6,7 +6,7 @@ */ import { IScopedClusterClient } from 'src/core/server'; -import { JsonObject } from '../../../../../../../../../src/plugins/kibana_utils/common'; +import { JsonObject } from '@kbn/common-utils'; import { EventStats, ResolverSchema } from '../../../../../../common/endpoint/types'; import { NodeID, TimeRange } from '../utils/index'; diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/utils/pagination.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/utils/pagination.ts index befd69bdcf953c..24fc447173ba6c 100644 --- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/utils/pagination.ts +++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/utils/pagination.ts @@ -5,12 +5,12 @@ * 2.0. */ +import { JsonObject } from '@kbn/common-utils'; import { SafeResolverEvent } from '../../../../../common/endpoint/types'; import { eventIDSafeVersion, timestampSafeVersion, } from '../../../../../common/endpoint/models/event'; -import { JsonObject } from '../../../../../../../../src/plugins/kibana_utils/common'; type SearchAfterFields = [number, string]; diff --git a/x-pack/plugins/security_solution/server/endpoint/types.ts b/x-pack/plugins/security_solution/server/endpoint/types.ts index b3c7e58afe9915..6076aa9af635bf 100644 --- a/x-pack/plugins/security_solution/server/endpoint/types.ts +++ b/x-pack/plugins/security_solution/server/endpoint/types.ts @@ -8,9 +8,9 @@ import { LoggerFactory } from 'kibana/server'; import { SearchResponse } from '@elastic/elasticsearch/api/types'; +import { JsonObject } from '@kbn/common-utils'; import { ConfigType } from '../config'; import { EndpointAppContextService } from './endpoint_app_context_services'; -import { JsonObject } from '../../../../../src/plugins/kibana_utils/common'; import { HostMetadata, MetadataQueryStrategyVersions } from '../../common/endpoint/types'; import { ExperimentalFeatures } from '../../common/experimental_features'; diff --git a/x-pack/plugins/security_solution/server/utils/serialized_query.ts b/x-pack/plugins/security_solution/server/utils/serialized_query.ts index fb5009eefa3180..7f8603ccab4b76 100644 --- a/x-pack/plugins/security_solution/server/utils/serialized_query.ts +++ b/x-pack/plugins/security_solution/server/utils/serialized_query.ts @@ -7,7 +7,7 @@ import { isEmpty, isPlainObject, isString } from 'lodash/fp'; -import { JsonObject } from '../../../../../src/plugins/kibana_utils/common'; +import { JsonObject } from '@kbn/common-utils'; export const parseFilterQuery = (filterQuery: string): JsonObject => { try { diff --git a/x-pack/plugins/task_manager/server/monitoring/capacity_estimation.ts b/x-pack/plugins/task_manager/server/monitoring/capacity_estimation.ts index 35eb0dfca7a6bc..073112f94e049b 100644 --- a/x-pack/plugins/task_manager/server/monitoring/capacity_estimation.ts +++ b/x-pack/plugins/task_manager/server/monitoring/capacity_estimation.ts @@ -7,7 +7,7 @@ import { mapValues } from 'lodash'; import stats from 'stats-lite'; -import { JsonObject } from 'src/plugins/kibana_utils/common'; +import { JsonObject } from '@kbn/common-utils'; import { RawMonitoringStats, RawMonitoredStat, HealthStatus } from './monitoring_stats_stream'; import { AveragedStat } from './task_run_calcultors'; import { TaskPersistenceTypes } from './task_run_statistics'; diff --git a/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.test.ts b/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.test.ts index 7e13e25457ed68..fdf60fe6dda2c3 100644 --- a/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.test.ts +++ b/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.test.ts @@ -9,7 +9,7 @@ import { TaskManagerConfig } from '../config'; import { of, Subject } from 'rxjs'; import { take, bufferCount } from 'rxjs/operators'; import { createMonitoringStatsStream, AggregatedStat } from './monitoring_stats_stream'; -import { JsonValue } from 'src/plugins/kibana_utils/common'; +import { JsonValue } from '@kbn/common-utils'; beforeEach(() => { jest.resetAllMocks(); diff --git a/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.ts b/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.ts index 8338bf3197162e..78511f5a94ca07 100644 --- a/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.ts +++ b/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.ts @@ -9,7 +9,7 @@ import { merge, of, Observable } from 'rxjs'; import { map, scan } from 'rxjs/operators'; import { set } from '@elastic/safer-lodash-set'; import { Logger } from 'src/core/server'; -import { JsonObject } from 'src/plugins/kibana_utils/common'; +import { JsonObject } from '@kbn/common-utils'; import { TaskStore } from '../task_store'; import { TaskPollingLifecycle } from '../polling_lifecycle'; import { diff --git a/x-pack/plugins/task_manager/server/monitoring/runtime_statistics_aggregator.ts b/x-pack/plugins/task_manager/server/monitoring/runtime_statistics_aggregator.ts index 0a6db350a88b9a..799ea054596c0a 100644 --- a/x-pack/plugins/task_manager/server/monitoring/runtime_statistics_aggregator.ts +++ b/x-pack/plugins/task_manager/server/monitoring/runtime_statistics_aggregator.ts @@ -6,7 +6,7 @@ */ import { Observable } from 'rxjs'; -import { JsonValue } from 'src/plugins/kibana_utils/common'; +import { JsonValue } from '@kbn/common-utils'; export interface AggregatedStat { key: string; diff --git a/x-pack/plugins/task_manager/server/monitoring/task_run_calcultors.ts b/x-pack/plugins/task_manager/server/monitoring/task_run_calcultors.ts index 4e2e689b71c88d..b0611437d87bec 100644 --- a/x-pack/plugins/task_manager/server/monitoring/task_run_calcultors.ts +++ b/x-pack/plugins/task_manager/server/monitoring/task_run_calcultors.ts @@ -6,7 +6,7 @@ */ import stats from 'stats-lite'; -import { JsonObject } from 'src/plugins/kibana_utils/common'; +import { JsonObject } from '@kbn/common-utils'; import { isUndefined, countBy, mapValues } from 'lodash'; export interface AveragedStat extends JsonObject { diff --git a/x-pack/plugins/task_manager/server/monitoring/task_run_statistics.ts b/x-pack/plugins/task_manager/server/monitoring/task_run_statistics.ts index eb6cb0796c33cc..b792f4ca475f93 100644 --- a/x-pack/plugins/task_manager/server/monitoring/task_run_statistics.ts +++ b/x-pack/plugins/task_manager/server/monitoring/task_run_statistics.ts @@ -7,7 +7,7 @@ import { combineLatest, Observable } from 'rxjs'; import { filter, startWith, map } from 'rxjs/operators'; -import { JsonObject, JsonValue } from 'src/plugins/kibana_utils/common'; +import { JsonObject, JsonValue } from '@kbn/common-utils'; import { isNumber, mapValues } from 'lodash'; import { AggregatedStatProvider, AggregatedStat } from './runtime_statistics_aggregator'; import { TaskLifecycleEvent } from '../polling_lifecycle'; diff --git a/x-pack/plugins/task_manager/server/monitoring/workload_statistics.ts b/x-pack/plugins/task_manager/server/monitoring/workload_statistics.ts index 669f6198325485..abd86be522f0cd 100644 --- a/x-pack/plugins/task_manager/server/monitoring/workload_statistics.ts +++ b/x-pack/plugins/task_manager/server/monitoring/workload_statistics.ts @@ -8,7 +8,7 @@ import { combineLatest, Observable, timer } from 'rxjs'; import { mergeMap, map, filter, switchMap, catchError } from 'rxjs/operators'; import { Logger } from 'src/core/server'; -import { JsonObject } from 'src/plugins/kibana_utils/common'; +import { JsonObject } from '@kbn/common-utils'; import { keyBy, mapValues } from 'lodash'; import { estypes } from '@elastic/elasticsearch'; import { AggregatedStatProvider } from './runtime_statistics_aggregator'; diff --git a/x-pack/plugins/task_manager/server/routes/health.ts b/x-pack/plugins/task_manager/server/routes/health.ts index cc2f6c6630e56d..0f43575d844816 100644 --- a/x-pack/plugins/task_manager/server/routes/health.ts +++ b/x-pack/plugins/task_manager/server/routes/health.ts @@ -16,7 +16,7 @@ import { Observable, Subject } from 'rxjs'; import { tap, map } from 'rxjs/operators'; import { throttleTime } from 'rxjs/operators'; import { isString } from 'lodash'; -import { JsonValue } from 'src/plugins/kibana_utils/common'; +import { JsonValue } from '@kbn/common-utils'; import { Logger, ServiceStatus, ServiceStatusLevels } from '../../../../../src/core/server'; import { MonitoringStats, diff --git a/x-pack/plugins/uptime/server/lib/alerts/status_check.ts b/x-pack/plugins/uptime/server/lib/alerts/status_check.ts index 6a69921a36671e..c5a6ef877c47a4 100644 --- a/x-pack/plugins/uptime/server/lib/alerts/status_check.ts +++ b/x-pack/plugins/uptime/server/lib/alerts/status_check.ts @@ -8,10 +8,10 @@ import { schema } from '@kbn/config-schema'; import { i18n } from '@kbn/i18n'; import Mustache from 'mustache'; +import { JsonObject } from '@kbn/common-utils'; import { ActionGroupIdsOf } from '../../../../alerting/common'; import { UptimeAlertTypeFactory } from './types'; import { esKuery } from '../../../../../../src/plugins/data/server'; -import { JsonObject } from '../../../../../../src/plugins/kibana_utils/common'; import { StatusCheckFilters, Ping, diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor_status.ts b/x-pack/plugins/uptime/server/lib/requests/get_monitor_status.ts index c126de27158cc1..07047bd0be7bc5 100644 --- a/x-pack/plugins/uptime/server/lib/requests/get_monitor_status.ts +++ b/x-pack/plugins/uptime/server/lib/requests/get_monitor_status.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { JsonObject } from 'src/plugins/kibana_utils/public'; +import { JsonObject } from '@kbn/common-utils'; import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types'; import { asMutableArray } from '../../../common/utils/as_mutable_array'; import { UMElasticsearchQueryFn } from '../adapters'; diff --git a/x-pack/test/apm_api_integration/tests/services/annotations.ts b/x-pack/test/apm_api_integration/tests/services/annotations.ts index 9a634c9bf82470..34eadbe3c609ce 100644 --- a/x-pack/test/apm_api_integration/tests/services/annotations.ts +++ b/x-pack/test/apm_api_integration/tests/services/annotations.ts @@ -7,7 +7,7 @@ import expect from '@kbn/expect'; import { merge, cloneDeep, isPlainObject } from 'lodash'; -import { JsonObject } from 'src/plugins/kibana_utils/common'; +import { JsonObject } from '@kbn/common-utils'; import { FtrProviderContext } from '../../common/ftr_provider_context'; import { registry } from '../../common/registry'; diff --git a/x-pack/test/observability_api_integration/basic/tests/annotations.ts b/x-pack/test/observability_api_integration/basic/tests/annotations.ts index 05bfba42dd59ca..4a2c7b68f612e9 100644 --- a/x-pack/test/observability_api_integration/basic/tests/annotations.ts +++ b/x-pack/test/observability_api_integration/basic/tests/annotations.ts @@ -6,7 +6,7 @@ */ import expect from '@kbn/expect'; -import { JsonObject } from 'src/plugins/kibana_utils/common'; +import { JsonObject } from '@kbn/common-utils'; import { FtrProviderContext } from '../../common/ftr_provider_context'; // eslint-disable-next-line import/no-default-export diff --git a/x-pack/test/observability_api_integration/trial/tests/annotations.ts b/x-pack/test/observability_api_integration/trial/tests/annotations.ts index 1ea3460060bc9f..b1ef717ddfd88b 100644 --- a/x-pack/test/observability_api_integration/trial/tests/annotations.ts +++ b/x-pack/test/observability_api_integration/trial/tests/annotations.ts @@ -6,7 +6,7 @@ */ import expect from '@kbn/expect'; -import { JsonObject } from 'src/plugins/kibana_utils/common'; +import { JsonObject } from '@kbn/common-utils'; import { Annotation } from '../../../../plugins/observability/common/annotations'; import { FtrProviderContext } from '../../common/ftr_provider_context'; diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/resolver/events.ts b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/events.ts index 073bc44e89e61f..b3aeb55eb38a12 100644 --- a/x-pack/test/security_solution_endpoint_api_int/apis/resolver/events.ts +++ b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/events.ts @@ -6,7 +6,7 @@ */ import expect from '@kbn/expect'; -import { JsonObject } from 'src/plugins/kibana_utils/common'; +import { JsonObject } from '@kbn/common-utils'; import { eventsIndexPattern } from '../../../../plugins/security_solution/common/endpoint/constants'; import { eventIDSafeVersion, diff --git a/yarn.lock b/yarn.lock index a9a81585000b5e..4316e5f638c379 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2620,6 +2620,10 @@ version "0.0.0" uid "" +"@kbn/common-utils@link:bazel-bin/packages/kbn-common-utils": + version "0.0.0" + uid "" + "@kbn/config-schema@link:bazel-bin/packages/kbn-config-schema": version "0.0.0" uid "" From c5e74d8241d645ccaf266bcb7d9c909a9c95b6df Mon Sep 17 00:00:00 2001 From: Madison Caldwell Date: Wed, 16 Jun 2021 11:35:07 -0400 Subject: [PATCH 18/46] [RAC][Security Solution] Pull Gap Remediation out of search_after_bulk_create (#102104) * Modify threshold rules to receive a single date range tuple * Modify threat match rules to receive a single date range tuple * Modify custom query rules to receive a single date range tuple * Fix up tests (partially) * Change log message to indicate single tuple instead of array * Bad test? * Prevent max_signals from being exceeded on threat match rule executions * Revert "Prevent max_signals from being exceeded on threat match rule executions" This reverts commit ba3b2f7a382ef7c369f02c7939e1495f72d92bfe. * Modify EQL rules to use date range tuple * Modify ML rules to use date range tuple * Fix ML/EQL tests * Use dateMath to parse moments in ML/Threshold tests * Add mocks for threshold test * Use dateMath for eql tests --- .../signals/executors/eql.test.ts | 10 +- .../detection_engine/signals/executors/eql.ts | 7 +- .../signals/executors/ml.test.ts | 12 +- .../detection_engine/signals/executors/ml.ts | 8 +- .../signals/executors/query.ts | 6 +- .../signals/executors/threat_match.ts | 6 +- .../signals/executors/threshold.test.ts | 25 +- .../signals/executors/threshold.ts | 160 ++++++------ .../signals/search_after_bulk_create.test.ts | 37 ++- .../signals/search_after_bulk_create.ts | 245 +++++++++--------- .../signals/signal_rule_alert_type.ts | 132 +++++----- .../threat_mapping/create_threat_signal.ts | 4 +- .../threat_mapping/create_threat_signals.ts | 4 +- .../signals/threat_mapping/types.ts | 4 +- .../lib/detection_engine/signals/types.ts | 4 +- 15 files changed, 352 insertions(+), 312 deletions(-) diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/eql.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/eql.test.ts index 947e7d573173ea..e7af3d484dfbd2 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/eql.test.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/eql.test.ts @@ -5,6 +5,7 @@ * 2.0. */ +import dateMath from '@elastic/datemath'; import { loggingSystemMock } from 'src/core/server/mocks'; import { alertsMock, AlertServicesMock } from '../../../../../../alerting/server/mocks'; import { eqlExecutor } from './eql'; @@ -23,6 +24,7 @@ describe('eql_executor', () => { let logger: ReturnType; let alertServices: AlertServicesMock; (getIndexVersion as jest.Mock).mockReturnValue(SIGNALS_TEMPLATE_VERSION); + const params = getEqlRuleParams(); const eqlSO = { id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd', type: 'alert', @@ -40,10 +42,15 @@ describe('eql_executor', () => { interval: '5m', }, throttle: 'no_actions', - params: getEqlRuleParams(), + params, }, references: [], }; + const tuple = { + from: dateMath.parse(params.from)!, + to: dateMath.parse(params.to)!, + maxSignals: params.maxSignals, + }; const searchAfterSize = 7; beforeEach(() => { @@ -64,6 +71,7 @@ describe('eql_executor', () => { const exceptionItems = [getExceptionListItemSchemaMock({ entries: [getEntryListMock()] })]; const response = await eqlExecutor({ rule: eqlSO, + tuple, exceptionItems, services: alertServices, version, diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/eql.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/eql.ts index 28d1f3e19baeed..a187b730696829 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/eql.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/eql.ts @@ -28,6 +28,7 @@ import { AlertAttributes, BulkCreate, EqlSignalSearchResponse, + RuleRangeTuple, SearchAfterAndBulkCreateReturnType, WrappedSignalHit, } from '../types'; @@ -35,6 +36,7 @@ import { createSearchAfterReturnType, makeFloatString, wrapSignal } from '../uti export const eqlExecutor = async ({ rule, + tuple, exceptionItems, services, version, @@ -43,6 +45,7 @@ export const eqlExecutor = async ({ bulkCreate, }: { rule: SavedObject>; + tuple: RuleRangeTuple; exceptionItems: ExceptionListItemSchema[]; services: AlertServices; version: string; @@ -81,8 +84,8 @@ export const eqlExecutor = async ({ const request = buildEqlSearchRequest( ruleParams.query, inputIndex, - ruleParams.from, - ruleParams.to, + tuple.from.toISOString(), + tuple.to.toISOString(), searchAfterSize, ruleParams.timestampOverride, exceptionItems, diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/ml.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/ml.test.ts index 25a9d2c3f510fe..89c1392cb67ba7 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/ml.test.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/ml.test.ts @@ -5,6 +5,7 @@ * 2.0. */ +import dateMath from '@elastic/datemath'; import { loggingSystemMock } from 'src/core/server/mocks'; import { alertsMock, AlertServicesMock } from '../../../../../../alerting/server/mocks'; import { mlExecutor } from './ml'; @@ -26,7 +27,13 @@ describe('ml_executor', () => { const exceptionItems = [getExceptionListItemSchemaMock()]; let logger: ReturnType; let alertServices: AlertServicesMock; - const mlSO = sampleRuleSO(getMlRuleParams()); + const params = getMlRuleParams(); + const mlSO = sampleRuleSO(params); + const tuple = { + from: dateMath.parse(params.from)!, + to: dateMath.parse(params.to)!, + maxSignals: params.maxSignals, + }; const buildRuleMessage = buildRuleMessageFactory({ id: mlSO.id, ruleId: mlSO.attributes.params.ruleId, @@ -60,6 +67,7 @@ describe('ml_executor', () => { await expect( mlExecutor({ rule: mlSO, + tuple, ml: undefined, exceptionItems, services: alertServices, @@ -76,6 +84,7 @@ describe('ml_executor', () => { jobsSummaryMock.mockResolvedValue([]); const response = await mlExecutor({ rule: mlSO, + tuple, ml: mlMock, exceptionItems, services: alertServices, @@ -101,6 +110,7 @@ describe('ml_executor', () => { const response = await mlExecutor({ rule: mlSO, + tuple, ml: mlMock, exceptionItems, services: alertServices, diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/ml.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/ml.ts index f5c7d8822b51f0..20c4cb16dadc8d 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/ml.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/ml.ts @@ -21,11 +21,12 @@ import { bulkCreateMlSignals } from '../bulk_create_ml_signals'; import { filterEventsAgainstList } from '../filters/filter_events_against_list'; import { findMlSignals } from '../find_ml_signals'; import { BuildRuleMessage } from '../rule_messages'; -import { AlertAttributes, BulkCreate, WrapHits } from '../types'; +import { AlertAttributes, BulkCreate, RuleRangeTuple, WrapHits } from '../types'; import { createErrorsFromShard, createSearchAfterReturnType, mergeReturns } from '../utils'; export const mlExecutor = async ({ rule, + tuple, ml, listClient, exceptionItems, @@ -36,6 +37,7 @@ export const mlExecutor = async ({ wrapHits, }: { rule: SavedObject>; + tuple: RuleRangeTuple; ml: SetupPlugins['ml']; listClient: ListClient; exceptionItems: ExceptionListItemSchema[]; @@ -88,8 +90,8 @@ export const mlExecutor = async ({ savedObjectsClient: services.savedObjectsClient, jobIds: ruleParams.machineLearningJobId, anomalyThreshold: ruleParams.anomalyThreshold, - from: ruleParams.from, - to: ruleParams.to, + from: tuple.from.toISOString(), + to: tuple.to.toISOString(), exceptionItems, }); diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/query.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/query.ts index 9d76a06afa2755..385c01c2f1cda1 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/query.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/query.ts @@ -24,7 +24,7 @@ import { QueryRuleParams, SavedQueryRuleParams } from '../../schemas/rule_schema export const queryExecutor = async ({ rule, - tuples, + tuple, listClient, exceptionItems, services, @@ -37,7 +37,7 @@ export const queryExecutor = async ({ wrapHits, }: { rule: SavedObject>; - tuples: RuleRangeTuple[]; + tuple: RuleRangeTuple; listClient: ListClient; exceptionItems: ExceptionListItemSchema[]; services: AlertServices; @@ -63,7 +63,7 @@ export const queryExecutor = async ({ }); return searchAfterAndBulkCreate({ - tuples, + tuple, listClient, exceptionsList: exceptionItems, ruleSO: rule, diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threat_match.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threat_match.ts index 078eb8362069cf..d0e22f696b222e 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threat_match.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threat_match.ts @@ -23,7 +23,7 @@ import { ThreatRuleParams } from '../../schemas/rule_schemas'; export const threatMatchExecutor = async ({ rule, - tuples, + tuple, listClient, exceptionItems, services, @@ -36,7 +36,7 @@ export const threatMatchExecutor = async ({ wrapHits, }: { rule: SavedObject>; - tuples: RuleRangeTuple[]; + tuple: RuleRangeTuple; listClient: ListClient; exceptionItems: ExceptionListItemSchema[]; services: AlertServices; @@ -51,7 +51,7 @@ export const threatMatchExecutor = async ({ const ruleParams = rule.attributes.params; const inputIndex = await getInputIndex(services, version, ruleParams.index); return createThreatSignals({ - tuples, + tuple, threatMapping: ruleParams.threatMapping, query: ruleParams.query, inputIndex, diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threshold.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threshold.test.ts index f03e8b8a147aea..3906c669222386 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threshold.test.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threshold.test.ts @@ -5,18 +5,23 @@ * 2.0. */ +import dateMath from '@elastic/datemath'; import { loggingSystemMock } from 'src/core/server/mocks'; +// eslint-disable-next-line @kbn/eslint/no-restricted-paths +import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks'; import { alertsMock, AlertServicesMock } from '../../../../../../alerting/server/mocks'; import { thresholdExecutor } from './threshold'; import { getExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/exception_list_item_schema.mock'; import { getEntryListMock } from '../../../../../../lists/common/schemas/types/entry_list.mock'; import { getThresholdRuleParams } from '../../schemas/rule_schemas.mock'; import { buildRuleMessageFactory } from '../rule_messages'; +import { sampleEmptyDocSearchResults } from '../__mocks__/es_results'; describe('threshold_executor', () => { const version = '8.0.0'; let logger: ReturnType; let alertServices: AlertServicesMock; + const params = getThresholdRuleParams(); const thresholdSO = { id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd', type: 'alert', @@ -34,10 +39,15 @@ describe('threshold_executor', () => { interval: '5m', }, throttle: 'no_actions', - params: getThresholdRuleParams(), + params, }, references: [], }; + const tuple = { + from: dateMath.parse(params.from)!, + to: dateMath.parse(params.to)!, + maxSignals: params.maxSignals, + }; const buildRuleMessage = buildRuleMessageFactory({ id: thresholdSO.id, ruleId: thresholdSO.attributes.params.ruleId, @@ -47,6 +57,9 @@ describe('threshold_executor', () => { beforeEach(() => { alertServices = alertsMock.createAlertServices(); + alertServices.scopedClusterClient.asCurrentUser.search.mockResolvedValue( + elasticsearchClientMock.createSuccessTransportRequestPromise(sampleEmptyDocSearchResults()) + ); logger = loggingSystemMock.createLogger(); }); @@ -55,14 +68,20 @@ describe('threshold_executor', () => { const exceptionItems = [getExceptionListItemSchemaMock({ entries: [getEntryListMock()] })]; const response = await thresholdExecutor({ rule: thresholdSO, - tuples: [], + tuple, exceptionItems, services: alertServices, version, logger, buildRuleMessage, startedAt: new Date(), - bulkCreate: jest.fn(), + bulkCreate: jest.fn().mockImplementation((hits) => ({ + errors: [], + success: true, + bulkCreateDuration: '0', + createdItemsCount: 0, + createdItems: [], + })), wrapHits: jest.fn(), }); expect(response.warningMessages.length).toEqual(1); diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threshold.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threshold.ts index 5e23128c9c148a..378d68fc13d2a9 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threshold.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threshold.ts @@ -39,7 +39,7 @@ import { BuildRuleMessage } from '../rule_messages'; export const thresholdExecutor = async ({ rule, - tuples, + tuple, exceptionItems, services, version, @@ -50,7 +50,7 @@ export const thresholdExecutor = async ({ wrapHits, }: { rule: SavedObject>; - tuples: RuleRangeTuple[]; + tuple: RuleRangeTuple; exceptionItems: ExceptionListItemSchema[]; services: AlertServices; version: string; @@ -70,90 +70,88 @@ export const thresholdExecutor = async ({ } const inputIndex = await getInputIndex(services, version, ruleParams.index); - for (const tuple of tuples) { - const { - thresholdSignalHistory, - searchErrors: previousSearchErrors, - } = await getThresholdSignalHistory({ - indexPattern: [ruleParams.outputIndex], - from: tuple.from.toISOString(), - to: tuple.to.toISOString(), - services, - logger, - ruleId: ruleParams.ruleId, - bucketByFields: ruleParams.threshold.field, - timestampOverride: ruleParams.timestampOverride, - buildRuleMessage, - }); + const { + thresholdSignalHistory, + searchErrors: previousSearchErrors, + } = await getThresholdSignalHistory({ + indexPattern: [ruleParams.outputIndex], + from: tuple.from.toISOString(), + to: tuple.to.toISOString(), + services, + logger, + ruleId: ruleParams.ruleId, + bucketByFields: ruleParams.threshold.field, + timestampOverride: ruleParams.timestampOverride, + buildRuleMessage, + }); - const bucketFilters = await getThresholdBucketFilters({ - thresholdSignalHistory, - timestampOverride: ruleParams.timestampOverride, - }); + const bucketFilters = await getThresholdBucketFilters({ + thresholdSignalHistory, + timestampOverride: ruleParams.timestampOverride, + }); + + const esFilter = await getFilter({ + type: ruleParams.type, + filters: ruleParams.filters ? ruleParams.filters.concat(bucketFilters) : bucketFilters, + language: ruleParams.language, + query: ruleParams.query, + savedId: ruleParams.savedId, + services, + index: inputIndex, + lists: exceptionItems, + }); + + const { + searchResult: thresholdResults, + searchErrors, + searchDuration: thresholdSearchDuration, + } = await findThresholdSignals({ + inputIndexPattern: inputIndex, + from: tuple.from.toISOString(), + to: tuple.to.toISOString(), + services, + logger, + filter: esFilter, + threshold: ruleParams.threshold, + timestampOverride: ruleParams.timestampOverride, + buildRuleMessage, + }); - const esFilter = await getFilter({ - type: ruleParams.type, - filters: ruleParams.filters ? ruleParams.filters.concat(bucketFilters) : bucketFilters, - language: ruleParams.language, - query: ruleParams.query, - savedId: ruleParams.savedId, - services, - index: inputIndex, - lists: exceptionItems, - }); + const { + success, + bulkCreateDuration, + createdItemsCount, + createdItems, + errors, + } = await bulkCreateThresholdSignals({ + someResult: thresholdResults, + ruleSO: rule, + filter: esFilter, + services, + logger, + inputIndexPattern: inputIndex, + signalsIndex: ruleParams.outputIndex, + startedAt, + from: tuple.from.toDate(), + thresholdSignalHistory, + bulkCreate, + wrapHits, + }); - const { + result = mergeReturns([ + result, + createSearchAfterReturnTypeFromResponse({ searchResult: thresholdResults, - searchErrors, - searchDuration: thresholdSearchDuration, - } = await findThresholdSignals({ - inputIndexPattern: inputIndex, - from: tuple.from.toISOString(), - to: tuple.to.toISOString(), - services, - logger, - filter: esFilter, - threshold: ruleParams.threshold, timestampOverride: ruleParams.timestampOverride, - buildRuleMessage, - }); - - const { + }), + createSearchAfterReturnType({ success, - bulkCreateDuration, - createdItemsCount, - createdItems, - errors, - } = await bulkCreateThresholdSignals({ - someResult: thresholdResults, - ruleSO: rule, - filter: esFilter, - services, - logger, - inputIndexPattern: inputIndex, - signalsIndex: ruleParams.outputIndex, - startedAt, - from: tuple.from.toDate(), - thresholdSignalHistory, - bulkCreate, - wrapHits, - }); - - result = mergeReturns([ - result, - createSearchAfterReturnTypeFromResponse({ - searchResult: thresholdResults, - timestampOverride: ruleParams.timestampOverride, - }), - createSearchAfterReturnType({ - success, - errors: [...errors, ...previousSearchErrors, ...searchErrors], - createdSignalsCount: createdItemsCount, - createdSignals: createdItems, - bulkCreateTimes: bulkCreateDuration ? [bulkCreateDuration] : [], - searchAfterTimes: [thresholdSearchDuration], - }), - ]); - } + errors: [...errors, ...previousSearchErrors, ...searchErrors], + createdSignalsCount: createdItemsCount, + createdSignals: createdItems, + bulkCreateTimes: bulkCreateDuration ? [bulkCreateDuration] : [], + searchAfterTimes: [thresholdSearchDuration], + }), + ]); return result; }; diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.test.ts index e4eb7e854f670f..184b49c2d6c7b9 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.test.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.test.ts @@ -44,14 +44,14 @@ describe('searchAfterAndBulkCreate', () => { const sampleParams = getQueryRuleParams(); const ruleSO = sampleRuleSO(getQueryRuleParams()); sampleParams.maxSignals = 30; - let tuples: RuleRangeTuple[]; + let tuple: RuleRangeTuple; beforeEach(() => { jest.clearAllMocks(); listClient = listMock.getListClient(); listClient.searchListItemByValues = jest.fn().mockResolvedValue([]); inputIndexPattern = ['auditbeat-*']; mockService = alertsMock.createAlertServices(); - ({ tuples } = getRuleRangeTuples({ + tuple = getRuleRangeTuples({ logger: mockLogger, previousStartedAt: new Date(), from: sampleParams.from, @@ -59,7 +59,7 @@ describe('searchAfterAndBulkCreate', () => { interval: '5m', maxSignals: sampleParams.maxSignals, buildRuleMessage, - })); + }).tuples[0]; bulkCreate = bulkCreateFactory( mockLogger, mockService.scopedClusterClient.asCurrentUser, @@ -174,7 +174,7 @@ describe('searchAfterAndBulkCreate', () => { ]; const { success, createdSignalsCount, lastLookBackDate } = await searchAfterAndBulkCreate({ - tuples, + tuple, ruleSO, listClient, exceptionsList: [exceptionItem], @@ -279,7 +279,7 @@ describe('searchAfterAndBulkCreate', () => { ]; const { success, createdSignalsCount, lastLookBackDate } = await searchAfterAndBulkCreate({ ruleSO, - tuples, + tuple, listClient, exceptionsList: [exceptionItem], services: mockService, @@ -357,7 +357,7 @@ describe('searchAfterAndBulkCreate', () => { ]; const { success, createdSignalsCount, lastLookBackDate } = await searchAfterAndBulkCreate({ ruleSO, - tuples, + tuple, listClient, exceptionsList: [exceptionItem], services: mockService, @@ -416,7 +416,7 @@ describe('searchAfterAndBulkCreate', () => { ]; const { success, createdSignalsCount, lastLookBackDate } = await searchAfterAndBulkCreate({ ruleSO, - tuples, + tuple, listClient, exceptionsList: [exceptionItem], services: mockService, @@ -495,7 +495,7 @@ describe('searchAfterAndBulkCreate', () => { const { success, createdSignalsCount, lastLookBackDate } = await searchAfterAndBulkCreate({ ruleSO, - tuples, + tuple, listClient, exceptionsList: [], services: mockService, @@ -550,7 +550,7 @@ describe('searchAfterAndBulkCreate', () => { ]; const { success, createdSignalsCount, lastLookBackDate } = await searchAfterAndBulkCreate({ ruleSO, - tuples, + tuple, listClient, exceptionsList: [exceptionItem], services: mockService, @@ -569,11 +569,6 @@ describe('searchAfterAndBulkCreate', () => { expect(mockService.scopedClusterClient.asCurrentUser.search).toHaveBeenCalledTimes(1); expect(createdSignalsCount).toEqual(0); // should not create any signals because all events were in the allowlist expect(lastLookBackDate).toEqual(new Date('2020-04-20T21:27:45+0000')); - // I don't like testing log statements since logs change but this is the best - // way I can think of to ensure this section is getting hit with this test case. - expect(((mockLogger.debug as unknown) as jest.Mock).mock.calls[7][0]).toContain( - 'ran out of sort ids to sort on name: "fake name" id: "fake id" rule id: "fake rule id" signals index: "fakeindex"' - ); }); test('should return success when no sortId present but search results are in the allowlist', async () => { @@ -627,7 +622,7 @@ describe('searchAfterAndBulkCreate', () => { ]; const { success, createdSignalsCount, lastLookBackDate } = await searchAfterAndBulkCreate({ ruleSO, - tuples, + tuple, listClient, exceptionsList: [exceptionItem], services: mockService, @@ -701,7 +696,7 @@ describe('searchAfterAndBulkCreate', () => { ); const { success, createdSignalsCount, lastLookBackDate } = await searchAfterAndBulkCreate({ ruleSO, - tuples, + tuple, listClient, exceptionsList: [], services: mockService, @@ -746,7 +741,7 @@ describe('searchAfterAndBulkCreate', () => { const { success, createdSignalsCount, lastLookBackDate } = await searchAfterAndBulkCreate({ listClient, exceptionsList: [exceptionItem], - tuples, + tuple, ruleSO, services: mockService, logger: mockLogger, @@ -793,7 +788,7 @@ describe('searchAfterAndBulkCreate', () => { const { success, createdSignalsCount, lastLookBackDate } = await searchAfterAndBulkCreate({ listClient, exceptionsList: [exceptionItem], - tuples, + tuple, ruleSO, services: mockService, logger: mockLogger, @@ -854,7 +849,7 @@ describe('searchAfterAndBulkCreate', () => { const { success, createdSignalsCount, lastLookBackDate } = await searchAfterAndBulkCreate({ listClient, exceptionsList: [exceptionItem], - tuples, + tuple, ruleSO, services: mockService, logger: mockLogger, @@ -979,7 +974,7 @@ describe('searchAfterAndBulkCreate', () => { errors, } = await searchAfterAndBulkCreate({ ruleSO, - tuples, + tuple, listClient, exceptionsList: [], services: mockService, @@ -1075,7 +1070,7 @@ describe('searchAfterAndBulkCreate', () => { const { success, createdSignalsCount, lastLookBackDate } = await searchAfterAndBulkCreate({ enrichment: mockEnrichment, ruleSO, - tuples, + tuple, listClient, exceptionsList: [], services: mockService, diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.ts index bb2e57b0606e59..eb4af0c38ce254 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.ts @@ -23,7 +23,7 @@ import { SearchAfterAndBulkCreateParams, SearchAfterAndBulkCreateReturnType } fr // search_after through documents and re-index using bulk endpoint. export const searchAfterAndBulkCreate = async ({ - tuples: totalToFromTuples, + tuple, ruleSO, exceptionsList, services, @@ -49,150 +49,143 @@ export const searchAfterAndBulkCreate = async ({ // to ensure we don't exceed maxSignals let signalsCreatedCount = 0; - const tuplesToBeLogged = [...totalToFromTuples]; - logger.debug(buildRuleMessage(`totalToFromTuples: ${totalToFromTuples.length}`)); - - while (totalToFromTuples.length > 0) { - const tuple = totalToFromTuples.pop(); - if (tuple == null || tuple.to == null || tuple.from == null) { - logger.error(buildRuleMessage(`[-] malformed date tuple`)); - return createSearchAfterReturnType({ - success: false, - errors: ['malformed date tuple'], - }); - } - signalsCreatedCount = 0; - while (signalsCreatedCount < tuple.maxSignals) { - try { - let mergedSearchResults = createSearchResultReturnType(); - logger.debug(buildRuleMessage(`sortIds: ${sortIds}`)); + if (tuple == null || tuple.to == null || tuple.from == null) { + logger.error(buildRuleMessage(`[-] malformed date tuple`)); + return createSearchAfterReturnType({ + success: false, + errors: ['malformed date tuple'], + }); + } + signalsCreatedCount = 0; + while (signalsCreatedCount < tuple.maxSignals) { + try { + let mergedSearchResults = createSearchResultReturnType(); + logger.debug(buildRuleMessage(`sortIds: ${sortIds}`)); - if (hasSortId) { - const { searchResult, searchDuration, searchErrors } = await singleSearchAfter({ - buildRuleMessage, - searchAfterSortIds: sortIds, - index: inputIndexPattern, - from: tuple.from.toISOString(), - to: tuple.to.toISOString(), - services, - logger, - // @ts-expect-error please, declare a type explicitly instead of unknown - filter, - pageSize: Math.ceil(Math.min(tuple.maxSignals, pageSize)), + if (hasSortId) { + const { searchResult, searchDuration, searchErrors } = await singleSearchAfter({ + buildRuleMessage, + searchAfterSortIds: sortIds, + index: inputIndexPattern, + from: tuple.from.toISOString(), + to: tuple.to.toISOString(), + services, + logger, + // @ts-expect-error please, declare a type explicitly instead of unknown + filter, + pageSize: Math.ceil(Math.min(tuple.maxSignals, pageSize)), + timestampOverride: ruleParams.timestampOverride, + }); + mergedSearchResults = mergeSearchResults([mergedSearchResults, searchResult]); + toReturn = mergeReturns([ + toReturn, + createSearchAfterReturnTypeFromResponse({ + searchResult: mergedSearchResults, timestampOverride: ruleParams.timestampOverride, - }); - mergedSearchResults = mergeSearchResults([mergedSearchResults, searchResult]); - toReturn = mergeReturns([ - toReturn, - createSearchAfterReturnTypeFromResponse({ - searchResult: mergedSearchResults, - timestampOverride: ruleParams.timestampOverride, - }), - createSearchAfterReturnType({ - searchAfterTimes: [searchDuration], - errors: searchErrors, - }), - ]); + }), + createSearchAfterReturnType({ + searchAfterTimes: [searchDuration], + errors: searchErrors, + }), + ]); - const lastSortIds = getSafeSortIds( - searchResult.hits.hits[searchResult.hits.hits.length - 1]?.sort - ); - if (lastSortIds != null && lastSortIds.length !== 0) { - sortIds = lastSortIds; - hasSortId = true; - } else { - hasSortId = false; - } + const lastSortIds = getSafeSortIds( + searchResult.hits.hits[searchResult.hits.hits.length - 1]?.sort + ); + if (lastSortIds != null && lastSortIds.length !== 0) { + sortIds = lastSortIds; + hasSortId = true; + } else { + hasSortId = false; } + } + + // determine if there are any candidate signals to be processed + const totalHits = createTotalHitsFromSearchResult({ searchResult: mergedSearchResults }); + logger.debug(buildRuleMessage(`totalHits: ${totalHits}`)); + logger.debug( + buildRuleMessage(`searchResult.hit.hits.length: ${mergedSearchResults.hits.hits.length}`) + ); - // determine if there are any candidate signals to be processed - const totalHits = createTotalHitsFromSearchResult({ searchResult: mergedSearchResults }); - logger.debug(buildRuleMessage(`totalHits: ${totalHits}`)); + if (totalHits === 0 || mergedSearchResults.hits.hits.length === 0) { logger.debug( - buildRuleMessage(`searchResult.hit.hits.length: ${mergedSearchResults.hits.hits.length}`) + buildRuleMessage( + `${ + totalHits === 0 ? 'totalHits' : 'searchResult.hits.hits.length' + } was 0, exiting early` + ) ); + break; + } - if (totalHits === 0 || mergedSearchResults.hits.hits.length === 0) { - logger.debug( - buildRuleMessage( - `${ - totalHits === 0 ? 'totalHits' : 'searchResult.hits.hits.length' - } was 0, exiting and moving on to next tuple` - ) - ); - break; - } - - // filter out the search results that match with the values found in the list. - // the resulting set are signals to be indexed, given they are not duplicates - // of signals already present in the signals index. - const filteredEvents = await filterEventsAgainstList({ - listClient, - exceptionsList, - logger, - eventSearchResult: mergedSearchResults, - buildRuleMessage, - }); - - // only bulk create if there are filteredEvents leftover - // if there isn't anything after going through the value list filter - // skip the call to bulk create and proceed to the next search_after, - // if there is a sort id to continue the search_after with. - if (filteredEvents.hits.hits.length !== 0) { - // make sure we are not going to create more signals than maxSignals allows - if (signalsCreatedCount + filteredEvents.hits.hits.length > tuple.maxSignals) { - filteredEvents.hits.hits = filteredEvents.hits.hits.slice( - 0, - tuple.maxSignals - signalsCreatedCount - ); - } - const enrichedEvents = await enrichment(filteredEvents); - const wrappedDocs = wrapHits(enrichedEvents.hits.hits); + // filter out the search results that match with the values found in the list. + // the resulting set are signals to be indexed, given they are not duplicates + // of signals already present in the signals index. + const filteredEvents = await filterEventsAgainstList({ + listClient, + exceptionsList, + logger, + eventSearchResult: mergedSearchResults, + buildRuleMessage, + }); - const { - bulkCreateDuration: bulkDuration, - createdItemsCount: createdCount, - createdItems, - success: bulkSuccess, - errors: bulkErrors, - } = await bulkCreate(wrappedDocs); - toReturn = mergeReturns([ - toReturn, - createSearchAfterReturnType({ - success: bulkSuccess, - createdSignalsCount: createdCount, - createdSignals: createdItems, - bulkCreateTimes: bulkDuration ? [bulkDuration] : undefined, - errors: bulkErrors, - }), - ]); - signalsCreatedCount += createdCount; - logger.debug(buildRuleMessage(`created ${createdCount} signals`)); - logger.debug(buildRuleMessage(`signalsCreatedCount: ${signalsCreatedCount}`)); - logger.debug( - buildRuleMessage(`enrichedEvents.hits.hits: ${enrichedEvents.hits.hits.length}`) + // only bulk create if there are filteredEvents leftover + // if there isn't anything after going through the value list filter + // skip the call to bulk create and proceed to the next search_after, + // if there is a sort id to continue the search_after with. + if (filteredEvents.hits.hits.length !== 0) { + // make sure we are not going to create more signals than maxSignals allows + if (signalsCreatedCount + filteredEvents.hits.hits.length > tuple.maxSignals) { + filteredEvents.hits.hits = filteredEvents.hits.hits.slice( + 0, + tuple.maxSignals - signalsCreatedCount ); - - sendAlertTelemetryEvents(logger, eventsTelemetry, enrichedEvents, buildRuleMessage); } + const enrichedEvents = await enrichment(filteredEvents); + const wrappedDocs = wrapHits(enrichedEvents.hits.hits); - if (!hasSortId) { - logger.debug(buildRuleMessage('ran out of sort ids to sort on')); - break; - } - } catch (exc: unknown) { - logger.error(buildRuleMessage(`[-] search_after and bulk threw an error ${exc}`)); - return mergeReturns([ + const { + bulkCreateDuration: bulkDuration, + createdItemsCount: createdCount, + createdItems, + success: bulkSuccess, + errors: bulkErrors, + } = await bulkCreate(wrappedDocs); + toReturn = mergeReturns([ toReturn, createSearchAfterReturnType({ - success: false, - errors: [`${exc}`], + success: bulkSuccess, + createdSignalsCount: createdCount, + createdSignals: createdItems, + bulkCreateTimes: bulkDuration ? [bulkDuration] : undefined, + errors: bulkErrors, }), ]); + signalsCreatedCount += createdCount; + logger.debug(buildRuleMessage(`created ${createdCount} signals`)); + logger.debug(buildRuleMessage(`signalsCreatedCount: ${signalsCreatedCount}`)); + logger.debug( + buildRuleMessage(`enrichedEvents.hits.hits: ${enrichedEvents.hits.hits.length}`) + ); + + sendAlertTelemetryEvents(logger, eventsTelemetry, enrichedEvents, buildRuleMessage); + } + + if (!hasSortId) { + logger.debug(buildRuleMessage('ran out of sort ids to sort on')); + break; } + } catch (exc: unknown) { + logger.error(buildRuleMessage(`[-] search_after and bulk threw an error ${exc}`)); + return mergeReturns([ + toReturn, + createSearchAfterReturnType({ + success: false, + errors: [`${exc}`], + }), + ]); } } logger.debug(buildRuleMessage(`[+] completed bulk index of ${toReturn.createdSignalsCount}`)); - toReturn.totalToFromTuples = tuplesToBeLogged; return toReturn; }; diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.ts index 0a2e22bc44b60e..bb1e50c14d4014 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.ts @@ -235,74 +235,86 @@ export const signalRulesAlertType = ({ if (isMlRule(type)) { const mlRuleSO = asTypeSpecificSO(savedObject, machineLearningRuleParams); - result = await mlExecutor({ - rule: mlRuleSO, - ml, - listClient, - exceptionItems, - services, - logger, - buildRuleMessage, - bulkCreate, - wrapHits, - }); + for (const tuple of tuples) { + result = await mlExecutor({ + rule: mlRuleSO, + tuple, + ml, + listClient, + exceptionItems, + services, + logger, + buildRuleMessage, + bulkCreate, + wrapHits, + }); + } } else if (isThresholdRule(type)) { const thresholdRuleSO = asTypeSpecificSO(savedObject, thresholdRuleParams); - result = await thresholdExecutor({ - rule: thresholdRuleSO, - tuples, - exceptionItems, - services, - version, - logger, - buildRuleMessage, - startedAt, - bulkCreate, - wrapHits, - }); + for (const tuple of tuples) { + result = await thresholdExecutor({ + rule: thresholdRuleSO, + tuple, + exceptionItems, + services, + version, + logger, + buildRuleMessage, + startedAt, + bulkCreate, + wrapHits, + }); + } } else if (isThreatMatchRule(type)) { const threatRuleSO = asTypeSpecificSO(savedObject, threatRuleParams); - result = await threatMatchExecutor({ - rule: threatRuleSO, - tuples, - listClient, - exceptionItems, - services, - version, - searchAfterSize, - logger, - eventsTelemetry, - buildRuleMessage, - bulkCreate, - wrapHits, - }); + for (const tuple of tuples) { + result = await threatMatchExecutor({ + rule: threatRuleSO, + tuple, + listClient, + exceptionItems, + services, + version, + searchAfterSize, + logger, + eventsTelemetry, + buildRuleMessage, + bulkCreate, + wrapHits, + }); + } } else if (isQueryRule(type)) { const queryRuleSO = validateQueryRuleTypes(savedObject); - result = await queryExecutor({ - rule: queryRuleSO, - tuples, - listClient, - exceptionItems, - services, - version, - searchAfterSize, - logger, - eventsTelemetry, - buildRuleMessage, - bulkCreate, - wrapHits, - }); + for (const tuple of tuples) { + result = await queryExecutor({ + rule: queryRuleSO, + tuple, + listClient, + exceptionItems, + services, + version, + searchAfterSize, + logger, + eventsTelemetry, + buildRuleMessage, + bulkCreate, + wrapHits, + }); + } } else if (isEqlRule(type)) { const eqlRuleSO = asTypeSpecificSO(savedObject, eqlRuleParams); - result = await eqlExecutor({ - rule: eqlRuleSO, - exceptionItems, - services, - version, - searchAfterSize, - bulkCreate, - logger, - }); + for (const tuple of tuples) { + result = await eqlExecutor({ + rule: eqlRuleSO, + tuple, + exceptionItems, + services, + version, + searchAfterSize, + bulkCreate, + logger, + }); + } } else { throw new Error(`unknown rule type ${type}`); } diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/create_threat_signal.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/create_threat_signal.ts index 3e30a08f1ae69c..806f5e47608e40 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/create_threat_signal.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/create_threat_signal.ts @@ -13,7 +13,7 @@ import { CreateThreatSignalOptions } from './types'; import { SearchAfterAndBulkCreateReturnType } from '../types'; export const createThreatSignal = async ({ - tuples, + tuple, threatMapping, threatEnrichment, query, @@ -70,7 +70,7 @@ export const createThreatSignal = async ({ ); const result = await searchAfterAndBulkCreate({ - tuples, + tuple, listClient, exceptionsList: exceptionItems, ruleSO, 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 5054ab1b2cca50..169a820392a6e6 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 @@ -15,7 +15,7 @@ import { combineConcurrentResults } from './utils'; import { buildThreatEnrichment } from './build_threat_enrichment'; export const createThreatSignals = async ({ - tuples, + tuple, threatMapping, query, inputIndex, @@ -104,7 +104,7 @@ export const createThreatSignals = async ({ const concurrentSearchesPerformed = chunks.map>( (slicedChunk) => createThreatSignal({ - tuples, + tuple, threatEnrichment, threatMapping, query, diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/types.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/types.ts index 34b064b0f88053..ded79fc647ac41 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/types.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/types.ts @@ -40,7 +40,7 @@ import { ThreatRuleParams } from '../../schemas/rule_schemas'; export type SortOrderOrUndefined = 'asc' | 'desc' | undefined; export interface CreateThreatSignalsOptions { - tuples: RuleRangeTuple[]; + tuple: RuleRangeTuple; threatMapping: ThreatMapping; query: string; inputIndex: string[]; @@ -70,7 +70,7 @@ export interface CreateThreatSignalsOptions { } export interface CreateThreatSignalOptions { - tuples: RuleRangeTuple[]; + tuple: RuleRangeTuple; threatMapping: ThreatMapping; threatEnrichment: SignalsEnrichment; query: string; 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 c35eb04ba12707..8a6ce91b2575ab 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 @@ -262,11 +262,11 @@ export type WrapHits = ( ) => Array>; export interface SearchAfterAndBulkCreateParams { - tuples: Array<{ + tuple: { to: moment.Moment; from: moment.Moment; maxSignals: number; - }>; + }; ruleSO: SavedObject; services: AlertServices; listClient: ListClient; From 973d0578461a8823eb529b38ee7a5edc427b93a0 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Wed, 16 Jun 2021 18:01:53 +0200 Subject: [PATCH 19/46] Upgrade normalize-url from v4.5.0 to v4.5.1 (#102291) --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 4316e5f638c379..353527731cb04e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -20304,9 +20304,9 @@ normalize-url@^3.0.0: integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== normalize-url@^4.1.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129" - integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ== + version "4.5.1" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" + integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA== now-and-later@^2.0.0: version "2.0.0" From d2e81ee785df812135faf775e14f7aaaf58eb901 Mon Sep 17 00:00:00 2001 From: John Dorlus Date: Wed, 16 Jun 2021 12:07:50 -0400 Subject: [PATCH 20/46] CIT for circle processor (renewed PR) (#102277) * Added CITs for Circle processor. * Fixed issue with form function using int instead of string. * Added changed per nits. Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../__jest__/processors/circle.test.tsx | 114 ++++++++++++++++++ .../__jest__/processors/processor.helpers.tsx | 2 + .../processor_form/processors/circle.tsx | 2 + 3 files changed, 118 insertions(+) create mode 100644 x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/circle.test.tsx diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/circle.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/circle.test.tsx new file mode 100644 index 00000000000000..e29bb2ac6e92ec --- /dev/null +++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/circle.test.tsx @@ -0,0 +1,114 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { act } from 'react-dom/test-utils'; +import { setup, SetupResult, getProcessorValue } from './processor.helpers'; + +const CIRCLE_TYPE = 'circle'; + +describe('Processor: Circle', () => { + let onUpdate: jest.Mock; + let testBed: SetupResult; + + beforeAll(() => { + jest.useFakeTimers(); + }); + + afterAll(() => { + jest.useRealTimers(); + }); + + beforeEach(async () => { + onUpdate = jest.fn(); + + await act(async () => { + testBed = await setup({ + value: { + processors: [], + }, + onFlyoutOpen: jest.fn(), + onUpdate, + }); + }); + testBed.component.update(); + const { + actions: { addProcessor, addProcessorType }, + } = testBed; + // Open the processor flyout + addProcessor(); + + // Add type (the other fields are not visible until a type is selected) + await addProcessorType(CIRCLE_TYPE); + }); + + test('prevents form submission if required fields are not provided', async () => { + const { + actions: { saveNewProcessor }, + form, + } = testBed; + + // Click submit button with only the type defined + await saveNewProcessor(); + + // Expect form error as "field" and "shape_type" are required parameters + expect(form.getErrorsMessages()).toEqual([ + 'A field value is required.', + 'A shape type value is required.', + ]); + }); + + test('saves with required parameter values', async () => { + const { + actions: { saveNewProcessor }, + form, + } = testBed; + + // Add "field" value (required) + form.setInputValue('fieldNameField.input', 'field_1'); + // Save the field + form.setSelectValue('shapeSelectorField', 'shape'); + // Set the error distance + form.setInputValue('errorDistanceField.input', '10'); + + await saveNewProcessor(); + + const processors = getProcessorValue(onUpdate, CIRCLE_TYPE); + + expect(processors[0].circle).toEqual({ + field: 'field_1', + error_distance: 10, + shape_type: 'shape', + }); + }); + + test('allows optional parameters to be set', async () => { + const { + actions: { saveNewProcessor }, + form, + } = testBed; + + // Add "field" value (required) + form.setInputValue('fieldNameField.input', 'field_1'); + // Select the shape + form.setSelectValue('shapeSelectorField', 'geo_shape'); + // Add "target_field" value + form.setInputValue('targetField.input', 'target_field'); + + form.setInputValue('errorDistanceField.input', '10'); + + // Save the field with new changes + await saveNewProcessor(); + + const processors = getProcessorValue(onUpdate, CIRCLE_TYPE); + expect(processors[0].circle).toEqual({ + field: 'field_1', + error_distance: 10, + shape_type: 'geo_shape', + target_field: 'target_field', + }); + }); +}); diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/processor.helpers.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/processor.helpers.tsx index c00f09b2d2b06c..15e8c323b1308e 100644 --- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/processor.helpers.tsx +++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/processor.helpers.tsx @@ -151,6 +151,8 @@ type TestSubject = | 'keepOriginalField.input' | 'removeIfSuccessfulField.input' | 'targetFieldsField.input' + | 'shapeSelectorField' + | 'errorDistanceField.input' | 'separatorValueField.input' | 'quoteValueField.input' | 'emptyValueField.input' diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/circle.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/circle.tsx index acb480df6d35f0..74a7f37d841aee 100644 --- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/circle.tsx +++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/circle.tsx @@ -97,6 +97,7 @@ export const Circle: FunctionComponent = () => { /> { Date: Wed, 16 Jun 2021 12:42:15 -0400 Subject: [PATCH 21/46] Fix 7.13 aggregation reference issue (#102256) --- docs/user/dashboard/aggregation-reference.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user/dashboard/aggregation-reference.asciidoc b/docs/user/dashboard/aggregation-reference.asciidoc index 001114578a1cd0..cb5c484def3b9d 100644 --- a/docs/user/dashboard/aggregation-reference.asciidoc +++ b/docs/user/dashboard/aggregation-reference.asciidoc @@ -190,8 +190,8 @@ For information about {es} metrics aggregations, refer to {ref}/search-aggregati | Metrics with filters | -^| X | +^| X | | Average From dbe3ca97082b62247098ec59a78cb129f05250c4 Mon Sep 17 00:00:00 2001 From: Nick Partridge Date: Wed, 16 Jun 2021 12:05:56 -0500 Subject: [PATCH 22/46] Add auto-backport by default to ech renovate bot prs (#102208) --- renovate.json5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json5 b/renovate.json5 index f533eac4796508..2a3b9d740ee93b 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -39,7 +39,7 @@ packageNames: ['@elastic/charts'], reviewers: ['markov00', 'nickofthyme'], matchBaseBranches: ['master'], - labels: ['release_note:skip', 'v8.0.0', 'v7.14.0'], + labels: ['release_note:skip', 'v8.0.0', 'v7.14.0', 'auto-backport'], enabled: true, }, { From c8256d57bdf23de5354b178e418b8e6694851c64 Mon Sep 17 00:00:00 2001 From: spalger Date: Wed, 16 Jun 2021 10:07:21 -0700 Subject: [PATCH 23/46] skip flaky suite (#101984) --- x-pack/test/functional_with_es_ssl/apps/uptime/alert_flyout.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x-pack/test/functional_with_es_ssl/apps/uptime/alert_flyout.ts b/x-pack/test/functional_with_es_ssl/apps/uptime/alert_flyout.ts index 7d235d9e181082..bbd212b61e4394 100644 --- a/x-pack/test/functional_with_es_ssl/apps/uptime/alert_flyout.ts +++ b/x-pack/test/functional_with_es_ssl/apps/uptime/alert_flyout.ts @@ -11,7 +11,8 @@ import { delay } from 'bluebird'; import { FtrProviderContext } from '../../ftr_provider_context'; export default ({ getPageObjects, getService }: FtrProviderContext) => { - describe('uptime alerts', () => { + // FLAKY: https://github.com/elastic/kibana/issues/101984 + describe.skip('uptime alerts', () => { const pageObjects = getPageObjects(['common', 'uptime']); const supertest = getService('supertest'); const retry = getService('retry'); From f4e0895b173faf6c0878b82182265697d79ab481 Mon Sep 17 00:00:00 2001 From: spalger Date: Wed, 16 Jun 2021 10:10:38 -0700 Subject: [PATCH 24/46] skip flaky suite (#100296) --- .../security_solution_endpoint/apps/endpoint/policy_details.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts index 44348d1ad0d9c4..e01a24d2ea8d54 100644 --- a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts +++ b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts @@ -21,7 +21,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { const testSubjects = getService('testSubjects'); const policyTestResources = getService('policyTestResources'); - describe('When on the Endpoint Policy Details Page', function () { + // FLAKY: https://github.com/elastic/kibana/issues/100296 + describe.skip('When on the Endpoint Policy Details Page', function () { describe('with an invalid policy id', () => { it('should display an error', async () => { await pageObjects.policy.navigateToPolicyDetails('invalid-id'); From 3e723045a048ea692c3f1e01700096a3983291b1 Mon Sep 17 00:00:00 2001 From: spalger Date: Wed, 16 Jun 2021 10:14:04 -0700 Subject: [PATCH 25/46] remove nested skip (#100296) --- .../security_solution_endpoint/apps/endpoint/policy_details.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts index e01a24d2ea8d54..ae60935013d272 100644 --- a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts +++ b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts @@ -757,8 +757,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { }); }); - // FLAKY: https://github.com/elastic/kibana/issues/100296 - describe.skip('when on Ingest Policy Edit Package Policy page', async () => { + describe('when on Ingest Policy Edit Package Policy page', async () => { let policyInfo: PolicyTestResourceInfo; beforeEach(async () => { // Create a policy and navigate to Ingest app From 4a941565502547f96bab72786e1ac11f61f19558 Mon Sep 17 00:00:00 2001 From: Kyle Pollich Date: Wed, 16 Jun 2021 13:29:38 -0400 Subject: [PATCH 26/46] [Fleet + Integrations UI] Migrate Fleet UI to new tabbed layout (#101828) * WIP: Migrate fleet to new page layout system * Add 'Add Agent' button to agents table * Fix flyout import in search and filter bar * Place settings/feedback in header * Move actions to top nav * Fix i18n + types + unit test failures * Remove unused props in DefaultLayout * Fix background height in Fleet layout This is fixed through a hack for now, because Kibana's layout doesn't allow apps to flex the top-level wrapper via `flex: 1`. The same behavior reported in the original issue (#101781) is present in all other Kibana apps. Fixes #101781 * Use euiHeaderHeightCompensation for min-height calc * Move settings portal to app component * Fix agent details URL in failing unit test * Remove unreferenced overview files + update functional tests * Remove unneeded fragment * Remove beta badges in Fleet + Integrations Fixes #100731 * Fix i18n * Fix page path reference * Fix failing tests * Re-fix i18n post merge Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- x-pack/plugins/fleet/kibana.json | 10 +- .../fleet/public/applications/fleet/app.tsx | 129 +++++++---- .../fleet/hooks/use_breadcrumbs.tsx | 33 +-- .../fleet/public/applications/fleet/index.tsx | 7 +- .../applications/fleet/layouts/default.tsx | 207 +++++++----------- .../fleet/sections/agent_policy/index.tsx | 6 +- .../sections/agent_policy/list_page/index.tsx | 37 +--- .../agent_details_integrations.tsx | 2 +- .../agents/agent_details_page/index.tsx | 17 +- .../components/search_and_filter_bar.tsx | 24 +- .../sections/agents/agent_list_page/index.tsx | 6 +- .../agents/components/list_layout.tsx | 101 --------- .../enrollment_token_list_page/index.tsx | 7 +- .../fleet/sections/agents/index.tsx | 28 +-- .../fleet/sections/data_stream/index.tsx | 5 +- .../sections/data_stream/list_page/index.tsx | 207 ++++++++---------- .../applications/fleet/sections/index.tsx | 5 +- .../components/agent_policy_section.tsx | 78 ------- .../overview/components/agent_section.tsx | 87 -------- .../components/datastream_section.tsx | 99 --------- .../components/integration_section.tsx | 88 -------- .../overview/components/overview_panel.tsx | 74 ------- .../overview/components/overview_stats.tsx | 24 -- .../fleet/sections/overview/index.tsx | 110 ---------- .../integrations/layouts/default.tsx | 11 +- .../managed_instructions.tsx | 2 +- .../public/components/linked_agent_count.tsx | 2 +- .../fleet/public/constants/page_paths.ts | 38 ++-- .../fleet/public/layouts/without_header.tsx | 7 + .../fleet/public/mock/plugin_dependencies.ts | 2 + x-pack/plugins/fleet/public/plugin.ts | 3 + .../action_results/action_results_summary.tsx | 2 +- .../osquery/public/results/results_table.tsx | 2 +- .../view/hooks/use_endpoint_action_items.tsx | 8 +- .../pages/endpoint_hosts/view/index.test.tsx | 4 +- .../pages/endpoint_hosts/view/index.tsx | 4 +- .../endpoint/routes/actions/isolation.ts | 4 +- .../translations/translations/ja-JP.json | 38 ---- .../translations/translations/zh-CN.json | 38 ---- .../apps/fleet/agents_page.ts | 38 ++++ .../test/fleet_functional/apps/fleet/index.ts | 2 +- .../apps/fleet/overview_page.ts | 38 ---- .../{overview_page.ts => agents_page.ts} | 23 +- .../fleet_functional/page_objects/index.ts | 4 +- 44 files changed, 421 insertions(+), 1240 deletions(-) delete mode 100644 x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/list_layout.tsx delete mode 100644 x-pack/plugins/fleet/public/applications/fleet/sections/overview/components/agent_policy_section.tsx delete mode 100644 x-pack/plugins/fleet/public/applications/fleet/sections/overview/components/agent_section.tsx delete mode 100644 x-pack/plugins/fleet/public/applications/fleet/sections/overview/components/datastream_section.tsx delete mode 100644 x-pack/plugins/fleet/public/applications/fleet/sections/overview/components/integration_section.tsx delete mode 100644 x-pack/plugins/fleet/public/applications/fleet/sections/overview/components/overview_panel.tsx delete mode 100644 x-pack/plugins/fleet/public/applications/fleet/sections/overview/components/overview_stats.tsx delete mode 100644 x-pack/plugins/fleet/public/applications/fleet/sections/overview/index.tsx create mode 100644 x-pack/test/fleet_functional/apps/fleet/agents_page.ts delete mode 100644 x-pack/test/fleet_functional/apps/fleet/overview_page.ts rename x-pack/test/fleet_functional/page_objects/{overview_page.ts => agents_page.ts} (55%) diff --git a/x-pack/plugins/fleet/kibana.json b/x-pack/plugins/fleet/kibana.json index 4a4019e3e9e47f..ca1407be2008a1 100644 --- a/x-pack/plugins/fleet/kibana.json +++ b/x-pack/plugins/fleet/kibana.json @@ -4,14 +4,8 @@ "server": true, "ui": true, "configPath": ["xpack", "fleet"], - "requiredPlugins": ["licensing", "data", "encryptedSavedObjects"], - "optionalPlugins": [ - "security", - "features", - "cloud", - "usageCollection", - "home" - ], + "requiredPlugins": ["licensing", "data", "encryptedSavedObjects", "navigation"], + "optionalPlugins": ["security", "features", "cloud", "usageCollection", "home"], "extraPublicDirs": ["common"], "requiredBundles": ["kibanaReact", "esUiShared", "home", "infra", "kibanaUtils"] } diff --git a/x-pack/plugins/fleet/public/applications/fleet/app.tsx b/x-pack/plugins/fleet/public/applications/fleet/app.tsx index 1398e121c68700..1072a6b66419eb 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/app.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/app.tsx @@ -7,7 +7,7 @@ import React, { memo, useEffect, useState } from 'react'; import type { AppMountParameters } from 'kibana/public'; -import { EuiCode, EuiEmptyPrompt, EuiErrorBoundary, EuiPanel } from '@elastic/eui'; +import { EuiCode, EuiEmptyPrompt, EuiErrorBoundary, EuiPanel, EuiPortal } from '@elastic/eui'; import type { History } from 'history'; import { createHashHistory } from 'history'; import { Router, Redirect, Route, Switch } from 'react-router-dom'; @@ -16,11 +16,13 @@ import { i18n } from '@kbn/i18n'; import styled from 'styled-components'; import useObservable from 'react-use/lib/useObservable'; +import type { TopNavMenuData } from 'src/plugins/navigation/public'; + import type { FleetConfigType, FleetStartServices } from '../../plugin'; import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public'; import { EuiThemeProvider } from '../../../../../../src/plugins/kibana_react/common'; -import { PackageInstallProvider } from '../integrations/hooks'; +import { PackageInstallProvider, useUrlModal } from '../integrations/hooks'; import { ConfigContext, @@ -30,25 +32,25 @@ import { sendGetPermissionsCheck, sendSetup, useBreadcrumbs, - useConfig, useStartServices, UIExtensionsContext, } from './hooks'; -import { Error, Loading } from './components'; +import { Error, Loading, SettingFlyout } from './components'; import type { UIExtensionsStorage } from './types'; import { FLEET_ROUTING_PATHS } from './constants'; import { DefaultLayout, WithoutHeaderLayout } from './layouts'; import { AgentPolicyApp } from './sections/agent_policy'; import { DataStreamApp } from './sections/data_stream'; -import { FleetApp } from './sections/agents'; -import { IngestManagerOverview } from './sections/overview'; -import { ProtectedRoute } from './index'; +import { AgentsApp } from './sections/agents'; import { CreatePackagePolicyPage } from './sections/agent_policy/create_package_policy_page'; +import { EnrollmentTokenListPage } from './sections/agents/enrollment_token_list_page'; + +const FEEDBACK_URL = 'https://ela.st/fleet-feedback'; const ErrorLayout = ({ children }: { children: JSX.Element }) => ( - + {children} @@ -233,37 +235,82 @@ export const FleetAppContext: React.FC<{ } ); -export const AppRoutes = memo(() => { - const { agents } = useConfig(); +const FleetTopNav = memo( + ({ setHeaderActionMenu }: { setHeaderActionMenu: AppMountParameters['setHeaderActionMenu'] }) => { + const { getModalHref } = useUrlModal(); + const services = useStartServices(); - return ( - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ); -}); + const { TopNavMenu } = services.navigation.ui; + + const topNavConfig: TopNavMenuData[] = [ + { + label: i18n.translate('xpack.fleet.appNavigation.sendFeedbackButton', { + defaultMessage: 'Send Feedback', + }), + iconType: 'popout', + run: () => window.open(FEEDBACK_URL), + }, + + { + label: i18n.translate('xpack.fleet.appNavigation.settingsButton', { + defaultMessage: 'Fleet settings', + }), + iconType: 'gear', + run: () => (window.location.href = getModalHref('settings')), + }, + ]; + return ( + + ); + } +); + +export const AppRoutes = memo( + ({ setHeaderActionMenu }: { setHeaderActionMenu: AppMountParameters['setHeaderActionMenu'] }) => { + const { modal, setModal } = useUrlModal(); + + return ( + <> + + + {modal === 'settings' && ( + + { + setModal(null); + }} + /> + + )} + + + + + + + + + + + + + + + + {/* TODO: Move this route to the Integrations app */} + + + + + + + + + + ); + } +); diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_breadcrumbs.tsx b/x-pack/plugins/fleet/public/applications/fleet/hooks/use_breadcrumbs.tsx index fd980475dc9194..254885ea71b1e4 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_breadcrumbs.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/hooks/use_breadcrumbs.tsx @@ -20,7 +20,7 @@ interface AdditionalBreadcrumbOptions { type Breadcrumb = ChromeBreadcrumb & Partial; const BASE_BREADCRUMB: Breadcrumb = { - href: pagePathGetters.overview()[1], + href: pagePathGetters.base()[1], text: i18n.translate('xpack.fleet.breadcrumbs.appTitle', { defaultMessage: 'Fleet', }), @@ -38,15 +38,6 @@ const breadcrumbGetters: { [key in Page]?: (values: DynamicPagePathValues) => Breadcrumb[]; } = { base: () => [BASE_BREADCRUMB], - overview: () => [ - BASE_BREADCRUMB, - { - text: i18n.translate('xpack.fleet.breadcrumbs.overviewPageTitle', { - defaultMessage: 'Overview', - }), - }, - ], - policies: () => [ BASE_BREADCRUMB, { @@ -122,15 +113,7 @@ const breadcrumbGetters: { }), }, ], - fleet: () => [ - BASE_BREADCRUMB, - { - text: i18n.translate('xpack.fleet.breadcrumbs.agentsPageTitle', { - defaultMessage: 'Agents', - }), - }, - ], - fleet_agent_list: () => [ + agent_list: () => [ BASE_BREADCRUMB, { text: i18n.translate('xpack.fleet.breadcrumbs.agentsPageTitle', { @@ -138,24 +121,18 @@ const breadcrumbGetters: { }), }, ], - fleet_agent_details: ({ agentHost }) => [ + agent_details: ({ agentHost }) => [ BASE_BREADCRUMB, { - href: pagePathGetters.fleet()[1], + href: pagePathGetters.agent_list({})[1], text: i18n.translate('xpack.fleet.breadcrumbs.agentsPageTitle', { defaultMessage: 'Agents', }), }, { text: agentHost }, ], - fleet_enrollment_tokens: () => [ + enrollment_tokens: () => [ BASE_BREADCRUMB, - { - href: pagePathGetters.fleet()[1], - text: i18n.translate('xpack.fleet.breadcrumbs.agentsPageTitle', { - defaultMessage: 'Agents', - }), - }, { text: i18n.translate('xpack.fleet.breadcrumbs.enrollmentTokensPageTitle', { defaultMessage: 'Enrollment tokens', diff --git a/x-pack/plugins/fleet/public/applications/fleet/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/index.tsx index 7d31fb31b36a43..8942c13a0a69db 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/index.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/index.tsx @@ -37,6 +37,7 @@ interface FleetAppProps { history: AppMountParameters['history']; kibanaVersion: string; extensions: UIExtensionsStorage; + setHeaderActionMenu: AppMountParameters['setHeaderActionMenu']; } const FleetApp = ({ basepath, @@ -45,6 +46,7 @@ const FleetApp = ({ history, kibanaVersion, extensions, + setHeaderActionMenu, }: FleetAppProps) => { return ( - + ); @@ -64,7 +66,7 @@ const FleetApp = ({ export function renderApp( startServices: FleetStartServices, - { element, appBasePath, history }: AppMountParameters, + { element, appBasePath, history, setHeaderActionMenu }: AppMountParameters, config: FleetConfigType, kibanaVersion: string, extensions: UIExtensionsStorage @@ -77,6 +79,7 @@ export function renderApp( history={history} kibanaVersion={kibanaVersion} extensions={extensions} + setHeaderActionMenu={setHeaderActionMenu} />, element ); diff --git a/x-pack/plugins/fleet/public/applications/fleet/layouts/default.tsx b/x-pack/plugins/fleet/public/applications/fleet/layouts/default.tsx index d707fd162ae020..f312ff374d792c 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/layouts/default.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/layouts/default.tsx @@ -6,145 +6,98 @@ */ import React from 'react'; -import styled from 'styled-components'; -import { - EuiTabs, - EuiTab, - EuiFlexGroup, - EuiFlexItem, - EuiButtonEmpty, - EuiPortal, -} from '@elastic/eui'; +import { EuiText, EuiFlexGroup, EuiFlexItem, EuiTitle } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; import type { Section } from '../sections'; -import { SettingFlyout } from '../components'; -import { useLink, useConfig, useUrlModal } from '../hooks'; +import { useLink, useConfig } from '../hooks'; +import { WithHeaderLayout } from '../../../layouts'; interface Props { - showNav?: boolean; - showSettings?: boolean; section?: Section; children?: React.ReactNode; } -const Container = styled.div` - min-height: calc( - 100vh - ${(props) => parseFloat(props.theme.eui.euiHeaderHeightCompensation) * 2}px - ); - background: ${(props) => props.theme.eui.euiColorEmptyShade}; - display: flex; - flex-direction: column; -`; - -const Wrapper = styled.div` - display: flex; - flex-direction: column; - flex: 1; -`; - -const Nav = styled.nav` - background: ${(props) => props.theme.eui.euiColorEmptyShade}; - border-bottom: ${(props) => props.theme.eui.euiBorderThin}; - padding: ${(props) => - `${props.theme.eui.euiSize} ${props.theme.eui.euiSizeL} ${props.theme.eui.euiSize} ${props.theme.eui.euiSizeL}`}; - .euiTabs { - padding-left: 3px; - margin-left: -3px; - } -`; - -export const DefaultLayout: React.FunctionComponent = ({ - showNav = true, - showSettings = true, - section, - children, -}) => { +export const DefaultLayout: React.FunctionComponent = ({ section, children }) => { const { getHref } = useLink(); const { agents } = useConfig(); - const { modal, setModal, getModalHref } = useUrlModal(); return ( - <> - {modal === 'settings' && ( - - { - setModal(null); - }} - /> - - )} - - - - {showNav ? ( - - ) : null} - {children} - - - + + + + + +

+ +

+ + + + + + +

+ +

+ + + + } + tabs={[ + { + name: ( + + ), + isSelected: section === 'agents', + href: getHref('agent_list'), + disabled: !agents?.enabled, + 'data-test-subj': 'fleet-agents-tab', + }, + { + name: ( + + ), + isSelected: section === 'agent_policies', + href: getHref('policies_list'), + 'data-test-subj': 'fleet-agent-policies-tab', + }, + { + name: ( + + ), + isSelected: section === 'enrollment_tokens', + href: getHref('enrollment_tokens'), + 'data-test-subj': 'fleet-enrollment-tokens-tab', + }, + { + name: ( + + ), + isSelected: section === 'data_streams', + href: getHref('data_streams'), + 'data-test-subj': 'fleet-datastreams-tab', + }, + ]} + > + {children} + ); }; diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/index.tsx index c0ec811ce2bcd5..d8db44e28e4af9 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/index.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/index.tsx @@ -11,6 +11,8 @@ import { HashRouter as Router, Switch, Route } from 'react-router-dom'; import { FLEET_ROUTING_PATHS } from '../../constants'; import { useBreadcrumbs } from '../../hooks'; +import { DefaultLayout } from '../../layouts'; + import { AgentPolicyListPage } from './list_page'; import { AgentPolicyDetailsPage } from './details_page'; import { CreatePackagePolicyPage } from './create_package_policy_page'; @@ -32,7 +34,9 @@ export const AgentPolicyApp: React.FunctionComponent = () => { - + + + diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/list_page/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/list_page/index.tsx index 48b9118d115666..10859e32f00805 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/list_page/index.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/list_page/index.tsx @@ -9,7 +9,6 @@ import React, { useCallback, useMemo, useState } from 'react'; import type { EuiTableActionsColumnType, EuiTableFieldDataColumnType } from '@elastic/eui'; import { EuiSpacer, - EuiText, EuiFlexGroup, EuiFlexItem, EuiButton, @@ -25,7 +24,6 @@ import { useHistory } from 'react-router-dom'; import type { AgentPolicy } from '../../../types'; import { AGENT_POLICY_SAVED_OBJECT_TYPE } from '../../../constants'; -import { WithHeaderLayout } from '../../../layouts'; import { useCapabilities, useGetAgentPolicies, @@ -41,37 +39,6 @@ import { LinkedAgentCount, AgentPolicyActionMenu } from '../components'; import { CreateAgentPolicyFlyout } from './components'; -const AgentPolicyListPageLayout: React.FunctionComponent = ({ children }) => ( - - - -

- -

- - - - -

- -

- - - - } - > - {children} - -); - export const AgentPolicyListPage: React.FunctionComponent<{}> = () => { useBreadcrumbs('policies_list'); const { getPath } = useLink(); @@ -246,7 +213,7 @@ export const AgentPolicyListPage: React.FunctionComponent<{}> = () => { }; return ( - + <> {isCreateAgentPolicyFlyoutOpen ? ( { @@ -322,6 +289,6 @@ export const AgentPolicyListPage: React.FunctionComponent<{}> = () => { sorting={{ sort: sorting }} onChange={onTableChange} /> - + ); }; diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_details/agent_details_integrations.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_details/agent_details_integrations.tsx index 6e0206603a458e..a599d726cedefe 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_details/agent_details_integrations.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_details/agent_details_integrations.tsx @@ -101,7 +101,7 @@ export const AgentDetailsIntegration: React.FunctionComponent<{ })} > { () => ( - + { name: i18n.translate('xpack.fleet.agentDetails.subTabs.detailsTab', { defaultMessage: 'Agent details', }), - href: getHref('fleet_agent_details', { agentId, tabId: 'details' }), + href: getHref('agent_details', { agentId, tabId: 'details' }), isSelected: !tabId || tabId === 'details', }, { @@ -240,7 +235,7 @@ export const AgentDetailsPage: React.FunctionComponent = () => { name: i18n.translate('xpack.fleet.agentDetails.subTabs.logsTab', { defaultMessage: 'Logs', }), - href: getHref('fleet_agent_details', { agentId, tabId: 'logs' }), + href: getHref('agent_details_logs', { agentId, tabId: 'logs' }), isSelected: tabId === 'logs', }, ]; @@ -299,7 +294,7 @@ const AgentDetailsPageContent: React.FunctionComponent<{ agent: Agent; agentPolicy?: AgentPolicy; }> = ({ agent, agentPolicy }) => { - useBreadcrumbs('fleet_agent_details', { + useBreadcrumbs('agent_list', { agentHost: typeof agent.local_metadata.host === 'object' && typeof agent.local_metadata.host.hostname === 'string' @@ -309,13 +304,13 @@ const AgentDetailsPageContent: React.FunctionComponent<{ return ( { return ; }} /> { return ; }} 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 1beaf437ceb0e9..1d7b44ceefb7c6 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 @@ -7,18 +7,20 @@ import React, { useState } from 'react'; import { + EuiButton, EuiFilterButton, EuiFilterGroup, EuiFilterSelectItem, EuiFlexGroup, EuiFlexItem, EuiPopover, + EuiPortal, } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n/react'; import type { AgentPolicy } from '../../../../types'; -import { SearchBar } from '../../../../components'; +import { AgentEnrollmentFlyout, SearchBar } from '../../../../components'; import { AGENTS_INDEX } from '../../../../constants'; const statusFilters = [ @@ -77,6 +79,8 @@ export const SearchAndFilterBar: React.FunctionComponent<{ showUpgradeable, onShowUpgradeableChange, }) => { + const [isEnrollmentFlyoutOpen, setIsEnrollmentFlyoutOpen] = useState(false); + // Policies state for filtering const [isAgentPoliciesFilterOpen, setIsAgentPoliciesFilterOpen] = useState(false); @@ -97,6 +101,15 @@ export const SearchAndFilterBar: React.FunctionComponent<{ return ( <> + {isEnrollmentFlyoutOpen ? ( + + setIsEnrollmentFlyoutOpen(false)} + /> + + ) : null} + {/* Search and filter bar */} @@ -207,6 +220,15 @@ export const SearchAndFilterBar: React.FunctionComponent<{ + + setIsEnrollmentFlyoutOpen(true)} + > + + + diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/index.tsx index 672b8718c9cbe7..431c4da3efb5b2 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/index.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/index.tsx @@ -73,7 +73,7 @@ const RowActions = React.memo<{ const menuItems = [ @@ -146,7 +146,7 @@ function safeMetadata(val: any) { export const AgentListPage: React.FunctionComponent<{}> = () => { const { notifications } = useStartServices(); - useBreadcrumbs('fleet_agent_list'); + useBreadcrumbs('agent_list'); const { getHref } = useLink(); const defaultKuery: string = (useUrlParams().urlParams.kuery as string) || ''; const hasWriteCapabilites = useCapabilities().write; @@ -358,7 +358,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => { defaultMessage: 'Host', }), render: (host: string, agent: Agent) => ( - + {safeMetadata(host)} ), diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/list_layout.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/list_layout.tsx deleted file mode 100644 index 67758282521b79..00000000000000 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/list_layout.tsx +++ /dev/null @@ -1,101 +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'; -import { FormattedMessage } from '@kbn/i18n/react'; -import { EuiText, EuiFlexGroup, EuiFlexItem, EuiButton, EuiPortal } from '@elastic/eui'; -import type { Props as EuiTabProps } from '@elastic/eui/src/components/tabs/tab'; -import { useRouteMatch } from 'react-router-dom'; - -import { FLEET_ROUTING_PATHS } from '../../../constants'; -import { WithHeaderLayout } from '../../../layouts'; -import { useCapabilities, useLink, useGetAgentPolicies } from '../../../hooks'; -import { AgentEnrollmentFlyout } from '../../../components'; - -export const ListLayout: React.FunctionComponent<{}> = ({ children }) => { - const { getHref } = useLink(); - const hasWriteCapabilites = useCapabilities().write; - - // Agent enrollment flyout state - const [isEnrollmentFlyoutOpen, setIsEnrollmentFlyoutOpen] = React.useState(false); - - const headerRightColumn = hasWriteCapabilites ? ( - - - setIsEnrollmentFlyoutOpen(true)}> - - - - - ) : undefined; - const headerLeftColumn = ( - - - -

- -

- - - - -

- -

- - - - ); - - const agentPoliciesRequest = useGetAgentPolicies({ - page: 1, - perPage: 1000, - }); - - const agentPolicies = agentPoliciesRequest.data ? agentPoliciesRequest.data.items : []; - - const routeMatch = useRouteMatch(); - - return ( - , - isSelected: routeMatch.path === FLEET_ROUTING_PATHS.fleet_agent_list, - href: getHref('fleet_agent_list'), - }, - { - name: ( - - ), - isSelected: routeMatch.path === FLEET_ROUTING_PATHS.fleet_enrollment_tokens, - href: getHref('fleet_enrollment_tokens'), - }, - ] as unknown) as EuiTabProps[] - } - > - {isEnrollmentFlyoutOpen ? ( - - setIsEnrollmentFlyoutOpen(false)} - /> - - ) : null} - {children} - - ); -}; diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/enrollment_token_list_page/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/enrollment_token_list_page/index.tsx index 8dc9ad33962e0d..666d0887fe5103 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/enrollment_token_list_page/index.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/enrollment_token_list_page/index.tsx @@ -34,6 +34,7 @@ import { } from '../../../hooks'; import type { EnrollmentAPIKey, GetAgentPoliciesResponseItem } from '../../../types'; import { SearchBar } from '../../../components/search_bar'; +import { DefaultLayout } from '../../../layouts'; import { ConfirmEnrollmentTokenDelete } from './components/confirm_delete_modal'; @@ -155,7 +156,7 @@ const DeleteButton: React.FunctionComponent<{ apiKey: EnrollmentAPIKey; refresh: }; export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => { - useBreadcrumbs('fleet_enrollment_tokens'); + useBreadcrumbs('enrollment_tokens'); const [isModalOpen, setModalOpen] = useState(false); const [search, setSearch] = useState(''); const { pagination, setPagination, pageSizeOptions } = usePagination(); @@ -269,7 +270,7 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => { ]; return ( - <> + {isModalOpen && ( = () => { setPagination(newPagination); }} /> - + ); }; diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/index.tsx index dcb33e7662dc45..79b19b443cca14 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/index.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/index.tsx @@ -7,7 +7,7 @@ import React, { useCallback, useEffect, useState } from 'react'; import { FormattedMessage } from '@kbn/i18n/react'; -import { HashRouter as Router, Route, Switch, Redirect } from 'react-router-dom'; +import { HashRouter as Router, Route, Switch } from 'react-router-dom'; import { FLEET_ROUTING_PATHS } from '../../constants'; import { Loading, Error } from '../../components'; @@ -18,20 +18,18 @@ import { useCapabilities, useGetSettings, } from '../../hooks'; -import { WithoutHeaderLayout } from '../../layouts'; +import { DefaultLayout, WithoutHeaderLayout } from '../../layouts'; import { AgentListPage } from './agent_list_page'; import { FleetServerRequirementPage, MissingESRequirementsPage } from './agent_requirements_page'; import { AgentDetailsPage } from './agent_details_page'; import { NoAccessPage } from './error_pages/no_access'; -import { EnrollmentTokenListPage } from './enrollment_token_list_page'; -import { ListLayout } from './components/list_layout'; import { FleetServerUpgradeModal } from './components/fleet_server_upgrade_modal'; const REFRESH_INTERVAL_MS = 30000; -export const FleetApp: React.FunctionComponent = () => { - useBreadcrumbs('fleet'); +export const AgentsApp: React.FunctionComponent = () => { + useBreadcrumbs('agent_list'); const { agents } = useConfig(); const capabilities = useCapabilities(); @@ -110,16 +108,11 @@ export const FleetApp: React.FunctionComponent = () => { return ( - } - /> - + - - + + {fleetServerModalVisible && ( )} @@ -128,12 +121,7 @@ export const FleetApp: React.FunctionComponent = () => { ) : ( )} - - - - - - + diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/data_stream/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/data_stream/index.tsx index bc3a0229284dbd..c660d3ed297672 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/data_stream/index.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/sections/data_stream/index.tsx @@ -9,6 +9,7 @@ import React from 'react'; import { HashRouter as Router, Route, Switch } from 'react-router-dom'; import { FLEET_ROUTING_PATHS } from '../../constants'; +import { DefaultLayout } from '../../layouts'; import { DataStreamListPage } from './list_page'; @@ -17,7 +18,9 @@ export const DataStreamApp: React.FunctionComponent = () => { - + + + diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/data_stream/list_page/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/data_stream/list_page/index.tsx index e805fb8f6f64ef..ac236578e6f58d 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/data_stream/list_page/index.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/sections/data_stream/list_page/index.tsx @@ -10,7 +10,6 @@ import type { EuiTableActionsColumnType, EuiTableFieldDataColumnType } from '@el import { EuiBadge, EuiButton, - EuiText, EuiFlexGroup, EuiFlexItem, EuiEmptyPrompt, @@ -20,43 +19,11 @@ import { i18n } from '@kbn/i18n'; import { FormattedMessage, FormattedDate } from '@kbn/i18n/react'; import type { DataStream } from '../../../types'; -import { WithHeaderLayout } from '../../../layouts'; import { useGetDataStreams, useStartServices, usePagination, useBreadcrumbs } from '../../../hooks'; import { PackageIcon } from '../../../components'; import { DataStreamRowActions } from './components/data_stream_row_actions'; -const DataStreamListPageLayout: React.FunctionComponent = ({ children }) => ( - - - -

- -

- - - - -

- -

- - - - } - > - {children} - -); - export const DataStreamListPage: React.FunctionComponent<{}> = () => { useBreadcrumbs('data_streams'); @@ -232,97 +199,95 @@ export const DataStreamListPage: React.FunctionComponent<{}> = () => { } return ( - - - ) : dataStreamsData && !dataStreamsData.data_streams.length ? ( - emptyPrompt - ) : ( + + ) : dataStreamsData && !dataStreamsData.data_streams.length ? ( + emptyPrompt + ) : ( + + ) + } + items={dataStreamsData ? dataStreamsData.data_streams : []} + itemId="index" + columns={columns} + pagination={{ + initialPageSize: pagination.pageSize, + pageSizeOptions, + }} + sorting={true} + search={{ + toolsRight: [ + resendRequest()} + > - ) - } - items={dataStreamsData ? dataStreamsData.data_streams : []} - itemId="index" - columns={columns} - pagination={{ - initialPageSize: pagination.pageSize, - pageSizeOptions, - }} - sorting={true} - search={{ - toolsRight: [ - resendRequest()} - > - - , - ], - box: { - placeholder: i18n.translate('xpack.fleet.dataStreamList.searchPlaceholderTitle', { - defaultMessage: 'Filter data streams', + , + ], + box: { + placeholder: i18n.translate('xpack.fleet.dataStreamList.searchPlaceholderTitle', { + defaultMessage: 'Filter data streams', + }), + incremental: true, + }, + filters: [ + { + type: 'field_value_selection', + field: 'dataset', + name: i18n.translate('xpack.fleet.dataStreamList.datasetColumnTitle', { + defaultMessage: 'Dataset', }), - incremental: true, + multiSelect: 'or', + operator: 'exact', + options: filterOptions.dataset, }, - filters: [ - { - type: 'field_value_selection', - field: 'dataset', - name: i18n.translate('xpack.fleet.dataStreamList.datasetColumnTitle', { - defaultMessage: 'Dataset', - }), - multiSelect: 'or', - operator: 'exact', - options: filterOptions.dataset, - }, - { - type: 'field_value_selection', - field: 'type', - name: i18n.translate('xpack.fleet.dataStreamList.typeColumnTitle', { - defaultMessage: 'Type', - }), - multiSelect: 'or', - operator: 'exact', - options: filterOptions.type, - }, - { - type: 'field_value_selection', - field: 'namespace', - name: i18n.translate('xpack.fleet.dataStreamList.namespaceColumnTitle', { - defaultMessage: 'Namespace', - }), - multiSelect: 'or', - operator: 'exact', - options: filterOptions.namespace, - }, - { - type: 'field_value_selection', - field: 'package', - name: i18n.translate('xpack.fleet.dataStreamList.integrationColumnTitle', { - defaultMessage: 'Integration', - }), - multiSelect: 'or', - operator: 'exact', - options: filterOptions.package, - }, - ], - }} - /> - + { + type: 'field_value_selection', + field: 'type', + name: i18n.translate('xpack.fleet.dataStreamList.typeColumnTitle', { + defaultMessage: 'Type', + }), + multiSelect: 'or', + operator: 'exact', + options: filterOptions.type, + }, + { + type: 'field_value_selection', + field: 'namespace', + name: i18n.translate('xpack.fleet.dataStreamList.namespaceColumnTitle', { + defaultMessage: 'Namespace', + }), + multiSelect: 'or', + operator: 'exact', + options: filterOptions.namespace, + }, + { + type: 'field_value_selection', + field: 'package', + name: i18n.translate('xpack.fleet.dataStreamList.integrationColumnTitle', { + defaultMessage: 'Integration', + }), + multiSelect: 'or', + operator: 'exact', + options: filterOptions.package, + }, + ], + }} + /> ); }; diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/index.tsx index 810334e2df9ce6..b36fbf4bb815e7 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/index.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/sections/index.tsx @@ -5,9 +5,8 @@ * 2.0. */ -export { IngestManagerOverview } from './overview'; export { AgentPolicyApp } from './agent_policy'; export { DataStreamApp } from './data_stream'; -export { FleetApp } from './agents'; +export { AgentsApp } from './agents'; -export type Section = 'overview' | 'agent_policy' | 'fleet' | 'data_stream'; +export type Section = 'agents' | 'agent_policies' | 'enrollment_tokens' | 'data_streams'; diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/overview/components/agent_policy_section.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/overview/components/agent_policy_section.tsx deleted file mode 100644 index 79a4f08faa7522..00000000000000 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/overview/components/agent_policy_section.tsx +++ /dev/null @@ -1,78 +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'; -import { FormattedMessage } from '@kbn/i18n/react'; -import { i18n } from '@kbn/i18n'; -import { - EuiFlexItem, - EuiI18nNumber, - EuiDescriptionListTitle, - EuiDescriptionListDescription, -} from '@elastic/eui'; - -import { SO_SEARCH_LIMIT } from '../../../constants'; -import { useLink, useGetPackagePolicies } from '../../../hooks'; -import type { AgentPolicy } from '../../../types'; -import { Loading } from '../../agents/components'; - -import { OverviewStats } from './overview_stats'; -import { OverviewPanel } from './overview_panel'; - -export const OverviewPolicySection: React.FC<{ agentPolicies: AgentPolicy[] }> = ({ - agentPolicies, -}) => { - const { getHref } = useLink(); - const packagePoliciesRequest = useGetPackagePolicies({ - page: 1, - perPage: SO_SEARCH_LIMIT, - }); - - return ( - - - - {packagePoliciesRequest.isLoading ? ( - - ) : ( - <> - - - - - - - - - - - - - - )} - - - - ); -}; diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/overview/components/agent_section.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/overview/components/agent_section.tsx deleted file mode 100644 index d69306969c78c3..00000000000000 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/overview/components/agent_section.tsx +++ /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; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React from 'react'; -import { FormattedMessage } from '@kbn/i18n/react'; -import { i18n } from '@kbn/i18n'; -import { - EuiI18nNumber, - EuiDescriptionListTitle, - EuiDescriptionListDescription, - EuiFlexItem, -} from '@elastic/eui'; - -import { useLink, useGetAgentStatus } from '../../../hooks'; -import { Loading } from '../../agents/components'; - -import { OverviewPanel } from './overview_panel'; -import { OverviewStats } from './overview_stats'; - -export const OverviewAgentSection = () => { - const { getHref } = useLink(); - const agentStatusRequest = useGetAgentStatus({}); - - return ( - - - - {agentStatusRequest.isLoading ? ( - - ) : ( - <> - - - - - - - - - - - - - - - - - - - - - - - - - - )} - - - - ); -}; diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/overview/components/datastream_section.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/overview/components/datastream_section.tsx deleted file mode 100644 index b51be3fdd20e56..00000000000000 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/overview/components/datastream_section.tsx +++ /dev/null @@ -1,99 +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'; -import { FormattedMessage } from '@kbn/i18n/react'; -import { i18n } from '@kbn/i18n'; -import { - EuiFlexItem, - EuiI18nNumber, - EuiDescriptionListTitle, - EuiDescriptionListDescription, -} from '@elastic/eui'; - -import { useLink, useGetDataStreams, useStartServices } from '../../../hooks'; -import { Loading } from '../../agents/components'; - -import { OverviewPanel } from './overview_panel'; -import { OverviewStats } from './overview_stats'; - -export const OverviewDatastreamSection: React.FC = () => { - const { getHref } = useLink(); - const datastreamRequest = useGetDataStreams(); - const { - data: { fieldFormats }, - } = useStartServices(); - - const total = datastreamRequest.data?.data_streams?.length ?? 0; - let sizeBytes = 0; - const namespaces = new Set(); - if (datastreamRequest.data) { - datastreamRequest.data.data_streams.forEach((val) => { - namespaces.add(val.namespace); - sizeBytes += val.size_in_bytes; - }); - } - - let size: string; - try { - const formatter = fieldFormats.getInstance('bytes'); - size = formatter.convert(sizeBytes); - } catch (e) { - size = `${sizeBytes}b`; - } - - return ( - - - - {datastreamRequest.isLoading ? ( - - ) : ( - <> - - - - - - - - - - - - - - - - {size} - - )} - - - - ); -}; diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/overview/components/integration_section.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/overview/components/integration_section.tsx deleted file mode 100644 index 5ada8e298507cb..00000000000000 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/overview/components/integration_section.tsx +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React from 'react'; -import { FormattedMessage } from '@kbn/i18n/react'; -import { i18n } from '@kbn/i18n'; -import { - EuiFlexItem, - EuiI18nNumber, - EuiDescriptionListTitle, - EuiDescriptionListDescription, -} from '@elastic/eui'; - -import { useLink, useGetPackages } from '../../../hooks'; -import { Loading } from '../../agents/components'; -import { installationStatuses } from '../../../../../../common/constants'; - -import { OverviewStats } from './overview_stats'; -import { OverviewPanel } from './overview_panel'; - -export const OverviewIntegrationSection: React.FC = () => { - const { getHref } = useLink(); - const packagesRequest = useGetPackages(); - const res = packagesRequest.data?.response; - const total = res?.length ?? 0; - const installed = res?.filter((p) => p.status === installationStatuses.Installed)?.length ?? 0; - const updatablePackages = - res?.filter( - (item) => 'savedObject' in item && item.version > item.savedObject.attributes.version - )?.length ?? 0; - return ( - - - - {packagesRequest.isLoading ? ( - - ) : ( - <> - - - - - - - - - - - - - - - - - - - - )} - - - - ); -}; diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/overview/components/overview_panel.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/overview/components/overview_panel.tsx deleted file mode 100644 index c402bc15f7b026..00000000000000 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/overview/components/overview_panel.tsx +++ /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; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React from 'react'; -import styled from 'styled-components'; -import { - EuiPanel, - EuiFlexGroup, - EuiFlexItem, - EuiTitle, - EuiIconTip, - EuiButtonEmpty, -} from '@elastic/eui'; - -const StyledPanel = styled(EuiPanel).attrs((props) => ({ - paddingSize: 'm', -}))` - header { - display: flex; - align-items: center; - justify-content: space-between; - border-bottom: 1px solid ${(props) => props.theme.eui.euiColorLightShade}; - margin: -${(props) => props.theme.eui.paddingSizes.m} -${(props) => - props.theme.eui.paddingSizes.m} - ${(props) => props.theme.eui.paddingSizes.m}; - padding: ${(props) => props.theme.eui.paddingSizes.s} - ${(props) => props.theme.eui.paddingSizes.m}; - } - - h2 { - padding: ${(props) => props.theme.eui.paddingSizes.xs} 0; - } -`; - -interface OverviewPanelProps { - title: string; - tooltip: string; - linkToText: string; - linkTo: string; - children: React.ReactNode; -} - -export const OverviewPanel = ({ - title, - tooltip, - linkToText, - linkTo, - children, -}: OverviewPanelProps) => { - return ( - -
- - - -

{title}

- - - - - - - - {linkToText} - -
- {children} - - ); -}; diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/overview/components/overview_stats.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/overview/components/overview_stats.tsx deleted file mode 100644 index acb94e4b05695d..00000000000000 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/overview/components/overview_stats.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; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import styled from 'styled-components'; -import { EuiDescriptionList } from '@elastic/eui'; - -export const OverviewStats = styled(EuiDescriptionList).attrs((props) => ({ - compressed: true, - textStyle: 'reverse', - type: 'column', -}))` - & > * { - margin-top: ${(props) => props.theme.eui.paddingSizes.s} !important; - - &:first-child, - &:nth-child(2) { - margin-top: 0 !important; - } - } -`; diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/overview/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/overview/index.tsx deleted file mode 100644 index f905fd1c89da27..00000000000000 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/overview/index.tsx +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React, { useState } from 'react'; -import { - EuiButton, - EuiBetaBadge, - EuiText, - EuiTitle, - EuiFlexGrid, - EuiFlexGroup, - EuiFlexItem, -} from '@elastic/eui'; -import { FormattedMessage } from '@kbn/i18n/react'; -import { i18n } from '@kbn/i18n'; - -import { WithHeaderLayout } from '../../layouts'; -import { useGetAgentPolicies, useBreadcrumbs } from '../../hooks'; -import { AgentEnrollmentFlyout } from '../../components'; - -import { OverviewAgentSection } from './components/agent_section'; -import { OverviewPolicySection } from './components/agent_policy_section'; -import { OverviewIntegrationSection } from './components/integration_section'; -import { OverviewDatastreamSection } from './components/datastream_section'; - -export const IngestManagerOverview: React.FunctionComponent = () => { - useBreadcrumbs('overview'); - - // Agent enrollment flyout state - const [isEnrollmentFlyoutOpen, setIsEnrollmentFlyoutOpen] = useState(false); - - // Agent policies required for enrollment flyout - const agentPoliciesRequest = useGetAgentPolicies({ - page: 1, - perPage: 1000, - }); - const agentPolicies = agentPoliciesRequest.data ? agentPoliciesRequest.data.items : []; - - return ( - - - - - -

- -

- - - - - - - - - - -

- -

- - - - } - rightColumn={ - - - setIsEnrollmentFlyoutOpen(true)}> - - - - - } - > - {isEnrollmentFlyoutOpen && ( - setIsEnrollmentFlyoutOpen(false)} - /> - )} - - - - - - - - - ); -}; diff --git a/x-pack/plugins/fleet/public/applications/integrations/layouts/default.tsx b/x-pack/plugins/fleet/public/applications/integrations/layouts/default.tsx index 4c1ff4972b89e2..98b8e9515e689c 100644 --- a/x-pack/plugins/fleet/public/applications/integrations/layouts/default.tsx +++ b/x-pack/plugins/fleet/public/applications/integrations/layouts/default.tsx @@ -5,7 +5,7 @@ * 2.0. */ import React, { memo } from 'react'; -import { EuiText, EuiBetaBadge } from '@elastic/eui'; +import { EuiText } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; import { useLink } from '../../../hooks'; @@ -30,15 +30,6 @@ export const DefaultLayout: React.FunctionComponent = memo(({ section, ch

{' '} - } - tooltipContent={ - - } - />

} diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/managed_instructions.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/managed_instructions.tsx index 2bb8586a11503d..e7045173f1257e 100644 --- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/managed_instructions.tsx +++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/managed_instructions.tsx @@ -36,7 +36,7 @@ const DefaultMissingRequirements = () => { defaultMessage="Before enrolling agents, {link}." values={{ link: ( - + 0 ? ( diff --git a/x-pack/plugins/fleet/public/constants/page_paths.ts b/x-pack/plugins/fleet/public/constants/page_paths.ts index 3c9c0e57596151..326cfd804bd570 100644 --- a/x-pack/plugins/fleet/public/constants/page_paths.ts +++ b/x-pack/plugins/fleet/public/constants/page_paths.ts @@ -13,8 +13,7 @@ export type StaticPage = | 'integrations_installed' | 'policies' | 'policies_list' - | 'fleet' - | 'fleet_enrollment_tokens' + | 'enrollment_tokens' | 'data_streams'; export type DynamicPage = @@ -27,8 +26,9 @@ export type DynamicPage = | 'add_integration_from_policy' | 'add_integration_to_policy' | 'edit_integration' - | 'fleet_agent_list' - | 'fleet_agent_details'; + | 'agent_list' + | 'agent_details' + | 'agent_details_logs'; export type Page = StaticPage | DynamicPage; @@ -42,20 +42,21 @@ export const INTEGRATIONS_BASE_PATH = '/app/integrations'; // If routing paths are changed here, please also check to see if // `pagePathGetters()`, below, needs any modifications export const FLEET_ROUTING_PATHS = { - overview: '/', + fleet: '/:tabId', + agents: '/agents', + agent_details: '/agents/:agentId/:tabId?', + agent_details_logs: '/agents/:agentId/logs', policies: '/policies', policies_list: '/policies', policy_details: '/policies/:policyId/:tabId?', policy_details_settings: '/policies/:policyId/settings', - add_integration_from_policy: '/policies/:policyId/add-integration', - add_integration_to_policy: '/integrations/:pkgkey/add-integration/:integration?', edit_integration: '/policies/:policyId/edit-integration/:packagePolicyId', - fleet: '/fleet', - fleet_agent_list: '/fleet/agents', - fleet_agent_details: '/fleet/agents/:agentId/:tabId?', - fleet_agent_details_logs: '/fleet/agents/:agentId/logs', - fleet_enrollment_tokens: '/fleet/enrollment-tokens', + add_integration_from_policy: '/policies/:policyId/add-integration', + enrollment_tokens: '/enrollment-tokens', data_streams: '/data-streams', + + // TODO: Move this to the integrations app + add_integration_to_policy: '/integrations/:pkgkey/add-integration/:integration?', }; export const INTEGRATIONS_ROUTING_PATHS = { @@ -120,15 +121,12 @@ export const pagePathGetters: { FLEET_BASE_PATH, `/policies/${policyId}/edit-integration/${packagePolicyId}`, ], - fleet: () => [FLEET_BASE_PATH, '/fleet'], - fleet_agent_list: ({ kuery }) => [ - FLEET_BASE_PATH, - `/fleet/agents${kuery ? `?kuery=${kuery}` : ''}`, - ], - fleet_agent_details: ({ agentId, tabId, logQuery }) => [ + agent_list: ({ kuery }) => [FLEET_BASE_PATH, `/agents${kuery ? `?kuery=${kuery}` : ''}`], + agent_details: ({ agentId, tabId, logQuery }) => [ FLEET_BASE_PATH, - `/fleet/agents/${agentId}${tabId ? `/${tabId}` : ''}${logQuery ? `?_q=${logQuery}` : ''}`, + `/agents/${agentId}${tabId ? `/${tabId}` : ''}${logQuery ? `?_q=${logQuery}` : ''}`, ], - fleet_enrollment_tokens: () => [FLEET_BASE_PATH, '/fleet/enrollment-tokens'], + agent_details_logs: ({ agentId }) => [FLEET_BASE_PATH, `/agents/${agentId}/logs`], + enrollment_tokens: () => [FLEET_BASE_PATH, '/enrollment-tokens'], data_streams: () => [FLEET_BASE_PATH, '/data-streams'], }; diff --git a/x-pack/plugins/fleet/public/layouts/without_header.tsx b/x-pack/plugins/fleet/public/layouts/without_header.tsx index 220ee592d7d07a..d9481d44359c25 100644 --- a/x-pack/plugins/fleet/public/layouts/without_header.tsx +++ b/x-pack/plugins/fleet/public/layouts/without_header.tsx @@ -11,6 +11,13 @@ import { EuiPage, EuiPageBody, EuiSpacer } from '@elastic/eui'; export const Wrapper = styled.div` background-color: ${(props) => props.theme.eui.euiColorEmptyShade}; + + // HACK: Kibana introduces a div element around the app component that results in us + // being unable to stretch this Wrapper to full height via flex: 1. This calc sets + // the min height to the viewport size minus the height of the two global Kibana headers. + min-height: calc( + 100vh - ${(props) => parseFloat(props.theme.eui.euiHeaderHeightCompensation) * 2}px + ); `; export const Page = styled(EuiPage)` diff --git a/x-pack/plugins/fleet/public/mock/plugin_dependencies.ts b/x-pack/plugins/fleet/public/mock/plugin_dependencies.ts index 16fa34e2d0b3d7..5d1567936bcb00 100644 --- a/x-pack/plugins/fleet/public/mock/plugin_dependencies.ts +++ b/x-pack/plugins/fleet/public/mock/plugin_dependencies.ts @@ -8,6 +8,7 @@ import { dataPluginMock } from '../../../../../src/plugins/data/public/mocks'; import { licensingMock } from '../../../licensing/public/mocks'; import { homePluginMock } from '../../../../../src/plugins/home/public/mocks'; +import { navigationPluginMock } from '../../../../../src/plugins/navigation/public/mocks'; import type { MockedFleetSetupDeps, MockedFleetStartDeps } from './types'; @@ -22,5 +23,6 @@ export const createSetupDepsMock = (): MockedFleetSetupDeps => { export const createStartDepsMock = (): MockedFleetStartDeps => { return { data: dataPluginMock.createStartContract(), + navigation: navigationPluginMock.createStartContract(), }; }; diff --git a/x-pack/plugins/fleet/public/plugin.ts b/x-pack/plugins/fleet/public/plugin.ts index f9515ca925a4ab..7b71b210068648 100644 --- a/x-pack/plugins/fleet/public/plugin.ts +++ b/x-pack/plugins/fleet/public/plugin.ts @@ -14,6 +14,8 @@ import type { } from 'src/core/public'; import { i18n } from '@kbn/i18n'; +import type { NavigationPublicPluginStart } from 'src/plugins/navigation/public'; + import { DEFAULT_APP_CATEGORIES, AppNavLinkStatus } from '../../../../src/core/public'; import type { DataPublicPluginSetup, @@ -64,6 +66,7 @@ export interface FleetSetupDeps { export interface FleetStartDeps { data: DataPublicPluginStart; + navigation: NavigationPublicPluginStart; } export interface FleetStartServices extends CoreStart, FleetStartDeps { diff --git a/x-pack/plugins/osquery/public/action_results/action_results_summary.tsx b/x-pack/plugins/osquery/public/action_results/action_results_summary.tsx index 23277976968a98..23eaaeac1439d4 100644 --- a/x-pack/plugins/osquery/public/action_results/action_results_summary.tsx +++ b/x-pack/plugins/osquery/public/action_results/action_results_summary.tsx @@ -132,7 +132,7 @@ const ActionResultsSummaryComponent: React.FC = ({ diff --git a/x-pack/plugins/osquery/public/results/results_table.tsx b/x-pack/plugins/osquery/public/results/results_table.tsx index affc600847284c..6ff60d30d23bf7 100644 --- a/x-pack/plugins/osquery/public/results/results_table.tsx +++ b/x-pack/plugins/osquery/public/results/results_table.tsx @@ -66,7 +66,7 @@ const ResultsTableComponent: React.FC = ({ const getFleetAppUrl = useCallback( (agentId) => getUrlForApp('fleet', { - path: `#` + pagePathGetters.fleet_agent_details({ agentId }), + path: `#` + pagePathGetters.agent_details({ agentId }), }), [getUrlForApp] ); 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 31069b1939ce98..e03427671798da 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 @@ -138,13 +138,13 @@ export const useEndpointActionItems = ( navigateAppId: 'fleet', navigateOptions: { path: `#${ - pagePathGetters.fleet_agent_details({ + pagePathGetters.agent_details({ agentId: fleetAgentId, })[1] }`, }, href: `${getUrlForApp('fleet')}#${ - pagePathGetters.fleet_agent_details({ + pagePathGetters.agent_details({ agentId: fleetAgentId, })[1] }`, @@ -162,13 +162,13 @@ export const useEndpointActionItems = ( navigateAppId: 'fleet', navigateOptions: { path: `#${ - pagePathGetters.fleet_agent_details({ + pagePathGetters.agent_details({ agentId: fleetAgentId, })[1] }/activity?openReassignFlyout=true`, }, href: `${getUrlForApp('fleet')}#${ - pagePathGetters.fleet_agent_details({ + pagePathGetters.agent_details({ agentId: fleetAgentId, })[1] }/activity?openReassignFlyout=true`, 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 86f1e32e751eeb..1ac5c289c87cf7 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 @@ -1108,13 +1108,13 @@ describe('when on the endpoint list page', () => { }); it('navigates to the Ingest Agent Details page', async () => { const agentDetailsLink = await renderResult.findByTestId('agentDetailsLink'); - expect(agentDetailsLink.getAttribute('href')).toEqual(`/app/fleet#/fleet/agents/${agentId}`); + expect(agentDetailsLink.getAttribute('href')).toEqual(`/app/fleet#/agents/${agentId}`); }); it('navigates to the Ingest Agent Details page with policy reassign', async () => { const agentPolicyReassignLink = await renderResult.findByTestId('agentPolicyReassignLink'); expect(agentPolicyReassignLink.getAttribute('href')).toEqual( - `/app/fleet#/fleet/agents/${agentId}/activity?openReassignFlyout=true` + `/app/fleet#/agents/${agentId}/activity?openReassignFlyout=true` ); }); }); diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx index 410afb4684cd54..d1dab3dd07a7e3 100644 --- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx +++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx @@ -515,12 +515,12 @@ export const EndpointList = () => { agentsLink: ( diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.ts b/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.ts index 8c1eb611cb5a1a..c54c12981c7710 100644 --- a/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.ts +++ b/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.ts @@ -156,9 +156,7 @@ export const isolationRequestHandler = function ( commentLines.push(`${isolate ? 'I' : 'Uni'}solate action was sent to the following Agents:`); // lines of markdown links, inside a code block - commentLines.push( - `${agentIDs.map((a) => `- [${a}](/app/fleet#/fleet/agents/${a})`).join('\n')}` - ); + commentLines.push(`${agentIDs.map((a) => `- [${a}](/app/fleet#/agents/${a})`).join('\n')}`); if (req.body.comment) { commentLines.push(`\n\nWith Comment:\n> ${req.body.comment}`); } diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index fb936a58387816..db382a677fbe82 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -8829,7 +8829,6 @@ "xpack.fleet.agentList.addButton": "エージェントの追加", "xpack.fleet.agentList.agentUpgradeLabel": "アップグレードが利用可能です", "xpack.fleet.agentList.clearFiltersLinkText": "フィルターを消去", - "xpack.fleet.agentList.enrollButton": "エージェントの追加", "xpack.fleet.agentList.errorFetchingDataTitle": "エージェントの取り込みエラー", "xpack.fleet.agentList.forceUnenrollOneButton": "強制的に登録解除する", "xpack.fleet.agentList.hostColumnTitle": "ホスト", @@ -8903,8 +8902,6 @@ "xpack.fleet.agentPolicyList.noAgentPoliciesPrompt": "エージェントポリシーがありません", "xpack.fleet.agentPolicyList.noFilteredAgentPoliciesPrompt": "エージェントポリシーが見つかりません。{clearFiltersLink}", "xpack.fleet.agentPolicyList.packagePoliciesCountColumnTitle": "統合", - "xpack.fleet.agentPolicyList.pageSubtitle": "エージェントポリシーを使用すると、エージェントとエージェントが収集するデータを管理できます。", - "xpack.fleet.agentPolicyList.pageTitle": "エージェントポリシー", "xpack.fleet.agentPolicyList.reloadAgentPoliciesButtonText": "再読み込み", "xpack.fleet.agentPolicyList.updatedOnColumnTitle": "最終更新日", "xpack.fleet.agentPolicySummaryLine.hostedPolicyTooltip": "このポリシーはFleet外で管理されます。このポリシーに関連するほとんどのアクションは使用できません。", @@ -8914,8 +8911,6 @@ "xpack.fleet.agentReassignPolicy.flyoutTitle": "新しいエージェントポリシーを割り当てる", "xpack.fleet.agentReassignPolicy.selectPolicyLabel": "エージェントポリシー", "xpack.fleet.agentReassignPolicy.successSingleNotificationTitle": "エージェントポリシーが再割り当てされました", - "xpack.fleet.agents.pageSubtitle": "ポリシーの更新を管理し、任意のサイズのエージェントのグループにデプロイします。", - "xpack.fleet.agents.pageTitle": "エージェント", "xpack.fleet.agentsInitializationErrorMessageTitle": "Elasticエージェントの集中管理を初期化できません", "xpack.fleet.agentStatus.healthyLabel": "正常", "xpack.fleet.agentStatus.inactiveLabel": "非アクティブ", @@ -8924,13 +8919,10 @@ "xpack.fleet.agentStatus.updatingLabel": "更新中", "xpack.fleet.appNavigation.agentsLinkText": "エージェント", "xpack.fleet.appNavigation.dataStreamsLinkText": "データストリーム", - "xpack.fleet.appNavigation.overviewLinkText": "概要", "xpack.fleet.appNavigation.policiesLinkText": "ポリシー", "xpack.fleet.appNavigation.sendFeedbackButton": "フィードバックを送信", "xpack.fleet.appNavigation.settingsButton": "Fleet 設定", "xpack.fleet.appTitle": "Fleet", - "xpack.fleet.betaBadge.labelText": "ベータ", - "xpack.fleet.betaBadge.tooltipText": "このプラグインは本番環境用ではありません。バグについてはディスカッションフォーラムで報告してください。", "xpack.fleet.breadcrumbs.addPackagePolicyPageTitle": "統合の追加", "xpack.fleet.breadcrumbs.agentsPageTitle": "エージェント", "xpack.fleet.breadcrumbs.allIntegrationsPageTitle": "すべて", @@ -8939,7 +8931,6 @@ "xpack.fleet.breadcrumbs.editPackagePolicyPageTitle": "統合の編集", "xpack.fleet.breadcrumbs.enrollmentTokensPageTitle": "登録トークン", "xpack.fleet.breadcrumbs.installedIntegrationsPageTitle": "インストール済み", - "xpack.fleet.breadcrumbs.overviewPageTitle": "概要", "xpack.fleet.breadcrumbs.policiesPageTitle": "ポリシー", "xpack.fleet.config.invalidPackageVersionError": "有効なサーバーまたはキーワード「latest」でなければなりません", "xpack.fleet.copyAgentPolicy.confirmModal.cancelButtonLabel": "キャンセル", @@ -8998,8 +8989,6 @@ "xpack.fleet.dataStreamList.namespaceColumnTitle": "名前空間", "xpack.fleet.dataStreamList.noDataStreamsPrompt": "データストリームがありません", "xpack.fleet.dataStreamList.noFilteredDataStreamsMessage": "一致するデータストリームが見つかりません", - "xpack.fleet.dataStreamList.pageSubtitle": "エージェントが作成したデータを管理します。", - "xpack.fleet.dataStreamList.pageTitle": "データストリーム", "xpack.fleet.dataStreamList.reloadDataStreamsButtonText": "再読み込み", "xpack.fleet.dataStreamList.searchPlaceholderTitle": "データストリームをフィルター", "xpack.fleet.dataStreamList.sizeColumnTitle": "サイズ", @@ -9188,8 +9177,6 @@ "xpack.fleet.integrations.updatePackage.updatePackageButtonLabel": "最新バージョンに更新", "xpack.fleet.invalidLicenseDescription": "現在のライセンスは期限切れです。登録されたビートエージェントは引き続き動作しますが、Elastic Fleet インターフェイスにアクセスするには有効なライセンスが必要です。", "xpack.fleet.invalidLicenseTitle": "ライセンスの期限切れ", - "xpack.fleet.listTabs.agentTitle": "エージェント", - "xpack.fleet.listTabs.enrollmentTokensTitle": "登録トークン", "xpack.fleet.namespaceValidation.invalidCharactersErrorMessage": "名前空間に無効な文字が含まれています", "xpack.fleet.namespaceValidation.lowercaseErrorMessage": "名前空間は小文字で指定する必要があります", "xpack.fleet.namespaceValidation.requiredErrorMessage": "名前空間は必須です", @@ -9202,33 +9189,8 @@ "xpack.fleet.noAccess.accessDeniedDescription": "Elastic Fleet にアクセスする権限がありません。Elastic Fleet を使用するには、このアプリケーションの読み取り権または全権を含むユーザーロールが必要です。", "xpack.fleet.noAccess.accessDeniedTitle": "アクセスが拒否されました", "xpack.fleet.oldAppTitle": "Ingest Manager", - "xpack.fleet.overviewAgentActiveTitle": "アクティブ", - "xpack.fleet.overviewAgentErrorTitle": "エラー", - "xpack.fleet.overviewAgentOfflineTitle": "オフライン", - "xpack.fleet.overviewAgentTotalTitle": "合計エージェント数", - "xpack.fleet.overviewDatastreamNamespacesTitle": "名前空間", - "xpack.fleet.overviewDatastreamSizeTitle": "合計サイズ", - "xpack.fleet.overviewDatastreamTotalTitle": "データストリーム", - "xpack.fleet.overviewIntegrationsInstalledTitle": "インストール済み", - "xpack.fleet.overviewIntegrationsTotalTitle": "合計利用可能数", - "xpack.fleet.overviewIntegrationsUpdatesAvailableTitle": "更新が可能です", - "xpack.fleet.overviewPackagePolicyTitle": "使用済みの統合", - "xpack.fleet.overviewPageAgentsPanelTitle": "エージェント", - "xpack.fleet.overviewPageDataStreamsPanelAction": "データストリームを表示", - "xpack.fleet.overviewPageDataStreamsPanelTitle": "データストリーム", - "xpack.fleet.overviewPageDataStreamsPanelTooltip": "エージェントが収集するデータはさまざまなデータストリームに整理されます。", - "xpack.fleet.overviewPageEnrollAgentButton": "エージェントの追加", - "xpack.fleet.overviewPageFleetPanelAction": "エージェントを表示", - "xpack.fleet.overviewPageFleetPanelTooltip": "Fleetを使用して、中央の場所からエージェントを登録し、ポリシーを管理します。", - "xpack.fleet.overviewPageIntegrationsPanelAction": "統合を表示", - "xpack.fleet.overviewPageIntegrationsPanelTitle": "統合", - "xpack.fleet.overviewPageIntegrationsPanelTooltip": "Elastic Stackの統合を参照し、インストールします。統合をエージェントポリシーに追加し、データの送信を開始します。", - "xpack.fleet.overviewPagePoliciesPanelAction": "ポリシーを表示", - "xpack.fleet.overviewPagePoliciesPanelTitle": "エージェントポリシー", - "xpack.fleet.overviewPagePoliciesPanelTooltip": "エージェントポリシーを使用すると、エージェントが収集するデータを管理できます。", "xpack.fleet.overviewPageSubtitle": "Elasticエージェントとポリシーを中央の場所で管理します。", "xpack.fleet.overviewPageTitle": "Fleet", - "xpack.fleet.overviewPolicyTotalTitle": "合計利用可能数", "xpack.fleet.packagePolicyInputOverrideError": "パッケージ{packageName}には入力タイプ{inputType}が存在しません。", "xpack.fleet.packagePolicyStreamOverrideError": "パッケージ{packageName}の{inputType}にはデータストリーム{streamSet}が存在しません", "xpack.fleet.packagePolicyStreamVarOverrideError": "パッケージ{packageName}の{inputType}の{streamSet}にはVar {varName}が存在しません", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index 998b2a4c672872..2f86597f4c5c50 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -8906,7 +8906,6 @@ "xpack.fleet.agentList.addButton": "添加代理", "xpack.fleet.agentList.agentUpgradeLabel": "升级可用", "xpack.fleet.agentList.clearFiltersLinkText": "清除筛选", - "xpack.fleet.agentList.enrollButton": "添加代理", "xpack.fleet.agentList.errorFetchingDataTitle": "获取代理时出错", "xpack.fleet.agentList.forceUnenrollOneButton": "强制取消注册", "xpack.fleet.agentList.hostColumnTitle": "主机", @@ -8981,8 +8980,6 @@ "xpack.fleet.agentPolicyList.noAgentPoliciesPrompt": "无代理策略", "xpack.fleet.agentPolicyList.noFilteredAgentPoliciesPrompt": "找不到任何代理策略。{clearFiltersLink}", "xpack.fleet.agentPolicyList.packagePoliciesCountColumnTitle": "集成", - "xpack.fleet.agentPolicyList.pageSubtitle": "使用代理策略管理代理及其收集的数据。", - "xpack.fleet.agentPolicyList.pageTitle": "代理策略", "xpack.fleet.agentPolicyList.reloadAgentPoliciesButtonText": "重新加载", "xpack.fleet.agentPolicyList.updatedOnColumnTitle": "上次更新时间", "xpack.fleet.agentPolicySummaryLine.hostedPolicyTooltip": "此策略是在 Fleet 外进行管理的。与此策略相关的操作多数不可用。", @@ -8994,8 +8991,6 @@ "xpack.fleet.agentReassignPolicy.policyDescription": "选定代理策略将收集 {count, plural, other {{countValue} 个集成} }的数据：", "xpack.fleet.agentReassignPolicy.selectPolicyLabel": "代理策略", "xpack.fleet.agentReassignPolicy.successSingleNotificationTitle": "代理策略已重新分配", - "xpack.fleet.agents.pageSubtitle": "管理策略更新并将其部署到一组任意大小的代理。", - "xpack.fleet.agents.pageTitle": "代理", "xpack.fleet.agentsInitializationErrorMessageTitle": "无法为 Elastic 代理初始化集中管理", "xpack.fleet.agentStatus.healthyLabel": "运行正常", "xpack.fleet.agentStatus.inactiveLabel": "非活动", @@ -9004,13 +8999,10 @@ "xpack.fleet.agentStatus.updatingLabel": "正在更新", "xpack.fleet.appNavigation.agentsLinkText": "代理", "xpack.fleet.appNavigation.dataStreamsLinkText": "数据流", - "xpack.fleet.appNavigation.overviewLinkText": "概览", "xpack.fleet.appNavigation.policiesLinkText": "策略", "xpack.fleet.appNavigation.sendFeedbackButton": "发送反馈", "xpack.fleet.appNavigation.settingsButton": "Fleet 设置", "xpack.fleet.appTitle": "Fleet", - "xpack.fleet.betaBadge.labelText": "公测版", - "xpack.fleet.betaBadge.tooltipText": "不推荐在生产环境中使用此插件。请在我们讨论论坛中报告错误。", "xpack.fleet.breadcrumbs.addPackagePolicyPageTitle": "添加集成", "xpack.fleet.breadcrumbs.agentsPageTitle": "代理", "xpack.fleet.breadcrumbs.allIntegrationsPageTitle": "全部", @@ -9019,7 +9011,6 @@ "xpack.fleet.breadcrumbs.editPackagePolicyPageTitle": "编辑集成", "xpack.fleet.breadcrumbs.enrollmentTokensPageTitle": "注册令牌", "xpack.fleet.breadcrumbs.installedIntegrationsPageTitle": "已安装", - "xpack.fleet.breadcrumbs.overviewPageTitle": "概览", "xpack.fleet.breadcrumbs.policiesPageTitle": "策略", "xpack.fleet.config.invalidPackageVersionError": "必须是有效的 semver 或关键字 `latest`", "xpack.fleet.copyAgentPolicy.confirmModal.cancelButtonLabel": "取消", @@ -9080,8 +9071,6 @@ "xpack.fleet.dataStreamList.namespaceColumnTitle": "命名空间", "xpack.fleet.dataStreamList.noDataStreamsPrompt": "无数据流", "xpack.fleet.dataStreamList.noFilteredDataStreamsMessage": "找不到匹配的数据流", - "xpack.fleet.dataStreamList.pageSubtitle": "管理您的代理创建的数据。", - "xpack.fleet.dataStreamList.pageTitle": "数据流", "xpack.fleet.dataStreamList.reloadDataStreamsButtonText": "重新加载", "xpack.fleet.dataStreamList.searchPlaceholderTitle": "筛选数据流", "xpack.fleet.dataStreamList.sizeColumnTitle": "大小", @@ -9274,8 +9263,6 @@ "xpack.fleet.integrations.updatePackage.updatePackageButtonLabel": "更新到最新版本", "xpack.fleet.invalidLicenseDescription": "您当前的许可证已过期。已注册 Beats 代理将继续工作，但您需要有效的许可证，才能访问 Elastic Fleet 界面。", "xpack.fleet.invalidLicenseTitle": "已过期许可证", - "xpack.fleet.listTabs.agentTitle": "代理", - "xpack.fleet.listTabs.enrollmentTokensTitle": "注册令牌", "xpack.fleet.namespaceValidation.invalidCharactersErrorMessage": "命名空间包含无效字符", "xpack.fleet.namespaceValidation.lowercaseErrorMessage": "命名空间必须小写", "xpack.fleet.namespaceValidation.requiredErrorMessage": "“命名空间”必填", @@ -9288,33 +9275,8 @@ "xpack.fleet.noAccess.accessDeniedDescription": "您无权访问 Elastic Fleet。要使用 Elastic Fleet，您需要包含此应用程序读取权限或所有权限的用户角色。", "xpack.fleet.noAccess.accessDeniedTitle": "访问被拒绝", "xpack.fleet.oldAppTitle": "采集管理器", - "xpack.fleet.overviewAgentActiveTitle": "活动", - "xpack.fleet.overviewAgentErrorTitle": "错误", - "xpack.fleet.overviewAgentOfflineTitle": "脱机", - "xpack.fleet.overviewAgentTotalTitle": "代理总数", - "xpack.fleet.overviewDatastreamNamespacesTitle": "命名空间", - "xpack.fleet.overviewDatastreamSizeTitle": "总大小", - "xpack.fleet.overviewDatastreamTotalTitle": "数据流", - "xpack.fleet.overviewIntegrationsInstalledTitle": "已安装", - "xpack.fleet.overviewIntegrationsTotalTitle": "可用总计", - "xpack.fleet.overviewIntegrationsUpdatesAvailableTitle": "可用更新", - "xpack.fleet.overviewPackagePolicyTitle": "已使用的集成", - "xpack.fleet.overviewPageAgentsPanelTitle": "代理", - "xpack.fleet.overviewPageDataStreamsPanelAction": "查看数据流", - "xpack.fleet.overviewPageDataStreamsPanelTitle": "数据流", - "xpack.fleet.overviewPageDataStreamsPanelTooltip": "您的代理收集的数据组织到各种数据流中。", - "xpack.fleet.overviewPageEnrollAgentButton": "添加代理", - "xpack.fleet.overviewPageFleetPanelAction": "查看代理", - "xpack.fleet.overviewPageFleetPanelTooltip": "使用 Fleet 注册代理并从中央位置管理其策略。", - "xpack.fleet.overviewPageIntegrationsPanelAction": "查看集成", - "xpack.fleet.overviewPageIntegrationsPanelTitle": "集成", - "xpack.fleet.overviewPageIntegrationsPanelTooltip": "浏览并安装适用于 Elastic Stack 的集成。将集成添加到您的代理策略，以开始发送数据。", - "xpack.fleet.overviewPagePoliciesPanelAction": "查看策略", - "xpack.fleet.overviewPagePoliciesPanelTitle": "代理策略", - "xpack.fleet.overviewPagePoliciesPanelTooltip": "使用代理策略控制您的代理收集的数据。", "xpack.fleet.overviewPageSubtitle": "在集中位置管理 Elastic 代理及其策略。", "xpack.fleet.overviewPageTitle": "Fleet", - "xpack.fleet.overviewPolicyTotalTitle": "可用总计", "xpack.fleet.packagePolicyInputOverrideError": "输入类型 {inputType} 在软件包 {packageName} 上不存在", "xpack.fleet.packagePolicyStreamOverrideError": "数据流 {streamSet} 在软件包 {packageName} 的 {inputType} 上不存在", "xpack.fleet.packagePolicyStreamVarOverrideError": "变量 {varName} 在软件包 {packageName} 的 {inputType} 的 {streamSet} 上不存在", diff --git a/x-pack/test/fleet_functional/apps/fleet/agents_page.ts b/x-pack/test/fleet_functional/apps/fleet/agents_page.ts new file mode 100644 index 00000000000000..515eaa65f5310a --- /dev/null +++ b/x-pack/test/fleet_functional/apps/fleet/agents_page.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 { FtrProviderContext } from '../../ftr_provider_context'; + +export default function ({ getPageObjects, getService }: FtrProviderContext) { + const { agentsPage } = getPageObjects(['agentsPage']); + + describe('When in the Fleet application', function () { + this.tags(['ciGroup7']); + + describe('and on the agents page', () => { + before(async () => { + await agentsPage.navigateToAgentsPage(); + }); + + it('should show the agents tab', async () => { + await agentsPage.agentsTabExistsOrFail(); + }); + + it('should show the agent policies tab', async () => { + await agentsPage.agentPoliciesTabExistsOrFail(); + }); + + it('should show the enrollment tokens tab', async () => { + await agentsPage.enrollmentTokensTabExistsOrFail(); + }); + + it('should show the data streams tab', async () => { + await agentsPage.dataStreamsTabExistsOrFail(); + }); + }); + }); +} diff --git a/x-pack/test/fleet_functional/apps/fleet/index.ts b/x-pack/test/fleet_functional/apps/fleet/index.ts index 23a070cb799340..ec16e2d8571831 100644 --- a/x-pack/test/fleet_functional/apps/fleet/index.ts +++ b/x-pack/test/fleet_functional/apps/fleet/index.ts @@ -12,6 +12,6 @@ export default function (providerContext: FtrProviderContext) { describe('endpoint', function () { this.tags('ciGroup7'); - loadTestFile(require.resolve('./overview_page')); + loadTestFile(require.resolve('./agents_page')); }); } diff --git a/x-pack/test/fleet_functional/apps/fleet/overview_page.ts b/x-pack/test/fleet_functional/apps/fleet/overview_page.ts deleted file mode 100644 index 3d3b069665448b..00000000000000 --- a/x-pack/test/fleet_functional/apps/fleet/overview_page.ts +++ /dev/null @@ -1,38 +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 { FtrProviderContext } from '../../ftr_provider_context'; - -export default function ({ getPageObjects, getService }: FtrProviderContext) { - const { overviewPage } = getPageObjects(['overviewPage']); - - describe('When in the Fleet application', function () { - this.tags(['ciGroup7']); - - describe('and on the Overview page', () => { - before(async () => { - await overviewPage.navigateToOverview(); - }); - - it('should show the Integrations section', async () => { - await overviewPage.integrationsSectionExistsOrFail(); - }); - - it('should show the Agents section', async () => { - await overviewPage.agentSectionExistsOrFail(); - }); - - it('should show the Agent policies section', async () => { - await overviewPage.agentPolicySectionExistsOrFail(); - }); - - it('should show the Data streams section', async () => { - await overviewPage.datastreamSectionExistsOrFail(); - }); - }); - }); -} diff --git a/x-pack/test/fleet_functional/page_objects/overview_page.ts b/x-pack/test/fleet_functional/page_objects/agents_page.ts similarity index 55% rename from x-pack/test/fleet_functional/page_objects/overview_page.ts rename to x-pack/test/fleet_functional/page_objects/agents_page.ts index 2fd351184c7fe9..99e9ebfdcc15a5 100644 --- a/x-pack/test/fleet_functional/page_objects/overview_page.ts +++ b/x-pack/test/fleet_functional/page_objects/agents_page.ts @@ -11,31 +11,32 @@ import { PLUGIN_ID } from '../../../plugins/fleet/common'; // NOTE: import path below should be the deep path to the actual module - else we get CI errors import { pagePathGetters } from '../../../plugins/fleet/public/constants/page_paths'; -export function OverviewPage({ getService, getPageObjects }: FtrProviderContext) { +export function AgentsPage({ getService, getPageObjects }: FtrProviderContext) { const pageObjects = getPageObjects(['common']); const testSubjects = getService('testSubjects'); return { - async navigateToOverview() { + async navigateToAgentsPage() { await pageObjects.common.navigateToApp(PLUGIN_ID, { - hash: pagePathGetters.overview()[1], + // Fleet's "/" route should redirect to "/agents" + hash: pagePathGetters.base()[1], }); }, - async integrationsSectionExistsOrFail() { - await testSubjects.existOrFail('fleet-integrations-section'); + async agentsTabExistsOrFail() { + await testSubjects.existOrFail('fleet-agents-tab'); }, - async agentPolicySectionExistsOrFail() { - await testSubjects.existOrFail('fleet-agent-policy-section'); + async agentPoliciesTabExistsOrFail() { + await testSubjects.existOrFail('fleet-agent-policies-tab'); }, - async agentSectionExistsOrFail() { - await testSubjects.existOrFail('fleet-agent-section'); + async enrollmentTokensTabExistsOrFail() { + await testSubjects.existOrFail('fleet-enrollment-tokens-tab'); }, - async datastreamSectionExistsOrFail() { - await testSubjects.existOrFail('fleet-datastream-section'); + async dataStreamsTabExistsOrFail() { + await testSubjects.existOrFail('fleet-datastreams-tab'); }, }; } diff --git a/x-pack/test/fleet_functional/page_objects/index.ts b/x-pack/test/fleet_functional/page_objects/index.ts index 2c534285146e54..f0543aa3c7e89e 100644 --- a/x-pack/test/fleet_functional/page_objects/index.ts +++ b/x-pack/test/fleet_functional/page_objects/index.ts @@ -6,9 +6,9 @@ */ import { pageObjects as xpackFunctionalPageObjects } from '../../functional/page_objects'; -import { OverviewPage } from './overview_page'; +import { AgentsPage } from './agents_page'; export const pageObjects = { ...xpackFunctionalPageObjects, - overviewPage: OverviewPage, + agentsPage: AgentsPage, }; From c26d178937d9283691c9566a0c15740cee4bccbf Mon Sep 17 00:00:00 2001 From: Tim Sullivan Date: Wed, 16 Jun 2021 10:32:48 -0700 Subject: [PATCH 27/46] [Reporting] remove unused reference to path.data config (#102267) --- x-pack/plugins/reporting/server/config/config.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/x-pack/plugins/reporting/server/config/config.ts b/x-pack/plugins/reporting/server/config/config.ts index 69eafba994b74f..cd4dbd7c19956c 100644 --- a/x-pack/plugins/reporting/server/config/config.ts +++ b/x-pack/plugins/reporting/server/config/config.ts @@ -6,8 +6,7 @@ */ import { get } from 'lodash'; -import { Observable } from 'rxjs'; -import { first, map } from 'rxjs/operators'; +import { first } from 'rxjs/operators'; import { CoreSetup, PluginInitializerContext } from 'src/core/server'; import { LevelLogger } from '../lib'; import { createConfig$ } from './create_config'; @@ -43,7 +42,6 @@ interface Config { } interface KbnServerConfigType { - path: { data: Observable }; server: { basePath: string; host: string; @@ -68,9 +66,6 @@ export const buildConfig = async ( const serverInfo = http.getServerInfo(); const kbnConfig = { - path: { - data: initContext.config.legacy.globalConfig$.pipe(map((c) => c.path.data)), - }, server: { basePath: core.http.basePath.serverBasePath, host: serverInfo.hostname, From 154150732d3a0c6dd74f50a69e861baeeb551c5b Mon Sep 17 00:00:00 2001 From: Robert Oskamp Date: Wed, 16 Jun 2021 19:42:44 +0200 Subject: [PATCH 28/46] [ML] Functional tests - fix and re-activate alerting flyout test (#102368) This PR fixes the ML alerting flyout tests and re-activates it. --- x-pack/test/functional_with_es_ssl/apps/ml/alert_flyout.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/x-pack/test/functional_with_es_ssl/apps/ml/alert_flyout.ts b/x-pack/test/functional_with_es_ssl/apps/ml/alert_flyout.ts index 777e6fd598f454..ba7243efe1773f 100644 --- a/x-pack/test/functional_with_es_ssl/apps/ml/alert_flyout.ts +++ b/x-pack/test/functional_with_es_ssl/apps/ml/alert_flyout.ts @@ -67,8 +67,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { let testJobId = ''; - // Failing: See https://github.com/elastic/kibana/issues/102012 - describe.skip('anomaly detection alert', function () { + describe('anomaly detection alert', function () { this.tags('ciGroup13'); before(async () => { @@ -119,11 +118,11 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { await ml.testExecution.logTestStep('should preview the alert condition'); await ml.alerting.assertPreviewButtonState(false); - await ml.alerting.setTestInterval('2y'); + await ml.alerting.setTestInterval('5y'); await ml.alerting.assertPreviewButtonState(true); // don't check the exact number provided by the backend, just make sure it's > 0 - await ml.alerting.checkPreview(/Found [1-9]\d* anomalies in the last 2y/); + await ml.alerting.checkPreview(/Found [1-9]\d* anomal(y|ies) in the last 5y/); await ml.testExecution.logTestStep('should create an alert'); await pageObjects.triggersActionsUI.setAlertName('ml-test-alert'); From 8eea4914126fc079cfb77dce29e4ec1899c64807 Mon Sep 17 00:00:00 2001 From: Dario Gieselaar Date: Wed, 16 Jun 2021 20:15:59 +0200 Subject: [PATCH 29/46] [RAC] Update alert documents in lifecycle rule type helper (#101598) Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../server/lib/services/get_service_alerts.ts | 6 +- .../server/lib/rules/get_top_alerts.ts | 12 +- x-pack/plugins/rule_registry/README.md | 3 - .../create_rule_data_client_mock.ts | 42 ++ .../server/rule_data_client/index.ts | 37 +- .../utils/create_lifecycle_rule_type.test.ts | 381 ++++++++++++++++++ .../create_lifecycle_rule_type_factory.ts | 29 +- .../tests/alerts/rule_registry.ts | 23 +- 8 files changed, 501 insertions(+), 32 deletions(-) create mode 100644 x-pack/plugins/rule_registry/server/rule_data_client/create_rule_data_client_mock.ts create mode 100644 x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_type.test.ts diff --git a/x-pack/plugins/apm/server/lib/services/get_service_alerts.ts b/x-pack/plugins/apm/server/lib/services/get_service_alerts.ts index f58452ce4d9160..2141570f521c01 100644 --- a/x-pack/plugins/apm/server/lib/services/get_service_alerts.ts +++ b/x-pack/plugins/apm/server/lib/services/get_service_alerts.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { ALERT_UUID } from '@kbn/rule-data-utils/target/technical_field_names'; +import { EVENT_KIND } from '@kbn/rule-data-utils/target/technical_field_names'; import { RuleDataClient } from '../../../../rule_registry/server'; import { SERVICE_NAME, @@ -36,6 +36,7 @@ export async function getServiceAlerts({ ...rangeQuery(start, end), ...environmentQuery(environment), { term: { [SERVICE_NAME]: serviceName } }, + { term: { [EVENT_KIND]: 'signal' } }, ], should: [ { @@ -64,9 +65,6 @@ export async function getServiceAlerts({ }, size: 100, fields: ['*'], - collapse: { - field: ALERT_UUID, - }, sort: { '@timestamp': 'desc', }, diff --git a/x-pack/plugins/observability/server/lib/rules/get_top_alerts.ts b/x-pack/plugins/observability/server/lib/rules/get_top_alerts.ts index 9560de6ec00ff0..db8191136686a1 100644 --- a/x-pack/plugins/observability/server/lib/rules/get_top_alerts.ts +++ b/x-pack/plugins/observability/server/lib/rules/get_top_alerts.ts @@ -4,7 +4,7 @@ * 2.0; you may not use this file except in compliance with the Elastic License * 2.0. */ -import { ALERT_UUID, TIMESTAMP } from '@kbn/rule-data-utils/target/technical_field_names'; +import { EVENT_KIND, TIMESTAMP } from '@kbn/rule-data-utils/target/technical_field_names'; import { RuleDataClient } from '../../../../rule_registry/server'; import type { AlertStatus } from '../../../common/typings'; import { kqlQuery, rangeQuery, alertStatusQuery } from '../../utils/queries'; @@ -28,13 +28,15 @@ export async function getTopAlerts({ body: { query: { bool: { - filter: [...rangeQuery(start, end), ...kqlQuery(kuery), ...alertStatusQuery(status)], + filter: [ + ...rangeQuery(start, end), + ...kqlQuery(kuery), + ...alertStatusQuery(status), + { term: { [EVENT_KIND]: 'signal' } }, + ], }, }, fields: ['*'], - collapse: { - field: ALERT_UUID, - }, size, sort: { [TIMESTAMP]: 'desc', diff --git a/x-pack/plugins/rule_registry/README.md b/x-pack/plugins/rule_registry/README.md index e12c2b29ed3738..3fe6305a0d9f6e 100644 --- a/x-pack/plugins/rule_registry/README.md +++ b/x-pack/plugins/rule_registry/README.md @@ -111,9 +111,6 @@ const response = await ruleDataClient.getReader().search({ }, size: 100, fields: ['*'], - collapse: { - field: ALERT_UUID, - }, sort: { '@timestamp': 'desc', }, diff --git a/x-pack/plugins/rule_registry/server/rule_data_client/create_rule_data_client_mock.ts b/x-pack/plugins/rule_registry/server/rule_data_client/create_rule_data_client_mock.ts new file mode 100644 index 00000000000000..18f3c21fafc155 --- /dev/null +++ b/x-pack/plugins/rule_registry/server/rule_data_client/create_rule_data_client_mock.ts @@ -0,0 +1,42 @@ +/* + * Copyright 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 { Assign } from '@kbn/utility-types'; +import type { RuleDataClient } from '.'; +import { RuleDataReader, RuleDataWriter } from './types'; + +type MockInstances> = { + [K in keyof T]: T[K] extends (...args: infer TArgs) => infer TReturn + ? jest.MockInstance + : never; +}; + +export function createRuleDataClientMock() { + const bulk = jest.fn(); + const search = jest.fn(); + const getDynamicIndexPattern = jest.fn(); + + return ({ + createOrUpdateWriteTarget: jest.fn(({ namespace }) => Promise.resolve()), + getReader: jest.fn(() => ({ + getDynamicIndexPattern, + search, + })), + getWriter: jest.fn(() => ({ + bulk, + })), + } as unknown) as Assign< + RuleDataClient & Omit, 'options' | 'getClusterClient'>, + { + getWriter: ( + ...args: Parameters + ) => MockInstances; + getReader: ( + ...args: Parameters + ) => MockInstances; + } + >; +} diff --git a/x-pack/plugins/rule_registry/server/rule_data_client/index.ts b/x-pack/plugins/rule_registry/server/rule_data_client/index.ts index cd7467c903e52b..cb336580ca3540 100644 --- a/x-pack/plugins/rule_registry/server/rule_data_client/index.ts +++ b/x-pack/plugins/rule_registry/server/rule_data_client/index.ts @@ -4,6 +4,8 @@ * 2.0; you may not use this file except in compliance with the Elastic License * 2.0. */ + +import { isEmpty } from 'lodash'; import type { estypes } from '@elastic/elasticsearch'; import { ResponseError } from '@elastic/elasticsearch/lib/errors'; import { IndexPatternsFetcher } from '../../../../../src/plugins/data/server'; @@ -44,15 +46,26 @@ export class RuleDataClient implements IRuleDataClient { const clusterClient = await this.getClusterClient(); const indexPatternsFetcher = new IndexPatternsFetcher(clusterClient); - const fields = await indexPatternsFetcher.getFieldsForWildcard({ - pattern: index, - }); - - return { - fields, - timeFieldName: '@timestamp', - title: index, - }; + try { + const fields = await indexPatternsFetcher.getFieldsForWildcard({ + pattern: index, + }); + + return { + fields, + timeFieldName: '@timestamp', + title: index, + }; + } catch (err) { + if (err.output?.payload?.code === 'no_matching_indices') { + return { + fields: [], + timeFieldName: '@timestamp', + title: index, + }; + } + throw err; + } }, }; } @@ -127,6 +140,12 @@ export class RuleDataClient implements IRuleDataClient { const mappings: estypes.MappingTypeMapping = simulateResponse.template.mappings; + if (isEmpty(mappings)) { + throw new Error( + 'No mappings would be generated for this index, possibly due to failed/misconfigured bootstrapping' + ); + } + await clusterClient.indices.putMapping({ index: `${alias}*`, body: mappings }); } } diff --git a/x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_type.test.ts b/x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_type.test.ts new file mode 100644 index 00000000000000..85e69eb51fd02f --- /dev/null +++ b/x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_type.test.ts @@ -0,0 +1,381 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { schema } from '@kbn/config-schema'; +import { loggerMock } from '@kbn/logging/target/mocks'; +import { castArray, omit, mapValues } from 'lodash'; +import { RuleDataClient } from '../rule_data_client'; +import { createRuleDataClientMock } from '../rule_data_client/create_rule_data_client_mock'; +import { createLifecycleRuleTypeFactory } from './create_lifecycle_rule_type_factory'; + +type RuleTestHelpers = ReturnType; + +function createRule() { + const ruleDataClientMock = createRuleDataClientMock(); + + const factory = createLifecycleRuleTypeFactory({ + ruleDataClient: (ruleDataClientMock as unknown) as RuleDataClient, + logger: loggerMock.create(), + }); + + let nextAlerts: Array<{ id: string; fields: Record }> = []; + + const type = factory({ + actionGroups: [ + { + id: 'warning', + name: 'warning', + }, + ], + defaultActionGroupId: 'warning', + executor: async ({ services }) => { + nextAlerts.forEach((alert) => { + services.alertWithLifecycle(alert); + }); + nextAlerts = []; + }, + id: 'test_type', + minimumLicenseRequired: 'basic', + name: 'Test type', + producer: 'test', + actionVariables: { + context: [], + params: [], + state: [], + }, + validate: { + params: schema.object({}, { unknowns: 'allow' }), + }, + }); + + let state: Record = {}; + let previousStartedAt: Date | null; + const createdAt = new Date('2021-06-16T09:00:00.000Z'); + + const scheduleActions = jest.fn(); + + const alertInstanceFactory = () => { + return { + scheduleActions, + } as any; + }; + + return { + alertWithLifecycle: async (alerts: Array<{ id: string; fields: Record }>) => { + nextAlerts = alerts; + + const startedAt = new Date((previousStartedAt ?? createdAt).getTime() + 60000); + + scheduleActions.mockClear(); + + state = await type.executor({ + alertId: 'alertId', + createdBy: 'createdBy', + name: 'name', + params: {}, + previousStartedAt, + startedAt, + rule: { + actions: [], + consumer: 'consumer', + createdAt, + createdBy: 'createdBy', + enabled: true, + name: 'name', + notifyWhen: 'onActionGroupChange', + producer: 'producer', + ruleTypeId: 'ruleTypeId', + ruleTypeName: 'ruleTypeName', + schedule: { + interval: '1m', + }, + tags: ['tags'], + throttle: null, + updatedAt: createdAt, + updatedBy: 'updatedBy', + }, + services: { + alertInstanceFactory, + savedObjectsClient: {} as any, + scopedClusterClient: {} as any, + }, + spaceId: 'spaceId', + state, + tags: ['tags'], + updatedBy: 'updatedBy', + namespace: 'namespace', + }); + + previousStartedAt = startedAt; + }, + scheduleActions, + ruleDataClientMock, + }; +} + +describe('createLifecycleRuleTypeFactory', () => { + describe('with a new rule', () => { + let helpers: RuleTestHelpers; + + beforeEach(() => { + helpers = createRule(); + }); + + describe('when alerts are new', () => { + beforeEach(async () => { + await helpers.alertWithLifecycle([ + { + id: 'opbeans-java', + fields: { + 'service.name': 'opbeans-java', + }, + }, + { + id: 'opbeans-node', + fields: { + 'service.name': 'opbeans-node', + }, + }, + ]); + }); + + it('writes the correct alerts', () => { + expect(helpers.ruleDataClientMock.getWriter().bulk).toHaveBeenCalledTimes(1); + + const body = helpers.ruleDataClientMock.getWriter().bulk.mock.calls[0][0].body!; + + const documents = body.filter((op: any) => !('index' in op)) as any[]; + + const evaluationDocuments = documents.filter((doc) => doc['event.kind'] === 'event'); + const alertDocuments = documents.filter((doc) => doc['event.kind'] === 'signal'); + + expect(evaluationDocuments.length).toBe(2); + expect(alertDocuments.length).toBe(2); + + expect( + alertDocuments.every((doc) => doc['kibana.rac.alert.status'] === 'open') + ).toBeTruthy(); + + expect( + alertDocuments.every((doc) => doc['kibana.rac.alert.duration.us'] === 0) + ).toBeTruthy(); + + expect(alertDocuments.every((doc) => doc['event.action'] === 'open')).toBeTruthy(); + + expect(documents.map((doc) => omit(doc, 'kibana.rac.alert.uuid'))).toMatchInlineSnapshot(` + Array [ + Object { + "@timestamp": "2021-06-16T09:01:00.000Z", + "event.action": "open", + "event.kind": "event", + "kibana.rac.alert.duration.us": 0, + "kibana.rac.alert.id": "opbeans-java", + "kibana.rac.alert.producer": "test", + "kibana.rac.alert.start": "2021-06-16T09:01:00.000Z", + "kibana.rac.alert.status": "open", + "rule.category": "Test type", + "rule.id": "test_type", + "rule.name": "name", + "rule.uuid": "alertId", + "service.name": "opbeans-java", + "tags": Array [ + "tags", + ], + }, + Object { + "@timestamp": "2021-06-16T09:01:00.000Z", + "event.action": "open", + "event.kind": "event", + "kibana.rac.alert.duration.us": 0, + "kibana.rac.alert.id": "opbeans-node", + "kibana.rac.alert.producer": "test", + "kibana.rac.alert.start": "2021-06-16T09:01:00.000Z", + "kibana.rac.alert.status": "open", + "rule.category": "Test type", + "rule.id": "test_type", + "rule.name": "name", + "rule.uuid": "alertId", + "service.name": "opbeans-node", + "tags": Array [ + "tags", + ], + }, + Object { + "@timestamp": "2021-06-16T09:01:00.000Z", + "event.action": "open", + "event.kind": "signal", + "kibana.rac.alert.duration.us": 0, + "kibana.rac.alert.id": "opbeans-java", + "kibana.rac.alert.producer": "test", + "kibana.rac.alert.start": "2021-06-16T09:01:00.000Z", + "kibana.rac.alert.status": "open", + "rule.category": "Test type", + "rule.id": "test_type", + "rule.name": "name", + "rule.uuid": "alertId", + "service.name": "opbeans-java", + "tags": Array [ + "tags", + ], + }, + Object { + "@timestamp": "2021-06-16T09:01:00.000Z", + "event.action": "open", + "event.kind": "signal", + "kibana.rac.alert.duration.us": 0, + "kibana.rac.alert.id": "opbeans-node", + "kibana.rac.alert.producer": "test", + "kibana.rac.alert.start": "2021-06-16T09:01:00.000Z", + "kibana.rac.alert.status": "open", + "rule.category": "Test type", + "rule.id": "test_type", + "rule.name": "name", + "rule.uuid": "alertId", + "service.name": "opbeans-node", + "tags": Array [ + "tags", + ], + }, + ] + `); + }); + }); + + describe('when alerts are active', () => { + beforeEach(async () => { + await helpers.alertWithLifecycle([ + { + id: 'opbeans-java', + fields: { + 'service.name': 'opbeans-java', + }, + }, + { + id: 'opbeans-node', + fields: { + 'service.name': 'opbeans-node', + }, + }, + ]); + + await helpers.alertWithLifecycle([ + { + id: 'opbeans-java', + fields: { + 'service.name': 'opbeans-java', + }, + }, + { + id: 'opbeans-node', + fields: { + 'service.name': 'opbeans-node', + }, + }, + ]); + }); + + it('writes the correct alerts', () => { + expect(helpers.ruleDataClientMock.getWriter().bulk).toHaveBeenCalledTimes(2); + + const body = helpers.ruleDataClientMock.getWriter().bulk.mock.calls[1][0].body!; + + const documents = body.filter((op: any) => !('index' in op)) as any[]; + + const evaluationDocuments = documents.filter((doc) => doc['event.kind'] === 'event'); + const alertDocuments = documents.filter((doc) => doc['event.kind'] === 'signal'); + + expect(evaluationDocuments.length).toBe(2); + expect(alertDocuments.length).toBe(2); + + expect( + alertDocuments.every((doc) => doc['kibana.rac.alert.status'] === 'open') + ).toBeTruthy(); + expect(alertDocuments.every((doc) => doc['event.action'] === 'active')).toBeTruthy(); + + expect(alertDocuments.every((doc) => doc['kibana.rac.alert.duration.us'] > 0)).toBeTruthy(); + }); + }); + + describe('when alerts recover', () => { + beforeEach(async () => { + await helpers.alertWithLifecycle([ + { + id: 'opbeans-java', + fields: { + 'service.name': 'opbeans-java', + }, + }, + { + id: 'opbeans-node', + fields: { + 'service.name': 'opbeans-node', + }, + }, + ]); + + const lastOpbeansNodeDoc = helpers.ruleDataClientMock + .getWriter() + .bulk.mock.calls[0][0].body?.concat() + .reverse() + .find( + (doc: any) => !('index' in doc) && doc['service.name'] === 'opbeans-node' + ) as Record; + + const stored = mapValues(lastOpbeansNodeDoc, (val) => { + return castArray(val); + }); + + helpers.ruleDataClientMock.getReader().search.mockResolvedValueOnce({ + hits: { + hits: [{ fields: stored } as any], + total: { + value: 1, + relation: 'eq', + }, + }, + took: 0, + timed_out: false, + _shards: { + failed: 0, + successful: 1, + total: 1, + }, + }); + + await helpers.alertWithLifecycle([ + { + id: 'opbeans-java', + fields: { + 'service.name': 'opbeans-java', + }, + }, + ]); + }); + + it('writes the correct alerts', () => { + expect(helpers.ruleDataClientMock.getWriter().bulk).toHaveBeenCalledTimes(2); + + const body = helpers.ruleDataClientMock.getWriter().bulk.mock.calls[1][0].body!; + + const documents = body.filter((op: any) => !('index' in op)) as any[]; + + const opbeansJavaAlertDoc = documents.find( + (doc) => castArray(doc['service.name'])[0] === 'opbeans-java' + ); + const opbeansNodeAlertDoc = documents.find( + (doc) => castArray(doc['service.name'])[0] === 'opbeans-node' + ); + + expect(opbeansJavaAlertDoc['event.action']).toBe('active'); + expect(opbeansJavaAlertDoc['kibana.rac.alert.status']).toBe('open'); + + expect(opbeansNodeAlertDoc['event.action']).toBe('close'); + expect(opbeansNodeAlertDoc['kibana.rac.alert.status']).toBe('closed'); + }); + }); + }); +}); diff --git a/x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_type_factory.ts b/x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_type_factory.ts index b523dd6770b9f3..c2e0ae7c151ca0 100644 --- a/x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_type_factory.ts +++ b/x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_type_factory.ts @@ -32,7 +32,7 @@ import { AlertTypeWithExecutor } from '../types'; import { ParsedTechnicalFields, parseTechnicalFields } from '../../common/parse_technical_fields'; import { getRuleExecutorData } from './get_rule_executor_data'; -type LifecycleAlertService> = (alert: { +export type LifecycleAlertService> = (alert: { id: string; fields: Record; }) => AlertInstance; @@ -179,7 +179,7 @@ export const createLifecycleRuleTypeFactory: CreateLifecycleRuleTypeFactory = ({ ...alertData, ...ruleExecutorData, [TIMESTAMP]: timestamp, - [EVENT_KIND]: 'state', + [EVENT_KIND]: 'event', [ALERT_ID]: alertId, }; @@ -221,8 +221,29 @@ export const createLifecycleRuleTypeFactory: CreateLifecycleRuleTypeFactory = ({ }); if (eventsToIndex.length) { + const alertEvents: Map = new Map(); + + for (const event of eventsToIndex) { + const uuid = event[ALERT_UUID]!; + let storedEvent = alertEvents.get(uuid); + if (!storedEvent) { + storedEvent = event; + } + alertEvents.set(uuid, { + ...storedEvent, + [EVENT_KIND]: 'signal', + }); + } + await ruleDataClient.getWriter().bulk({ - body: eventsToIndex.flatMap((event) => [{ index: {} }, event]), + body: eventsToIndex + .flatMap((event) => [{ index: {} }, event]) + .concat( + Array.from(alertEvents.values()).flatMap((event) => [ + { index: { _id: event[ALERT_UUID]! } }, + event, + ]) + ), }); } @@ -238,7 +259,7 @@ export const createLifecycleRuleTypeFactory: CreateLifecycleRuleTypeFactory = ({ ); return { - wrapped: nextWrappedState, + wrapped: nextWrappedState ?? {}, trackedAlerts: nextTrackedAlerts, }; }, diff --git a/x-pack/test/apm_api_integration/tests/alerts/rule_registry.ts b/x-pack/test/apm_api_integration/tests/alerts/rule_registry.ts index 1f8d1144349dd5..3c2e98cfdae47c 100644 --- a/x-pack/test/apm_api_integration/tests/alerts/rule_registry.ts +++ b/x-pack/test/apm_api_integration/tests/alerts/rule_registry.ts @@ -8,6 +8,7 @@ import expect from '@kbn/expect'; import { merge, omit } from 'lodash'; import { format } from 'url'; +import { EVENT_KIND } from '@kbn/rule-data-utils/target/technical_field_names'; import { FtrProviderContext } from '../../common/ftr_provider_context'; import { registry } from '../../common/registry'; @@ -259,7 +260,9 @@ export default function ApiTest({ getService }: FtrProviderContext) { index: ALERTS_INDEX_TARGET, body: { query: { - match_all: {}, + term: { + [EVENT_KIND]: 'signal', + }, }, size: 1, sort: { @@ -286,7 +289,9 @@ export default function ApiTest({ getService }: FtrProviderContext) { index: ALERTS_INDEX_TARGET, body: { query: { - match_all: {}, + term: { + [EVENT_KIND]: 'signal', + }, }, size: 1, sort: { @@ -313,7 +318,9 @@ export default function ApiTest({ getService }: FtrProviderContext) { index: ALERTS_INDEX_TARGET, body: { query: { - match_all: {}, + term: { + [EVENT_KIND]: 'signal', + }, }, size: 1, sort: { @@ -346,7 +353,7 @@ export default function ApiTest({ getService }: FtrProviderContext) { "open", ], "event.kind": Array [ - "state", + "signal", ], "kibana.rac.alert.duration.us": Array [ 0, @@ -416,7 +423,7 @@ export default function ApiTest({ getService }: FtrProviderContext) { "open", ], "event.kind": Array [ - "state", + "signal", ], "kibana.rac.alert.duration.us": Array [ 0, @@ -486,7 +493,9 @@ export default function ApiTest({ getService }: FtrProviderContext) { index: ALERTS_INDEX_TARGET, body: { query: { - match_all: {}, + term: { + [EVENT_KIND]: 'signal', + }, }, size: 1, sort: { @@ -521,7 +530,7 @@ export default function ApiTest({ getService }: FtrProviderContext) { "close", ], "event.kind": Array [ - "state", + "signal", ], "kibana.rac.alert.evaluation.threshold": Array [ 30, From adc95c102356867d0d3885e0a2164199f14f1d24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cau=C3=AA=20Marcondes?= <55978943+cauemarcondes@users.noreply.github.com> Date: Wed, 16 Jun 2021 14:32:22 -0400 Subject: [PATCH 30/46] [APM] Fixing time comparison types (#101423) * fixing time comparison types * fixing ts issues * addressing PR comments * addressing PR comments * addressing PR comments Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../shared/time_comparison/index.test.tsx | 374 ++++++++++-------- .../shared/time_comparison/index.tsx | 148 +++---- .../url_params_context/helpers.test.ts | 56 +++ .../context/url_params_context/helpers.ts | 30 +- .../url_params_context/resolve_url_params.ts | 2 +- .../context/url_params_context/types.ts | 2 + .../url_params_context/url_params_context.tsx | 13 +- 7 files changed, 395 insertions(+), 230 deletions(-) diff --git a/x-pack/plugins/apm/public/components/shared/time_comparison/index.test.tsx b/x-pack/plugins/apm/public/components/shared/time_comparison/index.test.tsx index a4f44290fe777f..dd87c23908cbc5 100644 --- a/x-pack/plugins/apm/public/components/shared/time_comparison/index.test.tsx +++ b/x-pack/plugins/apm/public/components/shared/time_comparison/index.test.tsx @@ -15,7 +15,7 @@ import { expectTextsInDocument, expectTextsNotInDocument, } from '../../../utils/testHelpers'; -import { TimeComparison } from './'; +import { getComparisonTypes, getSelectOptions, TimeComparison } from './'; import * as urlHelpers from '../../shared/Links/url_helpers'; import moment from 'moment'; import { TimeRangeComparisonType } from './get_time_range_comparison'; @@ -37,188 +37,248 @@ describe('TimeComparison', () => { moment.tz.setDefault('Europe/Amsterdam'); }); afterAll(() => moment.tz.setDefault('')); - const spy = jest.spyOn(urlHelpers, 'replace'); - beforeEach(() => { - jest.resetAllMocks(); - }); - describe('Time range is between 0 - 24 hours', () => { - it('sets default values', () => { - const Wrapper = getWrapper({ - start: '2021-01-28T14:45:00.000Z', - end: '2021-01-28T15:00:00.000Z', - rangeTo: 'now', - }); - render(, { - wrapper: Wrapper, - }); - expect(spy).toHaveBeenCalledWith(expect.anything(), { - query: { - comparisonEnabled: 'true', - comparisonType: TimeRangeComparisonType.DayBefore, - }, - }); + + describe('getComparisonTypes', () => { + it('shows week and day before when 15 minutes is selected', () => { + expect( + getComparisonTypes({ + start: '2021-06-04T16:17:02.335Z', + end: '2021-06-04T16:32:02.335Z', + }) + ).toEqual([ + TimeRangeComparisonType.DayBefore.valueOf(), + TimeRangeComparisonType.WeekBefore.valueOf(), + ]); }); - it('selects day before and enables comparison', () => { - const Wrapper = getWrapper({ - start: '2021-01-28T14:45:00.000Z', - end: '2021-01-28T15:00:00.000Z', - comparisonEnabled: true, - comparisonType: TimeRangeComparisonType.DayBefore, - rangeTo: 'now', - }); - const component = render(, { - wrapper: Wrapper, - }); - expectTextsInDocument(component, ['Day before', 'Week before']); + + it('shows week and day before when Today is selected', () => { expect( - (component.getByTestId('comparisonSelect') as HTMLSelectElement) - .selectedIndex - ).toEqual(0); + getComparisonTypes({ + start: '2021-06-04T04:00:00.000Z', + end: '2021-06-05T03:59:59.999Z', + }) + ).toEqual([ + TimeRangeComparisonType.DayBefore.valueOf(), + TimeRangeComparisonType.WeekBefore.valueOf(), + ]); }); - it('enables yesterday option when date difference is equal to 24 hours', () => { - const Wrapper = getWrapper({ - start: '2021-01-28T10:00:00.000Z', - end: '2021-01-29T10:00:00.000Z', - comparisonEnabled: true, - comparisonType: TimeRangeComparisonType.DayBefore, - rangeTo: 'now', - }); - const component = render(, { - wrapper: Wrapper, - }); - expectTextsInDocument(component, ['Day before', 'Week before']); + it('shows week and day before when 24 hours is selected', () => { + expect( + getComparisonTypes({ + start: '2021-06-03T16:31:35.748Z', + end: '2021-06-04T16:31:35.748Z', + }) + ).toEqual([ + TimeRangeComparisonType.DayBefore.valueOf(), + TimeRangeComparisonType.WeekBefore.valueOf(), + ]); + }); + it('shows week before when 25 hours is selected', () => { expect( - (component.getByTestId('comparisonSelect') as HTMLSelectElement) - .selectedIndex - ).toEqual(0); + getComparisonTypes({ + start: '2021-06-02T12:32:00.000Z', + end: '2021-06-03T13:32:09.079Z', + }) + ).toEqual([TimeRangeComparisonType.WeekBefore.valueOf()]); }); - it('selects previous period when rangeTo is different than now', () => { - const Wrapper = getWrapper({ - start: '2021-01-28T10:00:00.000Z', - end: '2021-01-29T10:00:00.000Z', - comparisonEnabled: true, - comparisonType: TimeRangeComparisonType.PeriodBefore, - rangeTo: 'now-15m', - }); - const component = render(, { - wrapper: Wrapper, - }); - expectTextsInDocument(component, ['27/01 11:00 - 28/01 11:00']); + it('shows week before when 7 days is selected', () => { + expect( + getComparisonTypes({ + start: '2021-05-28T16:32:17.520Z', + end: '2021-06-04T16:32:17.520Z', + }) + ).toEqual([TimeRangeComparisonType.WeekBefore.valueOf()]); + }); + it('shows period before when 8 days is selected', () => { expect( - (component.getByTestId('comparisonSelect') as HTMLSelectElement) - .selectedIndex - ).toEqual(0); + getComparisonTypes({ + start: '2021-05-27T16:32:46.747Z', + end: '2021-06-04T16:32:46.747Z', + }) + ).toEqual([TimeRangeComparisonType.PeriodBefore.valueOf()]); }); }); - describe('Time range is between 24 hours - 1 week', () => { - it("doesn't show yesterday option when date difference is greater than 24 hours", () => { - const Wrapper = getWrapper({ - start: '2021-01-28T10:00:00.000Z', - end: '2021-01-29T11:00:00.000Z', - comparisonEnabled: true, - comparisonType: TimeRangeComparisonType.WeekBefore, - rangeTo: 'now', - }); - const component = render(, { - wrapper: Wrapper, - }); - expectTextsNotInDocument(component, ['Day before']); - expectTextsInDocument(component, ['Week before']); - }); - it('sets default values', () => { - const Wrapper = getWrapper({ - start: '2021-01-26T15:00:00.000Z', - end: '2021-01-28T15:00:00.000Z', - rangeTo: 'now', - }); - render(, { - wrapper: Wrapper, - }); - expect(spy).toHaveBeenCalledWith(expect.anything(), { - query: { - comparisonEnabled: 'true', - comparisonType: TimeRangeComparisonType.WeekBefore, + describe('getSelectOptions', () => { + it('returns formatted text based on comparison type', () => { + expect( + getSelectOptions({ + comparisonTypes: [ + TimeRangeComparisonType.DayBefore, + TimeRangeComparisonType.WeekBefore, + TimeRangeComparisonType.PeriodBefore, + ], + start: '2021-05-27T16:32:46.747Z', + end: '2021-06-04T16:32:46.747Z', + }) + ).toEqual([ + { + value: TimeRangeComparisonType.DayBefore.valueOf(), + text: 'Day before', }, - }); + { + value: TimeRangeComparisonType.WeekBefore.valueOf(), + text: 'Week before', + }, + { + value: TimeRangeComparisonType.PeriodBefore.valueOf(), + text: '19/05 18:32 - 27/05 18:32', + }, + ]); }); - it('selects week and enables comparison', () => { - const Wrapper = getWrapper({ - start: '2021-01-26T15:00:00.000Z', - end: '2021-01-28T15:00:00.000Z', - comparisonEnabled: true, - comparisonType: TimeRangeComparisonType.WeekBefore, - rangeTo: 'now', - }); - const component = render(, { - wrapper: Wrapper, - }); - expectTextsNotInDocument(component, ['Day before']); - expectTextsInDocument(component, ['Week before']); + + it('formats period before as DD/MM/YY HH:mm when range years are different', () => { expect( - (component.getByTestId('comparisonSelect') as HTMLSelectElement) - .selectedIndex - ).toEqual(0); + getSelectOptions({ + comparisonTypes: [TimeRangeComparisonType.PeriodBefore], + start: '2020-05-27T16:32:46.747Z', + end: '2021-06-04T16:32:46.747Z', + }) + ).toEqual([ + { + value: TimeRangeComparisonType.PeriodBefore.valueOf(), + text: '20/05/19 18:32 - 27/05/20 18:32', + }, + ]); }); + }); - it('selects previous period when rangeTo is different than now', () => { - const Wrapper = getWrapper({ - start: '2021-01-26T15:00:00.000Z', - end: '2021-01-28T15:00:00.000Z', - comparisonEnabled: true, - comparisonType: TimeRangeComparisonType.PeriodBefore, - rangeTo: '2021-01-28T15:00:00.000Z', + describe('TimeComparison component', () => { + const spy = jest.spyOn(urlHelpers, 'replace'); + beforeEach(() => { + jest.resetAllMocks(); + }); + describe('Time range is between 0 - 24 hours', () => { + it('sets default values', () => { + const Wrapper = getWrapper({ + exactStart: '2021-06-04T16:17:02.335Z', + exactEnd: '2021-06-04T16:32:02.335Z', + }); + render(, { wrapper: Wrapper }); + expect(spy).toHaveBeenCalledWith(expect.anything(), { + query: { + comparisonEnabled: 'true', + comparisonType: TimeRangeComparisonType.DayBefore, + }, + }); }); - const component = render(, { - wrapper: Wrapper, + it('selects day before and enables comparison', () => { + const Wrapper = getWrapper({ + exactStart: '2021-06-04T16:17:02.335Z', + exactEnd: '2021-06-04T16:32:02.335Z', + comparisonEnabled: true, + comparisonType: TimeRangeComparisonType.DayBefore, + }); + const component = render(, { wrapper: Wrapper }); + expectTextsInDocument(component, ['Day before', 'Week before']); + expect( + (component.getByTestId('comparisonSelect') as HTMLSelectElement) + .selectedIndex + ).toEqual(0); + }); + + it('enables day before option when date difference is equal to 24 hours', () => { + const Wrapper = getWrapper({ + exactStart: '2021-06-03T16:31:35.748Z', + exactEnd: '2021-06-04T16:31:35.748Z', + comparisonEnabled: true, + comparisonType: TimeRangeComparisonType.DayBefore, + }); + const component = render(, { wrapper: Wrapper }); + expectTextsInDocument(component, ['Day before', 'Week before']); + expect( + (component.getByTestId('comparisonSelect') as HTMLSelectElement) + .selectedIndex + ).toEqual(0); }); - expectTextsInDocument(component, ['24/01 16:00 - 26/01 16:00']); - expect( - (component.getByTestId('comparisonSelect') as HTMLSelectElement) - .selectedIndex - ).toEqual(0); }); - }); - describe('Time range is greater than 7 days', () => { - it('Shows absolute times without year when within the same year', () => { - const Wrapper = getWrapper({ - start: '2021-01-20T15:00:00.000Z', - end: '2021-01-28T15:00:00.000Z', - comparisonEnabled: true, - comparisonType: TimeRangeComparisonType.PeriodBefore, - rangeTo: 'now', + describe('Time range is between 24 hours - 1 week', () => { + it("doesn't show day before option when date difference is greater than 24 hours", () => { + const Wrapper = getWrapper({ + exactStart: '2021-06-02T12:32:00.000Z', + exactEnd: '2021-06-03T13:32:09.079Z', + comparisonEnabled: true, + comparisonType: TimeRangeComparisonType.WeekBefore, + }); + const component = render(, { + wrapper: Wrapper, + }); + expectTextsNotInDocument(component, ['Day before']); + expectTextsInDocument(component, ['Week before']); }); - const component = render(, { - wrapper: Wrapper, + it('sets default values', () => { + const Wrapper = getWrapper({ + exactStart: '2021-06-02T12:32:00.000Z', + exactEnd: '2021-06-03T13:32:09.079Z', + }); + render(, { + wrapper: Wrapper, + }); + expect(spy).toHaveBeenCalledWith(expect.anything(), { + query: { + comparisonEnabled: 'true', + comparisonType: TimeRangeComparisonType.WeekBefore, + }, + }); + }); + it('selects week before and enables comparison', () => { + const Wrapper = getWrapper({ + exactStart: '2021-06-02T12:32:00.000Z', + exactEnd: '2021-06-03T13:32:09.079Z', + comparisonEnabled: true, + comparisonType: TimeRangeComparisonType.WeekBefore, + }); + const component = render(, { + wrapper: Wrapper, + }); + expectTextsNotInDocument(component, ['Day before']); + expectTextsInDocument(component, ['Week before']); + expect( + (component.getByTestId('comparisonSelect') as HTMLSelectElement) + .selectedIndex + ).toEqual(0); }); - expect(spy).not.toHaveBeenCalled(); - expectTextsInDocument(component, ['12/01 16:00 - 20/01 16:00']); - expect( - (component.getByTestId('comparisonSelect') as HTMLSelectElement) - .selectedIndex - ).toEqual(0); }); - it('Shows absolute times with year when on different year', () => { - const Wrapper = getWrapper({ - start: '2020-12-20T15:00:00.000Z', - end: '2021-01-28T15:00:00.000Z', - comparisonEnabled: true, - comparisonType: TimeRangeComparisonType.PeriodBefore, - rangeTo: 'now', + describe('Time range is greater than 7 days', () => { + it('Shows absolute times without year when within the same year', () => { + const Wrapper = getWrapper({ + exactStart: '2021-05-27T16:32:46.747Z', + exactEnd: '2021-06-04T16:32:46.747Z', + comparisonEnabled: true, + comparisonType: TimeRangeComparisonType.PeriodBefore, + }); + const component = render(, { + wrapper: Wrapper, + }); + expect(spy).not.toHaveBeenCalled(); + expectTextsInDocument(component, ['19/05 18:32 - 27/05 18:32']); + expect( + (component.getByTestId('comparisonSelect') as HTMLSelectElement) + .selectedIndex + ).toEqual(0); }); - const component = render(, { - wrapper: Wrapper, + + it('Shows absolute times with year when on different year', () => { + const Wrapper = getWrapper({ + exactStart: '2020-05-27T16:32:46.747Z', + exactEnd: '2021-06-04T16:32:46.747Z', + comparisonEnabled: true, + comparisonType: TimeRangeComparisonType.PeriodBefore, + }); + const component = render(, { + wrapper: Wrapper, + }); + expect(spy).not.toHaveBeenCalled(); + expectTextsInDocument(component, ['20/05/19 18:32 - 27/05/20 18:32']); + expect( + (component.getByTestId('comparisonSelect') as HTMLSelectElement) + .selectedIndex + ).toEqual(0); }); - expect(spy).not.toHaveBeenCalled(); - expectTextsInDocument(component, ['11/11/20 16:00 - 20/12/20 16:00']); - expect( - (component.getByTestId('comparisonSelect') as HTMLSelectElement) - .selectedIndex - ).toEqual(0); }); }); }); diff --git a/x-pack/plugins/apm/public/components/shared/time_comparison/index.tsx b/x-pack/plugins/apm/public/components/shared/time_comparison/index.tsx index 98fbd4f399d980..cbe7b81486a64d 100644 --- a/x-pack/plugins/apm/public/components/shared/time_comparison/index.tsx +++ b/x-pack/plugins/apm/public/components/shared/time_comparison/index.tsx @@ -59,80 +59,92 @@ function formatDate({ return `${momentStart.format(dateFormat)} - ${momentEnd.format(dateFormat)}`; } -function getSelectOptions({ +export function getComparisonTypes({ start, end, - rangeTo, - comparisonEnabled, }: { start?: string; end?: string; - rangeTo?: string; - comparisonEnabled?: boolean; }) { const momentStart = moment(start); const momentEnd = moment(end); - const dayBeforeOption = { - value: TimeRangeComparisonType.DayBefore, - text: i18n.translate('xpack.apm.timeComparison.select.dayBefore', { - defaultMessage: 'Day before', - }), - }; - - const weekBeforeOption = { - value: TimeRangeComparisonType.WeekBefore, - text: i18n.translate('xpack.apm.timeComparison.select.weekBefore', { - defaultMessage: 'Week before', - }), - }; - - const dateDiff = Number( - getDateDifference({ - start: momentStart, - end: momentEnd, - unitOfTime: 'days', - precise: true, - }).toFixed(2) - ); - - const isRangeToNow = rangeTo === 'now'; + const dateDiff = getDateDifference({ + start: momentStart, + end: momentEnd, + unitOfTime: 'days', + precise: true, + }); - if (isRangeToNow) { - // Less than or equals to one day - if (dateDiff <= 1) { - return [dayBeforeOption, weekBeforeOption]; - } + // Less than or equals to one day + if (dateDiff <= 1) { + return [ + TimeRangeComparisonType.DayBefore, + TimeRangeComparisonType.WeekBefore, + ]; + } - // Less than or equals to one week - if (dateDiff <= 7) { - return [weekBeforeOption]; - } + // Less than or equals to one week + if (dateDiff <= 7) { + return [TimeRangeComparisonType.WeekBefore]; } + // } - const { comparisonStart, comparisonEnd } = getTimeRangeComparison({ - comparisonType: TimeRangeComparisonType.PeriodBefore, - start, - end, - comparisonEnabled, - }); + // above one week or when rangeTo is not "now" + return [TimeRangeComparisonType.PeriodBefore]; +} - const dateFormat = getDateFormat({ - previousPeriodStart: comparisonStart, - currentPeriodEnd: end, - }); +export function getSelectOptions({ + comparisonTypes, + start, + end, +}: { + comparisonTypes: TimeRangeComparisonType[]; + start?: string; + end?: string; +}) { + return comparisonTypes.map((value) => { + switch (value) { + case TimeRangeComparisonType.DayBefore: { + return { + value, + text: i18n.translate('xpack.apm.timeComparison.select.dayBefore', { + defaultMessage: 'Day before', + }), + }; + } + case TimeRangeComparisonType.WeekBefore: { + return { + value, + text: i18n.translate('xpack.apm.timeComparison.select.weekBefore', { + defaultMessage: 'Week before', + }), + }; + } + case TimeRangeComparisonType.PeriodBefore: { + const { comparisonStart, comparisonEnd } = getTimeRangeComparison({ + comparisonType: TimeRangeComparisonType.PeriodBefore, + start, + end, + comparisonEnabled: true, + }); - const prevPeriodOption = { - value: TimeRangeComparisonType.PeriodBefore, - text: formatDate({ - dateFormat, - previousPeriodStart: comparisonStart, - previousPeriodEnd: comparisonEnd, - }), - }; + const dateFormat = getDateFormat({ + previousPeriodStart: comparisonStart, + currentPeriodEnd: end, + }); - // above one week or when rangeTo is not "now" - return [prevPeriodOption]; + return { + value, + text: formatDate({ + dateFormat, + previousPeriodStart: comparisonStart, + previousPeriodEnd: comparisonEnd, + }), + }; + } + } + }); } export function TimeComparison() { @@ -140,14 +152,12 @@ export function TimeComparison() { const history = useHistory(); const { isMedium, isLarge } = useBreakPoints(); const { - urlParams: { start, end, comparisonEnabled, comparisonType, rangeTo }, + urlParams: { comparisonEnabled, comparisonType, exactStart, exactEnd }, } = useUrlParams(); - const selectOptions = getSelectOptions({ - start, - end, - rangeTo, - comparisonEnabled, + const comparisonTypes = getComparisonTypes({ + start: exactStart, + end: exactEnd, }); // Sets default values @@ -155,14 +165,18 @@ export function TimeComparison() { urlHelpers.replace(history, { query: { comparisonEnabled: comparisonEnabled === false ? 'false' : 'true', - comparisonType: comparisonType - ? comparisonType - : selectOptions[0].value, + comparisonType: comparisonType ? comparisonType : comparisonTypes[0], }, }); return null; } + const selectOptions = getSelectOptions({ + comparisonTypes, + start: exactStart, + end: exactEnd, + }); + const isSelectedComparisonTypeAvailable = selectOptions.some( ({ value }) => value === comparisonType ); diff --git a/x-pack/plugins/apm/public/context/url_params_context/helpers.test.ts b/x-pack/plugins/apm/public/context/url_params_context/helpers.test.ts index 4de68a5bc20362..784b10b3f3ee1e 100644 --- a/x-pack/plugins/apm/public/context/url_params_context/helpers.test.ts +++ b/x-pack/plugins/apm/public/context/url_params_context/helpers.test.ts @@ -10,6 +10,9 @@ import moment from 'moment-timezone'; import * as helpers from './helpers'; describe('url_params_context helpers', () => { + beforeEach(() => { + jest.restoreAllMocks(); + }); describe('getDateRange', () => { describe('with non-rounded dates', () => { describe('one minute', () => { @@ -23,6 +26,8 @@ describe('url_params_context helpers', () => { ).toEqual({ start: '2021-01-28T05:47:00.000Z', end: '2021-01-28T05:48:55.304Z', + exactStart: '2021-01-28T05:47:52.134Z', + exactEnd: '2021-01-28T05:48:55.304Z', }); }); }); @@ -37,6 +42,8 @@ describe('url_params_context helpers', () => { ).toEqual({ start: '2021-01-27T05:46:00.000Z', end: '2021-01-28T05:46:13.367Z', + exactStart: '2021-01-27T05:46:07.377Z', + exactEnd: '2021-01-28T05:46:13.367Z', }); }); }); @@ -52,6 +59,8 @@ describe('url_params_context helpers', () => { ).toEqual({ start: '2020-01-28T05:52:00.000Z', end: '2021-01-28T05:52:39.741Z', + exactStart: '2020-01-28T05:52:36.290Z', + exactEnd: '2021-01-28T05:52:39.741Z', }); }); }); @@ -66,6 +75,8 @@ describe('url_params_context helpers', () => { rangeTo: 'now', start: '1970-01-01T00:00:00.000Z', end: '1971-01-01T00:00:00.000Z', + exactStart: '1970-01-01T00:00:00.000Z', + exactEnd: '1971-01-01T00:00:00.000Z', }, rangeFrom: 'now-1m', rangeTo: 'now', @@ -73,6 +84,8 @@ describe('url_params_context helpers', () => { ).toEqual({ start: '1970-01-01T00:00:00.000Z', end: '1971-01-01T00:00:00.000Z', + exactStart: '1970-01-01T00:00:00.000Z', + exactEnd: '1971-01-01T00:00:00.000Z', }); }); }); @@ -94,24 +107,37 @@ describe('url_params_context helpers', () => { ).toEqual({ start: '1972-01-01T00:00:00.000Z', end: '1973-01-01T00:00:00.000Z', + exactStart: undefined, + exactEnd: undefined, }); }); }); describe('when the start or end are invalid', () => { it('returns the previous state', () => { + const endDate = moment('2021-06-04T18:03:24.211Z'); + jest + .spyOn(datemath, 'parse') + .mockReturnValueOnce(undefined) + .mockReturnValueOnce(endDate) + .mockReturnValueOnce(undefined) + .mockReturnValueOnce(endDate); expect( helpers.getDateRange({ state: { start: '1972-01-01T00:00:00.000Z', end: '1973-01-01T00:00:00.000Z', + exactStart: '1972-01-01T00:00:00.000Z', + exactEnd: '1973-01-01T00:00:00.000Z', }, rangeFrom: 'nope', rangeTo: 'now', }) ).toEqual({ start: '1972-01-01T00:00:00.000Z', + exactStart: '1972-01-01T00:00:00.000Z', end: '1973-01-01T00:00:00.000Z', + exactEnd: '1973-01-01T00:00:00.000Z', }); }); }); @@ -134,8 +160,38 @@ describe('url_params_context helpers', () => { ).toEqual({ start: '1970-01-01T00:00:00.000Z', end: '1970-01-01T00:00:00.000Z', + exactStart: '1970-01-01T00:00:00.000Z', + exactEnd: '1970-01-01T00:00:00.000Z', }); }); }); }); + + describe('getExactDate', () => { + it('returns date when it is not not relative', () => { + expect(helpers.getExactDate('2021-01-28T05:47:52.134Z')).toEqual( + new Date('2021-01-28T05:47:52.134Z') + ); + }); + + ['s', 'm', 'h', 'd', 'w'].map((roundingOption) => + it(`removes /${roundingOption} rounding option from relative time`, () => { + const spy = jest.spyOn(datemath, 'parse'); + helpers.getExactDate(`now/${roundingOption}`); + expect(spy).toHaveBeenCalledWith('now', {}); + }) + ); + + it('removes rounding option but keeps subtracting time', () => { + const spy = jest.spyOn(datemath, 'parse'); + helpers.getExactDate('now-24h/h'); + expect(spy).toHaveBeenCalledWith('now-24h', {}); + }); + + it('removes rounding option but keeps adding time', () => { + const spy = jest.spyOn(datemath, 'parse'); + helpers.getExactDate('now+15m/h'); + expect(spy).toHaveBeenCalledWith('now+15m', {}); + }); + }); }); diff --git a/x-pack/plugins/apm/public/context/url_params_context/helpers.ts b/x-pack/plugins/apm/public/context/url_params_context/helpers.ts index eae9eba8b3ddad..902456bf4ebc07 100644 --- a/x-pack/plugins/apm/public/context/url_params_context/helpers.ts +++ b/x-pack/plugins/apm/public/context/url_params_context/helpers.ts @@ -19,6 +19,16 @@ function getParsedDate(rawDate?: string, options = {}) { } } +export function getExactDate(rawDate: string) { + const isRelativeDate = rawDate.startsWith('now'); + if (isRelativeDate) { + // remove rounding from relative dates "Today" (now/d) and "This week" (now/w) + const rawDateWithouRounding = rawDate.replace(/\/([smhdw])$/, ''); + return getParsedDate(rawDateWithouRounding); + } + return getParsedDate(rawDate); +} + export function getDateRange({ state, rangeFrom, @@ -30,16 +40,28 @@ export function getDateRange({ }) { // If the previous state had the same range, just return that instead of calculating a new range. if (state.rangeFrom === rangeFrom && state.rangeTo === rangeTo) { - return { start: state.start, end: state.end }; + return { + start: state.start, + end: state.end, + exactStart: state.exactStart, + exactEnd: state.exactEnd, + }; } - const start = getParsedDate(rangeFrom); const end = getParsedDate(rangeTo, { roundUp: true }); + const exactStart = rangeFrom ? getExactDate(rangeFrom) : undefined; + const exactEnd = rangeTo ? getExactDate(rangeTo) : undefined; + // `getParsedDate` will return undefined for invalid or empty dates. We return // the previous state if either date is undefined. if (!start || !end) { - return { start: state.start, end: state.end }; + return { + start: state.start, + end: state.end, + exactStart: state.exactStart, + exactEnd: state.exactEnd, + }; } // rounds down start to minute @@ -48,6 +70,8 @@ export function getDateRange({ return { start: roundedStart.toISOString(), end: end.toISOString(), + exactStart: exactStart?.toISOString(), + exactEnd: exactEnd?.toISOString(), }; } diff --git a/x-pack/plugins/apm/public/context/url_params_context/resolve_url_params.ts b/x-pack/plugins/apm/public/context/url_params_context/resolve_url_params.ts index b6e7330be30cbd..134f65bbf0f405 100644 --- a/x-pack/plugins/apm/public/context/url_params_context/resolve_url_params.ts +++ b/x-pack/plugins/apm/public/context/url_params_context/resolve_url_params.ts @@ -24,7 +24,7 @@ import { IUrlParams } from './types'; type TimeUrlParams = Pick< IUrlParams, - 'start' | 'end' | 'rangeFrom' | 'rangeTo' + 'start' | 'end' | 'rangeFrom' | 'rangeTo' | 'exactStart' | 'exactEnd' >; export function resolveUrlParams(location: Location, state: TimeUrlParams) { diff --git a/x-pack/plugins/apm/public/context/url_params_context/types.ts b/x-pack/plugins/apm/public/context/url_params_context/types.ts index 4332019d1a1c9e..5e9e4bd257b87b 100644 --- a/x-pack/plugins/apm/public/context/url_params_context/types.ts +++ b/x-pack/plugins/apm/public/context/url_params_context/types.ts @@ -17,6 +17,8 @@ export type IUrlParams = { environment?: string; rangeFrom?: string; rangeTo?: string; + exactStart?: string; + exactEnd?: string; refreshInterval?: number; refreshPaused?: boolean; sortDirection?: string; diff --git a/x-pack/plugins/apm/public/context/url_params_context/url_params_context.tsx b/x-pack/plugins/apm/public/context/url_params_context/url_params_context.tsx index 1da57ac10a20c8..f3969745b6ea76 100644 --- a/x-pack/plugins/apm/public/context/url_params_context/url_params_context.tsx +++ b/x-pack/plugins/apm/public/context/url_params_context/url_params_context.tsx @@ -54,7 +54,14 @@ const UrlParamsProvider: React.ComponentClass<{}> = withRouter( ({ location, children }) => { const refUrlParams = useRef(resolveUrlParams(location, {})); - const { start, end, rangeFrom, rangeTo } = refUrlParams.current; + const { + start, + end, + rangeFrom, + rangeTo, + exactStart, + exactEnd, + } = refUrlParams.current; // Counter to force an update in useFetcher when the refresh button is clicked. const [rangeId, setRangeId] = useState(0); @@ -66,8 +73,10 @@ const UrlParamsProvider: React.ComponentClass<{}> = withRouter( end, rangeFrom, rangeTo, + exactStart, + exactEnd, }), - [location, start, end, rangeFrom, rangeTo] + [location, start, end, rangeFrom, rangeTo, exactStart, exactEnd] ); refUrlParams.current = urlParams; From ab2a80f4b0f830947e57245fcfe2961a11d7ecd3 Mon Sep 17 00:00:00 2001 From: Chris Roberson Date: Wed, 16 Jun 2021 15:20:28 -0400 Subject: [PATCH 31/46] [Task Manager] Log at different levels based on the state (#101751) * Log at different levels based on the state * Fix types and add tests * Remove unnecessary code * Add more descriptive message * Partially fix failing tests * Move into separate function * Get rid of customStatus in favor of moving the logging logic to a separate, mockable function * Remove debug logging * Do not log as an error if the stats are empty * PR feedback * Add docker whitelist * alpha order * English is hard * Removing extra newline * PR feedback around ignoring capacity estimation * Move json utils --- docs/settings/task-manager-settings.asciidoc | 3 + .../resources/base/bin/kibana-docker | 1 + .../task_manager/server/config.test.ts | 3 + x-pack/plugins/task_manager/server/config.ts | 5 + .../managed_configuration.test.ts | 1 + .../lib/calculate_health_status.mock.ts | 14 + .../server/lib/calculate_health_status.ts | 79 ++++++ .../server/lib/log_health_metrics.mock.ts | 14 + .../server/lib/log_health_metrics.test.ts | 262 ++++++++++++++++++ .../server/lib/log_health_metrics.ts | 47 ++++ .../configuration_statistics.test.ts | 1 + .../monitoring_stats_stream.test.ts | 1 + .../monitoring/monitoring_stats_stream.ts | 1 - .../task_manager/server/plugin.test.ts | 2 + .../server/polling_lifecycle.test.ts | 1 + .../task_manager/server/routes/health.test.ts | 141 +++++++++- .../task_manager/server/routes/health.ts | 80 +----- 17 files changed, 576 insertions(+), 80 deletions(-) create mode 100644 x-pack/plugins/task_manager/server/lib/calculate_health_status.mock.ts create mode 100644 x-pack/plugins/task_manager/server/lib/calculate_health_status.ts create mode 100644 x-pack/plugins/task_manager/server/lib/log_health_metrics.mock.ts create mode 100644 x-pack/plugins/task_manager/server/lib/log_health_metrics.test.ts create mode 100644 x-pack/plugins/task_manager/server/lib/log_health_metrics.ts diff --git a/docs/settings/task-manager-settings.asciidoc b/docs/settings/task-manager-settings.asciidoc index 12c958c9e86838..87f5b700870ebf 100644 --- a/docs/settings/task-manager-settings.asciidoc +++ b/docs/settings/task-manager-settings.asciidoc @@ -28,6 +28,9 @@ Task Manager runs background tasks by polling for work on an interval. You can | `xpack.task_manager.max_workers` | The maximum number of tasks that this Kibana instance will run simultaneously. Defaults to 10. Starting in 8.0, it will not be possible to set the value greater than 100. + + | `xpack.task_manager.monitored_stats_warn_delayed_task_start_in_seconds` + | The amount of seconds we allow a task to delay before printing a warning server log. Defaults to 60. |=== [float] diff --git a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker index a1838c571ea0be..f82a21c2f520cf 100755 --- a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker +++ b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker @@ -322,6 +322,7 @@ kibana_vars=( xpack.task_manager.monitored_aggregated_stats_refresh_rate xpack.task_manager.monitored_stats_required_freshness xpack.task_manager.monitored_stats_running_average_window + xpack.task_manager.monitored_stats_warn_delayed_task_start_in_seconds xpack.task_manager.monitored_task_execution_thresholds xpack.task_manager.poll_interval xpack.task_manager.request_capacity diff --git a/x-pack/plugins/task_manager/server/config.test.ts b/x-pack/plugins/task_manager/server/config.test.ts index 85a139956ae966..947b1fd84467e1 100644 --- a/x-pack/plugins/task_manager/server/config.test.ts +++ b/x-pack/plugins/task_manager/server/config.test.ts @@ -20,6 +20,7 @@ describe('config validation', () => { "monitored_aggregated_stats_refresh_rate": 60000, "monitored_stats_required_freshness": 4000, "monitored_stats_running_average_window": 50, + "monitored_stats_warn_delayed_task_start_in_seconds": 60, "monitored_task_execution_thresholds": Object { "custom": Object {}, "default": Object { @@ -68,6 +69,7 @@ describe('config validation', () => { "monitored_aggregated_stats_refresh_rate": 60000, "monitored_stats_required_freshness": 4000, "monitored_stats_running_average_window": 50, + "monitored_stats_warn_delayed_task_start_in_seconds": 60, "monitored_task_execution_thresholds": Object { "custom": Object {}, "default": Object { @@ -103,6 +105,7 @@ describe('config validation', () => { "monitored_aggregated_stats_refresh_rate": 60000, "monitored_stats_required_freshness": 4000, "monitored_stats_running_average_window": 50, + "monitored_stats_warn_delayed_task_start_in_seconds": 60, "monitored_task_execution_thresholds": Object { "custom": Object { "alerting:always-fires": Object { diff --git a/x-pack/plugins/task_manager/server/config.ts b/x-pack/plugins/task_manager/server/config.ts index 3ebfe7da7c3f9b..5dee66cf113b28 100644 --- a/x-pack/plugins/task_manager/server/config.ts +++ b/x-pack/plugins/task_manager/server/config.ts @@ -18,6 +18,7 @@ export const DEFAULT_VERSION_CONFLICT_THRESHOLD = 80; // Refresh aggregated monitored stats at a default rate of once a minute export const DEFAULT_MONITORING_REFRESH_RATE = 60 * 1000; export const DEFAULT_MONITORING_STATS_RUNNING_AVERGAE_WINDOW = 50; +export const DEFAULT_MONITORING_STATS_WARN_DELAYED_TASK_START_IN_SECONDS = 60; export const taskExecutionFailureThresholdSchema = schema.object( { @@ -109,6 +110,10 @@ export const configSchema = schema.object( defaultValue: {}, }), }), + /* The amount of seconds we allow a task to delay before printing a warning server log */ + monitored_stats_warn_delayed_task_start_in_seconds: schema.number({ + defaultValue: DEFAULT_MONITORING_STATS_WARN_DELAYED_TASK_START_IN_SECONDS, + }), }, { validate: (config) => { diff --git a/x-pack/plugins/task_manager/server/integration_tests/managed_configuration.test.ts b/x-pack/plugins/task_manager/server/integration_tests/managed_configuration.test.ts index f7ea6cea538577..f6ee8d8a78ddce 100644 --- a/x-pack/plugins/task_manager/server/integration_tests/managed_configuration.test.ts +++ b/x-pack/plugins/task_manager/server/integration_tests/managed_configuration.test.ts @@ -37,6 +37,7 @@ describe('managed configuration', () => { version_conflict_threshold: 80, max_poll_inactivity_cycles: 10, monitored_aggregated_stats_refresh_rate: 60000, + monitored_stats_warn_delayed_task_start_in_seconds: 60, monitored_stats_required_freshness: 4000, monitored_stats_running_average_window: 50, request_capacity: 1000, diff --git a/x-pack/plugins/task_manager/server/lib/calculate_health_status.mock.ts b/x-pack/plugins/task_manager/server/lib/calculate_health_status.mock.ts new file mode 100644 index 00000000000000..f34a26560133b2 --- /dev/null +++ b/x-pack/plugins/task_manager/server/lib/calculate_health_status.mock.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. + */ + +const createCalculateHealthStatusMock = () => { + return jest.fn(); +}; + +export const calculateHealthStatusMock = { + create: createCalculateHealthStatusMock, +}; diff --git a/x-pack/plugins/task_manager/server/lib/calculate_health_status.ts b/x-pack/plugins/task_manager/server/lib/calculate_health_status.ts new file mode 100644 index 00000000000000..7a6bc598621001 --- /dev/null +++ b/x-pack/plugins/task_manager/server/lib/calculate_health_status.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; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { isString } from 'lodash'; +import { JsonValue } from '@kbn/common-utils'; +import { HealthStatus, RawMonitoringStats } from '../monitoring'; +import { TaskManagerConfig } from '../config'; + +export function calculateHealthStatus( + summarizedStats: RawMonitoringStats, + config: TaskManagerConfig +): HealthStatus { + const now = Date.now(); + + // if "hot" health stats are any more stale than monitored_stats_required_freshness (pollInterval +1s buffer by default) + // consider the system unhealthy + const requiredHotStatsFreshness: number = config.monitored_stats_required_freshness; + + // if "cold" health stats are any more stale than the configured refresh (+ a buffer), consider the system unhealthy + const requiredColdStatsFreshness: number = config.monitored_aggregated_stats_refresh_rate * 1.5; + + /** + * If the monitored stats aren't fresh, return a red status + */ + const healthStatus = + hasStatus(summarizedStats.stats, HealthStatus.Error) || + hasExpiredHotTimestamps(summarizedStats, now, requiredHotStatsFreshness) || + hasExpiredColdTimestamps(summarizedStats, now, requiredColdStatsFreshness) + ? HealthStatus.Error + : hasStatus(summarizedStats.stats, HealthStatus.Warning) + ? HealthStatus.Warning + : HealthStatus.OK; + return healthStatus; +} + +function hasStatus(stats: RawMonitoringStats['stats'], status: HealthStatus): boolean { + return Object.values(stats) + .map((stat) => stat?.status === status) + .includes(true); +} + +/** + * If certain "hot" stats are not fresh, then the _health api will should return a Red status + * @param monitoringStats The monitored stats + * @param now The time to compare against + * @param requiredFreshness How fresh should these stats be + */ +function hasExpiredHotTimestamps( + monitoringStats: RawMonitoringStats, + now: number, + requiredFreshness: number +): boolean { + const diff = + now - + getOldestTimestamp( + monitoringStats.last_update, + monitoringStats.stats.runtime?.value.polling.last_successful_poll + ); + return diff > requiredFreshness; +} + +function hasExpiredColdTimestamps( + monitoringStats: RawMonitoringStats, + now: number, + requiredFreshness: number +): boolean { + return now - getOldestTimestamp(monitoringStats.stats.workload?.timestamp) > requiredFreshness; +} + +function getOldestTimestamp(...timestamps: Array): number { + const validTimestamps = timestamps + .map((timestamp) => (isString(timestamp) ? Date.parse(timestamp) : NaN)) + .filter((timestamp) => !isNaN(timestamp)); + return validTimestamps.length ? Math.min(...validTimestamps) : 0; +} diff --git a/x-pack/plugins/task_manager/server/lib/log_health_metrics.mock.ts b/x-pack/plugins/task_manager/server/lib/log_health_metrics.mock.ts new file mode 100644 index 00000000000000..96c0f686ad61e7 --- /dev/null +++ b/x-pack/plugins/task_manager/server/lib/log_health_metrics.mock.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. + */ + +const createLogHealthMetricsMock = () => { + return jest.fn(); +}; + +export const logHealthMetricsMock = { + create: createLogHealthMetricsMock, +}; diff --git a/x-pack/plugins/task_manager/server/lib/log_health_metrics.test.ts b/x-pack/plugins/task_manager/server/lib/log_health_metrics.test.ts new file mode 100644 index 00000000000000..ccbbf81ebfa31b --- /dev/null +++ b/x-pack/plugins/task_manager/server/lib/log_health_metrics.test.ts @@ -0,0 +1,262 @@ +/* + * Copyright 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 { merge } from 'lodash'; +import { loggingSystemMock } from 'src/core/server/mocks'; +import { configSchema, TaskManagerConfig } from '../config'; +import { HealthStatus } from '../monitoring'; +import { TaskPersistence } from '../monitoring/task_run_statistics'; +import { MonitoredHealth } from '../routes/health'; +import { logHealthMetrics } from './log_health_metrics'; +import { Logger } from '../../../../../src/core/server'; + +jest.mock('./calculate_health_status', () => ({ + calculateHealthStatus: jest.fn(), +})); + +describe('logHealthMetrics', () => { + afterEach(() => { + const { calculateHealthStatus } = jest.requireMock('./calculate_health_status'); + (calculateHealthStatus as jest.Mock).mockReset(); + }); + it('should log as debug if status is OK', () => { + const logger = loggingSystemMock.create().get(); + const config = getTaskManagerConfig({ + monitored_stats_warn_delayed_task_start_in_seconds: 60, + }); + const health = getMockMonitoredHealth(); + + logHealthMetrics(health, logger, config); + + const firstDebug = JSON.parse( + (logger as jest.Mocked).debug.mock.calls[0][0].replace('Latest Monitored Stats: ', '') + ); + expect(firstDebug).toMatchObject(health); + }); + + it('should log as warn if status is Warn', () => { + const logger = loggingSystemMock.create().get(); + const config = getTaskManagerConfig({ + monitored_stats_warn_delayed_task_start_in_seconds: 60, + }); + const health = getMockMonitoredHealth(); + const { calculateHealthStatus } = jest.requireMock('./calculate_health_status'); + (calculateHealthStatus as jest.Mock).mockImplementation( + () => HealthStatus.Warning + ); + + logHealthMetrics(health, logger, config); + + const logMessage = JSON.parse( + ((logger as jest.Mocked).warn.mock.calls[0][0] as string).replace( + 'Latest Monitored Stats: ', + '' + ) + ); + expect(logMessage).toMatchObject(health); + }); + + it('should log as error if status is Error', () => { + const logger = loggingSystemMock.create().get(); + const config = getTaskManagerConfig({ + monitored_stats_warn_delayed_task_start_in_seconds: 60, + }); + const health = getMockMonitoredHealth(); + const { calculateHealthStatus } = jest.requireMock('./calculate_health_status'); + (calculateHealthStatus as jest.Mock).mockImplementation(() => HealthStatus.Error); + + logHealthMetrics(health, logger, config); + + const logMessage = JSON.parse( + ((logger as jest.Mocked).error.mock.calls[0][0] as string).replace( + 'Latest Monitored Stats: ', + '' + ) + ); + expect(logMessage).toMatchObject(health); + }); + + it('should log as warn if drift exceeds the threshold', () => { + const logger = loggingSystemMock.create().get(); + const config = getTaskManagerConfig({ + monitored_stats_warn_delayed_task_start_in_seconds: 60, + }); + const health = getMockMonitoredHealth({ + stats: { + runtime: { + value: { + drift: { + p99: 60000, + }, + }, + }, + }, + }); + + logHealthMetrics(health, logger, config); + + expect((logger as jest.Mocked).warn.mock.calls[0][0] as string).toBe( + `Detected delay task start of 60s (which exceeds configured value of 60s)` + ); + + const secondMessage = JSON.parse( + ((logger as jest.Mocked).warn.mock.calls[1][0] as string).replace( + `Latest Monitored Stats: `, + '' + ) + ); + expect(secondMessage).toMatchObject(health); + }); + + it('should log as debug if there are no stats', () => { + const logger = loggingSystemMock.create().get(); + const config = getTaskManagerConfig({ + monitored_stats_warn_delayed_task_start_in_seconds: 60, + }); + const health = { + id: '1', + status: HealthStatus.OK, + timestamp: new Date().toISOString(), + last_update: new Date().toISOString(), + stats: {}, + }; + + logHealthMetrics(health, logger, config); + + const firstDebug = JSON.parse( + (logger as jest.Mocked).debug.mock.calls[0][0].replace('Latest Monitored Stats: ', '') + ); + expect(firstDebug).toMatchObject(health); + }); + + it('should ignore capacity estimation status', () => { + const logger = loggingSystemMock.create().get(); + const config = getTaskManagerConfig({ + monitored_stats_warn_delayed_task_start_in_seconds: 60, + }); + const health = getMockMonitoredHealth({ + stats: { + capacity_estimation: { + status: HealthStatus.Warning, + }, + }, + }); + + logHealthMetrics(health, logger, config); + + const { calculateHealthStatus } = jest.requireMock('./calculate_health_status'); + expect(calculateHealthStatus).toBeCalledTimes(1); + expect(calculateHealthStatus.mock.calls[0][0].stats.capacity_estimation).toBeUndefined(); + }); +}); + +function getMockMonitoredHealth(overrides = {}): MonitoredHealth { + const stub: MonitoredHealth = { + id: '1', + status: HealthStatus.OK, + timestamp: new Date().toISOString(), + last_update: new Date().toISOString(), + stats: { + configuration: { + timestamp: new Date().toISOString(), + status: HealthStatus.OK, + value: { + max_workers: 10, + poll_interval: 3000, + max_poll_inactivity_cycles: 10, + request_capacity: 1000, + monitored_aggregated_stats_refresh_rate: 5000, + monitored_stats_running_average_window: 50, + monitored_task_execution_thresholds: { + default: { + error_threshold: 90, + warn_threshold: 80, + }, + custom: {}, + }, + }, + }, + workload: { + timestamp: new Date().toISOString(), + status: HealthStatus.OK, + value: { + count: 4, + task_types: { + actions_telemetry: { count: 2, status: { idle: 2 } }, + alerting_telemetry: { count: 1, status: { idle: 1 } }, + session_cleanup: { count: 1, status: { idle: 1 } }, + }, + schedule: [], + overdue: 0, + overdue_non_recurring: 0, + estimatedScheduleDensity: [], + non_recurring: 20, + owner_ids: 2, + estimated_schedule_density: [], + capacity_requirments: { + per_minute: 150, + per_hour: 360, + per_day: 820, + }, + }, + }, + runtime: { + timestamp: new Date().toISOString(), + status: HealthStatus.OK, + value: { + drift: { + p50: 1000, + p90: 2000, + p95: 2500, + p99: 3000, + }, + drift_by_type: {}, + load: { + p50: 1000, + p90: 2000, + p95: 2500, + p99: 3000, + }, + execution: { + duration: {}, + duration_by_persistence: {}, + persistence: { + [TaskPersistence.Recurring]: 10, + [TaskPersistence.NonRecurring]: 10, + [TaskPersistence.Ephemeral]: 10, + }, + result_frequency_percent_as_number: {}, + }, + polling: { + last_successful_poll: new Date().toISOString(), + duration: [500, 400, 3000], + claim_conflicts: [0, 100, 75], + claim_mismatches: [0, 100, 75], + result_frequency_percent_as_number: [ + 'NoTasksClaimed', + 'NoTasksClaimed', + 'NoTasksClaimed', + ], + }, + }, + }, + }, + }; + return (merge(stub, overrides) as unknown) as MonitoredHealth; +} + +function getTaskManagerConfig(overrides: Partial = {}) { + return configSchema.validate( + overrides.monitored_stats_required_freshness + ? { + // use `monitored_stats_required_freshness` as poll interval otherwise we might + // fail validation as it must be greather than the poll interval + poll_interval: overrides.monitored_stats_required_freshness, + ...overrides, + } + : overrides + ); +} diff --git a/x-pack/plugins/task_manager/server/lib/log_health_metrics.ts b/x-pack/plugins/task_manager/server/lib/log_health_metrics.ts new file mode 100644 index 00000000000000..1c98b3272a82da --- /dev/null +++ b/x-pack/plugins/task_manager/server/lib/log_health_metrics.ts @@ -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 { isEmpty } from 'lodash'; +import { Logger } from '../../../../../src/core/server'; +import { HealthStatus } from '../monitoring'; +import { TaskManagerConfig } from '../config'; +import { MonitoredHealth } from '../routes/health'; +import { calculateHealthStatus } from './calculate_health_status'; + +export function logHealthMetrics( + monitoredHealth: MonitoredHealth, + logger: Logger, + config: TaskManagerConfig +) { + const healthWithoutCapacity: MonitoredHealth = { + ...monitoredHealth, + stats: { + ...monitoredHealth.stats, + capacity_estimation: undefined, + }, + }; + const statusWithoutCapacity = calculateHealthStatus(healthWithoutCapacity, config); + let logAsWarn = statusWithoutCapacity === HealthStatus.Warning; + const logAsError = + statusWithoutCapacity === HealthStatus.Error && !isEmpty(monitoredHealth.stats); + const driftInSeconds = (monitoredHealth.stats.runtime?.value.drift.p99 ?? 0) / 1000; + + if (driftInSeconds >= config.monitored_stats_warn_delayed_task_start_in_seconds) { + logger.warn( + `Detected delay task start of ${driftInSeconds}s (which exceeds configured value of ${config.monitored_stats_warn_delayed_task_start_in_seconds}s)` + ); + logAsWarn = true; + } + + if (logAsError) { + logger.error(`Latest Monitored Stats: ${JSON.stringify(monitoredHealth)}`); + } else if (logAsWarn) { + logger.warn(`Latest Monitored Stats: ${JSON.stringify(monitoredHealth)}`); + } else { + logger.debug(`Latest Monitored Stats: ${JSON.stringify(monitoredHealth)}`); + } +} diff --git a/x-pack/plugins/task_manager/server/monitoring/configuration_statistics.test.ts b/x-pack/plugins/task_manager/server/monitoring/configuration_statistics.test.ts index b8f047836b750d..39a7658fb09e40 100644 --- a/x-pack/plugins/task_manager/server/monitoring/configuration_statistics.test.ts +++ b/x-pack/plugins/task_manager/server/monitoring/configuration_statistics.test.ts @@ -23,6 +23,7 @@ describe('Configuration Statistics Aggregator', () => { max_poll_inactivity_cycles: 10, request_capacity: 1000, monitored_aggregated_stats_refresh_rate: 5000, + monitored_stats_warn_delayed_task_start_in_seconds: 60, monitored_stats_running_average_window: 50, monitored_task_execution_thresholds: { default: { diff --git a/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.test.ts b/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.test.ts index fdf60fe6dda2c3..01bd86ec96db6b 100644 --- a/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.test.ts +++ b/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.test.ts @@ -27,6 +27,7 @@ describe('createMonitoringStatsStream', () => { max_poll_inactivity_cycles: 10, request_capacity: 1000, monitored_aggregated_stats_refresh_rate: 5000, + monitored_stats_warn_delayed_task_start_in_seconds: 60, monitored_stats_running_average_window: 50, monitored_task_execution_thresholds: { default: { diff --git a/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.ts b/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.ts index 78511f5a94ca07..0d3b6ebf56de65 100644 --- a/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.ts +++ b/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.ts @@ -51,7 +51,6 @@ interface MonitoredStat { timestamp: string; value: T; } - export type RawMonitoredStat = MonitoredStat & { status: HealthStatus; }; diff --git a/x-pack/plugins/task_manager/server/plugin.test.ts b/x-pack/plugins/task_manager/server/plugin.test.ts index 45db18a3e83857..6c7f722d4c5255 100644 --- a/x-pack/plugins/task_manager/server/plugin.test.ts +++ b/x-pack/plugins/task_manager/server/plugin.test.ts @@ -25,6 +25,7 @@ describe('TaskManagerPlugin', () => { max_poll_inactivity_cycles: 10, request_capacity: 1000, monitored_aggregated_stats_refresh_rate: 5000, + monitored_stats_warn_delayed_task_start_in_seconds: 60, monitored_stats_required_freshness: 5000, monitored_stats_running_average_window: 50, monitored_task_execution_thresholds: { @@ -55,6 +56,7 @@ describe('TaskManagerPlugin', () => { max_poll_inactivity_cycles: 10, request_capacity: 1000, monitored_aggregated_stats_refresh_rate: 5000, + monitored_stats_warn_delayed_task_start_in_seconds: 60, monitored_stats_required_freshness: 5000, monitored_stats_running_average_window: 50, monitored_task_execution_thresholds: { diff --git a/x-pack/plugins/task_manager/server/polling_lifecycle.test.ts b/x-pack/plugins/task_manager/server/polling_lifecycle.test.ts index f733bb6bfdf2a8..66c6805e9160ef 100644 --- a/x-pack/plugins/task_manager/server/polling_lifecycle.test.ts +++ b/x-pack/plugins/task_manager/server/polling_lifecycle.test.ts @@ -45,6 +45,7 @@ describe('TaskPollingLifecycle', () => { max_poll_inactivity_cycles: 10, request_capacity: 1000, monitored_aggregated_stats_refresh_rate: 5000, + monitored_stats_warn_delayed_task_start_in_seconds: 60, monitored_stats_required_freshness: 5000, monitored_stats_running_average_window: 50, monitored_task_execution_thresholds: { diff --git a/x-pack/plugins/task_manager/server/routes/health.test.ts b/x-pack/plugins/task_manager/server/routes/health.test.ts index ae883585e7085e..c14eb7e10b7261 100644 --- a/x-pack/plugins/task_manager/server/routes/health.test.ts +++ b/x-pack/plugins/task_manager/server/routes/health.test.ts @@ -14,10 +14,19 @@ import { healthRoute } from './health'; import { mockHandlerArguments } from './_mock_handler_arguments'; import { sleep } from '../test_utils'; import { loggingSystemMock } from '../../../../../src/core/server/mocks'; -import { Logger } from '../../../../../src/core/server'; -import { MonitoringStats, RawMonitoringStats, summarizeMonitoringStats } from '../monitoring'; +import { + HealthStatus, + MonitoringStats, + RawMonitoringStats, + summarizeMonitoringStats, +} from '../monitoring'; import { ServiceStatusLevels } from 'src/core/server'; import { configSchema, TaskManagerConfig } from '../config'; +import { calculateHealthStatusMock } from '../lib/calculate_health_status.mock'; + +jest.mock('../lib/log_health_metrics', () => ({ + logHealthMetrics: jest.fn(), +})); describe('healthRoute', () => { beforeEach(() => { @@ -38,6 +47,9 @@ describe('healthRoute', () => { it('logs the Task Manager stats at a fixed interval', async () => { const router = httpServiceMock.createRouter(); const logger = loggingSystemMock.create().get(); + const calculateHealthStatus = calculateHealthStatusMock.create(); + calculateHealthStatus.mockImplementation(() => HealthStatus.OK); + const { logHealthMetrics } = jest.requireMock('../lib/log_health_metrics'); const mockStat = mockHealthStats(); await sleep(10); @@ -55,6 +67,7 @@ describe('healthRoute', () => { id, getTaskManagerConfig({ monitored_stats_required_freshness: 1000, + monitored_stats_warn_delayed_task_start_in_seconds: 100, monitored_aggregated_stats_refresh_rate: 60000, }) ); @@ -65,35 +78,137 @@ describe('healthRoute', () => { await sleep(600); stats$.next(nextMockStat); - const firstDebug = JSON.parse( - (logger as jest.Mocked).debug.mock.calls[0][0].replace('Latest Monitored Stats: ', '') - ); - expect(firstDebug).toMatchObject({ + expect(logHealthMetrics).toBeCalledTimes(2); + expect(logHealthMetrics.mock.calls[0][0]).toMatchObject({ id, timestamp: expect.any(String), status: expect.any(String), ...ignoreCapacityEstimation(summarizeMonitoringStats(mockStat, getTaskManagerConfig({}))), }); + expect(logHealthMetrics.mock.calls[1][0]).toMatchObject({ + id, + timestamp: expect.any(String), + status: expect.any(String), + ...ignoreCapacityEstimation(summarizeMonitoringStats(nextMockStat, getTaskManagerConfig({}))), + }); + }); - const secondDebug = JSON.parse( - (logger as jest.Mocked).debug.mock.calls[1][0].replace('Latest Monitored Stats: ', '') + it(`logs at a warn level if the status is warning`, async () => { + const router = httpServiceMock.createRouter(); + const logger = loggingSystemMock.create().get(); + const calculateHealthStatus = calculateHealthStatusMock.create(); + calculateHealthStatus.mockImplementation(() => HealthStatus.Warning); + const { logHealthMetrics } = jest.requireMock('../lib/log_health_metrics'); + + const warnRuntimeStat = mockHealthStats(); + const warnConfigurationStat = mockHealthStats(); + const warnWorkloadStat = mockHealthStats(); + + const stats$ = new Subject(); + + const id = uuid.v4(); + healthRoute( + router, + stats$, + logger, + id, + getTaskManagerConfig({ + monitored_stats_required_freshness: 1000, + monitored_stats_warn_delayed_task_start_in_seconds: 120, + monitored_aggregated_stats_refresh_rate: 60000, + }) ); - expect(secondDebug).not.toMatchObject({ + + stats$.next(warnRuntimeStat); + await sleep(1001); + stats$.next(warnConfigurationStat); + await sleep(1001); + stats$.next(warnWorkloadStat); + + expect(logHealthMetrics).toBeCalledTimes(3); + expect(logHealthMetrics.mock.calls[0][0]).toMatchObject({ id, timestamp: expect.any(String), status: expect.any(String), ...ignoreCapacityEstimation( - summarizeMonitoringStats(skippedMockStat, getTaskManagerConfig({})) + summarizeMonitoringStats(warnRuntimeStat, getTaskManagerConfig({})) ), }); - expect(secondDebug).toMatchObject({ + expect(logHealthMetrics.mock.calls[1][0]).toMatchObject({ id, timestamp: expect.any(String), status: expect.any(String), - ...ignoreCapacityEstimation(summarizeMonitoringStats(nextMockStat, getTaskManagerConfig({}))), + ...ignoreCapacityEstimation( + summarizeMonitoringStats(warnConfigurationStat, getTaskManagerConfig({})) + ), }); + expect(logHealthMetrics.mock.calls[2][0]).toMatchObject({ + id, + timestamp: expect.any(String), + status: expect.any(String), + ...ignoreCapacityEstimation( + summarizeMonitoringStats(warnWorkloadStat, getTaskManagerConfig({})) + ), + }); + }); - expect(logger.debug).toHaveBeenCalledTimes(2); + it(`logs at an error level if the status is error`, async () => { + const router = httpServiceMock.createRouter(); + const logger = loggingSystemMock.create().get(); + const calculateHealthStatus = calculateHealthStatusMock.create(); + calculateHealthStatus.mockImplementation(() => HealthStatus.Error); + const { logHealthMetrics } = jest.requireMock('../lib/log_health_metrics'); + + const errorRuntimeStat = mockHealthStats(); + const errorConfigurationStat = mockHealthStats(); + const errorWorkloadStat = mockHealthStats(); + + const stats$ = new Subject(); + + const id = uuid.v4(); + healthRoute( + router, + stats$, + logger, + id, + getTaskManagerConfig({ + monitored_stats_required_freshness: 1000, + monitored_stats_warn_delayed_task_start_in_seconds: 120, + monitored_aggregated_stats_refresh_rate: 60000, + }) + ); + + stats$.next(errorRuntimeStat); + await sleep(1001); + stats$.next(errorConfigurationStat); + await sleep(1001); + stats$.next(errorWorkloadStat); + + expect(logHealthMetrics).toBeCalledTimes(3); + expect(logHealthMetrics.mock.calls[0][0]).toMatchObject({ + id, + timestamp: expect.any(String), + status: expect.any(String), + ...ignoreCapacityEstimation( + summarizeMonitoringStats(errorRuntimeStat, getTaskManagerConfig({})) + ), + }); + expect(logHealthMetrics.mock.calls[1][0]).toMatchObject({ + id, + timestamp: expect.any(String), + status: expect.any(String), + ...ignoreCapacityEstimation( + summarizeMonitoringStats(errorConfigurationStat, getTaskManagerConfig({})) + ), + }); + expect(logHealthMetrics.mock.calls[2][0]).toMatchObject({ + id, + timestamp: expect.any(String), + status: expect.any(String), + ...ignoreCapacityEstimation( + summarizeMonitoringStats(errorWorkloadStat, getTaskManagerConfig({})) + ), + }); }); it('returns a error status if the overall stats have not been updated within the required hot freshness', async () => { diff --git a/x-pack/plugins/task_manager/server/routes/health.ts b/x-pack/plugins/task_manager/server/routes/health.ts index 0f43575d844816..b5d8a23ba55575 100644 --- a/x-pack/plugins/task_manager/server/routes/health.ts +++ b/x-pack/plugins/task_manager/server/routes/health.ts @@ -15,8 +15,6 @@ import { import { Observable, Subject } from 'rxjs'; import { tap, map } from 'rxjs/operators'; import { throttleTime } from 'rxjs/operators'; -import { isString } from 'lodash'; -import { JsonValue } from '@kbn/common-utils'; import { Logger, ServiceStatus, ServiceStatusLevels } from '../../../../../src/core/server'; import { MonitoringStats, @@ -25,8 +23,14 @@ import { RawMonitoringStats, } from '../monitoring'; import { TaskManagerConfig } from '../config'; +import { logHealthMetrics } from '../lib/log_health_metrics'; +import { calculateHealthStatus } from '../lib/calculate_health_status'; -type MonitoredHealth = RawMonitoringStats & { id: string; status: HealthStatus; timestamp: string }; +export type MonitoredHealth = RawMonitoringStats & { + id: string; + status: HealthStatus; + timestamp: string; +}; const LEVEL_SUMMARY = { [ServiceStatusLevels.available.toString()]: 'Task Manager is healthy', @@ -54,26 +58,12 @@ export function healthRoute( // consider the system unhealthy const requiredHotStatsFreshness: number = config.monitored_stats_required_freshness; - // if "cold" health stats are any more stale than the configured refresh (+ a buffer), consider the system unhealthy - const requiredColdStatsFreshness: number = config.monitored_aggregated_stats_refresh_rate * 1.5; - - function calculateStatus(monitoredStats: MonitoringStats): MonitoredHealth { + function getHealthStatus(monitoredStats: MonitoringStats) { + const summarizedStats = summarizeMonitoringStats(monitoredStats, config); + const status = calculateHealthStatus(summarizedStats, config); const now = Date.now(); const timestamp = new Date(now).toISOString(); - const summarizedStats = summarizeMonitoringStats(monitoredStats, config); - - /** - * If the monitored stats aren't fresh, return a red status - */ - const healthStatus = - hasStatus(summarizedStats.stats, HealthStatus.Error) || - hasExpiredHotTimestamps(summarizedStats, now, requiredHotStatsFreshness) || - hasExpiredColdTimestamps(summarizedStats, now, requiredColdStatsFreshness) - ? HealthStatus.Error - : hasStatus(summarizedStats.stats, HealthStatus.Warning) - ? HealthStatus.Warning - : HealthStatus.OK; - return { id: taskManagerId, timestamp, status: healthStatus, ...summarizedStats }; + return { id: taskManagerId, timestamp, status, ...summarizedStats }; } const serviceStatus$: Subject = new Subject(); @@ -90,11 +80,11 @@ export function healthRoute( }), // Only calculate the summerized stats (calculates all runnign averages and evaluates state) // when needed by throttling down to the requiredHotStatsFreshness - map((stats) => withServiceStatus(calculateStatus(stats))) + map((stats) => withServiceStatus(getHealthStatus(stats))) ) .subscribe(([monitoredHealth, serviceStatus]) => { serviceStatus$.next(serviceStatus); - logger.debug(`Latest Monitored Stats: ${JSON.stringify(monitoredHealth)}`); + logHealthMetrics(monitoredHealth, logger, config); }); router.get( @@ -109,7 +99,7 @@ export function healthRoute( ): Promise { return res.ok({ body: lastMonitoredStats - ? calculateStatus(lastMonitoredStats) + ? getHealthStatus(lastMonitoredStats) : { id: taskManagerId, timestamp: new Date().toISOString(), status: HealthStatus.Error }, }); } @@ -134,45 +124,3 @@ export function withServiceStatus( }, ]; } - -/** - * If certain "hot" stats are not fresh, then the _health api will should return a Red status - * @param monitoringStats The monitored stats - * @param now The time to compare against - * @param requiredFreshness How fresh should these stats be - */ -function hasExpiredHotTimestamps( - monitoringStats: RawMonitoringStats, - now: number, - requiredFreshness: number -): boolean { - return ( - now - - getOldestTimestamp( - monitoringStats.last_update, - monitoringStats.stats.runtime?.value.polling.last_successful_poll - ) > - requiredFreshness - ); -} - -function hasExpiredColdTimestamps( - monitoringStats: RawMonitoringStats, - now: number, - requiredFreshness: number -): boolean { - return now - getOldestTimestamp(monitoringStats.stats.workload?.timestamp) > requiredFreshness; -} - -function hasStatus(stats: RawMonitoringStats['stats'], status: HealthStatus): boolean { - return Object.values(stats) - .map((stat) => stat?.status === status) - .includes(true); -} - -function getOldestTimestamp(...timestamps: Array): number { - const validTimestamps = timestamps - .map((timestamp) => (isString(timestamp) ? Date.parse(timestamp) : NaN)) - .filter((timestamp) => !isNaN(timestamp)); - return validTimestamps.length ? Math.min(...validTimestamps) : 0; -} From 1cf82cbc3689c2e0f5694fea777b18c8364e7696 Mon Sep 17 00:00:00 2001 From: Dominique Clarke Date: Wed, 16 Jun 2021 15:29:28 -0400 Subject: [PATCH 32/46] [Uptime] refactor Synthetics Integration package UI (#102080) * refactor contexts * add http, tcp, and icmp folders * adjust types * adjust useUpdatePolicy hook * adjust synthetics policy create and edit wrappers * adjust validation * fix typo and types * remove typo Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../fleet_package/contexts/http_context.tsx | 60 ++++ .../fleet_package/contexts/http_provider.tsx | 69 ++++ .../fleet_package/contexts/icmp_context.tsx | 61 ++++ .../fleet_package/contexts/index.ts | 30 +- .../contexts/monitor_type_context.tsx | 47 +++ .../contexts/simple_fields_context.tsx | 60 ---- .../fleet_package/contexts/tcp_context.tsx | 60 ++++ .../fleet_package/contexts/tcp_provider.tsx | 62 ++++ .../fleet_package/custom_fields.test.tsx | 69 ++-- .../fleet_package/custom_fields.tsx | 324 ++---------------- .../advanced_fields.test.tsx} | 10 +- .../advanced_fields.tsx} | 14 +- .../fleet_package/http/simple_fields.tsx | 200 +++++++++++ .../fleet_package/icmp/simple_fields.tsx | 204 +++++++++++ .../synthetics_policy_create_extension.tsx | 91 +++-- ...s_policy_create_extension_wrapper.test.tsx | 74 ++-- ...hetics_policy_create_extension_wrapper.tsx | 23 +- .../synthetics_policy_edit_extension.tsx | 85 +++-- ...ics_policy_edit_extension_wrapper.test.tsx | 106 +++--- ...nthetics_policy_edit_extension_wrapper.tsx | 135 ++++---- .../advanced_fields.test.tsx} | 8 +- .../advanced_fields.tsx} | 6 +- .../fleet_package/tcp/simple_fields.tsx | 171 +++++++++ .../public/components/fleet_package/types.tsx | 40 ++- .../fleet_package/use_update_policy.test.tsx | 99 ++---- .../fleet_package/use_update_policy.ts | 46 ++- .../components/fleet_package/validation.tsx | 7 +- 27 files changed, 1404 insertions(+), 757 deletions(-) create mode 100644 x-pack/plugins/uptime/public/components/fleet_package/contexts/http_context.tsx create mode 100644 x-pack/plugins/uptime/public/components/fleet_package/contexts/http_provider.tsx create mode 100644 x-pack/plugins/uptime/public/components/fleet_package/contexts/icmp_context.tsx create mode 100644 x-pack/plugins/uptime/public/components/fleet_package/contexts/monitor_type_context.tsx delete mode 100644 x-pack/plugins/uptime/public/components/fleet_package/contexts/simple_fields_context.tsx create mode 100644 x-pack/plugins/uptime/public/components/fleet_package/contexts/tcp_context.tsx create mode 100644 x-pack/plugins/uptime/public/components/fleet_package/contexts/tcp_provider.tsx rename x-pack/plugins/uptime/public/components/fleet_package/{http_advanced_fields.test.tsx => http/advanced_fields.test.tsx} (95%) rename x-pack/plugins/uptime/public/components/fleet_package/{http_advanced_fields.tsx => http/advanced_fields.tsx} (97%) create mode 100644 x-pack/plugins/uptime/public/components/fleet_package/http/simple_fields.tsx create mode 100644 x-pack/plugins/uptime/public/components/fleet_package/icmp/simple_fields.tsx rename x-pack/plugins/uptime/public/components/fleet_package/{tcp_advanced_fields.test.tsx => tcp/advanced_fields.test.tsx} (92%) rename x-pack/plugins/uptime/public/components/fleet_package/{tcp_advanced_fields.tsx => tcp/advanced_fields.tsx} (97%) create mode 100644 x-pack/plugins/uptime/public/components/fleet_package/tcp/simple_fields.tsx diff --git a/x-pack/plugins/uptime/public/components/fleet_package/contexts/http_context.tsx b/x-pack/plugins/uptime/public/components/fleet_package/contexts/http_context.tsx new file mode 100644 index 00000000000000..d1306836afa9c8 --- /dev/null +++ b/x-pack/plugins/uptime/public/components/fleet_package/contexts/http_context.tsx @@ -0,0 +1,60 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { createContext, useContext, useMemo, useState } from 'react'; +import { IHTTPSimpleFields, ConfigKeys, ScheduleUnit, DataStream } from '../types'; + +interface IHTTPSimpleFieldsContext { + setFields: React.Dispatch>; + fields: IHTTPSimpleFields; + defaultValues: IHTTPSimpleFields; +} + +interface IHTTPSimpleFieldsContextProvider { + children: React.ReactNode; + defaultValues?: IHTTPSimpleFields; +} + +export const initialValues = { + [ConfigKeys.URLS]: '', + [ConfigKeys.MAX_REDIRECTS]: '0', + [ConfigKeys.MONITOR_TYPE]: DataStream.HTTP, + [ConfigKeys.SCHEDULE]: { + number: '3', + unit: ScheduleUnit.MINUTES, + }, + [ConfigKeys.APM_SERVICE_NAME]: '', + [ConfigKeys.TAGS]: [], + [ConfigKeys.TIMEOUT]: '16', +}; + +const defaultContext: IHTTPSimpleFieldsContext = { + setFields: (_fields: React.SetStateAction) => { + throw new Error( + 'setFields was not initialized for HTTP Simple Fields, set it when you invoke the context' + ); + }, + fields: initialValues, // mutable + defaultValues: initialValues, // immutable +}; + +export const HTTPSimpleFieldsContext = createContext(defaultContext); + +export const HTTPSimpleFieldsContextProvider = ({ + children, + defaultValues = initialValues, +}: IHTTPSimpleFieldsContextProvider) => { + const [fields, setFields] = useState(defaultValues); + + const value = useMemo(() => { + return { fields, setFields, defaultValues }; + }, [fields, defaultValues]); + + return ; +}; + +export const useHTTPSimpleFieldsContext = () => useContext(HTTPSimpleFieldsContext); diff --git a/x-pack/plugins/uptime/public/components/fleet_package/contexts/http_provider.tsx b/x-pack/plugins/uptime/public/components/fleet_package/contexts/http_provider.tsx new file mode 100644 index 00000000000000..e48de76862e24a --- /dev/null +++ b/x-pack/plugins/uptime/public/components/fleet_package/contexts/http_provider.tsx @@ -0,0 +1,69 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { ReactNode } from 'react'; +import { IHTTPSimpleFields, IHTTPAdvancedFields, ITLSFields, ConfigKeys } from '../types'; +import { + HTTPSimpleFieldsContextProvider, + HTTPAdvancedFieldsContextProvider, + TLSFieldsContextProvider, +} from '.'; + +interface HTTPContextProviderProps { + defaultValues?: any; + children: ReactNode; +} + +export const HTTPContextProvider = ({ defaultValues, children }: HTTPContextProviderProps) => { + const httpAdvancedFields: IHTTPAdvancedFields | undefined = defaultValues + ? { + [ConfigKeys.USERNAME]: defaultValues[ConfigKeys.USERNAME], + [ConfigKeys.PASSWORD]: defaultValues[ConfigKeys.PASSWORD], + [ConfigKeys.PROXY_URL]: defaultValues[ConfigKeys.PROXY_URL], + [ConfigKeys.RESPONSE_BODY_CHECK_NEGATIVE]: + defaultValues[ConfigKeys.RESPONSE_BODY_CHECK_NEGATIVE], + [ConfigKeys.RESPONSE_BODY_CHECK_POSITIVE]: + defaultValues[ConfigKeys.RESPONSE_BODY_CHECK_POSITIVE], + [ConfigKeys.RESPONSE_BODY_INDEX]: defaultValues[ConfigKeys.RESPONSE_BODY_INDEX], + [ConfigKeys.RESPONSE_HEADERS_CHECK]: defaultValues[ConfigKeys.RESPONSE_HEADERS_CHECK], + [ConfigKeys.RESPONSE_HEADERS_INDEX]: defaultValues[ConfigKeys.RESPONSE_HEADERS_INDEX], + [ConfigKeys.RESPONSE_STATUS_CHECK]: defaultValues[ConfigKeys.RESPONSE_STATUS_CHECK], + [ConfigKeys.REQUEST_BODY_CHECK]: defaultValues[ConfigKeys.REQUEST_BODY_CHECK], + [ConfigKeys.REQUEST_HEADERS_CHECK]: defaultValues[ConfigKeys.REQUEST_HEADERS_CHECK], + [ConfigKeys.REQUEST_METHOD_CHECK]: defaultValues[ConfigKeys.REQUEST_METHOD_CHECK], + } + : undefined; + const httpSimpleFields: IHTTPSimpleFields | undefined = defaultValues + ? { + [ConfigKeys.APM_SERVICE_NAME]: defaultValues[ConfigKeys.APM_SERVICE_NAME], + [ConfigKeys.MAX_REDIRECTS]: defaultValues[ConfigKeys.MAX_REDIRECTS], + [ConfigKeys.MONITOR_TYPE]: defaultValues[ConfigKeys.MONITOR_TYPE], + [ConfigKeys.SCHEDULE]: defaultValues[ConfigKeys.SCHEDULE], + [ConfigKeys.TAGS]: defaultValues[ConfigKeys.TAGS], + [ConfigKeys.TIMEOUT]: defaultValues[ConfigKeys.TIMEOUT], + [ConfigKeys.URLS]: defaultValues[ConfigKeys.URLS], + } + : undefined; + const tlsFields: ITLSFields | undefined = defaultValues + ? { + [ConfigKeys.TLS_CERTIFICATE_AUTHORITIES]: + defaultValues[ConfigKeys.TLS_CERTIFICATE_AUTHORITIES], + [ConfigKeys.TLS_CERTIFICATE]: defaultValues[ConfigKeys.TLS_CERTIFICATE], + [ConfigKeys.TLS_KEY]: defaultValues[ConfigKeys.TLS_KEY], + [ConfigKeys.TLS_KEY_PASSPHRASE]: defaultValues[ConfigKeys.TLS_KEY_PASSPHRASE], + [ConfigKeys.TLS_VERIFICATION_MODE]: defaultValues[ConfigKeys.TLS_VERIFICATION_MODE], + [ConfigKeys.TLS_VERSION]: defaultValues[ConfigKeys.TLS_VERSION], + } + : undefined; + return ( + + + {children} + + + ); +}; diff --git a/x-pack/plugins/uptime/public/components/fleet_package/contexts/icmp_context.tsx b/x-pack/plugins/uptime/public/components/fleet_package/contexts/icmp_context.tsx new file mode 100644 index 00000000000000..93c67c6133ce9f --- /dev/null +++ b/x-pack/plugins/uptime/public/components/fleet_package/contexts/icmp_context.tsx @@ -0,0 +1,61 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { createContext, useContext, useMemo, useState } from 'react'; +import { IICMPSimpleFields, ConfigKeys, ScheduleUnit, DataStream } from '../types'; + +interface IICMPSimpleFieldsContext { + setFields: React.Dispatch>; + fields: IICMPSimpleFields; + defaultValues: IICMPSimpleFields; +} + +interface IICMPSimpleFieldsContextProvider { + children: React.ReactNode; + defaultValues?: IICMPSimpleFields; +} + +export const initialValues = { + [ConfigKeys.HOSTS]: '', + [ConfigKeys.MAX_REDIRECTS]: '0', + [ConfigKeys.MONITOR_TYPE]: DataStream.ICMP, + [ConfigKeys.SCHEDULE]: { + number: '3', + unit: ScheduleUnit.MINUTES, + }, + [ConfigKeys.APM_SERVICE_NAME]: '', + [ConfigKeys.TAGS]: [], + [ConfigKeys.TIMEOUT]: '16', + [ConfigKeys.WAIT]: '1', +}; + +const defaultContext: IICMPSimpleFieldsContext = { + setFields: (_fields: React.SetStateAction) => { + throw new Error( + 'setFields was not initialized for ICMP Simple Fields, set it when you invoke the context' + ); + }, + fields: initialValues, // mutable + defaultValues: initialValues, // immutable +}; + +export const ICMPSimpleFieldsContext = createContext(defaultContext); + +export const ICMPSimpleFieldsContextProvider = ({ + children, + defaultValues = initialValues, +}: IICMPSimpleFieldsContextProvider) => { + const [fields, setFields] = useState(defaultValues); + + const value = useMemo(() => { + return { fields, setFields, defaultValues }; + }, [fields, defaultValues]); + + return ; +}; + +export const useICMPSimpleFieldsContext = () => useContext(ICMPSimpleFieldsContext); diff --git a/x-pack/plugins/uptime/public/components/fleet_package/contexts/index.ts b/x-pack/plugins/uptime/public/components/fleet_package/contexts/index.ts index bea3e9d5641a57..f84a4e75df922a 100644 --- a/x-pack/plugins/uptime/public/components/fleet_package/contexts/index.ts +++ b/x-pack/plugins/uptime/public/components/fleet_package/contexts/index.ts @@ -6,11 +6,29 @@ */ export { - SimpleFieldsContext, - SimpleFieldsContextProvider, - initialValues as defaultSimpleFields, - useSimpleFieldsContext, -} from './simple_fields_context'; + MonitorTypeContext, + MonitorTypeContextProvider, + initialValue as defaultMonitorType, + useMonitorTypeContext, +} from './monitor_type_context'; +export { + HTTPSimpleFieldsContext, + HTTPSimpleFieldsContextProvider, + initialValues as defaultHTTPSimpleFields, + useHTTPSimpleFieldsContext, +} from './http_context'; +export { + TCPSimpleFieldsContext, + TCPSimpleFieldsContextProvider, + initialValues as defaultTCPSimpleFields, + useTCPSimpleFieldsContext, +} from './tcp_context'; +export { + ICMPSimpleFieldsContext, + ICMPSimpleFieldsContextProvider, + initialValues as defaultICMPSimpleFields, + useICMPSimpleFieldsContext, +} from './icmp_context'; export { TCPAdvancedFieldsContext, TCPAdvancedFieldsContextProvider, @@ -29,3 +47,5 @@ export { initialValues as defaultTLSFields, useTLSFieldsContext, } from './tls_fields_context'; +export { HTTPContextProvider } from './http_provider'; +export { TCPContextProvider } from './tcp_provider'; diff --git a/x-pack/plugins/uptime/public/components/fleet_package/contexts/monitor_type_context.tsx b/x-pack/plugins/uptime/public/components/fleet_package/contexts/monitor_type_context.tsx new file mode 100644 index 00000000000000..6e9a5de83c2fe1 --- /dev/null +++ b/x-pack/plugins/uptime/public/components/fleet_package/contexts/monitor_type_context.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, { createContext, useContext, useMemo, useState } from 'react'; +import { DataStream } from '../types'; + +interface IMonitorTypeFieldsContext { + setMonitorType: React.Dispatch>; + monitorType: DataStream; + defaultValue: DataStream; +} + +interface IMonitorTypeFieldsContextProvider { + children: React.ReactNode; + defaultValue?: DataStream; +} + +export const initialValue = DataStream.HTTP; + +const defaultContext: IMonitorTypeFieldsContext = { + setMonitorType: (_monitorType: React.SetStateAction) => { + throw new Error('setMonitorType was not initialized, set it when you invoke the context'); + }, + monitorType: initialValue, // mutable + defaultValue: initialValue, // immutable +}; + +export const MonitorTypeContext = createContext(defaultContext); + +export const MonitorTypeContextProvider = ({ + children, + defaultValue = initialValue, +}: IMonitorTypeFieldsContextProvider) => { + const [monitorType, setMonitorType] = useState(defaultValue); + + const value = useMemo(() => { + return { monitorType, setMonitorType, defaultValue }; + }, [monitorType, defaultValue]); + + return ; +}; + +export const useMonitorTypeContext = () => useContext(MonitorTypeContext); diff --git a/x-pack/plugins/uptime/public/components/fleet_package/contexts/simple_fields_context.tsx b/x-pack/plugins/uptime/public/components/fleet_package/contexts/simple_fields_context.tsx deleted file mode 100644 index 1d981ed4c2c8fb..00000000000000 --- a/x-pack/plugins/uptime/public/components/fleet_package/contexts/simple_fields_context.tsx +++ /dev/null @@ -1,60 +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, { createContext, useContext, useMemo, useState } from 'react'; -import { ISimpleFields, ConfigKeys, ScheduleUnit, DataStream } from '../types'; - -interface ISimpleFieldsContext { - setFields: React.Dispatch>; - fields: ISimpleFields; - defaultValues: ISimpleFields; -} - -interface ISimpleFieldsContextProvider { - children: React.ReactNode; - defaultValues?: ISimpleFields; -} - -export const initialValues = { - [ConfigKeys.HOSTS]: '', - [ConfigKeys.MAX_REDIRECTS]: '0', - [ConfigKeys.MONITOR_TYPE]: DataStream.HTTP, - [ConfigKeys.SCHEDULE]: { - number: '3', - unit: ScheduleUnit.MINUTES, - }, - [ConfigKeys.APM_SERVICE_NAME]: '', - [ConfigKeys.TAGS]: [], - [ConfigKeys.TIMEOUT]: '16', - [ConfigKeys.URLS]: '', - [ConfigKeys.WAIT]: '1', -}; - -const defaultContext: ISimpleFieldsContext = { - setFields: (_fields: React.SetStateAction) => { - throw new Error('setSimpleFields was not initialized, set it when you invoke the context'); - }, - fields: initialValues, // mutable - defaultValues: initialValues, // immutable -}; - -export const SimpleFieldsContext = createContext(defaultContext); - -export const SimpleFieldsContextProvider = ({ - children, - defaultValues = initialValues, -}: ISimpleFieldsContextProvider) => { - const [fields, setFields] = useState(defaultValues); - - const value = useMemo(() => { - return { fields, setFields, defaultValues }; - }, [fields, defaultValues]); - - return ; -}; - -export const useSimpleFieldsContext = () => useContext(SimpleFieldsContext); diff --git a/x-pack/plugins/uptime/public/components/fleet_package/contexts/tcp_context.tsx b/x-pack/plugins/uptime/public/components/fleet_package/contexts/tcp_context.tsx new file mode 100644 index 00000000000000..6020a7ff2bff8d --- /dev/null +++ b/x-pack/plugins/uptime/public/components/fleet_package/contexts/tcp_context.tsx @@ -0,0 +1,60 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { createContext, useContext, useMemo, useState } from 'react'; +import { ITCPSimpleFields, ConfigKeys, ScheduleUnit, DataStream } from '../types'; + +interface ITCPSimpleFieldsContext { + setFields: React.Dispatch>; + fields: ITCPSimpleFields; + defaultValues: ITCPSimpleFields; +} + +interface ITCPSimpleFieldsContextProvider { + children: React.ReactNode; + defaultValues?: ITCPSimpleFields; +} + +export const initialValues = { + [ConfigKeys.HOSTS]: '', + [ConfigKeys.MAX_REDIRECTS]: '0', + [ConfigKeys.MONITOR_TYPE]: DataStream.TCP, + [ConfigKeys.SCHEDULE]: { + number: '3', + unit: ScheduleUnit.MINUTES, + }, + [ConfigKeys.APM_SERVICE_NAME]: '', + [ConfigKeys.TAGS]: [], + [ConfigKeys.TIMEOUT]: '16', +}; + +const defaultContext: ITCPSimpleFieldsContext = { + setFields: (_fields: React.SetStateAction) => { + throw new Error( + 'setFields was not initialized for TCP Simple Fields, set it when you invoke the context' + ); + }, + fields: initialValues, // mutable + defaultValues: initialValues, // immutable +}; + +export const TCPSimpleFieldsContext = createContext(defaultContext); + +export const TCPSimpleFieldsContextProvider = ({ + children, + defaultValues = initialValues, +}: ITCPSimpleFieldsContextProvider) => { + const [fields, setFields] = useState(defaultValues); + + const value = useMemo(() => { + return { fields, setFields, defaultValues }; + }, [fields, defaultValues]); + + return ; +}; + +export const useTCPSimpleFieldsContext = () => useContext(TCPSimpleFieldsContext); diff --git a/x-pack/plugins/uptime/public/components/fleet_package/contexts/tcp_provider.tsx b/x-pack/plugins/uptime/public/components/fleet_package/contexts/tcp_provider.tsx new file mode 100644 index 00000000000000..666839803f4d67 --- /dev/null +++ b/x-pack/plugins/uptime/public/components/fleet_package/contexts/tcp_provider.tsx @@ -0,0 +1,62 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { ReactNode } from 'react'; +import { ConfigKeys, ITCPSimpleFields, ITCPAdvancedFields, ITLSFields } from '../types'; +import { + TCPSimpleFieldsContextProvider, + TCPAdvancedFieldsContextProvider, + TLSFieldsContextProvider, +} from '.'; + +interface TCPContextProviderProps { + defaultValues?: any; + children: ReactNode; +} + +/** + * Exports Synthetics-specific package policy instructions + * for use in the Ingest app create / edit package policy + */ +export const TCPContextProvider = ({ defaultValues, children }: TCPContextProviderProps) => { + const tcpSimpleFields: ITCPSimpleFields | undefined = defaultValues + ? { + [ConfigKeys.APM_SERVICE_NAME]: defaultValues[ConfigKeys.APM_SERVICE_NAME], + [ConfigKeys.HOSTS]: defaultValues[ConfigKeys.HOSTS], + [ConfigKeys.MONITOR_TYPE]: defaultValues[ConfigKeys.MONITOR_TYPE], + [ConfigKeys.SCHEDULE]: defaultValues[ConfigKeys.SCHEDULE], + [ConfigKeys.TAGS]: defaultValues[ConfigKeys.TAGS], + [ConfigKeys.TIMEOUT]: defaultValues[ConfigKeys.TIMEOUT], + } + : undefined; + const tcpAdvancedFields: ITCPAdvancedFields | undefined = defaultValues + ? { + [ConfigKeys.PROXY_URL]: defaultValues[ConfigKeys.PROXY_URL], + [ConfigKeys.PROXY_USE_LOCAL_RESOLVER]: defaultValues[ConfigKeys.PROXY_USE_LOCAL_RESOLVER], + [ConfigKeys.RESPONSE_RECEIVE_CHECK]: defaultValues[ConfigKeys.RESPONSE_RECEIVE_CHECK], + [ConfigKeys.REQUEST_SEND_CHECK]: defaultValues[ConfigKeys.REQUEST_SEND_CHECK], + } + : undefined; + const tlsFields: ITLSFields | undefined = defaultValues + ? { + [ConfigKeys.TLS_CERTIFICATE_AUTHORITIES]: + defaultValues[ConfigKeys.TLS_CERTIFICATE_AUTHORITIES], + [ConfigKeys.TLS_CERTIFICATE]: defaultValues[ConfigKeys.TLS_CERTIFICATE], + [ConfigKeys.TLS_KEY]: defaultValues[ConfigKeys.TLS_KEY], + [ConfigKeys.TLS_KEY_PASSPHRASE]: defaultValues[ConfigKeys.TLS_KEY_PASSPHRASE], + [ConfigKeys.TLS_VERIFICATION_MODE]: defaultValues[ConfigKeys.TLS_VERIFICATION_MODE], + [ConfigKeys.TLS_VERSION]: defaultValues[ConfigKeys.TLS_VERSION], + } + : undefined; + return ( + + + {children} + + + ); +}; diff --git a/x-pack/plugins/uptime/public/components/fleet_package/custom_fields.test.tsx b/x-pack/plugins/uptime/public/components/fleet_package/custom_fields.test.tsx index b5fec58d4da850..e114ea72b8f49c 100644 --- a/x-pack/plugins/uptime/public/components/fleet_package/custom_fields.test.tsx +++ b/x-pack/plugins/uptime/public/components/fleet_package/custom_fields.test.tsx @@ -9,18 +9,15 @@ import React from 'react'; import { fireEvent, waitFor } from '@testing-library/react'; import { render } from '../../lib/helper/rtl_helpers'; import { - SimpleFieldsContextProvider, - HTTPAdvancedFieldsContextProvider, - TCPAdvancedFieldsContextProvider, - TLSFieldsContextProvider, - defaultSimpleFields, - defaultTLSFields, - defaultHTTPAdvancedFields, - defaultTCPAdvancedFields, + TCPContextProvider, + HTTPContextProvider, + ICMPSimpleFieldsContextProvider, + MonitorTypeContextProvider, } from './contexts'; import { CustomFields } from './custom_fields'; import { ConfigKeys, DataStream, ScheduleUnit } from './types'; import { validate as centralValidation } from './validation'; +import { defaultConfig } from './synthetics_policy_create_extension'; // ensures that fields appropriately match to their label jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => ({ @@ -29,25 +26,21 @@ jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => ({ const defaultValidation = centralValidation[DataStream.HTTP]; -const defaultConfig = { - ...defaultSimpleFields, - ...defaultTLSFields, - ...defaultHTTPAdvancedFields, - ...defaultTCPAdvancedFields, -}; +const defaultHTTPConfig = defaultConfig[DataStream.HTTP]; +const defaultTCPConfig = defaultConfig[DataStream.TCP]; describe('', () => { const WrappedComponent = ({ validate = defaultValidation, typeEditable = false }) => { return ( - - - - + + + + - - - - + + + + ); }; @@ -63,20 +56,20 @@ describe('', () => { const timeout = getByLabelText('Timeout in seconds') as HTMLInputElement; expect(monitorType).not.toBeInTheDocument(); expect(url).toBeInTheDocument(); - expect(url.value).toEqual(defaultConfig[ConfigKeys.URLS]); + expect(url.value).toEqual(defaultHTTPConfig[ConfigKeys.URLS]); expect(proxyUrl).toBeInTheDocument(); - expect(proxyUrl.value).toEqual(defaultConfig[ConfigKeys.PROXY_URL]); + expect(proxyUrl.value).toEqual(defaultHTTPConfig[ConfigKeys.PROXY_URL]); expect(monitorIntervalNumber).toBeInTheDocument(); - expect(monitorIntervalNumber.value).toEqual(defaultConfig[ConfigKeys.SCHEDULE].number); + expect(monitorIntervalNumber.value).toEqual(defaultHTTPConfig[ConfigKeys.SCHEDULE].number); expect(monitorIntervalUnit).toBeInTheDocument(); - expect(monitorIntervalUnit.value).toEqual(defaultConfig[ConfigKeys.SCHEDULE].unit); + expect(monitorIntervalUnit.value).toEqual(defaultHTTPConfig[ConfigKeys.SCHEDULE].unit); // expect(tags).toBeInTheDocument(); expect(apmServiceName).toBeInTheDocument(); - expect(apmServiceName.value).toEqual(defaultConfig[ConfigKeys.APM_SERVICE_NAME]); + expect(apmServiceName.value).toEqual(defaultHTTPConfig[ConfigKeys.APM_SERVICE_NAME]); expect(maxRedirects).toBeInTheDocument(); - expect(maxRedirects.value).toEqual(`${defaultConfig[ConfigKeys.MAX_REDIRECTS]}`); + expect(maxRedirects.value).toEqual(`${defaultHTTPConfig[ConfigKeys.MAX_REDIRECTS]}`); expect(timeout).toBeInTheDocument(); - expect(timeout.value).toEqual(`${defaultConfig[ConfigKeys.TIMEOUT]}`); + expect(timeout.value).toEqual(`${defaultHTTPConfig[ConfigKeys.TIMEOUT]}`); // ensure other monitor type options are not in the DOM expect(queryByLabelText('Host')).not.toBeInTheDocument(); @@ -116,11 +109,15 @@ describe('', () => { expect(verificationMode).toBeInTheDocument(); await waitFor(() => { - expect(ca.value).toEqual(defaultConfig[ConfigKeys.TLS_CERTIFICATE_AUTHORITIES].value); - expect(clientKey.value).toEqual(defaultConfig[ConfigKeys.TLS_KEY].value); - expect(clientKeyPassphrase.value).toEqual(defaultConfig[ConfigKeys.TLS_KEY_PASSPHRASE].value); - expect(clientCertificate.value).toEqual(defaultConfig[ConfigKeys.TLS_CERTIFICATE].value); - expect(verificationMode.value).toEqual(defaultConfig[ConfigKeys.TLS_VERIFICATION_MODE].value); + expect(ca.value).toEqual(defaultHTTPConfig[ConfigKeys.TLS_CERTIFICATE_AUTHORITIES].value); + expect(clientKey.value).toEqual(defaultHTTPConfig[ConfigKeys.TLS_KEY].value); + expect(clientKeyPassphrase.value).toEqual( + defaultHTTPConfig[ConfigKeys.TLS_KEY_PASSPHRASE].value + ); + expect(clientCertificate.value).toEqual(defaultHTTPConfig[ConfigKeys.TLS_CERTIFICATE].value); + expect(verificationMode.value).toEqual( + defaultHTTPConfig[ConfigKeys.TLS_VERIFICATION_MODE].value + ); }); }); @@ -157,14 +154,14 @@ describe('', () => { ); const monitorType = getByLabelText('Monitor Type') as HTMLInputElement; expect(monitorType).toBeInTheDocument(); - expect(monitorType.value).toEqual(defaultConfig[ConfigKeys.MONITOR_TYPE]); + expect(monitorType.value).toEqual(defaultHTTPConfig[ConfigKeys.MONITOR_TYPE]); fireEvent.change(monitorType, { target: { value: DataStream.TCP } }); // expect tcp fields to be in the DOM const host = getByLabelText('Host:Port') as HTMLInputElement; expect(host).toBeInTheDocument(); - expect(host.value).toEqual(defaultConfig[ConfigKeys.HOSTS]); + expect(host.value).toEqual(defaultTCPConfig[ConfigKeys.HOSTS]); // expect HTTP fields not to be in the DOM expect(queryByLabelText('URL')).not.toBeInTheDocument(); diff --git a/x-pack/plugins/uptime/public/components/fleet_package/custom_fields.tsx b/x-pack/plugins/uptime/public/components/fleet_package/custom_fields.tsx index e6703a6eaa97cd..0d9291261b82d6 100644 --- a/x-pack/plugins/uptime/public/components/fleet_package/custom_fields.tsx +++ b/x-pack/plugins/uptime/public/components/fleet_package/custom_fields.tsx @@ -5,28 +5,26 @@ * 2.0. */ -import React, { useEffect, useState, memo } from 'react'; +import React, { useState, memo } from 'react'; import { FormattedMessage } from '@kbn/i18n/react'; import { EuiFlexGroup, EuiFlexItem, EuiForm, EuiFormRow, - EuiFieldText, - EuiFieldNumber, EuiSelect, EuiSpacer, EuiDescribedFormGroup, EuiCheckbox, } from '@elastic/eui'; -import { ConfigKeys, DataStream, ISimpleFields, Validation } from './types'; -import { useSimpleFieldsContext } from './contexts'; +import { ConfigKeys, DataStream, Validation } from './types'; +import { useMonitorTypeContext } from './contexts'; import { TLSFields, TLSRole } from './tls_fields'; -import { ComboBox } from './combo_box'; -import { OptionalLabel } from './optional_label'; -import { HTTPAdvancedFields } from './http_advanced_fields'; -import { TCPAdvancedFields } from './tcp_advanced_fields'; -import { ScheduleField } from './schedule_field'; +import { HTTPSimpleFields } from './http/simple_fields'; +import { HTTPAdvancedFields } from './http/advanced_fields'; +import { TCPSimpleFields } from './tcp/simple_fields'; +import { TCPAdvancedFields } from './tcp/advanced_fields'; +import { ICMPSimpleFields } from './icmp/simple_fields'; interface Props { typeEditable?: boolean; @@ -37,26 +35,22 @@ interface Props { export const CustomFields = memo( ({ typeEditable = false, isTLSEnabled: defaultIsTLSEnabled = false, validate }) => { const [isTLSEnabled, setIsTLSEnabled] = useState(defaultIsTLSEnabled); - const { fields, setFields, defaultValues } = useSimpleFieldsContext(); - const { type } = fields; + const { monitorType, setMonitorType } = useMonitorTypeContext(); - const isHTTP = fields[ConfigKeys.MONITOR_TYPE] === DataStream.HTTP; - const isTCP = fields[ConfigKeys.MONITOR_TYPE] === DataStream.TCP; - const isICMP = fields[ConfigKeys.MONITOR_TYPE] === DataStream.ICMP; + const isHTTP = monitorType === DataStream.HTTP; + const isTCP = monitorType === DataStream.TCP; - // reset monitor type specific fields any time a monitor type is switched - useEffect(() => { - if (typeEditable) { - setFields((prevFields: ISimpleFields) => ({ - ...prevFields, - [ConfigKeys.HOSTS]: defaultValues[ConfigKeys.HOSTS], - [ConfigKeys.URLS]: defaultValues[ConfigKeys.URLS], - })); + const renderSimpleFields = (type: DataStream) => { + switch (type) { + case DataStream.HTTP: + return ; + case DataStream.ICMP: + return ; + case DataStream.TCP: + return ; + default: + return null; } - }, [defaultValues, type, typeEditable, setFields]); - - const handleInputChange = ({ value, configKey }: { value: unknown; configKey: ConfigKeys }) => { - setFields((prevFields) => ({ ...prevFields, [configKey]: value })); }; return ( @@ -88,7 +82,7 @@ export const CustomFields = memo( defaultMessage="Monitor Type" /> } - isInvalid={!!validate[ConfigKeys.MONITOR_TYPE]?.(fields[ConfigKeys.MONITOR_TYPE])} + isInvalid={!!validate[ConfigKeys.MONITOR_TYPE]?.(monitorType)} error={ ( > - handleInputChange({ - value: event.target.value, - configKey: ConfigKeys.MONITOR_TYPE, - }) - } + value={monitorType} + onChange={(event) => setMonitorType(event.target.value as DataStream)} data-test-subj="syntheticsMonitorTypeField" /> )} - {isHTTP && ( - - } - isInvalid={!!validate[ConfigKeys.URLS]?.(fields[ConfigKeys.URLS])} - error={ - - } - > - - handleInputChange({ value: event.target.value, configKey: ConfigKeys.URLS }) - } - data-test-subj="syntheticsUrlField" - /> - - )} - {isTCP && ( - - } - isInvalid={!!validate[ConfigKeys.HOSTS]?.(fields[ConfigKeys.HOSTS])} - error={ - - } - > - - handleInputChange({ - value: event.target.value, - configKey: ConfigKeys.HOSTS, - }) - } - data-test-subj="syntheticsTCPHostField" - /> - - )} - {isICMP && ( - - } - isInvalid={!!validate[ConfigKeys.HOSTS]?.(fields[ConfigKeys.HOSTS])} - error={ - - } - > - - handleInputChange({ - value: event.target.value, - configKey: ConfigKeys.HOSTS, - }) - } - data-test-subj="syntheticsICMPHostField" - /> - - )} - - } - isInvalid={!!validate[ConfigKeys.SCHEDULE]?.(fields[ConfigKeys.SCHEDULE])} - error={ - - } - > - - handleInputChange({ - value: schedule, - configKey: ConfigKeys.SCHEDULE, - }) - } - number={fields[ConfigKeys.SCHEDULE].number} - unit={fields[ConfigKeys.SCHEDULE].unit} - /> - - {isICMP && ( - - } - isInvalid={!!validate[ConfigKeys.WAIT]?.(fields[ConfigKeys.WAIT])} - error={ - - } - labelAppend={} - helpText={ - - } - > - - handleInputChange({ value: event.target.value, configKey: ConfigKeys.WAIT }) - } - step={'any'} - /> - - )} - - } - labelAppend={} - helpText={ - - } - > - - handleInputChange({ - value: event.target.value, - configKey: ConfigKeys.APM_SERVICE_NAME, - }) - } - data-test-subj="syntheticsAPMServiceName" - /> - - {isHTTP && ( - - } - isInvalid={ - !!validate[ConfigKeys.MAX_REDIRECTS]?.(fields[ConfigKeys.MAX_REDIRECTS]) - } - error={ - - } - labelAppend={} - helpText={ - - } - > - - handleInputChange({ - value: event.target.value, - configKey: ConfigKeys.MAX_REDIRECTS, - }) - } - /> - - )} - - } - isInvalid={ - !!validate[ConfigKeys.TIMEOUT]?.( - fields[ConfigKeys.TIMEOUT], - fields[ConfigKeys.SCHEDULE].number, - fields[ConfigKeys.SCHEDULE].unit - ) - } - error={ - - } - helpText={ - - } - > - - handleInputChange({ - value: event.target.value, - configKey: ConfigKeys.TIMEOUT, - }) - } - step={'any'} - /> - - - } - labelAppend={} - helpText={ - - } - > - handleInputChange({ value, configKey: ConfigKeys.TAGS })} - data-test-subj="syntheticsTags" - /> - + {renderSimpleFields(monitorType)} diff --git a/x-pack/plugins/uptime/public/components/fleet_package/http_advanced_fields.test.tsx b/x-pack/plugins/uptime/public/components/fleet_package/http/advanced_fields.test.tsx similarity index 95% rename from x-pack/plugins/uptime/public/components/fleet_package/http_advanced_fields.test.tsx rename to x-pack/plugins/uptime/public/components/fleet_package/http/advanced_fields.test.tsx index b1a37be1bffb67..69c1d897f7847d 100644 --- a/x-pack/plugins/uptime/public/components/fleet_package/http_advanced_fields.test.tsx +++ b/x-pack/plugins/uptime/public/components/fleet_package/http/advanced_fields.test.tsx @@ -7,14 +7,14 @@ import React from 'react'; import { fireEvent } from '@testing-library/react'; -import { render } from '../../lib/helper/rtl_helpers'; -import { HTTPAdvancedFields } from './http_advanced_fields'; -import { ConfigKeys, DataStream, HTTPMethod, IHTTPAdvancedFields, Validation } from './types'; +import { render } from '../../../lib/helper/rtl_helpers'; +import { HTTPAdvancedFields } from './advanced_fields'; +import { ConfigKeys, DataStream, HTTPMethod, IHTTPAdvancedFields, Validation } from '../types'; import { HTTPAdvancedFieldsContextProvider, defaultHTTPAdvancedFields as defaultConfig, -} from './contexts'; -import { validate as centralValidation } from './validation'; +} from '../contexts'; +import { validate as centralValidation } from '../validation'; jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => ({ htmlIdGenerator: () => () => `id-${Math.random()}`, diff --git a/x-pack/plugins/uptime/public/components/fleet_package/http_advanced_fields.tsx b/x-pack/plugins/uptime/public/components/fleet_package/http/advanced_fields.tsx similarity index 97% rename from x-pack/plugins/uptime/public/components/fleet_package/http_advanced_fields.tsx rename to x-pack/plugins/uptime/public/components/fleet_package/http/advanced_fields.tsx index 568ff526efb6e9..aeaa452c38db96 100644 --- a/x-pack/plugins/uptime/public/components/fleet_package/http_advanced_fields.tsx +++ b/x-pack/plugins/uptime/public/components/fleet_package/http/advanced_fields.tsx @@ -20,15 +20,15 @@ import { EuiFieldPassword, } from '@elastic/eui'; -import { useHTTPAdvancedFieldsContext } from './contexts'; +import { useHTTPAdvancedFieldsContext } from '../contexts'; -import { ConfigKeys, HTTPMethod, Validation } from './types'; +import { ConfigKeys, HTTPMethod, Validation } from '../types'; -import { OptionalLabel } from './optional_label'; -import { HeaderField } from './header_field'; -import { RequestBodyField } from './request_body_field'; -import { ResponseBodyIndexField } from './index_response_body_field'; -import { ComboBox } from './combo_box'; +import { OptionalLabel } from '../optional_label'; +import { HeaderField } from '../header_field'; +import { RequestBodyField } from '../request_body_field'; +import { ResponseBodyIndexField } from '../index_response_body_field'; +import { ComboBox } from '../combo_box'; interface Props { validate: Validation; diff --git a/x-pack/plugins/uptime/public/components/fleet_package/http/simple_fields.tsx b/x-pack/plugins/uptime/public/components/fleet_package/http/simple_fields.tsx new file mode 100644 index 00000000000000..d17b8c997e9e8d --- /dev/null +++ b/x-pack/plugins/uptime/public/components/fleet_package/http/simple_fields.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; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { memo } from 'react'; +import { FormattedMessage } from '@kbn/i18n/react'; +import { EuiFormRow, EuiFieldText, EuiFieldNumber } from '@elastic/eui'; +import { ConfigKeys, Validation } from '../types'; +import { useHTTPSimpleFieldsContext } from '../contexts'; +import { ComboBox } from '../combo_box'; +import { OptionalLabel } from '../optional_label'; +import { ScheduleField } from '../schedule_field'; + +interface Props { + validate: Validation; +} + +export const HTTPSimpleFields = memo(({ validate }) => { + const { fields, setFields } = useHTTPSimpleFieldsContext(); + const handleInputChange = ({ value, configKey }: { value: unknown; configKey: ConfigKeys }) => { + setFields((prevFields) => ({ ...prevFields, [configKey]: value })); + }; + + return ( + <> + + } + isInvalid={!!validate[ConfigKeys.URLS]?.(fields[ConfigKeys.URLS])} + error={ + + } + > + + handleInputChange({ value: event.target.value, configKey: ConfigKeys.URLS }) + } + data-test-subj="syntheticsUrlField" + /> + + + } + isInvalid={!!validate[ConfigKeys.SCHEDULE]?.(fields[ConfigKeys.SCHEDULE])} + error={ + + } + > + + handleInputChange({ + value: schedule, + configKey: ConfigKeys.SCHEDULE, + }) + } + number={fields[ConfigKeys.SCHEDULE].number} + unit={fields[ConfigKeys.SCHEDULE].unit} + /> + + + } + labelAppend={} + helpText={ + + } + > + + handleInputChange({ + value: event.target.value, + configKey: ConfigKeys.APM_SERVICE_NAME, + }) + } + data-test-subj="syntheticsAPMServiceName" + /> + + + } + isInvalid={!!validate[ConfigKeys.MAX_REDIRECTS]?.(fields[ConfigKeys.MAX_REDIRECTS])} + error={ + + } + labelAppend={} + helpText={ + + } + > + + handleInputChange({ + value: event.target.value, + configKey: ConfigKeys.MAX_REDIRECTS, + }) + } + /> + + + } + isInvalid={ + !!validate[ConfigKeys.TIMEOUT]?.( + fields[ConfigKeys.TIMEOUT], + fields[ConfigKeys.SCHEDULE].number, + fields[ConfigKeys.SCHEDULE].unit + ) + } + error={ + + } + helpText={ + + } + > + + handleInputChange({ + value: event.target.value, + configKey: ConfigKeys.TIMEOUT, + }) + } + step={'any'} + /> + + + } + labelAppend={} + helpText={ + + } + > + handleInputChange({ value, configKey: ConfigKeys.TAGS })} + data-test-subj="syntheticsTags" + /> + + + ); +}); diff --git a/x-pack/plugins/uptime/public/components/fleet_package/icmp/simple_fields.tsx b/x-pack/plugins/uptime/public/components/fleet_package/icmp/simple_fields.tsx new file mode 100644 index 00000000000000..3ca07c70673677 --- /dev/null +++ b/x-pack/plugins/uptime/public/components/fleet_package/icmp/simple_fields.tsx @@ -0,0 +1,204 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { memo } from 'react'; +import { FormattedMessage } from '@kbn/i18n/react'; +import { EuiFormRow, EuiFieldText, EuiFieldNumber } from '@elastic/eui'; +import { ConfigKeys, Validation } from '../types'; +import { useICMPSimpleFieldsContext } from '../contexts'; +import { ComboBox } from '../combo_box'; +import { OptionalLabel } from '../optional_label'; +import { ScheduleField } from '../schedule_field'; + +interface Props { + validate: Validation; +} + +export const ICMPSimpleFields = memo(({ validate }) => { + const { fields, setFields } = useICMPSimpleFieldsContext(); + const handleInputChange = ({ value, configKey }: { value: unknown; configKey: ConfigKeys }) => { + setFields((prevFields) => ({ ...prevFields, [configKey]: value })); + }; + + return ( + <> + + } + isInvalid={!!validate[ConfigKeys.HOSTS]?.(fields[ConfigKeys.HOSTS])} + error={ + + } + > + + handleInputChange({ + value: event.target.value, + configKey: ConfigKeys.HOSTS, + }) + } + data-test-subj="syntheticsICMPHostField" + /> + + + } + isInvalid={!!validate[ConfigKeys.SCHEDULE]?.(fields[ConfigKeys.SCHEDULE])} + error={ + + } + > + + handleInputChange({ + value: schedule, + configKey: ConfigKeys.SCHEDULE, + }) + } + number={fields[ConfigKeys.SCHEDULE].number} + unit={fields[ConfigKeys.SCHEDULE].unit} + /> + + + } + isInvalid={!!validate[ConfigKeys.WAIT]?.(fields[ConfigKeys.WAIT])} + error={ + + } + labelAppend={} + helpText={ + + } + > + + handleInputChange({ + value: event.target.value, + configKey: ConfigKeys.WAIT, + }) + } + step={'any'} + /> + + + } + labelAppend={} + helpText={ + + } + > + + handleInputChange({ + value: event.target.value, + configKey: ConfigKeys.APM_SERVICE_NAME, + }) + } + data-test-subj="syntheticsAPMServiceName" + /> + + + } + isInvalid={ + !!validate[ConfigKeys.TIMEOUT]?.( + fields[ConfigKeys.TIMEOUT], + fields[ConfigKeys.SCHEDULE].number, + fields[ConfigKeys.SCHEDULE].unit + ) + } + error={ + + } + helpText={ + + } + > + + handleInputChange({ + value: event.target.value, + configKey: ConfigKeys.TIMEOUT, + }) + } + step={'any'} + /> + + + } + labelAppend={} + helpText={ + + } + > + handleInputChange({ value, configKey: ConfigKeys.TAGS })} + data-test-subj="syntheticsTags" + /> + + + ); +}); diff --git a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension.tsx b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension.tsx index 1306308f8ba4e1..90e7e7d7bb7333 100644 --- a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension.tsx +++ b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension.tsx @@ -9,37 +9,62 @@ import React, { memo, useContext, useEffect } from 'react'; import useDebounce from 'react-use/lib/useDebounce'; import { PackagePolicyCreateExtensionComponentProps } from '../../../../fleet/public'; import { useTrackPageview } from '../../../../observability/public'; -import { Config, ConfigKeys, DataStream } from './types'; +import { PolicyConfig, DataStream } from './types'; import { - SimpleFieldsContext, + MonitorTypeContext, HTTPAdvancedFieldsContext, TCPAdvancedFieldsContext, TLSFieldsContext, + HTTPSimpleFieldsContext, + TCPSimpleFieldsContext, + ICMPSimpleFieldsContext, + defaultHTTPAdvancedFields, + defaultHTTPSimpleFields, + defaultICMPSimpleFields, + defaultTCPSimpleFields, + defaultTCPAdvancedFields, + defaultTLSFields, } from './contexts'; import { CustomFields } from './custom_fields'; import { useUpdatePolicy } from './use_update_policy'; import { validate } from './validation'; +export const defaultConfig: PolicyConfig = { + [DataStream.HTTP]: { + ...defaultHTTPSimpleFields, + ...defaultHTTPAdvancedFields, + ...defaultTLSFields, + }, + [DataStream.TCP]: { + ...defaultTCPSimpleFields, + ...defaultTCPAdvancedFields, + ...defaultTLSFields, + }, + [DataStream.ICMP]: defaultICMPSimpleFields, +}; + /** * Exports Synthetics-specific package policy instructions * for use in the Ingest app create / edit package policy */ export const SyntheticsPolicyCreateExtension = memo( ({ newPolicy, onChange }) => { - const { fields: simpleFields } = useContext(SimpleFieldsContext); + const { monitorType } = useContext(MonitorTypeContext); + const { fields: httpSimpleFields } = useContext(HTTPSimpleFieldsContext); + const { fields: tcpSimpleFields } = useContext(TCPSimpleFieldsContext); + const { fields: icmpSimpleFields } = useContext(ICMPSimpleFieldsContext); const { fields: httpAdvancedFields } = useContext(HTTPAdvancedFieldsContext); const { fields: tcpAdvancedFields } = useContext(TCPAdvancedFieldsContext); const { fields: tlsFields } = useContext(TLSFieldsContext); - const defaultConfig: Config = { - name: '', - ...simpleFields, - ...httpAdvancedFields, - ...tcpAdvancedFields, - ...tlsFields, - }; useTrackPageview({ app: 'fleet', path: 'syntheticsCreate' }); useTrackPageview({ app: 'fleet', path: 'syntheticsCreate', delay: 15000 }); - const { config, setConfig } = useUpdatePolicy({ defaultConfig, newPolicy, onChange, validate }); + const { setConfig } = useUpdatePolicy({ + monitorType, + defaultConfig, + newPolicy, + onChange, + validate, + }); // Fleet will initialize the create form with a default name for the integratin policy, however, // for synthetics, we want the user to explicitely type in a name to use as the monitor name, @@ -57,24 +82,40 @@ export const SyntheticsPolicyCreateExtension = memo { - setConfig((prevConfig) => ({ - ...prevConfig, - ...simpleFields, - ...httpAdvancedFields, - ...tcpAdvancedFields, - ...tlsFields, - // ensure proxyUrl is not overwritten - [ConfigKeys.PROXY_URL]: - simpleFields[ConfigKeys.MONITOR_TYPE] === DataStream.HTTP - ? httpAdvancedFields[ConfigKeys.PROXY_URL] - : tcpAdvancedFields[ConfigKeys.PROXY_URL], - })); + setConfig(() => { + switch (monitorType) { + case DataStream.HTTP: + return { + ...httpSimpleFields, + ...httpAdvancedFields, + ...tlsFields, + }; + case DataStream.TCP: + return { + ...tcpSimpleFields, + ...tcpAdvancedFields, + ...tlsFields, + }; + case DataStream.ICMP: + return { + ...icmpSimpleFields, + }; + } + }); }, 250, - [setConfig, simpleFields, httpAdvancedFields, tcpAdvancedFields, tlsFields] + [ + setConfig, + httpSimpleFields, + tcpSimpleFields, + icmpSimpleFields, + httpAdvancedFields, + tcpAdvancedFields, + tlsFields, + ] ); - return ; + return ; } ); SyntheticsPolicyCreateExtension.displayName = 'SyntheticsPolicyCreateExtension'; diff --git a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.test.tsx b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.test.tsx index a16f2ba87d79ab..395b5d67abeb0b 100644 --- a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.test.tsx +++ b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.test.tsx @@ -9,22 +9,10 @@ import React from 'react'; import { fireEvent, waitFor } from '@testing-library/react'; import { render } from '../../lib/helper/rtl_helpers'; import { NewPackagePolicy } from '../../../../fleet/public'; -import { - defaultSimpleFields, - defaultTLSFields, - defaultHTTPAdvancedFields, - defaultTCPAdvancedFields, -} from './contexts'; import { SyntheticsPolicyCreateExtensionWrapper } from './synthetics_policy_create_extension_wrapper'; +import { defaultConfig } from './synthetics_policy_create_extension'; import { ConfigKeys, DataStream, ScheduleUnit, VerificationMode } from './types'; -const defaultConfig = { - ...defaultSimpleFields, - ...defaultTLSFields, - ...defaultHTTPAdvancedFields, - ...defaultTCPAdvancedFields, -}; - // ensures that fields appropriately match to their label jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => ({ htmlIdGenerator: () => () => `id-${Math.random()}`, @@ -266,6 +254,9 @@ const defaultNewPolicy: NewPackagePolicy = { }, }; +const defaultHTTPConfig = defaultConfig[DataStream.HTTP]; +const defaultTCPConfig = defaultConfig[DataStream.TCP]; + describe('', () => { const onChange = jest.fn(); const WrappedComponent = ({ newPolicy = defaultNewPolicy }) => { @@ -283,21 +274,21 @@ describe('', () => { const maxRedirects = getByLabelText('Max redirects') as HTMLInputElement; const timeout = getByLabelText('Timeout in seconds') as HTMLInputElement; expect(monitorType).toBeInTheDocument(); - expect(monitorType.value).toEqual(defaultConfig[ConfigKeys.MONITOR_TYPE]); + expect(monitorType.value).toEqual(DataStream.HTTP); expect(url).toBeInTheDocument(); - expect(url.value).toEqual(defaultConfig[ConfigKeys.URLS]); + expect(url.value).toEqual(defaultHTTPConfig[ConfigKeys.URLS]); expect(proxyUrl).toBeInTheDocument(); - expect(proxyUrl.value).toEqual(defaultConfig[ConfigKeys.PROXY_URL]); + expect(proxyUrl.value).toEqual(defaultHTTPConfig[ConfigKeys.PROXY_URL]); expect(monitorIntervalNumber).toBeInTheDocument(); - expect(monitorIntervalNumber.value).toEqual(defaultConfig[ConfigKeys.SCHEDULE].number); + expect(monitorIntervalNumber.value).toEqual(defaultHTTPConfig[ConfigKeys.SCHEDULE].number); expect(monitorIntervalUnit).toBeInTheDocument(); - expect(monitorIntervalUnit.value).toEqual(defaultConfig[ConfigKeys.SCHEDULE].unit); + expect(monitorIntervalUnit.value).toEqual(defaultHTTPConfig[ConfigKeys.SCHEDULE].unit); expect(apmServiceName).toBeInTheDocument(); - expect(apmServiceName.value).toEqual(defaultConfig[ConfigKeys.APM_SERVICE_NAME]); + expect(apmServiceName.value).toEqual(defaultHTTPConfig[ConfigKeys.APM_SERVICE_NAME]); expect(maxRedirects).toBeInTheDocument(); - expect(maxRedirects.value).toEqual(`${defaultConfig[ConfigKeys.MAX_REDIRECTS]}`); + expect(maxRedirects.value).toEqual(`${defaultHTTPConfig[ConfigKeys.MAX_REDIRECTS]}`); expect(timeout).toBeInTheDocument(); - expect(timeout.value).toEqual(`${defaultConfig[ConfigKeys.TIMEOUT]}`); + expect(timeout.value).toEqual(`${defaultHTTPConfig[ConfigKeys.TIMEOUT]}`); // ensure other monitor type options are not in the DOM expect(queryByLabelText('Host')).not.toBeInTheDocument(); @@ -425,7 +416,7 @@ describe('', () => { const { getByText, getByLabelText, queryByLabelText } = render(); const monitorType = getByLabelText('Monitor Type') as HTMLInputElement; expect(monitorType).toBeInTheDocument(); - expect(monitorType.value).toEqual(defaultConfig[ConfigKeys.MONITOR_TYPE]); + expect(monitorType.value).toEqual(DataStream.HTTP); fireEvent.change(monitorType, { target: { value: DataStream.TCP } }); await waitFor(() => { @@ -452,7 +443,7 @@ describe('', () => { const host = getByLabelText('Host:Port') as HTMLInputElement; expect(host).toBeInTheDocument(); - expect(host.value).toEqual(defaultConfig[ConfigKeys.HOSTS]); + expect(host.value).toEqual(defaultTCPConfig[ConfigKeys.HOSTS]); // expect HTTP fields not to be in the DOM expect(queryByLabelText('URL')).not.toBeInTheDocument(); @@ -467,29 +458,6 @@ describe('', () => { fireEvent.change(monitorType, { target: { value: DataStream.ICMP } }); - await waitFor(() => { - expect(onChange).toBeCalledWith({ - isValid: false, - updatedPolicy: { - ...defaultNewPolicy, - inputs: [ - { - ...defaultNewPolicy.inputs[0], - enabled: false, - }, - { - ...defaultNewPolicy.inputs[1], - enabled: false, - }, - { - ...defaultNewPolicy.inputs[2], - enabled: true, - }, - ], - }, - }); - }); - // expect ICMP fields to be in the DOM expect(getByLabelText('Wait in seconds')).toBeInTheDocument(); @@ -721,23 +689,27 @@ describe('', () => { await waitFor(() => { fireEvent.change(ca, { target: { value: 'certificateAuthorities' } }); - expect(ca.value).toEqual(defaultConfig[ConfigKeys.TLS_CERTIFICATE_AUTHORITIES].value); + expect(ca.value).toEqual(defaultHTTPConfig[ConfigKeys.TLS_CERTIFICATE_AUTHORITIES].value); }); await waitFor(() => { fireEvent.change(clientCertificate, { target: { value: 'clientCertificate' } }); - expect(clientCertificate.value).toEqual(defaultConfig[ConfigKeys.TLS_KEY].value); + expect(clientCertificate.value).toEqual(defaultHTTPConfig[ConfigKeys.TLS_KEY].value); }); await waitFor(() => { fireEvent.change(clientKey, { target: { value: 'clientKey' } }); - expect(clientKey.value).toEqual(defaultConfig[ConfigKeys.TLS_KEY].value); + expect(clientKey.value).toEqual(defaultHTTPConfig[ConfigKeys.TLS_KEY].value); }); await waitFor(() => { fireEvent.change(clientKeyPassphrase, { target: { value: 'clientKeyPassphrase' } }); - expect(clientKeyPassphrase.value).toEqual(defaultConfig[ConfigKeys.TLS_KEY_PASSPHRASE].value); + expect(clientKeyPassphrase.value).toEqual( + defaultHTTPConfig[ConfigKeys.TLS_KEY_PASSPHRASE].value + ); }); await waitFor(() => { fireEvent.change(verificationMode, { target: { value: VerificationMode.NONE } }); - expect(verificationMode.value).toEqual(defaultConfig[ConfigKeys.TLS_VERIFICATION_MODE].value); + expect(verificationMode.value).toEqual( + defaultHTTPConfig[ConfigKeys.TLS_VERIFICATION_MODE].value + ); }); await waitFor(() => { diff --git a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.tsx b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.tsx index 688ee24bd2330a..88bb8e7871459d 100644 --- a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.tsx +++ b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.tsx @@ -9,9 +9,10 @@ import React, { memo } from 'react'; import { PackagePolicyCreateExtensionComponentProps } from '../../../../fleet/public'; import { SyntheticsPolicyCreateExtension } from './synthetics_policy_create_extension'; import { - SimpleFieldsContextProvider, - HTTPAdvancedFieldsContextProvider, - TCPAdvancedFieldsContextProvider, + MonitorTypeContextProvider, + TCPContextProvider, + ICMPSimpleFieldsContextProvider, + HTTPContextProvider, TLSFieldsContextProvider, } from './contexts'; @@ -22,15 +23,17 @@ import { export const SyntheticsPolicyCreateExtensionWrapper = memo( ({ newPolicy, onChange }) => { return ( - - - + + + - + + + - - - + + + ); } ); diff --git a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension.tsx b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension.tsx index e29a5c6a363ed5..8a3c42c10bc14a 100644 --- a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension.tsx +++ b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension.tsx @@ -5,17 +5,20 @@ * 2.0. */ -import React, { memo, useContext } from 'react'; +import React, { memo } from 'react'; import useDebounce from 'react-use/lib/useDebounce'; import { PackagePolicyEditExtensionComponentProps } from '../../../../fleet/public'; import { useTrackPageview } from '../../../../observability/public'; import { - SimpleFieldsContext, - HTTPAdvancedFieldsContext, - TCPAdvancedFieldsContext, - TLSFieldsContext, + useMonitorTypeContext, + useTCPSimpleFieldsContext, + useTCPAdvancedFieldsContext, + useICMPSimpleFieldsContext, + useHTTPSimpleFieldsContext, + useHTTPAdvancedFieldsContext, + useTLSFieldsContext, } from './contexts'; -import { Config, ConfigKeys, DataStream } from './types'; +import { PolicyConfig, DataStream } from './types'; import { CustomFields } from './custom_fields'; import { useUpdatePolicy } from './use_update_policy'; import { validate } from './validation'; @@ -23,7 +26,7 @@ import { validate } from './validation'; interface SyntheticsPolicyEditExtensionProps { newPolicy: PackagePolicyEditExtensionComponentProps['newPolicy']; onChange: PackagePolicyEditExtensionComponentProps['onChange']; - defaultConfig: Config; + defaultConfig: PolicyConfig; isTLSEnabled: boolean; } /** @@ -34,37 +37,57 @@ export const SyntheticsPolicyEditExtension = memo { useTrackPageview({ app: 'fleet', path: 'syntheticsEdit' }); useTrackPageview({ app: 'fleet', path: 'syntheticsEdit', delay: 15000 }); - const { fields: simpleFields } = useContext(SimpleFieldsContext); - const { fields: httpAdvancedFields } = useContext(HTTPAdvancedFieldsContext); - const { fields: tcpAdvancedFields } = useContext(TCPAdvancedFieldsContext); - const { fields: tlsFields } = useContext(TLSFieldsContext); - const { config, setConfig } = useUpdatePolicy({ defaultConfig, newPolicy, onChange, validate }); + const { monitorType } = useMonitorTypeContext(); + const { fields: httpSimpleFields } = useHTTPSimpleFieldsContext(); + const { fields: tcpSimpleFields } = useTCPSimpleFieldsContext(); + const { fields: icmpSimpleFields } = useICMPSimpleFieldsContext(); + const { fields: httpAdvancedFields } = useHTTPAdvancedFieldsContext(); + const { fields: tcpAdvancedFields } = useTCPAdvancedFieldsContext(); + const { fields: tlsFields } = useTLSFieldsContext(); + const { setConfig } = useUpdatePolicy({ + defaultConfig, + newPolicy, + onChange, + validate, + monitorType, + }); useDebounce( () => { - setConfig((prevConfig) => ({ - ...prevConfig, - ...simpleFields, - ...httpAdvancedFields, - ...tcpAdvancedFields, - ...tlsFields, - // ensure proxyUrl is not overwritten - [ConfigKeys.PROXY_URL]: - simpleFields[ConfigKeys.MONITOR_TYPE] === DataStream.HTTP - ? httpAdvancedFields[ConfigKeys.PROXY_URL] - : tcpAdvancedFields[ConfigKeys.PROXY_URL], - })); + setConfig(() => { + switch (monitorType) { + case DataStream.HTTP: + return { + ...httpSimpleFields, + ...httpAdvancedFields, + ...tlsFields, + }; + case DataStream.TCP: + return { + ...tcpSimpleFields, + ...tcpAdvancedFields, + ...tlsFields, + }; + case DataStream.ICMP: + return { + ...icmpSimpleFields, + }; + } + }); }, 250, - [setConfig, simpleFields, httpAdvancedFields, tcpAdvancedFields, tlsFields] + [ + setConfig, + httpSimpleFields, + httpAdvancedFields, + tcpSimpleFields, + tcpAdvancedFields, + icmpSimpleFields, + tlsFields, + ] ); - return ( - - ); + return ; } ); SyntheticsPolicyEditExtension.displayName = 'SyntheticsPolicyEditExtension'; diff --git a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.test.tsx b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.test.tsx index e6981b9a850e1f..fec6c504a445f0 100644 --- a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.test.tsx +++ b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.test.tsx @@ -11,25 +11,13 @@ import { render } from '../../lib/helper/rtl_helpers'; import { NewPackagePolicy } from '../../../../fleet/public'; import { SyntheticsPolicyEditExtensionWrapper } from './synthetics_policy_edit_extension_wrapper'; import { ConfigKeys, DataStream, ScheduleUnit } from './types'; -import { - defaultSimpleFields, - defaultTLSFields, - defaultHTTPAdvancedFields, - defaultTCPAdvancedFields, -} from './contexts'; +import { defaultConfig } from './synthetics_policy_create_extension'; // ensures that fields appropriately match to their label jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => ({ htmlIdGenerator: () => () => `id-${Math.random()}`, })); -const defaultConfig = { - ...defaultSimpleFields, - ...defaultTLSFields, - ...defaultHTTPAdvancedFields, - ...defaultTCPAdvancedFields, -}; - const defaultNewPolicy: NewPackagePolicy = { name: 'samplePolicyName', description: '', @@ -277,6 +265,10 @@ const defaultCurrentPolicy: any = { created_by: '', }; +const defaultHTTPConfig = defaultConfig[DataStream.HTTP]; +const defaultICMPConfig = defaultConfig[DataStream.ICMP]; +const defaultTCPConfig = defaultConfig[DataStream.TCP]; + describe('', () => { const onChange = jest.fn(); const WrappedComponent = ({ policy = defaultCurrentPolicy, newPolicy = defaultNewPolicy }) => { @@ -301,24 +293,24 @@ describe('', () => { const verificationMode = getByLabelText('Verification mode') as HTMLInputElement; const enableTLSConfig = getByLabelText('Enable TLS configuration') as HTMLInputElement; expect(url).toBeInTheDocument(); - expect(url.value).toEqual(defaultConfig[ConfigKeys.URLS]); + expect(url.value).toEqual(defaultHTTPConfig[ConfigKeys.URLS]); expect(proxyUrl).toBeInTheDocument(); - expect(proxyUrl.value).toEqual(defaultConfig[ConfigKeys.PROXY_URL]); + expect(proxyUrl.value).toEqual(defaultHTTPConfig[ConfigKeys.PROXY_URL]); expect(monitorIntervalNumber).toBeInTheDocument(); - expect(monitorIntervalNumber.value).toEqual(defaultConfig[ConfigKeys.SCHEDULE].number); + expect(monitorIntervalNumber.value).toEqual(defaultHTTPConfig[ConfigKeys.SCHEDULE].number); expect(monitorIntervalUnit).toBeInTheDocument(); - expect(monitorIntervalUnit.value).toEqual(defaultConfig[ConfigKeys.SCHEDULE].unit); + expect(monitorIntervalUnit.value).toEqual(defaultHTTPConfig[ConfigKeys.SCHEDULE].unit); expect(apmServiceName).toBeInTheDocument(); - expect(apmServiceName.value).toEqual(defaultConfig[ConfigKeys.APM_SERVICE_NAME]); + expect(apmServiceName.value).toEqual(defaultHTTPConfig[ConfigKeys.APM_SERVICE_NAME]); expect(maxRedirects).toBeInTheDocument(); - expect(maxRedirects.value).toEqual(`${defaultConfig[ConfigKeys.MAX_REDIRECTS]}`); + expect(maxRedirects.value).toEqual(`${defaultHTTPConfig[ConfigKeys.MAX_REDIRECTS]}`); expect(timeout).toBeInTheDocument(); - expect(timeout.value).toEqual(`${defaultConfig[ConfigKeys.TIMEOUT]}`); + expect(timeout.value).toEqual(`${defaultHTTPConfig[ConfigKeys.TIMEOUT]}`); // expect TLS settings to be in the document when at least one tls key is populated expect(enableTLSConfig.checked).toBe(true); expect(verificationMode).toBeInTheDocument(); expect(verificationMode.value).toEqual( - `${defaultConfig[ConfigKeys.TLS_VERIFICATION_MODE].value}` + `${defaultHTTPConfig[ConfigKeys.TLS_VERIFICATION_MODE].value}` ); // ensure other monitor type options are not in the DOM @@ -651,15 +643,21 @@ describe('', () => { streams: [ { ...defaultNewPolicy.inputs[0].streams[0], - vars: Object.keys(httpVars || []).reduce< - Record - >((acc, key) => { - acc[key] = { - value: undefined, - type: `${httpVars?.[key].type}`, - }; - return acc; - }, {}), + vars: { + ...Object.keys(httpVars || []).reduce< + Record + >((acc, key) => { + acc[key] = { + value: undefined, + type: `${httpVars?.[key].type}`, + }; + return acc; + }, {}), + [ConfigKeys.MONITOR_TYPE]: { + value: 'http', + type: 'text', + }, + }, }, ], }, @@ -680,19 +678,19 @@ describe('', () => { const enableTLSConfig = getByLabelText('Enable TLS configuration') as HTMLInputElement; expect(url).toBeInTheDocument(); - expect(url.value).toEqual(defaultConfig[ConfigKeys.URLS]); + expect(url.value).toEqual(defaultHTTPConfig[ConfigKeys.URLS]); expect(proxyUrl).toBeInTheDocument(); - expect(proxyUrl.value).toEqual(defaultConfig[ConfigKeys.PROXY_URL]); + expect(proxyUrl.value).toEqual(defaultHTTPConfig[ConfigKeys.PROXY_URL]); expect(monitorIntervalNumber).toBeInTheDocument(); - expect(monitorIntervalNumber.value).toEqual(defaultConfig[ConfigKeys.SCHEDULE].number); + expect(monitorIntervalNumber.value).toEqual(defaultHTTPConfig[ConfigKeys.SCHEDULE].number); expect(monitorIntervalUnit).toBeInTheDocument(); - expect(monitorIntervalUnit.value).toEqual(defaultConfig[ConfigKeys.SCHEDULE].unit); + expect(monitorIntervalUnit.value).toEqual(defaultHTTPConfig[ConfigKeys.SCHEDULE].unit); expect(apmServiceName).toBeInTheDocument(); - expect(apmServiceName.value).toEqual(defaultConfig[ConfigKeys.APM_SERVICE_NAME]); + expect(apmServiceName.value).toEqual(defaultHTTPConfig[ConfigKeys.APM_SERVICE_NAME]); expect(maxRedirects).toBeInTheDocument(); - expect(maxRedirects.value).toEqual(`${defaultConfig[ConfigKeys.MAX_REDIRECTS]}`); + expect(maxRedirects.value).toEqual(`${defaultHTTPConfig[ConfigKeys.MAX_REDIRECTS]}`); expect(timeout).toBeInTheDocument(); - expect(timeout.value).toEqual(`${defaultConfig[ConfigKeys.TIMEOUT]}`); + expect(timeout.value).toEqual(`${defaultHTTPConfig[ConfigKeys.TIMEOUT]}`); /* expect TLS settings not to be in the document when and Enable TLS settings not to be checked * when all TLS values are falsey */ @@ -709,7 +707,7 @@ describe('', () => { await waitFor(() => { const requestMethod = getByLabelText('Request method') as HTMLInputElement; expect(requestMethod).toBeInTheDocument(); - expect(requestMethod.value).toEqual(`${defaultConfig[ConfigKeys.REQUEST_METHOD_CHECK]}`); + expect(requestMethod.value).toEqual(`${defaultHTTPConfig[ConfigKeys.REQUEST_METHOD_CHECK]}`); }); }); @@ -752,24 +750,24 @@ describe('', () => { const { getByText, getByLabelText, queryByLabelText } = render( ); - const url = getByLabelText('Host:Port') as HTMLInputElement; + const host = getByLabelText('Host:Port') as HTMLInputElement; const proxyUrl = getByLabelText('Proxy URL') as HTMLInputElement; const monitorIntervalNumber = getByLabelText('Number') as HTMLInputElement; const monitorIntervalUnit = getByLabelText('Unit') as HTMLInputElement; const apmServiceName = getByLabelText('APM service name') as HTMLInputElement; const timeout = getByLabelText('Timeout in seconds') as HTMLInputElement; - expect(url).toBeInTheDocument(); - expect(url.value).toEqual(defaultConfig[ConfigKeys.URLS]); + expect(host).toBeInTheDocument(); + expect(host.value).toEqual(defaultTCPConfig[ConfigKeys.HOSTS]); expect(proxyUrl).toBeInTheDocument(); - expect(proxyUrl.value).toEqual(defaultConfig[ConfigKeys.PROXY_URL]); + expect(proxyUrl.value).toEqual(defaultTCPConfig[ConfigKeys.PROXY_URL]); expect(monitorIntervalNumber).toBeInTheDocument(); - expect(monitorIntervalNumber.value).toEqual(defaultConfig[ConfigKeys.SCHEDULE].number); + expect(monitorIntervalNumber.value).toEqual(defaultTCPConfig[ConfigKeys.SCHEDULE].number); expect(monitorIntervalUnit).toBeInTheDocument(); - expect(monitorIntervalUnit.value).toEqual(defaultConfig[ConfigKeys.SCHEDULE].unit); + expect(monitorIntervalUnit.value).toEqual(defaultTCPConfig[ConfigKeys.SCHEDULE].unit); expect(apmServiceName).toBeInTheDocument(); - expect(apmServiceName.value).toEqual(defaultConfig[ConfigKeys.APM_SERVICE_NAME]); + expect(apmServiceName.value).toEqual(defaultTCPConfig[ConfigKeys.APM_SERVICE_NAME]); expect(timeout).toBeInTheDocument(); - expect(timeout.value).toEqual(`${defaultConfig[ConfigKeys.TIMEOUT]}`); + expect(timeout.value).toEqual(`${defaultTCPConfig[ConfigKeys.TIMEOUT]}`); // ensure other monitor type options are not in the DOM expect(queryByLabelText('Url')).not.toBeInTheDocument(); @@ -825,24 +823,24 @@ describe('', () => { const { getByLabelText, queryByLabelText } = render( ); - const url = getByLabelText('Host') as HTMLInputElement; + const host = getByLabelText('Host') as HTMLInputElement; const monitorIntervalNumber = getByLabelText('Number') as HTMLInputElement; const monitorIntervalUnit = getByLabelText('Unit') as HTMLInputElement; const apmServiceName = getByLabelText('APM service name') as HTMLInputElement; const timeout = getByLabelText('Timeout in seconds') as HTMLInputElement; const wait = getByLabelText('Wait in seconds') as HTMLInputElement; - expect(url).toBeInTheDocument(); - expect(url.value).toEqual(defaultConfig[ConfigKeys.URLS]); + expect(host).toBeInTheDocument(); + expect(host.value).toEqual(defaultICMPConfig[ConfigKeys.HOSTS]); expect(monitorIntervalNumber).toBeInTheDocument(); - expect(monitorIntervalNumber.value).toEqual(defaultConfig[ConfigKeys.SCHEDULE].number); + expect(monitorIntervalNumber.value).toEqual(defaultICMPConfig[ConfigKeys.SCHEDULE].number); expect(monitorIntervalUnit).toBeInTheDocument(); - expect(monitorIntervalUnit.value).toEqual(defaultConfig[ConfigKeys.SCHEDULE].unit); + expect(monitorIntervalUnit.value).toEqual(defaultICMPConfig[ConfigKeys.SCHEDULE].unit); expect(apmServiceName).toBeInTheDocument(); - expect(apmServiceName.value).toEqual(defaultConfig[ConfigKeys.APM_SERVICE_NAME]); + expect(apmServiceName.value).toEqual(defaultICMPConfig[ConfigKeys.APM_SERVICE_NAME]); expect(timeout).toBeInTheDocument(); - expect(timeout.value).toEqual(`${defaultConfig[ConfigKeys.TIMEOUT]}`); + expect(timeout.value).toEqual(`${defaultICMPConfig[ConfigKeys.TIMEOUT]}`); expect(wait).toBeInTheDocument(); - expect(wait.value).toEqual(`${defaultConfig[ConfigKeys.WAIT]}`); + expect(wait.value).toEqual(`${defaultICMPConfig[ConfigKeys.WAIT]}`); // ensure other monitor type options are not in the DOM expect(queryByLabelText('Url')).not.toBeInTheDocument(); diff --git a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.tsx b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.tsx index 85b38e05fdbc89..0bafef61166d26 100644 --- a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.tsx +++ b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.tsx @@ -7,17 +7,26 @@ import React, { memo, useMemo } from 'react'; import { PackagePolicyEditExtensionComponentProps } from '../../../../fleet/public'; -import { Config, ConfigKeys, ContentType, contentTypesToMode } from './types'; +import { + PolicyConfig, + ConfigKeys, + ContentType, + DataStream, + ICustomFields, + contentTypesToMode, +} from './types'; import { SyntheticsPolicyEditExtension } from './synthetics_policy_edit_extension'; import { - SimpleFieldsContextProvider, - HTTPAdvancedFieldsContextProvider, - TCPAdvancedFieldsContextProvider, - TLSFieldsContextProvider, - defaultSimpleFields, + MonitorTypeContextProvider, + HTTPContextProvider, + TCPContextProvider, + defaultTCPSimpleFields, + defaultHTTPSimpleFields, + defaultICMPSimpleFields, defaultHTTPAdvancedFields, defaultTCPAdvancedFields, defaultTLSFields, + ICMPSimpleFieldsContextProvider, } from './contexts'; /** @@ -26,21 +35,29 @@ import { */ export const SyntheticsPolicyEditExtensionWrapper = memo( ({ policy: currentPolicy, newPolicy, onChange }) => { - const { enableTLS: isTLSEnabled, config: defaultConfig } = useMemo(() => { - const fallbackConfig: Config = { - name: '', - ...defaultSimpleFields, - ...defaultHTTPAdvancedFields, - ...defaultTCPAdvancedFields, - ...defaultTLSFields, + const { enableTLS: isTLSEnabled, config: defaultConfig, monitorType } = useMemo(() => { + const fallbackConfig: PolicyConfig = { + [DataStream.HTTP]: { + ...defaultHTTPSimpleFields, + ...defaultHTTPAdvancedFields, + ...defaultTLSFields, + }, + [DataStream.TCP]: { + ...defaultTCPSimpleFields, + ...defaultTCPAdvancedFields, + ...defaultTLSFields, + }, + [DataStream.ICMP]: defaultICMPSimpleFields, }; let enableTLS = false; const getDefaultConfig = () => { const currentInput = currentPolicy.inputs.find((input) => input.enabled === true); const vars = currentInput?.streams[0]?.vars; + const type: DataStream = vars?.[ConfigKeys.MONITOR_TYPE].value as DataStream; + const fallbackConfigForMonitorType = fallbackConfig[type] as Partial; const configKeys: ConfigKeys[] = Object.values(ConfigKeys); - const formattedDefaultConfig = configKeys.reduce( + const formatttedDefaultConfigForMonitorType = configKeys.reduce( (acc: Record, key: ConfigKeys) => { const value = vars?.[key]?.value; switch (key) { @@ -59,12 +76,14 @@ export const SyntheticsPolicyEditExtensionWrapper = memo { if ( headerKey === 'Content-Type' && contentTypesToMode[headers[headerKey] as ContentType] ) { - type = contentTypesToMode[headers[headerKey] as ContentType]; + requestBodyType = contentTypesToMode[headers[headerKey] as ContentType]; return true; } }); acc[key] = { value: requestBodyValue, - type, + type: requestBodyType, }; break; case ConfigKeys.TLS_KEY_PASSPHRASE: case ConfigKeys.TLS_VERIFICATION_MODE: acc[key] = { - value: value ?? fallbackConfig[key].value, + value: value ?? fallbackConfigForMonitorType[key]?.value, isEnabled: !!value, }; if (!!value) { @@ -112,7 +131,7 @@ export const SyntheticsPolicyEditExtensionWrapper = memo - - - + + + + - - - - + + + + ); } ); diff --git a/x-pack/plugins/uptime/public/components/fleet_package/tcp_advanced_fields.test.tsx b/x-pack/plugins/uptime/public/components/fleet_package/tcp/advanced_fields.test.tsx similarity index 92% rename from x-pack/plugins/uptime/public/components/fleet_package/tcp_advanced_fields.test.tsx rename to x-pack/plugins/uptime/public/components/fleet_package/tcp/advanced_fields.test.tsx index 77551f9aa80114..78a6724fc8cfbf 100644 --- a/x-pack/plugins/uptime/public/components/fleet_package/tcp_advanced_fields.test.tsx +++ b/x-pack/plugins/uptime/public/components/fleet_package/tcp/advanced_fields.test.tsx @@ -7,13 +7,13 @@ import React from 'react'; import { fireEvent } from '@testing-library/react'; -import { render } from '../../lib/helper/rtl_helpers'; -import { TCPAdvancedFields } from './tcp_advanced_fields'; +import { render } from '../../../lib/helper/rtl_helpers'; +import { TCPAdvancedFields } from './advanced_fields'; import { TCPAdvancedFieldsContextProvider, defaultTCPAdvancedFields as defaultConfig, -} from './contexts'; -import { ConfigKeys, ITCPAdvancedFields } from './types'; +} from '../contexts'; +import { ConfigKeys, ITCPAdvancedFields } from '../types'; // ensures fields and labels map appropriately jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => ({ diff --git a/x-pack/plugins/uptime/public/components/fleet_package/tcp_advanced_fields.tsx b/x-pack/plugins/uptime/public/components/fleet_package/tcp/advanced_fields.tsx similarity index 97% rename from x-pack/plugins/uptime/public/components/fleet_package/tcp_advanced_fields.tsx rename to x-pack/plugins/uptime/public/components/fleet_package/tcp/advanced_fields.tsx index 161de0f0af8d0f..9db07afa559b9d 100644 --- a/x-pack/plugins/uptime/public/components/fleet_package/tcp_advanced_fields.tsx +++ b/x-pack/plugins/uptime/public/components/fleet_package/tcp/advanced_fields.tsx @@ -16,11 +16,11 @@ import { EuiSpacer, } from '@elastic/eui'; -import { useTCPAdvancedFieldsContext } from './contexts'; +import { useTCPAdvancedFieldsContext } from '../contexts'; -import { ConfigKeys } from './types'; +import { ConfigKeys } from '../types'; -import { OptionalLabel } from './optional_label'; +import { OptionalLabel } from '../optional_label'; export const TCPAdvancedFields = () => { const { fields, setFields } = useTCPAdvancedFieldsContext(); diff --git a/x-pack/plugins/uptime/public/components/fleet_package/tcp/simple_fields.tsx b/x-pack/plugins/uptime/public/components/fleet_package/tcp/simple_fields.tsx new file mode 100644 index 00000000000000..82c77a63611f2d --- /dev/null +++ b/x-pack/plugins/uptime/public/components/fleet_package/tcp/simple_fields.tsx @@ -0,0 +1,171 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { memo } from 'react'; +import { FormattedMessage } from '@kbn/i18n/react'; +import { EuiFormRow, EuiFieldText, EuiFieldNumber } from '@elastic/eui'; +import { ConfigKeys, Validation } from '../types'; +import { useTCPSimpleFieldsContext } from '../contexts'; +import { ComboBox } from '../combo_box'; +import { OptionalLabel } from '../optional_label'; +import { ScheduleField } from '../schedule_field'; + +interface Props { + validate: Validation; +} + +export const TCPSimpleFields = memo(({ validate }) => { + const { fields, setFields } = useTCPSimpleFieldsContext(); + const handleInputChange = ({ value, configKey }: { value: unknown; configKey: ConfigKeys }) => { + setFields((prevFields) => ({ ...prevFields, [configKey]: value })); + }; + + return ( + <> + + } + isInvalid={!!validate[ConfigKeys.HOSTS]?.(fields[ConfigKeys.HOSTS])} + error={ + + } + > + + handleInputChange({ + value: event.target.value, + configKey: ConfigKeys.HOSTS, + }) + } + data-test-subj="syntheticsTCPHostField" + /> + + + + } + isInvalid={!!validate[ConfigKeys.SCHEDULE]?.(fields[ConfigKeys.SCHEDULE])} + error={ + + } + > + + handleInputChange({ + value: schedule, + configKey: ConfigKeys.SCHEDULE, + }) + } + number={fields[ConfigKeys.SCHEDULE].number} + unit={fields[ConfigKeys.SCHEDULE].unit} + /> + + + } + labelAppend={} + helpText={ + + } + > + + handleInputChange({ + value: event.target.value, + configKey: ConfigKeys.APM_SERVICE_NAME, + }) + } + data-test-subj="syntheticsAPMServiceName" + /> + + + } + isInvalid={ + !!validate[ConfigKeys.TIMEOUT]?.( + fields[ConfigKeys.TIMEOUT], + fields[ConfigKeys.SCHEDULE].number, + fields[ConfigKeys.SCHEDULE].unit + ) + } + error={ + + } + helpText={ + + } + > + + handleInputChange({ + value: event.target.value, + configKey: ConfigKeys.TIMEOUT, + }) + } + step={'any'} + /> + + + } + labelAppend={} + helpText={ + + } + > + handleInputChange({ value, configKey: ConfigKeys.TAGS })} + data-test-subj="syntheticsTags" + /> + + + ); +}); diff --git a/x-pack/plugins/uptime/public/components/fleet_package/types.tsx b/x-pack/plugins/uptime/public/components/fleet_package/types.tsx index 802d5f08fd6468..4d44b4f074e829 100644 --- a/x-pack/plugins/uptime/public/components/fleet_package/types.tsx +++ b/x-pack/plugins/uptime/public/components/fleet_package/types.tsx @@ -105,6 +105,28 @@ export interface ISimpleFields { [ConfigKeys.WAIT]: string; } +export interface ICommonFields { + [ConfigKeys.MONITOR_TYPE]: DataStream; + [ConfigKeys.SCHEDULE]: { number: string; unit: ScheduleUnit }; + [ConfigKeys.APM_SERVICE_NAME]: string; + [ConfigKeys.TIMEOUT]: string; + [ConfigKeys.TAGS]: string[]; +} + +export type IHTTPSimpleFields = { + [ConfigKeys.MAX_REDIRECTS]: string; + [ConfigKeys.URLS]: string; +} & ICommonFields; + +export type ITCPSimpleFields = { + [ConfigKeys.HOSTS]: string; +} & ICommonFields; + +export type IICMPSimpleFields = { + [ConfigKeys.HOSTS]: string; + [ConfigKeys.WAIT]: string; +} & ICommonFields; + export interface ITLSFields { [ConfigKeys.TLS_CERTIFICATE_AUTHORITIES]: { value: string; @@ -154,11 +176,21 @@ export interface ITCPAdvancedFields { [ConfigKeys.REQUEST_SEND_CHECK]: string; } -export type ICustomFields = ISimpleFields & ITLSFields & IHTTPAdvancedFields & ITCPAdvancedFields; +export type HTTPFields = IHTTPSimpleFields & IHTTPAdvancedFields & ITLSFields; +export type TCPFields = ITCPSimpleFields & ITCPAdvancedFields & ITLSFields; +export type ICMPFields = IICMPSimpleFields; + +export type ICustomFields = HTTPFields & + TCPFields & + ICMPFields & { + [ConfigKeys.NAME]: string; + }; -export type Config = { - [ConfigKeys.NAME]: string; -} & ICustomFields; +export interface PolicyConfig { + [DataStream.HTTP]: HTTPFields; + [DataStream.TCP]: TCPFields; + [DataStream.ICMP]: ICMPFields; +} export type Validation = Partial void>>; diff --git a/x-pack/plugins/uptime/public/components/fleet_package/use_update_policy.test.tsx b/x-pack/plugins/uptime/public/components/fleet_package/use_update_policy.test.tsx index 3732791f895dcb..5a62aec90032d9 100644 --- a/x-pack/plugins/uptime/public/components/fleet_package/use_update_policy.test.tsx +++ b/x-pack/plugins/uptime/public/components/fleet_package/use_update_policy.test.tsx @@ -10,20 +10,7 @@ import { act, renderHook } from '@testing-library/react-hooks'; import { NewPackagePolicy } from '../../../../fleet/public'; import { validate } from './validation'; import { ConfigKeys, DataStream, TLSVersion } from './types'; -import { - defaultSimpleFields, - defaultTLSFields, - defaultHTTPAdvancedFields, - defaultTCPAdvancedFields, -} from './contexts'; - -const defaultConfig = { - name: '', - ...defaultSimpleFields, - ...defaultTLSFields, - ...defaultHTTPAdvancedFields, - ...defaultTCPAdvancedFields, -}; +import { defaultConfig } from './synthetics_policy_create_extension'; describe('useBarChartsHooks', () => { const newPolicy: NewPackagePolicy = { @@ -269,10 +256,10 @@ describe('useBarChartsHooks', () => { it('handles http data stream', () => { const onChange = jest.fn(); const { result } = renderHook((props) => useUpdatePolicy(props), { - initialProps: { defaultConfig, newPolicy, onChange, validate }, + initialProps: { defaultConfig, newPolicy, onChange, validate, monitorType: DataStream.HTTP }, }); - expect(result.current.config).toMatchObject({ ...defaultConfig }); + expect(result.current.config).toMatchObject({ ...defaultConfig[DataStream.HTTP] }); // expect only http to be enabled expect(result.current.updatedPolicy.inputs[0].enabled).toBe(true); @@ -281,28 +268,28 @@ describe('useBarChartsHooks', () => { expect( result.current.updatedPolicy.inputs[0]?.streams[0]?.vars?.[ConfigKeys.MONITOR_TYPE].value - ).toEqual(defaultConfig[ConfigKeys.MONITOR_TYPE]); + ).toEqual(defaultConfig[DataStream.HTTP][ConfigKeys.MONITOR_TYPE]); expect( result.current.updatedPolicy.inputs[0]?.streams[0]?.vars?.[ConfigKeys.URLS].value - ).toEqual(defaultConfig[ConfigKeys.URLS]); + ).toEqual(defaultConfig[DataStream.HTTP][ConfigKeys.URLS]); expect( result.current.updatedPolicy.inputs[0]?.streams[0]?.vars?.[ConfigKeys.SCHEDULE].value ).toEqual( JSON.stringify( - `@every ${defaultConfig[ConfigKeys.SCHEDULE].number}${ - defaultConfig[ConfigKeys.SCHEDULE].unit + `@every ${defaultConfig[DataStream.HTTP][ConfigKeys.SCHEDULE].number}${ + defaultConfig[DataStream.HTTP][ConfigKeys.SCHEDULE].unit }` ) ); expect( result.current.updatedPolicy.inputs[0]?.streams[0]?.vars?.[ConfigKeys.PROXY_URL].value - ).toEqual(defaultConfig[ConfigKeys.PROXY_URL]); + ).toEqual(defaultConfig[DataStream.HTTP][ConfigKeys.PROXY_URL]); expect( result.current.updatedPolicy.inputs[0]?.streams[0]?.vars?.[ConfigKeys.APM_SERVICE_NAME].value - ).toEqual(defaultConfig[ConfigKeys.APM_SERVICE_NAME]); + ).toEqual(defaultConfig[DataStream.HTTP][ConfigKeys.APM_SERVICE_NAME]); expect( result.current.updatedPolicy.inputs[0]?.streams[0]?.vars?.[ConfigKeys.TIMEOUT].value - ).toEqual(`${defaultConfig[ConfigKeys.TIMEOUT]}s`); + ).toEqual(`${defaultConfig[DataStream.HTTP][ConfigKeys.TIMEOUT]}s`); expect( result.current.updatedPolicy.inputs[0]?.streams[0]?.vars?.[ ConfigKeys.RESPONSE_BODY_CHECK_POSITIVE @@ -316,29 +303,29 @@ describe('useBarChartsHooks', () => { expect( result.current.updatedPolicy.inputs[0]?.streams[0]?.vars?.[ConfigKeys.RESPONSE_STATUS_CHECK] .value - ).toEqual(JSON.stringify(defaultConfig[ConfigKeys.RESPONSE_STATUS_CHECK])); + ).toEqual(null); expect( result.current.updatedPolicy.inputs[0]?.streams[0]?.vars?.[ConfigKeys.REQUEST_HEADERS_CHECK] .value - ).toEqual(JSON.stringify(defaultConfig[ConfigKeys.REQUEST_HEADERS_CHECK])); + ).toEqual(null); expect( result.current.updatedPolicy.inputs[0]?.streams[0]?.vars?.[ConfigKeys.RESPONSE_HEADERS_CHECK] .value - ).toEqual(JSON.stringify(defaultConfig[ConfigKeys.RESPONSE_HEADERS_CHECK])); + ).toEqual(null); expect( result.current.updatedPolicy.inputs[0]?.streams[0]?.vars?.[ConfigKeys.RESPONSE_BODY_INDEX] .value - ).toEqual(defaultConfig[ConfigKeys.RESPONSE_BODY_INDEX]); + ).toEqual(defaultConfig[DataStream.HTTP][ConfigKeys.RESPONSE_BODY_INDEX]); expect( result.current.updatedPolicy.inputs[0]?.streams[0]?.vars?.[ConfigKeys.RESPONSE_HEADERS_INDEX] .value - ).toEqual(defaultConfig[ConfigKeys.RESPONSE_HEADERS_INDEX]); + ).toEqual(defaultConfig[DataStream.HTTP][ConfigKeys.RESPONSE_HEADERS_INDEX]); }); it('stringifies array values and returns null for empty array values', () => { const onChange = jest.fn(); const { result } = renderHook((props) => useUpdatePolicy(props), { - initialProps: { defaultConfig, newPolicy, onChange, validate }, + initialProps: { defaultConfig, newPolicy, onChange, validate, monitorType: DataStream.HTTP }, }); act(() => { @@ -419,16 +406,8 @@ describe('useBarChartsHooks', () => { it('handles tcp data stream', () => { const onChange = jest.fn(); - const tcpConfig = { - ...defaultConfig, - [ConfigKeys.MONITOR_TYPE]: DataStream.TCP, - }; const { result } = renderHook((props) => useUpdatePolicy(props), { - initialProps: { defaultConfig, newPolicy, onChange, validate }, - }); - - act(() => { - result.current.setConfig(tcpConfig); + initialProps: { defaultConfig, newPolicy, onChange, validate, monitorType: DataStream.TCP }, }); // expect only tcp to be enabled @@ -443,55 +422,47 @@ describe('useBarChartsHooks', () => { expect( result.current.updatedPolicy.inputs[1]?.streams[0]?.vars?.[ConfigKeys.MONITOR_TYPE].value - ).toEqual(tcpConfig[ConfigKeys.MONITOR_TYPE]); + ).toEqual(defaultConfig[DataStream.TCP][ConfigKeys.MONITOR_TYPE]); expect( result.current.updatedPolicy.inputs[1]?.streams[0]?.vars?.[ConfigKeys.HOSTS].value - ).toEqual(defaultConfig[ConfigKeys.HOSTS]); + ).toEqual(defaultConfig[DataStream.TCP][ConfigKeys.HOSTS]); expect( result.current.updatedPolicy.inputs[1]?.streams[0]?.vars?.[ConfigKeys.SCHEDULE].value ).toEqual( JSON.stringify( - `@every ${defaultConfig[ConfigKeys.SCHEDULE].number}${ - defaultConfig[ConfigKeys.SCHEDULE].unit + `@every ${defaultConfig[DataStream.TCP][ConfigKeys.SCHEDULE].number}${ + defaultConfig[DataStream.TCP][ConfigKeys.SCHEDULE].unit }` ) ); expect( result.current.updatedPolicy.inputs[1]?.streams[0]?.vars?.[ConfigKeys.PROXY_URL].value - ).toEqual(tcpConfig[ConfigKeys.PROXY_URL]); + ).toEqual(defaultConfig[DataStream.TCP][ConfigKeys.PROXY_URL]); expect( result.current.updatedPolicy.inputs[0]?.streams[0]?.vars?.[ConfigKeys.APM_SERVICE_NAME].value - ).toEqual(tcpConfig[ConfigKeys.APM_SERVICE_NAME]); + ).toEqual(defaultConfig[DataStream.TCP][ConfigKeys.APM_SERVICE_NAME]); expect( result.current.updatedPolicy.inputs[1]?.streams[0]?.vars?.[ConfigKeys.TIMEOUT].value - ).toEqual(`${tcpConfig[ConfigKeys.TIMEOUT]}s`); + ).toEqual(`${defaultConfig[DataStream.TCP][ConfigKeys.TIMEOUT]}s`); expect( result.current.updatedPolicy.inputs[1]?.streams[0]?.vars?.[ ConfigKeys.PROXY_USE_LOCAL_RESOLVER ].value - ).toEqual(tcpConfig[ConfigKeys.PROXY_USE_LOCAL_RESOLVER]); + ).toEqual(defaultConfig[DataStream.TCP][ConfigKeys.PROXY_USE_LOCAL_RESOLVER]); expect( result.current.updatedPolicy.inputs[1]?.streams[0]?.vars?.[ConfigKeys.RESPONSE_RECEIVE_CHECK] .value - ).toEqual(tcpConfig[ConfigKeys.RESPONSE_RECEIVE_CHECK]); + ).toEqual(defaultConfig[DataStream.TCP][ConfigKeys.RESPONSE_RECEIVE_CHECK]); expect( result.current.updatedPolicy.inputs[1]?.streams[0]?.vars?.[ConfigKeys.REQUEST_SEND_CHECK] .value - ).toEqual(tcpConfig[ConfigKeys.REQUEST_SEND_CHECK]); + ).toEqual(defaultConfig[DataStream.TCP][ConfigKeys.REQUEST_SEND_CHECK]); }); it('handles icmp data stream', () => { const onChange = jest.fn(); - const icmpConfig = { - ...defaultConfig, - [ConfigKeys.MONITOR_TYPE]: DataStream.ICMP, - }; const { result } = renderHook((props) => useUpdatePolicy(props), { - initialProps: { defaultConfig, newPolicy, onChange, validate }, - }); - - act(() => { - result.current.setConfig(icmpConfig); + initialProps: { defaultConfig, newPolicy, onChange, validate, monitorType: DataStream.ICMP }, }); // expect only icmp to be enabled @@ -506,25 +477,27 @@ describe('useBarChartsHooks', () => { expect( result.current.updatedPolicy.inputs[2]?.streams[0]?.vars?.[ConfigKeys.MONITOR_TYPE].value - ).toEqual(icmpConfig[ConfigKeys.MONITOR_TYPE]); + ).toEqual(defaultConfig[DataStream.ICMP][ConfigKeys.MONITOR_TYPE]); expect( result.current.updatedPolicy.inputs[2]?.streams[0]?.vars?.[ConfigKeys.HOSTS].value - ).toEqual(icmpConfig[ConfigKeys.HOSTS]); + ).toEqual(defaultConfig[DataStream.ICMP][ConfigKeys.HOSTS]); expect( result.current.updatedPolicy.inputs[2]?.streams[0]?.vars?.[ConfigKeys.SCHEDULE].value ).toEqual( JSON.stringify( - `@every ${icmpConfig[ConfigKeys.SCHEDULE].number}${icmpConfig[ConfigKeys.SCHEDULE].unit}` + `@every ${defaultConfig[DataStream.ICMP][ConfigKeys.SCHEDULE].number}${ + defaultConfig[DataStream.ICMP][ConfigKeys.SCHEDULE].unit + }` ) ); expect( result.current.updatedPolicy.inputs[0]?.streams[0]?.vars?.[ConfigKeys.APM_SERVICE_NAME].value - ).toEqual(defaultConfig[ConfigKeys.APM_SERVICE_NAME]); + ).toEqual(defaultConfig[DataStream.ICMP][ConfigKeys.APM_SERVICE_NAME]); expect( result.current.updatedPolicy.inputs[2]?.streams[0]?.vars?.[ConfigKeys.TIMEOUT].value - ).toEqual(`${icmpConfig[ConfigKeys.TIMEOUT]}s`); + ).toEqual(`${defaultConfig[DataStream.ICMP][ConfigKeys.TIMEOUT]}s`); expect( result.current.updatedPolicy.inputs[2]?.streams[0]?.vars?.[ConfigKeys.WAIT].value - ).toEqual(`${icmpConfig[ConfigKeys.WAIT]}s`); + ).toEqual(`${defaultConfig[DataStream.ICMP][ConfigKeys.WAIT]}s`); }); }); diff --git a/x-pack/plugins/uptime/public/components/fleet_package/use_update_policy.ts b/x-pack/plugins/uptime/public/components/fleet_package/use_update_policy.ts index cb11e9f9c4a9b1..2b2fb22866463f 100644 --- a/x-pack/plugins/uptime/public/components/fleet_package/use_update_policy.ts +++ b/x-pack/plugins/uptime/public/components/fleet_package/use_update_policy.ts @@ -6,10 +6,11 @@ */ import { useEffect, useRef, useState } from 'react'; import { NewPackagePolicy } from '../../../../fleet/public'; -import { ConfigKeys, Config, DataStream, Validation } from './types'; +import { ConfigKeys, PolicyConfig, DataStream, Validation, ICustomFields } from './types'; interface Props { - defaultConfig: Config; + monitorType: DataStream; + defaultConfig: PolicyConfig; newPolicy: NewPackagePolicy; onChange: (opts: { /** is current form state is valid */ @@ -20,22 +21,27 @@ interface Props { validate: Record; } -export const useUpdatePolicy = ({ defaultConfig, newPolicy, onChange, validate }: Props) => { +export const useUpdatePolicy = ({ + monitorType, + defaultConfig, + newPolicy, + onChange, + validate, +}: Props) => { const [updatedPolicy, setUpdatedPolicy] = useState(newPolicy); // Update the integration policy with our custom fields - const [config, setConfig] = useState(defaultConfig); - const currentConfig = useRef(defaultConfig); + const [config, setConfig] = useState>(defaultConfig[monitorType]); + const currentConfig = useRef>(defaultConfig[monitorType]); useEffect(() => { - const { type } = config; const configKeys = Object.keys(config) as ConfigKeys[]; - const validationKeys = Object.keys(validate[type]) as ConfigKeys[]; + const validationKeys = Object.keys(validate[monitorType]) as ConfigKeys[]; const configDidUpdate = configKeys.some((key) => config[key] !== currentConfig.current[key]); const isValid = - !!newPolicy.name && !validationKeys.find((key) => validate[type][key]?.(config[key])); + !!newPolicy.name && !validationKeys.find((key) => validate[monitorType][key]?.(config[key])); const formattedPolicy = { ...newPolicy }; const currentInput = formattedPolicy.inputs.find( - (input) => input.type === `synthetics/${type}` + (input) => input.type === `synthetics/${monitorType}` ); const dataStream = currentInput?.streams[0]; @@ -51,17 +57,19 @@ export const useUpdatePolicy = ({ defaultConfig, newPolicy, onChange, validate } if (configItem) { switch (key) { case ConfigKeys.SCHEDULE: - configItem.value = JSON.stringify(`@every ${config[key].number}${config[key].unit}`); // convert to cron + configItem.value = JSON.stringify( + `@every ${config[key]?.number}${config[key]?.unit}` + ); // convert to cron break; case ConfigKeys.RESPONSE_BODY_CHECK_NEGATIVE: case ConfigKeys.RESPONSE_BODY_CHECK_POSITIVE: case ConfigKeys.RESPONSE_STATUS_CHECK: case ConfigKeys.TAGS: - configItem.value = config[key].length ? JSON.stringify(config[key]) : null; + configItem.value = config[key]?.length ? JSON.stringify(config[key]) : null; break; case ConfigKeys.RESPONSE_HEADERS_CHECK: case ConfigKeys.REQUEST_HEADERS_CHECK: - configItem.value = Object.keys(config[key]).length + configItem.value = Object.keys(config?.[key] || []).length ? JSON.stringify(config[key]) : null; break; @@ -70,26 +78,26 @@ export const useUpdatePolicy = ({ defaultConfig, newPolicy, onChange, validate } configItem.value = config[key] ? `${config[key]}s` : null; // convert to cron break; case ConfigKeys.REQUEST_BODY_CHECK: - configItem.value = config[key].value ? JSON.stringify(config[key].value) : null; // only need value of REQUEST_BODY_CHECK for outputted policy + configItem.value = config[key]?.value ? JSON.stringify(config[key]?.value) : null; // only need value of REQUEST_BODY_CHECK for outputted policy break; case ConfigKeys.TLS_CERTIFICATE: case ConfigKeys.TLS_CERTIFICATE_AUTHORITIES: case ConfigKeys.TLS_KEY: configItem.value = - config[key].isEnabled && config[key].value - ? JSON.stringify(config[key].value) + config[key]?.isEnabled && config[key]?.value + ? JSON.stringify(config[key]?.value) : null; // only add tls settings if they are enabled by the user break; case ConfigKeys.TLS_VERSION: configItem.value = - config[key].isEnabled && config[key].value.length - ? JSON.stringify(config[key].value) + config[key]?.isEnabled && config[key]?.value.length + ? JSON.stringify(config[key]?.value) : null; // only add tls settings if they are enabled by the user break; case ConfigKeys.TLS_KEY_PASSPHRASE: case ConfigKeys.TLS_VERIFICATION_MODE: configItem.value = - config[key].isEnabled && config[key].value ? config[key].value : null; // only add tls settings if they are enabled by the user + config[key]?.isEnabled && config[key]?.value ? config[key]?.value : null; // only add tls settings if they are enabled by the user break; default: configItem.value = @@ -104,7 +112,7 @@ export const useUpdatePolicy = ({ defaultConfig, newPolicy, onChange, validate } updatedPolicy: formattedPolicy, }); } - }, [config, currentConfig, newPolicy, onChange, validate]); + }, [config, currentConfig, newPolicy, onChange, validate, monitorType]); // update our local config state ever time name, which is managed by fleet, changes useEffect(() => { diff --git a/x-pack/plugins/uptime/public/components/fleet_package/validation.tsx b/x-pack/plugins/uptime/public/components/fleet_package/validation.tsx index 5197cb9299e45e..f3057baf10381f 100644 --- a/x-pack/plugins/uptime/public/components/fleet_package/validation.tsx +++ b/x-pack/plugins/uptime/public/components/fleet_package/validation.tsx @@ -48,10 +48,6 @@ function validateTimeout({ // validation functions return true when invalid const validateCommon = { - [ConfigKeys.MAX_REDIRECTS]: (value: unknown) => - (!!value && !`${value}`.match(digitsOnly)) || - parseFloat(value as ICustomFields[ConfigKeys.MAX_REDIRECTS]) < 0, - [ConfigKeys.MONITOR_TYPE]: (value: unknown) => !value, [ConfigKeys.SCHEDULE]: (value: unknown) => { const { number, unit } = value as ICustomFields[ConfigKeys.SCHEDULE]; const parsedFloat = parseFloat(number); @@ -84,6 +80,9 @@ const validateHTTP = { const headers = value as ICustomFields[ConfigKeys.REQUEST_HEADERS_CHECK]; return validateHeaders(headers); }, + [ConfigKeys.MAX_REDIRECTS]: (value: unknown) => + (!!value && !`${value}`.match(digitsOnly)) || + parseFloat(value as ICustomFields[ConfigKeys.MAX_REDIRECTS]) < 0, [ConfigKeys.URLS]: (value: unknown) => !value, ...validateCommon, }; From dcb5a6708d5813b202bcc299860425d05e721f56 Mon Sep 17 00:00:00 2001 From: Janeen Mikell-Straughn <57149392+jmikell821@users.noreply.github.com> Date: Wed, 16 Jun 2021 15:45:12 -0400 Subject: [PATCH 33/46] [DOCS] Updating Elastic Security Overview topic (#101922) * updating overview topic for Kibana * formatting fixes * small formatting tweaks * small formatting tweaks --- docs/siem/images/workflow.png | Bin 0 -> 308403 bytes docs/siem/siem-ui.asciidoc | 238 +++++++++++++++++++++------------- 2 files changed, 148 insertions(+), 90 deletions(-) create mode 100644 docs/siem/images/workflow.png diff --git a/docs/siem/images/workflow.png b/docs/siem/images/workflow.png new file mode 100644 index 0000000000000000000000000000000000000000..b71c7b0ace301e3554d71f4d2f156bbe476cbf10 GIT binary patch literal 308403 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%0A_ z9t)~ykhf%Tjg7@xH)^zUae6d1IOeuy!FRgM9RF(7dRl&>KKqpP<a`R?v*Xq;zi|r|C1S;=(UA151w* z>73xiUG$ws+cQaS`tMUDfcxtf@gwT|r{WB2L0en;j)(S(Esc$5jAUvx{h{qaLZ8)D zDPYuRaPUYt&NRwIXhKgEg_0jUCHL|Qg98IN$cMij4uIt32a!R8_h%~rY-}@e)3`N| zY{dNq3_7Gbz^p&7|1WWHbB1Iy6xN^VE1nhA^^{vZDwx8bEk0Jrj$y#%)i$gMe2efT>!ud` z-I}#q3!>Gczp1wuDr7O1r0jxfQg>JZoxl_kB8&U@3?t{C*?WUN{gdihLVc`HrUlWw zURHO%5Aas`uQdW@fGyJ5Gm{S1$4}Dv=74cO(qfSxHy2rc{JNp0;ppg_i`|c(c=Nz) zA+8)0WhWmtKe0DR8#=iX;pL5yaPhdj$)xmGQiFSi@e@78Um1waoI65WNm`71Q1Y`}F? z3E{&svb@^E3?582qOLIdf8qfn6gd@N``g_P*Euj&<|ev`9)p8%luR!0W(kbCh;qAG zpmfj6zs6}Uj2&oEX#!I$)HhMD#)>jl#x8)#60AbyMzt-# zAzsZCLtN#g5ISYd)2d{=y_Fl35zze;KXd7j1ehL?;5UFDDV>J}zRzW6FMREx>boQs zQZo#k(ttU%k#LqXE2F62`o^!T`-vl7abPI?v_fHVM-`$H8(f|*htmm8qsf}(q`8?L zO@{XC*ZxaiN>xEn>+=#+{G}pkLndHkWF(SDOkY1A(4buhhv18b4D@#)$w!Igih>RpegGJL+ex^ku*S;}3R{1*_?^#$fqGaI5 zoFA1HRN3fEFm|JAig~u>DXyF35UdR;K`tYizPE*dD1;J(yHy}c!t4Tr_x_%(ETxg% zA#qeJ#wdscK$ObX&`9hn!zi`L{R>MbFa5 z;h~}3Fa*{0RfMCFXK0_1bei@jXVB~U+v%Z5SV8esHIq6+SCQovdC!0Ak0llwTRxL3 zbTT$3>$r-t$!%<$kDaDcsbpr0J7pp8x|Q2Gs*S);`gooEV1_ea6PD+o!ph@{&5JI` zu)IB-R&8~zkdu%sro-;|Zw5;*jWCrc9vd`;4<*7DL% zyUf;c5IDJ)Ik@nhd5U8tA{j>uP@l@yEssIAN&IZH1(r{Yi5=IBnl$62avVl~KEtlp zQT?a`o0Qr;Yvo#&ZFNR8U$p+A?Z}s3EEUun)0Zs$850aC(y^f)_j*QY-FHGBsq|>c zxi&n&+{tr4j=E?(_!nbjgD}>YG5Monv0k&p-}2{wdcHfOUW+G>L-38d>&v3%pNc(0 znCrdu(mph9aRtwl*3vQXF0~Qh?9RRvN6h~aHJfn4tdcy~f-5gy@j%~^j}e3XLrIM{ zF^2Ux%{Z2ZGSPiS&kh>vr=SKZc#=hQ?E#7IZieDWs=aqG`r>mX4P~`(kx%TW>z=p~ z!TNouXlaA>+lKW?zI}t)zT5TBoy3&fhTJP80)p%@K(IN;wZFz-Fg?{#UT&o`A|lV_ z>P%Z&&?3-!t0yRx(I{Mwb2Pd)iM ztA93!Bqpm<1jEroF*%Y2$HkISR9M037f!h8PO8JvQ$^hU@{mv{Lj-goc{e4R%a>xy zC{SjPiciR%QAc1%Go_>>DzZwZ?Q;cx{<6fNI4IUj7uT^xs&9Gh0ilV&sa0pi1?PRo z41QRL=dywilPli6b$e`Vz46&)nn_$~JyO)U@tD;{xI4!i*(V-FuQyo75&0z`1=t0K z_r&IsoM1~^D!@e(xcrcmeVazhU! zHgOzE|5>Kk=G+H{6s5NeA_XabYtStGPIrXOe7L9*+~`C;{FLyjEEO?kI?*Gs{mGr$ zQ-R~B_Fo#Fr+Di2HYB=FmPggSkzPV7jgdD%Gok-lLlr;v@HAH5=2;f8?9Dk z)zr-N2cmFTj%(Kt`>4VLli8JC3(%)CSgi!z+GCq;#9|5w81jQHLsnaGJP7*^pnVFTv9got9em{bQ#{k_ArE2X&F?Y`R7t_Mhgn7&q5r>u@ zWeg`(5kcepUWUh|6osVDXxd_b5Qc-AbQ@TRx?I`|+`ALE=Zr4=$`x2^VT&a*HZv3d zrCyvMHN99$19>NG*iSLT9Tu!CZ7FPF_KLPVxz#Kxw`^+4(TrBBOunt`5S>B0kt`%SQu;|1wEoA!6g7zE#G`!Dt;s;S7 z_bbRUglwfNFC}cFzxL<{l9WD*^2Ga3)mMz~>z5 z8rOnM)jSZgpiT9J8tVLa)6(z~{xt9BQbEgQ)w|O>qi8GkgJ~!>!e?HG?Azb323q%% z>2dy|%A;qg}+-ukvnx)6sE4wqycexf4~UJjB%Ys%lN zbqF(5+smdUiB8XwaI;iKpWyUaV(iBcE9azPs^;Wlv&uP!RRyW-1k!IM{24^Tnah#3 zsI$SFg;gYB<`iZ4ih0=A>I!CGQo{@zW9YmXpR|OVVTTHJrLHGuZOlI%z358xsrhBi zf~j0mxm!5-JhK&3GRA9@!3s#kvhZQ0vuWImqK}hUt5FO68qwJ5ji-4b7 zg|+0Ked6`>zB1#-UrMvt0d_Z-sRus@GeKqIPL$1!sJ6_E1wyf%Q7&=b6oqNLPn~wd zmxQBTQff8ziSgwYDD7g;@GrdFF{dG(W%3KC^xv60mY}v;D@i(WtUSV}I$E*rWISO^ zoY4gdQ$uszgxC#2FcJdF+HJ8PTNkZMi;EN_v}iIA@p1`HDOgcyA`_f)Ydxnr)!*1# zDS0Sy^uW+#WbrK$4uDf*OPcoFu|<{hWo2apf;;8`aNi>-iGSgtqmx^|+@HCAygfwC zg)|Ol_qLE}K6g};-ipwh@6Arc$DHZ*0^VSTQb@@qED9Lkc?_Hy5OOBC z-bNP~F>3${Axc!RBuR6YfK%dph@s8|Cn{^G1>B_P|3oUmNS>_EyNls%<;owi@MhQ2 ze{e~-xMfW!GU<$I%zOwF4uRQnK!ttCX16O!>`@}cQ1UG6Y$*$-2Mm4Ddr@9S3k^wQznL5&8}5oR8HU!Y{Epl3r|6+wievR zB~0H~W>9il@3+?(LX_|Foa|rcwom(2l$3>{A|CR$mT301P_8#2AY|`Oab1=M`n5G* zx)mK81rF!%yZj(&D!I}<6fY!^^WHn>bL)N~0dz9WPL-k1C{xNUBu${#Ihv6_8m_$@ z>zjIq)8;@4tA(8iuu15vv-*NkTx3*xWO@NF(?*5vDSMAwySCPBM*<>1k@#eu&77#nVVrj1W0 zr5026K<~WGakR}S)_6c!ERirPtLkTYIl)>L6K;$@ciP+IpdFZ`^gm*q@0Fq#-x%M?Xv3>dj)_#!tM{TsIMi%7m&xN+PxtJ@dwHN^%tOpM&yI~9&p z6yL{{^T1x6&rqy)WZ>ym#6D-KxHbaQ7d{a^m^otSZ13UO_kHRC9IS5m;P|A38GP)9 zP>X_mTp%QmdfIT?^3!z>a{jb@^CY+@=KDkNL1X@1KmklT7lc5@YpMs{jx@4NnowjqHwT${OiZWPN#I5#|r9~o_!_K-wA+Jy zIxi5^1#tg3r=!79bh=Ll`ST`bop%R7*MN$4ARQ7L)fGe+23~$wx%~)J{$fGv_xb*0 zp=uCBG;I_8vM$5S%nesH_n$4lj86Xe%`iKZ=1uFEsW!5hCLb<)l-R0c*l= zc1ZE=`;rGs*`SP?_poLmZ?b>dXVq&_j5wNxS_!;WMz<TfvRUzxE@(wzhNllHW}rN?s+=IRx`{(| zY?*MJFZzacc>Q9@-*Lfig_xcB7FulYUsVEqJ;ti6)UvO-k=2-^yN~6id{?u@syvu4 z!;vhQJQ%@A&Crqa&U7i#HE_4^x)PnQG25)JH5z!%;hE= zIO33JD>0wQOaB1zQFln(N5n_O_JWSUGl`DBjkvf@_B=sr3`(p>0uvjQR?uDP%S+KEK2C`5 z({Gr}Or*}+!|YUWFGp*S#dl#}CX$Gg>BhQGG*mJ91}@kE_)H+$hi-zyfK~fn1XU6c z`zETbO|b5MLW4Fc?FVKumZ}G%6W6lrLz#QA~V1Jne}yJMLWD^DeiGKl6edt zN62E`;>Q2D&el!{EVWVg>AshWv_R>`eC2bR?v|0YYp>5P$g;~FLRogLJR zaa&UclNuX-@6~U*qRn2NSKUzeSNjtwc@lRW)=e z3)g{T&}ufLw7OgjB-3cfDk=tMShv6$3`8;rz(el_{r3N^hWZTGRjWn=p6$yo?ZB0M zN--Fb0Vnsp-^yJd#yTf8P_Etw2FW)2isU}97HOIB8$XT$iWOvj8FN}XAnba8)gbBr zBkCWxE9<&0TsTfDNySxR#kOsmJ5I$$#kOrb6+0E%wrx8*Hokp7?|07m1FN;w)@pN( zG5Xc}s7tnd_`19GksXWfQ#Uo!Hxv(QJi%(M?_MxL=;DPEgj`g$5ZsQ1~6#^|40G1jG<&e>xUY$-*>-oD&{Z zcS8MY$Ny=HBq(vOFV8po&pUz0h_#uSnFv&QBqT3?&LrNVW&DZAnrJ!6WwZ1<@_#g3 zUp8+Km8q04S}oDm+b~w-(|z+U;~Dw5%udIGmKmdNG(L;-ew_^2;%dpv&%*X&w|^gHQ4upNE}-E2eG}H92F8*+6sON?HHp$Tt}ka^heS2OG75_HkzX3})fSh)IIuMDN>)g7;VPH(2Fg zto6c@ZCb`D)(yQ_{MjVy&Y()gmj{m2C)h^699#4t6xUdVG zBe+yuaL@-E`1yj(aVip^qWXiB%H1A+NJ@J8p)4*(Mz7~=!z1cy*MtC)v z+d0+cfa-h?r=$d^Dsw`nwTP(zZYPc=mN>e_W>S$}ml)m>F+c9rYWpDQK8lPWHYrPj zCSTDAZZ{+mIN<1i=H>!>d~P2Vw$XU`Ktnv+yf0%$Q-p^8@8%VF}=I@S-mDAwF+$5Y2gE_qOw@ z{$pLQnV>)^wDGyQv5i*CIApaQ$rQ3_`n)NSoq3x?!7czml9DwADJfQD42W*PVfFwi zEXDYN(UEMV_xct0!&lbry~I1caIAGVFSkp=9WAwCq!o||6ch%sTAajXTJ|lIIi9WW zmo_$(^t6P~mx1({sy|aRIjJ@6ZlTm@e@Cq@Gn{asd5l~uNy<+OQmWc_Ap#CZrHq|O zA;n_kq6HCoj51?XjV61g--CX&4BL(lny;1LFFHRM>sYV;54P+XL^(M#mza#XEdAY$ z1b&(xhQ*O18cD{>5TfpDtuEO2ocTv+x4v8KG}D%lk?0$drsfiUkw6cy#8Hy#99=w^ zPU?U~O7zSwp_I5tD&K|WF&IwSo1>6Q3V`_yfT`NP3Ak}#v-gC)Btl}erFb&&VW;yP zv7{9V)9P$SVLJLRq=jr2?Hc2q*`ePGVX+b%P_x9NOFF5Y#-4aT*;HxW0`4N zWM7&P^j_wYr}3L!*i|L~3?rd+M*)e>;n6Spy^6WhoxucLYp?8%=h+*RrRH3lU2rlH zsglG9E4qHuktT)*UeECp>h@Kd`Q}8v@o3m`{Os$YSU~O?ZQu<@aaV9|9eGzwm?lmu z6E1-mT-faG@_V7jv#I-E!wre(|N817vL+3_DefbjGgh~A%?dgxd#hblD8;;6MLfp3 zVgsK&A1{O~EU1d*GDC<&LV9rF9%L5p9DF%Q8xAg(*LvO@5UlSspAku8a{fMxlhd7K`}l;6qB+i%D_F3PfCcX!sQqBGGrEy!j2_@eI$+; z`mn%Wjmyw1Yb%F<=2b`GY0=zJF9>a9V;kXV$c1{czk`sLlpdOikK(1NK=GhoR8vo9 zE;2bH^drfSdWqq_awG=+qcU?eBIzR`W->mYJV3%VxZoD8CgAaaYXtF1#sgRfzxe&o z5uM0t%217l?AIwpET4W%)t!#)uzg2}k`VnTu(hcakW0@WWt$k5Gq983a{*ZWfB1UP zYPhel)J`kOqS8~A9fDs*2CYkQ|3rQy<;0YpS4%uZ9G1S@vC(l6?-HPUR>_!7Z>Pdx zvHbz-3}!%yQZA$oU!jk$CDw0c4?0h`A=dM3a#cB8UlgqPRvzFPrd1`ilrZ5E{|{Pq zF{JcIFO9IK*T2Xwa~@0)Mw-u%i@gDXipc@bIXQk@xP>TX_nHPiv4mD_*Oc+Ng$c6}qxh3z#Ib3y<770=gMU=89}5;LdvN(@+EDG12X@p0Wj{eY{=Ne9 zs@~gmeI<)%PomTE8qu7lyJ$luyo1UAvGG_va4jne479YYOStat?n6_;XU9oN7)IT@ zRU1Xm@r9&FYl+8-oiTV^0Vd-qe=92y_lKfIbaXbry2=SuC*x)aydORlZYQhuOYdeQ zOfgj13-X%2FT!u+p_;Mbz$hvkfg+j53a`Nm9fNo?b@guyKC_@p#3SUkqWu0WlC!Vr ztq?;yfjgjy*pIJ>8V^F>y_U0Wb&ranX^~!6O!GzBCl=?IwW87|G!BYEuRQNcZ}4tDs_+EqD|eeqs~?@(lbBheM=`d?R@0P;)*$XPWt@vvfs0n{k*f;e6w2fP8Jf4 zBM0$9qX@|ju7njaC{

zn5BEQ*o!!CvT45Dm_6;grp*#*C(p~~hvqOZkJM!4p|F&kRRqq|uA3NbBt}YIhK;QV z^&O~~XiVwT8faG1cGO$cD{Q%Kd;0Nh@-cgrzNq;Y z?t;5rqua6^n)-ySss105kTqh_FqDCzc%jmGh$HDHIZ#A!a^IA_YkN~WM8L-l9ve@m z#ZfpP+x&Vl+KUbi*jPLSbFtnE-TRlQ#d}s{$g&^_{uuM*7u}r8$aOqvx+A00fH^=l z$*Aw(G>z5h=htHvB?HY+3?1%w?2eONiBhjA=I>8?0bXb`-!PgK9~`(F*_!i`j9nBJ z;XwH#QpPgBJ163{o9WteS(rW)l>uR{+is(j1x40>Dr?vZo5xl_#Q2A&i^1X>5R3S2 z3FNFJ{m7SzkT*EZtl6W3QO4nNfj~=CQBu|Pzsy{kQ{aZ@*tADBESs5{<_S2?afb)F zg~gF#v+=U7=(TbyA9NDb?`1u_&hIJ!onMxV-@M+A@DTr=ZBpmILAiJ;{zsD{pqvyV z>wo7VVyoMgloNSAskMXA1bQj7Il)U}d2jM2b-glEZ}}4VXO&^3B(95`xGM|UX!62> zyYzTNH0l(2XN*{|XGB|S9@I%%R;`+{EfM@7t1oNST7JFUW4ymdw>Y-vj*J~KMjar| zTKrrxYnpG^bfOj0`hQJKodJF@C`E8vwMMYU>Zm9vemDEWBs4VR8k&f#2)l$+5Yzfz ziPzV5c>G>iAnHmGMD~))Wdy~ONZ{nRsrxRwaTDIO(_`;J>S*ORX# zK8To&1iiiKPhV|6tdgF(6)o*vsTUGLte}GjO!%2BrQ+Y(_rD#+pH;5&&=3;z{`7nHO& z-PvunTn%Y68Jr;+t;WY?83Go&Uk;~B$F>Y4&9hbfHO+qek`zy5$k4k*Y8i=y<07rI;$L|h*#$hY`(AEf-H<{8Xdy{9ysu=0eR%ITx zH}Bk_5bEzyYtsoT-u(Te{6vjG0xjDk?jS}18O3~?;{Y6KT{i=>M;`fVjPx#@XACF? z7LU^otU|4d+4wyu96e4PJVb@X8b*Vev_TTf7EjZB->GuHVMD{d6piQ33U!oF?@nTX zSRyD}ybRWD4)BTc8f+o;cY5U{$u22AieHfI`7zO%Q%WWQnq;4miv|8K{Ex0nx7idk}!kH&ce^`#n&z`uYTg#NeP`E3ouDq-%$Kg4x zj7&vcEn#4(Iq3|?*oQTOK1xMUAqJGPnCsbqy`wZAnQ$L*lw253-rtcc#TZF;MigO+ zORiVYYN6NS90Rtj-G4{=KfbC1Z)O&Z2bi%YS6lAQ(l1*7uNrO?%u8g^25C+)ONpQ! z#*sas?B|Vv(I)w{h@cR0f%)QM-^s(`xqzshJd$CtJ(wGqD;^(^dIjzOb3nJFpdeF? zf2YcAwqEVSs-Z7{z~}dBQG#oKyV+8$prNTU-GzdM#T}2wLfQjvb*}Fy>FWBBoB#Cz zrdK(d3_mVx6te-NG1cLB`pF(NI@Zb4 zuN!&Xgz+~=`qaJO5Os)uPoQS3jpoSr0MAlIpVF`G%JMb>X=;SY9`_TPlzQ(!sZ+XR^O68T zrY73jNYkChO~(HpG))fIV#b5{;|I2YvAZA*WiHS2j-Z-=9->`Y{{H?xljox~9=Fp7 z%4{Si0|?J$Vf45+FGy3%@sE?Gn*hAbLq%}_q~T8j2OmHXKGjFux;-$+xKJEA<1}MS z@w1D*pi+VvyOc3&Hnmw9^<(T2&Ev{tH-#x2POZ>1lNZgOe2vk%sA?i%vj{5@eNf+- z313Vw7kn~q=s2OC*giY;PLbCtARurWFSI|El$Gy&LzH#d#>Qp{Va>a%r$;afkHsGx zZa6Ol92ue1a7(yo@oxIFW)+CL{UM;!?#S|q5PlSwr^w2_lF|NXoa&}JfyFWGe?k}(Ww}esQvUn6xMvpQ zD3VGlDEnUx>31^L7#Pg|F!H^lizx8)&W=MuU=9us4L)8UK+9wpmvC==W5U8XSt4H? z#>$PT;ta+qCPtPfY^cINMo@LA!xKv@D+i>e`f!4THXV?}WP3)~IzG|9&rG2FV=s9aHr zIfNaHN7;?#Tyt3YzitbL8RGZFMhcxb>|`hs;n9#b%7j_>w22cQ|2K4J5N%ghT3L4F z84P6XD#7sV$(?qeocm@Z!JW0FY_?^T>-6u=XTFx_1^;x<&$36e-gavIv8=m1aB-}6 zRd8x;RyK#ci$d>rT~Kxs;RgE`3~5;2Q(R$Qd^~7!oU%_^E}#<}x1lp2n`>bM;5~R< zG5qg3?2Pr>0*{bTQIPR3E+)U@w^JU;caOUQ1CrjwP!d;_Wt#C zBpM?jE}l~cbZ_?UJUd1hqEI!; zu{BGA)i84wP7kgl@TD`q5%VBXVPDsP>Z+i?v|N@OX{T9|n6a{n!sQ7om#%cY*$Z3T z?VE@FcS^t>5fs%yTClp?EeKzP>9`d4m(xq10qJt{J7&25+#ZDWddp8a022+{EV|Qq zh_l;MG-mC!|Fi)yA31hDp6ZW7P*mYx^?NuL>OWY)^T%+1nXM>_S(d822x{$b zKwX$f@96%s-5|3OkjdwkwLVgOMhuT~^rk)zrI?uJDy2Dyf`BjbP zPyZNME?H``{ts1qxr&6#Bf&dW{4w|)W!TSh|79bG>&v6i)HEl)*~qjHm`jMh2+ zA~Gtx*pm6V?y*&aTm&a2dA4mP_oGZ>e^pymDVXF9*^qR5_9OnR-0I)$W>GP629Fmf zC|F%8h(K5rfbnL(d7>B5EnvxeJ@vOK660POOXkBX0P-7G6akaX8tVw`%RKpHp6+mW z=k~{yD;AH-1+;1(4&I#YR?0%of@~l*OEC#Z#>8c}?%@G;KvE5r$fiTYpY7>;)Niip zVY&bKwz;v}X9+_z0W#;{QG2Ku_ZrNTfegcZ*`iKjHZ(c9-e>~9S?5Y^=uo|-PF~3Z z7d|MkM3vd`%4&N7H4;zb?gFQz#7QKa!D{S3_(?_BEdQP=+=NTt$&hboIC*dIM(I`$F&) zAShn~j~r_pXbMq0krt_s2EI$%UueM+@B0qt^K>wMGlXCdhlnJkX-|~DZ+LT^`jv2u z#9|T|9?lZf5J>uvCZ%F0bLj2%@v^p)KfFh0C}DgT@P9-19DhHU+NAr9 z+S4=ClhO*Y-uiAx&*`w%Kltz1R2|JD<1R=};woIXhp+?#g|$XAW2YU5Kay8!T?ukL z_rG^sFKIu&Vs`n#UbSp?jBhk54VM+v2mS)mt6-Fsu-{?*hR z!tehzs?*)Fnt9; z@A2&?QN~An+nQyBCHro$nQv@WCi@;k_mel`FRnho@4zbfm1?sl(`f0zbDz(Mg{y;n zBP;geoarmG7F>>x;*a|d^*P7S3s?Uw3K>1`$Qmu{8Ob}dWq09gu``dJ9W>3D)w#5 ziQrCpiQ352wD=~-rJ@S~9-h&5i?@JqnTx+{O5LIQbIj8QJB6l{tcC^&<2D|G zHRAkGvT5^z5*5`GAVyNC;`L949k-`ZJ@D~TT5-BWEw#AnN!e#BHB{^iH7gNWKGP~` z2_p46#q}k*N{{}|pY(E_$!rx*8@0o9skl8ey+p=Ak67)0YS!5093^n|^oKKbN zrFyz{Z|3X%35y-2>MtQ?x^mD8SGr51T8OiWDc2Dc5?6O{C`NR9Pk^D(m^Dr9i_{}F z*FQD=bcQ>ZqkG&%n;U?dLhlayeZ84**FV&vKi+4N9q%}mBPshhUL;iiF{#YVr|s*J z=O6Ie;QfB|t9RP>fyT(zo~4ARygzSBoXiOIg5L?ngfvs+MILu3#!XxrK7fl+d+>A_ zm(#`(oky(}U~FR|dbi8f8dgwV5>4ug$^&f2vM%}C`i;peHJaob(Hr8&<@xhj1Erp( z33SZiaY1Jl`YE8@cPb#yfR z_TAl&TJ_YFqe@q>g6tn-TQDXW>B!wxb(KvogqffDXMvaq5X%cQVZ2=g2zLtD_KIAw z6jq|0?FX}XQ~tkKV_5B6-!cV|het0^%)gz#FRX1CPSx<24@lCz>rM+wVqhFl$#!J>-QA<|M591tP=1z%tIA{RC#~F{Buq_@Nd9!T?H?L6;%l>C_ z3%DG`F*=$^9|AsG#(Y>jE_Q;<}gUwTkTJcz3u2*y5DUJ zlr7_{`12pE0cwmKceY-LV&5(2!&iQeex6m-?48UO9NChlKfQQAZJM3odbH6!*6!=| z!u%2enY^t7|7^6(X32msU#>)klx_gI}MOWal}=7lDeC$-1uMZ)nF_R`KThknh5)iodd7yJW>oNsvXTL zMgffE4+Vbi%XP-ed}c>k=Ql<1-gIUZWo2k9*IYbOy~#bH)jwSm2-cv{zoHVQSk1Y3 zvUBxRdghqxCmme)pUlcC8?&+tnNiZKL9=U<*plUhl={R#YNi(jPwBb5fuKss^1qS) zuFSuSmxycFnk%$&Vp2))+n6lPAr&VL%t3DhtQAA+W_^HiuJM%-COHU4Z6mXuX7x(f zw=V^6n~90-S+Aa5KRLb8*at5J`9FaI;y?LLzRvFS#60GpacXj%z~0ue|8r+#bH?Ov zfBhsX5XaRsctLoQKqI0td|lUjMeBNb66m|L?ec%AH^p(j4!K;v4$S?;{Ys&U7gBDH zQ1M$Yb$W@M_W7Ax)F(@NBa?;Gnywq<@1-z$wx1cxYZ$hhYEE@qko$obe}PeA7xzec zHzYp1L-2KE%NY9$f7O4)a{q@*NRIc7Nkc;;)@_Tw@l9v*mLbM^#gc80$~2#uSKim# zs+s-#MyuQX=i5!a-UmFBQoP%Hg&x^zR)}1~x!YcIH(OBiSXqo3Q;EW~(eMEQzAv6s zRFf`1D`42?y4mgCANCr&q`JI+L7HJunfis_aXI_>s34X&GjOOg8Gn$-8sz~s0-=6tAEGl`4cGKh`wcJ8h4_0e z{b!5MB|sl!y?xJ})vp&@k&DlZ=I&j@NsJCz;kWN-OW(gclcttk9XfhlMRV*q`rfcb z5h_*j7f7yczaKN)^sd{IL_y~M!Z-@^`R$l zK)3O*1BrOy1L5m-<|~y^6GD)jizW*N9lAHZ{YrlI0eTkao8#o|)6LtLPXcisZ{_bU zyv*gQ!Q-ySG@|-#uTL?@i<`=AZH5lxG2iuk&+8)uhWv0~6H=GnA00Oe@;mS5fWwte zXN2)}|6L>TeVXl0tBJyh#P^&VSD%z)jn7BzYl_wqO`bY)uX~2>7})N6vB3S8r}1J? zYyn_;#s0T8&_c4J_AMX>|IZ6X7`~IT9$G4j6 zPAw5DiEnvrk_qzdF~B9;cQSE>w4Ix*l@|@SGuO=;OS238H{-=}RdFfWI)EA)v3-pg z8uq7lQ}W}*YGC_S+jwahG9IV?$c7iv+54TqSAFdrXS+2Hp2zEH$ql$!2OY?mkHED8 zP*s&9_WXu4hx-9?(593nN?sCtJr56Q9iTQr7FGI0vRrh1T-xpneC`VnZd=8VsAr0@ zBIB|n-dHc6X4SDPt=hKi!qophv$B;ePRfxNL>Ljd7vodi3;<=}{Xq9P9ZA^&^YKlc z%`IGiZm^?W)edPKF1LR(FBkW&!fETS>0dprusI#54)6fXoWI9NNx_*Y3WJKsV-iME zBB)Wk!W9*b*#089u<`Gl0+AnALU386-#$V)^!h#vLQy2-7-jnsz%cQBU2N`r&TlQ}T6D5@-@v-C!b5se-mue#foEDqIterz*_mZ$xc$Mv>dwB)^+VA*(5^#ay* z+nEj9>bZdnyv@e`(|@!skoDQ)=aH+vez2!S&O1x=m4ub3!Q=cNdwRB?@z7Tf}QuI7jOhiLrs z-FL`eem7ak=$TltWHlWTPrAO4&D*{NKl$%b!~~d7W?#{47)51=L7?R1#KHrOnjz06 zqR;KXwB3hI^WQ|{%Us_NE8eH`?U@`y9AlN6e&4U|XN3d{_)niNlH6n2S)HLlE-8m+ zXc$k1evk-ie7V6@x}R4bwxP#&gHYb!$hq&FQajDr4hkQSLwj>hF<5#(w}(~D-iubF z^?tgr&U#r6hKG?`Z#SawxjP#dr~3#k$?3yo=nCujfW2u1^2YeS0QC$Be0^hpS>LVr zNwN8sRt!4sZfRD;m@mKLO51lI*Q1JhGpD=#wgp}=l*hvTMyO!hFG{)#yR<5E^eYEq4m_GFD!WbkDrm))) z61`i;TT$8(cmd>QemXWd?b zkg2fLv%KwZ?UB#@T5GgdmgZINpk$4SwiAgPI{aVqppHP$yzRyPt^%})?Il2KIpTLi zS~%QIe`!)=X|U(H@gt{hq@YtC!H@%(#o?9%9w90p6CXtHXA=pq3=;~$3?!6XKlqmgM|UM|+2Y3%KC;TGg0IW+iPy9bcFhFd|K1oP<$tIU zj-K(91+99Xpghjx8zHIk-R{m?vs4}SZ%76h!1DaI)b_obl|UKQfIV|6vV*_tcV%Eb zaKh(d6#_t1nK`+=0LJl2`(#tEhHL=iq)JR#C%(3wN^A^r%bn z*O{LpSup;>tuco?eC%mU3`#&kF6)9m;Pi@LWie#4>P3j z{yWXEpx?E|ROC}>Q((Twk91CWlW8iMsz4?Rn>>0`wi0YBWbd0u$vwa7F|wjNhbfE< zvEbtOI+Ew=acp*sQGmC)L$N&iC9g5Ma~yCyopk+*(z?hHSfzcVh z3YVS&dKShK%|4s&3kGx^`JK_?KLu~|_X~!wi7RymLRM$=dh$&t3v0tIDzv2B{A%-9 zWj5k7lsXv~dfRgsJ(2$C$cXSnZGq3@2noC=_Iiu(Q_~ZtKCbb;v?5Spt|)B2?n=Go ziiAY1+lXtf=Pmz%SDO*YRJT6USz4Ey+sBzH_jCc9_3ip7(-w!!iTz8>nN~BhRK9MT zbE;_trKzNEHD&&0gDN#p5accvB{N%~ipyIUS^Ib^`F*~cZxjx|M5UitcG!{T49ohN zUj4SNlBiDkcl>NEPH#5oU_?+9R_~eUD;(@@sB(W&akQ+Sc_6jOFTZRo%;z838m&FI zFXs||)llu2Y1BTz_x!uJ%~b#rQgzmWw|8B~H<84C^V%7nvjQs>T+gL0QNif$tQLLi zgYEM_2{Rl@T)Cr!DgOy_mUyL(L;`AMgbYcd)t{fy$M)ANN+N1zabD=7g#e}B{_0!W z)&bd@-u+c!`S~VqpTFHKPPOkH`1Eh1aGB7MH=E#CC}i0zk8aE1d0*aH(wI#HZuGUA ze8|GwJpr0`iW+JGC7el?@klGlqzkDu?FLZH#g5k&-Y2#x~}K7z}(@=8VbsCanRm^I2TydG>OK;%{$xPnF}3s(W~nl-uJU2fxY;4f*x&})IIahZ|@(= z1jGIvByq~#)R1`*q8Q?hfD~O06K;Obd7g zGXD5}=R!Cc;P&EZJ055OZTpLl`H6t5FGd{8DK{$@W8j*zll)vtTtFsR-HnqkUBQf+ zswOY@jtNjVUr>~BV5eh^XqZnjxt*1Rduy6A9McfM-58J94JbE0);hy~0knsk`~rbk zxSEcY@? ziE{zU(F^>apzO~tDrj65u%K(9eBH%_hX}w`B2_{+gHW9{Q-fLoWtbvCaaRVcw@`*Z9(DbG~V--XUIq$u;*77ua#!}Q2ZTnaF@7;1c{G)!l)v4yxmV6sTzW#`}VZuiCokD+4e%qR(nBHxYngH2aIJjZ~P;DNi%Im z)owyZ?A#3J62EpEk-`?zkugo~>ny*SIc5|jfXOpkvQd3ISewljs>Vv(>dL}C8kyx! zxNYP9`+OrOts@|Kl0<2F$V@>PibV0Y*PBc#izi&B;wjNlAFNVVq@f zH0inBez&DQ#rLEmC31b@r527KR6VW~yZRQ>gmjzA@b&Gd5vF~eBN&esi+hZWd|YG3p&q+o@H28?PBMHDfHl&;8W=H^==z-;u1z~Re9C-f)Q-TXvWVu zJCfK~AKUl<#OyoDwqVC`MN{qIL4|@FM=f-Z_r(R3`!NF$BI|o9m%g22 zegiD+!Pnavy8C&nI@sJ}CFZrX{)fheRQl7d?cnT?ZZRS*!eeQ;C_W#hZ}wMN2fIxQ z;whitMwX6=%C5`HpMFbwM<-RShMThR+tY*^0IoM*$Ly!RCL|XU5186V+kKo%483w# zKDS=Yr+kxvECnTRrK>O4Lh9lt`dq?+dQC@B)3}&HRwEC))J>xyncNH$BUbRi1nG-m zdF5uSShj%wjXk9Jh&!I^cCGm!tM~a!tD*nGypes$p|8N3WEM(;kN1!ayl5fo2$0{0 z;PaE<6mR2`seMjM-_brgnJD;XFJVwQT&!h%TmTJn33;YkIJ0)NW2+`rH_@1JR0A-B zhHxZId&Oner-c=4X}bZFAP1hHGS9_Ixbyf?zP^AbIU9XR8J6 z{_Usv6M}fJddGC1A0qh@w4FU-TMSc*7V;J*EX2ZM3}X(K z!GvXCPYKh}KP|AhX;L*TY}`$94LicaxA)lnIW`PZ(vhrK;%O=U#Ip=reZLh59TxGW z8D}VGpxJ~dGjvZCAAj?)RgCq$95h5#(X|k29XOSOFrg0iFh4K1OZbe8y*cmPj_-^1 z&`?e==^*_eEjbSdC#MGZEHd7TxggCmj|#~P7vo7b5lt}ygd>MBB6=mrxLaVzQg4G! z$YvDzf{#6e+p|Jpr(Lm|K^7-}d7NGf+t(KYa&9T<-*Fiab_T5BL3Ncm@}Z$|85`Yc zv=!Iw3S#6jWc0Q8GEa)cll400AF-vM7>lVyW)OBmY>^S`hd#}=Ll9V69i?2;Ilh!wfZ5%Of8;g;%GTD5R0StrsoygG&{d&AD zf-;|t6eQvKW|%w?Sk9*8{nQA>(tpY|B9)%KZ2MNs?}-l8R8&YDxZkfAqC%Gm&Y14} zs9ptK|K;wZwn$DSv`jnK_~NiY;;5nI3~ydpLSj*ec23fGUoE=LoDM6TET|%V+THJE_>c8$FMUD)Q(iUzg?=UYJW%JCBJ(HA_ye% zNg(ZY3f?%_C!%`8j0UL6m@LLbGaFn}YSud@YNd6s9&()sXiL>Fnv-d*hNV`tBU0FX zFMj?^Gsp0bO8E1u&-gLuG>*;=EED&EnAgjAw(SRJjpV=F5(9%UVOPrg6lXH+Ph`SQ z^d29Yk$k(}wCF)3p@-7~@-kqeiJV@poOIko*7$R0M=vd1>UCZWv&n$Q&C{)_KrZe( z+tZUkVu6`FC86FE$71)N7Fg=q(uqiJLTI-YBz$t4JlFTq`vCXYY`;GyhL#z!*lf~2 zzB~1Z=I~vV3PBcG4a8{BX+ni#5HFO+nLMSAP3QT!I$ahemt7?pI|N6s*t+A;sF` zBG;0hK){RN7BIwd(ZDt}kH+5tv*fw7#%8$6B}`kZF_*ao>4AL0cirOAv)Y)wA~OAg zVVvA1=$KZyo{+E`1OG(7DEKB1&m_T$K}yt~tR50B+J2bq+eoR>r82i3yEx7DR$ zFt>UzLf~p0NQzT2N(W=DcTq-9OlqpXa&^+XOG_&MH(OvEe8zTI8r7>) zz53bCUU~T4CseRytgwu$#qLdOi$!n}8Xat@*tA%>J;P&Z{%E4h3JA4a#TZH_m>u$l zjjS^M7tpKsn)yboF|}>L>(sp2!CP^e;KL62P0059ogiue1r)DB9v129knsUpL(wPG z$Ci%xPP*0z`v`f(H{ts4!NI}O%z&^`vCL!cJQ$cYw}&k#*9Q9R1wqrQu&lLu z5-}UmXlmFA1eza&lY|~Ph_~IJaA=G=U0)}Ip~Uz@4?V%g<`Ayto#t}l1dnJ&7-qP= z!AhDj*01bdt+q*lDER1mG!;>BxuPdOq8VA{1kOSdg6K7d;1~CmnkpyYJhC9?Pv)>B z(&5~|s~OD`l2yV@QW@n$G}Ir?Nl2)h3t)C`U%I2CQ-F!HUXtOzrT%1ToXHMHqKIp_ z(P0MF(l)1lfTJCx?1h~rl%Or#vX9Ka44$1G5xoLLJ)lqz`zE{veYkr%6m9R zx7G1+JA;q6CUUN=RxDFYXZ!!Lsy3uL@*nivd$+J}bVc)3AQ&CQN=Qq|kHAxg*@G7Z zu+0t$LNWj0he^e%@Ws15;;i2&JezDJs%i%Vynt_KdqE`r&h5 za01DiBRv;BpgT&@V62+7rtf zrFL*XRgF>R=}8WmU;3c!p+v^tmjaTX@X464-gmrzK+qkTP&y=jFLs6c$-Nf5;?8L9 zV6X7(;UOeGBy1r^AhLEAEQ2l09r&iu*M-^3uyuvcjQyIYqk*DWEfbnJ2vx@5jU*^~ zwdm!yWrNXwK|MvoPlgT7K!Ks&5NGX2#M)F(-Xb@eS*$~-M6&=F$&C9xl`hkrd_RaV zc)`()4oQ1*U;O0v-;u-{ga0r1kFUn^pE}!Nd9EN~Pg6MlwUyO!{>)>MVw;7n&N}A@ zt<$ZV8VG^!T2?)jF+Z|u?O!I@x=3E_r5)^Y_WfS4{Ee7h>lG=hT1rLzXN(~+f9i_; zbfviI#WDhOkD>loIxVD| z*p&o^63spGRNgx1op`CW%qi-1I8?QN${w&PI3P_qUu=bE8wIYj4*sUEG+cp2GYOWZ zxq*YOVaIfJPsP}CdBf%wjz0Q^6BA&x$QlsCtE(+(&c(?k4Kt(xG1ulZC8X335taM? z{XtCt`Pze!#*Lx+2E?aEl$4Yh3RpSE5|HL8b(09Js6iFCrVwd{AnSfX3>;xoYk zf5;Foiy4f>tOy9AH66Jth=NTY&T!xUKFCjwkPZ!pjL%z&HOs4pbYRN=_3j9*k?6jO z2My`osRAE7M+((XHC=17&i;T~t4LhL)8IIlalDr0+w6wY)>5f_D?>A|343ohgoj(@85SYnl%bWN#`i0P^6KZOKnEG6&dw^eJ#W$(i20; z z27e*AGcc|)@qe|gc)n|2Z#%B23LMBjYTu);+%2GL8HWe*W5lan6F`qlwe?C~6VT zqOj4v*U;Lv$Ih6c zwLCRf`n6Gc7x{{uu?e}5e7Qs=T#O`vQVUZb5Ga7%#Y)c^;(rJVg;m~DNd)t16H3J1 z!E-u=aROEd>N6*e&P28k6~JxP=y1Smu0SwJmt zV$+JuGFfgfvdSmH!F4n3i(yFf(B4>tgGK$qfZOc0QaDAyiWrpQt7Btysr#iKSuKs^ zcPH?9EHc8kDa9u)ssAd8Dio7i>iA3vmtVr&;!PV|-5zkici z*JuY*Q~KPivGbFggIBA4>iDja2*Phv~FXYEy^Eo zr7aU)LWnljz`LTM7fyz5L1HDbEM?rRX4Et}Nf}iz`qcs3{J6aC=H@m%I0)p^Z3T8A z^fd^_I(Z@@0(n&iHk|F0sOLE{t5 zG8h;L*VxyKdzjJeO3R?Woc+>T)er%;h)&@NkPoBoG)UxbejC*PMr%~6htpZaEPzd_1)@wLkJ4r#r}Or# z!*xb}Si4@_W}J0e9PXOs+6M_-McNo;rh1Z-p`43@7^NB_w^PPb$Y%b$H#CEfN zlnRN9i&Hw?xd`@9C)yuDEN00y<(%(+=h}SUxL-@^`21Qq(h|$6#M}gF6j&%W#F%MG7Jnhs z_rxBP?TX7PB>gJVZSfnlv#tlY^ML2Y!T-eJXo-nFAiW0-Q4wZNfbM4mVe+xa&dSIT zZ~s8W-oM{>8uB?i_j3rUaPnaT9bD?8@jknRz>a^&lcTlDiC65&3*`cW7#-d8EV71Ncg?vi#|ai1q-2J*g@!>{*YP_*``FpuS&pAQrNCeo zLF1Uz355qOzyM}ol(HJ_5r7=se<(oOJHReiGt{VcK(xCUKouubCIH2%j|qUI(bu#_ zAh)&&htem+g6Fkqvz1K6#mkvsP$ofVIZ72n{L%CmrFVGuTJ>*ho|DqR#bP56V;dzl z2s-OpTLAK!;(q{@!H_AzVk-~8GRNJk(CMRwvkijB_cF4g2X^fxLB0Xim^(aoXM0Bk zn>BqZ*`3tT)?HOmYgfzczQg*twJN-|ApyqkH?NV+`*)+*;RrCJ0~C8AAMJ}gdI(Lc zM<;r(6L`u$t3;6hD#oS4LkGnoqN|u=4#nTUDUH{?3xEKBZ!gI}5u`%2f$U-iW;j_N z(x*27-Y^LRn5(^Jna=nc^aWR;0MrRE#m*$et0pqA(lb0lyfByKcU>@!4e8TYw(pCS zt&x#nQV&J|s@U;Ge&kE*e|P5 z@P_v@+5gW^nk2oksAF)XC!R+^(=Y0Hj0(g|964M9e0pKdv7A( zParrP;1dC6UjV=)15>ub&C?S)$#+O397nn#+omW#AH4%JEX=h` zF}HI?tplF3c8Wxa4<`g*+hQ!`Inp@xkPyXZ27WEU*c?1&v^v)q0OADL85F&aLe;_0 z!glxc!aj|Vy$5MIu$akarhEwjG=lqW;RDWLiMf!?&A)Yxz`ZK~ctiM`<68t|6N(Cp zBnHLf)_k{2$rI4e7HCID1PaWsz255f0DYAKY~awLLlTdm2bs1k%tr|bNMd`p^WoFCl}0?I7sQ{Zqb!*KBheNk%+JwwE#` zJnyYrw<-w|wu!$V{qZQQ#bb}<6^v@3BS+`O1!Y5w9bR~kUaEsUAA1_b12ZJyT&$cv zegry1rV`e@CnPcks&tG%OoU^i56YFC92E(RJ$V8hqm6_>>Z0@(*nA3_olKeW^z#=F zu$8IrL_MRd%!>-7Geg9KX&h-O$r2xTMgoFE)iDWZ)7rE#lSI5uSnL{z4VbM>Wx%d*{X!!a5ldck{Hg167nNgSo|150 zc5YrTufF|@MhBsJ{jU3dsq`H(3==df1-Mb0ol-f}ID1lzQTcMP?TU&}fD%Ebhc#n^ zXT;VVUlm`k4RRR9ezSB}IxY zIjBcJ#af|c#$HHL{d3{x0KX2aB8S?di8{Nj{u1L8S=9mr9fy~jH6^^GZmA} zA1*w&Frj52{c-!jJ&L*V%9Q8j0LIwmo7c+g0KIFQtZ|}bWp1eo2Zn`okTC;>-!7I& z_DeaKIwrBKQ3f=-nvGnILFbN{^2$R|5$yVV0aX?u-y@$o-=7WSnIZ`?~Fci z6uzp$meqZ$yMO)bdwYN~97Rb9lD%zK<~%Lf8#+HEKR{zjj!ljKKmZ2w-X@0=Pb4 zP&4hhXIKPeV_Xy{%nSijfDfLSx4AlNAT7ajw=X14HYB0AC-OZ8=4Kt}+6&A2h);HNOq*Y{d@bi;G`8B!dOB1PZr?&Sp%i>oSn#Z@vdN|DkC zUiSld$GTm_ROmkf%~NK*pg?rWa&XRQg`g<4n^~BUzT@+x=bsZ>_>}wd2?$W^aK3MZ zzx{%PWyZ@di3{e=T4P(;uC}k6L+->0`)Q>>{lTL~iXZlU89*V|Xk?T#FyP|uh9E)H z&quWFdz_v*hoDpi^^cE(T~Bsz0Dc1kzXUS1L54?hPP{LucT7-~uXXRMn(ZM-P5tIh z$TZ`cgli2F4rnYYNMM?vHqXZu0ThC`y#Dx_U@jTWEM&;{$aJP`p!VGPJr+Fl#au8S z_ZRPXg1_9qcAJ{*X^y|?54M4FA!MraHzbRlQXyopd!Ucvc{I1Rco15p4g)M@l$yj`|#SfwI&-Fo#$XBH&U2lmQYXjz5=3^)crx<|i( zDjkN4+o`i&mLn*5bo9`E#VVzAM?{a_=-k4pHLI$sQc4lMD*{V7>+&TzxOd0x&r7eD z066wg%U9maZO}FgOuVVhNya3u5nQb3z;C5#^9^1&jHdGZgW7kJ$us9j0vIHFkjnTB zO6ItEdP%PVgE0trt4QJPgWcx^8MrrbyfOg%T=eLzc|CBoq(btqRfts^g9dAz*VWP+ z=y4BQ8~m@M&HWZG9d4~h7tuz<6C}Twqnm$%z+m%j2&+Q*n}Au(xe!GPFpOL-8?*1 zaS2u>=6w{kZ>NfYo1znE76Dn?6_wCvx)l}Sb1_oindX)aW@Z)cLk4c#5VUbbfiT_^ z)c#6MN>Gt^-s{|sx?Tj@+>wUwj6uT?%*VQn?PPzz^SOq|CI>GUoToD;F$x63`Q%;6 zQCSJ5WK_ael=k7a7C0xrz+g=FtZwg~*$XL&@ya*!2QwuIc-%n0z~AR#O${WtW(>e+ z&4DDx^@((I=vZ>_W!Ey4_nP z4S~&pkb1JW)&yjnkS^$h0L|IN^I%J#2DsH#fngbt>DaJmyZGX>!9DxkK13-NKx7%~ z8m}D|8{{(%jQ|Fuu8@6DfJr3*t4$cIGSMGQ9X?i^q0#3IJ!%&FV_ISv7DEhTQL{P$ zk|6}WgS?T-RRcWK=q+1-!3hRV)LyWtPolVBH^ofOK)0oqwoilS@iBdAqPrs@GmUWI}|?uUMh?K_M6 z?li{62#k~dUXZxLIq^|SX$}r?nyyJbRRJg@P|e>+H~vqMp3(~J6Y;+~HqVLUdOF&_ zVb4}2<3RQ{_o2t4b+52`yoOUt(LZ0=wNolGFNyuwabk=`J$1_YXoxXj;ev$+ zA9WcQBaT>v@u6#6y!c>p&&R#Yf{O#N!TG4oxSwEv1bk?X-_bR;!3m3VK58?bKQjcv zz*wqj_5daLXfA67;G``86Kl+|^FXS|>(WK+`ws+5y7?DD&2`TDC6|azIFMwfDGx2V@lSQI`=|4+8+GHAjH{d}z(d)dd8; z>f<}dy_$aE_7-SY`|vRJ(0*V4T(<|fj?IEZAPWyt)`4?tN>Gsb`zXN6nl0t;%z09M zjoT88t*Ot<_jUKf^VBu|O;$7?bs5`2Rx|0 z0cDpjU6AQ7&Q*(0BP@9P4H=H_bwJcC9jPMcz(xj@{ZfXC;_0@I3s$D05Wu43NB^Ot zbU#*%PZl2_%e2)qU@>BQf)UjW7w{beaDZ*N7&k@4aq@F> zcU!OqbFXA6#;mrLEON1T`(`#2 z?oa@*tD6VpVB(;o^#g#|R297@>&wI#DZYINNY`Hd6qrq!8W!4&-oF=xJd+hrOaRLj zV9}6KW7R#i8^t`c0qRgrhAG2#0NKu-I*Fp2Q8H}oBSID*vYc$e0V4P)MOjqYikloAI4=HKW#V;sC9aDS$+Gm2^u{b`p z-wAee|D}j-l6f#_3R}l5t?8H0dv-Bq@Mhd)$Y8wlD#64{|zJO3I}K%ug07)LYB*09h=D zPchx`hSF!Q*+Q~zdv@*)@E8Tz(8m+hbw+TLU~os&9tc8VL9MKWvz?<1>DgZap$k?n zk)-rg#bhKPeB{h=nKNOA0#3EZD61$__nr1{?Xz}hA=v8#kohRC|E23!LJ}YZjDRv( zyK}STB9Ik`OdkT)1d&aVHN+x)=D4O45rFx6)prVPd+WJZ?gpW8ATj}FjGhRc-DH{1 zwjvN^j`YTO=v<#oJ})Et43=v+Kc2(3gL}ox)m=vP8Kh)1sEvIT$NXa1A`~a|7AIr} z5eSbuc|^Y3uo6BP0KnZFfHgI=_sfDGmPiQ3?d#}s2+k824)F_6V=CKkfJbcs0BYhA z&?b|-njv__G29C5oGz#vvGu?nnU7;Q;de>RxS;yVa1LDfy&|{$v=8T3Q%0x4F0vioQlj?y**_fKu6RX0W7<|{iPULikHBKHuds?EQdde zQ`UbW`ILE0f4X`P=slqKfZhXo4>X$xNXVe{L~?Snl9-?j2N}VXm!Mola{`vlcG6G5 zfe1pAIZkd!3%-EPQh&u- zCMd-HT?f07^Z$@BAa$!y;XehLpzy8lZ#A25fbcbA2@jre@V2e^7-dNmr?$T4S zstF43+qF%yaSY2_OvuX0Dz$$WLv%*UXB7Y<>f4eLNkD=U9b|nP8JXb5MMYZxYn4dR z*Ift`tRwSUYiwId#~-X2u&@adUd~8IwcCOQfzZ@}1_llWUhNv8 z>VW!xn#2RVl1re)T?Q!>GZVu`DN1-9EJ1?G8&)mHbD6zr0)feR-nV<30;NYxn5?dSd$5hEUCvAbZ!ndwf#JVm@dE7c zkg!l@2#!+>P+|9$jj|Eos~L1!yY}u2W^uY~Sh-A+(&ctB36=vRO7^RamYZ(S1B^5VxncuvTqT^c9)S8rmA}0O){Wqm&-|<~1u+TO!~e zS1`ekAB|S}^S$~Fl7S;eBT{S#o%wwTbe#c!T{}CiTAS+mhnbOqn1BggfIvnWn9zD_ zc^)8mIsn&o3dW8iOyKyaX=L4(Tra-;HdE!t4H_x7U_XaLn#SFQ@=KcZbQaX@feal+ z;Wwjz9|2f~Dy@+<^U|c}pc6d|%xGj)05B$4?dqthg09`Uy|u0M3GV@E04EgLL*;dh zcN2$<#Mo0Mu}SBU`tKnV@OLX*SBD@uvGG<055d?M#!kh#^j5_c&DxkrTgYvw0*4r@ zYBRREGur=)m*0?$U}+yb9<8)@DJ?K@$QT)jeOaO~AQ{+!0Nz>n&;@}de$U;xoxC!6 zrmRElgsj{gNC~*f^idNalhInv18@(8CU&5YuS@}3+XnuMLR+`&+oiN{y>Jf>0XW?m zz$V$N_89Lc4;zExie4D(=q-);fhA3_o9uF}{w+1O1CcqwIRU>%e@z=PLCKn&j5{r{ z7=r^m{bcrp>CzJc{4M8_`pJhhV+l>h{1*fc`~^31C6*kk$y&+xF}! z2AB`&?J4yD=Fmo9jysGQCmCOVC0Uy`iP3X*VvN-4x^zjOQcvkmTkiqA2O8M}Tx%E+FqHJ!L8{N__t^{D)&~`H2f&&c!B?8jEfkBGNNCxHsERHGY z9}KM^vKS4)W}2Dl=VaT$QA9?*~W4+&Lr0c0YxqAJ;@1hTo0 z)THwgcjlx5w0nTrwSD6%*|~8o06l-jl3e}WV(AGG%N_s$+0q1}2}tT1foZ1x-Z2dm zni`*n_U!=>eG<&e$pEz+m7Y^UJ{g|@(gsZLh8O`*0{a&5Z|nN?M-AD%e%pI^fI7aV z0HOKY8=>H4V^{&wDdNu}$YEwGlb(A~vHf}NGZ;cim|Ia^&j z1Z)V@vKsSgfI58!4OM@;;Jep~3#CI?7olD`!QMT%H^xqVP9{uyUZpc}pEgLZ|LT*E zptTO!4#?WXLQC~DBs>PAsOLz4)dbE0!FnSA&HxLU)&T&i3=NIJQVv#`*ekH?CeLGhcd5oX|!ZS;-^DO;&(8_hoHsuOvk>(o&#@ zU3fPLt-f_r0>A+69MN5R4;-T2VG+i}IA|pSJf>6$3y{)SsFAP7PMLx9FINRZ^IZP< zr}qH5Ux1c-JK48=3!;an&?uV?nT{Z(wZ`BU@7ZFsp|Q-s;2HR|6{6GBz{P#6w+4HF z_eOqx0j@7Y^z&^RJ(^E&^%pPuR%0jM)kyTatpU7hfo3vyCk-2|0fX^c`@Z&jmTfI% zP>;RaiS!2@h^Ot^%KPkO&M_<*?(?@(gJk>qc>KRR+GoV`^ z>Dj3(0vTnh_#ux!YuvLkW!N~m0;WGURs{md#@4pQ4Z+zSogyIHkppX}3rGv~;6hVx zdJpJ5P~8I;K$a;hEx&c2SgQ2-+x0T4Z>s-G?|~=61I%{31g&wdmu*lN!V1M9Ifm9| zBx#ZLeE9HT#eybKN%;*HAJmnrsO`J@_Z}Y)DB=wQ|Gj$k5(kjw7;MVAp9#{=nQnfq{Gol9U;qF>07*naRECiBhd=9WOxvIH`cGuXhP84K zjL<#XsiTblfVz_5I1~)4;0~RY6akV0A;V#Z6#VW;|KA7QpIypjT*Y0x^z=A1?#~uo%!DrL+Z&Ad3ya zSYNP>&z(N4-pfbOf}kl`!HL2ykl4{xqetd~0FpaEC+aZKSc#d%C9Yj7Rz)Y&o4WsCUu16g9XwLC zJMPRW;W0TllMT&?FAE83vlMv0dwBb)026n^0FpTXK;FBQ4Pjx6OBrdZz0`YSu@4%- zdjkB)U{5xdwZ<`x(GlK+97n013H?BBW!B2J?YmVLfWM!Q*xEum1=kF<%~-AbVU6G> zt9Lil2yznGtjjol86%U%!A?`)rRH}0oB(i5BVa1eRDYjsBeGvFjvVx za##vu4vQ&@*jTpjh5S8npOL^*yBqSt@ANuasUY%WSe^2ut%utDmIU&n`SR2vbIvvVND6TJeAJY zpLC1xKmju5zhALR&c?+{_pag6rAruqM|-gZA(P_+r8PLG<2XxJECFb~rdF_4FIYc* zw1}Uw(HlVm2_;roV3I{Aj~qE7mp~XHIPH!(8P~>5@!P9aKvV3vu{>ms)N^xapcaD3 zSy6cdAav~u*Sd~J0BFt|@5pqpCJ8c82bSXY)Oyurijk>RjADXCh4}!KyDRNz?LH}| zF&>)B!^TZiMasCawMM!w0Wl)PEQmH58ntA8a>7h-i_EF#Uwu<1f^AA*kH>6_6lA_n zqrS91iZ3Y^7~X4xADC(W{fCUW4MI@RfBdsEfdE1~8laXF0J%4Q{;uSs;2ZbJYOa<@ z$EKivL#?p1Lam+c+Zy3nXXV|{9qG4kum>v9$+Mswnb5#$8^x*ss*xdNXry7-Yj?_f zn}H5(gr60g39v>&6Z*u_LwA8a49?WnAMm=q3IG~UO0Hu44@>Xb&K+s)ypK4Du^6H$ zbYQC)fv|cSWk4#*D-_VHTUe2Ltpt~;flWyr)gbKC3Kh(-$-Jhx6uNiPTcI<@gi;7md%k4vgP$9UpbnFl+_85fC+M0@y z-nV!8(;UF_xIx3k7{F0AAoi{;^=~{49$^2OdcefVS?q=lm&~P0)P=No*(w!GXqXqDS2>7QQE;sS<0- zr^y)9N=iUEpdebS{%XX(}@9H5Jvv@$kS!LO&uC;D@(p9h$+UQ$$|vMG&g ztQG6Ghexv&3w#$8XvPPQ5sQ|rkkHTo>D{9nBp5nl?PIHOgs7;4ssJI!*gk#wh^Lq5 zJu@F4&DrRW+Snc-9_fslb(C5;dlnhtM~^Bt{D1)iFo%dxKy+gtv*GAvW4GWw`)doi z0{gbca;cycz#TMnAFv1)fh#`lGAyE0+QEfX6l>d}ijMv0r@sL(TOEYr_sCFob*}-e z-P$3Ukp#ANjes*5lzh}Qepd4s3KYjhaN96>QmNBAZxQq+;Ks+pSbFX?v9~Z0Q}|P{ z0LS1rlp_ zg8PiXawXbF-P-#ZQ-lZvQ}Tj-V#SFgxUVZUw$Hcc5JTp6$LsI;O0ZuuxrZk5Nsw;T~$?~0#Vvc*#7It zh~V$iSjHwWsKC^!tn4e2XIZ07jdh?0*iRucHF&OUTi(@{yQm>^y&ORf+#ZsbmoIzw zMX85{g}H`<{PD+1S8l|J5yFRcT8flk&J@e=F49Ju+0yjQd#sK?{}G(x z0@s*wZ5UIYCbL9V;?@28CI9#_F+_cqOPD7eiarXqVvHmvrvNA`tLBa>jI9?lF3J7_ zQPtjmn*S&T6Z(97BIZmO*kGLJ#GOx2k8i(QAwFJSV10I$UOl^sM~R850it`AaqdWY z9cH{Rc+YtcvotCHW!Tyfb3h}_nndlrW&d*pWE~cewZOWJ#cCNiZ3$M0ti>}4$c%%p zBSJbW38P2ZE|OA`&zzH#l7vUujAlP}d_ofXTa8Si?tQXq%_eCd8iYdYkO(qwylaN{ zB#%Sm+NHMjO0zqm9tXUMc5D4a83u(@)Z=>(x(UZYj)9z`8=GKl)j;CmgC4gb->bM* zDhDDD$R$Y38MeUo)pahc!@@CBYi00pOw1|uu!b~8k8TklSek?An5)2OA7t7)p^i+= z%tYTCoIihFX@Ywo+nkTaw#M~hW48|bBS7loU?%Z7C6WsbR68(t8`C)Hk2!Qe z{{7cKDdy&M6etVr6xNuBXmR`E#U7hcBz=5s#MJO^u)W1K_z7zeA*~zu4QgfRKH#}B zz|t1%vb5v`L}&{k17WX#XR`a#63+u5&@4*Kv5hs-Z>aTbf!D6>(5c`aBXGz;pA#cv z1u_wYCa{2i@ed~+E^eNxW2AHkbz3`+vZlRiYRx2l8Vl zPRa)#{__F%()3@ufk`eG=lo4++MpmO+oxmW*DHv zM=pr~DT~4`+q6neecE6yXoqY|7ckTP+`XkI>Jd2F*kitf->R12zV>*vJrm%*hJL~X zK(+w@?Z&n;kQ~?t5hNhNCpF`OELyWnSPy~nQ7r|8z67n!uU9UW${Us9=i&3vAhcpu zW6ni;kN`134p%VbtvWk4_D|BH_m`5IDzRrZ5D5DgLu6gEzJ`yFr;;iN4God9Le$2% z*f^&_>BG~mIXh4+ybB)^Vqlp_bD6d)YbJ`~c5){TBZ?c9OK zBmkYBnj(kxM9QEsqaZJ7-{in|Lr=&6;GlnCfP`R;YV;V%isj{9m4x`@+o#KW-w4^$ z%#2|cXt!=%qzf`ai;yL}ckf<+(=n>v2Mg6vFPQg<_PV&elPBN>i!Ux%ut2eYKltDS zrF%_GgzH0Xz=(kCuYdh(B~LMa{CIJM>}F#b=h3WjK?xLUG8co)MSoL++ug&x*;wej z4>@<>yqzp)`h{)i-@m_58@eg1#e>j1X@5sE*>XlCJHJ$X>=A*`0f8RYDP%GB=nJZO z_ugs{YW<`ykN~RXU8|7nLTFUGSYX0-H%s(keX9Tdy*mmUm8abKBo!f+3=+r?UHf9pG z^HEyVhxhN5E-2tdUFQqQNwVORzo~+nlV{G7*3>41AM&9mT>-YK2Kc^(_@bpO=;w=q zUnh?qmVGE#tw9PAile!Cc->wI-N1zYHe!6s{RBb`aevpQ%}emu z&dyOycrK(Rqu^+JDMJUmZR2VbL_DITIw;>mK$WYpn>PVG<8#e1?tsvg2QdZ%oNS?p zuD#_y`~ED4B6lI0JXs8}*gCjpmtuz7qmXE$8h#rOZ*Q49e3*3gZv08%gSNE@1)~l{ zAHe{2Tz>tlc@MgqCjTDUUcdjtU*y1{!w3+dSSED)g981bq1jP7b!;zwzTRS5(OL=? zM@#A2*d}j}{s2#>2Q2NZ<(Kcy79$Uv$I=0uq!Vl&G-#004&(xbmD7g|86y4q^+QHM zcQtvvc0=*fQI}~ zv!%5krM7dbeak!VYW9x+H~wpgHKbkKZzgJz%wM?#wGqtao!PH7+kfB?049KNSc~{TvZi0(UedQuPx12dP(hYr1T{{cYP^Et1y>7X_vXz~ir`tN zuH9NJ2u&ghiA-k5;AS=|0kLiC)~Z7EPOh$v4nh;`D^o#i!7u|1X-U$2KATTy}OHp zy`2J?d3h%D#R3P=_H?fsuhhff{Ke%=4ZkqwL7=;ltHAk_pXgGASuZ zHsgMsGiQ#fsbC37-PyBeEAW}yH>T0Q1i=?ATBJa47J+23Z|X3={r1~3b?Q_VTy4x_ z*4!88RJ_-z2Yuqi2^4I#6oT!YI(1TQs=0k*{jES~qVNQ4TB^BNp-_^IiCiu$m4fRP zVr$m8Y-pxEJ}s$_Rk+a3T`CsKHU<)4Zze`9_;+uq*W<&si&6^47zD67kg6Mv)0wkK zUgz#TBXZo1Z5}Am@QXwvgA{+|CcQI9Gb<@ zLC(B{!kM8mYSL6C(NR)jD8VQmwdT8TNoUTA= zvQM%vUy`AtCrDV=o=V%?)5lkaj2F5|26d9Q4Kbtt4y2qimYC?NdEKD`>GJ={nBCB zc@t0{G-{0ONAc26KKMQSzW_miN_EZw(0->rVPhF(Tq?j8;Nr#z+R%DyxCgi}_w)A^ zUtb?g!~y`E`5`kvQzw8x8pp$`ypo3RSpN;Z2c9Yqpe6<;$`d9`gl1g00-ilRJ=LUD zdmr(+EebfB1-F-i{d=Xr8$rq*z0ha2+&Sl?_z5kLQ8R1uWO-rIq}z2t9z{DI#W8Py zeUr6igH$2|$);CdF}Af;3t|@4BVamcU_TWQ<|6tOSiHxNpOS<`FuHJU>8-j4ICeP# zPzVkRkT3>S0Xnnjnr0ruu?;f^`0ZXZ5-)%&KbrBP1bBL@*gMyVxhQJ=kA?3G59xH*rWM$ZpHr@m1&2wN(3{2sj>rg| z@$4iC@7xLVKyP);@!sLR(G=$5)=qx<$3Nf-24nr!b=efhdDwj>o<9cw_yd{uhxb5q z@ezA4GJp5i57lnT3TWUVS7RBo2)At6qK@^-E3e24FT9|Ndy|E{WXTd$ zZzVJ|R62I-*jR_WYd^#=E`Z?2pu^?Mmz6I_BB4HXW1j0>2gVy}glp=9)OO&8yk~6K zN+LY1WMvG}^K!0RZh2n_8Y#f8O^2hiEpp3IeJgaGio-~9<- z^ejnFNd{P2F3zrQ;*IZHK?Z~1KwGe*`wtxjwz0QlW?V$No`;%H`v--{Kj$x%^Jh;> z7JzF8Z@hf{g#|#hn&@OT_v|-V`~pM3!afU$i(IinTS7aAf#Iwfylla&{=?rs1q1t( zlFJAPZLb*A;oW*lJ20GSPH5)~ue~V)M~so=_;W~&sQ{quEP(*WS!|IPFEbflc=Zi{ zyf<*Zci6@}*JtOvrUn#CZd=3XFMFiZ{Q2WACHBNoxe7+MgR`py04QOR&@NaA6F7Hp za#4T^&(RKSX6*!(QRLtbo#gj_{ZzdD{MFuVY#ro({{Fedo{W)PEV!(Zw(199zZ6m= zltpoEBrR0P$U;+`z_&otz4k>)jnmctS;GUIj6FAFs_OrgWD9~q+TXUurVsUJ6&U*0 zZ|O>#kulF7t%VvF_(jDt)x43;xzf*)G0T ztTf@xP0=3x0=ltW-)Q?W08`4>*H`}aua6aIs8Zn>V69=sV0JhR9WK`~-dx=mDQ&R$ zF}>B#*Vwd0{aIFC3RY->T*i1xeab*A%AHWSR29KRO9`Ci7{rf1*XO3|M zp0(p!efPobxGpfjJn*)Z87?zN%-MeXqj^$5kPe^)G) z-O>A{1oItB%pV8!=qs;Gd0qm+O5Pr|S6=?zPn6d5*f*Y+4t~M1;Ljfe#CDVod$!6~ zE54Oj$i`J5v%(oE?$3^zB-2Mt5O?Qxs@Wx|t8oAsYM(CouN=pmk;UP;|DV0|x>$j+ z`HK&KFPjhSR^Q*aXPf-`)wjgm)m>I>UMs#Hp7PqWv&9U+czkM-d;&)IroGz~h)bq; zd%qxg@AaQcMEgz(*!~6*9^3ZsmY$uvN?dZhY{PzePqqiM`iIv z{trv!+x08t!ljGqUiHM>`sGQ_p`h;wFw5^wX(rH}3;pWPmoJostCmSI&Xs_5hk#&t zXVz=d2ib>hG5+m56e-I$t(JC}lV;}RNX+RIkQ(ul^EjvTX-Tpna=R>C`<*QL@H4f| z$BVv{ACU2wTL3T|7K9oXKbkg62KVeIRshDIb{jovm}2(x9;pq4Yi$2;zC#%}0zQ0j zJh+DIiqa0$V9f#elY`8UwqRL0wR2T9tjZ8@VKyemRb$-S+P;wACu8|K?ll6#+Im+E z(4?oN$#n+vu;#J{qm}#CHGYrlom^Z)+@~|f2##IcCxbI_Cr`;$NFo(NnvnZpEi4wk z=drQLZR4@>vU4zpD^(JVZIDfP4YG*zrEXDrw*O*UsublHD0Vg3)MhAJ&pw8ASuR7P zI4S--)_-172x%_@&-4}7rA9YQr1eeAnYl6EE5trBv3)rLU6gCIMPXX)`O&v*3!jZK zR+J+6asi|zjuBj=wJ~dR+kdxD;wgJ!1>NV#lg6swT01t}%LUxV&(9C+XGKD`NzHX)6maS@Vl*9vqpOK=po6;$+91{BFGF54i1)4qeh{aVyL?A8MGv5 zO2#s`DWnu8n9MAsH*VZG#bD-j%eq*U7umggx7wcT8-mWxA*#(sjvQ$+5SsTf zna?~Q&audT=DDghAllK?rVtEvKHAQ$sSo%d`)BtP>|!qa6Y>B;mp~&L(Q5+HdTWpe zD$p69%PNwx@*C3E-v(@4dRA}E?E%Vhv_T47WhEvdWsL(u^Bl;Uumdy2vZsw&pi#cU z5XD$*>}~+q_0XhqphM<(PLP=ZwJ#>RoLO+8YJjvwg0sr7kr{xXU=#}?Fsoh2w!)&9 zddFb^i>a&3e&aUqz#Y@@%xJcAJ9k9Uk@ktnmbNY0{qvb1vn>|%Gy_yGXR4Y_sfi2E zk>|pF(_hYz0MST!JfkLA3Iw}#j`V{yCV641h=E4mkmqD&W32#e4vrk4xj*WE^W18t zpK9CM(B~V_$E?D2Lq?OKf&LzDsQf$;a>h8K79xN+wVze%-DuvSr^c01gwS7xYHAW5NIF()seA_x>ur z?q2f#XMdNJjCA?vSASHjyOs>%KZwttgzvDQBa`HwhQ8Juiy3HwFOJ z8Vk;rXzag}0T{mv23R71Wfv?At`-)dCcq7uJ!OiFN9v{n7G@{Uo|SJ`uNHd*Z^-~X zd5-lLP*@c`#EWD#@zQ-=%hY}~+C?0d~IZ=5lDlI%LPUyh$UEnPc=Nm6>Me6skz zU_lqlpWgnpgaXt(9Umtvwyc$Z;eE<)bZg&P-uuzdJ$x@*0nj_6BIV=7 zUx0D#FF$?pb+G|qfPnS(gS%DmaV|hp{?QAT>@}CQWpK+eaDVyzH){U`%SZJeqFB@m zpd0u9subHLVvvI3mMqGkIbGhUEDyXSh{|d ztlG9g-hTdN=^fr3;QuvQ4yn0?YnQ9va6q?S0_E(x+VV8L!5~d@8X3PUzFDMz*SSA^ z2jrka`SUM-EuFeVfTU6+QF|j*JsAdnMopb8V=*RV0dQTpbSVf%{xSjmxK@vuVDbK) zJ7np9=gS+v`IUrYe2Ch!R~G*JGnLiKwFbwqPF=gm)LFBXbYg3)_v6oRee!{cQ%AnDs@%?|xDtumq;OZ}4ohzd;)(sguTGoHRLd+qdHFoMW1(3&` zIw{M)UMOcVHW`6*WbfoCgHV7tdjA3O^7oThe)6`OW1oOD-@?!SE$PXr>Ubm__(Ds0 z>g-w4u}c>@bu>mk|Jz3ZzE5JU)mlzr{F?jIc>uq!$wz7hgalKiY*_Jw zZ1`aX{8psaK3qSC0}LGxzXU?R`zrK~H?8~u@`q=T(Hbrre^@C62TEfJJ0vq+&%=LZSJzt3WQS|6~u zVN_Iszy0lR3cRM=2YnbHAFrf0($mvr`t<3FZOnFZjN&|+zY&d78)gvk zxJ?E2^EV{>IU^%Of`WpCfI5F;26mbY6TXAmG-q%80LQWc=-eBH^nN&gSx#Lnl3sY- znA*?}(4@!eE1axfMPbLSr*mXxS66YeFi{=(V|5ZwNMp%HHZcL{YuFl*+e)=yY%G0f z0-*$ebq%HY?(W3U27=Cf)M?xX9kG`6b$dI!PdN)>!S^yX;Gq+*%Lp=a0&~aE`PQ5l z<5&cTwIKMNZSTCgt9|_F*7@Dps*YFKu6i3Z+YxYXWu(&>48%2!=hq5;sAg(^)!);6 z^X~6g`(6Y7D66PaavT;W7$gzQ&|Ay(KshEXOv`1!hFYc%YfK?Ndgizanv4J=t1*qi zn(>22DCUT6s`LGhLGbNNLY$lhlkJ7^)9TIkW^kqm428^`%L*tUFjoX1BMq4sWJmM< z8q#}!Vv3rZnK#>{=ziy`|NOx`&>Fy)HMB5Gk`m==%egO(d{&w{$89ii>OdUN&u}60Uh+nj7l>*tyaJ>`YCU~6(1{$TD zxF{h&9fgIyB^G+0{ONxHWLbg<8Y_SP*S};>)IqR4U6GRCN>*;#Ea#Gvi7`_3eOxnMMm`-0@kjXxT6k8Ys^I%fQ>$R z6ywS$@pQ#+i}!qy0paKAt;WO+U?j6|pFQze2@me5hy)D2kkNQ1{;VXTUWXNADb|8{ zZHGY53($M^aBYYC!$*Gc(pv~%?m&w~+?-sMjE4n4a_*nO-o&(&+dm1VE6xD`y+A_0 zl#Wd}k2VgHv0x=rT7&1p;4oR*WOKW_U;&OfT@?cTJv()gu>*#w_q@>d#0#miD>_n= zFQ(NALbL5}f-T)AqK9e|i2?=1Ly-ZI0qitys8F4({3`fg#8a_4WkO#6aTF=VyZ@tp%Z3{5&S=kOFQ=mPx}H^zZ-s5bR)k zdG~|AsI1LI0A%Zye~)@SE5sBmWs-;XY~G^S!7si2CNfIfOEK#G?A){oa)gV;AMD2| zvt9r*IYSjteEYY*1-Kgw0>uq5qpzqrC$mwr@cHIdtI_t0^5R=>N)Q;F>8NF}7D3Px zN1{PKa#c{eI{O2zgrISsK7CYh zn%fa@rnWVuHMsrQv11kUnfvP8xwDd>AmGZm7QtS!f(bqoj3oe0n=oO5(t##$%^(Wr zfozAjx3>c135xq8NW}S79OoMOjPBX9XUnu{(-bqC`yk7i%xkuR%x5yI zb&c)G#XU!cH?3>euDTyT^lP32eM0s#ZRpUU5)u-k{H;sod*}nzV+RVsXv#@TJ=##O zO*ojhce4PKw^)v)BemVyM0}xXthf4kpcu@_sKh+6Hf}8=JFuc_)6?wh*RrQ`D{69^ z8MTu9(n=}CAa4plT5oy})W-vbxR*;HtK(#83=mp>AJ@lcPs%oVNZZ|e!l z4|H(k0mow%BtM#!GK304$LrO>lb3n9&lKlq9FYf(geW z-Vi}RGEdzAx((>jQ+%+{A&}e)3?Z_bgLJ#erD`uM2gJ`B1<9*#y~ zv79=uY#!4HAjCwl%-TaPi@{h^EVMkqR!P9ZpDfQ@Fu+d7#eo$aBt!f5MqAn`K%0w+ zGyn!HbT|fO0Jav zoJ~<$%mt7fi-|p{08d4F0Z_(ZP69rsk-@H>5#VRQGY=qka(bFt^i#Tm3u783Im!TB zQ5%^IWCkQtGt#9y*uWZa8>9rtko6Ah3Lw@W+Q~Lbi<;|Lk~t``p~;xJGhUPeVBj$* zufw8>vREha(aAOov2)Z-76*xElyu zWJ=<>^NQ(AiNp2Fmq~WkW%(;gHa1qhvPn0i5jzn3k5D0)Sfs((?XbrY8%V z69~75=Kj!eW2GIkP${Ef1>leJ93NjSy8;zErP94;JOWBf(0085Wjg*GM_r4haZX(;;6tWwAA!9(MH33Bn zWUH=)w8AL>ZX*CzviPCi8twu1uk0_W6HF-yg1ZD#x8k=UQ<)F;lZ}Zd_U_$Vv6~6{ za!jGb1sTj_?ou;3IXPK@zXZYwj?;yq* zg2!4T;7&#|-&fZUzRU9>J6mh~jBPo5_^@I_vj8`@p{_D@v&nj9@j?Q<1h>iBX1i$o zZdh2DlKdbWnwrpjPix#h5y6^;2u6{q{4->{`C!i27^cQ$oCn#@^bLXeUcGuL-EX#^ z=ic1*SkdS#+Zakee>=%6MD#uJs#t*uXlH&OI%acwv;`jTT6vY6$|#c9%p#dL*jwyS z*b)7S-X5U`SX|Q*Z0M`kD&#ttt$Gmp5&jsD*`W(dE96>vr8t-yiy4ASdV4e;xB=OU znAlTD72b=5VzL5DeZe{+I2_~?pb7!i)-q~l9*aF8+YatgtX~!(3PFnRn1NtjL88W> zwIQ@96BOf_%&I)FpW~9^#Q_@QEbO!a#V_sgnkknPhl~V6%vO$o9ZfyXEJV+_$fT6T zke>aa3G1$yUA48N=6hTauiU;K=W$b}jhvts>}z*!Q43y9ETc}uNCHxS$silqXP}bL zV7l|S>sCS|bR$@yrSjodpUUt)1Eh0M2LKR-vK88z(a=c0lAo(soIL;l^g&9svyOgy z&30)2rhm8W+o{-~lZK5_I+oPXJqYIA!Q;_F(8J%;S2_o`SFAj;=LYxc4;c}2#W>UY zI2DVzHd-GK7^;8_t&fkKioxRCMX@aQ#Y9O47ILnT5E|8QsL}`}SVDb5&2bOQ!DBcs zfEBNH9x?>S^2W1b&Y`VjyX`$3CCAU7QCf{|SoHS}@1e9s$qv*T;u8R{+G0X&KX|BQ ze6v7u0Yp1bm?*8Gm)=sW3g9rcnX|Egzl7^yIoQuk6{ZzI-!C&OTheVZluj%c^wcjW z`0R*95bu-L2Cc*b3tfVB*|;AWM4=Wmb)ws$&>rQaxScZ=?g8FD&?AJ*M;#~6{gcT| z;98pvWDcOf0t+1K)DlF<$jXu&ND&xZG?cYlw<}Ow+g4^3Tm{>$u&B62fzV`qmjh(X zUb|Y1As^s8Zh{zDL#Or;EQ0EAz5eYwJizP~_Pt~#)2I=B3E3=bc5PC9v-WEYkg(rv zgW`W&{MIzeOE8Nj2jK8`kcwc<1RA%@ha7-bPrU+cVZLhtIScmNS~JD=e9(%nX=)j0 zKdbr7vE(|&2V7ucV^uvELrrUQfDR=919-2}sI5);3?rRPK?U66Jjhj1xN^8p#LEF73$QUDpA!^jHCy1i?DRt7-A7`pP>Y!UVy<^afz z!TPMr*jEkjGYI2UvFtx~NWNJ9joQ=&(DEoikpg=i_td{d&RdxYj#BEqSu(+rI#oPNR$-vl?r&U8QVVo%k z(^?BAU4ia%4m5lz1rh|%%-zFNjw86b^uJ$8??D5_6Tmk$p##8h<#kirHLB|YO0|*A zO`zD#%R_81Ht`(VU<~w!B!;!E9T?M^j6VX|og%s@mUJ|L!vbXWl;e8|U}#^1+y=F& z>tken6Kr+|XzmE`kU%JXz+>^f)5ngZ=Ft_o8GvH#z%?v!ZTmpNLksL#LI=4m?&Sgm zy(n+MbL98+_Fx`hkdC^`l(rzF_Yj!oWJPCT9zw8{0B>WlX$c@}!CU@jJTAdf>MT>o znQUnS%mk^m#_hZ%SWYHk_kq37quP3LOR^l2rk$ok3`A8mwpAdm8EnH3`XI?QrV2OVy5f9Gi$B_ zHpu{E@h2`qSk<13Mi+Z$1(ud#K}$vy-)HJALEiVj_@{Uy4LQ)uR~1}3a2yeOq#yt2 z*;$GOMZNg@8B^3YNA6PRF#+Hf%{(+n<9wpk2W!#_%fIaOV_W2u4M*vMZtVTn)SVmKHdvoC8wt< zV4EPtX0&I?`X2x!SgZ5O&dUY}{sTaeOkv727udyU4}JV8d~AU>bqWko00dLF>63S6 zy^5l6o|1k!LsswDq?m48pj(6KW(Bzere$Y>$!3pDFQvhLnjR_(KqgK=gUAZ8XeEq|f6$KP+0jARD0tf)rZ@OfDlM z%{``JCGuZt`rUxs7Qv)4HPJW5HK3h;QIoVS7F0YQ+1E9V_Z5%9drEsOZbL}}_6syF zE+{onfq7moz=4F+6cks}092gUTSH@)1q#{57Gr4h4FHsR`}av1KyvS2zAI(`@f#w; z(PGZ!DQgI?s_*F5Uz&Cyo5Iip z0o1-SwD-WfwzILc7DtRZ99t;8LlB7HtIOyg%8^XR7~2;`4YTudl&s16Jv-#f<%`4w ztUG2r8O#0W1a%!l|Ng^yfWIEIXjpvK20$KxGVO0l0GdCq3W(rEJ7fzHq^9IWHb5;( zYn(q5s|vXLqOJe~dMrd=dc9PR9*k0j1hxCR1~xre%5BN!MDVijup!bKS+@jkx2|2M zBsOfpMD97Dzw|{)z81Kx>+D#MrVJoA??cKMYW0u0DVf3mjEsqzXYBs(ZRxhENbV6;06oZX@9E+JtF%$UE}_0>;G#0uDZwN zwMoF4k{1Mw$)1iwron2+xDYg^+y~jw4K*8E8wo_PgXf%@nySu~3}#A)Xqn4gQxP;L zGn#;XO`Mf}qW`o;aGILZ+#dmGw)@`felH7|AZ;)ibGM;Hf!-dC z2W~2sB!N^epgRNxtHm*a%K0moNECo!rupg`7w}nFP_tkY!Kt^Ne?=|i8KEX~`XAqX zu4FA7!0_OEnc0`Y1~Zm9lcr18_F;$A;26K6sn3Jk-f4n=8z<&r^s)AJP*f& zCL|`?o$>jp^Ji6RGeNHEQ#svMRew!QW-VKUAY37s223TM+ohMVm=P!ayADMvP&Vew zDV0Lp2L%N;?b!yvz*!~_gI*tiU#4h(vu2rMV?RG`ief(JgSqp=)^&3D^f3iIFfICC z#`OZzy~(;`TbRDRe)m>2*(0di-aiP%;__uB3NYAm;fXP99s480d25Fnvu3H26Pa*3Td zPMkQ&=j7LCe~A;vu@l8LmMz@(og{8%MuHRYrp@QQC$&JASm=w5!H4?IL zp|rw(wHwxnCm3380G#Z>IDv5mKtP~(&XlP#9e_CjEL-!%1dGZ3&R|l*?I{;$JMqzN z@jcnl1lkBVv|;j2rVA%b+_oFhEG<~*X$Oehi^au(#xlwD<5o#pTtT$GxG z3ClA0lK=Fn6H@&6p{UsG~9a_5k~Zodx^k_p9EL z_{dlQ&S}c75682V5i)ULv`>SMG8Z8UQn4@LvpWbNs_oU=hu_F-rkn($cyJLzR%0Cc zt`xmj$hNEp6Pk=;E~1bv9T60!i-wG@;o>dJFDft5sGvoN`0*NW%@6b>7XU+Xzj6VH zQA<;DCSKTt+SWC7wa`=!*Shlu_BXu%rUznH&JK_g!TmPSSRY2naAA55`pVgprfcFw z0*M7Dk0{%D;6D7D&y^r7sIqPZS7xFwb;L1fo!y-pNkNu2C3twRTb=`#KP$LB#~1vC z{Tdg-128rr!0+Igp$Q}dd;{c%NMLyA#4#ODxOw<;H)FTL12~tCxQ@7>G1&FQDiJuv zX5tU9D|LK^lp;R?^`k=oDwhDHnmT*7Y9Vv1NcjMQuk)dSOVHVN(TDw57$R^yFwXHp zzqJG!w-csLlWG9kMW;{8){PtGcR%}ugrNUrBEzd0>tg{19dxW^?aTO1*^DkM@K_~h z_V3!IK=;DsOJ(|;xnM2_>iyIPpp9}ILp6fUloH|M5#=_l#(RqZ8;wyymivRBx!7dg z>f*b_pYZ9$ugs?#^Z>5~GHItlip;7NO`Ty%We|)e@OmR4Dw)L8P_`PG&(v)WN3;L| zRKBdNXzMn-7Adbm1~Ti$aT2eUgv0~|Udetghuj(yA5xZrn$lziU&&Y=UjvPO3X}N} ze5ce0*~L{@47%r@dlZ0YJ;{#dHA?x7Z0Mg`?{#Z54I?cr_mib`GLotPOn{hr(Kq5d zmPp@G@`JJ<)rg9qrZ?+ChB?dTJ#(u~ds8~t9x5|bXLv&oY(gC9_i*5c1(mYuV5Lk? zLI_5vr%6@_Cvrkl-P|Sn0dStFX_INm0dh}ngajDI_)ssg5#P=eN$+9-alTKsC16T7vQ#%sb;NJGby-ZzvW4Fcw4rFiv1pPWDu6|%$v;$xw6T=S^KWbW5 z)qG{`t2 zvy5Q&Way1DxfR)V{CoALHF6eV;sii8@7{)R?^am`a5*k2Mu8Gaeh|D4@by>S&;7>> zl|)*nT=3vIw>3_FxF6qn-K>XxVg)7w zA;Ce)iZ4g_>d7-_bh2c-pY=13XPrQSPi_7B!n+3+g!p?TCOQPg85I#39;S)gxKRs0 zz>;!=qhcF-Vd3|qj$N3b)^1!cPPiAN9$qOf02(=#H)cN`pyUP<@$s5wR6so>p^ic0 zc-5zCAbnIP-+1avD$~Sgdj9x4JmYq$yc8GrVk4pzeEw|j4k@lEl}DF7pnAkyh~d3; z==d>-4Ubmvbq1c%f5f8fnysIz_PL*rKfvZvEOdT`YuZQkjL8Jf#iHsTu-(U-*UO9v zQ*^QLcOSfg2%-&;JDQ~OG`z+se^Z3#c5py2?uUzvXG$ieAX+IB3#E*vVc$)CX@cZ$ zeEg2~1(UOLFGy%H0UPB)$TGDxy(iIzfktqc&jWWvC$V4Ti$FU8@2!y8sBNsnt6pF1 zqpU_yg2@oM0LtWq^QO#FX)fx;?>$l=8+UHOqUK_mXcJY{hXrgaD8l=njB);brmPsz zH^t(KzWB9OZz{k^`3;^Ajy*UoA?QJ0SoOKB^)T-@-vibqg~6g=9C4m_JrOu1FqH_# zGIOSk&&?5PL^J6j8Pe28XTN!=4LI2OA9=ix&@d!IERhySSM`SX>X^0z zWz+)nBS=jhYpa|HnbTx!4>SVRykAUTGte_P_BWr2o?yTebfydjL1;3J2^ftRK+T(B<^g)LQi~ryfUu&{NDjd9O_yV5T`D)b&kd|c`UNbt@p6?c-QjI zd#e#LY{${plKsqb=ggU-@*6xy{M%kkL1=rb&`=%Yi^Oh|69S-#>MW}Ys$|3QYALGo zlJSuU4e;gQ+RMfRgD;Tam(116!Eh66s30ZE23wI5&m@EzF=IgsSoM2W)$J7-)b0Ahq&4KisS zP|Q{TjDcn{b#JX460$^@EUgRe=|MXO8Yj@45EFPNGyDKp!)y<&2CTD+s!El(VDhPJ zu{yBhsQVlo5Tcr$+?OHK1Plo__dt?>png3<&nf{}Q%Bp@$7I+Mq#%$_fPudA^7IA+ zE<$AySRMz1?vOy>n5en6StswM=PCf01X>t<=Lc_O@y*Vk&Ryhm$ywD9E&<^34&*&H z?cA#0^PE!hgXf*+*4U*UZ~|}|0H$%XCa2pd-l=Kg2O#KH8?S*VgqPkqXSOC6%uGv_ zabTwKe%^DiKnkE~x%>_=cmpjugw&hm^)zte%LQgHOeT0O&BsLQBTPizMz(WmZtt*UIaZCb8{e#?R&XE7$FgFniq;fIw*;{Z>RN++ z@GPvZuhF~&Uw{0IsyXb9g*f&J`B}NLeC}ddzwV)Vc%u&2le}rK?$7F&VR(~XcSj3Et zPr&>pNq6GCHF?%7`QXhz$tUl*17mR#9i3w6uhxyFO6Pn=AdadzbtV?)I6m+Y@WZ%wR0J1ZXOfXK)fmyn9 z%V+4zEQ)Wv49!3cnWOlZh{gb@k7eLYG@V0~?k&n+V8K zx0wuRg3){S?9qgNl%1gDg_Q|Blq#@1j(t{R%tW1JGK~pJGa({nDy+KHWcIFFg`70F zmU&zz2Hd=PliYv*{R$GZjI)RwAmB`}nEMlWW>P`Qh>#sTuwH!L5*+>j_X`soGKpbA zLc(R$COA&{jZK?2DG0rM`EmuwxgpCWApPKj4{8!ZmPrk1g7cKz;AgU(ZH<6A+sh<~ z&p-dX_MNuB59Kq7H0LVLspJSXu_MsW1Ayq;LCXBaNox>qtXGSib%<=Zd(g=|OSKmy`B zkZkWgOvdvvvgOY((P!Pb-L)Dg9GoCf*K(j70Y>~+EROAD(i!x+3Kn~TC87G7_&yeG zCIc-GfPuTa+ZD?g><11ed0YZ)wi6=`?)V}YNamWw$157B;bVZR$Ct?M{Q>cr3q0B-gst)-f^cUs=U?pGRME@0Rp$v^CqLexVXTr*E9M6 zYUF1il7*W0wm@hIBsD0*MD6i?M-D;4sZp=v*+@V;IV(>=Q1+SZ+rIJimyo=0r%Gy& z6`dFxFJFB4DP>Yq(u3i{TtuCmou?5g)byvN#3#yE9(_jEZTk#~ILozPdHTLbWWluA znje7o#EJ!rQLZ;4Va{m;LKGGk$pj9&Yq}w1ZGc~ zid+NxbWw`T?#0l4WN{5;N5|B;bHIY0to?3QUY;Ij&HL|59S9Q>r%i)yt*=UXQ0gK&G*)I~5te}W zhi||zrVP*?O( zV9XvbI3yn+aoltyYjef*ty~IesVT{ph2Q%7-6*s4Qt7i*_$0XO=BnrmSKfi`%SQ zw@&q-sR_;RDCsd9iyLGsb3u?SX|k)yrY4Jd!GZ;v*pQ56%4)FwOe9D^oo%48ALRab z-F26;rdb{rNN9S0gVp@ZGtVdh&$>|>gSZ{R>4lI^vt>bZAGV2pW4YHlX5;-u);0n6 zV<1YfFC|z{pqp*A*K2>&qZpi^$04iR%E<_6if=`-!WubP-YgaM9q8Ph#1D*V4{YOv zi*9I_JuijPVVH7D7XYcY&R%Imm_Bu~Lji0)Fd-b^yuXp(u=CRx1SV@zxR>lW(;z3# zwMs&;CFIx6t8G`+>jCrellR}2_{3zHGHb3T$B0i()y&DNjW&jE`UWHy@-{Sp2Qvb(WNa~M5GRCx z_3W2*63J~fc^L)`1Vp(VCy4~PDEq;w=H+H#AQO0HqCzGJ%pI2n=2eFjLb8Io(|-Un zIs?%Fv6zgyKu7ahjT0po1+OkYK7P{nUOt$#B#vStLjvfJ-Ti<}f}S-)hG`5%qyGq! zwSr-HE#`}f5C>*WU{iJ}APv8v4{QRPjmeh+!6>6Kky{AZ(e&{*p8b-7;rxD}kNF)9 z)w#?#7_>0xTogQ6yKSQ$CkW-T&D3F}?j{F|ESF&8c*uP`_u%6iPOaslZUoMGj@$rV z7`xm9D$9Y1Mfm*>NYRh~Lu$8dme7TZEV3ND$ZnDG{AZ`9%eTM!RoROPP&t?-{BH5Q zxd5ZaK?^rP2lcU-R6V%#E|sLQF7$8$91E7qvnwA0U>C1>}Qj_hR=oN3y@$6;5HY&IJwBe1c}V- zBVdx9#YBfTFD6bGwb2LNi358N-V05y%-mj?)7GQz_e< zViHhJg0%>JCunYK)J3+|ff6@dC>>~7sTlykFO`aNMgKJ+JzHM`x3~S9tm7x{d05+G zTR*bE**{;&*gs4HV9(c;+Ls7MHD3dbew_lan=e~iICYNj#r_AKmiE`SznjlD*8`N5 zmJ1%x5eHjNe%-5uCJ}rM1pg% zfSEgKvP8wj=&|yqPL)TWZv$|A2Kv$=kl*l@nF|(*t2-hD0DODl@5wV}DTrNk>a;Sp z$;zhO#`evhNjS!vw0Ion>92lS_5(O>!h&cRSf>-FPEq-fOaNm=00Y^+2=tZrJ^G03 z-m+EuGH>{UVEN-;d|rWQva7l8%IBVw{a~*aoj$F)=d5!k`qOwEo9(B3NFKn?Xe_!C zw6_|^(`16P9M;j;$a{d}bSwLrjA$~Dshv#LFl8~wApSg%m1AeJg=gWO>B0g#Ut~WM zu#WZU$%KRidG^_7704c_v&?b`l)w1mi>k>?Af0ul zem38EY+K{^D^{$~`tbLm8gq@*V!??rCqlnN0_`PuqUpiR~)kuh-?fF$TDIUoM+=gT6>#LkI&Wz9%rMyUj5rS=E& zB?zn-WgB3d8q|kU0!-l1j6oB(C8XvLp9P}Ba#8jP6L28pADvkfH2%o=`+R}KR@Vf3rh$BP# z2{;oBT?f`bGu}_1FiG{H$AS4g7vamRHm(I=+X~>f7pyNtTVRkvfHn;GEP<@gGaie~ zmtNF?gEU*?1e*)M1giO;qm$*HZN>de7Uv{{X#e-``@#O&ugtd4Kqg!4mJ?vRG2A*m z30a{L@_a2u*$pyIj}@L!Hk>!^ZvxN-(0@K#S}cC!IIyLU!z?}q+pQc@8q@*BjjYlb z)Y;4(Hy+6ZEfb|)-0zePA&_iq`uu=T$vDeR9}i!5$u5*f&22Y;g#@7g^VOfK#`O}g z+S1~aA&Ih6L%ZW5qxCt~h=q#dXHM(6qHZ24LZ&p8P=A>0 zV9H)tZv(KfI91S`)`Qc`qU6G1%t)xXrt$%hc`|IxdD0$5wA zfU-M63A2!}Z0_Q_06hE2R)Ai`XV1voMR!RCCz*Vv0Nkmosg^f?`zwT@xyj?teHmdQ z?XuyM51}FUsSaM)-avrCvliTm75-@&PF0Bzu}{~mR?saNVP3ldv{fNfF3}`zxAcLB z5th~>@4Wu1oH%+2-%=u>RhF#y0>JP(*}r=SGBVGXY$U#EYipLH2uoc5@hYjr!^pi; zo`kMtW=aP3>6MQ+taEw1kZGJeecwtAhql)1^WK{QcoV3-k`VxB zlEA}AxVV1%W*HCm852p}F?}vHl2?frz*lNfHbQ6cjgQ|`E$J5?dQy`yUa8E%z9*19 z7wqN_Hhe6vLkeZ)#3@MhR*CTLU79_e^>A}@LAxVl*_=D&7jMGHzyFo2Sa_F$=&Ru4 z&G7MGJ@X|j9$3Z(WQj2p&kFQgk4tFLcWv3QQMPUTRAvBFC-7TQTBh}2XNlNC)Mnp)0e2@jUEkYFz*Fi3RcyvNw(9^kyC z33IBWM~}*h6DM@8Lb(u1eUJ$~T1=4)^S~G_r_0oHta%_9O!ge;c5j4?%=W^1Ne)Ls z6aXN@ZOx6%^64k5_7em;P+y=W9dDby?MjOAIfij_G1O)X3krH zgcbF&f6sO~d+H=~#U{$6>9aKKYXgAfSAOzCNz2TZcrZQ_lhgG3aDe9NU|$A+-FyU|$|SB(MC>kI>#0S@F>0SW%CV(%ab)l$RFCw_f@;WrCkPepq&F z-iUp7%ky@<+&Fya~XSAZ0Y}2Li(k0Sf?w|Gqnx0a)%wf~L1+^`^CYTqei+ z>Z8x81|%gr7!i;V6)(X^h)11s8jni`@ACO~$}32|^n+Jkmajkl0(3TCl$T%smHZsZ zkeHMLMJo{g#64e-*#JiwVohtt_21NDiDJ+%2K>Wu0FyT{fgkm0sW}^u#TC`mJTIrg zU0Amm+;0R|DXYPE>RFQ={O`YdS)N2V^0N;Ga@N4U7G)eO-Oft;w>R|4#;wjzcZ7^sSY*k6N7t|AUs**Jno~*9sv8=Nj}-SLALDM zDf#1bWInVrsj=(A7wYVfNDOLc(wJOp^=B3zGkM{cA9)6$=F=dH;-%6kOd1t}P}K{J z0UXoY!y6JD@e+u-P+}zvZ1-<{@$2&aU;dZ;-=F+I0r?<=brZ}d=G_s0YY;_Cfe#-yBOO-E+ive9(wv|NNE`I z-{?E5BU@vRfvC4k9pq>vN&fWHPc@kzB`>I3Owg3`Bdd`${KOMasB{OTmW^HN0nYQP ztEy!;hzv|VNU4#TGiRyBG@1XS$@Hu<)YhyvjHc6O>N-|Dz@(We;XaZUw`)>tX$7NZAk(in$-~2z{L#S1_%5%K? zhu=zVO_hA--~J1r@C5BJCQqNOKyv|@h)jMFmz<(n%qIcR*4Nh}Q3dyH1t@%2`F4%p@umdldr3B!m%_du565CG^7ND56(3Y4foqic4n?|*`m z`I&k0+Q0o&YQVhbYQG(`X)@B#k!uiyMfZHH|g#wDi6KY#68dXZb(bl03a zWZ{(A($die@YYX{%S2S){Yy)|nwnd*KK{@}wAE81czySRCGZ=P4FX(VK4+2ElVCER z3*Ub68#>wH0F~gnFBs_0KJci5$&|$)E1fLw9f$Tv7#5(YkI4uV>TZAW;V0#(dmol7 z`8XF54nO?cOMOiC^Tf;?WpZ1`MD#^QVygV|r5{Qy&UFW#OH3~1;Q^Kgj!&cS=1iKQ zNxd2&JwT}x%7swJ+PaNyX#TmP2OM#ZBbMJIb=$T|EuvsNANA9@g`-LQYZbQTv$$nq5uFyT_&+ELy-Q+?wB;{oG=+sXs% zv*MBx<%PfchCKC^FC$vENyj+;K_pC!E&%MdI&pT;Sk6hZF$N;Yym|9x*^jY7d3m|a zfHX^FRHRChajeAOAAa~@JE*aJRe=jXlon;;K?2bHo9t&MAEaLPXf&Nc@uV9w9xxub zH6DnBruY2xU}^8_l}#sVl?^;nHOT`r&ldm+lQi%ZgGoMhqH7V>-gQ1vm=8dtB!rI# zfjLO)?&?M+Z{SHk4Aq`2aVaLnOr0!JW6(cwn^Uo!>e)*8JekUot%~i5d2OBuC2$=0*2wA ziiQr^bEaMwCnm=G3AMzH*@p+1P=*@B1SM@5%gkm^u$2HLK}^1^fG}&$&+dpYh(X5t zC`fcL5uxqx+>iSc6dl+*^FHuKC3Ks|l+h*WC=I`?!z&UruB18P2eNkERHS5+$H?peh z>cbdv5+~{mHy!H$bU(oM*3+k?2@zAC=>Nm+T#SU1SJzG)L#Np^#dyGYz<6NHdVshQ zleL9FHX#TJ3=IH1W>597HjLvQg3Qa7Et7k}s3#8a9wNl{?B1(md@E^ZSPwb|3L|-; z0psDdYuCyKNV_qK;iHc}stE{3D*(;Ya*_W&22PS`g7Ls;^nf=&#VqJTXU6%<-cxll z8wm>IMkw)I5P)7M8)liin};$dDVx#VWzl_g$G{>0i2w*v698bc2_`Z;arl5dxNtID zd?_sE0|1V!VrDfS2bqi`2lj&fd_;lfit-XLiA&|)ho4Yjw*%WT+2PNA@Ll=&e|+z< zvht=(M?E@$<8q>ogns~lDF<@FcxZ&@_d;f4D8>%13*Z%#Clb`Q8r#Npx`D~e%*{-i zNb>+d=M6?H!7v)ZFLs&)shMCgDmG3Ydh%I$1q`nr|G$62>pKcsQ(9!j!;gdg9X6~w zrer~HJ5?)9ZQb(Fn(`d0 zSFeUd$3{7Grcmy<;|@(kXcjdto|c}T9{A>rtXZ>06A{u!)24w?2wY>dlZX|B9_@{| zc&f}N(o2 z>_P@MR?xrlH{X$Yid67D zcw?i(1AUOAX+R>vu99L2x#vFd&z&$jDsF0NJYYOvJYYOvJYYO9;vV4Kn+XUhy^)4! z;&Sp}lNq`Vzz0UWLUwil%5AhD5$N{q+f{xe5^}1KJ@%L+BqV4w-DTK_ zoz;IR)iI;`p?Jw`V>~dz9&mSYl&ol9Svnz7-rP|lJ0ZU?1Ny(iZAE8Jsn)U=*uJ!S zXwtTWnH+(MK7r;7X2qBR2r$GvBq9PJ>t2Ar_>4qrRyL(3F+)c}9af^Z!RSyDl2c{R zjxBOv&n`I(R&?6`lU~GG6{Y=l7S5)`?v!V zA-x37ZHz$LC3Us=ZQw_?)6YKu$q@@x_9HAJQa9=C?UCy0bMQq6+8$#8qVWqK`Wg;I zpq_0yZdBOe!3 z;<%1-cW#8lj-Xcfjn>udZ~q<`?Eo}A%;!!h^t0#To|`>ss$6|#R9xM%Z8vVAg9LXc zxVr~;cMBfe-AQn0B)D5baCdiicX#(-ufKEdIrok?)}Q@zkG{KkQ#qEFmHp&#-lyT7polREr}W#A8anKNmqU(%w`+n&aEJ458C>HrM#ng%wYOzT zxb7b}u2@L=U|n#z>j;}io9p=4DLAOiE@dNH?I9AIFb`^q6g&iJM?2v-V==~kwiNKc z?rH(ATdMmcp%ZpIPIU~$wm%Tk3hMq&S7qa&WzcucTKC_1KzdQgo&Kv zj5H5@cR%K#E{X~EbFHz_d5&wxkSY&Ey?gfe`EZSg7@v|+)ZDOI+|Z%vWs5s=AnWAl znk4vA|LN{6w4#H=TB8lwjU&EQxdFSAzsrdlV2Z_j+Pzir4879&CKa7QZyR68lN*nX ztQ~I*sIO=dHJ980@?8M}Eg7SlTAEL+bJpuK)n?RoB=`fq%XehxAsRI6Eh}aw_6I>v zM^ZHOpKd^B9_pUd`@kW7vPbNBx`~QtG8I{P(>3~L`QJll#P7hyFHDl=$vSwe-{e$C zuTv{EJUpyM_xErrpJcdhBkJ2?A4`}wI}myaGK;8Gr%vYNc91-FFrHGD{b^GRDrbqi zC!{`dWL&M=Lpbp&?c+8j)3_|y|8WNG>8u|8X}Z9s)YWZ2&@h!}hP!Y=Eb(F|SrC0c-vJ zP<0ZFI$uVcjfRVXti&h1?)%Ec>N*a^oa@XeCn`XKe7UOGK`P{Nbg^gner3-dM`|V< zfutxaD)XnHAXd_;>ZW-hx#Wl5W#AokbxZ%Qg~T^$ZLc`P|RH6u8wD{Q5-) z&CAa2GAfghGPPydrX$}rPyo-bPe>`$Wtf$MOa0!mRodE7A*vyq*JF}W8*uZnJByW3 zY*;q35Vpit_QGFky2c66EAgkd_c0^|pV5OsBBbrBbQ)5RQRC(mBDTqpVc$D^=2?wN9QU#r>H?Z+C(=j}>6I%Fpm1oY} zz+*vx#=12GXz9>hz(FM_q9J%AJ{NU=c|E(fBqA<8Fl_kpDhqxH(~zhIg*+L)^l!*? zwd+f1EdJVbm-ET%rKXZ~(F>yVAr`(uqL3I(<%V??Dn^8(&5h#})cuN)(EH?**KYvi(GgCbSVGo>;7)!P!w>LT@jcms!Sf*re*u zaHlr5>8&5Ad=LT-27dKf#>@P=L8s(WDqWiUccQ4~*$F*ye);J^=1TEh^0>hcZ6Scf zalpO*bQ0R=vX(#y4mT!q`)3@3NX>p2+h2?SqK5y*4zmw{)p-JO9aNN*;!sdfrYrTf zqMR=B^3l6{d(sdk?y$R$0Z;y!dv$g!As0^>t zafBRun%K<$72zCOJUf9C4*{*=)2#08v*oW^X{gv?k=Yg8+WBU7T%n7O-Yv)9ayQzf zGg{jyFt=*64uh90{#7wDL#oDqFPuN{G!tC~-){~kl4*7m$@n}@=F5;IV)3~Ypjfhr zkxLIDX``7JF}H*8XF9sNvY8@zRjS71g{R+_xxBWRcJ8#(rlB8xe}6k|#uzB5u3JL2 z=K5R0PVCi4Yvj@Vwc27-kY9M-x*)rym6_TgZMkJH0s1F+&;iU-EV8}h=i5-4ADqCQ zoqXru=BRP$Q8|y!PK5Az#qI#5bB=3MMQQ2Y{k62S;$}`n+eWN&5em;xBgl=hJlM3~ z?AMMU$q-scKGt2~zSB`QH<5@3gsBRq;wyNg@4T0l8*%z1w6G;hApPMmq94_h5alp0 zjnmW5FK84Wn|}RVuF?G8NZ986Z2%kAW6%K;cs_x;0CC7}DCAyb77_T(*wZq9ahNs4m~t`CsW_d>0a%*MJtA03}3H0=aY zbk2z5b}y)yxP#o8y=r>l4_1Jke^{Qcgh2pHsELcyV(`wVvFpcD?j~yNQs)c{)}848 z3E1^SoothIj0&RI8p-QuM6@s&T-dP*V@?XZRn3GfaN+c{>S= z7Wb&dA8V$hJaWoPG-DFEM$*L8RkSxq6-Q$dekPDSY?%QL<1Qb@7;8Wi^X27?XFaPN zR|j`YfV;Z~W6}t-JF&ch9dj--HR9NV+)v2Mrt*!#MFU;E*inCOj=~TK-dho;p*US$ z`(39!4g+A6lX`mMnT*sp%%jxnTdG99ah768enI)ZS|!B~Zd|CG9axm+9Ao+Kv1=43 zG790`<7sVc`&7Hu;$Cq~y)ZXd?8ZvTXQzgKW6oZdpD%`ljQsO;b$*^I5o>5{?C0R% zAWOQ>sfQD$d!xb*RAgD3;+`b|b)Uz-=r5{foaER#WcWrh6^RzRr zvgB56aIDi}idulD($m_zVr$t@iG7|KK4TtZXAzaV47o>VrYXHAIEVLlIJTqiLM--s zhkP-})t$`3MvzSg$@3d%e}3RlQP!nhYZFLj?;d~-rhFGJwzrEfsy81BlSg~7Mj<4> zTt)nt9{GYIU-GSVt|K9TI~1j$-rZG7U94=DeID3*{$sx>GUO3fCdHrmw!ea2(OKH$ z^e}e69@5-ak|@zy@}s4uB&2(S6xbDZh|3>R*78gDK7*g4cnT5y$5{qJbYd`J<}|5# z->1{%%_ir5%lH{^7XqWS9T3Q1+f)SLj9mMfXHJAD*JuzTY`P7??*RMNdno+EH0}8q4wgIraSgR~xfp z0&ZWmAmC~9%3&y*=PxGo-)MmHUOLLpA`ZWh0?j0HF5BIRz<|UKD^qkhikN^@L}BbK zIy6O!=O`pp3{60JJu+t0SL1?@@XWzg-YdMzdtaV#d33eQ2TWYVu>u zE(YyzJm~8~R~k{EXxwvSBxMz(9o3sWI;l&obuE4+nxK)ek;;D+Bd==>^gH_Ap_rH% z7nY-hczc!L_sdWI+wi?s^g-l+Ti(S)@a(*sBfhSXv+m!JaOE;H2i=ng=oK4*AD$gR z&}OR#H3jL>8al1-&uW5|UczP1@6#Q9)c-HpBL@NA`lZcsKH6>3&<#MZSYv)6L5x|;RpMh=Q3f2Y&2(13{f z_}bd5x#mE53>Q0Ip}zW(TE7S6CJ@#G|KevM*Fewx^vWrGI0io8b}JXBqWmkX5|$kD z*ckq+#Q1S(XKo64-`Pa6L2cH3c*)E)(uS zm`hmSpUE&alSdlL=atdsi^EUIcz7cnp@2CF=DZQ>&xJL=WJR?6?TN!tQQ<)lDpzcnjODKS?m3@Nqo%%GQ8(Y^NP2x^;D`I_) zrLuY|fuOfaJo%2Pk6wgFP~jrL{QfFlv>1+!w~$MLm*h%WLp9fku|nA2-Y^^m3Hork zWRnrNq+lZ!Fo%B)p9pRBCC{k3nH&lT^;KBQKoeGYQF_nChj;(9Q$GPDGEi3@bFpKy)=>;vV*qa^=kNGiM zZzA9Whrn$7fb6}g0W>9Txn6l0y+*I4z^9y!Gf_+GD99%_yIL0*zxyF(3E-=IYu>cU z^xk=znOXj`|>H#HjjhwmH{N>GD z??glEYb4XUe9G;P67!7&h(Fr~QHXXFhT4TPTTP9{XQ#m`Es{x#V6kd1`x&ew ziF$i`SeZcq+7+a5LEsb{gE&<)i#i3Eo}u`4=W1ar`HaGVlfSPkeb_lAAiyqbzyXX6 zwC_umeFIeOk>e0jp8e;=a9C!=E0N!;JOM|htf7BHX}A@r9!g7x;y+?hhK^^bVbu@| z-=P9-O)(CBnSX1W&wI_4ikEe0A@U1NKP z0X9d{R@#@IWu@zP#jO3F3b9EUNxflOgDH)cgot(%Ls_NB(9g)RmgydEc)Gf`jjGem zwFcM~P&Y>s0-IQvrKKzN5cJ(~K;tS(48dH5_3oQpt!2&oM*(5nnEv4BLbG?laF1K* zE3tbo@*b8i2dQKKccgNWDk|2Ia`0noRO4h55_w)w@+mjDI=8JaDCi(2MTvDcT?6++COiOu% z#oBns$9)4J3}-{b4+Cwc&^Mu1oe16mQA?PIA_MRP#UVY^fP5~ZvN+I#2FX!Q!WTF% zDWsITa1kOYqkW3E`&Ih-ipL%kbZo1RB(0}DpGO^_!8M0 z15B0RA?gH|(!VuarrS3%CMIIc8cGhS$504E?8g9npQ8y@!N1KOsbAJd}TXi&`+9gv>3}CFwSqo5K;GDDO zSprw5@H2vJ4v0K`ci^3xOSRC+OcGxqT&$0tT>PnkD?-$c3iF?YpM`A?yT$|!I%GN;803MbZLixr$LXNzGmHUSLQRu93?H5Zv*4D2ND1NXy}V#ekAkJij_s!P;(yV&zQ7Xe+nh6Y<7)r}?)ormaX@CBzOv1vifg#as^qk-K9Vy=3#ceAi z-8ktkjUdVW)?yto9Np_cU*$S7Tk5PRdK*p~6ZQ%h3QbJ{`6(zM?S<)q{@~YD zRCHwsPI@YF9xt&OZYqcofQo{mcGR1GgzqhsG#*o`6MAp3l&;(nQ}4FaZk5pbHexvB zZurI&Zd7ECzj+SvExmrueiy}}Z;{<+(k3IyqT+iV<7V2&N%jutynaL=mWHSMyY)h| zq(4iNO*XU^m`BC)q2HFP^Rv6V#TDGgvq*PM3u*vOKn{V;Q)+Uub$gQ===MR(D;GXf zkqfJe*Q>Db1HB?(+Ky2HooJWwVPA5PpfYP<%g3_?cmJl&d$IlD5}<_lVF{jYCB+x6 zOIeq})QucQhxU^)f`lD)0VM*bYGmrrwP+lT!$1|ZM<|N8QV44bA{e#SU{F8_DM&(s zWiFpKvMaglN()Bmxw2Bmyt+)p6?a27o~YinzQhzZ(4aazwGu4-&dqoUb9e%OIR`sx zc+8aGdL}yr0#wb4?FS*Bh~0B6t=TlNWwEsz89pDn#r$0*ElE|u!J?|6UeElwb&8nN z1}rs~@%V@n%We1rdiYmWj9Ny$!^oCU=M*g%D;&150v!*GNn1)2M=nnNDWfP6!AueA zQlagb8L;b96z&(e_N(EG3>QzR- zjAf9cax?WyOhRi}o_*I-xT7YPbvFs7@O>uk6W}LcB`8wF7paKVnj&bhC}E!F4;N&Dn7_Xddl^#osURY~d6gl~6;5-6#tBvNJ_D72?c zg}694hT_O2cQ?C&KVw&a?L&g?<_TqWYl3&_^=mOVYh5KIh`p0_#}5y&^ z!rfpTv>t3*S*$SI!V-86w-b(`ASpMi&#dg~D&XH$#m_v=%g37-Ee;u`$uNK%pRi2y zBJmN*|92K;>;c@Gn8GEbv_^rLp{A3)teG|WH`0%xLL)4b4-9n*EPU?cC{s~eV7vo| zSi(yUpR6n*cmSMv)+hY37_pLgZ(DY9*D_J}om~P#rMbDG7#n_(6=P)JWdb&NHsil3 z_bh%(^d|96RslKJP|=PwH8zX-7s1_D(>iyd+MyqF+w)axegjmhj6CIOpX*nbBK}23 zDDq>Ep2ml95?Gyb-xR_FstPf?45isYO`gCCSiVV=Sp}D z4ZuugI_TdB;l1y>+C81-Y?ffO&)7~iXv;rvcMx_s8+UjJPLTi|)Vex`B=_Go zJA8k`r^#lk&->WoU9a74Li}8#>zCYEx>SA?%B&`Hta~3Gn5-mSb8UqTMF?ly6cT$9H_D??lW#lO9X_^T&kX&&yCE zG)U1txzo3IwfA%@C;0SlNK@FLQ8( z2aojmJ>W&+-lVf-%hL4|+zlcck9y?b!hAHq=s%r-CTQ^vBJeuMbeDl3ncz=tey?8A ziWA_{QaLm7gfCw+2T&yG!b+H*j3D9;nV?Gnh)X;cWKLcD7_V?94 zc{BI^hc32$0BHBX1oE{o1&wD+s)jCp)1#z5#KXrcB>6_mo|O7Kwt0dQke|MyLrKf3 zQH{|bn7UHh$(q{C9yBTdP(#FETO#5}qg_x&@#85W4 z3OrL$a?wj2FfanME^QIn$a3D@Mj@i3xLqDae3h3N+))#r;o)=47*?okH#O14u0S|u z6(N<6&3)ZEfW}q;)D7jil{zRPeymQwpX#5F;gna9BDBPNl`;trzU#W3*%xae&5T3( zaQekkjZYeR*iu}VW<`Y1lF40>v{BKhsrEj@MyOg5OED|ow*)q$KIjQ%YUuo46BlFw zZ$Tl30>#!M{uwCfolju51e)g-aW09Qv%Q1QZYX6*V2<}CJjD*P&XEOLQW>5G!Gu-C zT?Igw3sfv>$w#>FZ@g!#mA@(F5&NrTI7H(^Lfoy1@h@a)|3B;Ax~usnl>2c5y+dbt zqZ60JQ;FR1L=LDoXcoI@N6UeS(KP;7DXA1O>tI1ADw3zCiQBl+bXsp1fdCe1L+=Kc zQ--*5Tk-9bk0gxJUF05}Q@ZTQrRe~{4&6#k&MaO|FZ{3H1Z{{WDb{dCoKG!?5_>~YCy3YOnL{pzTT-|Zpfc_EUgo=NDj^Rlh|i$SG~7cquO{I)-;_^C`+f~Izv`O#oue%I<_Xsa0i)yMB<4oHOt*fdI3^cvy?GQdV`>Qm zjs;>Qz^V*91!v+{O$b(|;qNI}GJ69stC@Wm>cW25^wr+-FX>gv`gv`01k{fsQYk=kALg#a-hJJ1D2$3a>Fmr2d2Sd)*C}Q4X`?cRga#AV!DSxmDZnv`TUk zt;X!e+D!x9%rV*PEqV-LW>-k_uddF=z?@4J*$4Y_pN9RIt#-wkaXGq4er`~PNS;7- z_6MC+A5ALME-7#K@+)s4+Ndld`Ok2+A1MIpv?dM=W8=)cE=Kn)h%b7^1l|GIJh zrEe4nF@V45*#T1Z+)NDp1nMe((|wq9z)-#%enQ898L-o-H+hc2dFOK(!udi>&$zXjSl zdK~LL;ci`9iP5$sR_fuL)iD)^)^9=%V}V=D3-6Fcg8zFUO%m>>$U_z8etTzf+`t{u zm_R%09rwekBERBYq`C64ygd%nX8lL)mo~zWs1WvFdJx!C&etDA`DCTY%QMx7#@Y z-wO#~i)|_6Chet>#Q*w}N!Gz(uMOHY8 zZr2nrA(j1mMa4dqt%p&HwJDcaDpp=egNc&!F&&?RTC1NB!(uqY=JwNKwh9J}3axD% zUIL9FFhHiC0e3v{cjeFMO_9ML3NaCyIX_vkOjUK`(ZA{jRX#G|4LxRcoEXd1E`#}J zv`6x0;qSo28EtB@BThH*{d5WGu10M|Q6my94k(E=U;kzfPZps%t2uBF>xTaYFc0{< z%cT@w*t|c6s7Z%M1p7JtI#%?~%ieoSWb^c3jNL1>%_-=^PA-SBL|sBVwdMGxp(r<& zxZ3M7XLAn6mmpjVPgy$NK>a})6QkRtGv5eex3ac1fv|RO)6%}obK@6?k!C4QB#B2~C5t12aIw0a1Bo)>a#cWwTzCQ^v;&DyVez8w3Bb1yR$Yxq{57_8%BW#`ePRF1MyD zDQvID`a8wA9g66#_caJcWO&ER?uSU4Q9JAZ@C%KIL?q0|r$|4p0!%(|qBw@o!@5RV zL8i~2OQ{V_C>g?WNA!CAUFq9^H0WitJ$`tou6AIEEL`=k+;QZ4+m2#w6<~6EsMp2V zrM$%3l%IUuR@Nfd{4i!tYeWTIy63N9;v`bCWGC5~256ou)q#jo_gb2oOI&{J*~^yk zSeg))n$z}>O&PzA|5Y$rL%X}CEWtNio=;slZ0Cl3Jl3Ndz`7}dNs4z73ic$B0^I}f8CvNIwo#sI9T_U{YvDo zLr{tE^|W7L614pVeh{n9S`fYAx8>u#bUw82j$K_WdgbIk<~Bn+=pb@o+vSK`i}B1l zM*3i%ZMrEJ{Pk@c^N5@g*LXV~3+X9F*fIQr(h}-u?OFbZBCG>}fW0HmUFy%a;PY*r zBOY~feb|G7h63QmLzrr5b|a${*2H%!qn3d%=gJ1|#=O|CZ}29;UI8YEGtrUkTn&S7 zzVMXX+)8<5WW7BL7E1o9OwsVCbI=sUApnz>=kpfzn4Ovl!GyUIO=R4uB_$R}K1$>? zSMukN=|Z{wuwP7UY;u$H0n$dO?6%3^CtPU!WBT}0y(|)w0|9`SCSL(3Z&v}HW%S+M z^xRZ2JuN6Kn@Ou#E=aV;6uukN(DTX6%IaHEhV&D7#{&rwu_cbSMkGQZGs%_MuK+Pi z%Ya(T$PwaGb$dNq@V(rweEWMPv4u5jPar(U|6a{?@IQDd8=x}g`xoEFCW3#mJvJnv z+oX2Sv%-6K=-{sU{oX^-xUciEu-Y&xYfVz2SGxEqv-Oa@upTJcGJh88{T{fN+7WsV zq-H*Tt#+cg4P=t)yD&hT=ru*m5QH{5>iZs=n`~a+x(ST>-twoU!2DI`$nJOYV}*}A zKUqHGi;Z9u5CjNwa~Kf)_PfGk>cVf{0{%sNg#U2Tr`abXcl3i#%Ox(Hu99^ZiFHMo8$Zj>X2( zwlferVz(QxbMVhBlMqAakRj~NW3ObJ>k z6P>6O#+M`CSMVq>9zQUPh?TH}gy-o=N@bBG^x-V|VZ%dg{e1_&`X!f1*tuV^8Ym-l z|B@ZJ=W|82=jij|v)7y3qtlvuq1$G&{=ZboKPcmmLtuajBaZd=jW$so1%l-3jaQvC zB-98^r$5|Z<2DvuJpcd~u6VNsB3f`(kp!Xv5^l^9c)lrSa_)q?d1=qwJHUv&Q<}Q{ z1^f)hN?^A`Uhp2sNKxHWg4TH({`p8ypL~t-ZW?~F#^lV(C)TuelbN<;9vV>B0WWOD z@EXcqtbM+Yd}5FT)~y73*RtL=4rbMKFh>#tp5$MkIa@*z^AGV(u3$WTO=Ji-=| zic%_pb9Mn1y8h`CVpo8|T~uNoxThc|`A&^+n)AlS#oW_x^(;h{e4vlk&SJAELWy@j9q)6N_+IBTrH~@-^KY>|D ze)k13B5a|A+C@?Se!6JChnJR8zGiuF!hE3%81*URZ(&>%$4@!6> zG#h-EP?pQ8s91KM!MAFggaKCmVxhMLg4Fu*0JW=@U<@iHfXF8VN}OY;D_S9nDOlmN zO+@hQfPA2Rmj%2#tLqivhCW($@Rv)NfhVWl$UR|0nS5o2Pc;etEdD1KUCwZFd+p^! zN1^sGIjpH8Fj3E)O6L~^7tLRm5jmkP;Q}@mmMLGy^ru%~98x=34OT;K%##ifz)M~D zJRrb1p9&r&pWL9Jd(1udft1iAsvkv5su7!yIc#S1=#NZ2?EF@|=xBMT+eO6Uva;m+ z7*yDNKHh#1(rol~QQGl_1QCfd4+)8I5eb(r425~U{YE)Dz8rfBNW}^=7sM-gQIFKr zm9}FlXm|7_8lC7R)2O~n!TvN)`QtM8RUSqr%O=D#CgG=|5M@Qjwe?en{|!U9qD(wQ zOu*w+3BbP}31adQ$ulvzZHd@M*M6N}sb*u4?{*+f&Jdt8>l26c0jXFDJda#6@zV(T z9kpEdBpbwEE%8iGuhKuepC$3QGscf1dSZiY1ph76_(yB97znSkvQkjgWFYzy#Ju4? z8`4}q2PKhedNh=~JNCv=zJV5tN%xWuE+?f+)}?Fg-b4 zdSM($$|aB9t7CB^SkJ#15dK}$rnQ&9RYi1vEZJap<8Yw6LqKOMm8@8#SKrAg59VvB zrF)TZK_u(wnph4z$`H3nLlt~yqT6jy>j#5?KqkEN3c;YV0}(5zvZM)^uTKIvZKn4c z!F{?LjIZ)%)2a(arG`*-zLd7p$eVSMMhtIM_*x5505v}D{QO+C0>6GfCm=W2wIB7c zH3|V}6;uJE|1&x|yD1iG!xZG`EEPrr@T;27elG5SxSq_z>Z;;rj+&V7oL#_3MRhz+ zYQRP!awmKV*?4aHkj-NQ60v%VwtWVEuF*$52TXo45&{)Hlc@A;sAq_EVu3DU7DurK zLvujtU?LKBN+pt1QFFFJRRZ8N-JzUBQ@GsYs?D>6@NkkMXY69f!KH zw6fwLxxH(dJ+-1H%0Yrj9UUS`kN-3l@;&k3aW_FR@soU#i-<^|jKkyKzYrqON!LGW zLGG=7izggO6r`wZl8*^>oj9b`=+hJ;60tKomH!7crk&ep;T0h4~NHw z&6wC(sl=nH@|i>ZClbHVW$#YB0E^+O@X^HRSOU}gS;KDcR?lRpgvM7CoTSwT(LFx? zxSY@I{Bq_@IyA;P4}2>WJb3u)>}CH|dC5Z(!q(?mQrL*LHG#cJ?MkCGd`z`^My(d3 zZDMS6%3>D8>EIzRY1i)=Gz`5y_z4a#3(!M<99g8}(LaR>PG~D6V-FQa)yFbK#9X?FT&>!85Wh_?*ZZE==Fkw?#v81T537H(^mG>^b;tkggbaS zo~DV%4Ev$;`=9~-v=1a6`cMkGCm=YEu0=oQ0Cl^dP5QuZtbT|F5MRlYC1H^ws<3wSoHRHi{ zGJE}xA}9y~gNXY`lFR{SLF0)_hr;oqk|^A*Xc1E3AE@Ozt@Omh<>kO1^;&0x&ySC> zxIh$xU7r!H{<1R>+owh$^HGwE@m9tk2JHs>Apk3uYQ#mbSBGUM>nKa$mAw4Mn zS*xa?#CeU+zxlbmS^sjw)0Xj28yIm8gnS`EUuHFR5Z%Du-1%kX?5O_zRKQcJ8zStP z-5`@zpHrfPFjyZA>1(~bJ%-FO=p1aW5vO$8>?9qMQcMU5;okZ(m~z#bas%kng{t{{2ITjk`9Ps0 zr*Y+Jq(k``a}>@&-Y6x914|YWlWw#0;!FM&SAY#HxGcNr6}IQ%1p_%tKU4pD=uaJQ zgKnjV;J)dpyOL%ZNvC;9ZiVWPx}UxuH0r-wjk%wSFyoOlKtD?`H>k4_c5*x`1dVGr zECm{I4wLb$KwiP}Qdm{BhCske^cWwnu34{@_B$s##-}3Vt=UQu$sTQXSAq!mu!Fd> zjLgjFFTo;dJ`NLEzEXnRs=!0=$HUX~-wC;m*J<@EB)96T;#M)6li(7YE?7tSD@Z22 z@RO6m(znnFLFUHnf8}wT8eRc%$wA#F=!jM*ka<<&Y+lq<6mtCol)*V>+In^KRrO5@ z3W=YN^S=3g;|wroy37$r?>517xp#1tRC8jY;7X(5<<^5pYk-#Cc`wX93p7MwSl4%# zNf3R_5;RE*L>tl#UA}&x6Ke~}@gz#%)6#Sb5J=d2G8D5uC$_HI9AYfzQVdwSRu(@T z-U9;kgSwF3Vw7Z;mzT{}`h{dvRDwJh@qVE+pz$Ws&U+ZCdF8aVK`%Fu#)FO~BbKtT=wQN5Jdp>&JPpDYUjh^nP0y@fq=O^BusPitTFrztSR> z2`QI9d@S8K|06MVCIXa%pHhDlU@dTu!sq@vjrhY{`-~?wne9`QDRzj_ea=yv3QE(5 zpb^FtpUG9AMCf1mKXB}UI}n;4Hs=XH+~iN)|w8$?@YPZ2x!SG|9cO}?V?es&*CUZk709zNC~T}WrpcK7XYQR6*B1) zzlCt&fBaj|^IDYawh6TMKY&F?qxAWgfL-qxC?rJOIs_W5ByL-N-^D0|WkDo}9IK7wJc^n=gutjx%s(Nllrf0;NE4s^=9^A) z0V1#0okyK0cEtx09ea=%+E~x+k4&HMP&jr+KOE#hmd{TjI};Nl;!tr*tHjzPYd8^B zHZGn3`IBun$@F_rb{z)$4m}Ah*lWDM^ z5&v_*)an4(f?uU|ji1T-Gtd$bc=WO>$6PcaBd^-VUe_?Vzn;Nmwy(*lHHazb)qw?H0J4d~1yVD1B>LzKs zuXI<>OEEiSx-sc`rX$t#C6Qkf7Ww+tk;B%#2QXLfY>_Z&u>xT`Q7&z*xP#e#o!$rq zck!H*wh8LjpyNnEk-^keB6+IIa(&kFeR1*SL)EO$Z><_Zm|7d1KLH0ZU4LKJtTZFx zV@F?*4`d9hYd=O~rzq*=5Mf_%;&X;g#7Y=~zMj4vYmWHuBpWO3Y=l*T z^{n>3&^>3S6A2I5^vU~vKWFD2L2B&Wt)7P)c6!h@$9dwwPFHc>Oey)a`MjF0YOKkC zBCESYd~vg1bjd>B&j55KC>dcy8X#p3Oro$bh7z@lFfq|t26`hqkQjDPLW6**_@Z~c z8mp8~BbKcB#Op95rXTSrF-il4U0Y*JFt!aY45X`~P(RT6{Gr~G~%HuW1EZEMPsglNCrSJ5K)JHhGr zSEHSEETL}5V}AWr&=dbLa8e2l6uMxaC>|ko^&_G&`}zERWP*&lCFR0KNVj8i)WBDW<39y;B#HrD3Gkk{CnvYeC&Wd^?DI5UW+ z?5IC5Q|GjBWgtl9Nyz?!FT`Y>Cn_F@fS$wjY)-BE*0XzRN$zIe*YxpZx1zzXKJ;|* z!Q=J!rX%ei+ky3X^HL$bSl7^FW=;kucX{dl+EPmj=5vvJ-XEtQeYbxw#6cYOqXQ}X zqmvBnBnJ2-C+n`*PitzTa0v0vLi%ha!xBWvU{{Uo$C*PNnHt<(@r<>;xFL6l;c0)V zEU4eMp{nIh(Z|fmUqc&|9%4?NN(cD{RHZ&iBnufRM>$1|?$k);ubgxR=9&DqDwQ;l zDbkkI*8ds)HYg=0f|EHf;1cTQ;!64*7A;g9W2-5B+sm8FXDss)b1vVyNBU8L6UV}L zc7q}4xxT9M^1-kpKeP|+;z1z{VQp^hLul|pwo`s2mjR@3QP$LqRnEU2mCy03kh4(x z-;MdtE)|h5`of*7o0eYbe1laxw{LgPQ;u>Hm@IoP?3_%WKE0 z8;iDB8r+z=eKeILb)zDB)^OZ}bNzZ{ZVjSJGSD9wp>)x3n32Uli9(KQb!U8TU^M1rr% zO3tHZz@!KLgrG~yy*Hhi)nmfx@4`P%RMyiU%rV+$+s}$L6+0#+P7u2H@F^I1*B3X= zcjv06xACLn#Fr2z+{kj@y+bWmn9R`#yXQN%9rHTVfzDx3=ldWEts0ZmJK0bd99S!? zl7h5IFbR$;x#(@}i=)<4mqe7^7-!z)3nH7~75JAjIBB3zM?w^@@3%95qH&jP z&_6`O(&Qs?ZO* zDX~`hCZqkviMeF-mC`?*Jq`1O3bbi>7j5oqF1)qCQu9+YYkgK4Nb8(6sInW^dgYQy z7K}v*a~fCyNIP!bG+(7Sf8A=%Uu;d9)84w6zq+hDK3Svn$y?lI2T+j=bfiPwUI))T zUJa{Se%-&cO-QJ6uxUkOgl@iBZn{Ajy!fV*NC;9?>_h2yY^|<=>d_3?R`KXV+dGopv5qqn z^i3~IG6HAkt&|L)Y^g>(aU}>`uJu26;D5J#4jJ>;FNd+jpXmD5R+aNve8+7{eRkwA zGr5h;JBIZlj{+_;}^m5i;k^PFO(RPQ$i*vLUgD@Zv%OCVi^UcE4 zER{@_I+m!*(BM&EzV$U`D9ga*`OITG(m#4MgMeJF!t(BdFUcmc zHxlVo86R`V)sVCko`(7|fq}t7HB~0+0w&N7Uw2R#VF&qG3BJf@9t!GxFK;vZXZm55 zzS*JIPFT1Vf-%1=jlX>vPgUh^9~nKvaxbeE+t-i7=^)bU=T)xZ{ZcC5`@S4BVf=$&<8|uPS}gpUAY7n0ZTs5^&h)Tj4Ppv`;^F(_w`prY<=eB z+{qkWhSLZah)ClEZ6tB{)AUi(i0Nq&mwm9K2#UcbP>~u`Ke8R$(s^!)|8Knd*C7i) zKO|@VDsBlRVJt<(3W+=MbCh{L^eg}Kn>pxq`uU=-cFB3uNaNOd$5nDi_ru%S##P1pogrqH z;ahFMz0Ny&cHvI z%#Aa{jtlni;Br${5m&jnqy~9H=$YQY`--wZl7gI^PuERyg_&Yf9{Bf}PI3GDhd!Fo z@GcX!88FsPj)}u%U$JqR`=C2*d>{EmN-qs`zsrly9j(vb1LDmA%sgr{rP3FN#9pww z3g4tXRIaiDxBaI3{ixinUsB}N!@>wuUY5z+pr~? z?l^40`83}ove5oubmQ)QG}f!dlHk?S0cr(T9N?{Qa&|Ecve%ny5vOFpn z582<>80A#7XU3umE^n6X1v^TO4u;q}KSBgn&v+`r${kVd;*`d@?L@|St5aXAxQOMCw zXlzbvBM!qD17-oSq=sKs`1s>(az{wsj>YQSiAMPs4Lj6xuSe2eY6?7yC4pGMppBQ^ zU)-)Q+$u9O@|dAGRTRm*jHJK@AqOG5rW1vJCoRYLra(eM%#o+|Okbza(47(gcUOZu zR>m*LpHW8)&7SC8?jEmp9=-%HcI~n_dYF3Q#gnmfc{CC_SZL7{nM-WhC&zSyHUt7I z+C2d8cZVM2Uslw@P|JH545$0Y=y4}~#hKeu7guQjYpB!41@6S9mSj)M{_|TrJnen(6q-$Xi*WKXpjC?h+-a4acYyVZ}8lA zjMMtWv;Y6yd;j{cn;3|Yf7)DD_o3tU=sg9+lCCDH?KmzZc;A=?nc<^1+~IM=#5u+72lteT*%hdy4! z?I{6;s@^>d^55Iy1RCS0eo*$4V!{o*WMN?wt|W+%wF)nxNO52>93xf!m6~9^fmqdi zyf?&3mBnqEA|zCjgp!=_#=h;7(DTKGNl)4X^WBfs6m}E1{wREl`nzyRZ3_fmD2OZb ztDQHkUrQF$?V%PwFZutY>n+3LN|&zTUg1fuZjRk@`1W0gq zcXxM(;KBXtdCr-cbKY-G|J&EqKlZ+N?W$F)R#l;eZ@d$Ev*Leb7J3Z%LMI*GzQ#Dv z=QtepJU17;zBJUEL&2NIx0}3t=TrL8422UGCqV4&VN$?lgU5I3MG1etl$`3*G@vU^ zA-(bgy$D$GS4j>>T|U}sit6pJ#bHigw3VhErn5;UrkpRfZ*nQOIe-CGR^R|EJOT_lrnk`V%IVO-y|KT&c^QWBoj!# ze19be`v}N?Y^5q1UBnh6*vThx1Cl-8OgZ&fZ11PbOqC3sB`ouZ5Nv#ratc;yr~{8F z8~J1S((1V?s^_;eJ}?~aAFq38((|cUy>?8AOkz9)C~1%ZS>wPGIr48U(>0F1PFQcb zT9~7*>^P-@>#a8AU;&q6B+I@Foa6c4#awLIa*a zb(OR$w(G97d30fv#B1fWD=w8Ryz_+9n@MU$*wT7G?{6i&;b;-f&qD7LPr-K9$kY-2 z!*lt`1sHm%H@r0pK?#K0Om}z6nPWn1>bu95KmnO-;b+@twlS{-9=YpOUl(dB{_YWC zTb$uYMVl>h-Df#8dnLN)ybJ!B*F}-SD$*E{II+o7bd6g3=yly}iOF|&*$`Hw*tTOJ zGqFK(*-o->s)e>5oh>>+?49z%_?)e`>VGG2f4pXYOQ62EIY4WqXOFAoT{%7;fHzit z$Ew!^q?0(1wLMd2EFrT+&8m%4Mh(nu2oDb5?#wJ{YI?I-T+4eD76s-~BJ$A%@yyOp zaqzs+MTXmqVdiroX@CNmI^OV$y3LTg3ji*uwfck5a!82P{i zVNCk4m(PTFNEph}ffM0Pm9g?z0klORQLnc{(9?dZ1UJlpd=z&;j`k`u>+QH$>;b6C z&{q_OJ)pEl%2ry8T>=-EGVr&Zu6=<-SjJbv$dn&~>J?4MEGLESd%Gr-;mq>ZRAGLA z0Qz!1iM#~H{UJ_(?On?Teypar#a*&JxnvgisrNoN_tbX&JMuK_xEO&IPg|_@^;#FAFL)VV*tlX2* z{{wUXKuRHD?P2z!H;HA4zk$HiUdwfHyyv(=NTlT~h3zGQ@wVyKc5E)F+O;fvzkhIm zV_|}y+q!qx*^;m$_Dh0Zogo7H=~{HzW7iy;X9uj+T0PQ(%L(Vno}%WDy0g8nIV$Sy zpqQvyRjZZqiEc~TR4(EQ`*S-f$#KLzF;_MGYlj9`U3UbG%5sC%B-r_Mbek!dOto$Y zT_>=9Hq$=R?cG9=%}Hk&_qUw<@5Bl$!;-4S%X#Bl#FuYwkX_o}!`M70smJp;8IJgC zLgbPAzMhAN+3n9=;p&s{Rt?_3*%}i`oz@)HAkIFbvl~`5$F~J~aZl|xa-ZXwK9RR3 z+>BZXqM?B_DgYNJWZ*)jyS?U%4VgQBlh(me0peKod*+;K#33Ms?`@SVKgVfs(FFZJ zI4sOGc*sw-WeM4$o-ZW*-25v+i2y66G!`Hqaw!J*2?<}Vo)|;$iBtFKiTv#1^rg;T z63j|MNE(=mxArm75m?Z`db%s&=6lz4yV@q)WsZ)5U@W|==oJ+a3B{>Z_I;Hm>KCK@ z^R)(WSFk9-doHpmLTCV`Sel%!4@&NLMP(Z;t_i6q_6xnY^eU{*qgEFKUjxF&UiLMx z$$?5_Oird_TGjpHE~qzK_-SpLYO9BM=;>>A%`jTgb4DlgZnC5Lv5fW?7R2`OhWn^3 z)`q|gJw3?W%_mCXiAW?1M!SN{P{54_K{Y8JjJnO2NkvAcASHaYNl{M?^VnEIyk33j z-b(I&z~G9odsqa3Sw4D^+x?6JxQPZ~F1BcF_ddpeCthD=`o;3iJQc`( z8=s=`I*b4QgNPwWeztb&n+|RmxO^j_QygU6-%tyXp%RE>;kb-+;6yIdnl# zcCi5(+5=m(3fut|VeNa3(GpHkk!#mz(cIu>18shhDboz&e z5=eQpJ|hk-DSB{xxi`y^uf4tZD_HlqB*Ve~*u$%1pjkf>Y7I?@r(fb8E z0pI@43+DcjNg75JH*3rc>qywS>MRk5%Iigui9Pv+pO+&dGh2U+;rQi>0&_?`Y9ZHX zV)eM|Csj?M)j=a!(TwxIh~>ZW{GX(fz9JG7*Vo&=ajt4)gPP4f;&jcGzKjx;W>a&0 zEW$zcD;;t|?}SY&_&kD#ddnoUfd39OYIxqonA|3|KLh_{E0|0+hy7t8l1m4|P} z!BLoVX0^!%9GuHT_bOqls zqv<%EJ<7|f5l97F8MORIOaA8L{+-|ci@Nuxe5)_MKZH9;+}V1N|E;~8X59d%@5iDG z4qFrz%R;2O+I;z{-bzCeEydcz0upl&f2Unm4#MXV&8)Lu7Qep!51Y`3)&ef|vFDEI z{V|X@o!#u}E74k>F=eH};^uTk;}$Bgi4>UR22$w3`#%$GNJ?x%X&kg+i==O zuu*=WJ+^Ni==~5%$(RhmICd9q&WQI{kMINbZ{FgFE-7LbW+%Bd)&?q(sOEKpLUK?V zM<{^nmBB!&(O|J*OySQnAtwRwpibBuPyVp+FKYjM!2U2a(9;mX%jzLsT%HN8p^e&9 z{M_?ui$J4@#iBS+;W%E*VH}}p`@I^sv*9OYkYO5858K-}z<%x&JR`HWp}2hnTa)7x zfzxy??f~OZ#ipWvI(B_=ELNZs3vPwTNN|*MlfBu7+jMnJWi-`q0$*G~~sXT^rvrr^vywce2MWztJ&XlmG93#ObQR9w`I$;) zll~g4d%y}-1OZ>R;BbGL&AwrVZy8=S>NZ@yx61z?d;VdCs4$;huL7Zv$4^A?!i$){ zCCmh`nxQ>n=*rDwd|ENIztDWS;YbO2rxXRzWN)vlM+v!VkEIi`z|%=e=F=hI&;EWh zq05SeGD@tCuiB$BMvG|RpM*4^U<*&rV zMI`nqVarlU7vNLqMC#bSQZX%}zoEi|Ezw{!kRIqa^y*2slM>e+7t~TGDCQ>qQp7N^ zIvX-wjT#gblJm0}HRFT~l)S@y8vaU~)g~wW#N5)dqayG@Nk_wGS59tB+^0jmp4Zk$ z46Z3@^siG#7exc$Dcu*ryvvLL9nqA+dn+O1$#j+84!<~ zX{x6QAS5-KO^yHh+EQ3b>GsKoSQG8X3I>~yc2ktxSENyA z;IQ$^H7tY*qp8;<%S}V#j(JMetCc5$B+GTg;R8QFKDV!W<5!shqe&8MmA|13I@ur@q$RThuoK`a#ATyCrJ6ow0D9_BUeD8@o%V zyWE6gN}t0seP8(1Jzm7Z6h3wi^62(7&I|znglGj*;Y1N@o5QVO=93>h!{17EYwzf- z+S)dm7=4e&>>9cbUPb3%HHo`D z|9wF*juiCq4IK15vf!ql>HQg~*NxtaOC@4_bv>z`LKq1PUbku~EGl__Z~#>4AK$ym zZmnI!c`RaN@edn7vDHE@>kF)5SnH@ov!s8!7Hksj`x=8y;XYq0LI1G#ro!adQ!@VK z(!^Gkur0e0PLNTXL;GK*NWSmr?&xxvM^YdwQR9^h2h|y?* z_Yc>e-F{acC*I~ZU$|d~KC}FAeD~KW%!#&xvU_w02D2~! zV2TLbV0C|m91s7-g{uxMofWb2X~XCGj62_A&5%}#!jWC|`!|3T+jF9H$=U^y%8G!3 zw+7R+;{P=#ZoYBDdn>Hmx002&UE3ga3CkE~*aPn&YwvRxuKLAV+8OeMjE;R*wvy-SR z+mPC*J6ti%#sb{-_j(P{&vDu$HNu2i9hsQ;NNWN51(7NKtlko?nYjNiU=GaSl@>2<1D+#!Ebsg)q z2D3s(!Bjze1+JFLwt_QX2oSbtDUZdJ_^J5Ej{0`y*y>L;-EKN<&=95+$C+F?|NBe0 z1p7_1evp&l0y?$fjVJ#r&gqL|ma8)*`EFTt_x74=cE2LCFEQuxvvZ#LxNZnVbQn!^ z;+X@6ZSy2z!Xu)w9F%N?Ji|=`I0p}I(O;FP^eeQzE`!3xyn9eh;)A=boRmmxY-_gm zJG}Qw-tjV#+MkEhfHl~^lgii8+o*q2{z5WgaiAeN?$X#vIATAJIEiaQ?RGS!$13qg zp^{=FQ|}fxeUeKuK0($ja|{mSBJDf*lYL#7mM3&{BKrd$R$nwpcdgvvhE5aFxs&8r zlRI1fXqp(0^SZGpI8cZ)5C6*9S^dEWK|bV76z0mxOyuw15f@Pv&wpazKll(4N{Zbg zyE++!5D{LAMGR<&iWl+2ET3Gjbvp+}?bdS816iet-yr_9{1w8NU51p&Tnt|t@QP{N zU+DLkVFe|)0!M}*lXCN@Ck1gB-*S`n0DOaF;uHk>q2ojx{f;2CPv~I|KkYI!_(PDS zKqK#4c6#0(95x&?M@vWSUWMer8?4x`8U9aAt|^;=KvuApMvAeVt(z@w#_e(lItQ|6 zhHm=EIWs+8r3Y5FJX>{d9lRG4)s7hd?b`;l3BNEmoFQem(jH37 zF>o9fGfzxR_(u}+1K30qN}?~K1N7oU~9sQM3}V*t(Ajr9e9L;T&)W4 z(ZElHNc@z^t=xQ(Qlh9)J%(J#!ykV9U_6@(E8Hg#SDF4cyD}5JnS&jpy{Fjtb0rpl z(|S?ieZhCMP_q&?cL3=@#J~ux&#SZ5HiMFXVEJt^&GR4FVG$9%(9J5t0L1&c;nf+}2e`F8;av!X>@Zx^Y zyF6{-(A~$5 z!AUjkiHeHzB=0R?^Zll61#~kKtI=qrshf<&IeqhU!J5(YNFB6j?Ml$+EUAiqk(o$L zsew%V5k|DB>wTyr>_x6+g~aZ(e9?}vv!0X>^wD9^k6Y28ar8qX=Z z4F5N;!)tScA(`K^Jb%ICzak3sxKN?tk4E-pU)FbV@*rG&IV}Qybf)9d}^cKG}%w%BWTv z(OOVK+x^&@zCq^`T`s}O(qW&qtFRy27Oew;?6yX%8p+s=@bz084G#>guW<$sio*#> z5Eh?f^6{QdSNB|$dsVp(cVO%D$m#lRc3?CAg1iAQaYJse;x>BMv_=)ZCXb?`!j=a~ z{{VTQajT2sSq9q;&2}WcF{gAfV4VD6SW43+T6=lsXtXne>Y3Dg2H#FO!Tb+=iO4H#>HJnjMfEW3zUZyvy0u>DLXdL1jZW~j zdfFIE^BJtqWiEMkW#wepOpdR#jT4cao8H}^+8K1kFfgO0q*{m2-+)C_236`Qio{i0C zY{e&8*6KiYBOr}Ke$Vj^ZCmS)S#9u|`x&P>#C-IfQFeU4{sUtE2NqR?O{CQ~ zTi&a-n6i6$y2;JSfo*$OIaU1pxd+ofS~A~LfD9Uv-)Hne2m|ZuL9<`^uz{3HBtT^aCdr`Iq~E?14S`mMT~XHN!XAih9H!;!dg3ux&x1|Goq7<&ULcPNEzL#2d}br7_`rtou6rRv-fFQBvnJv|auE}Q+PxYbJIOt%AwaAso83v&4_wA!)fp!Mb<<6-yUK_l})O5g1r zLG{#4Ifcd@xvt3cC9!@Y0s2tC9cqY#q*55OUtJAh&1s2fnF7M-^V2)j6YUMiW`CGV z`_@fv@efZso>DCoO<1fhrPXD$#F2nyklOf3sEhVLy!7~Xee7~YVw}(ms%QbjwBgMV zp;5zN?-A3gWYM7PVrp6&i}2+$mAcqjkz6w!opgIisfkDW(J$6&l2FK>sB%+gs2?~bctqo{T&J>9^eDYQ~A=!5Sb3R3&B-hsQ59s(C0z!mXDM1sj@v} zT~5XvaWXeu8d9EJT!Er&C7+6Q`xf>a(~5aEW;*t%D5GP~|1#DmS_+%};bGaW5OfR- zVdA!ly4QfhL}r~YBx7R&7pP=jXYWGLT2lRi8yx!QYM`(`VH?%u1)qLQ=tKlDp8!Z{DQe!1xEJcb`;=_o zq2+cJHRb#RE}u*G+ZOh{W6%p3I}{@sN%5BJHld z2$IkW+8>G4-yHn^T@V<+zqJt~!?!e;?ql9D$CHy2KXeQ}1eb^v=n%r>x*;^Zid@yj z?ow(qAPwHb6qm~wB#4R*`3V+j+FO4=J|78Q-ijef``(F+r_>u= zoeJ2`GhEX0vVJQzVhYjtC5-d<#H7L0jQSwUK^*n63F;#wrS6|8L{^Ixa2KY-pgI(| z=f;Zf2u<|WLlu{IHlU^!Mai$AWXrAoe({-9+xGNy6ie~$g`2CMajY<->dx&;x?(}? zP#p<5fa&m>d17EeBC2mZyn?VQs@j;^V;0gf?oPR#Z~BY5$M7P z_#FAN1h0+$dN*CBheE5F5iI$YlTfytK%>~dB<5|bY(mCP#XgC@1+o~N;w#lh-m$U! zTFG*D78{(g^X1jHl9i;{)Mx_wo~46Aj0fEW$T-T5f>6;4H@sF>REPt)5hG&n)|(gJuTR{UiR3b z-B)kZz1iLAGk6%Fu>z?^4})k)eua=-ZebP@#}i{ed`yWYKJ9(GT5K2Wjl+dg=soKL zrO`08;Zxk7%Y9!cr!2q{Qd_8(6Z{UB1RrIFDqPoKrl+j3to4zcZrsc{!@CQW-0d3F z;i2&3KiXf~V=xiF&{nqITu`^9qPfxc zNBCVgjn6Fv>|fx_>P|w*M@pE~D{KUHJr3o(b~mKf*ZEvdh5gKYpNR9QX*XU+bZ*Ar zO*A$C{CXh(k>^XDvsw)E4n^ORyrvYUode~)oZTNTClF`)9;wjf-##5(w6QH^bh&%s zb)O3cWrYlTSr3ngX&4 z@(^h$aBdpwLc(_tXP+i~^n_ta1%>#wiQVD`q7e{~`XMvmy+bLrxjZOCMed)H!uNO` zoT#YIN>ouX;T?D7?uYnE^;33~^GE1!qT@ou8ct^Y_8eHRgDxO<5gsuPH>5dN`fn#p zp^g+5UftaMH5k!oJx_>W*mOli=(S`J-u!#DwDP&=(qCVoa3>DoR+Ny3?G77ZCYM%W zn3V__FJgVUSE7f`qkJ66w%MJ)8{Tl0h9?nd`E;m2vOIiP#(2 zj<%LibOTa}t#3FH<;gE3BP?xC++CPS<=!sK#ChxQT6mUT8A z1@xb6*Q!DdJ>Z_NIWjvg2jVb0U$h^o>C1fXCNpbd6tRZ@!oHO6^n3slDg{7~Nt`el z&82ay7^k&uI$E2|n6Pw-5jR)8NB}Vv$uBq3MJkSJt;EyV++qLKk>axt3lq>nK0=+2 zFt(T{lq&hCe~Tp@7Tx82!zkh6GJCc%@M@u|=8*gS@;Df8w9mZJu?CINpUZM~V>~t& zt_h&i^p}}qPQ#0bdhW2;u9Ib8n3+O1M4Bs}D*Cys(#5=|6~WF=9F0{)?y?Szrtp~< zDZeywOE+enpaUhMVQiXGES4zf-VWn zUR^6UK`s9OfeuioK~aws##>ik56PY8lPjrTUrlX4ZUJOdCxViScaw#Ayk!fhAmIY6q4+g@ThpNnYU2g|qJy}7I`(Nk0e zQyVbC!Di8h1f-M7if78hU%nik|6Ur3lx89~9X5sU5|9;*idLR&;x&E+NE($*g+yhsW2fYG;>;%UbAm% zN9Q;A<-MShES7Bpt}0(w4Vs`os1D6lUb@#*(xJJv2(}@d*|_f)YfQE*^AT1a=>X~kJdh|pd`#UA`CNp2w_x%qn zI#ZK*ejDj^%ZAItYY%rUtO*Mfbu8+yQkfu16wJ#4uFTJKX2L_-`^Fq?p};y&Y0o($ z;q;`3oI{Pf`!zZLwY=RX^Iu(ne+S0=-`O=%K;LF?t5}U(PV*$ zjqPO#8?-hGX8Sxa_JU?T4QD(kRp-$xq@Cn-@f&6MI~2VGsVHBKdF{{9pc`B{U5?;f9f5|wmx0-;^omrgh9X2LI| zUz2d3Z?`Zg`5C6PvC+G)ozwq<2tXwjVC3lTbgo{EvLcCBx6>ndp; zC43}C%G(G|o^3Oyqy_Grjjgxh$PA_&2YCcb33%aUr!VZnk&+wiIx2BFVy2oCb{!g> z$$CzttY``i{^zb^0!BHYJPsuQAW6{rolTPk%!#4RrSIdu6iC+zc>^a4gBwlU0ioY5$m=<~VtCT}QfPzq8;#FujNQN?r2No^PfN_R^WlUI%+ zn;PHLNysO4BgWZHmujG47>SNLd)&B^@~vIbQdE#kRT-Ui2Uw8^%mfLamWuO(r!0sG z;kWaZEsSV=nksMr8{A&^y^O|%#6HF(UMn(xTG&T@5kz%!bq7|PieN6!S?l?LE-8hq z6w%AsV}7OXMt<%TuWcfkzfk~dIeb9rI~}PHNGYzzS+^vSVF8^!Q?VBj-z?|0x_?aV zz7;?5$uwn@wDuM}(eYyF+0pO;2 zCh>do>1wo+gwl~Ur7?Tiol(#zYG(+zFh)%dkaR|dE0TU-yRTA~j>);>p%?dk(R;xl zQ?G>A5}FV8y*qKOu)Ah#{NX8=-F2?r8q;IZ9c#6d8y8EA)iN=+T}^k{g%|_f`BWZl zySX$b7U*s!PA>;9Ihfpn+M7lvu8kLo&P0nr4nrZ$@v)243o zobU%-k#&z{Dg&kr?WHmvlT(OJ`j+qhjkM=DIV@0Q&eiR#<+B8d&PET<2}^r@wRBL$ z+0Xyd`S};oVxG7dTpuN?_lSPm(>0PK5XJ)lHhTS>t}N%M|5EArKVu@k11!!>M7`c6 z06X$z*kb|nt_y-y=vt!#EI+v4B_pCCcgrJ}-mJF5BQ!KHzD|M(T`^dF(CRhD+1<;n zuEhEg{^52xH@dU8cn9}zmMwIlH^<*a;AuTjl6AG_^p${~;6{w$~e8ZZV)>I6e3^IC;yeCo#hdi-T596n4+r zw7cIL#a0ww!lCI&cH({bc@mG~YX^3AIi>ErZgH=@%om=AYO>EYH3WLBuQ67f6X~t! z8YU}8pE;$z5CQY$#jXaw*_G=XxVbPJkxwIxle@t2Mw0{}7U1e>u@lvl=r&h03@_`~ zTWbTC8I=pHZvinm1zaV9x1+zY%`Nu3+k`psc(%Jc4L-wo+>% z(CTWO`1ttb5t+!$A91wFhfN(P(KZVIW~SPup;Dob_Ui~<%$yJN)wbk|QKZ2Pwm3)O zX20Vf9LL{2+(o706UHVNvB?Dq0m7+6HA2ik#O>iAH%G5}V&t+unyM$@yo$db*KsBC zSB1AQ;Ii$N9Zq2%X*M&+uf};Df8dVe$T2lFJoY<3n3e}9FvO|B9lr#P(7jJM?bHrp z39+(Y4ni+!-vN;?^2b=i$GwAJTQkytLJcdT)9ZZdpHPwe6_`ESK|h$BK5A;@jgNg7 zrB@r|ewZOR1#~?Xy4^*a&sPInB)@8ZX#UVvo6Vtv>#yj;{PxW)@eS_!OS21st!g1>;6|7_|eVnT5(+_$w2vkr%*-DHXw9mci1TI?@h zDWZrKb11;}TQ(W=T#T5WMq(>|z^ZEr6}A2Om)9A7N(^wiel(%XyVN{ZtME{lV+azx zXQ+12SZEVsyNip7z&y%hxZjdXo803DgjguHW`)0!{czWO;4ryW4H}b=d-n43_O>0o z784s227JBS+1_6s@%Bph9@0Cg;sRo^RqbZkFX7c+NK%C;QDqNHOmSbri-*ZaRc`5> zkOh(#3j{keewv$JjC?4_2Qu|`KuyxfHI{H9gxK>S;j%zY!*3+19C@K=P zdudMl>|#%rF!Hf4Jc66g6kNXLgw0p2zu{~kfWr_wK|8~=;%2Qt?bGyJ9j0=W)lkpV3g96X#0qPzf^4OrIqSS+gHLfFK4IZl?_=>HkI;{_PZ) zIP&|~IY7?S6*MVHJQ52F0gLgbnYoKCBYO~_NA_1^&1tsDsV)c$%fP;&Y>&oCXHG=q zr*lCM==?HG7An;|Uy`GCvsa-!X5hw)Lx_DHy<=_@!OlRf) zKv8itI%^>2P>R7C*o?bh;Vyh5#*_b7n1&F*vVY}dX2#<%lYLJLo`NnX49S&qhTjjn zd$k|+FO5rk3^quZ$FRT2@f^LHR1h_M&CbL`3?6!<$*)#wueWiwLQWVNBotJz)82{d znf1@r^8Fg8NijN~hd1u#JLe;tDR1SX_cq_xUPL z@=?`B9xj}!WIuaGRpjRNmLbb;d61Q@OH8Q?l`?c#jfA1jzUj3fLb-V4yx_|R}R2hFff%W;hxv)FzYJ%!~j#1f%u>7_s&;o9GrQ1iBW)vixoIYizRjoycjzlDA zxOtz-OPsev+VFkXt@N87^VGWq!>UPY()tHZ5)Ybz`wTMS#^jlm@ePArNBl3To{B?e z7-iO2RMz$Bn-|q-<`9$1kjLU4>d>y(IqyFi2FzRdM>(mDBK6SKjC{++1ms7-r#!Oj z&YcS*8!IN!s0`6D=_vQ@E4wg3nAu`}%*~I_Z|&|||1^C|8cZCZ(`^zg=ka2A)RaVd zA1y)O$;^?vlo>7e@qCn6UsP^t4?4XBhs+#o-Bj>pJPw4MgDBbJKr+5HoQ zNJ(}WUr+kSt5leXsO;MPSO~0Y0+glBt3c8{e;YZ!d-_w%_JZ;@&U7j)4|o~&M6n;m z@Q2fS9V?<3HqMOP1~&MvU#ls-WBN=QlB#aU5Zx`ujXP*47e39ZzS!?h|0&$~J zj+Ef&)ZXqX|D{L=yyhaSBN6AKH<8C=Zl29&_nuH1ptSZ--tT8sq&yKl=0P5|VAQ7L z$9T9OZ0LC3oG1nX`N?B*q>ZJDP!-RiMEjQ-3Lr3zhcR%o`po0_I;NzrLsm0!D4cbc ze}elA{s^6andE?$id@PA#l8T@X-_742mL~Wsx!Dx+^Dnv?N#*45#f6lYzs$B#m((S z>qz+riEq!#d#JU!a*>==eK%AxMc>;93Fu;c`Sq*ZWk|L8w)ZeBI=m-wa!P4#KI}eU zQd~lO-N}N`p{gETtmD0iAa=J~d(IzDc^NY7o?j{)SKW+s9f*@FN4m#Ka0x(>Fs^Wh{1jOf8L; zg{~Wg#BaHcwFzR6f_A)gLiy0ti)Q!dPyUlLuTfmPa%H>1Gxr*1dqOU5zBP$AB!rT%uos0690~uX+qb@b;B;wi7($a$e z=%lh!!ncm4Re4xAqlH6rb5UJ6-o;hD$cX(y7~sgMR79DJWN`y~)i8%BtTax1tXMI4 zqStYxG{WH)1eZMS&Plr{j*FL$|FpumRT9cx8^ z_S)GQV}5VRp%MPWRiwFQ3vw&s%_~yX-}&=Q!L3~vzYV_cm+Vc!1!=1Ntp|r^^3TG| z4lWI(otWS-%`v^>mkf)_z#GUmzAl2b1@svf&V$4NJk0HE*E@Rh_M^iiMv4YC6ry{t?baA*%7FE4uU1YuWx{1Ood(0)TMp zy5>tx8==r8f4(AhK0X53HIX@O&#N%1IPC{C|Gwtm*C%Jv)=gVpASA3moYjhr%dqdk z&G7tnI9};Xo>MR)BK}Ml^fk10Lqa5na=XgG^i1TH&KU;Fa3jwjp~L@B$}hki!`6l8 zWH~&=bya+C0Q>BM#;N~R$UBqD8>Tm|xjXmAJ?@rRcLG6sdcX+DvE{3|Zri}1Z%i-*^&XzqSQRnEL$DImSEdHknh zk8(Upx6$ZfV>hpk&z$wFF{F-bYFx9Ln)Y%I6AtT=_Ms`w=!f#^#(SDipJple-oYMN z3^;8K*|ze2DWNVTPkuobO3Ox91)TS0Ezo z`+EFNe(T%eoTGUQ9L92MeCdI}Q5Ne{Q(JR{gyXLMK~6B{+{Gb-+Q!xAB1~-DNP6sE z!{c2hHqC=FeG(MDa@ z)}YVY0jPYHOlI-DKHfPy0kz>1Z)d~kx`$JsTF!?5C}WDrv`f8l!baGy-19~ERp80l z8x4)i%`c^iurj~d&MhI%u4^DHX+GB(iZ#pVr7`w>F4Nyatj@OC^ebJfMCuWC$1@Pf z1Z#QmTNS?t=D3&F>b6DK2oX&*-oVAb+$Z+#q+e|p97q=Ui=D`0e8%qM)!Ch4Sbaa> zC>#QQ9ag_|${E}z!HF?TLxu9a_9M2iRDtiU&gv7!dti?*0~(#!Ab*(O>@1i5NaHab zeM!)WODjE1Q079I9e%=!C&T6zv#>|I7+X_CLr-^Ech7Ihc1)jT405JU+vl^_HfbEV z(ac*nA2E^k-(OBll>Q5Y}SLv!Z!^Y zeJp$*&ABsmWvjcwhmL=$4urofc*Umr`b=Zc)PUg1GD6#3oT zT5{vgiFTj`DMUlwAm^^yW4hs?u5=!joN^M=<$+kpW!P?RQkTUIi9pbp;60tgL8}XI zS`xbtEV`1k(0luqh|W4rsic+qYEmar{3xOx$S-ZaQei$eSN5uf&iyDm^s7{UBR*5v z4C4rfkO}{Z(_ZgWMtaG2o= z@<}pJZ)=9IB5x9A-U(P5 zqsBFBNA-eJKuEY{k4T?=JpgPRwj$F(AH+tRBKIbTpk%)rshA?HhquS8}><%Niq_`ib zq7!qK?y6)T_9y$_;$8*g&hT(;&G5`oaPh*pGB*rBUdKD1owfI!eqw1eqK;naL~LrM zIlbZ{{Qiy@#3Qz>%>hl;VjwwB_2o>5S9UFUE`vm-f)A|(3EfB2Tjxn854G8UO`VW@ z2a~HgNUnOfMTR;ech3D~@Y8guwuK>Y4vl>4X54|b6E3-sbHq7;d>8?-LfN%|ekq?W^t>6&dB>M-jwGp#_=^)*d#&BryUG;*d|C0lTRPx)}HXR zT#iLya`|XDLa2mkQgtrQmyR8F)iBD}Sz)lf}m6 zQy3nBg1)ecIyV139!2a!`_dxhwWP0e1}G%y4rOCk&i2`#e2`hE&Dv2|d_Qt$zo>K* z`005ES6n^=nO;QjZRB3t%GFh&UK`%ZcWP<(qk%)9$dG%@G>OGlLoRp^;?mof?iodM zCCr!X&nTJ{IBJ|cCj*c%oX->LceWI;#W8aQ=7QuoXi9JKg~c{_o&!%DL;TNL-rH_Z zcFo5{2)CgM8|^5cc(-5Lsw0lW#%0=SSqXeS@qG1N_>K}P*D{9xm=lge!rj&d_m~X` z9D#FP3t;iNrmS~QzdrAc#?;hYR2MFQ83-Rv+!OfSG}EsAaD6Qww9sXDsSa>CT8w^N zW|Ylfef{ABRxj-I3>Q05?(Cy(?>Hzv3rZ4@mfWvSx~24CFx^h;ya;O zN^#mOztYltol~F?ns$R)KogK_jNLb!8vQfz+3%gC{6BzuLAhdaJfN#{)G*15cs)+Z1`Is;1aaJ5uH zYof_KkxOT*-*>TyO}ErCN_U+s6XhlxSOnMx8@wm_JmDMWi!CTZRIH|FycnJk-aL^b`UAMR$uAng@pXMDDpuZfVWQwBc%&t9eT!3W#HMIy~{IfRmB9mfTa-+oGf>S_$9OvID8~ z%^VtReYc9BwK^{MF};U^)AjyvL*yy@!otG$9s49+PeqvqvPK;y`Q%hjs=|S2l_57mD&TgyF_au`@ zRB=xXRa#Z$-4OOU38XJ3S|8OFGytxg%$P#KrpsJo6-)9AK_0rI}HR3sh?<$K3K;8__^L95#x=UVu5 zk649urK+qEp4oB>9DMhV^+y(FEKcB#m)0o8oYj1g-qV4C+hv9)t8*tj4#%uDhg4hS z=upcEu$mQZXTNz~qiUkwf^?7|5YQowgD-`LzI&Istbb7aQxw5gAgG5{8L@2v!bvi1 zBqU872VDDr^Q6Gxk_VN%uNy*pr(H(f^Aq0x`Z)goG4+nok%n6n=maydIkD|boOEnE z6Wg{kv2EM7t%;L~)3I%LaC5$U&slfXkN(;3>h<=1o?W}Dw#~@anJ{kfrYCo1=Wz-@ z@OT%cP?jusr@gUcyWYfY`>6NjD^1Jf)~yPM2f+D9p05pE8f#|sdB7Vp52?Q()3y&S zc0D+uLF#R1W@4%$<@1Hh*raHCzg&s;HobQ=l96##{o_>ePFK-^>z{Jsb)cOezLEHm z;Q>fXL0iecYEs2}&(ANtP>Hqf^u79d=IR3;=z2bypmk(849Zkg`yHL?_pY;lWU`Gt zd|a!Pq}%9<%c2qX|1;#-1N@1xBi($VY933k*Lh8WQzGgo7S2goJ!^~Fu3SirQoQKF z2WnmLu~`F&kBO5Bn?CxzKgY=j>4xj+6!C(irv6IFA4pD^pYuCHLb>mrQ)X-PcNeSWyuj(Zq0TE)_)w7m z_{6mI$Un|SMZ~WCQ*YiEVi10{eDqUT>C%)wSpr7Na5*oRjB)%A3`OYco{#ZtzSKSU zp8zA4Yqpagft(T%G0myMqDYI+=Qsb z#5W&=lSHhIbQ45ln5=i7S+smwYR02Pzy@Bu+p4F{$@TUp_%5EK9Iu|XG-wLgtVo2D zP8mbb%^y2wd%>Nia{7QAjkbRg!ZWH3XK4V7Uq4EQaCt@`6E=NiT+>`=M#<#8UvEHl z4lk7wQc>(ra{_*P)7A*gCQDoUUYhE3)iapj|3x>7KhQO%w84wEJv!kmxk_)eJj9^R z?WBL&n*+&Yel&KpJPYsbmhm%mtLMI)F<6G`>FiY&8G1ND2J z+R3zwPE7BApqTwea{@y-K@6w_=d71&ZhtWC8Qx^H*nN9`6KnG+{pj<0Lr3?y2MfkC z+GhQQ;Ci3mGnWsRQW3RBrTvDo9tt0bq~|8|taPsEa{MhKh2Fq%j%=6j{A+QVop_We zy?Ds@$m1$&$nvI8>Fp|@cP*_HXl42b^s6Vmp3Gb zHzyWs- z=2$KM995XMi2B&0)Lm$+A@nW-f0>?_&xB$jFKScy>$$htd8ohk>;QcLu!c2~r}+7H ziq#ty+-P=_Pe=IZ`k2*%F>V~(uxigdPxqj3Q)uUnAG_g4xbPEZ2SUQwoT{2*U3Sz& z!;(h#W05i5=Mj&lvT|EKGp24^KT$)$((1QM(N{FmI3pc(h?EFYq-d&KRT+r|DX1Q!W803l{ z^SHHp-6qn^$s+0JBXTBYd&RxIf#Ia$+hd|gBq=nTiEp+CBM)f+1EJW&S)t_^AG|G; zLdAL`TDjiq&orub{`Uf5&n)CiPqH&OSj8?=dYs6JvhnWJF;sqOU6+kRO#p4|U+*=! zuGh=X5kpzuSuZ3)L)+NnuelEJlp!-L?gh?1qVZw6`;$R?kdzY{*;V!^qk59|1=zRh z_nkIn?y+cYMP-G0YaAar1`je}N_ul^GjD2IlcF2mZWM%Q4r*qftI6eC=bV@ig#mU- z%b3%uH*&aM@kNPIB=RRFhGwmUQ#i#khr`;O9oPN{G&aE|K$Us8H(qCT8-E$58JrvQ z7jcGev9@a!ZQ6qmLCjgLD)r_^)XAw;DJd-MmJE6(Ls*6`b zm*Bm%S{Z~xIWi{TE6s~3J`6wHRLdMUI!wHAo5Ha zlQ=k{8@M?q6|y2l9s@Day2sw~`u9p^bFOFI&B>~Z8W>Od*>XVA83>VuKwZ68afA>&J}}-}9VKLii95qRt#h5t5xaEq^sY_=0v={iv4oakkr=7X6Q~%K<9Q;OAFi1I`RwbA}1t0jg0Nj zfq3Ge(F~U#{_rU)x(N6B1RIIed}u=^E?{c~AcSvLQ#oXW-ekE^-89ZY_twTnH%d zmx}FH1T3s#78Rf!Lz1|&TF>r1A=W%-x{E<|m=6@Y{T{2n2ip2TMI@LWLZ!frf`%KI z?Z-+0qw$K($p?RX-#)moy$ru`Q1os&HG`DolKEA}%NujZHQqwWN2u#AmL%Ss)5;xs zT4F;(Tj@ZzM|L=s9?(R5@AGuaq&x5N66_sw&jdQ|%6{1V{|<$`C*nLWZw!!WDJPG@ zn3+j?W_)~j#W+onqCL)lpbTZH)z^xyp2x=!oS&$#u4H*O+pEgi=ZpLpi=nY;#(*7_ zm&eY@`w?23O5QY{2SMvjRzFc1H;NQS&A&(?S*AxKpDtLMzU|a$rd}=mU>mvTnhXuE zQo`(b2u&AdE6orn^4{V2`n?lR=QU0GR^7Vce@dX#7C81)B%(%M3Tli+%5OVp<)RJ%h&P#qiMyCOEZ5ZNGAKPUbXe7elS$|fp;9frcy5-o5vdR zkq}_1GB4HO%_<~$$D0V%XEcP3?tNWTAFhxfRPJggvXBLsTF0iHi``GUDyz58Ll}#O zJ-Cc>H`t%ezjzU`v_cV2?lfJ!u;sh{>3Al#Sm@N=AQ=BH@sR&crT>rDEeA`NY|kzT zAtC`~Nx@&Q&GEa9>DxBHEjZ{{ebetk`wIBbT?PJbarCti%3stwcZ-t24Kk@@pYP;adj7gYO^nw1eya02Z{hWry6FA%1+Fg)K;B;X zUbZB!<<6I_xVkZa%z_XJL`TBsn~u$g{v~Io4fPCZT<+)4Gc8H9TvYY`x9)VKeYsg- zyY9!evQ`r!6B3m6bEfv9FwNffIC=uUO=C7m9Ov-ahLA5hlK~+lW-$Hsq!T@dgHy0R z5-CYR#aJgdse-D~r_ozC7Y$GZTI9m`+?3_gT z@8n=7ZbvRKF+zH9XFs8Jfi>4fG<_AIwkhN|b=$ELgfhMyFnQEI+a?QSN%wAt*Yn?9 zFFWF8#w=~2hg;G8P3^PW&8GT`ON%?&f&hZfD_>Od8mx!UdoFewSaJERyz$yo&q@aq zVB)t{H#hO?t{2XC;HT&&=&GOXS5%6XKOaDUQ(HCoU-gOkUoMC%=DnTqmd(F_`0J(F zt7nwKo3l@^_|ptaUcpMVsis7z>esDS5s)rUm#c1J+_dJA&FSDJdp`W=Vsfh0 zHn3f_9A41IH`XxwRaxl%uSp zGv7N2I4J1w;<5xfhXwZPKR4`nV^X)CzxBTC;mTMahf|}85jFeqq7ht{43GMfkq;3O zGvMS4f}MZHi0jg(yn$-2krx| zNKWk>8%c@6_njPfsh^%DLK%)Rx2V?4;JmwdEJSz=7dH|P1=MWk7-5A(VRzm=)kA7o zBEGzP`r~|}W~jqRl+&>V_Mlmo4ClOT$VKoI8Y}3wHZqbgi|ab?Bs3zj^Zth-48Hsbga26I049=ei z*Z(w;QlZK?2u$#rfEV(y>GU+5ijIMOEPlhn${{Hnc9c0a$co9w-6I#3nFf5JTKOL% z5U_}%K421GNUwcm8Vvcp21W5Yn-~88cex-+G6!O{^h{9;QLeR0A9aKU)nCrP|GETW zteMQO3r8mDO_3k5{yf#QqccCh9?T*B-k{{D`eox-MFaD_RnPb6N{qa^7GE-fd}zq9 ze=4TL9=yzc@Yd8I#*fr@Y+T{w>=oI$^}ux0T8Y zy%vXzD>{&247gJ7vN0G~*||543B*#JX&82oE4m+Y7))y%O;;|5h&q@}{q3sji-J?8 z;p*yIFylic0+?X+yuTKdkc=>?!RLQW1%k{VBq=K8a_E%v-ysv@d><_imv$b``>dP? z((<9<5caDExpkN2O61-p*kkch#@7X1N0vRGXFs~OI<#FeZCVjpdj9j5{}0-Bpv$h# z#)IYtLy<-*7SGH@#Zd@J;{(I|@dQ--CL?l0`-nU{EAnQ9`_V?@0h2w2>FcIj1WC4A zA$=CCw(f?Rcc80cyI%+m^<~J(P)~z?yJW%(PyZ@37dxaN$IWZ&LC)U+eA<5o+f~iY zErgB#(2kJ55D#UB=d9!J9PH{Zw6Wj5(6|{?`{G0YVxQNF7_*?^qEbNTHWvJE7Jv{> z66>%FXNF#M?Bl+Hv?5?LvL_ZZg>0ZtogVW|Z3tD^wF9jDjs!JATve4WXG zGCRmPCgQJYRb-Z-dG1^9g#X?+?G`INA=IrH7_%)HosxmvuLlYLYZtD;F z``5c{rm-@=&Ps84?;~@wSa(lC{+B)yP8yD|MhJoqFEDy=9N7Tz_}Ro&GYo%<&X}SV zPF{)Px)fkS9(8FLV`Ae*nSI{tdM;;{*O9Cd+71qiWY^x`riaOI78|SD6n@&#?5I~g zGQKB$zOP5YKlt~j%8pQRQJy`3+7pgI-=^3~pC3x^O+HUR$Lo;gxEiC()5R9X@);j< zKjkLx^m?Qu*sbU^Ee9|#4!7wcd!*j$Vb!j?f`H$QT0xK?;o4~wF&53*%Yj^W0#6r2 zLOc12Z3Y7Dh5Pe1Y>Jo*XoSP!NBKG*-cR)kb6UEutHpm{iv*d)IZwgG6~Bb*OGQP+ zGCwK~FK^_xx>o^$X%&yOv!MsUSJ#H3V^L_qWUykj*LDjf3&Ls-ka(W^UoH`pSOL9Q zOLx?qq^h$kalt9%yA3`fmeqKyDy;6F?A!!NiCL{D^z5sH`2mbvc_%8t^)r zWZ%DCF&L~*+L|&kJTgX&eI(;8p5&8d?Am}rBI2b=3(tCYpaI>IHATmDYUe~%S|pw0 zyp_&~?1*3G8{c_yvZgno0Uf*Nq#RqVk6aItxW2WD>}1=oz7a2X@{?!9K*I>f`E9@K z&kaH;!^k+Q?l*jt6eIrfOXj5K=8cjpg-FA@4S3C}Oe?Zn)=HJOox!J)%u`>3Rzb~d zzz4!_#sIL;98%XmSl}|!o$IZS5Z5O00!Q=m?PH_G`NodvrY9$8k2kH>V=vN=xQW?~6ca&v2=9!CDh zvV8s65h$~Lj_&4EsHnTgXL|5@h*?O-xz-{-)wRQ#cQHuyCCvFm)+L7fF_sUx)tioz zXl2c+CGevX9?p8t+}p86iWP7Zd2PRO_t@2!BY(`H9*o4D*%lE* zz(hnE{-c02!PvowXIF`U39kM}0OEq>HkFS35fVTu#_}`Y4y1iWyYgtM7Juu(Tg~~! zW7k>EQ#{A(XYrc;GMzu&{g#ONvD4gpdxy>XT}OG_?Q+X3sVuQgF0NPN*t+qe<{c_M ztJ24_pd<~{*b`n~PX=GEX^L7SdUyB$Z9w(C+#2pzV5Rc~jyuau(^Z{8ol_4W6PkQf zS&0*2+zUyzlSK7$aeLiGCw@|i>&yhsjAoW6RJxRXb(PCuBQv*7zU|dspn#ngt@tE! zCq4_DaMy|N^o|{%tYSjIp*#E7G;${?&FXVQ@#>Jvn;1Cw^QUQr)l&MSh%H27Lewh{ z4exrE@|VOVzqO|Ir^rc^x_tMtzO=({YQRQQf83|Kw2)aYPb5MUc6e-fM_7>ByK(F7 z^uJ<>-9EWrK%-^LP+1;V?3o>ZNoxD;ytwIJZqEd)S}la9AQ5*Y{e%IYYp&wbm{Qf4 z|GU2Y-xcP8B+oa~v?U4;fDUZA64UmE7ZMJn{&CEjv2hk$Cf>?X_V^uqEpH$cYt<2Q zCOfoB?*m+QG~*(8v^M}lsuENF@iDZKB4Yh@E{h|ODoisg+jO=g7A}ELsS(s_D|E>Lz_(O zCXHKDcdqq~^EbxVQ5X;1#KuwRzUR4s2Y~FQp5MVCST(B9?(}_>p~IH#RYIbea^#Q# z3M7nuiORYti-^9shrX=tG6^p{p ztY&m*Hrkq~vLPn^RWr;Zq8S<#ekPLm?!jgDtQt3IT8jCA@E{Q`uTKynX6zW3p9DeQ z5EmXBW4J4B=LASmS5xw+epkV^+g6}pS>~#ab8L?|xGJS-j{w1y!1AXYr7ujN9_=3< z?P&XgLFr|15*2a>rHSO2?#1|Ny3?nsF#U9vW2mh(MZC4|9q*mX_bD%Ukhaw&p!nxG zocKsdlIil{QH&t|Qt}`p)sd5ew_|_bSMAYSO^Mz@__3kgyampS*-gD&S-KdHuIa%%ZvOLwNj=QljZ&2C)#%F?qpHC_KE zqf^AqYkK{vpSk!ZKv-#nmLUomUv{Tzp_x9b(o10GV*XsmZd#`EVEnjxTLs*gq)aQ_2~8*l&U9WqtmS@ zN$GICmMqzcPLkPMcTIrm8+}A;K-mn9_7(WiPDIUs`GR+Uc>*Yc!YIfgJFR#;7yFL3 z#+AtFeBJdUR+ZvM6{j<{2`mo zSRT}a9O`%3gaOB;jYyN%SbRU7QzzxRhuHsBr>_=^jWllybbKsvFE2N6Z6Lg}?`*&h zWW%zwS)m6H3A#K94Yhr8M(b4xw*c$ z3OFM`11@K-n*m472(l{6M)l^M>a6Vm2?Kl%Gj+&8pbpKR8K3R4vmRUla!{1N|Mi{o zfH=?0PU-~997`txTH^c8p}8OBdc$j9d{c%#v3)S~b;;)1?4P$-ei2g1%2`I<5kbdK z0(`P%pW#+q)#ASvgf!gur+77FLkWAkQLis{GC$gU&)9_vqA7O{<ENI8bAHuqZ=1wehVdD$2DP zDXDpl-rNyOnzjp*a}7zy_P_BH?)~oZbmGqOIcNTBq_sKS>-V7Q{n8J0QlA|$kYL#L z_P7NvN&nAtbOyL&MTagS$rs1IL!3c&V-; zGn8ExXPXG`*9$G{!~2^sRZAh4cDS0On$qsWa5L0#Vq$jk$<1*=Va2ti1l0v&`g(jS z1P&_iYTw>ik7k! zB`t{ICJW(kb6DvTCz7W(oj8BS@08ZgUD^KjPW(6^`0vM=v`iQ3Afk)+R_lTOj4+b6 zl-TiK#M*{Qz1UhkJuZCPQP-wh4NP^8-DY|&4H=C4Fi8G&R^F(hVxwHpTql04y!_JY z)EGgb#USz4@iK?$o}YS7-Yr~{)=emF>O(byoIHtHvI()h7co&m zXAS=1P&e@iBG$=yDtt+c{`Z=;trJZ~tX z_;)n)6kFL)TC{u4x^voS%%#$xo;?@J#%*&M~T`U`(j zQBku<`FO3Bk=<}kr?Y(D%pv%)n*|bA2?qwk&r#5=Z*0U#-g5AArX4lK)?bwE2D(rs zFTbN5_n#kx8~y%0@?rE=7C%BFqB~tKIkq0NxkFz3cl%MEPBSQ9CCqD9tT5p8u$5oe zx{56;Yb|_uErdIZmhKk}Ib{@%$vL|**X>tXXC5sG4ljJd=Q2bklp@~XDgvl0Ng!2B z7e6veZVi~Fd~ZE?Dc1^)NfhciWNUVj*y>45Th#B@Nt~*RjG9!|cswzs5P#?!eA@ah zPta-Qyvz);u&^!8=<)x^CJQk4YjBz|*gwEBSlgeIp~Em=YRC8t^VVxL$V?AsF?oYV z?VskwT7x39RrAs0`gVWQ@DK)%H1b78)Ol?gK!1Kskp-Mpwy=-e<}}!^TS?#VCA*qP z@td1K4jq9PnVOov%2W_}4jX=}sk)1!Iab?LhlGKiemceD;2@fz{_~**@U|gYHLxg* zf_-iH5UbO>aHz1W7=6^yx;(zq>D8X<`Vi*rx=!S}Lm@K2dsw?_kZiC?O6IK|p*ONG%cBo3WDHam&pK0&S4FlXUN# z>#x>m!*ZN?!TAG!fT7OHs<@fM17K(8dO zbmi1JIRq|m_ftq3td>MylYpHGODEByvR=Q{?0yp)du_HaG8Dr^LnO1SC0~~y0l9ni zhhN0w{7wxEV=Iq5SU$eG5;t6#@}?wraWB7RJe_rNG_XaU& zuS=J={(KRTAr7-5<37P~7tH%8HgKztY)aig2_*AiRCLMV%4-sfivIMDSI^z`o?J{C zUtCFDFZ+@|=p{Ii_J!PXn=?4PYJ84&x6#q!ZjCTWgCkxNIF^!YSk)SqRUW*%dtOs~ z{lDH|KP*bXUsi6EO{eyYG_e0wv=CrmsCsWnDRrQJUd`AUVU5jF68!EnTAOrvaHmbG z0f=~FVWt{lg&+N#AHn9o(M;$~7DL$ZJ+J9mINK@+ex&1h!W+o+`-If zK2Z(05;2ud{ycx0C=qr$5@;kMz;lmTQ=n{9-O3mKXMwkztbi~bIa+-=djRfCekat8 zoS1kP0TCZ*fUljulI}kQX=bPZ9M5C%SC*pTyeB08ZJOi<1zQnDs(9brD3Y&=@R8p& zLxfswfR!=&`U%^c2Y=WtMGAsAA4sJCi7|kcuf8@+=0XKOKIb7iYkX6{F!Cz9+|i}v z-`5G13@<-+hTZ@+>m}Rm#y&pk8^WZz+ZBSyXhUsmGjZR2%4pKnviMD)^EK<8v&N3M z_2nCt(r*`q+fJN>T$?Nsnk^%B`aSk3GU=#SLrp{&f_hup~DB$R{>*47Sim$UfzfG%D>#2w3HaR3&$1+`w zeg;KD0BuoO8VAW#8&SDo7~2@l8iJ&#&I++Ei%V(G;MYwdjS`;Q5FU|V?>;VjnI5b@uzw!xqNhv2HOX~ zS*tnHAY+z5GIjJyPoOA*&;oKo;@l&vbM+7Z8S0wc-w$FwbALTK*x7Nb769?*-0JJ) zOs>Ul9TE#IExw1|wKX*dT#Ex&60?mlH8mFm%P+y??sm-d+HKKcGkpU5leuj1uoY^W zaVw-}D(o?M69a*8W_u0^vr55Mgf1=!rhX(+$!SWrG{F|Wi>`R z^R|{&p~e2t-t@}dDum7ItTMb@e@VV)nDRh7>D&#p;uCH-WlXw8cW|H(B9xi`_`{c| zclI!uO2G6kW?(toOu9YgU&b|7o`#d_ei5vp_4pGqX8z-3*ar7i#;e0h!cm{;kjYJK zl1;)WM~2#1!cCUO5k-$523E+xAv*h$da>gQk1)kCMT;}4%L3uap_ zmto(xL-F%jUxVe{&I(dhc5S)8vNjAF4qt={kn&vo^iX}yJ)lgBU;HUA8xfM5i9UO7 zqUj(`#KgXYYqDtYY_G-e(XvOEv%`gaN`F<)Q}CijN)P#p2W~@#b_#nN2Rfy-4-aRP z{Ci$AuO<7=POgde(}HyP70(_Y;Z{N>U^LF4tfX4(C!d#&d8NJ|Os-`kOno`PA!}&U zu+2eXGf?-Ry7YN`sSw-PWcB^?)L(83iQx|z7;I)^H#H z;B)?qY>Q@bg^c@CQg4G|k2b5vsgyVa!h(&%0-hd9qM|Ye*2A^rYR#gn4+`mc2GX5@ zZ02;bhgKt&x^Pr`Uwpks_35+1kFLwA@dtKh*uM)c6c)2f6BzIK6B8b;Gy74swkN`& z3$)q^wSwe#qIf5EY3v6-5o8=y7C$JqZ$vyluo40!Rd|;ht4Ga+Il{0x;;yy2Jy=8F z&+VZ5j3^t*F69Me+#y4dGwBE_JyEMWT-U;1BNzEdgx}3~P%sE$0!L#S-ZWmNK}?E< zA??!v5D?||HNUoDj)+k2gNKI?u`M!vzFaceiYVbz+!SiO0ZeN_&kcGtXHA_K{&2y+zw=>vV>-T zWf3yY*L|RA)$9ZvB!A+au<-^|tfecDBqX^UK4n@6)(4W6qt!yGN8$1L1n~x%1~tbyDPtff*}=s7NZJ(Qr4Tkvu90D zvmSX!8Ny%oSfL8Fd!NPlg#4N2PLEdK)QB1-=*VQJS#46JHp(6$igLv>o59fED9K*& z+D;=*2n>8b;%B?&YI~2VUlp2{0$$TXrtoQb|bYAeAX%j(1o`Xr}+i z=x)D$32K~kDcV*%5VCj?RL`+7mHqem4Op}X1{i_)J-!-trZ6gF_UPS7KU;9AQ;~Gs z3D;LpT6Q0W1&~C(A3QuyjIfqfTMV@xQ4%MGpA|XQ?M@2{Jnf}J1jH#TO#~%*NFd(y zz4iBBJJ+iux=sJqZ*F2Fo|Oq`uzz7$$maG>yLzwNzzkS^X%3P2QO@^7$Q1=fR@Y_0 zI+q%5j^fgD4_!0CZJV&^K~dV5`IUDW)`6K2waVE0mn`l9I*k`Yjx4(NF|;We@@6-g z_U3VS*xmlayD;SKA=0n^OW+^cX*M|o_DKCXVuG?`Fe3e|tw_AoK=_zlnmf|BPqt?K zhA*vF+mD9CtB>0BKKl8AGsAn!beZjh#csVd4H>7!95!S`=99V{_si#@+l@I(4TXfu z4WCoLE6DHd!j3dHXK?HNDp&us&EcL^uFq>C#o%mn<9WH(uW@6pFH7WIBF!|fp#zp! zrVAS%C0tw6rEA7zub_a*XdtMPdlApaTUM#R<9uFh<6N{V`t=R9_!lM?@l_#G-fAdd zP<$Z#^nn(JT3YngwFgz?gX`8SXE#J<-h{-Y4BD(*LiCM$ZN4#Us1^0Sm~3c|HWm=! z=W*#5=G7qi>q~`Y{R3h@v3e-TPpbh^knD=~1ny!=@Q)dRN05}t5u&Ka=oO6{nKXj( z*JQICig3Wm?-gyrXFBYg^Aw-wmJjbz_{wzAQAMaqqrrXlW*t5J*7K7ehX$>MDoJ;a zXxbIOCwd}h+V%%m3)uiLRg%-n!Yl#wh&w{N8Sm2jlQ`jNs+W$dnKjVk z8~^8nH1ze;utY*Gj~o8Lpxy_V&jNg)Vs@d!&zc0s zLWn*#a<}$h#qDR-sk_8HqW-z<>G|IBejIe_mDt@&7{_`0UAEThk3}G~*?l-i;pIeN zl^Zh9FpS3bfRYpmKX0FE>kwtr#8q1_2`iWFhSd!3KHq^H5X?0r>YZ+`H zwyCM8#Om82Pww^=p|52X6GhBVF{>!F=fx{Ma!K7VMgS+$(JkD~z{HjQL58y@yZq2> z|NBkmksfJzFMfW$;FmKEdvVw02O&?6G7>|U$=XXMf0ylJ?PGF^>h{!A3htZl)B4lY z!z~PuT=X$bu}fal;C~{`*$HH(Zbp~G*IS6Fg??sv{=jn%UGeGM&oJNfHf|<|+_x>; zCk2wUk~iMA5_o}qBl#9us#k$d+owH8`iI&gr2E$>RBIl!sNbZ6OibtFXy7^%A5}J< zjNo#J@Ag|^_WLOdJ6Axbc6-$0E&K`wm9p)A4y}n&0rA00tfA<|L4cWm4b?z<42m8 zM~CtO&o|no>cJajN)#!>U#af{x8qVW1gs&TE15fA-3ef7rz8I+sd#>n?l6u(_{S}4 z9VyIPIuR(P_Z)2@n=_=(1MX{5EI4yFbEP%Gu!k$pD=Czq29bSES%2&>V8a4Y^fKjSAgz_v`~L@F%A#SYSYm(^unHw)F+8G3S!#p=4B=|@p$y{%$AV@Hm3Rga(Gf1){9WS#p zN|<)XW4+Uz3M>*&9UBpXdGC2Y$3n=@VyF84c{6`h@Aj!!^eEp~X~!t`S%m%e#@{0f z&pX*;f>CdIp*ESt{UZ>HjD(p1$3X=)a=SX8uu15ts87I8Ci@qxU3cpw@;|sES=OK% zFG8P)+|OrV8o&cRHk8%@Zqzqn76W7P$MTC41t~cfCWP{?qN=JD^rv1z7d;)#@b&`P zy?l((%X`!-N8eWH(O9sP(@akxr^{*8P4368@EvE}c9?t6d-SHQ5$3Wwr>Vo2{jlHjBP2)GV3JoeYsG&_$XIEC zWmz_u*h)rrn?1P|w~EiF%8_M;hE!phe=g5s zy}lc9e@RB*U?<>D^aQu8%BQZhn6g0$*8Zcv`G4WR8TIF7 z@p4}381X*4EFcWDwv2K!J9sZQEy{{Piqqb+A&m5W`W&zGy7;6-{mjF?v$eN&p*MV9 zo)ymOdYPUJ8p&a_ONACjM31Xwc`b&hV*3alreEuXOQWmzTRwmR`e@?+)ILB+Fjp3w zhzN(r?A~<2D+N?(jzL5jKtVA1aFd6<@HeP+(fj0-RAp+dX!Gf$gl2y_1Y-jQF+yb& zTd)r3&n8>%`i}8Xn(94nd=yw z3KdA5jrp|&YlzH&4`51?HGTFtQ`1PmpSg=TrT;af_7fHQ{^PlkPS0q=;4Q~O+<-T% zy{fGZa_i$JR#6018`ugOYQcFZuYTKq)(|!(oSGC8lEE9B$3x8ns}fGLNv?dQRc)m7 zA+~alNvit&eQT~Tjm+`cY+Qk5U_c&okd0xk%CESEazMtow&0F6Z0&NaNTTKHUfs8? z<&+eC`jv3-p13Pv>c+oa3Np0#oi6!C$@XQr;~+F?+Wrg343#fS zNIC7zX$Olj$vNyu{-Ng)TUos)hQJIwCbUC+kKYl5E(}-?H{s%Pj0+g|d2x$;lMgFo z1ccjDkD725fTC5lW$z!=8f5;bhoOV?=py+%{mG$XbLkVNJ}H3B=^3}!#!WB_XO0d0Bee2 zpYYePByOk*N;*1zJWXcE-nyW(&!;|D#{!CiMbe1Zq$IwUO1$E_@0jri@=Km`0G_`Q z{u>|xa7Pe~v5mMrjX`0hli6=jn08A2!joWmjlzq5TgOB9?HE|WY@6d)#gzI;6BlZV z@tsxteAfAUxUFg0RqjWHaf{^p=rlCDCWMK*(=_Ftld~C}Ww^EJ7bF>H<{e>!k;gLM zGHH(2aX+>u5x1HmO@E?qwpF8e*sTlmWbJ}+Db=GsVew2@s~N1m>4Ww8I%S8=6O$;@ z^!(-ZoUI>)lZp`N{Z_c1QhIN@=8-kUZ$?Kg5~r(mAK2*k%{#q_>2srZXWi>+kQ5NE z#)4&PK6Xj=RLwCrE{N0%lejI?8C*#$%P2biMN8kA2`yd#n&gfixLaS8COT@i9va7w zWz5~^=O5dxURoTj{cO&39vRQBhQJE{{A`Q^?dDoc+)(WHywF$70AVgBY`wDKF5C&Y zmFT_a+9z3(nG`nHZ)enm0D(TEJyC0^rMam47VH;`keQYV=2H3AgAxQ2&aE7}TMZ}A z?|PfN@8twW6272UcgH>f2=)uehl9uBGwDEHIWjj(cZHpn=ns#_3`87eIG{A6Bwh%@WlB8e!+zZF|V*hj|@==g~-);`DuHw^-0&6l4hiSXMb^>zD zTK)+ZAQTlCTRWZ3E-byIw1-7714O`Z*pwtlq;b<=i?&gTs7eW{3pdmyNJh0LL^04% z_kVt+UYg=ObxH#a3~QC4jRty6&Xx?{!oH$0JsK4AYS!COyb$q4ASE@ZQP?iLQPDP{ z@c~(5BaSzLxu1BHjg6Ad^Q|tcO1!?G5Zdff{06S>*+uu$J|Gm~0*#@Ehmco0Tg9f@ zJd#$&BiAJBRmf#10zUGVDEX*Q63Lu^d76 z1UC5VJn^DBpm>r9<8C6=b|}@J(sJn3;?P}WG@ys#&exCts@w@zB&1naf!;FLlX`(N zm9Zgd_P2E+DtZhdb5>CXYwV1t${lA5lSgLZUa+xS18E$8gT%4?Qk58)4doB!)t!g? ztKv1cNa9UWv3y6MX_BJ=dDy9wR#M`5%}NGhE)3d~rz_%eNNaT$&wK5(`hQeB@z0E! zx5NQoQ6f_L|l!PDP~#2 ze1C18%U$m;OIZv_K~&NuYvh2kp@@+lEbuZ@-0>4+t~pbsF^`|6=-8C84t9IPSQ=ntrBsc)Mt62toA~@!5nG3RoDHqvII-!WU8T7p2#v1F zM#R^M9!*wQ%1WFKht{R>)gmEp2a0Rw;VKn&+5f6Vg>s@rIh}wKmPWA2Cc*^o#_?Yo z`LPf$U_Chz_&K?1fBo2P@sPYIMkTzkyK*d1I2Fx{K>7uLI zl5i=4UUgD2jx@*cUqmBoS|ja*lBdY4EM99ry*BtYQ^OK*q?XWeyJ<^9FZ8S|KbWI@ zh9GSUu|x9_(Wa`@Nu`-eg_4&5k;CP+M1>?j2U2IJASuUPnJ$r=-zug`M);EeH=V-^ z_RK*upwIo~E^4}7olIDbq_OELG4C98bqR*CRql(7L z$!$SWjIFOM40ae~tyMb(dlyy()iiXQ^S~n6Etc^e|ee!g`VAF)LJUv)0*^@aoQ5HLr>|Yk*Mb&z`ZB)mRGxks*2bm{$9-t z>KS(}rCvywOAwiLX%mg`Ty1&U{jZa^Cq=1~IK~aHQEdtCJ0c=tJXXFB*mS6XXC}in zdTAIC%3}q$^~T1P(uyfGqpjzvgtTDZ47+}@Hq4p^YW!bCw`B$=fjqS=o3#mH#TYTg zT#~IwK#gv0(k03-uEQ9!PzJKc^J2D>6(}3r{o_l|HVO(P;Xjoukmke3K^IY?%xH%d zijr@lRgGtl)qQDQ19D;S3NN9&OKh9-lSqnaNDI={Zhq_Wq|>PBuH-o{=d{iLbfgVu zL|eB*8?!Ah$QF49t~6P#)Q8bAx*@$SKlKD&cs(`x(5JE6(y2~1I`EzqNn%pfUJSKi zCsN6GLg(e)snn1*H+JP<%?^+yJ=&36CktEvXS~xNsURfRIt?NuF;{*N%2RZZno7}N zj|6%3=t|WcO2{8!(`8j(KsYQfP>1YS=J82btDqmw>za`Gl;eigxBO;uqPUPZl;yf4 zJ0>mHkPnMtH+c;D9--29ON&{)HOcL4`i2v^!v0D+QLtxP=2E+(u<4t5{pM=yIP8n} z$GqSx36s{=9M?Jf6fi4ysC(XAeI_t;1o1T4*OCpot|kP8{-SuMrC}KS5dP_Yp8pb7 z?AFlo@OV2k&UR8|#UF*ozTM!0n2&Y8hcq)9D!pWQY=>b-BCBDs(%(Yq&w*mAz= z2ig0!K}#kT7-iS3GBzroHIl36gR})&Gy1X-j6mg9vB03`dYDT~I1S(2LV}Fjn zTCshytT_=wkeTsCvit z%(`e>_la$*V%xS+F)Oxh+qP}ntk|g7w(Vr+UHdv`o%09ghk4D}M<2cQyS1l*zXKzu z^uPT4LH0Ur46Ha5)4CL#s|vwF!*2CzJP}YBdtRUAZm#*?18_@JIUryQeqxSPiRF#3|9Y*Fa??S1P;dn2d?OfRsS(buWO0B zvW+qm53W5)K8k^%^3Zt<+f`}2)Uye4!LPs&9hS5`Y`nk-y!F{p$BFREZq@h1^O^%V zx;%dnrt?-SR%R$MgklJK2rL`rCItm8U3ourkBZJa4kpX3=(S`@wI$40{szB_O$JAs zvx&GJz{fx;Iw1|qY*V|h18&ZH?X@D9*I-=tSI<@&yC+cyywnjOB~?L?|25c?A?~1z zhNpl?Xjfdtjuj%ji^olF_wz(^hR@=HR^S|(+@~jZ&_&q@vO)GRLola&U)1_ouCHsp4wrVbk`!7#zM)LcCP@r6|~w zT25Q;7?KlZ{c{Kj8w;198VqkY~FS}IP zXv^xilX=AB-2citA;fy|v+TGAmJsN`o5Td(1FH>OKL~|@Un&Z6V70mZCb6;i`L2QO zN8SwTV%oj2NECgScJ+Fzv&qlDq6+$EPQ{&Ed8OR0dbI_G@A1|VBK~ORe9md@ef;%F zK}XBVH$cS`HEs-%P@GZI{k|gz8XrbMOI=!fPgv-tyjQgw2%$glboqdxBkl?3>(%Df zev6nR-k=29aKTmN_e8MU{ymB$-0>TSeL7BAO1Y%`IeTDnFc1~3iYO~3P*4A@2hnNcwpy_b9couJ?+Vo?80de+&cw_ zy!GFjDq@_Msx7k#CNFt{Aqx+MGpz}tXIX9ff(=dSAT-69O9PxVxLd;i${2c|{FA85 zO)+V)fI+-|cZ#@Cd3kq5QE5E!zR5y;h7`jI7*(@dAO?S)U=*sp!-Y)lRc_fN%7s=rD<1^ zF*&NFgJ#bIHsbuTD2(a6X7^upV-ZotQ|iNk4x5Y1cgA=#22=8vv^&;B!A5o-o(DuS74PDMg{$lvSeLHs_tAvNr`2<+zg_E^Xb5%j_9VA=AkE7(8bZY zrkxcTx$~Dc$RKbCWNEo5>}mh@uiLWH*5)%>MU62iG(xL$E##BC{FdOP4Wj(uY@uJv zL}|`)Nd8w>R}olBV$A0I1WQ9PBE6joi4!`)FDEN9g{I9W6=r$TgPk$iTR+dXXN#;7 z?2_2h{9g&fjvBFTmbeYgv-QcG&<=ulc6P8xShRVRx^iR|6aS@+YwNF>`tM#`V2`}W zyJL{JOyZdAN--T#JV~>2pgo5)jfo%9i4?eD+pZX!UGI%1E8o?A>w^To5;z7sA#-;j7yOJ#E|4!X*ZGWqYEzRfZy zPBI4CFEPcLAuSZ5#F@FuuAH1*#n=w{XgXsn1}KU6BCsLR(XolrN5M)$QbQu5sO1}f zL-E_If5jmLc#Lj!^?LDpT4TE+7U)V?IgVFV?OVztm^#En0+#8p*SN`(KFTo1SyRkg zy+~c)P5iXA2HeeBe5VZ^kh{D>UuQ%pn%HOZ_BVhtCT66s;?i9y%VZp0Pob@eAO5Xb z0eWqku)dBRZQR2d<1VFVfvNghY_G{uf)aNn+^d-ugObK-jW^DE`^;zGOy_dDDPCkz zZ+ZxXtED-aM*g5(M_c%iIzCUFTv6*h46`ME;EkqXHSxGfM-AD>XUpv&-`(x8nsk`k zd7r7@wcSlHfAl?QZ-LTl@!I*=OivBhl4BW@*BBzMa`lwZ?tg)1PO)69j zJ{kGotQ1AWvDpl)vU5$~|Lb7zgIh@<{xtd2f@6P1gm%CQ2&iNBUl&o;n+Q1<61Org z%zu5NrqmFAK^E9!cCaONHimQ z5k8t0UhLs5TWN=@;n~(Qr&bhseCT*^3d4NbV^e7|jyrP#`m8dRZn(ZdqWOAIa-43L zzoZ0a>n($v;d?5p$J6NWfE%x*iq6o4zGq5d_fW^~t}QHI)AhH=ndibEQGmK0^-o~u z`O-~tXBRGEQ;ZE@g{+mHV5szkZ)}DA$`S&Fl$k8mrRO+9djzW$d z@QUF3Ney01GT+)c7q>CZLyu9f^%_!J_~(=2(%tEjf-@UDti-X8f{+Orj$~kBo_&C| zoj<^2`l|7XjMq8lsl`F$Pb^MyNIwx7_OYHGif%XUfgpWy^VN)E`v1R-{(M@R{vFM7 zFhE4|@*1&9L(Mn$c0z62LlNLG1Tg+JkZlT#D8Fq_h})A#X{yAul?XOy5pHW3G;(P{ zJrIDE%ecb(3==xWwbvDz9I!Ts3S@}b8`_ptWPw~O%gT|bZ~ZJzyB1Wi zd_=|)-j93-G+3V=H4=BX*J4~xzqg}ov8$=%@AUz(pkWXmd_n9Y<*ryairzs?XU8_y zcK1I%&jAPP^eMkf`P10m4z6J0@}&5)X0j90F#(tJ9HZB2g@ae*Cyy%h{PlIabfyZb zycsNjsIy;p!7aG+Ku=!QC-G&s+6<{~at<$wb+7XU6v@|+x4#d5KF?c_A>x=*H`<)5 zdR?cRmNh*MwQPFUxh+yr-3Xs}YR15Ew-{o2kIySA#S7lKUZ&6v%XOBwLk%gboO|Um zrKln)pYwm8=|;0o@q0f~ll?73tt+Rb#9g?}-+s~%#>GGz(Z~DDkImumf9J65%ROFd z>Gr&xP9Qaj6T8&tFo7#DlVf(jz)YAOdYRC)jZcylbQ0!RvXW#cd2yTODI=Kki5L@L zm0!@(mVEr8^AJ=cx;w4y53aB~&$@g{I$zWsuQA;1Ivs8iX~F8IEka!O{{M=Kn&Ezo zIE@J?8{@)ym+!J7dCkpm$K&UcBFqEbwJL!?9+pYI6YnIoc+s#Ynwlv(v+7d_R6L z8}Ci+u(T&EE>xd+ll&hrY0cHBAi1Yr4W&VoBResgSmv(unVtLKHY+pLRAOFpj^CD8 zP&3sVoR#EL8zo^^PG}{DYVS(O4Z^Nn{7g?7ep#A`&R!!F=eJ!LcKgTSwf)& zLy;B#$79^F^!L!t7YKvP3uHwYN_2z9`0l_U4<#9TVOa$}rxAtNsd~anOYlcXXuN!i z2S?b`uSz!Sg0;2zNeYx(+G`WatVZ+T`tMN%x7mI}}SazgSCU3o@R;Ykzz-*gcv= z1#n1gXM9COAQ;Q_TvZ8LO(U!R=pq0&d@9g^b=$a{JPW@kgC(5l2mcQXC15MqrzoU* zCJ{$cWRLqN({26;uB$pY*BRv4)mp1$#@cHJ;Uj0_fnWCs-}~D=--sBmaP9)8wfERG zF(_z4W)G%%02Jq=uZTegv4Dh7S-9c(!@XE@!jluYnWxr4`kZ649WB2{rojORfBsK} z8}>=yNq;EsZ?)#^d%H z)!GGw#Mdon?ub;k1o5B7y(Zp9s5j1%WTPItSByVTMl?s_a9(lHoOkvMsNBJLz(0iy zbT(vwm#gF*jk_oLx5$cjq=eA5*lEg?9TZ$Bb9Z2IQcr@JjrlM*l|yV|+()bJC$ZKg zy>~8}KFzk_<0`O3gpTFH!qUI3{EV%2x~8Lsk#OeHI9+)WQpVEhZKFd2LvyTg$sKB7 z)9C=}`c5qlrF>kkWuC0p{cH2>dKgmW-?lsslZdl-pR^QojK44{@k>NPCb;8WyF%^NCN&m{6A|hW@i;ec~bJJgO2Vj)?!)D z*CBW)!@+cIp)KU9J)tv1w%&$>cIQa5-eoC)5~Nv#dvfbk>^cLRpEY4G)jI-8%-7~? zM_RHqk__qng7oWtOH*dQg@r+w%zcZ}@$GRh?oSiUo;}V9Ceoqb_NjM^d)s4mdAKD( zMvI4v&1`If*dZXbAEM0u?*|F^Svh=|y4u-dI(QYH6}zjg&WEy&rafA$h?nffnA;fa zozmL6ZPgWK{&U`D;|%iWblXzGl-Bm3s-GD-STl@}&RNf~FNqJ-Y)As?4GO3;E% zR8*CVQNO3!c*Uvx6Hi{99sHu~op&d}UsFYHtjMHg%snGYP(5E==S=I+iUBn@-VAc} zeljN`&VuFts&N!=sc`*HeNTDoGT0C~sQu%A_#i#)aNm!C?=kzrj6Xh_M>>>Q!d(IC za;KYu7A$mN#c0hO)QWslapjDQYGaVwmE5*)<4qf`i!_}SjLCDseOCB15iqblf-%GQ zg_$Ms!j^DRR%!Shyu2R2Pu`YGC2Rv@xJw|~knk^@;Y;t;0aWSsBfB&mG|ug-S4~Is z?P?Rx+Nd;Z-RW|SS}=>*+DuuMIX3)b(HMa!>(I4Y-gV1mW35*nzc<&s(n_!>hmMAF zi0n^zm3lY!(9hmmYAi;;bvs55&r>VYijiZDit^H|a8C{2cg zrhg!D>*9+KBVkM1aHz7vLP1{L02$}){Wa}xP$g|eLt#&gIDNLX)bMftf%hHo@rWjN ze{&27zRDtM?u`~Z21MuN%OAHJ?XadEzfv16BdXLKFd;y z1dqoAx!FF;vhN+i6;T*`-dIw2OgAOTlZ*-r8t-p!Wrw_nThs6S5y=xNGWAcV+mR#J zW1p=+ZBCA5&WudWI+s;N)caN^zRMIMLjx}Qo~vh-4PRPc%WjVK!LYoVPLWE$Plfi+ z3>Mf{7P=QNNG8$MqyNQ~9F(%tX&P|UOWW$eO`rt_1P93n)CGm8|%#BRs_nSWS6H*v)9rDN~rig3c zf)WR**~87cOY(lKMBAD+p)=%>qMYz{3Q0MB$DAKAWsZxhFL8kLWd{R zgXy8pBLU%}_kGpZ;ON8iHn_BB&Bw;&;((%b^6Qm-CZ8Y0g!kh>4QW_JsD)y3X5ihn zC!(vd{bdCI>sWNc>fGrw(~%1%bE(FUzFRI4yh!JvZqs>l>#aQmx@lem3zN}>r&cT%j`FEE0hcQ8|9r0bstUs|gM6s_lReuKpiaft-%LQ>7%zmSB!Dx%$qoD8V=0xS*kXqBK* zaShf{>XpohMcz<&CDv}ZIiy{Q0}vNjlu6@xem8__8lz4E1ZxdJk$>cxY;dH-#iKmV z5l;xOSvA)INiS|+&cjdL?{)ECLy8Af8rc%7id3h21qHBQ4drp0fjtN?(EaiWi+{hq zII^=N8^PR3AhqM=44MNF4((;C*n^H!snI$b(pP*B!fx?W9M~D@mM)ZXb}^8OEhyhh z9&z((@_gG1bpgO+zk`Lz5pG;qI=+`lBC{A_NFfmNJl5gcU~yqh6Z(lx5pa1eP$#4g zjt@?v!e$YzR(b~X76pXvXX_0^R#4Lm4+62sBSQ!iklS22+hx|>$pW=vi5mgekqfg8fEuM(n&`}vyJnjl@?_*lTs;UP#!k(>_ta4$1| zdNl@La9*t1h?DV6GOH5SUpNNeVZxVaiy!?=SvMO|rV)7h{L4FS%$bB%2UV0+_a%lU zFIKz}i;K}pXn!$_ z-d6i(Z6&+qNhlJN&Q_mxty7%Vi{T$Fio{J5cI;RNcx`zZrhcxAZohzIWyeQa2aGz)TGmUsu(#bBJ)sOR#`r@ z3({Wz1oO)sQ`>o3Q38M8_Q3qh<#!fix45Jk+{fi{UVh9F4VgsDu5CHme~x^u2*7Gj zmdoqw#Q!vcn8*H5rfN#=v1QW;I?7_{7MqQg3rO>!k;s6W9*@av_}h57_veUId&iOE z?sKBa7tu+Ycp}e;Sx@3e>fl^Zv@Eh_xU?jUT2<#m7e*X#tuK2uU`EUQSyGfh&IIjL zo_or-vTVcnW|H=9qQ~9iNS>1eZI&=kSPqde^`!p@d0H!ZPL4pkPfK2G?u$KhQKJg{ zsUZvphx?|#ez_Fc4uZt`K*{0}KPsN!Z*=0co65%bS(Ti%BkCi?hZHR}5b-hm;`RdU zBF)_>GLeIEBPsTrKF{s zJ0{&o;jy96NN01ICtSR(W}0iieRTz7PKXkj^>T$aS1WjwD~)!vI`QyWL^NViSkNz& zjVRZgap>7$f1NMWV-~9)N9`&mn|Gww#VZc|_0OKF0g-9>bluq>4ZWDDGJINP{&ut1 z8w*}`W~}}EGrf0nZ~^r{%W)o@z+L#OiFFZPACk&r4SJh@$natG_jvwrIC=P8T2~{E z)klJ)-koQ2STrf@ZdGx$*i$*KUS*q+2x4}e=(~}T`jTPo9-i&V%xup7ENhMFenTI2 zx~7u^%aR~F?e(%|=-BrMqx8IL_D6~>TbW++|v1ESFpUo zmy(d|phC?(;Bhk;{sS%iqNPhFYJ(~!NiasU=eTdX72O(i_IdlbSLd)qm$d$Y3Z}U+ z#SGphkyDA%wsq_KzXwm5-S!I+ZaeY6 z(~8{G->;3x0hyA0Df6zK=}XG_2)sgFDBQH4AFaRa?I8{EAnvyp$(WkS)QO&X9@G=O?wDw(|cdU3gGN%peyB-Q86WlLE$Rxj?urvlBO0jiqNvSpjU^g`oRz1TY z5%K~&Uh$E0Z?kPoJp^@Lv%~BA7YzXx z9+T^@jsE^Aw$`)UwKb0_t?ZcX@7LcVVnGIHK}aR|tv`_vT@P!aZboxjAM@&c-*Dbu}yvTl|}4Z?41a|7Yod_cN6rjef&>?gqW-> zpK8^b6}W5&+*Pcv*AvW1F76Cp%YeHU_w|fw$y2F+B3z~`;k^-Cj?V{QPUa=_!t}W% z?>d`y?=lm0%`YJCi0J?hNLKwfr>Zw2$~(%H+dYA7VhCO$3vDnjG}EVUdskOdp_`qWA?Z2b;#n8ViK``-^~cSc zugZ0o^=i*@AT+Z`X?s_4i4ARn>F=ye9!PV=A|T+&k?Y&Lt<2Y>Om61fEYGXt^Z`K$FmEhecQPXk&7s$( zb?98dhVf>~P~uqGRxNrvj@cuRQiM;(-e*UrK3i?_P^bCGb!FANm<=Nzha&}M*uSnv zzLwYq(ly5&2fbzTGCqrGi+*RV94~`BlHnvXBa2xF4Gx^#<00AiKjN+)y~j5_VP>UW zb~*t~tpCokqs_1&ex@I46Pwi{MzW)=+Wl~La!~A?2S02RYeIT9%~gi#pRrkc@w4Qs1yDZXtjHmgV~Qs2>=B=2Et^!aujdYM zYq{8=X2Sy+D$xv6had!nm$3*~GBq_nUN-Tv5QITZB^E(PNkT->tZ%khW#Eyetg zIwx3Ps{LC;tPLC}?98P7=MQYkgJ5`AL~?%skEGmh#V01`xYNZM8R;cS1retz_-PdY z5cK{1!AtyrVq9wF9WK(G^$^Ss6uAs;n{z@m6t{E!eB2}jEvLfy-7QQ~-6&fcF0n{+ zITl0CE(^_yn^s8q;qjq_g+YNVAYg!KkR9Ma@OU}iKN#LIbp=2iy)(gdJih7%Ff2)AlmmG6hNbt(a=1MPsjmTAq;bJo~w}5Wu*iRN~hV0_(iLS zL;Z*_OG3Dai*XQapXK9!{AOw8%N2t4fd+upHh`VBIP>KmvROp` z@wur<0hZc_UD04pPIYDVw<}?&E@Vpa3OU@OLL%kox7XwxJKuWJa@!g9f#YDf=KH6b z@ZQQfq5RRFuLDNV?hTfHte2^B_@Q{ z2g6UdZ~Ih^-J8gQYN8n;rg!K1Hp(Z=GbcH35Rzd_UULOP;gNyz$N@!tof9KOLSQx( z0=~8$R}A&ue<|d-&BtWl-OOCg8M&X@z1jRFTH6HMcNQTL*b_O8e)qRB4w$7`p!>4= z3k(+Dj=$P#-xjLl_Kf#CY~=hmH%i_wK0QC+b$svFVBFzX`CN|PG6DZJC}OdlKe_S3 zP*7{|^WF-!;N7ligY{0|I`(1Kp$Bf=h`g@mfiN0JIo@y5`~U`@Hc~2X*Ej(YjNpK& zsrS%3vKj#5g?%sob16UNIR^=ae2@PWq=4q`2BgG2&ppB1F6b;fF*Qow8<*cq4fMtq zr+vVRVV3c3w`kw1(xvYkQf9F#y?6>cf zSKGV6YaH<)j@)P9M;M=3~P zB`YmM39yEQf?YU{p*b$~eb;2r>~8i>l5MxVGvdVvIE~$UXO@%#^2Cd}$CeP~$fiq? z2b})u_F(6gW75v6yva$=rUrEs4g@(^_2nT0`f`SW4VcPx)g*K5Rj1q||St^)u+IRXg@2~74Qwl;tbOt9Iu1p=Zb)JK&hwLTkoz%Jbt z-^Bu**su3R8FLJrd=jpYhPmm7Nh@RVP|(-F-xpP& z;4ZPC-*+$(_LndVbAn>cBrCdC*{p(C+aEHgX|(H4V~KLzWY3>xlCKBZrX(~h0?)hmXRu=^DBK-Q zsBC{Z=Li$B6R9;_uTqm1V0jVbMhldc1uXGooC8*9R`BkXsy=5&Zrd9xzIA+AzB;X7 zQaPv#ozu6R~Ey&;Z1c8~pM(zz{>M3Gug(>9$Yuy9_Bo+jQSbfkBh(0 zc%LG-`TSWG0mC@Gq znD+ld45E2oSG>AbvZLBYbsUp&ZghEQaPf4x9(Aa}4;O~0(y`RV(kH~7UUKfGu?3FQZ4J4i0( z2@|&c>EZq@#kWb9oS8Vp1p74c=NdZ-ICcKft{qPXB<0fbj(fH}1rmz}{n*r-njiK-QSMKgCWKPivt z&Zjf-ZSU9iA^}S#0t#jF@%B}XekjFjAmPKlD?EUK5~?04q_(OmFaet+&5m}g^)}MQ zF*IkJYb(!lEWZR13lT`b02;-S(A8gYU-|*t?6ALE8m-*k9WqNb>QuTj*&sXUF$6Rl zlqq}`{mSj0PsFBww?j-0LEjUfb<|8;K%LTJ@i-x8-0D$59-hGTc=oqe9VS+8``LWo zrq3I22>a(CZ?)Tv@*ggk<+)tW!=V-l-M_AVlY#~yhDP}1sp{+~>FDAV_Q?&IT)#Z9HvGuiG!eS0Y&o-Y$jzdqV{?v8z>VtYXB zWs@6j?qiL&vYvym*Wl9#Qc_R}H>m%Z@ZCtCa=T%sEicy1(7m#==s+c)*v(8&$5GL6 znee^TMWu6~p;YFgm#od|l=NQy&1w}qG2T73pd^1^rw9Rqh0)?i2l(wmTrPh&Tawx? zLf3dH zuJJ-`E2yoM=lGAdATh{-GDx!BnZoqWb#P28SaR(SLXq@=Jsb{rw+#!wMKHhz6ptqy4w;L`6i(|&f3Ec`JpQOd623Gd%tqiB zz{>i>2*~CF7%?BxiY4G}8${3D;AuuBC!p_!MT?jzx%GOB7@z(Hd&f@B*g>fz=vjrt zhzs&$Z9RJi{pitPPq1Mc2ZO0kHFAo#iJ`*-)00zF(Ot;Wk zydiy=jtzEGDVRhMH-5Z3y)J$pX+1eU&0kxt!Rdat#_f1GVXNv_Z&S`hw&3FP@|W9a z&-eKI-B5pW8v-taFY@b@Ftc%gwXl<{ON$T>eK@80-LU69(1PiNVQ-hx z9(ObE`+f0;AnnO$9YHuGOp?=r=uKxwiMo#0C2{)wD-lN=a2yM>uK!kQ?kjH$O6BKD zgG%P%kQzT|B$twN#d>S-B=k{}&57FgTPFk>Dp}#{w~m{*bAx%IB2T36=jM#@UYmXe z#@Eet4wCprZ8+sAGz&jCxVutt0;ji!b4uy=S6Nin1I#P5-s{D?O=_vGmt3)e&;2Zo zHUImKyDoj=k3+|3+3x4zPCm+Ae*Ch(v%(XN{n#K?X}GIcTko3xnZEa7O++09lr;P<@|rhq2CFTW&b zd{Mj0Xv(pheAMkx^zk=wCP3i(<5pMt{l(4iA0_lt&sXm8VQTMtcR)k%$#Wt@PwVvt z*i3#qi6Ja!fEgadL!tTD*du{cvz11xtfOlDqKscxd4nxEk=9NWCa-?i#`6tvgXue) z1iepyN43$@^{>hHYpobw&?-gdq`Fl_Fltn1*l^< zja4|9)j^(`@>xFaxo6*-w{wHo`q%K@Z|#rW8}2&GRIj%yZVuIyfK#o+uj^COx?yfA zgpW4`a}b7Hf%`55{)AWjsrXYnMaYaCf3d zm!zqYy4cIKBB`fSl&Xa^V#3>ds3Uqg+9t@-#V0A01Mat-BOrWA&d8cm-Mvg#gFhHR8&dKqoV8c z&XLOT_9|8SZ<fAgo?seb?m9N5lu7f1p<6DfaQe)CaJ^k@RQo1eJai3>T=^rw4P zu0H8g{PYn)$;QpyFZtyv)!y6L`4gV9_v#61{Y^iFH8`$Of`A}KU(A_{kNpHCNF0#E zA$t2oDkI$lm7I3FX6(Mu?(Rpv^76Z*fslchBYShmyCL91N}d8ex(42#$3|>>BknzL z^qf%r%puaB=Q<6bG-tG9L=5#pQQE$D9#f5{?yec^qaY;kVA7{21lQa6Z-cO71>Y8-S&hqM^rOXhI60OnUA-_bMT#6EFxa zPG(uPyRNZ>!y}}+NA@Jj0tm=su#0Ji4%N$k*f_zjyV-#?xv%r&RAXLD<%N1)&^|kK z^&Z#X=`^S6c6^aw2C_E4n&`8QE@ty9#-uf3a(`!2QR+GKz8~QL5ayGDJ%IHdu1#iA zpoqmScw@iMx1mG+fLKk8j>UWSv1NyCmqmL~7GvhwpI&9}d9RDu3o@}g)_v2pavw1=A$C7Z^T5fU%hnnh9u-1w8zS4%pcP*Y8g!@Omt$Py7(0 zw;hOm_kbJhc``*oGaG4~R-iBs%(cOiB9D(Rq2e0r73fRiK7A_O+G#(k;r;q_HnuRU zfiyj;7me8c%Tv-u(=AHk`aZI}FV-}>ABz;u*Sl)=zAl?WKb&X66>Y!miQTNn4rkzt zO@9_cCFj(StF`*Vq=$3*RTvBjB=j$xzz_m8DeX3{Y;5A$Us8D=XEVMk>s#XJKc>Hpla)YB5cRHs&5nv!r+D4orEewU=lkvIpTDgG)vtt9a(-TnD zmQoBpohNjXrfO0YJ`+T_hl}A#o9Xzp(!-bYuh}u{t+mi0pik=!$RlparZll(fV_4 zKh!>5u5Y_Yj_0d46ugiK*^zunLQXREwQm>TQznJy?jCD4zsC*mCs&;h@iEv}F_eeC z7IJOYjx6u9^9eV_n3`=Yi~XB6@cr43xD-`yejm_%JpRr5T1IB*^&UuHWcY68ett-< z(qcSqx;-u(M}fsx#4hlLZN^PLnt45ws=LXq;$#2qCXy?!uQeZkileEPM>vTjJ2sK%i%EM;2La>pW=QR|8$kJuxM=De%oH)csx|^ z{oI%94VwH7q<+C|%y_`dltlfiFi$Npx3z6Zq(SZA|I(rCm_f?_r)6Q%(-%pxDYJ^p$l zc_>1Vpb^k#@?hS%Fd8HyrGjh$4+*v?Iz+OX2TKqHb*Gd>isVa0s&fisQQ^tsvyiq9Vn%&TmXY#t#J=4-psl$HT3dPAxe*db7e` z8J{8OIINN}_zc129$O$=&nO1HPtksnd5tcA-k|jcM_9V{2Km^n;v~K9y{l*#T^}5l z0?!JwuLDWn;bBh*5h5Zkf}FP3_1lX|yAiw73D`zrtVc#gFL7r5h&3c3Hg2_6r+57} zXoD8T#*TLTw5pD*h732CiSTLFnr- zg(luud}da&5^F>K1VY5Q{&kwXHOMNDu~uVRrvAb)UXCVS89vb*}byCj-C9^_Q zwj26Hj=FJQ3`cj#Z7+>H)7~{D_e61im%v1$LPw#J&+a51!15iAw_YRNU5Jt zG9G4!0|P3C%k>-#p*avYu*6WzB4Wd5`SV6-nKpr4S z+@k<8G4M2KUw5D1`Iaew3@3BPd+WB4fQ6h-SUfse!0!muig<01fXBj*j9Z2)C-0Z} zlL8%NU=G(gUsEzoEHl+aJ;KGw`gM;kQK7*@o9ar{y|vKKCv1ld-J(B0h9lNm`#gQ8tMX%4>j0UqpRu`4#dy`;wNvF8BrSGE9u16$Bl)#GkHLFfS@muwB!?s6Z)gQMm zG>vBlKl1SVa~~g?%@(5U{rbD7;0}4)cB4q|^4j+nW>I3R`P+}FfilyHGB{(96F_MF z0W##cLr`C%+ovOi2iHnEv0*tYPr22oDHVtEmybmzOW*eCb17wM)<+DoGvH`-+>dP5 z2^C2Mv{V}~$Q+K_95z<+7y^=yX$ZQyV>4YdF2;@*3AG`#L%VH07K|n%54Myz7oOYly{)=_d(4$nABE6aCYb!9cNG{baJJnd2C?L|< z6wqPR#SGhv4dbA++a@fgMR+kP5|$K^1{89gmM?5Xrf&BRk0%J+H`_?y#5w$0FoiS3 z#w5k__6S0~ysErt+^wWD3^J`dK80$%P6MyLzzujX(O>^y;D4C{d9Gvu>)rPXmhmuV z-S_E4o9tH*2B+qjzI=T@j4G~5e75KDgXLoey{pz!A`9zEIb0Y+serMCKyMlG^T+ty z&^=}27JSqHS1k;L+&T8s6qCn(>|%{g(Ss*$Xxab)Jin_XB?>U^0!^YI*4-y>eAvnti+0>d`NKRmbe=Kmib_; z&6mfurF}M1{zIEI;wiw;W+JGq*T1((Udyu@x=k#<+x*u|Rcn7;bqg@qG=7=gVye?s zix$~wG!JZ779VxH;I$LUEiW8N=<}#iX4o2;0CCjkKAo%Xc3S<1?#L@bw&R6d2iNRj zix=Gk_1@Tv$8J&AP$`!sgB0+Z6nKiYt@9ReD1+Dw91k^x)|QlaZJGa$Mz|N?&AKi| zt~{XFD*L_bvAhA>ai$aZg|#GyPOC|d(C=bXGu`0+&ex4zuaG}W@>8giZ(U*3^I%A* zc!2n>2h}G*gF*9A{*shb5ool7M&V#cy)a@ogEp`jyD4vFQQ`~Arzw=!XLD6}?MjZa#_wiA#c_d+bmC3wNn6cpK@D<+z4}55G}=Xr>$wlP zM$V=Pg^Q6$UITpsE!iYV>Y=Us<;&UeLX2Fj*3tv+@X1SVv39&C)CLq`%5y>vQHObQ z@Rv)0;BX_8#-RG!tU_;Nj+e?kT_vPiQb}h|N^S1-I2xd065}r?!bq#e?&fs0%IbK@ zQIMOiZ392cDXpmlF+sF)Ir0|LuKN=`5x5(quhOVzlc6VU~L<=^$Ox} z{cf=U<|%X^&;oDh)*!0}3-%LJ(?L;^4Iw4*yPpfWzfwc5I`9&U>N9rY{%qvvY3fcF zXhggEf739$HUQyd6gSL)UITYx^Z)m9XQgNa@}}{}p2kmT)|&*a${J&R&JCb3R2N8N zLR{+D)q|5L!}@@yabU=SQ$ZQ9fqO4z&H=DNC8}9sd)?lO(O*_5E483UvLFOwLqaUn z+z>Q;zV?m|De4m7ZUqSR5SH`G&~pdY#)SF5mAP9v#9ua}70x~}b_H#xJu>7%6zvg5r=F98m@-U0=e%&F@Qw)A4p z>2FVh??Mif?Z;#+pJJe^L#&jqq{p>l=?fm1-Z6Hi7vv4pJ=}(5^rI2v z+*RWHkoaTDc{-hulmk%9CMG{2FB%q9Q>3>-9!KjH33Y^R{ksR8zVi5Wu6*0J-8R*A zshVc)Tdj~ZIeKW%jv<`-lww3O`efX4k$H}KQz)RLTKYcck*)Rdev(Qkcd~$=W1ne> zhkDTJFZDd^hqY`5>-d-uC84lB1@zqBYXbFH>61E5z9sqGE_DIH)26N_2AN>nH3_x7 znv|zl?a(!IfA=65TF~dr7nta{RS0+Eh8RxA6Y=mcQ1TraxMV1jZi+h9%`gg)KtNatzdJcyl5>*(h@8q zOc&bgCrtZvcThxr%+8^NQG~@CQ?pCvUS$u>V0>!vzO1PeJQD9CmwJjy6%2Ura$7k1n3lgCen-cS%{*aFSSf^-+rg5XP4}eS1tvLQ z`>b9rZs5NoavO{owS6ebTEt+n2AFMD3@TzFp8`pyjo!1))Y{a-(Y zUrCj;kGuC3^0Oc>%@OpvcRQj+@*2Zpw8%(}7)M-_R0-3^|L;gv1LlM#7H{QIb+Q}p zK*qj3sjF9I@}hdE#I#OboRGLVAHv%{6&a@cYy-KRCxbYdTd9Z(Nn?ETGX4ZnlAVE& zMc^codH>K#WlB;)1x_FUUzUWvwCCt4|2V5dRp!L?ZbiW@79{>Rhjb#UgMiEPjZj-E zb=O^a#%_A}8!nJ6O59OU8lh?hDfAMCznT(ZVVPy_m!5blH+OhlQ(cAW*U~fTi4tUp zU0-btuqLJqN2FM!6j#jX4gtp$&~_5TME?eIqOXZt2pJYS1A1BJWfPd0p$flw{vk&= z^MFtW%|(bTg(EXew)}0{MsD!2G#0$LI0o(5d^X^mR{%q0>V*CYH=V`{7#Zsllg&8Z>_8756M0UFw&u$x>_cgz z@#QmC!l^S9Kn|w0z}^|O>L>mb$Jg46jYdyBuO4hxoQtq)0YyOhDS*ECppVZuFT<~6 zI5YPdYoGmx?ep`vFx9}Uu?+qyFF)17lhA;vO8|(`_P0$axAHU6{(e5Z1|gtFLPgAb zWFVw*F4n*&xtc)_SeL;Z7V6dxm`zH}U~veNk{>i6{J6;dqUe0ORO1Y0@ykmTi&h1v zTOGzwk~QQR*KHQcig#P8_C%=f3#cQ7_P0{2n~(5(jt^k1EXE}05tjq-sSCUZntMGb zts5_fz*XGiqM?I(KKP-t6!bI1Flqb*Ah=#^!b}|-0s0jF;Z@zrlPnUK{U4gnfxXT) z+SV(!ZQHif*lDa4+xCiWJ86TajcwbuokoqFoP1~R{U7Ev-}ye{9%HbYPvDwoq=@06 z&>W;B2t!-EaHrAia=k3?D+53e>Y}f`c%EZEZ|UHLIrs}HQt`>Z{yDK0F&xHU?;k?u z_CjLt4>m&m*^nMi5$64vmr0atzgbfRquu%=Z^^2e#LB{`-@MCL(*i`if)fQzI8e*I zEpB?kxuH;s0mY}=b{)KR)dL(-0g4*q1gQC{M3DQS>%4yC22w_mA@q1DpSGiF<)3_}zo* zXfAfnN=`U(6k%NwQeHsD#}CQCnp#CcPB!IKUFtWq=dCo)7xjoR(>rM9m9tzG!tD%x ziC|k)>V*5!hDw=zcom0m;xGB)Fgj6+PL_x0Rip7G~}rMrGr0b7JvnF?$FbcJ7LMQN@m)GL6|krq z`#zELMS*yo=~!X|IRZZl6|&vS4$O~xunAII-!I3j0fiq}l;46C+j&0Yn^c!VlOz^j z&U5uV&-`Ggi4%tJ*}qyZiC=vN2JawaKflx|>96$>W+;us&6S2fqiGPLfzU?Jrc96F zQfx8_SI$(8K90&$8~g8jI;VRAlOW;1M0(lS}oZ$AQhKRi5HeE7U1~rJ}~pg zE!X3)I0q(1chPJnTDJW25#>VMNa0C_WISwu&wNvQ%T9c}{_&Nye zqPPx+I}_l%g9H~7YBva$HZd|Px4gZPrf6BUtF1IcPsHhm$XNpOQCM>KWBsQvc6g?< ziCcP6&?qDrP$~D6%2GVO6dvZqhOsM)C~Mv2M}ONdBnyjhNo^~dX0jRa<49|h9)Z-9 z298Y8Jbn$I%N9F?9@DV|t4Nlqq_9!uCI{^@jH)L?e+`oCSSKY+0vx3w*l2a)gQj&$ zV6s=2Aw^)Bbbe1W#+s=A#lK%xUr}X>TM^WE%|?^+ql5`!iEnb4`2|SW9#b+m^SaTC z*3?6Fs(EcobJRbH!l88kKuyd}d!e*{GbfL3a-63OL)M1mUih@HyEwtvoaLdRr2cXB z$F+fttdRP*gotkQ6W1Sk_V8&)URMP862k2Jw@DZm{AZwsDoKVY5>5z~6RCG_qaXUY z{)7FC4JQt%?Fh_`Y(CHnjnzDGVvy*}(xgKjh%p!{O}p;7upH* zk$*lIbC>Gh`_VY4?IxzjXbe7@6Y|qe!DL@8^0#VGd+8_opWz9e)^A8M(_K|Dj)R|GH_)oE=A{V+>H!PMAfc<2L6K z5n_1(|8y94??OP!KvhA#I#E-bzC-?{eVqO2N>dpjiX#SY$g;GG0q_w3ZQmKJo9YD& z*U~al%3#Q&hnhHpgT$6N5V9<0TZn^zD;%}>Kdor5de25|wZdS_1OYeczz+3?&~vA^ z!q<<3PnCqY3=}gJ=<)JU3N=7ew-A`?hA)q8`G`V<;3#%2IPd_j72T${IbD3|qRHU( zaGlClLwqm2x6?T=$Uo+F25b(as!C}L$jSGhcp>cmTR&dxft+##g&k*;^Vxtuv#<3z zEITn_y1F@o;L?{z#*lI(6Ai*ShHMQC^zV4&YPL*^hIfJfyKwMuY#dyM@-a*D^uL_u z=JvW0#o@LYfnE!ibBvwk2Dcu%117#`N@p}^g*a|e=9VZTFpHw))e;>^fLuwQl|0AtEb~Cy-ws0I;mm^j3d?3pXGgx zi7+psN6E&;Wh4!WiU3Ex%c6N87)Gc?;AI>vHqIRyO+2y2Om^EyY7{L4)BMOxUZj*9 z2qUSElyWU|Nm`MJ2Zz)F>_-~r$>5|olXX>0i?FG<#N`<*UMZOqEz8GW+f~9g=nDqW zgiM802DirXp`Rs!4z8yRFtK-XABL2UOdiQ8S|8Q6#pCvyn+)GlC|-GaWc0nX*&mjv zbr{<^R4SQD!#YgwfaJS&gvOvk4=3K-4&Lq91x%edsOz73#IDMQdb6{D=Ly=N2ra14ih>BNBnOhEb^`(}Tw@e6GLc zCeAB*Zrm3#S_M`lrkYH4L!(+k;xYxuBq6#nLOU6e9XcT@tZZQK*wo=(T6IsNO4|BLt#^o=t=rk=mm|F{ zLx}Ap1<(IRJ2;k5q=a}y^al>&nlzYx1kl+Qyhy%CC@b4f90P~lE|yHYRVH~5m4+lR z9LODLbOA!0 zUMzhT1dn*ze6COv(p!3akMRA1(}HQc)1SjI=U{2nQ`E8|q~m#y<7TwIdbB_ADQC>a zNkrWlvW5_qkp9$~PAx1dNnpjoj2V@1I(R^uSbT@}I;kM0n8nw_6ntI^%vNj*Nh$Ly zVV0%3`yXbVv88c=jRLVESM!8`LQoWC=a&q>9wBqQBQO87$X;pHmaYachAe)#5?Hx| z9%}wi3(K_x6S%_@{y8i&*6v6lyXzq%=|$#D%%4I+cdqO^JUrg~M{_jV{Y>N56HDB3 zel`PL+)Zs}UdP!<-Q$Dc0aT5k~TAo08Pq|CmA-` z{@W0V7#*`V0k*QIr!@`{6GQFQ2So&#$ZnV^AxLsq^$Rqx%X+-_kJV&k{|Pq0YMp3@y3`*7YS>-oL40kZ;uV62lZk|@~Y z=|#%it^V*B9S$YydA`latHwwfh8_;>kmtzdf2uYa>4{m^bb3kOPQiEBQFg8oWNI>^ zAcHOv%@UFftYw@Yg%5at*%N*dZpira&ZmjaZVf5L2Z(%rcg2`kX}_?qr#4@~_QW%u zC8OEnBalzv@=ga6qav|HM3ldJ0_!Ubn>F^@2TtD-3kiZQkrQ`+iMsTA9y2DgbQzN6 zKen6-{(Vot5!dWfzihqbo-bl~&Z~2n0@yr)A#Mkr@O~kfI&~%x4fFDpB%=uBWETj) zEH%Oy%?d4lKTDYe#?OHIFK%Ox2Su>`L536;3b1atm37;=!DY|b?(b_d>Y{1E@2DYlW?asd}`KY_q5KQ_yF8+ME* zD%59NBum^;h)m2{iv`<}X%=GrguX%1nM5KmQoEPuPCk0b6mWytaAOi@jpZwKH3- z3dtV>Y8fsEj3QJ!sYkPEnmM2vC)fM!Dz(9$=xdjG-4YoCh^ZznCzJgdS~8 z5*V{(;kI`a|BsrV6mtL?qJsip12b{i`-59T+R|bYC!n630YivDz#rg0wh$!6&^(Jp z`avNxrL`~4w9X-@`M!6F*e6j8zrE}G27^z79kAd%_}G|sf3eT~mUFBY>2ZI5`Iex>*z3z^AYX`H$9GsQFjZkG)k+r1-{^3 zzbh0faXn`^+85^PN%^ezb|~mIpJ2r2fm0B#Fq z^1S&t-lgv7u3zS$2BzY@IaZSFchj=*+*1v(TK0ZzmD#HIXP^|pCiP<=Ccg6vRrH6t zs;gXjH9gjbnsGV&5k~L0ivucFf*T?1G>)rlq4;6qrlll|%UwE6-`#t#K2I=_qc=2C z+Q^VZ#wW_}ae?gU*;=99p|T1|g!Uqj@_9`G!?vm&JTbZ}1L9R`oTSaTzWg)1Qm2@<0)(y(lc@!x|l)N;0_!bqLC#Y!7 z_v^k1V-)uS%x1=Qn-F5dtzz8U@)6`9pM}n>dorDm$ zuejJPL5x6X)?TDp%x~>koR00OLnsuHzo4+JZ)u!L>MdIJF7!{dAAXXZqJ8LqSDGqtd3w$+Kp2`@~A zV^pY&tir@X#;oqAY$GhMwTL^T%GJffYlt2>RnAreAz2)zKLAV7~DK($b&^YO5{k5ZE`rI42~~D_-z$O zVTM5XVG%Zqp?m7xx!U(G1)Ky4q;h?9Hy@KXBOGwBvJgZKfEE&{MG5i2?fqB6Nre$) zY4T;BPR`CsWKmPp=Gn>yeNY6XLSc3@_e(rcD8r%7a+iMuURA+sR_oVez0AY76R=N? zk12_HE`xzOWA6TL$y#Nw;8cMQ!YSMu@^)$e^*j<`9hBL@ukM<8mz5k_p)YO;%`W4W z3^Mju{#0+itaIxXhw?B*!|KoFp4_E(gG|}=I}Ujqr*Z6NVEK3_*@H$+M=PTG_AQbB zJnkM*#$+WvSxR9`+FE=J(&RIytrCs27ytH1HTeeS#i_eIbsaK)bMEEkEH~?n4`W7t*HThj&FnQ^|M!gpfNbm&6qFOUT!5ubiRP^o5~GOQ&>g{bcH=Z1RUmvqp?i z&y6D6_C3U+Bo(A@RxF^d$}G!-zt{`+6R!{WD4g*Bl<>Z2Jx=TCrwyAgp<)NfI(g?q zR>$4UGpdBzN~H7Ok7b#qsJi6psU-+vyH0gUgwxh{6$y?j3+#nGTCgii0cNuLH#DTI z4X{-(=P>hU+p;~fDtq@L87;f;(>WlW!M2vb{e*w+a0nL+S-vR(vVm2>{fm-bziSOP zAGjcE{s8Pk(7c;shN+z#$MFC|ke%)iLGj4@k`jyv1bLhLcIr<^4}z~cp9kk*5Rq^# zLuMsPl)oM1>!>Cw0POo4+9Uehx8SY>JvP%tdQ{YR4|lJ1Z(YYr3~O@4w_qOiT~RedoiQ) z##U=g7L%>859hg2Vt1?vySjLf`AFV_biv%F90>U>-zbhz=NP-ZKre-C> z3Ezela-qXrE0$I_0u8$Y(ASGn&et0yxC6S;4KKjG&L|GkYnyu|uFB4BSXlEVYMty) zWJ@Ta57|#jwwrBp2%!rBX&iYqarhz{ZTEkx*QRJ#*_^|PPa|tFRE>xrD7!3;_}Q5L-7e*fpB`ZG#+87U`akV=mm=DoM++DP{64uA z+6|&zS)W{!B}hZROsZwZvcj|#m>v5h09`sj45f+_&wqr(r|3eG zgI_ruH+4I^nV6lFH)NK7;M=u>Q(ZNRy_@!dbBW}!3niBr2qn1>}ixk zdpN~xv~Z+PjD6_^*4%>4{I@-qAu0JMmRcPQKPh5R0Qfh%4?%-^lmx zVeHVTUwveO=XG>@3$^vqDb#R256DtosF3&JygTJ&YMaMruXM0otdE~>3s;>#!1Dgn zZaF%Ijkwx2^g^o(jUUT&Kn}I28@TpV==WExlq|Sg_@34aBqBrGMGu2r2$yBZN{B!w z72DlKM;c;<;}X$?Ra4I5lBep-Y%X)&eU67=oq$~i*zlUZneRQZrBH*(I3y4XS<|QO zg2V8xZYpq2-(xTPm{KdI|7vNC;q^__H#9ll*3F&_NBkeHD0)RuSWv-zsXVXK;D^wxR$0G}(;m z++jea-1d0!v%+7_mROuQjtTcsJtf(EE{~(wKVyo&xnslBU@Sm@+kQ?mXTMC5NAyIV zZ9`*C)AD)J-B7C>N$Zf+U6hGGkPoNyDFh-U?&pM6@EqU=94iKhT2BXW95N=YeB$bv zNX*Jlnwo2t@2#rF`F;Dve?O!ULKB*6OMBq~GViQgs|Js#6nsjOp|_>#m7u2%eD(=Z z*@}pPAfuW%v+B>})2B}j2nt$2?~Ax!Pu0@bq366}k<~qOne#z|E3%R8OLkUzNE%Lz?goKoD1ZV@b1 z0q;Arth_MYp!SLLo)l1smiK$-0UY_f@&cs_+e8DN#AoYim383&X_$u$5-PKIV>5w40>lK^_sq4T=eemz2+39QiIakO=DV6h?$w4 z6!bV-wzT%%m;g#G04LhhP34;mmZZHFkG*K;XA5m#6^l~T(f%>ze9Y;jpLbmx!yToK z*x(Zj-yM{+vM!p2-ngjw&(GA>Sg9v zA3uQ!S0RjJaL>y|B*BUojg@Z+QxYsSt8nQACFV>$?s8?9o7t7Ag$`wx2Gg&3bzww% z`z7`f@xZ5a3LO%1v)Ut@3H}FBHw+^rgkhb(l)ecq|9Hpu8-|?~!qjk5Crr2HciN3f z6vW9f7>UK*G@6AwQ8!NmH9rO$0{1;(HnboIav1Dv1wipg2x7)YfF8&zE;vC}?4w<4 z8FrKQja`+$yQ|7#Hc}?4-EFlS;XKJWbHb^pKQHjX{~{%nKV0IY^r^!Ll|ngT*3}WL z>Dl|hxn_jlZ%+g+@4PVSwWu7L4Jl>HFE18IO@{gBwZ#j(7Sbef4KwH)WVV(OMOF!8AS)UC_3sn z*nt83Jbsku?(G!O3D2DIguJA-=}Zu3!VtEPqNg6E30w0MY-tdyQz@A+hZ4gD)72t` zxMXN(J-B~!!zT@<)f1)U!YL>Y&3>d()Xl)X({T--0@uRQbB0}S)mXmM`61BQRWQL|9xY=5^ZD8`^!;FCE0ZrMOa$}3qwqfS6? z+?+eX$QSSg8|nYt!zaoqrj!CJiEQPD{MP{qindgBN*6$snZ;zpGc0~^?oAM=uYoXg zyaOBFh6Nay2Oe?UK9raNx{HT?{3L5x?{b|_fdofX=o!{h4?9N^0abm?&##b)jB-}l z?Gj9Whm~s{C4klM5FjsCW)3}M?`qQR;`gFE8L#g|zJ z>jSwlF`+e}R589Dfh)moKM2++PLwl-PIfcwq4lWSbXG5JQ0AlbK2c79DQF&TH8|kO zWcsCam8))wD*dSpqAfSGdm@@azUrSCU{ zAvs&#lF@MH)n@6N|T7z7KCC1w&ME3(W3>*%JV;5c8Z9kcP2Mn-swww*%3c50lNC^ISSU4wDLOPbzDdIeYC<)6u zDty4l=S?Y=`6trnLd-bPP-4M&?ivF=vy7??nCDpiijGyvVNScYtuj@zyUJmG^p{HB zjNm}(HT;hVv+ez@~*Ixwh4l%1gM7gzEH>*oh`U8Q`u>NRL?A&aOGjrHZwe^_N z1oCvDO`d%G91$^uqIzval|{m1x~vO&r-Znm*qeQ9TIT8`cEGIhrHly_9`R4y|0qFI zZ4f(VzC^g}S}sbl)hqW1HtAbu{;6LPha2>n_d$;sKbr+J=&Wc#Q&SY;H52n{gZWY- zBF46CN(%~9YEO%?3n<*iQ02BJ38ejUGdBgDW9YQ=*pQudI4vvjAw8(<_@me)OWpcR zt}*yenPmxthLO>2!^--&rQ%1UfDOYqrKir` z7sDH-SsO)kz``7Ux`7@?70LR`$P*3)E>#lHc6gXZPlFCuj>J-ZOChei=f$K7(+kO7 z54V7Fg26(xPT@>$hO01d?OIb463jf2Z6DQy>#iS&O-h>yrV~49yF?E5qeP+e(Q@X} z-dD`x_};TrDn@S&T)`|a%=efwbKFzVsapzz19hnXQkv&HQ znL)%Fu~~25KJmIE0jl5BkjRE?43&T}U)(F9-`$OVuAxDXZ(CIfVqmkwqtZ{n zQ+Vwv?&P0dHl)>UovYbxn>#+;itiKYHNa`2iAh@gvc!l*g_>*iE)GHLxblo=9#l=%fTN3)dnb)>MTtwLg>JIU}1G2wd#s!j9NIz`-8)h^!WMsJ5)-l zu*;)O(`sYs&-*H%sJdw|ZXXXD1htWbJGVL{4xeau<7OVm`vrrWr2b_U__LJZY^om$ z1zOAy9qs}rZOEvPTOn{E#4+YH#rXPDjDUiLZ3C+5ZbKMrffYcGLLEqKcusH|yc;xXY`E%FZRk)|_ zO@?FakMSsf{T>-j-*Chs#Utb7+O26x+!!BR@~>UjF-bbzs&B?56*K<$o39%Li+uMjO7a0m;_if;4}JnouZ08!)Zk7s3d@>DW2XGoo& zK*_6TC`fP>2ZmX%09#Ttg$T2~TGKIROTCC~Zl&okH4@>GZ?)!|o4_!~xs!_}RJL+Y z1m!NSnK}X^r~P{4Ac943W)IE1ODiTis6(|_$gKRQR}01vsn{f4xA+JB+|5FS+4PR8 zG+-=Fs%A7FbO4E#-tNKd|G%#{c(H51+WRnMA+m~VtOSyef+}qzqK@J;ZN7Zo!YxMh z$x4yiL>#@zNZl`Gk!-`*2)Hbibc_O!o6B6=F+^q<75G%?Z7)c+yA&qzMi8wjf`AW= z85qRZd&m2ZYHo&%;reglbluJ}Dv#APRF?PfaG8RQN+~bU1fO&qDfQ?GHYbWcA@7r~ zh`Pv3e#R`-Z5)ebN&TgSvz9Un!C~#H4kidad{m2NP9h6o5!(alE!N6;aFKB5*XEf0 z;29=h;G?PHY{O5Ar?D~gE9u2>)QhpP@oIo1-=^*^HNLFQ`qY{MwM8xHvL_;yu4fvWKkAkJ<*SQc8)o)qbiJ}T>3E<6?==O?r?wWpM6&`@HbdH z4lty-U#}LWUW5R*uE=f|f#9PBhf+b=RS(L)L%DGm=6kE^RxCdUh5p4373Fh{Yg*kn zvbT2nb)*I<$is{Wx$D-k8mta70g5N(S-Z0t`4q57B|jg!>5;nD7K1{#Ikv@u9qLQK z{4x!q0A}$D0)Mz*Da2cOz{Tb-1;8w6YK_u`+F@52Fgb*TN9iqB$@F>I6K+GAXCcn| zkHC)VJcYG*TvR>24%WQuwdW~bn6mfneZ9paDq(k*a}3~(f^_BC#W`$G=nHBS*Mj@4 zn0p}f9MNnB&=p(2;4$trf>wG$gSiz?T-jmdbyn#B(2aXXdv1eM?eL=)@@O7Y+$vWM zMd@x-0Rm84Z;RJ-f~&UNS*0JGCkKkvftSBM zGA=LAthm_5rL$C_XQWwo%)!JLnG3QAE|Q0JN zU&^b^F7>V)5hE8cx%G7cD;E)Jct#NoX!qk%gdoGZA2A3BV0+9NAv1~&k%8!M@sYjS zo3WQ7De!9W`?Tc86Jh{Yr;2_Sb~Uwu5Tzpv_ypf0g}4>6o2iX+LY3`*E9QVMIJ=b5 zJQS%$h^9tQr{uah^pOkzsEWmKYm1%8g>T#cy5u}KbOU=Na)z2M@feraB=jkG)&LBy zoX|?FTE9Wt!*SbqO=Ekr6IR>z_xtqgF227CYPOGP2U)C%c27;uVlAjMEiBY)rTmeV zsQ|--r`D=;zn!0nJ>Eq~yAT(DuaydG?=O%l$f0RjA|;L+|G#4=3cE&94U318k1oi; z;5yzukr5VCn$k~$^vnl3riPyv0`!ZVM!wO-HtBlH@lCQ;Y~-MkQ4<#G9`H}U#kBpP zTATU-cD>>LJ^~TGbY!``vp1G5qSIANR2_{mr%=Fhanwnl;fM`S-AVX0u7LC#!IJFK zvQgyWoxnY@3h4`UjpsLqrUSovmGeR{#q>@p?9fSrp?IBy8l@$M10ruODqeKca#2DswW!R{p@un0Mq%1Kq%N6zII zVX%Mmn|^Mf{+!uYI=&yXaZ~wbSueC+r$bI^YU=16-A^}UhnGsK?b|}3 zHm_&?sF8m;@)8TCc^$pcW$O9 z-N0361arzw&#eHJw?~vUMJ=!V5aX<-GCO9hWTGmS@bx}<3{*jC1LS%}3mKrWpt&~1Lj_VcMPh4lQqu}BAkHvrTpFTP3wEKls zfbS@9Kibci(Y5EitT!v>M4N^6PhHx+^y8bNQHknGuw~9v?$YDhx12JHD(57`#Ch?p z%HUJ+72cj%1Rml5c=C!Ii!q=Z6zML9ZN{Kvf=LQ@wrB#i^U7^G0Vi|DEggU@hx?tmu3u z0EmJIi#Hmc+U1b((GLsLy`IWb%gUh(^4z3}PqMGly%|2LVz{^ftfut%UZxG;6f8>S zP5~wLOr33(fU0X7AC>pMYwheTTJX!&VQ;cop&x(IHnhMh|7LO3*PtO31ejbdDcQ_v zK|~rNvfd z_wi(b@l`2qM(uM^b3E%edO4F);+j6|!NdhXSh@dw2BX+31Zq>wqD$=_74{Fv46M<$ zviGhTI;Fwc7*^z!Ob#ov?}NZ`9$(~kV?AwyvVO;A?SC8TpO^4KA|yo+ z`PBDtT&Mn0ud#4EJ=2a!N7J%L^myzNt3^H}8;8p_xW4L)_JitvUPpmAt6N1}By%A% zCwwzx!OP(kh4#rQA4>?ssDwGn$*$6x5`RS6Zz~mq%tt!#1%-}#>*&xMi9N8LQP$`q zWFgL5vXF>?`aFQR88&_5b-_BkQ>mmyBnit4uIf;eXM!~`o21@ia7Zky1-93@<|Sne zsQN+g&-x#Qg<#B8Rp^A+^yNUcjKWO?E15)Lq&brH#G1rzHvS0vAH;47gelOvV!=NZ zFocgF?5av?RcLEf5zCRlPq$|3AFgl1JUkjc(qY@tFdqTytI(#17@}?D(aA}?f`Q;$ z3zZf>r0O-r1vOE1^&H>UEBzAAlHyoF3qH0k_24P&~xL zEPoFQ0!YjOAWjkR2qPQtsyO;$L#)ZN=w;BnbTp=9{>?5}obuopB?cuIzta3#3=eZV z>1S_GWAeh|cFH-+aS#=X?=nkMmHeNt>{o71g+Ai<#+JvEO&c>_{Pp>XHAO~=VF0`6iG`8+wOesyiFUpKE;dgpujcBJ3JplIm_wQnJZJPHo_F(_i)>G~?<+v_O z=H}+J-JcX zz{}-0Zv&!OU@Nhpd8~(a60KSN9#PKZw|t?B(`zX}DSW=znR32aKzil(RMHR=Cx|e_ zvr#tqanx%IFifYGRb28JaY~K;wqsTMkA%^J+nrP)hG_iPNwiKO>@0ww%ZRBJVDok1 zGt?5H4$i^l)-0-J6~vV{pq>B{qC_j z6ff6F5}S{&yvwUFkuzEeai4ItwGX=?=%SE{dE7Bp^SBB9Zc6qId;4CuWu*b~Y?N4* zd$JbS;T=i|{*|;gzE#=g?L~evs#VSZ&c62FUnmbdmYN^sSsQg~agbIKNPo$uyWWD# z%nl1CSbw-B ze*6?A@0T!p%M_avu8L#c8^xgjcA~_dd}RcU?f#^p;vF$^AmGq$bBmmn?~~3ZeJH(n zHQQR2r-ET8g?JqpAJB`4j*vE><))HIuiT*3YohR`?>T9jMf+l|NlsC5N<^jk8ot4i z2i{N0@%ad<>VuW4>zYpd1N#NhwvL2=tgWg_*Zx3^oo~53WlzP={{7|QlJV2)FVbr3 zaUvq|Oy@2!(<6^Is1eIsEvHM)CI&gG^@_C?9*@Q%zLz(=cE^fO!st0W8sJkImVWVq zHGVkL<$u#2_^!9nDL5tY??I7(YIjHM6tMXjqsS=(;1{C$w)K29e$!)`5NvQ-Ho86a zXXWY3LdAywXeoT_C&~X1@jeT~IqYBFp7FGm@&lNC-Nn;8y)FW{GZ*{&*9IDSx2Sdj zF;e?x+hh`{I)Z^y!#D3=?TZbp2vLB}Ucs-b=cXqZD4UyJ2Y;V&nCdR(gl*66mbO;9 z#EF-8vXZ8qdga6J&$o=Xo5yYqR1Y4}3mOvd?L%)WObx6M88i*%M;PF=vAGa|27D9hb-AvkdKDQy%na72 z?PryI^^2n8NSN%x>%G5Jen?(gk3yglk(^O|gcIN0`;x__6JWPUA|ztj<6u@)%Wo{M zys0sPpwg%r5ED>$$7#P3NgJBg-H1fJ22m^scOtM^>oF0Qd23Iee9MCrB<^b;dov9v zu*raOzHU@$XA!S&p^j~C(ds}RDlYZjO&37Juu?Jo3?ckijfw+V&oTLllzcyB{v=>|FkKQNBzm z#Gy45hYw3+L-Xvg%CA#zobz@X1yk&s;Zf&&>)^eU)Ggb+b?tIB0oUjHJY4TM_Fr&Y+V*Qll@f_cjfz$dKRk8a8|Q@oMRcee3B8uBe67wAd*s4%dy~@2gRZQ&4&2(h&VQde>po_6`Ooyd zn$qgZ1H3jVrJ(-D$6UwQJS$fUN*Tb+kbvyf@~kq$U8 zrS;W_L>#)|yXFoKVBEDi3fX+>{GM0Le56iKrpOnUarYeBeMxL=E;mnXGG>%?>U<4~ z1Pv+3Lv1n{;r8tBn_z$!5knui3;tNz9JLXvP%#7n#Ox_-_J8TS*@!bdJ=+b>-dCwT zPtO<$b%gWI^*<;3d8STL{XpN4Pn@j5x((!W!VqO$Bk+MX|EnZ9npoG5M{dYP+R z1-r_>G;miGUo%^N_r5gbm zL_`AM$&#uy(&EYEL(ppWX!OexUA)$46u>E+E{abkL?>GThMNrKBY>Ny3V^5c?&tps z;e>lP3Iv6$COe%Z21hI6?aqAo-%QDWrXeR%69{>`_}8_SHgR^@B4Lxl;-ezAa*b$M zVdCYz0PoPfxUu*@e^s8tkHXdY2Wt0JK<}^OJY#CZG#hs!;f*awphQI`l1dWQLeF18 zwylem1`pmDd|z*ZH>oF9CwfqdpGmz00GlMioNdC z=i5T)-3Um_gu0#J8`0SRT%S=>Ty1xjuiiRNcXu@E^dOM_x{V~Xdx%D11)%vTCi=v= zX)tA|GKre0Gd%^nn)|OJ+aC3%4L;}Ov(^u3KpxTBK zcgI0*#6cV4PEkQALy!_Er!gIr4n;R4NBO~ZDi-;P39J7e;F%g-l9lbkno3GG%y2<|L zA?7nJ^}s9(ifFaF^B)P)rxE8T!t+68vqoF^91%Sn0C3e*u5P}OO6Rn-^3}-A(BOWC z-p59^R^S^#+*IimUy&yEj!X%lm1l)ahGg;kmoNB{&@J(k zN8Zr)l8>*!vOu_NS2rfaB2r;?0PWIeF3I z-|r9W<4WM*_`B@#$%>*&WPNA|#%iy=JYZhf@@${4K2LC&gszl3=Rste*{c22Q>g64 zm76G~6-i+|r|D-LL4IJr#D5R@{G1zwSa0^MMS8v8ShJmOb$h_`Ok0|Nx}kWcEW)@R z@^S{6zQg7D(Y-SETqmnh5dh%K%&5?28MVf%gNU_q1l2=Y34uYk zxAV!fA27uiDD?V<%Xzf4@s87tc%-K1ruPq{mtZO=s$aW#VmN{Z;_nqqs8J~s4Z6dZ zovazG64EJZZJ9EQApf3U*l{HlmLms9@5IPL)1maewJK9D6WXeG~Nsr-sh$0t(Nu zv#ZdnP7rK)NhJ3zlF~6DX(ZcC(G|SrcEH{6T_%nk`=rEHRun@{CO^e_zzt?F8^=&8 z=~199J&L^GiuXwM9$Da3x>WE7G*j(nVE@6u6k=+Ga81#Bqs_-3r1B4nF>P3kh6V{4TDm(ON=iVwySoPIo}s(Dm6q-?aKMo{-$#o*xkAkM=2tAn8!{yC6LgIv@1g&fCp(K$jf z-}l0+!K++UB4JR-0Lu1pE7r#PhAMEo!Q@w;E+C+yIwBRHfFM#(ow@I82&d$mN6@ok znbB>3CbBF&sd;>b1(YegrWUdlAW%AWU&zBlbfMJ&^@SPQggEe(hsZ(<_h$S%&F~B^(Ne@`s9J0?-Nr;eX%uV&<9+c?&YpOLaEjiMz70aX-c`0g0F)u5` zSjWOE1!dJ|%J!r|2DPgZV8dsP`*RASTcIXV;?O6lkG1nVtx8z>pO#+^dvvr{oaV=?cHq|S zgLkechCQ0l{mz3rdEAyjLUZ{@iCz0Zwgb?r&IcKY(Jf6`8`zF z3|M}haZx~9TPq3WpZGK1n3;smWFXLYD!RZxnkoO}8d?9q3m6QWiI^}%f$oc=lr3R# z_s^bn;F=_uJ=3Y!uZ z4_2C6=Dj$Xw1CD2odcP=dA;rMiC?qFcTrEyJr6e2@%)o08pBYh0jisaF~PWayqF_- zDe+rM*?6?#5}H)%pz8`9N}#(xWX2AB9Fx&EK&2{FMDsH{@ymfgCcr2I6)7kv=mRC{ z%d~aJ)gwe`c*7)3FGxuBY;y&2f@7I-MIv+R*G@ZRf z9U!N6(4}pFuwEv`JDV2L_Kpm5jb9$nvSp_UCqvA60EjP5NT!A;;A2 zXyR*M(3iaRC{58XdOwDBc5+y?wNaA8Q78!ZPR+~6Zo!->!8dw>lAo}1|}2dmPIX~w>Weva=_q1qli+Y=9~{KG$eKzwglh@yFn^S}hnJyJf4 zqqns9&B8Y#8p_BX5bx0o)tKc7zo-5P*wWLUK_pDawFr+J$hK!%0>uzt-34W*;!};ukDgV-A*EJ0ulq|K_yAkD!H1f_`0am?63{wAPmZ9dc64KNMx;DNTJvH?1=`uUP z2z=KY8}`JS8aXjtqAmGtV*A3zPK}He4QA&lpyE~_q&tdcQM>&oUBDxJakLP_NT9%n9ex^qkH__>R z%zsXG*e}dD3*@F8)`g1tea5CZx<_%a^Q2%0#v?BVId0xtWwyH_)Y2+ZypgDFXK4=K zXB55kzC11P8t20#*Svvro#>ys@>3Is^OBHY;MJwKhcHtWyY+a<|UqlgkU-i(qL?`5AK-*f?4f8=v-@V*Vju>PTP5myt z%>%m*(qEQqav*ckycM7lRvy2|)NFMQ0LwLE$pGukcO+c0L8n$yrlODazcgjwiTK;|63Zjsk~(2!#?rAk1F12S9}*H8DTqiNg=)S$w~ODcnQ+=cjO zahsoJ{{I})3%|N$IZuIWGIA6JL=71@o@=J zvfqo-j8yja3A~8I=Eo+{3RLgMv`TY6FiBO#SiT~Feq!kgoipf#_J$QjtM?7i0R?CY z*qzSl1q|o`v(l3bQ=!ZE-kSZGVbJHE! z7Z%K)aEM64Tl)^vdpzyj@bw>$PeDRTVkg0%kvj>T{9iEC$?Fo(OPpRHo7fIC67|L#k#6%Be z5g+&$iaQy!MFK)Cz%65*8}=R znm92-f3g>z2{j)Vv9Lwy8)c4vd^^5GjPfKll|X-0_Iwg@#Nh$`rDK zijaj@^Lcm!h4d~hZQpv?btRAT_^U^!6tVM&EGp&c?>&bW%WBmq*r8?^3Pw`f2F_WII*w{C!d?TWCUaAZi$+3aR5Y7u zQ@QfyL^Rn=Hj-=>UDyw{#CzO|`Sssba7Nh!j#5G-c&@LSKWeqbbw(zOEN`dck;OzJtn3*XJns># z8m=&?k&%-ZSF_{xeHgfqD%Wqd457xI3`*&~;EF%>+3Dh?`4%m`OT9(0CK4t}&Lr&` ztKjYL838o2W;O{Bi^(KCZq|%>PIyow!=#Ry@C8NzM=z{)iL(PN?q`UI%<~Fl#+9|= z53aaR$37alpCeg*0hP!?`xE1>NFyHf`hx%RTk~fcZw{s!+D}KB_!VM^} zTdf+y1&*V&X7r3T-@WvSubuO8<63PfYWVnk)n2?`K!(wfNUm8DwVj<*4wFzz4E2H+ zA51Z^m(nzHdKX%~A`Lh*n} zf<7AR^~XW-ZkvgA|2^MF7r>xuKXMB`U5rz!Ck|Ba4JsG9v_u{C zBDRx|ti1~=1}gUzrRsn}q9~fWP}3E8oh;IY*Ah~lwuzvsB)F-<>o97Pt&&f zHK8pyb;A}%LCq)t!;Yoi#cK7xP%}Km4`3DR0_{uTr&5QEw-jh35S|1vmdf{i*VR0# z!Lcpa1WdVKU#7Zzb1NeVSE>hFwf2^+EcZ)H{m?eg&+!t3U%9Uo;4m$u3G6@UJB`?( zan`7qSe5e!jJu?;us@CjO(0u^oUbP+yN{8Q6n*)YP0H(*J8h&x~tpEedwQi+9Xa)Nkqx*a2XQ=L=skML%}t@sqkhgK(%a4 z+~mmYYC!q2F5YOG-3j@+GcB>M)1CkzJ;?E-PxfQ7S{E&0NOFZ%gcdp>k#ah!fGQ_v zjrQV1;sb+zE$n@)!6$c~j$hjeK<5#M5WG+7tnDThvgSj-kMLQ~_tV&ZS}G&1DjAMK zC-FSe$|r%!CHL%d;c{GnDH=61nB|({7M-5D8pDL0rJc>891|t7A_3qTF~59S)J(8x z!g6&>$IB(GBdM}wdlhvpbD`u^*RxMFT?GEfv*o z+%`zZBdWL($n~*X<9g!dc6qW;WO=Hc?g(n`N>k{Mu!(b47oFR0NIsk0Z;_B1_Ad@Q zHR-NFd9RX&?EHP3Oq`j3+i5xPmKz{>=lO zX(Bp5N{Cvn1=Bc&#DtYOBWKo!tsj(2ILKg@8xcFpS)~rTKQ*|@-@993e0Bawy5(eZ zO4zI*iXA>)xhvs`H++*uHrto9*(qEwajgZjCT>Ln(r|e8XL&4RKMOGxxh0fZv)JB# z!^|jmpCLH)eT9aA_fd+?9erVjq(`#vad9pu-p-QQgtLKASJdO&_+lSk4-iQ%*P@Al z!3rJk)+ez6si!^hKgy;kZ<=l6z1hT0=nY?=#AoEt@lbl6H14K(FmEfQTarI$d;mWk zs486<6js5VG!YHbKqkrx<;!~vg{bPgh|Uz<`c~j9iM#;#%UQYZSS?h!1O0~^_dbr! ztCW$O&sOeGR|Tw}jSU?!`SFZW_eG8K_)!0jG!Y^kqCmBaWW$}de&f$mk>Ll{nH^wE zzxlJ5*^X>i|p@u|wguXL)!q$)=K2A1d-Tr{X8 zaOQs~dfi{SHQIjx{vFh)kfggxv&A};LygS)*1Uz^Ymqa=9Bo{QRbEn0hu2-kSwPf) zg6TB{)fH(DY|B%-vtHC7Q>>AishuA2lHw{kzkMmhLfyjH-JJS}r(Nc<|MNli-xOb$ z9nBk&{^VR!&FNFZ(@iVKM0>o6{pb6~v8DTL+OCk4^EYMTON*Uxwr~>gr}EffeGjBG zn*i#|61TsHyMJsC*zl}GnUvcwiP2cwv&p^eC!`Srq{fZm{BZ4kOAlP?k2j%5YyWX~ z*M=pTr5y%`5d{(cfILq|si(4!1vZeJ$N`3IZM^7+_YwU%{Bpp6pc=J&=-OJ%ifrmw3eZt+TTr5qk5aJ_-Kk))GX`?Yh4Y5o&H|>m5>6z zxl>OkXt#kNp(|E&)Cfp)5toon3FQDOE)l-ETD7aMRVIer`Q{UriqlE2TR+nQ?auueYb8>HEt)lH$kA{BY4 zly6y@v6y%xMkyfDN8wldRxW=>54I1ATJG87coT+%MwaJLKzb9n#9$OI78Gc=tdgP5uD$6K}>bwA;c&tk0`tF*_;C(K~S zS6Pe_WGC_qZXA>X&TsHOWsLXYq@%Bumu&OP_3g2bnveR@yRQH7X#;A+yC9PVYW~Gd za$c`KVY@-Wy2`3iDXU(%S(~*&szSNPIH+Tm8#2SQ0xl{6^P0i=ZN)fu{VYKQujO%u z_Km{pg`>$$qNZj6hQOi(<9;dzx``uIpgO6%t>)TCR#`MNcrz)xs8qShT-*cg=1rP( zr2uhu` zv{ZUbcTxO_eBUeReBNmnGVk++U<{~InT{7WBO{1NeGXO3qnlW_xQ_Dpz~v_3_@(@X z137&V($M;y$L_j)nnC?K%oaZW^f!BXhKLvsn)nv{DGqm1^^rX@#X#JlfO;t+jYfG2 z>LW7vDxX-c|3}bjrIf4?SUJBhCVbsC$l)Z1=nw+}uKJ4w?Xsjb1X)tmshpG0gaG<{ zfkLOkzSzIVqHtsnx{AIULmgLH0sVI1gH`Fsr>{9Eo#*jZNr=Ctz1(xzI{{%z6oWM` zC9y=W!?yMmO{`ZzTg}VMi-9ryPo7he&9pTegLfXrPc>AQ@xlIKN;!BsQ5X5h+Kyk( zNO$Fvn7-!amHk>B;C>dU4$Hb+iMGSBKqIti7 zwXylR?x|1tNYI^Vi{q3a_78~V&xK0J#WnNwNrw2;i*6u~nU8rnZM7DW$+}uf+Dp-%=s3}- zv+9O!!>FkstQqYe+A>+!Q>sM5PDRg|nKDI?Meo0#Zq8M;`>%DJ1C6Nzx>}0L&iCPX zRuPy-rlz=EXbxnjt(=H|ryU&)>A5W`>nrYkD{)D29+Bc32EQe~+~6ykLFW_YIn_ny ztfZ$bLAgoyPSA5gI~uUUj}YA8VkCZrM2S|1ZHShU!g# zaFMbKn)IDj*RPB27;65x0Df5WeQN%cm7W^e>HSM*cgio!iJ1R+@&hdF$>He-&@^Un z&3CKydGc5`hfmjCx5HNzj7(D4BMPta)uv=%6H-o1c;WSDLu1+(%L&cpH&v&YV?jPpRc&lze` ztA5ENmZn)|fq7)_t?bmd|7MwnbpWD}lnm)5yr1C2E;=N7*1drj8`9U?M#tOWdv^q&m#%dEMeaoW&v%)BcC$;xf^z;4cJLOlDM zbdQsOB7Tt7D`QO@^)6nkB;pkMNqvfiV|?7)tdIXyzZg1runMOw7$#iY`fP)o)P)Vm zEgmhk%vb>;mf)YmYcceXlVm^<51EhlYA$r)uLY)N7J}@N%~Y6s#r-b~egn zc80$di$U?S`-u9A0YPd`xO=V$FPgG4pRt{!gL)KY?vI*gr-y?Ixs$B#t%T zg;W=SyHS2mG@hR_^_pL@oVED!Mslrk$T9`Da-8H+{WPeo0!ak$qIzH~W&eojr^V0^ zbd$HcwCu07z-S2gdBSG2brgT63xASYe|Upff0*Rmyou5880@78yqaA;AP*T3sZlo` z#S~ER&Sm?mb3Neh)s7%-)`@*^*(0B>0%0NRd3CWUlbuqql3028#JgebLzVvqWMu_7 zUQJJR{5VmAsrawB|KEkzSCIAz$>I^@428TUI5)}{kS!i$O`?pTsn6s-e5K}nMYPE7 z-WWcwhh))f^?6RZ?F(TKiSWDII7}Hoc#Fe-TNyqe=H$Q=4{r92J>+7Ye{AaSvvr{W zusbbnW7hGvt7nJ%!Da2F?NJu%2iACg2d^|u zsI~H`$%7pxQ808f)c$nt@C}a|Sfq@+h>%Q3@x1Eplu_U|wI z?tK?8(d@hyE!v_MmHw1jhJUi$epDuK7)iB1pGtyBpmOm;%csdDEi8@iT2x|pNPWG$ z7s{G6`6Mba1b+$gy`d#4*o?Z4W|DRgQ^YZmtBaRG*FG-3Z1KSAfkuQFxZmhDa%?lU zf9%{P4O{){x0qt7=Rrn}$kJRp1AqtGhr= z)!C6POie^ks`}bqTm~bSO|xEKlb+{>Q6;2$5wFVx!1MBL% z+UI!)S4*?SJlknVEo7L9+_M-udu=Mg4dLsg&Zi&wb0Ok~jA2ukRZE5n7-7t!xgZc?uDQ6=#So)?e07tc_pPUS1i7)$A)q9zv_+| z1+51%ovVJQ$Tqqgz;NovIf^7tLC;!YnQ3s}_~3-=ZcsXS9&i5f$8dK&Wcr>Q2D$x= zxR2f2spyu8Wnx1$fdG`UphL=g!~E*vYXKVz3lSwk$JurL&_uk{ye@JM%YR+ve{{ZU z5*O~OoN0bhv9tEWtwD+Up2Q1DSqCz)W(`8 zrY5qV(im@oszOSRcqzblqg&j$vFu(wvM1rd(9f@l8s}EU?T6-LQ-Ox!uHfS0#-2k^ zRaMo^QHw2WhT*9DIqX80>=TX3tb;n*5jv;Q)2a&04Ad}Qa;S9*Nt zthPUXYieHnn(|XQCvo(-R|Sd>M(7W;wP3d3W!@hk>38`OS#Eaw0%`%3wMqN@20_sZ zdmDVLjnguC)inC?YK4$DWE5{3jbA{OQiZ60rC>$0U7=p`D$mRvT+a}4C~A1|>SAmv zePkuh%D7oJA2|798%It0D|T;{=bUdOo{?zFWL=PwfHJ~)U6gVaa^WoNV*4`8>mYMg zqO*m%$8)Y<0G=SAVrG3#Ds$^drOm(Sahe)ZLJ1ht=pWPR;y2B>MP9;YjzIBxeCCKtYd7Ez%Cdz_!PQK(Yu`L^@@+W8aV z5{YlZ8!ECK6M1`;r;w!8I5Tm?kLhhdbKS;G)Yemy>>Al#W;$}<+~o%RXB4efrYgxG zNZv1PoHw^a$Cq`t&yGd*#hIsiMR>G!8AmL=x-3wzPZIn+Yw*W{0_8hKfKB`((fG5!#SsukGS)`PGeFesp}cr=FC~;^`?ms`&lf9(&8lr%PK^ABl!2F95rmLc6zK!slwZGTi7R zVj`o60^jJe{nDx+6LLwv^Pcg4(@ez0&VWR0-0vjPh<{2}*3)Un)K}T_^4?H^$9a>h zrHj+zgICf2Vx9ql0C+ia^SvypwziJ4np#L-AFSqum^2(3byZ`t0lD6dF(gLb8uw`f zJk4fu__aebNCLD$W`M`a8>SJC3vE{$wAlghf{=38iH>>j@dWBL%8>nuw|U9v#gDmZ zgKHjhUwU0mhG&f%nst%Hi1o%l&(HxmYr-F+OV6GOb?^aj`+rf&uzawL7d*WonnV_m zXAx0|1AT!SBh=j)3yTOThje2{dn^5Rm|;)^<8dV z&GV;gl9p=BOw1rgHu9d10!LAUFnDisaMAD`tP);HXQaozLL|q zJi$yU-T(YK4+Zc#TLUw3ql9Blu?DTh!5R_KYK)VK*{0}!cku^tr-ZwnwMM6yDIqC| zPl}10$wC)im6+eqpeVVov^7lw|G_d4f%{d5q+v@lP7@iD?ytel{ATp0yP$}9mpn|l zz9-Kg!F=a_>Ik>)XPtI-kZ-mrt<2825@%KrXlbnzZ zMX6OUKpJ2|ppt0SWr0@DP$aV7F-!({y$Tp7r^8I)+Fa11k%>a>yA4DFz5M*_m>rjE zl&nTZWd>C?uc`J8dDSUnuiPf?19RF_-H=#RAcgsrcKg3#F+AHKIz&qKb{x3;Y-w$s z92`s|^IpE|NQ)C2507tlY9IEe9(t-Hd_s}2#(%#qhvUfSrL4Oau;-qVJF?N!&WRKE zhI}%e?@})C_tzC-fG{H`Vy#O-A66TAhSFSa-a7}Mi?3EQC;vxw_=h1ppb!Dli9giC z1;XZx1jDekJROj>uyOj*gvvs{g;mZ1JZS{A^cv4_3XP!)3CWBwb1;!(UoLe75W%GGyjH(gs|cY{ax4` zqs{w7dYIWwjiu$!fq^ZxQtN}n$QgZpyyO3$|I0RjN~C02)w;4q(^%Zv0*ZBtKL7bT zdP8U31mhW#Z?AImtS1>F9s#4I;j(w}%Ze;aZ##Xop5t`ROM%jXS>QQ*_7o?aa|hl! z)(ohnmJp%kdgd(|5lOzave%tj7gQNmD+rVG0#`rj5TrtM`L|neGb(| zG>l4pl@t5QOwiO&v^8H58YrSV6?nXNz$U_v=UKNgnU56w%#MH8Tza#7-pL!>LU04k z8;V9(Ng;S}{U@dUAE%%%3Fi%1QsnF(uF2Wwe&{0Y6^TMnR-VmEw4*gid(1AN^0fwx zR`v4osY&iHv1z$#l-i&4jrV-w+wp30mSD0~KfPgDeF-w@fXdfcq-B#wQ)!Smwbh}* z870`Eh3Tjt3*JAR$3IL9J%R%e&Y(Hq$y3qdzWus zq-=v3TLm*&bW81fJMv#{_aRdWfAeK*J!~-X_a8e58vbm=M+>~vZ`Nezq$2$s7hqzz zEdcsIrTX5m4j#T-tLE9jS*(|qX#td^VG&048ha{7ruATifZGOgQo2sSQi3{dmoMaS23$E=d)9db8n)5V4!Fj^mZdmq}d;sC=Y~e5BDC_9d_XN4Q`X zgs|_ZtL&_ZL3{2hUd3=%GzVY<)}c-6^E%8OJDQm>TU#H-VG~Bp&kr5i7oZDAh&lNn zV?t2KC;h8Aj5S8Hs zJ7a$Vk7fVJcfB7;V7uw$zFA_5z_=ZZx9A2JhENoowGpmR?On;)O?Gely($epT&b`; z-G_a25f5-L*Q&u*67`)ZnZ?kbTwM(~IUz^-Cc?8c6fV(vP0=rS>Jy24Y7hmVI3ZnD z^Eov_67bS(qE;t$Q_xFg7~Ye3E_HRWWdyDh3_>xLdI6-J54`|_Qh43Jpa?@^I>@vT z?_W1r_Z!dr;O%CJZ2Bi?eWAcub9og&*v;-D+KDBfMNZ)@(ITT5kA^Sa&^|e)aKRXq=a}OK_J#Os8V@wL_uJf27_h_QyW! zxShj00d|b)tT|!l&Ce5FtDs*dG5Rs%u(v;*p%xZVzY(TE?eJB1b%Q#BPx8U~EtAZ~ zSF^{+j_Rv}10ZAj7+kG121`4;UME2Dgh87z2#B`$y=1q0Z8s)6o19e8jl5et0NyPl z?eh*7-X$r&t(k%{l$X~{&-7MY%M*W7bMNRg3KlxM>Oms4dr47+ss&5B5ALRM;i`8Z zNctPaOEor!4VP0uMl!Ga`g=RUO^N5&uZ=GtB35)lDgI;D;?8wsgYPpwX#NOoV4(|q zKCr9Qv^PFIe@v{Tf{1uO$nuP=`Ty{{-n0k>hLJz|f_*!DjSB$&v4(dTlw`ubn4Mma z%=cSse#pbJ=X~I8Jl~7u*Quf&B=GwxoPN3Hog0bxG@vki&8FL^YO4XjCyIOe?nyP7 zL|_jQ4kkPC{IKyHA*2WtS%C6wczkx zp7%|_hgR17cMrid@f{|XM zM>WmUn`}7Ugo71$8>#e|cv=L!)^Sc_`hqo~wkP`@oGJ;p@UjpSqWkO2c12v-73Nv;im!U_ z-f@yD4*Ik2zn-9-e5;ODgpqZYbgF0Ex8EMpUN2crHJ&9Nhp(gI85}r zlql<{nX$C-^=}T$O}xzL6zwrxg7r~@KvKPX2dAnY8g%2CeDDTi+CsA(AOp?s#g<2W zjl}RGg>y65((}0FIOybA!12}EY=%Dadpy@b&^v>;;A9%NtW?2C*`bWke4oGg?tceH zxL+K=4qzuk%}URN+|5>DcY_V_*s1ag3T{D+w_>c>ykxKYu8ezkk72WO6rfd@{CvNA z5YY8$n&FhO?C^uWa+Jo}{WEbK*|AORDocu*9ZQ>2qzWZXdTrzg43uMmWt#VWr{MF? z1j5?E)?E{G@>ngcUSi!hg%pzqUr+7Z{-me!|IK03UC zG+((#MFeUwt|5b-Q#UTKA4-o4;JmfFNfS+%>*vpDhkrU6&JF5Rd)%qZexls0g%zth zo+Le`t~041?Q5YEm^@A=p;3Za zc`!3I-P>eT5)!rsS!Ud`1qgqDC~=C5GT{(sTVe`Obc#z8PgfJoB!1TVfw z9~0xA1x`An9$5K=ZBa|ZDu`;ZAC#xUB&40bgpG@T^V!GJ#u#6mo`Yi;%<{;scYI%LG6;-(rwnZzq8V`OxK_er+hgjpzV1s?%3YJJ@uxWEEyb{25SYA=t7x&!DX?KQwJ}4;4acrj`f9O;kLQQpsD1|&(DYAEnC`bhu6T1uEg#GODC7Ew~|yg&-5kqpLRJscmmZ^~4pTK>JJWZ=aU zASL@2KK~@9ZTbvR%81&gYTovvhWh$^-UE@S)m!s%Eq{&dJN$5#%-+I4;+*tM?3zA? zRAEBgV)@pF%Jz1Q8q{;x@x&v(SEEnx0(x?)n|c|=fI@2IZ3{^zzb7KQ6Dm*zIn}K_ z{w&UpYj%!`hFR`}WWV+GhIUcGx}>E)zBmu#!M21{#vF6wySx zou0X>Z*U1KcVFeFKYuZzUoW&$-^L`>zF9bP?db1=V?{sT{SY}U(D>~rq17_H^u@;ToxKg+NC28oE0a&{(-mbpA{ z`4Pe9arN=s2($a3=;DK(9&5e>KJD&azTq^O?c2?IoGK7U+URyhNa%K5psmx2PT$X~ z7BcAmarla}WQR(7R>!9T{&sc(#G(XHy1*tn&kzruWC(Q5ZD-9-kkI*PiexUIVYnDY zfN=X-NyJ~(0&Qw~k%hcBtKl2_eGd*U#4{P5T39eTd4&>t`eRvg$4j6sT@ZCamJU2lv$(+K(3J0od}Bvh~PMiTF_pghQNJ) zYZ?KmL9;~>p!}UgAdw{$uVx0kxzRdBBRki#{cUKJ7&k5!n<_4SEO*e=)fH*BO3Uuue;=EX6@Kb{ zK}p>wO~p1DZSlBGnJM6fqsBcEgai8ktMRg6ccMGL$$dkn5VY&N4T3+28{v z+E%ORHht_3hw-KGvppS_gQ#AT}Sy^@v2&7NXz=sGuxgxRa zr;>fpMo4~Xs-}F>{sGn9HN@ajrP;3d9S$XVJT*i%zMKs|g+-suox1>oZAHiSmy%M< zbA?Tp|>5*<=8@RZq6L95bil6Dv0kp6Ma%n|A33LJ8Lsb-6tO3I*R%YWH6YSMiewaj&q2Grr-z%z z-?Lo)>PC>niMeEHpXB#Y^nlAuMBGkp1!KUHRBl+@q;bJI_Fa;a>5rw^`)Z!PK7V`~ z8a`jxGm^uDv#DZ?`PK`n@8&U@v3$Ciq${1THNsimQ(qL?_@JUjbZsWt#KmV*%2P|| zDn0@WOycNyNH?5u%(>q8FX7TD6*RI8nGDQQ5+YXOrGVxA>Ztz6R03*1{y=LpGn)6?r)(ioXz||F zXP7{O@X4E-8$OraS1kH%kev~YAu^wH^OfVt!`urkgaWb z+Qp+?{6mM&-G`4KspIt1q+C0lchHIzv%+|ap z3HEYxtCy|g0t>IfFVyz@MLj(|&1S#McadggX~`CNzkVF%Jo-*+Zr%65>%V&YpI*_i zUAnl*t^Sw11T>piWIzw2sF7i=%I5}kiYuoBNFRec*k9`vAccnb=YT1f9=sKddyK3M zkr*o~OS^^(!T>3;fpqXW!yyvh$Ar}(sIr_KC)z}I_aH@EnA+jVJJT7l*Xc?;kKR>1 zptfuQ6HIs8mEhT3DJH#I@*3xSpW1}~hpw-VYO~AsF0>R1MFPRC5VUA;cPS2~E$&_* zxVw`Opp@bc1=`}p-QA(MySw|Bcjmq`ch=nRFV@3aELL*PbI#sB+ZDqa_4IZdCfO+j zY`v}UbNlEWO9cg{%R|98^cS*1c`CDje|)`~RALxVt#b1u)NVy<=#;+KpwzAJ8tD>| z|H}JOTF~+Po^m>FJb_8kZGi_usP-oZ_0kT_>x1v^W2(TX6rL?;8Q@HsYUe>ZD zI5F#X3urPlQ1Cl;z?nWVH`S!Zw9JQ^tPp9{i0*9$nJl}K;bGjh9%zbQtq4H2Hpl#Q z=i}!b$gkX{`pvwLievBUySr?!lWmW=uUx8!>lPjyn>TraFcM;N>e=9276$6->a+<; zT)%$(dbz)9-tXEwAWY!6;&qu&QaisOdf0BZ-fnj2>yT70!b=EQTl5oaM+o5lXZxYy zEH7~``fz&~i}dv|ZBW~O<)7MIVq%e0X;Iy14ZLeH-A)-HL4ft!DlKmpyAs(1=_+=HrdQ^u0ml1aUnO*kE$gU-Bgj?N>|5lk}2eas3?<^senA-73 zmSk6ajsz>U`WM|MZ~i=`6!RCeX@YLqwY4*;Ap3`@=0}&cQN;pO860(@+{B)P1ZFK` zEoQK_@ zDF#kBIGnA-K>SZm>{CJCdp?odZIIB#A9c(4h^rKlY17T{xp9yef`?2LbSox)z7;(e z3+69d;^*f-q*J2g4=ZVYysiA<1K2X%Q(Ifkp|B zQ{UsMlLQksY_5Xc=!J;ra}N&>y1vJjfaiI>hfdeWMx2n}rat>?$=ue8&LS%J|8tHZ z_#P`{p>(YZO9~#_nb7-&lTEw4yVcuwSGErN%}{@>^s-$edq`H@0YNOVKF%@+mL z2`(+UE%{{PD5-g_c0gt9w;q9BT12lD1Kdv6dkty$_tqa}qbX3N&8x0f!cvq>PnRAR zmWaiD+e0z=+zwL#1&oWAYyihA0%;9xGkfm_w3aEjl!d4kWrBkrr2k>bdrc`;=(K+6 zp}6*4%SkM)N<8CYc{Fg(BU=%WX3VwcObF`$W@;T}OGn_)zRKk1Ewp&Nzv-g9?||aT ztZ#}aTGsg7xwh{nS)_yK#sqJxn;(h*cioYc7Pmu|pAq8(y$^itUz1_8X|wlI3HRN2 zxNm2L!LJ8ypN_*s6ZtbO2Rjn~g~h|UkP7CD(%It4e*To}qD&?r*A5NySF?~YsaQT< zzV)tj4X5AjhY%x|_CW&|=&G4uiPH-kWJ7rn>xFX{ z-&K`n5WN~JAh6^q=K!R(?C?tNdYEvLi{9ARm*;-x>QP2{-_s~oN7L>THI4R`?9(ab zF(9-sBBUDC@2UAINNVaheyK?yQ2K}Oaj#w9t5gLk%elc{7r!o85v>=N(LR0kSzqVt ze>Le%Xh@!{oB~O0w08VT^70%66iP~wGO2l`a%@&I3-5us{yhkK;(#MNu?h!hqJ^5{ zU7PO0PDRoANd`&1MoC45mzsWxo`xpTMd->fCBDF~AN49@k3sXS)pJ@F{YM2+R;FiT z+vEEh7mRW5!N<|9nFBT@s#IgHPOZzBhvl zwM27z=~dE=H5~;fhY@r7(8u<%V<{YMyn#SqqOW}uLwxM3oXHH|TdQ%_xyip9#1=fX z<0E5To7bOM4U8S>=C^BF@NRbxe2Da@0zq7)z!7-`CN=$!5m1jAM^$=XTgOZy8o;xA zc7(R|;Z+ZqFL2)%4Tq|(Q9dC zyXxK{#?@1yul@b}QX|{lTGZu6lTDaJWjz*Tcv~MLT4Qejn}LhD(ZfykfbopFPQ*v( zYtszRIQvq`dNPKYQ$dbd8QdY(1eei1%hU5~*2* zapvRCy+lfv><${Har+a=&*q~XAwWqI$&->D|U#HsCib+{nYkSEH4BCoA9@^$4C`kZOD zh#TpAf{)YH@Iu0)OI;D)e18qgp2N|azAw}8L-!G6X)w~5B|)zw8kmnt2vI1DUo)-% zOFQYKWwH;VS!rj~NS}p=ziW?lIX`Ny$9~u|r(7V!neS)p;3P>xzRZ$Dr41Aut(a?O zy{gLCO1i7C|rb+`e?kS}ie^bxoci9DT=R_HOJ4Jn71?W|Nul0>ghsHrix#%G9iV8! z%!8J>IbX!e!$;CiQ}D@+@c`O(X5=C2g_8e})WV67U{#ROq%`}8c<(&JcM7l2BPzZu zb7Fup8G{{3J)b%GX=}2JQ*^4rqTz;3aT2Yu)FnFC>rI7AEa;rSYMu~dy+0HSN+i#{ zC)?ztJX|f#X|@-tp}4B@Hm7`vu^6;xh{)?!y+)j+cMgr7j2!BT7Sy7r-&OljQM|R& zRJjhz1+V*1V`^q30BHObw$;bs;tf_d4MJT4{-MuxH07r|5xWMi zzZ9=&v5Rjh;XX6+jkbQUZnlQsNYWbe4p+0ZrJ5}6e&bm8?N3)2_j{rbV#SBDi40pA zPq+BB!Yt?tghRm5x);qJhtV}A7s!B!c0^tpmByo>D!Wy~iGR}v-6-s;!;YY}?Y(>fxCM;WEtT>AwGnnuQh+d+Jo`Iw4`RdoPyCW%ae}Lnc~pkA+Ozd&BR?@3OwR;s6zhiTh2%yj7^iS@KSWrA^R( z0;v}c>QUv9rXCPJL(ULQSTelAOplOFpUZY^b+s)7Baa-iMe$sEq?MXus=iaF*o1O? zd|b&#*R8w_(M_PQn6^oUz+Y~j3VU4=jZW)5E!WjhK2-Jw8*>#gGVH$(H#Y?f$L}l+ zJdWcA&5ivETFa&9>Fy~TdrAuAxocV7Cf<%!Qid0AHVhgiE&Ac-ox3x(ipjD|ZJhnU6 zlpDjRm%}%ax4HfQv|udr;FMmsc55)R`dnbe&56zBq#QfI6m7B=c8<3r5I#T3A0Av# zqg`FQl4!DLcP6L7WX!1=Zvv0G_)>i|4xVnGZbcawWA}$}f8KWqQf3#_V<1>zy3t`P zhN3U8=O~Y2pPRm+5_y@l^Yiy&03ub7S`n*@^_{7Uf;Fn=_u|zt^oHAR?Bg^$Z>8*v zg#OlKn&Wq{PSJ;cyHblM2Rz$_g@vG~Ayz;Z-f@dCQ)CU0S>mkuzT1hR?gQ*(jidCc z1w4?U?w=cBPDR6jGn4f5$B#n5a~IE1%wbg1#M0=S&p{o&AT6nm=hB!A*4t99`;j2^ zE+J+V`^aaud~Z|gaMtal>!uwLi6Q^oGxi{4NLhT~(z3)!f-x0}v|ARDywSJe`EK%y zeFBWyRJm8g6AcKI1ypxR7I?sZL%BE5H^ebI;&pY%9Y`asgq{aa&$X0O`$kQVGRdM- zOn#$a+-!Xei9ZG?`P zewEEnsPU%9>$xm{`4k*j*1l+nGI|*>N{eCoeM2r{CK?&(ojeAhcx`&BP|KvN?Sc44 z0V%#;Ygz@pr7%N+sXHY;-h9@WvIe_)q1mr_#{9TO6LoGqQKL{735*VAt|7l0uF}Hp z?rU?{+>GLk>56n@6+=pXSSR}exKbcoN%L6=3h7VevtOul2}PX)C3Hp*l15vi@9lGL z`P(`QZ>8D(R*nkTo52E2SXD~++Qd2yh?Loj@P9g#MM~+9jg2jHJoe)E+MkZ1Rk%Fc zKU-Ej zRdW3Lu*K&)5ggQAO_Fuf>SZS(rHR(}_Sf;`>V~t8o6%~Gjc&Vp6g&FV{nI(k)w$zTWH;mPf$#BNIw7L?scJ4*7Mc$Jh};hC{b@2ga0Teyez~`BAXFIW*&fY_{P7lI z2Pif(sP|uV6RKrHcGtC;ms5#&!-RbGQ|XZoJlBjJLJsVtfTj7;(SIEp%F*!$7bGvcm=4>%KCguj-26|!esS0Jie zH_2C>qq%Nh_2dpp&uC~CA?bS|;WPgQXCI1xSFjy=s0#38pe&?ful}?tPB>Y?fjx`F znAJcM1o5=}=RNTkN}o&h#_xG}&)cN2_d=>t77qRqLE0S%&BpcEfU@lW64tbgfHIXW z>rzuvbe3iETc_2C!z0nVN5|yR$L|a)wMJ(aqyaN{GobfnPa}YD<01Rqd{MY{d7_%X zLzSP|;X%dwxjV7tlmD z(?)x1r}aiJt6@1gC=k}-ABDdSCA zmQfe9^Py?u_D1u!cOxJw2%(I#9u_Yj{PSuC4PD5Ac;SRRdI6Bu+cv*U@QKLJ>4bjz zH;53gJL}`?We5mT>H0YGHz+voc%}b^$@L&Sqree>G^(AG7b6%)d7fUpP1+8`y?LHZ(G)T zq{s8ki@9ZgoJOQAWv!H9<;Qb2QlR)xpf}{Gl{Jom}ghZ$(R}0`Q8eW^XhY= zGEG4cVolnwcx%TKVTWSMpWaT|&IWuPLx*qjTrK#JFWwl^68Keo^+2Q&e_s4BkS?;w zmqcG`X=tRD1V|80yhu$Zi>T$KYm2?2japN_1pxTY%my%~6Y4$lk3k>Bu`|HlW1faTDI!3>5#FN*1V#(V0cV z)`;+EcCXdrZ~k8V$E0}gzg^9*QIHSdW%zjJzO8DXHD~gZH1)Ke1{N0ZCn-qFE$WqM z;uZi(Y4|+)EFCawOG_J`u0dEIiO^-`U1ZXGcmnl7Wkpre4;^TMi-n(Y*EhP*LW-T> zqKF4gElwrHBwUw0!-0xMmuXW{IWUg+l<#QiIg^u}g>k@u?5!~6L804|>rla5$9i84 z2V22J7ym^|Oj+%vOW(a|@q2aU)w*?$pGT9kvye$d2JxPBc+Pzzwg$0s_0sR-njqav zI}@9dfvF@PcQu8IE4GpuzGCyVEXZd3e_qg;&qxw;em7PDpQF z6~&!DG-ysFY>hPih}=U1LB!{W2-OQ};;V&>oJqT9&E3@sg6L;a6|O!RJNdH6oHW(< zhcqUzIb+o=;n254ZvpBuu{Ej;ol_~_w>5CXOu{KS($fER82v3VS$3p;bNkU;o0{Ub zZP237OI6vS_S%v^Fz6mYOkrFVYdN#})zRIr^g+cKS)2?Q z<==s~C>b)x3rbHZ59K1?-DsOB6^-uTt`Vn5SG%gJmfW1#bjt=W2ZC}_b+VEY&WYQv z7l}T5QQP!uce0b<&*+?M2JgHd;>@rn7BmlrKE%27&YB$p=6R?@W((Qe{6r?lj(6pp z_QD5DC;b%G@0s~@HDQf+rz7vMj0NI|7J*$Su+hqRD@+vlc^rdLt=~8EnP;MuGWTOX z$`9ZxF_B-^djLv2xg1*(lVBePb2obtX}&~*j++Vx8Nf`yx4TqL`~37dL@-p=bWyzxwhq&y?Wts=zF`VS5)fqr**OvTiB)6{@8f3!fhWV z;x->Ub2v59pEKIRJDi@5?&Wg39)3^$2p{z?UeLYG-Hx>eR=_9y-xZBNkcRG~lH-B? zICjEv&KqPtdO!bbR37iw`6=k8_ZZ$WDzL4o!bh?}9TDjX? z&DCu3#DFyUvc{tRDlc>&MNhG5VBuF61x=_HL|NIrn z^*}h>BHb^x%?9IQiy{wb+LEw(j-7rj+$IqiDX87C>jN}0aKF*Jzua2Ns!3Bss(sPy zy~_`plz(BzvNbtB1`~wn2MgNiU;h-tW{x%Va4PuH zk?jO&D3nOS{j%ifAp|bVuR+Q&_KqRmd7hxI3}>YMyR7(E74}yl`CLxyg{1>ciGDLa zwdtkpBT#KzeKjUN)qk%f8Op0^XS*?L+x4^F>`r7L2~07?l57<`kD1~|LVp(mPS_cRK=@I^lS6nvA0t(Awp|(6UcL@d;3YAX{OD5m^LeG90qGd9GKqX%e?+3( z*z7n+AONjDPAl<2!s{|ms`)~jQMhJ~)%B1nmVX(4Pz&_37`q`456v?#)UL+IFjonU zETf_HZXm&)_rinJL5h1v7YC9df^OvgsGtB^Gx2OC+?j3-%DQo&xA*1^?{s;PmI~Rz zfD$mL`Np8RWt{Dvv{$Z-&i8w0@i9V(%zk+FsV=$kWUjeEYEt2NZlvyzr{)Fwl&J33e!>EjK9!y z5as3JCMK*FO`Ai6-qyOVDAv@~WR@3<|M}u|F&J(CrsPW}W}^~WDB8jlYjP{YYdfhC zkNd|l?yjBG&TW0@s~92x^v^<>S94PNL&k0B%kkmx^B3>vsyaO1*_^(HZ8ZDc8o;T3 znh?11cAtQik271IU7CpVkq?b+g`b<^%~17X#K1|1@*}i4aypUpKdD*m&i3{qX>|u( zE%rF0?*5Ed0P$fe&{sT&C1p^{psu&9ro6O1fH-eGJWmt!d!7Gd&oJu^rUf?4gWgX} zdG<-(-xY~$DsP6Ql#3>NX>8Lp)t&cKUue#t{*ZLH2%xcp-YWSeY@Dt026)OthX2l zj{oVQhNj1EfzD&Q5QHwHshGhryDpg_azKG+G&(&7KN3EX^?rIK<9I$QtsZMaRN1O+ ze_uZx!r#->q@TB)E);KGrir5no?N8S(U#hrBuHlcX@9hk5G^Wt_cp$G`WYd;1*k<{ zyaSLVcd0jY>$H;k6WD5fydPn=7VYOn{8P>Wm}RjXYHbb<N$2c9D}qiD#bk zUwXKSi`9>Qjm=SP7B68MT0sg@7Sc3OhOx=3Ny%Q1Qym^Hk?y=z{tSJ@L7GcaYdhQN z^F3ejIz|;}$+(~3l;LY$+109f+?@$W!{E^xqsQby!-k^?@1x^gqIRvyjCwGm?8KCQ zvJ;5+Nqw)@IJx)enTH za%qlU;EK{!TCE)>w_#8bz_GeZ2}rr96gid#E^_DAD` zent53AWCUGv$Tp1BXe1GJMAqAUk&@O4mB*FrRu|^pSw&!k}Y!!ug2AbN_my3rgg5D>arON2G z+7f8>JGrR#2ly>QBP*+AhL7-@eo0UEPmQrMw|(-y5O!Ac&ftU4Y#p^w2UJd%^J3>X zjS&y71bJ}Mw=PWJtAMq0zBk|&LyFDQ7E)!gpUy5%xg4lN;J7g^9wSPuN-z-2imz2F ziZ9Vct^*pk=W1M7z}4$bu(GsB#`vMWwl>LkL-QR#Hp$QPGj-EroW1&W*^lpJN=hsV z%E9r^-|!sv=RsR`w^8y-tr~~6`!1LbuV32W7pxHRq-c%p2yxpJ3+5!<*;tE6ocQ1) zx~F9#FeU4%w<~tmyQ8l5LgPtQ?~?um=^rIb6xrJ~`4z-|I$Gh~#d6{`(GfR+6fmbr zem!qwM>?n8#kV%Y1)WNG)L>42ob+PHv3LJQQ2uUO{u0Z!(vK`mL@wN6tql8l6&XC( z&u;_h-mY>J^hH3?yOGT~?ndL7qqf~dG@;)*_=43xT-v*Jcd>YtCJrm5e~BDk@(}jD zsrP$BGeWu61!wQXFz_&WWv)UQR!{WguqlIDI^j9nkE^lL@6ax3d7R^=84T&QTzn_% zYNW<^mRdBBve?UPwi{?+83n)9tb~vv8v8DZAa%v_P@wqyZ%#tc*jL3YaR-O)ZmC4H zsHvq#Gz4gXhq9-7Ic-9=tnzqU0&jlDNj!51Ok46k!c#{W^q7NZCXh;1r3l=dUUu35 zDz<)WB0k(5_WixvurVEHRj$}t$&Pl@NizTSs!z45b37VWY@u~msfwQN2(IW@HFR~V zbM2z{SETz>`^5EFP&HVB20bhZpGD$+!CCyyJ;OfjYQZh@NN3Z)WiXm9no{r$wZ`-I z%B%f_uQj#J(^GU`!&DqnJYnWCtj+J8 z2fGKGa0WkKZzmHf;Ow@TSXtb&Vl~- zwBbk&>oRoyCcko8+{|q{VsS zdI7w0m$Sl0>o3V#epTv325A~gLz*D0#+t{&F)@T+`VkulR7c-rF#W{jn=AJrI6NQ7smLW|p+W!4nzW_}Gb>9RD3>-W zQKq@dDIg%oP%MzdY+|RPqVBKqJC*jOWYw9-=HkKbzKo9vp01wmKov*S#H>lM11|yi z+%z>LG6tV|tV)&3Ejw|4Z*34ctkJ~9#jQOy%I1cVWm(fm^lW)r)R-0W8Ionla<&%G#*$HX%-9t>np_{3a~oxPZRd_Jyk#CAn@j+MnN56rWwG1@7)V)JdHP zfx5AUwKFz{M_XoGgwJmf+%WsubTQ8TRX}zHwz6yA?62HH&4C&i{XPP!gCxV!pcA{$*@TkGl6}z3u7TPTMa4dFi zzcxyh{m!o>n@qL^W<@Nw+z8Sxpvo?ND2_u~1I|=piX!9oue5t_?>V)pEzCoCdA=>< zi@5dIpuH&LOKT`TIHexxHAwW5Cpo_FqZU|6JKk=10S{kh>ouYgGtifn(#ZKgS|o`U ziPrbQvyUCKDxme%Rk;7NNm{|l`LuZ)az=0&eKHW~n~tASHuL&qHNW}`0$G5)mP2^{x)An!ODqAZewhx!UXT%LqLIsqeD{o_MDrbMzJ9C zcRxf(K3+hk z7B4X)I6spvzL2uSI(6)9jCHqq6?Cv<6jMj&L3b1iHiGXS`=7BxEr=FnjqJ^r#;iKc zW$b&vm-dy*DG^`US*e~uhVF|=QW>`y{sThz*Fy_G4vt${hjTc_&7xpQr(#!F__M-; z@mIPY)D>w^P!8sNJA({rORFGO)$Ie&r8>LbIf-$3i-?aTieeyz*!ZogiY!afiPz|O zVt0eJsCmUe2uN=sN>cTsP|@`xkcBxirFU^K*0Zu*iluN_fSI|~!GOuG9^zpYQaOKrQ~g_d6D z{k*mjb=7E50i={r;)_=ok}l4Eg1Mktt9@Ab+_7C@&&Hz7r?~i>oEfM(I})WQ9XYM0 z8T|=18u44wVPV_;dniYV{xB_OEa>O>zf+O_qX`-c^M{S(j~S=`&IupVFDvCSZ`Uq+ zS(PVrUIFB+0zp^pkeBy4ON|j#{{qW^mq=e3c20id(1-8Nuw--v)yuMJ%#Q`i!p;eI zCI$pdsR@AKAJ2H1XVk59D~@c~+85umnM&WjVeJXxA7iyQf74t=CFP&7m50UjmPGK2 z#%N%gEUDVWNbA~0l-F+wu%IwnKsrM1YlK!LpZ~Yc_J5ny6ZiwFF0npL{W*i_VYEpE z5#zQ{n>}zrQwj@zNmoz6#6&4;yi#?&OEdID&eZSKN%aQIs%CBM9ULjX>27v)5&Yrh zO3Drl@Ihzw-R#t*BL9K5a1@XiE^ATIDH@yYgkI?4ER|4fs3^?oBC%5ct#-J{9@az>MYXoF{GFeZ5aYuBpc{&>FKr)n>el^3 zQreg<=W*2-{*P4-?SDg~u8|nI9%~KV-`kort?c^lOOEOo7h}D2f z)JtZNLP6l^`~ z4jU2w((GovM^XxD$0FF=3oS3l>x$}=@^9w-RI(JRe8_1s%O{1IiH0cWLb7u<_`bQl z_*i+do%QVSaPza&X~jC65@y8y_LVQW!H@+D>3O*0$ zpyi_#_>7f!5A-styb38}e~nPX0VFc5)oOqoWX9uLC*v-1qB6H_POkht=tmu zQDo&$x|8`)+-Lc#x7OwCLy(imN< zLCq99_T1$hSz2Azz4cAp6y=gg8xp|nBL#?=f4-A+Yp9p-D{vt7TJ^JM25htOp zBbRU2?cf>NvxE2lNBRpZLBM2{tIcd3st2MX+HQ9vUio-SV8lx$g8Ot;-d*Z6jO2ai z)eM%@c1OAVvF|)x$m8zil^MsnNN`Do8_bs=y^oHGwcafJBhRb0ENiC2(tQL>jthL| z=61EVTCj8c`l+I#%6O&^v%$6_R`gnhIZ+TASQ-I+eY3@MWIVGwNW^O%>>wGTQ2+BM zO63J6qR9`#>vRyMWJ7Oivd@zlo0y3tX`;*a(DBL#jOeB6ElULOk1T~jcJ;w}k6k6! zmh1Oqy;L~r^d7B)6B7ffQa3!s<)JaOw$1^F3XOU?{12;4MS_nt!xvurM%<6odzi;( zK|tOLUN;Sk@$LdU-{9}TL@!V-Nz|mbUDsxBcPopEY=8W;72~{-KRZ2TcXBZ&lT%k< zs;e(D_d}g5-!uOp=kYPp0g9?xm|#NRon742i*}Ws-gZx&Cpb;$9G|fpEP|2xsPAa_ zB8=9Xj_i37p5YO6F8977)WD#EfRP@saMbO(s|C#iSbo8FMv%$Ck($l5J1^sc23{dcvB?K{bq@B)lv=xWfXFK9`(_>+K>_D`ZsKM(WiE@U{h%g8o*FK)YWA^?{rrQyjZaRrhJj{bg8ut zf4AnOkwRt-1$!J6(I#@5Apb6Z&j!nxQ(Px|0#iFLNvEy(YTTP+u|C?vw0k51Oh)y} z;*HP4N+%8jO^*3C-<>^wdovjIV0qu5ONk&hE8|r=^oNh9>-4vr){*(#Wxf{ZXZv+F z*NT9iIn2saoQK=nIo-h*b`JlK1^r7%gfAgB-!H4sM_jE2E!b2JDd7cK4v*9^pzCbF z3`rIpvDe2v=KCz8Vw|6N414KGuWORB&rRV&a`|)Bk;vQKeD*(Z41AAyuH8LXYZI1Q zvD5EC={F15G3j5Af7W&%LLlLhP%#fPOnr9`Fh$Ls%(W^PLBPz!L`ZF)Ro4QOllFb9 ze8YWLSR%VC4di<%Q}&I{k#8WV)9m`NnnD62t$pqi_6h`Z~AMT(*$ZzTKO*p5P**q z?;3xh>{3W1mX*S_vw91Tva@uA(tDB4No95C5$!5u;X#xEuXNP>0c!@4Zu^vg{()LV z%7p3PRm6WSZ@`L#m}6T1uV0MJZXf{;xaUNY1?!T6fD9!y;=gyN-MSA6Vp8UD^_wp~>#`)jeo@ zKkf2t%78n}i9v?eg#VrxObvK@0#@tVU;(@hT0j`c89J=C_V zwwEWNt&F#y`8+$b!lJeyoA2g6SE**|zes>T1qUUB4|}4q_EC)}|3|_89}gmUNYGxy z)Qs1r7|6&zY&C3l0zcMvwl9PU1gX>rPs(C6Yt1nblCtF5uA%|nVvBj{#$F4N1d>nG zHi+~3{x5d?`PHJO)JKPVNT&PUfK!PHne;Y&^Aja7T2GPUx77OvnJn!WhE^!jxdY)4 zDQW3QK$i43f)&lvm|WTpX(|x+t3BR>u9{KMh-84Klx}Z50n!YsLc(ISDQldW=C zfA{kK*zYm?1~@DIqMFx%Ujs})lN|Hrt2GO91y`@ z^+S_HcWwBEEHQMoyDcW9a|4)X!NGag7G2<@On9n}KZ23vn&-3a?rM)6(42$G;CsDEc#pe^x<*@1wu zx6GWYH|p}tB=xY2ZfHx|*;@2!%=p8{iR?t;zSZ-1ADZ;`Mbm}%+o~`^0X4D161f%0 zg31(RFG7KBR>G-D;OkT#s|o!gSXcdCA2C+%Ky+DwOX}?W+^&-+j>;5st?Ff;f@gHWs!>N_T5s)OhW!+ zC;!I-D=rd-v~sUT)hNpR*qAugA0$l7NQ4fOTp|#eJ=UXlY*tWU2ay)-H89yF)@qo16SbtPy`g|e9w;!O8= zvO3q3^W2jb1F1_Y1Qg&vp*%$2VLqzbxpSbfqLIz2NcQS(H*dSqYl#YR;+&m@mL%~0 zL;TQ7katP9mNCo6vT5hFg3#u`1P}dQ+cjQ6jhJK4m$kh+PX^XTWOyqZp^|lRC>SRE zvVH<-v3MqmCv7Y`SHDMc@_UOZc@60p+{uooXSbK(hMzQKW=393)08NiQLa<+>BgV4f4<{j5>oTU^?$bsRLo_PbT zPusi3h8$(j8+|H`o<-)xz~v>6y8SVI^F0PnnQ8`KVJ`H|CScBn$qGzY?06 z5}(?V9a2wpre>TvrGuDn)+*~8jA*!sl9G&Z-E*V!@(5y=5Q7wh^B?bVr)uI4w~N*5 zxg@HAmfq{Ff{ekG0Us~_(#`IO*x_czm z#J(g5^4@#cAc{#x(;#q!qho_5E=VI1-hYb@^Lu8(Po!|VGWP%Idh4ht+jnhPkVazY zPAMsoZfTTKQ92}~yBjGP8bxUs8kFwtZjf%6p=0P7n(zLtZ|(Qpdq2;+*8LCvG51_^ zUgvq7N7Qcjytb4+7qK@b-@}H5CJKkOP}bl*LE#Xw+8a%z{JL7J^8dVJQCOVbV=4E@ zi-djQ)ew%%B+=fpLYTPqsLhQ5jnLIovXvWB*iW+WSD0~<(aMqO_i6eZvh-=+i;FoG zEuL%E#B|rUKXT$UV~=Q-^{dT|=Q0>X89$z)Gn=cJ_nbfKjX*;Z)ZX{B!A+dG!~de( z14p}?J~M!l;N2k}0iHRR(vzsuU%6pjhxWo_{aj+T3N-Do#IQb;I~e31Jj}l{Bp1@^qWp!G#r^^u%Rc>)3{jA@*BJq8oh;2P)JLio{Z-ucV%SuCQXpFW z8j`}4N!B^p^rEMd`Fp3TMW8XSgwwd1*J-V1W#oIthvl}MoK(tb>||kE)Ap{`XvPwU zW@i+s8*^Hm$l=cidohZ-0)b*@_~bCpz#BFrze_{rUE%jmMgpEx1<~Uc0$^rTfYaM` z%~LS{u$u(WSxO(Fkb&;)b*3L?D*C?X72J!dqGP9lgXf`Xkm&b?gN8yz#vt@&K@ z#ruImC;j(^axx1UlT;?)&Aa90WnK9R6zOX?b2MPGjBPLNqRF3i1T+$IXX`0 zJZY|P(|qEZwyP^3fHg{&;_l>>cgop6d6K2{nuXF%FcH( zQFUvG7$mIp6_{h{MavcC^-ZYR{Oo`nh6E4;Gg{xTBltF|r>FK^f48RzBY*Mm&W38+O z(UxHEiu|MH{O?||&+t%Xf&!9-oJlhM_v}k_+ew9|D!IbW<=tWmlb3rB%`^ss3v3rx ziHLL5gsPq@sFl+ZB)nhNc62jib&>TWQCKHrrb*+ncHqR{m``?!%qGKG6=eOxoNW5X z7xL`OEd^72^ZWQ;4KYRFm*#wDT{ck3JggjQ+J)tHodhsp#B4k}9*4TshAoq6l$lPd zog)+f&7rHEwpe>BAFFtRtcVWQNe@*BJ0fy`8y&-U2Wr!EgH`qh2Q;*NqnMy`YB9=jd94{x@OTE;&38f;wVH?;V?%ifcV6c`>&tZH!hg1KfGtV=%}2@{QqT;{~a6s zKX0_7f{8)a#zOH&L?W;wo8I&?x8#E*>lJ|~1xO*Y>MqkRa!UQg&{BUh&})Ue!=*fp zW~YPhF2DL$ALQhnn!$^nOKnI6RRqG~sJ6P+%paJdn}0_yX?I8_&6z(GmJOE-j*`M# zF6TDgooSGBHwWWw8Qw8Dm%m3-#s^E=S+7@IXw=2XmM0|Ot|F-H0c$QR5}8jZU#-qXavCt;V5&=VoRmSC4J&?zF`S0HrB${0K4@PUm*+T4ukFC313? z6P55Z{VHsH?aSi-=o0?xk7xR*(7&ySKPli`m4%S5YHTmMb!m^*mSr`WP7_@FWK{#G z%BIjfzz!~4Y{T>=N`iSY9SREzn;oyV4vddm5_++_xVTUd(REZm^H-NPh>e;PG$ca( z(K+46l^6NV|ZYK+$nJ#RB_koh5WrSTb%4x$7HB)M?vjC<51r z=306pCuv`=o+sPWS(V|p-J-e6NvQ32TpK@ANeMgbFn12?^?Aqdwk zLaT!+0Pe)Yx2c4Xl(1-Tuk`tn z)s(}Ff5Taow2jY+W2;}8TY;hncGCNnZE0&a2ECj{ja# z{%?(cyY2!+Q0@-LwyiuXRo?3F)_RQ=P<9muURtz zf1|#JoZQ^p8B$3K%-vU1xe18v+*p-q5rLYB8YH!vsru}sfTP&+7;r-U`RQYK z7aL%rP2uc)wl-jBDBv?AoKssH6L#U3@@2WWdZ9lNVki*uD^YurWOjy{wri)yi4*;< zMM6@ffV{s=ga~jQqsGCB`|D*Rh)!Mn=KvsnK7lD&rug{U3fn9BxS%q11y{O`%ZPkP zd!r7%zhH{=CwId~mQH^I2&UOpfAA;Yn*hv=?bL9OX9vBas5?(~Tvp_(Ak@^~MF z^}j`&%1zqzYz+(yOc{)o@sue8{xSHw_qRwh!2hSHv{b>x<<;Gt&h^wAg8r==sYacH zKZV^w^)=Xz4!qro-Iq?z9vxTD1DS0U`2y#4GirgYi^5)i6#m8LI}O*gbegYnq@y|z z?WkXkpXRmRh1l(D*by{eSWH};dShe5$<=kr56=I$*~K`X z_b9SYy+q<&4EZc+_U~Hig=qKWUv!~X(w+e_wk6%~0zI#q#7*n~WlML9st59iqm4Npg*59hxQr>jtnjsXY#cEx zcd`#HsHMBtD{#=JR|8K-9J3X$iasJ2I;zeKTg6 zcI#?ADUfvy<%Whp*x=yw9MQ`7(2WMP$iu@$2yQPe?P%b6$wl0GuLq=A&(FY}BbV4I7M8S5p&YLNp>=)kF3ayHmf$=ytP2yLmbI^Q|r! z#XfN)U*_k=NQqvJr@*)Gj`~`kM%?#4I+g&@Gjuf$6~a53F0gh~5HBgl zcHe-tvb-GWe~UYz&L<)v&|~LY7q~r|8k$y?A_v>yb7e;dOev7Cokt{>R>`V7NF0~Z zjYU|ne%(oi51*Dtmb`br=!B5@b9fjUrKg9cCTDEo$Cn-4D!cR6a1 z9xid_rKIcMs1J4(ZEbYo9)~Y`F%`TL!7TM7)jE6XSUSl_ zY+}~roeb;pIkPFuc~UQJwB4L0p}U)0i4yU5Athdc%K~E0KwM%)$1xkX-{Q^K8dr$= zLG*_~&QOg-{0BuR<6S-b2%U}hB68y*id^ZpEB@F#svZtuqv zXe=WRy%NT3BA#GxO5EMIQkMIo!6-pzxsMM&K&fkwUZf90UIYY#35YX!=QkWMi618? z{`E{9X&C)+* zz0n-76JS((C1E~NOYOm6EB|V7}>kjM$3vqg=0pVY*ci?NYs7g72he{jmyx z3*(mX{73D>GAmG?=kaQc@R}bntUpc|ZWFOHVKyaQKYXtX%2J_TI?b&|m{`g@-TvU$ z7Kxf)-anWGHh|Oc>|8d!dVIl_+D=H`v`zpaSyw7QlG9JZo6}6!V!UyYI%^X8#}B1r zOCu|c12y~%XU_{E!+)NG+}wuYZHpTRUaCHy807p;iV%9m88!wZBB9~nLw{`HcoKD9 zUt9WgLD#w!4n%fZUMy9V=xMaBb4M_UN&eup zjV7+K?9D&+%T6qWB0r6zArEKeT**6Mpsb7HOO(u@7(V7H7JpbCS=T^R%}=icYQs;T zY@@T7WN&Y87`R2@>41^Ekv9S7oPB=9;Rse74_q@i2kOF=Do%;JqsG@&j#X=Ke*|pX zTKN1U<-|l8$rAc3r@pi#n4Wy>^S(0ePBf(8f02Ryq!l382J!wy=Uz16!+oCVNX&L6 zWubq|&-y$={fjTY8!EcPVCAaZhBxBkwC|pq>8$3B86~c1P(pQ>YZT1D<0W%bcf%hI z+NG2ww42+`U)DHVq%(zW5_xpgY!~sVlZ5H2GBPM+yhhI=`v2pK88JjrG-9DmuKk>i zO|B}3AeqYK7zf4d{|x(!Ud*mN32fN!z_f3YmaPv-hJWTW7E zd`HIF%icy^)>{llJrWiGU6GJDMaWz=G=H{n$)ZDUxU;+0{hyigzb$g3znYV%$aGx0 zvZe(4LT!v{9r*vlU&zg=!T@mWSmKi8H==1>C$5h^;k}5r8y_}C4q-mZm6C&AiHmlS z*$)Y(FJFk`(YZ-PJqcic1V?mvowy2ru*7{$9L4Z9^Sr>mG1<2}>G|rl7cu|(GNswZ zfVbZfrzb2)Lo!^6{?<6RSB(y0wmi&V7$e?xf4#hSco@8?-+sRFw&m(ZslT6;)+mx` z)qjaevte>_GPolCwOG1FLn+H2&5_Di(vwj)woF=472Lh_;Vx6EyZkh?q8)&ZcERT? za3|nf6`up-IKiLN#W7lH-QC~wd7qj0^!1sJrV7rt2TGT<-Pml;qgj!iP{uB7ow;c$ z2^-Dp1S5r#OlCusM~1VWjLu`&Ckdl~a-LGup6#}X+-=|cNnFd&JtTEq6tUBb=wDnJ zuPPa97yg4k)*yi`ax$(vT-k0746l14W1Z7)a!*eq)fyf%(^P}nR)2{nGx@KMe3tTS zp!g(sd2-<(cjFLIE`&mtE_T2a~gis(mr>?tVEkL^@;1+8j^9}`dGHim_Zm(#axca{M-Gwj9V=UE-eA>BorDAE{Xw?>x`IhB zH!1pjf98g%@1NV#l_1H+oR=t{njY1q1cP6daT-oA)z$Oa!0h;1m_8%h;GYd9CArSn zw{@-0azoT@8wbUB0P=R`7{-MFEruN}`SR$3$FxYSl-p*BjF}lTFj<>cK{P*ni2wPs zho3hy={b%Z8b`zvkakUvb7*+D+0mlAh}$lq#aOyElQ_l;vOEH^R&iytl36;M-`2gy zN#q^9quBM6=tl=*aYZ;2A#P~j`d_<6FdF6ag|vnevo54&5bzO($d zFq9;8l){1Hi7!XrE_X32X5pbMZcH?iW>5N~n8~$1&b*F1{#2O-u`;NQp3~_a*_QKG zI*Eb=bd#VT;{FZd**eWtTECB*%PKC8>T=}bPieh%a2Z1`kp9(#@d2X#7In7sS7fv; z=i9|s2B@#55>778ABFIbl6SG}7TU;pTM<$L=hAD6eyY!bHH|(%z7VvRkfn^P^j@Ot z3!gTQXTP_joom zL!@H)ad|xS?dNOU35Z~(FImG=X4;Inv~<28A|eVt2cnb~=910s+gF@!uT$a`_KbIT zvYep$h~4s#?-;rx_`dZP)6&w4xNKqx+0DPk^(A0cOAVcvcn5o(NHCOd=TavZ>J+hk z0wm}%UFbWuehJ+JjFQh6^V1=*{?1s+j9s1{pR)3r&^=XSWop`+uYa_Ov>HFOPS1SI zZTt-ictANhLxlMa63lIPU6FFg>*~xzvNUtDzx7S?v(k?FLRl96ai{bjMTWu!jYgsi zSQLrd$q;|$Hb$|XY_9N@@8AO~+_vOcMT*xyLC39EQHfP@_2Ts7h>Ua<7JKnbRM$GX z!m2Zo*4M;jwNfOIWehqQeyoUpp3~cSc(fOUZKhP!kV%jSVTTI`&dS41)Kt{7-W@)X zCSw~hbyJkracY0Iva-x)wyz^r*hsfS{Gl+dnA){~jY8X1Q?nSrVA|_DAhulSBZs)`0i7mpDDaAUAhFRMi!AJKSLGy^HTxV@E5c*ED-bPqG>A z>(EX`Nz#|m&hTg)#E&OxU9s=6Y{2N`*b4x}2O$dzT*F`jvVP~Z(r&xrGgetf~KmhoOe5a{G$OPZ9i#R?`UHq3t)VC zpK}`W*i@6hR#a3limm~9%XVv(QS@TMs%b+EKKA!S0NQ8bAAlEdGbSUC(FDuhb3Sn~ zd)EJ?e*X`Sol!NB;HOUml)@m&gW;5-dfKAFf$ZQ0WFk390SGluM6@DecqWAg@sB?DJ{E8>vKPEDk2C ze3iLyg-bwkF)_Uy+|-02=2>c?$>$}eo4&68UJD2Bt@$^Bi0?%Onu`$G3hIN3HxUbQI53HedE}aAXm1)bLacxawS5>aMWeT$|=D zJyNvul&~l%F17!9NKUb?V!^XH5p9Fu9K?F{@F0hNbx>W-oF+O&;J;y^xqI?as!$Sc z^Q~5jye{>KByEt>?M3en*XmZK2T>dO+B9-_?U9l#?{dn*?OK{K3=I`hB*A2&ZGP56T@v2eU;AAe?85LT94I**giTmkvG4E%~Rks_Amav zZ=S@aqa!nSK-eEj=Np5{w`S|nFDO+qkB4hpaxehbAwKx=0)Jm%)035zRo|STO6nT> zZXyXhd=wIh_XuseDE!HRgmxYlH+;tiN9z`OEDWH8jm(PCuip`t?v$j9(xieXzJLF& z_>x@v;y;ldy1Ef1C0xvT1WE4CFlV1i_G^(bk8s;}%?A6J_ueq^&6{O~ORTp4TG05g zTUDD+>5Yllu$ly!Ux2dhC91VYkux`+hS!Ix!_?HC{VsgBTJO$Z_`5bA$(7aIj5%)b zs(#?1SK<4d(Z}(i_EPzYL@!G3$Hn@+b?mIVSuIz}*yivZ(LjvmX0gehXP)Fuhmy!Da)MioN!RyB1lo_-0>a*soP_~@JmRmAKjpXR~3a3on%`L_4OFFk#1%;*g zGZG$_CLhRCkPJee4^Zl~^*DdO!2f`RhgS4?;Rg`~G7@NFKmP&wtq(DNb`A^CewMx* zVsic_I7W1`Zqa_%LNz=@1BVNR(#c73p}}LTgHn(4sG$2+`8~%kGR$SSBbw*ENX5_# zaTQx~yO`^W*~8D1op7VM>OdhHf8vz;5tw&uCFecDpH2gxp!ZUO?7})N5(daZm|g=* z9_mgZR@OdnW0KhI_0)F2{sGfAIvUzZ6$$|?l8ny>a0OIWR~Hg?R<)(RL3^>kRJr{Q zFWu{RZw-l-67A-)abr3&pI`>G3J((rmwBr=>&)1Yn@byxI9A}4=G0v<^IA|Ib($@$6re*qO&=eEpjBSwLvoY^mU~sI*Mh%>Y%X%*bSUR(s7& z9DPsAZl!{*vAHfc(|e38Ga?#nUh%MLt*rdEVBOaTtNj^IQVWfR#K2ITw7k1Fr2z+5 zVV-4H)1MzH@9SXa#3+pn#|-^CQ9q!}gnWzrN$1olA*Y%JX~TX(e36?g!bSyGMqh=E z{Kh1t{o$wyuo}-Dp~J-{%38rs1>@@zPSJGI5eLIT2k0bBB2ty-EyUF8v4<4Kb~|q( zkHYZ4co$#8qnfhEiE|yw{?SJO{HM1aPzSWP5tbD<`CVGIq>?d>yAD#%l%y>%ZVUd3 zs)S5arcdsOMLT$IpviZWAd&7-7ED|M^X8u*vuUF^`sbiNheJhza|mq<(Vort2A^tf zbq0@9c;~OMQL7)4V#{drQyl?A#Lxhs{PHQ>KUdLx70J>iyF5PDEg`NoYs#y~j_T{+ zP^Mel;|kW-b1|*KQ$syk5uz!w>KlV9J`eL{Obv#87XB?oofNOiH-{H~j?fe-lY7m; zTfKn{7Ksrq(~Ir-=_cRX$5#*bR_tGVXl*_na@BCX#c0dK@RTMXp_2mpH+v>aZ5#R$ z>#-Y^8&^Kl7b=lqJum2$<8J)>VasFmEdNS4%=q!^Yn-Ww-Ce8hZ-T?`KgNe295;|# zGb?5$YH-VXO(S1L(0Eyu$P>*JiA=@*l1`wlXU2qNQX`ow`0k*+(5=Y?@! z>*MI(vI`wAH$}*L2wRNlo977c+i;Xjt#E4-48#ogWgh7Rc~XxrVf}3RA3ETh0o30E z8OS~THcZT8=zOEQIv$;1Zz4eN+vYz_f5k(0r+}>Y+wE$!=UJ~?7BK&}E!cmpjytwg zzT)to2XQ~7RCx9C%Xvwc{5mixmj0Sq&}GE9C?0DnP_9~MjOTydMd8Aka1}dn@_;KC zxwJ5=_bqd=wW3x#nVnSSxnMj4&IH$Mto}|?$k7SUXc1x(bFZ)g5(l87PciYcBGKpN zlSwDFOhtIePYn$wgMxzkCJpuUY?fE4h3sD2*u22yX0_6~U}&8i^Gr_NRzDP3{5l4w zi?%=&p4FY`{B9dWp9Dz6W)5ZQTnB_sWPJ)qmoZC`VH!|qxx6rBewZD#%w zyf=uCTatPtEEv~)ZCM$fD7RK+SYaI)ul>%c4cp|)A$qVOz=bo z3+5`!P)b&WL#KSmPa9jQB=Nl6UTb!n%+|A*Q_;w=c1&jI&Lk=O)oCn&Cz7HFZH<54 z7h=74CrLOvKUcf^)>pAQnyx?SW zdrmJV%AH_5AIlEIE^*jqi@1Xi1Y_VuKd(HiJ{q7%=(Ndgc<*k^ti?Vsn?xjc5~GbodQebdV<(jo>qV9ViBBn3kvTa`J^lUEN)-*< zfH8Pxfi(29iuQ9g_;EWO|fOP{BaSls6Z z%^utZ8jyfarkV@K@kp}whGyt;l{Npo~4og`ZaZc^`Oa$a0qeAnr>*N`Vr;~cG- z#_@BYn9{H1p8cKg84!lb4p)^CVHf$yCyr>WC}L=T+Oxr>zGFf5@h7@+fjekriO$U` zN@T?m=5dtX-|6og9nV8!w_Fzr8NW%@!#Nd#)xbU1Q2btrbv%7oEn{uVFDg(|*hMif zHRSv!!=NJtTbZs#bJJixSg}(}UEA%NN=H9(0+wKhLoL>X@gdqn(iQV&sF!hq8R|;x zqxY5~p^BicjI}Q>uUpg_WRs0bUYedZM_Y-Z7N*)c4#g&p9^m5n z>?}Qe&UB@oCNzrGO-f3-Eea~_i=hr*a%^7#*LuuViTn}Y%c;?|?{_sjDqoNp7W(i~ zEj60CTxHfxT|E}m(c0P?rxZBg!Srre2s%VIse|~w8x00y!A#*xHYkK{@ zpJ@__?!!VkgQDW1X;Qr#+?C7^4-b9V4})wF27dmj~_9t7JK$vGZ6`WbUc=Pa@h38 z_gJviNNj#MW7#)f{hoVo-ZGrXdWm$#_wbEk z8FVxZR&6;n4rv{?BBfeeFPHv)FYn_&ix&7hqWp;0k6d;2(7mlkiss&~9h9kw;7Ua0 zHV&q%slN5#yLtMZmM>+sio?`LaXaFs`O3Fv)5!nkhL_kcAw)4k?BITfg?(uC=8bj; zga6&fFADjs4^US`a`@fA;CMAhl4|{37u=%|XUf zh*=+0yR&R5bd`|D-gvXfxs}JJ`*`Q3UvZjMx~OZx9Q7*Wa`4&Wuuv^0Dig#1e4I8w zukB)w{S(4{lkF~-jGfANuPwsoQnsE6o)glZ4n7p`h34TBj4Z$_#rt*DQf9OdT~56l z1-`U)y6|*zC4XxD5nl*Z%Y=>?LLBjL5$9mQo8#fm?lx zL*kEgqM=0Zc~l|E=NFhB@7OS*X@SqYt;kPP{A%1!);m8d{Uk5{LR9w-6VqtP>m_W` ze?T~Jcx2?6J-G*OjXC*c5#VG?Nqyo|0LjnKp9RX!gd>`RtZOv2Fi$9kH(-lm4-B&& zlM3XNCem1IpkY>u?8kIsRPmLkKHY6D!^3YY??w>DjH++dt8$F;6OAXjjeIvm2`u?u zhAvQuxb=j4<>eLVCa&RP)p_A4{cdV{5jt6foN0JQ@T>C=79%&6!B2cnVCQSGwfXJZ zdvB!Jeiko~tjop;+c~wDVVfIi50f{fgrmohyZ`d##6(&+=9bls9pC$FZ6TjwH<4|1=aVB6j>g9Q2PJ!=x?0l? zk+;LHkl3n>^Evaitcn5QGC#*D8U6O#BHGfj>XGU5ZBW3N_a7M$ADtdTro%L~WX|JGSacRZPAAhaD&%eW0 zbu69tSQ16nGYOekcs9Dl-YS`rk~|C5kcW(=R+LjqfG;95^6-Fcrw_G8vuY{8wsi)+rtqu3HMc{Y<@3yO z5=1?wXeOas8i6-c*>~xp6wUCT5VEC_6#k>y zIiu=+`oLu=L}lDUjrEl5lJvuATnJWdMKn@K=@8%z@;m#?QSsgP9qW9L@R zMNTYzLL|k8Auy#ZjFg4*f6kJ;nxgl;iii=quA*d&#(=um$u1v>e~vFjj6SKiUnFS> zCHChzUTGZ`@{!oNsCmY@M?5M`_UVp|sbqjgqqo&RJ5Q++x7X3lIQDZXNOsUm8@v{32;HiuWl7L2WKwg3rtui`FhGpQ~>Y?{tZ7@(Kl(HDH8$x|eoJZpu!F6-h_7c}5M}44WNZJ=V+5S4AP<)HwK$l> zgVWy*4SmybYpv>Qj^d@WpEEF!;mb*=W;1;h`AVm(d<|#ytboxDi0Ti4?)^jW?0R@U zqN3*kQWttx33P7(zR|S>xH6&e5>$a4vS9wzaa=O43WX>#^y3{6vtsB3X(@_~QIAfK zVNd=qPVH|Lf2D6G!6Fx|UBjeu9+4g%@B3P$|E z1N}9zLA0SZ;MgI6baTD71X`rl>UR_IlF@FRoLejJ zTJc-bNHVDqpWklKt^M{GwE=jn+H~sC%SI2wcedqzSeNf&gLdx=SorpdlhokzxzxgR7u#lLHFhXRlnWm*Cjj0=_s}K z(wV~XwM9$<*Miw+$nZ1^_oRy?&jpWh$NYYp9s*9*+aZ;tRmA;|ql5yo`u5c^7?2b} zSO~6j9DfQA+X&xx+RQx+nUNCIUUfwoMvu9cTOsEq>!l1wDVDI+t0AB4Q)Ze@4B8Jq zMX7K&onG@qjYF)Q-=t(@J*7{kkhki|_8{(*s>uIzT#@2LdN6xEey~EE;sz873<8+e zCz1q847-ouhA1UIMiIigz>^Sq9W5;_aHGWMjwjU80WGD5%|do!4d#PC7`$Nq(H$yY zQO)osPAphxCs=JdW;7IsQq0W?YtQ+hv>wAG&T9-joyTs6X~GX|%R#bEPHkCP9Tut( z2VhxgR|N5^k+HKCqUmwyv61Ki)naS>HCKLmYzdL_mmR=wsRA{hM)sYHGsBXRY)2d! zlBi0>HueXdZ&h46Yo0gX%R1-Xq#v#nwv&1s@139M_?>04v>x^8`^)rp>yupW6EhHE z?`$t4bAkJ#v)9|>8C3s6ePcwAC;+mfNj`Y{h z8-o%-A%bWk*;9MZ)uU4g?%|-4<&t#3y~>6Zh48iM?FjkfUpW&4w+{~lLo7PuP$R@; z`(xYvo$=#Bz{TTZ#+JEf^?_q+H@sm7*Mz^bq{J+Z!D!1wYX6Qd`L>7N4xSKL!@=Vg zh)^-Uq?o2ebof6mWqNHglGlVUOk4BYUqg|HF-hCrBfBApu=0SZgQhvUORvA}PH`vE zWhp`jefo!-Yj>DSO+^<r8x1({hoBdZhaVVSvfL-}0=2x+#_ zKcIg*T(m)6a}-q=x@RZtbxqxK`YTNfTGbbriSN8pST2&cH^dBH|I&6lSG^YW_K%rq zyfUc2w2o34r~tGs*UR@%vuyQL-UX9#G*DBw-dwZ^)Y(#G=_D+q{O+9^zB<4=ApM>6G?`-JZWD4fRf+9rcgRF0-~nxo5uv@5tO8ZWmoBOQ zBJ2fKV4nx=2y}_n{cNbW+&uO9bJpZ>gNCntMUgb;H4y%sz;H64-lP(@2XYP7mQ{kr zI=UnoPpmjxZ(6F0DN#i08yc{hV+0FeGkPEPaKJ$l3mWtgTORfBN7`~uVcv0v+iAlM_}%##cpGv% zBz!pjcxJmngj943^h5Sb6YS*FJ=`2W3{th-uT1dlL`M29fh&n)XW~TZrl=Bb@M)~b zHQHZs%`3XoI$ou>JQtfAaWk%QTD~Rtq{p3>--N9Hfd&5hzaKYc)V4QtX;pJD^r^$Xk#-aZ>W*lf0HsjzWvP%?kFSP|d--4rOO#KeK z%?hXuPj+bv32%r*o&z|`T)!%Mgmk1JDW(3oMXv0N+v!Chte}Er~*t)EqagrePW%LLVT>6-?kqK^s67% zgr8J~yr{fosB7r15}o&Sx4Qum)JUldu{T}(s*n{xDQao|6xFuy3??Sd$DU^S^ISh_ zsHF6q!h0OTCIc5c$YfzZCWrFxtpLS)PQT4$}t9Fj)w&BV^U`i6= zx!|U&-ObO7zUU9_+U#e>91f!)FVgn&G4VRn-XTI+CjRpgXx93QYI1Zqoe#U0 zX!UP;=M<17$OjXTibQ_LXKlc4ZPlOg5JOg=u0*$*H5AT(!Jj$pMMCUI$-6Tze`nFN zAKZnS_R={R)SP+~VX3wo$G)K(!zOr1+$<^t>Q1rshMPnR3#|T~H`*Zjkl*RL{~&bO<)e& zmR1!!+#O{3JpZ3F6!4~;0*DxlYNAHLW2XypB@V~pTFs{>#Y^|!!gm{%iCh$uS&YA$ zy7`yRB-vLt9gXXTL``6`2RUg+ocaJgy@NL&V`L}cJrZUC`A76Ef21F;$1zRPCdjo7oE5++ z(e;9|0;Wf1agr9qtg012FT$73%ryXulctmSahekVP+vkQ{4Zy;A)#m*u)<8AAqSuV zVsInY3TYU}>Izt`J5S$R z&y^V>fH3)Rv6B}{er$E_DnkJuSDID@P|~+KS3+w0c1(WYMxGuW=`Gcyh%L!r=RIf9 z`4PVUnKAdztT6jKqW?8~{HJSFm+Po~f!t@QkvB!E7<$ps$?rDVyOsnTqek&2LpQ`R zj44dSPW*V*tlh

%K8l`@{NFxU5f-xOrN`qb?1{sZT{yQ-O9-6;B{4Hb%l(_U^knM4m(GXQJB!kv2lw`4$OU|>5~%!#J38A zCpHyYVq0l+0lki0xPT(!J!J7_bMFGe`1{dWXWr zk6ZY`{h@8IdkWO#jTUzpj08+X=T+lhO#_!y>f0f;}+BZ_q$aP1~-ZQF2%@?2Z8e z0lQDrXc2o;Y}0DuSR;^|>B277=$e?`L=QkyV1%Mr%(S5V`(KV+TL1t)f_d$Auz-eNNv z_%YAec*{ZxyGtA*{?|RyfiBw-ICyN-?wmr&)3L2*P|qimUb=J+Tq!z-rWYbn$9nrF z93RA_334bu!cQN#u__@j12=UVr}|z?{F;UuRAkd-!}yLf4wIXv=@-jAep#N(4lim; z3yZL;5dd@Ghw?JxyT(YommN?jvbUB^R`|Sa#k28iWb&hI#Wt9T>6MZuwn-ZE+wXHi znWJhf(9goLVQPV*RBSyv>_&pC7j*4K5t{XN{*#_$qDy%3)>{odQsL9e)H?9OZr4%#lyGWNwn4 z-|FrqP{q_1y#i#Wnn1?$F$#Cdvncp%=O z`m5}J$mD1H>ZNnU8kN(aslR+*&(Z3@p`}ri;ye2O`)>)B_?CNji5^Xt-?ZHP zA@HHs(z(yBrTfCXLWEQ3O|M9EAZI#-UrHMouRh*&t{7TyYj=|PeX{o(9yOV))_)?| zw91WWyL1U%DT8igaYTa#bd8MYOusm;wupMERcD*6wcSfZ4|oe+6bj!i{r-rB0+Y@8 zft8LO^xRknrcKI1d1?7UEiGwl;e&y}^!DW+*?)ATLAYSx|MzLx?U|Oa9iaN`eoNM* zbaBh0*lvMm9mcbXe||tG`b48NHu+DS-b(fik5swK0d!^cJ=xl5Ya{4Y0cOV05#PT|%;~+-F+UvJC3{Y4;$&f#C-Wqme)wX4L{i<txT1Flrfd2>}d3I9DhnD#Wwszn@%JYV2mueslHg^t4_^xZ|6P6CoP4d@6!Q zfDr+LL#C$%qL2y@;=vty*9pjV(6X6=a*X;Z13@uaq`6*qRy_6!sJ=~&-Tc7Lb$ zyO*UoLCZI6uc)}{rmA$-$?4aOHXNx&cFtY7!xc47>ulf$f4(7?YPzPl6O83A<@h#y zB6=5yPO}Z&(W$nGp%ry`?u9{4LNb57Ng9JZf4IN3KbS4u_@#!a6i4U(w-0PD;P`Qr zl2G|#M?EPolwnrO<7>QTv#O-I~oWx~}{vM+e>c-1)b+1QqEHZ8_kR zz0;n#5U9cz;q2DoOVZlNbCAxOmofpP63{a)aDAUZ@C4zN5^NDRt=l&roPqI`SuGH7Zp_i zQ{im)(!rEt)|WoJCq5W*3p@%D97d$ucu|x)TXDLJVZ~IW|7bgQ(a?x~glIdv%t_I~ zO~YpFQ*7OD$#vy=J>nQ+l#ezT6Phx`fpfdKKkTX7ZGsHoS%Q8S{=l6*(7SVoO}3Vq z@oS)IY+dkB!c7e552XXnIDC9) zRBN>Rb_o||m=52$xS1(F^j&-4yxo?*X9rJAyFbRYSrW5q)E+I>VN5n@L)v6M2i%7> zBKnGXskV}r>`Fx4Hm#a_m)LhF`N6a8S9@{xdr)Ml(l~UTrFHFS_Xv8{e|+OgEn;3o zi!hduc$}s``b7?@&Fe8&an;y6tIEx$*EaG^7;QRDWJvXFSvZ{}n`t6?3%RdcV^_A_9MK_uRfPbkC(ip;+otJ53+nd`u zk&YKL3q+{2jEeJKPR+it&`U{=!+FBnYd?h3u^o)Wme^%9v&XpchcIMmxcySgWM<$EwtlP2Z$po*nGCH^ z9%MYnCwIKrQk5V1H#8sqts%!v{MsL_&YoytCxVe0cI< zJ6v7WR(waAJdGNFa6`gZi0)31&D7QgGrtXs7VF~R?@u&<7ay6f6jLIwe6 z29#!qAw*hW=uQO$L zPjpN_&5tC7LCV4hg12bt708Z$Wi9>9=m$Ev`go73;mnav$N@o8%{gCfJE87(`Ek`@ zdi|c~T2tUxtWv@&R7xqa`FqULqemPati?s2Npttm1t~AAJ)eLYW&6NEOY@?37LtjIqr9A&93SWY4``&joj^alZ!k=_Ly5$CQAkvB^5g!PVVH$sA3yV zEj^xpKmHx%C+Fn>+_X4fvT2+vE!g0hmdcZ`7dO(jQ3=3W$l^jxKYc2;e{%zFf~)6< zS-rnX%>ZuP5PbJYQSKRa>~@O2f7PIFm3@PsvW%SvQHtNinl`VpUuyi_*}DUak5Qg` zT6wyLE6gI52Gi2OYwen`g?)Adi)b8zw6--;xu`j%S*x>JIY+om%n$>6eQ)}kp@?Cn zg8?WH?5+||PtyWt6)xvAbYR#z%p#lY>gsa9Y1S%nchb^5e5nc=DK9Ta`s7xon7^uO zBiNgY5$53eS;<&b<_7#WApE^eX;RWs+m(+_`cNPh9 z0=`e}CIW84<*I(&^8Oq{K$Vm?JR)+^!?)%X34|Pgs3R4)S0Zi&@mDdief*$b{7X7H z!>w>XYBur?eF>zEtz$t;Cz1pMSfJ8G-IMnyJQn@s=jnLNf4AUhO#zrCG&@$SC+zyQ z`*MZ}b}(n2=dg`}khy;8c=Dt3*5Id`VLTF%s5bXLnL9;4C&9pZdG)o>p1aWlJgGKa zxZ8F9jT{9 zce{Z{fA5Dx#iIBDL72G6Swcr?7StJbWOXHr(4 z==vOz+N@2ssj?Rn?0S`a=&1v&gmE^*%VIzM_>>h%yT+^20A>WCKyvYq-}m>J3d48A3ufjGbFFwas5R8CIPl?y!v^<{;+noECOGRhu0>F zE&hT|t&?^_oVoU!#Mq;a4gUu{1~=mLgjfzd#*C@za{nX);`kW;7DM->U3!4ai10|I z`_HF-*O$kRdrLp(&05>^nYX#;wBOl;+{h7q?Dll4*MqDQD;s{ucVKq9_0EWX`~ADE znRdO2HbLu}CPQ;Iss@{DkJ(0y!nH>u8AM>>;iY&%ZrPN`(+k;`MTZ)nJyRTDg#hFfQ| z21c(!*piGq)MMji#>aV|ExlJ(IF$Q3d-%iI^W;aH6|xkqJzI&$nCF$QLQ$BPXKu1m zEeS#dwe0NdVAegJmY7)q%_DE0Pkz%Ixlc`^~8ti21MWbh2J$5~&GGHTFi=R!n z_ZE=RPGstg_*k;2QsMkKLW2k{#oazx+(=%RkVomcgV|n&MQV`2r}EyLQhvzKkHqw9 zJFLBa{m`&tZc9t=8E>!U!w%sWuAA>Ot=Iz2CbOn%9X9ecIuH&)yTw@1{@JVU{>lF9 zL)3J)Shw%t_M*TSs__|P39|V#wA7E6^R<=M%eN(b4{Y!6kJ|H16lF@Z910;1rTq`| zYgh6o3tJXV$~i4;)FZoIZDuo0OWswHOIBR#6OAY{AW)S3>vztGBC5RlU>hR8$g7sN zx3fJcIq^#Os`h#D6%w>4Hu^q7e9X2|%4Q^{!T#{xIk(;Lby-sBb+NO*s4|{A_vayR zKFu}df!){aPYyIhreETMyD}UZNigsA>%*f}ql32dn%vwL5r~l!2^DX}qr~07th)&5 z&1dU%1W_>Uq|8@RAC6?buWjj4tLU}jN%Ym;cZswacKc0IzdP(?f1ak6YY z%WuyW*_*M^;?h|1Xzsblj75;|2{RY>rrqKv6AP6)j1`eVr?R_75D6?xw<~b@A{3IG znBweQcM*Dc;CtKmpu#GKYJ#i3R{$}0|KkaZW}Kfyc@4Y3r$-KyqSh@hTP;uLO)pbo zeyaE@w6gj+&XiZ$wTh=NZ`t@v?bA8cw>BKU>z@Q(W79p)Kgrk_|FE7ockZp~n65M! zyH1;SnPjN6pM;%ng&iAu&BpF_ZCv&2k@#WSJ?u9Lfx=HQ^`9cQ?vp}h8(lSbY#4*k z4d;s}AJR=`-QUN52HUR^e(qU&&Ue+->O%??_-J!|+^@jB?stu9EM55JxtHy!J_+bGZp@%kvgAp*?v87oy~yR@tK`e31$euG{Gj_+ znTo#kDk(cx<6HWBojdye+o~~YUG7*Kvh5{Pc-04`WwEqi#kE8qgeDe}PFcKW-Wp+m zQ?qU^rX0w@(#`ywz+tuHb6IfdCntHVM9vMR$=k3EO-dtv9t$nk@2zH;KlX~%jBc6oDpF*o#Rp#cR9zsJ>iFafGU zTg-tjhiy{L^lSSeW~gz_762^ompORuvojNLbk)+voV>$ErD><|G_&ymEG@nKW!3a? z%Pl(XUn5Q^eFx^Oy_)U!{WUm;4V0T(mOCYtzG0N4;nKg%J310R`I0LA5u%~#{PgoI zko#>3r^)LMTXtaSd#MIxK#sP7wp}EUfi$ZfYohsMEO8-5+{&cL-a7f?nV)3*PldwY z!_SIkZuf@pm|R6gc7NVG8M+z_Ulr=^>>|zjRq9AD?%qVW_PBp&jtfO+#IE=OQ%~ELzl3scfo69w|SZj!xN<6y5AUT(Qf3!w6ljh81 zHQ-}E`eVLBuCx9G#BQj;?YwuxurS;Hb->~J)u>1#!(vnw(T(q%|K_MM;W=t#H;gXI zFqTDh)$>Z8H`sGV^)r^*nHx^J+#Eh`J>RZ6f^TfF27}+1mz9O;xtj!L)mP0)`Qhk( z2OR!9TI;oAxnM|l__19|&}$Q8&ZSr6{*9;a4_80I)K^r8ngqBJePRD8WpG}@;T|M2 zy2V|73E2>7+!#MDy9VK*>;bLx9pv)@(ieghbqK+LMcH_33XhL|#(_dlq6W3aYwFhu z8?$mRqK$ZZ6i$#B5EDn2inGy4I|UBmHTiC}x}wb3Y9AUiX3zi_&LYkUXw7nyc=6nR zh-lT&JpWqm*?)-5Zh}Px@vx9w==VthTy^y~66Lhdf6(B`A(ZFdbdHneEPf*H*M4eb zVQi#|1MM@v>6f2I~T{P5E!hu|~6PwlPuJuH(BILk=Z6PoFt z^rsM(cV>Etq!a0Ttfm%r{GIaF3jxtgA$#jrZ^`(&Dhgw#k7nA#U=2c(4|O~YJ%7zh z+FKXzSI0H8bJRS=BsCga{xK_yBuUCtFHagLw5y>qq*35n``8(NlMWDdo!eTz=WIyZ{ zSy@p7*212`70roS5-1Z4fOZR>3ai>rN~fQWgFF}8<8;^3^~#vM#iLVyUufWHI0@aU zF;emX9koDh{0(?%jidc$yGh`9D+F+me)7BYnwKeGJg7LTJpPitbj)x9hXOqZh_n?4 z-MT|hP3bQ4WfPa_d(XR6Mm|dFTAQ$MS3F>rX^GYu#67+SZrwdp>4 zb~jb{-L-rF)_6I`#bl`I3!Ln&`1y!pW6=VYZY)DI_A&P4Dwcud_b0)?xVUVFtedgm z#a89MOxK;)?U%o7{u;lAlq<;crhNMOj_-xPL4Rjwi4l^y_SMJ(!?Kr;P9DB?as9&A z?O!w95K!xg1J3>Bmbxc{Z{qiHF|P`hn!IWI;X}X1835m0ety0=^6uQh8%X7|L>3^| z7Y_88XoVN=g+~iZASV=2P=y$yrUU&2oA)3j2=evo*Vgvm|@`-PfyMnRX?n-NWdv1Pz{DsA#|a@r*T>fL|;YT{ovRGSpf^e-{HFu$3Ye-$qnhWEAC3 z1{~YGwM9xXmz9^d(l=9X_p2&8X-w~0ZDZAVX3DkD8D=?A#}~f#=qNDHLeLk_(uA6; zvyI}&^WtwS2L%(u!hbV;pW0kcgRsX;U{&<8e}Mv`JuhaL-r;_=$HwTc5~QE4p%8X- z2Q5g5mPwXZIXu$XKy6^4z?VRX7a;4f6D@2@9eAn zZecGeuA5jX9(ShUBsLGc`?B&vEaU`D|2k78N|`>pHT1x3zwPI_Y(+Cs3n zD9(&x}N6u`>6{jIL5KmjeZUVu~ZW=W<9)Pnv?yL^~%jwP~puy{AZ805mL(bYnFUTeBaYZC}lmRy@Sgj{H2w zwTaF)o*T*6d!*#Jx;JV-}&7Ie!=9zC57?i!ti9S zv&Z+QF;^g3-{WnDz%Sh?%nfr`B?wN(NGypuE%TASjJ>R*8Sq>K zFjMA}ty?=6PCNJWOgrNLu+i@?9QG_x)bPBECwxd&*|dl#p4D+0i+@mIE+rU87=wHa z5b%D!*G*cdVM(Y|7eQRxgh$iQT1TyB9IL!0*U4G|BC!G(M-4=|Bq0eVkgp_;d|4kb zJF)l=Lbi5eStF#)Z+0qRLe^?jKSR+XeNaW_Y;&kN5;Rg0voGmP93oqf<4UENUG~+L zSU;e+0WAJQ?3W+;B%KTBu=JYRMdvDfLu``8*nD>Fh$HWK=n|GDnVT0z*KXum}bCJ*aBNZ43{ZW7IdK2z-2*A>?E znc$av3|#-#U`mo1fx>V?(x1yt4<|$oiFeeOKmAuC~@eucQHHlLvH(%!9@wEkor{Lc;GAlK2O@sDOu_u8m zwEG#-7J`=j)q-C4`$hSk^L*msJ_hbQ?64r5*H1TVl@jpYopYfDQw1WW&un+!S{Lze zCm2hL*rLt}Ywgm1h-o&a=3!n-O##9C7}#%)i<+uV1)2M5jWmAbml1q^4sSj)0)1BS z10oGsJ#~m;R0pL%QbehXJvMbmzws}|r^J4!ct6>VoeO^VH|$>aoC3fiWGend<)v-V zzC=8sKl5@orRm9uMO**y>C-kU_67pxySr^^k}1ZX2BK6OTSKnCENT;BH<&5UmOV<5 zaXWT0@5@KC3@baF(zRaNJ!0e$uZ*mJwa-oAV(vaPI)>Unp+2#iS4Eu9%d4iX2s$VCc|NfoP6rir<=}isR{~>5YQJ+GHbNsyQVj4u zV=~CBQR?zw$b3eaGN+XA9As%8-n*;dV&hPncB({udqUR#WjyqC%WJIt??#W3aB1Nu zQ$%q)ge&5fvZf$M?8|oDm4`i8Tk8ayz6`M(?iSAdw}kdZg36emm(7ya4FY=lMoo!X zVk(TLILL>o?-y`S0EjDSw9XIfB_1q2!lj(V?&07w>Y-IskaQ2@gt;_0{?>Vo=Fk2{ zV;nP(X~u;oR4H(cOZ$Qt29%JMrkx{$hy+XvkS+|~zWZryB!R;1MwtSZ%5!bG_{TTK zO5^N@TQe*(I2F!gp$_0LK0x@DloCY$A){ruvqOfky>7`zHvcE1x|#XrhPh~#LEX@oSGb#R1*X3R1yZTm&P&dXht5TM zhpUElB3uxl=r`d}VX|mA=i?|_z*Fx)mcTt4ft~qC#>zjc@g(POQDG;DC}m?@O*yzN zmFqFKgAo`CHpu|kMI{6BD&m+TF^bhUiuTi1?+4|9CU-X#KU*gBe{3pQiv&btM0*zx zeu?ZsO-$T=vgO=CSNQC&5b~L~0GYCx_e@;d?!la&6q*F{ z--KC&E@Lcc1@8dt0kMKMeYmg?&;f`61mHAH3MF(muf}aqWHU`s?_xPfk^$e*Gs?pz z6}Ab?AE2xY+OPFHPfXyw!sZTOiQo7~i)r*ei8@q^gGqp1VYC*d26zXwPYtho$r)zW z??>*LNCZw(ipNF25vB5ot5(J<5T)4e+vOcb$l8+mCWz5oHlX+8N%aYPxP_v5JF#4n zn7Hr3+5ix(vO*fl%_6=Z9msE*ddx2mh@|tVU=`R|qr0@r_;J3{?BmlRxsqo;CDG&6 zjz@XGpxYzSj`B-z?WoiY+)Fff#ohaH2JSIvTDh7FRH(q|^AeDyRtZrxYCdO?Af$f( zg%kIvisztBdzKsP3PJyk?SS?)Y@5?IV>>`%?OaDw>YhV5$CzFE|LDb=Qv?)utpZgX zTW_RSdzB&u0-^q$#~EN~ibx0OzI3-!Q`r@SpwF?Ig0{=_Dwa%{1bq1x@9J zrf=vGp4lvLe4)d$N)qCY5oWrvzP8?gZ zObe?LYQBMdg7BU|UiB?}|LNx-_a+Q%GC$0474V)Y1`b~`PcaXc(3&kAC)svoC0|zUI)7qFfPbRrUMVdwfq`Xc5vYmSwlpeCKc6V#pB(PGfTAl#tD;m+JQ<^r)}_n8lv@a8pM+s3IPTvX%%IGuB5(z2{~%)M(6Z%zE% z>w)kRv>Xc~3#G+fD{w6KN{IkUiqAr2aX*wg>s{&LQ;5Lr91=}6H0MN4ag;0T9`p)J z5r7!A$?{R#{XQ0W%D8SRsN zRqni{AbnrsKMdzU}80N{pZa5vrrN4N@zP&mWB7} z9YbhyYJ&^EQ)%p6yO{Ubv#|{7{?AhA7uCx2d1LvTw*K))Yl18f<_&Vi)EO|{7I-ig z>tDwyCcc~%ZT`*OsioOlw%l}MjOS@$F{`IS$E?m7Yih%&HCjttkr|tIViTiJ#ej;b zNPp{`aG%Ik34t^kifyG$Hcfc+)yOD=A;_Xn@u)S^$KwmaxJRs=jP5>ijDNwaf;zN* zcPWsWk<@^G0kR|rPta?J(b}IyTxNVivewPa$8(5e*a0UCQj|EdWR`5EI#rCx4m)7b z4`dE8Pu;H*P_C<`a4K7Qwr~$BGiPQ;2w z3yJksWqHUtJbN!$yH}9VFs84T^`Cc zwc1l7ZCjpeWnHzg69^#m5W-zdx;j)W)GRc_<}v$8aq_IY<$((eEYvEMu&Y|k3EZKU z#|IdrN}UJvc4T?u3fXyq?o`zeS3x7&Zq^yp#H$EdhNbY9R;EA3XiDJ*)s9+CQpLci z37^XK<_LCtZ^20Z| z8+EJVDvJa``lZ?OYk-zVF7Zd4j6Bw6eC7=LOJ;JRu0cx)DlPskUnO7Fx?aY~=y<8^ zKb*BCI(KTkJTfz6eXpFuzs6-D9m5byJkJUkYtCSceGDg-c=}c+bl^3$nyFX^S3vAp zZ%uo2+r1UJ3IX%Qjp6304$9QSEfN$0grWg@ljHFb9kVT}F#1@@F;!}0@$}HG(Bz6| z%^#$NL$?hn7sXTz`ml95l83Hn-Y;(=k8&G+sjM*JiS$40Qd;bz7MP_zHgu|C8*VL+ zKaXgGpxr5%bN#*w;0I9tE%NjtSRxMC*8j=|wiO5&{y=a(jIf}hd4;Pt44ZH^_P?rj zeu0^8^{5bnxx~=vw0m;MZmwGK%3hyOc_gPLSX^&J$iY5m$FTjdxkzJ0a}cO2s-k%b z_|d=h6M)S`t|ZJHYTv-px3k}_{`v9jrga>&sOef$2`=oO|ZS^1K1}?T3fw1pmUz< z)J52!pG)2chl|~hydPnv+VHsnbM;FG%}+j-CoSB@_CQ5?eT4}ZW%`5zA@2`tI^r`! zOwm!2QT9u6qU?;hT$YHq14ieksm*sMEw&=WTA1f4Ks%shF!y|yec_nhOZ$Vz#)u`^ zCF=_;zm;5YnRd&Qb=lADy6ZNZAj<;AoYW0WlURF#nA{AmaDAL ztot|z=6#@G)Io?a>a~i;obzlrys_ms7Nn+$;qHH<%S75ZG1P#bzmWsUC%O z#82jN~soNY~O<7@A`=r?nxL{aQVku6t-p6wQrJn`X`;U9f z3ghlYtLY;G#cWGZ(cqG|TVR&xr>(CT^Sv_Q>$?~cb&+tiE0l)BHVZ(QP_ z;3L#Nta{8O_p-Y~%3W4_g@$AR69GV|hNZACP@%vsAU}|oC}^=W%q8NOsf8hzVJ4xV zz;6CtX|!bA^%JHd<~!Oja!Vhj3iJkeXZn9~P-t}c7WlHdGWvUeeqZ{qRN_iEFBlI| z@^%22bCksRmL&4i1EO$ge1Mk23E_><6T}=M1u8$H3=9v(!~>$T!?$9n_^=yx^O8r* zW(h!TM_k@0^BqCh+xsMuMQO(0dbVW!7k4ZiUOUJSuskC)S@1@()HPQWAW9;bBAH&3 z9iVy-L63;jLR4eCR#8_6iY4{~*&%YldHuT!w7Kj#q8RiYIoeXP6-+y^T!8u&w|Fz7&*aGs*O@tq_y$X2l_%Q{sar^C~U2E7v=2Mv6eUZjf4M23*v0yI0C3@-uFK%Nq zCqKsXaADk2BiLi`)0I{C!kjt2|i(F%DC)7-DF`*R_h|%xIg|;ca-<>jrEe=iS=Gu6^cUacY}=j?hcm{O!V9CbwpyevNe~GgE5}98iH#2m<;4r05R6s30WS%%+E=yX0sd zT;fvmNdr{O@~$fy122Ct5wN^q`32==$#-P}KriNfV#)r*l3Og?P!LpK5E9FpyYN9vTZ#@7OchX}~2za;(5C25C$t0LsvL0ZFIPd?I6UJ?@T%%@lR z=}wZRX4)?%I1W%)8~@!N75)!*RtN)d`JZwSQS$c$a>@P`Hzg2?E4-&Z;hgepEbOZw z2-vP5W+Tbmfd;zSa5Q1x>ak6T_9+r9es3YiNF&kyMj&Rz z%7wvbYzTDspmUn3{LFxAOs~;OLnu!r9A#w{AxU>0^d#)D`upc6(I*ECFUHz#f z!9JD`(kZFa*;?&}5+LeSi2@-K1zoiZ3}(HI9U+subrt~J81um zYK&7YS8_G);V{KWn;1FDE=7-gHBVp;{*2E<>2g7G$1ZXVckg7p_-8&}&C3t^61feo z(p^;cI_{ZAHIT#1i>OmTS`->k7pF7K(FIG%mHu_-5Uv&9Us^dNv$^{2q4sp0+nsc= z`OZVu+Sk74{^TeT(r#*1! znR@-OQs6}V`fE}2s0ySDI#bTCwH`xl#IaKxbh)vcM#cgj{Haz?&$=G(D0t-i66()F zC(rzM&>(vnaIxEP&QsmL%O>~dY+WQ*-5;PAjJ%7`qL(?0+gPbN-fZcObV!aFT=cUs zRPKsgJoKEJF{(};shum^GW%Fx;fAVjut0v~;Fwq~TDM_joNRTgJ!wz0nKz*48dhBL zS%FK#gx>+dk$D9N+6%hR@(XvG)f4`(G(c%i9?`x}j>KYo^Ug|7pKa#)4{j7}iaj?jt%O+*zdwSuCrH(` zkM^$W-|}a7EfP4l)Qi6q`BH_|N3Ym@*(r4t$qGtf=p8xL9s`SFJDvI@PV&y~+DrK4 z4L_5qrtJPyBe^6oA_~uR|FYNN=D$0uAHkS$xm&x^e!tQ==~a7`{xCuPk<@dYS+n$`cawA*cQ6ux zxR;NkZ%%Laakjy#{q(vIT)2vsja;HpI}{J_=hOHJ0Cg8hDAX$a8Rw z<;Ek=;VZ=II!lO!EFrvs<8Q3TYKaa$FR1%@97^LvCMlPJSJr->+GS*J3BE5M>1||= zwf*qGqL$T|?5n`V2cQR&cb;R!fwgknJ8`w$p=M&k9b0GG;jnzY%4HjN!`H~);qP~g zSlM}8W3f@J^Uoi}jwSoLRT4=!v?_n>Q<24nNQ|b=Psi$syAFW!h^w0MZep{2C~Xry zS;nOlg8wzZ2oYpv0-vd`6%+z0@Nc>=b02#{CZL19zNGUpXUiCJB-h2n`^!rI4Rga1 zr$(y}>;~39oVi!hsaO1_)(R^W6`G!8m(Yt$dJapva}QeDOZCCS{r0zxdvAF$6jcU9 ze%*92h#Og$PEWJYBjqdMymWIkJLc6*O^@zxH66L3Zfz9 z!{3*SI2&Z&B(9r3b#v4*kGQv*Zlk? z4#PvEptABZhtWbB&)vEC%AyyC9xQmqwbuG}J0_W(3w`zvLfxsTysi%A;sx-u*3J{#)@SQNoZC0doa~ zR?f1uzfo&{MPzXFMF!+1E^ieg^6o#%g8tuwZExPhiQ9ueaQ|t>fB$|`k!3mf?W)81 z&-SAPy#Y+)ss0D0{J%ch#g`xy@GXv56PWe*?@6_P?MKG@V96ZKUKPE6T|9rcu`EGf zuq-HNabck^`}Vzm&)xceef{$zB%heo?Zv$4`-r^qf9NmnPd3W3^P+vRsK+sXZPVYV zp^Q+RCR3+r@V`vz|9yFgAQYr%8@?zi81;bXpA5}1Aav7F9V0}Q`Oh7(#mAdSEg@t2 za{Hf0B%k;`yZexlyY4?u(`+(;D#8gr>Wln8|C=4|G)P~`{r_0bQI;uc;PCL!QS058 zzZm~-%k9r_B;wY*xU|WgK@Q77j(_e-CDR*KHgEZkwzls|0bdmUv8A#EPe1_P0rG6k z-2u9Pek_a?B$-1;OFL2W_&M7@4h<7t2Y^Xl=7.11.0, {elastic-sec} supports cold tier data for the following {es} indices: + +* Index patterns specified in `securitySolution:defaultIndex` +* Index patterns specified in the definitions of detection rules, except for indicator match rules +* Index patterns specified in the data sources selector on various {security-app} pages + +{elastic-sec} does NOT support cold tier data for the following {es} indices: + +* Index patterns controlled by {elastic-sec}, including signals and list indices +* Index patterns specified in indicator match rules + +Using cold tier data for unsupported indices may result in detection rule timeouts and overall performance degradation. + +[discrete] +[[self-protection]] +==== Elastic Endpoint self-protection + +Self-protection means that {elastic-endpoint} has guards against users and attackers that may try to interfere with its functionality. This protection feature is consistently enhanced to prevent attackers who may attempt to use newer, more sophisticated tactics to interfere with the {elastic-endpoint}. Self-protection is enabled by default when {elastic-endpoint} installs on supported platforms, listed below. + +Self-protection is enabled on the following 64-bit Windows versions: + +* Windows 8.1 +* Windows 10 +* Windows Server 2012 R2 +* Windows Server 2016 +* Windows Server 2019 + +And on the following macOS versions: + +* macOS 10.15 (Catalina) +* macOS 11 (Big Sur) + +NOTE: Other Windows and macOS variants (and all Linux distributions) do not have self-protection. + +For {stack} version >= 7.11.0, self-protection defines the following permissions: + +* Users -- even Administrator/root -- *cannot* delete {elastic-endpoint} files (located at `c:\Program Files\Elastic\Endpoint` on Windows, and `/Library/Elastic/Endpoint` on macOS). +* Users *cannot* terminate the {elastic-endpoint} program or service. +* Administrator/root users *can* read the endpoint's files. On Windows, the easiest way to read Endpoint files is to start an Administrator `cmd.exe` prompt. On macOS, an Administrator can use the `sudo` command. +* Administrator/root users *can* stop the {elastic-agent}'s service. On Windows, run the `sc stop "Elastic Agent"` command. On macOS, run the `sudo launchctl stop elastic-agent` command. + + +[discrete] +[[siem-integration]] +=== Integration with other Elastic products + +You can use {elastic-sec} with other Elastic products and features to help you +identify and investigate suspicious activity: + +* https://www.elastic.co/products/stack/machine-learning[{ml-cap}] +* https://www.elastic.co/products/stack/alerting[Alerting] +* https://www.elastic.co/products/stack/canvas[Canvas] + +[discrete] +[[data-sources]] +=== APM transaction data sources + +By default, {elastic-sec} monitors {apm-app-ref}/apm-getting-started.html[APM] +`apm-*-transaction*` indices. To add additional APM indices, update the +index patterns in the `securitySolution:defaultIndex` setting ({kib} -> Stack Management -> Advanced Settings -> `securitySolution:defaultIndex`). +[discrete] +[[ecs-compliant-reqs]] +=== ECS compliance data requirements +The {ecs-ref}[Elastic Common Schema (ECS)] defines a common set of fields to be used for +storing event data in Elasticsearch. ECS helps users normalize their event data +to better analyze, visualize, and correlate the data represented in their +events. {elastic-sec} supports events and indicator index data from any ECS-compliant data source. +IMPORTANT: {elastic-sec} requires {ecs-ref}[ECS-compliant data]. If you use third-party data collectors to ship data to {es}, the data must be mapped to ECS. +{security-guide}/siem-field-reference.html[Elastic Security ECS field reference] lists ECS fields used in {elastic-sec}. From a816dae16249b1c86a0e1f719d63d3f047192c79 Mon Sep 17 00:00:00 2001 From: Tim Sullivan Date: Wed, 16 Jun 2021 13:55:53 -0700 Subject: [PATCH 34/46] [Reporting/Docs] Add section to troubleshooting guide to explain the StatusCodeError logs (#102278) * [Reporting/Docs] Add section to troubleshooting guide to explain the StatusCodeError logs * Update docs/user/reporting/reporting-troubleshooting.asciidoc Co-authored-by: gchaps <33642766+gchaps@users.noreply.github.com> * use script formatting around error message block Co-authored-by: gchaps <33642766+gchaps@users.noreply.github.com> --- .../reporting-troubleshooting.asciidoc | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/docs/user/reporting/reporting-troubleshooting.asciidoc b/docs/user/reporting/reporting-troubleshooting.asciidoc index 4305b39653f8dc..d6d6190c8504b9 100644 --- a/docs/user/reporting/reporting-troubleshooting.asciidoc +++ b/docs/user/reporting/reporting-troubleshooting.asciidoc @@ -92,6 +92,32 @@ the first time Kibana starts when verbose logging is enabled. Whenever possible, a Reporting error message tries to be as self-explanatory as possible. Here are some error messages you might encounter, along with the solution. +[float] +==== `StatusCodeError: [version_conflict_engine_exception]` +If you are running multiple instances of {kib} in a cluster, the instances share the work of executing report jobs to evenly distribute +the work load. Each instance searches the reporting index for "pending" jobs that the user has requested. It is possible for +multiple instances to find the same job in these searches. Only the instance that successfully updated the job status to +"processing" will actually execute the report job. The other instances that unsuccessfully tried to make the same update will log +something similar to this: + +[source] +-------------------------------------------------------------------------------- +StatusCodeError: [version_conflict_engine_exception] [...]: version conflict, required seqNo [6124], primary term [1]. current document has seqNo [6125] and primary term [1], with { ... } + status: 409, + displayName: 'Conflict', + path: '/.reporting-...', + body: { + error: { + type: 'version_conflict_engine_exception', + reason: '[...]: version conflict, required seqNo [6124], primary term [1]. current document has seqNo [6125] and primary term [1]', + }, + }, + statusCode: 409 +} +-------------------------------------------------------------------------------- + +These messages alone don't indicate a problem. They show normal events that happen in a healthy system. + [float] ==== Max attempts reached There are two primary causes of this error: From 66c9d801d5cdcd48f0d5ee0472a337763547fed4 Mon Sep 17 00:00:00 2001 From: Constance Date: Wed, 16 Jun 2021 15:23:13 -0700 Subject: [PATCH 35/46] [Enterprise Search] Set up initial KibanaPageTemplate (#102170) * Set up shared EnterpriseSearchPageTemplate component * Set up product-specific page templates + setPageChrome + misc tech debt - create AS components/layout/index.ts for imports * Set up navigation helpers for EuiSideNav usage - Update react_router_helpers to pass back props as a plain JS obj instead of only working with React components (+ update react components to use new simpler helper) - Convert SideNavLink active logic to a plain JS helper * Set up top-level product navigations NYI: sub navigations (future separate PRs) * Set up test_helpers for inspecting pageHeaders - primarily useful for rightSideItems, which often contain conditional logic * Initial example: Convert RoleMappings views to new page template Minor refactors: + remove unnecessary type union + fix un-i18n'ed product names + add full stop to documentation sentence + add semantic HTML tags around various page landmarks (header, section) * EUI feedback: add empty root parent section * Revert Role Mappings union type removal - but shenanigans it a bit to take our i18n'd shared product names (requires as const assertion) - done to reduce merge conflicts for Scotty / make his life (hopefully) a bit easier between ent-search and Kibana Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- x-pack/plugins/enterprise_search/kibana.json | 2 +- .../app_search/components/layout/index.ts | 10 + .../app_search/components/layout/nav.test.tsx | 107 +++++++++ .../app_search/components/layout/nav.tsx | 63 ++++++ .../components/layout/page_template.test.tsx | 69 ++++++ .../components/layout/page_template.tsx | 36 +++ .../role_mappings/role_mappings.test.tsx | 8 - .../role_mappings/role_mappings.tsx | 26 ++- .../public/applications/app_search/index.tsx | 12 +- .../applications/shared/layout/index.ts | 4 + .../shared/layout/nav_link_helpers.test.ts | 69 ++++++ .../shared/layout/nav_link_helpers.ts | 40 ++++ .../shared/layout/page_template.scss | 15 ++ .../shared/layout/page_template.test.tsx | 213 ++++++++++++++++++ .../shared/layout/page_template.tsx | 97 ++++++++ .../eui_components.test.tsx | 72 ++---- .../react_router_helpers/eui_components.tsx | 79 +------ .../generate_react_router_props.test.ts | 70 ++++++ .../generate_react_router_props.ts | 55 +++++ .../shared/react_router_helpers/index.ts | 1 + .../shared/role_mapping/constants.ts | 2 +- .../role_mapping/role_mappings_heading.tsx | 4 +- .../public/applications/shared/types.ts | 5 +- .../test_helpers/get_page_header.tsx | 43 ++++ .../public/applications/test_helpers/index.ts | 6 + .../components/layout/index.ts | 3 +- .../components/layout/nav.test.tsx | 55 ++++- .../components/layout/nav.tsx | 49 +++- .../components/layout/page_template.test.tsx | 79 +++++++ .../components/layout/page_template.tsx | 39 ++++ .../applications/workplace_search/index.tsx | 4 +- .../role_mappings/role_mappings.test.tsx | 8 - .../views/role_mappings/role_mappings.tsx | 26 ++- 33 files changed, 1181 insertions(+), 190 deletions(-) create mode 100644 x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/index.ts create mode 100644 x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/nav.test.tsx create mode 100644 x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/nav.tsx create mode 100644 x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/page_template.test.tsx create mode 100644 x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/page_template.tsx create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/layout/nav_link_helpers.test.ts create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/layout/nav_link_helpers.ts create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.scss create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.test.tsx create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.tsx create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/generate_react_router_props.test.ts create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/generate_react_router_props.ts create mode 100644 x-pack/plugins/enterprise_search/public/applications/test_helpers/get_page_header.tsx create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/page_template.test.tsx create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/page_template.tsx diff --git a/x-pack/plugins/enterprise_search/kibana.json b/x-pack/plugins/enterprise_search/kibana.json index a7b29a1e6b457f..f8b4261114a22d 100644 --- a/x-pack/plugins/enterprise_search/kibana.json +++ b/x-pack/plugins/enterprise_search/kibana.json @@ -7,7 +7,7 @@ "optionalPlugins": ["usageCollection", "security", "home", "spaces", "cloud"], "server": true, "ui": true, - "requiredBundles": ["home"], + "requiredBundles": ["home", "kibanaReact"], "owner": { "name": "Enterprise Search", "githubTeam": "enterprise-search-frontend" diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/index.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/index.ts new file mode 100644 index 00000000000000..a7699848831b25 --- /dev/null +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/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 { AppSearchPageTemplate } from './page_template'; +export { useAppSearchNav } from './nav'; +export { KibanaHeaderActions } from './kibana_header_actions'; diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/nav.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/nav.test.tsx new file mode 100644 index 00000000000000..8b06f4b26835d4 --- /dev/null +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/nav.test.tsx @@ -0,0 +1,107 @@ +/* + * Copyright 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'; + +jest.mock('../../../shared/layout', () => ({ + generateNavLink: jest.fn(({ to }) => ({ href: to })), +})); + +import { useAppSearchNav } from './nav'; + +describe('useAppSearchNav', () => { + it('always generates a default engines nav item', () => { + setMockValues({ myRole: {} }); + + expect(useAppSearchNav()).toEqual([ + { + id: '', + name: '', + items: [ + { + id: 'engines', + name: 'Engines', + href: '/engines', + items: [], + }, + ], + }, + ]); + }); + + it('generates a settings nav item if the user can view settings', () => { + setMockValues({ myRole: { canViewSettings: true } }); + + expect(useAppSearchNav()).toEqual([ + { + id: '', + name: '', + items: [ + { + id: 'engines', + name: 'Engines', + href: '/engines', + items: [], + }, + { + id: 'settings', + name: 'Settings', + href: '/settings', + }, + ], + }, + ]); + }); + + it('generates a credentials nav item if the user can view credentials', () => { + setMockValues({ myRole: { canViewAccountCredentials: true } }); + + expect(useAppSearchNav()).toEqual([ + { + id: '', + name: '', + items: [ + { + id: 'engines', + name: 'Engines', + href: '/engines', + items: [], + }, + { + id: 'credentials', + name: 'Credentials', + href: '/credentials', + }, + ], + }, + ]); + }); + + it('generates a users & roles nav item if the user can view role mappings', () => { + setMockValues({ myRole: { canViewRoleMappings: true } }); + + expect(useAppSearchNav()).toEqual([ + { + id: '', + name: '', + items: [ + { + id: 'engines', + name: 'Engines', + href: '/engines', + items: [], + }, + { + id: 'usersRoles', + name: 'Users & roles', + href: '/role_mappings', + }, + ], + }, + ]); + }); +}); diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/nav.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/nav.tsx new file mode 100644 index 00000000000000..57fa740caebec2 --- /dev/null +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/nav.tsx @@ -0,0 +1,63 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { useValues } from 'kea'; + +import { EuiSideNavItemType } from '@elastic/eui'; + +import { generateNavLink } from '../../../shared/layout'; +import { ROLE_MAPPINGS_TITLE } from '../../../shared/role_mapping/constants'; + +import { AppLogic } from '../../app_logic'; +import { ENGINES_PATH, SETTINGS_PATH, CREDENTIALS_PATH, ROLE_MAPPINGS_PATH } from '../../routes'; +import { CREDENTIALS_TITLE } from '../credentials'; +import { ENGINES_TITLE } from '../engines'; +import { SETTINGS_TITLE } from '../settings'; + +export const useAppSearchNav = () => { + const { + myRole: { canViewSettings, canViewAccountCredentials, canViewRoleMappings }, + } = useValues(AppLogic); + + const navItems: Array> = [ + { + id: 'engines', + name: ENGINES_TITLE, + ...generateNavLink({ to: ENGINES_PATH, isRoot: true }), + items: [], // TODO: Engine nav + }, + ]; + + if (canViewSettings) { + navItems.push({ + id: 'settings', + name: SETTINGS_TITLE, + ...generateNavLink({ to: SETTINGS_PATH }), + }); + } + + if (canViewAccountCredentials) { + navItems.push({ + id: 'credentials', + name: CREDENTIALS_TITLE, + ...generateNavLink({ to: CREDENTIALS_PATH }), + }); + } + + if (canViewRoleMappings) { + navItems.push({ + id: 'usersRoles', + name: ROLE_MAPPINGS_TITLE, + ...generateNavLink({ to: ROLE_MAPPINGS_PATH }), + }); + } + + // Root level items are meant to be section headers, but the AS nav (currently) + // isn't organized this way. So we create a fake empty parent item here + // to cause all our navItems to properly render as nav links. + return [{ id: '', name: '', items: navItems }]; +}; diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/page_template.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/page_template.test.tsx new file mode 100644 index 00000000000000..8f47d5f1c46444 --- /dev/null +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/page_template.test.tsx @@ -0,0 +1,69 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +jest.mock('./nav', () => ({ + useAppSearchNav: () => [], +})); + +import React from 'react'; + +import { shallow } from 'enzyme'; + +import { SetAppSearchChrome } from '../../../shared/kibana_chrome'; +import { EnterpriseSearchPageTemplate } from '../../../shared/layout'; +import { SendAppSearchTelemetry } from '../../../shared/telemetry'; + +import { AppSearchPageTemplate } from './page_template'; + +describe('AppSearchPageTemplate', () => { + it('renders', () => { + const wrapper = shallow( + +

+ + ); + + expect(wrapper.type()).toEqual(EnterpriseSearchPageTemplate); + expect(wrapper.prop('solutionNav')).toEqual({ name: 'App Search', items: [] }); + expect(wrapper.find('.hello').text()).toEqual('world'); + }); + + describe('page chrome', () => { + it('takes a breadcrumb array & renders a product-specific page chrome', () => { + const wrapper = shallow(); + const setPageChrome = wrapper.find(EnterpriseSearchPageTemplate).prop('setPageChrome') as any; + + expect(setPageChrome.type).toEqual(SetAppSearchChrome); + expect(setPageChrome.props.trail).toEqual(['Some page']); + }); + }); + + describe('page telemetry', () => { + it('takes a metric & renders product-specific telemetry viewed event', () => { + const wrapper = shallow(); + + expect(wrapper.find(SendAppSearchTelemetry).prop('action')).toEqual('viewed'); + expect(wrapper.find(SendAppSearchTelemetry).prop('metric')).toEqual('some_page'); + }); + }); + + it('passes down any ...pageTemplateProps that EnterpriseSearchPageTemplate accepts', () => { + const wrapper = shallow( + } + /> + ); + + expect(wrapper.find(EnterpriseSearchPageTemplate).prop('pageHeader')!.pageTitle).toEqual( + 'hello world' + ); + expect(wrapper.find(EnterpriseSearchPageTemplate).prop('isLoading')).toEqual(false); + expect(wrapper.find(EnterpriseSearchPageTemplate).prop('emptyState')).toEqual(
); + }); +}); diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/page_template.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/page_template.tsx new file mode 100644 index 00000000000000..31f2eb3215e05a --- /dev/null +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/page_template.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 React from 'react'; + +import { APP_SEARCH_PLUGIN } from '../../../../../common/constants'; +import { SetAppSearchChrome } from '../../../shared/kibana_chrome'; +import { EnterpriseSearchPageTemplate, PageTemplateProps } from '../../../shared/layout'; +import { SendAppSearchTelemetry } from '../../../shared/telemetry'; + +import { useAppSearchNav } from './nav'; + +export const AppSearchPageTemplate: React.FC = ({ + children, + pageChrome, + pageViewTelemetry, + ...pageTemplateProps +}) => { + return ( + } + > + {pageViewTelemetry && } + {children} + + ); +}; diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings.test.tsx index d7ce8053c71f02..308022ccb2e5a7 100644 --- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings.test.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings.test.tsx @@ -12,7 +12,6 @@ import React from 'react'; import { shallow } from 'enzyme'; -import { Loading } from '../../../shared/loading'; import { RoleMappingsTable, RoleMappingsHeading } from '../../../shared/role_mapping'; import { wsRoleMapping } from '../../../shared/role_mapping/__mocks__/roles'; @@ -44,13 +43,6 @@ describe('RoleMappings', () => { expect(wrapper.find(RoleMappingsTable)).toHaveLength(1); }); - it('returns Loading when loading', () => { - setMockValues({ ...mockValues, dataLoading: true }); - const wrapper = shallow(); - - expect(wrapper.find(Loading)).toHaveLength(1); - }); - it('renders RoleMapping flyout', () => { setMockValues({ ...mockValues, roleMappingFlyoutOpen: true }); const wrapper = shallow(); diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings.tsx index 78d0a5cbc8638e..db0e6e6dead111 100644 --- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings.tsx @@ -9,11 +9,10 @@ import React, { useEffect } from 'react'; import { useActions, useValues } from 'kea'; -import { FlashMessages } from '../../../shared/flash_messages'; -import { SetAppSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome'; -import { Loading } from '../../../shared/loading'; +import { APP_SEARCH_PLUGIN } from '../../../../../common/constants'; import { RoleMappingsTable, RoleMappingsHeading } from '../../../shared/role_mapping'; import { ROLE_MAPPINGS_TITLE } from '../../../shared/role_mapping/constants'; +import { AppSearchPageTemplate } from '../layout'; import { ROLE_MAPPINGS_ENGINE_ACCESS_HEADING } from './constants'; import { RoleMapping } from './role_mapping'; @@ -38,11 +37,12 @@ export const RoleMappings: React.FC = () => { return resetState; }, []); - if (dataLoading) return ; - const roleMappingsSection = ( - <> - initializeRoleMapping()} /> +
+ initializeRoleMapping()} + /> { shouldShowAuthProvider={multipleAuthProvidersConfig} handleDeleteMapping={handleDeleteMapping} /> - +
); return ( - <> - + {roleMappingFlyoutOpen && } - {roleMappingsSection} - + ); }; diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx index a491efcb234dca..caf0f805e8ca7e 100644 --- a/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx @@ -25,7 +25,7 @@ import { EngineNav, EngineRouter } from './components/engine'; import { EngineCreation } from './components/engine_creation'; import { EnginesOverview, ENGINES_TITLE } from './components/engines'; import { ErrorConnecting } from './components/error_connecting'; -import { KibanaHeaderActions } from './components/layout/kibana_header_actions'; +import { KibanaHeaderActions } from './components/layout'; import { Library } from './components/library'; import { MetaEngineCreation } from './components/meta_engine_creation'; import { RoleMappings } from './components/role_mappings'; @@ -92,6 +92,11 @@ export const AppSearchConfigured: React.FC> = (props) = )} + {canViewRoleMappings && ( + + + + )} } readOnlyMode={readOnlyMode}> @@ -110,11 +115,6 @@ export const AppSearchConfigured: React.FC> = (props) = - {canViewRoleMappings && ( - - - - )} {canManageEngines && ( diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/index.ts b/x-pack/plugins/enterprise_search/public/applications/shared/layout/index.ts index 2dd5254cee7f1e..856d483e174a69 100644 --- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/index.ts +++ b/x-pack/plugins/enterprise_search/public/applications/shared/layout/index.ts @@ -5,5 +5,9 @@ * 2.0. */ +export { EnterpriseSearchPageTemplate, PageTemplateProps } from './page_template'; +export { generateNavLink } from './nav_link_helpers'; + +// TODO: Delete these once KibanaPageTemplate migration is done export { Layout } from './layout'; export { SideNav, SideNavLink, SideNavItem } from './side_nav'; diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav_link_helpers.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav_link_helpers.test.ts new file mode 100644 index 00000000000000..b51416ac76ca78 --- /dev/null +++ b/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav_link_helpers.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 { mockKibanaValues } from '../../__mocks__/kea_logic'; + +jest.mock('../react_router_helpers', () => ({ + generateReactRouterProps: ({ to }: { to: string }) => ({ + href: `/app/enterprise_search${to}`, + onClick: () => mockKibanaValues.navigateToUrl(to), + }), +})); + +import { generateNavLink, getNavLinkActive } from './nav_link_helpers'; + +describe('generateNavLink', () => { + beforeEach(() => { + jest.clearAllMocks(); + mockKibanaValues.history.location.pathname = '/current_page'; + }); + + it('generates React Router props & isSelected (active) state for use within an EuiSideNavItem obj', () => { + const navItem = generateNavLink({ to: '/test' }); + + expect(navItem.href).toEqual('/app/enterprise_search/test'); + + navItem.onClick({} as any); + expect(mockKibanaValues.navigateToUrl).toHaveBeenCalledWith('/test'); + + expect(navItem.isSelected).toEqual(false); + }); + + describe('getNavLinkActive', () => { + it('returns true when the current path matches the link path', () => { + mockKibanaValues.history.location.pathname = '/test'; + const isSelected = getNavLinkActive({ to: '/test' }); + + expect(isSelected).toEqual(true); + }); + + describe('isRoot', () => { + it('returns true if the current path is "/"', () => { + mockKibanaValues.history.location.pathname = '/'; + const isSelected = getNavLinkActive({ to: '/overview', isRoot: true }); + + expect(isSelected).toEqual(true); + }); + }); + + describe('shouldShowActiveForSubroutes', () => { + it('returns true if the current path is a subroute of the passed path', () => { + mockKibanaValues.history.location.pathname = '/hello/world'; + const isSelected = getNavLinkActive({ to: '/hello', shouldShowActiveForSubroutes: true }); + + expect(isSelected).toEqual(true); + }); + + it('returns false if not', () => { + mockKibanaValues.history.location.pathname = '/hello/world'; + const isSelected = getNavLinkActive({ to: '/hello' }); + + expect(isSelected).toEqual(false); + }); + }); + }); +}); diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav_link_helpers.ts b/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav_link_helpers.ts new file mode 100644 index 00000000000000..6124636af3f992 --- /dev/null +++ b/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav_link_helpers.ts @@ -0,0 +1,40 @@ +/* + * Copyright 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 { stripTrailingSlash } from '../../../../common/strip_slashes'; + +import { KibanaLogic } from '../kibana'; +import { generateReactRouterProps, ReactRouterProps } from '../react_router_helpers'; + +interface Params { + to: string; + isRoot?: boolean; + shouldShowActiveForSubroutes?: boolean; +} + +export const generateNavLink = ({ to, ...rest }: Params & ReactRouterProps) => { + return { + ...generateReactRouterProps({ to, ...rest }), + isSelected: getNavLinkActive({ to, ...rest }), + }; +}; + +export const getNavLinkActive = ({ + to, + isRoot = false, + shouldShowActiveForSubroutes = false, +}: Params): boolean => { + const { pathname } = KibanaLogic.values.history.location; + const currentPath = stripTrailingSlash(pathname); + + const isActive = + currentPath === to || + (shouldShowActiveForSubroutes && currentPath.startsWith(to)) || + (isRoot && currentPath === ''); + + return isActive; +}; diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.scss b/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.scss new file mode 100644 index 00000000000000..9ddd68277c9bc9 --- /dev/null +++ b/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.scss @@ -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. + */ + +.enterpriseSearchPageTemplate { + position: relative; + + &__content { + // Note: relative positioning is required for our centered Loading component + position: relative; + } +} diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.test.tsx new file mode 100644 index 00000000000000..5b02756e44b524 --- /dev/null +++ b/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.test.tsx @@ -0,0 +1,213 @@ +/* + * Copyright 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 { EuiCallOut } from '@elastic/eui'; + +import { KibanaPageTemplate } from '../../../../../../../src/plugins/kibana_react/public'; +import { FlashMessages } from '../flash_messages'; +import { Loading } from '../loading'; + +import { EnterpriseSearchPageTemplate } from './page_template'; + +describe('EnterpriseSearchPageTemplate', () => { + beforeEach(() => { + jest.clearAllMocks(); + setMockValues({ readOnlyMode: false }); + }); + + it('renders', () => { + const wrapper = shallow(); + + expect(wrapper.type()).toEqual(KibanaPageTemplate); + }); + + it('renders children', () => { + const wrapper = shallow( + +
world
+ + ); + + expect(wrapper.find('.hello').text()).toEqual('world'); + }); + + describe('loading state', () => { + it('renders a loading icon in place of children', () => { + const wrapper = shallow( + +
+ + ); + + expect(wrapper.find(Loading).exists()).toBe(true); + expect(wrapper.find('.test').exists()).toBe(false); + }); + + it('renders children & does not render a loading icon when the page is done loading', () => { + const wrapper = shallow( + +
+ + ); + + expect(wrapper.find(Loading).exists()).toBe(false); + expect(wrapper.find('.test').exists()).toBe(true); + }); + }); + + describe('empty state', () => { + it('renders a custom empty state in place of children', () => { + const wrapper = shallow( + Nothing here yet!
} + > +
+ + ); + + expect(wrapper.find('.emptyState').exists()).toBe(true); + expect(wrapper.find('.test').exists()).toBe(false); + + // @see https://github.com/elastic/kibana/blob/master/dev_docs/tutorials/kibana_page_template.mdx#isemptystate + // if you want to use KibanaPageTemplate's `isEmptyState` without a custom emptyState + }); + + it('does not render the custom empty state if the page is not empty', () => { + const wrapper = shallow( + Nothing here yet!
} + > +
+ + ); + + expect(wrapper.find('.emptyState').exists()).toBe(false); + expect(wrapper.find('.test').exists()).toBe(true); + }); + + it('does not render an empty state if the page is still loading', () => { + const wrapper = shallow( + } + /> + ); + + expect(wrapper.find(Loading).exists()).toBe(true); + expect(wrapper.find('.emptyState').exists()).toBe(false); + }); + }); + + describe('read-only mode', () => { + it('renders a callout if in read-only mode', () => { + setMockValues({ readOnlyMode: true }); + const wrapper = shallow(); + + expect(wrapper.find(EuiCallOut).exists()).toBe(true); + }); + + it('does not render a callout if not in read-only mode', () => { + setMockValues({ readOnlyMode: false }); + const wrapper = shallow(); + + expect(wrapper.find(EuiCallOut).exists()).toBe(false); + }); + }); + + describe('flash messages', () => { + it('renders FlashMessages by default', () => { + const wrapper = shallow(); + + expect(wrapper.find(FlashMessages).exists()).toBe(true); + }); + + it('does not render FlashMessages if hidden', () => { + // Example use case: manually showing flash messages in an open flyout or modal + // and not wanting to duplicate flash messages on the overlayed page + const wrapper = shallow(); + + expect(wrapper.find(FlashMessages).exists()).toBe(false); + }); + }); + + describe('page chrome', () => { + const SetPageChrome = () =>
; + + it('renders a product-specific ', () => { + const wrapper = shallow(} />); + + expect(wrapper.find(SetPageChrome).exists()).toBe(true); + }); + + it('invokes page chrome immediately (without waiting for isLoading to be finished)', () => { + const wrapper = shallow( + } isLoading /> + ); + + expect(wrapper.find(SetPageChrome).exists()).toBe(true); + + // This behavior is in contrast to page view telemetry, which is invoked after isLoading finishes + // In addition to the pageHeader prop also changing immediately, this makes navigation feel much snappier + }); + }); + + describe('EuiPageTemplate props', () => { + it('overrides the restrictWidth prop', () => { + const wrapper = shallow(); + + expect(wrapper.find(KibanaPageTemplate).prop('restrictWidth')).toEqual(true); + }); + + it('passes down any ...pageTemplateProps that EuiPageTemplate accepts', () => { + const wrapper = shallow( + + ); + + expect(wrapper.find(KibanaPageTemplate).prop('template')).toEqual('empty'); + expect(wrapper.find(KibanaPageTemplate).prop('paddingSize')).toEqual('s'); + expect(wrapper.find(KibanaPageTemplate).prop('pageHeader')!.pageTitle).toEqual('hello world'); + }); + + it('sets enterpriseSearchPageTemplate classNames while still accepting custom classNames', () => { + const wrapper = shallow( + + ); + + expect(wrapper.find(KibanaPageTemplate).prop('className')).toEqual( + 'enterpriseSearchPageTemplate hello' + ); + expect(wrapper.find(KibanaPageTemplate).prop('pageContentProps')!.className).toEqual( + 'enterpriseSearchPageTemplate__content world' + ); + }); + + it('automatically sets the Enterprise Search logo onto passed solution navs', () => { + const wrapper = shallow( + + ); + + expect(wrapper.find(KibanaPageTemplate).prop('solutionNav')).toEqual({ + icon: 'logoEnterpriseSearch', + name: 'Enterprise Search', + items: [], + }); + }); + }); +}); diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.tsx new file mode 100644 index 00000000000000..affec119215455 --- /dev/null +++ b/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.tsx @@ -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; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React from 'react'; + +import classNames from 'classnames'; +import { useValues } from 'kea'; + +import { EuiCallOut, EuiSpacer } from '@elastic/eui'; +import { i18n } from '@kbn/i18n'; + +import { + KibanaPageTemplate, + KibanaPageTemplateProps, +} from '../../../../../../../src/plugins/kibana_react/public'; + +import { FlashMessages } from '../flash_messages'; +import { HttpLogic } from '../http'; +import { BreadcrumbTrail } from '../kibana_chrome/generate_breadcrumbs'; +import { Loading } from '../loading'; + +import './page_template.scss'; + +/* + * EnterpriseSearchPageTemplate is a light wrapper for KibanaPageTemplate (which + * is a light wrapper for EuiPageTemplate). It should contain only concerns shared + * between both AS & WS, which should have their own AppSearchPageTemplate & + * WorkplaceSearchPageTemplate sitting on top of this template (:nesting_dolls:), + * which in turn manages individual product-specific concerns (e.g. side navs, telemetry, etc.) + * + * @see https://github.com/elastic/kibana/tree/master/src/plugins/kibana_react/public/page_template + * @see https://elastic.github.io/eui/#/layout/page + */ + +export type PageTemplateProps = KibanaPageTemplateProps & { + hideFlashMessages?: boolean; + isLoading?: boolean; + emptyState?: React.ReactNode; + setPageChrome?: React.ReactNode; + // Used by product-specific page templates + pageChrome?: BreadcrumbTrail; + pageViewTelemetry?: string; +}; + +export const EnterpriseSearchPageTemplate: React.FC = ({ + children, + className, + hideFlashMessages, + isLoading, + isEmptyState, + emptyState, + setPageChrome, + solutionNav, + ...pageTemplateProps +}) => { + const { readOnlyMode } = useValues(HttpLogic); + const hasCustomEmptyState = !!emptyState; + const showCustomEmptyState = hasCustomEmptyState && isEmptyState; + + return ( + + {setPageChrome} + {readOnlyMode && ( + <> + + + + )} + {!hideFlashMessages && } + {isLoading ? : showCustomEmptyState ? emptyState : children} + + ); +}; diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_components.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_components.test.tsx index 7fded20cdd87e6..a04e628e0c4f9c 100644 --- a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_components.test.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_components.test.tsx @@ -5,22 +5,22 @@ * 2.0. */ -import { mockKibanaValues } from '../../__mocks__/kea_logic'; -import { mockHistory } from '../../__mocks__/react_router'; +jest.mock('./', () => ({ + generateReactRouterProps: ({ to }: { to: string }) => ({ + href: `/app/enterprise_search${to}`, + onClick: () => {}, + }), +})); import React from 'react'; -import { shallow, mount } from 'enzyme'; +import { shallow } from 'enzyme'; import { EuiLink, EuiButton, EuiButtonEmpty, EuiPanel, EuiCard } from '@elastic/eui'; import { EuiLinkTo, EuiButtonTo, EuiButtonEmptyTo, EuiPanelTo, EuiCardTo } from './eui_components'; -describe('EUI & React Router Component Helpers', () => { - beforeEach(() => { - jest.clearAllMocks(); - }); - +describe('React Router EUI component helpers', () => { it('renders an EuiLink', () => { const wrapper = shallow(); @@ -54,64 +54,18 @@ describe('EUI & React Router Component Helpers', () => { }); it('passes down all ...rest props', () => { - const wrapper = shallow(); + const wrapper = shallow(); const link = wrapper.find(EuiLink); expect(link.prop('external')).toEqual(true); - expect(link.prop('data-test-subj')).toEqual('foo'); + expect(link.prop('data-test-subj')).toEqual('test'); }); - it('renders with the correct href and onClick props', () => { - const wrapper = mount(); + it('renders with generated href and onClick props', () => { + const wrapper = shallow(); const link = wrapper.find(EuiLink); expect(link.prop('onClick')).toBeInstanceOf(Function); - expect(link.prop('href')).toEqual('/app/enterprise_search/foo/bar'); - expect(mockHistory.createHref).toHaveBeenCalled(); - }); - - it('renders with the correct non-basenamed href when shouldNotCreateHref is passed', () => { - const wrapper = mount(); - const link = wrapper.find(EuiLink); - - expect(link.prop('href')).toEqual('/foo/bar'); - expect(mockHistory.createHref).not.toHaveBeenCalled(); - }); - - describe('onClick', () => { - it('prevents default navigation and uses React Router history', () => { - const wrapper = mount(); - - const simulatedEvent = { - button: 0, - target: { getAttribute: () => '_self' }, - preventDefault: jest.fn(), - }; - wrapper.find(EuiLink).simulate('click', simulatedEvent); - - expect(simulatedEvent.preventDefault).toHaveBeenCalled(); - expect(mockKibanaValues.navigateToUrl).toHaveBeenCalled(); - }); - - it('does not prevent default browser behavior on new tab/window clicks', () => { - const wrapper = mount(); - - const simulatedEvent = { - shiftKey: true, - target: { getAttribute: () => '_blank' }, - }; - wrapper.find(EuiLink).simulate('click', simulatedEvent); - - expect(mockKibanaValues.navigateToUrl).not.toHaveBeenCalled(); - }); - - it('calls inherited onClick actions in addition to default navigation', () => { - const customOnClick = jest.fn(); // Can be anything from telemetry to a state reset - const wrapper = mount(); - - wrapper.find(EuiLink).simulate('click', { shiftKey: true }); - - expect(customOnClick).toHaveBeenCalled(); - }); + expect(link.prop('href')).toEqual('/app/enterprise_search/hello/world'); }); }); diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_components.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_components.tsx index b9fee9d16273b8..e7eb36f279fc75 100644 --- a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_components.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_components.tsx @@ -7,8 +7,6 @@ import React from 'react'; -import { useValues } from 'kea'; - import { EuiLink, EuiButton, @@ -22,55 +20,10 @@ import { } from '@elastic/eui'; import { EuiPanelProps } from '@elastic/eui/src/components/panel/panel'; -import { HttpLogic } from '../http'; -import { KibanaLogic } from '../kibana'; - -import { letBrowserHandleEvent, createHref } from './'; +import { generateReactRouterProps, ReactRouterProps } from './'; /** - * Generates EUI components with React-Router-ified links - * - * Based off of EUI's recommendations for handling React Router: - * https://github.com/elastic/eui/blob/master/wiki/react-router.md#react-router-51 - */ - -interface ReactRouterProps { - to: string; - onClick?(): void; - // Used to navigate outside of the React Router plugin basename but still within Kibana, - // e.g. if we need to go from Enterprise Search to App Search - shouldNotCreateHref?: boolean; -} - -export const ReactRouterHelper: React.FC = ({ - to, - onClick, - shouldNotCreateHref, - children, -}) => { - const { navigateToUrl, history } = useValues(KibanaLogic); - const { http } = useValues(HttpLogic); - - // Generate the correct link href (with basename etc. accounted for) - const href = createHref(to, { history, http }, { shouldNotCreateHref }); - - const reactRouterLinkClick = (event: React.MouseEvent) => { - if (onClick) onClick(); // Run any passed click events (e.g. telemetry) - if (letBrowserHandleEvent(event)) return; // Return early if the link behavior shouldn't be handled by React Router - - // Prevent regular link behavior, which causes a browser refresh. - event.preventDefault(); - - // Perform SPA navigation. - navigateToUrl(to, { shouldNotCreateHref }); - }; - - const reactRouterProps = { href, onClick: reactRouterLinkClick }; - return React.cloneElement(children as React.ReactElement, reactRouterProps); -}; - -/** - * Component helpers + * Correctly typed component helpers with React-Router-friendly `href` and `onClick` props */ type ReactRouterEuiLinkProps = ReactRouterProps & EuiLinkAnchorProps; @@ -79,11 +32,7 @@ export const EuiLinkTo: React.FC = ({ onClick, shouldNotCreateHref, ...rest -}) => ( - - - -); +}) => ; type ReactRouterEuiButtonProps = ReactRouterProps & EuiButtonProps; export const EuiButtonTo: React.FC = ({ @@ -91,11 +40,7 @@ export const EuiButtonTo: React.FC = ({ onClick, shouldNotCreateHref, ...rest -}) => ( - - - -); +}) => ; type ReactRouterEuiButtonEmptyProps = ReactRouterProps & EuiButtonEmptyProps; export const EuiButtonEmptyTo: React.FC = ({ @@ -104,9 +49,7 @@ export const EuiButtonEmptyTo: React.FC = ({ shouldNotCreateHref, ...rest }) => ( - - - + ); type ReactRouterEuiPanelProps = ReactRouterProps & EuiPanelProps; @@ -115,11 +58,7 @@ export const EuiPanelTo: React.FC = ({ onClick, shouldNotCreateHref, ...rest -}) => ( - - - -); +}) => ; type ReactRouterEuiCardProps = ReactRouterProps & EuiCardProps; export const EuiCardTo: React.FC = ({ @@ -127,8 +66,4 @@ export const EuiCardTo: React.FC = ({ onClick, shouldNotCreateHref, ...rest -}) => ( - - - -); +}) => ; diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/generate_react_router_props.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/generate_react_router_props.test.ts new file mode 100644 index 00000000000000..dc8bf28a444071 --- /dev/null +++ b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/generate_react_router_props.test.ts @@ -0,0 +1,70 @@ +/* + * Copyright 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 { mockKibanaValues } from '../../__mocks__/kea_logic'; +import { mockHistory } from '../../__mocks__/react_router'; + +import { generateReactRouterProps } from './'; + +describe('generateReactRouterProps', () => { + beforeEach(() => { + jest.clearAllMocks(); + }); + + it('generates React-Router-friendly href and onClick props', () => { + expect(generateReactRouterProps({ to: '/hello/world' })).toEqual({ + href: '/app/enterprise_search/hello/world', + onClick: expect.any(Function), + }); + expect(mockHistory.createHref).toHaveBeenCalled(); + }); + + it('renders with the correct non-basenamed href when shouldNotCreateHref is passed', () => { + expect(generateReactRouterProps({ to: '/hello/world', shouldNotCreateHref: true })).toEqual({ + href: '/hello/world', + onClick: expect.any(Function), + }); + }); + + describe('onClick', () => { + it('prevents default navigation and uses React Router history', () => { + const mockEvent = { + button: 0, + target: { getAttribute: () => '_self' }, + preventDefault: jest.fn(), + } as any; + + const { onClick } = generateReactRouterProps({ to: '/test' }); + onClick(mockEvent); + + expect(mockEvent.preventDefault).toHaveBeenCalled(); + expect(mockKibanaValues.navigateToUrl).toHaveBeenCalled(); + }); + + it('does not prevent default browser behavior on new tab/window clicks', () => { + const mockEvent = { + shiftKey: true, + target: { getAttribute: () => '_blank' }, + } as any; + + const { onClick } = generateReactRouterProps({ to: '/test' }); + onClick(mockEvent); + + expect(mockKibanaValues.navigateToUrl).not.toHaveBeenCalled(); + }); + + it('calls inherited onClick actions in addition to default navigation', () => { + const mockEvent = { preventDefault: jest.fn() } as any; + const customOnClick = jest.fn(); // Can be anything from telemetry to a state reset + + const { onClick } = generateReactRouterProps({ to: '/test', onClick: customOnClick }); + onClick(mockEvent); + + expect(customOnClick).toHaveBeenCalled(); + }); + }); +}); diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/generate_react_router_props.ts b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/generate_react_router_props.ts new file mode 100644 index 00000000000000..d80eca19207bd5 --- /dev/null +++ b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/generate_react_router_props.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 React from 'react'; + +import { HttpLogic } from '../http'; +import { KibanaLogic } from '../kibana'; + +import { letBrowserHandleEvent, createHref } from './'; + +/** + * Generates the `href` and `onClick` props for React-Router-friendly links + * + * Based off of EUI's recommendations for handling React Router: + * https://github.com/elastic/eui/blob/master/wiki/react-router.md#react-router-51 + * + * but separated out from EuiLink portion as we use this for multiple EUI components + */ + +export interface ReactRouterProps { + to: string; + onClick?(): void; + // Used to navigate outside of the React Router plugin basename but still within Kibana, + // e.g. if we need to go from Enterprise Search to App Search + shouldNotCreateHref?: boolean; +} + +export const generateReactRouterProps = ({ + to, + onClick, + shouldNotCreateHref, +}: ReactRouterProps) => { + const { navigateToUrl, history } = KibanaLogic.values; + const { http } = HttpLogic.values; + + // Generate the correct link href (with basename etc. accounted for) + const href = createHref(to, { history, http }, { shouldNotCreateHref }); + + const reactRouterLinkClick = (event: React.MouseEvent) => { + if (onClick) onClick(); // Run any passed click events (e.g. telemetry) + if (letBrowserHandleEvent(event)) return; // Return early if the link behavior shouldn't be handled by React Router + + // Prevent regular link behavior, which causes a browser refresh. + event.preventDefault(); + + // Perform SPA navigation. + navigateToUrl(to, { shouldNotCreateHref }); + }; + + return { href, onClick: reactRouterLinkClick }; +}; diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/index.ts b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/index.ts index 1a73c9c281b21f..17827b02302377 100644 --- a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/index.ts +++ b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/index.ts @@ -7,4 +7,5 @@ export { letBrowserHandleEvent } from './link_events'; export { createHref, CreateHrefOptions } from './create_href'; +export { generateReactRouterProps, ReactRouterProps } from './generate_react_router_props'; export { EuiLinkTo, EuiButtonTo, EuiButtonEmptyTo, EuiPanelTo, EuiCardTo } from './eui_components'; diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/constants.ts b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/constants.ts index 47d481630510e2..9f40844e52470a 100644 --- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/constants.ts +++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/constants.ts @@ -193,7 +193,7 @@ export const ROLE_MAPPINGS_HEADING_DESCRIPTION = (productName: ProductName) => export const ROLE_MAPPINGS_HEADING_DOCS_LINK = i18n.translate( 'xpack.enterpriseSearch.roleMapping.roleMappingsHeadingDocsLink', - { defaultMessage: 'Learn more about role mappings' } + { defaultMessage: 'Learn more about role mappings.' } ); export const ROLE_MAPPINGS_HEADING_BUTTON = i18n.translate( diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_heading.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_heading.tsx index b2143c6ff44028..eee8b180d32819 100644 --- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_heading.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_heading.tsx @@ -35,7 +35,7 @@ interface Props { const ROLE_MAPPINGS_DOCS_HREF = '#TODO'; export const RoleMappingsHeading: React.FC = ({ productName, onClick }) => ( - <> +
@@ -58,5 +58,5 @@ export const RoleMappingsHeading: React.FC = ({ productName, onClick }) = - +
); diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/types.ts b/x-pack/plugins/enterprise_search/public/applications/shared/types.ts index f450ca556ebe25..67208c63ddf4cc 100644 --- a/x-pack/plugins/enterprise_search/public/applications/shared/types.ts +++ b/x-pack/plugins/enterprise_search/public/applications/shared/types.ts @@ -5,6 +5,8 @@ * 2.0. */ +import { APP_SEARCH_PLUGIN, WORKPLACE_SEARCH_PLUGIN } from '../../../common/constants'; + import { ADD, UPDATE } from './constants/operations'; export type TOperation = typeof ADD | typeof UPDATE; @@ -36,4 +38,5 @@ export interface RoleMapping { }; } -export type ProductName = 'App Search' | 'Workplace Search'; +const productNames = [APP_SEARCH_PLUGIN.NAME, WORKPLACE_SEARCH_PLUGIN.NAME] as const; +export type ProductName = typeof productNames[number]; diff --git a/x-pack/plugins/enterprise_search/public/applications/test_helpers/get_page_header.tsx b/x-pack/plugins/enterprise_search/public/applications/test_helpers/get_page_header.tsx new file mode 100644 index 00000000000000..6e89274dca5703 --- /dev/null +++ b/x-pack/plugins/enterprise_search/public/applications/test_helpers/get_page_header.tsx @@ -0,0 +1,43 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { Fragment } from 'react'; + +import { shallow, ShallowWrapper } from 'enzyme'; + +import { EuiPageHeaderProps } from '@elastic/eui'; + +/* + * Given an AppSearchPageTemplate or WorkplaceSearchPageTemplate, these + * helpers dive into various parts of the EuiPageHeader to make assertions + * slightly less of a pain in shallow renders + */ + +export const getPageHeader = (wrapper: ShallowWrapper) => { + const pageHeader = wrapper.prop('pageHeader') as EuiPageHeaderProps; + return pageHeader || {}; +}; + +export const getPageTitle = (wrapper: ShallowWrapper) => { + return getPageHeader(wrapper).pageTitle; +}; + +export const getPageDescription = (wrapper: ShallowWrapper) => { + return getPageHeader(wrapper).description; +}; + +export const getPageHeaderActions = (wrapper: ShallowWrapper) => { + const actions = getPageHeader(wrapper).rightSideItems || []; + + return shallow( +
+ {actions.map((action: React.ReactNode, i) => ( + {action} + ))} +
+ ); +}; diff --git a/x-pack/plugins/enterprise_search/public/applications/test_helpers/index.ts b/x-pack/plugins/enterprise_search/public/applications/test_helpers/index.ts index e34ff763637b5a..ed5c3f85a888ee 100644 --- a/x-pack/plugins/enterprise_search/public/applications/test_helpers/index.ts +++ b/x-pack/plugins/enterprise_search/public/applications/test_helpers/index.ts @@ -10,6 +10,12 @@ export { mountAsync } from './mount_async'; export { mountWithIntl } from './mount_with_i18n'; export { shallowWithIntl } from './shallow_with_i18n'; export { rerender } from './enzyme_rerender'; +export { + getPageHeader, + getPageTitle, + getPageDescription, + getPageHeaderActions, +} from './get_page_header'; // Misc export { expectedAsyncError } from './expected_async_error'; diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/index.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/index.ts index e1c2a3b76e3ff1..8cdc1336817629 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/index.ts +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/index.ts @@ -5,7 +5,8 @@ * 2.0. */ -export { WorkplaceSearchNav } from './nav'; +export { WorkplaceSearchPageTemplate } from './page_template'; +export { useWorkplaceSearchNav, WorkplaceSearchNav } from './nav'; export { WorkplaceSearchHeaderActions } from './kibana_header_actions'; export { AccountHeader } from './account_header'; export { PersonalDashboardLayout } from './personal_dashboard_layout'; diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/nav.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/nav.test.tsx index 8f37f608f4e282..90da5b3163ecfc 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/nav.test.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/nav.test.tsx @@ -5,7 +5,10 @@ * 2.0. */ -import '../../../__mocks__/enterprise_search_url.mock'; +jest.mock('../../../shared/layout', () => ({ + ...jest.requireActual('../../../shared/layout'), + generateNavLink: jest.fn(({ to }) => ({ href: to })), +})); import React from 'react'; @@ -13,7 +16,55 @@ import { shallow } from 'enzyme'; import { SideNav, SideNavLink } from '../../../shared/layout'; -import { WorkplaceSearchNav } from './'; +import { useWorkplaceSearchNav, WorkplaceSearchNav } from './'; + +describe('useWorkplaceSearchNav', () => { + it('returns an array of top-level Workplace Search nav items', () => { + expect(useWorkplaceSearchNav()).toEqual([ + { + id: '', + name: '', + items: [ + { + id: 'root', + name: 'Overview', + href: '/', + }, + { + id: 'sources', + name: 'Sources', + href: '/sources', + items: [], + }, + { + id: 'groups', + name: 'Groups', + href: '/groups', + items: [], + }, + { + id: 'usersRoles', + name: 'Users & roles', + href: '/role_mappings', + }, + { + id: 'security', + name: 'Security', + href: '/security', + }, + { + id: 'settings', + name: 'Settings', + href: '/settings', + items: [], + }, + ], + }, + ]); + }); +}); + +// TODO: Delete below once fully migrated to KibanaPageTemplate describe('WorkplaceSearchNav', () => { it('renders', () => { diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/nav.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/nav.tsx index fb3c8556029b25..8e7b13a6218214 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/nav.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/nav.tsx @@ -7,10 +7,10 @@ import React from 'react'; -import { EuiSpacer } from '@elastic/eui'; +import { EuiSideNavItemType, EuiSpacer } from '@elastic/eui'; import { WORKPLACE_SEARCH_PLUGIN } from '../../../../../common/constants'; -import { SideNav, SideNavLink } from '../../../shared/layout'; +import { generateNavLink, SideNav, SideNavLink } from '../../../shared/layout'; import { NAV } from '../../constants'; import { SOURCES_PATH, @@ -20,6 +20,51 @@ import { ORG_SETTINGS_PATH, } from '../../routes'; +export const useWorkplaceSearchNav = () => { + const navItems: Array> = [ + { + id: 'root', + name: NAV.OVERVIEW, + ...generateNavLink({ to: '/', isRoot: true }), + }, + { + id: 'sources', + name: NAV.SOURCES, + ...generateNavLink({ to: SOURCES_PATH }), + items: [], // TODO: Source subnav + }, + { + id: 'groups', + name: NAV.GROUPS, + ...generateNavLink({ to: GROUPS_PATH }), + items: [], // TODO: Group subnav + }, + { + id: 'usersRoles', + name: NAV.ROLE_MAPPINGS, + ...generateNavLink({ to: ROLE_MAPPINGS_PATH }), + }, + { + id: 'security', + name: NAV.SECURITY, + ...generateNavLink({ to: SECURITY_PATH }), + }, + { + id: 'settings', + name: NAV.SETTINGS, + ...generateNavLink({ to: ORG_SETTINGS_PATH }), + items: [], // TODO: Settings subnav + }, + ]; + + // Root level items are meant to be section headers, but the WS nav (currently) + // isn't organized this way. So we crate a fake empty parent item here + // to cause all our navItems to properly render as nav links. + return [{ id: '', name: '', items: navItems }]; +}; + +// TODO: Delete below once fully migrated to KibanaPageTemplate + interface Props { sourcesSubNav?: React.ReactNode; groupsSubNav?: React.ReactNode; diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/page_template.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/page_template.test.tsx new file mode 100644 index 00000000000000..622fddc449ca7d --- /dev/null +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/page_template.test.tsx @@ -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; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +jest.mock('./nav', () => ({ + useWorkplaceSearchNav: () => [], +})); + +import React from 'react'; + +import { shallow } from 'enzyme'; + +import { SetWorkplaceSearchChrome } from '../../../shared/kibana_chrome'; +import { EnterpriseSearchPageTemplate } from '../../../shared/layout'; +import { SendWorkplaceSearchTelemetry } from '../../../shared/telemetry'; + +import { WorkplaceSearchPageTemplate } from './page_template'; + +describe('WorkplaceSearchPageTemplate', () => { + it('renders', () => { + const wrapper = shallow( + +
world
+ + ); + + expect(wrapper.type()).toEqual(EnterpriseSearchPageTemplate); + expect(wrapper.prop('solutionNav')).toEqual({ name: 'Workplace Search', items: [] }); + expect(wrapper.find('.hello').text()).toEqual('world'); + }); + + describe('page chrome', () => { + it('takes a breadcrumb array & renders a product-specific page chrome', () => { + const wrapper = shallow(); + const setPageChrome = wrapper.find(EnterpriseSearchPageTemplate).prop('setPageChrome') as any; + + expect(setPageChrome.type).toEqual(SetWorkplaceSearchChrome); + expect(setPageChrome.props.trail).toEqual(['Some page']); + }); + }); + + describe('page telemetry', () => { + it('takes a metric & renders product-specific telemetry viewed event', () => { + const wrapper = shallow(); + + expect(wrapper.find(SendWorkplaceSearchTelemetry).prop('action')).toEqual('viewed'); + expect(wrapper.find(SendWorkplaceSearchTelemetry).prop('metric')).toEqual('some_page'); + }); + }); + + describe('props', () => { + it('allows overriding the restrictWidth default', () => { + const wrapper = shallow(); + expect(wrapper.find(EnterpriseSearchPageTemplate).prop('restrictWidth')).toEqual(true); + + wrapper.setProps({ restrictWidth: false }); + expect(wrapper.find(EnterpriseSearchPageTemplate).prop('restrictWidth')).toEqual(false); + }); + + it('passes down any ...pageTemplateProps that EnterpriseSearchPageTemplate accepts', () => { + const wrapper = shallow( + } + /> + ); + + expect(wrapper.find(EnterpriseSearchPageTemplate).prop('pageHeader')!.pageTitle).toEqual( + 'hello world' + ); + expect(wrapper.find(EnterpriseSearchPageTemplate).prop('isLoading')).toEqual(false); + expect(wrapper.find(EnterpriseSearchPageTemplate).prop('emptyState')).toEqual(
); + }); + }); +}); diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/page_template.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/page_template.tsx new file mode 100644 index 00000000000000..4a6e0d9c6e2ddc --- /dev/null +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/page_template.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 { WORKPLACE_SEARCH_PLUGIN } from '../../../../../common/constants'; +import { SetWorkplaceSearchChrome } from '../../../shared/kibana_chrome'; +import { EnterpriseSearchPageTemplate, PageTemplateProps } from '../../../shared/layout'; +import { SendWorkplaceSearchTelemetry } from '../../../shared/telemetry'; + +import { useWorkplaceSearchNav } from './nav'; + +export const WorkplaceSearchPageTemplate: React.FC = ({ + children, + pageChrome, + pageViewTelemetry, + ...pageTemplateProps +}) => { + return ( + } + > + {pageViewTelemetry && ( + + )} + {children} + + ); +}; diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx index 7e911b31c516b7..dd263c3bd69f5d 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx @@ -141,9 +141,7 @@ export const WorkplaceSearchConfigured: React.FC = (props) => { - } restrictWidth readOnlyMode={readOnlyMode}> - - + } restrictWidth readOnlyMode={readOnlyMode}> diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings.test.tsx index d7ce8053c71f02..308022ccb2e5a7 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings.test.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings.test.tsx @@ -12,7 +12,6 @@ import React from 'react'; import { shallow } from 'enzyme'; -import { Loading } from '../../../shared/loading'; import { RoleMappingsTable, RoleMappingsHeading } from '../../../shared/role_mapping'; import { wsRoleMapping } from '../../../shared/role_mapping/__mocks__/roles'; @@ -44,13 +43,6 @@ describe('RoleMappings', () => { expect(wrapper.find(RoleMappingsTable)).toHaveLength(1); }); - it('returns Loading when loading', () => { - setMockValues({ ...mockValues, dataLoading: true }); - const wrapper = shallow(); - - expect(wrapper.find(Loading)).toHaveLength(1); - }); - it('renders RoleMapping flyout', () => { setMockValues({ ...mockValues, roleMappingFlyoutOpen: true }); const wrapper = shallow(); diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings.tsx index 46c426c3dad2a5..b153d012241939 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings.tsx @@ -9,11 +9,10 @@ import React, { useEffect } from 'react'; import { useActions, useValues } from 'kea'; -import { FlashMessages } from '../../../shared/flash_messages'; -import { SetWorkplaceSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome'; -import { Loading } from '../../../shared/loading'; +import { WORKPLACE_SEARCH_PLUGIN } from '../../../../../common/constants'; import { RoleMappingsTable, RoleMappingsHeading } from '../../../shared/role_mapping'; import { ROLE_MAPPINGS_TITLE } from '../../../shared/role_mapping/constants'; +import { WorkplaceSearchPageTemplate } from '../../components/layout'; import { ROLE_MAPPINGS_TABLE_HEADER } from './constants'; @@ -36,11 +35,12 @@ export const RoleMappings: React.FC = () => { initializeRoleMappings(); }, []); - if (dataLoading) return ; - const roleMappingsSection = ( - <> - initializeRoleMapping()} /> +
+ initializeRoleMapping()} + /> { initializeRoleMapping={initializeRoleMapping} handleDeleteMapping={handleDeleteMapping} /> - +
); return ( - <> - + {roleMappingFlyoutOpen && } - {roleMappingsSection} - + ); }; From d4cc6861a1f4d31848e93f7a53f8185e69f6574d Mon Sep 17 00:00:00 2001 From: Joe Portner <5295965+jportner@users.noreply.github.com> Date: Wed, 16 Jun 2021 18:24:01 -0400 Subject: [PATCH 36/46] Update security best practices document (#100814) --- dev_docs/best_practices.mdx | 165 +++++++++++++--- .../best-practices/security.asciidoc | 184 +++++++++++++----- 2 files changed, 265 insertions(+), 84 deletions(-) diff --git a/dev_docs/best_practices.mdx b/dev_docs/best_practices.mdx index 54aaaa6b9497ad..d87c6eb618993d 100644 --- a/dev_docs/best_practices.mdx +++ b/dev_docs/best_practices.mdx @@ -241,35 +241,136 @@ There are some exceptions where a separate repo makes sense. However, they are e It may be tempting to get caught up in the dream of writing the next package which is published to npm and downloaded millions of times a week. Knowing the quality of developers that are working on Kibana, this is a real possibility. However, knowing which packages will see mass adoption is impossible to predict. Instead of jumping directly to writing code in a separate repo and accepting all of the complications that come along with it, prefer keeping code inside the Kibana repo. A [Kibana package](https://github.com/elastic/kibana/tree/master/packages) can be used to publish a package to npm, while still keeping the code inside the Kibana repo. Move code to an external repo only when there is a good reason, for example to enable external contributions. -## Hardening - -Review the following items related to vulnerability and security risks. - -- XSS - - Check for usages of `dangerouslySetInnerHtml`, `Element.innerHTML`, `Element.outerHTML` - - Ensure all user input is properly escaped. - - Ensure any input in `$.html`, `$.append`, `$.appendTo`, $.prepend`, `$.prependTo`is escaped. Instead use`$.text`, or don't use jQuery at all. -- CSRF - - Ensure all APIs are running inside the Kibana HTTP service. -- RCE - - Ensure no usages of `eval` - - Ensure no usages of dynamic requires - - Check for template injection - - Check for usages of templating libraries, including `_.template`, and ensure that user provided input isn't influencing the template and is only used as data for rendering the template. - - Check for possible prototype pollution. -- Prototype Pollution - more info [here](https://docs.google.com/document/d/19V-d9sb6IF-fbzF4iyiPpAropQNydCnoJApzSX5FdcI/edit?usp=sharing) - - Check for instances of `anObject[a][b] = c` where a, b, and c are user defined. This includes code paths where the following logical code steps could be performed in separate files by completely different operations, or recursively using dynamic operations. - - Validate any user input, including API url-parameters/query-parameters/payloads, preferable against a schema which only allows specific keys/values. At a very minimum, black-list `__proto__` and `prototype.constructor` for use within keys - - When calling APIs which spawn new processes or potentially perform code generation from strings, defensively protect against Prototype Pollution by checking `Object.hasOwnProperty` if the arguments to the APIs originate from an Object. An example is the Code app's [spawnProcess](https://github.com/elastic/kibana/blob/b49192626a8528af5d888545fb14cd1ce66a72e7/x-pack/legacy/plugins/code/server/lsp/workspace_command.ts#L40-L44). - - Common Node.js offenders: `child_process.spawn`, `child_process.exec`, `eval`, `Function('some string')`, `vm.runIn*Context(x)` - - Common Client-side offenders: `eval`, `Function('some string')`, `setTimeout('some string', num)`, `setInterval('some string', num)` -- Check for accidental reveal of sensitive information - - The biggest culprit is errors which contain stack traces or other sensitive information which end up in the HTTP Response -- Checked for Mishandled API requests - - Ensure no sensitive cookies are forwarded to external resources. - - Ensure that all user controllable variables that are used in constructing a URL are escaped properly. This is relevant when using `transport.request` with the Elasticsearch client as no automatic escaping is performed. -- Reverse tabnabbing - https://github.com/OWASP/CheatSheetSeries/blob/master/cheatsheets/HTML5_Security_Cheat_Sheet.md#tabnabbing - - When there are user controllable links or hard-coded links to third-party domains that specify target="\_blank" or target="\_window", the `a` tag should have the rel="noreferrer noopener" attribute specified. - - Allowing users to input markdown is a common culprit, a custom link renderer should be used -- SSRF - https://www.owasp.org/index.php/Server_Side_Request_Forgery - - All network requests made from the Kibana server should use an explicit configuration or white-list specified in the `kibana.yml` +## Security best practices + +When writing code for Kibana, be sure to follow these best practices to avoid common vulnerabilities. Refer to the included Open Web +Application Security Project (OWASP) references to learn more about these types of attacks. + +### Cross-site Scripting (XSS) + +[_OWASP reference for XSS_](https://owasp.org/www-community/attacks/xss) + +XSS is a class of attacks where malicious scripts are injected into vulnerable websites. Kibana defends against this by using the React +framework to safely encode data that is rendered in pages, the EUI framework to [automatically sanitize +links](https://elastic.github.io/eui/#/navigation/link#link-validation), and a restrictive `Content-Security-Policy` header. + +**Best practices** + +* Check for dangerous functions or assignments that can result in unescaped user input in the browser DOM. Avoid using: + * **React:** [`dangerouslySetInnerHtml`](https://reactjs.org/docs/dom-elements.html#dangerouslysetinnerhtml). + * **Browser DOM:** `Element.innerHTML` and `Element.outerHTML`. +* If using the aforementioned unsafe functions or assignments is absolutely necessary, follow [these XSS prevention +rules](https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html#xss-prevention-rules) to ensure that +user input is not inserted into unsafe locations and that it is escaped properly. +* Use EUI components to build your UI, particularly when rendering `href` links. Otherwise, sanitize user input before rendering links to +ensure that they do not use the `javascript:` protocol. +* Don't use the `eval`, `Function`, and `_.template` functions -- these are restricted by ESLint rules. +* Be careful when using `setTimeout` and `setInterval` in client-side code. If an attacker can manipulate the arguments and pass a string to +one of these, it is evaluated dynamically, which is equivalent to the dangerous `eval` function. + +### Cross-Site Request Forgery (CSRF/XSRF) + +[_OWASP reference for CSRF_](https://owasp.org/www-community/attacks/csrf) + +CSRF is a class of attacks where a user is forced to execute an action on a vulnerable website that they're logged into, usually without +their knowledge. Kibana defends against this by requiring [custom request +headers](https://cheatsheetseries.owasp.org/cheatsheets/Cross-Site_Request_Forgery_Prevention_Cheat_Sheet.html#use-of-custom-request-headers) +for API endpoints. For more information, see [API Request +Headers](https://www.elastic.co/guide/en/kibana/master/api.html#api-request-headers). + +**Best practices** + +* Ensure all HTTP routes are registered with the [Kibana HTTP service](https://www.elastic.co/guide/en/kibana/master/http-service.html) to +take advantage of the custom request header security control. + * Note that HTTP GET requests do **not** require the custom request header; any routes that change data should [adhere to the HTTP +specification and use a different method (PUT, POST, etc.)](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods) + +### Remote Code Execution (RCE) + +[_OWASP reference for Command Injection_](https://owasp.org/www-community/attacks/Command_Injection), +[_OWASP reference for Code Injection_](https://owasp.org/www-community/attacks/Code_Injection) + +RCE is a class of attacks where an attacker executes malicious code or commands on a vulnerable server. Kibana defends against this by using +ESLint rules to restrict vulnerable functions, and by hooking into or hardening usage of these in third-party dependencies. + +**Best practices** + +* Don't use the `eval`, `Function`, and `_.template` functions -- these are restricted by ESLint rules. +* Don't use dynamic `require`. +* Check for usages of templating libraries. Ensure that user-provided input doesn't influence the template and is used only as data for +rendering the template. +* Take extra caution when spawning child processes with any user input or parameters that are user-controlled. + +### Prototype Pollution + +Prototype Pollution is an attack that is unique to JavaScript environments. Attackers can abuse JavaScript's prototype inheritance to +"pollute" objects in the application, which is often used as a vector for XSS or RCE vulnerabilities. Kibana defends against this by +hardening sensitive functions (such as those exposed by `child_process`), and by requiring validation on all HTTP routes by default. + +**Best practices** + +* Check for instances of `anObject[a][b] = c` where `a`, `b`, and `c` are controlled by user input. This includes code paths where the +following logical code steps could be performed in separate files by completely different operations, or by recursively using dynamic +operations. +* Validate all user input, including API URL parameters, query parameters, and payloads. Preferably, use a schema that only allows specific +keys and values. At a minimum, implement a deny-list that prevents `__proto__` and `prototype.constructor` from being used within object +keys. +* When calling APIs that spawn new processes or perform code generation from strings, protect against Prototype Pollution by checking if +`Object.hasOwnProperty` has arguments to the APIs that originate from an Object. An example is the defunct Code app's +[`spawnProcess`](https://github.com/elastic/kibana/blob/b49192626a8528af5d888545fb14cd1ce66a72e7/x-pack/legacy/plugins/code/server/lsp/workspace_command.ts#L40-L44) +function. + * Common Node.js offenders: `child_process.spawn`, `child_process.exec`, `eval`, `Function('some string')`, `vm.runInContext(x)`, +`vm.runInNewContext(x)`, `vm.runInThisContext()` + * Common client-side offenders: `eval`, `Function('some string')`, `setTimeout('some string', num)`, `setInterval('some string', num)` + +See also: + +* [Prototype pollution: The dangerous and underrated vulnerability impacting JavaScript applications | +portswigger.net](https://portswigger.net/daily-swig/prototype-pollution-the-dangerous-and-underrated-vulnerability-impacting-javascript-applications) +* [Prototype pollution attack in NodeJS application | Olivier +Arteau](https://github.com/HoLyVieR/prototype-pollution-nsec18/blob/master/paper/JavaScript_prototype_pollution_attack_in_NodeJS.pdf) + +### Server-Side Request Forgery (SSRF) + +[_OWASP reference for SSRF_](https://owasp.org/www-community/attacks/Server_Side_Request_Forgery) + +SSRF is a class of attacks where a vulnerable server is forced to make an unintended request, usually to an HTTP API. This is often used as +a vector for information disclosure or injection attacks. + +**Best practices** + +* Ensure that all outbound requests from the Kibana server use hard-coded URLs. +* If user input is used to construct a URL for an outbound request, ensure that an allow-list is used to validate the endpoints and that +user input is escaped properly. Ideally, the allow-list should be set in `kibana.yml`, so only server administrators can change it. + * This is particularly relevant when using `transport.request` with the Elasticsearch client, as no automatic escaping is performed. + * Note that URLs are very hard to validate properly; exact match validation for user input is most preferable, while URL parsing or RegEx +validation should only be used if absolutely necessary. + +### Reverse tabnabbing + +[_OWASP reference for Reverse Tabnabbing_](https://owasp.org/www-community/attacks/Reverse_Tabnabbing) + +Reverse tabnabbing is an attack where a link to a malicious page is used to rewrite a vulnerable parent page. This is often used as a vector +for phishing attacks. Kibana defends against this by using the EUI framework, which automatically adds the `rel` attribute to anchor tags, +buttons, and other vulnerable DOM elements. + +**Best practices** + +* Use EUI components to build your UI whenever possible. Otherwise, ensure that any DOM elements that have an `href` attribute also have the +`rel="noreferrer noopener"` attribute specified. For more information, refer to the [OWASP HTML5 Security Cheat +Sheet](https://github.com/OWASP/CheatSheetSeries/blob/master/cheatsheets/HTML5_Security_Cheat_Sheet.md#tabnabbing). +* If using a non-EUI markdown renderer, use a custom link renderer for rendered links. + +### Information disclosure + +Information disclosure is not an attack, but it describes whenever sensitive information is accidentally revealed. This can be configuration +info, stack traces, or other data that the user is not authorized to access. This concern cannot be addressed with a single security +control, but at a high level, Kibana relies on the hapi framework to automatically redact stack traces and detailed error messages in HTTP +5xx response payloads. + +**Best practices** + +* Look for instances where sensitive information might accidentally be revealed, particularly in error messages, in the UI, and URL +parameters that are exposed to users. +* Make sure that sensitive request data is not forwarded to external resources. For example, copying client request headers and using them +to make an another request could accidentally expose the user's credentials. diff --git a/docs/developer/best-practices/security.asciidoc b/docs/developer/best-practices/security.asciidoc index 79ecb082950646..fd83aa1dff49fd 100644 --- a/docs/developer/best-practices/security.asciidoc +++ b/docs/developer/best-practices/security.asciidoc @@ -1,55 +1,135 @@ [[security-best-practices]] == Security best practices -* XSS -** Check for usages of `dangerouslySetInnerHtml`, `Element.innerHTML`, -`Element.outerHTML` -** Ensure all user input is properly escaped. -** Ensure any input in `$.html`, `$.append`, `$.appendTo`, -latexmath:[$.prepend`, `$].prependTo`is escaped. Instead use`$.text`, or -don’t use jQuery at all. -* CSRF -** Ensure all APIs are running inside the {kib} HTTP service. -* RCE -** Ensure no usages of `eval` -** Ensure no usages of dynamic requires -** Check for template injection -** Check for usages of templating libraries, including `_.template`, and -ensure that user provided input isn’t influencing the template and is -only used as data for rendering the template. -** Check for possible prototype pollution. -* Prototype Pollution -** Check for instances of `anObject[a][b] = c` where a, b, and c are -user defined. This includes code paths where the following logical code -steps could be performed in separate files by completely different -operations, or recursively using dynamic operations. -** Validate any user input, including API -url-parameters/query-parameters/payloads, preferable against a schema -which only allows specific keys/values. At a very minimum, black-list -`__proto__` and `prototype.constructor` for use within keys -** When calling APIs which spawn new processes or potentially perform -code generation from strings, defensively protect against Prototype -Pollution by checking `Object.hasOwnProperty` if the arguments to the -APIs originate from an Object. An example is the Code app’s -https://github.com/elastic/kibana/blob/b49192626a8528af5d888545fb14cd1ce66a72e7/x-pack/legacy/plugins/code/server/lsp/workspace_command.ts#L40-L44[spawnProcess]. -*** Common Node.js offenders: `child_process.spawn`, -`child_process.exec`, `eval`, `Function('some string')`, -`vm.runIn*Context(x)` -*** Common Client-side offenders: `eval`, `Function('some string')`, -`setTimeout('some string', num)`, `setInterval('some string', num)` -* Check for accidental reveal of sensitive information -** The biggest culprit is errors which contain stack traces or other -sensitive information which end up in the HTTP Response -* Checked for Mishandled API requests -** Ensure no sensitive cookies are forwarded to external resources. -** Ensure that all user controllable variables that are used in -constructing a URL are escaped properly. This is relevant when using -`transport.request` with the {es} client as no automatic -escaping is performed. -* Reverse tabnabbing - -https://github.com/OWASP/CheatSheetSeries/blob/master/cheatsheets/HTML5_Security_Cheat_Sheet.md#tabnabbing -** When there are user controllable links or hard-coded links to -third-party domains that specify target="_blank" or target="_window", the a tag should have the rel="noreferrer noopener" attribute specified. -Allowing users to input markdown is a common culprit, a custom link renderer should be used -* SSRF - https://www.owasp.org/index.php/Server_Side_Request_Forgery -All network requests made from the {kib} server should use an explicit configuration or white-list specified in the kibana.yml \ No newline at end of file +When writing code for {kib}, be sure to follow these best practices to avoid common vulnerabilities. Refer to the included Open Web +Application Security Project (OWASP) references to learn more about these types of attacks. + +=== Cross-site Scripting (XSS) === + +https://owasp.org/www-community/attacks/xss[_OWASP reference for XSS_] + +XSS is a class of attacks where malicious scripts are injected into vulnerable websites. {kib} defends against this by using the React +framework to safely encode data that is rendered in pages, the EUI framework to +https://elastic.github.io/eui/#/navigation/link#link-validation[automatically sanitize links], and a restrictive `Content-Security-Policy` +header. + +*Best practices* + +* Check for dangerous functions or assignments that can result in unescaped user input in the browser DOM. Avoid using: +** *React:* https://reactjs.org/docs/dom-elements.html#dangerouslysetinnerhtml[`dangerouslySetInnerHtml`]. +** *Browser DOM:* `Element.innerHTML` and `Element.outerHTML`. +* If using the aforementioned unsafe functions or assignments is absolutely necessary, follow +https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html#xss-prevention-rules[these XSS prevention +rules] to ensure that user input is not inserted into unsafe locations and that it is escaped properly. +* Use EUI components to build your UI, particularly when rendering `href` links. Otherwise, sanitize user input before rendering links to +ensure that they do not use the `javascript:` protocol. +* Don't use the `eval`, `Function`, and `_.template` functions -- these are restricted by ESLint rules. +* Be careful when using `setTimeout` and `setInterval` in client-side code. If an attacker can manipulate the arguments and pass a string to +one of these, it is evaluated dynamically, which is equivalent to the dangerous `eval` function. + +=== Cross-Site Request Forgery (CSRF/XSRF) === + +https://owasp.org/www-community/attacks/csrf[_OWASP reference for CSRF_] + +CSRF is a class of attacks where a user is forced to execute an action on a vulnerable website that they're logged into, usually without +their knowledge. {kib} defends against this by requiring +https://cheatsheetseries.owasp.org/cheatsheets/Cross-Site_Request_Forgery_Prevention_Cheat_Sheet.html#use-of-custom-request-headers[custom +request headers] for API endpoints. For more information, see <>. + +*Best practices* + +* Ensure all HTTP routes are registered with the <> to take advantage of the custom request header +security control. +** Note that HTTP GET requests do *not* require the custom request header; any routes that change data should +https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods[adhere to the HTTP specification and use a different method (PUT, POST, etc.)] + +=== Remote Code Execution (RCE) === + +https://owasp.org/www-community/attacks/Command_Injection[_OWASP reference for Command Injection_], +https://owasp.org/www-community/attacks/Code_Injection[_OWASP reference for Code Injection_] + +RCE is a class of attacks where an attacker executes malicious code or commands on a vulnerable server. {kib} defends against this by using +ESLint rules to restrict vulnerable functions, and by hooking into or hardening usage of these in third-party dependencies. + +*Best practices* + +* Don't use the `eval`, `Function`, and `_.template` functions -- these are restricted by ESLint rules. +* Don't use dynamic `require`. +* Check for usages of templating libraries. Ensure that user-provided input doesn't influence the template and is used only as data for +rendering the template. +* Take extra caution when spawning child processes with any user input or parameters that are user-controlled. + +=== Prototype Pollution === + +Prototype Pollution is an attack that is unique to JavaScript environments. Attackers can abuse JavaScript's prototype inheritance to +"pollute" objects in the application, which is often used as a vector for XSS or RCE vulnerabilities. {kib} defends against this by +hardening sensitive functions (such as those exposed by `child_process`), and by requiring validation on all HTTP routes by default. + +*Best practices* + +* Check for instances of `anObject[a][b] = c` where `a`, `b`, and `c` are controlled by user input. This includes code paths where the +following logical code steps could be performed in separate files by completely different operations, or by recursively using dynamic +operations. +* Validate all user input, including API URL parameters, query parameters, and payloads. Preferably, use a schema that only allows specific +keys and values. At a minimum, implement a deny-list that prevents `__proto__` and `prototype.constructor` from being used within object +keys. +* When calling APIs that spawn new processes or perform code generation from strings, protect against Prototype Pollution by checking if +`Object.hasOwnProperty` has arguments to the APIs that originate from an Object. An example is the defunct Code app's +https://github.com/elastic/kibana/blob/b49192626a8528af5d888545fb14cd1ce66a72e7/x-pack/legacy/plugins/code/server/lsp/workspace_command.ts#L40-L44[`spawnProcess`] +function. +** Common Node.js offenders: `child_process.spawn`, `child_process.exec`, `eval`, `Function('some string')`, `vm.runInContext(x)`, +`vm.runInNewContext(x)`, `vm.runInThisContext()` +** Common client-side offenders: `eval`, `Function('some string')`, `setTimeout('some string', num)`, `setInterval('some string', num)` + +See also: + +* https://portswigger.net/daily-swig/prototype-pollution-the-dangerous-and-underrated-vulnerability-impacting-javascript-applications[Prototype +pollution: The dangerous and underrated vulnerability impacting JavaScript applications | portswigger.net] +* https://github.com/HoLyVieR/prototype-pollution-nsec18/blob/master/paper/JavaScript_prototype_pollution_attack_in_NodeJS.pdf[Prototype +pollution attack in NodeJS application | Olivier Arteau] + +=== Server-Side Request Forgery (SSRF) === + +https://owasp.org/www-community/attacks/Server_Side_Request_Forgery[_OWASP reference for SSRF_] + +SSRF is a class of attacks where a vulnerable server is forced to make an unintended request, usually to an HTTP API. This is often used as +a vector for information disclosure or injection attacks. + +*Best practices* + +* Ensure that all outbound requests from the {kib} server use hard-coded URLs. +* If user input is used to construct a URL for an outbound request, ensure that an allow-list is used to validate the endpoints and that +user input is escaped properly. Ideally, the allow-list should be set in `kibana.yml`, so only server administrators can change it. +** This is particularly relevant when using `transport.request` with the {es} client, as no automatic escaping is performed. +** Note that URLs are very hard to validate properly; exact match validation for user input is most preferable, while URL parsing or RegEx +validation should only be used if absolutely necessary. + +=== Reverse tabnabbing === + +https://owasp.org/www-community/attacks/Reverse_Tabnabbing[_OWASP reference for Reverse Tabnabbing_] + +Reverse tabnabbing is an attack where a link to a malicious page is used to rewrite a vulnerable parent page. This is often used as a vector +for phishing attacks. {kib} defends against this by using the EUI framework, which automatically adds the `rel` attribute to anchor tags, +buttons, and other vulnerable DOM elements. + +*Best practices* + +* Use EUI components to build your UI whenever possible. Otherwise, ensure that any DOM elements that have an `href` attribute also have the +`rel="noreferrer noopener"` attribute specified. For more information, refer to the +https://github.com/OWASP/CheatSheetSeries/blob/master/cheatsheets/HTML5_Security_Cheat_Sheet.md#tabnabbing[OWASP HTML5 Security Cheat +Sheet]. +* If using a non-EUI markdown renderer, use a custom link renderer for rendered links. + +=== Information disclosure === + +Information disclosure is not an attack, but it describes whenever sensitive information is accidentally revealed. This can be configuration +info, stack traces, or other data that the user is not authorized to access. This concern cannot be addressed with a single security +control, but at a high level, {kib} relies on the hapi framework to automatically redact stack traces and detailed error messages in HTTP +5xx response payloads. + +*Best practices* + +* Look for instances where sensitive information might accidentally be revealed, particularly in error messages, in the UI, and URL +parameters that are exposed to users. +* Make sure that sensitive request data is not forwarded to external resources. For example, copying client request headers and using them +to make an another request could accidentally expose the user's credentials. From 8d14128216ab3a14d6ae2a60286c628357b94340 Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Wed, 16 Jun 2021 15:43:47 -0700 Subject: [PATCH 37/46] [build] Updates Ironbank templates (#102407) * Bump to Ironbank 8.4 * Updates to stay consistant with upstream repo Signed-off-by: Tyler Smalley --- .../tasks/os_packages/docker_generator/bundle_dockerfiles.ts | 2 +- .../docker_generator/templates/ironbank/Dockerfile | 4 ++-- .../{hardening_manifest.yml => hardening_manifest.yaml} | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/{hardening_manifest.yml => hardening_manifest.yaml} (99%) diff --git a/src/dev/build/tasks/os_packages/docker_generator/bundle_dockerfiles.ts b/src/dev/build/tasks/os_packages/docker_generator/bundle_dockerfiles.ts index a633e919cc5db2..5f0665692b46f6 100644 --- a/src/dev/build/tasks/os_packages/docker_generator/bundle_dockerfiles.ts +++ b/src/dev/build/tasks/os_packages/docker_generator/bundle_dockerfiles.ts @@ -42,7 +42,7 @@ export async function bundleDockerFiles(config: Config, log: ToolingLog, scope: await copyAll(resolve(scope.dockerBuildDir), resolve(dockerFilesBuildDir), { select: ['LICENSE'], }); - const templates = ['hardening_manifest.yml', 'README.md']; + const templates = ['hardening_manifest.yaml', 'README.md']; for (const template of templates) { const file = readFileSync(resolve(__dirname, 'templates/ironbank', template)); const output = Mustache.render(file.toString(), scope); diff --git a/src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/Dockerfile b/src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/Dockerfile index 1654377b241d84..c1335f6c7a3969 100644 --- a/src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/Dockerfile +++ b/src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/Dockerfile @@ -4,7 +4,7 @@ ################################################################################ ARG BASE_REGISTRY=registry1.dsop.io ARG BASE_IMAGE=redhat/ubi/ubi8 -ARG BASE_TAG=8.3 +ARG BASE_TAG=8.4 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as prep_files @@ -59,7 +59,7 @@ COPY --chown=1000:0 config/kibana.yml /usr/share/kibana/config/kibana.yml # Add the launcher/wrapper script. It knows how to interpret environment # variables and translate them to Kibana CLI options. -COPY --chown=1000:0 scripts/kibana-docker /usr/local/bin/ +COPY --chown=1000:0 bin/kibana-docker /usr/local/bin/ # Remove the suid bit everywhere to mitigate "Stack Clash" RUN find / -xdev -perm -4000 -exec chmod u-s {} + diff --git a/src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/hardening_manifest.yml b/src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/hardening_manifest.yaml similarity index 99% rename from src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/hardening_manifest.yml rename to src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/hardening_manifest.yaml index 8de5ac29733588..2e65e68bc28827 100644 --- a/src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/hardening_manifest.yml +++ b/src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/hardening_manifest.yaml @@ -14,7 +14,7 @@ tags: # Build args passed to Dockerfile ARGs args: BASE_IMAGE: 'redhat/ubi/ubi8' - BASE_TAG: '8.3' + BASE_TAG: '8.4' # Docker image labels labels: From 2507d37e37dc1a3b71c2538dcf78a36aa2dc1425 Mon Sep 17 00:00:00 2001 From: Paul Tavares <56442535+paul-tavares@users.noreply.github.com> Date: Wed, 16 Jun 2021 18:45:40 -0400 Subject: [PATCH 38/46] [Security Solution][Endpoint] Isolate Action should only be available to Platinum+ licenses (#102374) * Isolate action should only be available for platinum license * Moved `useLicense` hook mock into `__mocks__` --- .../security_solution/common/license/mocks.ts | 21 +++++ .../common/hooks/__mocks__/use_license.ts | 11 +++ .../details/components/actions_menu.test.tsx | 23 +++++ .../view/hooks/use_endpoint_action_items.tsx | 87 +++++++++++-------- .../pages/endpoint_hosts/view/index.test.tsx | 5 ++ .../pages/policy/view/policy_details.test.tsx | 12 +-- 6 files changed, 113 insertions(+), 46 deletions(-) create mode 100644 x-pack/plugins/security_solution/common/license/mocks.ts create mode 100644 x-pack/plugins/security_solution/public/common/hooks/__mocks__/use_license.ts diff --git a/x-pack/plugins/security_solution/common/license/mocks.ts b/x-pack/plugins/security_solution/common/license/mocks.ts new file mode 100644 index 00000000000000..f352932b446139 --- /dev/null +++ b/x-pack/plugins/security_solution/common/license/mocks.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; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { LicenseService } from './license'; + +export const createLicenseServiceMock = (): jest.Mocked => { + return ({ + start: jest.fn(), + stop: jest.fn(), + getLicenseInformation: jest.fn(), + getLicenseInformation$: jest.fn(), + isAtLeast: jest.fn(), + isGoldPlus: jest.fn().mockReturnValue(true), + isPlatinumPlus: jest.fn().mockReturnValue(true), + isEnterprise: jest.fn().mockReturnValue(true), + } as unknown) as jest.Mocked; +}; diff --git a/x-pack/plugins/security_solution/public/common/hooks/__mocks__/use_license.ts b/x-pack/plugins/security_solution/public/common/hooks/__mocks__/use_license.ts new file mode 100644 index 00000000000000..2d34e4b22a14e9 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/hooks/__mocks__/use_license.ts @@ -0,0 +1,11 @@ +/* + * Copyright 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 { createLicenseServiceMock } from '../../../../common/license/mocks'; + +export const licenseService = createLicenseServiceMock(); +export const useLicense = () => licenseService; 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 356d44a8105287..04708ea90cd349 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 @@ -15,8 +15,10 @@ import React from 'react'; import { act } from '@testing-library/react'; import { endpointPageHttpMock } from '../../../mocks'; import { fireEvent } from '@testing-library/dom'; +import { licenseService } from '../../../../../../common/hooks/use_license'; jest.mock('../../../../../../common/lib/kibana'); +jest.mock('../../../../../../common/hooks/use_license'); describe('When using the Endpoint Details Actions Menu', () => { let render: () => Promise>; @@ -112,4 +114,25 @@ describe('When using the Endpoint Details Actions Menu', () => { expect(coreStart.application.navigateToApp).toHaveBeenCalled(); }); }); + + describe('and license is NOT PlatinumPlus', () => { + const licenseServiceMock = licenseService as jest.Mocked; + + beforeEach(() => licenseServiceMock.isPlatinumPlus.mockReturnValue(false)); + + afterEach(() => licenseServiceMock.isPlatinumPlus.mockReturnValue(true)); + + it('should not show the `isoalte` 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(); + expect(renderResult.queryByTestId('isolateLink')).toBeNull(); + expect(renderResult.getByTestId('unIsolateLink')).not.toBeNull(); + }); + }); }); 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 e03427671798da..7c38c935a0b9f3 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 @@ -17,7 +17,8 @@ import { useEndpointSelector } from './hooks'; import { agentPolicies, uiQueryParams } from '../../store/selectors'; import { useKibana } from '../../../../../common/lib/kibana'; import { ContextMenuItemNavByRouterProps } from '../components/context_menu_item_nav_by_rotuer'; -import { isEndpointHostIsolated } from '../../../../../common/utils/validators/is_endpoint_host_isolated'; +import { isEndpointHostIsolated } from '../../../../../common/utils/validators'; +import { useLicense } from '../../../../../common/hooks/use_license'; /** * Returns a list (array) of actions for an individual endpoint @@ -26,6 +27,7 @@ import { isEndpointHostIsolated } from '../../../../../common/utils/validators/i export const useEndpointActionItems = ( endpointMetadata: MaybeImmutable | undefined ): ContextMenuItemNavByRouterProps[] => { + const isPlatinumPlus = useLicense().isPlatinumPlus(); const { formatUrl } = useFormatUrl(SecurityPageName.administration); const fleetAgentPolicies = useEndpointSelector(agentPolicies); const allCurrentUrlParams = useEndpointSelector(uiQueryParams); @@ -58,40 +60,48 @@ export const useEndpointActionItems = ( selected_endpoint: endpointId, }); + const isolationActions = []; + + if (isIsolated) { + // Un-isolate is always available to users regardless of license level + isolationActions.push({ + 'data-test-subj': 'unIsolateLink', + icon: 'logoSecurity', + key: 'unIsolateHost', + navigateAppId: MANAGEMENT_APP_ID, + navigateOptions: { + path: endpointUnIsolatePath, + }, + href: formatUrl(endpointUnIsolatePath), + children: ( + + ), + }); + } else if (isPlatinumPlus) { + // For Platinum++ licenses, users also have ability to isolate + isolationActions.push({ + 'data-test-subj': 'isolateLink', + icon: 'logoSecurity', + key: 'isolateHost', + navigateAppId: MANAGEMENT_APP_ID, + navigateOptions: { + path: endpointIsolatePath, + }, + href: formatUrl(endpointIsolatePath), + children: ( + + ), + }); + } + return [ - isIsolated - ? { - 'data-test-subj': 'unIsolateLink', - icon: 'logoSecurity', - key: 'unIsolateHost', - navigateAppId: MANAGEMENT_APP_ID, - navigateOptions: { - path: endpointUnIsolatePath, - }, - href: formatUrl(endpointUnIsolatePath), - children: ( - - ), - } - : { - 'data-test-subj': 'isolateLink', - icon: 'logoSecurity', - key: 'isolateHost', - navigateAppId: MANAGEMENT_APP_ID, - navigateOptions: { - path: endpointIsolatePath, - }, - href: formatUrl(endpointIsolatePath), - children: ( - - ), - }, + ...isolationActions, { 'data-test-subj': 'hostLink', icon: 'logoSecurity', @@ -183,5 +193,12 @@ export const useEndpointActionItems = ( } return []; - }, [allCurrentUrlParams, endpointMetadata, fleetAgentPolicies, formatUrl, getUrlForApp]); + }, [ + allCurrentUrlParams, + endpointMetadata, + fleetAgentPolicies, + formatUrl, + getUrlForApp, + isPlatinumPlus, + ]); }; 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 1ac5c289c87cf7..14f9662ad9b0bb 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 @@ -37,6 +37,7 @@ import { isUninitialisedResourceState, } from '../../../state'; import { getCurrentIsolationRequestState } from '../store/selectors'; +import { licenseService } from '../../../../common/hooks/use_license'; // not sure why this can't be imported from '../../../../common/mock/formatted_relative'; // but sure enough it needs to be inline in this one file @@ -59,6 +60,7 @@ jest.mock('../../policy/store/services/ingest', () => { }); jest.mock('../../../../common/lib/kibana'); +jest.mock('../../../../common/hooks/use_license'); describe('when on the endpoint list page', () => { const docGenerator = new EndpointDocGenerator(); @@ -70,6 +72,9 @@ describe('when on the endpoint list page', () => { let coreStart: AppContextTestRender['coreStart']; let middlewareSpy: AppContextTestRender['middlewareSpy']; let abortSpy: jest.SpyInstance; + + (licenseService as jest.Mocked).isPlatinumPlus.mockReturnValue(true); + beforeAll(() => { const mockAbort = new AbortController(); mockAbort.abort(); diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx index d01ccea5ba1f4a..1766048a3985aa 100644 --- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx +++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx @@ -17,17 +17,7 @@ import { policyListApiPathHandlers } from '../store/test_mock_utils'; import { licenseService } from '../../../../common/hooks/use_license'; jest.mock('../../../../common/components/link_to'); -jest.mock('../../../../common/hooks/use_license', () => { - const licenseServiceInstance = { - isPlatinumPlus: jest.fn(), - }; - return { - licenseService: licenseServiceInstance, - useLicense: () => { - return licenseServiceInstance; - }, - }; -}); +jest.mock('../../../../common/hooks/use_license'); describe('Policy Details', () => { type FindReactWrapperResponse = ReturnType['find']>; From bfca0c3197f4234af8b6e25b9b5805d44ca104bf Mon Sep 17 00:00:00 2001 From: Matthew Kime Date: Wed, 16 Jun 2021 20:14:28 -0500 Subject: [PATCH 39/46] [Index Patterns] Move rollup config to index pattern management v2 (#102285) * move rollup config to index pattern management --- .../public/constants.ts | 9 ++++ .../index_pattern_management/public/mocks.ts | 9 +--- .../index_pattern_management/public/plugin.ts | 7 ++-- .../components/rollup_prompt/index.ts | 5 ++- .../rollup_prompt/rollup_prompt.tsx | 9 ++-- .../public/service/creation/index.ts | 2 + .../public/service/creation/manager.ts | 41 +++++++++++-------- .../creation/rollup_creation_config.js | 21 +++++----- .../index_pattern_management_service.ts | 31 +++++--------- .../public/service/list/index.ts | 2 + .../public/service/list/manager.ts | 38 +++++++++-------- .../public/service/list/rollup_list_config.js | 7 ++-- x-pack/plugins/rollup/kibana.json | 1 - x-pack/plugins/rollup/public/plugin.ts | 19 +-------- x-pack/plugins/rollup/tsconfig.json | 1 - .../translations/translations/ja-JP.json | 18 ++++---- .../translations/translations/zh-CN.json | 18 ++++---- 17 files changed, 116 insertions(+), 122 deletions(-) create mode 100644 src/plugins/index_pattern_management/public/constants.ts rename x-pack/plugins/rollup/public/index_pattern_creation/components/rollup_prompt/index.js => src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/index.ts (53%) rename x-pack/plugins/rollup/public/index_pattern_creation/components/rollup_prompt/rollup_prompt.js => src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/rollup_prompt.tsx (76%) rename x-pack/plugins/rollup/public/index_pattern_creation/rollup_index_pattern_creation_config.js => src/plugins/index_pattern_management/public/service/creation/rollup_creation_config.js (84%) rename x-pack/plugins/rollup/public/index_pattern_list/rollup_index_pattern_list_config.js => src/plugins/index_pattern_management/public/service/list/rollup_list_config.js (86%) diff --git a/src/plugins/index_pattern_management/public/constants.ts b/src/plugins/index_pattern_management/public/constants.ts new file mode 100644 index 00000000000000..e5010d133f0f30 --- /dev/null +++ b/src/plugins/index_pattern_management/public/constants.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 const CONFIG_ROLLUPS = 'rollups:enableIndexPatterns'; diff --git a/src/plugins/index_pattern_management/public/mocks.ts b/src/plugins/index_pattern_management/public/mocks.ts index 6c709fb14f08d7..7671a532d1cb86 100644 --- a/src/plugins/index_pattern_management/public/mocks.ts +++ b/src/plugins/index_pattern_management/public/mocks.ts @@ -19,14 +19,7 @@ import { } from './plugin'; import { IndexPatternManagmentContext } from './types'; -const createSetupContract = (): IndexPatternManagementSetup => ({ - creation: { - addCreationConfig: jest.fn(), - } as any, - list: { - addListConfig: jest.fn(), - } as any, -}); +const createSetupContract = (): IndexPatternManagementSetup => {}; const createStartContract = (): IndexPatternManagementStart => ({ creation: { diff --git a/src/plugins/index_pattern_management/public/plugin.ts b/src/plugins/index_pattern_management/public/plugin.ts index e3c156927bface..d254691a0270da 100644 --- a/src/plugins/index_pattern_management/public/plugin.ts +++ b/src/plugins/index_pattern_management/public/plugin.ts @@ -80,12 +80,13 @@ export class IndexPatternManagementPlugin return mountManagementSection(core.getStartServices, params); }, }); - - return this.indexPatternManagementService.setup({ httpClient: core.http }); } public start(core: CoreStart, plugins: IndexPatternManagementStartDependencies) { - return this.indexPatternManagementService.start(); + return this.indexPatternManagementService.start({ + httpClient: core.http, + uiSettings: core.uiSettings, + }); } public stop() { diff --git a/x-pack/plugins/rollup/public/index_pattern_creation/components/rollup_prompt/index.js b/src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/index.ts similarity index 53% rename from x-pack/plugins/rollup/public/index_pattern_creation/components/rollup_prompt/index.js rename to src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/index.ts index 1d9eff8227c0ac..d1fc2fa242eb1b 100644 --- a/x-pack/plugins/rollup/public/index_pattern_creation/components/rollup_prompt/index.js +++ b/src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/index.ts @@ -1,8 +1,9 @@ /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. */ export { RollupPrompt } from './rollup_prompt'; diff --git a/x-pack/plugins/rollup/public/index_pattern_creation/components/rollup_prompt/rollup_prompt.js b/src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/rollup_prompt.tsx similarity index 76% rename from x-pack/plugins/rollup/public/index_pattern_creation/components/rollup_prompt/rollup_prompt.js rename to src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/rollup_prompt.tsx index 9306ab082dff49..81fcdaedb90c90 100644 --- a/x-pack/plugins/rollup/public/index_pattern_creation/components/rollup_prompt/rollup_prompt.js +++ b/src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/rollup_prompt.tsx @@ -1,8 +1,9 @@ /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. */ import React from 'react'; @@ -14,7 +15,7 @@ export const RollupPrompt = () => (

{i18n.translate( - 'xpack.rollupJobs.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph1Text', + 'indexPatternManagement.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph1Text', { defaultMessage: "Kibana's support for rollup index patterns is in beta. You might encounter issues using " + @@ -25,7 +26,7 @@ export const RollupPrompt = () => (

{i18n.translate( - 'xpack.rollupJobs.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph2Text', + 'indexPatternManagement.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph2Text', { defaultMessage: 'You can match a rollup index pattern against one rollup index and zero or more regular ' + diff --git a/src/plugins/index_pattern_management/public/service/creation/index.ts b/src/plugins/index_pattern_management/public/service/creation/index.ts index 51610bc83e371b..e1f464b01e5505 100644 --- a/src/plugins/index_pattern_management/public/service/creation/index.ts +++ b/src/plugins/index_pattern_management/public/service/creation/index.ts @@ -8,3 +8,5 @@ export { IndexPatternCreationConfig, IndexPatternCreationOption } from './config'; export { IndexPatternCreationManager } from './manager'; +// @ts-ignore +export { RollupIndexPatternCreationConfig } from './rollup_creation_config'; diff --git a/src/plugins/index_pattern_management/public/service/creation/manager.ts b/src/plugins/index_pattern_management/public/service/creation/manager.ts index c139b10ebb1fe6..cc2285bbfcafb3 100644 --- a/src/plugins/index_pattern_management/public/service/creation/manager.ts +++ b/src/plugins/index_pattern_management/public/service/creation/manager.ts @@ -6,31 +6,36 @@ * Side Public License, v 1. */ -import { HttpSetup } from '../../../../../core/public'; +import { once } from 'lodash'; +import { HttpStart, CoreStart } from '../../../../../core/public'; import { IndexPatternCreationConfig, UrlHandler, IndexPatternCreationOption } from './config'; +import { CONFIG_ROLLUPS } from '../../constants'; +// @ts-ignore +import { RollupIndexPatternCreationConfig } from './rollup_creation_config'; -export class IndexPatternCreationManager { - private configs: IndexPatternCreationConfig[] = []; +interface IndexPatternCreationManagerStart { + httpClient: HttpStart; + uiSettings: CoreStart['uiSettings']; +} - setup(httpClient: HttpSetup) { - return { - addCreationConfig: (Config: typeof IndexPatternCreationConfig) => { - const config = new Config({ httpClient }); +export class IndexPatternCreationManager { + start({ httpClient, uiSettings }: IndexPatternCreationManagerStart) { + const getConfigs = once(() => { + const configs: IndexPatternCreationConfig[] = []; + configs.push(new IndexPatternCreationConfig({ httpClient })); - if (this.configs.findIndex((c) => c.key === config.key) !== -1) { - throw new Error(`${config.key} exists in IndexPatternCreationManager.`); - } + if (uiSettings.isDeclared(CONFIG_ROLLUPS) && uiSettings.get(CONFIG_ROLLUPS)) { + configs.push(new RollupIndexPatternCreationConfig({ httpClient })); + } - this.configs.push(config); - }, - }; - } + return configs; + }); - start() { const getType = (key: string | undefined): IndexPatternCreationConfig => { + const configs = getConfigs(); if (key) { - const index = this.configs.findIndex((config) => config.key === key); - const config = this.configs[index]; + const index = configs.findIndex((config) => config.key === key); + const config = configs[index]; if (config) { return config; @@ -48,7 +53,7 @@ export class IndexPatternCreationManager { const options: IndexPatternCreationOption[] = []; await Promise.all( - this.configs.map(async (config) => { + getConfigs().map(async (config) => { const option = config.getIndexPatternCreationOption ? await config.getIndexPatternCreationOption(urlHandler) : null; diff --git a/x-pack/plugins/rollup/public/index_pattern_creation/rollup_index_pattern_creation_config.js b/src/plugins/index_pattern_management/public/service/creation/rollup_creation_config.js similarity index 84% rename from x-pack/plugins/rollup/public/index_pattern_creation/rollup_index_pattern_creation_config.js rename to src/plugins/index_pattern_management/public/service/creation/rollup_creation_config.js index 8e5203fca90347..2a85dfa01143c7 100644 --- a/x-pack/plugins/rollup/public/index_pattern_creation/rollup_index_pattern_creation_config.js +++ b/src/plugins/index_pattern_management/public/service/creation/rollup_creation_config.js @@ -1,43 +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. + * 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 { i18n } from '@kbn/i18n'; import { RollupPrompt } from './components/rollup_prompt'; -import { IndexPatternCreationConfig } from '../../../../../src/plugins/index_pattern_management/public'; +import { IndexPatternCreationConfig } from '.'; const rollupIndexPatternTypeName = i18n.translate( - 'xpack.rollupJobs.editRollupIndexPattern.createIndex.defaultTypeName', + 'indexPatternManagement.editRollupIndexPattern.createIndex.defaultTypeName', { defaultMessage: 'rollup index pattern' } ); const rollupIndexPatternButtonText = i18n.translate( - 'xpack.rollupJobs.editRollupIndexPattern.createIndex.defaultButtonText', + 'indexPatternManagement.editRollupIndexPattern.createIndex.defaultButtonText', { defaultMessage: 'Rollup index pattern' } ); const rollupIndexPatternButtonDescription = i18n.translate( - 'xpack.rollupJobs.editRollupIndexPattern.createIndex.defaultButtonDescription', + 'indexPatternManagement.editRollupIndexPattern.createIndex.defaultButtonDescription', { defaultMessage: 'Perform limited aggregations against summarized data' } ); const rollupIndexPatternNoMatchError = i18n.translate( - 'xpack.rollupJobs.editRollupIndexPattern.createIndex.noMatchError', + 'indexPatternManagement.editRollupIndexPattern.createIndex.noMatchError', { defaultMessage: 'Rollup index pattern error: must match one rollup index' } ); const rollupIndexPatternTooManyMatchesError = i18n.translate( - 'xpack.rollupJobs.editRollupIndexPattern.createIndex.tooManyMatchesError', + 'indexPatternManagement.editRollupIndexPattern.createIndex.tooManyMatchesError', { defaultMessage: 'Rollup index pattern error: can only match one rollup index' } ); const rollupIndexPatternIndexLabel = i18n.translate( - 'xpack.rollupJobs.editRollupIndexPattern.createIndex.indexLabel', + 'indexPatternManagement.editRollupIndexPattern.createIndex.indexLabel', { defaultMessage: 'Rollup' } ); @@ -127,7 +128,7 @@ export class RollupIndexPatternCreationConfig extends IndexPatternCreationConfig if (error) { const errorMessage = i18n.translate( - 'xpack.rollupJobs.editRollupIndexPattern.createIndex.uncaughtError', + 'indexPatternManagement.editRollupIndexPattern.createIndex.uncaughtError', { defaultMessage: 'Rollup index pattern error: {error}', values: { diff --git a/src/plugins/index_pattern_management/public/service/index_pattern_management_service.ts b/src/plugins/index_pattern_management/public/service/index_pattern_management_service.ts index f30ccfcb9f3ed7..25a36faa1c3e37 100644 --- a/src/plugins/index_pattern_management/public/service/index_pattern_management_service.ts +++ b/src/plugins/index_pattern_management/public/service/index_pattern_management_service.ts @@ -6,11 +6,13 @@ * Side Public License, v 1. */ -import { HttpSetup } from '../../../../core/public'; -import { IndexPatternCreationManager, IndexPatternCreationConfig } from './creation'; -import { IndexPatternListManager, IndexPatternListConfig } from './list'; -interface SetupDependencies { - httpClient: HttpSetup; +import { HttpStart, CoreStart } from '../../../../core/public'; +import { IndexPatternCreationManager } from './creation'; +import { IndexPatternListManager } from './list'; + +interface StartDependencies { + httpClient: HttpStart; + uiSettings: CoreStart['uiSettings']; } /** @@ -27,23 +29,12 @@ export class IndexPatternManagementService { this.indexPatternListConfig = new IndexPatternListManager(); } - public setup({ httpClient }: SetupDependencies) { - const creationManagerSetup = this.indexPatternCreationManager.setup(httpClient); - creationManagerSetup.addCreationConfig(IndexPatternCreationConfig); - - const indexPatternListConfigSetup = this.indexPatternListConfig.setup(); - indexPatternListConfigSetup.addListConfig(IndexPatternListConfig); - - return { - creation: creationManagerSetup, - list: indexPatternListConfigSetup, - }; - } + public setup() {} - public start() { + public start({ httpClient, uiSettings }: StartDependencies) { return { - creation: this.indexPatternCreationManager.start(), - list: this.indexPatternListConfig.start(), + creation: this.indexPatternCreationManager.start({ httpClient, uiSettings }), + list: this.indexPatternListConfig.start({ uiSettings }), }; } diff --git a/src/plugins/index_pattern_management/public/service/list/index.ts b/src/plugins/index_pattern_management/public/service/list/index.ts index 620d4c7600733b..738b807ac76246 100644 --- a/src/plugins/index_pattern_management/public/service/list/index.ts +++ b/src/plugins/index_pattern_management/public/service/list/index.ts @@ -8,3 +8,5 @@ export { IndexPatternListConfig } from './config'; export { IndexPatternListManager } from './manager'; +// @ts-ignore +export { RollupIndexPatternListConfig } from './rollup_list_config'; diff --git a/src/plugins/index_pattern_management/public/service/list/manager.ts b/src/plugins/index_pattern_management/public/service/list/manager.ts index 22877f78d46fcd..bdb2d47057f1f2 100644 --- a/src/plugins/index_pattern_management/public/service/list/manager.ts +++ b/src/plugins/index_pattern_management/public/service/list/manager.ts @@ -8,31 +8,35 @@ import { IIndexPattern, IFieldType } from 'src/plugins/data/public'; import { SimpleSavedObject } from 'src/core/public'; +import { once } from 'lodash'; +import { CoreStart } from '../../../../../core/public'; import { IndexPatternListConfig, IndexPatternTag } from './config'; +import { CONFIG_ROLLUPS } from '../../constants'; +// @ts-ignore +import { RollupIndexPatternListConfig } from './rollup_list_config'; -export class IndexPatternListManager { - private configs: IndexPatternListConfig[] = []; +interface IndexPatternListManagerStart { + uiSettings: CoreStart['uiSettings']; +} - setup() { - return { - addListConfig: (Config: typeof IndexPatternListConfig) => { - const config = new Config(); +export class IndexPatternListManager { + start({ uiSettings }: IndexPatternListManagerStart) { + const getConfigs = once(() => { + const configs: IndexPatternListConfig[] = []; + configs.push(new IndexPatternListConfig()); - if (this.configs.findIndex((c) => c.key === config.key) !== -1) { - throw new Error(`${config.key} exists in IndexPatternListManager.`); - } - this.configs.push(config); - }, - }; - } + if (uiSettings.isDeclared(CONFIG_ROLLUPS) && uiSettings.get(CONFIG_ROLLUPS)) { + configs.push(new RollupIndexPatternListConfig()); + } - start() { + return configs; + }); return { getIndexPatternTags: ( indexPattern: IIndexPattern | SimpleSavedObject, isDefault: boolean ) => - this.configs.reduce( + getConfigs().reduce( (tags: IndexPatternTag[], config) => config.getIndexPatternTags ? tags.concat(config.getIndexPatternTags(indexPattern, isDefault)) @@ -41,14 +45,14 @@ export class IndexPatternListManager { ), getFieldInfo: (indexPattern: IIndexPattern, field: IFieldType): string[] => - this.configs.reduce( + getConfigs().reduce( (info: string[], config) => config.getFieldInfo ? info.concat(config.getFieldInfo(indexPattern, field)) : info, [] ), areScriptedFieldsEnabled: (indexPattern: IIndexPattern): boolean => - this.configs.every((config) => + getConfigs().every((config) => config.areScriptedFieldsEnabled ? config.areScriptedFieldsEnabled(indexPattern) : true ), }; diff --git a/x-pack/plugins/rollup/public/index_pattern_list/rollup_index_pattern_list_config.js b/src/plugins/index_pattern_management/public/service/list/rollup_list_config.js similarity index 86% rename from x-pack/plugins/rollup/public/index_pattern_list/rollup_index_pattern_list_config.js rename to src/plugins/index_pattern_management/public/service/list/rollup_list_config.js index 43eee6ca27f9a0..9a80d5fd0d622b 100644 --- a/x-pack/plugins/rollup/public/index_pattern_list/rollup_index_pattern_list_config.js +++ b/src/plugins/index_pattern_management/public/service/list/rollup_list_config.js @@ -1,11 +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. + * 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 { IndexPatternListConfig } from '../../../../../src/plugins/index_pattern_management/public'; +import { IndexPatternListConfig } from '.'; function isRollup(indexPattern) { return ( diff --git a/x-pack/plugins/rollup/kibana.json b/x-pack/plugins/rollup/kibana.json index 725b563c3674f3..10541d9a4ebddc 100644 --- a/x-pack/plugins/rollup/kibana.json +++ b/x-pack/plugins/rollup/kibana.json @@ -5,7 +5,6 @@ "server": true, "ui": true, "requiredPlugins": [ - "indexPatternManagement", "management", "licensing", "features" diff --git a/x-pack/plugins/rollup/public/plugin.ts b/x-pack/plugins/rollup/public/plugin.ts index 17e352e1a44729..0d345e326193c7 100644 --- a/x-pack/plugins/rollup/public/plugin.ts +++ b/x-pack/plugins/rollup/public/plugin.ts @@ -12,14 +12,13 @@ import { rollupBadgeExtension, rollupToggleExtension } from './extend_index_mana import { RollupIndexPatternCreationConfig } from './index_pattern_creation/rollup_index_pattern_creation_config'; // @ts-ignore import { RollupIndexPatternListConfig } from './index_pattern_list/rollup_index_pattern_list_config'; -import { CONFIG_ROLLUPS, UIM_APP_NAME } from '../common'; +import { UIM_APP_NAME } from '../common'; import { FeatureCatalogueCategory, HomePublicPluginSetup, } from '../../../../src/plugins/home/public'; import { ManagementSetup } from '../../../../src/plugins/management/public'; import { IndexManagementPluginSetup } from '../../index_management/public'; -import { IndexPatternManagementSetup } from '../../../../src/plugins/index_pattern_management/public'; // @ts-ignore import { setHttp, init as initDocumentation } from './crud_app/services/index'; import { setNotifications, setFatalErrors, setUiStatsReporter } from './kibana_services'; @@ -29,20 +28,13 @@ export interface RollupPluginSetupDependencies { home?: HomePublicPluginSetup; management: ManagementSetup; indexManagement?: IndexManagementPluginSetup; - indexPatternManagement: IndexPatternManagementSetup; usageCollection?: UsageCollectionSetup; } export class RollupPlugin implements Plugin { setup( core: CoreSetup, - { - home, - management, - indexManagement, - indexPatternManagement, - usageCollection, - }: RollupPluginSetupDependencies + { home, management, indexManagement, usageCollection }: RollupPluginSetupDependencies ) { setFatalErrors(core.fatalErrors); if (usageCollection) { @@ -54,13 +46,6 @@ export class RollupPlugin implements Plugin { indexManagement.extensionsService.addToggle(rollupToggleExtension); } - const isRollupIndexPatternsEnabled = core.uiSettings.get(CONFIG_ROLLUPS); - - if (isRollupIndexPatternsEnabled) { - indexPatternManagement.creation.addCreationConfig(RollupIndexPatternCreationConfig); - indexPatternManagement.list.addListConfig(RollupIndexPatternListConfig); - } - if (home) { home.featureCatalogue.register({ id: 'rollup_jobs', diff --git a/x-pack/plugins/rollup/tsconfig.json b/x-pack/plugins/rollup/tsconfig.json index 9b994d1710ffc2..6885081ce4bdd1 100644 --- a/x-pack/plugins/rollup/tsconfig.json +++ b/x-pack/plugins/rollup/tsconfig.json @@ -16,7 +16,6 @@ "references": [ { "path": "../../../src/core/tsconfig.json" }, // required plugins - { "path": "../../../src/plugins/index_pattern_management/tsconfig.json" }, { "path": "../../../src/plugins/management/tsconfig.json" }, { "path": "../licensing/tsconfig.json" }, { "path": "../features/tsconfig.json" }, diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index db382a677fbe82..865c80ff0f3e51 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -17975,15 +17975,15 @@ "xpack.rollupJobs.detailPanel.jobActionMenu.buttonLabel": "管理", "xpack.rollupJobs.detailPanel.loadingLabel": "ロールアップジョブを読み込み中...", "xpack.rollupJobs.detailPanel.notFoundLabel": "ロールアップジョブが見つかりません", - "xpack.rollupJobs.editRollupIndexPattern.createIndex.defaultButtonDescription": "要約データに制限された集約を実行します。", - "xpack.rollupJobs.editRollupIndexPattern.createIndex.defaultButtonText": "ロールアップインデックスパターン", - "xpack.rollupJobs.editRollupIndexPattern.createIndex.defaultTypeName": "ロールアップインデックスパターン", - "xpack.rollupJobs.editRollupIndexPattern.createIndex.indexLabel": "ロールアップ", - "xpack.rollupJobs.editRollupIndexPattern.createIndex.noMatchError": "ロールアップインデックスパターンエラー：ロールアップインデックスの 1 つと一致している必要があります", - "xpack.rollupJobs.editRollupIndexPattern.createIndex.tooManyMatchesError": "ロールアップインデックスパターンエラー：一致できるロールアップインデックスは 1 つだけです", - "xpack.rollupJobs.editRollupIndexPattern.createIndex.uncaughtError": "ロールアップインデックスパターンエラー：{error}", - "xpack.rollupJobs.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph1Text": "ロールアップインデックスパターンのKibanaのサポートはベータ版です。保存された検索、可視化、ダッシュボードでこれらのパターンを使用すると問題が発生する場合があります。Timelionや機械学習などの一部の高度な機能ではサポートされていません。", - "xpack.rollupJobs.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph2Text": "ロールアップインデックスパターンは、1つのロールアップインデックスとゼロ以上の標準インデックスと一致させることができます。ロールアップインデックスパターンでは、メトリック、フィールド、間隔、アグリゲーションが制限されています。ロールアップインデックスは、1つのジョブ構成があるインデックス、または複数のジョブと互換する構成があるインデックスに制限されています。", + "indexPatternManagement.editRollupIndexPattern.createIndex.defaultButtonDescription": "要約データに制限された集約を実行します。", + "indexPatternManagement.editRollupIndexPattern.createIndex.defaultButtonText": "ロールアップインデックスパターン", + "indexPatternManagement.editRollupIndexPattern.createIndex.defaultTypeName": "ロールアップインデックスパターン", + "indexPatternManagement.editRollupIndexPattern.createIndex.indexLabel": "ロールアップ", + "indexPatternManagement.editRollupIndexPattern.createIndex.noMatchError": "ロールアップインデックスパターンエラー：ロールアップインデックスの 1 つと一致している必要があります", + "indexPatternManagement.editRollupIndexPattern.createIndex.tooManyMatchesError": "ロールアップインデックスパターンエラー：一致できるロールアップインデックスは 1 つだけです", + "indexPatternManagement.editRollupIndexPattern.createIndex.uncaughtError": "ロールアップインデックスパターンエラー：{error}", + "indexPatternManagement.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph1Text": "ロールアップインデックスパターンのKibanaのサポートはベータ版です。保存された検索、可視化、ダッシュボードでこれらのパターンを使用すると問題が発生する場合があります。Timelionや機械学習などの一部の高度な機能ではサポートされていません。", + "indexPatternManagement.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph2Text": "ロールアップインデックスパターンは、1つのロールアップインデックスとゼロ以上の標準インデックスと一致させることができます。ロールアップインデックスパターンでは、メトリック、フィールド、間隔、アグリゲーションが制限されています。ロールアップインデックスは、1つのジョブ構成があるインデックス、または複数のジョブと互換する構成があるインデックスに制限されています。", "xpack.rollupJobs.featureCatalogueDescription": "今後の分析用に履歴データを小さなインデックスに要約して格納します。", "xpack.rollupJobs.indexMgmtBadge.rollupLabel": "ロールアップ", "xpack.rollupJobs.indexMgmtToggle.toggleLabel": "ロールアップインデックスを含める", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index 2f86597f4c5c50..0e98aff3f4a361 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -18215,15 +18215,15 @@ "xpack.rollupJobs.detailPanel.jobActionMenu.buttonLabel": "管理", "xpack.rollupJobs.detailPanel.loadingLabel": "正在加载汇总/打包作业……", "xpack.rollupJobs.detailPanel.notFoundLabel": "未找到汇总/打包作业", - "xpack.rollupJobs.editRollupIndexPattern.createIndex.defaultButtonDescription": "针对汇总数据执行有限聚合", - "xpack.rollupJobs.editRollupIndexPattern.createIndex.defaultButtonText": "汇总/打包索引模式", - "xpack.rollupJobs.editRollupIndexPattern.createIndex.defaultTypeName": "汇总/打包索引模式", - "xpack.rollupJobs.editRollupIndexPattern.createIndex.indexLabel": "汇总/打包", - "xpack.rollupJobs.editRollupIndexPattern.createIndex.noMatchError": "汇总/打包索引模式错误：必须匹配一个汇总/打包索引", - "xpack.rollupJobs.editRollupIndexPattern.createIndex.tooManyMatchesError": "汇总/打包索引模式错误：只能匹配一个汇总/打包索引", - "xpack.rollupJobs.editRollupIndexPattern.createIndex.uncaughtError": "汇总索引模式错误：{error}", - "xpack.rollupJobs.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph1Text": "Kibana 对汇总/打包索引模式的支持处于公测版状态。将这些模式用于已保存搜索、可视化以及仪表板可能会遇到问题。某些高级功能，如 Timelion 和 Machine Learning，不支持这些模式。", - "xpack.rollupJobs.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph2Text": "可以根据一个汇总/打包索引和零个或更多常规索引匹配汇总/打包索引模式。汇总/打包索引模式的指标、字段、时间间隔和聚合有限。汇总/打包索引仅限于具有一个作业配置或多个作业配置兼容的索引。", + "indexPatternManagement.editRollupIndexPattern.createIndex.defaultButtonDescription": "针对汇总数据执行有限聚合", + "indexPatternManagement.editRollupIndexPattern.createIndex.defaultButtonText": "汇总/打包索引模式", + "indexPatternManagement.editRollupIndexPattern.createIndex.defaultTypeName": "汇总/打包索引模式", + "indexPatternManagement.editRollupIndexPattern.createIndex.indexLabel": "汇总/打包", + "indexPatternManagement.editRollupIndexPattern.createIndex.noMatchError": "汇总/打包索引模式错误：必须匹配一个汇总/打包索引", + "indexPatternManagement.editRollupIndexPattern.createIndex.tooManyMatchesError": "汇总/打包索引模式错误：只能匹配一个汇总/打包索引", + "indexPatternManagement.editRollupIndexPattern.createIndex.uncaughtError": "汇总索引模式错误：{error}", + "indexPatternManagement.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph1Text": "Kibana 对汇总/打包索引模式的支持处于公测版状态。将这些模式用于已保存搜索、可视化以及仪表板可能会遇到问题。某些高级功能，如 Timelion 和 Machine Learning，不支持这些模式。", + "indexPatternManagement.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph2Text": "可以根据一个汇总/打包索引和零个或更多常规索引匹配汇总/打包索引模式。汇总/打包索引模式的指标、字段、时间间隔和聚合有限。汇总/打包索引仅限于具有一个作业配置或多个作业配置兼容的索引。", "xpack.rollupJobs.featureCatalogueDescription": "汇总历史数据并将其存储在较小的索引中以供将来分析。", "xpack.rollupJobs.indexMgmtBadge.rollupLabel": "汇总/打包", "xpack.rollupJobs.indexMgmtToggle.toggleLabel": "包括汇总索引", From 611352047078801cd243e6cbe0d7dd4221e6298a Mon Sep 17 00:00:00 2001 From: Nathan L Smith Date: Thu, 17 Jun 2021 00:27:23 -0500 Subject: [PATCH 40/46] Refactor observability plugin breadcrumbs (#102290) Previously the observability plugin set the page title and breadcrumbs in the main app rendering component based on the `breadcrumb` property of the current route. In addition, there's a `useBreadcrumb` hook used by the UX app, exploratory view, and cases. The conflict between these was creating situations where neither would work and the breadcrumbs would just show "Kibana". Remove the breadcrumb properties from the routes and the main app breadcrumb handling and just use `useBreadcrumb` on all pages. Fixes #102131. --- .../public/application/index.tsx | 40 ++---- .../components/app/cases/case_view/index.tsx | 3 +- .../public/hooks/use_breadcrumbs.test.tsx | 116 ++++++++++++++++++ .../public/hooks/use_breadcrumbs.ts | 62 ++++------ .../public/pages/alerts/index.tsx | 9 ++ .../public/pages/cases/all_cases.tsx | 5 + .../public/pages/cases/configure_cases.tsx | 4 +- .../public/pages/cases/create_case.tsx | 4 +- .../observability/public/pages/cases/links.ts | 21 +++- .../public/pages/landing/index.tsx | 8 ++ .../public/pages/overview/index.tsx | 9 ++ .../observability/public/routes/index.tsx | 59 ++------- .../translations/translations/ja-JP.json | 6 - .../translations/translations/zh-CN.json | 6 - 14 files changed, 211 insertions(+), 141 deletions(-) create mode 100644 x-pack/plugins/observability/public/hooks/use_breadcrumbs.test.tsx diff --git a/x-pack/plugins/observability/public/application/index.tsx b/x-pack/plugins/observability/public/application/index.tsx index f8dce3ce1d487e..69ee6fa19cf0f7 100644 --- a/x-pack/plugins/observability/public/application/index.tsx +++ b/x-pack/plugins/observability/public/application/index.tsx @@ -6,30 +6,25 @@ */ import { i18n } from '@kbn/i18n'; -import React, { MouseEvent, useEffect } from 'react'; +import React from 'react'; import ReactDOM from 'react-dom'; import { Route, Router, Switch } from 'react-router-dom'; -import { EuiThemeProvider } from '../../../../../src/plugins/kibana_react/common'; +import { ConfigSchema } from '..'; import { AppMountParameters, APP_WRAPPER_CLASS, CoreStart } from '../../../../../src/core/public'; +import { EuiThemeProvider } from '../../../../../src/plugins/kibana_react/common'; import { KibanaContextProvider, RedirectAppLinks, } from '../../../../../src/plugins/kibana_react/public'; +import { Storage } from '../../../../../src/plugins/kibana_utils/public'; +import type { LazyObservabilityPageTemplateProps } from '../components/shared/page_template/lazy_page_template'; +import { HasDataContextProvider } from '../context/has_data_context'; import { PluginContext } from '../context/plugin_context'; -import { usePluginContext } from '../hooks/use_plugin_context'; import { useRouteParams } from '../hooks/use_route_params'; import { ObservabilityPublicPluginsStart } from '../plugin'; -import type { LazyObservabilityPageTemplateProps } from '../components/shared/page_template/lazy_page_template'; -import { HasDataContextProvider } from '../context/has_data_context'; -import { Breadcrumbs, routes } from '../routes'; -import { Storage } from '../../../../../src/plugins/kibana_utils/public'; -import { ConfigSchema } from '..'; +import { routes } from '../routes'; import { ObservabilityRuleTypeRegistry } from '../rules/create_observability_rule_type_registry'; -function getTitleFromBreadCrumbs(breadcrumbs: Breadcrumbs) { - return breadcrumbs.map(({ text }) => text).reverse(); -} - function App() { return ( <> @@ -38,27 +33,6 @@ function App() { const path = key as keyof typeof routes; const route = routes[path]; const Wrapper = () => { - const { core } = usePluginContext(); - - useEffect(() => { - const href = core.http.basePath.prepend('/app/observability'); - const breadcrumbs = [ - { - href, - text: i18n.translate('xpack.observability.observability.breadcrumb.', { - defaultMessage: 'Observability', - }), - onClick: (event: MouseEvent) => { - event.preventDefault(); - core.application.navigateToUrl(href); - }, - }, - ...route.breadcrumb, - ]; - core.chrome.setBreadcrumbs(breadcrumbs); - core.chrome.docTitle.change(getTitleFromBreadCrumbs(breadcrumbs)); - }, [core]); - const params = useRouteParams(path); return route.handler(params); }; diff --git a/x-pack/plugins/observability/public/components/app/cases/case_view/index.tsx b/x-pack/plugins/observability/public/components/app/cases/case_view/index.tsx index 3267f7bb17cce6..728333ac8c544f 100644 --- a/x-pack/plugins/observability/public/components/app/cases/case_view/index.tsx +++ b/x-pack/plugins/observability/public/components/app/cases/case_view/index.tsx @@ -7,6 +7,7 @@ import React, { useCallback, useState } from 'react'; import { + casesBreadcrumbs, getCaseDetailsUrl, getCaseDetailsUrlWithCommentId, getCaseUrl, @@ -17,7 +18,7 @@ import { Case } from '../../../../../../cases/common'; import { useFetchAlertData } from './helpers'; import { useKibana } from '../../../../utils/kibana_react'; import { CASES_APP_ID } from '../constants'; -import { casesBreadcrumbs, useBreadcrumbs } from '../../../../hooks/use_breadcrumbs'; +import { useBreadcrumbs } from '../../../../hooks/use_breadcrumbs'; interface Props { caseId: string; diff --git a/x-pack/plugins/observability/public/hooks/use_breadcrumbs.test.tsx b/x-pack/plugins/observability/public/hooks/use_breadcrumbs.test.tsx new file mode 100644 index 00000000000000..d033ecc2069cdf --- /dev/null +++ b/x-pack/plugins/observability/public/hooks/use_breadcrumbs.test.tsx @@ -0,0 +1,116 @@ +/* + * Copyright 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 React, { ReactNode } from 'react'; +import { MemoryRouter } from 'react-router-dom'; +import { CoreStart } from '../../../../../src/core/public'; +import { createKibanaReactContext } from '../../../../../src/plugins/kibana_react/public'; +import { useBreadcrumbs } from './use_breadcrumbs'; + +const setBreadcrumbs = jest.fn(); +const setTitle = jest.fn(); +const kibanaServices = ({ + application: { getUrlForApp: () => {}, navigateToApp: () => {} }, + chrome: { setBreadcrumbs, docTitle: { change: setTitle } }, + uiSettings: { get: () => true }, +} as unknown) as Partial; +const KibanaContext = createKibanaReactContext(kibanaServices); + +function Wrapper({ children }: { children?: ReactNode }) { + return ( + + {children} + + ); +} + +describe('useBreadcrumbs', () => { + afterEach(() => { + setBreadcrumbs.mockClear(); + setTitle.mockClear(); + }); + + describe('when setBreadcrumbs and setTitle are not defined', () => { + it('does not set breadcrumbs or the title', () => { + renderHook(() => useBreadcrumbs([]), { + wrapper: ({ children }) => ( + + + } + > + {children} + + + ), + }); + + expect(setBreadcrumbs).not.toHaveBeenCalled(); + expect(setTitle).not.toHaveBeenCalled(); + }); + }); + + describe('with an empty array', () => { + it('sets the overview breadcrumb', () => { + renderHook(() => useBreadcrumbs([]), { wrapper: Wrapper }); + + expect(setBreadcrumbs).toHaveBeenCalledWith([ + { href: '/overview', onClick: expect.any(Function), text: 'Observability' }, + ]); + }); + + it('sets the overview title', () => { + renderHook(() => useBreadcrumbs([]), { wrapper: Wrapper }); + + expect(setTitle).toHaveBeenCalledWith(['Observability']); + }); + }); + + describe('given breadcrumbs', () => { + it('sets the breadcrumbs', () => { + renderHook( + () => + useBreadcrumbs([ + { text: 'One', href: '/one' }, + { + text: 'Two', + }, + ]), + { wrapper: Wrapper } + ); + + expect(setBreadcrumbs).toHaveBeenCalledWith([ + { href: '/overview', onClick: expect.any(Function), text: 'Observability' }, + { + href: '/one', + onClick: expect.any(Function), + text: 'One', + }, + { + text: 'Two', + }, + ]); + }); + + it('sets the title', () => { + renderHook( + () => + useBreadcrumbs([ + { text: 'One', href: '/one' }, + { + text: 'Two', + }, + ]), + { wrapper: Wrapper } + ); + + expect(setTitle).toHaveBeenCalledWith(['Two', 'One', 'Observability']); + }); + }); +}); diff --git a/x-pack/plugins/observability/public/hooks/use_breadcrumbs.ts b/x-pack/plugins/observability/public/hooks/use_breadcrumbs.ts index 090031e314fd1a..241a978d36948b 100644 --- a/x-pack/plugins/observability/public/hooks/use_breadcrumbs.ts +++ b/x-pack/plugins/observability/public/hooks/use_breadcrumbs.ts @@ -5,14 +5,13 @@ * 2.0. */ -import { ChromeBreadcrumb } from 'kibana/public'; import { i18n } from '@kbn/i18n'; +import { ChromeBreadcrumb } from 'kibana/public'; import { MouseEvent, useEffect } from 'react'; -import { EuiBreadcrumb } from '@elastic/eui'; -import { useQueryParams } from './use_query_params'; import { useKibana } from '../utils/kibana_react'; +import { useQueryParams } from './use_query_params'; -function handleBreadcrumbClick( +function addClickHandlers( breadcrumbs: ChromeBreadcrumb[], navigateToHref?: (url: string) => Promise ) { @@ -31,52 +30,37 @@ function handleBreadcrumbClick( })); } -export const makeBaseBreadcrumb = (href: string): EuiBreadcrumb => { - return { - text: i18n.translate('xpack.observability.breadcrumbs.observability', { - defaultMessage: 'Observability', - }), - href, - }; -}; -export const casesBreadcrumbs = { - cases: { - text: i18n.translate('xpack.observability.breadcrumbs.observability.cases', { - defaultMessage: 'Cases', - }), - }, - create: { - text: i18n.translate('xpack.observability.breadcrumbs.observability.cases.create', { - defaultMessage: 'Create', - }), - }, - configure: { - text: i18n.translate('xpack.observability.breadcrumbs.observability.cases.configure', { - defaultMessage: 'Configure', - }), - }, -}; +function getTitleFromBreadCrumbs(breadcrumbs: ChromeBreadcrumb[]) { + return breadcrumbs.map(({ text }) => text?.toString() ?? '').reverse(); +} + export const useBreadcrumbs = (extraCrumbs: ChromeBreadcrumb[]) => { const params = useQueryParams(); const { services: { - chrome: { setBreadcrumbs }, + chrome: { docTitle, setBreadcrumbs }, application: { getUrlForApp, navigateToUrl }, }, } = useKibana(); - + const setTitle = docTitle.change; const appPath = getUrlForApp('observability-overview') ?? ''; - const navigate = navigateToUrl; useEffect(() => { + const breadcrumbs = [ + { + text: i18n.translate('xpack.observability.breadcrumbs.observabilityLinkText', { + defaultMessage: 'Observability', + }), + href: appPath + '/overview', + }, + ...extraCrumbs, + ]; if (setBreadcrumbs) { - setBreadcrumbs( - handleBreadcrumbClick( - [makeBaseBreadcrumb(appPath + '/overview')].concat(extraCrumbs), - navigate - ) - ); + setBreadcrumbs(addClickHandlers(breadcrumbs, navigateToUrl)); + } + if (setTitle) { + setTitle(getTitleFromBreadCrumbs(breadcrumbs)); } - }, [appPath, extraCrumbs, navigate, params, setBreadcrumbs]); + }, [appPath, extraCrumbs, navigateToUrl, params, setBreadcrumbs, setTitle]); }; diff --git a/x-pack/plugins/observability/public/pages/alerts/index.tsx b/x-pack/plugins/observability/public/pages/alerts/index.tsx index bd926f3a326bf7..6f696a70665ce6 100644 --- a/x-pack/plugins/observability/public/pages/alerts/index.tsx +++ b/x-pack/plugins/observability/public/pages/alerts/index.tsx @@ -12,6 +12,7 @@ import { useHistory } from 'react-router-dom'; import { ParsedTechnicalFields } from '../../../../rule_registry/common/parse_technical_fields'; import type { AlertStatus } from '../../../common/typings'; import { ExperimentalBadge } from '../../components/shared/experimental_badge'; +import { useBreadcrumbs } from '../../hooks/use_breadcrumbs'; import { useFetcher } from '../../hooks/use_fetcher'; import { usePluginContext } from '../../hooks/use_plugin_context'; import { RouteParams } from '../../routes'; @@ -44,6 +45,14 @@ export function AlertsPage({ routeParams }: AlertsPageProps) { query: { rangeFrom = 'now-15m', rangeTo = 'now', kuery = '', status = 'open' }, } = routeParams; + useBreadcrumbs([ + { + text: i18n.translate('xpack.observability.breadcrumbs.alertsLinkText', { + defaultMessage: 'Alerts', + }), + }, + ]); + // In a future milestone we'll have a page dedicated to rule management in // observability. For now link to the settings page. const manageDetectionRulesHref = prepend( diff --git a/x-pack/plugins/observability/public/pages/cases/all_cases.tsx b/x-pack/plugins/observability/public/pages/cases/all_cases.tsx index 4131cdc40738f2..f73f3b4cf57d75 100644 --- a/x-pack/plugins/observability/public/pages/cases/all_cases.tsx +++ b/x-pack/plugins/observability/public/pages/cases/all_cases.tsx @@ -14,10 +14,15 @@ import { permissionsReadOnlyErrorMessage, CaseCallOut } from '../../components/a import { CaseFeatureNoPermissions } from './feature_no_permissions'; import { useGetUserCasesPermissions } from '../../hooks/use_get_user_cases_permissions'; import { usePluginContext } from '../../hooks/use_plugin_context'; +import { casesBreadcrumbs } from './links'; +import { useBreadcrumbs } from '../../hooks/use_breadcrumbs'; export const AllCasesPage = React.memo(() => { const userPermissions = useGetUserCasesPermissions(); const { ObservabilityPageTemplate } = usePluginContext(); + + useBreadcrumbs([casesBreadcrumbs.cases]); + return userPermissions == null || userPermissions?.read ? ( <> {userPermissions != null && !userPermissions?.crud && userPermissions?.read && ( diff --git a/x-pack/plugins/observability/public/pages/cases/configure_cases.tsx b/x-pack/plugins/observability/public/pages/cases/configure_cases.tsx index acc6bdf68fba75..2986c1ff34e11c 100644 --- a/x-pack/plugins/observability/public/pages/cases/configure_cases.tsx +++ b/x-pack/plugins/observability/public/pages/cases/configure_cases.tsx @@ -14,8 +14,8 @@ import { CASES_APP_ID, CASES_OWNER } from '../../components/app/cases/constants' import { useKibana } from '../../utils/kibana_react'; import { useGetUserCasesPermissions } from '../../hooks/use_get_user_cases_permissions'; import { usePluginContext } from '../../hooks/use_plugin_context'; -import { casesBreadcrumbs, useBreadcrumbs } from '../../hooks/use_breadcrumbs'; -import { getCaseUrl, useFormatUrl } from './links'; +import { useBreadcrumbs } from '../../hooks/use_breadcrumbs'; +import { casesBreadcrumbs, getCaseUrl, useFormatUrl } from './links'; const ButtonEmpty = styled(EuiButtonEmpty)` display: block; diff --git a/x-pack/plugins/observability/public/pages/cases/create_case.tsx b/x-pack/plugins/observability/public/pages/cases/create_case.tsx index d0e25e6263075b..11f6d62da61033 100644 --- a/x-pack/plugins/observability/public/pages/cases/create_case.tsx +++ b/x-pack/plugins/observability/public/pages/cases/create_case.tsx @@ -14,8 +14,8 @@ import { CASES_APP_ID } from '../../components/app/cases/constants'; import { useKibana } from '../../utils/kibana_react'; import { useGetUserCasesPermissions } from '../../hooks/use_get_user_cases_permissions'; import { usePluginContext } from '../../hooks/use_plugin_context'; -import { getCaseUrl, useFormatUrl } from './links'; -import { casesBreadcrumbs, useBreadcrumbs } from '../../hooks/use_breadcrumbs'; +import { casesBreadcrumbs, getCaseUrl, useFormatUrl } from './links'; +import { useBreadcrumbs } from '../../hooks/use_breadcrumbs'; const ButtonEmpty = styled(EuiButtonEmpty)` display: block; diff --git a/x-pack/plugins/observability/public/pages/cases/links.ts b/x-pack/plugins/observability/public/pages/cases/links.ts index 768d74ec4e7ee3..9b2f464a0e8471 100644 --- a/x-pack/plugins/observability/public/pages/cases/links.ts +++ b/x-pack/plugins/observability/public/pages/cases/links.ts @@ -5,10 +5,29 @@ * 2.0. */ -import { useCallback } from 'react'; +import { i18n } from '@kbn/i18n'; import { isEmpty } from 'lodash/fp'; +import { useCallback } from 'react'; import { useKibana } from '../../utils/kibana_react'; +export const casesBreadcrumbs = { + cases: { + text: i18n.translate('xpack.observability.breadcrumbs.casesLinkText', { + defaultMessage: 'Cases', + }), + }, + create: { + text: i18n.translate('xpack.observability.breadcrumbs.casesCreateLinkText', { + defaultMessage: 'Create', + }), + }, + configure: { + text: i18n.translate('xpack.observability.breadcrumbs.casesConfigureLinkText', { + defaultMessage: 'Configure', + }), + }, +}; + export const getCaseDetailsUrl = ({ id, subCaseId }: { id: string; subCaseId?: string }) => { if (subCaseId) { return `/${encodeURIComponent(id)}/sub-cases/${encodeURIComponent(subCaseId)}`; diff --git a/x-pack/plugins/observability/public/pages/landing/index.tsx b/x-pack/plugins/observability/public/pages/landing/index.tsx index 46c99bffbcc698..28d3784c65c4ae 100644 --- a/x-pack/plugins/observability/public/pages/landing/index.tsx +++ b/x-pack/plugins/observability/public/pages/landing/index.tsx @@ -21,6 +21,7 @@ import React, { useContext } from 'react'; import styled, { ThemeContext } from 'styled-components'; import { FleetPanel } from '../../components/app/fleet_panel'; import { ObservabilityHeaderMenu } from '../../components/app/header'; +import { useBreadcrumbs } from '../../hooks/use_breadcrumbs'; import { usePluginContext } from '../../hooks/use_plugin_context'; import { useTrackPageview } from '../../hooks/use_track_metric'; import { appsSection } from '../home/section'; @@ -33,6 +34,13 @@ const EuiCardWithoutPadding = styled(EuiCard)` export function LandingPage() { useTrackPageview({ app: 'observability-overview', path: 'landing' }); useTrackPageview({ app: 'observability-overview', path: 'landing', delay: 15000 }); + useBreadcrumbs([ + { + text: i18n.translate('xpack.observability.breadcrumbs.landingLinkText', { + defaultMessage: 'Getting started', + }), + }, + ]); const { core, ObservabilityPageTemplate } = usePluginContext(); const theme = useContext(ThemeContext); diff --git a/x-pack/plugins/observability/public/pages/overview/index.tsx b/x-pack/plugins/observability/public/pages/overview/index.tsx index 4cb6792d501952..89398ad16f1988 100644 --- a/x-pack/plugins/observability/public/pages/overview/index.tsx +++ b/x-pack/plugins/observability/public/pages/overview/index.tsx @@ -16,6 +16,7 @@ import { NewsFeed } from '../../components/app/news_feed'; import { Resources } from '../../components/app/resources'; import { AlertsSection } from '../../components/app/section/alerts'; import { DatePicker } from '../../components/shared/date_picker'; +import { useBreadcrumbs } from '../../hooks/use_breadcrumbs'; import { useFetcher } from '../../hooks/use_fetcher'; import { useHasData } from '../../hooks/use_has_data'; import { usePluginContext } from '../../hooks/use_plugin_context'; @@ -39,6 +40,14 @@ function calculateBucketSize({ start, end }: { start?: number; end?: number }) { export function OverviewPage({ routeParams }: Props) { useTrackPageview({ app: 'observability-overview', path: 'overview' }); useTrackPageview({ app: 'observability-overview', path: 'overview', delay: 15000 }); + useBreadcrumbs([ + { + text: i18n.translate('xpack.observability.breadcrumbs.overviewLinkText', { + defaultMessage: 'Overview', + }), + }, + ]); + const { core, ObservabilityPageTemplate } = usePluginContext(); const { relativeStart, relativeEnd, absoluteStart, absoluteEnd } = useTimeRange(); diff --git a/x-pack/plugins/observability/public/routes/index.tsx b/x-pack/plugins/observability/public/routes/index.tsx index a2a67a42bd166a..92f51aeff9bd63 100644 --- a/x-pack/plugins/observability/public/routes/index.tsx +++ b/x-pack/plugins/observability/public/routes/index.tsx @@ -5,21 +5,19 @@ * 2.0. */ -import React from 'react'; import * as t from 'io-ts'; -import { i18n } from '@kbn/i18n'; +import React from 'react'; +import { alertStatusRt } from '../../common/typings'; +import { ExploratoryViewPage } from '../components/shared/exploratory_view'; +import { AlertsPage } from '../pages/alerts'; +import { AllCasesPage } from '../pages/cases/all_cases'; +import { CaseDetailsPage } from '../pages/cases/case_details'; +import { ConfigureCasesPage } from '../pages/cases/configure_cases'; +import { CreateCasePage } from '../pages/cases/create_case'; import { HomePage } from '../pages/home'; import { LandingPage } from '../pages/landing'; import { OverviewPage } from '../pages/overview'; import { jsonRt } from './json_rt'; -import { AlertsPage } from '../pages/alerts'; -import { CreateCasePage } from '../pages/cases/create_case'; -import { ExploratoryViewPage } from '../components/shared/exploratory_view'; -import { CaseDetailsPage } from '../pages/cases/case_details'; -import { ConfigureCasesPage } from '../pages/cases/configure_cases'; -import { AllCasesPage } from '../pages/cases/all_cases'; -import { casesBreadcrumbs } from '../hooks/use_breadcrumbs'; -import { alertStatusRt } from '../../common/typings'; export type RouteParams = DecodeParams; @@ -27,8 +25,6 @@ type DecodeParams = { [key in keyof TParams]: TParams[key] extends t.Any ? t.TypeOf : never; }; -export type Breadcrumbs = Array<{ text: string }>; - export interface Params { query?: t.HasProps; path?: t.HasProps; @@ -40,26 +36,12 @@ export const routes = { return ; }, params: {}, - breadcrumb: [ - { - text: i18n.translate('xpack.observability.home.breadcrumb', { - defaultMessage: 'Overview', - }), - }, - ], }, '/landing': { handler: () => { return ; }, params: {}, - breadcrumb: [ - { - text: i18n.translate('xpack.observability.landing.breadcrumb', { - defaultMessage: 'Getting started', - }), - }, - ], }, '/overview': { handler: ({ query }: any) => { @@ -73,34 +55,24 @@ export const routes = { refreshInterval: jsonRt.pipe(t.number), }), }, - breadcrumb: [ - { - text: i18n.translate('xpack.observability.overview.breadcrumb', { - defaultMessage: 'Overview', - }), - }, - ], }, '/cases': { handler: () => { return ; }, params: {}, - breadcrumb: [casesBreadcrumbs.cases], }, '/cases/create': { handler: () => { return ; }, params: {}, - breadcrumb: [casesBreadcrumbs.cases, casesBreadcrumbs.create], }, '/cases/configure': { handler: () => { return ; }, params: {}, - breadcrumb: [casesBreadcrumbs.cases, casesBreadcrumbs.configure], }, '/cases/:detailName': { handler: () => { @@ -111,7 +83,6 @@ export const routes = { detailName: t.string, }), }, - breadcrumb: [casesBreadcrumbs.cases], }, '/alerts': { handler: (routeParams: any) => { @@ -127,13 +98,6 @@ export const routes = { refreshInterval: jsonRt.pipe(t.number), }), }, - breadcrumb: [ - { - text: i18n.translate('xpack.observability.alerts.breadcrumb', { - defaultMessage: 'Alerts', - }), - }, - ], }, '/exploratory-view': { handler: () => { @@ -147,12 +111,5 @@ export const routes = { refreshInterval: jsonRt.pipe(t.number), }), }, - breadcrumb: [ - { - text: i18n.translate('xpack.observability.overview.exploratoryView', { - defaultMessage: 'Analyze data', - }), - }, - ], }, }; diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index 865c80ff0f3e51..90203fdb6b6eec 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -17222,7 +17222,6 @@ "xpack.monitoring.updateLicenseButtonLabel": "ライセンスを更新", "xpack.monitoring.updateLicenseTitle": "ライセンスの更新", "xpack.monitoring.useAvailableLicenseDescription": "すでに新しいライセンスがある場合は、今すぐアップロードしてください。", - "xpack.observability.alerts.breadcrumb": "アラート", "xpack.observability.alerts.manageDetectionRulesButtonLabel": "検出ルールの管理", "xpack.observability.alerts.searchBarPlaceholder": "\"domain\": \"ecommerce\" AND (\"service.name\":\"ProductCatalogService\" …)", "xpack.observability.alertsDisclaimerLinkText": "アラートとアクション", @@ -17243,7 +17242,6 @@ "xpack.observability.alertsTable.triggeredColumnDescription": "実行済み", "xpack.observability.alertsTable.viewInAppButtonLabel": "アプリで表示", "xpack.observability.alertsTitle": "アラート", - "xpack.observability.breadcrumbs.observability": "オブザーバビリティ", "xpack.observability.emptySection.apps.alert.description": "503 エラーが累積していますか?サービスは応答していますか?CPUとRAMの使用量が跳ね上がっていますか?このような警告を、事後にではなく、発生と同時に把握しましょう。", "xpack.observability.emptySection.apps.alert.link": "アラートの作成", "xpack.observability.emptySection.apps.alert.title": "アラートが見つかりません。", @@ -17319,15 +17317,12 @@ "xpack.observability.formatters.secondsTimeUnitLabel": "s", "xpack.observability.formatters.secondsTimeUnitLabelExtended": "秒", "xpack.observability.home.addData": "データの追加", - "xpack.observability.home.breadcrumb": "概要", "xpack.observability.home.getStatedButton": "使ってみる", "xpack.observability.home.sectionsubtitle": "ログ、メトリック、トレースを大規模に、1つのスタックにまとめて、環境内のあらゆる場所で生じるイベントの監視、分析、対応を行います。", "xpack.observability.home.sectionTitle": "エコシステム全体の一元的な可視性", - "xpack.observability.landing.breadcrumb": "はじめて使う", "xpack.observability.news.readFullStory": "詳細なストーリーを読む", "xpack.observability.news.title": "新機能", "xpack.observability.notAvailable": "N/A", - "xpack.observability.observability.breadcrumb.": "オブザーバビリティ", "xpack.observability.overview.alert.allTypes": "すべてのタイプ", "xpack.observability.overview.alert.appLink": "アラートを管理", "xpack.observability.overview.alert.view": "表示", @@ -17337,7 +17332,6 @@ "xpack.observability.overview.apm.services": "サービス", "xpack.observability.overview.apm.throughput": "スループット", "xpack.observability.overview.apm.title": "APM", - "xpack.observability.overview.breadcrumb": "概要", "xpack.observability.overview.exploratoryView": "調査ビュー", "xpack.observability.overview.exploratoryView.lensDisabled": "Lensアプリを使用できません。調査ビューを使用するには、Lensを有効にしてください。", "xpack.observability.overview.loadingObservability": "オブザーバビリティを読み込んでいます", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index 0e98aff3f4a361..a41a4cd7e5ae12 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -17458,7 +17458,6 @@ "xpack.monitoring.updateLicenseButtonLabel": "更新许可证", "xpack.monitoring.updateLicenseTitle": "更新您的许可证", "xpack.monitoring.useAvailableLicenseDescription": "如果您已经持有新的许可证，请立即上传。", - "xpack.observability.alerts.breadcrumb": "告警", "xpack.observability.alerts.manageDetectionRulesButtonLabel": "管理检测规则", "xpack.observability.alerts.searchBarPlaceholder": "\"domain\": \"ecommerce\" AND (\"service.name\":\"ProductCatalogService\" …)", "xpack.observability.alertsDisclaimerLinkText": "告警和操作", @@ -17479,7 +17478,6 @@ "xpack.observability.alertsTable.triggeredColumnDescription": "已触发", "xpack.observability.alertsTable.viewInAppButtonLabel": "在应用中查看", "xpack.observability.alertsTitle": "告警", - "xpack.observability.breadcrumbs.observability": "可观测性", "xpack.observability.emptySection.apps.alert.description": "503 错误是否越来越多？服务是否响应？CPU 和 RAM 利用率是否激增？实时查看警告，而不是事后再进行剖析。", "xpack.observability.emptySection.apps.alert.link": "创建告警", "xpack.observability.emptySection.apps.alert.title": "未找到告警。", @@ -17555,15 +17553,12 @@ "xpack.observability.formatters.secondsTimeUnitLabel": "s", "xpack.observability.formatters.secondsTimeUnitLabelExtended": "秒", "xpack.observability.home.addData": "添加数据", - "xpack.observability.home.breadcrumb": "概览", "xpack.observability.home.getStatedButton": "开始使用", "xpack.observability.home.sectionsubtitle": "通过根据需要将日志、指标和跟踪都置于单个堆栈上，来监测、分析和响应环境中任何位置发生的事件。", "xpack.observability.home.sectionTitle": "整个生态系统的统一可见性", - "xpack.observability.landing.breadcrumb": "入门", "xpack.observability.news.readFullStory": "详细了解", "xpack.observability.news.title": "最新动态", "xpack.observability.notAvailable": "不可用", - "xpack.observability.observability.breadcrumb.": "可观测性", "xpack.observability.overview.alert.allTypes": "所有类型", "xpack.observability.overview.alert.appLink": "管理告警", "xpack.observability.overview.alert.view": "查看", @@ -17573,7 +17568,6 @@ "xpack.observability.overview.apm.services": "服务", "xpack.observability.overview.apm.throughput": "吞吐量", "xpack.observability.overview.apm.title": "APM", - "xpack.observability.overview.breadcrumb": "概览", "xpack.observability.overview.exploratoryView": "浏览视图", "xpack.observability.overview.exploratoryView.lensDisabled": "Lens 应用不可用，请启用 Lens 以使用浏览视图。", "xpack.observability.overview.loadingObservability": "正在加载可观测性", From fd5883b4654ce574837f79c529d38b5f976232e8 Mon Sep 17 00:00:00 2001 From: mgiota Date: Thu, 17 Jun 2021 08:28:34 +0200 Subject: [PATCH 41/46] update readme of logs-metrics-ui (#101968) --- x-pack/plugins/infra/README.md | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/x-pack/plugins/infra/README.md b/x-pack/plugins/infra/README.md index 5bff47e7a55e14..9097faa0aa2b56 100644 --- a/x-pack/plugins/infra/README.md +++ b/x-pack/plugins/infra/README.md @@ -80,17 +80,16 @@ life-cycle of a PR looks like the following: backported later. The checklist in the PR description template can be used to guide the progress of the PR. 2. **Label the PR**: To ensure that a newly created PR gets the attention of - the @elastic/infra-logs-ui team, the following label should be applied to + the @elastic/logs-metrics-ui team, the following label should be applied to PRs: - * `Team:infra-logs-ui` - * `Feature:Infra UI` if it relates to the *Intrastructure UI* + * `Team:logs-metrics-ui` + * `Feature:Metrics UI` if it relates to the *Metrics UI* * `Feature:Logs UI` if it relates to the *Logs UI* - * `[zube]: In Progress` to track the stage of the PR * Version labels for merge and backport targets (see [Kibana's contribution - procedures]), usually: + procedures](https://www.elastic.co/guide/en/kibana/master/contributing.html)), usually: * the version that `master` currently represents * the version of the next minor release - * Release note labels (see [Kibana's contribution procedures]) + * Release note labels (see [Kibana's contribution procedures](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)) * `release_note:enhancement` if the PR contains a new feature or enhancement * `release_note:fix` if the PR contains an external-facing fix * `release_note:breaking` if the PR contains a breaking change @@ -100,14 +99,13 @@ life-cycle of a PR looks like the following: to unreleased code or documentation changes 3. **Satisfy CI**: The PR will automatically be picked up by the CI system, which will run the full test suite as well as some additional checks. A - comment containing `jenkins, test this` can be used to manually trigger a CI + comment containing `@elasticmachine merge upstream` or `retest` can be used to manually trigger a CI run. The result will be reported on the PR itself. Out of courtesy for the reviewers the checks should pass before requesting reviews. 4. **Request reviews**: Once the PR is ready for reviews it can be marked as - such by [changing the PR state to ready]. In addition the label `[zube]: In - Progress` should be replaced with `[zube]: In Review` and `review`. If the + such by [changing the PR state to ready]. If the GitHub automation doesn't automatically request a review from - `@elastic/infra-logs-ui` it should be requested manually. + `@elastic/logs-metrics-ui` it should be requested manually. 5. **Incorporate review feedback**: Usually one reviewer's approval is sufficient. Particularly complicated or cross-cutting concerns might warrant multiple reviewers. From c75f369536cb9a9b7cd621365fd2e29fda3d6a33 Mon Sep 17 00:00:00 2001 From: Joe Reuter Date: Thu, 17 Jun 2021 09:32:28 +0200 Subject: [PATCH 42/46] [Lens] Docs for time shift (#102048) --- .../user/dashboard/images/lens_time_shift.png | Bin 0 -> 133407 bytes docs/user/dashboard/lens-advanced.asciidoc | 35 ++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 docs/user/dashboard/images/lens_time_shift.png diff --git a/docs/user/dashboard/images/lens_time_shift.png b/docs/user/dashboard/images/lens_time_shift.png new file mode 100644 index 0000000000000000000000000000000000000000..f7edf80bdd0d6ce3c1f13dc637aba97d0ddff277 GIT binary patch literal 133407 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%0D@X=s_dn412YBR=oKGbCjV^m3Xc zWVRwuknu0vkb|~oq2AH|#oP4~%Qg0~%eYJdvXaf@*oV^l}@R{`ptVFnH0_jTH&H9Z&DZ@Sx0FP=!K#F$uEw^>dKo(DcPh z=Y0JuS2a+vgFzArpKsl`>zYE+RKmNfPk6gxRrC3f`kya3HYKBV$M<@mgG0^Jst$*Y zu<)KamB&IcRCtO1#Buw&p5I|m*j2B_CCTB(>O$!d%pcMUy2D$P{Du!YpJgS)91@+a ztm$r>n*J>uS_^rn44dR`n07dfi(aTR4R$D5xbh`Onx+oPO1&G>;wTN|dSO~4FR;Bv9j)D)X$WN@>>#KXI4)05v#(fGuigF` zngkJ>vE-q`bxadg1b1u8WIsC;>1n#LQqypkCqWSkpWnbtZHlRuX>Nw+xK4^g3y6Ff zL5+@PQnf{K;Gp7uy%uAzgzc;Gu==&10M*@UQw!j#*39iRtf1PUj~<)D6E)h6fmg&I z%%Pr@6@Ak7cuN>*-G;l1N0Y-5gcy)c_sELO02hMEfFYaO12fH^v5qcR?l?IQuKw@Eod)K@Z^KHGC}Ws!cPj2OEmgm2%gaD*C}ft+ z{x-pKfx%$c!to~41E=S?Z(hr&6yWN~WEACPdTYk)eoau{sx#9}OLRIs*uxwA*oz;q zeNw+W1}uac%gGKkr;Q;?)NG6EcV7Wr)?(TW3!+jcX7yAh^EtHYxXGri$?xn z6WwIOarEPg-kyhT#pSs$v+25%)bE721ZxZWS^#<_G9tQ%eOaRRVv(E_c4m}gbZSI& z@b@Pc)gx5V9api%f`VX=NMGD84^Whk@|5de3_7dYMX>|w&o!fOEJ;ImR|T}Gl(0^( zLh<`B3wfrUxj$qDw{AV3?qCA*IJ;hcB0>wtLG9kZs873$Jrwe++qSv;zIgK<;dUUl z*Q~zAZuUj+Xs{`pA_JG4Pv=RicZQt@GhQNvK+uzA$ejD%73D1UJzSj-%M08FFH!(3 zmtv{VJkv;a!F<16O}_}(R)s#BMo*^Qn;h01Gn=2h-Jfr%{U)UF+!D zVT|k)QiACd{SI#+`^}Q=2VUnaEJ{?zH|n34cf92>hd5Z!j*rmyUqf|I6c?Uh`BNGd zU$PkBY|s!W;cQ*E5xvat+{+o-bUah!Mq4gN?y1rBlqhU(Q6Or1NIqMW)TR+{t~+2X zo}#DiUCuUp9*jtHC#-I(6_<<3yj<%{!hJxg(1pc&i8Mpp+Eo2jw!Vv8My-Ep)wp30 z;@&PTxLz0Mbg1ATeHXnO_nSYwcg=;OtO*B4~vA*p*kg{dnEy&+$lzlr9aV> zU^rU88m6;IwrLn@xDm$VnT9}KutjL2Sq{Z(OJx!skJDhKO-{>2w%WJK|PHT1q->gN29U zvBR1zT4~Ax9-C^fv49+#|Rco6qOb@xkCGE}*((Gt1W3u`hv7ZkSUxGACuu*F79H}&I#}TSF z4btzR4r@XdFOA+9+@0QLGG#2MJWNN2zc{?>fr`bwk+I1%?| zw_z{vt5tO^HxJ}8t}}|p(y!Vq?_y~BUP#t67fX}pd31-*8J#1V@+7S}s(14!fW}uw zTVCWYZVxJCoTztoHC3Sz8U<}QOAw34CPz?O+r)lV>TLtC2YhC`Fw zFIfZj9~f^Q{il`uo-5Fr2p=0-p~!geX3F0cLVVb~6%nELFO<%VP+=Eml0J{paf4tC zh8^{7EmrFi&y!kv%W&y==G^UYt#aqm$1`(*f-+u2O#dBz$Kxekf25P$&?e)sqKQT$ zd)JrTSws8p(K0*nbeR<$Cj(4Ee}A7viS*3aJz?EKG}SJJ*EpVMw*P7;-qOBURsh}P<=Xp;tW^sxKq!bg_ z!_~tN{kD-$m&j@k6K|nq%5l$eT~5sz5zZ}zE}%XiW_XSF6k_$YX5%Ou*`_NY%KGG# zNZveAUKW@O-K|C6d;dv|jj+2FTQfWKh9z;d4&=IzD8zz#7sko#=)`e zZH7DML&v$jX<1=Po#Zzi2YBJ$;hc42ge_aJBp-1Gs2*VYR^nnt91hlRoNZ8{ojf>zBnixo;yJ1qj+7P#O|j4=-`)dlSJy&T zfGye;sL3&E=<9^XSb?XnOC-?4Yb8VVxWkXf2eQ>4a8+^Jx&z>`gBauM1ogja@D%zk zt8w=5v0+7bGIbE@s}>_e=%(LdmNNJK>W#KmglY)VSoQhTQ zgymF7a^{u)XO0NosMn(0pa|RrQd&WK&sem!v?uO2WE$mB0%ljvKxu=PS)OXSaImPX zLo}|Q8U7sR{r_R_tD~y;qHq;K2@#N%ltxNGx~02IxLT6UEiK*M-5_0;F6r)i zbNv;*zu)`g#agpmIP2cIXU^<%X76u*``hDvM_3SVZ0)(bHVqAn)6hqPs;v6Bt^+Aa zl);ZIxk^l^oO>T-5O_dO5_&D| z8pK?3te%l%rSBtXLNzBTc0Hu**_y3Q2>QRw^7stazY;eKevztqG&S7EMi?;^ieww% zjdR|YN@b6LF`rQXITQzp;F_K2MXMH1lDM=}_aH=#yq5oo*4t9C?S#smd6k{OSQ?}` zHnbZ;Hm7kDeb{&Hke*(zdy1itlUMGCyzGiRp8w*vH5h4lO?{|Grqv~Y8F6kH(-)q0 zc{d`C85nMPf5^u0#B7|$hb@oVR~}sYCF+QuPOGd0^{P{gCx7$X^iN50kJ4@rkB~_{&m;X=nnjzYOi~6pdxc5Vh`M~QpamQO+Pp;YRHWr6ITnvAh=is zzt>y)$#;%aYv#+Wq@I<_RFkO@75kQ)XC>{=>y}@%5)&7Z1wY9 zf+3{0ly7IOUVXudIrSBy4VUd3g>~81JL}vsb@lfQtq&)~VHlbnUylJe*v_y~bjnIv zYtm$QQb}Qp*$*gHK=;Ft-XzDg&c$~M6q_-f{dIT;uKTxwlo(d*1!p-@iCdF8zZE)< zQQa-IUhmoXv3BBtdN*E}Fh^BNgXRe_a~Zy1NHLHfws@b}&@2>hjV)*vqLK!;Y~D2? zVf1oSy+#Nb9Q6*ySIojgc*b>i2JfgDy*=PJkGYbeXGJVwT?yl;?JYuu4|GCfxNgr>6x?$1P&TolZKs7w#WHX2qZ%wb{%mMqQ8<*%8k)6k;3zF;@(R@fnZ1s5;d}kGZ0H@V60|50CLEOERt1lDan#BNHgATwm;M(KdPAT-6*k_jsk|u*&Me zV}?X)yn#Ai;DnO@_-b`XwO0%tS4WoT;(*cndNZk%Lcio< zxD7pm&Ygu9$T&~`qbld7Acfx!k&mrG{+9u?>1OfVPQiFxOHKunsRrL+Iv?c0J44Oa z*@l^Gusc1s{y6`+>R_4@hlMm-W)`8lt1oy;Od@wdC9J z{mgjq5FG`H!GjX|T7o81rm^b5vte`0$xBOJ#?rBDm#r20AuJ&&QR`m5C<3*^vM2qQ z08}C_!vgqCKxiJ`MAP3dpAp+%CQ0c!O%)qrbA2#FvW8<48u~jZApZuZ%>VpsL{Su{ z2T6~-uPZoF0~6EvgUqz^*)Jju#gR~d(W|ecpVyAXeeyd&5fbs&^*O;}=>7eNCq5#k z5?^RT=Bpxwp2Y|V=a_*H6-$lDNi(QfzN5W}|Lrr)NPPd<$}en|Vad#r+O*Loa0ah9 z>0EeWkHd}@RW^rEx0P)Nu83c-Hg}XH$%}R!+i$mCI)vkc?dZFvdX0&0e~Z1>e(K$M zJ((AJQROO}1WT(Z)+tV^_z7j63^)Jubp4h-uG#NHjUGxK({(!36t-7QL2eO$)`TF1 zUoCcZ-R0=h zGf}$2{Kyy@HKiry$c391v(r^(zPQT$u3K_hB($`XT$Iipn3``)Mfc(;V@nyFhR^JE z5|)9@^7|8Hzfkc`6=ci%T)}9*BfdLlm~nUmL9Z43H?QRXf@J>wH;e~%t!ice>_sm@ z5UUtudHj1&SOUN>W{vm|>f`F9o=^zl+@0S={}?YuV+G(_1Tg6)+~c!r!Vp||RdF@$ zF{%rX3n1Ar`w=HzkIx?24h^tM?xsP?m*#HV~d7$%KOJ>K@ixSN0TWe{t?{#y#?j_ zislk6n{?cxvxGblaGRj`P4{E*51AzZucot%O(K7MHjDs*^M@)2>ph;x|6``tof?JJ zPE5ad6rI6p6m6!~#35!DD8vM2zJ~^Cq;^8K282PUN*hV`uz?#A5)!jhT>C*?c4PC& z(~@qcZy$_Rr0X2^;+{2@hyoVwA+eML*W42jZGsC8WWB=O@0@e|S1;nr^(S|)q-r6H znT`KNrYbox44KrmA_(`QT;2eDskL_CRxb|}r6h!tsQ?!K4ca;x0wk+do5cdOk&SDA zLuKFmse(udj54TLtfUCM8wQKAZL;tSH+fF(E4+(5=@1(DeX=Mw5)gVLt-!oy5H1*E7Y|1LTU$&2p6r#qwg; z0D$Uv?v&?rYzt$i$<Qci}LY+K{TY$g?@MJ8>7bg@4n2?!al?$5zpraf@$#UwI)(I%jjZHTK6rR&XC zDz+lCF&jHNSajnRix#sSYW7Lt&+s|Rl6j6O);ydOtB1?*qZn-h zbnCJ7#AbumvTRvxezU;*o@j_Wg#)X5)($B6yABRftdWS98)AK*QUIbqtPa&iso_!1 z|0J03p@?o;TC&P)?k%KGedP{IPxhc%rln~?6qWp^*{zdu`@%Om`75dcO-Emii-)l| zO>R9lJ8O<2lXe-0SpNoV)014)cZ{xgeU`5LH-GJOIVbz^U8=Q!z2&mRMde+|fbIw5 z*s=1gR|L0s%byCzH*>-#@~42Vsv-9Fl8GBw)g)n4&~gtv^u@xlL-$tCKqq^lYbwVi zvhs+iTAOq#y8^Giq(6*lf_mRK)@B8LV*{-eGo0t7N-{YhJP1o@U*C7bS?^86iX_i6 zCF{vd8V-sE*e_vBcAVpJBoiF3tgMbIfCJHKwvAo{>}o6acy@%`d)U-yPtTZ_aydm_ zFX9~3yCy!9S+XMbj-pK_tOnZ#3(v5ux0$t?1FHN(K=bfWfE{Ld&(>`QMF$J&#B1Qb zyEWPTR0G50ezZJ$SAfJlfXM1>`S7w?eR>bV=9GC4+tSzx_Drim`bohw+;o_i@offr zGS`Cxw4z^oo)@?-!L&48W+k6KC#1gIMv3Nt#SgkQN|(5G4A787Z#84ExYuPm9f&f2 z)wLPU35rk zA8vmSv--_f(QhrVwtzwlf+pH6l$5;}{tfHpL+)_j@p>OS_v-yMxpaWU&7Jf`gYl11 z{LGqzh4O9#ubtpn!UhT;cglFHUC?fG9X+*R7ZUGQwN;Ki+~$8>PmgLt zX8mxPIQvI=W$MxTsR2CQGql%!Xi$`u(<0ca?A@huG;PIA_nPoo^IER0ZKTKRQ;Rp{ z26YP`JfiID2{mCg-FEneM=DO_#dErAG|~mEDnBdOCtlf{bF!F`BYW#?m65>UUeTz1 zkTu~S&GO7z$~DvyO{lfHd4TS5Jto@ z-uSIP28|3m-?J2Yd!2ZYBQq;W>VoL9GcUdNGp(JBs*|}V$8pUt1A^=dQdDmA=SQZl zY;5CYXt1cWf5DZ{1`?FU$X?^=M=iQ{VDaMoEDn10F`W}PN#UFN4|&7#!;LE{H+P7Q zS3|<)Dv}QX1)6vkfv!26=IGcHD;}iX(N@l$w8Xh^vovPu`|L!1hpq&QQIyaZZp|c+ z%w^vzWoEw5!1o{Dsz zn~m!p2Fs)E)07+&e=eoDt$MW&l-wxb;989SaIY|#`)EA=gA6vur&BO! z0=n;p$Y8Wa)^$uF#KH}iW5jBX9&b4-Lv8cixRr9<AW{enLidqfhD~>sI|inF z>hI*^A?i0>*s0dmXE$P3#|F^mI5iH5&OA{LE;BgO57cfGEv^(TT>*hmmwjyCwdg8m zr>w#64Tn_;#|&>NWzcNo&Ua_X7eNn^b1-1(Ar6PIaoMRzz3!0yBu9kt!wkPBG{(56UP{MSZ~PXDc{wbg~^eLbC!h9!-Eb`H!+- zp7W?|96h~%*vC!lmg?Em0`1g%(oz56b_BEeB`<8%IvQ2aAdw_Y73%7fRd?{x0DGnW zRo_IJ^94S39(RC-BISqCro!uN;qD%CV>WsZoU$u@ctLCo6XMMjuAg=md=e)>y!C7F zD6X7W0iYs7rw$Mvl6K_qi$vY0rlNIfWc~ovF)trowPd?eJ!qha?OE`WVnLPdtNZ_krgY z!B^hlmyqZiGaCPq@*<w>ZDg+4jgpq~TPr@f(&^A$E7; z)^w8m4%6gJeX9KuYwAyB1AEWuh^tNy=Hw6gYd?BNfDLz7Nhk1LfFi$^x=(Lf#P<7t zAVa`umAorR(HJPI?-WOFvThM3fJzl{u^Rd%@Tr=Q43dM#eToGGlzK?vPcBZlrvPlfSa`PWYe02>oqoqDpM%%Bo57*gr+Yc$L%w6hj>vvlGmINE24>N(m4jT*D_ORZ<8CO&S* zG}}nHmN5gDdQ~@29grU@qmryGGYaE=_fdrN!63YpdCf#TuHX|yah{WpiSbHpIPPB+X zA$Hv$D4d(`B~HFouhFCtMiEj>uMX{8d3y_m}7_Av4_Wv&X=1a~kkYkIHO zU%L9~c@#Ke;B%r~kM7g;yT10bh05_>2^sbTD%fJZ5n{91L?_%J@bSKcIs?ml6=`Je zCp-t$5++-7V${r4JV>(r(XH`>FvusW(lY6SH(=sA}AjW z`eP(>NfPu_=gsHv<$^{gH#3?fl_SZLtUh_)?cpf@tk{lUt=KZ?VmPw?buMgbVg|7vs>q$|gG-Dj;^dX;w>? z4!*a(+=Vsa{D`faeVx|6obmc{=d(URDk{Ko+fa&+E+|N4wHmGLSk)GGbw5PV{DeRC zgQoeGokqr}d+X+l3+*CX@myk{<8Dy28D66kg}0zT^S1nlP1IF0a-J0lOdh+&(Hvlw2PE29W&RnD00L z+F-`EMjEa%RdR+mlqo|L8rd#NRaq{9t;-->EqdCL-n*Mdb0(mWoKcz${}-ir99`i( zagD>Ab*DkQJT<;P0gF*hcBb&|IZF9UnmYI_wcV{d#uj-@H!oAj7UVUC%@Npix zoTuDlmx$!$BMvJ@cNnl_f$Hy`fAbk0;r+Dr@mj7zw0%7_n(J)|7IM@IK=L;hNGMhp zXTBY@(sTFbtcMAIDz?21B5S}Z*q54?|7ueKJCv9F>cLP zn#5(6*J;#r@*OUlK5Hu+fW(1KWHO5vqxbjSTCCwE9#Zf^kN7OrHglEZ1f{c=9i)9ih}dZliGOUmL4Th zDlg%m6U^1&6>%PqG&L^3ZrH&jlQ%IxY{ti~Z*6Ku8>T#@7ED-1h9xjHOhKFYK*NFA zjtZD`n@g7GpVL7JZ5ZpbJYc;dVB3JBGVR+~i`h?L6OA=9jOJ}p0_Q6iuB7lp$u}Ed zvy>q5V6Vp(YR1i>{o-4!o}d*z6-c^b?tlzUddiejGpFUFh61N%i6B*#5o&3VNn8u+L;C zFCm$pp~rdA9RKDuiVu+sj1RS1lU(}}2)PO_C?mAXh{a=~ygN8`ZIb1xCy~>jP8()C zJk^b~yztxeY>A&3d&I9AP?E^^M^x%NdNhMgPmXdj28#r81rd&p-eyg#XIZuXw1Im| zK>tdu>Wdf9zVZI&V4MCjZSq|0jYt%o*5rKmBFv-){XT!mY4dqk{l2nAwe~9#F)}Yr z!pVGkqk{!kwx0-zB<=;Meyqyz%?lUBABMLd_VJg!?2UgM4X1tOx0H8X^WRMFjDD9_ z|8gZd@lbyGO~<<&o}lEV>#|U}{u}+|HOGzk%CoKp@k9Ud6hiMXB@i7pwUd`0Eph`V z_+eNWs1n;t;i_rA&V1q94bOt#q3+8NlITN2Gj6!()c)H@O)bdtv{awv*TZ;eF2 zwvyzgME!yW5YidZayxi8dTD#tF-EtQt~5f6*`VMhUx7l4NQDhbqZ;KqWPr+-G}Aak zLb6g>Vlh1hLG8^n%4ZYtO{+t=nts$!u-y*82DWw;yI^~O>8wESw7M61N~QC*(Xgxc zZSb$?%u%Oq&>1?WQO)8Zsz75_xgpY9_foMRvXjd(SE0TsXai~NdFF0gR{?M))|(-F zOp`bIhBB-yoW=eA@u&`80_^k1|M+pkW(5icorf@O5T^JYkFb80}t&r7!?Pb^$(vPygRGm}O zO2jvRzM0C{Gh|IBwd|&OS)Q2q9G-WiK?c+LSe!!x8Ey}&bs9zP^<>ll>__QqQgvLN zC>-`oAQ9C>MA-JSiHH|?ts({5=nIuNf!XR;NOD%nPE0e1$SbLu!E-z8iktqpgv^uDO5%TY+!;Z}6>Y?Vr zy!DQa>-ByU3Lf6NQfS#|Plxgo;(NWG;!jy+V7nW{IxH;>`GNU1x*H)y6+p6Te*=be zg$b9w3AvqOxw&~I@F;jnlU8tL)g!OYkyISb28xci70J-cxDciL-sys72vfOQmmQTf zVy^q$vi1SynvR_br?@BUDx34L2C;4Q?C1NuA?_eUmPN}fkn0{Q*7VcZrx*9%?~h#Y z((I_B5NpSv?IV&@DWW%h?{<+!F)dTvYEQ^o?MjQ$G1}6@cu7!x*M&5wY~)^&XJj(P zeg8ol_tVQ#NzHCT_EuU|3X_T<@N!8d0*}WCZqss4kEwG04VM9+3-r2}WsJetfUann zr0~YMCQpi+8eL@^>W-M=_0n!a(ZC$imk|Q<-yqqsSZ9x5A zixKaWrUgq;a3K{b!Ot5g%_XWRy5ge_y)nmO@j8pAf_WE3nK)=-Szo5Wn4Tdse#=g< z56(3(?86wzJJ5JX005S3$1MZ&vgN-2#j|Ui@}UWK^~$mfdt}IUxZpha;}+hF>%}^| zdY_s396h$Iiz~TVrC#3l=$sSV{iXai3_E{t{)JNwIUrCZb#NvqZ;3F4%es8uWO$)T znYHS{VHlQZSaZEpVm9}Rt!R}(BQL7yhnFVF#~?Y)gP)~QQ`7tXQQ~_CFzc-tQ}FBb z#WYe6WRxVxA-pc?Up>FbBp-m1u%h-h5VsfmC0~#deY8S)gLMLUXOM$10#0ARDs=5+ zX&U%1;5q|z`+;~bMmJEwp9LKxVQ`T8h^N7de}D7u?^i=IOJ*y(e@PGibrQG`AE5z7 zjKqhwcYkNiWPZYGTQ{o0(oqnJ^R2d?00B&oBXB{R6nf{sGH9%baD)m6d)4X=Z&I+O z{ehv$!TnSulPiAN{g-CrKSeGWK$;HYCE4TD9ptkzR-xlm?N)!O=s{A^!0}BG=yw3) z38a1gP0|4`A_d@giO>2h)gNc{NVI_@n|Z5t#G@1&z~+wz(jg*^47iw&vUE@2RDcYm z+WWXai%mpGf!y8yd&4Epi2(9TJ<_OT{Xm+*IuD`hH{JK|xwT9{^&8qbQLFiqE0Mx5 zk0+ERhQ5~c_HO>}lmv8dkVmar*G4njpsKe8WKQZ+WBt!|So#8s8`fXyfG1+foct|UvQ`&_%fDGEe;WudJFGxv{y=dI40oZ;rQW1^=xB=46_|S=)9RUY ztl3<};jYbZTHwD%Kgti`H}H8T0U4#2_|wAa>FFM?oR2|QXDq{@%)RjfS;_nRY7T=t zpJ2KA&xn+tDnv37!&m<*g!s!0dtN{jjjn)hFRg&q13C$p?`Hr}-g%>#{v9YdQgM;7 zF2vl5%`o3(eQ!;RKk}12%@;gyomu@r9Ge=m*#eRC z`EE3Xg#x71uJcI-6PO}^iVGzp6p55%!>e4RUALGh1wk+!5Q0lGn~B+$Wn^R+Twd`f zo!;NQSerZOs_pazn4j+s@AWV>EJJq3jsc$i*rMD_y+i6M(qfH{YwoAYvbnD8LH{z_ zEiqLfHHFJ+DU+v^OR_gx6~$g@QfDBcJ2-pBV0KL~WZsZsQsduzeu=}9M>m+j%plpL zym(LH`wHLs-1%&mDC_lW{jFp4vM(bHfD}+9Nc0D7ux$`f)mW${8nFQ5K&2*urJ2`E zqgE}tHJX(vc+v&1Q5h)}euT|2L&{M9J+_FEO9MF2b~gdAIF1-g zw5>OeR>{{QrG;Nix?3Y$9q$~hUz^ZI&sG|fOuYsg*Cq{IYd6)qoleu&9+x42T}hbp z+PF7vQo#)&dusJY6qDr}UfUOY^X-b@yYB0=JxXb=n}DT2Pm~HSApc~2&*quwSp`Yw zVBd_9*i6r?7(lz8ZjT5)Kiyeps{*x?Rl7ArdC7wfOq} zv?KAh%s`9-zH~;b#L}OzBZDS2^tx+4IFO3kbDW2V@pv}zpdP-g`Tj?7Q)KbP@t*SR zo;51DWbcv6krwFAQ`o5b<^@jB2~aOnQO>nBVKNCOOtTK5gy<1#hhE_cB3?a z1#Z1FIK{dt)A$KpI-f^6VS8qHKY70X0#;Lsw)T*-cIO-?NwmW-3FVqGp(w`TeL>bf zBa5a(t-A9BsYlIqmBck^89CaV9>g8~=M6^W%`37R5Qb6-$o>Tp!NME@76>o&COcg!>$T^|9~Ml??DdZMN%R8U;{2O3j8i1^G^g=~~Y$uk7HKccuvGbLs{6 zn?g%(7@YT^*sNB(>ZV)_%O<+(V;JEk279!jChs`R8#T9+RfSz=BfHj-$Y&~ToY@?H zJ=sKfHna@X>_&^B^Y05Bk`IfvR$lcd6K5I(lF8M|32rS^W-#K{OV?n|yR<9HRZGzr z$ut+K+aFy?nS$gudPXw-PQd?tSA=)aL{e711ortDlJkt0g5F+6tcUg5_K{yYAxDqK9 zaNg%_I)?S#jFI0S>fKhd_e?^VIjSy-U;`af0G_{XeS7B5Bs7X$IMP7px{{mjr$Hk; z593yj?3-Ru`1^&n#MQsdH32Vi%Jn* zbx3k1{S91KjNDVIJ`6g1xy(Iu{XM6dXrJhLx}&27`samCYUu)Bf_|iqt)7O4L&}=} zKEf8^yc}K*w=?D|lzN~J!t^l#Bcp4!jf=cDo0TvObkk0TB+cqmKS32?Gcvtgvj8~X z^+K$0N`vwye7I8ye9xSm+c?sntE(?DL@4_EhlrNLH4AbN!q2D^a*b#oI|a?S^qGb{ zvN{i5flpw*E+sF3Buz_6KJl8{?$ao=WK=83Amfk-2N`P{E%zNb|M)DfR7$0dFbnVg zU<;*#`a-&~?^W$*D(wK4vhn50XFe5f-36Dq9yrP*(`D z-5(z!k)H<@9L<@f8Vd*-0m^IRQ~r_YK&x(s>l=-Baox1E@wM?>`QwouI(f8sE<<Q``S@gxtqccst(hkBrC;8Gr9$`g}aTrF$bq>>)0ix@h}z zLQX?XsZetVzpY~`kd~FDbFKHzI9ghK38@(<+^ohT%Y37?ha?;l;rw8&R@d~T2662p zQ6KyStV0?qxl~<#V#0pwm+m2r&k(NKzb>6SED3UH5rek(PhTPA`;m}N^KNGr1CJ_z zIb&0J&id-&javum8l7g@%fym0hXZa%!gJrsi>+bnnhNYHk)Hg4%~0=0eX;?eY+VJ* z%21o2xZHTk`3=E7f=Gbp9~G{Cuuv$4HF~3lKsB5Ew|D8`O50QUi9|dU&qgFnAI<>T3$!x( zH$Nhp31>z*mp8Qx7H$QHbVX%;rS({hQ84EArg!%11Jng`l!8oSu*Hu!w5 zdI$T9($_mn?yg|hg1P`jMPkt*9)~a-w}qe`udE6OrHeGcdx+!zT~PIx?+z3T5V~_J zgEKPH&H<{Pq{l5sqzH4g!X;5gmK_aX3l_YZ~=tefy-{IqRdW1hTf;FVB#`*6PSBI zAWWeZ>NS#t=hxfkB($BAZ&p38aP83VW$1?x^!2jd{vhJ=k|;u^%xjahBdF6YL{yTz z+0To^t@`0Kh~6ch^M+Wz`_WFt2X$m+M3(}T%*=yM4d-8XFW+rhKZa` zU8DY^Q{VJ@{A1D}EJ}}!a{N!3xWC&E{Id#SA>2n+hJino1Yn7Pn8<_nx$i&SBL5ol zGDJUL*asrR_1}Ta2SioEKRcHonS=ihLI_!Nx##_#`x+61rv_Vxh5Pt5@&wKcU{!MA zVsAX=fQIox1EC#0AEqb&V=tW09l|d4C2n_lw3PtSAt59>{H1G2@!!aRQ6fWVpqBb^ zkNe&Ml^+7YO+#zEeD#~=_V1Y6Aio##^5j1&0d9!U1GwqX?}4ppk5^O}FNC++9-)Rf^xx}1HnSJ9 zI{1%J3t(Aex&Pw#4HcXYW5xY**Kq;%Z~9txkxyV7bQX?3e_;T)%@j8Cf66n`i6}uKaW4$`F)J5xg7p-}(VQzyR5^H)={T{ut!iJK!PK1|%l` zIoTV);~K_gnfznlcUOmiUdmSGjDOrt4`k1dU+wzz=h*UrIoW(?{y&M<#6u>~2CNeJ z$JneP$eViS;Lx8pVgp>lFa*cs&#@IjsPOqUGuVIJh(2V`9#zk!x~sRIPNX48pmH{9yW%x6a`phH6!Z z{P8TQl82cE+=LSgul0{)7+jw&8brSf+L^Kl6N`Q)3LrZAOD#`FZweM(6A;9np_m{b zVA4iCG~EV_DcLGiaGngv17w^;8nev{A!dsO>M3>S#sZbnkARZ$dXiMyNAI<(&6H^K z`8u&?(6c0$wZ_v?gwbZLX6oc)Wi3}4z3yO}*&o12Zx^-pr5v2Kg5Hp#l1bS1u^5kw znAe}h*iISn{WqHwU!cnbt$fQs!&(Q?0*Y@U6*@_R`eW%ZZ@WTM3GH?!qc0Ynl>riV zqCr=^{a!>W=*>aZ$y#LSX8cM>Y0#UqERGnR_Muon1lWP68ueoS0?D^_o(}C2U?TTq zOFFqmL_3H|ljvgJA@!Y?sH)-FHYt~) z|6-+c_3gEZT&-yHEfHV9&2qc%1f6phfTaplSu8F~{Mh}O)~HaRGGfM);os3ApxU7C zzj}a2fJs+rJO#9DnG;t~P{@}YI|tKD`TK zOU-VWMJeJ5wT-$=;qA7kWyPW>bnNGWtTXFFmeaj>a&Mtxo>F*`MxDq=y5Kwmw&?EU z4v)oxi)x;kE;Wr>m8Iq`!|3z=|8%N&`N+daJMY5Y%@uVQ*Z!jg@ZuG&CHBW&Cb9Zn z&eb5s@iynwcUhuJ=L}imiTwK*efwGmcZn@~0^{PEiB^TJ{Jt;4-R^eMUQz}FVPT{& zzN`pUGsp^ z=C2Vw>p3%r8t&EXLScNzakhn8d2+{#`D#h~X_~0j=6Q!^#$^oe2rM7!<>JQkywmL& zMpIW@plC{MNd@0!i7%-_d-PW*j|+JmZxB6>-JE0G^2Ms5$ zu&quchpyt;jm(2z2Z zb?d>pJD*9&+tzRTTl3sTI%9i0U=TQ6)0?j5zpf6xl6TX10Li3&)i~Nrw7Rf zfIO@J{oS>b%7Ww6{HR+Cuj6)Z&ibZkB!tDCvU>h1>X+}snT2w#>107}OWSSdW@?@w zvp#kTheJvb?p3Y^lj-$(td@P0jr`IO$3fIE4-RE<^F0sW4KhW@!{sK=`cfKyb{y)Q z%kFe$iBFFyxTcizZrlx;dpR5bSUB{4HvS6^4i0gN%EOHo67gL03xcmLy$?H$7d4K{ zuZNotJq$rDu5LGpE@_btsb5#QdBz&C+^tq zhay#Ywln3MJ81gfCQSI0$DO*i?>jw(9*4tj)YPKOm=R9EMjoJ4Svj>BHnsQ_NZ+$P z+@3(|ye|C}N>ki)olrl=>sluaIxgKALlg%=WFS&4FJv5-J7d@K@{7=F7Q7;Zaaeli z4jOjwK}X)3$ymo^8T>b|Mys{l5Iy65z@I$5+SsvJOAn;Aebqi{3axjwwi=o#68@EZ zr@>}8I;C+)%zho^>i&iRS2?suqn;hKm5pDOTyGlz0Pi!ZI%8aQ4zUSL#(fEuCi*{w zzS7fA0J;>kzGvQ>Y5F_Nn%~~PAf%;beZ{@9sz(h6xA28aqu$<1cgq*=o83~W{sp0a zE8Z`6xBGTGf1|0QWLzE)_)hHToa2BMzDAKt@U_+lQkP;3;SOo7^~F79tcHCq zM}%s*VeOVUZLL5^e(0H1Km3Ap;gyh;?`v3xH(noJlE+CHXG+8~jAj@jg(_-jHh zea-zAckI_`uI6UZv_+v>J z?cWMlf8CT3YERjUdEKwEoa)nk*BI0JI>l_sMA~M_#Oz3Z;l%ck*GLG~M=PD{yXC&@ zC{m_bh^UkVE{AWcU1W6IeS&k}?W?@(fhDVBwn$;fLx|ERHkl%=H7?L>?9ykOBa?jN zd|v8V5^(=BfD+z-=vhP4rEb(f(v>gjQ*t8@^HFhWvV?wxXn=3?bsG_%VZ8ic(LEy6 zzaUp|v$Pl{eFr+)Y@!Su-GN7a|Gx;G7Yl0nPO42oga$`RPbFg+^==I{w0~FCttTV& zc23>^=;SIwS8_b7OD6ZRw93sM(CcWh+tm}XkSCqSsK<+}3bmMvQNWLJQSGMkM7tAyYwSjNLKW++np$uk7H23|nzom~2!+{kVO@Eq7t zl~7+d^nn2chpg}uGt0!Y>fkp_@B=LIRR{=RMtrwj6dMXlwM-E?^<#MS#v(ekD$~KE z3613xJ>N)ypi}o}&qX$ek~5VG6RdZq>9LtPdmp$h4`$i`el}uXHed;c#_;!esHCxIJgbtpGfRk^5Ssri6a<^1;@F1?KW5%8MWkd+f}N-1BYt{R#i0`ud2?lf%IN$f*?x6X6(DGfJI zHZ=RWs$>>T9*k@cEl%h?uDb!olpl;bI4h4H8{t!5-WckA$wX!=G|if3UTt?@=NAQK z6XVxr(%g3Nzj*8w;`?bE1vI}d3vME(cb)FA@X|J}=^8?9gB?!{+PuO9tHh%7pkO$d zfU*a#qFuI+nvQ4aIanAD2`m;Vr@uz{m*jcO!P4eI4iwpV9JZE;^;_9E9Z4^`81#S5 zNKy3izd&L;`Ze#7@N2BTx?ZjD6Vs-P7T<1CBArBSAVsl_>i%M zBX(sOylI}PkSlk5)J@Pw8mqpcpGJ#ud4zB~@o;wNdB59oH)oEMW;LSBQ93F61U^TW zeGfiFx>1OOev~izD|OZBPkvE^cRJK6Fq3pD+PR=RCv)aD9U>{NHjR%mNMa7ArUjd% zorPgZ-#FmY53w9j##@n;94f-+(q04URicYUx8@?;n>fagmsyD=@#oX^4hLk)>Y&kcGHUBFmImFuT^t-`c>I=(5xEU2AP)opz$VzR?0TF*Sh** z@q(pxPszeLurTh}oKI^d3sWo1q^PMc5+T(^V7(Qq{GIH`G8;^#>)?cPpPEGz3hUGp zx;HYr^t7wnUd*P-Z#jbXR7BvXiVQ>Xr|n>-juAC_tN2_GIH9Va{IPN=VSnS{PPvAm zEpjh;HUPtB%MT*zL%@(|6Hr)f#w#Kp@9Y>E{DgVGxZWQvUW8Lr?x&Z-fE*sJ>Tye<+xG`1Dx}? zjtKui8Ipvct<|iMuHuq}kRAV_JN2l)s={C|20UjX>{wYM*h=>Pdn~+AvO-Uu^*TCUT|X;KkfW6y9g847r}o6y zzd^!{*-hd^d_pKEXUP&txc%JsPc3Exp(n2hYik`NqNAxke`n))@Kd1BDjJwY8*ul0 zz5nFNNJ<*DfB=h9!KQxbR-CCNZR6E3Bx>ijJESr-1e6JtNl559dKUU-(caBfEPzbWwJg8EtT zIdlHYj7YkS>2k;~`uCR=V}GJ-uVJzFj4Mn@DrPE5r`zz}66nPFiTw#miV$j7i2PW-rJ+9vaD8av-@ut5VyrWf|Pezv&==6 zP~0dw4$P-nkUx2RPF$N$Iom!O;Wit9B9=klHNokm5WgLDL&$kBDEQA3S`C|PsgMt*` ztLT3{OG0-)GT__uQgk#llG{_oCZy}@>%G~MYHLfap4MxABA-8JbKVUgl-W#~W7|&{ zC~+74nHH!(g{4~NK8=dhU+XbJpkK`Lx)vsIBRgoiNn5y>R6FST&eturDujrzZUFU% zDF_g|mn0^=$#KyI^C;#kjd0ISsk?elyhwFD&#D|ke`Fx;heU@v#cn--)N|lGMU)`k z2Xgn4H&zbJ{U@`vn<=ElP3PGQwbtuyDU7+}0L;_}u01j69X06db`Cxd_D#Jw>P8H6 zI!h{IU3kZ8x%6!yg;6<%R+YA2xggATT`lyuP^~(ORwLwCX+UhT!7=bQBc$171|9t%sozigZ z*1s7*XS@EzEocxLe}_T}mY3@j4Sq9WFjuu#2D*D5ntXb9!P7?^%AE#N!qskJoW6l$ zArWOW%qA}sR3qdX&dFo?4YtW}+;baiu0pFZ_ZjM!qjk3Z8h7g(GZs-Nr-YgHvLwzc zXUE;690WW!2yDI5ak1uw`n>mlu=kchbu3*QC?ORYt?(bW-zAB2^wPmKKXL@z_dSq!iFOu~2_0ew-&G20x zqo*V!B@qGD|6~sZ($p<|9$OcbOEt-zm(F~?KQHeC`Q0l3`pJ`B?w&|TjGN0!qx-zH zygqc9@KJkMsqboD#hS5h=i3xf_eaF!oBiJm{s=hfV$dUM`Z_M^AxHC7P{=|}^TJ%a z=^XGb%4I|My45dj5l3I2z0bTG>o4o?j0&$2ViEFMYH7|ExOZ!K1@gWg&D(u_EZ%(Z zuvNQc+^f`CnpmQdlG*HDOFu=`NKMaocl=Y+andm+-f^b64z0he_mRLIFi_}nDob6s z7<|dRc3oG2#kxz}H#9`AxJV}T;1p^_85zVmS7S-)s3<0?50ELNB^esk*{mEwFJI%& z!SgcWZ4Gf9PNEu0VP9?By+GV}fF-C9;)-PX%cN)}#4}6_5w3j>M>QOX@2E@&+-m zhpnOwj`j_1caS3zaz(<)4#L%&^Kt3u%Y%7!NB-a_g8Ojt28Q};Xz~$;cpxR8V%!s% zVmG~TWnK$df=mG^P^m<88SX{uR*xGA^DexQEKxpMPssV$!|hC<`S2(9rFX!hIGWFB zAWnuig$z^MhTaK-dA*$@9LF)}?Zf3Ol#M!pHnc$0J7BFki-W=Eu>I9*)d$r}=Mpdh zp$RzZwSDw-F6wLPdGo{k$Np@iXdn`9hR7NF9_rl&W?9@@y6-oIk&u69s&tfRq>K01 zu6ZU5{$;WsyTa=PujfQTOlVfMiP~<1a~_AYlsWEK^z^ZsOgQ&l+oHwX=oC%nzyMVs z&n8aNMLC!*bU6tL2~ozMEK-S;yIL%`S{v>`X<>8MEj}ZcACAPP6TRBYTCg1u(f~8H zFg=hLbwQ52_w6U}Ee{rof*d_2oKUIE%WX#D&japd0?NEn6!-RumM|5r@NfK&0x(ncL+fah^N(Y#n@(c(0TZ7P!@S{}hkMAR(3mSH z16X|-_pr}wvhdwj0ep?kbo-}{CGW>9%8Z6BVXpaV^R?9CTH|}x9*NfT7{p1cdchHm z5VIFD@bvZ99`y&8a+d~)7q=4SSx9>mn!Z5xM?6aeN%OMSbX?-l+%s`?EoK1e-%t&g zd^ zScEg^L=8g1Wm6Xh_{Ow=J5No`f(mt1Pd=xN;!V(jZ)9Cd7Z%B{zf@CJreMX%ST|N>IX~CZZ`hnXj}D)h zVwR=Tx;WK)AAqSvoR{KO`6D}XaXI&y49@2_2RP3k|C!kQeSEZ<9%TmEyPyhhbwVyF z9btH-gmO%-kT{F|8;^2BHQoAN*j0yaSc&v~@@lm4^1Oq=SL)uk*TGq`$+n(tP(r*q zn8!!gj#e(S(xQcCZiFh+$g3Hy#ByY>5f6wsH-OhBStMfU(CFBmIKfkvKT`CLiHWJI zV?X4hSfG{RJb~f4afn24ho^{bxmItvKE-XurRThdT*dqDQjjVI1ZDrbzUQZc!#eT0 z;z35};(7_65h20{6qsuy^y!qSOLLquWxku!r5}6{i;!-;yw%{eEJcXk?z`My*o(2i z+@j|KvsJz}+<8;ifF=1!lC{W-;p*ULyv&6bLFtEI%<*9|=|-8m*^tp8#mTqU9r&b| z!#ogw1P%`IMGyN-JZ=|RM3*YqSmP7dqvj|@ll~xo>wKiD#H4=+J#Dzpg0Di*wd1W@ z?*%|KS4mm%m_7{Fu+|q{dTzjD(B&`0Gdi}2x|Qmj5ZMO(EL8kk>pfeREYSnbWRZrj zRrAJ69;Qi&;|lrabWK*)lZlzP3|Y%Yt$BtKI76qwyleeV`!l)+r78@^qxVLG-}B*E ziwyh_UhMSSoPEh>Y64cre7${~&fm+bNah*M1?DIC`t7&#e}Ct1ZVK7VKw>>$poynSMb2 zv6YwRnW3|4FdTgIyxM#^Mv}gHM53l=xE8Jc&(w!(Aq>gKI#N*I@rsJt=U>g&g<&6l z<=?r!h|(b1*Kxf-^8Mfl#0u|N$f37tGu)07hvD`tz3Y$)J;$$9PpcoV1x;%P(JH1< z+3ZqJs~HmIhsgF42~)fuX5DaGR%LkZo7UIscrn_Bt`;8wcQN(iGh$l9wOY}7%00hC74e-le!4}(E0%dJ z)AK0n{$~m6@6X?n?|$T7{(%)A1RCuI<#D~Ru-)}Nx&?Y;Co@>o8Cy3(;#0)?EY{8NAl5Cf0C6pPH~;P2aYlIC_QSD?!Dyl8GY=5$lzX#3*rU^2$( z8bfdHCRDbB(WZb}z7>>BsgCzq3aLjHb*o{&@_fWA;Qu?}>slN$Wo=5)g`ROBlP>O@O&}Umy4#$qPW?b_OAj z%fK++BDX&lx^?*2NHA6x99*x#f`(EWC&G$0IngYvUau0?4st9=%;$9IwUcYn&YWOHFw zUlV|wUYETbiA!lj-UU~ixp?>Iw@!XT)$ZA@I+CYgu)6`JrKHdSveVe-u*}tBWk78_ zocJ;lc&|mOHc_v^@70ywkI%#vKi0Q|ZpK8*wQn&U&;^xoku;`rFAgDG0iqN=ave*y ztxcM!do0zUFhouJ%Yrq7eARr%N!u|5y}snzufr-SPYA_ea!r2C;dD472ZohM3n*P0 z=ilw25Q#6{Jl@fAf%@!?SIX)SQ8S5^b~&93sRysZvIS;?V<_NB>rkRV@!hu8zBY$F zo740cvzV(2k#T8p((B?IS%bJ+U9PPfwawe!m6TP6jz%I!{J}vY@_@fS%0p|}YD@St z7$&*N^0CT)%W;#T=A{`nm;?Fi}6{O zRzyMs*&E`bE%!fo2J@uBOTl5iedH z4raPUWosL2{F_rE`US^dCHS)=T{pv!bPx~Jm{cMyBbjh_M;en7OUdPo|HdLO8%pTQ zn*l94qe0sLCgj>t+k_Oat2%jpg;!BhlA8?TXbu`Ga8j*AQm9brNc;72?nCLN#|`cr z=l|O}Ad$QL4N7E=X#}s}ZIw+=$aAPW|JTM_)QR6bSP{|~M5T&T#K=3H{!B^A#{c14(l&em-W#{Oe!4Ag~j!z^v^GU<*!2x<}SOlA?>~VXKnfPg8v;# zx(&mNUhdzei2nHqM$)H)NA(Nse~HLB{5~DcZ-~xN{?l?4THu-d3}4Cp$Gro>6g2Rz zyw8B(Kgaxix^fsQupfEv>3@zOivYYU`HUI)Pu!dzx*fvGrM?&cw>*EX^vgmC4KQ!bGMY-XTZvEDQ@KhvXWGRCmr*du0 zbFDs=7X&WeAr@d)F|^gy^$S$d8!cf*!+YM~H0;g-IxjYk;-A9k!?Q(~y+~zrBTcQ3 z#zjpopL)uThJOVx01x-^0dCE2rfWw`oAb|FkUXoK$$pB?)C+R3@VhG4qASqQ{VW=x zvDt+^wv-wl@``hfjak@I#Ot+i)Gii=$KWPT!-#c44w7n`yxwokyLCQV)f?&6%?9^g z<|#B}C{(~X_(PcZo^E#+qpt^fZp)qdPeh<7wGk*`K}}u~{w)rC7m082zK5&xt()g= zL}A`rw8K27BJx&-#f*m(yae4I_Hbb#?kyBlU?ic6DgP!9SMYz%LED*+D+*tj_?+dz z;vS~ys7dP1JS|Sd2A}VZe5g$SPCK==&`bmwHg<0= z(fO!7MM1A0wVx7uvbntdA)vu;r$-H*m0l3yf-(^bNOdW-5{MEq8Tc9G#?_WOfOlhg zB0XD0Be{GyQl;EbRj8tkqbzf#ER+X3mY}q2WW2%|e8 zU3Buz#-a7>+yU%H8HW3LY{YpSjHz~GQ&oYEK%p|#fYp$Qjn#UMcp2W$M~KUJ7bGXmBl)B}Xo1KRbX zYz35}9f_>ZQ z4`0xl-|+dOFjs7gBL2MLUMBqjNto|3@0zx&wFf_F;)+=NO65pdDf=V!MnK z+-ACEWtjzT9uF^bQ?=SAB|PwA>gIZ&XKl+(**@o2{SDX0X(aU# zUS~u1J@?ns6_1_`V31#YGc4k*2L67b0Mf>(FOuO|YNzt!rKwiVR~rUtcfTEDkFt@T zGvx!v9sMdkxrGml4t5G0or5xjkT2ChO&&#iD3JIWr}U-oM7`elv)N*BM5L7l>sLLw z_{0^WtU@kV=BG(b)(&Q~c##e(B!IQ_TPZ^urE^J6EwRS{RhD%5eV-C&r*dnnSBiZ! zk`~L9AO{9U#EeIc(U4~{=zZ0NHb%Em4D4v+JxYeoeYLQaLdT$0w`IQ^5{>vxoDkht zr=wxiaQbSSLxh5$y7ClrHV+Uceb(>Yjk-aYe(8?5AWa_qcL zoxKpmSe3qHzOrgcNn6(j#Z_JX3^xgzc9x$P3b0o-pK-JLRf_C=;LZ(}o$?ygD#M)C z1!q0Y*6+S2ZuZ$}s9hyvDNwrP)bW_|;~)Bb99`tURdWmiU*AH1Ge;`F4M+U%=ZSB`Gi0_++~eTfOV4DxyGP@TQ$7cgFN@@Tci`iIG{UJ*lWwS!XFOt4)H{ z-Xm5km~9gcBf{f8wZK@!4cS2>#qwhNL#QauKAqAaSt|a#dw-s zbS7DKcR96;R)_c2GaoKWZue=Zyk~u0+F30%%wa$`={$H<4}G!sbKxos>2x$mY$(9G z8uV5^QJ55anCxLkyEcA2KXSr8>z3d_K(0-`p+@*>dvjynZFM6UG1j?^cD5Z*k|P>M zz1tPpTe};$4u4Vg%u3Aqp-wq!26sAt^|T6STlYogxi=wKfR_0M%y!0^#tyG$7WgMH z(Nz@7vP*Lm@>~^A@)IsD4hqs`ZrS?u^BC7mu;(LAj%Ujq(N0B2$zI-+J&qIOuPFuH zU#jwLe2Js%;kgbfEsDk&^?qa=hb=jJM(Ov*u3j;Wx9F>$`{l2_qM8J&vZR`JbtX{z1DD|bx6isJ z`&uI69Wm1#uy!py>G<#+7$>977H!pf323%XomBI<5^z|4V!x<(V6;WlGXWFYV2Phg zEw6Hmn+dKiHbGJM1(Nf9Hy}sA^F`g1@3_hieoh$bV>g_9FeVEpfrUn(gKci;Gy8assmJ~5bmelxOqNA`DaP*;K^yoRfrY%dOxYp4 zFrfBsxWJ38iEY|fOJSJt`MZ;qp-$uNNZ>wDk5`xYkX_nch4>ayLSAWCXWCNY{+j_< zA0-vugR<901}O}g%}tzlRQKo4A+~GKnB+3bjq)7iv|MH?BtJx9H|*Z)8er1USZNN} z7I*0t`xiF*p8rHWFrjbRLpfl)OKwtJSdUP==ayK|-3O* zE^N;Teb@e7(e3e3`2RL9yzo*A8T*W82%S{9*sR^c>+7Yjy)A<4$}F=^d&8K6hhIyo zbU?*EfDgWST`a_&I{`6ES@kQNFEpP%T-@3ujE24%$IYCKchq2+Yuc$w;EVYLk?Jwp zXYd3?lLq2gN%tn`r-JUBYu@^+JMf{HFb*u_+Ytu}v4oG>)$?eFHqAad)r}d}`+(Jx z7|X-ijEKuethtKMgS^d=+?~=U+0zH!LyDG=^~=Ls`|*)nH_!smP?WYs4=f}pQ>OCBvr(f*8gSo3dNQl8Jv!3}HX#Z;*TE;1Zy6C(iOle3g z1|6Y=fhvqWjQ@n)|@AWSmK`x<%eBDeZaaE#K0Hw1* z9#P6=M9+PijG^FX;P|sWEW;KSb6m+25j`P+uT>D=-01H}^SHgTeI@9Ct{-8Zi(!}5 z&I_klSMa%O(W*VJdV0;$(-+NkDSw+V_(!F9M2pc@!5R(fejSf39fpMlQ7NO{!>V%; zZG~4gT8~ZaO$HG&vVUgdNMKucY-HM|waQ1^)_vKQ9Wg&wv%E!Jh=ODUUL)=%B^HZg zhFow{=BMhc=%9Sgq#wJy-yHo)yc6GH#_>8oniXEw`FnHFs-~t=_te6odVF49sPWwj z8MCz53AS3dqMGkuvz^=*b)&)PGnNqW{$|evd9D>$*!-b%>Av`MN^vQqW|#Z8IY@Vm z4qSJvm}@^CYG={7yQ?s`)~cjM1mj)hqEgC?Bs?txF}|Mir#Lm8%K@e|f~ajb+*67Krw8 z@fGpwpUC{64|GYDL+S`+8`LXYy9?dB0Ux;T(OUC~-&hI+i^4h2T-nzm_(M97Ahhh? z2nLJ98tjajY7}f+&A@z>j%D`mC-(jN0o3tRW)OLo6Y<&Cz>v7jU+-Ao35b4ur#K|o z5qV!~Dah0E3f)jQV|i!iLtO=v^1FqztCCE*h52j~`!&;DX34sD*k|W)o%?6b*oBw3 z^TQ^XRwz0xHL*?C2WB_hQAiC1+wA2@4WEPVGI{BCshlhO=k~S*A5taLZ&2!Cy$(^1 zNaI{uZN(J!oY!z!bvA8T;j6!VpMN%u6Y4~%wZ%U2?HB9cDUx!yyAMmKCtVV(IgCd#=d2JjjK9g|% z7NfI%(OKE57o~5H-vxS~vu%7YmyWpn{^1&HkVh#%{e7TD(&M`oJt3}CvCr=bc&}aT zuyBbOezlzX8FL@0zo-Q`ub^9 z8;df)U6(@YFZK-;kxy9ux8Pv1u9LtvNA_?%Qh&TxavDzfy;EMtla?J;)pq)A`Kb`G zZRm?i0-3Cy_BcoDwAo)bcLgLpZA1xa4NWPjQU&M}g!@+xeyE`}%Pzt7uU8`1K2I!2 zDF!eGEj1fb`+fWHEjv(*a$!=u&@3-1pm$)uyQS{vfdWT;#?&FzbQt?$3U@h?Llt6Bl8Ii&Z< z8cBjOtD0MC4U!E-nDnzqJFV1dHdv99vP^KlK29#K);!DFcNs+^;a+*3Ty0ki=3Ydl zaH#)Y_oIMl#cFUuGaNrkM7luz7n@}qhV3>LIrhIDkWlWao(*I z&Z3^_z&%nlEVDgbntd#6zijn}Dn?0n*S(kVoZGz~*#w_hL~gQ!#o7zGUyd*4lN3$a z>t%|3Q^cx}FppB30c@5cp02&F&;X>No^TNcS-l1#!0)mwV&r6{%MFEU%xjk zd{?Z=JY0TBU$oqeWaKSQN4&VCoCRSo#N>;RkItjWcWmf!$sI&>9@b2f_)T_8hx33$ z>HA|aGIs0^USW11j|zq}a8r1a)O;8#le1QB7Pu+zXn`0P5k!a@pu>&JJj`rkZA`jr zJ;EqVRa0!e-Q6z{sY%SQ1Eb_e71V0KRFzLVD|C*k+NH(OJgKkIAaXRZDpNLT1LD_K< zY+->+jCSDf1k>uTZYO)BlAI)YcB|=qVO;G-Rw2Q&K%us)a&wJo6sU5l3V5?W!YF8k zHz$?)XqIy*8qDVbE-7o!#hGcx_F{R%y%6P__c2OqMx?YYTYDqQOEuuy!5ieq>>@ta z`{nxd(D5^_Oq30J=%}f)VE7dcESrP)ul@iV7BiTWwB5iLgaLA`Q2pdTElCv*s+H8% zslj@`ig2;6fBFsE6QsJVK(2z_qTkZp!KGW9{GBkB4Q`WQ{Rpry;Q97=OFUbJnUvu9 z!a<#k-+6L~csc0b2Mc>GghZr7twf7sdxZCBFUUdWIOR1TU;chBm9uaPPA?<098|fD z3-u40S}qK_`aTt}cfo8KGAml{fb(MzgJLJeYALxg^pRZ8GuZ-C?fA?2fSq<2D`<`~ zhGKTk!g+@s( z7~)J+G&DJzv)`l9LU@bU`UV3;r|mg5PobxA;2iWXkKT-h&M&TBvV5Fxb+*T>7vTvh zZ#4dPxk7OozsFfH^7S<)RqT+V3raAT3zfzK^4Q;mo^%Jews`16s_IFYDl=?fo={{U z;Qj3MmuwPe7AU~3Q-EPcWtgx$nc$5L%tH;vjm)QwP~?gQYttH>2H1tvLwzu6al@0( zlL);SE6I#}HjQ|l(0PC>qfn?swKeTO8M6%UTpYpm(_kqB4`26J@*b?!du#ba&7UfV zqgLEU3v)_*bRD>+CyKd0>;l@aI_cXyZQE|vD2PXnYFiI39QXMzi9KjMZk+RvFgpyU zlw#diE(Ooh_{~DM%Ci>DlJ4#mts5O~zqUX3ILs>wm*EEgWuS>-27OuU^HSXzSeN4? zdQ~5X&_@O|(6!9TX6bRX=e=`lsk`&Gua z2x(i|nah`MQedbK*rh~5uXIOd?>@9;OQpV3!~bxV$xzUMd?0aquf)G3DPW79ZU7i* z<{I2oI{gpm@r5JuIgYeZY7aKzsLqb&|L~O0@6pyx{^xfR5l{x4Bo`xML}2*i1ZJ>% z@WH?E?vr{&*ry{!=lTB*_*>5s3!PyJ;p9Va=Ac6+Sy`ub-6(N6*vA++nGIaENng7>fANVf>1!QF5w#nF{|G@8j z0O;Zd|6da86X6(+h<}CPSxOhhpGehLr~t0k=l?kc$}`}{r0KCULjSqKbek<_pk06b zk@x^yWf%vvWU)V}*!)00+`ay%bx$w&VE{BI%12rc{a-Ze=`bBBOTYW>pJx7FC;oFI z{(s(yU$LH98azD?!1Rhq8IzpMFgxoC;Fy@7O^yC?Q3|Gj?h}WP`SF7&B;>?yUF>~| z+I|XRfcyRh$M6Rb{QAa5zwf|46`y44U)n{VRv1Pf{g<|&JW9!r(D?LshL~12RN&4M z(HR0XxGzv5GsuP;+cFa#xWE$%5j}Yo6TTbwclH{r_ol_ zI-`zuECz)xr)v|nBGxD>B=uK(kcF{{Xsd=cD#ds6^CtNM3^*YNblrUZt^aue;EF@H zz_-=nzf5!bCvQdaxfEk_ZiR;7Dgg5d652(s34{q1ZWBTTP~iXfZ+#)*ckWIRvzpJtQ{YkJUF!-bAoh>;22!i~t0GKB# zV`#JB&$uH*4>YXzfUD-mA0dS(5Qup_vc_kMe+CMYMBu8|FYz^`{|GZEf0doajaYmj8*T+`6|n;-mqKF(OQ3UQ6bzq?Wd37bTmu6W^#pk3eaTfUOf+3PN`kp zJ(9J?I*Hk*7@>}69FR-U5<7BiS7>}TBxyQSNi-XS+J1%CzFYg-{Sq%njU|Su1|QGZ zb-bH<*lK*Dw~&`srRc-FoouCjl-OWs-&md!d4bZq`iXhaa}i$OK|lbYVckpvxJZmp z+V>BVW~)~hMtkcKbNcPHJ`gM9-esFNLP|BVKL)I7dEA)}`G*|!Wizxy12mobhlV1c zx_m!x5%3#8CLqIR1txgI45Jq`l!!}7`}4cU zquQrC-mOd*OR%GAU~7w_lkukNg+4h4lXTk;5$FfBUKMs99WPcj0>b-n$>^dWEs+%~ z(n_;QoSU63Q#4FW%FZAiCA|*Mg@y~}lY^^^=(46&y#mF8%o2=9rSsWr28w=k8BPeT zc7##9QCd7rA}wiItNLNXmcTbQ%Z7ne9(LNaS8u-bzyOyuMxO4K+)xyK**an3YTMPQ zRi$DwsvhZPAhlD|`YP&eoQ+N;vBKLTne?fO41Gnj?oB^>VQ2i_6OFEhH{t0KO{Ail zNtR2A2Ui@J-FvCX%5TvQ_{W>;*GQ0C(uTlBqnt&?NCon|eRG=#@IFvrd;-sXQ}Tuf z;;)RvjJlbERckL-23Vx&CJF&2Fi1bE$6q+@;%G?)kX>YnF6g)(e8OIGw8*$*_I(;s zG0fC&C7T+RLc4S)P8U(Y@spbNgY_4}z|hW_!d% zbQcq`VYt%845TloYq5^NX{1MY4YRlVLj%>P_5m>b%Rz*BAX8(_&+u(Htc8-vY$b4c zui*FRYh_x#-8EaahxoyYo0)}5n&;jzDh++u%Pimd36SZr?Z)66A^?isTkiPur;zJI z2`$p3Vlp*`<2uZ-ybwz|CCr8Ol6BSVYA3>A%S+|tYIxW4bWR4hWAQMvmxKy1_Cy3dnD<6R_P+Rug`r*8IflV3?C$Kfas zR_AO3qy+1DC`&q;)HT~^C|sa5d*M+m@}}a;=wWwZ=_k-Ip0a3!%bJIL%$<9Fg+P3A zj>kjoeqTZ^t3r-+~(Lekn}@*r1GY+@p%{lhm($%%@$1!zbzHr0vtFh8?^Ib(Xxx_XvuW5u5pFa!C?F!f<@!U;G ze*GcpQ6UR5B%WAS7*dgVUPjmXaw^_-sSH!fs(RjjsT4i@QV^;U7iNz%twdQ)Wx^(Y zFcqSFPQ?m}mk}>NIB7w!^>`G0tiLWv1`m7vl&0U-kfi5rNcc{)OWpB_K*+29bff#0 zq9a?E<2HO9ImQTE!aB;$^%Pn_=Pj#-Q+w>7y` ziA++7uSZVKt3lX+m|814(1FD^>G^#{409NzP?f!hRHj6 z_^RP$O6yxP7MAfWo1k)bR~%NeZMnMP>oaQ_XcBs0~X*9TQ;Trdv_bn}2+1P;Ag zodEQxG*oQoiS~>Z;`z`bgik=Ci%GWsclzrjEp;kppmh!P_kE+d+r%_|E>R{72e6A1UTW z8+e=DRU>||?pd2J6z_xU`_T@>1YLxk`}_M7fl4qLu}pePW0$?Ioq?b1R=QQ{gD(M> zGO?&bEpk9*m^fQ)9yR1AXW-o5*Z0IwpG8ZbSt?dj*vS&v861D+Xia>zcopmc_?sVg zds?lDbkNV)o{i*4ey*5))To~06lts}DRG2IqQO~cClwN*RcN%nc#9D^!Bv?}ehhQw#^~DS z(9{WKb{^H%WKYhFM300-xYT+qS~taHE|g?F5!_ED!sblvHheh0jOsRe^0+rH?k~~` zGP;f*YD1rJ8K#bJyj($BO4`LT6d|tb;kI!?cU?J6_yR}si!t=!;b^hDrtfMR)cmCe zo2yh1!_`pL-1Tzo?N~vyeKsEYM<&;a*p+wCBHbtF={kE7F(_q$8y1%*X{DG_^YqOK zD&*Y6P`Hg+-XA?v9!5AmW&ilj=fgcspfa2)9A8j0euOpGOP+#DhC&SuSO~?wMB3fk z&3)t)v^lAq$HO?Aw*pL}5`p3iGqLNfkIL{Ombx|vZNW^h+|F_mb!sn>cs7K-u{l;Y zU4qV-F9Y%nK+b9XH(M!6U$26ju2=Wm79O^W%32d|5Z~^S)rEUp?lhi0G_GyT8WX5& zQ1<1!<7I910>u;<5VXInM-2kv$|qIgQ0QjMF<3!+LDOTh*5k%|>Tn8VNd5+p2&RL* zBPW%7_dxMQnuXolAG#Wt;9RfZ1YKP@PUo$?cWJkE&VM#mTg)m_7NqH_)mYR+tgK@B z2TS37T+ z_kMyQdUx)I$#RSb+)3idLB``&EQlg2 zDOvNP>qo7R6~=O;jju7W;Fi5S-8CR@={48S-3c84I;lkc^_%cYQUyTSx}J+$7OOuY zB#tH0wnAfV@%ZqZ*$GVJ_A~c1s7HVQ_G0(@f}88^2>Qm9hSkWP4b6?mmfhVdAw{w^^IYu+UW)Z=l#WM-rvZY zyELKCDfegeZ+CMbX@C?*O&l=!tC<3{9~EM4geTIYhqr^WeC`Re((HUh{wRjQe zXsL9WH0_2Po4)J*&7jCpXY}sPxLBDuWe_ZZQ5W}=+~zPJK0P*x?O1_=JDE9)6)To+ z>kb7w;ocYS8RzZ|%pJOki?UC3!)cFYZ_`k^*%ug_WRtqTP_KuN%hXuGZ4T?0#PHBF zxp@yBC!h09K=zYH$BK-dqg?OB!L3XF!eOxp*c| z2e0jG`p08h5%uoO*}r{xaO5k$r>k@cqmF>lO9516$SU-16azGM%R5WtiCS4{R2_Ld z31EG2D<(avFu)@`Yke~$i62C0({G$A}YUxR);`)skqO9~bq`6a7X zZ&$!)cx=-+K+CijP~k(Ji^q zl7yNf?=1#3b7t$CXKaf~Cofe$#8hH#843!=3*`48TbofjH#N#DTiH4$`yO%K9i0fQ z<6f7$GqWc;r3h=CnUbNf!k{1=eAoa13Nsre-{2x(!-eCSreG6kJEkp6B+&Jy>miU% zy-p~Sv(WD@3oIQzyI}CO#_R&88IhiLOUEWan_+iYg!S9x%q`OEl~RZL)b~bXo^&ga zlrpQ_6|YSzkt$LiIyx;BVMbZ?LuO8iOzYJX?SrfM^l7TrvTpN z3v=Y&j*D+oRNTAX_gfKjt$0iaKwpHx+)^(&z&W#e(b-RQ4L*B*TQqw04d;c&2(bjy z%~<$=Alb({+*<75wp264MJrr(PT@M9g=tP9-d9=M-4~5RgGw^b!5z#Egy=o>#uI|4 znQrSTaf)|oYTN;gfpRB>)HNRY#l}(e4b(=Pgl5(d=tNm*7XQ`&$>w*QwvJB*kqT9>2Y(7bi-9=Wl9-47nW8D`b3h-6>18(Zw#> zTqRf|UeEegE^$Jzo~%H+gBXZf8EP7$?9%HG)8qf?%D#=toje{ns^K08RR>&gGyv0A zq7gbH3RBGUVVVsavfx$}YPw4uW}$U)oy(vMnXa9+IkiPYhhxf$W( zyELpnNQllgX_IVp4HISeK$Xp9TEun@)!XZwbfvXDwnb(2>fd(*i zum$49X@lTgjqr`HS%vlfi9Z-Ee&B>n)N$q7VBKA?%;SY2-ut=laOIiQGK*>sfXW0V>;igx+`cm(QHNPvZC-NutgoN<^!| zqFXoa`e2=t9`2*2Iy`~Z(wx?>y0-KEmGi-)#S;D>G_@(;K+UFR?SpS_$EU*@_8)FA zs1?ui#0LOwH;O*Y9mc^+#O}s59_&ET2?hqB(xh>ucv@mhomgwQX|dbc?qnG~p#A4> zd+{sLM3lh&&G*4Z$7<`V+VcWv-U+m8w%&uCqFIIE8u8mmf}CNNn2A5Dhck zqA?<1Bx0ca=?GqQGRGrdn6FXpI)=;7zi_Dif~pxlz;|(u$cYTPtO2BaA!2}Xt7H+m zHt`+bUG_B3{cMY8klpw<+CBCUR-jJ=+=YP|cbGaJ`Z0)fCzoTxe2)^09O&pQ&1&_~ z&R=ss;TA<-!4_K}^PbnaxZT9YxA#aaa7HfC9y9XZ^H#z(6**f6K~V25d$=K)^vD8B zCFaIO^ykR8@Mr5fo)@1Eo=2q|hg=yJAy6QbB3o7dhEG3JqU4*f8%DT9O`5QPB$=Fw zC2q)EZ}q0(^~c{HBt#ioUe-_w*-Fykp0P;A+SmX#?zU zT8LC>oiYST_Uny3((3RyGh5)VrH09hl_ z2pl#>;gSv0yw?>|Y1k~%Q>Bg#x!>^B)YR-CDOY`f$AkJ1_Z|sG&^j!%LH>?NtJHek4_HD2o^Hi;M>Lt1`yz5$%?>OB%(f_7KTL zM%(ujFH4sZSv;X1wqf;APJ7Os&trGcvoSE3jBidc8W7ek$LB8YadNGmOfB@{d_vyn zhY{#gWZnvPX*CTuKPr2N3Ja&AVIE$hYCG#KUcOjWUM+}(Av6w%K4PEf|KUcX@>a&_ zV^87fVXxCz`geQzq&yEXzrClO@HB(f>BQ^sxg~oM{d%=#EKm}p-j&+e*;HJ9g(AWg zWPVxC5DNzD4Lm@G&1jADL+YL8%g@R^WB15pNnp$-@~uMb@c5CwOCoRVS+R#_U)kgK z;oIzwUeZpvb%$cx4NfNRSxUX+fq*5~9a&?d`pU5IAJ@kj)&r9dt4Pwb^YZ!ugOzg7 znyL!2eOyoQ<$@XW4zQJ;I^=dq-gaJkq(bJtPVzWj$!mCZnr1)rP5CBMxwLsxV&nNC zR{dgwV=_>Bf3YsG-ge?r|aPmV8Z*<(7>n4X^ZD}}oAxY0Q z`7%{%M#pKgiHI}8o!1HwDs{2>A`k$bDcME8cmYH0jVR*M@)c5dWvL|Y#Zz4 zFUqm*Vl#b{!*s$cR9F?S4V)Db9Qo z;$=~3pPlMy$CX@uG0E`d>c`JJJM2xVrMlb^^JKi)iET~EpzEECmtSbuHb)RE{*%H1p2EUFv8ss z?7AFoF3Q|PxE4kBQim-FIpYkwmwE;f7xg56Bfw!kwta3a+72oiwY+MgM8>8? zUvyIoN_1EXI?$gCe(0*zj*gY)UL3d5I;yLX>3^}6re(tCU&>G@G1AAP)r=!}|+~ImtRjf!@SOq&J$L)xczMP$^uWvus)5 z(x(8}Cz7*Po7A!^Pa@zeez)Y(BwpoIqF&QWPoc6yPdqcMz>xHDyC3jV?GHL? zRckzE{Q25NK*Pvyg3?$O{xE39^0C>3qCGqGbkU=8Sk`$uP+ME^JDxiX_fGUy4yZ^ zSE`gRD==4OssvsomwzpTLI2?qkG1_$oNf`dk_kL#!gm5>xYUVBhq?7l#Dp8~Km6_i zUsbYY2!}N-+6u>$;Ez8E70YhSmRiI^0l(q2JFzE7ZBH}#Y}4P_5n5!Pp?Mv8ItBb! zl>oR<0Jf67R!w@!#!I9^Q8avKFCR+f5j83ZDP1usQrdUwY6@DgJG%&=cpjvmJWKI} zq6L#dJH&@%FX}xhKlKv$w}$XHlFN9NGu}p-Jl@;D$dzep-Ry=%IgEd?RYT~p*Z)mh zAi{fc0uy8?M|y&?mSKHuFgwM?L(D#w@41uQeV{Y?i=%iP3l-3qmY(#N(l>n{o(OM4 zhsFCHB(VI&(+_1|!fdZ;zZ?OyXa8XGzzeuI;7ZcF{xz-m%>e*Cq5s(YTf~22bz(%a z00iiZrtkHiBTzjD-Zg|u3HlG|!IvMNu~6#wfjg4gP$z5Zpyr&{;Uwz5=e?iC`@0*d zB%y6>1H5;5a$L>zS9H9rIld8C0r1;jz%JEG-}P*mzM(!KeshaUNZAy$$D&-tZORAZ z{)O)8O16z#*NLBzEia7Ql=!U7353x;fs~Uv7Ig3~WM6;mqa3QK)yDw%?Evxz=J{!! zw?=;hcoQg8yX=G{1k(surTA67Pk^V|efLxhz+eQbne9-+G9ydY+rh^qwe8Rl2r&Jo zU+8`H(HhvwA9d2CAzHRQI9_JL_VXv%iUSbTys{a2v||Y(zznbH_Kf02?-vDX&g>c* zIyu2=bK8#Aqe&;_SWO9Gik*fG0uzCs=Ttkz4lL1^E5x}jeyMUV)gnow77RAV0J}+%amh4OzqbBJj*>bDPo9VHz zhBhJkD1;fzOci_g1-_UnFQ)zz!8M@GVD}=tKJslvzBOi|e&Ffq*%@zR(DWiG#c;I~ z8Vu-Q%}^-<-G0|CCB~{7@x#2POAlZLK+*C;0=7t)CiMS@s;_{mYWu!MLP4Yj73nT1 z1*Ab5B&8)Kq`Nyry1ToiyStGPr0denrMte3zW4oqZwv>+!8qJ|&OSTVnrp5(8F_2Z z@T4_o#8d99s$32?^w}d~DKG2l5MB^RBhTE5x{U>qu@Cu@uDQs0FjQZ<9bdQZ!?mCd zxub1=g>V5Y?S;erm9dnnCdg{=RUEG|>(}f@@8DWyHp6$<@fDTgUDnf=kq!M?Ih9&spHeW zdBxTGrpq>x6k5zxD+H@8-5P7amI<0G6~l%GX?DbZ++d(y)9b-KO#U=Mq{aI1#8?J) z_PU7N81xN)TBo^~>sdUzLqy9x$!a+R+2HQv3^y;lT( z)?#}s%r^&Sp6!{iqE2T;#cI1yCfMX$* zR5K_<|LA``#qewZ9EkZ)HJ|`3U$+>6>X(`B+Z)#H9Ryr!kE`-Bw0oM zyQJA*YxNgrwAs#$k7YSYvhBt1(?cLsWL?m3|IDrglT>PK< zJ`oL4oU!k%)3RGe^I6@-nq42z5nyoa=7L3f9_YdAg^#_$^p#{G;$NXfPZ&h-9dmDF z2VzCf?IfQrS`6UA!ZyzM!jKdYdCGuU7p8Am0?C?=rC|2pCY=0d4{Ck!NR4xM5_6Sh z_RNZ6kZ$j~R-+z_g+we{s4y%sd06g3NI&6d7>S2z%`_qsZ;$g zNwmJzs?12wr|7#k8V+~-E82({<#C(vrDY<{2?((z*w9Nna1yqT)<;BJDIdAJqwihr z@>cWEZb<#J?OBj&wS1o{d1E%M#(F!r0k$JzVz7T;1{HpT7Y~JTW4z2%acXoVd$=6b z7aNRz?1M<3I%WtwMmwm3{FYLaSYBQ} zNkfmRozPmQnJ`=u@*ssSjT4$kKEo;vw79NkAnV;Q*U&t*ApG;L`AjeoS2@14EKE)6 zM5;|EvG_PoTWrXR5oy7$i;U9AKAIS$a%sgb|I2>h8^CI1>AbCnr8=vO^L;K1vq^&` zoZObvN$;8AM#R1Mm8y5@w)tS-VbqDD07FHk(jnets#axtyx`5=Z1q`zQ&c8rux8$e z7=KbIu|QvdXxb`bEwa5yLvHlkh|1f)_f&~>VLf3I&w7g%&*mO(`@4b5QK|ttbZ%y*f<^=kjeP*$&$?NvPn22a7YF> z|EuMh_8xwsP@MtDXhZ`q)a_+XyWNQC`+-S%MoCj!1-BGznVeh%$g z>6Rk{T0OfN^UWGRf*0HV^4u~)S_$9YMd=&w`j=P z4~4sY0LRIkvx)OZ^aHXn$pn>dc*GQ4K}-kN8^P&%)5J=n=?_C3$79T#zCbqRXCl_Z zcu&i6d0>`Q@{HaD4nZ7zyFVW=6(lDn=2t9Iq4h=kDq*CW0F)3#k>P;tr>iH+5>nj-n{SNDxp=N##kwk?H57(fK0!qMS!XVxNZLUR6zLO@ zBX@LYcBQv3YTsL(?tYdIa~q7kvd*;1A=`d5-u&EGuTPeM5V_X}U!R?Rzt?7O$YzlB zo@sx$zjMttQ}+!VkSKXCyf2{4T|naLM~2?Z()n4#dCeunOapKL|PccH#y_qWU-5WQ>NXmVJ(=dr!^cdj&676y|9m{-G z_9R<8x}W}f@Ud{-J|H6Pzq9IZ%G7%D~dC|m*$ks13f+u9VZa`HL3Mx=AN`1qr{ zC#jn^z);m50~(0)rs@p8#0<0ewPgVip!>xEat`N0TX#hqI*VrJCZRxmpMazc;idhC zb5t=2$v2h5kZ)g8on@`dHlBFbKrZj{BSv&d3QTp)j-vsywvKr$o_K%{+`Hd z;GDH_9*)jxmg2MwWBe;E1;8lSG=X&pZGLuK?5%^(o=KBj5zdQ1D&yd^Q~l3$Mt3C| zcyE`rC`g%_|zqqk=4eS!DL-lwls$cur5@l@4z@$hPtLWPoYx{p=nt5e;Y&+ z(H3BI3dGp&xjXj=Ea)z284Q~>Bg`It`Q@memOci+!7A|R(rzbMI)!`MO6oZxgIHMj zyu;381-<)q=fvC@sD!SouF&Zb#XFgjMJ_4MQ{A->R#ozOGQ^A9O9Z;YJDj#AgcgqO zPg@5Oyl&f`K+7^ZTWueEx!t@*wNJBTXr=(^{qCWqo5U;%#$3c>Jm*SYUp)d$KOLs z6@RO52FNF{Jr z>$lbs{w%9>AeR|!W=o`*SEvbDusT<-c`i|ziPA70{JkuJ1-aog&b5v1_gEsn2=84O zXv%-Fj<%SStKPs`Z^SrXWn9zKF_xz>C=S^o4~_N&S|M=o7H@#GzYoW!o}~P9-XyY6 zUKXkKyh~EMW1GRlD1C;G(_atl`!~`P!m#909=s9cA+^d+TEB@ja*s!zZmlGx`C}M1 z#K%4*-t#&huHG-7h>VO}JCaC_lxn%Y6EW7zQyO}I`#dyr?2e$P@%H&8t>VBzjWXZm zV>ALXpqWf9|2T4OkyXb8i0lwO7c+})QG+hW9P2_>{qD!%^ybX`x=LR>pk#Daa z)%Sl>@hxQsxrPVEj{X)k+VB1tzT@@5M%FY%$&FPJL3^g}Y`zI2$NX@i;X%(f5Pq*R z{cLtkUM9rQ74HYZ&ujT{JL26P7cX|v$nM}qoSI>sDfiaC8I4w`J(?03px%0T^Ht;o zuMK?`p|YZBXpT3?{u~+&-U%>4YRJ%?;eW_ zfA2W$PG1lB_GFk2{_oCcWv(EWe@^-`J&%-TNq9=kc5773$!4FX;x3^`KtRK- z%c5>|`8Zp0Cnh4^QRXh5Q+grcAjMXZZQda{D~E&9<4cdFcS!U`io4iGe2Z4Pn!`x6 z)u=zEsFhX3&E0jX*Sp5b-o}x!ABEo(>+SaFb|y@J^~}~9MvkE|ck1RP)`9S&pnrWZ zQFTX+7!*@IjKxbaVn4`=(4BkoZb&Ub(a6_{J()=sC6k;b7&7&bO8L=SeUAJ`(E5Ve z=JOF)De`%Mh&q9B=Vt}!_ii%ju5qgzH#4+rYf1~ht^vuI?g0T_^EPn*&}3+{8eH?) zki2d*+nSQ8m>VcQzgBF&{gqC4%G&FAb<$wRE#5SgEUPDe)X-W_8t74DjEvxTaYCxD z*PhET1(fwYnaLL4Ow_kX9i+?=~Tl#BP~{kW21 z=rv|zXA@iet^asPW1pBL>|rRE!vrj!6|}h{{iYrv;a1_{&y{1iFD7?6b2U{C-Ki%ui{=Q{gi3#Fj#&n)G+}2oG z6G(r!v_?V{J8W}gGrv#d*{dY=ZRIAL;M?`1Wxr*b;7E&&#y47K5ait5t&qwzIB)mw zE0ZLeGX7Y)rjzJ4@>P0C;~nYxUpx{q48{y^h0)OK!|+_9_xb4`FI=Za%~*2d8|=-T zPJEl5HN&S~`xDFndbp%Yxw2C4pz0_LsCo<3{yfL{#ys6pud$&44pF1(n5VpBnPNVLwJ0hyWsmXtPdgWrgvVrF z`JU6$^YXRf%>Vt1Fb_>Iw72b@AIZ?&;NNd!xVg6DJm3_3S(u9~U4J3tzdxBk ze;W5=&g5J*R`~Z;vaEBC@_(=$&r!-&V~sw>TnmO*#f8y-kcofa(g$(yH(Bph{%ge> z^$d(~#8SWNKOoiLtBJC}APNLTMu+olp{MO@ZCR|#K7bBHF^C596ZHp2h&&8_BOR=Q<= z5&j3O`n$BKIKglAdQwFGPip_6Ij`lR5jr^F)&1~-W2=a)i{;Iu^z#L05&kfWCV!$P zq^BeSqe3$E0YvKc9`7Du-+2W*-x@VNK_$V@rfI?=YIS$R(yy?uld$T`R=eQliA_#! zhM>gOm_r)>Yg)4TV1#@%Wv%<4n?igGyp*+ty8{0A&5)tHK3G%}I){AxPXmrN1^9@8 zJmvrPL1u&kBjin;;s1^S(E#`e-&feQ{~2Gt6O4nv=5%)EfAG<7$*oJIB6@eBfwtaf z`;FAEn6uEFS44|1H%CZcahgS3KpH4nekg@oF+};VVoY-*g|z|zD&YFJ!=&RNxMg5A zNL~a_z~Lf@O2|V4jF)27>a0ZbBgnJFR<0t*CDtuuIb7EZfp?-njqB;SzFgtv+of&a zU_2x)rxWGxp)Y9xBQjzmfSY#fcdm8e!Ri3yK85biFn)KYNl7Z{JvCsc%bqhwKBrOU z0}UA)XKq|>H_ANt?>;~wEeycFHsU+VcKt3yU4O3DvI_#y1UWTz%Wbt74nq>9KNh8x zQu5`)$fDB&Tj&m-;9xKTUE*5{OV)eG3@g0UVWU2{=nuzJerkS6OCF86pRd;JA~aDv zo0k~PpgB>Lv1!;M?R=Z6R5E`47!M#&be7AVNZ(g$AZ&eM>6xqB%x zlR2A6&8rR9WJ0j0pdc5Sxb(*)KT@_7={Vb47!Ba;zK7I6BpU2zHt#O}0Dg@^9z0Os zpW*g!S6;2aIs`xJ>;uBF#IaIBp0rM1EJLU*N^-pm(e>HAVe(rHSNO&6M_sE7r|{xD znrbPoITodTc<(J_oK9|fDqf@q%joc2F`kYAiGGE5e4Sz)^J;u);j8{Eed~Hr{)T}HCxUCrtpDXM#?HZ00A-jJp;|(k~9vXgIKMBC} zCx-JhHE>ex^@hG?3u#>V;S)uJy-8A`(_^+)<1+kii75e*PNQ)E7Z75fD$bBerSj-d zpRpLpN7u|YFQrvx640IEb5^oQu1c?AV!x8RsmlQEXEgJtp~$c=MuofI??%FlE^d*b z>xMXRl%y(wX2pZ&7!DT)>GD66H8d^P`myIVE|19rkfZE+%XE4G!8x$D=(Xyj?wg&G zj&gg*BS2g)nLBNv6?*z2!fLJGK##fdY-9MI)?x9z&1N2OD*X_VD@yNZwGrWTY9vuz zsG`Q|+j5rG_j^sdRe<`(I;!48G@e|bl~R#vW}xajbCUSCU(0{A8M%m4cN+fA37;rw zq4C=+cRXgD&f>YV-|zpG4oBu(U8v|vW)YmoYAU-o)L&IFN%koxD1y!0EMIe9Pb{9< zM_|4*W$u%#>OjIHDhOy>cs6lzb^3b3)wB>NtsaZch~;P_)xGbSJmqaJeW?4rwK(v& zWB|BFBruc|(^wPtVfDksV$k4RrmO>#va8O)V#_jH#ZFWAT01s>tFwwK)9Le=MJJSAd_qS^$6 zIV!vQx`SJgaHb|4FUc=UHPOVvh&%=Gsi4;DF1dgnRkWvQc@OM2qKtpJsFy@oy(*`L z8c&*!p)n}K!E{yFL!|M#JwBMOP87`^S>Csa=R=Ij@j@)Pak-81<~<%aB2eT6#hffwuL<~oOkQU;FT8a=k_$%iK+Ee%0^y4rGScrTQSS`p zIHM9HzXm)npVKRyiVtWY?jQw6y&!0-r^tYxP5~#DBF4pj3o=c;Xc{($SOi(WQ4;ao zBpZPCB@BJ5Y67f|8O@$=K7ZQeue;2J=yJFx&bcnvtft~SwPrAz3xUCJ|5eviGo;O3 zL%S!lYQ5S^;U-Ntr2OKSdn@{rYCT8)%s21k-_(id=FW^>y^ljN$5$lFGGQ@F1SZP6))-RNY9Qf=$q@A+v5 z|A-0;M!~#+VvzTqffrcj)$0A^QMqf6RFnTuGN=6s%jw19JfiySbj614z@aA`PgJ4G z+nwe`4mcmT?t$qmm(dr$5fm+*9RzB#UrM~EX;VcBtj&j`J!#lK9m9~nyU+=Ax$pR} zHjxC+q|DV7op|!**M4S<1E;$mBREAdgnLmRHqz+UE{Rx$tZ*o- z9PTVJAY#8I69g60@|#p_niGS)dP zvW4PV_$<0NmAAy@c>JB=uRNb2;Q@<_JkExJsaZj?`MoA74&9sr9#n#7<$gNa3@*!i zqlJb7dxR-qChbj{GayS`^^X@QR-J79R^9rAsSep8-?+b30_`s=GT6p=S0`=|;^FbW zG*3cys=YiorPP`Q6LL-0+afb7`ODG{Tk8(fYGK{r+OT$>&lA@{b#t>M^SlBKeoI&}P`G!> zFe1^w^(|)BfbBDT7@klVyZUcmHVP}1@(#Sp`zJyU5XOsdzc32nBrl^O&FKeeJ^F#s zdB-|puGQ8}pHd7@&-F&rS?C4-C8XLkx4=lF&sgSOujY12-JjLuhDDiM&Dg$58-(SPEC&Y%#{&uijzal2760QvJpytdStP3Afp5HzQ_qeNR}zB|9hZ`Q!E+ z>fr)_@2OufXkbzuI@GqosrpLIuQnCqpLTzQ7J6O^SoHNpF?q9$4JPuR5B9r6h@J{s z_E682?lP?FsuhoYF(LLw z=s3|Mn)a9$cMrvd^j2P%3+2&lF-+_ZXV+&mPz{lOR1n*`_`u9@@N7YP5}>zF&~&Fq zqnW>~zAtKRnXSsLwNfa<{T3k_K~^@4JLLXMQm6qoWn8jWT zU(%1=IMmQW(f#yg-{6$Bvt&<5uw==k!(t?87${n83~8^`{9J!CtGk+asOl&Zl{j0o zkH~6dMcxysOoqyT zD1v|S>ovb<_a^4IY&Ayrkf=8+n-g$sS>_veMEBetNB?R8m^V)IGjzM2Y=-xIdiV4? zTY{gMgBvQy()!v1$*9Q#gAP4pV6duq7Me*(&!g|g1%h9PRG8-%QPfylA=-{D_JnBT z&E)cPt~+j))nH$glpnOZFlotT2e%VFE0m(gn7 zWVQB1x_iY77=q$2UJV{~`UGN&hLkXC+=daYO$^Yv(*=7idCTl&0);GgRB+%_VtNo> zm#-DTC*t0oUFXPbM92yuc=Blr&gNlWe;F3=4f*zdH=MMm@F`m!@S{OVDhq)pu&HPZV=tPP<)Ju{u;SyPVmxDJpuIHxhK zPs?Mwv%l?N^gd8vGDjSp?nc&>HhCbSn8I4bd(J8CNV`bp)n3owuegBe*DeIp+=oRe z`TK5?+sTd0UO;AMvDj+!K$aVoq@ng$1Z`6AgJINL5!9aukC}c+;@K(RxYy)OLD**P~w`>42qFq8_Q~cBxJ~IOOW_`eqimpyULiYm-;jAP%{% zR(5^ny*#Jh_~P1ZcFSIE3V3#1F`0!}g_qA%u$?Y!OxHCf99ZgwU>sb^6DUdu-~3xm|#*JXW_1G!}b7{Z(U zKnPqj#TJx<<(V&1Wu0sixV$!5b-<7AbgX5+zn1Fp6yfC4zt?_fs!f1iCd(nGyNHeW679DIALy}}9g>5MZu^!j)N9}@(gGgU$ z+7+>O0#)m&gAop|AZvW8y|-UoN%aLNcejl+Nf*_4NjChx=w!vsFvWfVi=+Y(UO4Xs zf1ao&7QOX(6=(M)n8n``VeAIpaYle(M)r=wMp?sfLK(!L=^Z}AQA>beYe4N*s@gJg zHEt35V&VH#escyJ2tN ztcU=9x5@irI@xe*t=sR*MsyuRdmT;-`M)_wi=4G|3Ahd#XENfW=oLQ50b>MG@sX6v zaXfCED`zpEl9Q7?q40KuqWqWHv;7VcRGBzkBwi>u9m~IK4QXvPU-!KgXP3?+_;%n? zZZU$%-}#!Y$*W;ZALoZI;fiDwA5%XyK~RUNvZ zk}WQTzoxfSjb9&cO<4M#%|u2C6NY^sLJdWL2HmpA)IIioYCiq8rzMrCE z+j#WoQ9taZ=$=gckVf(rBPLAG&)AZ@U#?13$RaUx@#Kc1X;YipyA-1Z^L5TjLn-W( zQ`#)13GV=qJ3cecNax+ra=lw;T~9+dRZQ@_eN@`O_MpLGd(5z|(4jjROR1F8)i;}QEm5R{H8tSVGe3hYU7yIrnzMKx_4^0{m-8Z4veig1Bpq5mO!XtIM z2V5ZX8h>v9t91&(mih_gTkE9bb?>F084OaZ?1?018{?%Btk?rcnpO)R0muG-*6GrA;fSsJI)M+tD5VgT6aAWmem z568V1efke{)fx!TVdwDq{PDdl9Z`sXx!wF@<3}dLX!YHl)K*g9tm2XK2xtg}@Jao# zR!eydI~Dgs$G7@Qt_*GmNH^$=>2>TGwRh$_N%?6A8aoHob0co9u+p^R|yZ~DZ z$O95#aAqbP>tdRFSBdEggHfMaG$dTEkySkw>TI4hwi)oz0h>*y23U+b`%P=ne?ZSd z5)VahLiN_0*{L1oMRJAQ^b%UfYa+(WF+*h<4uQK(wo0~;xV#W+UG_M`B1 zh`KH)m|of3-|^}lq&>=^5)ZvTCk(R$oi$9iH_Lrl{ww7CUhuLUPf-6=YX18@#Sfnk zDb>zYtGAg}fG94s@(W~HWe1Gjueix&iE7gl`g?fz0*fR!+Wp;WYekM9SW3kj(Evdz z`;O1X3f`cQH`4zgfS#LV=-OS}g^~BCHIQumqWYs1H0x}&x)+7|r6wKi3-^)I(LOvy zjkDRA3f&;B%^MHQfYqxRj7oE>+7H0nr_ip zlv3h17l-3`wBqSr2zcFyJ7Ro%9!EV8n)@UUa*)2qayeQ_gtz;UIiHzqw~?ld4>Gje zQ2@`fiH!%yS^vjnb6f5w_Z(Tp{3o{Zg);mAd^8Hc53!&wZ#b0CR}-7$w!H$j zs^tpw8jWNK$j`%Q6lk`LZ468}>nvBkn<$>P9RkBlIl!PFB+=;(s#f*v6Yxd-Y1#EG zg4~*dS~jCL?Utg7V5v7;M=s|hHAp$4I)h)oOxhgD6rs7#GnuZJgw8imW=lkmnSOA3 z$?1Nl$?kB#z;1PtrxBIJCQWcF{Mh^pl{O_`pyZTF8O1+q!?(_zDzET)wIc>nTUviqxbI8VtO#IK zYfjFL(`Ma!@K0oD{AN_IuROZ7hdg#>bOiWW(5ve@m*Q?4a;=NYi;)QM#tJTS$tCpK zJNvF0RepB^+un&LUxg6CAv|{7tq32ZqIS6a&n=dWL!0M;Vk_Q4PwO3zb5dIB+?;dc z#|7F;)4f--6BuSH;{Ok=_smV;i|VrU%`l5iZm^q`R?k^7`u)T9b*wliZYx4Au-n8_ zvrOVNf}~3@>S5Yeo6XXr;Ic%5H0C{Lm0g^l#;#9gm znLjDYfKy%bcFXk|)vsbSgt^gibEF^?SkNR(3~k!aoV?0;?b=wpP%K{{`_sw5l1iS^ zq1UOv)Va+Y4lv99t*L;e#ur5mRVmlSQT7f_l6$IY0IN4$o0tae9sb@|@_MqLO>+=k zc{Vr*k7a_)8$W%nqn^iXSM(K=NvXFvchp|pF>KLt8}1DAqS0Fei?9N;!kta?%knM` zxsd#Tx?+tA#nc$;Pu)vSlSQ*yKekrR@Hz2|i)1?23`@2kxA5p1T*vDb(1fqOA=j zmvSqs1V3Om|NQe*7AG22*V~<2Y%!Vpcy~!@({aIE{5lc^9q}u#rcq!yzHN>BE z$+yAr=X`usl|40$jS!t)>3%o4n1UuOwi+gE=67`R^2`yw)T+og8M<46p4!zw2;oI=!(3(Vq*2KPE!)7Y5lIc9omo zm^;MF4_52TG{eyYclt5w{^dprw8%KPuiIE|%C&>n_7|9>lvIFABz-q`Pa;a8S)a$WPyq}$w8 zjLh#GiQ?w(%1hugxeW>V(uUEbOxSiibYaXRk{{PmVTj%>5)zflZa(d(OdU~d4;k)S@qnW>ZVjR(SSoHCb-h2 zNT^h(I%iBpx#>})8fT*lRfZQD`QpH*8h_#QpCZXjCzIb*w{2WsbDzC>Jt4kXj%93fB0@h#7T zm!XYs>HF3CKzX3ZgzMcJ!^_npUF<1LZO6Ad1w&;27yERo!dhl-_b(Qh6t=y5tJ%zz zj*7y2hTV@3A1;xEKum`5rCc>Q*5-nL!^%2^ONBYIGNkVlypRfG0%t8P!QM(Xf~=99UU z3iC|nN>wkz_s7Du?Dl3zci2oSe{>klt`F9zfB!6)jr@Y)@uwRG4MZzbe*B9*Utqv| zmw|2f>B-%k#fHZYBHcEXNSvsWoaUP`JRXu?*-v832Ar#eXGpziT`i>4AGg==zDWJVZHE3m&g0=x!jXo{K^sDvJKFif@+%dN3hEslwv8Y$=v?WT35_wt$_`?8&q?8I?9+Z7ns zB1hAx$Xz#oj;HagdFzlFCS#f=^uP6AM6yK%rB@fS0wdiUE%$f7>FES~T`6q0S#1`% z)l7?ZG_`XMa843LC~-kyCEJGBb({{f#-`Sb(D5P?QF93+y&B?^8#V`msnc} zd)lt3lKhnoU3`avHqS{xl=O+1yoC)^cO(s`z)XEFZLSj(6DF{Tr!oX2g9xr2xobN}Wt!?00691H~D%sSq z?fnD|Z_ebGC4{Fb$rsfw#HX~P`Kirm8*1@9WS=^kMlme0#%#+MCI};+G@(!? zQ7+!6!9nYXOtXu;RH)A1j*^FI&KE?!sL;ioRUo+8VyPp7R5+j=9YRCEVfTV1fQePN zy+PviO_oQOkZGqU*kJUVZKCrkf4fUr+!=5JR89Z(We+@s^$^ z^I7uw8>Gg#yRrXw>bnGZD5>iumEb|?iWC|TwfkAt&mpX}3NtH|e*1IssT=*#pWNwip*7fmA?ypJjlq(exd8-85Y#h7QUsw@M;2}2KqcNbCy@{~LI!mY z|3?*Bn%na|%|eY%>;B6Cc(-4O$W|wv8 zRGuQ8W|7Vkymah)(824;ypPu~hdU+&8*Tw$tO=S+NK(ldG!r~-o_MS8&Dhpkno%h` z&sp)0=#71RmH34$FrSo&xpdmONI9Nt+#3yTY!U)Uf^fJHu9X8bD)HFE1BM?Y=3Bet z|3r{}+3+zXs)WnY<3;M+omLy|?)MF8llWJc2)Os?c(6N<2UP_(4t_s?^UY!AFF-j( z#U}Rw8n|Qlyq-7iL*jI=mS~Wfm=kz-7zl^V#T!V~F^D-p|)wJ~5c&Xh7?`STW zFTdV?zj=YhrnR+Akwy82R-w=!SwxQnbhUd)e~j>(n~bx;PeT5`V*(`8sj_pVSRZsx zn~cVdwtj8RYt45^c1~B3DU<8}vswSiq{BRd`7A^XKNCk{ke2H2)obBbI1(_ED-(4GQI2h_o#h{ z!u<4rKGAZ>fv2;*c_>DWVJjtJm!G2r=Kp?jvoz5JHMH4X!r@OlEgx(#q6_=V>&yLi z1Zw$Gk9Wp1zZ9YkeqICKK~-vxWgqBD1K6Qq<)AklNdG&{9&m;8+qH49L~DsH&Wl@2 zZotNBz0U(O!`vipXALV*93@X>pa-`b=7n(7VED@FY?u9b^;bG+1dl6+V~cZa7;VM7 z0eDu^1sctv3)RUImXX_a+oh(GmiuOvy}3r!b4bbl6Oe%%F%F|(N0LiWNW>KWG8K=a z!hu2vLm%tu0rF682;j`*LSv4-zyV{n&`3>qav^gD!1~Z@YbTc`&y2Gh;Vsc9Ak1SdVKuL` zVQ<=OE}1G^2WQ*K+}Up1=OlIdjlPe6UMS)t)j84+p{C#&T|!!I*32FiP-Qt)^)nm% z>WOHrMm}yAlF;k?s$+ZEE4z{{d`dIpRQ&dWR26YCh3^1orEVj|mfbhbLX%d}p)Fw+ z7+mLk+=`fB{}YQYqQF+xI(w5`gPC)H1Z$D4e9;-8!B4Fs;OnxSR=Glw@UFPzc5V>i zw#+b4?C2#5yj0S~XH>lRc_PJ1CDm0Z4X!jyYt74hgAy!oHHp5ngX6}NyT5f49=1r5 zj~+PZh@`qtz}##8pfx_spP12ft7r_+ij<%E=ND-OALBVb#m=|fx9TOA>T3Yf<&d z^ROGX?P^?>M53^G3>`g-W+6Sb+_z>JOl0+Q+OE@*7Sx~d6&qyUswY>w6+&5N$+2@+ z+WT{LpWQwMz9HUkoELtR^l{s&9@Jua>)dX?t41ZN^OnYmKX79R*BM50Wn$ib?I-(O zZ4$}LY8oxz8;W={0NEQ|ke}=UNoH@qg7NCqAy$9US|yoOl=7ZtxDbsZ)y4$nd^#K( zr81vM)|X2wiY<$vpz8pk;_ES7KW^u9+L|A?5sca&9E+za3ucvA;200A@(gIZFdL zRI5w~3SA&~-puw3F3AviA4!|s+793QcAr4GMhB)RUAOIB5{lOu+r-+vzhtcr7Kx3M zlGv@44ap`7=ZOS-gHi30sXA^n9nvd<@R*b_$;JKXLUkd{yhT?CPgg5O&%V{{7qrOD zaN0UTmJ*lAau)BELzpe9eK@GI_@!!cUGCKkUR~9gOw*^L5)gOzqLyy^kRJk~ zoNH5FpiDAIr!1!jX3wi2B59QyN;84!|)oRGNOm|c?ITV~jkEWJz)aDJawh6Fk(_AxvNE5n1t`5{%#C8$V- zQCgqAlhXat5ka#y&aa+Cp$?upxV<_H0~|OS$Zjhy`oT1GWJds>jbH*gUNDJJ(N7Pk zblH^x+P-=`O2tV|c|DiNUQ7+TFne~@~0I#y(Yv_?Qr8b z5ZGHWRSPRtZ=g4Cng?Ba9H%i$7Kt$gU2MDsYTg64)OTvK#(2&o%uw17UaY30GWE@~ z8njC<_q&4=nHPU+&uoVrn>WYP!trbcW_d622uwrjO??&bnB1w3K#J!XCqP8Bn4S`p znz~O7RZGIPb_;!v^}y*QgVD4mb&ig%&3pR&@%VmpG3p{ZrvDI)BOB?&zm(-V;udWc#5+3yG zZ9-ND6L>@dd8gCe^)w3|?siJT^Rn&*ccNaO9#HV_jidIC_F;kl^GHIi5MDlMDt;G8 zh2|&AP?Z*mBmji-kzv%@P>Wi!1wO&3ah(|GE8jY2Il4A4(Cc5d>>nqtNO?pOZ{yw) z+Nw_42%9}09Yv$i-p>OdfoS0``wMUra0p+1<|+iLs3YOl6~J5Cp)Gl5=P<>*vP7I? z5-)f4d~yeBPpZ%#mE%8G+O$>19RG0sv%;c9Ro$K?Upw89`C|#ra>UKR8Oviwjr+<>Rsx7`^lFULTlV1{=)B}O733VP>$D*1}ZDhU+=cuoc* z%z8`gGlar(LW}-E*SK+;Y&kV?qmF)77%Ey!K3U5F0V8!3F8#Y4{rO_{slY-|)7mcG?<-~;-)g%Y&!75R_@1#L`b9#{ zlIi7|zeqZ^0O!3sK3c*1W5}ts4_H)6TglV`38l)%@fC48J zI$S%H8;d@EUUtO(I`3CO8`u|Gm^oj03q_!5xD`>TWs;2dNS!ntx7WvcqyU%RibNVI%&c_TmWvlKM>Q~ie80h-+5?YTT6z6r6xFS=w&xp! zWC#eb6OAJ2iW06?FAw>2eIzN9)Nb5+?ma)|Uzq9oXd{}I-|e!vTRT<$`N$% zU1S_Jhq$lhUcEE`1A&633woDfuPPZkv3D?~FfLlXt0F1aBf~~H8I2jw{aGfy4}iWu zuv6z(g-#F=nzcM{uDmS*HX7`rw2gEqz6pObnXUe0)Fe+j&_O1Rk#)jRg20&E*?H}> zr>ZsQJTP*1puIjoiquI4tHPXvSXo<8#e-gZ$Uoh6|JAw}OWG}Mz-9MRloUcgv~k9q z(;)(4n*&Q7TCk`H$z-yvgt(16l^_5$o~6C8Z2MAB$am+W$U%cSoYz$@yy&(pRcdkU zdl_iMfYo4yXa z(c;H^yX6QW;DlC-eQYT49m~-`pL@YYC-(q8w|)i;apyp?Yk*Vu9l|HDnraOm{^loL zy*P}Vs1q}px=0*|KTc+k?vJKX-pUi@%Dmaf5W(}p7jaiR_*AOB56T@K-$Sd9IPINg z+eV|OaTr`@PD(me@`dw$YIpP~?{y@$-YgjW)({SjCz_Hx8OcoR%E}pzr1btEs9)2B z&A3L4kHLd^xI{cvH>Pk;6)1L&EvvhT3*VL_+ijHp_Ag1AMAW0083Vp|{UH_<0NpVl zH9!~S@%%YpTr?xTGpQL3i*STg*aOJ1*jOw0O5;tRzk1RN%S-fxm`mgi?eA!dgy5Fg z%ND8SH|okgWuJ4wd83gdK%W7NGtFxD{DjY|@q^FP?U(z2$Nh_GDe;|Yw(GB@S$7cP z_!qrw1o={7e9Ri*5|co}vGgW6^P7=OH_E=lk=qdOwx6 zw(Yt`7n)Ume;>_o#Bx@Q%Epj(>pYOoHg9?4^l@N(V3G$(Ia4I$B_3TNc?N$Yq$tp4 zYo_A|&!nOK_)^E?{@O!LKUdEJh5yIgS$|d4ec@gal#ouPyF);_BqXG}8f0p%K`BL#FDHM}End8^T4c{*L=J2!iI;Zta!^ zUBo>=AVU~#E$Yt0@FX`q7WbnEq?9O}kX_LAe7hLiWU7xx9Be4~CCBDEC`+`9%H4U* zf`#m{Mu=~+6Pt&H@7Ucw)@bl()SVpH-Bt{7se9<96Y^{tyb1 zN~!vJTOt^nkwPKo^Mn zVp3>d)ZilW!!hRo%7??$FJw_VNP9D03mlj^(5&xD*4@LVyIBa`%xY`|N;|lE2RI#b zg#Qi*oO!n-*E_9Qtpy^&a2XHcwH8hg*khU~mE=>AZw%hjB10BbieIUbdAJTi&L4t_ z%N>1@Tv9aR$uvh;??|4LI9fO6%^D8pca$G|ukQMa%t+MmBK~|Xyza7h4Z(gP{S*`b z9J5%QUdKyArf8=gzYT6 z#2Pqv!2yV99bF8-24^E-JuCs`_^1K6Av}jc=Hf9lS&J(cCJ%d{n)?RVaSeSM!UQ_COQ51{0VKAAH-VWB}=L;6&9sP?c z(TR-pFY8^*V8=H326UIQ6}}^yhbe_f8C@)bq?S(oqGC@CSsof8ym*z{n@y0;%H*q(XSZ4nX3lL*&x$WkN;O{ z%}4bukx-qX50+E2Knzogkqz=mc4w`YZYvw18{hCCmg9!q#+97Sohl+4%7N_7?UTx7 zq_x|n_O3_!TdK4(uaNmOo!keP=Zme!bN;2*+qqHNwT<-*O8Q-439QSg zV$t0)8ngTSu%EJD_|^O;Cib$#=+SCVx^!| z9JC~~tAFsx>-1%anbYUv2L;$aFAzDAweg~{;%59EJ9y|&;MFqm0GRwu&;1)kcPZnFuBNOPj&1=|e`0&TCJqCc`h8g-<$K`yDjgaTx)midMc-5gkxToptmrCH;9Z89o9vnCAdw8O}0ecd@?rNpURJ0t(U`KCxBdj$y#F!%al|vhiOblgwT~2-f97v^R_PDx> zG^+7C=W0FBF`b@~@cd6|BnbSN6IH+Lw3l{c=XSF~&RHa%7T3-!=i$Kaea{slZqcqB zX`qIQ3>rXb9B`awC%tjZ}1S#diBdttb9fp$T|h>Dom<$ACOdk6lMf%*obVGva)OaVni^r7!^v_D>9I1+j(s{Xh;-Y-VEY zNh=BG#f07*Kg~vef>3W9ZKfCY>h_eu~58 z4!hhP2(;(9<3zFqX5YJD3~Idm{mHU-clFk9HrAAsLj++EIHFg60F|KH>#!ajFZ@V= z9aC4wewI&n=REDhW;>5n$dT#0yY=b?hB8G>dU|ZgjK!S+8UyL=qN8zFdc2M6iv@E-PD_^zR)J7R8JDbByD_`z_`GLgp+Dxu2&F`my9-{gO}U7N zC}>;_`5bBTCAnF%30Jwh^SyK1-AT9?ERKn2WOW*@DO533Fr4m|Viz~6C5#S6D z5Lp49gvY%MUkrdjG+Zbi!`$tt>A*+N{eF`)NUu(a+z`c&ZSGBac>-f`ZghuoKb^UG!-X9kiXh?q6D>S0&H+47|>IyKbLp)CRz> z$LV(jOSH5oa`V?8?mNRvfM;+oTrrrr44uqMY-(l8M02 zlW^lpy!{ZA@sCt86fU34UiKQ75H@|4>ApBxT+?>Yu`8m_Kqj>3DC^j0^5^5>(>Ww& z(^ZtqrE4p?g{|7-bu+UMxyj{%-_Rz@?5Z_utmVQFK`gMf^X2`e;nrkcJqVcA24?Y+ zwYCe~KNc#aA@rD3Xu5R$db0aVNn>-vi(g}!n%@;R`aEyMc&oD7OR@04cMO~n!mP@R zpeV$MKB7?NHoQ!8=65}jrQNsofRjp!IXkGE@@ESxi4|3~IX^y*S}$R(DE3-mYz8h+ zDn)i=vGf{x$?fWhMubpt(Qo|x=mtuQ!*RLgV;ME*Zuud`-+de$PrrU2cQGUb!?L6h z=Sfj<2)~M?n&f*h4TM6*Sh^Qb5$Kwexrg#MXyo$rMSQ+DEA^@12S)^k2W3O4pw^qo zm>6*;uo*@6f8~_QS1B<44x>PI0D%S#*mSy%J6u2UOukt2Cw9Gw-Rh>CR*uYm$^+XK z7)Vb?^Y)X}fv8KPtAiwq$B!qW5eKtim7vck!L>r()pzDW+`-?S7_dJk0^-MJRqb(@B3qpgm=wB8nR)yI%WqcuYB!WR{&?1p&3 zGc%oT&1p3%;T6oH2_eN=s~4Ft6)T-?k1Jax?r_!QEm|#cTQw6K#UPMCH?zy0HPSn` zIOn~0n4{M$T55wa##cU<-n6fZ#X?dgU z@+)Jgx53I-gMk|4)#Jvk8pu`IANh=3?^RjVY0kp)U%ciAnZxGi%3j5270n4*ce&By zB9o8u)sAD8U-zHKA(|DMZR6w=#8*>V>$Pb-tzi$?NXe2;R@b@S8ZjKTz zg(iu3bQ6dBI=|$WqO6#Vbt;Fzl(^Pz!+z&VS4S2e`?Jc|*YIG0TC+~Qepef}^u}PK zxX~6UKD750r0L!LjW}3+>SqSE+(uuNL3poE>+ z3Sp!D7W_M#z@ZwgmsF|Fq$b1Pu#9QxdUf^qJ(vA8>)d-3#~4_~#mUG(;@9MK8rbBy z94z|W#rMaVO_XCe_3tltgwSLNzg5^hM71J+&d3TW)L)!&k{3z38BFF<4d#wEro#*H z-KW!9*uw+S)3tf3y$?E7<}WN9y1omjvwC&NPun2T*2vA;c?unhCIwr*MqF^^{W-l05K~xY=-QW!=NhGURR+;wb zre*8hun}#{!kJiL6~|P~A-j=g0_j6$qbLDXVp>4x_Zm#vx96tvfnYcZ_xf_9e3KXH zg1LUsStBqmog>0D0-d!z@9`7(@2KwkEh_F&@M4P+6p~5#GajSYFA405j-QI)vA$|m4$&8Ok1{0*CTm~UP`;KH4mN~t9G?CJ?~0Z zpJ(h+yXf{a<(l!Iyq&k9C&9~MFtFBfm+oz3yl8A{g0p7;*P&ix?3Q}kYmgT?^ehpP zPW@dhox*qmy)8ih0w*_GX+#B|W>gaSevW7&Ji~SuL~CFR{j`j<;872lxAWZe)3okT44DXvbudWF*}17a5W^0(r~s)6DcZk z)Vb+BReNuc?@IdvRo)MNwWu`!g5tuC>uCLtpU6?DPGDm6pNCXdv{=nhjZyi%6R|nP zx0O_z3k~@h98<7X=ZbJObs*zMy+3#xaE_&BWBWG1(|hthO=}V(r{qAvS-dh~#`nL2Dti=;?T$ z7Op(ak~?_>s`pioI6ry(h7*TD^Pq^#`RL>HJYT^TU)ODb5}}m}71<&!^ltC<&vc)+ zPo1OXOpvef9~yaSo3{BwX3Yv-I5<_fJ%2qiuT-pv*b^vXtka z6YB9fBn}E&I)O)}LgKyc;LiJTCtCT$T5zF32B37gG_yHw zblr9d^Fmfgk1*GLtK$7YVZ9FwHvH}9go@KkfbW_i6wG}^sK%%tMlyR%x15bs_;WwM z8%Y*+N!s+j;e)Spd96#i72X09h! zviuE8dS>6%arSz@hFw{k_`Vy=Q!uWCBAi}UuSVB<{9vq_*>HYsoo1Vkpg3QVtGeGF zh@6qd`~1AkESUSI4PkYt9=djR;i>>XmdNPO&;4D1NXQeBeOx_hYXxb=1MurrfrWhA|Z z6Kor*;N{1H*-UM;`n|zAoY44gU4z8>VZ1V3UUP_gqT!oqx(D#3^^bO0GnKXWKiLxU zw8N3-Pl;_keaImczPFhFV3MUpKHW5?UQ710HY`ILNUs(BzaoD#tJbcA8>g<3pOuS$ zrSMei89%6_fNH9USHO%892H>&TvBfb?A4lXjKyPl64Z}B!UlwO_Tn%N;Bdl}P(y0! zR7SB+f9j=fA!y~$L8>k1%Nbru@J74UgEY+?SBHK_=*|R(FgNf%30HPeMT0}V_JUGT2n&A(L8H{)&eZa6E-fDYT=6SLeF+TXu>GjZH&J5k zZuI$W;7Pdhw0C5@6lQExg6uId;1Eu{DFKLxTnEfKjiS3A=~hufhlx zQxz?zNQql|W+*?5=QbKrjxg0;jP(UW z?!QCVEd^Lk{ycPAb>GaZ=|`F4lMMVwn*{@Gm2t%BkOK5WarQ4Vq1QNhbXF%{og_}( zv$W@b3AQM*7YhR9RqQW=&K;Tyv_j2O5tHN29d)(&?{48lMV(X z-LDwGTq=0soTDCLeQsLFOdTV?snpsVG*N;zAQ4A9=lca2FQ3G;-Vj+IY=2+Hd(+N= zf)7P|(en7#a51O-^g#8CDaq1mcZAd}A{FCz?R??@^9Y4DmLcIFw2wInq86ohi&2k- zir5L>d-xuzIZeDEuVDXlbHxF$@WR~wfn!I+o@eVfH z)tI`34Zd6>!c((Utd4pOAD4JZiK(zZMS>Dj8P$@#7`kj}PE8PH-FgX16oH@M5g#sR z=NpqQ_dsOA-F&z3<1}bw+?SOH@V(qPEh62PZ!Q;aEg9IAj+_M;SwD62_N6kWI*K!o zw7e#X{25y`BZ(DGhOz<&oOR^qcgFSH4x9h+0+{(~T#_>PO(G_(+F1Dw2D#-dta^16 z2XqJFNExGUrB|2mFU2CgQY_up8_x0fBH51+=$BkiIur3v^k)yubqz7j-o+KiTavDQ zLiw86DJg5^;5Bx;lKv#bci1j?7+N=6yjY;Q9sVNEaPC8qfOP@U4AR zI(}b_O`RoMa;03PN~2W3am69X*@=|aINB9+0f<~V-D*p)@0E(B*IHft=*tvcq-5^6 zD`tA%zBbFgoK&K7UJ>TGqWSR{SVP5PnyO43(4mFqESJ}#sh&0`a*H;5STl6_b@~!E zD|lAS;RWwb?8q+KqYVW`DU`KSFL%y#FgB4IC}7RIeLO2=(xaRP37|yC32NdGS+N#u z*rfY&{;eCxvsgyEYey@Q4;AEAniX?v%gY^Kv@UiTJf|wSi!0#zG$9N1gt4Z2`BA)X zY~L}jsMH!w%Ray0Rcu@`H>v%U=C`HendOV!|6D=mOd?MSM<3P~o#@2S5Kh0yV1yc$ zZWCa^aOc@_O9`30y*OCs5B_c`NKnP!D_}LbHN^%~km^aEW?jwPd(b;6CFxx72)(Lo zhB%C2(~T7$4OHq)C9^wKg^?pyIC(7 zdU}-52)tz-9`+#~WgF>2qTc`&X_;fc+Wo44&NwWMN@@KXHDK^pVc}C6o6#zyt`x!u zR{gPd-lwTy_|w~npRT-^g`H~U_lBo|6+?Jk^?tPL^;r?h?H=#;r1Fcy6VwcJD1)CT zdFUt0IvO!zGSfn6l*X)KVjBaG#fY*|4(d918?c`mVaOTpO1L>+Gw+o?#-KYm>1 zUM}F+K)YA;WBc{am}@Rv9k+EVn}fT*p!Y{7?LZ{Lvh_v0VU7lma(pn7`YBNiFwWz{ zgIR!uBB+}<>vbS-b%L*JQK$e+jV?FaQ%q4^l5l`6(b$7AgPqUt-BkDCcBryIY3;z} zf|D|bxPNRv2>J`*^N0!k?5f-J)^P5NF?AS8q=QF@nII8 z?#(!zB#J6{pNgh*vkYNW-hQf;YZ%MGrOD%2?}vtSOd5k z%GPn14M{;#Az+47tv_sOgl@X{l$FA$qg@0|s?8(3MnupvY3%J&Nu%TK^vgWHn1U7zvUSFJUhhjwkpg&eB7zDtL!DwMw-2fDUVk=9R_v#&Eg; zdr`ywRE5le4Hnh>6aKA&vw`k)&2OYD51w_q3W7zT$Rp=4#rSe={MYqI`Qd%^PlrzOAfP)eLsV)Zurvw3IkqrQ@6 z?&r0@ZmpG)%;ZjDMNDq?d>65ZqP$7i>!BAmwdqrY#gAceVxMZH1wGwclG}(NHcZetP-z1-W#8}8I z9m-;8?d4+&p>wVgs7xt&FO78GHk>U5#Xj0DxctQHDTHl@C#>FX1HVR!SEhKV(#Gle z&Pxg>?q&v^!wSgD9W>p`9FS||;e}q#RjrJ`X586Y>ZTVtD&#jr_#Kck8L0bmyR}k)o~(DR|^O} z!2Y8ziCH2C?bkK7Bf5CBHrBJhve&STK4df!Dt9+7?K7IUtznrYwk`x4b0d$_adhPh z)o^x9+?-BP%dxEBlnXWKL%h@(K$(pgpfs;7fGAw{#g>$>Yg9`gcqkMKQh?#4PwtcJ zfs99sdh{^39^QEA6NV2}G^{FlJ$KIES-BNp#y7cP0BN|aqc7Y`c{>X?k!CIofSSw) zphm9RFY2$9;=$9$=8^%3$wZSrV@)Hu>{sDoeDC{{iUI?y+(Oo+G7RAH9*Eno59V%P ztsVvbRRiu59+c__jg2({r^w&72uZ&h7ibH2RcjJiP4sQ5t;eo2%SFMKF8LX6R8n0HLs0oKthA%fACmO#n%A1+P_(6pznR4wvBQ*QT})nn7X8b zOz=U4!Mi^bwuGd*Y)rvDHtTc5Aj25;{P@qrtUkVvw|9#a;_VF{`{$zo1n>z2ryx5p zi~gJCJb-`fb^mBi#`mHLJ2N1-Ud0n;62Qd&UXFky<$-|OjMYMINe(ax^Nr`5(>=~y zCU_3V@>kRU{Qz(uQ|$par=32DuVg-Ck|;wP48P9jQ7`cHrGFQE`}@O0T(G*tH15+& z1O{|_e^HI-qFweRJQSFJ5&S5((8Y7lD~W{fB{`n_b(t~`o(0`e+u9{=OT+X)yHtG9 z@i&6;sS1tVadDM^X0;lp8U^~_1<`Z=mtO2|Jin8 zM7;n>2)A9u`|`&{dPDP20)q^@_vXJ5_kZyLIcaY>qYOOGXa7A#p99offCyc@ELSQd z5(sfCtO;#^{qGS2>;`y&xS2P%H}L)Wt}2+w|G)h#z--RA`*;3>UmmkV58gTnEdw0X z^AJj@t>$o995C>T+IVv$+Oy7K^hz&!4{fj>ob4VUm@v+Z%Z>=>!&@@(W#~vIpOI7H z4zdQ0rksQR}B+gY2oz~5#>UEK8JXLM@YPfx69&3hH&IX^5eJ59hmoS$gA6@^{@0?35Edg z6CP3a_@R3N36OG$8skjWezY(gy2KE{z6k9nyN$uV!jk)(jh|-&6JX8j|HVa!1g;sS z0#3k3CV@FZv&mLeW5MIs2G9!h-{G(9g5F0G)G}9pcQmkDYYU8Xcm+YhrEi8kXc4Sm zyN3!UdO)q|;_Ll;8$!^=a^FHR)$n!d?A7=n{Hjh1kYqN?z(cl~cG0k2_J#hjmBwFJ zuc;Mty`^(xQnei+v-A(kGcLPjZ#Syn>|oGu?bjnH+4-dnq__lbr~QJC{HC>iX_Xgu z1b~0xaexN$OiFqkE82>tucT%Z7Ne;n#)EHZ0-Nu+%tJ9z4v6Htf(r+8q*Jr%r9sLc z2+V8y^ho^nnm6t%CbgQ}J6^Ik1*82cGNbfpvRSbz2mY@GpMTq?Sc?+LWeC)t-adN_ z$^S9wP6K&$Hg2sCp87n6^#()>B%d?vH%Fy3Od99B%pu6gY!B+MxQn+tD&!{eT>)CZ zI;tdMf`JiCT1fwD9*h1l{o;3kZ#f73KM5qFBK)4%P zxlq+YDOavBKjtk7*A$7V$Q;-AQ+FV5qN0?(DH^%?J;Wif@vtYbm|JF`*G)ihHXbbS z7@*wF@xLHoGi+CZDmY(65Y{DbuNXBvI{ZtG#trpVmjTZEV3oyN@L&Wym^6j|9%s%R zUE);6Z*^_dL>U|B+eJK4K!Vl`FN*@t)DJcvNqah1Q={AB=& zbJc?aIbt42eVJY1WHKq5fKAwzFBQ0Ba#-8_UPWE*V+^-K z_H(3LqBew1KURxr*>dB)ZCOixpN^aEUk0Yn-tYs@*)`qX>c(O_SD^1%10Kj+^`>JI zgB{~8!jnLcA?&z6MG34}$PNsKqPXLtsTCw>RA{VD_ZcF%ouu~|{6zA>`X5=m?`W+O z^V^+yapZx&I@w!U1#4ZKL>kz~9*tzUL~`0?m$JdxHSSDUb+^1}UjtGoj>^`{B+i8Z z@rc>#dzs6FOqrr;sO-$-`m@c|4fO2pF2b|Or-<9}B!?;yHtU0lB|}kU;&gj6jYct3 z=)k6m+4f`uSRLXg&#i~Xo-NCcJiFuhFh*U-!Szmfvh6GXZC}Z1K}oa2CKiH}SA4VB zL7MD4-Wz|4Axzr*3HrsyD+^wX&~DvuMZA3v>oPcM|5WP4hM;W#Ei8&2lt?f}Fhx0*=@-^v(;rP6>vjWIbZQjeei+2avw}`dB~n8zs0Xv zZZUd#cl}JMyT{lZzHsZ&+S~2%BBMw>K45&KGa;4C74uCzimQK5u;5c@Qd+#w!50?C zekPZuA9l(tHHZ#7^Ii1Z1sM_;icRNlk!Z20tiL_%N(9VF!3y_JSEeF;q_g{gnI5K% zdU9H1WL1)~Sk7`B0Z!p)Jh5nYP#i|&S6TPYSP{KZjLdnG_r!X3sFdvF!pfDN|t*WdHaCn?Z1yRz$h%pNFtc_>HntJ7F|-wrnRC}8N8 zC;pV1qkkDt zbc4*0`f1tZC~U?LR!c>hRKdK3;~zyG(SSf3B!juzOX(c|j;R!R^4XQcs8UJXPV?K# z9WTcUD+`3dzt%G1UY%n12NCW%p%*d_yBwk_l(cZSzqY$XK2($kLt7)`@h@1oKAKj- zr;wE!4Uo7g)(AP-9u6C+WxD^`BPN&|a~Leqx)uQrL&#jX5av!9ym8x=g|Lo9fF|2p zzPzfn@QZ|oL-W_>|NOcXy#RHCDUM?f@7>EWrQ*@l{>_f=N5k?f1+F z>vF+ji5hnl8J^VS3aRgvUK`Owaw2=e0uGih6%dB9?18SD8D*iwfC4o;1gd2J8_q`bUO1I=^oa$7KWLuWFpcWvzQxy{1 zih1@gW{rUBZ{~=NaM1^c2d8?|4nk#M)Z!>{X>0TyWRYpS+;l53-8k|V5SpFx({f=QNyOp<*nT%ZP(_|vJ@LFeMV^C} za0|wGvqUbm-BsHUA+Qs#J$8P#i_Ghlr==hiY0xF@uUOc(YsD|0eUQTFnfs&y>S4#|&o`MLOpkf_R+I|?Y&6xfIi?u$Sl@izA>veZ?>9ux!iSXcvshs=; zEruo*S$Ve7#1B@ZJA|e>8EkuUuld|pb61B_*(W)cdYqLys#94uxaWXImS=UeKt)5O zxrf;6-b2Fk#-?m{&WT7;%fP1u)oNhqqzf3S10o&+N?T#JjC%q37`vM=k*#1NuWPLm zJ}Q>n4hwUOD30}mtc+>niGDQgAQ&4Fpp@Q+@$2(@YQJZQpQvXujR=H3hJ8Vo(e7h6 zSCx6mmP<%~Z2g+5a6@()RV%}4XfT#J?1p9IPHFtKKJxXu_u`2ZG0K}EnDlgZ>kOk7 zS7*B!p4Eb35=*9%>k;1Uuz(kko8O-o=?uLWbgH&qLTl|}_ynsUM}2I!F;H#1V}Enu zd2}e+2r}IfS9lJZW9@@^of9)-%ZjX>_kLh=(H%)nYp-*0XiGn2P^}S~N)|jr2jO;t zpza=RBl@@vo#dsyyAGSPcXBrK39qoys^5sHD5$W~h=PfTL!(bJTdnRYtRRE)jfqz0dv4cv#~yvj916|X4Q`O# z1QzSl?;j5J6Rs|?ZAS*G#o{UkqY!Z$EqJ0HAGP@S9bNA?b4!)T1tzSXd&l9-BD-TT zoLGJ8L)1+3H^^$7AjjsAxNca$?)D4kAs=eI_}FmO>2~xb_@31+jDTTxjyQzNfbt?H zdX@=0jMxf|N|gyv%pKScam0Rvv7{Po$X{>ra_qn8G4j)5(ucDIXtFJD*z+o+;9ceB z^od^RcwGUElU7WW)0;{XlCg>u6OZ6>Xr& z$wRD!c$YO_cJ>VqFK-*^AlG}MFKPt>VWKzmaEw5e%4{6NtwwR(I#*F{pdU2(UBj_! zH)T{Of;6h6Bb8>&7i~SS#a18Fm@3~{_YuS%NaS9Z_#<4|joUJT#4Z71_Q$>M122`< z>dY9%)JmFONz8kACE>Z*n^aIB7oY4?y&JW|Occ;#P$l>XdMQt$FGBkxRTZRA%a(W2!m7Bb4kc zs(GU0%?V=GZFJQ1PU^iLlrDxHsntZ;vAw}fAhf)2S{?INTTd2HN;yQIseXj24$bvC zk+Z>Yg;%-RMWE>%-y-eA+;XpyKqjY)CSfSbju>1Hi= zdCI{a6q`@jW|IdusX!g$i2de!xvG43|MxU|4zo^l zx7#1f?^+oVadx&}o7qbbynOx5plf8gyvUz208r{5j$_tnl{b~@NJl?@zdGG6kTMF` zwS2Pd*l3i`=h^dNv^1T|s7y*x$N6!n5qYVKUc|I}mF|+@T9akex|d-e*7k~Kf#49~uS2@W-;poH@-L6C~Qc>yzz zk->oJB;+@7Bk^d+FFeMgeySUOB65-_G53+i&0Y0*O#Qx#EU$)FB!B|p`ZeY8wY}{8 z380i`N@{K*6_EoU1Xun<-p6!LdAWoWt}r99Qwa0fYT2I?ZzbPO=!AT;YUci)ryGdW z<%Y24H)~D}nPmDvsDUUlk6)_KY~AuCERltgCBZ8C$ZN;K>C?m#fod7y%|)hu>U_1p zl(CMJ2VqVD+{)WN7wi-3VF0|22VWb6BS+LW4~$#__$H!$zpg#v4cWM-obm0|sqOwf z!KmZ1*vwjc5!_-d!|_NBJ*Zu|9!WL&ZQ)>^-zY~tV)R* zWtU+>Gc;>TjCb{m8gKudZ4JvNF0pSPnG-HuVu#LnbAhkUmv!j%ywLMo%i4ECXqK2# zHQV`plB{|v@lbll8^Gdq)n)DR#=wLJt}Xibo6m?vs%5=XubJ91V;-QfXQ zv13HT=^1Qo;e=9(1UGb-Ogt5~wtb%A`>Wy;ycVE|x<|zG<9?7-k(|VbC;Ou5*VC6G%{`0IL!D?1llJ8(lBs6;oO6*8R_K zNcxFx(K4GR^0>d>E&KzFtSkJdX@Q=NnD5K_7eHu-8HdXVCg=;ni~x zps7t1Sm_KjTLX0r{nTB;JIy@NSGx(` za~Q)F6`u(m+-y(CX-V`F*o}Q`Uhhty=e<8pBu!t0)L->I+YgO?j105BFqvaDiA^xF z2?8I6fb*ruYt-T4v@dO7-^OoEfkAJ%oOkoM%a=;==pc9seIw!fO3TKDv7W;auWHw< zTw3%LZMwmzVE)U?-Zj$g48*5s-QmzLbBzf#1+=YOIfpko&5VY-2)Cumd-Q!^67!X4 z-;wvdlPW9YEnY{`E4*NJ(%LsW@gZhJ#)VWO zaUaKNdy07JGT7)15!n6;;H|t2CjCY-)O=AMN;Lcht%^3PwvT6P9da&*cq7MHvC_M0pW7!!qe&_5 z+iJ<3e7^kmnke>+4(V6M{hQ}&H3s3YdUA_P)dG#pabL9;jS#G;CD7K@O8Aad1oKUd_whZGkjvyDRbZ0#_V zeIYh1c`&ki;l&GCKDRSQ=_`06>?UC6yg{jRvx@*T4qaJclUYr8!F|1e^?f+(Y%^!49fZL$%#D;MG zvrjx{o9$OodD_q@>vveHB_TW5;b*2o`*OXw0dNbR-0i|b+Q#b7Qd;;HsP?jbXQXcf z3x$d#YisottP3T$x4#Z#bD)mlFKRuN@W>s=$qqAV*Ge_{CkpK|E80S}&y-lZwSMQz zLLwP|(xX_ry^VXyXi{o2w7>r9BSP_%whepe8g?sPe-v z&BmIfT+d=Y86>Mws%2FyM)l=xa6n<(jPw8e`FUf{7;0~@aQ?Hh%y2G=_X9_b7<%Yt zHIE1m%B%!6kgF4bK<(Et%X>klqC@yY0v4pKdZS|s^*3EXxmAqkR@wJy$9fbjC$APt z7_+U+)w7Vnil_4T{dQ|We?AI}ITx*v4)0{^>58d+J=-pCg4~n}ZqkW8DCRxY`Vb$l zA{IkDrBJFfkAPu+ybV{Q!_K((%?GsfZ45e;TUNpEsKs6i&$>Q%9bRG#>0qUeHXST8 zajuO@9}RwTYJZ*6r)z8_m{6W2#kxFJtO77@8J7mUgwnIr1Io^?wJ$D*jT*Y-iwhTu zWDUG_50x}3~aaNX`>Ul#W%H191Lk}hD0G;b3^9|@G!7U z|K^0g?7-oy;aj$(Hwc*kQ9XRj8Hy8w1}&uY@=nC%?HelP!gx*VyV}QdEuFX&gfrDv zaiUKzF`R1F2btEeXZc8E7dcW z)6O$$-|M1PEuahM&S}A~w{b}hN@q7+uxR>qa*U<<)n~TJ)A5ppMKwfEh*ZnGk9F%_ zie39tD?7545&{dC%XZ`mQC1^Wxn{`MchCfePx&v)`98ztWC+?cpARNNef4&Et~{My znJJwsRq#0GKbzm~80fTyaOVxB1Rj_CXgVeNGWLqL)y**Oeasbg zyMx6y+ZY{Rdpi=F=T&sPigbJrh7F-QkG70GxywkyU`uKYV({3`*7+opuL8JYZ}mr# zn%X8Bs72rUJw1KWiyq@0^gQ|`Vm}nUD2WyZKe+x7=ZV*T=lE@Wrut5dBh6k=#*pK~ z4D=8=bAV3E)p6FV9z`SyKf!AZ4eIjOov;X;pIG>&oVHYe?4k2@W7T=6D;+>5VnY}kHLc}| zp`_V)mo8SGbfRyGtRxj1b01AQUvC-+;aNI!;#{q=Oe1qQ)GR8L3Bu4X04HClZNwK> z(E{_(&gW$+2i!@{zSQt8dsCV93QrgI75GkR?>NLATH5`RY=y&2Cm4v5yZzN%n%A-m zJW}*WXFac6!tQc|wt1pkD?duOk@Qs1|2G9m6M=3kT4hcw`&{qN*ZWDpAm0X*hpQI- znl#F@$F+WYUr{`pLKELmmEcSBX+C$UB9(tg3t?UBivv!;o9b?l;xgEUa{*L7+ zZm11mY0sp#MRVqTk*|?9WGFX;lz5leGqp-EMd?Y<`gdocMj?= znxfpzN_l&n)|3(U!pt$Ss-@s^FJa#vcC}w0IllZvf@alh?68%AvBRE({w|$tCb)d- zWuU-P7KOaC!$se4<_39K5qErT?O2|c1_3@RQyR4sFP`igp9kjYM;<;Z8uZL^)0M63 z%(r3_cDMX;QnxoD-h2@pr_oVsA9viIt+9}vLRUd1qpsdqL;sZzeT7b?k^iCJL6!I( ztvfdFd10a%c~ z(RghkddlJ}kM=`K<)0UtOd5y)oZ*U5rg@l$X;wIf-qdgDG|GLKi0So3O#cOqS6BId zPrXNx_Uz$AK}gltgLHUS?{bU<4Aw#osn{c4n~i=!BMb-@u%^&#N72@#8rzvq`wcm@NEk z8`XI`;qqeMl4p+%=Pzia+XI>=W>9P^ZJZj};V1hd8T4Z=+_SA0_&K z;bjPtp#%SQPx#^tRqwbL+vs-I>vQ{zEIqJ^%rke&vdr5w-8!PpR`pl=H|InBDa&xg zF9OT})scCsR0ZlW{k{N~_?A|`K*Q^*y>cDuT?&CRsSR&z^nPr@hQeqD1$F$l!tMU{ zO&cyYmf&udwN~Q)z8j(-=+DF2yQL)Zd4kl`YBx+C>hIC&C0#~1EX^<5+-?^3gF)As1L+RSGhqY2;Y2qEx8YaE16C?_I>*Zk9GK@fXA`{-g`fVOcLew-tQT9}@LsnC9H&s@V4l0*1oq|q zeLoMk?tWabm>rd@A<_otPFfF|@=!Pr^9*0ufIatHIWDQQehZcR=k z-}RsF7Tu^&veVTTGnv;kay&vveN@q;w-n`34d=LTNQ{T7{vDj)kKx!yY#D9Y`0KCU zXEo*?jp!6hmho^J(?DE~s%(BfJmD|e&>y9=$aktBF%+-g^@?<<3^+t_+i&u};L%I? zKUBR1P*v^sJx)p}Af+PR4bmNgN_V$NcgLlXlJ4%7?v6{xC8fK&yW@ZGec#Xb_n&bX zXBh51=Q+=__d0v8wf4cHrzkgpnw&J}PfF9R38}{F>6%LC)3J;r@mLyapdRztMaR`o zu_*5T$?)f^6bTk~^Eqnx*Y9FF{M=}C+lBn9MSy7`?zkMUvF%I5JJ+SBdiluf;@>&V z(WeKoD$kt*dOK~!1%*?UPJUqD$V-2pUh+BXnKskEq*xxwTMR295#gYTKC{`3gQi=q z*YJ0*6-V37!YmXA&_pzQ_3=CN$iOQ0ohzQY(hrsCic2h1Os-e>QEC#k{R;;3xkDBr z;-{UO$WncgRYW*&fI^TuUGhmX&yz=Z3IFtC?6tn2v=95~8PqY;%rE5Rt7c;Yz2#Rl zN9-s)z~!95LsRJpPwbg&5u{6el5EuK98+8#?fAeG7G4tlIT_Qlo?= zB%lKi-%6!mrijGW4gEZ4ozF4sz8^7gz05v$?kL`7(!UShHxxwwSstJ%9L# zfDqbJIy4;D4A`R^pJ7xh@OeEFd2iaIpmO=pq{%J(d2i!UD&6Zw*ygb*RnU@DEE|oK z1_&q)t0eVLUbkOqwb~${B;jxgL2WU8Qwum77KFL=2F}KVbv%~{MjtF3GYd=Zaj3ig zsF$}G&S3{zqV235c;MnTIrXZdV<18uhHzxzH$p_F2gFiCU=)v%W2tJmn_h=CVF!0j-e&Es4NgYDrBH|PUmW&Kt~)UNcyo8iyl3D4 z!%ukb3;2_P-_p$o@vRXhp3ORJ9{6d`+Ji{sT;`Y|5Ow>v;Y#u#&PTtXgBf>O5A9~9 zAr6IirLzTmLKDTZirh7YL?wH1%Db{`o!e#dxUK>Tr{SdbL%VFbZvB1hOxUeYi_iPL zfl`pfgAB9kYdXp!G2%2gm z+=Q4JYiZ$D{Q1%_1r#gFa{;`UIWbgnB-EXz%0<4-OZg2GRGz9rbBwuIr@Nk(kvRjIP!`ydBeBq>J0?MR3^1~?YM~TF>3U~bPZ|a&G zMsKlU?Sj9W^l}bvsdTNr8pHq5V#H-5^QmX6M#7{U|Ma$qxu72QOAIsxy;A}9m5xVh zk(r>0=T5t8RBb~dXDerGGj$DC+yuNDdkZb@%2kuJ_*>nkR}r>jq-gT)RN!8d znme|NWchczKaa@6Ce^emy}yf=T$AO8<=u@w!tOn|m&9zD2dX0IkOVx3S-}|5~ zq*~-ICd|ap;oOYj>Qd2Bc=JjS)sn~Y@<^e+Owr>&?=#8eQ?nB&FyXqrv`SyQik2VS zS3+e?OsFA~Ex4EKPg$I@QVF+l2U`cTG_T{{YY~Uto3s=wAv42Z9eTfKkC=-Sdlhr3 z0zSD_^IR{Q+>^~fhK4XI&*=2oR{dgU;HpT{oXZ3Ta0t1ya3AbsqQ#pkpgB8u_e-!s zIQA~xJIkumUF{8a7n#^|@gK|XoXVbRU~CdTlGBi#rzJ44D>BMZe21kMwujSpeY8-k zHV%B}Kjv|zmYQAkK?s=<22FtZOFY5SZ(T%c!)QSlfI^$5eH~pz?2Si!(&q(Tsr&c} z=V4+_f5pDwk150%|w~M>X$OjUAzGYXg#ACb!`v0No;u- z6;DELJ)y0c*F(tm(`GuUvpg)?-P<3#TYmfsgF=;HhDNTFYn0M|ov0efpqJx7N{Ghe0g z4zJ9QU1tS7wYT`cIY)CxAOQi}$am*+Yw0oU+%%>#C4Q>{qYf(~xg~n|Y_0>D zaC>IHgeW=tpTJ3T@50@#bXKVET+Lg?1v4DHYlV>jvh+^?u%Zcdya52QDBQ{|Ji+%Y zrKNEt6NG%sm^IX62E-Ev*lzdZC*d=dxXQ&=8?KfgVX+{pn{qo23i=2Uui5U^DgRz< z$WRs%nrHRImrm_WMZk+WdEipxnyXUwZuOBosa%=*NL#nKvaYU^DHJl(U%zJhTe^=b zWrol*+D0a&-4LLZorU9om1S+5Fp;H&)dIA*7X!HOqi>? zubp+~hEytqQzXRh7aFkOojRgGM32WGla*6p!bLfwV-Z~0Bak4`DB9xX9d08{!TR;w z?zP6~V3?yn`h9danjFMS?@<(%_mg&9*N!^P#k&c7oYBf{>k@UwdaQVqmxlb6N}IRi zn?^u}@q%tL3kO$_J785!gn_ z6C&`e*#T?5xe3OS^C5xBf%j~3?KHp>`gYEQoO25g6>2`$%2?QFEHFV`tU^`B+FS5G zJRs)GQh!Bv>(s`RXFY^XzA$0gs_78}(~Ku`1Jhk*;ZgtS5)|D|0P8=4RIjq6E7S>~ z>9>ghl6niaO5!nkNVBpZ-0Jx z{MPyHvNLKLdeitfmEo3oXOf5x^%xKv(eZ%g=WH1fzhp6<4^|ulu^JHYbih&y@(4SC zwaAh?6SlGF*OGCYN8hv_SocN`NnXO7{kh&hu*?pduGW_B2xZ)RrS&tgmD2GXcXA-& z^e$RdCC-uXmKb#tpY{-__mkv`-#%}hcP;?P?^nFna~;H4<2&EW29*U$wU+F~FybDv zb4)VkhmXFyU5x6IWC8;K1EF~?1Fz3qva^?z=W$oh<{$kYj=r0=blTN zK|&iV@44(6j8A^SMXqNRRbwF4ES;NW+uPt^(060Ny7<94Ek|4sBx79gUe>9tK!U~r(0F&>%iyn z+11lZdCZY9j*AI*+Z%?P@Bxg8Co2fS@I|8){#y=iMa8NuJxg9+0=_I`vhY_uL+t`k zD$)F;O4U$LPtr+l4yL4^3`AA5Rfj87HAt=awaM_#STygcj zTDy``Tr1|QjqhkE@Hktvhz^Rp6RX134KvRvjb{^Go9gdqk8hm)f@OYx)Ta#Z{#0DK zoTvG@BN|28qC`gBlCt}OWY|hyuMfL5E=%=Z5HoMcoHTZ z%O>re(s(TDq7`fs(2wRlfsr44L`~NR)5s4%B?1`F(0sehpt4}M#~APk+}4IE4E$mA zueA@<>}l);yU!$EY9T7+S^{bMsd0Pct}X+}%ok@ppT!#@{jy$LF~+AK9J0M)L>|$y z^SzKaWcegvgJ2$VI9D3gZ0oL2ki|PYLyUnIgVtCd8AG*qFW+1EWTsPGnf&WRFQf&) zXak_uXl+vEN;r~GCY)=yWLp*e7Uxxh0Pe}Dj}+NJNTMe5+WzvV6Imj0>}#&u?Al#o zl?e4I$YHak&66f4g0hLi+fBIbF+GU~gVKRpjb8o-NA zkF2YX3CeZjKkXbMk2N?RQKcl!yY*;jOM^L}7p*I|d8F|EF`A>x)=MkjIK(vOW}Ptm zll&R6xSm!CX-Nm8z=Lk{#)>IcckvFzq-E{Mu*quq^KA2Eoi5lGep8hwz+#Eg^Qy*G z6neLcJN;vXBjwNd?+X}`{}ecKQlQxFYWw{8*d&eilo;{^sMAB(ypDR6Y_P8Tt2huf zWwxfE3@oEQk_v4ysk86_IG*IP(?JDmBrAkI!OgpK45%uf-C`?-+FB7FK9-IQMuA)oN->@+@XXqXw`hTTT+uD|b`IP#3rit;I-%2PF815eQ zpMcBOw++Q;V!|>1gn@-*-+mTvm(ySRQ|&bPBC&6UbI*=;U2Hb6~px|B?h7q8eNkXkI0zON;rvZnMRPKuQM}E1gEP z+rK$$R7mv-Xf!9Zy;OlTO=Nm`QV8s_*3t;BfttwQQW%l9FQyla1UdVv>MRjbmlToH z69vw-z3Ttp!FMbgNNpF*WhvPImAn4A9{}(ha>R`Pzh>BJP8Hp>7# zYGL7;oy)%Ocyn#etTg88FkFI)jp}f*Q72~}@2o4Dd4Kyj*X7a_>5z1($G_#QkeBJg zM9aOaPws5-qAbgDuQR--Z=yiQ`1T!rQolvrRd6E%Jdij3xBO%Af*sh`yUQMw=^pHC zUaFBHBuFX?@9EX?MtcFb(_}NOYk~K4_C2+_ov*m8S26&9^}hbs?*R|d0?EgP{CcaU z%0yr&it3B-_rJAs`$DuDbbo_{>2u0ZYktwaX21L0FU0zGnq18 z+cpwtP4h10VQ7~fOL0H|9n?z;DFT78p3yXyZxvS8=bwG^^7E~KTfGhDX87&7!ST}L zSiKD?*H%Jyjzdx0XSSa3bTYH4Vx`L0_BeF3OKxU4ilvHT`7->sUrc71uXlcY#uSYX z@ufL>X~_b^U|h4jhn%jD-aE&2N2@hE+ax~p!_9&{!C2JtWN8#p%K4yk!#Vrym3Cpp zx#(|+DF3VF>c_Y3TQ!#?w^58Y*m*{W^M9n>PG45CY~6ij(0f$%&MWF^Q)RjD7(9Zu zbChhA$FrNnR-|C#WK6~wCENWN%m_yPV3ImlW6%wW<+eJgM@kCYuEW8iqMOYSs} zLVbOG&Rrm*Q;kP5rrM8Fi0p*E{q#AJ?Or7{JrnDCT#4^`cuOkzY0}fTNVzO-a8OIW zK>jP&;e04Z=Y?oaS+f5VgRb~>pcdIRv}0{Bjrnf&{_BU|Becgw=q&% zgGeHCZme{LXszX9VUex_K6ihjQCjBs36am_1+xL94}wi=uvs|yG7Uso9`LBgFH@_^ zYduTfz!3et#xG61O@Zg2sIj|r2-9$%c5gpbw>%U9kc1FGs@^|57BAf;*>EoUpc?id z1F0AHgl=R&{T>|ML&MVnlUqG^`HucU`0*5L+Mt};^P-~tY|qSUr}{qqg+U3hjEDda zO#Ansyb9fmirxTYzeRd$!)N3Mp(xdBtn^}WXsm> z;jvSIw?t1hk_zqjxYb%`n!Bv!-Vwl@9xA9n*91CiupV^pNZOoYxO?Bk_( zGtZtdy-(~7VEo8^Hm&1S69#^6=R8z;1$j8ETa+wgM$JqKBs+kjDE5*`ekx(vJ0Io~ z8RlHKrwr}OPj@GX_y$wdRhz}{+$ZbZj{;-fg}`@LAGV%8;HpI4yot!- zOPBPhb^cliy?}mZdwJ=Z0pOH5RG?q4NifE1H93AY6^~#4+9hEkvN}qc9@!r)fHFH= z1|E*YFQrq*tGD6M_o4g0XA1ol%8)5u+a;1!E)E3|7@(yQ?LW;nmYZJOVsW{LH1I)^~0$LM+6{bxJ;cGy1TCO9JO1GB7YiR5$!Que*HTvc@3Xq+yUM=XlTALhNh!{M-Wrtd%ET%DcU?$f(Fv@+2nzm-RN2(nh0Dtk}W zsrt#EI$B^#B?o=9H$wzrpY!?u@({2`1wjI>j}>7zjSl;%oTLptf*q0u=D80a4DPjR zOqKYAi<>>4AH%uBuva%B6itB9E_4+mFoKEqV&&0xTkCqyEg><*7SexqV8_U53yZ)@ z6%mXTN2i8C1Tet%;nzQNuKnuS3#}|y=UXNNEcRlB{5oZxfnfPs_Q+Msv7k0rL<0!p zliIds*c-I}aANp?mo3ypXh>A$oW(o9IHFO5ZJp8aNNvZntnZH=?;k{g5}6mOWhWpgxDg9khgT7nUr=1g!yFMB({A zPP=1(%rccHmH6fh?mG=eY-gJt$M#!jrFLWixmn~!^aP&ik!!c^_gA;IAV6YMQ?q7u z)R_hTU61S7{J*Bz7m+sSs6go?c`hj;;ymW)82oyC^+N3L=3lzEBhI{j+^Z7u8K%(h zb)5#B&185>&xO75aEn;t)ZO+A>de`q%T-PGirx08TVSBqsENMnO)usc@BkQId7Nw5 z;13Dk2W3a4*D2^Pwq}_0dTCkWV84+aIP6A&Q_q0mxh{=CUs_el(NcbvJ$wsIMsN=q z3%kpdv}~R;B=~QIUr^2wWyIU=$Lv3PForHuv)f|Hj=fxjRY9nk;Mjc;9t#!U4lDB- zDSqX=)k3Pcld<5D{!k9h_loe4gQo1I_+WFZ57}0zl zv*!bo4()n{Bq8m^6-{%&{nR|^&*r*^^AT>)aSK{b{23LdMVq(e^|DjA;O^5?0AWq) z9h$%s)+cGIlc6NG$uv`vn)$<@=NlK}(sCA$IrB-61B_v}Z}vLC_nkfj(W{->Z{`&b z)!9zy?!+D}z!}9?~FmjBwFPgwddZ*>dWvS51Cm zk_`ey!~eia-z)Ey`zwQN_M#qPB8@y|&h~R3G!dRh0;h!vmq{Gjk)!ZK2s-lZU}9B@ z%da=iH*%CH=Lse{o~3+XBFvzxY`I3xu1pCw)5+S29mPtK-QsR1k!HLK?=|Ax8SM6S2cjFPw`z;|3rG8*_yBb=h=;qY-?x zMYvAf>+Xhg-fgGQ;aN#oqZm>bOLYm&S^RUjnQZc;_sfForBMm2y}a=E?7O4;^AW$w zuDRowq{wm=j9=-3yJP&(+B@{X4Tpk>r$T}SYn2y_ij?fDXu_68cvNm#-=Iqi(2q6^ z_C`~@#&Y+4fq&78b8snX$kXBV+IEL1+_=et6}C&Qk2c>1&t3A=u?Z6{F`)dwt|Jl~ z3wDjB>HD(Hx_VYHZp{I&OEd@zupd)-+#LXZunMSdw^WA05ACL6O041pQGxTPYrldt z7j>K2n=Lq&OnNj0Im>(b-sdPbl>;-VZ41waEIV#aF{^KpBxR3UuA!sp zIm`R&Rl6pYOOIQxJ!app8YQZ;nY{wsO0u2?t40P$eF&T$`m^5UtQaoBnPVCRY zuE(}PCnP6Z8pnO^*8*6;tiIyyKO)V1Yn-u4aI|MK{HOJH)|ilT-FJ-ivU98G`DW8q z2Q<*9(>m^4Z92T{y=ysY%}^iC2^BwFoxPruq{;w176G6e;ScwuUagv_fI69ug3G?O zhx6k!&qQIFu||gP@#n+!vS))!Gaeq2Gy3n+tI<^FwbMr9=_4)XZ=lz1N4N3%J=X%D zKo-V!xHaX4(>5F)%Vrils*YG%CEGFWNV^fP`F{Vb+wl<=gRWn4(50^l32q`tefrwG zJ#q=eIoV@L0K%oq&P>AHAB1dPG@_qTe1M4H4o=bhM<`Y~`o;ZmE7F;W)!yZidyV9y zebmJ7)#W!q!f8T&$|Yej{m~SCCZ<(I_|^$yFNV-kRbd}%2PB(;Hy>u3jt>ooQy$O| zFm>+}Oh~uKXJ&(!gaC&z)8ZP=oq8*Eo30Msy&bPZlAeP%1EXLGQ#7$e*lD+Pe7@L? zBtyu3k|u8qgp+CTd|o{0`%X~daxRqZ9Qo;u z_0ZtL=7m!Ecj#Ta^&0NS`DTHb+s!&@98$6fTqJ#cxP38IU$>3b`^~Ii7r2A*`~9-7 z4K~Oo9Cf956+)eTMR?-X23eM(|=N0KkhN;)exfDn$wgNN=x{)xREto$yyK- zCW}oMs}((;6e$Ll(BFiKECO;HvnrB<*PI9CogEInl~|b8&-q)@dd@E(P$N|2@cX*o@_BRFZBfg}`b>HXKXb-DIazrc9Bu1pS|fk>1NZdg+Hf#97!yS< z{#)m1&qY45Nb+-OQ)@bd>xp;M=0O#=D}icxNb|2Gq^PNf%>vT zqBFK(RR&_GWV6ZJ2BxG|V$Fa8U!0jW-UH1pcsR`{8Sy49!!=p|Vg9D75WHLOl`jVX$-ZFQnOH(0sMrplyK&|ebWuP;Q0QU)Z@-?;!t^F(4j zqE*)q+ICR7N`}|hW#>@P1-IKl@IMNf8I-+&Kf4xqn!wfae7xi+kgIC69hy@HsHNY4 zvsSSA!lMCGYn*U_hoS|x8DlCpArLtW4It{K<{1AuxmWyN23R!M8LW16L*VC^<;8Cm zN_EOg*;{^_SVTQL07@Eix?Zt+Y6|5neJj}4}$-eH~{bWuSGJLg>j40{bh zH=k=hUgAl8k4Uv-=-~*@gN7?BOno%Mdmq&%y@0BUM96gJ?m*FV3lW}@f~GW{w_RPk z%4DQhXMK%9pReujkLD_^UT2A;_|Bpykg_`d*zh5vn^H1?>S9w{|a~f{}jDfW#I#oU6k3 z6c(Q9SDMcvZ<3to-Wn}(msAT^m@gF<9LzK*l(}VNNRM~*s5$G|AQW5ALzvlr)ygB( z>5|VRJWJkQ*v;ngDxrYfzDJx{&LuOgi?pl0{ay;q_|~|y7)vJgE>>Hub?r=|`VG5$ zT8x1|vjp{ms)fiW5WFG?s69BO-KTRb;jLB&PZ|^lb$%slE+7)jv?}fyy)*|mL^XxV z?g~uOv?57OyiVj<`ARY|;H$x|cz1Kv+qXOrx69?m>XLHCU>CZSuumTD>h+!qZow6= zSU<*t5wx*tFzoBF7mr1A*9IHWQ8{`_0cNNP2vHJYwk zIwi$VC+j1P}ILkFf0*@hoAG}_tCzjHzm_GJT7LUgc&5#7%GJZ({?N=G)XwEyH5Ns>9)KF|Us*5r(lTf~n z+pf|fGxO9Ve2+OoDBjZVOiS87&nvkbYr%~?nynAENhx;H??)_8%zhy)Hl-F}c`Oe^ z_MbP#RqzH`ELV(6_=5i4_ZP2Z1)qpdJ}-cCjr3$E0|7r5pMK@$xRpcanDtfn)0Bp# zeT*ZPpm%HYbazS0Cv4KJt$X$C4t$=s=JOBQpAw(2!z#;7g}4Gh+UUYLnd5KO63 zk#d{_!%^mW#+#9pTM5AiF~LB~BK8g!cyo0&XoNz24*Mgw#{33k<>?^_n7cOrdDYG- zIy>A6iLE^8hcjK}SzU;)j>rNu*!IJDI`B!Qs2NDD;3IBPVD8XD|5B4vI;PQIr?ie2 z2f8rSftQylB5@d$j}zxHgH&tR?=T=ojjE?Vq_yzq^g9Zbo??%yVy6?WGxd5EQrDD- zl?QSCm}m>sbAuE-^DA3MEWPTIWuYnglA(B>RXexny73JK`cb!O(Y{cu2vRzgbL2W6 z?pcVhm-n>=6e|*u3*TnoIo5wVz^qnFg*F9qO z;d^5U%k1&B{Mefmi=D7Bh_uPmuLol3i}Jlft51TW53J`3 zD0xbW1Qe4M|7-&@rD8b<(vKY%^7X>5mOS5@n%7!*-r8;o1u~_-EDX#`AZTlcd-67>6KVPVq(R7UoRv_wIa**MJR4+ZFgHV_vvA% z+6o_hWsQrJeqG@!u*GQIg(kqu#Xz5m`T@WLh(r;Xj1SQG6ra%Nqba=ctEm6JqI#de z?M;*(7GH!Bu(ZozwU~yw9FtNuX}2^=^Zr3Eww-sp3A7YQy4ss4IQ&Jg(K;4L$?^ls z>4M4e;Y<7Dr%Z`>7D?7Z+MA(77MX#LufXV};w;k;A>c4DVa|B2WRxn@TQ4d2oG<;- zYvn5zgxQrMn(8zgOaA6Egj%~0uRW$9gN%G0L75i&c#j4rWxLTt$XSY9Ay(<}*!Y=w zcIeXB7V@$$tQ^>#O+ATY^OzQ)a~; zKgvqFTyP4k2o`*~!YM2Pk~z=UE9ydN!zdCU+)-8;jUXBGO-U8}=GE&7m&V1H5$FzN z5dyx{4e$XYh-kTYdrd?hbh~&-0p9Mq0JbX=-YhcG#s_Fu2e?zkWcrPnu5%L+zyu+7 zwTzc?df7Tyc?odqrM#(!ZHByYJ|S>dFKVJg-vydBe*m3X4{kb8LDS%vZ&Z>nDb%Fc z(*G@=Tgehf=<%Rt^==4BXNNLvRNGo$&|8AjzQ`chkV)pTsz7ItduC#;mR@B+?^Pc% z66MO1wwNzRGmN(0fOtF^NS@ zDZ4jFU5yQ&=F*TgC{5nc?L3m}-g}KuVH}{fmR9Z(oL*V?n)fVnU_q`$T8Jsr-Ljgf zh_uROcSJmLFa;`zFKSj9`v89k>w}{|H*4e)uy>yVjooWpho-C1kLC`4+Bq=A>kp0=4E-~3^$-c!+RwqFOETzb0Gs}h~~fd!`|N~S%p zk9eK9IodkKU1?&k`qSO<-*u{`%AjZvICFFaRRWHaM0Mz*Q#3Y~$&|h8l(NmLOePb* zy{k>!b0!KDXnSKFL*R4{c5w3u3hsWCs#g50thxr-C7zt>&$i58pVy@;9tG2DH!IQ} zewd|yw9FYxySJ2U#gEkBlHquJLICU6V(S-0tu%+(&UV7l{H3~&9SB{OQc#cxHTODP zmfJ1UcqVC>+t4d3Cz)((#dYx>y&~Di8r$q6o6lM zTgk7c@jNCyRK0jy1)M%2Oa2J&S)oK`gA1D9CV()sj}h*rN7u~!AjP*hB9KgUwJLe* z2fZx@bBfV+-3w$7yz>v))wl-uL3M%IXgNc@MKUiE9M{QyD^R)zKm9?>2=Dqv`KG1~ zT5y0LSp+YPbH*$LRG&uDf3yrv2l|m-bP^gcfH{F`Q(hMwFefsx_I#sD6c7WPETS`X zWjXhf;FgZqGgfhw^|GkY9G%MQ;bVvrL-XPdAp{Amxn3PaW_=CLvsMH~{>lqO37o2w zsB^KU0t%nLb>Jg(u`JJ9evE30i{E=(w?NQJ`q$H z8OA5NmGLU{m<KtpOUvnDH1CcW3bx5J;7N$ZoGd9z2P7oG10MjQZ* z&34mB!!{K(@64Lg*pOhTttCO_HxrSDeqlT`!{XlwoEr=5XH-?aKJ{YBMV3T8o|Ot5 zJ*8BC4M9Osf{s{P3ez52us>B=)#Q4y+i%P`9EPwB92fdX1(v?|U|P9Podcj^G5NKf z7||x&pfFuBi1ZR$ju~q|Lf?O|g3jS*KMTt_8W=0O2 zw{gS^*u@(cOJ~i4coi&LX%|$Q(s(TO7jGrEc>y*8*GLLql;9xT$tY`3dEk1Gms{6R z=K|FRg~fm%aos$V#jby`r{uhHoWjU(Fq`FFSPjAEOPQ9a4E@9uY zv`u(sS6^V#;7%gmZGa9k0@^x=g!@6^g^;fy*8}@LsJ@>A?R(BC)8@__lWK2X%@n+;RQHldTY&Fs4tSSUiTHM zGcIUe);@UL&!6JPbe zJK-CV;xBc?J8U?YY}kDb@$@csluRoy8av{qSf)4HW=Z3N(X<&M5SXIy_C;@l{S@`% zfL!lv5Ejd#{``|@^!8Ebgu+zVu;v7<7iJx49tux5V07|QbLztQG-6Pu9E*IU9}p$n z3KYVwCc}7848KYy@+?b>km?Pvq=msy;GJ)y5&?t7<)jafBFGC)`@Rf8)^~%(g1Fg{tYrD35nV+>WCb^=Fa|T6z10 zFm`Or^&h#)m^BzQd3hWVFC)9!pGpGq8rJX!*at2YVMT$ile*e_FHE9G zz7<5#HexRXL)M@&Pq^TEM!X>41W|_5YfyOCBPJkZX;3?H7;Z#Z4SZx|a!e~Q z6G)IdB8OEQcl>QTPViDP0RC|axADdcUm6N5hlVssQ{j}kjr+TYDi4=-I{$dNLOPk+ zZ!luyUIBR}lB5<0Wy~85`aov1X*%O-2y63NRniv23akb|v7{r_Ch;u) z7%Br|(5*!C(o7dbr7$-qwcpLM7ER}ihYbUX()>Vd>o*!C5G7)OaTfemMAc+)7*J%= zxsh1SN9E++^u|VET2rb)MI$fdABC&;4pM!3*`J9wO1%eW%oZQG>>Rd}?dyx0EIHNU z$isoiuu)+!K(-If`?9Bd`imsNsU%C7Sf1|DdW_fz1<3eztN<%-;O?1gTlf<_}A@6-i zAqLjYh_mWFM&CPV-cO{|qn0>1QfW=4{b+1dF)S~+4A_>aFn{=?TQ(xz(+G?mH1B;a z>^$4R01~Tat9dG1 z3P9h_;uc^tszn=>I^t@BsOrvzyAK^djDTL^Q5u&k8MF~OuQHZ%#K+CqFcH(zKS-;gDjmgI3Fu4lD$Zw~NwsLAg~7f!nS1koBbqp8Q*7mHk!1#c zu_(IvEo^$?1vh*=I*5hKqVNj%tzlA2SbW6HdZ0w9*~<4}ytYXz+G>FL-|b`vm*tKc z5cN8qu#|4wurH0|rG^psc0i0s3`jKgw7nIM*rlPe23xCm1y-a+Jy>E(eW&98Ade3) zN88pp%ANha8t)2Z6bMS)NjuH1Ucx@VaIGMW7^N4&52|h)1d9Y_J2qHkl@VV3MF&Z( z>&d>R^T@DTl(NRb7q*%AgCx;H6`MLkF}EC}RHFn%$497 zJ@ST4z;2LE_FIB-n9Bd3n3MCi4VEK?1YZioiBncf%D2HJSLPxH-S+M87MDW&a&CT^ zWcnM}+=uKW{aMuw)vLsp=32E_1m%%S{On8qE1cW~}Sy%w{gd%XOJ;ReSirh;GFkwCXsCI!H>c+aB z{pO!+Zi@&2Cu5gi-}pb`IO&{D*wnS#o4*{@o?t+8RD`&ai6izW>|0M-%>8G)0{13{ zfAd5j<%$P`$h>g%Wmar(tq$b>g2r1+XkN~Bxv1;{BLc{2E#cvpH4}lkT56G(i{1SK z1lDM_eB=3WI=lzCxU2b;ZAnC1tHNg<2f#yYAm-EOjF%mFd-=!SeIJ_e5ulzTb zR>1vmf7MH4^$pjGPa%E!1_>(!Ok)N-LO@Jj!7oZoXqLLbsuSk-H}bZL5Tya54W2>g zWdXEDpz~In2@^>uv~g#Z&LJPpxVyZtP}aCRN4|gC@GsCK5nm#_ppu{0H-hsf0GOSQuuSq*IaiWz~d39Yl!` z5Xr=ErK_`s5S&mK+#LU!&mfUS{MvRTnG;=!IkQjzB=?6U+g;}{z^5E1WIvWmRb!;T z|6m*P5^*930WkY?Ff0&hVcO1*+Y(YL=_grZ^a+FPvU&1*A zszti_1Qra2ndlM8gh6%fzAl0anRV3vggq`9AiQuTl8Svz?@y6wtd{EL(>fyCj${Nf zsEIVqc;1LJ^!A48IzH+C3+Gpm8A<<|D`~KzVSZRb&mo*oAg7>yJD_QhD-R!~7s!fZF;MB#4bMIDHrMqc=gQ{sI&tQ)0?L;00xE|QsjjG^-D5cNO+Re7 z3gy%qR%Z6(AIgOY*uJtKFHoX2*R@f*UX10**M32#9704Q3-SWBZDGUn%bgqYyeys| zOd$F9RvCS z*DJy(V!ikM6AidOA=6fiv^Rt5m0$g3v=}%XODW^+f8&tV(Vu$_-nu47r#Ea9VLJu9 zBJC&gLSO)t=n)3Vf1lbD-0$k`5?9SnIGtL}j`_;XnO?mg0bUaOlfv^rLHS0yCvjjQy>rQWBSI?!OpGdbbYJL!yyHddFA0DS$}QW2$C6-#q+8Li2MNa2lH zF$n{+Jg}u8F(z5W516gbscX9BuKz@5EcBIY!JszEg87?}QPMX(RL2}Gcga;}1jAc= zvEn?+v&%QOek|F5B3pl>#3I)^6Gl1>A5iFnZgs9ZH!GNe?b!znTW|HEQ#>WvH0TO% z0Dl0u^xLA^fx^(H+@Et$^W~;uyC64|0=Z1%F7_wwbn5g$bw)s76vg&@6o+9dBluWI zp40Miy?==IN73h*ljJ?uu)Bv+_Vq0OJ1ga)YI~m2Mn!5@)tN@RK@GT*6?X5d6MwkB zNH8J|?!d^yW%$$caA8~N;(e5%XeqWW)iK1QS?)3_4OdyApnAO)e10j8^K@&w&A1XN zk<@2GPs?Re)<>LM?1XpXbFkzj`@YUhRXGhjRTtf7@H!(TMdL}aGqwG zi?5(n$uOR1v&kIrRdJ43Q+5^%p39Hrb(MPk*w7&1o*ycTKG-lHk*FK%SPh-~khco% ze}WD8ndBzhko+dUI=f?T$aP~behbk9y<9lY#bl?HebrxKj#%I>fbDGb-lHzg5jP~C z68hZEG{?+kIIZf1eDA#=Of+UU6SJL$Zb!!Tm54fz`D!Kf?1(+t`;8|54@_FD`;=;v zy58$Lbz+W8lM;D~kEe5ji8(8nX3n=&29*}^%M?$2E(RNC(Pm;TkZyz3q|~z@8l47{ zI!njaGvenUTfW(Ay652bo^0?)dlxhr6rD9sie`j=W=EK#1`r4fO|;U7SMuM zS90{{a@(tfa`lMOvKK-r&~8m|37n;tac@?PD{y?_6Mi&nwfdCn`;#j0{n2s86C zjmN5o&KLq!IQC zi5Uem0#);;MC}_!SOUeef|RuqeO^D|$XDQdd?`$0d1AKXlpzoB$c;<|OnJ1wUr)!J zFj;AH5~xtNczn_ey)qqFE&+sdrF6o&T7~RL$+AFDH=rcEA<=~l=4nJPWenOCQr&z0 zZF2qh%@gQ-Ox=qu=-3ME0jz#@*ol&?s#>+!`U#a}EOa&O9aDkd;{Xm$c72(A=|?HA zWbv8m`84Z{838_vrJ5dGZUy8KbI%58`z51{2Gx7iv0hRm3$2dj)S*e*!NtXlb?t+?2 zlhWD{>gD|A(YB$DPzdRebxp;jBTd!+x0_Zer%t#Rx2j8_`b6kMcDtuk`}9kE)#WU} zqBq}onU3dS&a7>TTPNL`&CMmY=APndvp1LI;+j}uB?EfIHT4Y)qBG-mZ?UN@EuQXD zuxZwDtZt zzGidK?8kGams(7@Yj3vYThP6nMV#%cebep1jD0LwntR zCYmp-rKHaTr<+iiIWVZiA{_iNM}lU|D}ovuvcK3$pR^Cp4L5sVw^Wwtdzp32 zF1gUF6X#k0_fl$zPb$lZ-QNQ|P{n8cfyZCMtYd1UWOr^$mbLDNjA}uhE+U{&avyjU ztw+lKz47xN2k)60)O~jO#vHS=8bJZT!;B*9qP9eCXH?zdeOs$jCho*G;N_iqQv2ur z&z~@}=Q^Xy2LAd-UBCe`R{r2wh4w#vBdX-$o#%UHSsml{-bL61|@c6HXSG`YUpPF{> z-jl9fFPLY?zJGtw;t8Yg_LY-;t+%ez@$ZRWBbrw}{{!Rw=Vz*lygqxqQ=04cf5!2S z{4ma(XLlLdofDV-eNz_dEcfimy2B>mRwQ^71T_4qawkM>=i#$AuO+_cy*zdAZ+=dj zO)lA| z+^?fq_UoQ{iA|Jx+Wm61=5v&l`%2kUpt?(l;)!39bpXN5#j%hYs5B=>-N3tYg_ za(~8>GT2#VkPNmFI5;DxZFma4R|_ Date: Thu, 17 Jun 2021 09:40:16 +0200 Subject: [PATCH 43/46] Fix trusted apps modified by field displayed as a date field (#102377) Fixes https://github.com/elastic/kibana/issues/102308 --- .../__snapshots__/index.test.tsx.snap | 4 +- .../components/trusted_app_card/index.tsx | 2 +- .../__snapshots__/index.test.tsx.snap | 240 +++++++++++++++--- .../__snapshots__/index.test.tsx.snap | 8 +- 4 files changed, 220 insertions(+), 34 deletions(-) diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_app_card/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_app_card/__snapshots__/index.test.tsx.snap index 47728eacf4cddf..7439245bc95719 100644 --- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_app_card/__snapshots__/index.test.tsx.snap +++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_app_card/__snapshots__/index.test.tsx.snap @@ -53,7 +53,7 @@ exports[`trusted_app_card TrustedAppCard should render correctly 1`] = ` ( - someone + + + someone + +

- someone + + + someone + +
- someone + + + someone + +
- someone + + + someone + +
- someone + + + someone + +
- someone + + + someone + +
- someone + + + someone + +
- someone + + + someone + +
- someone + + + someone + +
- someone + + + someone + +
- someone + + + someone + +
- someone + + + someone + +
- someone + + + someone + +
- someone + + + someone + +
- someone + + + someone + +
- someone + + + someone + +
- someone + + + someone + +
- someone + + + someone + +
- someone + + + someone + +
- someone + + + someone + +
- someone + + + someone + +
- someone + + + someone + +
- someone + + + someone + +
- someone + + + someone + +
- someone + + + someone + +
- someone + + + someone + +
- someone + + + someone + +
- someone + + + someone + +
- someone + + + someone + +
- someone + + + someone + +
- someone + + + someone + +
Date: Thu, 17 Jun 2021 10:14:29 +0200 Subject: [PATCH 44/46] [Lens] Fix Formula functional test with multiple suggestions (#102378) --- x-pack/test/functional/apps/lens/formula.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/x-pack/test/functional/apps/lens/formula.ts b/x-pack/test/functional/apps/lens/formula.ts index e9e5051c006f02..db7c680ac20af6 100644 --- a/x-pack/test/functional/apps/lens/formula.ts +++ b/x-pack/test/functional/apps/lens/formula.ts @@ -80,6 +80,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { let element = await find.byCssSelector('.monaco-editor'); expect(await element.getVisibleText()).to.equal(`count(kql='Men\\'s Clothing ')`); + await PageObjects.common.sleep(100); await PageObjects.lens.typeFormula('count(kql='); input = await find.activeElement(); await input.type(`Men\'s Clothing`); From d92ddf4b704a3d484db0a7cee7b79a0836ea44d3 Mon Sep 17 00:00:00 2001 From: Sergi Massaneda Date: Thu, 17 Jun 2021 10:17:17 +0200 Subject: [PATCH 45/46] hide not searchable results when no term (#102401) --- .../public/providers/get_app_results.test.ts | 5 +++++ .../public/providers/get_app_results.ts | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/x-pack/plugins/global_search_providers/public/providers/get_app_results.test.ts b/x-pack/plugins/global_search_providers/public/providers/get_app_results.test.ts index 3db9fcc3368522..db64e2972e9324 100644 --- a/x-pack/plugins/global_search_providers/public/providers/get_app_results.test.ts +++ b/x-pack/plugins/global_search_providers/public/providers/get_app_results.test.ts @@ -120,6 +120,11 @@ describe('getAppResults', () => { ], keywords: [], }), + createApp({ + id: 'AppNotSearchable', + title: 'App 1 not searchable', + searchable: false, + }), ]; expect(getAppResults('', apps).length).toBe(1); diff --git a/x-pack/plugins/global_search_providers/public/providers/get_app_results.ts b/x-pack/plugins/global_search_providers/public/providers/get_app_results.ts index 136b0d6076e69b..ece173777f3e17 100644 --- a/x-pack/plugins/global_search_providers/public/providers/get_app_results.ts +++ b/x-pack/plugins/global_search_providers/public/providers/get_app_results.ts @@ -31,7 +31,8 @@ export const getAppResults = ( .flatMap((app) => term.length > 0 ? flattenDeepLinks(app) - : [ + : app.searchable + ? [ { id: app.id, app, @@ -40,6 +41,7 @@ export const getAppResults = ( keywords: app.keywords ?? [], }, ] + : [] ) .map((appLink) => ({ appLink, From 7f625530fb9575082185f1369cdfae6e37952e50 Mon Sep 17 00:00:00 2001 From: Marco Liberati Date: Thu, 17 Jun 2021 10:27:25 +0200 Subject: [PATCH 46/46] [Lens] Add some more documentation for dynamic coloring (#101369) Co-authored-by: Kaarina Tungseth Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- docs/user/dashboard/lens.asciidoc | 19 +++++++++++++++++ .../coloring/palette_configuration.tsx | 21 ++++++++++++++++--- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/docs/user/dashboard/lens.asciidoc b/docs/user/dashboard/lens.asciidoc index 7927489c596d77..4ecfcc92501228 100644 --- a/docs/user/dashboard/lens.asciidoc +++ b/docs/user/dashboard/lens.asciidoc @@ -315,3 +315,22 @@ Pagination in a data table is unsupported in *Lens*. However, the < + {i18n.translate('xpack.lens.table.dynamicColoring.continuity.label', { + defaultMessage: 'Color continuity', + })}{' '} + + + } display="rowCompressed" >