From 83e5b6c689a221fa92db1bbd1d71e7c8f19dd627 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20G=C3=B3mez?= Date: Thu, 27 May 2021 11:30:15 +0200 Subject: [PATCH 01/14] [Fleet] Remove beats management plugin (#99789) --- .github/CODEOWNERS | 3 - api_docs/alerting.json | 22 +- api_docs/beats_management.json | 72 - api_docs/beats_management.mdx | 21 - api_docs/core.json | 338 ++- api_docs/core_application.json | 388 ++- api_docs/core_chrome.json | 144 +- api_docs/data.json | 2444 ++++++++--------- api_docs/data_index_patterns.json | 1730 ++++++------ api_docs/data_search.json | 81 +- api_docs/deprecations.mdx | 136 +- api_docs/features.json | 14 - api_docs/fleet.json | 24 +- api_docs/home.json | 14 +- api_docs/kibana_utils.json | 4 +- api_docs/licensing.json | 411 ++- api_docs/lists.json | 1359 +-------- api_docs/lists.mdx | 14 - api_docs/management.json | 53 +- api_docs/ml.json | 2 +- api_docs/saved_objects.json | 48 +- api_docs/security.json | 49 +- api_docs/spaces.json | 28 +- docs/developer/plugin-list.asciidoc | 5 - docs/management/managing-beats.asciidoc | 108 - docs/user/management.asciidoc | 6 - packages/kbn-optimizer/limits.yml | 1 - tsconfig.json | 1 - tsconfig.refs.json | 1 - x-pack/.i18nrc.json | 1 - .../beats_management/common/config_schemas.ts | 384 --- .../common/config_schemas_translations_map.ts | 243 -- .../common/constants/configuration_blocks.ts | 8 - .../common/constants/index.ts | 13 - .../common/constants/index_names.ts | 16 - .../common/constants/plugin.ts | 12 - .../common/constants/security.ts | 18 - .../common/constants/table.ts | 13 - .../beats_management/common/domain_types.ts | 136 - .../plugins/beats_management/common/index.ts | 23 - .../beats_management/common/io_ts_types.ts | 34 - .../beats_management/common/return_types.ts | 106 - .../plugins/beats_management/jest.config.js | 12 - x-pack/plugins/beats_management/kibana.json | 16 - .../beats_management/public/application.tsx | 89 - .../beats_management/public/bootstrap.tsx | 69 - .../components/autocomplete_field/index.tsx | 290 -- .../autocomplete_field/suggestion_item.tsx | 119 - .../public/components/config_list.tsx | 117 - .../public/components/enroll_beats.tsx | 292 -- .../public/components/inputs/code_editor.tsx | 114 - .../public/components/inputs/index.ts | 12 - .../public/components/inputs/input.tsx | 120 - .../public/components/inputs/multi_input.tsx | 122 - .../components/inputs/password_input.tsx | 114 - .../public/components/inputs/select.tsx | 125 - .../public/components/layouts/background.tsx | 12 - .../public/components/layouts/no_data.tsx | 31 - .../public/components/layouts/primary.tsx | 84 - .../public/components/layouts/walkthrough.tsx | 49 - .../public/components/loading.tsx | 17 - .../navigation/breadcrumb/breadcrumb.tsx | 64 - .../navigation/breadcrumb/consumer.tsx | 8 - .../navigation/breadcrumb/context.tsx | 19 - .../components/navigation/breadcrumb/index.ts | 10 - .../navigation/breadcrumb/provider.tsx | 73 - .../navigation/breadcrumb/types.d.ts | 16 - .../components/navigation/child_routes.tsx | 40 - .../components/navigation/connected_link.tsx | 46 - .../public/components/table/action_schema.ts | 101 - .../table/controls/action_control.tsx | 97 - .../public/components/table/controls/index.ts | 8 - .../table/controls/option_control.tsx | 58 - .../table/controls/tag_badge_list.tsx | 110 - .../public/components/table/index.ts | 16 - .../public/components/table/table.tsx | 160 -- .../components/table/table_type_configs.tsx | 345 --- .../tag/config_view/config_form.tsx | 216 -- .../components/tag/config_view/index.tsx | 189 -- .../public/components/tag/index.ts | 9 - .../public/components/tag/tag_badge.tsx | 48 - .../public/components/tag/tag_edit.tsx | 238 -- .../public/containers/beats.ts | 104 - .../public/containers/tags.ts | 54 - .../containers/with_kuery_autocompletion.tsx | 89 - .../public/containers/with_url_state.tsx | 101 - .../public/frontend_types.d.ts | 36 - .../plugins/beats_management/public/index.ts | 40 - .../beats_management/public/kbn_services.ts | 26 - .../lib/adapters/beats/adapter_types.ts | 38 - .../adapters/beats/memory_beats_adapter.ts | 109 - .../lib/adapters/beats/rest_beats_adapter.ts | 80 - .../configuration_blocks/adapter_types.ts | 15 - .../memory_config_blocks_adapter.ts | 42 - .../rest_config_blocks_adapter.ts | 36 - .../adapters/elasticsearch/adapter_types.ts | 14 - .../lib/adapters/elasticsearch/memory.ts | 27 - .../public/lib/adapters/elasticsearch/rest.ts | 66 - .../lib/adapters/framework/adapter_types.ts | 54 - .../framework/kibana_framework_adapter.ts | 160 -- .../framework/testing_framework_adapter.ts | 46 - .../lib/adapters/rest_api/adapter_types.ts | 15 - .../rest_api/axios_rest_api_adapter.ts | 79 - .../rest_api/node_axios_api_adapter.ts | 93 - .../public/lib/adapters/tags/adapter_types.ts | 16 - .../lib/adapters/tags/memory_tags_adapter.ts | 44 - .../lib/adapters/tags/rest_tags_adapter.ts | 66 - .../lib/adapters/tokens/adapter_types.ts | 10 - .../adapters/tokens/memory_tokens_adapter.ts | 14 - .../adapters/tokens/rest_tokens_adapter.ts | 23 - .../beats_management/public/lib/beats.ts | 66 - .../public/lib/compose/kibana.ts | 81 - .../public/lib/compose/scripts.ts | 79 - .../public/lib/config_blocks.test.ts | 149 - .../public/lib/configuration_blocks.ts | 123 - .../public/lib/elasticsearch.ts | 70 - .../beats_management/public/lib/framework.ts | 61 - .../beats_management/public/lib/tags.ts | 48 - .../beats_management/public/lib/types.ts | 60 - .../beats_management/public/pages/__404.tsx | 22 - .../public/pages/beat/details.tsx | 201 -- .../public/pages/beat/index.tsx | 201 -- .../public/pages/beat/tags.tsx | 76 - .../public/pages/error/enforce_security.tsx | 27 - .../public/pages/error/invalid_license.tsx | 28 - .../public/pages/error/no_access.tsx | 29 - .../beats_management/public/pages/index.ts | 56 - .../pages/overview/configuration_tags.tsx | 118 - .../public/pages/overview/enrolled_beats.tsx | 355 --- .../public/pages/overview/index.tsx | 110 - .../public/pages/tag/create.tsx | 160 -- .../public/pages/tag/edit.tsx | 203 -- .../public/pages/walkthrough/initial/beat.tsx | 65 - .../pages/walkthrough/initial/finish.tsx | 136 - .../pages/walkthrough/initial/index.tsx | 97 - .../public/pages/walkthrough/initial/tag.tsx | 137 - .../beats_management/public/router.tsx | 132 - .../public/utils/random_eui_color.ts | 26 - .../public/utils/typed_react.ts | 21 - x-pack/plugins/beats_management/readme.md | 39 - .../beats_management/scripts/enroll.js | 42 - .../beats_management/scripts/fake_env.ts | 158 -- .../plugins/beats_management/server/index.ts | 22 - .../index_templates/beats_template.json | 137 - .../index_templates/events_template.json | 45 - .../server/index_templates/index.ts | 11 - .../lib/adapters/beats/adapter_types.ts | 46 - .../beats/elasticsearch_beats_adapter.ts | 245 -- .../configuration_blocks/adapter_types.ts | 28 - ...asticsearch_configuration_block_adapter.ts | 168 -- .../lib/adapters/database/adapter_types.ts | 302 -- .../database/kibana_database_adapter.ts | 118 - .../lib/adapters/framework/adapter_types.ts | 115 - .../framework/kibana_framework_adapter.ts | 116 - .../server/lib/adapters/tags/adapter_types.ts | 17 - .../tags/elasticsearch_tags_adapter.ts | 180 -- .../lib/adapters/tokens/adapter_types.ts | 19 - .../tokens/elasticsearch_tokens_adapter.ts | 76 - .../server/lib/beat_events.ts | 59 - .../beats_management/server/lib/beats.ts | 260 -- .../server/lib/compose/kibana.ts | 85 - .../server/lib/configuration_blocks.ts | 77 - .../beats_management/server/lib/framework.ts | 54 - .../beats_management/server/lib/tags.ts | 62 - .../beats_management/server/lib/tokens.ts | 144 - .../beats_management/server/lib/types.ts | 61 - .../plugins/beats_management/server/plugin.ts | 89 - .../server/routes/beats/configuration.ts | 83 - .../server/routes/beats/enroll.ts | 90 - .../server/routes/beats/events.ts | 67 - .../server/routes/beats/get.ts | 60 - .../server/routes/beats/index.ts | 15 - .../server/routes/beats/list.ts | 70 - .../server/routes/beats/tag_assignment.ts | 69 - .../server/routes/beats/tag_removal.ts | 67 - .../server/routes/beats/update.ts | 105 - .../server/routes/configurations/delete.ts | 48 - .../server/routes/configurations/get.ts | 53 - .../server/routes/configurations/index.ts | 10 - .../server/routes/configurations/upsert.ts | 73 - .../beats_management/server/routes/index.ts | 55 - .../server/routes/tags/assignable.ts | 51 - .../server/routes/tags/delete.ts | 48 - .../server/routes/tags/get.ts | 46 - .../server/routes/tags/index.ts | 12 - .../server/routes/tags/list.ts | 53 - .../server/routes/tags/set.ts | 63 - .../server/routes/tokens/create.ts | 58 - .../server/routes/tokens/index.ts | 8 - .../server/routes/wrap_route_with_security.ts | 70 - x-pack/plugins/beats_management/tsconfig.json | 26 - .../beats_management/types/formsy.d.ts | 49 - .../translations/translations/ja-JP.json | 179 -- .../translations/translations/zh-CN.json | 183 -- .../apis/beats/assign_tags_to_beats.js | 254 -- .../api_integration/apis/beats/constants.js | 8 - .../apis/beats/create_enrollment_tokens.js | 88 - .../api_integration/apis/beats/enroll_beat.js | 184 -- .../api_integration/apis/beats/get_beat.js | 87 - .../test/api_integration/apis/beats/index.js | 31 - .../api_integration/apis/beats/list_beats.js | 39 - .../apis/beats/remove_tags_from_beats.js | 218 -- .../api_integration/apis/beats/set_config.js | 246 -- .../api_integration/apis/beats/set_tag.js | 67 - .../api_integration/apis/beats/update_beat.js | 122 - x-pack/test/api_integration/apis/index.ts | 1 - x-pack/test/tsconfig.json | 1 - 207 files changed, 2938 insertions(+), 19531 deletions(-) delete mode 100644 api_docs/beats_management.json delete mode 100644 api_docs/beats_management.mdx delete mode 100644 docs/management/managing-beats.asciidoc delete mode 100644 x-pack/plugins/beats_management/common/config_schemas.ts delete mode 100644 x-pack/plugins/beats_management/common/config_schemas_translations_map.ts delete mode 100644 x-pack/plugins/beats_management/common/constants/configuration_blocks.ts delete mode 100644 x-pack/plugins/beats_management/common/constants/index.ts delete mode 100644 x-pack/plugins/beats_management/common/constants/index_names.ts delete mode 100644 x-pack/plugins/beats_management/common/constants/plugin.ts delete mode 100644 x-pack/plugins/beats_management/common/constants/security.ts delete mode 100644 x-pack/plugins/beats_management/common/constants/table.ts delete mode 100644 x-pack/plugins/beats_management/common/domain_types.ts delete mode 100644 x-pack/plugins/beats_management/common/index.ts delete mode 100644 x-pack/plugins/beats_management/common/io_ts_types.ts delete mode 100644 x-pack/plugins/beats_management/common/return_types.ts delete mode 100644 x-pack/plugins/beats_management/jest.config.js delete mode 100644 x-pack/plugins/beats_management/kibana.json delete mode 100644 x-pack/plugins/beats_management/public/application.tsx delete mode 100644 x-pack/plugins/beats_management/public/bootstrap.tsx delete mode 100644 x-pack/plugins/beats_management/public/components/autocomplete_field/index.tsx delete mode 100644 x-pack/plugins/beats_management/public/components/autocomplete_field/suggestion_item.tsx delete mode 100644 x-pack/plugins/beats_management/public/components/config_list.tsx delete mode 100644 x-pack/plugins/beats_management/public/components/enroll_beats.tsx delete mode 100644 x-pack/plugins/beats_management/public/components/inputs/code_editor.tsx delete mode 100644 x-pack/plugins/beats_management/public/components/inputs/index.ts delete mode 100644 x-pack/plugins/beats_management/public/components/inputs/input.tsx delete mode 100644 x-pack/plugins/beats_management/public/components/inputs/multi_input.tsx delete mode 100644 x-pack/plugins/beats_management/public/components/inputs/password_input.tsx delete mode 100644 x-pack/plugins/beats_management/public/components/inputs/select.tsx delete mode 100644 x-pack/plugins/beats_management/public/components/layouts/background.tsx delete mode 100644 x-pack/plugins/beats_management/public/components/layouts/no_data.tsx delete mode 100644 x-pack/plugins/beats_management/public/components/layouts/primary.tsx delete mode 100644 x-pack/plugins/beats_management/public/components/layouts/walkthrough.tsx delete mode 100644 x-pack/plugins/beats_management/public/components/loading.tsx delete mode 100644 x-pack/plugins/beats_management/public/components/navigation/breadcrumb/breadcrumb.tsx delete mode 100644 x-pack/plugins/beats_management/public/components/navigation/breadcrumb/consumer.tsx delete mode 100644 x-pack/plugins/beats_management/public/components/navigation/breadcrumb/context.tsx delete mode 100644 x-pack/plugins/beats_management/public/components/navigation/breadcrumb/index.ts delete mode 100644 x-pack/plugins/beats_management/public/components/navigation/breadcrumb/provider.tsx delete mode 100644 x-pack/plugins/beats_management/public/components/navigation/breadcrumb/types.d.ts delete mode 100644 x-pack/plugins/beats_management/public/components/navigation/child_routes.tsx delete mode 100644 x-pack/plugins/beats_management/public/components/navigation/connected_link.tsx delete mode 100644 x-pack/plugins/beats_management/public/components/table/action_schema.ts delete mode 100644 x-pack/plugins/beats_management/public/components/table/controls/action_control.tsx delete mode 100644 x-pack/plugins/beats_management/public/components/table/controls/index.ts delete mode 100644 x-pack/plugins/beats_management/public/components/table/controls/option_control.tsx delete mode 100644 x-pack/plugins/beats_management/public/components/table/controls/tag_badge_list.tsx delete mode 100644 x-pack/plugins/beats_management/public/components/table/index.ts delete mode 100644 x-pack/plugins/beats_management/public/components/table/table.tsx delete mode 100644 x-pack/plugins/beats_management/public/components/table/table_type_configs.tsx delete mode 100644 x-pack/plugins/beats_management/public/components/tag/config_view/config_form.tsx delete mode 100644 x-pack/plugins/beats_management/public/components/tag/config_view/index.tsx delete mode 100644 x-pack/plugins/beats_management/public/components/tag/index.ts delete mode 100644 x-pack/plugins/beats_management/public/components/tag/tag_badge.tsx delete mode 100644 x-pack/plugins/beats_management/public/components/tag/tag_edit.tsx delete mode 100644 x-pack/plugins/beats_management/public/containers/beats.ts delete mode 100644 x-pack/plugins/beats_management/public/containers/tags.ts delete mode 100644 x-pack/plugins/beats_management/public/containers/with_kuery_autocompletion.tsx delete mode 100644 x-pack/plugins/beats_management/public/containers/with_url_state.tsx delete mode 100644 x-pack/plugins/beats_management/public/frontend_types.d.ts delete mode 100644 x-pack/plugins/beats_management/public/index.ts delete mode 100644 x-pack/plugins/beats_management/public/kbn_services.ts delete mode 100644 x-pack/plugins/beats_management/public/lib/adapters/beats/adapter_types.ts delete mode 100644 x-pack/plugins/beats_management/public/lib/adapters/beats/memory_beats_adapter.ts delete mode 100644 x-pack/plugins/beats_management/public/lib/adapters/beats/rest_beats_adapter.ts delete mode 100644 x-pack/plugins/beats_management/public/lib/adapters/configuration_blocks/adapter_types.ts delete mode 100644 x-pack/plugins/beats_management/public/lib/adapters/configuration_blocks/memory_config_blocks_adapter.ts delete mode 100644 x-pack/plugins/beats_management/public/lib/adapters/configuration_blocks/rest_config_blocks_adapter.ts delete mode 100644 x-pack/plugins/beats_management/public/lib/adapters/elasticsearch/adapter_types.ts delete mode 100644 x-pack/plugins/beats_management/public/lib/adapters/elasticsearch/memory.ts delete mode 100644 x-pack/plugins/beats_management/public/lib/adapters/elasticsearch/rest.ts delete mode 100644 x-pack/plugins/beats_management/public/lib/adapters/framework/adapter_types.ts delete mode 100644 x-pack/plugins/beats_management/public/lib/adapters/framework/kibana_framework_adapter.ts delete mode 100644 x-pack/plugins/beats_management/public/lib/adapters/framework/testing_framework_adapter.ts delete mode 100644 x-pack/plugins/beats_management/public/lib/adapters/rest_api/adapter_types.ts delete mode 100644 x-pack/plugins/beats_management/public/lib/adapters/rest_api/axios_rest_api_adapter.ts delete mode 100644 x-pack/plugins/beats_management/public/lib/adapters/rest_api/node_axios_api_adapter.ts delete mode 100644 x-pack/plugins/beats_management/public/lib/adapters/tags/adapter_types.ts delete mode 100644 x-pack/plugins/beats_management/public/lib/adapters/tags/memory_tags_adapter.ts delete mode 100644 x-pack/plugins/beats_management/public/lib/adapters/tags/rest_tags_adapter.ts delete mode 100644 x-pack/plugins/beats_management/public/lib/adapters/tokens/adapter_types.ts delete mode 100644 x-pack/plugins/beats_management/public/lib/adapters/tokens/memory_tokens_adapter.ts delete mode 100644 x-pack/plugins/beats_management/public/lib/adapters/tokens/rest_tokens_adapter.ts delete mode 100644 x-pack/plugins/beats_management/public/lib/beats.ts delete mode 100644 x-pack/plugins/beats_management/public/lib/compose/kibana.ts delete mode 100644 x-pack/plugins/beats_management/public/lib/compose/scripts.ts delete mode 100644 x-pack/plugins/beats_management/public/lib/config_blocks.test.ts delete mode 100644 x-pack/plugins/beats_management/public/lib/configuration_blocks.ts delete mode 100644 x-pack/plugins/beats_management/public/lib/elasticsearch.ts delete mode 100644 x-pack/plugins/beats_management/public/lib/framework.ts delete mode 100644 x-pack/plugins/beats_management/public/lib/tags.ts delete mode 100644 x-pack/plugins/beats_management/public/lib/types.ts delete mode 100644 x-pack/plugins/beats_management/public/pages/__404.tsx delete mode 100644 x-pack/plugins/beats_management/public/pages/beat/details.tsx delete mode 100644 x-pack/plugins/beats_management/public/pages/beat/index.tsx delete mode 100644 x-pack/plugins/beats_management/public/pages/beat/tags.tsx delete mode 100644 x-pack/plugins/beats_management/public/pages/error/enforce_security.tsx delete mode 100644 x-pack/plugins/beats_management/public/pages/error/invalid_license.tsx delete mode 100644 x-pack/plugins/beats_management/public/pages/error/no_access.tsx delete mode 100644 x-pack/plugins/beats_management/public/pages/index.ts delete mode 100644 x-pack/plugins/beats_management/public/pages/overview/configuration_tags.tsx delete mode 100644 x-pack/plugins/beats_management/public/pages/overview/enrolled_beats.tsx delete mode 100644 x-pack/plugins/beats_management/public/pages/overview/index.tsx delete mode 100644 x-pack/plugins/beats_management/public/pages/tag/create.tsx delete mode 100644 x-pack/plugins/beats_management/public/pages/tag/edit.tsx delete mode 100644 x-pack/plugins/beats_management/public/pages/walkthrough/initial/beat.tsx delete mode 100644 x-pack/plugins/beats_management/public/pages/walkthrough/initial/finish.tsx delete mode 100644 x-pack/plugins/beats_management/public/pages/walkthrough/initial/index.tsx delete mode 100644 x-pack/plugins/beats_management/public/pages/walkthrough/initial/tag.tsx delete mode 100644 x-pack/plugins/beats_management/public/router.tsx delete mode 100644 x-pack/plugins/beats_management/public/utils/random_eui_color.ts delete mode 100644 x-pack/plugins/beats_management/public/utils/typed_react.ts delete mode 100644 x-pack/plugins/beats_management/readme.md delete mode 100644 x-pack/plugins/beats_management/scripts/enroll.js delete mode 100644 x-pack/plugins/beats_management/scripts/fake_env.ts delete mode 100644 x-pack/plugins/beats_management/server/index.ts delete mode 100644 x-pack/plugins/beats_management/server/index_templates/beats_template.json delete mode 100644 x-pack/plugins/beats_management/server/index_templates/events_template.json delete mode 100644 x-pack/plugins/beats_management/server/index_templates/index.ts delete mode 100644 x-pack/plugins/beats_management/server/lib/adapters/beats/adapter_types.ts delete mode 100644 x-pack/plugins/beats_management/server/lib/adapters/beats/elasticsearch_beats_adapter.ts delete mode 100644 x-pack/plugins/beats_management/server/lib/adapters/configuration_blocks/adapter_types.ts delete mode 100644 x-pack/plugins/beats_management/server/lib/adapters/configuration_blocks/elasticsearch_configuration_block_adapter.ts delete mode 100644 x-pack/plugins/beats_management/server/lib/adapters/database/adapter_types.ts delete mode 100644 x-pack/plugins/beats_management/server/lib/adapters/database/kibana_database_adapter.ts delete mode 100644 x-pack/plugins/beats_management/server/lib/adapters/framework/adapter_types.ts delete mode 100644 x-pack/plugins/beats_management/server/lib/adapters/framework/kibana_framework_adapter.ts delete mode 100644 x-pack/plugins/beats_management/server/lib/adapters/tags/adapter_types.ts delete mode 100644 x-pack/plugins/beats_management/server/lib/adapters/tags/elasticsearch_tags_adapter.ts delete mode 100644 x-pack/plugins/beats_management/server/lib/adapters/tokens/adapter_types.ts delete mode 100644 x-pack/plugins/beats_management/server/lib/adapters/tokens/elasticsearch_tokens_adapter.ts delete mode 100644 x-pack/plugins/beats_management/server/lib/beat_events.ts delete mode 100644 x-pack/plugins/beats_management/server/lib/beats.ts delete mode 100644 x-pack/plugins/beats_management/server/lib/compose/kibana.ts delete mode 100644 x-pack/plugins/beats_management/server/lib/configuration_blocks.ts delete mode 100644 x-pack/plugins/beats_management/server/lib/framework.ts delete mode 100644 x-pack/plugins/beats_management/server/lib/tags.ts delete mode 100644 x-pack/plugins/beats_management/server/lib/tokens.ts delete mode 100644 x-pack/plugins/beats_management/server/lib/types.ts delete mode 100644 x-pack/plugins/beats_management/server/plugin.ts delete mode 100644 x-pack/plugins/beats_management/server/routes/beats/configuration.ts delete mode 100644 x-pack/plugins/beats_management/server/routes/beats/enroll.ts delete mode 100644 x-pack/plugins/beats_management/server/routes/beats/events.ts delete mode 100644 x-pack/plugins/beats_management/server/routes/beats/get.ts delete mode 100644 x-pack/plugins/beats_management/server/routes/beats/index.ts delete mode 100644 x-pack/plugins/beats_management/server/routes/beats/list.ts delete mode 100644 x-pack/plugins/beats_management/server/routes/beats/tag_assignment.ts delete mode 100644 x-pack/plugins/beats_management/server/routes/beats/tag_removal.ts delete mode 100644 x-pack/plugins/beats_management/server/routes/beats/update.ts delete mode 100644 x-pack/plugins/beats_management/server/routes/configurations/delete.ts delete mode 100644 x-pack/plugins/beats_management/server/routes/configurations/get.ts delete mode 100644 x-pack/plugins/beats_management/server/routes/configurations/index.ts delete mode 100644 x-pack/plugins/beats_management/server/routes/configurations/upsert.ts delete mode 100644 x-pack/plugins/beats_management/server/routes/index.ts delete mode 100644 x-pack/plugins/beats_management/server/routes/tags/assignable.ts delete mode 100644 x-pack/plugins/beats_management/server/routes/tags/delete.ts delete mode 100644 x-pack/plugins/beats_management/server/routes/tags/get.ts delete mode 100644 x-pack/plugins/beats_management/server/routes/tags/index.ts delete mode 100644 x-pack/plugins/beats_management/server/routes/tags/list.ts delete mode 100644 x-pack/plugins/beats_management/server/routes/tags/set.ts delete mode 100644 x-pack/plugins/beats_management/server/routes/tokens/create.ts delete mode 100644 x-pack/plugins/beats_management/server/routes/tokens/index.ts delete mode 100644 x-pack/plugins/beats_management/server/routes/wrap_route_with_security.ts delete mode 100644 x-pack/plugins/beats_management/tsconfig.json delete mode 100644 x-pack/plugins/beats_management/types/formsy.d.ts delete mode 100644 x-pack/test/api_integration/apis/beats/assign_tags_to_beats.js delete mode 100644 x-pack/test/api_integration/apis/beats/constants.js delete mode 100644 x-pack/test/api_integration/apis/beats/create_enrollment_tokens.js delete mode 100644 x-pack/test/api_integration/apis/beats/enroll_beat.js delete mode 100644 x-pack/test/api_integration/apis/beats/get_beat.js delete mode 100644 x-pack/test/api_integration/apis/beats/index.js delete mode 100644 x-pack/test/api_integration/apis/beats/list_beats.js delete mode 100644 x-pack/test/api_integration/apis/beats/remove_tags_from_beats.js delete mode 100644 x-pack/test/api_integration/apis/beats/set_config.js delete mode 100644 x-pack/test/api_integration/apis/beats/set_tag.js delete mode 100644 x-pack/test/api_integration/apis/beats/update_beat.js diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 39daa5780436f3..df7dc1040907cc 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -94,9 +94,6 @@ /x-pack/plugins/apm/server/projections/rum_page_load_transactions.ts @elastic/uptime /x-pack/test/apm_api_integration/tests/csm/ @elastic/uptime -# Beats -/x-pack/plugins/beats_management/ @elastic/beats -#CC# /x-pack/plugins/beats_management/ @elastic/beats # Presentation /src/plugins/dashboard/ @elastic/kibana-presentation diff --git a/api_docs/alerting.json b/api_docs/alerting.json index ddb92f5aff9bb1..13a150d0af00da 100644 --- a/api_docs/alerting.json +++ b/api_docs/alerting.json @@ -516,13 +516,15 @@ "label": "rule", "description": [], "signature": [ + "Pick, \"enabled\" | \"id\" | \"name\" | \"params\" | \"actions\" | \"tags\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"throttle\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">, \"enabled\" | \"name\" | \"actions\" | \"tags\" | \"consumer\" | \"schedule\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"throttle\" | \"notifyWhen\"> & { producer: string; ruleTypeId: string; ruleTypeName: string; }" ], "source": { "path": "x-pack/plugins/alerting/server/types.ts", @@ -840,7 +842,7 @@ "description": [], "source": { "path": "x-pack/plugins/alerting/server/types.ts", - "lineNumber": 75 + "lineNumber": 76 }, "deprecated": false } @@ -1030,7 +1032,7 @@ ], "source": { "path": "x-pack/plugins/alerting/server/types.ts", - "lineNumber": 107 + "lineNumber": 109 }, "deprecated": false } @@ -3913,7 +3915,15 @@ "label": "SanitizedRuleConfig", "description": [], "signature": [ - "Pick, \"enabled\" | \"id\" | \"name\" | \"params\" | \"actions\" | \"tags\" | \"muteAll\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"throttle\" | \"notifyWhen\" | \"mutedInstanceIds\" | \"executionStatus\">, \"enabled\" | \"name\" | \"actions\" | \"tags\" | \"consumer\" | \"schedule\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"throttle\" | \"notifyWhen\"> & { producer: string; ruleTypeId: string; ruleTypeName: string; }" + "Pick, \"enabled\" | \"id\" | \"name\" | \"params\" | \"actions\" | \"tags\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"throttle\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">, \"enabled\" | \"name\" | \"actions\" | \"tags\" | \"consumer\" | \"schedule\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"throttle\" | \"notifyWhen\"> & { producer: string; ruleTypeId: string; ruleTypeName: string; }" ], "source": { "path": "x-pack/plugins/alerting/common/alert.ts", diff --git a/api_docs/beats_management.json b/api_docs/beats_management.json deleted file mode 100644 index c8f0f6af96ce8a..00000000000000 --- a/api_docs/beats_management.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "id": "beatsManagement", - "client": { - "classes": [], - "functions": [], - "interfaces": [], - "enums": [], - "misc": [], - "objects": [] - }, - "server": { - "classes": [], - "functions": [], - "interfaces": [], - "enums": [], - "misc": [], - "objects": [] - }, - "common": { - "classes": [], - "functions": [], - "interfaces": [], - "enums": [], - "misc": [ - { - "parentPluginId": "beatsManagement", - "id": "def-common.BeatsManagementConfigType", - "type": "Type", - "tags": [], - "label": "BeatsManagementConfigType", - "description": [], - "signature": [ - "{ readonly enabled: boolean; readonly defaultUserRoles: string[]; readonly encryptionKey: string; readonly enrollmentTokensTtlInSeconds: number; }" - ], - "source": { - "path": "x-pack/plugins/beats_management/common/index.ts", - "lineNumber": 23 - }, - "deprecated": false, - "initialIsOpen": false - } - ], - "objects": [ - { - "parentPluginId": "beatsManagement", - "id": "def-common.beatsManagementConfigSchema", - "type": "Object", - "tags": [], - "label": "beatsManagementConfigSchema", - "description": [], - "signature": [ - "ObjectType", - "<{ enabled: ", - "Type", - "; defaultUserRoles: ", - "Type", - "; encryptionKey: ", - "Type", - "; enrollmentTokensTtlInSeconds: ", - "Type", - "; }>" - ], - "source": { - "path": "x-pack/plugins/beats_management/common/index.ts", - "lineNumber": 12 - }, - "deprecated": false, - "initialIsOpen": false - } - ] - } -} \ No newline at end of file diff --git a/api_docs/beats_management.mdx b/api_docs/beats_management.mdx deleted file mode 100644 index 9d712c102a1a29..00000000000000 --- a/api_docs/beats_management.mdx +++ /dev/null @@ -1,21 +0,0 @@ ---- -id: kibBeatsManagementPluginApi -slug: /kibana-dev-docs/beatsManagementPluginApi -title: beatsManagement -image: https://source.unsplash.com/400x175/?github -summary: API docs for the beatsManagement plugin -date: 2020-11-16 -tags: ['contributor', 'dev', 'apidocs', 'kibana', 'beatsManagement'] -warning: This document is auto-generated and is meant to be viewed inside our experimental, new docs system. Reach out in #docs-engineering for more info. ---- - -import beatsManagementObj from './beats_management.json'; - -## Common - -### Objects - - -### Consts, variables and types - - diff --git a/api_docs/core.json b/api_docs/core.json index fbf766cad30b38..ee4fe9b10b145e 100644 --- a/api_docs/core.json +++ b/api_docs/core.json @@ -1112,7 +1112,7 @@ ], "source": { "path": "src/core/public/index.ts", - "lineNumber": 206 + "lineNumber": 203 }, "deprecated": false, "children": [ @@ -1136,7 +1136,7 @@ ], "source": { "path": "src/core/public/index.ts", - "lineNumber": 208 + "lineNumber": 205 }, "deprecated": false }, @@ -1160,7 +1160,7 @@ ], "source": { "path": "src/core/public/index.ts", - "lineNumber": 210 + "lineNumber": 207 }, "deprecated": false }, @@ -1184,7 +1184,7 @@ ], "source": { "path": "src/core/public/index.ts", - "lineNumber": 212 + "lineNumber": 209 }, "deprecated": false }, @@ -1208,7 +1208,7 @@ ], "source": { "path": "src/core/public/index.ts", - "lineNumber": 214 + "lineNumber": 211 }, "deprecated": false }, @@ -1232,7 +1232,7 @@ ], "source": { "path": "src/core/public/index.ts", - "lineNumber": 216 + "lineNumber": 213 }, "deprecated": false }, @@ -1252,7 +1252,7 @@ ], "source": { "path": "src/core/public/index.ts", - "lineNumber": 223 + "lineNumber": 220 }, "deprecated": true, "references": [] @@ -1279,7 +1279,7 @@ ], "source": { "path": "src/core/public/index.ts", - "lineNumber": 227 + "lineNumber": 224 }, "deprecated": false, "returnComment": [], @@ -1299,7 +1299,7 @@ ], "source": { "path": "src/core/public/index.ts", - "lineNumber": 251 + "lineNumber": 248 }, "deprecated": false, "children": [ @@ -1323,7 +1323,7 @@ ], "source": { "path": "src/core/public/index.ts", - "lineNumber": 253 + "lineNumber": 250 }, "deprecated": false }, @@ -1347,7 +1347,7 @@ ], "source": { "path": "src/core/public/index.ts", - "lineNumber": 255 + "lineNumber": 252 }, "deprecated": false }, @@ -1371,7 +1371,7 @@ ], "source": { "path": "src/core/public/index.ts", - "lineNumber": 257 + "lineNumber": 254 }, "deprecated": false }, @@ -1395,7 +1395,7 @@ ], "source": { "path": "src/core/public/index.ts", - "lineNumber": 259 + "lineNumber": 256 }, "deprecated": false }, @@ -1419,7 +1419,7 @@ ], "source": { "path": "src/core/public/index.ts", - "lineNumber": 261 + "lineNumber": 258 }, "deprecated": false }, @@ -1443,7 +1443,7 @@ ], "source": { "path": "src/core/public/index.ts", - "lineNumber": 263 + "lineNumber": 260 }, "deprecated": false }, @@ -1467,7 +1467,7 @@ ], "source": { "path": "src/core/public/index.ts", - "lineNumber": 265 + "lineNumber": 262 }, "deprecated": false }, @@ -1491,7 +1491,7 @@ ], "source": { "path": "src/core/public/index.ts", - "lineNumber": 267 + "lineNumber": 264 }, "deprecated": false }, @@ -1515,7 +1515,7 @@ ], "source": { "path": "src/core/public/index.ts", - "lineNumber": 269 + "lineNumber": 266 }, "deprecated": false }, @@ -1539,7 +1539,7 @@ ], "source": { "path": "src/core/public/index.ts", - "lineNumber": 271 + "lineNumber": 268 }, "deprecated": false }, @@ -1563,7 +1563,7 @@ ], "source": { "path": "src/core/public/index.ts", - "lineNumber": 273 + "lineNumber": 270 }, "deprecated": false }, @@ -1583,7 +1583,7 @@ ], "source": { "path": "src/core/public/index.ts", - "lineNumber": 280 + "lineNumber": 277 }, "deprecated": true, "references": [ @@ -7427,7 +7427,7 @@ ], "source": { "path": "src/core/public/index.ts", - "lineNumber": 237 + "lineNumber": 234 }, "deprecated": false, "initialIsOpen": false @@ -8545,45 +8545,38 @@ } }, { - "plugin": "securitySolution", + "plugin": "monitoring", "link": { - "path": "x-pack/plugins/security_solution/server/lib/telemetry/sender.ts", - "lineNumber": 125 + "path": "x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.ts", + "lineNumber": 107 } }, { - "plugin": "securitySolution", + "plugin": "monitoring", "link": { - "path": "x-pack/plugins/security_solution/server/lib/telemetry/sender.ts", - "lineNumber": 218 + "path": "x-pack/plugins/monitoring/server/telemetry_collection/register_monitoring_telemetry_collection.ts", + "lineNumber": 148 } }, { "plugin": "securitySolution", "link": { "path": "x-pack/plugins/security_solution/server/lib/telemetry/sender.ts", - "lineNumber": 235 - } - }, - { - "plugin": "beatsManagement", - "link": { - "path": "x-pack/plugins/beats_management/server/lib/adapters/database/kibana_database_adapter.ts", - "lineNumber": 113 + "lineNumber": 125 } }, { - "plugin": "monitoring", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.ts", - "lineNumber": 107 + "path": "x-pack/plugins/security_solution/server/lib/telemetry/sender.ts", + "lineNumber": 218 } }, { - "plugin": "monitoring", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/monitoring/server/telemetry_collection/register_monitoring_telemetry_collection.ts", - "lineNumber": 148 + "path": "x-pack/plugins/security_solution/server/lib/telemetry/sender.ts", + "lineNumber": 235 } }, { @@ -9387,55 +9380,6 @@ "lineNumber": 67 } }, - { - "plugin": "lists", - "link": { - "path": "x-pack/plugins/lists/server/routes/read_privileges_route.ts", - "lineNumber": 31 - } - }, - { - "plugin": "lists", - "link": { - "path": "x-pack/plugins/lists/server/routes/read_privileges_route.ts", - "lineNumber": 35 - } - }, - { - "plugin": "securitySolution", - "link": { - "path": "x-pack/plugins/security_solution/server/lib/framework/kibana_framework_adapter.ts", - "lineNumber": 34 - } - }, - { - "plugin": "securitySolution", - "link": { - "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/query_signals_route.ts", - "lineNumber": 52 - } - }, - { - "plugin": "securitySolution", - "link": { - "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals_route.ts", - "lineNumber": 60 - } - }, - { - "plugin": "securitySolution", - "link": { - "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/privileges/read_privileges_route.ts", - "lineNumber": 41 - } - }, - { - "plugin": "beatsManagement", - "link": { - "path": "x-pack/plugins/beats_management/server/lib/adapters/database/kibana_database_adapter.ts", - "lineNumber": 111 - } - }, { "plugin": "canvas", "link": { @@ -9821,6 +9765,20 @@ "lineNumber": 420 } }, + { + "plugin": "lists", + "link": { + "path": "x-pack/plugins/lists/server/routes/read_privileges_route.ts", + "lineNumber": 31 + } + }, + { + "plugin": "lists", + "link": { + "path": "x-pack/plugins/lists/server/routes/read_privileges_route.ts", + "lineNumber": 35 + } + }, { "plugin": "monitoring", "link": { @@ -9842,6 +9800,34 @@ "lineNumber": 356 } }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/server/lib/framework/kibana_framework_adapter.ts", + "lineNumber": 34 + } + }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/query_signals_route.ts", + "lineNumber": 52 + } + }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals_route.ts", + "lineNumber": 60 + } + }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/privileges/read_privileges_route.ts", + "lineNumber": 41 + } + }, { "plugin": "canvas", "link": { @@ -12712,34 +12698,6 @@ "lineNumber": 117 } }, - { - "plugin": "securitySolution", - "link": { - "path": "x-pack/plugins/security_solution/server/lib/telemetry/sender.ts", - "lineNumber": 125 - } - }, - { - "plugin": "securitySolution", - "link": { - "path": "x-pack/plugins/security_solution/server/lib/telemetry/sender.ts", - "lineNumber": 218 - } - }, - { - "plugin": "securitySolution", - "link": { - "path": "x-pack/plugins/security_solution/server/lib/telemetry/sender.ts", - "lineNumber": 235 - } - }, - { - "plugin": "beatsManagement", - "link": { - "path": "x-pack/plugins/beats_management/server/lib/adapters/database/kibana_database_adapter.ts", - "lineNumber": 31 - } - }, { "plugin": "indexManagement", "link": { @@ -12768,6 +12726,27 @@ "lineNumber": 41 } }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/server/lib/telemetry/sender.ts", + "lineNumber": 125 + } + }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/server/lib/telemetry/sender.ts", + "lineNumber": 218 + } + }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/server/lib/telemetry/sender.ts", + "lineNumber": 235 + } + }, { "plugin": "licensing", "link": { @@ -15940,48 +15919,6 @@ "deprecated": true, "removeBy": "7.16", "references": [ - { - "plugin": "lists", - "link": { - "path": "x-pack/plugins/lists/server/schemas/common/get_call_cluster.mock.ts", - "lineNumber": 9 - } - }, - { - "plugin": "lists", - "link": { - "path": "x-pack/plugins/lists/server/schemas/common/get_call_cluster.mock.ts", - "lineNumber": 27 - } - }, - { - "plugin": "lists", - "link": { - "path": "x-pack/plugins/lists/server/schemas/common/get_call_cluster.mock.ts", - "lineNumber": 31 - } - }, - { - "plugin": "securitySolution", - "link": { - "path": "x-pack/plugins/security_solution/server/lib/telemetry/sender.ts", - "lineNumber": 10 - } - }, - { - "plugin": "securitySolution", - "link": { - "path": "x-pack/plugins/security_solution/server/lib/telemetry/sender.ts", - "lineNumber": 447 - } - }, - { - "plugin": "securitySolution", - "link": { - "path": "x-pack/plugins/security_solution/server/lib/telemetry/sender.ts", - "lineNumber": 466 - } - }, { "plugin": "canvas", "link": { @@ -16269,6 +16206,48 @@ "lineNumber": 35 } }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/server/lib/telemetry/sender.ts", + "lineNumber": 10 + } + }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/server/lib/telemetry/sender.ts", + "lineNumber": 447 + } + }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/server/lib/telemetry/sender.ts", + "lineNumber": 466 + } + }, + { + "plugin": "lists", + "link": { + "path": "x-pack/plugins/lists/server/schemas/common/get_call_cluster.mock.ts", + "lineNumber": 9 + } + }, + { + "plugin": "lists", + "link": { + "path": "x-pack/plugins/lists/server/schemas/common/get_call_cluster.mock.ts", + "lineNumber": 27 + } + }, + { + "plugin": "lists", + "link": { + "path": "x-pack/plugins/lists/server/schemas/common/get_call_cluster.mock.ts", + "lineNumber": 31 + } + }, { "plugin": "monitoring", "link": { @@ -16458,6 +16437,27 @@ "lineNumber": 20 } }, + { + "plugin": "lists", + "link": { + "path": "x-pack/plugins/lists/target/types/server/schemas/common/get_call_cluster.mock.d.ts", + "lineNumber": 2 + } + }, + { + "plugin": "lists", + "link": { + "path": "x-pack/plugins/lists/target/types/server/schemas/common/get_call_cluster.mock.d.ts", + "lineNumber": 4 + } + }, + { + "plugin": "lists", + "link": { + "path": "x-pack/plugins/lists/target/types/server/schemas/common/get_call_cluster.mock.d.ts", + "lineNumber": 5 + } + }, { "plugin": "monitoring", "link": { @@ -19544,7 +19544,7 @@ "The os platform" ], "signature": [ - "\"linux\" | \"aix\" | \"android\" | \"darwin\" | \"freebsd\" | \"openbsd\" | \"sunos\" | \"win32\" | \"cygwin\" | \"netbsd\"" + "\"linux\" | \"aix\" | \"android\" | \"darwin\" | \"freebsd\" | \"openbsd\" | \"sunos\" | \"win32\" | \"cygwin\"" ], "source": { "path": "src/core/server/metrics/collectors/types.ts", @@ -23173,20 +23173,6 @@ "lineNumber": 180 } }, - { - "plugin": "beatsManagement", - "link": { - "path": "x-pack/plugins/beats_management/server/lib/adapters/database/kibana_database_adapter.ts", - "lineNumber": 8 - } - }, - { - "plugin": "beatsManagement", - "link": { - "path": "x-pack/plugins/beats_management/server/lib/adapters/database/kibana_database_adapter.ts", - "lineNumber": 28 - } - }, { "plugin": "licensing", "link": { diff --git a/api_docs/core_application.json b/api_docs/core_application.json index 3141bf16a93498..13b110900ab530 100644 --- a/api_docs/core_application.json +++ b/api_docs/core_application.json @@ -886,7 +886,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 339 + "lineNumber": 326 }, "deprecated": false } @@ -930,26 +930,44 @@ }, { "parentPluginId": "core", - "id": "def-public.App.meta", - "type": "Object", + "id": "def-public.App.keywords", + "type": "Array", + "tags": [], + "label": "keywords", + "description": [ + "Optional keywords to match with in deep links search. Omit if this part of the hierarchy does not have a page URL." + ], + "signature": [ + "string[] | undefined" + ], + "source": { + "path": "src/core/public/application/types.ts", + "lineNumber": 215 + }, + "deprecated": false + }, + { + "parentPluginId": "core", + "id": "def-public.App.deepLinks", + "type": "Array", "tags": [], - "label": "meta", + "label": "deepLinks", "description": [ - "\nMeta data for an application that represent additional information for the app.\nSee {@link AppMeta}\n" + "\nInput type for registering secondary in-app locations for an application.\n\nDeep links must include at least one of `path` or `deepLinks`. A deep link that does not have a `path`\nrepresents a topological level in the application's hierarchy, but does not have a destination URL that is\nuser-accessible.\n" ], "signature": [ { "pluginId": "core", "scope": "public", "docId": "kibCoreApplicationPluginApi", - "section": "def-public.AppMeta", - "text": "AppMeta" + "section": "def-public.AppDeepLink", + "text": "AppDeepLink" }, - " | undefined" + "[] | undefined" ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 244 + "lineNumber": 254 }, "deprecated": false } @@ -967,7 +985,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 565 + "lineNumber": 552 }, "deprecated": false, "children": [ @@ -990,7 +1008,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 566 + "lineNumber": 553 }, "deprecated": false }, @@ -1003,7 +1021,7 @@ "description": [], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 567 + "lineNumber": 554 }, "deprecated": false }, @@ -1019,7 +1037,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 568 + "lineNumber": 555 }, "deprecated": false }, @@ -1035,7 +1053,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 569 + "lineNumber": 556 }, "deprecated": false } @@ -1053,7 +1071,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 553 + "lineNumber": 540 }, "deprecated": false, "children": [ @@ -1076,7 +1094,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 554 + "lineNumber": 541 }, "deprecated": false } @@ -1092,7 +1110,7 @@ "description": [], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 620 + "lineNumber": 607 }, "deprecated": false, "children": [ @@ -1118,7 +1136,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 626 + "lineNumber": 613 }, "deprecated": false, "children": [ @@ -1143,7 +1161,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 626 + "lineNumber": 613 }, "deprecated": false, "isRequired": true @@ -1175,7 +1193,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 655 + "lineNumber": 642 }, "deprecated": false, "children": [ @@ -1200,7 +1218,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 655 + "lineNumber": 642 }, "deprecated": false, "isRequired": true @@ -1220,7 +1238,7 @@ "description": [], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 696 + "lineNumber": 683 }, "deprecated": false, "children": [ @@ -1238,7 +1256,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 700 + "lineNumber": 687 }, "deprecated": false }, @@ -1265,7 +1283,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 709 + "lineNumber": 696 }, "deprecated": false }, @@ -1291,7 +1309,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 717 + "lineNumber": 704 }, "deprecated": false, "children": [ @@ -1307,7 +1325,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 717 + "lineNumber": 704 }, "deprecated": false, "isRequired": true @@ -1333,7 +1351,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 717 + "lineNumber": 704 }, "deprecated": false, "isRequired": false @@ -1355,7 +1373,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 755 + "lineNumber": 742 }, "deprecated": false, "children": [ @@ -1373,7 +1391,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 755 + "lineNumber": 742 }, "deprecated": false, "isRequired": true @@ -1395,7 +1413,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 769 + "lineNumber": 756 }, "deprecated": false, "children": [ @@ -1411,7 +1429,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 769 + "lineNumber": 756 }, "deprecated": false, "isRequired": true @@ -1425,7 +1443,7 @@ "description": [], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 769 + "lineNumber": 756 }, "deprecated": false, "children": [ @@ -1441,7 +1459,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 769 + "lineNumber": 756 }, "deprecated": false }, @@ -1457,7 +1475,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 769 + "lineNumber": 756 }, "deprecated": false } @@ -1481,68 +1499,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 774 - }, - "deprecated": false - } - ], - "initialIsOpen": false - }, - { - "parentPluginId": "core", - "id": "def-public.AppMeta", - "type": "Interface", - "tags": [], - "label": "AppMeta", - "description": [ - "\nInput type for meta data for an application.\n\nMeta fields include `keywords` and `searchDeepLinks`\nKeywords is an array of string with which to associate the app, must include at least one unique string as an array.\n`searchDeepLinks` is an array of links that represent secondary in-app locations for the app." - ], - "source": { - "path": "src/core/public/application/types.ts", - "lineNumber": 255 - }, - "deprecated": false, - "children": [ - { - "parentPluginId": "core", - "id": "def-public.AppMeta.keywords", - "type": "Array", - "tags": [], - "label": "keywords", - "description": [ - "Keywords to represent this application" - ], - "signature": [ - "string[] | undefined" - ], - "source": { - "path": "src/core/public/application/types.ts", - "lineNumber": 257 - }, - "deprecated": false - }, - { - "parentPluginId": "core", - "id": "def-public.AppMeta.searchDeepLinks", - "type": "Array", - "tags": [], - "label": "searchDeepLinks", - "description": [ - "Array of links that represent secondary in-app locations for the app." - ], - "signature": [ - { - "pluginId": "core", - "scope": "public", - "docId": "kibCoreApplicationPluginApi", - "section": "def-public.AppSearchDeepLink", - "text": "AppSearchDeepLink" - }, - "[] | undefined" - ], - "source": { - "path": "src/core/public/application/types.ts", - "lineNumber": 259 + "lineNumber": 761 }, "deprecated": false } @@ -1568,7 +1525,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 349 + "lineNumber": 336 }, "deprecated": false, "children": [ @@ -1586,7 +1543,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 353 + "lineNumber": 340 }, "deprecated": false }, @@ -1611,7 +1568,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 399 + "lineNumber": 386 }, "deprecated": false }, @@ -1628,7 +1585,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 449 + "lineNumber": 436 }, "deprecated": true, "references": [ @@ -1721,7 +1678,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 484 + "lineNumber": 471 }, "deprecated": true, "references": [ @@ -1746,20 +1703,6 @@ "lineNumber": 298 } }, - { - "plugin": "lens", - "link": { - "path": "x-pack/plugins/lens/public/app_plugin/types.ts", - "lineNumber": 71 - } - }, - { - "plugin": "lens", - "link": { - "path": "x-pack/plugins/lens/public/app_plugin/mounter.tsx", - "lineNumber": 171 - } - }, { "plugin": "maps", "link": { @@ -1781,6 +1724,20 @@ "lineNumber": 19 } }, + { + "plugin": "lens", + "link": { + "path": "x-pack/plugins/lens/public/app_plugin/types.ts", + "lineNumber": 71 + } + }, + { + "plugin": "lens", + "link": { + "path": "x-pack/plugins/lens/public/app_plugin/mounter.tsx", + "lineNumber": 171 + } + }, { "plugin": "ml", "link": { @@ -1882,7 +1839,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 484 + "lineNumber": 471 }, "deprecated": false } @@ -1910,7 +1867,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 515 + "lineNumber": 502 }, "deprecated": false, "returnComment": [], @@ -1934,7 +1891,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 515 + "lineNumber": 502 }, "deprecated": false } @@ -1954,7 +1911,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 674 + "lineNumber": 661 }, "deprecated": false, "children": [ @@ -1972,7 +1929,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 679 + "lineNumber": 666 }, "deprecated": false }, @@ -1990,7 +1947,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 683 + "lineNumber": 670 }, "deprecated": false }, @@ -2008,7 +1965,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 687 + "lineNumber": 674 }, "deprecated": false }, @@ -2026,7 +1983,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 692 + "lineNumber": 679 }, "deprecated": false } @@ -2046,7 +2003,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 540 + "lineNumber": 527 }, "deprecated": false, "initialIsOpen": false @@ -2085,6 +2042,57 @@ } ], "misc": [ + { + "parentPluginId": "core", + "id": "def-public.AppDeepLink", + "type": "Type", + "tags": [], + "label": "AppDeepLink", + "description": [ + "\nInput type for registering secondary in-app locations for an application.\n\nDeep links must include at least one of `path` or `deepLinks`. A deep link that does not have a `path`\nrepresents a topological level in the application's hierarchy, but does not have a destination URL that is\nuser-accessible." + ], + "signature": [ + "({ id: string; title: string; keywords?: string[] | undefined; navLinkStatus?: ", + { + "pluginId": "core", + "scope": "public", + "docId": "kibCoreApplicationPluginApi", + "section": "def-public.AppNavLinkStatus", + "text": "AppNavLinkStatus" + }, + " | undefined; } & { path: string; deepLinks?: ", + { + "pluginId": "core", + "scope": "public", + "docId": "kibCoreApplicationPluginApi", + "section": "def-public.AppDeepLink", + "text": "AppDeepLink" + }, + "[] | undefined; }) | ({ id: string; title: string; keywords?: string[] | undefined; navLinkStatus?: ", + { + "pluginId": "core", + "scope": "public", + "docId": "kibCoreApplicationPluginApi", + "section": "def-public.AppNavLinkStatus", + "text": "AppNavLinkStatus" + }, + " | undefined; } & { path?: string | undefined; deepLinks: ", + { + "pluginId": "core", + "scope": "public", + "docId": "kibCoreApplicationPluginApi", + "section": "def-public.AppDeepLink", + "text": "AppDeepLink" + }, + "[]; })" + ], + "source": { + "path": "src/core/public/application/types.ts", + "lineNumber": 279 + }, + "deprecated": false, + "initialIsOpen": false + }, { "parentPluginId": "core", "id": "def-public.AppLeaveAction", @@ -2113,7 +2121,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 579 + "lineNumber": 566 }, "deprecated": false, "initialIsOpen": false @@ -2143,7 +2151,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 530 + "lineNumber": 517 }, "deprecated": true, "references": [ @@ -2251,42 +2259,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 338 - }, - "deprecated": false, - "initialIsOpen": false - }, - { - "parentPluginId": "core", - "id": "def-public.AppSearchDeepLink", - "type": "Type", - "tags": [], - "label": "AppSearchDeepLink", - "description": [ - "\nInput type for registering secondary in-app locations for an application.\n\nDeep links must include at least one of `path` or `searchDeepLinks`. A deep link that does not have a `path`\nrepresents a topological level in the application's hierarchy, but does not have a destination URL that is\nuser-accessible." - ], - "signature": [ - "({ id: string; title: string; } & { path: string; searchDeepLinks?: ", - { - "pluginId": "core", - "scope": "public", - "docId": "kibCoreApplicationPluginApi", - "section": "def-public.AppSearchDeepLink", - "text": "AppSearchDeepLink" - }, - "[] | undefined; keywords?: string[] | undefined; }) | ({ id: string; title: string; } & { path?: string | undefined; searchDeepLinks: ", - { - "pluginId": "core", - "scope": "public", - "docId": "kibCoreApplicationPluginApi", - "section": "def-public.AppSearchDeepLink", - "text": "AppSearchDeepLink" - }, - "[]; keywords?: string[] | undefined; })" - ], - "source": { - "path": "src/core/public/application/types.ts", - "lineNumber": 293 + "lineNumber": 325 }, "deprecated": false, "initialIsOpen": false @@ -2305,7 +2278,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 346 + "lineNumber": 333 }, "deprecated": false, "initialIsOpen": false @@ -2328,15 +2301,15 @@ "section": "def-public.AppStatus", "text": "AppStatus" }, - " | undefined; meta?: ", + " | undefined; deepLinks?: ", { "pluginId": "core", "scope": "public", "docId": "kibCoreApplicationPluginApi", - "section": "def-public.AppMeta", - "text": "AppMeta" + "section": "def-public.AppDeepLink", + "text": "AppDeepLink" }, - " | undefined; navLinkStatus?: ", + "[] | undefined; navLinkStatus?: ", { "pluginId": "core", "scope": "public", @@ -2379,7 +2352,7 @@ "section": "def-public.App", "text": "App" }, - ", \"status\" | \"meta\" | \"navLinkStatus\" | \"defaultPath\" | \"tooltip\">> | undefined" + ", \"status\" | \"deepLinks\" | \"navLinkStatus\" | \"defaultPath\" | \"tooltip\">> | undefined" ], "source": { "path": "src/core/public/application/types.ts", @@ -2390,12 +2363,12 @@ }, { "parentPluginId": "core", - "id": "def-public.PublicAppInfo", + "id": "def-public.PublicAppDeepLinkInfo", "type": "Type", "tags": [], - "label": "PublicAppInfo", + "label": "PublicAppDeepLinkInfo", "description": [ - "\nPublic information about a registered {@link App | application}\n" + "\nPublic information about a registered app's {@link AppDeepLink | deepLinks}\n" ], "signature": [ "Pick<", @@ -2403,18 +2376,18 @@ "pluginId": "core", "scope": "public", "docId": "kibCoreApplicationPluginApi", - "section": "def-public.App", - "text": "App" + "section": "def-public.AppDeepLink", + "text": "AppDeepLink" }, - ", \"status\" | \"title\" | \"id\" | \"order\" | \"category\" | \"navLinkStatus\" | \"defaultPath\" | \"tooltip\" | \"euiIconType\" | \"icon\" | \"capabilities\" | \"chromeless\" | \"appRoute\" | \"exactRoute\"> & { status: ", + ", \"title\" | \"id\" | \"path\"> & { deepLinks: ", { "pluginId": "core", "scope": "public", "docId": "kibCoreApplicationPluginApi", - "section": "def-public.AppStatus", - "text": "AppStatus" + "section": "def-public.PublicAppDeepLinkInfo", + "text": "PublicAppDeepLinkInfo" }, - "; navLinkStatus: ", + "[]; keywords: string[]; navLinkStatus: ", { "pluginId": "core", "scope": "public", @@ -2422,31 +2395,23 @@ "section": "def-public.AppNavLinkStatus", "text": "AppNavLinkStatus" }, - "; appRoute: string; meta: ", - { - "pluginId": "core", - "scope": "public", - "docId": "kibCoreApplicationPluginApi", - "section": "def-public.PublicAppMetaInfo", - "text": "PublicAppMetaInfo" - }, "; }" ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 322 + "lineNumber": 262 }, "deprecated": false, "initialIsOpen": false }, { "parentPluginId": "core", - "id": "def-public.PublicAppMetaInfo", + "id": "def-public.PublicAppInfo", "type": "Type", "tags": [], - "label": "PublicAppMetaInfo", + "label": "PublicAppInfo", "description": [ - "\nPublic information about a registered app's {@link AppMeta | keywords }\n" + "\nPublic information about a registered {@link App | application}\n" ], "signature": [ "Pick<", @@ -2454,57 +2419,38 @@ "pluginId": "core", "scope": "public", "docId": "kibCoreApplicationPluginApi", - "section": "def-public.AppMeta", - "text": "AppMeta" + "section": "def-public.App", + "text": "App" }, - ", never> & { keywords: string[]; searchDeepLinks: ", + ", \"status\" | \"title\" | \"id\" | \"order\" | \"category\" | \"navLinkStatus\" | \"defaultPath\" | \"tooltip\" | \"euiIconType\" | \"icon\" | \"capabilities\" | \"chromeless\" | \"appRoute\" | \"exactRoute\"> & { status: ", { "pluginId": "core", "scope": "public", "docId": "kibCoreApplicationPluginApi", - "section": "def-public.PublicAppSearchDeepLinkInfo", - "text": "PublicAppSearchDeepLinkInfo" + "section": "def-public.AppStatus", + "text": "AppStatus" }, - "[]; }" - ], - "source": { - "path": "src/core/public/application/types.ts", - "lineNumber": 267 - }, - "deprecated": false, - "initialIsOpen": false - }, - { - "parentPluginId": "core", - "id": "def-public.PublicAppSearchDeepLinkInfo", - "type": "Type", - "tags": [], - "label": "PublicAppSearchDeepLinkInfo", - "description": [ - "\nPublic information about a registered app's {@link AppSearchDeepLink | searchDeepLinks}\n" - ], - "signature": [ - "Pick<", + "; navLinkStatus: ", { "pluginId": "core", "scope": "public", "docId": "kibCoreApplicationPluginApi", - "section": "def-public.AppSearchDeepLink", - "text": "AppSearchDeepLink" + "section": "def-public.AppNavLinkStatus", + "text": "AppNavLinkStatus" }, - ", \"title\" | \"id\" | \"path\"> & { searchDeepLinks: ", + "; appRoute: string; keywords: string[]; deepLinks: ", { "pluginId": "core", "scope": "public", "docId": "kibCoreApplicationPluginApi", - "section": "def-public.PublicAppSearchDeepLinkInfo", - "text": "PublicAppSearchDeepLinkInfo" + "section": "def-public.PublicAppDeepLinkInfo", + "text": "PublicAppDeepLinkInfo" }, - "[]; keywords: string[]; }" + "[]; }" ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 277 + "lineNumber": 308 }, "deprecated": false, "initialIsOpen": false diff --git a/api_docs/core_chrome.json b/api_docs/core_chrome.json index d6ec4b0d3f640b..fae65ff62c9714 100644 --- a/api_docs/core_chrome.json +++ b/api_docs/core_chrome.json @@ -890,7 +890,7 @@ "description": [], "source": { "path": "src/core/public/chrome/nav_links/nav_link.ts", - "lineNumber": 15 + "lineNumber": 14 }, "deprecated": false, "children": [ @@ -905,7 +905,7 @@ ], "source": { "path": "src/core/public/chrome/nav_links/nav_link.ts", - "lineNumber": 19 + "lineNumber": 18 }, "deprecated": false }, @@ -920,7 +920,7 @@ ], "source": { "path": "src/core/public/chrome/nav_links/nav_link.ts", - "lineNumber": 24 + "lineNumber": 23 }, "deprecated": false }, @@ -939,7 +939,7 @@ ], "source": { "path": "src/core/public/chrome/nav_links/nav_link.ts", - "lineNumber": 29 + "lineNumber": 28 }, "deprecated": false }, @@ -954,7 +954,7 @@ ], "source": { "path": "src/core/public/chrome/nav_links/nav_link.ts", - "lineNumber": 34 + "lineNumber": 33 }, "deprecated": false }, @@ -972,7 +972,7 @@ ], "source": { "path": "src/core/public/chrome/nav_links/nav_link.ts", - "lineNumber": 40 + "lineNumber": 39 }, "deprecated": false }, @@ -990,7 +990,7 @@ ], "source": { "path": "src/core/public/chrome/nav_links/nav_link.ts", - "lineNumber": 45 + "lineNumber": 44 }, "deprecated": false }, @@ -1008,7 +1008,7 @@ ], "source": { "path": "src/core/public/chrome/nav_links/nav_link.ts", - "lineNumber": 50 + "lineNumber": 49 }, "deprecated": false }, @@ -1026,7 +1026,7 @@ ], "source": { "path": "src/core/public/chrome/nav_links/nav_link.ts", - "lineNumber": 56 + "lineNumber": 55 }, "deprecated": false }, @@ -1044,7 +1044,7 @@ ], "source": { "path": "src/core/public/chrome/nav_links/nav_link.ts", - "lineNumber": 62 + "lineNumber": 61 }, "deprecated": false }, @@ -1059,7 +1059,7 @@ ], "source": { "path": "src/core/public/chrome/nav_links/nav_link.ts", - "lineNumber": 67 + "lineNumber": 66 }, "deprecated": false }, @@ -1077,7 +1077,7 @@ ], "source": { "path": "src/core/public/chrome/nav_links/nav_link.ts", - "lineNumber": 76 + "lineNumber": 75 }, "deprecated": false }, @@ -1095,7 +1095,7 @@ ], "source": { "path": "src/core/public/chrome/nav_links/nav_link.ts", - "lineNumber": 81 + "lineNumber": 80 }, "deprecated": false } @@ -1297,103 +1297,6 @@ ], "returnComment": [] }, - { - "parentPluginId": "core", - "id": "def-public.ChromeNavLinks.update", - "type": "Function", - "tags": [ - "deprecated" - ], - "label": "update", - "description": [ - "\nUpdate the navlink for the given id with the updated attributes.\nReturns the updated navlink or `undefined` if it does not exist.\n" - ], - "signature": [ - "(id: string, values: Partial>) => ", - { - "pluginId": "core", - "scope": "public", - "docId": "kibCoreChromePluginApi", - "section": "def-public.ChromeNavLink", - "text": "ChromeNavLink" - }, - " | undefined" - ], - "source": { - "path": "src/core/public/chrome/nav_links/nav_links_service.ts", - "lineNumber": 71 - }, - "deprecated": true, - "references": [ - { - "plugin": "apm", - "link": { - "path": "x-pack/plugins/apm/public/toggleAppLinkInNav.ts", - "lineNumber": 13 - } - }, - { - "plugin": "graph", - "link": { - "path": "x-pack/plugins/graph/public/services/toggle_nav_link.ts", - "lineNumber": 26 - } - } - ], - "children": [ - { - "parentPluginId": "core", - "id": "def-public.ChromeNavLinks.update.$1", - "type": "string", - "tags": [], - "label": "id", - "description": [], - "signature": [ - "string" - ], - "source": { - "path": "src/core/public/chrome/nav_links/nav_links_service.ts", - "lineNumber": 71 - }, - "deprecated": false, - "isRequired": true - }, - { - "parentPluginId": "core", - "id": "def-public.ChromeNavLinks.update.$2", - "type": "Object", - "tags": [], - "label": "values", - "description": [], - "signature": [ - "Partial>" - ], - "source": { - "path": "src/core/public/chrome/nav_links/nav_links_service.ts", - "lineNumber": 71 - }, - "deprecated": false, - "isRequired": true - } - ], - "returnComment": [] - }, { "parentPluginId": "core", "id": "def-public.ChromeNavLinks.enableForcedAppSwitcherNavigation", @@ -1408,7 +1311,7 @@ ], "source": { "path": "src/core/public/chrome/nav_links/nav_links_service.ts", - "lineNumber": 85 + "lineNumber": 73 }, "deprecated": false, "children": [], @@ -1430,7 +1333,7 @@ ], "source": { "path": "src/core/public/chrome/nav_links/nav_links_service.ts", - "lineNumber": 90 + "lineNumber": 78 }, "deprecated": false, "children": [], @@ -2678,23 +2581,6 @@ "deprecated": false, "initialIsOpen": false }, - { - "parentPluginId": "core", - "id": "def-public.ChromeNavLinkUpdateableFields", - "type": "Type", - "tags": [], - "label": "ChromeNavLinkUpdateableFields", - "description": [], - "signature": [ - "{ readonly hidden?: boolean | undefined; readonly url?: string | undefined; readonly disabled?: boolean | undefined; readonly href?: string | undefined; }" - ], - "source": { - "path": "src/core/public/chrome/nav_links/nav_link.ts", - "lineNumber": 85 - }, - "deprecated": false, - "initialIsOpen": false - }, { "parentPluginId": "core", "id": "def-public.NavType", diff --git a/api_docs/data.json b/api_docs/data.json index 77d26811db5bf4..ab5196934d855b 100644 --- a/api_docs/data.json +++ b/api_docs/data.json @@ -11486,111 +11486,6 @@ "lineNumber": 58 } }, - { - "plugin": "fleet", - "link": { - "path": "x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx", - "lineNumber": 10 - } - }, - { - "plugin": "fleet", - "link": { - "path": "x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx", - "lineNumber": 33 - } - }, - { - "plugin": "fleet", - "link": { - "path": "x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx", - "lineNumber": 51 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/service/list/config.ts", - "lineNumber": 10 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/service/list/config.ts", - "lineNumber": 42 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/service/list/manager.ts", - "lineNumber": 9 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/service/list/manager.ts", - "lineNumber": 43 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/extract_time_fields.ts", - "lineNumber": 10 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/extract_time_fields.ts", - "lineNumber": 12 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/types.ts", - "lineNumber": 9 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/types.ts", - "lineNumber": 11 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx", - "lineNumber": 11 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx", - "lineNumber": 23 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx", - "lineNumber": 45 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx", - "lineNumber": 148 - } - }, { "plugin": "maps", "link": { @@ -11955,6 +11850,90 @@ "lineNumber": 66 } }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/service/list/config.ts", + "lineNumber": 10 + } + }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/service/list/config.ts", + "lineNumber": 42 + } + }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/service/list/manager.ts", + "lineNumber": 9 + } + }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/service/list/manager.ts", + "lineNumber": 43 + } + }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/extract_time_fields.ts", + "lineNumber": 10 + } + }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/extract_time_fields.ts", + "lineNumber": 12 + } + }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/types.ts", + "lineNumber": 9 + } + }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/types.ts", + "lineNumber": 11 + } + }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx", + "lineNumber": 11 + } + }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx", + "lineNumber": 23 + } + }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx", + "lineNumber": 45 + } + }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx", + "lineNumber": 148 + } + }, { "plugin": "ml", "link": { @@ -12207,6 +12186,27 @@ "lineNumber": 21 } }, + { + "plugin": "fleet", + "link": { + "path": "x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx", + "lineNumber": 10 + } + }, + { + "plugin": "fleet", + "link": { + "path": "x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx", + "lineNumber": 33 + } + }, + { + "plugin": "fleet", + "link": { + "path": "x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx", + "lineNumber": 51 + } + }, { "plugin": "fleet", "link": { @@ -12747,409 +12747,346 @@ } }, { - "plugin": "lists", + "plugin": "maps", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.ts", - "lineNumber": 19 + "path": "x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts", + "lineNumber": 10 } }, { - "plugin": "lists", + "plugin": "maps", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.ts", - "lineNumber": 30 + "path": "x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts", + "lineNumber": 16 } }, { - "plugin": "lists", + "plugin": "maps", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.ts", - "lineNumber": 54 + "path": "x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts", + "lineNumber": 29 } }, { - "plugin": "lists", + "plugin": "maps", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.ts", - "lineNumber": 84 + "path": "x-pack/plugins/maps/public/components/geo_field_select.tsx", + "lineNumber": 12 } }, { - "plugin": "lists", + "plugin": "maps", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.ts", - "lineNumber": 150 + "path": "x-pack/plugins/maps/public/components/geo_field_select.tsx", + "lineNumber": 16 } }, { - "plugin": "lists", + "plugin": "maps", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 11 + "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/create_source_editor.tsx", + "lineNumber": 18 } }, { - "plugin": "lists", + "plugin": "maps", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 26 + "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/create_source_editor.tsx", + "lineNumber": 30 } }, { - "plugin": "lists", + "plugin": "maps", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 28 + "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/create_source_editor.tsx", + "lineNumber": 33 } }, { - "plugin": "lists", + "plugin": "maps", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 57 + "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/create_source_editor.tsx", + "lineNumber": 35 } }, { - "plugin": "lists", + "plugin": "lens", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 95 + "path": "x-pack/plugins/lens/public/indexpattern_datasource/types.ts", + "lineNumber": 8 } }, { - "plugin": "lists", + "plugin": "lens", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 96 + "path": "x-pack/plugins/lens/public/indexpattern_datasource/types.ts", + "lineNumber": 57 } }, { - "plugin": "lists", + "plugin": "lens", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 101 + "path": "x-pack/plugins/lens/server/routes/field_stats.ts", + "lineNumber": 11 } }, { - "plugin": "lists", + "plugin": "lens", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 114 + "path": "x-pack/plugins/lens/server/routes/field_stats.ts", + "lineNumber": 139 } }, { - "plugin": "lists", + "plugin": "lens", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 121 + "path": "x-pack/plugins/lens/server/routes/field_stats.ts", + "lineNumber": 248 } }, { - "plugin": "lists", + "plugin": "lens", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 125 + "path": "x-pack/plugins/lens/server/routes/field_stats.ts", + "lineNumber": 287 } }, { - "plugin": "lists", + "plugin": "lens", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 125 + "path": "x-pack/plugins/lens/server/routes/field_stats.ts", + "lineNumber": 329 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 130 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.ts", + "lineNumber": 19 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 131 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.ts", + "lineNumber": 30 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 133 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.ts", + "lineNumber": 54 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 134 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.ts", + "lineNumber": 84 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/operator.tsx", - "lineNumber": 11 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.ts", + "lineNumber": 150 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/operator.tsx", - "lineNumber": 27 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 11 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/hooks/use_field_value_autocomplete.ts", - "lineNumber": 13 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 26 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/hooks/use_field_value_autocomplete.ts", - "lineNumber": 16 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 28 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/hooks/use_field_value_autocomplete.ts", - "lineNumber": 32 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 57 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match.tsx", - "lineNumber": 19 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 95 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match.tsx", - "lineNumber": 36 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 96 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match_any.tsx", - "lineNumber": 13 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 101 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match_any.tsx", - "lineNumber": 23 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 114 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_lists.tsx", - "lineNumber": 13 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 121 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_lists.tsx", - "lineNumber": 29 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 125 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx", - "lineNumber": 31 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 125 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx", - "lineNumber": 91 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 130 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", - "lineNumber": 19 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 131 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", - "lineNumber": 333 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 133 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", - "lineNumber": 339 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 134 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", - "lineNumber": 347 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/operator.tsx", + "lineNumber": 11 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", - "lineNumber": 355 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/operator.tsx", + "lineNumber": 27 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", - "lineNumber": 363 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/hooks/use_field_value_autocomplete.ts", + "lineNumber": 13 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", - "lineNumber": 371 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/hooks/use_field_value_autocomplete.ts", + "lineNumber": 16 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", - "lineNumber": 380 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/hooks/use_field_value_autocomplete.ts", + "lineNumber": 32 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 62 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match.tsx", + "lineNumber": 19 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 166 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match.tsx", + "lineNumber": 36 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 167 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match_any.tsx", + "lineNumber": 13 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 629 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match_any.tsx", + "lineNumber": 23 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 666 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_lists.tsx", + "lineNumber": 14 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 691 - } - }, - { - "plugin": "lens", - "link": { - "path": "x-pack/plugins/lens/public/indexpattern_datasource/types.ts", - "lineNumber": 8 - } - }, - { - "plugin": "lens", - "link": { - "path": "x-pack/plugins/lens/public/indexpattern_datasource/types.ts", - "lineNumber": 57 - } - }, - { - "plugin": "maps", - "link": { - "path": "x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts", - "lineNumber": 10 - } - }, - { - "plugin": "maps", - "link": { - "path": "x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts", - "lineNumber": 16 - } - }, - { - "plugin": "maps", - "link": { - "path": "x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts", + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_lists.tsx", "lineNumber": 29 } }, { - "plugin": "maps", - "link": { - "path": "x-pack/plugins/maps/public/components/geo_field_select.tsx", - "lineNumber": 12 - } - }, - { - "plugin": "maps", - "link": { - "path": "x-pack/plugins/maps/public/components/geo_field_select.tsx", - "lineNumber": 16 - } - }, - { - "plugin": "maps", - "link": { - "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/create_source_editor.tsx", - "lineNumber": 18 - } - }, - { - "plugin": "maps", - "link": { - "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/create_source_editor.tsx", - "lineNumber": 30 - } - }, - { - "plugin": "maps", + "plugin": "lists", "link": { - "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/create_source_editor.tsx", - "lineNumber": 33 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx", + "lineNumber": 31 } }, { - "plugin": "maps", + "plugin": "lists", "link": { - "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/create_source_editor.tsx", - "lineNumber": 35 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx", + "lineNumber": 91 } }, { @@ -13391,192 +13328,213 @@ } }, { - "plugin": "securitySolution", + "plugin": "lens", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_lists.tsx", - "lineNumber": 12 + "path": "x-pack/plugins/lens/target/types/public/indexpattern_datasource/types.d.ts", + "lineNumber": 1 } }, { - "plugin": "securitySolution", + "plugin": "lens", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_lists.tsx", - "lineNumber": 20 - } + "path": "x-pack/plugins/lens/target/types/public/indexpattern_datasource/types.d.ts", + "lineNumber": 22 + } }, { - "plugin": "securitySolution", + "plugin": "lens", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match_any.tsx", - "lineNumber": 13 + "path": "x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts", + "lineNumber": 3 } }, { - "plugin": "securitySolution", + "plugin": "lens", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match_any.tsx", - "lineNumber": 22 + "path": "x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts", + "lineNumber": 7 } }, { - "plugin": "securitySolution", + "plugin": "lens", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", - "lineNumber": 11 + "path": "x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts", + "lineNumber": 8 } }, { - "plugin": "securitySolution", + "plugin": "lens", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "path": "x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts", + "lineNumber": 9 + } + }, + { + "plugin": "lists", + "link": { + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", + "lineNumber": 19 + } + }, + { + "plugin": "lists", + "link": { + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", "lineNumber": 333 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", "lineNumber": 339 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", "lineNumber": 347 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", "lineNumber": 355 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", "lineNumber": 363 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", "lineNumber": 371 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", "lineNumber": 380 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/operator.tsx", - "lineNumber": 11 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 62 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/operator.tsx", - "lineNumber": 17 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 166 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx", - "lineNumber": 43 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 167 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx", - "lineNumber": 104 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 629 } }, { - "plugin": "lens", + "plugin": "lists", "link": { - "path": "x-pack/plugins/lens/server/routes/field_stats.ts", - "lineNumber": 11 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 666 } }, { - "plugin": "lens", + "plugin": "lists", "link": { - "path": "x-pack/plugins/lens/server/routes/field_stats.ts", - "lineNumber": 139 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 691 } }, { - "plugin": "lens", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lens/server/routes/field_stats.ts", - "lineNumber": 248 + "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "lineNumber": 11 } }, { - "plugin": "lens", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lens/server/routes/field_stats.ts", - "lineNumber": 287 + "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "lineNumber": 333 } }, { - "plugin": "lens", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lens/server/routes/field_stats.ts", - "lineNumber": 329 + "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "lineNumber": 339 } }, { - "plugin": "lens", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lens/target/types/public/indexpattern_datasource/types.d.ts", - "lineNumber": 1 + "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "lineNumber": 347 } }, { - "plugin": "lens", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lens/target/types/public/indexpattern_datasource/types.d.ts", - "lineNumber": 22 + "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "lineNumber": 355 } }, { - "plugin": "lens", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts", - "lineNumber": 3 + "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "lineNumber": 363 } }, { - "plugin": "lens", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts", - "lineNumber": 7 + "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "lineNumber": 371 } }, { - "plugin": "lens", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts", - "lineNumber": 8 + "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "lineNumber": 380 } }, { - "plugin": "lens", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts", - "lineNumber": 9 + "path": "x-pack/plugins/security_solution/target/types/public/common/components/exceptions/helpers.test.d.ts", + "lineNumber": 1 + } + }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/target/types/public/common/components/exceptions/helpers.test.d.ts", + "lineNumber": 2 } }, { @@ -14103,48 +14061,6 @@ }, "deprecated": true, "references": [ - { - "plugin": "lists", - "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/exception_items_renderer.tsx", - "lineNumber": 34 - } - }, - { - "plugin": "lists", - "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/exception_items_renderer.tsx", - "lineNumber": 78 - } - }, - { - "plugin": "lists", - "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/exception_items_renderer.tsx", - "lineNumber": 86 - } - }, - { - "plugin": "lists", - "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/exception_items_renderer.tsx", - "lineNumber": 88 - } - }, - { - "plugin": "securitySolution", - "link": { - "path": "x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts", - "lineNumber": 8 - } - }, - { - "plugin": "securitySolution", - "link": { - "path": "x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts", - "lineNumber": 86 - } - }, { "plugin": "savedObjects", "link": { @@ -14237,206 +14153,178 @@ } }, { - "plugin": "savedObjectsManagement", + "plugin": "indexPatternManagement", "link": { - "path": "src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx", - "lineNumber": 37 + "path": "src/plugins/index_pattern_management/public/service/list/config.ts", + "lineNumber": 10 } }, { - "plugin": "savedObjectsManagement", + "plugin": "indexPatternManagement", "link": { - "path": "src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx", - "lineNumber": 89 + "path": "src/plugins/index_pattern_management/public/service/list/config.ts", + "lineNumber": 29 } }, { - "plugin": "infra", + "plugin": "indexPatternManagement", "link": { - "path": "x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx", - "lineNumber": 9 + "path": "src/plugins/index_pattern_management/public/service/list/config.ts", + "lineNumber": 29 } }, { - "plugin": "infra", + "plugin": "indexPatternManagement", "link": { - "path": "x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx", - "lineNumber": 24 + "path": "src/plugins/index_pattern_management/public/service/list/config.ts", + "lineNumber": 42 } }, { - "plugin": "infra", + "plugin": "indexPatternManagement", "link": { - "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/kuery_bar.tsx", - "lineNumber": 15 + "path": "src/plugins/index_pattern_management/public/service/list/config.ts", + "lineNumber": 46 } }, { - "plugin": "infra", + "plugin": "indexPatternManagement", "link": { - "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/kuery_bar.tsx", - "lineNumber": 28 + "path": "src/plugins/index_pattern_management/public/service/list/manager.ts", + "lineNumber": 9 } }, { - "plugin": "lens", + "plugin": "indexPatternManagement", "link": { - "path": "x-pack/plugins/lens/public/editor_frame_service/embeddable/embeddable.tsx", - "lineNumber": 14 + "path": "src/plugins/index_pattern_management/public/service/list/manager.ts", + "lineNumber": 32 } }, { - "plugin": "lens", + "plugin": "indexPatternManagement", "link": { - "path": "x-pack/plugins/lens/public/editor_frame_service/embeddable/embeddable.tsx", - "lineNumber": 85 + "path": "src/plugins/index_pattern_management/public/service/list/manager.ts", + "lineNumber": 32 } }, { - "plugin": "lens", + "plugin": "indexPatternManagement", "link": { - "path": "x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx", - "lineNumber": 47 + "path": "src/plugins/index_pattern_management/public/service/list/manager.ts", + "lineNumber": 43 } }, { - "plugin": "lens", + "plugin": "indexPatternManagement", "link": { - "path": "x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx", - "lineNumber": 172 + "path": "src/plugins/index_pattern_management/public/service/list/manager.ts", + "lineNumber": 50 } }, { - "plugin": "lens", + "plugin": "indexPatternManagement", "link": { - "path": "x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx", - "lineNumber": 42 - } - }, - { - "plugin": "lens", - "link": { - "path": "x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx", - "lineNumber": 96 - } - }, - { - "plugin": "lens", - "link": { - "path": "x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx", - "lineNumber": 166 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/service/list/config.ts", - "lineNumber": 10 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/service/list/config.ts", - "lineNumber": 29 + "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.tsx", + "lineNumber": 22 } }, { "plugin": "indexPatternManagement", "link": { - "path": "src/plugins/index_pattern_management/public/service/list/config.ts", - "lineNumber": 29 + "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.tsx", + "lineNumber": 171 } }, { "plugin": "indexPatternManagement", "link": { - "path": "src/plugins/index_pattern_management/public/service/list/config.ts", - "lineNumber": 42 + "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.tsx", + "lineNumber": 15 } }, { "plugin": "indexPatternManagement", "link": { - "path": "src/plugins/index_pattern_management/public/service/list/config.ts", - "lineNumber": 46 + "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.tsx", + "lineNumber": 18 } }, { "plugin": "indexPatternManagement", "link": { - "path": "src/plugins/index_pattern_management/public/service/list/manager.ts", - "lineNumber": 9 + "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/index_header/index_header.tsx", + "lineNumber": 12 } }, { "plugin": "indexPatternManagement", "link": { - "path": "src/plugins/index_pattern_management/public/service/list/manager.ts", - "lineNumber": 32 + "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/index_header/index_header.tsx", + "lineNumber": 15 } }, { - "plugin": "indexPatternManagement", + "plugin": "savedObjectsManagement", "link": { - "path": "src/plugins/index_pattern_management/public/service/list/manager.ts", - "lineNumber": 32 + "path": "src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx", + "lineNumber": 37 } }, { - "plugin": "indexPatternManagement", + "plugin": "savedObjectsManagement", "link": { - "path": "src/plugins/index_pattern_management/public/service/list/manager.ts", - "lineNumber": 43 + "path": "src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx", + "lineNumber": 89 } }, { - "plugin": "indexPatternManagement", + "plugin": "lens", "link": { - "path": "src/plugins/index_pattern_management/public/service/list/manager.ts", - "lineNumber": 50 + "path": "x-pack/plugins/lens/public/editor_frame_service/embeddable/embeddable.tsx", + "lineNumber": 14 } }, { - "plugin": "indexPatternManagement", + "plugin": "lens", "link": { - "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.tsx", - "lineNumber": 22 + "path": "x-pack/plugins/lens/public/editor_frame_service/embeddable/embeddable.tsx", + "lineNumber": 85 } }, { - "plugin": "indexPatternManagement", + "plugin": "lens", "link": { - "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.tsx", - "lineNumber": 171 + "path": "x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx", + "lineNumber": 47 } }, { - "plugin": "indexPatternManagement", + "plugin": "lens", "link": { - "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.tsx", - "lineNumber": 15 + "path": "x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx", + "lineNumber": 172 } }, { - "plugin": "indexPatternManagement", + "plugin": "lens", "link": { - "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.tsx", - "lineNumber": 18 + "path": "x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx", + "lineNumber": 42 } }, { - "plugin": "indexPatternManagement", + "plugin": "lens", "link": { - "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/index_header/index_header.tsx", - "lineNumber": 12 + "path": "x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx", + "lineNumber": 96 } }, { - "plugin": "indexPatternManagement", + "plugin": "lens", "link": { - "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/index_header/index_header.tsx", - "lineNumber": 15 + "path": "x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx", + "lineNumber": 166 } }, { @@ -14509,6 +14397,48 @@ "lineNumber": 30 } }, + { + "plugin": "apm", + "link": { + "path": "x-pack/plugins/apm/public/components/shared/KueryBar/index.tsx", + "lineNumber": 14 + } + }, + { + "plugin": "apm", + "link": { + "path": "x-pack/plugins/apm/public/components/shared/KueryBar/index.tsx", + "lineNumber": 31 + } + }, + { + "plugin": "infra", + "link": { + "path": "x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx", + "lineNumber": 9 + } + }, + { + "plugin": "infra", + "link": { + "path": "x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx", + "lineNumber": 24 + } + }, + { + "plugin": "infra", + "link": { + "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/kuery_bar.tsx", + "lineNumber": 15 + } + }, + { + "plugin": "infra", + "link": { + "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/kuery_bar.tsx", + "lineNumber": 28 + } + }, { "plugin": "infra", "link": { @@ -14649,32 +14579,74 @@ "lineNumber": 23 } }, + { + "plugin": "lists", + "link": { + "path": "x-pack/plugins/lists/public/exceptions/components/builder/exception_items_renderer.tsx", + "lineNumber": 34 + } + }, + { + "plugin": "lists", + "link": { + "path": "x-pack/plugins/lists/public/exceptions/components/builder/exception_items_renderer.tsx", + "lineNumber": 78 + } + }, + { + "plugin": "lists", + "link": { + "path": "x-pack/plugins/lists/public/exceptions/components/builder/exception_items_renderer.tsx", + "lineNumber": 86 + } + }, + { + "plugin": "lists", + "link": { + "path": "x-pack/plugins/lists/public/exceptions/components/builder/exception_items_renderer.tsx", + "lineNumber": 88 + } + }, { "plugin": "securitySolution", "link": { "path": "x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts", - "lineNumber": 20 + "lineNumber": 21 } }, { "plugin": "securitySolution", "link": { "path": "x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts", - "lineNumber": 64 + "lineNumber": 66 } }, { "plugin": "securitySolution", "link": { "path": "x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts", - "lineNumber": 17 + "lineNumber": 19 } }, { "plugin": "securitySolution", "link": { "path": "x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts", - "lineNumber": 98 + "lineNumber": 100 + } + }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts", + "lineNumber": 8 + } + }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts", + "lineNumber": 86 } }, { @@ -14912,21 +14884,21 @@ "plugin": "securitySolution", "link": { "path": "x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts", - "lineNumber": 32 + "lineNumber": 40 } }, { "plugin": "securitySolution", "link": { "path": "x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts", - "lineNumber": 38 + "lineNumber": 55 } }, { "plugin": "securitySolution", "link": { "path": "x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts", - "lineNumber": 43 + "lineNumber": 60 } }, { @@ -15013,34 +14985,6 @@ "lineNumber": 33 } }, - { - "plugin": "securitySolution", - "link": { - "path": "x-pack/plugins/security_solution/public/common/containers/kuery_autocompletion/index.tsx", - "lineNumber": 9 - } - }, - { - "plugin": "securitySolution", - "link": { - "path": "x-pack/plugins/security_solution/public/common/containers/kuery_autocompletion/index.tsx", - "lineNumber": 21 - } - }, - { - "plugin": "apm", - "link": { - "path": "x-pack/plugins/apm/public/components/shared/KueryBar/index.tsx", - "lineNumber": 14 - } - }, - { - "plugin": "apm", - "link": { - "path": "x-pack/plugins/apm/public/components/shared/KueryBar/index.tsx", - "lineNumber": 31 - } - }, { "plugin": "uptime", "link": { @@ -15083,6 +15027,20 @@ "lineNumber": 36 } }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/target/types/common/search_strategy/index_fields/index.d.ts", + "lineNumber": 1 + } + }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/target/types/common/search_strategy/index_fields/index.d.ts", + "lineNumber": 66 + } + }, { "plugin": "infra", "link": { @@ -15126,486 +15084,444 @@ } }, { - "plugin": "infra", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/infra/target/types/public/alerting/metric_threshold/components/expression_chart.d.ts", - "lineNumber": 2 + "path": "x-pack/plugins/security_solution/target/types/public/common/containers/source/index.d.ts", + "lineNumber": 1 } }, { - "plugin": "infra", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/infra/target/types/public/alerting/metric_threshold/components/expression_chart.d.ts", - "lineNumber": 7 + "path": "x-pack/plugins/security_solution/target/types/public/common/containers/source/index.d.ts", + "lineNumber": 10 } }, { - "plugin": "infra", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/infra/target/types/public/alerting/metric_threshold/hooks/use_metrics_explorer_chart_data.d.ts", - "lineNumber": 1 - } - }, - { - "plugin": "infra", - "link": { - "path": "x-pack/plugins/infra/target/types/public/alerting/metric_threshold/hooks/use_metrics_explorer_chart_data.d.ts", - "lineNumber": 4 + "path": "x-pack/plugins/security_solution/target/types/public/common/containers/source/index.d.ts", + "lineNumber": 23 } }, { "plugin": "infra", "link": { - "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/index.d.ts", - "lineNumber": 1 + "path": "x-pack/plugins/infra/target/types/public/alerting/metric_threshold/components/expression_chart.d.ts", + "lineNumber": 2 } }, { "plugin": "infra", "link": { - "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/index.d.ts", - "lineNumber": 5 + "path": "x-pack/plugins/infra/target/types/public/alerting/metric_threshold/components/expression_chart.d.ts", + "lineNumber": 7 } }, { "plugin": "infra", "link": { - "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/hooks/use_metric_explorer_state.d.ts", + "path": "x-pack/plugins/infra/target/types/public/alerting/metric_threshold/hooks/use_metrics_explorer_chart_data.d.ts", "lineNumber": 1 } }, { "plugin": "infra", "link": { - "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/hooks/use_metric_explorer_state.d.ts", - "lineNumber": 11 + "path": "x-pack/plugins/infra/target/types/public/alerting/metric_threshold/hooks/use_metrics_explorer_chart_data.d.ts", + "lineNumber": 4 } }, { "plugin": "infra", "link": { - "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.d.ts", + "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/index.d.ts", "lineNumber": 1 } }, { "plugin": "infra", "link": { - "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.d.ts", - "lineNumber": 4 + "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/index.d.ts", + "lineNumber": 5 } }, { - "plugin": "ml", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/ml/target/types/public/application/jobs/new_job/common/index_pattern_context.d.ts", - "lineNumber": 2 + "path": "x-pack/plugins/security_solution/target/types/public/common/components/url_state/types.d.ts", + "lineNumber": 3 } }, { - "plugin": "ml", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/ml/target/types/public/application/jobs/new_job/common/index_pattern_context.d.ts", - "lineNumber": 3 + "path": "x-pack/plugins/security_solution/target/types/public/common/components/url_state/types.d.ts", + "lineNumber": 25 } }, { - "plugin": "ml", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/ml/target/types/public/application/jobs/new_job/common/index_pattern_context.d.ts", - "lineNumber": 4 + "path": "x-pack/plugins/security_solution/target/types/public/common/components/url_state/types.d.ts", + "lineNumber": 55 } }, { - "plugin": "lists", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 11 + "path": "x-pack/plugins/security_solution/target/types/public/network/components/network_top_countries_table/columns.d.ts", + "lineNumber": 1 } }, { - "plugin": "lists", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 21 + "path": "x-pack/plugins/security_solution/target/types/public/network/components/network_top_countries_table/columns.d.ts", + "lineNumber": 20 } }, { - "plugin": "lists", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 100 + "path": "x-pack/plugins/security_solution/target/types/public/network/components/network_top_countries_table/columns.d.ts", + "lineNumber": 21 } }, { - "plugin": "lists", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 121 + "path": "x-pack/plugins/security_solution/target/types/public/common/components/search_bar/index.d.ts", + "lineNumber": 3 } }, { - "plugin": "lists", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/hooks/use_field_value_autocomplete.ts", - "lineNumber": 13 + "path": "x-pack/plugins/security_solution/target/types/public/common/components/search_bar/index.d.ts", + "lineNumber": 9 } }, { - "plugin": "lists", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/hooks/use_field_value_autocomplete.ts", - "lineNumber": 17 + "path": "x-pack/plugins/security_solution/target/types/public/hosts/pages/details/types.d.ts", + "lineNumber": 2 } }, { - "plugin": "lists", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/hooks/use_field_value_autocomplete.ts", - "lineNumber": 29 + "path": "x-pack/plugins/security_solution/target/types/public/hosts/pages/details/types.d.ts", + "lineNumber": 40 } }, { - "plugin": "lists", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match.tsx", - "lineNumber": 19 + "path": "x-pack/plugins/security_solution/target/types/public/network/components/network_top_countries_table/index.d.ts", + "lineNumber": 2 } }, { - "plugin": "lists", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match.tsx", - "lineNumber": 38 + "path": "x-pack/plugins/security_solution/target/types/public/network/components/network_top_countries_table/index.d.ts", + "lineNumber": 10 } }, { - "plugin": "lists", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match_any.tsx", - "lineNumber": 13 + "path": "x-pack/plugins/security_solution/target/types/public/network/pages/details/types.d.ts", + "lineNumber": 1 } }, { - "plugin": "lists", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match_any.tsx", + "path": "x-pack/plugins/security_solution/target/types/public/network/pages/details/types.d.ts", "lineNumber": 25 } }, { - "plugin": "lists", + "plugin": "infra", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx", - "lineNumber": 31 + "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/hooks/use_metric_explorer_state.d.ts", + "lineNumber": 1 } }, { - "plugin": "lists", + "plugin": "infra", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx", - "lineNumber": 53 + "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/hooks/use_metric_explorer_state.d.ts", + "lineNumber": 11 } }, { - "plugin": "lists", + "plugin": "infra", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx", - "lineNumber": 58 + "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.d.ts", + "lineNumber": 1 } }, { - "plugin": "lists", + "plugin": "infra", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx", - "lineNumber": 61 + "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.d.ts", + "lineNumber": 4 } }, { - "plugin": "lists", + "plugin": "ml", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/exception_item_renderer.tsx", - "lineNumber": 22 + "path": "x-pack/plugins/ml/target/types/public/application/jobs/new_job/common/index_pattern_context.d.ts", + "lineNumber": 2 } }, { - "plugin": "lists", + "plugin": "ml", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/exception_item_renderer.tsx", - "lineNumber": 50 + "path": "x-pack/plugins/ml/target/types/public/application/jobs/new_job/common/index_pattern_context.d.ts", + "lineNumber": 3 } }, { - "plugin": "lists", + "plugin": "ml", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/exception_item_renderer.tsx", - "lineNumber": 55 + "path": "x-pack/plugins/ml/target/types/public/application/jobs/new_job/common/index_pattern_context.d.ts", + "lineNumber": 4 } }, { - "plugin": "lists", + "plugin": "ml", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/exception_item_renderer.tsx", - "lineNumber": 58 + "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_action_name.tsx", + "lineNumber": 12 } }, { - "plugin": "lists", + "plugin": "ml", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 62 + "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_action_name.tsx", + "lineNumber": 412 } }, { - "plugin": "lists", + "plugin": "ml", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 96 + "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/use_delete_action.tsx", + "lineNumber": 12 } }, { - "plugin": "lists", + "plugin": "ml", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 169 + "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/use_delete_action.tsx", + "lineNumber": 60 } }, { - "plugin": "lists", + "plugin": "ml", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 169 + "path": "x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.d.ts", + "lineNumber": 8 } }, { - "plugin": "lists", + "plugin": "ml", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 184 + "path": "x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.d.ts", + "lineNumber": 37 } }, { - "plugin": "lists", + "plugin": "ml", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 187 + "path": "x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.d.ts", + "lineNumber": 8 } }, { - "plugin": "lists", + "plugin": "ml", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 196 + "path": "x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.d.ts", + "lineNumber": 11 } }, { - "plugin": "lists", + "plugin": "ml", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 199 + "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/actions_panel.tsx", + "lineNumber": 25 } }, { - "plugin": "lists", + "plugin": "ml", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 208 + "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/actions_panel.tsx", + "lineNumber": 28 } }, { - "plugin": "lists", + "plugin": "infra", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 214 + "path": "x-pack/plugins/infra/public/pages/metrics/index.tsx", + "lineNumber": 14 } }, { - "plugin": "lists", + "plugin": "infra", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 226 + "path": "x-pack/plugins/infra/public/pages/metrics/index.tsx", + "lineNumber": 193 } }, { - "plugin": "lists", + "plugin": "visTypeTimeseries", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 229 + "path": "src/plugins/vis_type_timeseries/common/index_patterns_utils.ts", + "lineNumber": 11 } }, { - "plugin": "lists", + "plugin": "visTypeTimeseries", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 239 + "path": "src/plugins/vis_type_timeseries/common/index_patterns_utils.ts", + "lineNumber": 20 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 267 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 11 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 285 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 21 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 320 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 100 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 336 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 121 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 1026 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/hooks/use_field_value_autocomplete.ts", + "lineNumber": 13 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 1045 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/hooks/use_field_value_autocomplete.ts", + "lineNumber": 17 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 1095 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/hooks/use_field_value_autocomplete.ts", + "lineNumber": 29 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 1251 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match.tsx", + "lineNumber": 19 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 1302 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match.tsx", + "lineNumber": 38 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 1352 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match_any.tsx", + "lineNumber": 13 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/common/detection_engine/get_query_filter.ts", - "lineNumber": 15 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match_any.tsx", + "lineNumber": 25 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/common/detection_engine/get_query_filter.ts", + "path": "x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx", "lineNumber": 31 } }, { - "plugin": "ml", - "link": { - "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_action_name.tsx", - "lineNumber": 12 - } - }, - { - "plugin": "ml", - "link": { - "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_action_name.tsx", - "lineNumber": 412 - } - }, - { - "plugin": "ml", - "link": { - "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/use_delete_action.tsx", - "lineNumber": 12 - } - }, - { - "plugin": "ml", - "link": { - "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/use_delete_action.tsx", - "lineNumber": 60 - } - }, - { - "plugin": "ml", - "link": { - "path": "x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.d.ts", - "lineNumber": 8 - } - }, - { - "plugin": "ml", + "plugin": "lists", "link": { - "path": "x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.d.ts", - "lineNumber": 37 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx", + "lineNumber": 53 } }, { - "plugin": "ml", + "plugin": "lists", "link": { - "path": "x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.d.ts", - "lineNumber": 8 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx", + "lineNumber": 58 } }, { - "plugin": "ml", + "plugin": "lists", "link": { - "path": "x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.d.ts", - "lineNumber": 11 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx", + "lineNumber": 61 } }, { - "plugin": "ml", + "plugin": "lists", "link": { - "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/actions_panel.tsx", - "lineNumber": 25 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/exception_item_renderer.tsx", + "lineNumber": 22 } }, { - "plugin": "ml", + "plugin": "lists", "link": { - "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/actions_panel.tsx", - "lineNumber": 28 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/exception_item_renderer.tsx", + "lineNumber": 50 } }, { - "plugin": "infra", + "plugin": "lists", "link": { - "path": "x-pack/plugins/infra/public/pages/metrics/index.tsx", - "lineNumber": 14 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/exception_item_renderer.tsx", + "lineNumber": 55 } }, { - "plugin": "infra", + "plugin": "lists", "link": { - "path": "x-pack/plugins/infra/public/pages/metrics/index.tsx", - "lineNumber": 193 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/exception_item_renderer.tsx", + "lineNumber": 58 } }, { @@ -15629,6 +15545,20 @@ "lineNumber": 53 } }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/common/detection_engine/get_query_filter.ts", + "lineNumber": 16 + } + }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/common/detection_engine/get_query_filter.ts", + "lineNumber": 31 + } + }, { "plugin": "securitySolution", "link": { @@ -15756,164 +15686,220 @@ } }, { - "plugin": "securitySolution", + "plugin": "stackAlerts", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match_any.tsx", + "path": "x-pack/plugins/stack_alerts/server/alert_types/geo_containment/es_query_builder.ts", "lineNumber": 13 } }, { - "plugin": "securitySolution", + "plugin": "stackAlerts", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match_any.tsx", - "lineNumber": 24 + "path": "x-pack/plugins/stack_alerts/server/alert_types/geo_containment/es_query_builder.ts", + "lineNumber": 25 } }, { - "plugin": "securitySolution", + "plugin": "infra", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx", - "lineNumber": 43 + "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts", + "lineNumber": 13 } }, { - "plugin": "securitySolution", + "plugin": "infra", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx", - "lineNumber": 49 + "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts", + "lineNumber": 30 } }, { - "plugin": "securitySolution", + "plugin": "infra", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx", - "lineNumber": 368 + "path": "x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts", + "lineNumber": 1 } }, { - "plugin": "visTypeTimeseries", + "plugin": "infra", "link": { - "path": "src/plugins/vis_type_timeseries/common/index_patterns_utils.ts", - "lineNumber": 11 + "path": "x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts", + "lineNumber": 3 } }, { - "plugin": "visTypeTimeseries", + "plugin": "lists", "link": { - "path": "src/plugins/vis_type_timeseries/common/index_patterns_utils.ts", - "lineNumber": 20 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 62 } }, { - "plugin": "stackAlerts", + "plugin": "lists", "link": { - "path": "x-pack/plugins/stack_alerts/server/alert_types/geo_containment/es_query_builder.ts", - "lineNumber": 13 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 96 } }, { - "plugin": "stackAlerts", + "plugin": "lists", "link": { - "path": "x-pack/plugins/stack_alerts/server/alert_types/geo_containment/es_query_builder.ts", - "lineNumber": 25 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 169 } }, { - "plugin": "infra", + "plugin": "lists", "link": { - "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts", - "lineNumber": 13 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 169 } }, { - "plugin": "infra", + "plugin": "lists", "link": { - "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts", - "lineNumber": 30 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 184 } }, { - "plugin": "infra", + "plugin": "lists", "link": { - "path": "x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts", - "lineNumber": 1 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 187 } }, { - "plugin": "infra", + "plugin": "lists", "link": { - "path": "x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts", - "lineNumber": 3 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 196 } }, { - "plugin": "discover", + "plugin": "lists", "link": { - "path": "src/plugins/discover/public/application/components/context_app/context_app_legacy.tsx", - "lineNumber": 17 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 199 } }, { - "plugin": "discover", + "plugin": "lists", "link": { - "path": "src/plugins/discover/public/application/components/context_app/context_app_legacy.tsx", - "lineNumber": 26 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 208 } }, { - "plugin": "observability", + "plugin": "lists", "link": { - "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts", - "lineNumber": 18 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 214 } }, { - "plugin": "observability", + "plugin": "lists", "link": { - "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts", - "lineNumber": 95 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 226 } }, { - "plugin": "observability", + "plugin": "lists", "link": { - "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts", - "lineNumber": 10 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 229 } }, { - "plugin": "observability", + "plugin": "lists", "link": { - "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts", - "lineNumber": 53 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 239 } }, { - "plugin": "observability", + "plugin": "lists", "link": { - "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts", - "lineNumber": 61 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 267 } }, { - "plugin": "observability", + "plugin": "lists", "link": { - "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts", - "lineNumber": 69 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 285 } }, { - "plugin": "observability", + "plugin": "lists", "link": { - "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/default_configs.ts", - "lineNumber": 19 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 320 } }, { - "plugin": "observability", + "plugin": "lists", "link": { - "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/default_configs.ts", - "lineNumber": 24 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 336 + } + }, + { + "plugin": "lists", + "link": { + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 1026 + } + }, + { + "plugin": "lists", + "link": { + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 1045 + } + }, + { + "plugin": "lists", + "link": { + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 1095 + } + }, + { + "plugin": "lists", + "link": { + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 1251 + } + }, + { + "plugin": "lists", + "link": { + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 1302 + } + }, + { + "plugin": "lists", + "link": { + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 1352 + } + }, + { + "plugin": "discover", + "link": { + "path": "src/plugins/discover/public/application/components/context_app/context_app_legacy.tsx", + "lineNumber": 17 + } + }, + { + "plugin": "discover", + "link": { + "path": "src/plugins/discover/public/application/components/context_app/context_app_legacy.tsx", + "lineNumber": 26 } }, { @@ -15980,52 +15966,108 @@ } }, { - "plugin": "ml", + "plugin": "ml", + "link": { + "path": "x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/custom_urls.tsx", + "lineNumber": 57 + } + }, + { + "plugin": "ml", + "link": { + "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/lens_utils.ts", + "lineNumber": 14 + } + }, + { + "plugin": "ml", + "link": { + "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/lens_utils.ts", + "lineNumber": 27 + } + }, + { + "plugin": "ml", + "link": { + "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/lens_utils.ts", + "lineNumber": 213 + } + }, + { + "plugin": "ml", + "link": { + "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/lens_utils.ts", + "lineNumber": 234 + } + }, + { + "plugin": "ml", + "link": { + "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/actions.ts", + "lineNumber": 12 + } + }, + { + "plugin": "ml", + "link": { + "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/actions.ts", + "lineNumber": 17 + } + }, + { + "plugin": "observability", + "link": { + "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts", + "lineNumber": 18 + } + }, + { + "plugin": "observability", "link": { - "path": "x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/custom_urls.tsx", - "lineNumber": 57 + "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts", + "lineNumber": 95 } }, { - "plugin": "ml", + "plugin": "observability", "link": { - "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/lens_utils.ts", - "lineNumber": 14 + "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts", + "lineNumber": 10 } }, { - "plugin": "ml", + "plugin": "observability", "link": { - "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/lens_utils.ts", - "lineNumber": 27 + "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts", + "lineNumber": 53 } }, { - "plugin": "ml", + "plugin": "observability", "link": { - "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/lens_utils.ts", - "lineNumber": 213 + "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts", + "lineNumber": 61 } }, { - "plugin": "ml", + "plugin": "observability", "link": { - "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/lens_utils.ts", - "lineNumber": 234 + "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts", + "lineNumber": 69 } }, { - "plugin": "ml", + "plugin": "observability", "link": { - "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/actions.ts", - "lineNumber": 12 + "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/default_configs.ts", + "lineNumber": 19 } }, { - "plugin": "ml", + "plugin": "observability", "link": { - "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/actions.ts", - "lineNumber": 17 + "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/default_configs.ts", + "lineNumber": 24 } }, { @@ -16098,20 +16140,6 @@ "lineNumber": 19 } }, - { - "plugin": "securitySolution", - "link": { - "path": "x-pack/plugins/security_solution/public/common/mock/index_pattern.ts", - "lineNumber": 8 - } - }, - { - "plugin": "securitySolution", - "link": { - "path": "x-pack/plugins/security_solution/public/common/mock/index_pattern.ts", - "lineNumber": 10 - } - }, { "plugin": "stackAlerts", "link": { @@ -16231,6 +16259,20 @@ "lineNumber": 13 } }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/public/common/mock/index_pattern.ts", + "lineNumber": 8 + } + }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/public/common/mock/index_pattern.ts", + "lineNumber": 10 + } + }, { "plugin": "ml", "link": { @@ -33252,111 +33294,6 @@ "lineNumber": 58 } }, - { - "plugin": "fleet", - "link": { - "path": "x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx", - "lineNumber": 10 - } - }, - { - "plugin": "fleet", - "link": { - "path": "x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx", - "lineNumber": 33 - } - }, - { - "plugin": "fleet", - "link": { - "path": "x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx", - "lineNumber": 51 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/service/list/config.ts", - "lineNumber": 10 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/service/list/config.ts", - "lineNumber": 42 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/service/list/manager.ts", - "lineNumber": 9 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/service/list/manager.ts", - "lineNumber": 43 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/extract_time_fields.ts", - "lineNumber": 10 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/extract_time_fields.ts", - "lineNumber": 12 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/types.ts", - "lineNumber": 9 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/types.ts", - "lineNumber": 11 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx", - "lineNumber": 11 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx", - "lineNumber": 23 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx", - "lineNumber": 45 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx", - "lineNumber": 148 - } - }, { "plugin": "maps", "link": { @@ -33701,24 +33638,108 @@ } }, { - "plugin": "maps", + "plugin": "maps", + "link": { + "path": "x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/layer_template.tsx", + "lineNumber": 59 + } + }, + { + "plugin": "maps", + "link": { + "path": "x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/layer_template.tsx", + "lineNumber": 60 + } + }, + { + "plugin": "maps", + "link": { + "path": "x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/layer_template.tsx", + "lineNumber": 66 + } + }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/service/list/config.ts", + "lineNumber": 10 + } + }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/service/list/config.ts", + "lineNumber": 42 + } + }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/service/list/manager.ts", + "lineNumber": 9 + } + }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/service/list/manager.ts", + "lineNumber": 43 + } + }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/extract_time_fields.ts", + "lineNumber": 10 + } + }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/extract_time_fields.ts", + "lineNumber": 12 + } + }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/types.ts", + "lineNumber": 9 + } + }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/types.ts", + "lineNumber": 11 + } + }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx", + "lineNumber": 11 + } + }, + { + "plugin": "indexPatternManagement", "link": { - "path": "x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/layer_template.tsx", - "lineNumber": 59 + "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx", + "lineNumber": 23 } }, { - "plugin": "maps", + "plugin": "indexPatternManagement", "link": { - "path": "x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/layer_template.tsx", - "lineNumber": 60 + "path": "src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx", + "lineNumber": 45 } }, { - "plugin": "maps", + "plugin": "indexPatternManagement", "link": { - "path": "x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/layer_template.tsx", - "lineNumber": 66 + "path": "src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx", + "lineNumber": 148 } }, { @@ -33973,6 +33994,27 @@ "lineNumber": 21 } }, + { + "plugin": "fleet", + "link": { + "path": "x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx", + "lineNumber": 10 + } + }, + { + "plugin": "fleet", + "link": { + "path": "x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx", + "lineNumber": 33 + } + }, + { + "plugin": "fleet", + "link": { + "path": "x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx", + "lineNumber": 51 + } + }, { "plugin": "fleet", "link": { @@ -34513,409 +34555,346 @@ } }, { - "plugin": "lists", - "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.ts", - "lineNumber": 19 - } - }, - { - "plugin": "lists", - "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.ts", - "lineNumber": 30 - } - }, - { - "plugin": "lists", - "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.ts", - "lineNumber": 54 - } - }, - { - "plugin": "lists", - "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.ts", - "lineNumber": 84 - } - }, - { - "plugin": "lists", - "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.ts", - "lineNumber": 150 - } - }, - { - "plugin": "lists", - "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 11 - } - }, - { - "plugin": "lists", - "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 26 - } - }, - { - "plugin": "lists", - "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 28 - } - }, - { - "plugin": "lists", - "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 57 - } - }, - { - "plugin": "lists", + "plugin": "maps", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 95 + "path": "x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts", + "lineNumber": 10 } }, { - "plugin": "lists", + "plugin": "maps", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 96 + "path": "x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts", + "lineNumber": 16 } }, { - "plugin": "lists", + "plugin": "maps", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 101 + "path": "x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts", + "lineNumber": 29 } }, { - "plugin": "lists", + "plugin": "maps", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 114 + "path": "x-pack/plugins/maps/public/components/geo_field_select.tsx", + "lineNumber": 12 } }, { - "plugin": "lists", + "plugin": "maps", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 121 + "path": "x-pack/plugins/maps/public/components/geo_field_select.tsx", + "lineNumber": 16 } }, { - "plugin": "lists", + "plugin": "maps", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 125 + "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/create_source_editor.tsx", + "lineNumber": 18 } }, { - "plugin": "lists", + "plugin": "maps", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 125 + "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/create_source_editor.tsx", + "lineNumber": 30 } }, { - "plugin": "lists", + "plugin": "maps", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 130 + "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/create_source_editor.tsx", + "lineNumber": 33 } }, { - "plugin": "lists", + "plugin": "maps", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 131 + "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/create_source_editor.tsx", + "lineNumber": 35 } }, { - "plugin": "lists", + "plugin": "lens", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 133 + "path": "x-pack/plugins/lens/public/indexpattern_datasource/types.ts", + "lineNumber": 8 } }, { - "plugin": "lists", + "plugin": "lens", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 134 + "path": "x-pack/plugins/lens/public/indexpattern_datasource/types.ts", + "lineNumber": 57 } }, { - "plugin": "lists", + "plugin": "lens", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/operator.tsx", + "path": "x-pack/plugins/lens/server/routes/field_stats.ts", "lineNumber": 11 } }, { - "plugin": "lists", + "plugin": "lens", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/operator.tsx", - "lineNumber": 27 + "path": "x-pack/plugins/lens/server/routes/field_stats.ts", + "lineNumber": 139 } }, { - "plugin": "lists", + "plugin": "lens", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/hooks/use_field_value_autocomplete.ts", - "lineNumber": 13 + "path": "x-pack/plugins/lens/server/routes/field_stats.ts", + "lineNumber": 248 } }, { - "plugin": "lists", + "plugin": "lens", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/hooks/use_field_value_autocomplete.ts", - "lineNumber": 16 + "path": "x-pack/plugins/lens/server/routes/field_stats.ts", + "lineNumber": 287 } }, { - "plugin": "lists", + "plugin": "lens", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/hooks/use_field_value_autocomplete.ts", - "lineNumber": 32 + "path": "x-pack/plugins/lens/server/routes/field_stats.ts", + "lineNumber": 329 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match.tsx", + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.ts", "lineNumber": 19 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match.tsx", - "lineNumber": 36 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.ts", + "lineNumber": 30 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match_any.tsx", - "lineNumber": 13 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.ts", + "lineNumber": 54 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match_any.tsx", - "lineNumber": 23 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.ts", + "lineNumber": 84 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_lists.tsx", - "lineNumber": 13 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.ts", + "lineNumber": 150 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_lists.tsx", - "lineNumber": 29 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 11 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx", - "lineNumber": 31 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 26 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx", - "lineNumber": 91 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 28 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", - "lineNumber": 19 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 57 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", - "lineNumber": 333 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 95 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", - "lineNumber": 339 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 96 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", - "lineNumber": 347 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 101 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", - "lineNumber": 355 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 114 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", - "lineNumber": 363 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 121 } }, { "plugin": "lists", - "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", - "lineNumber": 371 + "link": { + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 125 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", - "lineNumber": 380 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 125 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 62 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 130 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 166 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 131 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 167 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 133 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 629 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 134 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 666 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/operator.tsx", + "lineNumber": 11 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 691 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/operator.tsx", + "lineNumber": 27 } }, { - "plugin": "lens", + "plugin": "lists", "link": { - "path": "x-pack/plugins/lens/public/indexpattern_datasource/types.ts", - "lineNumber": 8 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/hooks/use_field_value_autocomplete.ts", + "lineNumber": 13 } }, { - "plugin": "lens", + "plugin": "lists", "link": { - "path": "x-pack/plugins/lens/public/indexpattern_datasource/types.ts", - "lineNumber": 57 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/hooks/use_field_value_autocomplete.ts", + "lineNumber": 16 } }, { - "plugin": "maps", + "plugin": "lists", "link": { - "path": "x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts", - "lineNumber": 10 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/hooks/use_field_value_autocomplete.ts", + "lineNumber": 32 } }, { - "plugin": "maps", + "plugin": "lists", "link": { - "path": "x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts", - "lineNumber": 16 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match.tsx", + "lineNumber": 19 } }, { - "plugin": "maps", + "plugin": "lists", "link": { - "path": "x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts", - "lineNumber": 29 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match.tsx", + "lineNumber": 36 } }, { - "plugin": "maps", + "plugin": "lists", "link": { - "path": "x-pack/plugins/maps/public/components/geo_field_select.tsx", - "lineNumber": 12 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match_any.tsx", + "lineNumber": 13 } }, { - "plugin": "maps", + "plugin": "lists", "link": { - "path": "x-pack/plugins/maps/public/components/geo_field_select.tsx", - "lineNumber": 16 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match_any.tsx", + "lineNumber": 23 } }, { - "plugin": "maps", + "plugin": "lists", "link": { - "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/create_source_editor.tsx", - "lineNumber": 18 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_lists.tsx", + "lineNumber": 14 } }, { - "plugin": "maps", + "plugin": "lists", "link": { - "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/create_source_editor.tsx", - "lineNumber": 30 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_lists.tsx", + "lineNumber": 29 } }, { - "plugin": "maps", + "plugin": "lists", "link": { - "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/create_source_editor.tsx", - "lineNumber": 33 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx", + "lineNumber": 31 } }, { - "plugin": "maps", + "plugin": "lists", "link": { - "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/create_source_editor.tsx", - "lineNumber": 35 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx", + "lineNumber": 91 } }, { @@ -35157,192 +35136,213 @@ } }, { - "plugin": "securitySolution", + "plugin": "lens", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_lists.tsx", - "lineNumber": 12 + "path": "x-pack/plugins/lens/target/types/public/indexpattern_datasource/types.d.ts", + "lineNumber": 1 } }, { - "plugin": "securitySolution", + "plugin": "lens", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_lists.tsx", - "lineNumber": 20 + "path": "x-pack/plugins/lens/target/types/public/indexpattern_datasource/types.d.ts", + "lineNumber": 22 } }, { - "plugin": "securitySolution", + "plugin": "lens", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match_any.tsx", - "lineNumber": 13 + "path": "x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts", + "lineNumber": 3 } }, { - "plugin": "securitySolution", + "plugin": "lens", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match_any.tsx", - "lineNumber": 22 + "path": "x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts", + "lineNumber": 7 } }, { - "plugin": "securitySolution", + "plugin": "lens", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", - "lineNumber": 11 + "path": "x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts", + "lineNumber": 8 } }, { - "plugin": "securitySolution", + "plugin": "lens", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "path": "x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts", + "lineNumber": 9 + } + }, + { + "plugin": "lists", + "link": { + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", + "lineNumber": 19 + } + }, + { + "plugin": "lists", + "link": { + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", "lineNumber": 333 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", "lineNumber": 339 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", "lineNumber": 347 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", "lineNumber": 355 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", "lineNumber": 363 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", "lineNumber": 371 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", "lineNumber": 380 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/operator.tsx", - "lineNumber": 11 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 62 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/operator.tsx", - "lineNumber": 17 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 166 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx", - "lineNumber": 43 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 167 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx", - "lineNumber": 104 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 629 } }, { - "plugin": "lens", + "plugin": "lists", "link": { - "path": "x-pack/plugins/lens/server/routes/field_stats.ts", - "lineNumber": 11 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 666 } }, { - "plugin": "lens", + "plugin": "lists", "link": { - "path": "x-pack/plugins/lens/server/routes/field_stats.ts", - "lineNumber": 139 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 691 } }, { - "plugin": "lens", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lens/server/routes/field_stats.ts", - "lineNumber": 248 + "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "lineNumber": 11 } }, { - "plugin": "lens", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lens/server/routes/field_stats.ts", - "lineNumber": 287 + "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "lineNumber": 333 } }, { - "plugin": "lens", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lens/server/routes/field_stats.ts", - "lineNumber": 329 + "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "lineNumber": 339 } }, { - "plugin": "lens", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lens/target/types/public/indexpattern_datasource/types.d.ts", - "lineNumber": 1 + "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "lineNumber": 347 } }, { - "plugin": "lens", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lens/target/types/public/indexpattern_datasource/types.d.ts", - "lineNumber": 22 + "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "lineNumber": 355 } }, { - "plugin": "lens", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts", - "lineNumber": 3 + "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "lineNumber": 363 } }, { - "plugin": "lens", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts", - "lineNumber": 7 + "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "lineNumber": 371 } }, { - "plugin": "lens", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts", - "lineNumber": 8 + "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "lineNumber": 380 } }, { - "plugin": "lens", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts", - "lineNumber": 9 + "path": "x-pack/plugins/security_solution/target/types/public/common/components/exceptions/helpers.test.d.ts", + "lineNumber": 1 + } + }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/target/types/public/common/components/exceptions/helpers.test.d.ts", + "lineNumber": 2 } }, { diff --git a/api_docs/data_index_patterns.json b/api_docs/data_index_patterns.json index 08c47437faa56c..6d9230cfb6a877 100644 --- a/api_docs/data_index_patterns.json +++ b/api_docs/data_index_patterns.json @@ -5513,111 +5513,6 @@ "lineNumber": 58 } }, - { - "plugin": "fleet", - "link": { - "path": "x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx", - "lineNumber": 10 - } - }, - { - "plugin": "fleet", - "link": { - "path": "x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx", - "lineNumber": 33 - } - }, - { - "plugin": "fleet", - "link": { - "path": "x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx", - "lineNumber": 51 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/service/list/config.ts", - "lineNumber": 10 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/service/list/config.ts", - "lineNumber": 42 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/service/list/manager.ts", - "lineNumber": 9 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/service/list/manager.ts", - "lineNumber": 43 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/extract_time_fields.ts", - "lineNumber": 10 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/extract_time_fields.ts", - "lineNumber": 12 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/types.ts", - "lineNumber": 9 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/types.ts", - "lineNumber": 11 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx", - "lineNumber": 11 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx", - "lineNumber": 23 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx", - "lineNumber": 45 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx", - "lineNumber": 148 - } - }, { "plugin": "maps", "link": { @@ -5982,6 +5877,90 @@ "lineNumber": 66 } }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/service/list/config.ts", + "lineNumber": 10 + } + }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/service/list/config.ts", + "lineNumber": 42 + } + }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/service/list/manager.ts", + "lineNumber": 9 + } + }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/service/list/manager.ts", + "lineNumber": 43 + } + }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/extract_time_fields.ts", + "lineNumber": 10 + } + }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/extract_time_fields.ts", + "lineNumber": 12 + } + }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/types.ts", + "lineNumber": 9 + } + }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/types.ts", + "lineNumber": 11 + } + }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx", + "lineNumber": 11 + } + }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx", + "lineNumber": 23 + } + }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx", + "lineNumber": 45 + } + }, + { + "plugin": "indexPatternManagement", + "link": { + "path": "src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx", + "lineNumber": 148 + } + }, { "plugin": "ml", "link": { @@ -6234,6 +6213,27 @@ "lineNumber": 21 } }, + { + "plugin": "fleet", + "link": { + "path": "x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx", + "lineNumber": 10 + } + }, + { + "plugin": "fleet", + "link": { + "path": "x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx", + "lineNumber": 33 + } + }, + { + "plugin": "fleet", + "link": { + "path": "x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx", + "lineNumber": 51 + } + }, { "plugin": "fleet", "link": { @@ -6774,409 +6774,346 @@ } }, { - "plugin": "lists", + "plugin": "maps", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.ts", - "lineNumber": 19 + "path": "x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts", + "lineNumber": 10 } }, { - "plugin": "lists", + "plugin": "maps", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.ts", - "lineNumber": 30 + "path": "x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts", + "lineNumber": 16 } }, { - "plugin": "lists", + "plugin": "maps", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.ts", - "lineNumber": 54 + "path": "x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts", + "lineNumber": 29 } }, { - "plugin": "lists", + "plugin": "maps", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.ts", - "lineNumber": 84 + "path": "x-pack/plugins/maps/public/components/geo_field_select.tsx", + "lineNumber": 12 } }, { - "plugin": "lists", + "plugin": "maps", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.ts", - "lineNumber": 150 + "path": "x-pack/plugins/maps/public/components/geo_field_select.tsx", + "lineNumber": 16 } }, { - "plugin": "lists", + "plugin": "maps", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 11 + "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/create_source_editor.tsx", + "lineNumber": 18 } }, { - "plugin": "lists", + "plugin": "maps", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 26 + "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/create_source_editor.tsx", + "lineNumber": 30 } }, { - "plugin": "lists", + "plugin": "maps", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 28 + "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/create_source_editor.tsx", + "lineNumber": 33 } }, { - "plugin": "lists", + "plugin": "maps", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 57 + "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/create_source_editor.tsx", + "lineNumber": 35 } }, { - "plugin": "lists", + "plugin": "lens", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 95 + "path": "x-pack/plugins/lens/public/indexpattern_datasource/types.ts", + "lineNumber": 8 } }, { - "plugin": "lists", + "plugin": "lens", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 96 + "path": "x-pack/plugins/lens/public/indexpattern_datasource/types.ts", + "lineNumber": 57 } }, { - "plugin": "lists", + "plugin": "lens", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 101 + "path": "x-pack/plugins/lens/server/routes/field_stats.ts", + "lineNumber": 11 } }, { - "plugin": "lists", + "plugin": "lens", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 114 + "path": "x-pack/plugins/lens/server/routes/field_stats.ts", + "lineNumber": 139 } }, { - "plugin": "lists", + "plugin": "lens", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 121 + "path": "x-pack/plugins/lens/server/routes/field_stats.ts", + "lineNumber": 248 } }, { - "plugin": "lists", + "plugin": "lens", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 125 + "path": "x-pack/plugins/lens/server/routes/field_stats.ts", + "lineNumber": 287 } }, { - "plugin": "lists", + "plugin": "lens", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 125 + "path": "x-pack/plugins/lens/server/routes/field_stats.ts", + "lineNumber": 329 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 130 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.ts", + "lineNumber": 19 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 131 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.ts", + "lineNumber": 30 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 133 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.ts", + "lineNumber": 54 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 134 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.ts", + "lineNumber": 84 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/operator.tsx", - "lineNumber": 11 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.ts", + "lineNumber": 150 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/operator.tsx", - "lineNumber": 27 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 11 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/hooks/use_field_value_autocomplete.ts", - "lineNumber": 13 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 26 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/hooks/use_field_value_autocomplete.ts", - "lineNumber": 16 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 28 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/hooks/use_field_value_autocomplete.ts", - "lineNumber": 32 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 57 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match.tsx", - "lineNumber": 19 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 95 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match.tsx", - "lineNumber": 36 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 96 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match_any.tsx", - "lineNumber": 13 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 101 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match_any.tsx", - "lineNumber": 23 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 114 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_lists.tsx", - "lineNumber": 13 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 121 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_lists.tsx", - "lineNumber": 29 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 125 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx", - "lineNumber": 31 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 125 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx", - "lineNumber": 91 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 130 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", - "lineNumber": 19 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 131 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", - "lineNumber": 333 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 133 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", - "lineNumber": 339 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 134 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", - "lineNumber": 347 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/operator.tsx", + "lineNumber": 11 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", - "lineNumber": 355 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/operator.tsx", + "lineNumber": 27 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", - "lineNumber": 363 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/hooks/use_field_value_autocomplete.ts", + "lineNumber": 13 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", - "lineNumber": 371 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/hooks/use_field_value_autocomplete.ts", + "lineNumber": 16 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", - "lineNumber": 380 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/hooks/use_field_value_autocomplete.ts", + "lineNumber": 32 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 62 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match.tsx", + "lineNumber": 19 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 166 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match.tsx", + "lineNumber": 36 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 167 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match_any.tsx", + "lineNumber": 13 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 629 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match_any.tsx", + "lineNumber": 23 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 666 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_lists.tsx", + "lineNumber": 14 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 691 - } - }, - { - "plugin": "lens", - "link": { - "path": "x-pack/plugins/lens/public/indexpattern_datasource/types.ts", - "lineNumber": 8 - } - }, - { - "plugin": "lens", - "link": { - "path": "x-pack/plugins/lens/public/indexpattern_datasource/types.ts", - "lineNumber": 57 - } - }, - { - "plugin": "maps", - "link": { - "path": "x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts", - "lineNumber": 10 - } - }, - { - "plugin": "maps", - "link": { - "path": "x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts", - "lineNumber": 16 - } - }, - { - "plugin": "maps", - "link": { - "path": "x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts", + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_lists.tsx", "lineNumber": 29 } }, { - "plugin": "maps", - "link": { - "path": "x-pack/plugins/maps/public/components/geo_field_select.tsx", - "lineNumber": 12 - } - }, - { - "plugin": "maps", - "link": { - "path": "x-pack/plugins/maps/public/components/geo_field_select.tsx", - "lineNumber": 16 - } - }, - { - "plugin": "maps", - "link": { - "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/create_source_editor.tsx", - "lineNumber": 18 - } - }, - { - "plugin": "maps", - "link": { - "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/create_source_editor.tsx", - "lineNumber": 30 - } - }, - { - "plugin": "maps", + "plugin": "lists", "link": { - "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/create_source_editor.tsx", - "lineNumber": 33 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx", + "lineNumber": 31 } }, { - "plugin": "maps", + "plugin": "lists", "link": { - "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/create_source_editor.tsx", - "lineNumber": 35 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx", + "lineNumber": 91 } }, { @@ -7418,192 +7355,213 @@ } }, { - "plugin": "securitySolution", + "plugin": "lens", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_lists.tsx", - "lineNumber": 12 + "path": "x-pack/plugins/lens/target/types/public/indexpattern_datasource/types.d.ts", + "lineNumber": 1 } }, { - "plugin": "securitySolution", + "plugin": "lens", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_lists.tsx", - "lineNumber": 20 - } + "path": "x-pack/plugins/lens/target/types/public/indexpattern_datasource/types.d.ts", + "lineNumber": 22 + } }, { - "plugin": "securitySolution", + "plugin": "lens", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match_any.tsx", - "lineNumber": 13 + "path": "x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts", + "lineNumber": 3 } }, { - "plugin": "securitySolution", + "plugin": "lens", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match_any.tsx", - "lineNumber": 22 + "path": "x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts", + "lineNumber": 7 } }, { - "plugin": "securitySolution", + "plugin": "lens", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", - "lineNumber": 11 + "path": "x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts", + "lineNumber": 8 } }, { - "plugin": "securitySolution", + "plugin": "lens", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "path": "x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts", + "lineNumber": 9 + } + }, + { + "plugin": "lists", + "link": { + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", + "lineNumber": 19 + } + }, + { + "plugin": "lists", + "link": { + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", "lineNumber": 333 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", "lineNumber": 339 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", "lineNumber": 347 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", "lineNumber": 355 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", "lineNumber": 363 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", "lineNumber": 371 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/helpers.test.ts", "lineNumber": 380 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/operator.tsx", - "lineNumber": 11 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 62 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/operator.tsx", - "lineNumber": 17 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 166 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx", - "lineNumber": 43 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 167 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx", - "lineNumber": 104 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 629 } }, { - "plugin": "lens", + "plugin": "lists", "link": { - "path": "x-pack/plugins/lens/server/routes/field_stats.ts", - "lineNumber": 11 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 666 } }, { - "plugin": "lens", + "plugin": "lists", "link": { - "path": "x-pack/plugins/lens/server/routes/field_stats.ts", - "lineNumber": 139 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 691 } }, { - "plugin": "lens", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lens/server/routes/field_stats.ts", - "lineNumber": 248 + "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "lineNumber": 11 } }, { - "plugin": "lens", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lens/server/routes/field_stats.ts", - "lineNumber": 287 + "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "lineNumber": 333 } }, { - "plugin": "lens", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lens/server/routes/field_stats.ts", - "lineNumber": 329 + "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "lineNumber": 339 } }, { - "plugin": "lens", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lens/target/types/public/indexpattern_datasource/types.d.ts", - "lineNumber": 1 + "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "lineNumber": 347 } }, { - "plugin": "lens", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lens/target/types/public/indexpattern_datasource/types.d.ts", - "lineNumber": 22 + "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "lineNumber": 355 } }, { - "plugin": "lens", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts", - "lineNumber": 3 + "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "lineNumber": 363 } }, { - "plugin": "lens", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts", - "lineNumber": 7 + "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "lineNumber": 371 } }, { - "plugin": "lens", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts", - "lineNumber": 8 + "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts", + "lineNumber": 380 } }, { - "plugin": "lens", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts", - "lineNumber": 9 + "path": "x-pack/plugins/security_solution/target/types/public/common/components/exceptions/helpers.test.d.ts", + "lineNumber": 1 + } + }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/target/types/public/common/components/exceptions/helpers.test.d.ts", + "lineNumber": 2 } }, { @@ -8130,48 +8088,6 @@ }, "deprecated": true, "references": [ - { - "plugin": "lists", - "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/exception_items_renderer.tsx", - "lineNumber": 34 - } - }, - { - "plugin": "lists", - "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/exception_items_renderer.tsx", - "lineNumber": 78 - } - }, - { - "plugin": "lists", - "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/exception_items_renderer.tsx", - "lineNumber": 86 - } - }, - { - "plugin": "lists", - "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/exception_items_renderer.tsx", - "lineNumber": 88 - } - }, - { - "plugin": "securitySolution", - "link": { - "path": "x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts", - "lineNumber": 8 - } - }, - { - "plugin": "securitySolution", - "link": { - "path": "x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts", - "lineNumber": 86 - } - }, { "plugin": "savedObjects", "link": { @@ -8264,206 +8180,178 @@ } }, { - "plugin": "savedObjectsManagement", + "plugin": "indexPatternManagement", "link": { - "path": "src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx", - "lineNumber": 37 + "path": "src/plugins/index_pattern_management/public/service/list/config.ts", + "lineNumber": 10 } }, { - "plugin": "savedObjectsManagement", + "plugin": "indexPatternManagement", "link": { - "path": "src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx", - "lineNumber": 89 + "path": "src/plugins/index_pattern_management/public/service/list/config.ts", + "lineNumber": 29 } }, { - "plugin": "infra", + "plugin": "indexPatternManagement", "link": { - "path": "x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx", - "lineNumber": 9 + "path": "src/plugins/index_pattern_management/public/service/list/config.ts", + "lineNumber": 29 } }, { - "plugin": "infra", + "plugin": "indexPatternManagement", "link": { - "path": "x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx", - "lineNumber": 24 + "path": "src/plugins/index_pattern_management/public/service/list/config.ts", + "lineNumber": 42 } }, { - "plugin": "infra", + "plugin": "indexPatternManagement", "link": { - "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/kuery_bar.tsx", - "lineNumber": 15 + "path": "src/plugins/index_pattern_management/public/service/list/config.ts", + "lineNumber": 46 } }, { - "plugin": "infra", + "plugin": "indexPatternManagement", "link": { - "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/kuery_bar.tsx", - "lineNumber": 28 + "path": "src/plugins/index_pattern_management/public/service/list/manager.ts", + "lineNumber": 9 } }, { - "plugin": "lens", + "plugin": "indexPatternManagement", "link": { - "path": "x-pack/plugins/lens/public/editor_frame_service/embeddable/embeddable.tsx", - "lineNumber": 14 + "path": "src/plugins/index_pattern_management/public/service/list/manager.ts", + "lineNumber": 32 } }, { - "plugin": "lens", + "plugin": "indexPatternManagement", "link": { - "path": "x-pack/plugins/lens/public/editor_frame_service/embeddable/embeddable.tsx", - "lineNumber": 85 + "path": "src/plugins/index_pattern_management/public/service/list/manager.ts", + "lineNumber": 32 } }, { - "plugin": "lens", + "plugin": "indexPatternManagement", "link": { - "path": "x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx", - "lineNumber": 47 + "path": "src/plugins/index_pattern_management/public/service/list/manager.ts", + "lineNumber": 43 } }, { - "plugin": "lens", + "plugin": "indexPatternManagement", "link": { - "path": "x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx", - "lineNumber": 172 + "path": "src/plugins/index_pattern_management/public/service/list/manager.ts", + "lineNumber": 50 } }, { - "plugin": "lens", + "plugin": "indexPatternManagement", "link": { - "path": "x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx", - "lineNumber": 42 - } - }, - { - "plugin": "lens", - "link": { - "path": "x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx", - "lineNumber": 96 - } - }, - { - "plugin": "lens", - "link": { - "path": "x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx", - "lineNumber": 166 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/service/list/config.ts", - "lineNumber": 10 - } - }, - { - "plugin": "indexPatternManagement", - "link": { - "path": "src/plugins/index_pattern_management/public/service/list/config.ts", - "lineNumber": 29 + "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.tsx", + "lineNumber": 22 } }, { "plugin": "indexPatternManagement", "link": { - "path": "src/plugins/index_pattern_management/public/service/list/config.ts", - "lineNumber": 29 + "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.tsx", + "lineNumber": 171 } }, { "plugin": "indexPatternManagement", "link": { - "path": "src/plugins/index_pattern_management/public/service/list/config.ts", - "lineNumber": 42 + "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.tsx", + "lineNumber": 15 } }, { "plugin": "indexPatternManagement", "link": { - "path": "src/plugins/index_pattern_management/public/service/list/config.ts", - "lineNumber": 46 + "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.tsx", + "lineNumber": 18 } }, { "plugin": "indexPatternManagement", "link": { - "path": "src/plugins/index_pattern_management/public/service/list/manager.ts", - "lineNumber": 9 + "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/index_header/index_header.tsx", + "lineNumber": 12 } }, { "plugin": "indexPatternManagement", "link": { - "path": "src/plugins/index_pattern_management/public/service/list/manager.ts", - "lineNumber": 32 + "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/index_header/index_header.tsx", + "lineNumber": 15 } }, { - "plugin": "indexPatternManagement", + "plugin": "savedObjectsManagement", "link": { - "path": "src/plugins/index_pattern_management/public/service/list/manager.ts", - "lineNumber": 32 + "path": "src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx", + "lineNumber": 37 } }, { - "plugin": "indexPatternManagement", + "plugin": "savedObjectsManagement", "link": { - "path": "src/plugins/index_pattern_management/public/service/list/manager.ts", - "lineNumber": 43 + "path": "src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx", + "lineNumber": 89 } }, { - "plugin": "indexPatternManagement", + "plugin": "lens", "link": { - "path": "src/plugins/index_pattern_management/public/service/list/manager.ts", - "lineNumber": 50 + "path": "x-pack/plugins/lens/public/editor_frame_service/embeddable/embeddable.tsx", + "lineNumber": 14 } }, { - "plugin": "indexPatternManagement", + "plugin": "lens", "link": { - "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.tsx", - "lineNumber": 22 + "path": "x-pack/plugins/lens/public/editor_frame_service/embeddable/embeddable.tsx", + "lineNumber": 85 } }, { - "plugin": "indexPatternManagement", + "plugin": "lens", "link": { - "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.tsx", - "lineNumber": 171 + "path": "x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx", + "lineNumber": 47 } }, { - "plugin": "indexPatternManagement", + "plugin": "lens", "link": { - "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.tsx", - "lineNumber": 15 + "path": "x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx", + "lineNumber": 172 } }, { - "plugin": "indexPatternManagement", + "plugin": "lens", "link": { - "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.tsx", - "lineNumber": 18 + "path": "x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx", + "lineNumber": 42 } }, { - "plugin": "indexPatternManagement", + "plugin": "lens", "link": { - "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/index_header/index_header.tsx", - "lineNumber": 12 + "path": "x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx", + "lineNumber": 96 } }, { - "plugin": "indexPatternManagement", + "plugin": "lens", "link": { - "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/index_header/index_header.tsx", - "lineNumber": 15 + "path": "x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx", + "lineNumber": 166 } }, { @@ -8536,6 +8424,48 @@ "lineNumber": 30 } }, + { + "plugin": "apm", + "link": { + "path": "x-pack/plugins/apm/public/components/shared/KueryBar/index.tsx", + "lineNumber": 14 + } + }, + { + "plugin": "apm", + "link": { + "path": "x-pack/plugins/apm/public/components/shared/KueryBar/index.tsx", + "lineNumber": 31 + } + }, + { + "plugin": "infra", + "link": { + "path": "x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx", + "lineNumber": 9 + } + }, + { + "plugin": "infra", + "link": { + "path": "x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx", + "lineNumber": 24 + } + }, + { + "plugin": "infra", + "link": { + "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/kuery_bar.tsx", + "lineNumber": 15 + } + }, + { + "plugin": "infra", + "link": { + "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/kuery_bar.tsx", + "lineNumber": 28 + } + }, { "plugin": "infra", "link": { @@ -8676,32 +8606,74 @@ "lineNumber": 23 } }, + { + "plugin": "lists", + "link": { + "path": "x-pack/plugins/lists/public/exceptions/components/builder/exception_items_renderer.tsx", + "lineNumber": 34 + } + }, + { + "plugin": "lists", + "link": { + "path": "x-pack/plugins/lists/public/exceptions/components/builder/exception_items_renderer.tsx", + "lineNumber": 78 + } + }, + { + "plugin": "lists", + "link": { + "path": "x-pack/plugins/lists/public/exceptions/components/builder/exception_items_renderer.tsx", + "lineNumber": 86 + } + }, + { + "plugin": "lists", + "link": { + "path": "x-pack/plugins/lists/public/exceptions/components/builder/exception_items_renderer.tsx", + "lineNumber": 88 + } + }, { "plugin": "securitySolution", "link": { "path": "x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts", - "lineNumber": 20 + "lineNumber": 21 } }, { "plugin": "securitySolution", "link": { "path": "x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts", - "lineNumber": 64 + "lineNumber": 66 } }, { "plugin": "securitySolution", "link": { "path": "x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts", - "lineNumber": 17 + "lineNumber": 19 } }, { "plugin": "securitySolution", "link": { "path": "x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts", - "lineNumber": 98 + "lineNumber": 100 + } + }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts", + "lineNumber": 8 + } + }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts", + "lineNumber": 86 } }, { @@ -8939,21 +8911,21 @@ "plugin": "securitySolution", "link": { "path": "x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts", - "lineNumber": 32 + "lineNumber": 40 } }, { "plugin": "securitySolution", "link": { "path": "x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts", - "lineNumber": 38 + "lineNumber": 55 } }, { "plugin": "securitySolution", "link": { "path": "x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts", - "lineNumber": 43 + "lineNumber": 60 } }, { @@ -9040,34 +9012,6 @@ "lineNumber": 33 } }, - { - "plugin": "securitySolution", - "link": { - "path": "x-pack/plugins/security_solution/public/common/containers/kuery_autocompletion/index.tsx", - "lineNumber": 9 - } - }, - { - "plugin": "securitySolution", - "link": { - "path": "x-pack/plugins/security_solution/public/common/containers/kuery_autocompletion/index.tsx", - "lineNumber": 21 - } - }, - { - "plugin": "apm", - "link": { - "path": "x-pack/plugins/apm/public/components/shared/KueryBar/index.tsx", - "lineNumber": 14 - } - }, - { - "plugin": "apm", - "link": { - "path": "x-pack/plugins/apm/public/components/shared/KueryBar/index.tsx", - "lineNumber": 31 - } - }, { "plugin": "uptime", "link": { @@ -9110,6 +9054,20 @@ "lineNumber": 36 } }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/target/types/common/search_strategy/index_fields/index.d.ts", + "lineNumber": 1 + } + }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/target/types/common/search_strategy/index_fields/index.d.ts", + "lineNumber": 66 + } + }, { "plugin": "infra", "link": { @@ -9153,507 +9111,479 @@ } }, { - "plugin": "infra", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/infra/target/types/public/alerting/metric_threshold/components/expression_chart.d.ts", - "lineNumber": 2 + "path": "x-pack/plugins/security_solution/target/types/public/common/containers/source/index.d.ts", + "lineNumber": 1 } }, { - "plugin": "infra", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/infra/target/types/public/alerting/metric_threshold/components/expression_chart.d.ts", - "lineNumber": 7 + "path": "x-pack/plugins/security_solution/target/types/public/common/containers/source/index.d.ts", + "lineNumber": 10 } }, { - "plugin": "infra", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/infra/target/types/public/alerting/metric_threshold/hooks/use_metrics_explorer_chart_data.d.ts", - "lineNumber": 1 - } - }, - { - "plugin": "infra", - "link": { - "path": "x-pack/plugins/infra/target/types/public/alerting/metric_threshold/hooks/use_metrics_explorer_chart_data.d.ts", - "lineNumber": 4 + "path": "x-pack/plugins/security_solution/target/types/public/common/containers/source/index.d.ts", + "lineNumber": 23 } }, { "plugin": "infra", "link": { - "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/index.d.ts", - "lineNumber": 1 + "path": "x-pack/plugins/infra/target/types/public/alerting/metric_threshold/components/expression_chart.d.ts", + "lineNumber": 2 } }, { "plugin": "infra", "link": { - "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/index.d.ts", - "lineNumber": 5 + "path": "x-pack/plugins/infra/target/types/public/alerting/metric_threshold/components/expression_chart.d.ts", + "lineNumber": 7 } }, { "plugin": "infra", "link": { - "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/hooks/use_metric_explorer_state.d.ts", + "path": "x-pack/plugins/infra/target/types/public/alerting/metric_threshold/hooks/use_metrics_explorer_chart_data.d.ts", "lineNumber": 1 } }, { "plugin": "infra", "link": { - "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/hooks/use_metric_explorer_state.d.ts", - "lineNumber": 11 + "path": "x-pack/plugins/infra/target/types/public/alerting/metric_threshold/hooks/use_metrics_explorer_chart_data.d.ts", + "lineNumber": 4 } }, { "plugin": "infra", "link": { - "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.d.ts", + "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/index.d.ts", "lineNumber": 1 } }, { "plugin": "infra", "link": { - "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.d.ts", - "lineNumber": 4 + "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/index.d.ts", + "lineNumber": 5 } }, { - "plugin": "ml", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/ml/target/types/public/application/jobs/new_job/common/index_pattern_context.d.ts", - "lineNumber": 2 + "path": "x-pack/plugins/security_solution/target/types/public/common/components/url_state/types.d.ts", + "lineNumber": 3 } }, { - "plugin": "ml", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/ml/target/types/public/application/jobs/new_job/common/index_pattern_context.d.ts", - "lineNumber": 3 + "path": "x-pack/plugins/security_solution/target/types/public/common/components/url_state/types.d.ts", + "lineNumber": 25 } }, { - "plugin": "ml", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/ml/target/types/public/application/jobs/new_job/common/index_pattern_context.d.ts", - "lineNumber": 4 + "path": "x-pack/plugins/security_solution/target/types/public/common/components/url_state/types.d.ts", + "lineNumber": 55 } }, { - "plugin": "lists", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 11 + "path": "x-pack/plugins/security_solution/target/types/public/network/components/network_top_countries_table/columns.d.ts", + "lineNumber": 1 } }, { - "plugin": "lists", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 21 + "path": "x-pack/plugins/security_solution/target/types/public/network/components/network_top_countries_table/columns.d.ts", + "lineNumber": 20 } }, { - "plugin": "lists", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 100 + "path": "x-pack/plugins/security_solution/target/types/public/network/components/network_top_countries_table/columns.d.ts", + "lineNumber": 21 } }, { - "plugin": "lists", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", - "lineNumber": 121 + "path": "x-pack/plugins/security_solution/target/types/public/common/components/search_bar/index.d.ts", + "lineNumber": 3 } }, { - "plugin": "lists", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/hooks/use_field_value_autocomplete.ts", - "lineNumber": 13 + "path": "x-pack/plugins/security_solution/target/types/public/common/components/search_bar/index.d.ts", + "lineNumber": 9 } }, { - "plugin": "lists", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/hooks/use_field_value_autocomplete.ts", - "lineNumber": 17 + "path": "x-pack/plugins/security_solution/target/types/public/hosts/pages/details/types.d.ts", + "lineNumber": 2 } }, { - "plugin": "lists", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/hooks/use_field_value_autocomplete.ts", - "lineNumber": 29 + "path": "x-pack/plugins/security_solution/target/types/public/hosts/pages/details/types.d.ts", + "lineNumber": 40 } }, { - "plugin": "lists", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match.tsx", - "lineNumber": 19 + "path": "x-pack/plugins/security_solution/target/types/public/network/components/network_top_countries_table/index.d.ts", + "lineNumber": 2 } }, { - "plugin": "lists", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match.tsx", - "lineNumber": 38 + "path": "x-pack/plugins/security_solution/target/types/public/network/components/network_top_countries_table/index.d.ts", + "lineNumber": 10 } }, { - "plugin": "lists", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match_any.tsx", - "lineNumber": 13 + "path": "x-pack/plugins/security_solution/target/types/public/network/pages/details/types.d.ts", + "lineNumber": 1 } }, { - "plugin": "lists", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match_any.tsx", + "path": "x-pack/plugins/security_solution/target/types/public/network/pages/details/types.d.ts", "lineNumber": 25 } }, { - "plugin": "lists", + "plugin": "infra", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx", - "lineNumber": 31 + "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/hooks/use_metric_explorer_state.d.ts", + "lineNumber": 1 } }, { - "plugin": "lists", + "plugin": "infra", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx", - "lineNumber": 53 + "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/hooks/use_metric_explorer_state.d.ts", + "lineNumber": 11 } }, { - "plugin": "lists", + "plugin": "infra", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx", - "lineNumber": 58 + "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.d.ts", + "lineNumber": 1 } }, { - "plugin": "lists", + "plugin": "infra", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx", - "lineNumber": 61 + "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.d.ts", + "lineNumber": 4 } }, { - "plugin": "lists", + "plugin": "ml", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/exception_item_renderer.tsx", - "lineNumber": 22 + "path": "x-pack/plugins/ml/target/types/public/application/jobs/new_job/common/index_pattern_context.d.ts", + "lineNumber": 2 } }, { - "plugin": "lists", + "plugin": "ml", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/exception_item_renderer.tsx", - "lineNumber": 50 + "path": "x-pack/plugins/ml/target/types/public/application/jobs/new_job/common/index_pattern_context.d.ts", + "lineNumber": 3 } }, { - "plugin": "lists", + "plugin": "ml", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/exception_item_renderer.tsx", - "lineNumber": 55 + "path": "x-pack/plugins/ml/target/types/public/application/jobs/new_job/common/index_pattern_context.d.ts", + "lineNumber": 4 } }, { - "plugin": "lists", + "plugin": "ml", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/exception_item_renderer.tsx", - "lineNumber": 58 + "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_action_name.tsx", + "lineNumber": 12 } }, { - "plugin": "lists", + "plugin": "ml", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 62 + "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_action_name.tsx", + "lineNumber": 412 } }, { - "plugin": "lists", + "plugin": "ml", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 96 + "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/use_delete_action.tsx", + "lineNumber": 12 } }, { - "plugin": "lists", + "plugin": "ml", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 169 + "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/use_delete_action.tsx", + "lineNumber": 60 } }, { - "plugin": "lists", + "plugin": "ml", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 169 + "path": "x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.d.ts", + "lineNumber": 8 } }, { - "plugin": "lists", + "plugin": "ml", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 184 + "path": "x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.d.ts", + "lineNumber": 37 } }, { - "plugin": "lists", + "plugin": "ml", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 187 + "path": "x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.d.ts", + "lineNumber": 8 } }, { - "plugin": "lists", + "plugin": "ml", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 196 + "path": "x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.d.ts", + "lineNumber": 11 } }, { - "plugin": "lists", + "plugin": "ml", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 199 + "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/actions_panel.tsx", + "lineNumber": 25 } }, { - "plugin": "lists", + "plugin": "ml", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 208 + "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/actions_panel.tsx", + "lineNumber": 28 } }, { - "plugin": "lists", + "plugin": "infra", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 214 + "path": "x-pack/plugins/infra/public/pages/metrics/index.tsx", + "lineNumber": 14 } }, { - "plugin": "lists", + "plugin": "infra", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 226 + "path": "x-pack/plugins/infra/public/pages/metrics/index.tsx", + "lineNumber": 193 } }, { - "plugin": "lists", + "plugin": "visTypeTimeseries", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 229 + "path": "src/plugins/vis_type_timeseries/common/index_patterns_utils.ts", + "lineNumber": 11 } }, { - "plugin": "lists", + "plugin": "visTypeTimeseries", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 239 + "path": "src/plugins/vis_type_timeseries/common/index_patterns_utils.ts", + "lineNumber": 20 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 267 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 11 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 285 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 21 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 320 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 100 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 336 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field.tsx", + "lineNumber": 121 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 1026 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/hooks/use_field_value_autocomplete.ts", + "lineNumber": 13 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 1045 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/hooks/use_field_value_autocomplete.ts", + "lineNumber": 17 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 1095 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/hooks/use_field_value_autocomplete.ts", + "lineNumber": 29 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 1251 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match.tsx", + "lineNumber": 19 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 1302 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match.tsx", + "lineNumber": 38 } }, { "plugin": "lists", "link": { - "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", - "lineNumber": 1352 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match_any.tsx", + "lineNumber": 13 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/common/detection_engine/get_query_filter.ts", - "lineNumber": 15 + "path": "x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match_any.tsx", + "lineNumber": 25 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/common/detection_engine/get_query_filter.ts", + "path": "x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx", "lineNumber": 31 } }, { - "plugin": "ml", - "link": { - "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_action_name.tsx", - "lineNumber": 12 - } - }, - { - "plugin": "ml", - "link": { - "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_action_name.tsx", - "lineNumber": 412 - } - }, - { - "plugin": "ml", - "link": { - "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/use_delete_action.tsx", - "lineNumber": 12 - } - }, - { - "plugin": "ml", + "plugin": "lists", "link": { - "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/use_delete_action.tsx", - "lineNumber": 60 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx", + "lineNumber": 53 } }, { - "plugin": "ml", + "plugin": "lists", "link": { - "path": "x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.d.ts", - "lineNumber": 8 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx", + "lineNumber": 58 } }, { - "plugin": "ml", + "plugin": "lists", "link": { - "path": "x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.d.ts", - "lineNumber": 37 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx", + "lineNumber": 61 } }, { - "plugin": "ml", + "plugin": "lists", "link": { - "path": "x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.d.ts", - "lineNumber": 8 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/exception_item_renderer.tsx", + "lineNumber": 22 } }, { - "plugin": "ml", + "plugin": "lists", "link": { - "path": "x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.d.ts", - "lineNumber": 11 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/exception_item_renderer.tsx", + "lineNumber": 50 } }, { - "plugin": "ml", + "plugin": "lists", "link": { - "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/actions_panel.tsx", - "lineNumber": 25 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/exception_item_renderer.tsx", + "lineNumber": 55 } }, { - "plugin": "ml", + "plugin": "lists", "link": { - "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/actions_panel.tsx", - "lineNumber": 28 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/exception_item_renderer.tsx", + "lineNumber": 58 } }, { - "plugin": "infra", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/infra/public/pages/metrics/index.tsx", - "lineNumber": 14 + "path": "x-pack/plugins/security_solution/public/network/pages/navigation/types.ts", + "lineNumber": 9 } }, { - "plugin": "infra", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/infra/public/pages/metrics/index.tsx", - "lineNumber": 193 + "path": "x-pack/plugins/security_solution/public/network/pages/navigation/types.ts", + "lineNumber": 35 } }, { "plugin": "securitySolution", "link": { "path": "x-pack/plugins/security_solution/public/network/pages/navigation/types.ts", - "lineNumber": 9 + "lineNumber": 53 } }, { "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/security_solution/public/network/pages/navigation/types.ts", - "lineNumber": 35 + "path": "x-pack/plugins/security_solution/common/detection_engine/get_query_filter.ts", + "lineNumber": 16 } }, { "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/security_solution/public/network/pages/navigation/types.ts", - "lineNumber": 53 + "path": "x-pack/plugins/security_solution/common/detection_engine/get_query_filter.ts", + "lineNumber": 31 } }, { @@ -9736,211 +9666,267 @@ { "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/field.tsx", - "lineNumber": 93 + "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/field.tsx", + "lineNumber": 93 + } + }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/field.tsx", + "lineNumber": 114 + } + }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/hooks/use_field_value_autocomplete.ts", + "lineNumber": 12 + } + }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/hooks/use_field_value_autocomplete.ts", + "lineNumber": 19 + } + }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/hooks/use_field_value_autocomplete.ts", + "lineNumber": 31 + } + }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match.tsx", + "lineNumber": 19 + } + }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match.tsx", + "lineNumber": 30 + } + }, + { + "plugin": "stackAlerts", + "link": { + "path": "x-pack/plugins/stack_alerts/server/alert_types/geo_containment/es_query_builder.ts", + "lineNumber": 13 + } + }, + { + "plugin": "stackAlerts", + "link": { + "path": "x-pack/plugins/stack_alerts/server/alert_types/geo_containment/es_query_builder.ts", + "lineNumber": 25 } }, { - "plugin": "securitySolution", + "plugin": "infra", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/field.tsx", - "lineNumber": 114 + "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts", + "lineNumber": 13 } }, { - "plugin": "securitySolution", + "plugin": "infra", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/hooks/use_field_value_autocomplete.ts", - "lineNumber": 12 + "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts", + "lineNumber": 30 } }, { - "plugin": "securitySolution", + "plugin": "infra", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/hooks/use_field_value_autocomplete.ts", - "lineNumber": 19 + "path": "x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts", + "lineNumber": 1 } }, { - "plugin": "securitySolution", + "plugin": "infra", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/hooks/use_field_value_autocomplete.ts", - "lineNumber": 31 + "path": "x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts", + "lineNumber": 3 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match.tsx", - "lineNumber": 19 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 62 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match.tsx", - "lineNumber": 30 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 96 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match_any.tsx", - "lineNumber": 13 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 169 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match_any.tsx", - "lineNumber": 24 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 169 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx", - "lineNumber": 43 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 184 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx", - "lineNumber": 49 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 187 } }, { - "plugin": "securitySolution", + "plugin": "lists", "link": { - "path": "x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx", - "lineNumber": 368 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 196 } }, { - "plugin": "visTypeTimeseries", + "plugin": "lists", "link": { - "path": "src/plugins/vis_type_timeseries/common/index_patterns_utils.ts", - "lineNumber": 11 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 199 } }, { - "plugin": "visTypeTimeseries", + "plugin": "lists", "link": { - "path": "src/plugins/vis_type_timeseries/common/index_patterns_utils.ts", - "lineNumber": 20 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 208 } }, { - "plugin": "stackAlerts", + "plugin": "lists", "link": { - "path": "x-pack/plugins/stack_alerts/server/alert_types/geo_containment/es_query_builder.ts", - "lineNumber": 13 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 214 } }, { - "plugin": "stackAlerts", + "plugin": "lists", "link": { - "path": "x-pack/plugins/stack_alerts/server/alert_types/geo_containment/es_query_builder.ts", - "lineNumber": 25 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 226 } }, { - "plugin": "infra", + "plugin": "lists", "link": { - "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts", - "lineNumber": 13 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 229 } }, { - "plugin": "infra", + "plugin": "lists", "link": { - "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts", - "lineNumber": 30 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 239 } }, { - "plugin": "infra", + "plugin": "lists", "link": { - "path": "x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts", - "lineNumber": 1 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 267 } }, { - "plugin": "infra", + "plugin": "lists", "link": { - "path": "x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts", - "lineNumber": 3 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 285 } }, { - "plugin": "discover", + "plugin": "lists", "link": { - "path": "src/plugins/discover/public/application/components/context_app/context_app_legacy.tsx", - "lineNumber": 17 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 320 } }, { - "plugin": "discover", + "plugin": "lists", "link": { - "path": "src/plugins/discover/public/application/components/context_app/context_app_legacy.tsx", - "lineNumber": 26 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 336 } }, { - "plugin": "observability", + "plugin": "lists", "link": { - "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts", - "lineNumber": 18 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 1026 } }, { - "plugin": "observability", + "plugin": "lists", "link": { - "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts", - "lineNumber": 95 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 1045 } }, { - "plugin": "observability", + "plugin": "lists", "link": { - "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts", - "lineNumber": 10 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 1095 } }, { - "plugin": "observability", + "plugin": "lists", "link": { - "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts", - "lineNumber": 53 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 1251 } }, { - "plugin": "observability", + "plugin": "lists", "link": { - "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts", - "lineNumber": 61 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 1302 } }, { - "plugin": "observability", + "plugin": "lists", "link": { - "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts", - "lineNumber": 69 + "path": "x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts", + "lineNumber": 1352 } }, { - "plugin": "observability", + "plugin": "discover", "link": { - "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/default_configs.ts", - "lineNumber": 19 + "path": "src/plugins/discover/public/application/components/context_app/context_app_legacy.tsx", + "lineNumber": 17 } }, { - "plugin": "observability", + "plugin": "discover", "link": { - "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/default_configs.ts", - "lineNumber": 24 + "path": "src/plugins/discover/public/application/components/context_app/context_app_legacy.tsx", + "lineNumber": 26 } }, { @@ -10055,6 +10041,62 @@ "lineNumber": 17 } }, + { + "plugin": "observability", + "link": { + "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts", + "lineNumber": 18 + } + }, + { + "plugin": "observability", + "link": { + "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts", + "lineNumber": 95 + } + }, + { + "plugin": "observability", + "link": { + "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts", + "lineNumber": 10 + } + }, + { + "plugin": "observability", + "link": { + "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts", + "lineNumber": 53 + } + }, + { + "plugin": "observability", + "link": { + "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts", + "lineNumber": 61 + } + }, + { + "plugin": "observability", + "link": { + "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts", + "lineNumber": 69 + } + }, + { + "plugin": "observability", + "link": { + "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/default_configs.ts", + "lineNumber": 19 + } + }, + { + "plugin": "observability", + "link": { + "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/default_configs.ts", + "lineNumber": 24 + } + }, { "plugin": "securitySolution", "link": { @@ -10125,20 +10167,6 @@ "lineNumber": 19 } }, - { - "plugin": "securitySolution", - "link": { - "path": "x-pack/plugins/security_solution/public/common/mock/index_pattern.ts", - "lineNumber": 8 - } - }, - { - "plugin": "securitySolution", - "link": { - "path": "x-pack/plugins/security_solution/public/common/mock/index_pattern.ts", - "lineNumber": 10 - } - }, { "plugin": "stackAlerts", "link": { @@ -10258,6 +10286,20 @@ "lineNumber": 13 } }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/public/common/mock/index_pattern.ts", + "lineNumber": 8 + } + }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/public/common/mock/index_pattern.ts", + "lineNumber": 10 + } + }, { "plugin": "ml", "link": { diff --git a/api_docs/data_search.json b/api_docs/data_search.json index a82a2ca24d899e..082553e94dcf42 100644 --- a/api_docs/data_search.json +++ b/api_docs/data_search.json @@ -2690,7 +2690,7 @@ ], "source": { "path": "src/plugins/data/server/search/types.ts", - "lineNumber": 89 + "lineNumber": 90 }, "deprecated": false, "children": [ @@ -2708,7 +2708,7 @@ ], "source": { "path": "src/plugins/data/server/search/types.ts", - "lineNumber": 90 + "lineNumber": 91 }, "deprecated": false, "returnComment": [], @@ -2758,7 +2758,7 @@ ], "source": { "path": "src/plugins/data/server/search/types.ts", - "lineNumber": 91 + "lineNumber": 92 }, "deprecated": false, "returnComment": [], @@ -2806,7 +2806,7 @@ ], "source": { "path": "src/plugins/data/server/search/types.ts", - "lineNumber": 92 + "lineNumber": 93 }, "deprecated": false, "returnComment": [], @@ -2875,7 +2875,7 @@ ], "source": { "path": "src/plugins/data/server/search/types.ts", - "lineNumber": 93 + "lineNumber": 94 }, "deprecated": false, "returnComment": [], @@ -2923,7 +2923,7 @@ ], "source": { "path": "src/plugins/data/server/search/types.ts", - "lineNumber": 94 + "lineNumber": 95 }, "deprecated": false, "returnComment": [], @@ -2955,7 +2955,7 @@ ], "source": { "path": "src/plugins/data/server/search/types.ts", - "lineNumber": 95 + "lineNumber": 96 }, "deprecated": false, "returnComment": [], @@ -2995,7 +2995,7 @@ ], "source": { "path": "src/plugins/data/server/search/types.ts", - "lineNumber": 96 + "lineNumber": 97 }, "deprecated": false, "returnComment": [], @@ -3128,7 +3128,7 @@ "description": [], "source": { "path": "src/plugins/data/server/search/types.ts", - "lineNumber": 42 + "lineNumber": 43 }, "deprecated": false, "children": [ @@ -3144,7 +3144,7 @@ ], "source": { "path": "src/plugins/data/server/search/types.ts", - "lineNumber": 43 + "lineNumber": 44 }, "deprecated": false }, @@ -3202,7 +3202,7 @@ ], "source": { "path": "src/plugins/data/server/search/types.ts", - "lineNumber": 48 + "lineNumber": 49 }, "deprecated": false, "returnComment": [], @@ -3216,7 +3216,7 @@ "description": [], "source": { "path": "src/plugins/data/server/search/types.ts", - "lineNumber": 52 + "lineNumber": 53 }, "deprecated": false }, @@ -3239,7 +3239,7 @@ ], "source": { "path": "src/plugins/data/server/search/types.ts", - "lineNumber": 53 + "lineNumber": 54 }, "deprecated": false } @@ -3266,7 +3266,7 @@ ], "source": { "path": "src/plugins/data/server/search/types.ts", - "lineNumber": 59 + "lineNumber": 60 }, "deprecated": false } @@ -3292,7 +3292,7 @@ ], "source": { "path": "src/plugins/data/server/search/types.ts", - "lineNumber": 99 + "lineNumber": 100 }, "deprecated": false, "children": [ @@ -3308,7 +3308,7 @@ ], "source": { "path": "src/plugins/data/server/search/types.ts", - "lineNumber": 103 + "lineNumber": 104 }, "deprecated": false }, @@ -3334,7 +3334,7 @@ ], "source": { "path": "src/plugins/data/server/search/types.ts", - "lineNumber": 109 + "lineNumber": 110 }, "deprecated": false, "returnComment": [], @@ -3351,7 +3351,7 @@ ], "source": { "path": "src/plugins/data/server/search/types.ts", - "lineNumber": 110 + "lineNumber": 111 }, "deprecated": false } @@ -3384,7 +3384,7 @@ ], "source": { "path": "src/plugins/data/server/search/types.ts", - "lineNumber": 112 + "lineNumber": 113 }, "deprecated": false, "returnComment": [], @@ -3408,7 +3408,7 @@ ], "source": { "path": "src/plugins/data/server/search/types.ts", - "lineNumber": 112 + "lineNumber": 113 }, "deprecated": false } @@ -3442,7 +3442,7 @@ ], "source": { "path": "src/plugins/data/server/search/types.ts", - "lineNumber": 113 + "lineNumber": 114 }, "deprecated": false } @@ -3470,7 +3470,7 @@ ], "source": { "path": "src/plugins/data/server/search/types.ts", - "lineNumber": 71 + "lineNumber": 72 }, "deprecated": false, "children": [ @@ -3504,7 +3504,7 @@ ], "source": { "path": "src/plugins/data/server/search/types.ts", - "lineNumber": 75 + "lineNumber": 76 }, "deprecated": false, "returnComment": [], @@ -3521,7 +3521,7 @@ ], "source": { "path": "src/plugins/data/server/search/types.ts", - "lineNumber": 76 + "lineNumber": 77 }, "deprecated": false }, @@ -3543,7 +3543,7 @@ ], "source": { "path": "src/plugins/data/server/search/types.ts", - "lineNumber": 77 + "lineNumber": 78 }, "deprecated": false }, @@ -3565,7 +3565,7 @@ ], "source": { "path": "src/plugins/data/server/search/types.ts", - "lineNumber": 78 + "lineNumber": 79 }, "deprecated": false } @@ -3599,7 +3599,7 @@ ], "source": { "path": "src/plugins/data/server/search/types.ts", - "lineNumber": 80 + "lineNumber": 81 }, "deprecated": false }, @@ -3631,7 +3631,7 @@ ], "source": { "path": "src/plugins/data/server/search/types.ts", - "lineNumber": 81 + "lineNumber": 82 }, "deprecated": false } @@ -4027,6 +4027,29 @@ "lineNumber": 39 }, "deprecated": false + }, + { + "parentPluginId": "data", + "id": "def-server.SearchStrategyDependencies.request", + "type": "Object", + "tags": [], + "label": "request", + "description": [], + "signature": [ + { + "pluginId": "core", + "scope": "server", + "docId": "kibCoreHttpPluginApi", + "section": "def-server.KibanaRequest", + "text": "KibanaRequest" + }, + "" + ], + "source": { + "path": "src/plugins/data/server/search/types.ts", + "lineNumber": 40 + }, + "deprecated": false } ], "initialIsOpen": false @@ -4122,7 +4145,7 @@ ], "source": { "path": "src/plugins/data/server/search/types.ts", - "lineNumber": 118 + "lineNumber": 119 }, "deprecated": false, "initialIsOpen": false diff --git a/api_docs/deprecations.mdx b/api_docs/deprecations.mdx index 7d6df4965c7120..9eee6d51d84ab9 100644 --- a/api_docs/deprecations.mdx +++ b/api_docs/deprecations.mdx @@ -42,15 +42,6 @@ warning: This document is auto-generated and is meant to be viewed inside our ex -## beatsManagement - -| Deprecated API | Reference location | Remove By | -| ---------------|-----------|-----------| -| | [kibana_database_adapter.ts#L8](https://github.com/elastic/kibana/tree/master/x-pack/plugins/beats_management/server/lib/adapters/database/kibana_database_adapter.ts#L8) | 7.16 | -| | [kibana_database_adapter.ts#L28](https://github.com/elastic/kibana/tree/master/x-pack/plugins/beats_management/server/lib/adapters/database/kibana_database_adapter.ts#L28) | 7.16 | - - - ## canvas | Deprecated API | Reference location | Remove By | @@ -783,7 +774,7 @@ warning: This document is auto-generated and is meant to be viewed inside our ex | | [field_value_match.tsx#L36](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match.tsx#L36) | - | | | [field_value_match_any.tsx#L13](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match_any.tsx#L13) | - | | | [field_value_match_any.tsx#L23](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match_any.tsx#L23) | - | -| | [field_value_lists.tsx#L13](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_lists.tsx#L13) | - | +| | [field_value_lists.tsx#L14](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_lists.tsx#L14) | - | | | [field_value_lists.tsx#L29](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_lists.tsx#L29) | - | | | [entry_renderer.tsx#L31](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx#L31) | - | | | [entry_renderer.tsx#L91](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx#L91) | - | @@ -830,7 +821,7 @@ warning: This document is auto-generated and is meant to be viewed inside our ex | | [field_value_match.tsx#L36](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match.tsx#L36) | - | | | [field_value_match_any.tsx#L13](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match_any.tsx#L13) | - | | | [field_value_match_any.tsx#L23](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match_any.tsx#L23) | - | -| | [field_value_lists.tsx#L13](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_lists.tsx#L13) | - | +| | [field_value_lists.tsx#L14](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_lists.tsx#L14) | - | | | [field_value_lists.tsx#L29](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_lists.tsx#L29) | - | | | [entry_renderer.tsx#L31](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx#L31) | - | | | [entry_renderer.tsx#L91](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx#L91) | - | @@ -923,7 +914,7 @@ warning: This document is auto-generated and is meant to be viewed inside our ex | | [field_value_match.tsx#L36](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match.tsx#L36) | - | | | [field_value_match_any.tsx#L13](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match_any.tsx#L13) | - | | | [field_value_match_any.tsx#L23](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match_any.tsx#L23) | - | -| | [field_value_lists.tsx#L13](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_lists.tsx#L13) | - | +| | [field_value_lists.tsx#L14](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_lists.tsx#L14) | - | | | [field_value_lists.tsx#L29](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_lists.tsx#L29) | - | | | [entry_renderer.tsx#L31](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx#L31) | - | | | [entry_renderer.tsx#L91](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx#L91) | - | @@ -944,6 +935,9 @@ warning: This document is auto-generated and is meant to be viewed inside our ex | | [get_call_cluster.mock.ts#L9](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lists/server/schemas/common/get_call_cluster.mock.ts#L9) | 7.16 | | | [get_call_cluster.mock.ts#L27](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lists/server/schemas/common/get_call_cluster.mock.ts#L27) | 7.16 | | | [get_call_cluster.mock.ts#L31](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lists/server/schemas/common/get_call_cluster.mock.ts#L31) | 7.16 | +| | [get_call_cluster.mock.d.ts#L2](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lists/target/types/server/schemas/common/get_call_cluster.mock.d.ts#L2) | 7.16 | +| | [get_call_cluster.mock.d.ts#L4](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lists/target/types/server/schemas/common/get_call_cluster.mock.d.ts#L4) | 7.16 | +| | [get_call_cluster.mock.d.ts#L5](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lists/target/types/server/schemas/common/get_call_cluster.mock.d.ts#L5) | 7.16 | @@ -1579,12 +1573,12 @@ warning: This document is auto-generated and is meant to be viewed inside our ex | Deprecated API | Reference location | Remove By | | ---------------|-----------|-----------| +| | [types.ts#L21](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts#L21) | - | +| | [types.ts#L66](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts#L66) | - | +| | [action.ts#L19](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts#L19) | - | +| | [action.ts#L100](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts#L100) | - | | | [index.ts#L8](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts#L8) | - | | | [index.ts#L86](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts#L86) | - | -| | [types.ts#L20](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts#L20) | - | -| | [types.ts#L64](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts#L64) | - | -| | [action.ts#L17](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts#L17) | - | -| | [action.ts#L98](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts#L98) | - | | | [index.tsx#L12](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/containers/source/index.tsx#L12) | - | | | [index.tsx#L48](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/containers/source/index.tsx#L48) | - | | | [index.tsx#L122](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/containers/source/index.tsx#L122) | - | @@ -1618,9 +1612,9 @@ warning: This document is auto-generated and is meant to be viewed inside our ex | | [types.ts#L41](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/network/pages/details/types.ts#L41) | - | | | [index.tsx#L12](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/network/components/network_top_countries_table/index.tsx#L12) | - | | | [index.tsx#L34](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/network/components/network_top_countries_table/index.tsx#L34) | - | -| | [middleware.ts#L32](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts#L32) | - | -| | [middleware.ts#L38](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts#L38) | - | -| | [middleware.ts#L43](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts#L43) | - | +| | [middleware.ts#L40](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts#L40) | - | +| | [middleware.ts#L55](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts#L55) | - | +| | [middleware.ts#L60](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts#L60) | - | | | [types.ts#L12](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/detections/components/rules/description_step/types.ts#L12) | - | | | [types.ts#L28](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/detections/components/rules/description_step/types.ts#L28) | - | | | [index.tsx#L15](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/detections/components/rules/description_step/index.tsx#L15) | - | @@ -1633,13 +1627,30 @@ warning: This document is auto-generated and is meant to be viewed inside our ex | | [index.tsx#L44](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/overview/components/alerts_by_category/index.tsx#L44) | - | | | [index.tsx#L21](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/overview/components/event_counts/index.tsx#L21) | - | | | [index.tsx#L33](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/overview/components/event_counts/index.tsx#L33) | - | -| | [index.tsx#L9](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/containers/kuery_autocompletion/index.tsx#L9) | - | -| | [index.tsx#L21](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/containers/kuery_autocompletion/index.tsx#L21) | - | -| | [get_query_filter.ts#L15](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/common/detection_engine/get_query_filter.ts#L15) | - | -| | [get_query_filter.ts#L31](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/common/detection_engine/get_query_filter.ts#L31) | - | +| | [index.d.ts#L1](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/common/search_strategy/index_fields/index.d.ts#L1) | - | +| | [index.d.ts#L66](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/common/search_strategy/index_fields/index.d.ts#L66) | - | +| | [index.d.ts#L1](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/common/containers/source/index.d.ts#L1) | - | +| | [index.d.ts#L10](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/common/containers/source/index.d.ts#L10) | - | +| | [index.d.ts#L23](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/common/containers/source/index.d.ts#L23) | - | +| | [types.d.ts#L3](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/common/components/url_state/types.d.ts#L3) | - | +| | [types.d.ts#L25](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/common/components/url_state/types.d.ts#L25) | - | +| | [types.d.ts#L55](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/common/components/url_state/types.d.ts#L55) | - | +| | [columns.d.ts#L1](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/network/components/network_top_countries_table/columns.d.ts#L1) | - | +| | [columns.d.ts#L20](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/network/components/network_top_countries_table/columns.d.ts#L20) | - | +| | [columns.d.ts#L21](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/network/components/network_top_countries_table/columns.d.ts#L21) | - | +| | [index.d.ts#L3](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/common/components/search_bar/index.d.ts#L3) | - | +| | [index.d.ts#L9](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/common/components/search_bar/index.d.ts#L9) | - | +| | [types.d.ts#L2](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/hosts/pages/details/types.d.ts#L2) | - | +| | [types.d.ts#L40](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/hosts/pages/details/types.d.ts#L40) | - | +| | [index.d.ts#L2](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/network/components/network_top_countries_table/index.d.ts#L2) | - | +| | [index.d.ts#L10](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/network/components/network_top_countries_table/index.d.ts#L10) | - | +| | [types.d.ts#L1](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/network/pages/details/types.d.ts#L1) | - | +| | [types.d.ts#L25](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/network/pages/details/types.d.ts#L25) | - | | | [types.ts#L9](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/network/pages/navigation/types.ts#L9) | - | | | [types.ts#L35](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/network/pages/navigation/types.ts#L35) | - | | | [types.ts#L53](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/network/pages/navigation/types.ts#L53) | - | +| | [get_query_filter.ts#L16](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/common/detection_engine/get_query_filter.ts#L16) | - | +| | [get_query_filter.ts#L31](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/common/detection_engine/get_query_filter.ts#L31) | - | | | [helpers.tsx#L39](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.tsx#L39) | - | | | [helpers.tsx#L49](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.tsx#L49) | - | | | [helpers.tsx#L52](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.tsx#L52) | - | @@ -1658,11 +1669,6 @@ warning: This document is auto-generated and is meant to be viewed inside our ex | | [use_field_value_autocomplete.ts#L31](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/hooks/use_field_value_autocomplete.ts#L31) | - | | | [field_value_match.tsx#L19](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match.tsx#L19) | - | | | [field_value_match.tsx#L30](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match.tsx#L30) | - | -| | [field_value_match_any.tsx#L13](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match_any.tsx#L13) | - | -| | [field_value_match_any.tsx#L24](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match_any.tsx#L24) | - | -| | [helpers.test.tsx#L43](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx#L43) | - | -| | [helpers.test.tsx#L49](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx#L49) | - | -| | [helpers.test.tsx#L368](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx#L368) | - | | | [model.ts#L8](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/store/sourcerer/model.ts#L8) | - | | | [model.ts#L30](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/store/sourcerer/model.ts#L30) | - | | | [index.tsx#L33](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/detections/components/rules/severity_mapping/index.tsx#L33) | - | @@ -1709,10 +1715,6 @@ warning: This document is auto-generated and is meant to be viewed inside our ex | | [use_field_value_autocomplete.ts#L27](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/hooks/use_field_value_autocomplete.ts#L27) | - | | | [field_value_match.tsx#L19](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match.tsx#L19) | - | | | [field_value_match.tsx#L28](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match.tsx#L28) | - | -| | [field_value_lists.tsx#L12](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_lists.tsx#L12) | - | -| | [field_value_lists.tsx#L20](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_lists.tsx#L20) | - | -| | [field_value_match_any.tsx#L13](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match_any.tsx#L13) | - | -| | [field_value_match_any.tsx#L22](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match_any.tsx#L22) | - | | | [helpers.test.ts#L11](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts#L11) | - | | | [helpers.test.ts#L333](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts#L333) | - | | | [helpers.test.ts#L339](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts#L339) | - | @@ -1721,10 +1723,8 @@ warning: This document is auto-generated and is meant to be viewed inside our ex | | [helpers.test.ts#L363](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts#L363) | - | | | [helpers.test.ts#L371](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts#L371) | - | | | [helpers.test.ts#L380](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts#L380) | - | -| | [operator.tsx#L11](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/operator.tsx#L11) | - | -| | [operator.tsx#L17](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/operator.tsx#L17) | - | -| | [helpers.test.tsx#L43](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx#L43) | - | -| | [helpers.test.tsx#L104](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx#L104) | - | +| | [helpers.test.d.ts#L1](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/common/components/exceptions/helpers.test.d.ts#L1) | - | +| | [helpers.test.d.ts#L2](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/common/components/exceptions/helpers.test.d.ts#L2) | - | | | [index.tsx#L32](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/detections/components/rules/severity_mapping/index.tsx#L32) | - | | | [index.tsx#L86](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/detections/components/rules/severity_mapping/index.tsx#L86) | - | | | [index.tsx#L305](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/detections/components/rules/severity_mapping/index.tsx#L305) | - | @@ -1767,10 +1767,6 @@ warning: This document is auto-generated and is meant to be viewed inside our ex | | [use_field_value_autocomplete.ts#L27](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/hooks/use_field_value_autocomplete.ts#L27) | - | | | [field_value_match.tsx#L19](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match.tsx#L19) | - | | | [field_value_match.tsx#L28](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match.tsx#L28) | - | -| | [field_value_lists.tsx#L12](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_lists.tsx#L12) | - | -| | [field_value_lists.tsx#L20](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_lists.tsx#L20) | - | -| | [field_value_match_any.tsx#L13](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match_any.tsx#L13) | - | -| | [field_value_match_any.tsx#L22](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match_any.tsx#L22) | - | | | [helpers.test.ts#L11](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts#L11) | - | | | [helpers.test.ts#L333](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts#L333) | - | | | [helpers.test.ts#L339](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts#L339) | - | @@ -1779,10 +1775,8 @@ warning: This document is auto-generated and is meant to be viewed inside our ex | | [helpers.test.ts#L363](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts#L363) | - | | | [helpers.test.ts#L371](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts#L371) | - | | | [helpers.test.ts#L380](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts#L380) | - | -| | [operator.tsx#L11](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/operator.tsx#L11) | - | -| | [operator.tsx#L17](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/operator.tsx#L17) | - | -| | [helpers.test.tsx#L43](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx#L43) | - | -| | [helpers.test.tsx#L104](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx#L104) | - | +| | [helpers.test.d.ts#L1](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/common/components/exceptions/helpers.test.d.ts#L1) | - | +| | [helpers.test.d.ts#L2](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/common/components/exceptions/helpers.test.d.ts#L2) | - | | | [index.tsx#L32](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/detections/components/rules/severity_mapping/index.tsx#L32) | - | | | [index.tsx#L86](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/detections/components/rules/severity_mapping/index.tsx#L86) | - | | | [index.tsx#L305](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/detections/components/rules/severity_mapping/index.tsx#L305) | - | @@ -1791,12 +1785,12 @@ warning: This document is auto-generated and is meant to be viewed inside our ex | | [index.tsx#L242](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/detections/components/rules/risk_score_mapping/index.tsx#L242) | - | | | [index.tsx#L12](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/detections/components/rules/autocomplete_field/index.tsx#L12) | - | | | [index.tsx#L35](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/detections/components/rules/autocomplete_field/index.tsx#L35) | - | +| | [types.ts#L21](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts#L21) | - | +| | [types.ts#L66](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts#L66) | - | +| | [action.ts#L19](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts#L19) | - | +| | [action.ts#L100](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts#L100) | - | | | [index.ts#L8](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts#L8) | - | | | [index.ts#L86](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts#L86) | - | -| | [types.ts#L20](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts#L20) | - | -| | [types.ts#L64](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts#L64) | - | -| | [action.ts#L17](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts#L17) | - | -| | [action.ts#L98](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts#L98) | - | | | [index.tsx#L12](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/containers/source/index.tsx#L12) | - | | | [index.tsx#L48](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/containers/source/index.tsx#L48) | - | | | [index.tsx#L122](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/containers/source/index.tsx#L122) | - | @@ -1830,9 +1824,9 @@ warning: This document is auto-generated and is meant to be viewed inside our ex | | [types.ts#L41](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/network/pages/details/types.ts#L41) | - | | | [index.tsx#L12](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/network/components/network_top_countries_table/index.tsx#L12) | - | | | [index.tsx#L34](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/network/components/network_top_countries_table/index.tsx#L34) | - | -| | [middleware.ts#L32](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts#L32) | - | -| | [middleware.ts#L38](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts#L38) | - | -| | [middleware.ts#L43](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts#L43) | - | +| | [middleware.ts#L40](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts#L40) | - | +| | [middleware.ts#L55](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts#L55) | - | +| | [middleware.ts#L60](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts#L60) | - | | | [types.ts#L12](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/detections/components/rules/description_step/types.ts#L12) | - | | | [types.ts#L28](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/detections/components/rules/description_step/types.ts#L28) | - | | | [index.tsx#L15](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/detections/components/rules/description_step/index.tsx#L15) | - | @@ -1845,13 +1839,30 @@ warning: This document is auto-generated and is meant to be viewed inside our ex | | [index.tsx#L44](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/overview/components/alerts_by_category/index.tsx#L44) | - | | | [index.tsx#L21](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/overview/components/event_counts/index.tsx#L21) | - | | | [index.tsx#L33](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/overview/components/event_counts/index.tsx#L33) | - | -| | [index.tsx#L9](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/containers/kuery_autocompletion/index.tsx#L9) | - | -| | [index.tsx#L21](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/containers/kuery_autocompletion/index.tsx#L21) | - | -| | [get_query_filter.ts#L15](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/common/detection_engine/get_query_filter.ts#L15) | - | -| | [get_query_filter.ts#L31](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/common/detection_engine/get_query_filter.ts#L31) | - | +| | [index.d.ts#L1](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/common/search_strategy/index_fields/index.d.ts#L1) | - | +| | [index.d.ts#L66](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/common/search_strategy/index_fields/index.d.ts#L66) | - | +| | [index.d.ts#L1](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/common/containers/source/index.d.ts#L1) | - | +| | [index.d.ts#L10](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/common/containers/source/index.d.ts#L10) | - | +| | [index.d.ts#L23](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/common/containers/source/index.d.ts#L23) | - | +| | [types.d.ts#L3](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/common/components/url_state/types.d.ts#L3) | - | +| | [types.d.ts#L25](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/common/components/url_state/types.d.ts#L25) | - | +| | [types.d.ts#L55](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/common/components/url_state/types.d.ts#L55) | - | +| | [columns.d.ts#L1](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/network/components/network_top_countries_table/columns.d.ts#L1) | - | +| | [columns.d.ts#L20](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/network/components/network_top_countries_table/columns.d.ts#L20) | - | +| | [columns.d.ts#L21](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/network/components/network_top_countries_table/columns.d.ts#L21) | - | +| | [index.d.ts#L3](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/common/components/search_bar/index.d.ts#L3) | - | +| | [index.d.ts#L9](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/common/components/search_bar/index.d.ts#L9) | - | +| | [types.d.ts#L2](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/hosts/pages/details/types.d.ts#L2) | - | +| | [types.d.ts#L40](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/hosts/pages/details/types.d.ts#L40) | - | +| | [index.d.ts#L2](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/network/components/network_top_countries_table/index.d.ts#L2) | - | +| | [index.d.ts#L10](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/network/components/network_top_countries_table/index.d.ts#L10) | - | +| | [types.d.ts#L1](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/network/pages/details/types.d.ts#L1) | - | +| | [types.d.ts#L25](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/network/pages/details/types.d.ts#L25) | - | | | [types.ts#L9](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/network/pages/navigation/types.ts#L9) | - | | | [types.ts#L35](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/network/pages/navigation/types.ts#L35) | - | | | [types.ts#L53](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/network/pages/navigation/types.ts#L53) | - | +| | [get_query_filter.ts#L16](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/common/detection_engine/get_query_filter.ts#L16) | - | +| | [get_query_filter.ts#L31](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/common/detection_engine/get_query_filter.ts#L31) | - | | | [helpers.tsx#L39](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.tsx#L39) | - | | | [helpers.tsx#L49](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.tsx#L49) | - | | | [helpers.tsx#L52](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.tsx#L52) | - | @@ -1870,11 +1881,6 @@ warning: This document is auto-generated and is meant to be viewed inside our ex | | [use_field_value_autocomplete.ts#L31](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/hooks/use_field_value_autocomplete.ts#L31) | - | | | [field_value_match.tsx#L19](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match.tsx#L19) | - | | | [field_value_match.tsx#L30](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match.tsx#L30) | - | -| | [field_value_match_any.tsx#L13](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match_any.tsx#L13) | - | -| | [field_value_match_any.tsx#L24](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match_any.tsx#L24) | - | -| | [helpers.test.tsx#L43](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx#L43) | - | -| | [helpers.test.tsx#L49](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx#L49) | - | -| | [helpers.test.tsx#L368](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx#L368) | - | | | [model.ts#L8](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/store/sourcerer/model.ts#L8) | - | | | [model.ts#L30](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/store/sourcerer/model.ts#L30) | - | | | [index.tsx#L33](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/detections/components/rules/severity_mapping/index.tsx#L33) | - | @@ -1921,10 +1927,6 @@ warning: This document is auto-generated and is meant to be viewed inside our ex | | [use_field_value_autocomplete.ts#L27](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/hooks/use_field_value_autocomplete.ts#L27) | - | | | [field_value_match.tsx#L19](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match.tsx#L19) | - | | | [field_value_match.tsx#L28](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match.tsx#L28) | - | -| | [field_value_lists.tsx#L12](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_lists.tsx#L12) | - | -| | [field_value_lists.tsx#L20](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_lists.tsx#L20) | - | -| | [field_value_match_any.tsx#L13](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match_any.tsx#L13) | - | -| | [field_value_match_any.tsx#L22](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match_any.tsx#L22) | - | | | [helpers.test.ts#L11](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts#L11) | - | | | [helpers.test.ts#L333](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts#L333) | - | | | [helpers.test.ts#L339](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts#L339) | - | @@ -1933,10 +1935,8 @@ warning: This document is auto-generated and is meant to be viewed inside our ex | | [helpers.test.ts#L363](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts#L363) | - | | | [helpers.test.ts#L371](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts#L371) | - | | | [helpers.test.ts#L380](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/helpers.test.ts#L380) | - | -| | [operator.tsx#L11](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/operator.tsx#L11) | - | -| | [operator.tsx#L17](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/operator.tsx#L17) | - | -| | [helpers.test.tsx#L43](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx#L43) | - | -| | [helpers.test.tsx#L104](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx#L104) | - | +| | [helpers.test.d.ts#L1](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/common/components/exceptions/helpers.test.d.ts#L1) | - | +| | [helpers.test.d.ts#L2](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/target/types/public/common/components/exceptions/helpers.test.d.ts#L2) | - | | | [index.tsx#L32](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/detections/components/rules/severity_mapping/index.tsx#L32) | - | | | [index.tsx#L86](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/detections/components/rules/severity_mapping/index.tsx#L86) | - | | | [index.tsx#L305](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/detections/components/rules/severity_mapping/index.tsx#L305) | - | diff --git a/api_docs/features.json b/api_docs/features.json index 6881b65061fac9..63c3ebe3a92dec 100644 --- a/api_docs/features.json +++ b/api_docs/features.json @@ -1599,13 +1599,6 @@ "path": "x-pack/plugins/security/server/authorization/disable_ui_capabilities.ts", "lineNumber": 311 } - }, - { - "plugin": "beatsManagement", - "link": { - "path": "x-pack/plugins/beats_management/server/plugin.ts", - "lineNumber": 61 - } } ] }, @@ -3298,13 +3291,6 @@ "path": "x-pack/plugins/security/server/authorization/disable_ui_capabilities.ts", "lineNumber": 311 } - }, - { - "plugin": "beatsManagement", - "link": { - "path": "x-pack/plugins/beats_management/server/plugin.ts", - "lineNumber": 61 - } } ] }, diff --git a/api_docs/fleet.json b/api_docs/fleet.json index 94f2acc12adf7e..389a56cccefc5b 100644 --- a/api_docs/fleet.json +++ b/api_docs/fleet.json @@ -8837,7 +8837,7 @@ ], "source": { "path": "x-pack/plugins/fleet/common/types/models/agent_policy.ts", - "lineNumber": 113 + "lineNumber": 114 }, "deprecated": false, "children": [ @@ -8855,7 +8855,7 @@ ], "source": { "path": "x-pack/plugins/fleet/common/types/models/agent_policy.ts", - "lineNumber": 117 + "lineNumber": 118 }, "deprecated": false }, @@ -8870,7 +8870,7 @@ ], "source": { "path": "x-pack/plugins/fleet/common/types/models/agent_policy.ts", - "lineNumber": 121 + "lineNumber": 122 }, "deprecated": false }, @@ -8885,7 +8885,7 @@ ], "source": { "path": "x-pack/plugins/fleet/common/types/models/agent_policy.ts", - "lineNumber": 125 + "lineNumber": 126 }, "deprecated": false }, @@ -8900,7 +8900,7 @@ ], "source": { "path": "x-pack/plugins/fleet/common/types/models/agent_policy.ts", - "lineNumber": 129 + "lineNumber": 130 }, "deprecated": false }, @@ -8918,7 +8918,7 @@ ], "source": { "path": "x-pack/plugins/fleet/common/types/models/agent_policy.ts", - "lineNumber": 133 + "lineNumber": 134 }, "deprecated": false }, @@ -8933,7 +8933,7 @@ ], "source": { "path": "x-pack/plugins/fleet/common/types/models/agent_policy.ts", - "lineNumber": 139 + "lineNumber": 140 }, "deprecated": false } @@ -9085,7 +9085,7 @@ "label": "agent", "description": [], "signature": [ - "{ monitoring: { use_output?: string | undefined; enabled: boolean; metrics: boolean; logs: boolean; }; } | undefined" + "{ monitoring: { namespace?: string | undefined; use_output?: string | undefined; enabled: boolean; metrics: boolean; logs: boolean; }; } | undefined" ], "source": { "path": "x-pack/plugins/fleet/common/types/models/agent_policy.ts", @@ -9326,7 +9326,7 @@ "description": [], "source": { "path": "x-pack/plugins/fleet/common/types/models/agent_policy.ts", - "lineNumber": 102 + "lineNumber": 103 }, "deprecated": false, "children": [ @@ -9342,7 +9342,7 @@ ], "source": { "path": "x-pack/plugins/fleet/common/types/models/agent_policy.ts", - "lineNumber": 103 + "lineNumber": 104 }, "deprecated": false }, @@ -9355,7 +9355,7 @@ "description": [], "source": { "path": "x-pack/plugins/fleet/common/types/models/agent_policy.ts", - "lineNumber": 104 + "lineNumber": 105 }, "deprecated": false }, @@ -9371,7 +9371,7 @@ ], "source": { "path": "x-pack/plugins/fleet/common/types/models/agent_policy.ts", - "lineNumber": 105 + "lineNumber": 106 }, "deprecated": false } diff --git a/api_docs/home.json b/api_docs/home.json index bc99a31a09c302..2aa23c1b756dfa 100644 --- a/api_docs/home.json +++ b/api_docs/home.json @@ -953,13 +953,6 @@ }, "deprecated": true, "references": [ - { - "plugin": "cloud", - "link": { - "path": "x-pack/plugins/cloud/public/plugin.ts", - "lineNumber": 66 - } - }, { "plugin": "ml", "link": { @@ -973,6 +966,13 @@ "path": "x-pack/plugins/apm/public/plugin.ts", "lineNumber": 82 } + }, + { + "plugin": "cloud", + "link": { + "path": "x-pack/plugins/cloud/public/plugin.ts", + "lineNumber": 66 + } } ] } diff --git a/api_docs/kibana_utils.json b/api_docs/kibana_utils.json index ade7a843a68413..173348ea2f2638 100644 --- a/api_docs/kibana_utils.json +++ b/api_docs/kibana_utils.json @@ -3799,7 +3799,7 @@ "description": [], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 717 + "lineNumber": 704 }, "deprecated": false }, @@ -3822,7 +3822,7 @@ ], "source": { "path": "src/core/public/application/types.ts", - "lineNumber": 717 + "lineNumber": 704 }, "deprecated": false } diff --git a/api_docs/licensing.json b/api_docs/licensing.json index f3ec50895547f6..873f40bd301a1c 100644 --- a/api_docs/licensing.json +++ b/api_docs/licensing.json @@ -554,192 +554,192 @@ "deprecated": true, "references": [ { - "plugin": "securitySolution", + "plugin": "apm", "link": { - "path": "x-pack/plugins/security_solution/common/license/policy_config.test.ts", - "lineNumber": 22 + "path": "x-pack/plugins/apm/common/license_check.test.ts", + "lineNumber": 19 } }, { - "plugin": "securitySolution", + "plugin": "apm", "link": { - "path": "x-pack/plugins/security_solution/common/license/policy_config.test.ts", - "lineNumber": 23 + "path": "x-pack/plugins/apm/common/license_check.test.ts", + "lineNumber": 36 } }, { - "plugin": "securitySolution", + "plugin": "apm", "link": { - "path": "x-pack/plugins/security_solution/common/license/policy_config.test.ts", - "lineNumber": 24 + "path": "x-pack/plugins/apm/common/license_check.test.ts", + "lineNumber": 53 } }, { - "plugin": "securitySolution", + "plugin": "apm", "link": { - "path": "x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/index.test.ts", - "lineNumber": 159 + "path": "x-pack/plugins/apm/common/license_check.test.ts", + "lineNumber": 70 } }, { - "plugin": "securitySolution", + "plugin": "apm", "link": { - "path": "x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/index.test.ts", - "lineNumber": 161 + "path": "x-pack/plugins/apm/common/license_check.test.ts", + "lineNumber": 87 } }, { - "plugin": "securitySolution", + "plugin": "apm", "link": { - "path": "x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts", - "lineNumber": 42 + "path": "x-pack/plugins/apm/common/license_check.test.ts", + "lineNumber": 104 } }, { - "plugin": "securitySolution", + "plugin": "apm", "link": { - "path": "x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts", - "lineNumber": 43 + "path": "x-pack/plugins/apm/common/license_check.test.ts", + "lineNumber": 122 } }, { - "plugin": "securitySolution", + "plugin": "apm", "link": { - "path": "x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts", - "lineNumber": 44 + "path": "x-pack/plugins/apm/common/license_check.test.ts", + "lineNumber": 139 } }, { - "plugin": "securitySolution", + "plugin": "apm", "link": { - "path": "x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.test.ts", - "lineNumber": 54 + "path": "x-pack/plugins/apm/common/license_check.test.ts", + "lineNumber": 156 } }, { - "plugin": "securitySolution", + "plugin": "apm", "link": { - "path": "x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.test.ts", - "lineNumber": 55 + "path": "x-pack/plugins/apm/common/license_check.test.ts", + "lineNumber": 173 } }, { - "plugin": "securitySolution", + "plugin": "apm", "link": { - "path": "x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts", - "lineNumber": 47 + "path": "x-pack/plugins/apm/common/license_check.test.ts", + "lineNumber": 190 } }, { - "plugin": "securitySolution", + "plugin": "apm", "link": { - "path": "x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts", - "lineNumber": 48 + "path": "x-pack/plugins/apm/common/license_check.test.ts", + "lineNumber": 207 } }, { - "plugin": "apm", + "plugin": "security", "link": { - "path": "x-pack/plugins/apm/common/license_check.test.ts", - "lineNumber": 19 + "path": "x-pack/plugins/security/common/licensing/license_service.test.ts", + "lineNumber": 169 } }, { - "plugin": "apm", + "plugin": "security", "link": { - "path": "x-pack/plugins/apm/common/license_check.test.ts", - "lineNumber": 36 + "path": "x-pack/plugins/security/common/licensing/license_service.test.ts", + "lineNumber": 194 } }, { - "plugin": "apm", + "plugin": "security", "link": { - "path": "x-pack/plugins/apm/common/license_check.test.ts", - "lineNumber": 53 + "path": "x-pack/plugins/security/common/licensing/license_service.test.ts", + "lineNumber": 219 } }, { - "plugin": "apm", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/apm/common/license_check.test.ts", - "lineNumber": 70 + "path": "x-pack/plugins/security_solution/common/license/policy_config.test.ts", + "lineNumber": 22 } }, { - "plugin": "apm", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/apm/common/license_check.test.ts", - "lineNumber": 87 + "path": "x-pack/plugins/security_solution/common/license/policy_config.test.ts", + "lineNumber": 23 } }, { - "plugin": "apm", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/apm/common/license_check.test.ts", - "lineNumber": 104 + "path": "x-pack/plugins/security_solution/common/license/policy_config.test.ts", + "lineNumber": 24 } }, { - "plugin": "apm", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/apm/common/license_check.test.ts", - "lineNumber": 122 + "path": "x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts", + "lineNumber": 47 } }, { - "plugin": "apm", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/apm/common/license_check.test.ts", - "lineNumber": 139 + "path": "x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts", + "lineNumber": 48 } }, { - "plugin": "apm", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/apm/common/license_check.test.ts", - "lineNumber": 156 + "path": "x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts", + "lineNumber": 42 } }, { - "plugin": "apm", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/apm/common/license_check.test.ts", - "lineNumber": 173 + "path": "x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts", + "lineNumber": 43 } }, { - "plugin": "apm", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/apm/common/license_check.test.ts", - "lineNumber": 190 + "path": "x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts", + "lineNumber": 44 } }, { - "plugin": "apm", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/apm/common/license_check.test.ts", - "lineNumber": 207 + "path": "x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.test.ts", + "lineNumber": 54 } }, { - "plugin": "security", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/security/common/licensing/license_service.test.ts", - "lineNumber": 169 + "path": "x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.test.ts", + "lineNumber": 55 } }, { - "plugin": "security", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/security/common/licensing/license_service.test.ts", - "lineNumber": 194 + "path": "x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/index.test.ts", + "lineNumber": 159 } }, { - "plugin": "security", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/security/common/licensing/license_service.test.ts", - "lineNumber": 219 + "path": "x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/index.test.ts", + "lineNumber": 161 } } ] @@ -942,73 +942,66 @@ "deprecated": true, "references": [ { - "plugin": "security", - "link": { - "path": "x-pack/plugins/security/public/plugin.tsx", - "lineNumber": 82 - } - }, - { - "plugin": "licenseManagement", + "plugin": "reporting", "link": { - "path": "x-pack/plugins/license_management/public/plugin.ts", - "lineNumber": 61 + "path": "x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.tsx", + "lineNumber": 40 } }, { - "plugin": "ml", + "plugin": "reporting", "link": { - "path": "x-pack/plugins/ml/public/application/license/check_license.tsx", - "lineNumber": 26 + "path": "x-pack/plugins/reporting/public/share_context_menu/register_csv_reporting.tsx", + "lineNumber": 33 } }, { - "plugin": "ml", + "plugin": "reporting", "link": { - "path": "x-pack/plugins/ml/public/plugin.ts", - "lineNumber": 136 + "path": "x-pack/plugins/reporting/public/share_context_menu/register_pdf_png_reporting.tsx", + "lineNumber": 81 } }, { - "plugin": "fleet", + "plugin": "reporting", "link": { - "path": "x-pack/plugins/fleet/public/plugin.ts", - "lineNumber": 97 + "path": "x-pack/plugins/reporting/public/plugin.ts", + "lineNumber": 116 } }, { "plugin": "reporting", "link": { - "path": "x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.tsx", - "lineNumber": 40 + "path": "x-pack/plugins/reporting/public/components/report_listing.tsx", + "lineNumber": 61 } }, { - "plugin": "reporting", + "plugin": "licenseManagement", "link": { - "path": "x-pack/plugins/reporting/public/share_context_menu/register_csv_reporting.tsx", - "lineNumber": 33 + "path": "x-pack/plugins/license_management/public/plugin.ts", + "lineNumber": 61 } }, { - "plugin": "reporting", + "plugin": "security", "link": { - "path": "x-pack/plugins/reporting/public/share_context_menu/register_pdf_png_reporting.tsx", - "lineNumber": 81 + "path": "x-pack/plugins/security/public/plugin.tsx", + "lineNumber": 82 } }, { - "plugin": "reporting", + "plugin": "ml", "link": { - "path": "x-pack/plugins/reporting/public/plugin.ts", - "lineNumber": 116 + "path": "x-pack/plugins/ml/public/application/license/check_license.tsx", + "lineNumber": 26 } }, { - "plugin": "reporting", + "plugin": "ml", "link": { - "path": "x-pack/plugins/reporting/public/components/report_listing.tsx", - "lineNumber": 61 + "path": "x-pack/plugins/ml/public/plugin.ts", + "lineNumber": 136 } }, { @@ -1019,17 +1012,17 @@ } }, { - "plugin": "beatsManagement", + "plugin": "crossClusterReplication", "link": { - "path": "x-pack/plugins/beats_management/public/lib/adapters/framework/kibana_framework_adapter.ts", - "lineNumber": 65 + "path": "x-pack/plugins/cross_cluster_replication/public/plugin.ts", + "lineNumber": 75 } }, { - "plugin": "crossClusterReplication", + "plugin": "fleet", "link": { - "path": "x-pack/plugins/cross_cluster_replication/public/plugin.ts", - "lineNumber": 75 + "path": "x-pack/plugins/fleet/public/plugin.ts", + "lineNumber": 97 } }, { @@ -2650,192 +2643,192 @@ "deprecated": true, "references": [ { - "plugin": "securitySolution", + "plugin": "apm", "link": { - "path": "x-pack/plugins/security_solution/common/license/policy_config.test.ts", - "lineNumber": 22 + "path": "x-pack/plugins/apm/common/license_check.test.ts", + "lineNumber": 19 } }, { - "plugin": "securitySolution", + "plugin": "apm", "link": { - "path": "x-pack/plugins/security_solution/common/license/policy_config.test.ts", - "lineNumber": 23 + "path": "x-pack/plugins/apm/common/license_check.test.ts", + "lineNumber": 36 } }, { - "plugin": "securitySolution", + "plugin": "apm", "link": { - "path": "x-pack/plugins/security_solution/common/license/policy_config.test.ts", - "lineNumber": 24 + "path": "x-pack/plugins/apm/common/license_check.test.ts", + "lineNumber": 53 } }, { - "plugin": "securitySolution", + "plugin": "apm", "link": { - "path": "x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/index.test.ts", - "lineNumber": 159 + "path": "x-pack/plugins/apm/common/license_check.test.ts", + "lineNumber": 70 } }, { - "plugin": "securitySolution", + "plugin": "apm", "link": { - "path": "x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/index.test.ts", - "lineNumber": 161 + "path": "x-pack/plugins/apm/common/license_check.test.ts", + "lineNumber": 87 } }, { - "plugin": "securitySolution", + "plugin": "apm", "link": { - "path": "x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts", - "lineNumber": 42 + "path": "x-pack/plugins/apm/common/license_check.test.ts", + "lineNumber": 104 } }, { - "plugin": "securitySolution", + "plugin": "apm", "link": { - "path": "x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts", - "lineNumber": 43 + "path": "x-pack/plugins/apm/common/license_check.test.ts", + "lineNumber": 122 } }, { - "plugin": "securitySolution", + "plugin": "apm", "link": { - "path": "x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts", - "lineNumber": 44 + "path": "x-pack/plugins/apm/common/license_check.test.ts", + "lineNumber": 139 } }, { - "plugin": "securitySolution", + "plugin": "apm", "link": { - "path": "x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.test.ts", - "lineNumber": 54 + "path": "x-pack/plugins/apm/common/license_check.test.ts", + "lineNumber": 156 } }, { - "plugin": "securitySolution", + "plugin": "apm", "link": { - "path": "x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.test.ts", - "lineNumber": 55 + "path": "x-pack/plugins/apm/common/license_check.test.ts", + "lineNumber": 173 } }, { - "plugin": "securitySolution", + "plugin": "apm", "link": { - "path": "x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts", - "lineNumber": 47 + "path": "x-pack/plugins/apm/common/license_check.test.ts", + "lineNumber": 190 } }, { - "plugin": "securitySolution", + "plugin": "apm", "link": { - "path": "x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts", - "lineNumber": 48 + "path": "x-pack/plugins/apm/common/license_check.test.ts", + "lineNumber": 207 } }, { - "plugin": "apm", + "plugin": "security", "link": { - "path": "x-pack/plugins/apm/common/license_check.test.ts", - "lineNumber": 19 + "path": "x-pack/plugins/security/common/licensing/license_service.test.ts", + "lineNumber": 169 } }, { - "plugin": "apm", + "plugin": "security", "link": { - "path": "x-pack/plugins/apm/common/license_check.test.ts", - "lineNumber": 36 + "path": "x-pack/plugins/security/common/licensing/license_service.test.ts", + "lineNumber": 194 } }, { - "plugin": "apm", + "plugin": "security", "link": { - "path": "x-pack/plugins/apm/common/license_check.test.ts", - "lineNumber": 53 + "path": "x-pack/plugins/security/common/licensing/license_service.test.ts", + "lineNumber": 219 } }, { - "plugin": "apm", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/apm/common/license_check.test.ts", - "lineNumber": 70 + "path": "x-pack/plugins/security_solution/common/license/policy_config.test.ts", + "lineNumber": 22 } }, { - "plugin": "apm", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/apm/common/license_check.test.ts", - "lineNumber": 87 + "path": "x-pack/plugins/security_solution/common/license/policy_config.test.ts", + "lineNumber": 23 } }, { - "plugin": "apm", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/apm/common/license_check.test.ts", - "lineNumber": 104 + "path": "x-pack/plugins/security_solution/common/license/policy_config.test.ts", + "lineNumber": 24 } }, { - "plugin": "apm", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/apm/common/license_check.test.ts", - "lineNumber": 122 + "path": "x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts", + "lineNumber": 47 } }, { - "plugin": "apm", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/apm/common/license_check.test.ts", - "lineNumber": 139 + "path": "x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts", + "lineNumber": 48 } }, { - "plugin": "apm", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/apm/common/license_check.test.ts", - "lineNumber": 156 + "path": "x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts", + "lineNumber": 42 } }, { - "plugin": "apm", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/apm/common/license_check.test.ts", - "lineNumber": 173 + "path": "x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts", + "lineNumber": 43 } }, { - "plugin": "apm", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/apm/common/license_check.test.ts", - "lineNumber": 190 + "path": "x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts", + "lineNumber": 44 } }, { - "plugin": "apm", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/apm/common/license_check.test.ts", - "lineNumber": 207 + "path": "x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.test.ts", + "lineNumber": 54 } }, { - "plugin": "security", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/security/common/licensing/license_service.test.ts", - "lineNumber": 169 + "path": "x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.test.ts", + "lineNumber": 55 } }, { - "plugin": "security", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/security/common/licensing/license_service.test.ts", - "lineNumber": 194 + "path": "x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/index.test.ts", + "lineNumber": 159 } }, { - "plugin": "security", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/security/common/licensing/license_service.test.ts", - "lineNumber": 219 + "path": "x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/index.test.ts", + "lineNumber": 161 } } ] @@ -3060,7 +3053,7 @@ "plugin": "spaces", "link": { "path": "x-pack/plugins/spaces/server/usage_collection/spaces_usage_collector.ts", - "lineNumber": 442 + "lineNumber": 431 } }, { @@ -3126,13 +3119,6 @@ "lineNumber": 139 } }, - { - "plugin": "fleet", - "link": { - "path": "x-pack/plugins/fleet/server/plugin.ts", - "lineNumber": 213 - } - }, { "plugin": "indexManagement", "link": { @@ -3147,6 +3133,13 @@ "lineNumber": 73 } }, + { + "plugin": "fleet", + "link": { + "path": "x-pack/plugins/fleet/server/plugin.ts", + "lineNumber": 213 + } + }, { "plugin": "graph", "link": { diff --git a/api_docs/lists.json b/api_docs/lists.json index 8932650bdff76a..90f5cd726287b9 100644 --- a/api_docs/lists.json +++ b/api_docs/lists.json @@ -273,1055 +273,8 @@ "initialIsOpen": false } ], - "functions": [ - { - "parentPluginId": "lists", - "id": "def-public.addEndpointExceptionListWithValidation", - "type": "Function", - "tags": [], - "label": "addEndpointExceptionListWithValidation", - "description": [], - "signature": [ - "({ http, signal, }: ", - "AddEndpointExceptionListProps", - ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; description: string; id: string; immutable: boolean; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"endpoint\" | \"detection\" | \"endpoint_events\"; updated_at: string; updated_by: string; version: number; } | {}>" - ], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/api.ts", - "lineNumber": 532 - }, - "deprecated": false, - "children": [ - { - "parentPluginId": "lists", - "id": "def-public.addEndpointExceptionListWithValidation.$1", - "type": "Object", - "tags": [], - "label": "{\n http,\n signal,\n}", - "description": [], - "signature": [ - "AddEndpointExceptionListProps" - ], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/api.ts", - "lineNumber": 532 - }, - "deprecated": false, - "isRequired": true - } - ], - "returnComment": [], - "initialIsOpen": false - }, - { - "parentPluginId": "lists", - "id": "def-public.addExceptionListWithValidation", - "type": "Function", - "tags": [], - "label": "addExceptionListWithValidation", - "description": [], - "signature": [ - "({ http, list, signal, }: ", - "AddExceptionListProps", - ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; description: string; id: string; immutable: boolean; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"endpoint\" | \"detection\" | \"endpoint_events\"; updated_at: string; updated_by: string; version: number; }>" - ], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/api.ts", - "lineNumber": 66 - }, - "deprecated": false, - "children": [ - { - "parentPluginId": "lists", - "id": "def-public.addExceptionListWithValidation.$1", - "type": "Object", - "tags": [], - "label": "{\n http,\n list,\n signal,\n}", - "description": [], - "signature": [ - "AddExceptionListProps" - ], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/api.ts", - "lineNumber": 66 - }, - "deprecated": false, - "isRequired": true - } - ], - "returnComment": [], - "initialIsOpen": false - }, - { - "parentPluginId": "lists", - "id": "def-public.exportListWithValidation", - "type": "Function", - "tags": [], - "label": "exportListWithValidation", - "description": [], - "signature": [ - "({ http, listId, signal, }: ", - "ExportListParams", - ") => Promise" - ], - "source": { - "path": "x-pack/plugins/lists/public/lists/api.ts", - "lineNumber": 174 - }, - "deprecated": false, - "children": [ - { - "parentPluginId": "lists", - "id": "def-public.exportListWithValidation.$1", - "type": "Object", - "tags": [], - "label": "{\n http,\n listId,\n signal,\n}", - "description": [], - "signature": [ - "ExportListParams" - ], - "source": { - "path": "x-pack/plugins/lists/public/lists/api.ts", - "lineNumber": 174 - }, - "deprecated": false, - "isRequired": true - } - ], - "returnComment": [], - "initialIsOpen": false - }, - { - "parentPluginId": "lists", - "id": "def-public.fetchExceptionListByIdWithValidation", - "type": "Function", - "tags": [], - "label": "fetchExceptionListByIdWithValidation", - "description": [], - "signature": [ - "({ http, id, namespaceType, signal, }: ", - "ApiCallByIdProps", - ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; description: string; id: string; immutable: boolean; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"endpoint\" | \"detection\" | \"endpoint_events\"; updated_at: string; updated_by: string; version: number; }>" - ], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/api.ts", - "lineNumber": 299 - }, - "deprecated": false, - "children": [ - { - "parentPluginId": "lists", - "id": "def-public.fetchExceptionListByIdWithValidation.$1", - "type": "Object", - "tags": [], - "label": "{\n http,\n id,\n namespaceType,\n signal,\n}", - "description": [], - "signature": [ - "ApiCallByIdProps" - ], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/api.ts", - "lineNumber": 299 - }, - "deprecated": false, - "isRequired": true - } - ], - "returnComment": [], - "initialIsOpen": false - }, - { - "parentPluginId": "lists", - "id": "def-public.transformNewItemOutput", - "type": "Function", - "tags": [], - "label": "transformNewItemOutput", - "description": [], - "signature": [ - "(exceptionItem: { description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; list_id: string; name: string; type: \"simple\"; } & { comments?: { comment: string; }[] | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }) => { description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; list_id: string; name: string; type: \"simple\"; } & { comments?: { comment: string; }[] | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }" - ], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/transforms.ts", - "lineNumber": 40 - }, - "deprecated": false, - "children": [ - { - "parentPluginId": "lists", - "id": "def-public.transformNewItemOutput.$1", - "type": "CompoundType", - "tags": [], - "label": "exceptionItem", - "description": [], - "signature": [ - "{ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; list_id: string; name: string; type: \"simple\"; } & { comments?: { comment: string; }[] | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }" - ], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/transforms.ts", - "lineNumber": 41 - }, - "deprecated": false, - "isRequired": true - } - ], - "returnComment": [], - "initialIsOpen": false - }, - { - "parentPluginId": "lists", - "id": "def-public.transformOutput", - "type": "Function", - "tags": [], - "label": "transformOutput", - "description": [ - "\nTransforms the output of exception items to compensate for technical debt or UI concerns such as\nReactJS preferences for having ids within arrays if the data is not modeled that way.\n\nIf you add a new transform of the output called \"myNewTransform\" do it\nin the form of:\nflow(removeIdFromExceptionItemsEntries, myNewTransform)(exceptionItem)\n" - ], - "signature": [ - "(exceptionItem: { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | ({ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; } & { _version?: string | undefined; comments?: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id?: string | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; })) => { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | ({ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; } & { _version?: string | undefined; comments?: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id?: string | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; })" - ], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/transforms.ts", - "lineNumber": 35 - }, - "deprecated": false, - "children": [ - { - "parentPluginId": "lists", - "id": "def-public.transformOutput.$1", - "type": "CompoundType", - "tags": [], - "label": "exceptionItem", - "description": [], - "signature": [ - "{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | ({ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; } & { _version?: string | undefined; comments?: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id?: string | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; })" - ], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/transforms.ts", - "lineNumber": 36 - }, - "deprecated": false, - "isRequired": true - } - ], - "returnComment": [ - "The exceptionItem transformed from the output" - ], - "initialIsOpen": false - }, - { - "parentPluginId": "lists", - "id": "def-public.useApi", - "type": "Function", - "tags": [], - "label": "useApi", - "description": [], - "signature": [ - "(http: ", - { - "pluginId": "core", - "scope": "public", - "docId": "kibCoreHttpPluginApi", - "section": "def-public.HttpSetup", - "text": "HttpSetup" - }, - ") => ", - "ExceptionsApi" - ], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/hooks/use_api.ts", - "lineNumber": 41 - }, - "deprecated": false, - "children": [ - { - "parentPluginId": "lists", - "id": "def-public.useApi.$1", - "type": "Object", - "tags": [], - "label": "http", - "description": [], - "signature": [ - { - "pluginId": "core", - "scope": "public", - "docId": "kibCoreHttpPluginApi", - "section": "def-public.HttpSetup", - "text": "HttpSetup" - } - ], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/hooks/use_api.ts", - "lineNumber": 41 - }, - "deprecated": false, - "isRequired": true - } - ], - "returnComment": [], - "initialIsOpen": false - }, - { - "parentPluginId": "lists", - "id": "def-public.useAsync", - "type": "Function", - "tags": [], - "label": "useAsync", - "description": [ - "\n" - ], - "signature": [ - "(fn: (...args: Args) => Promise) => ", - "Async", - "" - ], - "source": { - "path": "x-pack/plugins/lists/public/common/hooks/use_async.ts", - "lineNumber": 25 - }, - "deprecated": false, - "children": [ - { - "parentPluginId": "lists", - "id": "def-public.useAsync.$1", - "type": "Function", - "tags": [], - "label": "fn", - "description": [], - "signature": [ - "(...args: Args) => Promise" - ], - "source": { - "path": "x-pack/plugins/lists/public/common/hooks/use_async.ts", - "lineNumber": 26 - }, - "deprecated": false, - "isRequired": true - } - ], - "returnComment": [ - "An {@link AsyncTask} containing the underlying task's state along with a start callback" - ], - "initialIsOpen": false - }, - { - "parentPluginId": "lists", - "id": "def-public.useCreateListIndex", - "type": "Function", - "tags": [], - "label": "useCreateListIndex", - "description": [], - "signature": [ - "() => ", - "Async", - "<[args: ", - "OptionalSignalArgs", - "<", - "ApiParams", - ">], { acknowledged: boolean; }>" - ], - "source": { - "path": "x-pack/plugins/lists/public/lists/hooks/use_create_list_index.ts", - "lineNumber": 15 - }, - "deprecated": false, - "children": [], - "returnComment": [], - "initialIsOpen": false - }, - { - "parentPluginId": "lists", - "id": "def-public.useCursor", - "type": "Function", - "tags": [], - "label": "useCursor", - "description": [], - "signature": [ - "({ pageIndex, pageSize }: ", - "UseCursorProps", - ") => [string | undefined, SetCursor]" - ], - "source": { - "path": "x-pack/plugins/lists/public/common/hooks/use_cursor.ts", - "lineNumber": 20 - }, - "deprecated": false, - "children": [ - { - "parentPluginId": "lists", - "id": "def-public.useCursor.$1", - "type": "Object", - "tags": [], - "label": "{ pageIndex, pageSize }", - "description": [], - "signature": [ - "UseCursorProps" - ], - "source": { - "path": "x-pack/plugins/lists/public/common/hooks/use_cursor.ts", - "lineNumber": 20 - }, - "deprecated": false, - "isRequired": true - } - ], - "returnComment": [], - "initialIsOpen": false - }, - { - "parentPluginId": "lists", - "id": "def-public.useDeleteList", - "type": "Function", - "tags": [], - "label": "useDeleteList", - "description": [], - "signature": [ - "() => ", - "Async", - "<[args: ", - "OptionalSignalArgs", - "<", - "DeleteListParams", - ">], { _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }>" - ], - "source": { - "path": "x-pack/plugins/lists/public/lists/hooks/use_delete_list.ts", - "lineNumber": 15 - }, - "deprecated": false, - "children": [], - "returnComment": [], - "initialIsOpen": false - }, - { - "parentPluginId": "lists", - "id": "def-public.useExceptionListItems", - "type": "Function", - "tags": [], - "label": "useExceptionListItems", - "description": [ - "\nHook for using to get an ExceptionList and it's ExceptionListItems\n" - ], - "signature": [ - "({ http, lists, pagination, filterOptions, showDetectionsListsOnly, showEndpointListsOnly, matchFilters, onError, onSuccess, }: ", - "UseExceptionListProps", - ") => ", - "ReturnExceptionListAndItems" - ], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/hooks/use_exception_list_items.ts", - "lineNumber": 39 - }, - "deprecated": false, - "children": [ - { - "parentPluginId": "lists", - "id": "def-public.useExceptionListItems.$1", - "type": "Object", - "tags": [], - "label": "{\n http,\n lists,\n pagination = {\n page: 1,\n perPage: 20,\n total: 0,\n },\n filterOptions,\n showDetectionsListsOnly,\n showEndpointListsOnly,\n matchFilters,\n onError,\n onSuccess,\n}", - "description": [], - "signature": [ - "UseExceptionListProps" - ], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/hooks/use_exception_list_items.ts", - "lineNumber": 39 - }, - "deprecated": false, - "isRequired": true - } - ], - "returnComment": [], - "initialIsOpen": false - }, - { - "parentPluginId": "lists", - "id": "def-public.useExceptionLists", - "type": "Function", - "tags": [], - "label": "useExceptionLists", - "description": [ - "\nHook for fetching ExceptionLists\n" - ], - "signature": [ - "({ errorMessage, http, pagination, filterOptions, namespaceTypes, notifications, showTrustedApps, }: ", - "UseExceptionListsProps", - ") => ", - "ReturnExceptionLists" - ], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/hooks/use_exception_lists.ts", - "lineNumber": 30 - }, - "deprecated": false, - "children": [ - { - "parentPluginId": "lists", - "id": "def-public.useExceptionLists.$1", - "type": "Object", - "tags": [], - "label": "{\n errorMessage,\n http,\n pagination = {\n page: 1,\n perPage: 20,\n total: 0,\n },\n filterOptions = {},\n namespaceTypes,\n notifications,\n showTrustedApps = false,\n}", - "description": [], - "signature": [ - "UseExceptionListsProps" - ], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/hooks/use_exception_lists.ts", - "lineNumber": 30 - }, - "deprecated": false, - "isRequired": true - } - ], - "returnComment": [], - "initialIsOpen": false - }, - { - "parentPluginId": "lists", - "id": "def-public.useExportList", - "type": "Function", - "tags": [], - "label": "useExportList", - "description": [], - "signature": [ - "() => ", - "Async", - "<[args: ", - "OptionalSignalArgs", - "<", - "ExportListParams", - ">], Blob>" - ], - "source": { - "path": "x-pack/plugins/lists/public/lists/hooks/use_export_list.ts", - "lineNumber": 15 - }, - "deprecated": false, - "children": [], - "returnComment": [], - "initialIsOpen": false - }, - { - "parentPluginId": "lists", - "id": "def-public.useFindLists", - "type": "Function", - "tags": [], - "label": "useFindLists", - "description": [], - "signature": [ - "() => ", - "Async", - "<[args: ", - "OptionalSignalArgs", - "<", - "FindListsParams", - ">], { cursor: string; data: { _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }[]; page: number; per_page: number; total: number; }>" - ], - "source": { - "path": "x-pack/plugins/lists/public/lists/hooks/use_find_lists.ts", - "lineNumber": 15 - }, - "deprecated": false, - "children": [], - "returnComment": [], - "initialIsOpen": false - }, - { - "parentPluginId": "lists", - "id": "def-public.useImportList", - "type": "Function", - "tags": [], - "label": "useImportList", - "description": [], - "signature": [ - "() => ", - "Async", - "<[args: ", - "OptionalSignalArgs", - "<", - "ImportListParams", - ">], { _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }>" - ], - "source": { - "path": "x-pack/plugins/lists/public/lists/hooks/use_import_list.ts", - "lineNumber": 15 - }, - "deprecated": false, - "children": [], - "returnComment": [], - "initialIsOpen": false - }, - { - "parentPluginId": "lists", - "id": "def-public.useReadListIndex", - "type": "Function", - "tags": [], - "label": "useReadListIndex", - "description": [], - "signature": [ - "() => ", - "Async", - "<[args: ", - "OptionalSignalArgs", - "<", - "ApiParams", - ">], { list_index: boolean; list_item_index: boolean; }>" - ], - "source": { - "path": "x-pack/plugins/lists/public/lists/hooks/use_read_list_index.ts", - "lineNumber": 15 - }, - "deprecated": false, - "children": [], - "returnComment": [], - "initialIsOpen": false - }, - { - "parentPluginId": "lists", - "id": "def-public.useReadListPrivileges", - "type": "Function", - "tags": [], - "label": "useReadListPrivileges", - "description": [], - "signature": [ - "() => ", - "Async", - "<[args: ", - "OptionalSignalArgs", - "<", - "ApiParams", - ">], unknown>" - ], - "source": { - "path": "x-pack/plugins/lists/public/lists/hooks/use_read_list_privileges.ts", - "lineNumber": 15 - }, - "deprecated": false, - "children": [], - "returnComment": [], - "initialIsOpen": false - }, - { - "parentPluginId": "lists", - "id": "def-public.withOptionalSignal", - "type": "Function", - "tags": [], - "label": "withOptionalSignal", - "description": [ - "\n" - ], - "signature": [ - "(fn: (args: Args) => Result) => (args: ", - "OptionalSignalArgs", - ") => Result" - ], - "source": { - "path": "x-pack/plugins/lists/public/common/with_optional_signal.ts", - "lineNumber": 20 - }, - "deprecated": false, - "children": [ - { - "parentPluginId": "lists", - "id": "def-public.withOptionalSignal.$1", - "type": "Function", - "tags": [], - "label": "fn", - "description": [], - "signature": [ - "(args: Args) => Result" - ], - "source": { - "path": "x-pack/plugins/lists/public/common/with_optional_signal.ts", - "lineNumber": 20 - }, - "deprecated": false, - "isRequired": true - } - ], - "returnComment": [ - "An async function where the AbortSignal argument is optional" - ], - "initialIsOpen": false - } - ], - "interfaces": [ - { - "parentPluginId": "lists", - "id": "def-public.ExceptionList", - "type": "Interface", - "tags": [], - "label": "ExceptionList", - "description": [], - "signature": [ - { - "pluginId": "lists", - "scope": "public", - "docId": "kibListsPluginApi", - "section": "def-public.ExceptionList", - "text": "ExceptionList" - }, - " extends { _version: string | undefined; created_at: string; created_by: string; description: string; id: string; immutable: boolean; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"endpoint\" | \"detection\" | \"endpoint_events\"; updated_at: string; updated_by: string; version: number; }" - ], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/types.ts", - "lineNumber": 42 - }, - "deprecated": false, - "children": [ - { - "parentPluginId": "lists", - "id": "def-public.ExceptionList.totalItems", - "type": "number", - "tags": [], - "label": "totalItems", - "description": [], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/types.ts", - "lineNumber": 43 - }, - "deprecated": false - } - ], - "initialIsOpen": false - }, - { - "parentPluginId": "lists", - "id": "def-public.ExceptionListFilter", - "type": "Interface", - "tags": [], - "label": "ExceptionListFilter", - "description": [], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/types.ts", - "lineNumber": 126 - }, - "deprecated": false, - "children": [ - { - "parentPluginId": "lists", - "id": "def-public.ExceptionListFilter.name", - "type": "CompoundType", - "tags": [], - "label": "name", - "description": [], - "signature": [ - "string | null | undefined" - ], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/types.ts", - "lineNumber": 127 - }, - "deprecated": false - }, - { - "parentPluginId": "lists", - "id": "def-public.ExceptionListFilter.list_id", - "type": "CompoundType", - "tags": [], - "label": "list_id", - "description": [], - "signature": [ - "string | null | undefined" - ], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/types.ts", - "lineNumber": 128 - }, - "deprecated": false - }, - { - "parentPluginId": "lists", - "id": "def-public.ExceptionListFilter.created_by", - "type": "CompoundType", - "tags": [], - "label": "created_by", - "description": [], - "signature": [ - "string | null | undefined" - ], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/types.ts", - "lineNumber": 129 - }, - "deprecated": false - }, - { - "parentPluginId": "lists", - "id": "def-public.ExceptionListFilter.type", - "type": "CompoundType", - "tags": [], - "label": "type", - "description": [], - "signature": [ - "string | null | undefined" - ], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/types.ts", - "lineNumber": 130 - }, - "deprecated": false - }, - { - "parentPluginId": "lists", - "id": "def-public.ExceptionListFilter.tags", - "type": "CompoundType", - "tags": [], - "label": "tags", - "description": [], - "signature": [ - "string | null | undefined" - ], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/types.ts", - "lineNumber": 131 - }, - "deprecated": false - } - ], - "initialIsOpen": false - }, - { - "parentPluginId": "lists", - "id": "def-public.ExceptionListIdentifiers", - "type": "Interface", - "tags": [], - "label": "ExceptionListIdentifiers", - "description": [], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/types.ts", - "lineNumber": 63 - }, - "deprecated": false, - "children": [ - { - "parentPluginId": "lists", - "id": "def-public.ExceptionListIdentifiers.id", - "type": "string", - "tags": [], - "label": "id", - "description": [], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/types.ts", - "lineNumber": 64 - }, - "deprecated": false - }, - { - "parentPluginId": "lists", - "id": "def-public.ExceptionListIdentifiers.listId", - "type": "string", - "tags": [], - "label": "listId", - "description": [], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/types.ts", - "lineNumber": 65 - }, - "deprecated": false - }, - { - "parentPluginId": "lists", - "id": "def-public.ExceptionListIdentifiers.namespaceType", - "type": "CompoundType", - "tags": [], - "label": "namespaceType", - "description": [], - "signature": [ - "\"single\" | \"agnostic\"" - ], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/types.ts", - "lineNumber": 66 - }, - "deprecated": false - }, - { - "parentPluginId": "lists", - "id": "def-public.ExceptionListIdentifiers.type", - "type": "CompoundType", - "tags": [], - "label": "type", - "description": [], - "signature": [ - "\"endpoint\" | \"detection\" | \"endpoint_events\"" - ], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/types.ts", - "lineNumber": 67 - }, - "deprecated": false - } - ], - "initialIsOpen": false - }, - { - "parentPluginId": "lists", - "id": "def-public.Pagination", - "type": "Interface", - "tags": [], - "label": "Pagination", - "description": [], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/types.ts", - "lineNumber": 29 - }, - "deprecated": false, - "children": [ - { - "parentPluginId": "lists", - "id": "def-public.Pagination.page", - "type": "number", - "tags": [], - "label": "page", - "description": [], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/types.ts", - "lineNumber": 30 - }, - "deprecated": false - }, - { - "parentPluginId": "lists", - "id": "def-public.Pagination.perPage", - "type": "number", - "tags": [], - "label": "perPage", - "description": [], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/types.ts", - "lineNumber": 31 - }, - "deprecated": false - }, - { - "parentPluginId": "lists", - "id": "def-public.Pagination.total", - "type": "number", - "tags": [], - "label": "total", - "description": [], - "signature": [ - "number | undefined" - ], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/types.ts", - "lineNumber": 32 - }, - "deprecated": false - } - ], - "initialIsOpen": false - }, - { - "parentPluginId": "lists", - "id": "def-public.UseExceptionListItemsSuccess", - "type": "Interface", - "tags": [], - "label": "UseExceptionListItemsSuccess", - "description": [], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/types.ts", - "lineNumber": 46 - }, - "deprecated": false, - "children": [ - { - "parentPluginId": "lists", - "id": "def-public.UseExceptionListItemsSuccess.exceptions", - "type": "Array", - "tags": [], - "label": "exceptions", - "description": [], - "signature": [ - "{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }[]" - ], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/types.ts", - "lineNumber": 47 - }, - "deprecated": false - }, - { - "parentPluginId": "lists", - "id": "def-public.UseExceptionListItemsSuccess.pagination", - "type": "Object", - "tags": [], - "label": "pagination", - "description": [], - "signature": [ - { - "pluginId": "lists", - "scope": "public", - "docId": "kibListsPluginApi", - "section": "def-public.Pagination", - "text": "Pagination" - } - ], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/types.ts", - "lineNumber": 48 - }, - "deprecated": false - } - ], - "initialIsOpen": false - }, - { - "parentPluginId": "lists", - "id": "def-public.UseExceptionListsSuccess", - "type": "Interface", - "tags": [], - "label": "UseExceptionListsSuccess", - "description": [], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/types.ts", - "lineNumber": 121 - }, - "deprecated": false, - "children": [ - { - "parentPluginId": "lists", - "id": "def-public.UseExceptionListsSuccess.exceptions", - "type": "Array", - "tags": [], - "label": "exceptions", - "description": [], - "signature": [ - "{ _version: string | undefined; created_at: string; created_by: string; description: string; id: string; immutable: boolean; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"endpoint\" | \"detection\" | \"endpoint_events\"; updated_at: string; updated_by: string; version: number; }[]" - ], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/types.ts", - "lineNumber": 122 - }, - "deprecated": false - }, - { - "parentPluginId": "lists", - "id": "def-public.UseExceptionListsSuccess.pagination", - "type": "Object", - "tags": [], - "label": "pagination", - "description": [], - "signature": [ - { - "pluginId": "lists", - "scope": "public", - "docId": "kibListsPluginApi", - "section": "def-public.Pagination", - "text": "Pagination" - } - ], - "source": { - "path": "x-pack/plugins/lists/public/exceptions/types.ts", - "lineNumber": 123 - }, - "deprecated": false - } - ], - "initialIsOpen": false - } - ], + "functions": [], + "interfaces": [], "enums": [], "misc": [], "objects": [ @@ -1338,7 +291,7 @@ ], "source": { "path": "x-pack/plugins/lists/public/shared_exports.ts", - "lineNumber": 36 + "lineNumber": 10 }, "deprecated": false, "initialIsOpen": false @@ -1388,7 +341,7 @@ "description": [], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 57 + "lineNumber": 56 }, "deprecated": false, "children": [ @@ -1404,7 +357,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 62 + "lineNumber": 61 }, "deprecated": false, "children": [ @@ -1420,7 +373,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 62 + "lineNumber": 61 }, "deprecated": false, "isRequired": true @@ -1442,7 +395,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 67 + "lineNumber": 66 }, "deprecated": false, "children": [ @@ -1458,7 +411,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 67 + "lineNumber": 66 }, "deprecated": false, "isRequired": true @@ -1480,7 +433,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 76 + "lineNumber": 75 }, "deprecated": false, "children": [ @@ -1496,7 +449,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 76 + "lineNumber": 75 }, "deprecated": false, "isRequired": true @@ -1518,7 +471,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 91 + "lineNumber": 90 }, "deprecated": false, "children": [], @@ -1540,7 +493,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 103 + "lineNumber": 102 }, "deprecated": false, "children": [], @@ -1560,7 +513,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 115 + "lineNumber": 114 }, "deprecated": false, "children": [], @@ -1582,7 +535,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 129 + "lineNumber": 128 }, "deprecated": false, "children": [ @@ -1598,7 +551,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 129 + "lineNumber": 128 }, "deprecated": false, "isRequired": true @@ -1622,7 +575,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 165 + "lineNumber": 164 }, "deprecated": false, "children": [ @@ -1638,7 +591,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 165 + "lineNumber": 164 }, "deprecated": false, "isRequired": true @@ -1662,7 +615,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 201 + "lineNumber": 200 }, "deprecated": false, "children": [ @@ -1678,7 +631,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 201 + "lineNumber": 200 }, "deprecated": false, "isRequired": true @@ -1700,7 +653,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 209 + "lineNumber": 208 }, "deprecated": false, "children": [ @@ -1716,7 +669,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 209 + "lineNumber": 208 }, "deprecated": false, "isRequired": true @@ -1738,7 +691,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 236 + "lineNumber": 235 }, "deprecated": false, "children": [ @@ -1754,7 +707,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 236 + "lineNumber": 235 }, "deprecated": false, "isRequired": true @@ -1776,7 +729,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 267 + "lineNumber": 266 }, "deprecated": false, "children": [ @@ -1792,7 +745,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 267 + "lineNumber": 266 }, "deprecated": false, "isRequired": true @@ -1820,7 +773,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 281 + "lineNumber": 280 }, "deprecated": false, "children": [ @@ -1842,7 +795,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 281 + "lineNumber": 280 }, "deprecated": false, "isRequired": true @@ -1870,7 +823,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 312 + "lineNumber": 311 }, "deprecated": false, "children": [ @@ -1892,7 +845,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 312 + "lineNumber": 311 }, "deprecated": false, "isRequired": true @@ -1914,7 +867,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 345 + "lineNumber": 344 }, "deprecated": false, "children": [ @@ -1930,7 +883,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 345 + "lineNumber": 344 }, "deprecated": false, "isRequired": true @@ -1952,7 +905,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 359 + "lineNumber": 358 }, "deprecated": false, "children": [ @@ -1968,7 +921,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 359 + "lineNumber": 358 }, "deprecated": false, "isRequired": true @@ -1992,7 +945,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 374 + "lineNumber": 373 }, "deprecated": false, "children": [ @@ -2008,7 +961,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 374 + "lineNumber": 373 }, "deprecated": false, "isRequired": true @@ -2030,7 +983,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 387 + "lineNumber": 386 }, "deprecated": false, "children": [ @@ -2046,7 +999,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 387 + "lineNumber": 386 }, "deprecated": false, "isRequired": true @@ -2068,7 +1021,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 409 + "lineNumber": 408 }, "deprecated": false, "children": [ @@ -2084,7 +1037,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 409 + "lineNumber": 408 }, "deprecated": false, "isRequired": true @@ -2106,7 +1059,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 431 + "lineNumber": 430 }, "deprecated": false, "children": [ @@ -2122,7 +1075,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 431 + "lineNumber": 430 }, "deprecated": false, "isRequired": true @@ -2144,7 +1097,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 449 + "lineNumber": 448 }, "deprecated": false, "children": [ @@ -2160,7 +1113,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 449 + "lineNumber": 448 }, "deprecated": false, "isRequired": true @@ -2184,7 +1137,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 477 + "lineNumber": 476 }, "deprecated": false, "children": [ @@ -2200,7 +1153,7 @@ ], "source": { "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts", - "lineNumber": 477 + "lineNumber": 476 }, "deprecated": false, "isRequired": true @@ -4234,228 +3187,10 @@ }, "common": { "classes": [], - "functions": [ - { - "parentPluginId": "lists", - "id": "def-common.buildExceptionFilter", - "type": "Function", - "tags": [], - "label": "buildExceptionFilter", - "description": [], - "signature": [ - "({ lists, excludeExceptions, chunkSize, }: { lists: ({ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | ({ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; list_id: string; name: string; type: \"simple\"; } & { comments?: { comment: string; }[] | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }))[]; excludeExceptions: boolean; chunkSize: number; }) => ", - { - "pluginId": "data", - "scope": "common", - "docId": "kibDataPluginApi", - "section": "def-common.Filter", - "text": "Filter" - }, - " | undefined" - ], - "source": { - "path": "x-pack/plugins/lists/common/exceptions/build_exceptions_filter.ts", - "lineNumber": 69 - }, - "deprecated": false, - "children": [ - { - "parentPluginId": "lists", - "id": "def-common.buildExceptionFilter.$1.listsexcludeExceptionschunkSize", - "type": "Object", - "tags": [], - "label": "{\n lists,\n excludeExceptions,\n chunkSize,\n}", - "description": [], - "source": { - "path": "x-pack/plugins/lists/common/exceptions/build_exceptions_filter.ts", - "lineNumber": 73 - }, - "deprecated": false, - "children": [ - { - "parentPluginId": "lists", - "id": "def-common.buildExceptionFilter.$1.listsexcludeExceptionschunkSize.lists", - "type": "Array", - "tags": [], - "label": "lists", - "description": [], - "signature": [ - "({ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | ({ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; list_id: string; name: string; type: \"simple\"; } & { comments?: { comment: string; }[] | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }))[]" - ], - "source": { - "path": "x-pack/plugins/lists/common/exceptions/build_exceptions_filter.ts", - "lineNumber": 74 - }, - "deprecated": false - }, - { - "parentPluginId": "lists", - "id": "def-common.buildExceptionFilter.$1.listsexcludeExceptionschunkSize.excludeExceptions", - "type": "boolean", - "tags": [], - "label": "excludeExceptions", - "description": [], - "source": { - "path": "x-pack/plugins/lists/common/exceptions/build_exceptions_filter.ts", - "lineNumber": 75 - }, - "deprecated": false - }, - { - "parentPluginId": "lists", - "id": "def-common.buildExceptionFilter.$1.listsexcludeExceptionschunkSize.chunkSize", - "type": "number", - "tags": [], - "label": "chunkSize", - "description": [], - "source": { - "path": "x-pack/plugins/lists/common/exceptions/build_exceptions_filter.ts", - "lineNumber": 76 - }, - "deprecated": false - } - ] - } - ], - "returnComment": [], - "initialIsOpen": false - } - ], + "functions": [], "interfaces": [], "enums": [], - "misc": [ - { - "parentPluginId": "lists", - "id": "def-common.ENDPOINT_EVENT_FILTERS_LIST_DESCRIPTION", - "type": "string", - "tags": [], - "label": "ENDPOINT_EVENT_FILTERS_LIST_DESCRIPTION", - "description": [ - "Description of event filters agnostic list" - ], - "signature": [ - "\"Endpoint Security Event Filters List\"" - ], - "source": { - "path": "x-pack/plugins/lists/common/constants.ts", - "lineNumber": 71 - }, - "deprecated": false, - "initialIsOpen": false - }, - { - "parentPluginId": "lists", - "id": "def-common.ENDPOINT_EVENT_FILTERS_LIST_ID", - "type": "string", - "tags": [], - "label": "ENDPOINT_EVENT_FILTERS_LIST_ID", - "description": [ - "ID of event filters agnostic list" - ], - "signature": [ - "\"endpoint_event_filters\"" - ], - "source": { - "path": "x-pack/plugins/lists/common/constants.ts", - "lineNumber": 65 - }, - "deprecated": false, - "initialIsOpen": false - }, - { - "parentPluginId": "lists", - "id": "def-common.ENDPOINT_EVENT_FILTERS_LIST_NAME", - "type": "string", - "tags": [], - "label": "ENDPOINT_EVENT_FILTERS_LIST_NAME", - "description": [ - "Name of event filters agnostic list" - ], - "signature": [ - "\"Endpoint Security Event Filters List\"" - ], - "source": { - "path": "x-pack/plugins/lists/common/constants.ts", - "lineNumber": 68 - }, - "deprecated": false, - "initialIsOpen": false - }, - { - "parentPluginId": "lists", - "id": "def-common.ENDPOINT_LIST_ID", - "type": "string", - "tags": [], - "label": "ENDPOINT_LIST_ID", - "description": [ - "\nThis ID is used for _both_ the Saved Object ID and for the list_id\nfor the single global space agnostic endpoint list" - ], - "signature": [ - "\"endpoint_list\"" - ], - "source": { - "path": "x-pack/plugins/lists/common/constants.ts", - "lineNumber": 45 - }, - "deprecated": false, - "initialIsOpen": false - }, - { - "parentPluginId": "lists", - "id": "def-common.ENDPOINT_TRUSTED_APPS_LIST_ID", - "type": "string", - "tags": [], - "label": "ENDPOINT_TRUSTED_APPS_LIST_ID", - "description": [ - "ID of trusted apps agnostic list" - ], - "signature": [ - "\"endpoint_trusted_apps\"" - ], - "source": { - "path": "x-pack/plugins/lists/common/constants.ts", - "lineNumber": 56 - }, - "deprecated": false, - "initialIsOpen": false - }, - { - "parentPluginId": "lists", - "id": "def-common.EXCEPTION_LIST_ITEM_URL", - "type": "string", - "tags": [], - "label": "EXCEPTION_LIST_ITEM_URL", - "description": [], - "signature": [ - "\"/api/exception_lists/items\"" - ], - "source": { - "path": "x-pack/plugins/lists/common/constants.ts", - "lineNumber": 20 - }, - "deprecated": false, - "initialIsOpen": false - }, - { - "parentPluginId": "lists", - "id": "def-common.EXCEPTION_LIST_URL", - "type": "string", - "tags": [], - "label": "EXCEPTION_LIST_URL", - "description": [ - "\nException list routes" - ], - "signature": [ - "\"/api/exception_lists\"" - ], - "source": { - "path": "x-pack/plugins/lists/common/constants.ts", - "lineNumber": 19 - }, - "deprecated": false, - "initialIsOpen": false - } - ], + "misc": [], "objects": [] } } \ No newline at end of file diff --git a/api_docs/lists.mdx b/api_docs/lists.mdx index 1fe986ef4a06b3..8ef77a85fb548e 100644 --- a/api_docs/lists.mdx +++ b/api_docs/lists.mdx @@ -22,15 +22,9 @@ import listsObj from './lists.json'; ### Objects -### Functions - - ### Classes -### Interfaces - - ## Server ### Classes @@ -39,11 +33,3 @@ import listsObj from './lists.json'; ### Interfaces -## Common - -### Functions - - -### Consts, variables and types - - diff --git a/api_docs/management.json b/api_docs/management.json index 2a3bb7e3cb1eb3..41801e2f2bafc7 100644 --- a/api_docs/management.json +++ b/api_docs/management.json @@ -22,7 +22,7 @@ ], "source": { "path": "src/plugins/management/public/utils/management_app.ts", - "lineNumber": 19 + "lineNumber": 18 }, "deprecated": false, "children": [ @@ -50,7 +50,7 @@ ], "source": { "path": "src/plugins/management/public/utils/management_app.ts", - "lineNumber": 20 + "lineNumber": 19 }, "deprecated": false, "returnComment": [], @@ -88,29 +88,23 @@ "description": [], "source": { "path": "src/plugins/management/public/utils/management_app.ts", - "lineNumber": 21 + "lineNumber": 20 }, "deprecated": false }, { "parentPluginId": "management", - "id": "def-public.ManagementApp.meta", - "type": "Object", + "id": "def-public.ManagementApp.keywords", + "type": "Array", "tags": [], - "label": "meta", + "label": "keywords", "description": [], "signature": [ - { - "pluginId": "core", - "scope": "public", - "docId": "kibCoreApplicationPluginApi", - "section": "def-public.AppMeta", - "text": "AppMeta" - } + "string[]" ], "source": { "path": "src/plugins/management/public/utils/management_app.ts", - "lineNumber": 22 + "lineNumber": 21 }, "deprecated": false }, @@ -126,7 +120,7 @@ ], "source": { "path": "src/plugins/management/public/utils/management_app.ts", - "lineNumber": 24 + "lineNumber": 23 }, "deprecated": false, "children": [ @@ -148,7 +142,7 @@ ], "source": { "path": "src/plugins/management/public/utils/management_app.ts", - "lineNumber": 24 + "lineNumber": 23 }, "deprecated": false, "isRequired": true @@ -260,7 +254,7 @@ "section": "def-public.RegisterManagementAppArgs", "text": "RegisterManagementAppArgs" }, - ", \"title\" | \"id\" | \"meta\" | \"order\" | \"mount\" | \"euiIconType\" | \"icon\" | \"tip\">) => ", + ", \"title\" | \"id\" | \"order\" | \"mount\" | \"keywords\" | \"euiIconType\" | \"icon\" | \"tip\">) => ", { "pluginId": "management", "scope": "public", @@ -291,7 +285,7 @@ "section": "def-public.RegisterManagementAppArgs", "text": "RegisterManagementAppArgs" }, - ", \"title\" | \"id\" | \"meta\" | \"order\" | \"mount\" | \"euiIconType\" | \"icon\" | \"tip\">" + ", \"title\" | \"id\" | \"order\" | \"mount\" | \"keywords\" | \"euiIconType\" | \"icon\" | \"tip\">" ], "source": { "path": "src/plugins/management/public/utils/management_section.ts", @@ -653,7 +647,7 @@ ], "source": { "path": "src/plugins/management/public/utils/management_app.ts", - "lineNumber": 13 + "lineNumber": 12 }, "deprecated": false, "children": [ @@ -681,7 +675,7 @@ ], "source": { "path": "src/plugins/management/public/utils/management_app.ts", - "lineNumber": 14 + "lineNumber": 13 }, "deprecated": false, "returnComment": [], @@ -719,30 +713,23 @@ "description": [], "source": { "path": "src/plugins/management/public/utils/management_app.ts", - "lineNumber": 15 + "lineNumber": 14 }, "deprecated": false }, { "parentPluginId": "management", - "id": "def-public.RegisterManagementAppArgs.meta", - "type": "Object", + "id": "def-public.RegisterManagementAppArgs.keywords", + "type": "Array", "tags": [], - "label": "meta", + "label": "keywords", "description": [], "signature": [ - { - "pluginId": "core", - "scope": "public", - "docId": "kibCoreApplicationPluginApi", - "section": "def-public.AppMeta", - "text": "AppMeta" - }, - " | undefined" + "string[] | undefined" ], "source": { "path": "src/plugins/management/public/utils/management_app.ts", - "lineNumber": 16 + "lineNumber": 15 }, "deprecated": false } diff --git a/api_docs/ml.json b/api_docs/ml.json index 51a5608578026a..dee66858b9be94 100644 --- a/api_docs/ml.json +++ b/api_docs/ml.json @@ -1320,7 +1320,7 @@ }, " extends Pick<", "UseDataGridReturnType", - ", \"status\" | \"errorMessage\" | \"baseline\" | \"pagination\" | \"chartsVisible\" | \"chartsButtonVisible\" | \"ccsWarning\" | \"columnsWithCharts\" | \"invalidSortingColumnns\" | \"noDataMessage\" | \"onChangeItemsPerPage\" | \"onChangePage\" | \"onSort\" | \"setPagination\" | \"setVisibleColumns\" | \"rowCount\" | \"rowCountRelation\" | \"sortingColumns\" | \"tableItems\" | \"toggleChartVisibility\" | \"visibleColumns\" | \"predictionFieldName\" | \"resultsField\">" + ", \"status\" | \"errorMessage\" | \"baseline\" | \"chartsVisible\" | \"chartsButtonVisible\" | \"ccsWarning\" | \"columnsWithCharts\" | \"invalidSortingColumnns\" | \"noDataMessage\" | \"onChangeItemsPerPage\" | \"onChangePage\" | \"onSort\" | \"pagination\" | \"setPagination\" | \"setVisibleColumns\" | \"rowCount\" | \"rowCountRelation\" | \"sortingColumns\" | \"tableItems\" | \"toggleChartVisibility\" | \"visibleColumns\" | \"predictionFieldName\" | \"resultsField\">" ], "source": { "path": "x-pack/plugins/ml/public/application/components/data_grid/types.ts", diff --git a/api_docs/saved_objects.json b/api_docs/saved_objects.json index 566e0e9a14ae99..48579ca8e589e0 100644 --- a/api_docs/saved_objects.json +++ b/api_docs/saved_objects.json @@ -680,20 +680,6 @@ }, "deprecated": true, "references": [ - { - "plugin": "visualizations", - "link": { - "path": "src/plugins/visualizations/public/saved_visualizations/find_list_items.ts", - "lineNumber": 16 - } - }, - { - "plugin": "visualizations", - "link": { - "path": "src/plugins/visualizations/public/saved_visualizations/find_list_items.ts", - "lineNumber": 35 - } - }, { "plugin": "discover", "link": { @@ -722,6 +708,20 @@ "lineNumber": 88 } }, + { + "plugin": "visualizations", + "link": { + "path": "src/plugins/visualizations/public/saved_visualizations/find_list_items.ts", + "lineNumber": 16 + } + }, + { + "plugin": "visualizations", + "link": { + "path": "src/plugins/visualizations/public/saved_visualizations/find_list_items.ts", + "lineNumber": 35 + } + }, { "plugin": "visualizations", "link": { @@ -2569,31 +2569,31 @@ } }, { - "plugin": "visualizations", + "plugin": "discover", "link": { - "path": "src/plugins/visualizations/public/types.ts", + "path": "src/plugins/discover/public/saved_searches/_saved_search.ts", "lineNumber": 9 } }, { - "plugin": "visualizations", + "plugin": "discover", "link": { - "path": "src/plugins/visualizations/public/types.ts", - "lineNumber": 41 + "path": "src/plugins/discover/public/saved_searches/_saved_search.ts", + "lineNumber": 61 } }, { - "plugin": "discover", + "plugin": "visualizations", "link": { - "path": "src/plugins/discover/public/saved_searches/_saved_search.ts", + "path": "src/plugins/visualizations/public/types.ts", "lineNumber": 9 } }, { - "plugin": "discover", + "plugin": "visualizations", "link": { - "path": "src/plugins/discover/public/saved_searches/_saved_search.ts", - "lineNumber": 61 + "path": "src/plugins/visualizations/public/types.ts", + "lineNumber": 41 } }, { diff --git a/api_docs/security.json b/api_docs/security.json index 6cc84bc75f0090..7e28ad2a222bb3 100644 --- a/api_docs/security.json +++ b/api_docs/security.json @@ -1306,13 +1306,6 @@ "lineNumber": 444 } }, - { - "plugin": "cases", - "link": { - "path": "x-pack/plugins/cases/server/plugin.ts", - "lineNumber": 89 - } - }, { "plugin": "ml", "link": { @@ -1321,52 +1314,52 @@ } }, { - "plugin": "securitySolution", + "plugin": "cases", "link": { - "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/create_signals_migration_route.ts", - "lineNumber": 48 + "path": "x-pack/plugins/cases/server/plugin.ts", + "lineNumber": 89 } }, { - "plugin": "securitySolution", + "plugin": "dashboardMode", "link": { - "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/delete_signals_migration_route.ts", - "lineNumber": 45 + "path": "x-pack/plugins/dashboard_mode/server/interceptors/dashboard_mode_request_interceptor.ts", + "lineNumber": 33 } }, { - "plugin": "securitySolution", + "plugin": "dataEnhanced", "link": { - "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/finalize_signals_migration_route.ts", - "lineNumber": 45 + "path": "x-pack/plugins/data_enhanced/server/search/session/session_service.ts", + "lineNumber": 448 } }, { - "plugin": "beatsManagement", + "plugin": "logstash", "link": { - "path": "x-pack/plugins/beats_management/server/lib/adapters/framework/kibana_framework_adapter.ts", - "lineNumber": 44 + "path": "x-pack/plugins/logstash/server/routes/pipeline/save.ts", + "lineNumber": 41 } }, { - "plugin": "dashboardMode", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/dashboard_mode/server/interceptors/dashboard_mode_request_interceptor.ts", - "lineNumber": 33 + "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/create_signals_migration_route.ts", + "lineNumber": 48 } }, { - "plugin": "dataEnhanced", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/data_enhanced/server/search/session/session_service.ts", - "lineNumber": 448 + "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/delete_signals_migration_route.ts", + "lineNumber": 45 } }, { - "plugin": "logstash", + "plugin": "securitySolution", "link": { - "path": "x-pack/plugins/logstash/server/routes/pipeline/save.ts", - "lineNumber": 41 + "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/finalize_signals_migration_route.ts", + "lineNumber": 45 } }, { diff --git a/api_docs/spaces.json b/api_docs/spaces.json index aa4e651b9477ba..5225e8cebbeb5a 100644 --- a/api_docs/spaces.json +++ b/api_docs/spaces.json @@ -1213,13 +1213,6 @@ "lineNumber": 271 } }, - { - "plugin": "securitySolution", - "link": { - "path": "x-pack/plugins/security_solution/server/plugin.ts", - "lineNumber": 194 - } - }, { "plugin": "apm", "link": { @@ -1248,6 +1241,13 @@ "lineNumber": 153 } }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/server/plugin.ts", + "lineNumber": 194 + } + }, { "plugin": "security", "link": { @@ -2047,13 +2047,6 @@ "lineNumber": 303 } }, - { - "plugin": "securitySolution", - "link": { - "path": "x-pack/plugins/security_solution/server/plugin.ts", - "lineNumber": 194 - } - }, { "plugin": "apm", "link": { @@ -2088,6 +2081,13 @@ "path": "x-pack/plugins/infra/server/plugin.ts", "lineNumber": 153 } + }, + { + "plugin": "securitySolution", + "link": { + "path": "x-pack/plugins/security_solution/server/plugin.ts", + "lineNumber": 194 + } } ] }, diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc index 94384024e09357..087626240ff337 100644 --- a/docs/developer/plugin-list.asciidoc +++ b/docs/developer/plugin-list.asciidoc @@ -332,11 +332,6 @@ which will load the visualization's editor. |Allow to add a header banner that will be displayed on every page of the Kibana application -|{kib-repo}blob/{branch}/x-pack/plugins/beats_management/readme.md[beatsManagement] -|Notes: -Failure to have auth enabled in Kibana will make for a broken UI. UI-based errors not yet in place - - |{kib-repo}blob/{branch}/x-pack/plugins/canvas/README.md[canvas] |"Never look back. The past is done. The future is a blank canvas." ― Suzy Kassem, Rise Up and Salute the Sun diff --git a/docs/management/managing-beats.asciidoc b/docs/management/managing-beats.asciidoc deleted file mode 100644 index 232efb60cadd3e..00000000000000 --- a/docs/management/managing-beats.asciidoc +++ /dev/null @@ -1,108 +0,0 @@ -[[managing-beats]] -[role="xpack"] -== {beats} Central Management - -include::{asciidoc-dir}/../../shared/discontinued.asciidoc[tag=cm-discontinued] - -To use {beats} Central Management, open the main menu, click *Stack Management > -{beats} Central Management*, then define and -manage configurations in a central location in {kib} and quickly deploy -configuration changes to all {beats} running across your enterprise. For more -about central management, see the related {beats} documentation: - -* {filebeat-ref}/configuration-central-management.html[{filebeat} documentation] -* {metricbeat-ref}/configuration-central-management.html[{metricbeat} documentation] - -[NOTE] -==== -This feature requires an Elastic license that includes {beats} central -management. - -Don't have a license? You can start a 30-day trial. Open the main menu, then -click *Stack Management > License Management*. At the end of the trial -period, you can purchase a subscription to keep using central management. For -more information, see https://www.elastic.co/subscriptions and -<>. -==== - -{kib} makes it easy for you to use central management by walking you through the -enrollment and configuration process step by step the first time you use the -Central Management UI. - -[float] -=== Required permissions - -You must have the `beats_admin` role assigned to use **{beats} Central Management** - -To assign the role, open the menu, then click *Stack Management > Users*. - - -[float] -=== Enroll {beats} - -You need to enroll {beats} to register them in central management and establish -trust. Enrolled {beats} will have the credentials needed to retrieve -configurations from {kib}. - -[float] -=== Create configuration tags - -A _configuration tag_ is a group of configuration blocks that you can apply to -one or more {beats}. For example, you can create a tag called `development` to -group configurations for {beats} running in your development environment. - -The first time you walk through the enrollment process, you'll create a -configuration tag that's applied to the {beats} instance you're enrolling. - -After that, under *Configuration tags*, you can create additional tags and -apply them to any enrolled {beats}, and the {beats} will use the configurations -defined in the tag. - -[float] -=== Add configuration blocks - -Add one or more configuration blocks to the tag. A tag can have configuration -blocks for different types of {beats}. When the enrolled {beats} run, they will -use the configuration blocks that are valid for their type. - -Central management supports configuration settings for: - -* {filebeat} modules -* {metricbeat} modules -* {filebeat} inputs -* {filebeat} and {metricbeat} outputs - -NOTE: Central management supports the following outputs only: {es}, {ls}, Kafka, -and Redis. Other output types are not supported for {beats} that are enrolled in -central management. - -Use the Central Management UI to define and manage settings for supported -configuration blocks. You cannot define those settings in local {beats} -configuration files. For configuration blocks that are not supported by central -management, configure the settings in the local configuration file after -enrolling the Beat in central management. - -[float] -=== Manage enrolled {beats} - -Under *Enrolled {beats}*, you can view the list of enrolled {beats} to see -details, including the type, applied tags, configuration status, and the last -configuration update. Click the *Beat name* or *Type* column heading to sort the -list. To filter the list, enter a search string. If there are errors in a -configuration, you’ll see an Error status in the Central Management UI and need -to look at {beats} logs to troubleshoot the problem. - -You can add or remove tags, and the configuration changes are automatically -deployed to all {beats} that have the tag. Avoid applying tags with conflicting -configurations. Because the configurations for all assigned tags are merged, -conflicting configurations result in errors. - -You can unenroll {beats} to remove them from central management. - -[float] -=== Manage tags - -Under *Configuration tags*, you can select tags and delete them, or you can -drill down into a tag to add, modify, or remove configuration blocks from the -tag. When you change the configuration blocks or remove tags, the configuration -changes are automatically deployed to all {beats} that have the tag. diff --git a/docs/user/management.asciidoc b/docs/user/management.asciidoc index 397ab1717183b8..c5fabb15dc4de2 100644 --- a/docs/user/management.asciidoc +++ b/docs/user/management.asciidoc @@ -24,10 +24,6 @@ and enrichments on your data. | {logstash-ref}/logstash-centralized-pipeline-management.html[Logstash Pipelines] | Create, edit, and delete your Logstash pipeline configurations. -| <> -| Manage your Beats configurations in a central location and -quickly deploy configuration changes to all Beats running across your enterprise. - |=== @@ -182,8 +178,6 @@ next major version of {es}, and then reindex, if needed. include::{kib-repo-dir}/management/advanced-options.asciidoc[] -include::{kib-repo-dir}/management/managing-beats.asciidoc[] - include::{kib-repo-dir}/management/action-types.asciidoc[] include::{kib-repo-dir}/management/managing-licenses.asciidoc[] diff --git a/packages/kbn-optimizer/limits.yml b/packages/kbn-optimizer/limits.yml index 2e76c26dd7b389..c28fd835919602 100644 --- a/packages/kbn-optimizer/limits.yml +++ b/packages/kbn-optimizer/limits.yml @@ -3,7 +3,6 @@ pageLoadAssetSize: alerting: 106936 apm: 64385 apmOss: 18996 - beatsManagement: 188135 bfetch: 41874 canvas: 1066647 charts: 195358 diff --git a/tsconfig.json b/tsconfig.json index ceb03107076c2f..37fc9ee05a29b0 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -73,7 +73,6 @@ { "path": "./x-pack/plugins/actions/tsconfig.json" }, { "path": "./x-pack/plugins/alerting/tsconfig.json" }, { "path": "./x-pack/plugins/apm/tsconfig.json" }, - { "path": "./x-pack/plugins/beats_management/tsconfig.json" }, { "path": "./x-pack/plugins/canvas/tsconfig.json" }, { "path": "./x-pack/plugins/cases/tsconfig.json" }, { "path": "./x-pack/plugins/cloud/tsconfig.json" }, diff --git a/tsconfig.refs.json b/tsconfig.refs.json index 7343165e4a4ad9..1b8a76d601e38c 100644 --- a/tsconfig.refs.json +++ b/tsconfig.refs.json @@ -58,7 +58,6 @@ { "path": "./x-pack/plugins/actions/tsconfig.json" }, { "path": "./x-pack/plugins/alerting/tsconfig.json" }, { "path": "./x-pack/plugins/apm/tsconfig.json" }, - { "path": "./x-pack/plugins/beats_management/tsconfig.json" }, { "path": "./x-pack/plugins/canvas/tsconfig.json" }, { "path": "./x-pack/plugins/cases/tsconfig.json" }, { "path": "./x-pack/plugins/cloud/tsconfig.json" }, diff --git a/x-pack/.i18nrc.json b/x-pack/.i18nrc.json index 2db2f31ae09c3d..b2c3a36ae34144 100644 --- a/x-pack/.i18nrc.json +++ b/x-pack/.i18nrc.json @@ -7,7 +7,6 @@ "xpack.eventLog": "plugins/event_log", "xpack.stackAlerts": "plugins/stack_alerts", "xpack.apm": "plugins/apm", - "xpack.beatsManagement": "plugins/beats_management", "xpack.canvas": "plugins/canvas", "xpack.cases": "plugins/cases", "xpack.cloud": "plugins/cloud", diff --git a/x-pack/plugins/beats_management/common/config_schemas.ts b/x-pack/plugins/beats_management/common/config_schemas.ts deleted file mode 100644 index 95330655a77967..00000000000000 --- a/x-pack/plugins/beats_management/common/config_schemas.ts +++ /dev/null @@ -1,384 +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. - */ - -// Note: importing this is a temp thing. This file will be replaced with JSON from Beats/ES at some point -import { ConfigBlockSchema } from './domain_types'; - -export const configBlockSchemas: ConfigBlockSchema[] = [ - { - id: 'filebeat.inputs', - name: 'Filebeat Input', - version: 6.7, - allowOtherConfigs: true, - configs: [ - { - id: 'paths', - ui: { - label: 'Paths', - labelId: 'filebeatInputConfig.paths.ui.label', - type: 'multi-input', - helpText: 'filebeatInputConfig.paths.ui.helpText', - helpTextId: 'filebeatInputConfig.paths.ui.helpText', - placeholder: `first/path/to/file.json second/path/to/otherfile.json`, - }, - validation: 'isPaths', - error: 'filebeatInputConfig.paths.error', - errorId: 'filebeatInputConfig.paths.error', - required: true, - }, - ], - }, - { - id: 'filebeat.modules', - name: 'Filebeat Modules', - version: 6.7, - allowOtherConfigs: true, - configs: [ - { - id: '_sub_type', - ui: { - label: 'filebeatModuleConfig.module.ui.label', - labelId: 'filebeatModuleConfig.module.ui.label', - type: 'select', - }, - options: [ - { - value: 'apache2', - text: 'apache2', - }, - { - value: 'auditd', - text: 'auditd', - }, - { - value: 'elasticsearch', - text: 'elasticsearch', - }, - { - value: 'haproxy', - text: 'haproxy', - }, - { - value: 'icinga', - text: 'icinga', - }, - { - value: 'iis', - text: 'iis', - }, - { - value: 'kafka', - text: 'kafka', - }, - { - value: 'kibana', - text: 'kibana', - }, - { - value: 'logstash', - text: 'logstash', - }, - { - value: 'mongodb', - text: 'mongodb', - }, - { - value: 'mysql', - text: 'mysql', - }, - { - value: 'nginx', - text: 'nginx', - }, - { - value: 'osquery', - text: 'osquery', - }, - { - value: 'postgresql', - text: 'postgresql', - }, - { - value: 'redis', - text: 'redis', - }, - { - value: 'system', - text: 'system', - }, - { - value: 'traefik', - text: 'traefik', - }, - ], - error: 'filebeatModuleConfig.module.error', - errorId: 'filebeatModuleConfig.module.error', - required: true, - }, - ], - }, - { - id: 'metricbeat.modules', - name: 'Metricbeat Modules', - version: 6.7, - allowOtherConfigs: true, - configs: [ - { - id: '_sub_type', - ui: { - label: 'metricbeatModuleConfig.module.ui.label', - labelId: 'metricbeatModuleConfig.module.ui.label', - type: 'select', - }, - options: [ - { - value: 'aerospike', - text: 'aerospike', - }, - { - value: 'apache', - text: 'apache', - }, - { - value: 'ceph', - text: 'ceph', - }, - { - value: 'couchbase', - text: 'couchbase', - }, - { - value: 'docker', - text: 'docker', - }, - { - value: 'dropwizard', - text: 'dropwizard', - }, - { - value: 'elasticsearch', - text: 'elasticsearch', - }, - { - value: 'envoyproxy', - text: 'envoyproxy', - }, - { - value: 'etcd', - text: 'etcd', - }, - { - value: 'golang', - text: 'golang', - }, - { - value: 'graphite', - text: 'graphite', - }, - { - value: 'haproxy', - text: 'haproxy', - }, - { - value: 'http', - text: 'http', - }, - { - value: 'jolokia', - text: 'jolokia', - }, - { - value: 'kafka', - text: 'kafka', - }, - { - value: 'kibana', - text: 'kibana', - }, - { - value: 'kubernetes', - text: 'kubernetes', - }, - { - value: 'kvm', - text: 'kvm', - }, - { - value: 'logstash', - text: 'logstash', - }, - { - value: 'memcached', - text: 'memcached', - }, - { - value: 'mongodb', - text: 'mongodb', - }, - { - value: 'munin', - text: 'munin', - }, - { - value: 'mysql', - text: 'mysql', - }, - { - value: 'nginx', - text: 'nginx', - }, - { - value: 'php_fpm', - text: 'php_fpm', - }, - { - value: 'postgresql', - text: 'postgresql', - }, - { - value: 'prometheus', - text: 'prometheus', - }, - { - value: 'rabbitmq', - text: 'rabbitmq', - }, - { - value: 'redis', - text: 'redis', - }, - { - value: 'system', - text: 'system', - }, - { - value: 'traefik', - text: 'traefik', - }, - { - value: 'uwsgi', - text: 'uwsgi', - }, - { - value: 'vsphere', - text: 'vsphere', - }, - { - value: 'windows', - text: 'windows', - }, - { - value: 'zookeeper', - text: 'zookeeper', - }, - ], - error: 'metricbeatModuleConfig.module.error', - errorId: 'metricbeatModuleConfig.module.error', - required: true, - }, - { - id: 'hosts', - ui: { - label: 'metricbeatModuleConfig.hosts.ui.label', - labelId: 'metricbeatModuleConfig.hosts.ui.label', - type: 'multi-input', - helpText: 'metricbeatModuleConfig.hosts.ui.helpText', - helpTextId: 'metricbeatModuleConfig.hosts.ui.helpText', - placeholder: `somehost.local otherhost.local`, - }, - validation: 'isHosts', - error: 'metricbeatModuleConfig.hosts.error', - errorId: 'metricbeatModuleConfig.hosts.error', - required: false, - }, - { - id: 'period', - ui: { - label: 'metricbeatModuleConfig.period.ui.label', - labelId: 'metricbeatModuleConfig.period.ui.label', - type: 'input', - }, - defaultValue: '10s', - validation: 'isPeriod', - error: 'metricbeatModuleConfig.period.error', - errorId: 'metricbeatModuleConfig.period.error', - required: true, - }, - ], - }, - { - id: 'output', - name: 'Outputs', - allowOtherConfigs: true, - version: 6.7, - configs: [ - { - id: '_sub_type', - ui: { - label: 'outputConfig.output.ui.label', - labelId: 'outputConfig.output.ui.label', - type: 'select', - }, - options: [ - { - value: 'elasticsearch', - text: 'Elasticsearch', - }, - { - value: 'logstash', - text: 'Logstash', - }, - { - value: 'kafka', - text: 'Kafka', - }, - { - value: 'redis', - text: 'Redis', - }, - ], - error: 'outputConfig.output.error', - errorId: 'outputConfig.output.error', - required: true, - }, - { - id: 'hosts', - ui: { - label: 'outputConfig.hosts.ui.label', - labelId: 'outputConfig.hosts.ui.label', - type: 'multi-input', - }, - validation: 'isHosts', - error: 'outputConfig.hosts.error', - errorId: 'outputConfig.hosts.error', - parseValidResult: (v) => v.split('\n'), - }, - { - id: 'username', - ui: { - label: 'outputConfig.username.ui.label', - labelId: 'outputConfig.username.ui.label', - type: 'input', - }, - validation: 'isString', - error: 'outputConfig.username.error', - errorId: 'outputConfig.username.error', - }, - { - id: 'password', - ui: { - label: 'outputConfig.password.ui.label', - labelId: 'outputConfig.password.ui.label', - type: 'password', - }, - validation: 'isString', - error: 'outputConfig.password.error', - errorId: 'outputConfig.password.error', - }, - ], - }, -]; diff --git a/x-pack/plugins/beats_management/common/config_schemas_translations_map.ts b/x-pack/plugins/beats_management/common/config_schemas_translations_map.ts deleted file mode 100644 index ca2d48998ee062..00000000000000 --- a/x-pack/plugins/beats_management/common/config_schemas_translations_map.ts +++ /dev/null @@ -1,243 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { i18n } from '@kbn/i18n'; -import { ConfigBlockSchema } from './domain_types'; - -const supportedConfigLabelsMap = new Map([ - [ - 'filebeatInputConfig.paths.ui.label', - i18n.translate('xpack.beatsManagement.filebeatInputConfig.pathsLabel', { - defaultMessage: 'Paths', - }), - ], - [ - 'filebeatInputConfig.paths.ui.helpText', - i18n.translate('xpack.beatsManagement.filebeatInputConfig.pathsDescription', { - defaultMessage: 'Put each of the paths on a separate line', - }), - ], - [ - 'filebeatInputConfig.paths.error', - i18n.translate('xpack.beatsManagement.filebeatInputConfig.pathsErrorMessage', { - defaultMessage: 'One file path per line', - }), - ], - [ - 'filebeatInputConfig.other.ui.label', - i18n.translate('xpack.beatsManagement.filebeatInputConfig.otherConfigLabel', { - defaultMessage: 'Other Config', - }), - ], - [ - 'filebeatInputConfig.other.ui.helpText', - i18n.translate('xpack.beatsManagement.filebeatInputConfig.otherConfigDescription', { - defaultMessage: 'Use YAML format to specify other settings for the Filebeat Input', - }), - ], - [ - 'filebeatInputConfig.other.error', - i18n.translate('xpack.beatsManagement.filebeatInputConfig.otherConfigErrorMessage', { - defaultMessage: 'Use valid YAML format', - }), - ], - [ - 'filebeatModuleConfig.module.ui.label', - i18n.translate('xpack.beatsManagement.filebeatModuleConfig.moduleLabel', { - defaultMessage: 'Module', - }), - ], - [ - 'filebeatModuleConfig.module.error', - i18n.translate('xpack.beatsManagement.filebeatModuleConfig.moduleErrorMessage', { - defaultMessage: 'Please select a module', - }), - ], - [ - 'filebeatModuleConfig.other.ui.label', - i18n.translate('xpack.beatsManagement.filebeatModuleConfig.otherConfigLabel', { - defaultMessage: 'Other Config', - }), - ], - [ - 'filebeatModuleConfig.other.ui.helpText', - i18n.translate('xpack.beatsManagement.filebeatModuleConfig.moduleDescription', { - defaultMessage: 'Use YAML format to specify other settings for the Filebeat Module', - }), - ], - [ - 'filebeatModuleConfig.other.error', - i18n.translate('xpack.beatsManagement.filebeatModuleConfig.otherConfigErrorMessage', { - defaultMessage: 'Use valid YAML format', - }), - ], - - [ - 'metricbeatModuleConfig.module.ui.label', - i18n.translate('xpack.beatsManagement.metricbeatModuleConfig.moduleLabel', { - defaultMessage: 'Module', - }), - ], - [ - 'metricbeatModuleConfig.module.error', - i18n.translate('xpack.beatsManagement.metricbeatModuleConfig.moduleErrorMessage', { - defaultMessage: 'Please select a module', - }), - ], - [ - 'metricbeatModuleConfig.hosts.ui.label', - i18n.translate('xpack.beatsManagement.metricbeatModuleConfig.hostsLabel', { - defaultMessage: 'Hosts', - }), - ], - [ - 'metricbeatModuleConfig.hosts.ui.helpText', - i18n.translate('xpack.beatsManagement.metricbeatModuleConfig.hostsDescription', { - defaultMessage: 'Put each of the paths on a seperate line', - }), - ], - [ - 'metricbeatModuleConfig.hosts.error', - i18n.translate('xpack.beatsManagement.metricbeatModuleConfig.hostsErrorMessage', { - defaultMessage: 'One file host per line', - }), - ], - [ - 'metricbeatModuleConfig.period.ui.label', - i18n.translate('xpack.beatsManagement.metricbeatModuleConfig.periodLabel', { - defaultMessage: 'Period', - }), - ], - [ - 'metricbeatModuleConfig.period.error', - i18n.translate('xpack.beatsManagement.metricbeatModuleConfig.periodErrorMessage', { - defaultMessage: 'Invalid Period, must be formatted as `10s` for 10 seconds', - }), - ], - [ - 'metricbeatModuleConfig.other.ui.label', - i18n.translate('xpack.beatsManagement.metricbeatModuleConfig.otherConfigLabel', { - defaultMessage: 'Other Config', - }), - ], - [ - 'metricbeatModuleConfig.other.ui.helpText', - i18n.translate('xpack.beatsManagement.metricbeatModuleConfig.otherConfigDescription', { - defaultMessage: 'Use YAML format to specify other settings for the Metricbeat Module', - }), - ], - [ - 'metricbeatModuleConfig.other.error', - i18n.translate('xpack.beatsManagement.metricbeatModuleConfig.otherConfigErrorMessage', { - defaultMessage: 'Use valid YAML format', - }), - ], - - [ - 'outputConfig.output.ui.label', - i18n.translate('xpack.beatsManagement.outputConfig.outputTypeLabel', { - defaultMessage: 'Output Type', - }), - ], - [ - 'outputConfig.output.error', - i18n.translate('xpack.beatsManagement.outputConfig.outputTypeErrorMessage', { - defaultMessage: 'Please select an output type', - }), - ], - [ - 'outputConfig.hosts.ui.label', - i18n.translate('xpack.beatsManagement.outputConfig.hostsLabel', { - defaultMessage: 'Hosts', - }), - ], - [ - 'outputConfig.hosts.error', - i18n.translate('xpack.beatsManagement.outputConfig.hostsErrorMessage', { - defaultMessage: 'One file host per line', - }), - ], - [ - 'outputConfig.username.ui.label', - i18n.translate('xpack.beatsManagement.outputConfig.usernameLabel', { - defaultMessage: 'Username', - }), - ], - [ - 'outputConfig.username.error', - i18n.translate('xpack.beatsManagement.outputConfig.usernameErrorMessage', { - defaultMessage: 'Unprocessable username', - }), - ], - [ - 'outputConfig.password.ui.label', - i18n.translate('xpack.beatsManagement.outputConfig.passwordLabel', { - defaultMessage: 'Password', - }), - ], - [ - 'outputConfig.password.error', - i18n.translate('xpack.beatsManagement.outputConfig.passwordErrorMessage', { - defaultMessage: 'Unprocessable password', - }), - ], - - [ - 'supportedConfigs.filebeat.input.text', - i18n.translate('xpack.beatsManagement.tagConfig.filebeatInputLabel', { - defaultMessage: 'Filebeat Input', - }), - ], - [ - 'supportedConfigs.filebeat.modules.text', - i18n.translate('xpack.beatsManagement.tagConfig.filebeatModuleLabel', { - defaultMessage: 'Filebeat Module', - }), - ], - [ - 'supportedConfigs.metricbeatModule.text', - i18n.translate('xpack.beatsManagement.tagConfig.metricbeatModuleLabel', { - defaultMessage: 'Metricbeat Module', - }), - ], - [ - 'supportedConfigs.output.text', - i18n.translate('xpack.beatsManagement.tagConfig.outputLabel', { - defaultMessage: 'Output', - }), - ], -]); - -export let translatedConfigs: ConfigBlockSchema[]; -export const translateConfigSchema = (schemas: ConfigBlockSchema[]) => { - if (translatedConfigs) { - return translatedConfigs; - } - - translatedConfigs = schemas.map((schema) => { - schema.name = supportedConfigLabelsMap.get(`supportedConfigs.${schema.id}.text`) || schema.name; - - schema.configs = schema.configs.map((configBlock) => { - if (configBlock.ui.label) { - configBlock.ui.label = - supportedConfigLabelsMap.get(configBlock.ui.labelId || '') || configBlock.ui.label; - } - if (configBlock.ui.helpText) { - configBlock.ui.helpText = - supportedConfigLabelsMap.get(configBlock.ui.helpTextId || '') || configBlock.ui.helpText; - } - if (configBlock.error) { - configBlock.error = - supportedConfigLabelsMap.get(configBlock.errorId || '') || configBlock.error; - } - return configBlock; - }); - return schema; - }); - - return translatedConfigs; -}; diff --git a/x-pack/plugins/beats_management/common/constants/configuration_blocks.ts b/x-pack/plugins/beats_management/common/constants/configuration_blocks.ts deleted file mode 100644 index 7f0a1442a374ef..00000000000000 --- a/x-pack/plugins/beats_management/common/constants/configuration_blocks.ts +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export const UNIQUENESS_ENFORCING_TYPES = ['output']; diff --git a/x-pack/plugins/beats_management/common/constants/index.ts b/x-pack/plugins/beats_management/common/constants/index.ts deleted file mode 100644 index ac4f89b639c22a..00000000000000 --- a/x-pack/plugins/beats_management/common/constants/index.ts +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export { UNIQUENESS_ENFORCING_TYPES } from './configuration_blocks'; -export { INDEX_NAMES } from './index_names'; -export { PLUGIN, MANAGEMENT_SECTION } from './plugin'; -export { LICENSES, REQUIRED_LICENSES, REQUIRED_ROLES } from './security'; -export { TABLE_CONFIG } from './table'; -export const BASE_PATH = '/management/ingest/beats_management'; diff --git a/x-pack/plugins/beats_management/common/constants/index_names.ts b/x-pack/plugins/beats_management/common/constants/index_names.ts deleted file mode 100644 index f0a00c5ca28913..00000000000000 --- a/x-pack/plugins/beats_management/common/constants/index_names.ts +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export const INDEX_NAMES = { - BEATS: '.management-beats', - EVENTS: '.management-beats-events-*', - EVENTS_ALIAS: '.management-beats-events', -}; - -export const POLICY_NAMES = { - EVENTS: '.beats-management-events-retention', -}; diff --git a/x-pack/plugins/beats_management/common/constants/plugin.ts b/x-pack/plugins/beats_management/common/constants/plugin.ts deleted file mode 100644 index 912bc75b98f601..00000000000000 --- a/x-pack/plugins/beats_management/common/constants/plugin.ts +++ /dev/null @@ -1,12 +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. - */ - -export const PLUGIN = { - ID: 'beats_management', -}; -export const CONFIG_PREFIX = 'xpack.beats'; -export const MANAGEMENT_SECTION = 'beats_management'; diff --git a/x-pack/plugins/beats_management/common/constants/security.ts b/x-pack/plugins/beats_management/common/constants/security.ts deleted file mode 100644 index af4ef129f54b40..00000000000000 --- a/x-pack/plugins/beats_management/common/constants/security.ts +++ /dev/null @@ -1,18 +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. - */ - -export const REQUIRED_ROLES = ['beats_admin']; -export const REQUIRED_LICENSES = ['standard', 'gold', 'trial', 'platinum', 'enterprise']; -export const LICENSES = ['oss', 'basic', 'standard', 'gold', 'trial', 'platinum', 'enterprise']; -export type LicenseType = - | 'oss' - | 'basic' - | 'trial' - | 'standard' - | 'gold' - | 'platinum' - | 'enterprise'; diff --git a/x-pack/plugins/beats_management/common/constants/table.ts b/x-pack/plugins/beats_management/common/constants/table.ts deleted file mode 100644 index 54751c29cd35a6..00000000000000 --- a/x-pack/plugins/beats_management/common/constants/table.ts +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export const TABLE_CONFIG = { - INITIAL_ROW_SIZE: 5, - PAGE_SIZE_OPTIONS: [3, 5, 10, 20], - TRUNCATE_TAG_LENGTH: 33, - TRUNCATE_TAG_LENGTH_SMALL: 20, -}; diff --git a/x-pack/plugins/beats_management/common/domain_types.ts b/x-pack/plugins/beats_management/common/domain_types.ts deleted file mode 100644 index f7efb77f0dc395..00000000000000 --- a/x-pack/plugins/beats_management/common/domain_types.ts +++ /dev/null @@ -1,136 +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 * as t from 'io-ts'; -import { configBlockSchemas } from './config_schemas'; -import { DateFromString } from './io_ts_types'; - -// Here we create the runtime check for a generic, unknown beat config type. -// We can also pass in optional params to create spacific runtime checks that -// can be used to validate blocs on the API and UI -export const createConfigurationBlockInterface = ( - configType: t.LiteralType | t.KeyofC> = t.keyof( - Object.fromEntries(configBlockSchemas.map((s) => [s.id, null])) as Record - ), - beatConfigInterface: t.Mixed = t.Dictionary -) => - t.interface( - { - id: t.union([t.undefined, t.string]), - type: configType, - description: t.union([t.undefined, t.string]), - tag: t.string, - config: beatConfigInterface, - last_updated: t.union([t.undefined, t.number]), - }, - 'ConfigBlock' - ); -const BaseConfigurationBlock = createConfigurationBlockInterface(); -export interface ConfigurationBlock - extends Pick< - t.TypeOf, - Exclude, 'id'> - > { - id: string; -} - -export interface CMBeat { - id: string; - status?: BeatEvent; - enrollment_token: string; - active: boolean; - access_token?: string; - verified_on?: string; - type: string; - version?: string; - host_ip: string; - host_name: string; - ephemeral_id?: string; - last_checkin?: Date; - event_rate?: string; - local_configuration_yml?: string; - tags: string[]; - central_configuration_yml?: string; - metadata?: {}; - name?: string; - last_updated: number; -} - -export interface ConfigBlockSchema { - id: string; - name: string; - version: number; - allowOtherConfigs?: boolean; - configs: BeatConfigSchema[]; -} - -export interface BeatConfigSchema { - id: string; - ui: { - label: string; - labelId?: string; - type: 'input' | 'multi-input' | 'select' | 'code' | 'password'; - helpText?: string; - helpTextId?: string; - placeholder?: string; - }; - options?: Array<{ value: string; text: string }>; - validation?: 'isHosts' | 'isString' | 'isPeriod' | 'isPath' | 'isPaths' | 'isYaml'; - error: string; - errorId: string; - defaultValue?: string; - required?: boolean; - parseValidResult?: (value: any) => any; -} - -export const RuntimeBeatTag = t.interface( - { - id: t.union([t.undefined, t.string]), - name: t.string, - color: t.string, - hasConfigurationBlocksTypes: t.array(t.string), - }, - 'CMBeat' -); -export interface BeatTag - extends Pick< - t.TypeOf, - Exclude, 'id'> - > { - id: string; - // Used by the UI and api when a tag exists but is an invalid option - disabled?: boolean; -} - -export const RuntimeBeatEvent = t.interface( - { - type: t.union([t.literal('STATE'), t.literal('ERROR')]), - beat: t.union([t.undefined, t.string]), - timestamp: DateFromString, - event: t.type({ - type: t.union([ - t.literal('RUNNING'), - t.literal('STARTING'), - t.literal('IN_PROGRESS'), - t.literal('CONFIG'), - t.literal('FAILED'), - t.literal('STOPPED'), - ]), - message: t.string, - uuid: t.union([t.undefined, t.string]), - }), - }, - 'BeatEvent' -); -export interface BeatEvent - extends Pick< - t.TypeOf, - Exclude, 'timestamp'> - > { - beat: string; - timestamp: Date; -} diff --git a/x-pack/plugins/beats_management/common/index.ts b/x-pack/plugins/beats_management/common/index.ts deleted file mode 100644 index a7dde2298054fb..00000000000000 --- a/x-pack/plugins/beats_management/common/index.ts +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { schema, TypeOf } from '@kbn/config-schema'; - -const DEFAULT_ENROLLMENT_TOKENS_TTL_S = 10 * 60; // 10 minutes - -export const beatsManagementConfigSchema = schema.object({ - enabled: schema.boolean({ defaultValue: true }), - defaultUserRoles: schema.arrayOf(schema.string(), { defaultValue: ['superuser'] }), - encryptionKey: schema.string({ defaultValue: 'xpack_beats_default_encryptionKey' }), - enrollmentTokensTtlInSeconds: schema.number({ - min: 1, - max: 10 * 60 * 14, // No more then 2 weeks for security reasons, - defaultValue: DEFAULT_ENROLLMENT_TOKENS_TTL_S, - }), -}); - -export type BeatsManagementConfigType = TypeOf; diff --git a/x-pack/plugins/beats_management/common/io_ts_types.ts b/x-pack/plugins/beats_management/common/io_ts_types.ts deleted file mode 100644 index b1abd3d8b6b3bb..00000000000000 --- a/x-pack/plugins/beats_management/common/io_ts_types.ts +++ /dev/null @@ -1,34 +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 * as t from 'io-ts'; -import { isRight } from 'fp-ts/lib/Either'; - -class DateFromStringType extends t.Type { - public readonly _tag: 'DateFromISOStringType' = 'DateFromISOStringType'; - constructor() { - super( - 'DateFromString', - (u): u is Date => u instanceof Date, - (u, c) => { - const validation = t.string.validate(u, c); - if (!isRight(validation)) { - return validation as any; - } else { - const s = validation.right; - const d = new Date(s); - return isNaN(d.getTime()) ? t.failure(s, c) : t.success(d); - } - }, - (a) => a.toISOString() - ); - } -} -// eslint-disable-next-line -export interface DateFromString extends DateFromStringType {} - -export const DateFromString: DateFromString = new DateFromStringType(); diff --git a/x-pack/plugins/beats_management/common/return_types.ts b/x-pack/plugins/beats_management/common/return_types.ts deleted file mode 100644 index c498038d6a21da..00000000000000 --- a/x-pack/plugins/beats_management/common/return_types.ts +++ /dev/null @@ -1,106 +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. - */ - -export interface BaseReturnType { - error?: { - message: string; - code?: number; - }; - success: boolean; -} - -export interface ReturnTypeCreate extends BaseReturnType { - item: T; - action: 'created'; -} - -export interface ReturnTypeUpdate extends BaseReturnType { - item: T; - action: 'updated'; -} - -export interface ReturnTypeBulkCreate extends BaseReturnType { - results: Array<{ - item: T; - success: boolean; - action: 'created'; - error?: { - message: string; - code?: number; - }; - }>; -} - -export interface ReturnTypeBulkDelete extends BaseReturnType { - results: Array<{ - success: boolean; - action: 'deleted'; - error?: { - message: string; - code?: number; - }; - }>; -} - -// upsert -export interface ReturnTypeUpsert extends BaseReturnType { - item: T; - action: 'created' | 'updated'; -} - -// upsert bulk -export interface ReturnTypeBulkUpsert extends BaseReturnType { - results: Array<{ - success: boolean; - action: 'created' | 'updated'; - error?: { - message: string; - code?: number; - }; - }>; -} - -// list -export interface ReturnTypeList extends BaseReturnType { - list: T[]; - page: number; - total: number; -} - -// get -export interface ReturnTypeGet extends BaseReturnType { - item: T; -} - -export interface ReturnTypeBulkGet extends BaseReturnType { - items: T[]; -} - -// e.g. -// { -// result: { -// username: { valid: true }, -// password: { valid: false, error: 'something' }, -// hosts: [ -// { valid: false }, { valid: true }, -// ] -// } -// } - -// bulk action -- e.g. assign tags to beats -export interface ReturnTypeBulkAction extends BaseReturnType { - results?: Array<{ - success: boolean; - result?: { - [key: string]: any; - }; - error?: { - message: string; - code?: number; - }; - }>; -} diff --git a/x-pack/plugins/beats_management/jest.config.js b/x-pack/plugins/beats_management/jest.config.js deleted file mode 100644 index be070350450038..00000000000000 --- a/x-pack/plugins/beats_management/jest.config.js +++ /dev/null @@ -1,12 +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. - */ - -module.exports = { - preset: '@kbn/test', - rootDir: '../../..', - roots: ['/x-pack/plugins/beats_management'], -}; diff --git a/x-pack/plugins/beats_management/kibana.json b/x-pack/plugins/beats_management/kibana.json deleted file mode 100644 index c1070eedf07a62..00000000000000 --- a/x-pack/plugins/beats_management/kibana.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "id": "beatsManagement", - "configPath": ["xpack", "beats_management"], - "ui": true, - "server": true, - "version": "kibana", - "requiredPlugins": [ - "data", - "licensing", - "management", - "features" - ], - "optionalPlugins": [ - "security" - ] -} diff --git a/x-pack/plugins/beats_management/public/application.tsx b/x-pack/plugins/beats_management/public/application.tsx deleted file mode 100644 index 5a9b0a768856ed..00000000000000 --- a/x-pack/plugins/beats_management/public/application.tsx +++ /dev/null @@ -1,89 +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 * as euiVars from '@elastic/eui/dist/eui_theme_light.json'; -import { i18n } from '@kbn/i18n'; -import { FormattedMessage } from '@kbn/i18n/react'; -import React from 'react'; -import ReactDOM from 'react-dom'; -import { Router } from 'react-router-dom'; -import { ThemeProvider } from 'styled-components'; -import { Provider as UnstatedProvider, Subscribe } from 'unstated'; -import { EuiCallOut, EuiLink, EuiSpacer } from '@elastic/eui'; -import { Background } from './components/layouts/background'; -import { BreadcrumbProvider } from './components/navigation/breadcrumb'; -import { Breadcrumb } from './components/navigation/breadcrumb/breadcrumb'; -import { BeatsContainer } from './containers/beats'; -import { TagsContainer } from './containers/tags'; -import { FrontendLibs } from './lib/types'; -import { AppRouter } from './router'; -import { services } from './kbn_services'; -import { ManagementAppMountParams } from '../../../../src/plugins/management/public'; - -export const renderApp = ({ element, history }: ManagementAppMountParams, libs: FrontendLibs) => { - ReactDOM.render( - - - - - - - {(beats: BeatsContainer, tags: TagsContainer) => ( - - - -

- - - - ), - }} - /> -

- - - - - )} - - - - - - , - element - ); - - return () => { - ReactDOM.unmountComponentAtNode(element); - }; -}; diff --git a/x-pack/plugins/beats_management/public/bootstrap.tsx b/x-pack/plugins/beats_management/public/bootstrap.tsx deleted file mode 100644 index b5bdd39fa0817e..00000000000000 --- a/x-pack/plugins/beats_management/public/bootstrap.tsx +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { FrontendLibs } from './lib/types'; -import { compose } from './lib/compose/kibana'; - -import { setServices } from './kbn_services'; -import { ManagementSetup } from '../../../../src/plugins/management/public'; -import { SecurityPluginSetup } from '../../security/public'; -import { CoreSetup } from '../../../../src/core/public'; -import { DataPublicPluginStart } from '../../../../src/plugins/data/public'; -import { LicensingPluginSetup } from '../../licensing/public'; -import { BeatsManagementConfigType } from '../common'; -import { MANAGEMENT_SECTION } from '../common/constants'; - -async function startApp(libs: FrontendLibs, core: CoreSetup) { - const startServices = await core.getStartServices(); - - if (startServices[0].http.anonymousPaths.isAnonymous(window.location.pathname)) { - return; - } - // Can't run until the `start` lifecycle, so we wait for start services to resolve above before calling this. - await libs.framework.waitUntilFrameworkReady(); - - const capabilities = startServices[0].application.capabilities; - const hasBeatsCapability = capabilities.management.ingest?.[MANAGEMENT_SECTION] ?? false; - - if (libs.framework.licenseIsAtLeast('standard') && hasBeatsCapability) { - const mount = async (params: any) => { - const [coreStart, pluginsStart] = await core.getStartServices(); - setServices(coreStart, pluginsStart, params); - const { renderApp } = await import('./application'); - return renderApp(params, libs); - }; - - libs.framework.registerManagementUI(mount); - } -} - -interface SetupDeps { - management: ManagementSetup; - licensing: LicensingPluginSetup; - security?: SecurityPluginSetup; -} - -interface StartDeps { - data: DataPublicPluginStart; -} - -export const bootstrap = ( - core: CoreSetup, - plugins: SetupDeps, - config: BeatsManagementConfigType, - version: string -) => { - startApp( - compose({ - core, - config, - version, - ...plugins, - }), - core - ); -}; diff --git a/x-pack/plugins/beats_management/public/components/autocomplete_field/index.tsx b/x-pack/plugins/beats_management/public/components/autocomplete_field/index.tsx deleted file mode 100644 index 320296274e262b..00000000000000 --- a/x-pack/plugins/beats_management/public/components/autocomplete_field/index.tsx +++ /dev/null @@ -1,290 +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 { - EuiFieldSearch, - EuiFieldSearchProps, - EuiOutsideClickDetector, - EuiPanel, -} from '@elastic/eui'; -import React from 'react'; -import styled from 'styled-components'; - -import { QuerySuggestion } from '../../../../../../src/plugins/data/public'; - -import { composeStateUpdaters } from '../../utils/typed_react'; -import { SuggestionItem } from './suggestion_item'; - -interface AutocompleteFieldProps { - isLoadingSuggestions: boolean; - isValid: boolean; - loadSuggestions: (value: string, cursorPosition: number, maxCount?: number) => void; - onSubmit?: (value: string) => void; - onChange?: (value: string) => void; - placeholder?: string; - suggestions: QuerySuggestion[]; - value: string; -} - -interface AutocompleteFieldState { - areSuggestionsVisible: boolean; - selectedIndex: number | null; -} - -export class AutocompleteField extends React.Component< - AutocompleteFieldProps, - AutocompleteFieldState -> { - public readonly state: AutocompleteFieldState = { - areSuggestionsVisible: false, - selectedIndex: null, - }; - - private inputElement: HTMLInputElement | null = null; - - public render() { - const { suggestions, isLoadingSuggestions, isValid, placeholder, value } = this.props; - const { areSuggestionsVisible, selectedIndex } = this.state; - - return ( - - - - {areSuggestionsVisible && !isLoadingSuggestions && suggestions.length > 0 ? ( - - {suggestions.map((suggestion, suggestionIndex) => ( - - ))} - - ) : null} - - - ); - } - - public componentDidUpdate(prevProps: AutocompleteFieldProps, prevState: AutocompleteFieldState) { - const hasNewSuggestions = prevProps.suggestions !== this.props.suggestions; - const hasNewValue = prevProps.value !== this.props.value; - - if (hasNewValue) { - this.updateSuggestions(); - } - - if (hasNewSuggestions) { - this.showSuggestions(); - } - } - - private handleChangeInputRef = (element: HTMLInputElement | null) => { - this.inputElement = element; - }; - - private handleChange = (evt: React.ChangeEvent) => { - this.changeValue(evt.currentTarget.value); - }; - - private handleKeyDown = (evt: React.KeyboardEvent) => { - const { suggestions } = this.props; - - switch (evt.key) { - case 'ArrowUp': - evt.preventDefault(); - if (suggestions.length > 0) { - this.setState( - composeStateUpdaters(withSuggestionsVisible, withPreviousSuggestionSelected) - ); - } - break; - case 'ArrowDown': - evt.preventDefault(); - if (suggestions.length > 0) { - this.setState(composeStateUpdaters(withSuggestionsVisible, withNextSuggestionSelected)); - } else { - this.updateSuggestions(); - } - break; - case 'Enter': - evt.preventDefault(); - if (this.state.selectedIndex !== null) { - this.applySelectedSuggestion(); - } else { - this.submit(); - } - break; - case 'Escape': - evt.preventDefault(); - this.setState(withSuggestionsHidden); - break; - } - }; - - private handleKeyUp = (evt: React.KeyboardEvent) => { - switch (evt.key) { - case 'ArrowLeft': - case 'ArrowRight': - case 'Home': - case 'End': - this.updateSuggestions(); - break; - } - }; - - private selectSuggestionAt = (index: number) => () => { - this.setState(withSuggestionAtIndexSelected(index)); - }; - - private applySelectedSuggestion = () => { - if (this.state.selectedIndex !== null) { - this.applySuggestionAt(this.state.selectedIndex)(); - } - }; - - private applySuggestionAt = (index: number) => () => { - const { value, suggestions } = this.props; - const selectedSuggestion = suggestions[index]; - - if (!selectedSuggestion) { - return; - } - - const newValue = - value.substr(0, selectedSuggestion.start) + - selectedSuggestion.text + - value.substr(selectedSuggestion.end); - - this.setState(withSuggestionsHidden); - this.changeValue(newValue); - this.focusInputElement(); - }; - - private changeValue = (value: string) => { - const { onChange } = this.props; - if (onChange) { - onChange(value); - } - }; - - private focusInputElement = () => { - if (this.inputElement) { - this.inputElement.focus(); - } - }; - - private showSuggestions = () => { - this.setState(withSuggestionsVisible); - }; - - private hideSuggestions = () => { - this.setState(withSuggestionsHidden); - }; - - private submit = () => { - const { isValid, onSubmit, value } = this.props; - - if (isValid && onSubmit) { - onSubmit(value); - } - - this.setState(withSuggestionsHidden); - }; - - private updateSuggestions = (value?: string) => { - const inputCursorPosition = this.inputElement ? this.inputElement.selectionStart || 0 : 0; - this.props.loadSuggestions(value || this.props.value, inputCursorPosition, 10); - }; -} - -const withPreviousSuggestionSelected = ( - state: AutocompleteFieldState, - props: AutocompleteFieldProps -): AutocompleteFieldState => ({ - ...state, - selectedIndex: - props.suggestions.length === 0 - ? null - : state.selectedIndex !== null - ? (state.selectedIndex + props.suggestions.length - 1) % props.suggestions.length - : Math.max(props.suggestions.length - 1, 0), -}); - -const withNextSuggestionSelected = ( - state: AutocompleteFieldState, - props: AutocompleteFieldProps -): AutocompleteFieldState => ({ - ...state, - selectedIndex: - props.suggestions.length === 0 - ? null - : state.selectedIndex !== null - ? (state.selectedIndex + 1) % props.suggestions.length - : 0, -}); - -const withSuggestionAtIndexSelected = (suggestionIndex: number) => ( - state: AutocompleteFieldState, - props: AutocompleteFieldProps -): AutocompleteFieldState => ({ - ...state, - selectedIndex: - props.suggestions.length === 0 - ? null - : suggestionIndex >= 0 && suggestionIndex < props.suggestions.length - ? suggestionIndex - : 0, -}); - -const withSuggestionsVisible = (state: AutocompleteFieldState) => ({ - ...state, - areSuggestionsVisible: true, -}); - -const withSuggestionsHidden = (state: AutocompleteFieldState) => ({ - ...state, - areSuggestionsVisible: false, - selectedIndex: null, -}); - -const FixedEuiFieldSearch: React.FC< - React.InputHTMLAttributes & - EuiFieldSearchProps & { - inputRef?: (element: HTMLInputElement | null) => void; - onSearch: (value: string) => void; - } -> = EuiFieldSearch as any; - -const AutocompleteContainer = styled.div` - position: relative; -`; - -const SuggestionsPanel = styled(EuiPanel).attrs(() => ({ - paddingSize: 'none', - hasShadow: true, -}))` - position: absolute; - width: 100%; - margin-top: 2px; - overflow: hidden; - z-index: 1000; -`; diff --git a/x-pack/plugins/beats_management/public/components/autocomplete_field/suggestion_item.tsx b/x-pack/plugins/beats_management/public/components/autocomplete_field/suggestion_item.tsx deleted file mode 100644 index b870982d63d22d..00000000000000 --- a/x-pack/plugins/beats_management/public/components/autocomplete_field/suggestion_item.tsx +++ /dev/null @@ -1,119 +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 { EuiIcon } from '@elastic/eui'; -import { tint } from 'polished'; -import React from 'react'; -import styled from 'styled-components'; - -import { QuerySuggestion } from '../../../../../../src/plugins/data/public'; - -interface SuggestionItemProps { - isSelected?: boolean; - onClick?: React.MouseEventHandler; - onMouseEnter?: React.MouseEventHandler; - suggestion: QuerySuggestion; -} - -export const SuggestionItem: React.FC = (props) => { - const { isSelected, onClick, onMouseEnter, suggestion } = props; - - return ( - - - - - {suggestion.text} - {suggestion.description} - - ); -}; - -SuggestionItem.defaultProps = { - isSelected: false, -}; - -const SuggestionItemContainer = styled.div<{ - isSelected?: boolean; -}>` - display: flex; - flex-direction: row; - font-size: ${(props) => props.theme.eui.default.euiFontSizeS}; - height: ${(props) => props.theme.eui.default.euiSizeXl}; - white-space: nowrap; - background-color: ${(props) => - props.isSelected ? props.theme.eui.default.euiColorLightestShade : 'transparent'}; -`; - -const SuggestionItemField = styled.div` - align-items: center; - cursor: pointer; - display: flex; - flex-direction: row; - height: ${(props) => props.theme.eui.default.euiSizeXl}; - padding: ${(props) => props.theme.eui.default.euiSizeXs}; -`; - -const SuggestionItemIconField = styled(SuggestionItemField)<{ suggestionType: string }>` - background-color: ${(props) => { - return tint(0.1, getEuiIconColor(props.theme, props.suggestionType)); - }}; - color: ${(props) => { - return getEuiIconColor(props.theme, props.suggestionType); - }}; - flex: 0 0 auto; - justify-content: center; - width: ${(props) => props.theme.eui.default.euiSizeXl}; -`; - -const SuggestionItemTextField = styled(SuggestionItemField)` - flex: 2 0 0; - font-family: ${(props) => props.theme.eui.default.euiCodeFontFamily}; -`; - -const SuggestionItemDescriptionField = styled(SuggestionItemField)` - flex: 3 0 0; - p { - display: inline; - span { - font-family: ${(props) => props.theme.eui.default.euiCodeFontFamily}; - } - } -`; - -const getEuiIconType = (suggestionType: string) => { - switch (suggestionType) { - case 'field': - return 'kqlField'; - case 'value': - return 'kqlValue'; - case 'recentSearch': - return 'search'; - case 'conjunction': - return 'kqlSelector'; - case 'operator': - return 'kqlOperand'; - default: - return 'empty'; - } -}; - -const getEuiIconColor = (theme: any, suggestionType: string): string => { - switch (suggestionType) { - case 'field': - return theme.eui.default.euiColorVis7; - case 'value': - return theme.eui.default.euiColorVis0; - case 'operator': - return theme.eui.default.euiColorVis1; - case 'conjunction': - return theme.eui.default.euiColorVis2; - case 'recentSearch': - default: - return theme.eui.default.euiColorMediumShade; - } -}; diff --git a/x-pack/plugins/beats_management/public/components/config_list.tsx b/x-pack/plugins/beats_management/public/components/config_list.tsx deleted file mode 100644 index 44a581a8667352..00000000000000 --- a/x-pack/plugins/beats_management/public/components/config_list.tsx +++ /dev/null @@ -1,117 +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. - */ - -// @ts-ignore -import { EuiBasicTable, EuiLink } from '@elastic/eui'; -import { InjectedIntl, injectI18n } from '@kbn/i18n/react'; -import React from 'react'; -import { configBlockSchemas } from '../../common/config_schemas'; -import { translateConfigSchema } from '../../common/config_schemas_translations_map'; -import { ConfigurationBlock } from '../../common/domain_types'; - -interface ComponentProps { - configs: { - error?: string | undefined; - list: ConfigurationBlock[]; - page: number; - total: number; - }; - onConfigClick: (action: 'edit' | 'delete', config: ConfigurationBlock) => any; - onTableChange: (index: number, size: number) => void; - intl: InjectedIntl; -} -const pagination = { - pageSize: 5, - hidePerPageOptions: true, -}; - -const ConfigListUi: React.FC = (props) => ( - { - if (props.onTableChange) { - props.onTableChange(table.page.index, table.page.size); - } - }} - columns={[ - { - field: 'type', - name: props.intl.formatMessage({ - id: 'xpack.beatsManagement.tagTable.typeColumnName', - defaultMessage: 'Type', - }), - truncateText: false, - render: (type: string, config: ConfigurationBlock) => { - const translatedConfig = translateConfigSchema(configBlockSchemas).find( - (sc) => sc.id === type - ); - - return ( - props.onConfigClick('edit', config)}> - {translatedConfig ? translatedConfig.name : type} - - ); - }, - }, - { - field: 'module', - name: props.intl.formatMessage({ - id: 'xpack.beatsManagement.tagTable.moduleColumnName', - defaultMessage: 'Module', - }), - truncateText: false, - render: (value: string, config: ConfigurationBlock) => { - return ( - config.config._sub_type || - props.intl.formatMessage({ - id: 'xpack.beatsManagement.tagTable.moduleColumn.notAvailibaleLabel', - defaultMessage: 'N/A', - }) - ); - }, - }, - { - field: 'description', - name: props.intl.formatMessage({ - id: 'xpack.beatsManagement.tagTable.descriptionColumnName', - defaultMessage: 'Description', - }), - }, - { - name: props.intl.formatMessage({ - id: 'xpack.beatsManagement.tagTable.actionsColumnName', - defaultMessage: 'Actions', - }), - actions: [ - { - name: props.intl.formatMessage({ - id: 'xpack.beatsManagement.tagTable.actions.removeButtonAriaLabel', - defaultMessage: 'Remove', - }), - description: props.intl.formatMessage({ - id: 'xpack.beatsManagement.tagTable.actions.removeTooltip', - defaultMessage: 'Remove this config from tag', - }), - type: 'icon', - icon: 'trash', - onClick: (item: ConfigurationBlock) => props.onConfigClick('delete', item), - }, - ], - }, - ]} - /> -); - -export const ConfigList = injectI18n(ConfigListUi); diff --git a/x-pack/plugins/beats_management/public/components/enroll_beats.tsx b/x-pack/plugins/beats_management/public/components/enroll_beats.tsx deleted file mode 100644 index 4c85509f13256e..00000000000000 --- a/x-pack/plugins/beats_management/public/components/enroll_beats.tsx +++ /dev/null @@ -1,292 +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 { - EuiBasicTable, - EuiButton, - EuiCodeBlock, - EuiCopy, - EuiFlexGroup, - EuiFlexItem, - EuiLoadingSpinner, - EuiModalBody, - // @ts-ignore - EuiSelect, - EuiSpacer, - EuiTitle, -} from '@elastic/eui'; -import { FormattedMessage } from '@kbn/i18n/react'; -import { upperFirst } from 'lodash'; -import React from 'react'; -import { CMBeat } from '../../common/domain_types'; - -interface ComponentProps { - /** Such as kibanas basePath, for use to generate command */ - frameworkBasePath?: string; - enrollmentToken?: string; - getBeatWithToken(token: string): Promise; - createEnrollmentToken(): Promise; - onBeatEnrolled(enrolledBeat: CMBeat): void; -} - -interface ComponentState { - enrolledBeat: CMBeat | null; - hasPolledForBeat: boolean; - command: string; - beatType: string; -} - -export class EnrollBeat extends React.Component { - private pinging = false; - constructor(props: ComponentProps) { - super(props); - - this.state = { - enrolledBeat: null, - hasPolledForBeat: false, - command: 'sudo {{beatType}}', - beatType: 'filebeat', - }; - } - public pingForBeatWithToken = async (token: string): Promise => { - try { - const beats = await this.props.getBeatWithToken(token); - - if (!beats) { - throw new Error('no beats'); - } - return beats; - } catch (err) { - if (this.pinging) { - const timeout = (ms: number) => new Promise((res) => setTimeout(res, ms)); - await timeout(5000); - return await this.pingForBeatWithToken(token); - } - } - }; - public async componentDidMount() { - if (!this.props.enrollmentToken) { - await this.props.createEnrollmentToken(); - } - } - public waitForTokenToEnrollBeat = async () => { - if (this.pinging || !this.props.enrollmentToken) { - return; - } - this.pinging = true; - const enrolledBeat = (await this.pingForBeatWithToken(this.props.enrollmentToken)) as CMBeat; - - this.setState({ - enrolledBeat, - }); - this.props.onBeatEnrolled(enrolledBeat); - this.pinging = false; - }; - public render() { - if (!this.props.enrollmentToken && !this.state.enrolledBeat) { - return null; - } - if (this.props.enrollmentToken && !this.state.enrolledBeat) { - this.waitForTokenToEnrollBeat(); - } - const cmdText = `${this.state.command - .replace('{{beatType}}', this.state.beatType) - .replace('{{beatTypeInCaps}}', upperFirst(this.state.beatType))} enroll ${ - window.location.protocol - }//${window.location.host}${this.props.frameworkBasePath} ${this.props.enrollmentToken}`; - - return ( - - {!this.state.enrolledBeat && ( - - - - - - -

- -

- - - - this.setState({ beatType: e.target.value })} - fullWidth={true} - /> - - - -
-
- - - - - -

- -

- - - - {{beatType}}.exe`, - text: 'Windows', - }, - { - value: `./{{beatType}}`, - text: 'MacOS', - }, - ]} - onChange={(e: any) => this.setState({ command: e.target.value })} - fullWidth={true} - /> - - -
-
- {this.state.command && ( - - - - - -

- -

- - - - - {(copy: any) => ( - - - - )} - - - - -
- - {`$ ${cmdText}`} -
- - - - - - - - -

- -

- - - - - -
- - - - )} - - )} - {this.state.enrolledBeat && ( - - -
-
-
- - ), - sortable: false, - }, - { - field: 'version', - name: ( - - ), - sortable: false, - }, - { - field: 'host_name', - name: ( - - ), - sortable: false, - }, - ]} - /> -
-
- - )} - - ); - } -} diff --git a/x-pack/plugins/beats_management/public/components/inputs/code_editor.tsx b/x-pack/plugins/beats_management/public/components/inputs/code_editor.tsx deleted file mode 100644 index 9116725bfe06ab..00000000000000 --- a/x-pack/plugins/beats_management/public/components/inputs/code_editor.tsx +++ /dev/null @@ -1,114 +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. - */ - -// @ts-ignore -import { CommonProps, EuiCodeEditor, EuiCodeEditorProps, EuiFormRow } from '@elastic/eui'; -// @ts-ignore -import { FormsyInputProps, withFormsy } from 'formsy-react'; -import React, { Component, InputHTMLAttributes } from 'react'; - -interface ComponentProps extends FormsyInputProps, CommonProps, EuiCodeEditorProps { - instantValidation: boolean; - label: string; - isReadOnly: boolean; - mode: 'javascript' | 'yaml'; - errorText: string; - fullWidth: boolean; - helpText: React.ReactElement; - compressed: boolean; - onChange(value: string): void; - onBlur(): void; -} - -interface ComponentState { - allowError: boolean; -} - -class CodeEditor extends Component< - InputHTMLAttributes & ComponentProps, - ComponentState -> { - public static defaultProps = { - passRequiredToField: true, - }; - - public state = { allowError: false }; - - public componentDidMount() { - const { defaultValue, setValue } = this.props; - setValue(defaultValue || ''); - } - - public UNSAFE_componentWillReceiveProps(nextProps: ComponentProps) { - if (nextProps.isFormSubmitted()) { - this.showError(); - } - } - - public handleChange = (value: string) => { - this.props.setValue(value); - if (this.props.onChange) { - this.props.onChange(value); - } - if (this.props.instantValidation) { - this.showError(); - } - }; - - public handleBlur = () => { - this.showError(); - if (this.props.onBlur) { - this.props.onBlur(); - } - }; - - public showError = () => this.setState({ allowError: true }); - - public render() { - const { - name, - id, - label, - isReadOnly, - isValid, - getValue, - isPristine, - getErrorMessage, - mode, - fullWidth, - className, - helpText, - } = this.props; - - const { allowError } = this.state; - const error = !isPristine() && !isValid() && allowError; - - return ( - - - - ); - } -} - -export const FormsyEuiCodeEditor = withFormsy(CodeEditor); diff --git a/x-pack/plugins/beats_management/public/components/inputs/index.ts b/x-pack/plugins/beats_management/public/components/inputs/index.ts deleted file mode 100644 index 58f5ba4c81f71c..00000000000000 --- a/x-pack/plugins/beats_management/public/components/inputs/index.ts +++ /dev/null @@ -1,12 +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. - */ - -export { FormsyEuiCodeEditor } from './code_editor'; -export { FormsyEuiFieldText } from './input'; -export { FormsyEuiPasswordText } from './password_input'; -export { FormsyEuiMultiFieldText } from './multi_input'; -export { FormsyEuiSelect } from './select'; diff --git a/x-pack/plugins/beats_management/public/components/inputs/input.tsx b/x-pack/plugins/beats_management/public/components/inputs/input.tsx deleted file mode 100644 index 3fb18e1b218b43..00000000000000 --- a/x-pack/plugins/beats_management/public/components/inputs/input.tsx +++ /dev/null @@ -1,120 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { EuiFieldText, EuiFormRow } from '@elastic/eui'; -import { CommonProps } from '@elastic/eui/src/components/common'; -import { FormsyInputProps, withFormsy } from 'formsy-react'; -import React, { Component, InputHTMLAttributes } from 'react'; - -interface ComponentProps - extends FormsyInputProps, - CommonProps, - Omit, 'onChange' | 'onBlur'> { - instantValidation?: boolean; - label: string; - errorText: string; - fullWidth: boolean; - helpText: React.ReactElement; - compressed: boolean; - onChange?(e: React.ChangeEvent, value: any): void; - onBlur?(e: React.ChangeEvent, value: any): void; -} - -interface ComponentState { - allowError: boolean; -} - -class FieldText extends Component< - InputHTMLAttributes & ComponentProps, - ComponentState -> { - public static defaultProps = { - passRequiredToField: true, - }; - - public state = { allowError: false }; - - public componentDidMount() { - const { defaultValue, setValue } = this.props; - if (defaultValue) { - setValue(defaultValue); - } - } - - public UNSAFE_componentWillReceiveProps(nextProps: ComponentProps) { - if (nextProps.isFormSubmitted()) { - this.showError(); - } - } - - public handleChange = (e: React.ChangeEvent) => { - const { value } = e.currentTarget; - this.props.setValue(value); - if (this.props.onChange) { - this.props.onChange(e, e.currentTarget.value); - } - if (this.props.instantValidation) { - this.showError(); - } - }; - - public handleBlur = (e: React.ChangeEvent) => { - this.showError(); - if (this.props.onBlur) { - this.props.onBlur(e, e.currentTarget.value); - } - }; - - public showError = () => this.setState({ allowError: true }); - - public render() { - const { - name, - id, - required, - label, - getValue, - isValid, - isPristine, - getErrorMessage, - fullWidth, - className, - disabled, - helpText, - placeholder, - } = this.props; - - const { allowError } = this.state; - const error = !isPristine() && !isValid() && allowError; - - return ( - - - - ); - } -} - -export const FormsyEuiFieldText = withFormsy(FieldText); diff --git a/x-pack/plugins/beats_management/public/components/inputs/multi_input.tsx b/x-pack/plugins/beats_management/public/components/inputs/multi_input.tsx deleted file mode 100644 index ffc208f6f94fd6..00000000000000 --- a/x-pack/plugins/beats_management/public/components/inputs/multi_input.tsx +++ /dev/null @@ -1,122 +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 { EuiFormRow, EuiTextArea, EuiTextAreaProps } from '@elastic/eui'; -import { CommonProps } from '@elastic/eui/src/components/common'; -// @ts-ignore -import { FormsyInputProps, withFormsy } from 'formsy-react'; -import React, { Component, InputHTMLAttributes } from 'react'; - -interface ComponentProps - extends FormsyInputProps, - CommonProps, - Omit { - instantValidation: boolean; - label: string; - errorText: string; - fullWidth: boolean; - helpText: React.ReactElement; - compressed: boolean; - onChange(e: React.ChangeEvent, value: any): void; - onBlur(e: React.ChangeEvent, value: any): void; -} - -interface ComponentState { - allowError: boolean; -} - -class MultiFieldText extends Component< - InputHTMLAttributes & ComponentProps, - ComponentState -> { - public static defaultProps = { - passRequiredToField: true, - }; - - public state = { allowError: false }; - - public componentDidMount() { - const { defaultValue, setValue } = this.props; - - if (defaultValue) { - setValue(defaultValue); - } - } - - public UNSAFE_componentWillReceiveProps(nextProps: ComponentProps) { - if (nextProps.isFormSubmitted()) { - this.showError(); - } - } - - public handleChange = (e: React.ChangeEvent) => { - const value = e.currentTarget.value.split('\n'); - this.props.setValue(value); - if (this.props.onChange) { - this.props.onChange(e, value); - } - if (this.props.instantValidation) { - this.showError(); - } - }; - - public handleBlur = (e: React.ChangeEvent) => { - this.showError(); - if (this.props.onBlur) { - this.props.onBlur(e, e.currentTarget.value); - } - }; - - public showError = () => this.setState({ allowError: true }); - - public render() { - const { - name, - id, - required, - label, - getValue, - isValid, - isPristine, - getErrorMessage, - fullWidth, - className, - disabled, - helpText, - placeholder, - } = this.props; - - const { allowError } = this.state; - const error = !isPristine() && !isValid() && allowError; - - return ( - - - - ); - } -} - -export const FormsyEuiMultiFieldText = withFormsy(MultiFieldText); diff --git a/x-pack/plugins/beats_management/public/components/inputs/password_input.tsx b/x-pack/plugins/beats_management/public/components/inputs/password_input.tsx deleted file mode 100644 index 7d4b0c369c19ae..00000000000000 --- a/x-pack/plugins/beats_management/public/components/inputs/password_input.tsx +++ /dev/null @@ -1,114 +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 { CommonProps, EuiFieldPassword, EuiFieldPasswordProps, EuiFormRow } from '@elastic/eui'; -import { FormsyInputProps, withFormsy } from 'formsy-react'; -import React, { Component, InputHTMLAttributes } from 'react'; - -interface ComponentProps - extends FormsyInputProps, - CommonProps, - Omit { - instantValidation?: boolean; - label: string; - errorText: string; - fullWidth: boolean; - helpText: React.ReactElement; - compressed: boolean; - onChange?(e: React.ChangeEvent, value: any): void; - onBlur?(e: React.ChangeEvent, value: any): void; -} - -interface ComponentState { - allowError: boolean; -} - -class FieldPassword extends Component< - InputHTMLAttributes & ComponentProps, - ComponentState -> { - constructor(props: any) { - super(props); - - this.state = { - allowError: false, - }; - } - - public componentDidMount() { - const { defaultValue, setValue } = this.props; - if (defaultValue) { - setValue(defaultValue); - } - } - - public handleChange = (e: React.ChangeEvent) => { - const { value } = e.currentTarget; - this.props.setValue(value); - if (this.props.onChange) { - this.props.onChange(e, value); - } - if (this.props.instantValidation) { - this.showError(); - } - }; - - public handleBlur = (e: React.ChangeEvent) => { - this.showError(); - if (this.props.onBlur) { - this.props.onBlur(e, e.currentTarget.value); - } - }; - - public showError = () => this.setState({ allowError: true }); - - public render() { - const { - name, - id, - required, - label, - getValue, - isValid, - isPristine, - getErrorMessage, - fullWidth, - className, - disabled, - helpText, - onBlur, - } = this.props; - - const { allowError } = this.state; - const error = !isPristine() && !isValid() && allowError; - - return ( - - - - ); - } -} - -export const FormsyEuiPasswordText = withFormsy(FieldPassword); diff --git a/x-pack/plugins/beats_management/public/components/inputs/select.tsx b/x-pack/plugins/beats_management/public/components/inputs/select.tsx deleted file mode 100644 index edd1a7fee90c50..00000000000000 --- a/x-pack/plugins/beats_management/public/components/inputs/select.tsx +++ /dev/null @@ -1,125 +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 { - EuiFormRow, - // @ts-ignore - EuiSelect, -} from '@elastic/eui'; -import { CommonProps } from '@elastic/eui/src/components/common'; -// @ts-ignore -import { FormsyInputProps, withFormsy } from 'formsy-react'; -import React, { Component, InputHTMLAttributes } from 'react'; - -const FixedSelect = EuiSelect as React.FC; - -interface ComponentProps extends FormsyInputProps, CommonProps { - instantValidation: boolean; - options: Array<{ value: string; text: string }>; - label: string; - errorText: string; - fullWidth: boolean; - helpText: React.ReactElement; - compressed: boolean; - onChange(e: React.ChangeEvent, value: any): void; - onBlur(e: React.ChangeEvent, value: any): void; -} - -interface ComponentState { - allowError: boolean; -} - -class FieldSelect extends Component< - InputHTMLAttributes & ComponentProps, - ComponentState -> { - public static defaultProps = { - passRequiredToField: true, - }; - - public state = { allowError: false }; - - public componentDidMount() { - const { defaultValue, setValue } = this.props; - if (defaultValue) { - setValue(defaultValue); - } - } - - public UNSAFE_componentWillReceiveProps(nextProps: ComponentProps) { - if (nextProps.isFormSubmitted()) { - this.showError(); - } - } - - public handleChange = (e: React.ChangeEvent) => { - const { value } = e.currentTarget; - - this.props.setValue(value); - if (this.props.onChange) { - this.props.onChange(e, e.currentTarget.value); - } - if (this.props.instantValidation) { - this.showError(); - } - }; - - public handleBlur = (e: React.ChangeEvent) => { - this.showError(); - if (this.props.onBlur) { - this.props.onBlur(e, e.currentTarget.value); - } - }; - - public showError = () => this.setState({ allowError: true }); - - public render() { - const { - id, - required, - label, - options, - getValue, - isValid, - isPristine, - getErrorMessage, - fullWidth, - className, - disabled, - helpText, - } = this.props; - - const { allowError } = this.state; - const error = !isPristine() && !isValid() && allowError; - - return ( - - - - ); - } -} - -export const FormsyEuiSelect = withFormsy(FieldSelect); diff --git a/x-pack/plugins/beats_management/public/components/layouts/background.tsx b/x-pack/plugins/beats_management/public/components/layouts/background.tsx deleted file mode 100644 index ff060cb5869faa..00000000000000 --- a/x-pack/plugins/beats_management/public/components/layouts/background.tsx +++ /dev/null @@ -1,12 +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'; - -export const Background = styled.div` - flex-grow: 1; -`; diff --git a/x-pack/plugins/beats_management/public/components/layouts/no_data.tsx b/x-pack/plugins/beats_management/public/components/layouts/no_data.tsx deleted file mode 100644 index e61c3db2ebd139..00000000000000 --- a/x-pack/plugins/beats_management/public/components/layouts/no_data.tsx +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { EuiEmptyPrompt, EuiFlexGroup, EuiFlexItem, EuiPageContent } from '@elastic/eui'; -import React from 'react'; -import { withRouter, RouteComponentProps } from 'react-router-dom'; - -interface LayoutProps extends RouteComponentProps { - children: React.ReactNode; - title: string | React.ReactNode; - actionSection?: React.ReactNode; -} - -export const NoDataLayout = withRouter(({ actionSection, title, children }: LayoutProps) => ( - - - - {title}} - body={children} - actions={actionSection} - /> - - - -)); diff --git a/x-pack/plugins/beats_management/public/components/layouts/primary.tsx b/x-pack/plugins/beats_management/public/components/layouts/primary.tsx deleted file mode 100644 index 0a1c0bb028c77b..00000000000000 --- a/x-pack/plugins/beats_management/public/components/layouts/primary.tsx +++ /dev/null @@ -1,84 +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 { - EuiHeader, - EuiHeaderBreadcrumbs, - EuiHeaderSection, - EuiPage, - EuiPageBody, - EuiPageContent, - EuiPageContentBody, - EuiPageHeader, - EuiPageHeaderSection, - EuiTitle, -} from '@elastic/eui'; -import React, { Component, ReactNode } from 'react'; -import styled from 'styled-components'; -import { BreadcrumbConsumer } from '../navigation/breadcrumb'; - -type RenderCallback = (component: () => JSX.Element) => void; -interface PrimaryLayoutProps { - title: string | React.ReactNode; - actionSection?: React.ReactNode; - hideBreadcrumbs?: boolean; -} -export class PrimaryLayout extends Component { - private actionSection: (() => JSX.Element) | null = null; - constructor(props: PrimaryLayoutProps) { - super(props); - } - - public render() { - const children: (callback: RenderCallback) => void | ReactNode = this.props.children as any; - return ( - - {!this.props.hideBreadcrumbs && ( - - {({ breadcrumbs }) => ( - - - - - - )} - - )} - - - - - -

{this.props.title}

- - - - {(this.actionSection && this.actionSection()) || this.props.actionSection} - - - - - {(children && typeof children === 'function' - ? children(this.renderAction) - : children) || } - - - - - - ); - } - - private renderAction = (component: () => JSX.Element) => { - this.actionSection = component; - this.forceUpdate(); - }; -} - -const HeaderWrapper = styled(EuiHeader)` - height: 29px; -`; diff --git a/x-pack/plugins/beats_management/public/components/layouts/walkthrough.tsx b/x-pack/plugins/beats_management/public/components/layouts/walkthrough.tsx deleted file mode 100644 index 4d0fb9126d5b50..00000000000000 --- a/x-pack/plugins/beats_management/public/components/layouts/walkthrough.tsx +++ /dev/null @@ -1,49 +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 { EuiPageContent, EuiPageContentBody, EuiStepsHorizontal, EuiTitle } from '@elastic/eui'; - -interface LayoutProps { - title: string; - goTo: (path: string) => any; - walkthroughSteps: Array<{ - id: string; - name: string; - }>; - activePath: string; -} - -export const WalkthroughLayout: React.FC = ({ - walkthroughSteps, - title, - activePath, - goTo, - children, -}) => { - const indexOfCurrent = walkthroughSteps.findIndex((step) => activePath === step.id); - return ( - - -

{title}

- -
-
- ({ - title: step.name, - isComplete: i <= indexOfCurrent, - onClick: () => goTo(step.id), - }))} - /> -
-
- {children} - - ); -}; diff --git a/x-pack/plugins/beats_management/public/components/loading.tsx b/x-pack/plugins/beats_management/public/components/loading.tsx deleted file mode 100644 index fabbee359946c8..00000000000000 --- a/x-pack/plugins/beats_management/public/components/loading.tsx +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner } from '@elastic/eui'; -import * as React from 'react'; - -export const Loading: React.FC<{}> = () => ( - - - - - -); diff --git a/x-pack/plugins/beats_management/public/components/navigation/breadcrumb/breadcrumb.tsx b/x-pack/plugins/beats_management/public/components/navigation/breadcrumb/breadcrumb.tsx deleted file mode 100644 index 7af0270822422d..00000000000000 --- a/x-pack/plugins/beats_management/public/components/navigation/breadcrumb/breadcrumb.tsx +++ /dev/null @@ -1,64 +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, { Component } from 'react'; -import { RouteProps } from 'react-router-dom'; -import { BASE_PATH } from '../../../../common/constants'; -import { BreadcrumbConsumer } from './consumer'; -import { Breadcrumb as BreadcrumbData, BreadcrumbContext } from './types'; - -interface BreadcrumbManagerProps extends RouteProps { - text: string; - href?: string; - parents?: BreadcrumbData[]; - context: BreadcrumbContext; -} - -class BreadcrumbManager extends Component { - public componentWillUnmount() { - const { text, href, context } = this.props; - - context.removeCrumb({ - text, - href, - }); - } - - public componentDidMount() { - const { text, href, parents, context } = this.props; - context.addCrumb( - { - text, - href, - }, - parents - ); - } - - public render() { - return ; - } -} - -interface BreadcrumbProps extends RouteProps { - title: string; - path?: string; - parentBreadcrumbs?: BreadcrumbData[]; -} - -export const Breadcrumb: React.FC = ({ title, path, parentBreadcrumbs }) => ( - - {(context) => ( - - )} - -); diff --git a/x-pack/plugins/beats_management/public/components/navigation/breadcrumb/consumer.tsx b/x-pack/plugins/beats_management/public/components/navigation/breadcrumb/consumer.tsx deleted file mode 100644 index 3062095a06383b..00000000000000 --- a/x-pack/plugins/beats_management/public/components/navigation/breadcrumb/consumer.tsx +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export { Consumer as BreadcrumbConsumer } from './context'; diff --git a/x-pack/plugins/beats_management/public/components/navigation/breadcrumb/context.tsx b/x-pack/plugins/beats_management/public/components/navigation/breadcrumb/context.tsx deleted file mode 100644 index 3d11194bc3fb9f..00000000000000 --- a/x-pack/plugins/beats_management/public/components/navigation/breadcrumb/context.tsx +++ /dev/null @@ -1,19 +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 { Breadcrumb, BreadcrumbContext } from './types'; - -/* istanbul ignore next */ -const defaultContext: BreadcrumbContext = { - breadcrumbs: [], - addCrumb: (crumb: Breadcrumb) => null, - removeCrumb: (crumb: Breadcrumb) => null, -}; - -export const { Provider, Consumer } = React.createContext(defaultContext); diff --git a/x-pack/plugins/beats_management/public/components/navigation/breadcrumb/index.ts b/x-pack/plugins/beats_management/public/components/navigation/breadcrumb/index.ts deleted file mode 100644 index e4839a75c39e06..00000000000000 --- a/x-pack/plugins/beats_management/public/components/navigation/breadcrumb/index.ts +++ /dev/null @@ -1,10 +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. - */ - -export { BreadcrumbProvider } from './provider'; -export { BreadcrumbConsumer } from './consumer'; -export { Breadcrumb } from './breadcrumb'; diff --git a/x-pack/plugins/beats_management/public/components/navigation/breadcrumb/provider.tsx b/x-pack/plugins/beats_management/public/components/navigation/breadcrumb/provider.tsx deleted file mode 100644 index 20919a52b658ed..00000000000000 --- a/x-pack/plugins/beats_management/public/components/navigation/breadcrumb/provider.tsx +++ /dev/null @@ -1,73 +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, { Component, ReactElement } from 'react'; -import { Provider } from './context'; -import { Breadcrumb } from './types'; -import { services } from '../../../kbn_services'; - -interface ComponentProps { - useGlobalBreadcrumbs: boolean; - children: ReactElement | Array>; -} - -interface ComponentState { - breadcrumbs: Array<{ - href?: string; - breadcrumb: Breadcrumb; - parents?: Breadcrumb[]; - }>; -} - -export class BreadcrumbProvider extends Component { - public state = { - breadcrumbs: [] as ComponentState['breadcrumbs'], - }; - - public addCrumb = (breadcrumb: Breadcrumb, parents?: Breadcrumb[]) => { - this.setState(({ breadcrumbs: prevCrumbs }) => ({ - breadcrumbs: [ - ...prevCrumbs, - { - href: breadcrumb.href, - breadcrumb, - parents, - }, - ], - })); - }; - - public removeCrumb = (crumbToRemove: Breadcrumb) => { - this.setState(({ breadcrumbs: prevCrumbs }) => { - const breadcrumbs = prevCrumbs.filter((prevCrumb) => { - const { href } = prevCrumb; - return !(crumbToRemove.href === href); - }); - return { breadcrumbs }; - }); - }; - - public render() { - const { breadcrumbs } = this.state; - - const context = { - breadcrumbs: breadcrumbs.reduce((crumbs, crumbStorageItem) => { - if (crumbStorageItem.parents) { - crumbs = crumbs.concat(crumbStorageItem.parents); - } - crumbs.push(crumbStorageItem.breadcrumb); - return crumbs; - }, [] as Breadcrumb[]), - addCrumb: this.addCrumb, - removeCrumb: this.removeCrumb, - }; - if (this.props.useGlobalBreadcrumbs) { - services.setBreadcrumbs(context.breadcrumbs); - } - return {this.props.children}; - } -} diff --git a/x-pack/plugins/beats_management/public/components/navigation/breadcrumb/types.d.ts b/x-pack/plugins/beats_management/public/components/navigation/breadcrumb/types.d.ts deleted file mode 100644 index 33a947d649c46e..00000000000000 --- a/x-pack/plugins/beats_management/public/components/navigation/breadcrumb/types.d.ts +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export interface BreadcrumbContext { - breadcrumbs: Breadcrumb[]; - addCrumb: (crumb: Breadcrumb, parents?: Breadcrumb[]) => void; - removeCrumb: (crumb: Breadcrumb) => void; -} -export interface Breadcrumb { - text: string; - href?: string; -} diff --git a/x-pack/plugins/beats_management/public/components/navigation/child_routes.tsx b/x-pack/plugins/beats_management/public/components/navigation/child_routes.tsx deleted file mode 100644 index 9e4eaa98c41e95..00000000000000 --- a/x-pack/plugins/beats_management/public/components/navigation/child_routes.tsx +++ /dev/null @@ -1,40 +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, { FC } from 'react'; -import { Route, Switch } from 'react-router-dom'; - -export interface RouteConfig { - path: string; - component: React.ComponentType; - routes?: RouteConfig[]; -} - -export const ChildRoutes: FC<{ - routes?: RouteConfig[]; - useSwitch?: boolean; - [other: string]: any; -}> = ({ routes, useSwitch = true, ...rest }) => { - if (!routes) { - return null; - } - const Parent = useSwitch ? Switch : React.Fragment; - return ( - - {routes.map((route) => ( - { - const Component = route.component; - return ; - }} - /> - ))} - - ); -}; diff --git a/x-pack/plugins/beats_management/public/components/navigation/connected_link.tsx b/x-pack/plugins/beats_management/public/components/navigation/connected_link.tsx deleted file mode 100644 index 3eb00c8714868d..00000000000000 --- a/x-pack/plugins/beats_management/public/components/navigation/connected_link.tsx +++ /dev/null @@ -1,46 +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 { get } from 'lodash'; -import React from 'react'; - -import { EuiLink } from '@elastic/eui'; -import { Link, withRouter, RouteComponentProps } from 'react-router-dom'; - -interface ConnectedLinkComponent extends RouteComponentProps { - location: any; - path: string; - disabled: boolean; - query: any; - [key: string]: any; -} - -export const ConnectedLinkComponent = ({ - location, - path, - query, - disabled, - children, - ...props -}: ConnectedLinkComponent) => { - if (disabled) { - return ; - } - - // Shorthand for pathname - const pathname = path || get(props.to, 'pathname') || location.pathname; - - return ( - - ); -}; - -export const ConnectedLink = withRouter(ConnectedLinkComponent); diff --git a/x-pack/plugins/beats_management/public/components/table/action_schema.ts b/x-pack/plugins/beats_management/public/components/table/action_schema.ts deleted file mode 100644 index 254188e764590a..00000000000000 --- a/x-pack/plugins/beats_management/public/components/table/action_schema.ts +++ /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 { i18n } from '@kbn/i18n'; -import { AssignmentActionType } from './table'; - -export enum ActionComponentType { - Action, - Popover, - SelectionCount, - TagBadgeList, -} -export interface ControlSchema { - id?: number; - name: string; - danger?: boolean; - type: ActionComponentType; - action?: AssignmentActionType; - actionDataKey?: string; - showWarning?: boolean; - warningHeading?: string; - warningMessage?: string; - lazyLoad?: boolean; - grow?: boolean; -} - -export const beatsListActions: ControlSchema[] = [ - { - grow: false, - name: i18n.translate('xpack.beatsManagement.beatsListAssignmentOptions.unenrollButtonLabel', { - defaultMessage: 'Unenroll selected', - }), - showWarning: true, - type: ActionComponentType.Action, - warningHeading: i18n.translate( - 'xpack.beatsManagement.beatsListAssignmentOptions.unenrollBeatsWarninigTitle', - { defaultMessage: 'Unenroll selected beats?' } - ), - warningMessage: i18n.translate( - 'xpack.beatsManagement.beatsListAssignmentOptions.unenrollBeatsWarninigMessage', - { defaultMessage: 'The selected Beats will no longer use central management' } - ), - action: AssignmentActionType.Delete, - danger: true, - }, - { - name: i18n.translate('xpack.beatsManagement.beatsListAssignmentOptions.setTagsButtonLabel', { - defaultMessage: 'Set tags', - }), - grow: false, - type: ActionComponentType.TagBadgeList, - actionDataKey: 'tags', - lazyLoad: true, - }, -]; - -export const tagListActions: ControlSchema[] = [ - { - danger: true, - grow: false, - name: i18n.translate('xpack.beatsManagement.tagListAssignmentOptions.removeTagsButtonLabel', { - defaultMessage: 'Remove selected', - }), - type: ActionComponentType.Action, - showWarning: true, - warningHeading: i18n.translate( - 'xpack.beatsManagement.tagListAssignmentOptions.removeTagsWarninigTitle', - { defaultMessage: 'Remove tag(s)' } - ), - warningMessage: i18n.translate( - 'xpack.beatsManagement.tagListAssignmentOptions.removeTagWarninigMessage', - { defaultMessage: 'Remove the tag?' } - ), - action: AssignmentActionType.Delete, - }, -]; - -export const tagConfigActions: ControlSchema[] = [ - { - danger: true, - grow: false, - name: i18n.translate('xpack.beatsManagement.tagConfigAssignmentOptions.removeTagsButtonLabel', { - defaultMessage: 'Remove tag(s)', - }), - type: ActionComponentType.Action, - showWarning: true, - warningHeading: i18n.translate( - 'xpack.beatsManagement.tagConfigAssignmentOptions.removeTagsWarninigTitle', - { defaultMessage: 'Remove tag(s)' } - ), - warningMessage: i18n.translate( - 'xpack.beatsManagement.tagConfigAssignmentOptions.removeTagsWarninigMessage', - { defaultMessage: 'Remove the tag from the selected beat(s)?' } - ), - action: AssignmentActionType.Delete, - }, -]; diff --git a/x-pack/plugins/beats_management/public/components/table/controls/action_control.tsx b/x-pack/plugins/beats_management/public/components/table/controls/action_control.tsx deleted file mode 100644 index 5badef9a71fe17..00000000000000 --- a/x-pack/plugins/beats_management/public/components/table/controls/action_control.tsx +++ /dev/null @@ -1,97 +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 { EuiButton, EuiConfirmModal } from '@elastic/eui'; -import { FormattedMessage } from '@kbn/i18n/react'; -import React from 'react'; -import { AssignmentActionType } from '../table'; - -interface ActionControlProps { - action: AssignmentActionType; - disabled: boolean; - danger?: boolean; - name: string; - showWarning?: boolean; - warningHeading?: string; - warningMessage?: string; - actionHandler(action: AssignmentActionType, payload?: any): void; -} - -interface ActionControlState { - showModal: boolean; -} - -export class ActionControl extends React.PureComponent { - constructor(props: ActionControlProps) { - super(props); - - this.state = { - showModal: false, - }; - } - - public render() { - const { - action, - actionHandler, - danger, - name, - showWarning, - warningHeading, - warningMessage, - } = this.props; - - return ( -
- this.setState({ showModal: true }) : () => actionHandler(action) - } - > - {name} - - {this.state.showModal && ( - - } - confirmButtonText={ - - } - onConfirm={() => { - actionHandler(action); - this.setState({ showModal: false }); - }} - onCancel={() => this.setState({ showModal: false })} - title={ - warningHeading ? ( - warningHeading - ) : ( - - ) - } - > - {warningMessage} - - )} -
- ); - } -} diff --git a/x-pack/plugins/beats_management/public/components/table/controls/index.ts b/x-pack/plugins/beats_management/public/components/table/controls/index.ts deleted file mode 100644 index 72cbc7fcb23fd0..00000000000000 --- a/x-pack/plugins/beats_management/public/components/table/controls/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export { OptionControl } from './option_control'; diff --git a/x-pack/plugins/beats_management/public/components/table/controls/option_control.tsx b/x-pack/plugins/beats_management/public/components/table/controls/option_control.tsx deleted file mode 100644 index f07c84f584d918..00000000000000 --- a/x-pack/plugins/beats_management/public/components/table/controls/option_control.tsx +++ /dev/null @@ -1,58 +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 { ActionComponentType, ControlSchema } from '../action_schema'; -import { AssignmentActionType } from '../table'; -import { ActionControl } from './action_control'; -import { TagBadgeList } from './tag_badge_list'; - -interface ComponentProps extends ControlSchema { - actionData?: { - [key: string]: any; - }; - disabled: boolean; - actionHandler(action: AssignmentActionType, payload?: any): void; -} - -export const OptionControl: React.FC = (props: ComponentProps) => { - switch (props.type) { - case ActionComponentType.Action: - if (!props.action) { - throw Error('Action cannot be undefined'); - } - return ( - - ); - case ActionComponentType.TagBadgeList: - if (!props.actionDataKey) { - throw Error('actionDataKey cannot be undefined'); - } - if (!props.actionData) { - throw Error('actionData cannot be undefined'); - } - return ( - - ); - } - return
Invalid config
; -}; diff --git a/x-pack/plugins/beats_management/public/components/table/controls/tag_badge_list.tsx b/x-pack/plugins/beats_management/public/components/table/controls/tag_badge_list.tsx deleted file mode 100644 index 15cc3f3fce5771..00000000000000 --- a/x-pack/plugins/beats_management/public/components/table/controls/tag_badge_list.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 { - EuiButton, - EuiContextMenuPanel, - EuiFlexGroup, - EuiFlexItem, - EuiLoadingSpinner, - EuiPopover, -} from '@elastic/eui'; -import React from 'react'; -import { TABLE_CONFIG } from '../../../../common/constants/table'; -import { TagBadge } from '../../tag/tag_badge'; -import { AssignmentActionType } from '../index'; - -interface TagBadgeListProps { - items: object[]; - disabled: boolean; - name: string; - action?: AssignmentActionType; - actionHandler(action: AssignmentActionType, payload?: any): void; -} - -interface ComponentState { - isPopoverOpen: boolean; - items: object[]; -} - -export class TagBadgeList extends React.Component { - constructor(props: TagBadgeListProps) { - super(props); - - this.state = { - isPopoverOpen: false, - items: [], - }; - } - - public render() { - const button = ( - - {this.props.name} - - ); - - return ( - - - - {!this.props.items && } - {this.props.items && this.props.items.length === 0 && ( - - - No options avaliable - - - )} - {this.props.items && - this.props.items.map((tag: any) => ( - - - - - this.props.actionHandler(AssignmentActionType.Assign, tag.id) - } - onClickAriaLabel={tag.id} - tag={tag} - /> - - - - ))} - - - - ); - } - private onButtonClick = async () => { - this.props.actionHandler(AssignmentActionType.Reload); - this.setState((prevState) => ({ - isPopoverOpen: !prevState.isPopoverOpen, - })); - }; - - private closePopover = () => { - this.setState({ - isPopoverOpen: false, - }); - }; -} diff --git a/x-pack/plugins/beats_management/public/components/table/index.ts b/x-pack/plugins/beats_management/public/components/table/index.ts deleted file mode 100644 index bc6590c2e5c21c..00000000000000 --- a/x-pack/plugins/beats_management/public/components/table/index.ts +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export { beatsListActions, tagConfigActions } from './action_schema'; -export { AssignmentActionType, KueryBarProps, Table } from './table'; -export { - ActionDefinition, - BeatDetailTagsTable, - BeatsTableType, - FilterDefinition, - TagsTableType, -} from './table_type_configs'; diff --git a/x-pack/plugins/beats_management/public/components/table/table.tsx b/x-pack/plugins/beats_management/public/components/table/table.tsx deleted file mode 100644 index f22799c8b55b71..00000000000000 --- a/x-pack/plugins/beats_management/public/components/table/table.tsx +++ /dev/null @@ -1,160 +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 { EuiBasicTable, EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui'; -import { i18n } from '@kbn/i18n'; -import React from 'react'; -import styled from 'styled-components'; -import { QuerySuggestion } from '../../../../../../src/plugins/data/public'; -import { TABLE_CONFIG } from '../../../common/constants'; -import { AutocompleteField } from '../autocomplete_field/index'; -import { ControlSchema } from './action_schema'; -import { OptionControl } from './controls/option_control'; -import { TableType } from './table_type_configs'; - -export enum AssignmentActionType { - Add, - Assign, - Delete, - Edit, - Reload, - Search, -} - -export interface KueryBarProps { - filterQueryDraft: string; - isLoadingSuggestions: boolean; - isValid: boolean; - loadSuggestions: (value: string, cursorPosition: number, maxCount?: number) => void; - onChange?: (value: string) => void; - onSubmit?: (value: string) => void; - suggestions: QuerySuggestion[]; - value: string; -} - -interface TableProps { - actions?: ControlSchema[]; - actionData?: { - [key: string]: any; - }; - hideTableControls?: boolean; - kueryBarProps?: KueryBarProps; - items: any[]; - onTableChange?: (index: number, size: number) => void; - type: TableType; - actionHandler?(action: AssignmentActionType, payload?: any): void; -} - -interface TableState { - selection: any[]; - pageIndex: number; -} - -const TableContainer = styled.div` - padding: 16px; -`; - -export class Table extends React.Component { - constructor(props: any) { - super(props); - - this.state = { - selection: [], - pageIndex: 0, - }; - } - - public resetSelection = () => { - this.setSelection([]); - }; - - public setSelection = (selection: any[]) => { - this.setState({ - selection, - }); - }; - - public actionHandler = (action: AssignmentActionType, payload?: any): void => { - if (this.props.actionHandler) { - this.props.actionHandler(action, payload); - } - }; - - public render() { - const { actionData, actions, hideTableControls, items, kueryBarProps, type } = this.props; - - const pagination = { - pageIndex: this.state.pageIndex, - pageSize: TABLE_CONFIG.INITIAL_ROW_SIZE, - pageSizeOptions: TABLE_CONFIG.PAGE_SIZE_OPTIONS, - }; - - const selectionOptions = hideTableControls - ? undefined - : { - onSelectionChange: this.setSelection, - selectable: () => true, - selectableMessage: () => - i18n.translate('xpack.beatsManagement.table.selectThisBeatTooltip', { - defaultMessage: 'Select this beat', - }), - selection: this.state.selection, - }; - - return ( - - - {actions && - actions.map((action) => ( - - - - ))} - - {kueryBarProps && ( - - - - )} - - - - - - ); - } - - private onTableChange = ({ page }: { page: { index: number; size: number } }) => { - if (this.props.onTableChange) { - this.props.onTableChange(page.index, page.size); - } - this.setState({ - pageIndex: page.index, - }); - }; -} diff --git a/x-pack/plugins/beats_management/public/components/table/table_type_configs.tsx b/x-pack/plugins/beats_management/public/components/table/table_type_configs.tsx deleted file mode 100644 index 56cf99b01e8d99..00000000000000 --- a/x-pack/plugins/beats_management/public/components/table/table_type_configs.tsx +++ /dev/null @@ -1,345 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { EuiFlexGroup, EuiFlexItem, EuiHealth, EuiToolTip, IconColor } from '@elastic/eui'; -import { i18n } from '@kbn/i18n'; -import { sortBy, uniqBy } from 'lodash'; -import moment from 'moment'; -import React from 'react'; -import { BeatTag, CMBeat } from '../../../common/domain_types'; -import { ConnectedLink } from '../navigation/connected_link'; -import { TagBadge } from '../tag'; - -export interface ColumnDefinition { - align?: 'left' | 'right' | 'center' | undefined; - field: string; - name: string; - sortable?: boolean; - width?: string; - render?(value: any, object?: any): any; -} - -export interface ActionDefinition { - action: string; - danger?: boolean; - icon?: any; - name: string; -} - -interface FilterOption { - value: string; -} - -export interface FilterDefinition { - field: string; - name: string; - options?: FilterOption[]; - type: string; -} - -export interface ControlDefinitions { - actions: ActionDefinition[]; - filters: FilterDefinition[]; - primaryActions?: ActionDefinition[]; -} - -export interface TableType { - itemType: 'Beats' | 'Tags'; - columnDefinitions: ColumnDefinition[]; - controlDefinitions(items: any[]): ControlDefinitions; -} - -const dynamicStatuses = { - STARTING: { - color: 'success', - status: i18n.translate('xpack.beatsManagement.beatsTable.startingStatusLabel', { - defaultMessage: 'Starting', - }), - details: i18n.translate('xpack.beatsManagement.beatsTable.configStatus.startingTooltip', { - defaultMessage: 'This Beat is starting.', - }), - }, - IN_PROGRESS: { - color: 'warning', - status: i18n.translate('xpack.beatsManagement.beatsTable.updatingStatusLabel', { - defaultMessage: 'Updating', - }), - details: i18n.translate('xpack.beatsManagement.beatsTable.configStatus.progressTooltip', { - defaultMessage: 'This Beat is currently reloading config from CM.', - }), - }, - RUNNING: { - color: 'success', - status: i18n.translate('xpack.beatsManagement.beatsTable.runningStatusLabel', { - defaultMessage: 'Running', - }), - details: i18n.translate('xpack.beatsManagement.beatsTable.configStatus.runningTooltip', { - defaultMessage: 'This Beat is running without issues.', - }), - }, - CONFIG: { - color: 'danger', - status: i18n.translate('xpack.beatsManagement.beatsTable.configErrorStatusLabel', { - defaultMessage: 'Config error', - }), - }, - FAILED: { - color: 'danger', - status: i18n.translate('xpack.beatsManagement.beatsTable.failedStatusLabel', { - defaultMessage: 'Error', - }), - details: i18n.translate('xpack.beatsManagement.beatsTable.configStatus.errorTooltip', { - defaultMessage: 'There is an error on this beat, please check the logs for this host.', - }), - }, - STOPPED: { - color: 'danger', - status: i18n.translate('xpack.beatsManagement.beatsTable.stoppedStatusLabel', { - defaultMessage: 'stopped', - }), - details: i18n.translate('xpack.beatsManagement.beatsTable.configStatus.errorTooltip', { - defaultMessage: 'There is an error on this beat, please check the logs for this host.', - }), - }, -}; - -export const BeatsTableType: TableType = { - itemType: 'Beats', - columnDefinitions: [ - { - field: 'name', - name: i18n.translate('xpack.beatsManagement.beatsTable.beatNameTitle', { - defaultMessage: 'Beat name', - }), - render: (name: string, beat: CMBeat) => ( - {name} - ), - sortable: true, - }, - { - field: 'type', - name: i18n.translate('xpack.beatsManagement.beatsTable.typeTitle', { - defaultMessage: 'Type', - }), - sortable: true, - }, - { - field: 'full_tags', - name: i18n.translate('xpack.beatsManagement.beatsTable.tagsTitle', { - defaultMessage: 'Tags', - }), - render: (value: string, beat: CMBeat & { tags: BeatTag[] }) => ( - - {(sortBy(beat.tags, 'id') || []).map((tag) => ( - - - - - - ))} - - ), - sortable: false, - }, - { - field: 'config_status', - name: i18n.translate('xpack.beatsManagement.beatsTable.configStatusTitle', { - defaultMessage: 'Config Status', - }), - render: (value: string, beat: CMBeat) => { - let color: IconColor = 'success'; - let statusText = i18n.translate('xpack.beatsManagement.beatsTable.configStatus.okLabel', { - defaultMessage: 'OK', - }); - let tooltipText = i18n.translate( - 'xpack.beatsManagement.beatsTable.configStatus.okTooltip', - { - defaultMessage: 'Beat successfully applied latest config', - } - ); - - if (beat.status && moment().diff(beat.last_checkin, 'minutes') < 10) { - color = dynamicStatuses[beat.status.event.type].color; - statusText = dynamicStatuses[beat.status.event.type].status; - tooltipText = - (dynamicStatuses[beat.status.event.type] as any).details || beat.status.event.message; - } else if (!beat.status && moment().diff(beat.last_checkin, 'minutes') >= 10) { - color = 'danger'; - statusText = i18n.translate( - 'xpack.beatsManagement.beatsTable.configStatus.offlineLabel', - { - defaultMessage: 'Offline', - } - ); - tooltipText = i18n.translate( - 'xpack.beatsManagement.beatsTable.configStatus.noConnectionTooltip', - { - defaultMessage: 'This Beat has not connected to kibana in over 10min', - } - ); - } else if (beat.status && moment().diff(beat.last_checkin, 'minutes') >= 10) { - color = 'subdued'; - - tooltipText = i18n.translate( - 'xpack.beatsManagement.beatsTable.configStatus.notStartedTooltip', - { - defaultMessage: 'This Beat has not yet been started.', - } - ); - statusText = i18n.translate( - 'xpack.beatsManagement.beatsTable.configStatus.notStartedLabel', - { - defaultMessage: 'Not started', - } - ); - } else { - color = 'subdued'; - statusText = i18n.translate( - 'xpack.beatsManagement.beatsTable.configStatus.offlineLabel', - { - defaultMessage: 'Offline', - } - ); - } - - return ( - - - {statusText} - - - ); - }, - sortable: false, - }, - // { - // field: 'full_tags', - // name: i18n.translate('xpack.beatsManagement.beatsTable.lastConfigUpdateTitle', { - // defaultMessage: 'Last config update', - // }), - // render: (tags?: BeatTag[]) => - // tags && tags.length ? ( - // - // {moment(first(orderBy(tags, ['last_updated'], ['desc'])).last_updated).fromNow()} - // - // ) : null, - // sortable: true, - // }, - ], - controlDefinitions: (data: any[]) => ({ - actions: [ - { - name: i18n.translate('xpack.beatsManagement.beatsTable.disenrollSelectedLabel', { - defaultMessage: 'Unenroll Selected', - }), - action: 'delete', - danger: true, - }, - ], - filters: [ - { - type: 'field_value_selection', - field: 'type', - name: i18n.translate('xpack.beatsManagement.beatsTable.typeLabel', { - defaultMessage: 'Type', - }), - options: uniqBy( - data.map(({ type }: { type: any }) => ({ value: type })), - 'value' - ), - }, - ], - }), -}; - -export const TagsTableType: TableType = { - itemType: 'Tags', - columnDefinitions: [ - { - field: 'id', - name: i18n.translate('xpack.beatsManagement.tagsTable.tagNameTitle', { - defaultMessage: 'Tag name', - }), - render: (id: string, tag: BeatTag) => ( - - - - ), - sortable: true, - width: '45%', - }, - { - align: 'right', - field: 'last_updated', - name: i18n.translate('xpack.beatsManagement.tagsTable.lastUpdateTitle', { - defaultMessage: 'Last update', - }), - render: (lastUpdate: Date) =>
{moment(lastUpdate).fromNow()}
, - sortable: true, - }, - ], - controlDefinitions: (data: any) => ({ - actions: [ - { - name: i18n.translate('xpack.beatsManagement.tagsTable.removeSelectedLabel', { - defaultMessage: 'Remove Selected', - }), - action: 'delete', - danger: true, - }, - ], - filters: [], - }), -}; - -export const BeatDetailTagsTable: TableType = { - itemType: 'Tags', - columnDefinitions: [ - { - field: 'id', - name: i18n.translate('xpack.beatsManagement.beatTagsTable.tagNameTitle', { - defaultMessage: 'Tag name', - }), - render: (id: string, tag: BeatTag) => ( - - - - ), - sortable: true, - width: '55%', - }, - { - align: 'right', - field: 'last_updated', - name: i18n.translate('xpack.beatsManagement.beatTagsTable.lastUpdateTitle', { - defaultMessage: 'Last update', - }), - render: (lastUpdate: string) => {moment(lastUpdate).fromNow()}, - sortable: true, - }, - ], - controlDefinitions: (data: any) => ({ - actions: [], - filters: [], - primaryActions: [ - { - name: i18n.translate('xpack.beatsManagement.beatTagsTable.addTagLabel', { - defaultMessage: 'Add Tag', - }), - action: 'add', - danger: false, - }, - { - name: i18n.translate('xpack.beatsManagement.beatTagsTable.removeSelectedLabel', { - defaultMessage: 'Remove Selected', - }), - action: 'remove', - danger: true, - }, - ], - }), -}; diff --git a/x-pack/plugins/beats_management/public/components/tag/config_view/config_form.tsx b/x-pack/plugins/beats_management/public/components/tag/config_view/config_form.tsx deleted file mode 100644 index a3512a395570f0..00000000000000 --- a/x-pack/plugins/beats_management/public/components/tag/config_view/config_form.tsx +++ /dev/null @@ -1,216 +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. - */ - -// @ts-ignore -import { i18n } from '@kbn/i18n'; -import Formsy from 'formsy-react'; -import { get } from 'lodash'; -import React from 'react'; -import { ConfigBlockSchema, ConfigurationBlock } from '../../../../common/domain_types'; -import { - FormsyEuiCodeEditor, - FormsyEuiFieldText, - FormsyEuiMultiFieldText, - FormsyEuiPasswordText, - FormsyEuiSelect, -} from '../../inputs'; - -interface ComponentProps { - values: ConfigurationBlock; - schema: ConfigBlockSchema; - id: string; - onSubmit?: (modal: any) => any; - canSubmit(canIt: boolean): any; -} - -interface ComponentState { - canSubmit: boolean; -} - -class ConfigFormUi extends React.Component { - private form = React.createRef(); - constructor(props: ComponentProps) { - super(props); - - this.state = { - canSubmit: false, - }; - } - - public enableButton = () => { - this.setState({ - canSubmit: true, - }); - this.props.canSubmit(true); - }; - public disableButton = () => { - this.setState({ - canSubmit: false, - }); - this.props.canSubmit(false); - }; - public submit = () => { - if (this.form.current && this.props.onSubmit) { - this.form.current.click(); - } - }; - public onValidSubmit = (model: ModelType) => { - if (!this.props.onSubmit) { - return; - } - - this.props.onSubmit(model); - }; - public render() { - return ( -
-
- - {this.props.schema.configs.map((schema) => { - switch (schema.ui.type) { - case 'input': - return ( - - ); - case 'password': - return ( - - ); - case 'multi-input': - return ( - - ); - case 'select': - return ( - - ); - case 'code': - return ( - - ); - } - })} - {this.props.schema && ( - - )} - {this.props.onSubmit && ( -
- ); - } -} -export const ConfigForm = ConfigFormUi; diff --git a/x-pack/plugins/beats_management/public/components/tag/config_view/index.tsx b/x-pack/plugins/beats_management/public/components/tag/config_view/index.tsx deleted file mode 100644 index 601d517e95e9e5..00000000000000 --- a/x-pack/plugins/beats_management/public/components/tag/config_view/index.tsx +++ /dev/null @@ -1,189 +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 { - EuiButton, - EuiButtonEmpty, - EuiFieldText, - EuiFlexGroup, - EuiFlexItem, - EuiFlyout, - EuiFlyoutBody, - EuiFlyoutFooter, - EuiFlyoutHeader, - EuiFormRow, - EuiHorizontalRule, - EuiSelect, - EuiSpacer, - EuiTitle, -} from '@elastic/eui'; -import { i18n } from '@kbn/i18n'; -import React from 'react'; -import { configBlockSchemas } from '../../../../common/config_schemas'; -import { translateConfigSchema } from '../../../../common/config_schemas_translations_map'; -import { ConfigurationBlock } from '../../../../common/domain_types'; -import { ConfigForm } from './config_form'; - -interface ComponentProps { - configBlock?: ConfigurationBlock; - onClose(): any; - onSave?(config: ConfigurationBlock): any; -} - -interface ComponentState { - valid: boolean; - configBlock: ConfigurationBlock; -} - -class ConfigViewUi extends React.Component { - private form = React.createRef(); - private editMode: boolean; - private schema = translateConfigSchema(configBlockSchemas); - constructor(props: any) { - super(props); - this.editMode = props.configBlock !== undefined; - - this.state = { - valid: false, - configBlock: props.configBlock || { - type: this.schema[0].id, - }, - }; - } - public onValueChange = (field: string) => (e: any) => { - const value = e.currentTarget ? e.currentTarget.value : e; - this.setState((state: any) => ({ - configBlock: { - ...state.configBlock, - [field]: value, - }, - })); - }; - public render() { - const thisConfigSchema = this.schema.find((s) => this.state.configBlock.type === s.id); - - if (!thisConfigSchema) { - return i18n.translate('xpack.beatsManagement.tagConfig.invalidSchema', { - defaultMessage: - 'Error: This config is invalid, it is not supported by Beats and should be removed', - }); - } - return ( - - - -

- {this.editMode - ? this.props.onSave - ? i18n.translate('xpack.beatsManagement.tagConfig.editConfigurationTitle', { - defaultMessage: 'Edit configuration block', - }) - : i18n.translate('xpack.beatsManagement.tagConfig.viewConfigurationTitle"', { - defaultMessage: 'View configuration block', - }) - : i18n.translate('xpack.beatsManagement.tagConfig.addConfigurationTitle"', { - defaultMessage: 'Add configuration block', - })} -

- - - - - ({ value: s.id, text: s.name }))} - value={this.state.configBlock.type} - disabled={this.editMode} - onChange={this.onValueChange('type')} - /> - - - - - -

- {i18n.translate('xpack.beatsManagement.tagConfig.configurationTypeText', { - defaultMessage: '{configType} configuration', - values: { - configType: thisConfigSchema ? thisConfigSchema.name : 'Unknown', - }, - })} -

- - - { - if (this.props.onSave) { - this.props.onSave({ - ...this.state.configBlock, - config: data, - }); - } - this.props.onClose(); - } - : undefined - } - canSubmit={(canIt) => this.setState({ valid: canIt })} - ref={this.form} - values={this.state.configBlock} - id={thisConfigSchema ? thisConfigSchema.name : 'Undefined'} - schema={thisConfigSchema} - /> - - - - - - {i18n.translate('xpack.beatsManagement.tagConfig.closeButtonLabel', { - defaultMessage: 'Close', - })} - - - {this.props.onSave && ( - - { - if (this.form.current) { - this.form.current.submit(); - } - }} - > - {i18n.translate('xpack.beatsManagement.tagConfig.saveButtonLabel', { - defaultMessage: 'Save', - })} - - - )} - - - - ); - } -} - -export const ConfigView = ConfigViewUi; diff --git a/x-pack/plugins/beats_management/public/components/tag/index.ts b/x-pack/plugins/beats_management/public/components/tag/index.ts deleted file mode 100644 index 9bf533537a3b51..00000000000000 --- a/x-pack/plugins/beats_management/public/components/tag/index.ts +++ /dev/null @@ -1,9 +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. - */ - -export { TagBadge } from './tag_badge'; -export { TagEdit } from './tag_edit'; diff --git a/x-pack/plugins/beats_management/public/components/tag/tag_badge.tsx b/x-pack/plugins/beats_management/public/components/tag/tag_badge.tsx deleted file mode 100644 index 0940b9c4fbdf91..00000000000000 --- a/x-pack/plugins/beats_management/public/components/tag/tag_badge.tsx +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { EuiBadge, EuiBadgeProps } from '@elastic/eui'; -import React from 'react'; -import { TABLE_CONFIG } from '../../../common/constants'; - -type TagBadgeProps = EuiBadgeProps & { - maxIdRenderSize?: number; - tag: { name: string; color: string; disabled?: boolean; id: string }; -}; - -export const TagBadge = (props: TagBadgeProps) => { - const { iconType, onClick, onClickAriaLabel, tag } = props; - const maxIdRenderSize = props.maxIdRenderSize || TABLE_CONFIG.TRUNCATE_TAG_LENGTH; - const idToRender = `${tag.name.substring(0, maxIdRenderSize)}${ - tag.name.length > maxIdRenderSize ? '...' : '' - }`; - - if (tag.disabled) { - return ( - - {idToRender} - - ); - } else if (onClick && onClickAriaLabel) { - return ( - } - onClickAriaLabel={onClickAriaLabel} - > - {idToRender} - - ); - } else { - return ( - - {idToRender} - - ); - } -}; diff --git a/x-pack/plugins/beats_management/public/components/tag/tag_edit.tsx b/x-pack/plugins/beats_management/public/components/tag/tag_edit.tsx deleted file mode 100644 index bbf5a8407905e5..00000000000000 --- a/x-pack/plugins/beats_management/public/components/tag/tag_edit.tsx +++ /dev/null @@ -1,238 +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 { - EuiButton, - // @ts-ignore - EuiColorPicker, - EuiFieldText, - EuiFlexGroup, - EuiFlexItem, - // @ts-ignore - EuiForm, - EuiFormRow, - EuiHorizontalRule, - EuiSpacer, - EuiText, - EuiTitle, -} from '@elastic/eui'; -import { i18n } from '@kbn/i18n'; -import { FormattedMessage } from '@kbn/i18n/react'; -import 'brace/mode/yaml'; -import 'brace/theme/github'; -import React from 'react'; -import { BeatTag, CMBeat, ConfigurationBlock } from '../../../common/domain_types'; -import { ConfigList } from '../config_list'; -import { AssignmentActionType, BeatsTableType, Table, tagConfigActions } from '../table'; -import { ConfigView } from './config_view'; -import { TagBadge } from './tag_badge'; - -interface TagEditProps { - tag: BeatTag; - configuration_blocks: { - error?: string | undefined; - list: ConfigurationBlock[]; - page: number; - total: number; - }; - onConfigListChange: (index: number, size: number) => void; - onDetachBeat?: (beatIds: string[]) => void; - onTagChange: (field: keyof BeatTag, value: string) => any; - onConfigAddOrEdit: (block: ConfigurationBlock) => any; - onConfigRemoved: (block: ConfigurationBlock) => any; - attachedBeats?: CMBeat[]; -} - -interface TagEditState { - showFlyout: boolean; - tableRef: any; - selectedConfig?: ConfigurationBlock; -} - -export class TagEdit extends React.PureComponent { - constructor(props: TagEditProps) { - super(props); - - this.state = { - showFlyout: false, - tableRef: React.createRef(), - }; - } - - public render() { - // eslint-disable-next-line @typescript-eslint/naming-convention - const { tag, attachedBeats, configuration_blocks } = this.props; - - return ( -
- - - -

- -

- - -

- -

- -
- -
- - - - - } - isInvalid={!!this.getNameError(tag.name)} - error={this.getNameError(tag.name) || undefined} - > - - - - - - - - - - - - - -

- -

- - -

- -

- - - -
- { - if (action === 'delete') { - this.props.onConfigRemoved(block); - } else { - this.setState({ - showFlyout: true, - selectedConfig: block, - }); - } - }} - /> -
- { - this.setState({ showFlyout: true }); - }} - > - - -
- - - - {attachedBeats && ( -
- - - -

- -

- - - - )} - {this.state.showFlyout && ( - this.setState({ showFlyout: false, selectedConfig: undefined })} - onSave={(config: ConfigurationBlock) => { - this.setState({ showFlyout: false, selectedConfig: undefined }); - this.props.onConfigAddOrEdit(config); - }} - /> - )} - - ); - } - - private getNameError = (name: string) => { - if (name && name !== '' && name.search(/^[a-zA-Z0-9-]+$/) === -1) { - return i18n.translate('xpack.beatsManagement.tag.tagName.validationErrorMessage', { - defaultMessage: 'Tag name must consist of letters, numbers, and dashes only', - }); - } else { - return false; - } - }; - - private handleAssignmentActions = (action: AssignmentActionType) => { - switch (action) { - case AssignmentActionType.Delete: - const { selection } = this.state.tableRef.current.state; - if (this.props.onDetachBeat) { - this.props.onDetachBeat(selection.map((beat: any) => beat.id)); - } - } - }; - - private updateTag = (key: keyof BeatTag, value?: any) => - value !== undefined - ? this.props.onTagChange(key, value) - : (e: any) => this.props.onTagChange(key, e.target ? e.target.value : e); -} diff --git a/x-pack/plugins/beats_management/public/containers/beats.ts b/x-pack/plugins/beats_management/public/containers/beats.ts deleted file mode 100644 index 73f77c08282e10..00000000000000 --- a/x-pack/plugins/beats_management/public/containers/beats.ts +++ /dev/null @@ -1,104 +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 { Container } from 'unstated'; -import { CMBeat } from '../../common/domain_types'; -// eslint-disable-next-line @kbn/eslint/no-restricted-paths -import type { BeatsTagAssignment } from '../../server/lib/adapters/beats/adapter_types'; -import { FrontendLibs } from './../lib/types'; - -interface ContainerState { - list: CMBeat[]; -} - -export class BeatsContainer extends Container { - private query?: string; - constructor(private readonly libs: FrontendLibs) { - super(); - this.state = { - list: [], - }; - } - - public getBeatWithToken = async (token: string) => { - const beat = await this.libs.beats.getBeatWithToken(token); - - if (beat) { - this.setState({ - list: [beat as CMBeat, ...this.state.list], - }); - return beat as CMBeat; - } - return null; - }; - - public reload = async (kuery?: string) => { - if (kuery) { - this.query = kuery; - } else { - this.query = undefined; - } - const beats = await this.libs.beats.getAll(this.query); - - this.setState({ - list: beats, - }); - }; - - public deactivate = async (beats: CMBeat[]) => { - for (const beat of beats) { - await this.libs.beats.update(beat.id, { active: false }); - } - - // because the compile code above has a very minor race condition, we wait, - // the max race condition time is really 10ms but doing 100 to be safe - setTimeout(async () => { - await this.reload(this.query); - }, 100); - }; - - public toggleTagAssignment = async (tagId: string, beats: CMBeat[]) => { - if (beats.some((beat) => beat.tags !== undefined && beat.tags.some((id) => id === tagId))) { - await this.removeTagsFromBeats(beats, tagId); - return 'removed'; - } - await this.assignTagsToBeats(beats, tagId); - return 'added'; - }; - - public removeTagsFromBeats = async (beats: CMBeat[] | string[], tagId: string) => { - if (!beats.length) { - return false; - } - const assignments = createBeatTagAssignments(beats, tagId); - await this.libs.beats.removeTagsFromBeats(assignments); - // ES responds incorrectly when we call too soon - setTimeout(async () => { - await this.reload(this.query); - }, 150); - }; - - public assignTagsToBeats = async (beats: CMBeat[] | string[], tagId: string) => { - if (!beats.length) { - return false; - } - const assignments = createBeatTagAssignments(beats, tagId); - await this.libs.beats.assignTagsToBeats(assignments); - // ES responds incorrectly when we call too soon - setTimeout(async () => { - await this.reload(this.query); - }, 150); - }; -} - -function createBeatTagAssignments(beats: CMBeat[] | string[], tagId: string): BeatsTagAssignment[] { - if (typeof beats[0] === 'string') { - return (beats as string[]).map((id) => ({ beatId: id, tag: tagId })); - } else { - return (beats as CMBeat[]).map(({ id }) => ({ beatId: id, tag: tagId })); - } -} diff --git a/x-pack/plugins/beats_management/public/containers/tags.ts b/x-pack/plugins/beats_management/public/containers/tags.ts deleted file mode 100644 index f7b4996fc750d8..00000000000000 --- a/x-pack/plugins/beats_management/public/containers/tags.ts +++ /dev/null @@ -1,54 +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 { Container } from 'unstated'; -import { BeatTag } from '../../common/domain_types'; -import { FrontendLibs } from '../lib/types'; - -interface ContainerState { - list: BeatTag[]; -} - -export class TagsContainer extends Container { - private query?: string; - constructor(private readonly libs: FrontendLibs) { - super(); - this.state = { - list: [], - }; - } - public reload = async (kuery?: string) => { - if (kuery) { - this.query = kuery; - } else { - this.query = undefined; - } - - const tags = await this.libs.tags.getAll(this.query); - - this.setState({ - list: tags, - }); - }; - - public delete = async (tags: BeatTag[]) => { - const tagIds = tags.map((tag: BeatTag) => tag.id); - const success = await this.libs.tags.delete(tagIds); - if (success) { - this.setState({ - list: this.state.list.filter((tag) => tagIds.includes(tag.id)), - }); - } - return success; - }; - - public upsertTag = async (tag: BeatTag) => { - const beatTag = await this.libs.tags.upsertTag(tag); - await this.reload(); - return beatTag !== null; - }; -} diff --git a/x-pack/plugins/beats_management/public/containers/with_kuery_autocompletion.tsx b/x-pack/plugins/beats_management/public/containers/with_kuery_autocompletion.tsx deleted file mode 100644 index 5bd3a4194d4f77..00000000000000 --- a/x-pack/plugins/beats_management/public/containers/with_kuery_autocompletion.tsx +++ /dev/null @@ -1,89 +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 { QuerySuggestion } from '../../../../../src/plugins/data/public'; - -import { FrontendLibs } from '../lib/types'; -import { RendererFunction } from '../utils/typed_react'; - -interface WithKueryAutocompletionLifecycleProps { - libs: FrontendLibs; - fieldPrefix?: string; - children: RendererFunction<{ - isLoadingSuggestions: boolean; - loadSuggestions: (expression: string, cursorPosition: number, maxSuggestions?: number) => void; - suggestions: QuerySuggestion[]; - }>; -} - -interface WithKueryAutocompletionLifecycleState { - // lacking cancellation support in the autocompletion api, - // this is used to keep older, slower requests from clobbering newer ones - currentRequest: { - expression: string; - cursorPosition: number; - } | null; - suggestions: QuerySuggestion[]; -} - -export class WithKueryAutocompletion extends React.Component< - WithKueryAutocompletionLifecycleProps, - WithKueryAutocompletionLifecycleState -> { - public readonly state: WithKueryAutocompletionLifecycleState = { - currentRequest: null, - suggestions: [], - }; - - public render() { - const { currentRequest, suggestions } = this.state; - - return this.props.children({ - isLoadingSuggestions: currentRequest !== null, - loadSuggestions: this.loadSuggestions, - suggestions, - }); - } - - private loadSuggestions = async ( - expression: string, - cursorPosition: number, - maxSuggestions?: number - ) => { - this.setState({ - currentRequest: { - expression, - cursorPosition, - }, - suggestions: [], - }); - let suggestions: any[] = []; - try { - suggestions = await this.props.libs.elasticsearch.getSuggestions( - expression, - cursorPosition, - this.props.fieldPrefix - ); - } catch (e) { - suggestions = []; - } - - this.setState((state) => - state.currentRequest && - state.currentRequest.expression !== expression && - state.currentRequest.cursorPosition !== cursorPosition - ? state // ignore this result, since a newer request is in flight - : { - ...state, - currentRequest: null, - suggestions: maxSuggestions ? suggestions.slice(0, maxSuggestions) : suggestions, - } - ); - }; -} diff --git a/x-pack/plugins/beats_management/public/containers/with_url_state.tsx b/x-pack/plugins/beats_management/public/containers/with_url_state.tsx deleted file mode 100644 index a72a60bf04a184..00000000000000 --- a/x-pack/plugins/beats_management/public/containers/with_url_state.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 { parse, stringify } from 'query-string'; -import React from 'react'; -import { withRouter, RouteComponentProps } from 'react-router-dom'; -import { FlatObject } from '../frontend_types'; -import { RendererFunction } from '../utils/typed_react'; - -type StateCallback = (previousState: T) => T; - -export interface URLStateProps { - goTo: (path: string) => void; - setUrlState: ( - newState: - | Partial> - | StateCallback - | Promise> - ) => void; - urlState: URLState; -} -interface ComponentProps extends RouteComponentProps { - children: RendererFunction>; -} - -export class WithURLStateComponent extends React.Component< - ComponentProps -> { - private get URLState(): URLState { - // slice because parse does not account for the initial ? in the search string - return parse(decodeURIComponent(this.props.history.location.search).substring(1), { - sort: false, - }) as URLState; - } - - private historyListener: (() => void) | null = null; - - public componentWillUnmount() { - if (this.historyListener) { - this.historyListener(); - } - } - public render() { - return this.props.children({ - goTo: this.goTo, - setUrlState: this.setURLState, - urlState: this.URLState || {}, - }); - } - - private setURLState = async ( - state: - | Partial> - | StateCallback - | Promise> - ) => { - let newState; - const pastState = this.URLState; - if (typeof state === 'function') { - newState = await state(pastState); - } else { - newState = state; - } - - const search: string = stringify( - { - ...pastState, - ...newState, - }, - { sort: false } - ); - - const newLocation = { - ...this.props.history.location, - search, - }; - - this.props.history.replace(newLocation); - this.forceUpdate(); - }; - - private goTo = (path: string) => { - this.props.history.push({ - pathname: path, - search: this.props.history.location.search, - }); - }; -} -export const WithURLState = withRouter(WithURLStateComponent); - -export function withUrlState(UnwrappedComponent: React.ComponentType) { - return (origProps: OP) => ( - - {(URLProps: URLStateProps) => } - - ); -} diff --git a/x-pack/plugins/beats_management/public/frontend_types.d.ts b/x-pack/plugins/beats_management/public/frontend_types.d.ts deleted file mode 100644 index 2fa6da067d2b0d..00000000000000 --- a/x-pack/plugins/beats_management/public/frontend_types.d.ts +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { RouteComponentProps } from 'react-router-dom'; -import { BeatsContainer } from './containers/beats'; -import { TagsContainer } from './containers/tags'; -import { URLStateProps } from './containers/with_url_state'; -import { FrontendLibs } from './lib/types'; - -export type FlatObject = { [Key in keyof T]: string }; - -export interface AppURLState { - beatsKBar?: string; - tagsKBar?: string; - enrollmentToken?: string; - createdTag?: string; -} - -export interface RouteConfig { - path: string; - component: React.ComponentType; - routes?: RouteConfig[]; -} - -export interface AppPageProps extends URLStateProps, RouteComponentProps { - libs: FrontendLibs; - containers: { - beats: BeatsContainer; - tags: TagsContainer; - }; - routes?: RouteConfig[]; -} diff --git a/x-pack/plugins/beats_management/public/index.ts b/x-pack/plugins/beats_management/public/index.ts deleted file mode 100644 index da124a3c50da13..00000000000000 --- a/x-pack/plugins/beats_management/public/index.ts +++ /dev/null @@ -1,40 +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 { CoreSetup, Plugin, PluginInitializerContext } from '../../../../src/core/public'; - -import { ManagementSetup } from '../../../../src/plugins/management/public'; -import { SecurityPluginSetup } from '../../security/public'; -import { DataPublicPluginStart } from '../../../../src/plugins/data/public'; -import { LicensingPluginSetup } from '../../licensing/public'; - -import { bootstrap } from './bootstrap'; -import { BeatsManagementConfigType } from '../common'; - -interface SetupDeps { - management: ManagementSetup; - licensing: LicensingPluginSetup; - security?: SecurityPluginSetup; -} - -interface StartDeps { - data: DataPublicPluginStart; -} - -class BeatsManagementPlugin implements Plugin { - constructor(private readonly initContext: PluginInitializerContext) {} - - public setup(core: CoreSetup, plugins: SetupDeps) { - const config = this.initContext.config.get(); - bootstrap(core, plugins, config, this.initContext.env.packageInfo.version); - } - - public start() {} - public stop() {} -} - -export const plugin = (init: PluginInitializerContext) => new BeatsManagementPlugin(init); diff --git a/x-pack/plugins/beats_management/public/kbn_services.ts b/x-pack/plugins/beats_management/public/kbn_services.ts deleted file mode 100644 index 7c7ddef0dabc4e..00000000000000 --- a/x-pack/plugins/beats_management/public/kbn_services.ts +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { CoreStart } from '../../../../src/core/public'; -import { DataPublicPluginStart } from '../../../../src/plugins/data/public'; -import { ManagementAppMountParams } from '../../../../src/plugins/management/public'; - -export const services = { - I18nContext: (null as any) as CoreStart['i18n']['Context'], - setBreadcrumbs: (null as any) as ManagementAppMountParams['setBreadcrumbs'], - dataStart: (null as any) as DataPublicPluginStart, -}; - -export const setServices = ( - core: CoreStart, - plugins: { data: DataPublicPluginStart }, - params: ManagementAppMountParams -) => { - services.I18nContext = core.i18n.Context; - services.setBreadcrumbs = params.setBreadcrumbs; - services.dataStart = plugins.data; -}; diff --git a/x-pack/plugins/beats_management/public/lib/adapters/beats/adapter_types.ts b/x-pack/plugins/beats_management/public/lib/adapters/beats/adapter_types.ts deleted file mode 100644 index da61655e2c8564..00000000000000 --- a/x-pack/plugins/beats_management/public/lib/adapters/beats/adapter_types.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 { CMBeat } from '../../../../common/domain_types'; -import { ReturnTypeBulkAction } from '../../../../common/return_types'; - -export interface CMBeatsAdapter { - get(id: string): Promise; - update(id: string, beatData: Partial): Promise; - getBeatsWithTag(tagId: string): Promise; - getAll(ESQuery?: any): Promise; - removeTagsFromBeats(removals: BeatsTagAssignment[]): Promise; - assignTagsToBeats(assignments: BeatsTagAssignment[]): Promise; - getBeatWithToken(enrollmentToken: string): Promise; -} - -export interface BeatsTagAssignment { - beatId: string; - tag: string; - idxInRequest?: number; -} - -interface BeatsReturnedTagAssignment { - status: number | null; - result?: string; -} - -export interface CMAssignmentReturn { - assignments: BeatsReturnedTagAssignment[]; -} - -export interface BeatsRemovalReturn { - removals: BeatsReturnedTagAssignment[]; -} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/beats/memory_beats_adapter.ts b/x-pack/plugins/beats_management/public/lib/adapters/beats/memory_beats_adapter.ts deleted file mode 100644 index 172635fb14f9ad..00000000000000 --- a/x-pack/plugins/beats_management/public/lib/adapters/beats/memory_beats_adapter.ts +++ /dev/null @@ -1,109 +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 { omit } from 'lodash'; -import { CMBeat } from '../../../../common/domain_types'; -import { ReturnTypeBulkAction } from '../../../../common/return_types'; -import { BeatsTagAssignment, CMBeatsAdapter } from './adapter_types'; - -export class MemoryBeatsAdapter implements CMBeatsAdapter { - private beatsDB: CMBeat[]; - - constructor(beatsDB: CMBeat[]) { - this.beatsDB = beatsDB; - } - - public async get(id: string) { - return this.beatsDB.find((beat) => beat.id === id) || null; - } - - public async update(id: string, beatData: Partial): Promise { - const index = this.beatsDB.findIndex((beat) => beat.id === id); - - if (index === -1) { - return false; - } - - this.beatsDB[index] = { ...this.beatsDB[index], ...beatData }; - return true; - } - - public async getAll() { - return this.beatsDB.map((beat: any) => omit(beat, ['access_token'])) as CMBeat[]; - } - public async getBeatsWithTag(tagId: string): Promise { - return this.beatsDB.map((beat: any) => omit(beat, ['access_token'])) as CMBeat[]; - } - - public async getBeatWithToken(enrollmentToken: string): Promise { - return this.beatsDB.map((beat: any) => omit(beat, ['access_token']))[0] as CMBeat | null; - } - public async removeTagsFromBeats( - removals: BeatsTagAssignment[] - ): Promise { - const beatIds = removals.map((r) => r.beatId); - - const response = this.beatsDB - .filter((beat) => beatIds.includes(beat.id)) - .map((beat) => { - const tagData = removals.find((r) => r.beatId === beat.id); - if (tagData) { - if (beat.tags) { - beat.tags = beat.tags.filter((tag) => tag !== tagData.tag); - } - } - const removalsForBeat = removals.filter((r) => r.beatId === beat.id); - if (removalsForBeat.length) { - removalsForBeat.forEach((assignment: BeatsTagAssignment) => { - if (beat.tags) { - beat.tags = beat.tags.filter((tag) => tag !== assignment.tag); - } - }); - } - return beat; - }); - - return response.map((item: CMBeat, resultIdx: number) => ({ - idxInRequest: removals[resultIdx].idxInRequest, - result: 'updated', - status: 200, - })) as any; - } - - public async assignTagsToBeats( - assignments: BeatsTagAssignment[] - ): Promise { - const beatIds = assignments.map((r) => r.beatId); - - this.beatsDB - .filter((beat) => beatIds.includes(beat.id)) - .map((beat) => { - // get tags that need to be assigned to this beat - const tags = assignments - .filter((a) => a.beatId === beat.id) - .map((t: BeatsTagAssignment) => t.tag); - - if (tags.length > 0) { - if (!beat.tags) { - beat.tags = []; - } - const nonExistingTags = tags.filter((t: string) => beat.tags && !beat.tags.includes(t)); - - if (nonExistingTags.length > 0) { - beat.tags = beat.tags.concat(nonExistingTags); - } - } - return beat; - }); - - return assignments.map((item: BeatsTagAssignment, resultIdx: number) => ({ - idxInRequest: assignments[resultIdx].idxInRequest, - result: 'updated', - status: 200, - })); - } -} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/beats/rest_beats_adapter.ts b/x-pack/plugins/beats_management/public/lib/adapters/beats/rest_beats_adapter.ts deleted file mode 100644 index 489eb4d721cd34..00000000000000 --- a/x-pack/plugins/beats_management/public/lib/adapters/beats/rest_beats_adapter.ts +++ /dev/null @@ -1,80 +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 { CMBeat } from '../../../../common/domain_types'; -import { - ReturnTypeBulkAction, - ReturnTypeGet, - ReturnTypeList, - ReturnTypeUpdate, -} from '../../../../common/return_types'; -import { RestAPIAdapter } from '../rest_api/adapter_types'; -import { BeatsTagAssignment, CMBeatsAdapter } from './adapter_types'; - -export class RestBeatsAdapter implements CMBeatsAdapter { - constructor(private readonly REST: RestAPIAdapter) {} - - public async get(id: string): Promise { - try { - return (await this.REST.get>(`/api/beats/agent/${id}`)).item; - } catch (e) { - return null; - } - } - - public async getBeatWithToken(enrollmentToken: string): Promise { - try { - return ( - await this.REST.get>(`/api/beats/agent/unknown/${enrollmentToken}`) - ).item; - } catch (e) { - return null; - } - } - - public async getAll(ESQuery?: string): Promise { - try { - return (await this.REST.get>('/api/beats/agents/all', { ESQuery })) - .list; - } catch (e) { - return []; - } - } - - public async getBeatsWithTag(tagId: string): Promise { - try { - return (await this.REST.get>(`/api/beats/agents/tag/${tagId}`)).list; - } catch (e) { - return []; - } - } - - public async update(id: string, beatData: Partial): Promise { - await this.REST.put>(`/api/beats/agent/${id}`, beatData); - return true; - } - - public async removeTagsFromBeats( - removals: BeatsTagAssignment[] - ): Promise { - return ( - await this.REST.post(`/api/beats/agents_tags/removals`, { - removals, - }) - ).results; - } - - public async assignTagsToBeats( - assignments: BeatsTagAssignment[] - ): Promise { - return ( - await this.REST.post(`/api/beats/agents_tags/assignments`, { - assignments, - }) - ).results; - } -} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/configuration_blocks/adapter_types.ts b/x-pack/plugins/beats_management/public/lib/adapters/configuration_blocks/adapter_types.ts deleted file mode 100644 index 24921f1778b6c0..00000000000000 --- a/x-pack/plugins/beats_management/public/lib/adapters/configuration_blocks/adapter_types.ts +++ /dev/null @@ -1,15 +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 { ConfigurationBlock } from '../../../../common/domain_types'; -import { ReturnTypeBulkUpsert, ReturnTypeList } from '../../../../common/return_types'; - -export interface FrontendConfigBlocksAdapter { - upsert(blocks: ConfigurationBlock[]): Promise; - getForTags(tagIds: string[], page: number): Promise>; - delete(id: string): Promise; -} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/configuration_blocks/memory_config_blocks_adapter.ts b/x-pack/plugins/beats_management/public/lib/adapters/configuration_blocks/memory_config_blocks_adapter.ts deleted file mode 100644 index 6b3549465e171f..00000000000000 --- a/x-pack/plugins/beats_management/public/lib/adapters/configuration_blocks/memory_config_blocks_adapter.ts +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { ConfigurationBlock } from '../../../../common/domain_types'; -import { ReturnTypeBulkUpsert, ReturnTypeList } from '../../../../common/return_types'; -import { FrontendConfigBlocksAdapter } from './adapter_types'; - -export class MemoryConfigBlocksAdapter implements FrontendConfigBlocksAdapter { - constructor(private db: ConfigurationBlock[]) {} - - public async upsert(blocks: ConfigurationBlock[]): Promise { - this.db = this.db.concat(blocks); - return { - success: true, - results: blocks.map(() => ({ - success: true, - action: 'created', - })), - } as ReturnTypeBulkUpsert; - } - public async getForTags(tagIds: string[]): Promise> { - return { - success: true, - list: this.db.filter((block) => tagIds.includes(block.tag)), - page: 0, - total: this.db.filter((block) => tagIds.includes(block.tag)).length, - }; - } - public async delete(id: string): Promise { - this.db = this.db.reduce((newDB: ConfigurationBlock[], block) => { - if (block.id !== id) { - newDB.push(block); - } - return newDB; - }, []); - return !!this.db.find((block) => block.id === id); - } -} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/configuration_blocks/rest_config_blocks_adapter.ts b/x-pack/plugins/beats_management/public/lib/adapters/configuration_blocks/rest_config_blocks_adapter.ts deleted file mode 100644 index 295455dfaa48d1..00000000000000 --- a/x-pack/plugins/beats_management/public/lib/adapters/configuration_blocks/rest_config_blocks_adapter.ts +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { ConfigurationBlock } from '../../../../common/domain_types'; -import { - ReturnTypeBulkDelete, - ReturnTypeBulkUpsert, - ReturnTypeList, -} from '../../../../common/return_types'; -import { RestAPIAdapter } from '../rest_api/adapter_types'; -import { FrontendConfigBlocksAdapter } from './adapter_types'; - -export class RestConfigBlocksAdapter implements FrontendConfigBlocksAdapter { - constructor(private readonly REST: RestAPIAdapter) {} - - public async upsert(blocks: ConfigurationBlock[]) { - const result = await this.REST.put(`/api/beats/configurations`, blocks); - return result; - } - public async getForTags( - tagIds: string[], - page: number - ): Promise> { - return await this.REST.get>( - `/api/beats/configurations/${tagIds.join(',')}/${page}` - ); - } - public async delete(id: string): Promise { - return (await this.REST.delete(`/api/beats/configurations/${id}`)) - .success; - } -} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/elasticsearch/adapter_types.ts b/x-pack/plugins/beats_management/public/lib/adapters/elasticsearch/adapter_types.ts deleted file mode 100644 index b414648a192cb3..00000000000000 --- a/x-pack/plugins/beats_management/public/lib/adapters/elasticsearch/adapter_types.ts +++ /dev/null @@ -1,14 +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 { QuerySuggestion } from '../../../../../../../src/plugins/data/public'; - -export interface ElasticsearchAdapter { - convertKueryToEsQuery: (kuery: string) => Promise; - getSuggestions: (kuery: string, selectionStart: any) => Promise; - isKueryValid(kuery: string): boolean; -} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/elasticsearch/memory.ts b/x-pack/plugins/beats_management/public/lib/adapters/elasticsearch/memory.ts deleted file mode 100644 index e5a24f53d049eb..00000000000000 --- a/x-pack/plugins/beats_management/public/lib/adapters/elasticsearch/memory.ts +++ /dev/null @@ -1,27 +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 { QuerySuggestion } from '../../../../../../../src/plugins/data/public'; -import { ElasticsearchAdapter } from './adapter_types'; - -export class MemoryElasticsearchAdapter implements ElasticsearchAdapter { - constructor( - private readonly mockIsKueryValid: (kuery: string) => boolean, - private readonly mockKueryToEsQuery: (kuery: string) => string, - private readonly suggestions: QuerySuggestion[] - ) {} - - public isKueryValid(kuery: string): boolean { - return this.mockIsKueryValid(kuery); - } - public async convertKueryToEsQuery(kuery: string): Promise { - return this.mockKueryToEsQuery(kuery); - } - public async getSuggestions(kuery: string, selectionStart: any): Promise { - return this.suggestions; - } -} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/elasticsearch/rest.ts b/x-pack/plugins/beats_management/public/lib/adapters/elasticsearch/rest.ts deleted file mode 100644 index 0143fc8b4a364a..00000000000000 --- a/x-pack/plugins/beats_management/public/lib/adapters/elasticsearch/rest.ts +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { isEmpty } from 'lodash'; -import { ElasticsearchAdapter } from './adapter_types'; -import { QuerySuggestion, esKuery } from '../../../../../../../src/plugins/data/public'; -import { services } from '../../../kbn_services'; - -export class RestElasticsearchAdapter implements ElasticsearchAdapter { - private cachedIndexPattern: any = null; - constructor(private readonly indexPatternName: string) {} - - public isKueryValid(kuery: string): boolean { - try { - esKuery.fromKueryExpression(kuery); - } catch (err) { - return false; - } - - return true; - } - public async convertKueryToEsQuery(kuery: string): Promise { - if (!this.isKueryValid(kuery)) { - return ''; - } - const ast = esKuery.fromKueryExpression(kuery); - const indexPattern = await this.getIndexPattern(); - return JSON.stringify(esKuery.toElasticsearchQuery(ast, indexPattern)); - } - - public async getSuggestions(kuery: string, selectionStart: any): Promise { - const indexPattern = await this.getIndexPattern(); - - return ( - (await services.dataStart.autocomplete.getQuerySuggestions({ - language: 'kuery', - indexPatterns: [indexPattern], - boolFilter: [], - query: kuery || '', - selectionStart, - selectionEnd: selectionStart, - })) || [] - ); - } - - private async getIndexPattern() { - if (this.cachedIndexPattern) { - return this.cachedIndexPattern; - } - const res = await services.dataStart.indexPatterns.getFieldsForWildcard({ - pattern: this.indexPatternName, - }); - if (isEmpty(res.fields)) { - return; - } - this.cachedIndexPattern = { - fields: res.fields, - title: `${this.indexPatternName}`, - }; - return this.cachedIndexPattern; - } -} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/framework/adapter_types.ts b/x-pack/plugins/beats_management/public/lib/adapters/framework/adapter_types.ts deleted file mode 100644 index c9a0e6029dadae..00000000000000 --- a/x-pack/plugins/beats_management/public/lib/adapters/framework/adapter_types.ts +++ /dev/null @@ -1,54 +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. - */ - -/* eslint-disable @typescript-eslint/no-empty-interface */ - -import * as t from 'io-ts'; -import { LICENSES } from '../../../../common/constants/security'; -import { RegisterManagementAppArgs } from '../../../../../../../src/plugins/management/public'; - -export interface FrameworkAdapter { - // Instance vars - info: FrameworkInfo; - version: string; - currentUser: FrameworkUser; - // Methods - waitUntilFrameworkReady(): Promise; - registerManagementUI(mount: RegisterManagementAppArgs['mount']): void; -} - -export const RuntimeFrameworkInfo = t.type({ - basePath: t.string, - license: t.type({ - type: t.keyof(Object.fromEntries(LICENSES.map((s) => [s, null])) as Record), - expired: t.boolean, - expiry_date_in_millis: t.number, - }), - security: t.type({ - enabled: t.boolean, - available: t.boolean, - }), - settings: t.type({ - encryptionKey: t.string, - enrollmentTokensTtlInSeconds: t.number, - defaultUserRoles: t.array(t.string), - }), -}); - -export interface FrameworkInfo extends t.TypeOf {} - -export const RuntimeFrameworkUser = t.interface( - { - username: t.string, - roles: t.readonlyArray(t.string), - full_name: t.union([t.null, t.string]), - email: t.union([t.null, t.string]), - enabled: t.boolean, - }, - 'FrameworkUser' -); -export interface FrameworkUser extends t.TypeOf {} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/framework/kibana_framework_adapter.ts b/x-pack/plugins/beats_management/public/lib/adapters/framework/kibana_framework_adapter.ts deleted file mode 100644 index 03a9a776084984..00000000000000 --- a/x-pack/plugins/beats_management/public/lib/adapters/framework/kibana_framework_adapter.ts +++ /dev/null @@ -1,160 +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. - */ - -/* eslint-disable max-classes-per-file */ -import { IScope } from 'angular'; -import { PathReporter } from 'io-ts/lib/PathReporter'; -import { isLeft } from 'fp-ts/lib/Either'; -import { first } from 'rxjs/operators'; -import { i18n } from '@kbn/i18n'; -import { MANAGEMENT_SECTION } from '../../../../common/constants'; -import { SecurityPluginSetup } from '../../../../../security/public'; -import { BufferedKibanaServiceCall, KibanaAdapterServiceRefs, KibanaUIConfig } from '../../types'; -import { - FrameworkAdapter, - FrameworkInfo, - FrameworkUser, - RuntimeFrameworkInfo, - RuntimeFrameworkUser, -} from './adapter_types'; -import { - ManagementSetup, - RegisterManagementAppArgs, -} from '../../../../../../../src/plugins/management/public'; -import { LicensingPluginSetup } from '../../../../../licensing/public'; -import { BeatsManagementConfigType } from '../../../../common'; - -export class KibanaFrameworkAdapter implements FrameworkAdapter { - public get info() { - if (this.xpackInfo) { - return this.xpackInfo; - } else { - throw new Error('framework adapter must have init called before anything else'); - } - } - - public get currentUser() { - return this.shieldUser!; - } - private xpackInfo: FrameworkInfo | null = null; - private adapterService: KibanaAdapterServiceProvider; - private shieldUser: FrameworkUser | null = null; - constructor( - private readonly PLUGIN_ID: string, - private readonly management: ManagementSetup, - private readonly getBasePath: () => string, - private readonly licensing: LicensingPluginSetup, - private readonly securitySetup: SecurityPluginSetup | undefined, - private readonly config: BeatsManagementConfigType, - public readonly version: string - ) { - this.adapterService = new KibanaAdapterServiceProvider(); - } - - public setUISettings = (key: string, value: any) => { - this.adapterService.callOrBuffer(({ config }) => { - config.set(key, value); - }); - }; - - public async waitUntilFrameworkReady(): Promise { - const license = await this.licensing.license$.pipe(first()).toPromise(); - let xpackInfoUnpacked: FrameworkInfo; - - try { - xpackInfoUnpacked = { - basePath: this.getBasePath(), - license: { - type: license.type ?? 'oss', - expired: !license.isActive, - expiry_date_in_millis: license.expiryDateInMillis ?? -1, - }, - security: { - enabled: license.getFeature('security').isEnabled, - available: license.getFeature('security').isAvailable, - }, - settings: this.config, - }; - } catch (e) { - throw new Error(`Unexpected data structure from xpackInfoService, ${JSON.stringify(e)}`); - } - - const assertData = RuntimeFrameworkInfo.decode(xpackInfoUnpacked); - if (isLeft(assertData)) { - throw new Error( - `Error parsing xpack info in ${this.PLUGIN_ID}, ${PathReporter.report(assertData)[0]}` - ); - } - this.xpackInfo = xpackInfoUnpacked; - - try { - this.shieldUser = (await this.securitySetup?.authc.getCurrentUser()) || null; - const assertUser = RuntimeFrameworkUser.decode(this.shieldUser); - - if (isLeft(assertUser)) { - throw new Error( - `Error parsing user info in ${this.PLUGIN_ID}, ${PathReporter.report(assertUser)[0]}` - ); - } - } catch (e) { - this.shieldUser = null; - } - } - - public registerManagementUI(mount: RegisterManagementAppArgs['mount']) { - const section = this.management.sections.section.ingest; - section.registerApp({ - id: MANAGEMENT_SECTION, - title: i18n.translate('xpack.beatsManagement.centralManagementLinkLabel', { - defaultMessage: 'Beats Central Management', - }), - order: 2, - mount, - }); - } -} - -class KibanaAdapterServiceProvider { - public serviceRefs: KibanaAdapterServiceRefs | null = null; - public bufferedCalls: Array> = []; - - public $get($rootScope: IScope, config: KibanaUIConfig) { - this.serviceRefs = { - config, - rootScope: $rootScope, - }; - - this.applyBufferedCalls(this.bufferedCalls); - - return this; - } - - public callOrBuffer(serviceCall: (serviceRefs: KibanaAdapterServiceRefs) => void) { - if (this.serviceRefs !== null) { - this.applyBufferedCalls([serviceCall]); - } else { - this.bufferedCalls.push(serviceCall); - } - } - - public applyBufferedCalls( - bufferedCalls: Array> - ) { - if (!this.serviceRefs) { - return; - } - - this.serviceRefs.rootScope.$apply(() => { - bufferedCalls.forEach((serviceCall) => { - if (!this.serviceRefs) { - return; - } - return serviceCall(this.serviceRefs); - }); - }); - } -} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/framework/testing_framework_adapter.ts b/x-pack/plugins/beats_management/public/lib/adapters/framework/testing_framework_adapter.ts deleted file mode 100644 index 46aab987fb0a42..00000000000000 --- a/x-pack/plugins/beats_management/public/lib/adapters/framework/testing_framework_adapter.ts +++ /dev/null @@ -1,46 +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 { FrameworkAdapter, FrameworkInfo, FrameworkUser } from './adapter_types'; - -export class TestingFrameworkAdapter implements FrameworkAdapter { - public get info() { - if (this.xpackInfo) { - return this.xpackInfo; - } else { - throw new Error('framework adapter must have init called before anything else'); - } - } - - public get currentUser() { - return this.shieldUser!; - } - private settings: any; - constructor( - private readonly xpackInfo: FrameworkInfo | null, - private readonly shieldUser: FrameworkUser | null, - public readonly version: string - ) {} - - // We dont really want to have this, but it's needed to conditionaly render for k7 due to - // when that data is needed. - public getUISetting(key: 'k7design'): boolean { - return this.settings[key]; - } - - public setUISettings = (key: string, value: any) => { - this.settings[key] = value; - }; - - public async waitUntilFrameworkReady(): Promise { - return; - } - - public registerManagementUI(settings: { sectionId?: string; name: string; order?: number }) { - throw new Error('not yet implamented'); - } -} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/rest_api/adapter_types.ts b/x-pack/plugins/beats_management/public/lib/adapters/rest_api/adapter_types.ts deleted file mode 100644 index db79031ade7b45..00000000000000 --- a/x-pack/plugins/beats_management/public/lib/adapters/rest_api/adapter_types.ts +++ /dev/null @@ -1,15 +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 { FlatObject } from '../../../frontend_types'; - -export interface RestAPIAdapter { - get(url: string, query?: FlatObject): Promise; - post(url: string, body?: { [key: string]: any }): Promise; - delete(url: string): Promise; - put(url: string, body?: any): Promise; -} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/rest_api/axios_rest_api_adapter.ts b/x-pack/plugins/beats_management/public/lib/adapters/rest_api/axios_rest_api_adapter.ts deleted file mode 100644 index acf4734ed58eea..00000000000000 --- a/x-pack/plugins/beats_management/public/lib/adapters/rest_api/axios_rest_api_adapter.ts +++ /dev/null @@ -1,79 +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 axios, { AxiosInstance } from 'axios'; -import { FlatObject } from '../../../frontend_types'; -import { RestAPIAdapter } from './adapter_types'; -let globalAPI: AxiosInstance; - -export class AxiosRestAPIAdapter implements RestAPIAdapter { - constructor(private readonly xsrfToken: string, private readonly basePath: string) {} - - public async get(url: string, query?: FlatObject): Promise { - return await this.REST.get(url, query ? { params: query } : {}).then((resp) => resp.data); - } - - public async post( - url: string, - body?: { [key: string]: any } - ): Promise { - return await this.REST.post(url, body).then((resp) => resp.data); - } - - public async delete(url: string): Promise { - return await this.REST.delete(url).then((resp) => resp.data); - } - - public async put(url: string, body?: any): Promise { - return await this.REST.put(url, body).then((resp) => resp.data); - } - - private get REST() { - if (globalAPI) { - return globalAPI; - } - - globalAPI = axios.create({ - baseURL: this.basePath, - withCredentials: true, - responseType: 'json', - timeout: 30000, - headers: { - Accept: 'application/json', - credentials: 'same-origin', - 'Content-Type': 'application/json', - 'kbn-version': this.xsrfToken, - 'kbn-xsrf': this.xsrfToken, - }, - }); - // Add a request interceptor - globalAPI.interceptors.request.use( - (config) => { - // Do something before request is sent - return config; - }, - (error) => { - // Do something with request error - return Promise.reject(error); - } - ); - - // Add a response interceptor - globalAPI.interceptors.response.use( - (response) => { - // Do something with response data - return response; - }, - (error) => { - // Do something with response error - return Promise.reject(error); - } - ); - - return globalAPI; - } -} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/rest_api/node_axios_api_adapter.ts b/x-pack/plugins/beats_management/public/lib/adapters/rest_api/node_axios_api_adapter.ts deleted file mode 100644 index 675f28b2edb7d8..00000000000000 --- a/x-pack/plugins/beats_management/public/lib/adapters/rest_api/node_axios_api_adapter.ts +++ /dev/null @@ -1,93 +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 axios, { AxiosInstance } from 'axios'; -import fs from 'fs'; -import { join, resolve } from 'path'; -import { FlatObject } from '../../../frontend_types'; -import { RestAPIAdapter } from './adapter_types'; -const pkg = JSON.parse( - fs.readFileSync(resolve(join(__dirname, '../../../../../../../../package.json'))).toString() -); - -let globalAPI: AxiosInstance; - -export class NodeAxiosAPIAdapter implements RestAPIAdapter { - constructor( - private readonly username: string, - private readonly password: string, - private readonly basePath: string - ) {} - - public async get(url: string, query?: FlatObject): Promise { - return await this.REST.get(url, query ? { params: query } : {}).then((resp) => resp.data); - } - - public async post( - url: string, - body?: { [key: string]: any } - ): Promise { - return await this.REST.post(url, body).then((resp) => resp.data); - } - - public async delete(url: string): Promise { - return await this.REST.delete(url).then((resp) => resp.data); - } - - public async put(url: string, body?: any): Promise { - return await this.REST.put(url, body).then((resp) => resp.data); - } - - private get REST() { - if (globalAPI) { - return globalAPI; - } - - globalAPI = axios.create({ - baseURL: this.basePath, - withCredentials: true, - responseType: 'json', - timeout: 60 * 10 * 1000, // 10min - auth: { - username: this.username, - password: this.password, - }, - headers: { - 'Access-Control-Allow-Origin': '*', - Accept: 'application/json', - 'Content-Type': 'application/json', - 'kbn-version': (pkg as any).version, - 'kbn-xsrf': 'xxx', - }, - }); - // Add a request interceptor - globalAPI.interceptors.request.use( - (config) => { - // Do something before request is sent - return config; - }, - (error) => { - // Do something with request error - return Promise.reject(error); - } - ); - - // Add a response interceptor - globalAPI.interceptors.response.use( - (response) => { - // Do something with response data - return response; - }, - (error) => { - // Do something with response error - return Promise.reject(JSON.stringify(error.response.data)); - } - ); - - return globalAPI; - } -} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/tags/adapter_types.ts b/x-pack/plugins/beats_management/public/lib/adapters/tags/adapter_types.ts deleted file mode 100644 index c45b354bab5d07..00000000000000 --- a/x-pack/plugins/beats_management/public/lib/adapters/tags/adapter_types.ts +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { BeatTag, CMBeat } from '../../../../common/domain_types'; - -export interface CMTagsAdapter { - getTagsWithIds(tagIds: string[]): Promise; - delete(tagIds: string[]): Promise; - getAll(ESQuery?: string): Promise; - upsertTag(tag: BeatTag): Promise; - getAssignable(beats: CMBeat[]): Promise; -} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/tags/memory_tags_adapter.ts b/x-pack/plugins/beats_management/public/lib/adapters/tags/memory_tags_adapter.ts deleted file mode 100644 index bdab45c9c9d3f1..00000000000000 --- a/x-pack/plugins/beats_management/public/lib/adapters/tags/memory_tags_adapter.ts +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { BeatTag, CMBeat } from '../../../../common/domain_types'; -import { CMTagsAdapter } from './adapter_types'; - -export class MemoryTagsAdapter implements CMTagsAdapter { - private tagsDB: BeatTag[] = []; - - constructor(tagsDB: BeatTag[]) { - this.tagsDB = tagsDB; - } - - public async getTagsWithIds(tagIds: string[]) { - return this.tagsDB.filter((tag) => tagIds.includes(tag.id)); - } - - public async delete(tagIds: string[]) { - this.tagsDB = this.tagsDB.filter((tag) => !tagIds.includes(tag.id)); - return true; - } - - public async getAll(ESQuery?: string) { - return this.tagsDB; - } - - public async upsertTag(tag: BeatTag) { - const existingTagIndex = this.tagsDB.findIndex((t) => t.id === tag.id); - if (existingTagIndex !== -1) { - this.tagsDB[existingTagIndex] = tag; - } else { - this.tagsDB.push(tag); - } - return tag; - } - - public async getAssignable(beats: CMBeat[]) { - return this.tagsDB; - } -} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/tags/rest_tags_adapter.ts b/x-pack/plugins/beats_management/public/lib/adapters/tags/rest_tags_adapter.ts deleted file mode 100644 index 7c8e563948b22a..00000000000000 --- a/x-pack/plugins/beats_management/public/lib/adapters/tags/rest_tags_adapter.ts +++ /dev/null @@ -1,66 +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 { uniq } from 'lodash'; -import { BeatTag, CMBeat } from '../../../../common/domain_types'; -import { - ReturnTypeBulkDelete, - ReturnTypeBulkGet, - ReturnTypeList, - ReturnTypeUpsert, -} from '../../../../common/return_types'; -import { RestAPIAdapter } from '../rest_api/adapter_types'; -import { CMTagsAdapter } from './adapter_types'; - -export class RestTagsAdapter implements CMTagsAdapter { - constructor(private readonly REST: RestAPIAdapter) {} - - public async getTagsWithIds(tagIds: string[]): Promise { - try { - return ( - await this.REST.get>(`/api/beats/tags/${uniq(tagIds).join(',')}`) - ).items; - } catch (e) { - return []; - } - } - - public async getAll(ESQuery: string): Promise { - try { - return (await this.REST.get>(`/api/beats/tags`, { ESQuery })).list; - } catch (e) { - return []; - } - } - - public async delete(tagIds: string[]): Promise { - return ( - await this.REST.delete(`/api/beats/tags/${uniq(tagIds).join(',')}`) - ).success; - } - - public async upsertTag(tag: BeatTag): Promise { - const response = await this.REST.put>(`/api/beats/tag/${tag.id}`, { - color: tag.color, - name: tag.name, - }); - - return response.success ? tag : null; - } - - public async getAssignable(beats: CMBeat[]) { - try { - return ( - await this.REST.get>( - `/api/beats/tags/assignable/${beats.map((beat) => beat.id).join(',')}` - ) - ).items; - } catch (e) { - return []; - } - } -} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/tokens/adapter_types.ts b/x-pack/plugins/beats_management/public/lib/adapters/tokens/adapter_types.ts deleted file mode 100644 index 7a5f334aee6d2d..00000000000000 --- a/x-pack/plugins/beats_management/public/lib/adapters/tokens/adapter_types.ts +++ /dev/null @@ -1,10 +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. - */ - -export interface CMTokensAdapter { - createEnrollmentTokens(numTokens?: number): Promise; -} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/tokens/memory_tokens_adapter.ts b/x-pack/plugins/beats_management/public/lib/adapters/tokens/memory_tokens_adapter.ts deleted file mode 100644 index c5f871884609ae..00000000000000 --- a/x-pack/plugins/beats_management/public/lib/adapters/tokens/memory_tokens_adapter.ts +++ /dev/null @@ -1,14 +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 { CMTokensAdapter } from './adapter_types'; - -export class MemoryTokensAdapter implements CMTokensAdapter { - public async createEnrollmentTokens(): Promise { - return ['2jnwkrhkwuehriauhweair']; - } -} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/tokens/rest_tokens_adapter.ts b/x-pack/plugins/beats_management/public/lib/adapters/tokens/rest_tokens_adapter.ts deleted file mode 100644 index cac45c6b9f674c..00000000000000 --- a/x-pack/plugins/beats_management/public/lib/adapters/tokens/rest_tokens_adapter.ts +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { ReturnTypeBulkCreate } from '../../../../common/return_types'; -import { RestAPIAdapter } from '../rest_api/adapter_types'; -import { CMTokensAdapter } from './adapter_types'; - -export class RestTokensAdapter implements CMTokensAdapter { - constructor(private readonly REST: RestAPIAdapter) {} - - public async createEnrollmentTokens(numTokens: number = 1): Promise { - const results = ( - await this.REST.post>('/api/beats/enrollment_tokens', { - num_tokens: numTokens, - }) - ).results; - return results.map((result) => result.item); - } -} diff --git a/x-pack/plugins/beats_management/public/lib/beats.ts b/x-pack/plugins/beats_management/public/lib/beats.ts deleted file mode 100644 index ebe2f4125ba851..00000000000000 --- a/x-pack/plugins/beats_management/public/lib/beats.ts +++ /dev/null @@ -1,66 +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 { ReturnTypeBulkAction } from '../../common/return_types'; -import { CMBeat } from '../../common/domain_types'; -import { BeatsTagAssignment, CMBeatsAdapter } from './adapters/beats/adapter_types'; -import { ElasticsearchLib } from './elasticsearch'; - -export class BeatsLib { - constructor( - private readonly adapter: CMBeatsAdapter, - private readonly elasticsearch: ElasticsearchLib - ) {} - - /** Get a single beat using it's ID for lookup */ - public async get(id: string): Promise { - const beat = await this.adapter.get(id); - return beat; - } - - /** Get a single beat using the token it was enrolled in for lookup */ - public getBeatWithToken = async (enrollmentToken: string): Promise => { - const beat = await this.adapter.getBeatWithToken(enrollmentToken); - return beat; - }; - - /** Get an array of beats that have a given tag id assigned to it */ - public getBeatsWithTag = async (tagId: string): Promise => { - const beats = await this.adapter.getBeatsWithTag(tagId); - return beats; - }; - - // FIXME: This needs to be paginated https://github.com/elastic/kibana/issues/26022 - /** Get an array of all enrolled beats. */ - public getAll = async (kuery?: string): Promise => { - let ESQuery; - if (kuery) { - ESQuery = await this.elasticsearch.convertKueryToEsQuery(kuery); - } - const beats = await this.adapter.getAll(ESQuery); - return beats; - }; - - /** Update a given beat via it's ID */ - public update = async (id: string, beatData: Partial): Promise => { - return await this.adapter.update(id, beatData); - }; - - /** unassign tags from beats using an array of tags and beats */ - public removeTagsFromBeats = async ( - removals: BeatsTagAssignment[] - ): Promise => { - return await this.adapter.removeTagsFromBeats(removals); - }; - - /** assign tags from beats using an array of tags and beats */ - public assignTagsToBeats = async ( - assignments: BeatsTagAssignment[] - ): Promise => { - return await this.adapter.assignTagsToBeats(assignments); - }; -} diff --git a/x-pack/plugins/beats_management/public/lib/compose/kibana.ts b/x-pack/plugins/beats_management/public/lib/compose/kibana.ts deleted file mode 100644 index bd562f03548c26..00000000000000 --- a/x-pack/plugins/beats_management/public/lib/compose/kibana.ts +++ /dev/null @@ -1,81 +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 { camelCase } from 'lodash'; -import { configBlockSchemas } from '../../../common/config_schemas'; -import { translateConfigSchema } from '../../../common/config_schemas_translations_map'; -import { INDEX_NAMES } from '../../../common/constants/index_names'; -import { RestBeatsAdapter } from '../adapters/beats/rest_beats_adapter'; -import { RestConfigBlocksAdapter } from '../adapters/configuration_blocks/rest_config_blocks_adapter'; -import { RestElasticsearchAdapter } from '../adapters/elasticsearch/rest'; -import { KibanaFrameworkAdapter } from '../adapters/framework/kibana_framework_adapter'; -import { AxiosRestAPIAdapter } from '../adapters/rest_api/axios_rest_api_adapter'; -import { RestTagsAdapter } from '../adapters/tags/rest_tags_adapter'; -import { RestTokensAdapter } from '../adapters/tokens/rest_tokens_adapter'; -import { BeatsLib } from '../beats'; -import { ConfigBlocksLib } from '../configuration_blocks'; -import { ElasticsearchLib } from '../elasticsearch'; -import { TagsLib } from '../tags'; -import { FrontendLibs } from '../types'; -import { PLUGIN } from '../../../common/constants/plugin'; -import { FrameworkLib } from './../framework'; -import { ManagementSetup } from '../../../../../../src/plugins/management/public'; -import { SecurityPluginSetup } from '../../../../security/public'; -import { CoreSetup } from '../../../../../../src/core/public'; -import { LicensingPluginSetup } from '../../../../licensing/public'; -import { BeatsManagementConfigType } from '../../../common'; - -interface ComposeDeps { - core: CoreSetup; - management: ManagementSetup; - licensing: LicensingPluginSetup; - config: BeatsManagementConfigType; - version: string; - security?: SecurityPluginSetup; -} - -export function compose({ - core, - management, - licensing, - config, - version, - security, -}: ComposeDeps): FrontendLibs { - const api = new AxiosRestAPIAdapter(version, core.http.basePath.get()); - const esAdapter = new RestElasticsearchAdapter(INDEX_NAMES.BEATS); - const elasticsearchLib = new ElasticsearchLib(esAdapter); - const configBlocks = new ConfigBlocksLib( - new RestConfigBlocksAdapter(api), - translateConfigSchema(configBlockSchemas) - ); - const tags = new TagsLib(new RestTagsAdapter(api), elasticsearchLib); - const tokens = new RestTokensAdapter(api); - const beats = new BeatsLib(new RestBeatsAdapter(api), elasticsearchLib); - - const framework = new FrameworkLib( - new KibanaFrameworkAdapter( - camelCase(PLUGIN.ID), - management, - core.http.basePath.get, - licensing, - security, - config, - version - ) - ); - - const libs: FrontendLibs = { - framework, - elasticsearch: elasticsearchLib, - tags, - tokens, - beats, - configBlocks, - }; - return libs; -} diff --git a/x-pack/plugins/beats_management/public/lib/compose/scripts.ts b/x-pack/plugins/beats_management/public/lib/compose/scripts.ts deleted file mode 100644 index 37a1bc9ac4944d..00000000000000 --- a/x-pack/plugins/beats_management/public/lib/compose/scripts.ts +++ /dev/null @@ -1,79 +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 { configBlockSchemas } from '../../../common/config_schemas'; -import { translateConfigSchema } from '../../../common/config_schemas_translations_map'; -import { RestBeatsAdapter } from '../adapters/beats/rest_beats_adapter'; -import { RestConfigBlocksAdapter } from '../adapters/configuration_blocks/rest_config_blocks_adapter'; -import { MemoryElasticsearchAdapter } from '../adapters/elasticsearch/memory'; -import { TestingFrameworkAdapter } from '../adapters/framework/testing_framework_adapter'; -import { NodeAxiosAPIAdapter } from '../adapters/rest_api/node_axios_api_adapter'; -import { RestTagsAdapter } from '../adapters/tags/rest_tags_adapter'; -import { RestTokensAdapter } from '../adapters/tokens/rest_tokens_adapter'; -import { BeatsLib } from '../beats'; -import { ConfigBlocksLib } from '../configuration_blocks'; -import { ElasticsearchLib } from '../elasticsearch'; -import { FrameworkLib } from '../framework'; -import { TagsLib } from '../tags'; -import { FrontendLibs } from '../types'; - -export function compose(basePath: string): FrontendLibs { - const api = new NodeAxiosAPIAdapter('elastic', 'changeme', basePath); - const esAdapter = new MemoryElasticsearchAdapter( - () => true, - () => '', - [] - ); - const elasticsearchLib = new ElasticsearchLib(esAdapter); - const configBlocks = new ConfigBlocksLib( - new RestConfigBlocksAdapter(api), - translateConfigSchema(configBlockSchemas) - ); - const tags = new TagsLib(new RestTagsAdapter(api), elasticsearchLib); - const tokens = new RestTokensAdapter(api); - const beats = new BeatsLib(new RestBeatsAdapter(api), elasticsearchLib); - - const framework = new FrameworkLib( - new TestingFrameworkAdapter( - { - basePath, - license: { - type: 'gold', - expired: false, - expiry_date_in_millis: 34353453452345, - }, - security: { - enabled: true, - available: true, - }, - settings: { - encryptionKey: 'xpack_beats_default_encryptionKey', - enrollmentTokensTtlInSeconds: 10 * 60, // 10 minutes - defaultUserRoles: ['superuser'], - }, - }, - { - username: 'joeuser', - roles: ['beats_admin'], - enabled: true, - full_name: null, - email: null, - }, - '6.7.0' - ) - ); - - const libs: FrontendLibs = { - framework, - elasticsearch: elasticsearchLib, - tags, - tokens, - beats, - configBlocks, - }; - return libs; -} diff --git a/x-pack/plugins/beats_management/public/lib/config_blocks.test.ts b/x-pack/plugins/beats_management/public/lib/config_blocks.test.ts deleted file mode 100644 index 5fcd30e32d0236..00000000000000 --- a/x-pack/plugins/beats_management/public/lib/config_blocks.test.ts +++ /dev/null @@ -1,149 +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 { configBlockSchemas } from '../../common/config_schemas'; -import { translateConfigSchema } from '../../common/config_schemas_translations_map'; -import { ConfigBlocksLib } from './configuration_blocks'; -import { MemoryConfigBlocksAdapter } from './adapters/configuration_blocks/memory_config_blocks_adapter'; - -describe('Tags Client Domain Lib', () => { - let lib: ConfigBlocksLib; - - beforeEach(async () => { - lib = new ConfigBlocksLib( - new MemoryConfigBlocksAdapter([]), - translateConfigSchema(configBlockSchemas) - ); - }); - - it('should use helper function to convert users yaml in tag to config object', async () => { - const convertedBlocks = await lib.userConfigsToJson([ - { - id: 'foo', - tag: 'basic', - last_updated: parseInt(new Date().toISOString(), 10), - type: 'filebeat.inputs', - description: 'string', - config: { - paths: ['adad/adasd'], - other: "something: 'here'", - }, - }, - ]); - - expect(convertedBlocks.length).toBe(1); - expect(convertedBlocks[0]).toHaveProperty('config'); - expect(convertedBlocks[0].config).not.toHaveProperty('other'); - expect(convertedBlocks[0].config).toHaveProperty('something'); - expect(convertedBlocks[0].config.something).toBe('here'); - }); - - it('should use helper function to convert user config to json with undefined `other`', async () => { - const convertedTag = await lib.userConfigsToJson([ - { - id: 'foo', - tag: 'basic', - last_updated: parseInt(new Date().toISOString(), 10), - type: 'filebeat.inputs', - description: 'sdfsdf', - config: { - paths: ['sdfsfsdf'], - other: undefined, - }, - }, - ]); - - expect(convertedTag.length).toBe(1); - expect(convertedTag[0]).not.toHaveProperty('other'); - }); - - it('should use helper function to convert users yaml in tag to config object, where empty other leads to no other fields saved', async () => { - const convertedTag = await lib.userConfigsToJson([ - { - id: 'foo', - tag: 'basic', - last_updated: parseInt(new Date().toISOString(), 10), - type: 'filebeat.inputs', - description: 'string', - config: { - paths: ['adad/adasd'], - other: ` - sdfsdf: "foo" - `, - }, - }, - ]); - - expect(convertedTag.length).toBe(1); - expect(convertedTag[0].config).not.toHaveProperty('other'); - expect(convertedTag[0].config.sdfsdf).toBe('foo'); - }); - - it('should convert tokenized fields to JSON', async () => { - const convertedTag = await lib.userConfigsToJson([ - { - id: 'foo', - tag: 'basic', - last_updated: parseInt(new Date().toISOString(), 10), - type: 'output', - description: 'something', - config: { - _sub_type: 'console', - hosts: ['esefsfsgg', 'drgdrgdgr'], - username: '', - password: '', - }, - }, - ]); - - expect(convertedTag.length).toBe(1); - expect(convertedTag[0].config).toHaveProperty('_sub_type'); - expect(convertedTag[0].config).toHaveProperty('hosts'); - expect(convertedTag[0].config.hosts.length).toBe(2); - }); - - it('should use helper function to convert config object to users yaml', async () => { - const convertedTag = await lib.jsonConfigToUserYaml([ - { - id: 'foo', - tag: 'basic', - last_updated: parseInt(new Date().toISOString(), 10), - type: 'filebeat.inputs', - description: 'sdfsdf', - config: { - paths: ['sdfsfsdf'], - something: 'here', - }, - }, - ]); - - expect(convertedTag.length).toBe(1); - expect(convertedTag[0].config).not.toHaveProperty('something'); - expect(convertedTag[0].config).toHaveProperty('other'); - expect(convertedTag[0].config.other).toBe('something: here\n'); - }); - - it('should use helper function to convert config object to users yaml with empty `other`', async () => { - const convertedTag = await lib.jsonConfigToUserYaml([ - { - id: 'foo', - tag: 'basic', - last_updated: parseInt(new Date().toISOString(), 10), - type: 'filebeat.inputs', - description: undefined, - config: { - paths: ['sdfsfsdf'], - }, - }, - ]); - - expect(convertedTag.length).toBe(1); - expect(convertedTag[0].config).not.toHaveProperty('something'); - expect(convertedTag[0].config).toHaveProperty('other'); - expect(convertedTag[0].config.other).toBe(''); - }); -}); diff --git a/x-pack/plugins/beats_management/public/lib/configuration_blocks.ts b/x-pack/plugins/beats_management/public/lib/configuration_blocks.ts deleted file mode 100644 index 2328b353fe326f..00000000000000 --- a/x-pack/plugins/beats_management/public/lib/configuration_blocks.ts +++ /dev/null @@ -1,123 +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 { set } from '@elastic/safer-lodash-set'; -import { get, has, omit } from 'lodash'; -import { ConfigBlockSchema, ConfigurationBlock } from '../../common/domain_types'; -import { FrontendConfigBlocksAdapter } from './adapters/configuration_blocks/adapter_types'; - -export class ConfigBlocksLib { - public delete = this.adapter.delete.bind(this.adapter); - - constructor( - private readonly adapter: FrontendConfigBlocksAdapter, - private readonly configSchemas: ConfigBlockSchema[] - ) {} - - public upsert = async (blocks: ConfigurationBlock[]) => { - return await this.adapter.upsert(await this.userConfigsToJson(blocks)); - }; - - public getForTags = async (tagIds: string[], page: number) => { - const result = await this.adapter.getForTags(tagIds, page); - result.list = await this.jsonConfigToUserYaml(result.list); - return result; - }; - - public async jsonConfigToUserYaml(blocks: ConfigurationBlock[]): Promise { - const yaml = await import('js-yaml'); - // configuration_blocks yaml, JS cant read YAML so we parse it into JS, - // because beats flattens all fields, and we need more structure. - // we take tagConfigs, grab the config that applies here, render what we can into - // an object, and the rest we assume to be the yaml string that goes - // into the yaml editor... - // NOTE: The perk of this, is that as we support more features via controls - // vs yaml editing, it should "just work", and things that were in YAML - // will now be in the UI forms... - return blocks.map((block) => { - const { type, config } = block; - - const thisConfigSchema = this.configSchemas.find((conf) => conf.id === type); - const thisConfigBlockSchema = thisConfigSchema ? thisConfigSchema.configs : null; - if (!thisConfigBlockSchema) { - throw new Error('No config block schema '); - } - - const knownConfigIds: string[] = thisConfigBlockSchema.map((schema) => schema.id); - - const convertedConfig: ConfigurationBlock['config'] = knownConfigIds.reduce( - (blockObj: any, configKey: string, index: number) => { - const unhydratedKey = knownConfigIds[index]; - - set(blockObj, configKey, get(config, unhydratedKey)); - - return blockObj; - }, - thisConfigSchema && thisConfigSchema.allowOtherConfigs - ? { other: yaml.safeDump(omit(config, knownConfigIds)) } - : {} - ); - - // Workaround to empty object passed into dump resulting in this odd output - if (convertedConfig.other && convertedConfig.other === '{}\n') { - convertedConfig.other = ''; - } - - return { - ...block, - config: convertedConfig, - }; - }); - } - - public async userConfigsToJson(blocks: ConfigurationBlock[]): Promise { - const yaml = await import('js-yaml'); - // configurations is the JS representation of the config yaml, - // so here we take that JS and convert it into a YAML string. - // we do so while also flattening "other" into the flat yaml beats expect - return blocks.map((block) => { - const { type, config } = block; - const thisConfigSchema = this.configSchemas.find((conf) => conf.id === type); - const thisConfigBlockSchema = thisConfigSchema ? thisConfigSchema.configs : null; - if (!thisConfigBlockSchema) { - throw new Error('No config block schema '); - } - const knownConfigIds = thisConfigBlockSchema - .map((schema: ConfigurationBlock['config']) => schema.id) - .filter((id: string) => id !== 'other'); - - const picked = this.pickDeep(config, knownConfigIds); - let other = yaml.safeLoad(config.other || '{}'); - if (typeof other === 'string') { - other = { - [other]: '', - }; - } - - const convertedConfig = { - ...other, - ...picked, - }; - - return { - ...block, - config: convertedConfig, - }; - }); - } - - private pickDeep(obj: { [key: string]: any }, keys: string[]) { - const copy = {}; - keys.forEach((key) => { - if (has(obj, key)) { - const val = get(obj, key); - set(copy, key, val); - } - }); - return copy; - } -} diff --git a/x-pack/plugins/beats_management/public/lib/elasticsearch.ts b/x-pack/plugins/beats_management/public/lib/elasticsearch.ts deleted file mode 100644 index b64c307682f2f7..00000000000000 --- a/x-pack/plugins/beats_management/public/lib/elasticsearch.ts +++ /dev/null @@ -1,70 +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 { QuerySuggestion } from '../../../../../src/plugins/data/public'; -import { ElasticsearchAdapter } from './adapters/elasticsearch/adapter_types'; - -interface HiddenFields { - op: 'is' | 'startsWith' | 'withoutPrefix'; - value: string; -} - -export class ElasticsearchLib { - private readonly hiddenFields: HiddenFields[] = [ - { op: 'startsWith', value: 'enrollment_token' }, - { op: 'is', value: 'beat.active' }, - { op: 'is', value: 'beat.enrollment_token' }, - { op: 'is', value: 'beat.access_token' }, - { op: 'is', value: 'beat.ephemeral_id' }, - { op: 'is', value: 'beat.verified_on' }, - ]; - - constructor(private readonly adapter: ElasticsearchAdapter) {} - - public isKueryValid(kuery: string): boolean { - return this.adapter.isKueryValid(kuery); - } - public async convertKueryToEsQuery(kuery: string): Promise { - return await this.adapter.convertKueryToEsQuery(kuery); - } - - public async getSuggestions( - kuery: string, - selectionStart: any, - fieldPrefix?: string - ): Promise { - const suggestions = await this.adapter.getSuggestions(kuery, selectionStart); - - const filteredSuggestions = suggestions.filter((suggestion) => { - const hiddenFieldsCheck = this.hiddenFields; - - if (fieldPrefix) { - hiddenFieldsCheck.push({ - op: 'withoutPrefix', - value: `${fieldPrefix}.`, - }); - } - - return hiddenFieldsCheck.reduce((isvalid: boolean, field) => { - if (!isvalid) { - return false; - } - - switch (field.op) { - case 'startsWith': - return !suggestion.text.startsWith(field.value); - case 'is': - return suggestion.text.trim() !== field.value; - case 'withoutPrefix': - return suggestion.text.startsWith(field.value); - } - }, true); - }); - - return filteredSuggestions; - } -} diff --git a/x-pack/plugins/beats_management/public/lib/framework.ts b/x-pack/plugins/beats_management/public/lib/framework.ts deleted file mode 100644 index 94f6df20e4b4d3..00000000000000 --- a/x-pack/plugins/beats_management/public/lib/framework.ts +++ /dev/null @@ -1,61 +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 { difference, get } from 'lodash'; -import { LICENSES, LicenseType } from '../../common/constants/security'; -import { FrameworkAdapter } from './adapters/framework/adapter_types'; - -export class FrameworkLib { - public waitUntilFrameworkReady = this.adapter.waitUntilFrameworkReady.bind(this.adapter); - public registerManagementUI = this.adapter.registerManagementUI.bind(this.adapter); - - constructor(private readonly adapter: FrameworkAdapter) {} - - public get currentUser() { - return this.adapter.currentUser; - } - - public get info() { - return this.adapter.info; - } - - public licenseIsAtLeast(type: LicenseType) { - return ( - LICENSES.indexOf(get(this.adapter.info, 'license.type', 'oss')) >= LICENSES.indexOf(type) - ); - } - - public versionGreaterThen(version: string) { - const pa = this.adapter.version.split('.'); - const pb = version.split('.'); - for (let i = 0; i < 3; i++) { - const na = Number(pa[i]); - const nb = Number(pb[i]); - // version is greater - if (na > nb) { - return true; - } - // version is less then - if (nb > na) { - return false; - } - if (!isNaN(na) && isNaN(nb)) { - return true; - } - if (isNaN(na) && !isNaN(nb)) { - return false; - } - } - return true; - } - - public currentUserHasOneOfRoles(roles: string[]) { - // If the user has at least one of the roles requested, the returnd difference will be less - // then the orig array size. difference only compares based on the left side arg - return difference(roles, get(this.currentUser, 'roles', []) as string[]).length < roles.length; - } -} diff --git a/x-pack/plugins/beats_management/public/lib/tags.ts b/x-pack/plugins/beats_management/public/lib/tags.ts deleted file mode 100644 index 45f840be8e0627..00000000000000 --- a/x-pack/plugins/beats_management/public/lib/tags.ts +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import uuidv4 from 'uuid/v4'; -import { BeatTag, CMBeat } from '../../common/domain_types'; -import { CMTagsAdapter } from './adapters/tags/adapter_types'; -import { ElasticsearchLib } from './elasticsearch'; - -export class TagsLib { - constructor( - private readonly adapter: CMTagsAdapter, - private readonly elasticsearch: ElasticsearchLib - ) {} - - public async getTagsWithIds(tagIds: string[]): Promise { - if (tagIds.length === 0) { - return []; - } - return await this.adapter.getTagsWithIds([...new Set(tagIds)]); - } - public async delete(tagIds: string[]): Promise { - return await this.adapter.delete([...new Set(tagIds)]); - } - - // FIXME: This needs to be paginated https://github.com/elastic/kibana/issues/26022 - public async getAll(kuery?: string): Promise { - let ESQuery; - if (kuery) { - ESQuery = await this.elasticsearch.convertKueryToEsQuery(kuery); - } - - return await this.adapter.getAll(ESQuery); - } - public async upsertTag(tag: BeatTag): Promise { - if (!tag.id) { - tag.id = uuidv4(); - } - return await this.adapter.upsertTag(tag); - } - - public async getassignableTagsForBeats(beats: CMBeat[]): Promise { - return await this.adapter.getAssignable(beats); - } -} diff --git a/x-pack/plugins/beats_management/public/lib/types.ts b/x-pack/plugins/beats_management/public/lib/types.ts deleted file mode 100644 index 68f09cc3e8ba43..00000000000000 --- a/x-pack/plugins/beats_management/public/lib/types.ts +++ /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 { IModule, IScope } from 'angular'; -import { AxiosRequestConfig } from 'axios'; -import { FrameworkAdapter } from './adapters/framework/adapter_types'; -import { CMTokensAdapter } from './adapters/tokens/adapter_types'; -import { BeatsLib } from './beats'; -import { ConfigBlocksLib } from './configuration_blocks'; -import { ElasticsearchLib } from './elasticsearch'; -import { FrameworkLib } from './framework'; -import { TagsLib } from './tags'; - -export interface FrontendLibs { - elasticsearch: ElasticsearchLib; - framework: FrameworkLib; - beats: BeatsLib; - tags: TagsLib; - tokens: CMTokensAdapter; - configBlocks: ConfigBlocksLib; -} - -export type FramworkAdapterConstructable = new (uiModule: IModule) => FrameworkAdapter; - -// FIXME: replace AxiosRequestConfig with something more defined -export type RequestConfig = AxiosRequestConfig; - -export interface ApiAdapter { - kbnVersion: string; - - get(url: string, config?: RequestConfig | undefined): Promise; - post(url: string, data?: any, config?: AxiosRequestConfig | undefined): Promise; - delete(url: string, config?: RequestConfig | undefined): Promise; - put(url: string, data?: any, config?: RequestConfig | undefined): Promise; -} - -export interface UiKibanaAdapterScope extends IScope { - breadcrumbs: any[]; - topNavMenu: any[]; -} - -export interface KibanaUIConfig { - get(key: string): any; - set(key: string, value: any): Promise; -} - -export interface KibanaAdapterServiceRefs { - config: KibanaUIConfig; - rootScope: IScope; -} - -export type BufferedKibanaServiceCall = (serviceRefs: ServiceRefs) => void; - -export interface Chrome { - setRootTemplate(template: string): void; -} diff --git a/x-pack/plugins/beats_management/public/pages/__404.tsx b/x-pack/plugins/beats_management/public/pages/__404.tsx deleted file mode 100644 index d5813d36e2c6d3..00000000000000 --- a/x-pack/plugins/beats_management/public/pages/__404.tsx +++ /dev/null @@ -1,22 +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 { FormattedMessage } from '@kbn/i18n/react'; -import React from 'react'; - -export class NotFoundPage extends React.PureComponent { - public render() { - return ( -
- -
- ); - } -} diff --git a/x-pack/plugins/beats_management/public/pages/beat/details.tsx b/x-pack/plugins/beats_management/public/pages/beat/details.tsx deleted file mode 100644 index c9b26da9349b17..00000000000000 --- a/x-pack/plugins/beats_management/public/pages/beat/details.tsx +++ /dev/null @@ -1,201 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { - EuiFlexGroup, - EuiFlexItem, - // @ts-ignore EuiInMemoryTable typings not yet available - EuiInMemoryTable, - EuiLink, - EuiSpacer, - EuiText, - EuiTitle, - EuiBasicTableColumn, -} from '@elastic/eui'; -import { i18n } from '@kbn/i18n'; -import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react'; -import { get } from 'lodash'; -import React from 'react'; -import { configBlockSchemas } from '../../../common/config_schemas'; -import { translateConfigSchema } from '../../../common/config_schemas_translations_map'; -import { TABLE_CONFIG } from '../../../common/constants'; -import { BeatTag, CMBeat, ConfigurationBlock } from '../../../common/domain_types'; -import { Breadcrumb } from '../../components/navigation/breadcrumb'; -import { ConnectedLink } from '../../components/navigation/connected_link'; -import { TagBadge } from '../../components/tag'; -import { ConfigView } from '../../components/tag/config_view/index'; -import { AppPageProps } from '../../frontend_types'; - -interface PageProps extends AppPageProps { - beat: CMBeat; - intl: InjectedIntl; -} - -interface PageState { - selectedConfig: ConfigurationBlock | null; - tags: BeatTag[]; - configuration_blocks: ConfigurationBlock[]; - configurationBlocksPage: number; -} - -class BeatDetailPageUi extends React.PureComponent { - constructor(props: PageProps) { - super(props); - - this.state = { - selectedConfig: null, - tags: [], - configuration_blocks: [], - configurationBlocksPage: 0, - }; - } - - public async UNSAFE_componentWillMount() { - const tags = await this.props.libs.tags.getTagsWithIds(this.props.beat.tags); - const blocksResult = await this.props.libs.configBlocks.getForTags( - this.props.beat.tags, - this.state.configurationBlocksPage - ); - - this.setState({ - configuration_blocks: blocksResult.list, - tags, - }); - } - public render() { - const props = this.props; - const { beat, intl } = props; - if (!beat) { - return ( - - ); - } - const configurationBlocks = !this.state.configuration_blocks - ? [] - : this.state.configuration_blocks.map((configuration) => ({ - // @ts-ignore one of the types on ConfigurationBlock doesn't define a "module" property - module: configuration.config.type || null, - tagId: configuration.tag, - tagColor: - ((this.state.tags || []).find((tag) => tag.id === configuration.tag) || ({} as BeatTag)) - .color || 'grey', - tagName: - ((this.state.tags || []).find((tag) => tag.id === configuration.tag) || ({} as BeatTag)) - .name || configuration.tag, - ...beat, - ...configuration, - displayValue: get( - translateConfigSchema(configBlockSchemas).find( - (config) => config.id === configuration.type - ), - 'text', - null - ), - })); - - const columns: Array> = [ - { - field: 'displayValue', - name: intl.formatMessage({ - id: 'xpack.beatsManagement.beatConfigurations.typeColumnName', - defaultMessage: 'Type', - }), - sortable: true, - render: (value: string | null, configuration: any) => ( - { - this.setState({ - selectedConfig: configuration, - }); - }} - > - {value || configuration.type} - - ), - }, - { - field: 'module', - name: intl.formatMessage({ - id: 'xpack.beatsManagement.beatConfigurations.moduleColumnName', - defaultMessage: 'Module', - }), - sortable: true, - }, - { - field: 'description', - name: intl.formatMessage({ - id: 'xpack.beatsManagement.beatConfigurations.descriptionColumnName', - defaultMessage: 'Description', - }), - sortable: true, - }, - { - field: 'tagId', - name: intl.formatMessage({ - id: 'xpack.beatsManagement.beatConfigurations.tagColumnName', - defaultMessage: 'Tag', - }), - render: (id: string, block: any) => ( - - - - ), - sortable: true, - }, - ]; - return ( - - - - - - -

- -

- - -

- -

- - - - - - - {this.state.selectedConfig && ( - this.setState({ selectedConfig: null })} - /> - )} - - ); - } -} -export const BeatDetailPage = injectI18n(BeatDetailPageUi); diff --git a/x-pack/plugins/beats_management/public/pages/beat/index.tsx b/x-pack/plugins/beats_management/public/pages/beat/index.tsx deleted file mode 100644 index 3b306d6699a44d..00000000000000 --- a/x-pack/plugins/beats_management/public/pages/beat/index.tsx +++ /dev/null @@ -1,201 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { - EuiFlexGroup, - EuiFlexItem, - // @ts-ignore - EuiTab, - // @ts-ignore - EuiTabs, - EuiText, -} from '@elastic/eui'; -import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react'; -import moment from 'moment'; -import React from 'react'; -import { Redirect, Route, Switch } from 'react-router-dom'; -import { CMBeat } from '../../../common/domain_types'; -import { PrimaryLayout } from '../../components/layouts/primary'; -import { Breadcrumb } from '../../components/navigation/breadcrumb'; -import { ChildRoutes } from '../../components/navigation/child_routes'; -import { AppPageProps } from '../../frontend_types'; - -interface PageProps extends AppPageProps { - intl: InjectedIntl; -} -interface PageState { - beat: CMBeat | undefined; - beatId: string; - isLoading: boolean; -} - -class BeatDetailsPageComponent extends React.PureComponent { - constructor(props: PageProps) { - super(props); - this.state = { - beat: undefined, - beatId: props.match.params.beatId, - isLoading: true, - }; - this.loadBeat(); - } - - public onSelectedTabChanged = (id: string) => { - this.props.history.push({ - pathname: id, - search: this.props.location.search, - }); - }; - - public renderActionSection(beat?: CMBeat) { - return beat ? ( - - - - {beat.type} }} - /> - - - - - {beat.version} }} - /> - - - {beat.last_updated && ( - - - {moment(beat.last_updated).fromNow()}, - }} - /> - - - )} - - ) : ( - - ); - } - - public render() { - const { intl } = this.props; - const { beat } = this.state; - let id: string | undefined; - let name; - - if (beat) { - id = beat.id; - name = beat.name; - } - - const title = this.state.isLoading - ? intl.formatMessage({ - id: 'xpack.beatsManagement.beat.loadingTitle', - defaultMessage: 'Loading', - }) - : intl.formatMessage( - { - id: 'xpack.beatsManagement.beat.beatNameAndIdTitle', - defaultMessage: 'Beat: {nameOrNoName} (id: {id})', - }, - { - nameOrNoName: - name || - intl.formatHTMLMessage({ - id: 'xpack.beatsManagement.beat.noNameReceivedFromBeatTitle', - defaultMessage: 'No name received from beat', - }), - id, - } - ); - - return ( - - - - - - - - - - - - {!this.state.beat &&
Beat not found
} - {this.state.beat && ( - - - {id && } />} - - )} - - - ); - } - - private onTabClicked = (path: string) => { - return () => { - this.props.goTo(path); - }; - }; - - private async loadBeat() { - const { intl } = this.props; - const { beatId } = this.props.match.params; - let beat; - try { - beat = await this.props.libs.beats.get(beatId); - if (!beat) { - throw new Error( - intl.formatMessage({ - id: 'xpack.beatsManagement.beat.beatNotFoundErrorMessage', - defaultMessage: 'beat not found', - }) - ); - } - } catch (e) { - throw new Error(e); - } - this.setState({ beat, isLoading: false }); - } -} - -export const BeatDetailsPage = injectI18n(BeatDetailsPageComponent); diff --git a/x-pack/plugins/beats_management/public/pages/beat/tags.tsx b/x-pack/plugins/beats_management/public/pages/beat/tags.tsx deleted file mode 100644 index e5f7e7c3711a05..00000000000000 --- a/x-pack/plugins/beats_management/public/pages/beat/tags.tsx +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { EuiGlobalToastList } from '@elastic/eui'; -import { i18n } from '@kbn/i18n'; -import React from 'react'; -import { BeatTag, CMBeat } from '../../../common/domain_types'; -import { Breadcrumb } from '../../components/navigation/breadcrumb'; -import { BeatDetailTagsTable, Table } from '../../components/table'; -import { FrontendLibs } from '../../lib/types'; - -interface BeatTagsPageProps { - beat: CMBeat; - libs: FrontendLibs; - refreshBeat(): void; -} - -interface BeatTagsPageState { - notifications: any[]; - tags: BeatTag[]; -} - -export class BeatTagsPage extends React.PureComponent { - private tableRef = React.createRef
(); - constructor(props: BeatTagsPageProps) { - super(props); - - this.state = { - notifications: [], - tags: [], - }; - } - - public UNSAFE_componentWillMount() { - this.updateBeatsData(); - } - - public async updateBeatsData() { - const tags = await this.props.libs.tags.getTagsWithIds(this.props.beat.tags); - this.setState({ - tags, - }); - } - - public render() { - const { beat } = this.props; - return ( - - - -
- - this.setState({ notifications: [] })} - toastLifeTimeMs={5000} - /> - - ); - } -} diff --git a/x-pack/plugins/beats_management/public/pages/error/enforce_security.tsx b/x-pack/plugins/beats_management/public/pages/error/enforce_security.tsx deleted file mode 100644 index 2d55df7be69230..00000000000000 --- a/x-pack/plugins/beats_management/public/pages/error/enforce_security.tsx +++ /dev/null @@ -1,27 +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 { FormattedMessage, injectI18n } from '@kbn/i18n/react'; -import * as React from 'react'; -import { NoDataLayout } from '../../components/layouts/no_data'; - -export const EnforceSecurityPage = injectI18n(({ intl }) => ( - -

- -

- -)); diff --git a/x-pack/plugins/beats_management/public/pages/error/invalid_license.tsx b/x-pack/plugins/beats_management/public/pages/error/invalid_license.tsx deleted file mode 100644 index d34e3d22e4e677..00000000000000 --- a/x-pack/plugins/beats_management/public/pages/error/invalid_license.tsx +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { FormattedMessage, injectI18n } from '@kbn/i18n/react'; -import * as React from 'react'; -import { NoDataLayout } from '../../components/layouts/no_data'; - -export const InvalidLicensePage = injectI18n(({ intl }) => ( - -

- -

- -)); diff --git a/x-pack/plugins/beats_management/public/pages/error/no_access.tsx b/x-pack/plugins/beats_management/public/pages/error/no_access.tsx deleted file mode 100644 index 2a380a64ccd898..00000000000000 --- a/x-pack/plugins/beats_management/public/pages/error/no_access.tsx +++ /dev/null @@ -1,29 +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 { FormattedMessage, injectI18n } from '@kbn/i18n/react'; -import * as React from 'react'; -import { NoDataLayout } from '../../components/layouts/no_data'; - -export const NoAccessPage = injectI18n(({ intl }) => ( - -

- -

- -)); diff --git a/x-pack/plugins/beats_management/public/pages/index.ts b/x-pack/plugins/beats_management/public/pages/index.ts deleted file mode 100644 index eafe9f9b1394fe..00000000000000 --- a/x-pack/plugins/beats_management/public/pages/index.ts +++ /dev/null @@ -1,56 +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 { BeatDetailPage } from './beat/details'; -import { BeatDetailsPage } from './beat/index'; -import { BeatTagsPage } from './beat/tags'; -import { EnforceSecurityPage } from './error/enforce_security'; -import { InvalidLicensePage } from './error/invalid_license'; -import { NoAccessPage } from './error/no_access'; -import { TagsPage } from './overview/configuration_tags'; -import { BeatsPage } from './overview/enrolled_beats'; -import { MainPage } from './overview/index'; -import { TagCreatePage } from './tag/create'; -import { TagEditPage } from './tag/edit'; -import { BeatsInitialEnrollmentPage } from './walkthrough/initial/beat'; -import { FinishWalkthroughPage } from './walkthrough/initial/finish'; -import { InitialWalkthroughPage } from './walkthrough/initial/index'; -import { InitialTagPage } from './walkthrough/initial/tag'; -import type { RouteConfig } from '../components/navigation/child_routes'; - -export const routeMap: RouteConfig[] = [ - { path: '/tag/create/:tagid?', component: TagCreatePage }, - { path: '/tag/edit/:tagid?', component: TagEditPage }, - { - path: '/beat/:beatId', - component: BeatDetailsPage, - routes: [ - { path: '/beat/:beatId/details', component: BeatDetailPage }, - { path: '/beat/:beatId/tags', component: BeatTagsPage }, - ], - }, - { path: '/error/enforce_security', component: EnforceSecurityPage }, - { path: '/error/invalid_license', component: InvalidLicensePage }, - { path: '/error/no_access', component: NoAccessPage }, - { - path: '/overview', - component: MainPage, - routes: [ - { path: '/overview/configuration_tags', component: TagsPage }, - { path: '/overview/enrolled_beats', component: BeatsPage }, - ], - }, - { - path: '/walkthrough/initial', - component: InitialWalkthroughPage, - routes: [ - { path: '/walkthrough/initial/beat', component: BeatsInitialEnrollmentPage }, - { path: '/walkthrough/initial/finish', component: FinishWalkthroughPage }, - { path: '/walkthrough/initial/tag', component: InitialTagPage }, - ], - }, -]; diff --git a/x-pack/plugins/beats_management/public/pages/overview/configuration_tags.tsx b/x-pack/plugins/beats_management/public/pages/overview/configuration_tags.tsx deleted file mode 100644 index 0b7c4f17a6e2ca..00000000000000 --- a/x-pack/plugins/beats_management/public/pages/overview/configuration_tags.tsx +++ /dev/null @@ -1,118 +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 { EuiButton } from '@elastic/eui'; -import { i18n } from '@kbn/i18n'; -import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react'; -import React from 'react'; -import { Breadcrumb } from '../../components/navigation/breadcrumb'; -import { AssignmentActionType, Table, TagsTableType } from '../../components/table'; -import { tagListActions } from '../../components/table/action_schema'; -import { WithKueryAutocompletion } from '../../containers/with_kuery_autocompletion'; -import { AppPageProps } from '../../frontend_types'; - -interface PageProps extends AppPageProps { - renderAction: (area: () => JSX.Element) => void; - intl: InjectedIntl; -} - -interface PageState { - tableRef: any; -} - -class TagsPageComponent extends React.PureComponent { - constructor(props: PageProps) { - super(props); - - this.state = { - tableRef: React.createRef(), - }; - - props.containers.tags.reload(props.urlState.tagsKBar); - props.renderAction(this.renderActionArea); - } - - public renderActionArea = () => ( - { - this.props.goTo('/tag/create'); - }} - > - - - ); - - public render() { - return ( - - - - {(autocompleteProps) => ( -
{ - this.props.setUrlState({ tagsKBar: value }); - this.props.containers.tags.reload(value); - }, - onSubmit: () => null, // todo - value: this.props.urlState.tagsKBar || '', - }} - actions={tagListActions} - actionHandler={this.handleTagsAction} - ref={this.state.tableRef} - items={this.props.containers.tags.state.list} - type={TagsTableType} - /> - )} - - - ); - } - - private handleTagsAction = async (action: AssignmentActionType) => { - const { intl } = this.props; - switch (action) { - case AssignmentActionType.Delete: - const success = await this.props.containers.tags.delete(this.getSelectedTags()); - if (!success) { - alert( - intl.formatMessage({ - id: 'xpack.beatsManagement.tags.someTagsMightBeAssignedToBeatsTitle', - defaultMessage: - 'Some of these tags might be assigned to beats. Please ensure tags being removed are not activly assigned', - }) - ); - } else { - if (this.state.tableRef && this.state.tableRef.current) { - this.state.tableRef.current.resetSelection(); - } - } - break; - } - }; - - private getSelectedTags = () => { - return this.state.tableRef.current ? this.state.tableRef.current.state.selection : []; - }; -} - -export const TagsPage = injectI18n(TagsPageComponent); diff --git a/x-pack/plugins/beats_management/public/pages/overview/enrolled_beats.tsx b/x-pack/plugins/beats_management/public/pages/overview/enrolled_beats.tsx deleted file mode 100644 index 0ab02430e90e61..00000000000000 --- a/x-pack/plugins/beats_management/public/pages/overview/enrolled_beats.tsx +++ /dev/null @@ -1,355 +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 { - EuiButton, - EuiButtonEmpty, - EuiGlobalToastList, - EuiModal, - EuiModalBody, - EuiModalHeader, - EuiModalHeaderTitle, -} from '@elastic/eui'; -import { i18n } from '@kbn/i18n'; -import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react'; -import { flatten, sortBy } from 'lodash'; -import moment from 'moment'; -import React from 'react'; -import { BeatTag, CMBeat } from '../../../common/domain_types'; -import { EnrollBeat } from '../../components/enroll_beats'; -import { Breadcrumb } from '../../components/navigation/breadcrumb'; -import { BeatsTableType, Table } from '../../components/table'; -import { beatsListActions } from '../../components/table/action_schema'; -import { AssignmentActionType } from '../../components/table/table'; -import { WithKueryAutocompletion } from '../../containers/with_kuery_autocompletion'; -import { AppPageProps } from '../../frontend_types'; - -interface PageProps extends AppPageProps { - renderAction: (area: () => JSX.Element) => void; - intl: InjectedIntl; -} - -interface PageState { - notifications: any[]; - tags: BeatTag[] | null; - beats: CMBeat[]; - assignmentOptions: BeatTag[] | null; -} - -class BeatsPageComponent extends React.PureComponent { - private tableRef: React.RefObject = React.createRef(); - constructor(props: PageProps) { - super(props); - - this.state = { - notifications: [], - tags: null, - beats: [], - assignmentOptions: null, - }; - - props.renderAction(this.renderActionArea); - } - - public componentDidMount() { - if (this.props.urlState.beatsKBar) { - this.props.containers.beats.reload(this.props.urlState.beatsKBar); - } - this.updateBeatsData(this.props.urlState.beatsKBar); - } - - public async updateBeatsData(beatsKBar?: string) { - const beats = sortBy(await this.props.libs.beats.getAll(beatsKBar), 'id') || []; - const tags = await this.props.libs.tags.getTagsWithIds(flatten(beats.map((beat) => beat.tags))); - - this.setState({ - tags, - beats, - }); - } - - public renderActionArea = () => ( - - { - // random, but specific number ensures new tab does not overwrite another _newtab in chrome - // and at the same time not truly random so that many clicks of the link open many tabs at this same URL - window.open( - 'https://www.elastic.co/guide/en/beats/libbeat/current/getting-started.html', - '_newtab35628937456' - ); - }} - > - - - { - this.props.goTo(`/overview/enrolled_beats/enroll`); - }} - > - - - - {this.props.location.pathname === '/overview/enrolled_beats/enroll' && ( - { - this.props.setUrlState({ - enrollmentToken: '', - }); - this.props.goTo(`/overview/enrolled_beats`); - }} - style={{ width: '640px' }} - > - - - - - - - { - const enrollmentTokens = await this.props.libs.tokens.createEnrollmentTokens(); - this.props.setUrlState({ - enrollmentToken: enrollmentTokens[0], - }); - }} - onBeatEnrolled={() => { - this.props.setUrlState({ - enrollmentToken: '', - }); - }} - /> - {!this.props.urlState.enrollmentToken && ( - - { - this.props.goTo('/overview/enrolled_beats'); - }} - > - Done - - - )} - - - )} - - ); - - public render() { - return ( - - - - {(autocompleteProps) => ( -
{ - this.props.setUrlState({ beatsKBar: value }); - - this.updateBeatsData(value); - }, - onSubmit: () => null, // todo - value: this.props.urlState.beatsKBar || '', - }} - actions={beatsListActions} - actionData={{ - tags: this.state.assignmentOptions, - }} - actionHandler={async (action: AssignmentActionType, payload: any) => { - switch (action) { - case AssignmentActionType.Assign: - const status = await this.props.containers.beats.toggleTagAssignment( - payload, - this.getSelectedBeats() - ); - await this.updateBeatsData(); - this.notifyUpdatedTagAssociation(status, this.getSelectedBeats(), payload); - break; - case AssignmentActionType.Delete: - await this.props.containers.beats.deactivate(this.getSelectedBeats()); - await this.updateBeatsData(); - this.notifyBeatDisenrolled(this.getSelectedBeats()); - break; - case AssignmentActionType.Reload: - const assignmentOptions = await this.props.libs.tags.getassignableTagsForBeats( - this.getSelectedBeats() - ); - this.setState({ assignmentOptions }); - break; - } - }} - items={this.state.beats.map((beat) => ({ - ...beat, - tags: (this.state.tags || []).filter((tag) => beat.tags.includes(tag.id)), - }))} - ref={this.tableRef} - type={BeatsTableType} - /> - )} - - this.setState({ notifications: [] })} - toastLifeTimeMs={5000} - /> - - ); - } - - private notifyBeatDisenrolled = async (beats: CMBeat[]) => { - const { intl } = this.props; - let title; - let text; - if (beats.length === 1) { - title = intl.formatMessage( - { - id: 'xpack.beatsManagement.beats.beatDisenrolledNotificationTitle', - defaultMessage: '{firstBeatNameOrId} disenrolled', - }, - { - firstBeatNameOrId: `"${beats[0].name || beats[0].id}"`, - } - ); - text = intl.formatMessage( - { - id: 'xpack.beatsManagement.beats.beatDisenrolledNotificationDescription', - defaultMessage: 'Beat with ID {firstBeatId} was disenrolled.', - }, - { - firstBeatId: `"${beats[0].id}"`, - } - ); - } else { - title = intl.formatMessage( - { - id: 'xpack.beatsManagement.beats.disenrolledBeatsNotificationTitle', - defaultMessage: '{beatsLength} beats disenrolled', - }, - { - beatsLength: beats.length, - } - ); - } - - this.setState({ - notifications: this.state.notifications.concat({ - color: 'warning', - id: `disenroll_${new Date()}`, - title, - text, - }), - }); - }; - - private notifyUpdatedTagAssociation = ( - action: 'added' | 'removed', - beats: CMBeat[], - tag: string - ) => { - const { intl } = this.props; - const notificationMessage = - action === 'removed' - ? intl.formatMessage( - { - id: 'xpack.beatsManagement.beats.removedNotificationDescription', - defaultMessage: - 'Removed tag {tag} from {assignmentsLength, plural, one {beat {beatName}} other {# beats}}.', - }, - { - tag: `"${tag}"`, - assignmentsLength: beats.length, - beatName: `"${beats[0].name || beats[0].id}"`, - } - ) - : intl.formatMessage( - { - id: 'xpack.beatsManagement.beats.addedNotificationDescription', - defaultMessage: - 'Added tag {tag} to {assignmentsLength, plural, one {beat {beatName}} other {# beats}}.', - }, - { - tag: `"${tag}"`, - assignmentsLength: beats.length, - beatName: `"${beats[0].name || beats[0].id}"`, - } - ); - const notificationTitle = - action === 'removed' - ? intl.formatMessage( - { - id: 'xpack.beatsManagement.beats.removedNotificationTitle', - defaultMessage: '{assignmentsLength, plural, one {Tag} other {Tags}} removed', - }, - { - assignmentsLength: beats.length, - } - ) - : intl.formatMessage( - { - id: 'xpack.beatsManagement.beats.addedNotificationTitle', - defaultMessage: '{assignmentsLength, plural, one {Tag} other {Tags}} added', - }, - { - assignmentsLength: beats.length, - } - ); - - this.setState({ - notifications: this.state.notifications.concat({ - color: 'success', - id: `tag-${moment.now()}`, - text:

{notificationMessage}

, - title: notificationTitle, - }), - }); - }; - - private getSelectedBeats = (): CMBeat[] => { - if (!this.tableRef.current) { - return []; - } - const selectedIds = this.tableRef.current.state.selection.map((beat: any) => beat.id); - const beats: CMBeat[] = []; - selectedIds.forEach((id: any) => { - const beat = this.props.containers.beats.state.list.find((b) => b.id === id); - if (beat) { - beats.push(beat); - } - }); - return beats; - }; -} - -export const BeatsPage = injectI18n(BeatsPageComponent); diff --git a/x-pack/plugins/beats_management/public/pages/overview/index.tsx b/x-pack/plugins/beats_management/public/pages/overview/index.tsx deleted file mode 100644 index 942f600b09ea8e..00000000000000 --- a/x-pack/plugins/beats_management/public/pages/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 { - EuiBetaBadge, - EuiFlexGroup, - EuiFlexItem, - EuiTab, - // @ts-ignore types for EuiTab not currently available - EuiTabs, -} from '@elastic/eui'; -import { i18n } from '@kbn/i18n'; -import { FormattedMessage } from '@kbn/i18n/react'; -import React from 'react'; -import { Subscribe } from 'unstated'; -import { CMBeat } from '../../../common/domain_types'; -import { PrimaryLayout } from '../../components/layouts/primary'; -import { ChildRoutes } from '../../components/navigation/child_routes'; -import { BeatsContainer } from '../../containers/beats'; -import { TagsContainer } from '../../containers/tags'; -import { withUrlState } from '../../containers/with_url_state'; -import { AppPageProps } from '../../frontend_types'; - -interface MainPagesState { - enrollBeat?: { - enrollmentToken: string; - } | null; - beats: CMBeat[]; - loadedBeatsAtLeastOnce: boolean; -} - -class MainPageComponent extends React.PureComponent { - constructor(props: AppPageProps) { - super(props); - this.state = { - loadedBeatsAtLeastOnce: false, - beats: [], - }; - } - public onTabClicked = (path: string) => { - return () => { - this.props.goTo(path); - }; - }; - - public render() { - return ( - - {'Beats'} - - - - - - } - hideBreadcrumbs={this.props.libs.framework.versionGreaterThen('6.7.0')} - > - {(renderAction: any) => ( - - {(beats: BeatsContainer, tags: TagsContainer) => ( - - - - - - - - - - - - )} - - )} - - ); - } -} - -export const MainPage = withUrlState(MainPageComponent); diff --git a/x-pack/plugins/beats_management/public/pages/tag/create.tsx b/x-pack/plugins/beats_management/public/pages/tag/create.tsx deleted file mode 100644 index 63651156760010..00000000000000 --- a/x-pack/plugins/beats_management/public/pages/tag/create.tsx +++ /dev/null @@ -1,160 +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 { EuiButton, EuiButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui'; -import euiVars from '@elastic/eui/dist/eui_theme_light.json'; -import { i18n } from '@kbn/i18n'; -import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react'; -import 'brace/mode/yaml'; -import 'brace/theme/github'; -import { isEqual } from 'lodash'; -import React from 'react'; -import { UNIQUENESS_ENFORCING_TYPES } from '../../../common/constants/configuration_blocks'; -import { BeatTag, ConfigurationBlock } from '../../../common/domain_types'; -import { PrimaryLayout } from '../../components/layouts/primary'; -import { TagEdit } from '../../components/tag'; -import { AppPageProps } from '../../frontend_types'; -import { randomEUIColor } from '../../utils/random_eui_color'; - -interface TagPageState { - showFlyout: boolean; - tag: BeatTag; - configuration_blocks: ConfigurationBlock[]; - currentConfigPage: number; -} -class TagCreatePageComponent extends React.PureComponent< - AppPageProps & { - intl: InjectedIntl; - }, - TagPageState -> { - constructor(props: AppPageProps & { intl: InjectedIntl }) { - super(props); - - this.state = { - showFlyout: false, - currentConfigPage: 0, - tag: { - id: '', - name: '', - color: randomEUIColor(euiVars), - hasConfigurationBlocksTypes: [], - }, - configuration_blocks: [], - }; - } - public render() { - const { intl } = this.props; - const blockStartingIndex = this.state.currentConfigPage * 5; - return ( - -
- - this.setState((oldState) => ({ - tag: { ...oldState.tag, [field]: value }, - })) - } - onConfigListChange={(index: number) => { - this.setState({ - currentConfigPage: index, - }); - }} - onConfigAddOrEdit={(block: ConfigurationBlock) => { - this.setState((previousState) => ({ - configuration_blocks: previousState.configuration_blocks.concat([block]), - })); - }} - onConfigRemoved={(block: ConfigurationBlock) => { - this.setState((previousState) => { - const selectedIndex = previousState.configuration_blocks.findIndex((c) => { - return isEqual(block, c); - }); - const blocks = [...previousState.configuration_blocks]; - blocks.splice(selectedIndex, 1); - return { - configuration_blocks: blocks, - }; - }); - }} - /> - - - - 1 // || this.state.tag.configuration_blocks.length === 0 - } - onClick={this.saveTag} - > - - - - - this.props.goTo('/overview/configuration_tags')}> - - - - -
- - ); - } - - private saveTag = async () => { - const newTag = await this.props.containers.tags.upsertTag(this.state.tag); - if (!newTag) { - return alert( - i18n.translate('xpack.beatsManagement.createTag.errorSavingTagTitle', { - defaultMessage: 'error saving tag', - }) - ); - } - const createBlocksResponse = await this.props.libs.configBlocks.upsert( - this.state.configuration_blocks.map((block) => ({ ...block, tag: this.state.tag.id })) - ); - const creationError = createBlocksResponse.results.reduce( - (err: string, resp) => (!err ? (err = resp.error ? resp.error.message : '') : err), - '' - ); - if (creationError) { - return alert(creationError); - } - - this.props.goTo(`/overview/configuration_tags`); - }; - private getNumExclusiveConfigurationBlocks = () => - this.state.configuration_blocks - .map(({ type }) => UNIQUENESS_ENFORCING_TYPES.some((uniqueType) => uniqueType === type)) - .reduce((acc, cur) => (cur ? acc + 1 : acc), 0); -} - -export const TagCreatePage = injectI18n(TagCreatePageComponent); diff --git a/x-pack/plugins/beats_management/public/pages/tag/edit.tsx b/x-pack/plugins/beats_management/public/pages/tag/edit.tsx deleted file mode 100644 index 7c023a14b16bd6..00000000000000 --- a/x-pack/plugins/beats_management/public/pages/tag/edit.tsx +++ /dev/null @@ -1,203 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { EuiButton, EuiButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui'; -import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react'; -import 'brace/mode/yaml'; -import 'brace/theme/github'; -import { flatten } from 'lodash'; -import React from 'react'; -import { UNIQUENESS_ENFORCING_TYPES } from '../../../common/constants'; -import { BeatTag, CMBeat, ConfigurationBlock } from '../../../common/domain_types'; -import { PrimaryLayout } from '../../components/layouts/primary'; -import { TagEdit } from '../../components/tag'; -import { AppPageProps } from '../../frontend_types'; -interface TagPageState { - showFlyout: boolean; - attachedBeats: CMBeat[] | null; - tag: BeatTag; - beatsTags: BeatTag[]; - configuration_blocks: { - error?: string | undefined; - list: ConfigurationBlock[]; - page: number; - total: number; - }; -} -class TagEditPageComponent extends React.PureComponent< - AppPageProps & { - intl: InjectedIntl; - }, - TagPageState -> { - constructor(props: AppPageProps & { intl: InjectedIntl }) { - super(props); - - this.state = { - showFlyout: false, - attachedBeats: null, - beatsTags: [], - tag: { - id: props.match.params.tagid, - name: '', - color: '#fff', - hasConfigurationBlocksTypes: [], - }, - configuration_blocks: { - list: [], - page: 0, - total: 0, - }, - }; - } - - public UNSAFE_componentWillMount() { - this.loadTag(); - this.loadAttachedBeats(); - this.loadConfigBlocks(); - } - public render() { - const { intl } = this.props; - - return ( - -
- { - await this.props.containers.beats.removeTagsFromBeats(beatIds, this.state.tag.id); - await this.loadAttachedBeats(); - }} - onTagChange={(field: string, value: string | number) => - this.setState((oldState) => ({ - tag: { ...oldState.tag, [field]: value }, - })) - } - attachedBeats={ - (this.state.attachedBeats || []).map((beat) => ({ - ...beat, - tags: flatten( - beat.tags.map((tagId) => this.state.beatsTags.filter((tag) => tag.id === tagId)) - ), - })) as any - } - onConfigListChange={(index: number) => { - this.loadConfigBlocks(index); - }} - onConfigAddOrEdit={(block: ConfigurationBlock) => { - this.props.libs.configBlocks - .upsert([{ ...block, tag: this.state.tag.id }]) - .catch((e: any) => { - // eslint-disable-next-line - console.error('Error upseting config block', e); - }) - .then(() => { - this.loadConfigBlocks(this.state.configuration_blocks.page); - }); - }} - onConfigRemoved={(block: ConfigurationBlock) => { - this.props.libs.configBlocks - .delete(block.id) - .catch((e: any) => { - alert( - 'Error removing block, please check your browsers console logs for more details' - ); - // eslint-disable-next-line - console.error(`Error removing block ${block.id}`, e); - }) - .then(() => { - this.loadConfigBlocks(this.state.configuration_blocks.page); - }); - }} - /> - - - - 1 // || this.state.tag.configuration_blocks.length === 0 - } - onClick={this.saveTag} - > - - - - - this.props.goTo('/overview/configuration_tags')}> - - - - -
- - ); - } - private loadConfigBlocks = async (page: number = -1) => { - const blocksResponse = await this.props.libs.configBlocks.getForTags([this.state.tag.id], page); - - this.setState({ - configuration_blocks: blocksResponse as { - error?: string | undefined; - list: ConfigurationBlock[]; - page: number; - total: number; - }, - }); - }; - - private loadTag = async () => { - const tags = await this.props.libs.tags.getTagsWithIds([this.props.match.params.tagid]); - if (tags.length === 0) { - // TODO do something to error https://github.com/elastic/kibana/issues/26023 - } - this.setState({ - tag: tags[0], - }); - }; - - private loadAttachedBeats = async () => { - const beats = await this.props.libs.beats.getBeatsWithTag(this.props.match.params.tagid); - const beatsTags = await this.props.libs.tags.getTagsWithIds( - flatten(beats.map((beat) => beat.tags)) - ); - this.setState({ - attachedBeats: beats, - beatsTags, - }); - }; - private saveTag = async () => { - await this.props.containers.tags.upsertTag(this.state.tag); - this.props.goTo(`/overview/configuration_tags`); - }; - private getNumExclusiveConfigurationBlocks = () => - this.state.configuration_blocks.list - .map(({ type }) => UNIQUENESS_ENFORCING_TYPES.some((uniqueType) => uniqueType === type)) - .reduce((acc, cur) => (cur ? acc + 1 : acc), 0); -} - -export const TagEditPage = injectI18n(TagEditPageComponent); diff --git a/x-pack/plugins/beats_management/public/pages/walkthrough/initial/beat.tsx b/x-pack/plugins/beats_management/public/pages/walkthrough/initial/beat.tsx deleted file mode 100644 index 2881bcfb18b565..00000000000000 --- a/x-pack/plugins/beats_management/public/pages/walkthrough/initial/beat.tsx +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { EuiButton } from '@elastic/eui'; -import React, { Component } from 'react'; -import { EnrollBeat } from '../../../components/enroll_beats'; -import { AppPageProps } from '../../../frontend_types'; - -interface ComponentState { - readyToContinue: boolean; -} - -export class BeatsInitialEnrollmentPage extends Component { - constructor(props: AppPageProps) { - super(props); - this.state = { - readyToContinue: false, - }; - } - - public onBeatEnrolled = () => { - this.setState({ - readyToContinue: true, - }); - }; - - public createEnrollmentToken = async () => { - const enrollmentToken = await this.props.libs.tokens.createEnrollmentTokens(); - this.props.setUrlState({ - enrollmentToken: enrollmentToken[0], - }); - }; - - public render() { - return ( - - - {this.state.readyToContinue && ( - - { - this.props.goTo('/walkthrough/initial/tag'); - }} - > - Continue - - - )} - - ); - } -} diff --git a/x-pack/plugins/beats_management/public/pages/walkthrough/initial/finish.tsx b/x-pack/plugins/beats_management/public/pages/walkthrough/initial/finish.tsx deleted file mode 100644 index 7a1bc5e2184fe3..00000000000000 --- a/x-pack/plugins/beats_management/public/pages/walkthrough/initial/finish.tsx +++ /dev/null @@ -1,136 +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 { EuiButton, EuiEmptyPrompt, EuiFlexGroup, EuiFlexItem, EuiPageContent } from '@elastic/eui'; -import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react'; -import React from 'react'; -import { CMBeat } from '../../../../common/domain_types'; -import { AppPageProps } from '../../../frontend_types'; - -interface PageState { - assigned: boolean; -} -class FinishWalkthrough extends React.Component< - AppPageProps & { - intl: InjectedIntl; - }, - PageState -> { - constructor( - props: AppPageProps & { - intl: InjectedIntl; - } - ) { - super(props); - - this.state = { - assigned: false, - }; - } - - public componentDidMount() { - setTimeout(async () => { - const done = await this.assignTagToBeat(); - - if (done) { - this.setState({ - assigned: true, - }); - } - }, 300); - } - - public render() { - const { goTo } = this.props; - - return ( - - - - - - - } - body={ - -

- -

- - } - actions={ - { - goTo('/overview/enrolled_beats'); - }} - > - - - } - /> - - - - ); - } - - private assignTagToBeat = async () => { - const { intl } = this.props; - if (!this.props.urlState.enrollmentToken) { - return alert( - intl.formatMessage({ - id: 'xpack.beatsManagement.enrollBeat.assignTagToBeatInvalidURLNoTokenFountTitle', - defaultMessage: 'Invalid URL, no enrollmentToken found', - }) - ); - } - if (!this.props.urlState.createdTag) { - return alert( - intl.formatMessage({ - id: 'xpack.beatsManagement.enrollBeat.assignTagToBeatInvalidURLNoTagFoundTitle', - defaultMessage: 'Invalid URL, no createdTag found', - }) - ); - } - - const beat = await this.props.libs.beats.getBeatWithToken(this.props.urlState.enrollmentToken); - if (!beat) { - return alert( - intl.formatMessage({ - id: 'xpack.beatsManagement.enrollBeat.assignTagToBeatNotEnrolledProperlyTitle', - defaultMessage: 'Error: Beat not enrolled properly', - }) - ); - } - - await this.props.containers.beats.assignTagsToBeats( - [beat as CMBeat], - this.props.urlState.createdTag - ); - this.props.setUrlState({ - createdTag: '', - enrollmentToken: '', - }); - return true; - }; -} - -export const FinishWalkthroughPage = injectI18n(FinishWalkthrough); diff --git a/x-pack/plugins/beats_management/public/pages/walkthrough/initial/index.tsx b/x-pack/plugins/beats_management/public/pages/walkthrough/initial/index.tsx deleted file mode 100644 index 506aa87bc51ef2..00000000000000 --- a/x-pack/plugins/beats_management/public/pages/walkthrough/initial/index.tsx +++ /dev/null @@ -1,97 +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 { EuiBetaBadge, EuiButton, EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; -import { i18n } from '@kbn/i18n'; -import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react'; -import React from 'react'; -import { NoDataLayout } from '../../../components/layouts/no_data'; -import { WalkthroughLayout } from '../../../components/layouts/walkthrough'; -import { ChildRoutes } from '../../../components/navigation/child_routes'; -import { ConnectedLink } from '../../../components/navigation/connected_link'; -import { AppPageProps } from '../../../frontend_types'; - -type Props = AppPageProps & { - intl: InjectedIntl; -}; - -const InitialWalkthroughPageComponent: React.FC = (props) => { - if (props.location.pathname === '/walkthrough/initial') { - return ( - - {'Beats central management '} - - - - - } - actionSection={ - - - {' '} - - - } - > -

- -

- - ); - } - return ( - { - // FIXME implament goto - }} - activePath={props.location.pathname} - > - - - ); -}; - -export const InitialWalkthroughPage = injectI18n(InitialWalkthroughPageComponent); diff --git a/x-pack/plugins/beats_management/public/pages/walkthrough/initial/tag.tsx b/x-pack/plugins/beats_management/public/pages/walkthrough/initial/tag.tsx deleted file mode 100644 index eb1e251b2896d3..00000000000000 --- a/x-pack/plugins/beats_management/public/pages/walkthrough/initial/tag.tsx +++ /dev/null @@ -1,137 +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 { EuiButton, EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; -import { i18n } from '@kbn/i18n'; -import { FormattedMessage } from '@kbn/i18n/react'; -import { isEqual } from 'lodash'; -import React, { Component } from 'react'; -import uuidv4 from 'uuid/v4'; -import { BeatTag, ConfigurationBlock } from '../../../../common/domain_types'; -import { TagEdit } from '../../../components/tag/tag_edit'; -import { AppPageProps } from '../../../frontend_types'; -interface PageState { - tag: BeatTag; - configuration_blocks: ConfigurationBlock[]; - currentConfigPage: number; -} - -export class InitialTagPage extends Component { - constructor(props: AppPageProps) { - super(props); - this.state = { - tag: { - id: uuidv4(), - name: '', - color: '#DD0A73', - hasConfigurationBlocksTypes: [], - }, - configuration_blocks: [], - currentConfigPage: 0, - }; - - if (props.urlState.createdTag) { - this.loadTag(); - } - } - - public render() { - const blockStartingIndex = this.state.currentConfigPage * 5; - - return ( - - - this.setState((oldState) => ({ - tag: { ...oldState.tag, [field]: value }, - })) - } - onConfigListChange={(index: number) => { - this.setState({ - currentConfigPage: index, - }); - }} - onConfigAddOrEdit={(block: ConfigurationBlock) => { - this.setState((previousState) => ({ - configuration_blocks: previousState.configuration_blocks.concat([block]), - })); - }} - onConfigRemoved={(block: ConfigurationBlock) => { - this.setState((previousState) => { - const selectedIndex = previousState.configuration_blocks.findIndex((c) => { - return isEqual(block, c); - }); - const blocks = [...previousState.configuration_blocks]; - blocks.splice(selectedIndex, 1); - return { - configuration_blocks: blocks, - }; - }); - }} - /> - - - - - - - - - ); - } - - private loadTag = async () => { - const tags = await this.props.libs.tags.getTagsWithIds([this.state.tag.id]); - if (tags.length > 0) { - this.setState({ - tag: tags[0], - }); - } - }; - - private saveTag = async () => { - const newTag = await this.props.libs.tags.upsertTag(this.state.tag as BeatTag); - if (!newTag) { - return alert( - i18n.translate('xpack.beatsManagement.createTag.errorSavingTagTitle', { - defaultMessage: 'error saving tag', - }) - ); - } - const createBlocksResponse = await this.props.libs.configBlocks.upsert( - this.state.configuration_blocks.map((block) => ({ ...block, tag: this.state.tag.id })) - ); - const creationError = createBlocksResponse.results.reduce( - (err: string, resp) => (!err ? (err = resp.error ? resp.error.message : '') : err), - '' - ); - if (creationError) { - return alert(creationError); - } - this.props.setUrlState({ - createdTag: newTag.id, - }); - this.props.goTo(`/walkthrough/initial/finish`); - }; -} diff --git a/x-pack/plugins/beats_management/public/router.tsx b/x-pack/plugins/beats_management/public/router.tsx deleted file mode 100644 index 2c328c2745c14d..00000000000000 --- a/x-pack/plugins/beats_management/public/router.tsx +++ /dev/null @@ -1,132 +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 { get } from 'lodash'; -import React, { Component } from 'react'; -import { Redirect, Route, Switch } from 'react-router-dom'; -import { Loading } from './components/loading'; -import { ChildRoutes } from './components/navigation/child_routes'; -import { BeatsContainer } from './containers/beats'; -import { TagsContainer } from './containers/tags'; -import { URLStateProps, WithURLState } from './containers/with_url_state'; -import { FrontendLibs } from './lib/types'; -import { routeMap } from './pages/index'; - -interface RouterProps { - libs: FrontendLibs; - tagsContainer: TagsContainer; - beatsContainer: BeatsContainer; -} -interface RouterState { - loading: boolean; -} - -export class AppRouter extends Component { - constructor(props: RouterProps) { - super(props); - this.state = { - loading: true, - }; - } - - public async UNSAFE_componentWillMount() { - if (this.state.loading === true) { - try { - await this.props.beatsContainer.reload(); - await this.props.tagsContainer.reload(); - } catch (e) { - // TODO in a furture version we will better manage this "error" in a returned arg - } - - this.setState({ - loading: false, - }); - } - } - - public render() { - if (this.state.loading === true) { - return ; - } - - const countOfEverything = - this.props.beatsContainer.state.list.length + this.props.tagsContainer.state.list.length; - - return ( - - {/* Redirects mapping */} - - {/* License check (UI displays when license exists but is expired) */} - {get(this.props.libs.framework.info, 'license.expired', true) && ( - - !props.location.pathname.includes('/error') ? ( - - ) : null - } - /> - )} - - {/* Ensure security is eanabled for elastic and kibana */} - {!get(this.props.libs.framework.info, 'security.enabled', true) && ( - - !props.location.pathname.includes('/error') ? ( - - ) : null - } - /> - )} - - {/* Make sure the user has correct permissions */} - {!this.props.libs.framework.currentUserHasOneOfRoles( - ['beats_admin'].concat(this.props.libs.framework.info.settings.defaultUserRoles) - ) && ( - - !props.location.pathname.includes('/error') ? ( - - ) : null - } - /> - )} - - {/* If there are no beats or tags yet, redirect to the walkthrough */} - {countOfEverything === 0 && ( - - !props.location.pathname.includes('/walkthrough') ? ( - - ) : null - } - /> - )} - - {/* This app does not make use of a homepage. The mainpage is overview/enrolled_beats */} - } /> - - - {/* Render routes from the FS */} - - {(URLProps: URLStateProps) => ( - - )} - - - ); - } -} diff --git a/x-pack/plugins/beats_management/public/utils/random_eui_color.ts b/x-pack/plugins/beats_management/public/utils/random_eui_color.ts deleted file mode 100644 index 52d847cc6a5a0e..00000000000000 --- a/x-pack/plugins/beats_management/public/utils/random_eui_color.ts +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { sample } from 'lodash'; - -export const randomEUIColor = (euiVars: any) => { - const rgb = sample( - Object.keys(euiVars) - .filter((key) => key.startsWith('euiColorVis')) - .map((key) => (euiVars as any)[key]) - ); - - const matchedrgb = rgb.match( - /^rgba?[\s+]?\([\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?/i - ); - return matchedrgb && matchedrgb.length === 4 - ? '#' + - ('0' + parseInt(matchedrgb[1], 10).toString(16)).slice(-2) + - ('0' + parseInt(matchedrgb[2], 10).toString(16)).slice(-2) + - ('0' + parseInt(matchedrgb[3], 10).toString(16)).slice(-2) - : ''; -}; diff --git a/x-pack/plugins/beats_management/public/utils/typed_react.ts b/x-pack/plugins/beats_management/public/utils/typed_react.ts deleted file mode 100644 index ee5ffc2969bb07..00000000000000 --- a/x-pack/plugins/beats_management/public/utils/typed_react.ts +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React from 'react'; - -export type RendererResult = React.ReactElement | null; -export type RendererFunction = (args: RenderArgs) => Result; - -export type StateUpdater = ( - prevState: Readonly, - prevProps: Readonly -) => State | null; - -export function composeStateUpdaters(...updaters: Array>) { - return (state: State, props: Props) => - updaters.reduce((currentState, updater) => updater(currentState, props) || currentState, state); -} diff --git a/x-pack/plugins/beats_management/readme.md b/x-pack/plugins/beats_management/readme.md deleted file mode 100644 index 75adf428772e43..00000000000000 --- a/x-pack/plugins/beats_management/readme.md +++ /dev/null @@ -1,39 +0,0 @@ -# Beats CM - -Notes: -Failure to have auth enabled in Kibana will make for a broken UI. UI-based errors not yet in place - -## Testing - -### Unit tests - -Run Jest tests: - -Documentation: https://www.elastic.co/guide/en/kibana/current/development-tests.html#_unit_testing - -``` -yarn test:jest x-pack/plugins/beats --watch -``` - -### API tests - -In one shell, from **~/kibana/x-pack**: -`node scripts/functional_tests-server.js` - -In another shell, from **~kibana/x-pack**: -`node ../scripts/functional_test_runner.js --config test/api_integration/config.ts`. - -### Manual e2e testing - -- Run this command to fake an enrolling beat (from beats_management dir) - -``` -node scripts/enroll.js -``` - -- Run a command to setup a fake large-scale deployment - Note: `ts-node` is required to be installed gloably from NPM/Yarn for this action - -``` -ts-node scripts/fake_env.ts <# of beats> <# of tags per beat> <# of congifs per tag> -``` diff --git a/x-pack/plugins/beats_management/scripts/enroll.js b/x-pack/plugins/beats_management/scripts/enroll.js deleted file mode 100644 index 3c6712ada8e9b2..00000000000000 --- a/x-pack/plugins/beats_management/scripts/enroll.js +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -const request = require('request'); -const Chance = require('chance'); // eslint-disable-line -const args = process.argv.slice(2); -const chance = new Chance(); - -const enroll = async (kibanaURL, token) => { - const beatId = chance.word(); - - if (!token) { - token = kibanaURL; - kibanaURL = 'http://localhost:5601'; - } - - await request( - { - url: `${kibanaURL}/api/beats/agent/${beatId}`, - method: 'POST', - headers: { - 'kbn-xsrf': 'xxx', - 'kbn-beats-enrollment-token': token, - }, - body: JSON.stringify({ - type: 'filebeat', - host_name: `${chance.word()}.bar.com`, - name: chance.word(), - version: '6.3.0', - }), - }, - (error, response, body) => { - console.log(error, body); - } - ); -}; - -enroll(...args); diff --git a/x-pack/plugins/beats_management/scripts/fake_env.ts b/x-pack/plugins/beats_management/scripts/fake_env.ts deleted file mode 100644 index e45bbe2277387b..00000000000000 --- a/x-pack/plugins/beats_management/scripts/fake_env.ts +++ /dev/null @@ -1,158 +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 Chance from 'chance'; -// @ts-ignore -import request from 'request'; -import uuidv4 from 'uuid/v4'; -import { configBlockSchemas } from '../common/config_schemas'; -import { BeatTag } from '../common/domain_types'; -import { compose } from '../public/lib/compose/scripts'; -const args = process.argv.slice(2); -const chance = new Chance(); - -function sleep(ms: number) { - return new Promise((resolve) => setTimeout(resolve, ms)); -} -function getRandomColor() { - const letters = '0123456789ABCDEF'; - let color = '#'; - for (let i = 0; i < 6; i++) { - color += letters[Math.floor(Math.random() * 16)]; - } - return color; -} - -const enroll = async (kibanaURL: string, token: string) => { - const beatId = uuidv4(); - - await request( - { - url: `${kibanaURL}/api/beats/agent/${beatId}`, - method: 'POST', - headers: { - 'kbn-xsrf': 'xxx', - 'kbn-beats-enrollment-token': token, - }, - body: JSON.stringify({ - type: Math.random() >= 0.5 ? 'filebeat' : 'metricbeat', - host_name: `${chance.word()}.local`, - name: chance.word(), - version: '6.7.0', - }), - }, - (error: any, response: any, body: any) => { - const res = JSON.parse(body); - if (res.message) { - // eslint-disable-next-line - console.log(res.message); - } - } - ); -}; - -const start = async ( - kibanaURL: string, - numberOfBeats = 10, - maxNumberOfTagsPerBeat = 2, - maxNumberOfConfigsPerTag = 4 -) => { - try { - const libs = compose(kibanaURL); - // eslint-disable-next-line - console.error(`Enrolling ${numberOfBeats} fake beats...`); - - const enrollmentTokens = await libs.tokens.createEnrollmentTokens(numberOfBeats); - process.stdout.write(`enrolling fake beats... 0 of ${numberOfBeats}`); - let count = 0; - for (const token of enrollmentTokens) { - count++; - // @ts-ignore - process.stdout.clearLine(); - // @ts-ignore - process.stdout.cursorTo(0); - process.stdout.write(`enrolling fake beats... ${count} of ${numberOfBeats}`); - - await enroll(kibanaURL, token); - await sleep(10); - } - process.stdout.write('\n'); - - await sleep(2000); - // eslint-disable-next-line - console.error(`${numberOfBeats} fake beats are enrolled`); - const beats = await libs.beats.getAll(); - - // eslint-disable-next-line - console.error(`Creating tags, configs, and assigning them...`); - process.stdout.write(`creating tags/configs for beat... 0 of ${numberOfBeats}`); - count = 0; - for (const beat of beats) { - count++; - // @ts-ignore - process.stdout.clearLine(); - // @ts-ignore - process.stdout.cursorTo(0); - process.stdout.write(`creating tags w/configs for beat... ${count} of ${numberOfBeats}`); - - const tags = await Promise.all( - [...Array(maxNumberOfTagsPerBeat)].map(() => { - return libs.tags.upsertTag({ - name: chance.word(), - color: getRandomColor(), - hasConfigurationBlocksTypes: [] as string[], - } as BeatTag); - }) - ); - await libs.beats.assignTagsToBeats( - tags.map((tag: any) => ({ - beatId: beat.id, - tag: tag.id, - })) - ); - - await Promise.all( - tags.map((tag: any) => { - return libs.configBlocks.upsert( - [...Array(maxNumberOfConfigsPerTag)].map( - () => - ({ - type: configBlockSchemas[Math.floor(Math.random())].id, - description: `Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sint ista Graecorum; -Nihil ad rem! Ne sit sane; Quod quidem nobis non saepe contingit. -Duo Reges: constructio interrete. Itaque his sapiens semper vacabit.`.substring( - 0, - Math.floor(Math.random() * (0 - 115 + 1)) - ), - tag: tag.id, - last_updated: new Date(), - config: {}, - } as any) - ) - ); - }) - ); - } - } catch (e) { - if (e.response && e.response.data && e.response.message) { - // eslint-disable-next-line - console.error(e.response.data.message); - } else if (e.response && e.response.data && e.response.reason) { - // eslint-disable-next-line - console.error(e.response.data.reason); - } else if (e.code) { - // eslint-disable-next-line - console.error(e.code); - } else { - // eslint-disable-next-line - console.error(e); - } - } -}; - -// @ts-ignore -start(...args); diff --git a/x-pack/plugins/beats_management/server/index.ts b/x-pack/plugins/beats_management/server/index.ts deleted file mode 100644 index 5489fce1f36a3c..00000000000000 --- a/x-pack/plugins/beats_management/server/index.ts +++ /dev/null @@ -1,22 +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 { PluginInitializer } from '../../../../src/core/server'; -import { beatsManagementConfigSchema } from '../common'; -import { BeatsManagementPlugin } from './plugin'; - -export const config = { - schema: beatsManagementConfigSchema, - - exposeToBrowser: { - defaultUserRoles: true, - encryptionKey: true, - enrollmentTokensTtlInSeconds: true, - }, -}; - -export const plugin: PluginInitializer<{}, {}> = (context) => new BeatsManagementPlugin(context); diff --git a/x-pack/plugins/beats_management/server/index_templates/beats_template.json b/x-pack/plugins/beats_management/server/index_templates/beats_template.json deleted file mode 100644 index 36fc753c68745f..00000000000000 --- a/x-pack/plugins/beats_management/server/index_templates/beats_template.json +++ /dev/null @@ -1,137 +0,0 @@ -{ - "index_patterns": [".management-beats"], - "version": 70000, - "settings": { - "index": { - "number_of_shards": 1, - "auto_expand_replicas": "0-1", - "codec": "best_compression" - } - }, - "mappings": { - "dynamic": "strict", - "properties": { - "type": { - "type": "keyword" - }, - "configuration_block": { - "properties": { - "id": { - "type": "keyword" - }, - "type": { - "type": "keyword" - }, - "tag": { - "type": "keyword" - }, - "description": { - "type": "text" - }, - "config": { - "type": "keyword" - }, - "last_updated": { - "type": "date" - } - } - }, - "enrollment_token": { - "properties": { - "token": { - "type": "keyword" - }, - "expires_on": { - "type": "date" - } - } - }, - "tag": { - "properties": { - "id": { - "type": "keyword" - }, - "name": { - "type": "keyword" - }, - "color": { - "type": "keyword" - }, - "hasConfigurationBlocksTypes": { - "type": "keyword" - } - } - }, - "beat": { - "properties": { - "id": { - "type": "keyword" - }, - "status": { - "properties": { - "type": { - "type": "keyword" - }, - "timestamp": { - "type": "date" - }, - "event": { - "properties": { - "type": { - "type": "keyword" - }, - "message": { - "type": "text" - }, - "uuid": { - "type": "keyword" - } - } - } - } - }, - "active": { - "type": "boolean" - }, - "last_checkin": { - "type": "date" - }, - "enrollment_token": { - "type": "keyword" - }, - "access_token": { - "type": "keyword" - }, - "verified_on": { - "type": "date" - }, - "type": { - "type": "keyword" - }, - "version": { - "type": "keyword" - }, - "host_ip": { - "type": "ip" - }, - "host_name": { - "type": "keyword" - }, - "ephemeral_id": { - "type": "keyword" - }, - "tags": { - "type": "keyword" - }, - "metadata": { - "dynamic": "true", - "type": "object" - }, - "name": { - "type": "keyword" - } - } - } - } - } -} diff --git a/x-pack/plugins/beats_management/server/index_templates/events_template.json b/x-pack/plugins/beats_management/server/index_templates/events_template.json deleted file mode 100644 index 4f8063f0481329..00000000000000 --- a/x-pack/plugins/beats_management/server/index_templates/events_template.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "index_patterns": [".management-beats-events-*"], - "version": 67000, - "index": { - "lifecycle": { - "name": ".beats-management-events-retention" - } - }, - "settings": { - "index": { - "number_of_shards": 1, - "auto_expand_replicas": "0-1", - "codec": "best_compression" - } - }, - "mappings": { - "_doc": { - "dynamic": "strict", - "properties": { - "type": { - "type": "keyword" - }, - "beat": { - "type": "keyword" - }, - "timestamp": { - "type": "date" - }, - "event": { - "properties": { - "type": { - "type": "keyword" - }, - "message": { - "type": "text" - }, - "uuid": { - "type": "keyword" - } - } - } - } - } - } -} diff --git a/x-pack/plugins/beats_management/server/index_templates/index.ts b/x-pack/plugins/beats_management/server/index_templates/index.ts deleted file mode 100644 index ade9a86114e630..00000000000000 --- a/x-pack/plugins/beats_management/server/index_templates/index.ts +++ /dev/null @@ -1,11 +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 beatsIndexTemplate from './beats_template.json'; -import eventsIndexTemplate from './events_template.json'; - -export { beatsIndexTemplate, eventsIndexTemplate }; diff --git a/x-pack/plugins/beats_management/server/lib/adapters/beats/adapter_types.ts b/x-pack/plugins/beats_management/server/lib/adapters/beats/adapter_types.ts deleted file mode 100644 index 995fec9825db88..00000000000000 --- a/x-pack/plugins/beats_management/server/lib/adapters/beats/adapter_types.ts +++ /dev/null @@ -1,46 +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 { CMBeat } from '../../../../common/domain_types'; -import { FrameworkUser } from '../framework/adapter_types'; - -export interface CMBeatsAdapter { - insert(user: FrameworkUser, beat: CMBeat): Promise; - update(user: FrameworkUser, beat: CMBeat): Promise; - get(user: FrameworkUser, id: string): Promise; - getAll(user: FrameworkUser, ESQuery?: any): Promise; - getWithIds(user: FrameworkUser, beatIds: string[]): Promise; - getAllWithTags(user: FrameworkUser, tagIds: string[]): Promise; - getBeatWithToken(user: FrameworkUser, enrollmentToken: string): Promise; - removeTagsFromBeats( - user: FrameworkUser, - removals: BeatsTagAssignment[] - ): Promise; - assignTagsToBeats( - user: FrameworkUser, - assignments: BeatsTagAssignment[] - ): Promise; -} - -export interface BeatsTagAssignment { - beatId: string; - tag: string; - idxInRequest?: number; -} - -interface BeatsReturnedTagAssignment { - status: number | null; - result?: string; -} - -export interface CMAssignmentReturn { - assignments: BeatsReturnedTagAssignment[]; -} - -export interface BeatsRemovalReturn { - removals: BeatsReturnedTagAssignment[]; -} diff --git a/x-pack/plugins/beats_management/server/lib/adapters/beats/elasticsearch_beats_adapter.ts b/x-pack/plugins/beats_management/server/lib/adapters/beats/elasticsearch_beats_adapter.ts deleted file mode 100644 index 3fdba8f7441d19..00000000000000 --- a/x-pack/plugins/beats_management/server/lib/adapters/beats/elasticsearch_beats_adapter.ts +++ /dev/null @@ -1,245 +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 { flatten, get as _get, omit } from 'lodash'; -import { INDEX_NAMES } from '../../../../common/constants'; -import { CMBeat } from '../../../../common/domain_types'; -import { DatabaseAdapter } from '../database/adapter_types'; -import { FrameworkUser } from '../framework/adapter_types'; -import { BeatsTagAssignment, CMBeatsAdapter } from './adapter_types'; - -function formatWithTags(beat: CMBeat) { - const { tags, ...rest } = beat; - - return { - tags: tags || [], - ...rest, - }; -} - -export class ElasticsearchBeatsAdapter implements CMBeatsAdapter { - private database: DatabaseAdapter; - - constructor(database: DatabaseAdapter) { - this.database = database; - } - - public async get(user: FrameworkUser, id: string) { - const params = { - id: `beat:${id}`, - ignore: [404], - index: INDEX_NAMES.BEATS, - }; - - const response = await this.database.get(user, params); - if (!response.found) { - return null; - } - const beat = _get(response, '_source.beat') as CMBeat; - beat.tags = beat.tags || []; - return beat; - } - - public async insert(user: FrameworkUser, beat: CMBeat) { - const body = { - beat, - type: 'beat', - }; - - await this.database.index(user, { - body, - id: `beat:${beat.id}`, - index: INDEX_NAMES.BEATS, - refresh: 'wait_for', - }); - } - - public async update(user: FrameworkUser, beat: CMBeat) { - const body = { - beat, - type: 'beat', - }; - - const params = { - body, - id: `beat:${beat.id}`, - index: INDEX_NAMES.BEATS, - refresh: 'wait_for', - }; - await this.database.index(user, params); - } - - public async getWithIds(user: FrameworkUser, beatIds: string[]) { - const ids = beatIds.map((beatId) => `beat:${beatId}`); - - const params = { - body: { - ids, - }, - index: INDEX_NAMES.BEATS, - }; - const response = await this.database.mget(user, params); - - return _get(response, 'docs', []) - .filter((b: any) => b.found) - .map((b: any) => ({ tags: [], ...b._source.beat })); - } - - public async getAllWithTags(user: FrameworkUser, tagIds: string[]): Promise { - const params = { - ignore: [404], - index: INDEX_NAMES.BEATS, - body: { - query: { - terms: { 'beat.tags': tagIds }, - }, - }, - }; - - const response = await this.database.search(user, params); - - const beats = _get(response, 'hits.hits', []) as CMBeat[]; - - if (beats.length === 0) { - return []; - } - return beats.map((beat: any) => - formatWithTags(omit(beat._source.beat as CMBeat, ['access_token']) as CMBeat) - ); - } - - public async getBeatWithToken( - user: FrameworkUser, - enrollmentToken: string - ): Promise { - const params = { - ignore: [404], - index: INDEX_NAMES.BEATS, - body: { - query: { - match: { 'beat.enrollment_token': enrollmentToken }, - }, - }, - }; - - const response = await this.database.search(user, params); - - const beats = _get(response, 'hits.hits', []) as CMBeat[]; - - if (beats.length === 0) { - return null; - } - return omit(_get(formatWithTags(beats[0]), '_source.beat'), ['access_token']) as CMBeat; - } - - public async getAll(user: FrameworkUser, ESQuery?: any) { - const params = { - index: INDEX_NAMES.BEATS, - size: 10000, - ignore: [404], - body: { - query: { - bool: { - must: { - term: { - type: 'beat', - }, - }, - }, - }, - }, - }; - - if (ESQuery) { - params.body.query = { - ...params.body.query, - ...ESQuery, - }; - } - - let response; - try { - response = await this.database.search(user, params); - } catch (e) { - // TODO something - } - if (!response) { - return []; - } - const beats = _get(response, 'hits.hits', []) as any; - - return beats.map((beat: any) => - formatWithTags(omit(beat._source.beat as CMBeat, ['access_token']) as CMBeat) - ); - } - - public async removeTagsFromBeats( - user: FrameworkUser, - removals: BeatsTagAssignment[] - ): Promise { - const body = flatten( - removals.map(({ beatId, tag }) => { - const script = ` - def beat = ctx._source.beat; - if (beat.tags != null) { - beat.tags.removeAll([params.tag]); - }`; - - return [ - { update: { _id: `beat:${beatId}` } }, - { script: { source: script.replace(' ', ''), params: { tag } } }, - ]; - }) - ); - - const response = await this.database.bulk(user, { - body, - index: INDEX_NAMES.BEATS, - refresh: 'wait_for', - }); - return (_get(response, 'items', []) as any).map((item: any, resultIdx: number) => ({ - idxInRequest: removals[resultIdx].idxInRequest, - result: item.update.result, - status: item.update.status, - })); - } - - public async assignTagsToBeats( - user: FrameworkUser, - assignments: BeatsTagAssignment[] - ): Promise { - const body = flatten( - assignments.map(({ beatId, tag }) => { - const script = ` - def beat = ctx._source.beat; - if (beat.tags == null) { - beat.tags = []; - } - if (!beat.tags.contains(params.tag)) { - beat.tags.add(params.tag); - }`; - - return [ - { update: { _id: `beat:${beatId}` } }, - { script: { source: script.replace(' ', ''), params: { tag } } }, - ]; - }) - ); - - const response = await this.database.bulk(user, { - body, - index: INDEX_NAMES.BEATS, - refresh: 'wait_for', - }); - // console.log(response.items[0].update.error); - return (_get(response, 'items', []) as any).map((item: any, resultIdx: any) => ({ - idxInRequest: assignments[resultIdx].idxInRequest, - result: item.update.result, - status: item.update.status, - })); - } -} diff --git a/x-pack/plugins/beats_management/server/lib/adapters/configuration_blocks/adapter_types.ts b/x-pack/plugins/beats_management/server/lib/adapters/configuration_blocks/adapter_types.ts deleted file mode 100644 index dcd2043bd0ea15..00000000000000 --- a/x-pack/plugins/beats_management/server/lib/adapters/configuration_blocks/adapter_types.ts +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { ConfigurationBlock } from '../../../../common/domain_types'; -import { FrameworkUser } from '../framework/adapter_types'; - -export interface ConfigurationBlockAdapter { - getByIds(user: FrameworkUser, ids: string[]): Promise; - getForTags( - user: FrameworkUser, - tagIds: string[], - page?: number, - size?: number - ): Promise<{ blocks: ConfigurationBlock[]; page: number; total: number }>; - delete( - user: FrameworkUser, - blockIds: string[] - ): Promise>; - create(user: FrameworkUser, configs: ConfigurationBlock[]): Promise; - deleteForTags( - user: FrameworkUser, - tagIds: string[] - ): Promise<{ success: boolean; reason?: string }>; -} diff --git a/x-pack/plugins/beats_management/server/lib/adapters/configuration_blocks/elasticsearch_configuration_block_adapter.ts b/x-pack/plugins/beats_management/server/lib/adapters/configuration_blocks/elasticsearch_configuration_block_adapter.ts deleted file mode 100644 index 744aa0d87c7601..00000000000000 --- a/x-pack/plugins/beats_management/server/lib/adapters/configuration_blocks/elasticsearch_configuration_block_adapter.ts +++ /dev/null @@ -1,168 +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 { flatten, get } from 'lodash'; -import uuidv4 from 'uuid/v4'; -import { INDEX_NAMES } from '../../../../common/constants'; -import { ConfigurationBlock } from '../../../../common/domain_types'; -import { DatabaseAdapter } from '../database/adapter_types'; -import { FrameworkUser } from '../framework/adapter_types'; -import { ConfigurationBlockAdapter } from './adapter_types'; - -export class ElasticsearchConfigurationBlockAdapter implements ConfigurationBlockAdapter { - private database: DatabaseAdapter; - - constructor(database: DatabaseAdapter) { - this.database = database; - } - - public async getByIds(user: FrameworkUser, ids: string[]): Promise { - if (ids.length === 0) { - return []; - } - - const params = { - ignore: [404], - _source: true, - size: 10000, - index: INDEX_NAMES.BEATS, - body: { - ids: ids.map((id) => `configuration_block:${id}`), - }, - }; - - const response = await this.database.search(user, params); - const configs = get(response, 'hits.hits', []); - - return configs.map((tag: any) => ({ ...tag._source.tag, config: JSON.parse(tag._source.tag) })); - } - - public async getForTags( - user: FrameworkUser, - tagIds: string[], - page: number = 0, - size: number = 100 - ): Promise<{ blocks: ConfigurationBlock[]; page: number; total: number }> { - if (tagIds.length === 0) { - return { - page: 0, - total: 0, - blocks: [] as ConfigurationBlock[], - }; - } - - const params = { - ignore: [404], - index: INDEX_NAMES.BEATS, - body: { - from: page === -1 ? undefined : page * size, - size, - query: { - terms: { 'configuration_block.tag': tagIds }, - }, - }, - }; - let response; - if (page === -1) { - response = await this.database.searchAll(user, params); - } else { - response = await this.database.search(user, params); - } - const configs = get(response, 'hits.hits', []); - - return { - blocks: configs.map((block: any) => ({ - ...block._source.configuration_block, - config: JSON.parse(block._source.configuration_block.config || '{}'), - })), - page, - total: response.hits ? (response.hits.total as any).value : 0, - }; - } - - public async delete( - user: FrameworkUser, - ids: string[] - ): Promise> { - const result = await this.database.bulk(user, { - body: ids.map((id) => ({ delete: { _id: `configuration_block:${id}` } })), - index: INDEX_NAMES.BEATS, - refresh: 'wait_for', - }); - - if (result.errors) { - if (result.items[0].result) { - throw new Error(result.items[0].result); - } - throw new Error((result.items[0] as any).index.error.reason); - } - - return result.items.map((item: any) => { - return { - id: item.delete._id, - success: item.delete.result === 'deleted', - reason: item.delete.result !== 'deleted' ? item.delete.result : undefined, - }; - }); - } - - public async deleteForTags( - user: FrameworkUser, - tagIds: string[] - ): Promise<{ success: boolean; reason?: string }> { - const result: any = await this.database.deleteByQuery(user, { - body: { - query: { - terms: { 'configuration_block.tag': tagIds }, - }, - }, - index: INDEX_NAMES.BEATS, - }); - - if (result.failures.length > 0) { - return { - success: false, - reason: result.failures[0], - }; - } - - return { - success: true, - }; - } - - public async create(user: FrameworkUser, configs: ConfigurationBlock[]): Promise { - const body = flatten( - configs.map((config) => { - const { id: configId, ...configWithoutId } = config; - const id = configId || uuidv4(); - return [ - { index: { _id: `configuration_block:${id}` } }, - { - type: 'configuration_block', - configuration_block: { id, ...configWithoutId, config: JSON.stringify(config.config) }, - }, - ]; - }) - ); - - const result = await this.database.bulk(user, { - body, - index: INDEX_NAMES.BEATS, - refresh: 'wait_for', - }); - - if (result.errors) { - if (result.items[0].result) { - throw new Error(result.items[0].result); - } - throw new Error((result.items[0] as any).index.error.reason); - } - - return result.items.map((item: any) => item.index._id); - } -} diff --git a/x-pack/plugins/beats_management/server/lib/adapters/database/adapter_types.ts b/x-pack/plugins/beats_management/server/lib/adapters/database/adapter_types.ts deleted file mode 100644 index a1af8e79296355..00000000000000 --- a/x-pack/plugins/beats_management/server/lib/adapters/database/adapter_types.ts +++ /dev/null @@ -1,302 +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 { FrameworkUser } from '../framework/adapter_types'; - -export interface DatabaseAdapter { - get( - user: FrameworkUser, - params: DatabaseGetParams - ): Promise>; - create( - user: FrameworkUser, - params: DatabaseCreateDocumentParams - ): Promise; - index( - user: FrameworkUser, - params: DatabaseIndexDocumentParams - ): Promise; - delete( - user: FrameworkUser, - params: DatabaseDeleteDocumentParams - ): Promise; - deleteByQuery( - user: FrameworkUser, - params: DatabaseSearchParams - ): Promise; - mget(user: FrameworkUser, params: DatabaseMGetParams): Promise>; - bulk( - user: FrameworkUser, - params: DatabaseBulkIndexDocumentsParams - ): Promise; - search(user: FrameworkUser, params: DatabaseSearchParams): Promise>; - searchAll( - user: FrameworkUser, - params: DatabaseSearchParams - ): Promise>; - putTemplate(name: string, template: any): Promise; -} - -export interface DatabaseSearchParams extends DatabaseGenericParams { - analyzer?: string; - analyzeWildcard?: boolean; - defaultOperator?: DefaultOperator; - df?: string; - explain?: boolean; - storedFields?: DatabaseNameList; - docvalueFields?: DatabaseNameList; - fielddataFields?: DatabaseNameList; - from?: number; - ignoreUnavailable?: boolean; - allowNoIndices?: boolean; - expandWildcards?: ExpandWildcards; - lenient?: boolean; - lowercaseExpandedTerms?: boolean; - preference?: string; - q?: string; - routing?: DatabaseNameList; - scroll?: string; - searchType?: 'query_then_fetch' | 'dfs_query_then_fetch'; - size?: number; - sort?: DatabaseNameList; - _source?: DatabaseNameList; - _sourceExclude?: DatabaseNameList; - _source_includes?: DatabaseNameList; - terminateAfter?: number; - stats?: DatabaseNameList; - suggestField?: string; - suggestMode?: 'missing' | 'popular' | 'always'; - suggestSize?: number; - suggestText?: string; - timeout?: string; - trackScores?: boolean; - version?: boolean; - requestCache?: boolean; - index?: DatabaseNameList; - type?: DatabaseNameList; -} - -export interface DatabaseSearchResponse { - took: number; - timed_out: boolean; - _scroll_id?: string; - _shards: DatabaseShardsResponse; - hits: { - total: number; - max_score: number; - hits: Array<{ - _index: string; - _id: string; - _score: number; - _source: T; - _seq_no?: number; - _primary_term?: number; - _explanation?: DatabaseExplanation; - fields?: any; - highlight?: any; - inner_hits?: any; - sort?: string[]; - }>; - }; - aggregations?: any; -} - -export interface DatabaseExplanation { - value: number; - description: string; - details: DatabaseExplanation[]; -} - -export interface DatabaseShardsResponse { - total: number; - successful: number; - failed: number; - skipped: number; -} - -export interface DatabaseGetDocumentResponse { - _index: string; - _id: string; - _seq_no: number; - _primary_term: number; - found: boolean; - _source: Source; -} - -export interface DatabaseBulkResponse { - took: number; - errors: boolean; - items: Array< - DatabaseDeleteDocumentResponse | DatabaseIndexDocumentResponse | DatabaseUpdateDocumentResponse - >; -} - -export interface DatabaseBulkIndexDocumentsParams extends DatabaseGenericParams { - waitForActiveShards?: string; - refresh?: DatabaseRefresh; - routing?: string; - timeout?: string; - fields?: DatabaseNameList; - _source?: DatabaseNameList; - _sourceExclude?: DatabaseNameList; - _source_includes?: DatabaseNameList; - pipeline?: string; - index?: string; -} - -export interface DatabaseMGetParams extends DatabaseGenericParams { - storedFields?: DatabaseNameList; - preference?: string; - realtime?: boolean; - refresh?: boolean; - _source?: DatabaseNameList; - _sourceExclude?: DatabaseNameList; - _source_includes?: DatabaseNameList; - index: string; -} - -export interface DatabaseMGetResponse { - docs?: Array>; -} - -export interface DatabasePutTemplateParams extends DatabaseGenericParams { - name: string; - body: any; -} - -export interface DatabaseDeleteDocumentParams extends DatabaseGenericParams { - waitForActiveShards?: string; - parent?: string; - refresh?: DatabaseRefresh; - routing?: string; - timeout?: string; - ifSeqNo?: number; - ifPrimaryTerm?: number; - index: string; - id: string; -} - -export interface DatabaseIndexDocumentResponse { - found: boolean; - _index: string; - _id: string; - _seq_no: number; - _primary_term: number; - result: string; -} - -export interface DatabaseUpdateDocumentResponse { - found: boolean; - _index: string; - _id: string; - _seq_no: number; - _primary_term: number; - result: string; -} - -export interface DatabaseDeleteDocumentResponse { - found: boolean; - _index: string; - _id: string; - _seq_no: number; - _primary_term: number; - result: string; -} - -export interface DatabaseIndexDocumentParams extends DatabaseGenericParams { - waitForActiveShards?: string; - opType?: 'index' | 'create'; - parent?: string; - refresh?: string; - routing?: string; - timeout?: string; - timestamp?: Date | number; - ttl?: string; - ifSeqNo?: number; - ifPrimaryTerm?: number; - pipeline?: string; - id?: string; - index: string; - body: T; -} - -export interface DatabaseGetResponse { - found: boolean; - _source: T; -} -export interface DatabaseCreateDocumentParams extends DatabaseGenericParams { - waitForActiveShards?: string; - parent?: string; - refresh?: DatabaseRefresh; - routing?: string; - timeout?: string; - timestamp?: Date | number; - ttl?: string; - ifSeqNo?: number; - ifPrimaryTerm?: number; - pipeline?: string; - id?: string; - index: string; -} - -export interface DatabaseCreateDocumentResponse { - created: boolean; - result: string; -} - -export interface DatabaseDeleteDocumentParams extends DatabaseGenericParams { - waitForActiveShards?: string; - parent?: string; - refresh?: DatabaseRefresh; - routing?: string; - timeout?: string; - ifSeqNo?: number; - ifPrimaryTerm?: number; - index: string; - id: string; -} - -export interface DatabaseGetParams extends DatabaseGenericParams { - storedFields?: DatabaseNameList; - parent?: string; - preference?: string; - realtime?: boolean; - refresh?: boolean; - routing?: string; - _source?: DatabaseNameList; - _sourceExclude?: DatabaseNameList; - _source_includes?: DatabaseNameList; - ifSeqNo?: number; - ifPrimaryTerm?: number; - id: string; - index: string; -} - -export type DatabaseNameList = string | string[] | boolean; -export type DatabaseRefresh = boolean | 'true' | 'false' | 'wait_for' | ''; -export type ExpandWildcards = 'open' | 'closed' | 'none' | 'all'; -export type DefaultOperator = 'AND' | 'OR'; -export type DatabaseConflicts = 'abort' | 'proceed'; - -export interface DatabaseGenericParams { - requestTimeout?: number; - maxRetries?: number; - method?: string; - body?: any; - ignore?: number | number[]; - filterPath?: string | string[]; -} - -export interface DatabaseDeleteDocumentResponse { - found: boolean; - _index: string; - _type: string; - _id: string; - _seq_no: number; - _primary_term: number; - result: string; -} diff --git a/x-pack/plugins/beats_management/server/lib/adapters/database/kibana_database_adapter.ts b/x-pack/plugins/beats_management/server/lib/adapters/database/kibana_database_adapter.ts deleted file mode 100644 index 741668429a3c7f..00000000000000 --- a/x-pack/plugins/beats_management/server/lib/adapters/database/kibana_database_adapter.ts +++ /dev/null @@ -1,118 +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 { ElasticsearchServiceStart, ILegacyClusterClient } from 'src/core/server'; -import { FrameworkUser } from '../framework/adapter_types'; -import { internalAuthData } from './../framework/adapter_types'; -import { - DatabaseAdapter, - DatabaseBulkIndexDocumentsParams, - DatabaseCreateDocumentParams, - DatabaseCreateDocumentResponse, - DatabaseDeleteDocumentParams, - DatabaseDeleteDocumentResponse, - DatabaseGetDocumentResponse, - DatabaseGetParams, - DatabaseIndexDocumentParams, - DatabaseMGetParams, - DatabaseMGetResponse, - DatabaseSearchParams, - DatabaseSearchResponse, -} from './adapter_types'; - -export class KibanaDatabaseAdapter implements DatabaseAdapter { - private es: ILegacyClusterClient; - - constructor(elasticsearch: ElasticsearchServiceStart) { - this.es = elasticsearch.legacy.client; - } - - public async get( - user: FrameworkUser, - params: DatabaseGetParams - ): Promise> { - return await this.callWithUser(user, 'get', params); - } - - public async mget( - user: FrameworkUser, - params: DatabaseMGetParams - ): Promise> { - return await this.callWithUser(user, 'mget', params); - } - - public async bulk(user: FrameworkUser, params: DatabaseBulkIndexDocumentsParams): Promise { - return await this.callWithUser(user, 'bulk', params); - } - - public async create( - user: FrameworkUser, - params: DatabaseCreateDocumentParams - ): Promise { - return await this.callWithUser(user, 'create', params); - } - - public async index(user: FrameworkUser, params: DatabaseIndexDocumentParams): Promise { - return await this.callWithUser(user, 'index', params); - } - - public async delete( - user: FrameworkUser, - params: DatabaseDeleteDocumentParams - ): Promise { - return await this.callWithUser(user, 'delete', params); - } - - public async deleteByQuery( - user: FrameworkUser, - params: DatabaseSearchParams - ): Promise { - return await this.callWithUser(user, 'deleteByQuery', params); - } - - public async search( - user: FrameworkUser, - params: DatabaseSearchParams - ): Promise> { - return await this.callWithUser(user, 'search', params); - } - - public async searchAll( - user: FrameworkUser, - params: DatabaseSearchParams - ): Promise> { - return await this.callWithUser(user, 'search', { - scroll: '1m', - ...params, - body: { - size: 1000, - ...params.body, - }, - }); - } - - public async putTemplate(name: string, template: any): Promise { - return await this.callWithUser({ kind: 'internal' }, 'indices.putTemplate', { - name, - body: template, - }); - } - - private callWithUser(user: FrameworkUser, esMethod: string, options: any = {}): any { - if (user.kind === 'authenticated') { - return this.es - .asScoped({ - headers: user[internalAuthData], - }) - .callAsCurrentUser(esMethod, options); - } else if (user.kind === 'internal') { - return this.es.callAsInternalUser(esMethod, options); - } else { - throw new Error('Invalid user type'); - } - } -} diff --git a/x-pack/plugins/beats_management/server/lib/adapters/framework/adapter_types.ts b/x-pack/plugins/beats_management/server/lib/adapters/framework/adapter_types.ts deleted file mode 100644 index f4102b767c0446..00000000000000 --- a/x-pack/plugins/beats_management/server/lib/adapters/framework/adapter_types.ts +++ /dev/null @@ -1,115 +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. - */ - -/* eslint-disable @typescript-eslint/no-empty-interface */ - -import * as t from 'io-ts'; -import { Headers, KibanaRequest } from 'src/core/server'; - -export const internalAuthData = Symbol('internalAuthData'); -export const internalUser: FrameworkInternalUser = { - kind: 'internal', -}; - -export interface BackendFrameworkAdapter { - getUser(request: KibanaRequest): FrameworkUser; - internalUser: FrameworkInternalUser; - info: null | FrameworkInfo; - log(text: string): void; -} - -export const RuntimeFrameworkInfo = t.interface( - { - kibana: t.type({ - version: t.string, - }), - license: t.type({ - type: t.keyof({ - oss: null, - trial: null, - standard: null, - basic: null, - gold: null, - platinum: null, - enterprise: null, - }), - expired: t.boolean, - expiry_date_in_millis: t.number, - }), - security: t.type({ - enabled: t.boolean, - available: t.boolean, - }), - watcher: t.type({ - enabled: t.boolean, - available: t.boolean, - }), - }, - 'FrameworkInfo' -); -export interface FrameworkInfo extends t.TypeOf {} - -export const RuntimeKibanaServerRequest = t.interface( - { - params: t.object, - payload: t.object, - query: t.object, - headers: t.type({ - authorization: t.union([t.string, t.null]), - }), - info: t.type({ - remoteAddress: t.string, - }), - }, - 'KibanaServerRequest' -); -export interface KibanaServerRequest extends t.TypeOf {} - -export const RuntimeKibanaUser = t.interface( - { - username: t.string, - roles: t.readonlyArray(t.string), - full_name: t.union([t.null, t.string]), - email: t.union([t.null, t.string]), - enabled: t.boolean, - }, - 'KibanaUser' -); -export interface KibanaUser extends t.TypeOf {} - -export interface FrameworkAuthenticatedUser { - kind: 'authenticated'; - [internalAuthData]: AuthDataType; - username: string; - roles: readonly string[]; - full_name: string | null; - email: string | null; - enabled: boolean; -} - -export interface FrameworkUnAuthenticatedUser { - kind: 'unauthenticated'; -} - -export interface FrameworkInternalUser { - kind: 'internal'; -} - -export type FrameworkUser = - | FrameworkAuthenticatedUser - | FrameworkUnAuthenticatedUser - | FrameworkInternalUser; -export interface FrameworkRequest< - KibanaServerRequestGenaric extends Partial = any -> { - user: FrameworkUser; - headers: KibanaServerRequestGenaric['headers']; - info: KibanaServerRequest['info']; - payload: KibanaServerRequestGenaric['payload']; - params: KibanaServerRequestGenaric['params']; - query: KibanaServerRequestGenaric['query']; -} diff --git a/x-pack/plugins/beats_management/server/lib/adapters/framework/kibana_framework_adapter.ts b/x-pack/plugins/beats_management/server/lib/adapters/framework/kibana_framework_adapter.ts deleted file mode 100644 index dcacde81ce8b39..00000000000000 --- a/x-pack/plugins/beats_management/server/lib/adapters/framework/kibana_framework_adapter.ts +++ /dev/null @@ -1,116 +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 { PathReporter } from 'io-ts/lib/PathReporter'; -import { isLeft } from 'fp-ts/lib/Either'; -import { KibanaRequest, Headers, Logger } from 'src/core/server'; -import { - BackendFrameworkAdapter, - FrameworkInfo, - FrameworkUser, - internalAuthData, - internalUser, - RuntimeFrameworkInfo, - RuntimeKibanaUser, -} from './adapter_types'; -import { BeatsManagementConfigType } from '../../../../common'; -import { ILicense, LicensingPluginStart } from '../../../../../licensing/server'; -import { SecurityPluginSetup } from '../../../../../security/server'; - -export class KibanaBackendFrameworkAdapter implements BackendFrameworkAdapter { - public readonly internalUser = internalUser; - public info: null | FrameworkInfo = null; - - constructor( - private readonly PLUGIN_ID: string, - private readonly kibanaVersion: string, - private readonly config: BeatsManagementConfigType, - private readonly logger: Logger, - private readonly licensing: LicensingPluginStart, - private readonly security?: SecurityPluginSetup - ) { - this.licensing.license$.subscribe((license) => this.licenseUpdateHandler(license)); - } - - public log(text: string) { - this.logger.info(text); - } - - getUser(request: KibanaRequest): FrameworkUser { - const user = this.security?.authc.getCurrentUser(request); - if (!user) { - return { - kind: 'unauthenticated', - }; - } - const assertKibanaUser = RuntimeKibanaUser.decode(user); - if (isLeft(assertKibanaUser)) { - throw new Error( - `Error parsing user info in ${this.PLUGIN_ID}, ${ - PathReporter.report(assertKibanaUser)[0] - }` - ); - } - - return { - kind: 'authenticated', - [internalAuthData]: request.headers, - ...user, - }; - } - - private licenseUpdateHandler = (license: ILicense) => { - let xpackInfoUnpacked: FrameworkInfo; - - // If, for some reason, we cannot get the license information - // from Elasticsearch, assume worst case and disable - if (!license.isAvailable) { - this.info = null; - return; - } - - const securityFeature = license.getFeature('security'); - const watcherFeature = license.getFeature('watcher'); - - try { - xpackInfoUnpacked = { - kibana: { - version: this.kibanaVersion, - }, - license: { - type: license.type!, - expired: !license.isActive, - expiry_date_in_millis: license.expiryDateInMillis ?? -1, - }, - security: { - enabled: securityFeature.isEnabled, - available: securityFeature.isAvailable, - }, - watcher: { - enabled: watcherFeature.isEnabled, - available: watcherFeature.isAvailable, - }, - }; - } catch (e) { - this.logger.error(`Error accessing required xPackInfo in ${this.PLUGIN_ID} Kibana adapter`); - throw e; - } - - const assertData = RuntimeFrameworkInfo.decode(xpackInfoUnpacked); - if (isLeft(assertData)) { - throw new Error( - `Error parsing xpack info in ${this.PLUGIN_ID}, ${PathReporter.report(assertData)[0]}` - ); - } - this.info = xpackInfoUnpacked; - - return { - security: xpackInfoUnpacked.security, - settings: { ...this.config }, - }; - }; -} diff --git a/x-pack/plugins/beats_management/server/lib/adapters/tags/adapter_types.ts b/x-pack/plugins/beats_management/server/lib/adapters/tags/adapter_types.ts deleted file mode 100644 index 6e1ad59ce0c717..00000000000000 --- a/x-pack/plugins/beats_management/server/lib/adapters/tags/adapter_types.ts +++ /dev/null @@ -1,17 +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 { BeatTag } from '../../../../common/domain_types'; -import { FrameworkUser } from '../framework/adapter_types'; - -export interface CMTagsAdapter { - getAll(user: FrameworkUser, ESQuery?: any): Promise; - delete(user: FrameworkUser, tagIds: string[]): Promise; - getTagsWithIds(user: FrameworkUser, tagIds: string[]): Promise; - upsertTag(user: FrameworkUser, tag: BeatTag): Promise; - getWithoutConfigTypes(user: FrameworkUser, blockTypes: string[]): Promise; -} diff --git a/x-pack/plugins/beats_management/server/lib/adapters/tags/elasticsearch_tags_adapter.ts b/x-pack/plugins/beats_management/server/lib/adapters/tags/elasticsearch_tags_adapter.ts deleted file mode 100644 index bfc6993fcb025a..00000000000000 --- a/x-pack/plugins/beats_management/server/lib/adapters/tags/elasticsearch_tags_adapter.ts +++ /dev/null @@ -1,180 +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 { flatten, get } from 'lodash'; -import { INDEX_NAMES } from '../../../../common/constants'; -import { BeatTag } from '../../../../common/domain_types'; -import { DatabaseAdapter } from '../database/adapter_types'; -import { FrameworkUser } from '../framework/adapter_types'; -import { CMTagsAdapter } from './adapter_types'; - -export class ElasticsearchTagsAdapter implements CMTagsAdapter { - private database: DatabaseAdapter; - - constructor(database: DatabaseAdapter) { - this.database = database; - } - - public async getAll(user: FrameworkUser, ESQuery?: any): Promise { - const params = { - ignore: [404], - _source: true, - size: 10000, - index: INDEX_NAMES.BEATS, - body: { - query: { - bool: { - must: { - term: { - type: 'tag', - }, - }, - }, - }, - }, - }; - if (ESQuery) { - params.body.query = { - ...params.body.query, - ...ESQuery, - }; - } - const response = await this.database.search(user, params); - const tags = get(response, 'hits.hits', []) as any; - - return tags.map((tag: any) => ({ hasConfigurationBlocksTypes: [], ...tag._source.tag })); - } - - public async delete(user: FrameworkUser, tagIds: string[]): Promise { - const ids = tagIds.map((tag) => tag); - - const params = { - ignore: [404], - index: INDEX_NAMES.BEATS, - body: { - query: { - terms: { 'beat.tags': tagIds }, - }, - }, - }; - - const beatsResponse = await this.database.search(user, params); - - const beats = (get(beatsResponse, 'hits.hits', []) as BeatTag[]).map( - (beat: any) => beat._source.beat - ); - - const inactiveBeats = beats.filter((beat) => beat.active === false); - const activeBeats = beats.filter((beat) => beat.active === true); - if (activeBeats.length !== 0) { - return false; - } - const beatIds = inactiveBeats.map((beat: BeatTag) => beat.id); - - // While we block tag deletion when on an active beat, we should remove from inactive - const bulkInactiveBeatsUpdates = flatten( - beatIds.map((beatId) => { - const script = ` - def beat = ctx._source.beat; - if (beat.tags != null) { - beat.tags.removeAll([params.tag]); - }`; - - return flatten( - ids.map((tagId) => [ - { update: { _id: `beat:${beatId}` } }, - { script: { source: script.replace(' ', ''), params: { tagId } } }, - ]) - ); - }) - ); - - const bulkTagsDelete = ids.map((tagId) => ({ delete: { _id: `tag:${tagId}` } })); - - await this.database.bulk(user, { - body: flatten([...bulkInactiveBeatsUpdates, ...bulkTagsDelete]), - index: INDEX_NAMES.BEATS, - refresh: 'wait_for', - }); - - return true; - } - - public async getTagsWithIds(user: FrameworkUser, tagIds: string[]): Promise { - if (tagIds.length === 0) { - return []; - } - const ids = tagIds.map((tag) => `tag:${tag}`); - - const params = { - ignore: [404], - _source: true, - body: { - ids, - }, - index: INDEX_NAMES.BEATS, - }; - const response = await this.database.mget(user, params); - - return get(response, 'docs', []) - .filter((b: any) => b.found) - .map((b: any) => ({ - hasConfigurationBlocksTypes: [], - ...b._source.tag, - id: b._id.replace('tag:', ''), - })); - } - - public async upsertTag(user: FrameworkUser, tag: BeatTag): Promise { - const body = { - tag, - type: 'tag', - }; - - const params = { - body, - id: `tag:${tag.id}`, - index: INDEX_NAMES.BEATS, - refresh: 'wait_for', - }; - const response = await this.database.index(user, params); - - return get(response, 'result') as string; - } - - public async getWithoutConfigTypes( - user: FrameworkUser, - blockTypes: string[] - ): Promise { - const body = { - query: { - bool: { - filter: { - match: { - type: 'tag', - }, - }, - must_not: { - terms: { 'tag.hasConfigurationBlocksTypes': blockTypes }, - }, - }, - }, - }; - - const params = { - body, - index: INDEX_NAMES.BEATS, - ignore: [404], - _source: true, - size: 10000, - }; - const response = await this.database.search(user, params); - const tags = get(response, 'hits.hits', []) as any; - - return tags.map((tag: any) => ({ hasConfigurationBlocksTypes: [], ...tag._source.tag })); - } -} diff --git a/x-pack/plugins/beats_management/server/lib/adapters/tokens/adapter_types.ts b/x-pack/plugins/beats_management/server/lib/adapters/tokens/adapter_types.ts deleted file mode 100644 index a7d45490ada387..00000000000000 --- a/x-pack/plugins/beats_management/server/lib/adapters/tokens/adapter_types.ts +++ /dev/null @@ -1,19 +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 { FrameworkUser } from '../framework/adapter_types'; - -export interface TokenEnrollmentData { - token: string | null; - expires_on: string; -} - -export interface CMTokensAdapter { - deleteEnrollmentToken(user: FrameworkUser, enrollmentToken: string): Promise; - getEnrollmentToken(user: FrameworkUser, enrollmentToken: string): Promise; - insertTokens(user: FrameworkUser, tokens: TokenEnrollmentData[]): Promise; -} diff --git a/x-pack/plugins/beats_management/server/lib/adapters/tokens/elasticsearch_tokens_adapter.ts b/x-pack/plugins/beats_management/server/lib/adapters/tokens/elasticsearch_tokens_adapter.ts deleted file mode 100644 index 849602564347e4..00000000000000 --- a/x-pack/plugins/beats_management/server/lib/adapters/tokens/elasticsearch_tokens_adapter.ts +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { flatten, get } from 'lodash'; -import { INDEX_NAMES } from '../../../../common/constants'; -import { DatabaseAdapter } from '../database/adapter_types'; -import { FrameworkUser } from '../framework/adapter_types'; -import { CMTokensAdapter, TokenEnrollmentData } from './adapter_types'; - -export class ElasticsearchTokensAdapter implements CMTokensAdapter { - constructor(private readonly database: DatabaseAdapter) {} - - public async deleteEnrollmentToken(user: FrameworkUser, enrollmentToken: string) { - const params = { - id: `enrollment_token:${enrollmentToken}`, - index: INDEX_NAMES.BEATS, - }; - - await this.database.delete(user, params); - } - - public async getEnrollmentToken( - user: FrameworkUser, - tokenString: string - ): Promise { - const params = { - id: `enrollment_token:${tokenString}`, - ignore: [404], - index: INDEX_NAMES.BEATS, - }; - - const response = await this.database.get(user, params); - - const tokenDetails = get(response, '_source.enrollment_token', { - expires_on: '0', - token: null, - }) as TokenEnrollmentData; - - // Elasticsearch might return fast if the token is not found. OR it might return fast - // if the token *is* found. Either way, an attacker could using a timing attack to figure - // out whether a token is valid or not. So we introduce a random delay in returning from - // this function to obscure the actual time it took for Elasticsearch to find the token. - const randomDelayInMs = 25 + Math.round(Math.random() * 200); // between 25 and 225 ms - return new Promise((resolve) => - setTimeout(() => resolve(tokenDetails), randomDelayInMs) - ); - } - - public async insertTokens(user: FrameworkUser, tokens: TokenEnrollmentData[]) { - const body = flatten( - tokens.map((token) => [ - { index: { _id: `enrollment_token:${token.token}` } }, - { - enrollment_token: token, - type: 'enrollment_token', - }, - ]) - ); - - const result = await this.database.bulk(user, { - body, - index: INDEX_NAMES.BEATS, - refresh: 'wait_for', - }); - - if (result.errors) { - throw new Error(result.items[0].result); - } - - return tokens; - } -} diff --git a/x-pack/plugins/beats_management/server/lib/beat_events.ts b/x-pack/plugins/beats_management/server/lib/beat_events.ts deleted file mode 100644 index ffe77f8d99fffa..00000000000000 --- a/x-pack/plugins/beats_management/server/lib/beat_events.ts +++ /dev/null @@ -1,59 +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 { PathReporter } from 'io-ts/lib/PathReporter'; -import { isLeft } from 'fp-ts/lib/Either'; -import { BeatEvent, RuntimeBeatEvent } from '../../common/domain_types'; -import { FrameworkUser } from './adapters/framework/adapter_types'; -import { CMBeatsDomain } from './beats'; - -export class BeatEventsLib { - constructor(private readonly beats: CMBeatsDomain) {} - - public log = async ( - user: FrameworkUser, - beatId: string, - events: BeatEvent[] - ): Promise> => { - return events.map((event, i) => { - const assertData = RuntimeBeatEvent.decode(event); - if (isLeft(assertData)) { - if (events.length - 1 === i) { - this.beats - .update(user, beatId, { - status: { - ...events[events.length - 2], - timestamp: new Date(events[events.length - 2].timestamp), - }, - }) - .catch((e) => { - // eslint-disable-next-line - console.error('Error inserting event into beats log.', e); - }); - } - return { - success: false, - error: `Error parsing event ${i}, ${PathReporter.report(assertData)[0]}`, - }; - } - if (events.length - 1 === i) { - this.beats - .update(user, beatId, { - status: { - ...events[events.length - 1], - timestamp: new Date(events[events.length - 1].timestamp), - }, - }) - .catch((e) => { - // eslint-disable-next-line - console.error('Error inserting event into beats log.', e); - }); - } - return { success: true }; - }); - }; -} diff --git a/x-pack/plugins/beats_management/server/lib/beats.ts b/x-pack/plugins/beats_management/server/lib/beats.ts deleted file mode 100644 index de3fce4011a3d1..00000000000000 --- a/x-pack/plugins/beats_management/server/lib/beats.ts +++ /dev/null @@ -1,260 +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 { uniq } from 'lodash'; -import moment from 'moment'; -import { CMBeat } from '../../common/domain_types'; -import { - BeatsRemovalReturn, - BeatsTagAssignment, - CMAssignmentReturn, - CMBeatsAdapter, -} from './adapters/beats/adapter_types'; -import { FrameworkUser } from './adapters/framework/adapter_types'; -import { BeatEnrollmentStatus, CMServerLibs, UserOrToken } from './types'; - -export class CMBeatsDomain { - private tags: CMServerLibs['tags']; - private tokens: CMServerLibs['tokens']; - private framework: CMServerLibs['framework']; - - constructor( - private readonly adapter: CMBeatsAdapter, - libs: { - tags: CMServerLibs['tags']; - tokens: CMServerLibs['tokens']; - framework: CMServerLibs['framework']; - } - ) { - this.adapter = adapter; - this.tags = libs.tags; - this.tokens = libs.tokens; - this.framework = libs.framework; - } - - public async getById(user: FrameworkUser, beatId: string): Promise { - const beat = await this.adapter.get(user, beatId); - return beat && beat.active ? beat : null; - } - - public async getByIds(user: FrameworkUser, beatIds: string[]): Promise { - const beats = await this.adapter.getWithIds(user, beatIds); - return beats.filter((beat) => beat.active); - } - - public async getAll(user: FrameworkUser, ESQuery?: any) { - return (await this.adapter.getAll(user, ESQuery)).filter( - (beat: CMBeat) => beat.active === true - ); - } - - public async getAllWithTag(user: FrameworkUser, tagId: string) { - return (await this.adapter.getAllWithTags(user, [tagId])).filter( - (beat: CMBeat) => beat.active === true - ); - } - - public async getByEnrollmentToken(user: FrameworkUser, enrollmentToken: string) { - const beat = await this.adapter.getBeatWithToken(user, enrollmentToken); - return beat && beat.active ? beat : null; - } - - public async update(userOrToken: UserOrToken, beatId: string, beatData: Partial) { - const beat = await this.adapter.get(this.framework.internalUser, beatId); - - // FIXME make return type enum - if (beat === null) { - return 'beat-not-found'; - } - - if (typeof userOrToken === 'string') { - const { verified: isAccessTokenValid } = this.tokens.verifyToken( - beat?.access_token ?? '', - userOrToken - ); - if (!isAccessTokenValid) { - return 'invalid-access-token'; - } - } - - const user = typeof userOrToken === 'string' ? this.framework.internalUser : userOrToken; - await this.adapter.update(user, { - ...beat, - ...beatData, - }); - } - - public async enrollBeat( - enrollmentToken: string, - beatId: string, - remoteAddress: string, - beat: Partial - ): Promise<{ status: string; accessToken?: string }> { - // eslint-disable-next-line @typescript-eslint/naming-convention - const { token, expires_on } = await this.tokens.getEnrollmentToken(enrollmentToken); - if (expires_on && moment(expires_on).isBefore(moment())) { - return { status: BeatEnrollmentStatus.ExpiredEnrollmentToken }; - } - if (!token) { - return { status: BeatEnrollmentStatus.InvalidEnrollmentToken }; - } - - const existingBeat = await this.getById(this.framework.internalUser, beatId); - if (existingBeat) { - return { status: BeatEnrollmentStatus.Success }; - } - - const accessToken = this.tokens.generateAccessToken(); - const verifiedOn = moment().toJSON(); - - await this.adapter.insert(this.framework.internalUser, { - tags: [], - ...beat, - active: true, - enrollment_token: enrollmentToken, - verified_on: verifiedOn, - access_token: accessToken, - host_ip: remoteAddress, - id: beatId, - } as CMBeat); - - await this.tokens.deleteEnrollmentToken(enrollmentToken); - - return { status: BeatEnrollmentStatus.Success, accessToken }; - } - - public async removeTagsFromBeats( - user: FrameworkUser, - removals: BeatsTagAssignment[] - ): Promise { - const beatIds = uniq(removals.map((removal) => removal.beatId)); - const tagIds = uniq(removals.map((removal) => removal.tag)); - - const response = { - removals: removals.map(() => ({ status: null })), - }; - - const beats = await this.adapter.getWithIds(user, beatIds); - const tags = await this.tags.getWithIds(user, tagIds); - - // Handle assignments containing non-existing beat IDs or tags - const nonExistentBeatIds = findNonExistentItems(beats, beatIds); - const nonExistentTags = await findNonExistentItems(tags, tagIds); - - addNonExistentItemToResponse( - response, - removals, - nonExistentBeatIds, - nonExistentTags, - 'removals' - ); - - // FIXME abstract this - const validRemovals = removals - .map((removal, idxInRequest) => ({ - beatId: removal.beatId, - idxInRequest, // so we can add the result of this removal to the correct place in the response - tag: removal.tag, - })) - .filter((removal, idx) => response.removals[idx].status === null); - - if (validRemovals.length > 0) { - const removalResults = await this.adapter.removeTagsFromBeats(user, validRemovals); - return addToResultsToResponse('removals', response, removalResults); - } - return response; - } - - public async assignTagsToBeats( - user: FrameworkUser, - assignments: BeatsTagAssignment[] - ): Promise { - const beatIds = uniq(assignments.map((assignment) => assignment.beatId)); - const tagIds = uniq(assignments.map((assignment) => assignment.tag)); - - const response = { - assignments: assignments.map(() => ({ status: null })), - }; - const beats = await this.adapter.getWithIds(user, beatIds); - const tags = await this.tags.getWithIds(user, tagIds); - // Handle assignments containing non-existing beat IDs or tags - const nonExistentBeatIds = findNonExistentItems(beats, beatIds); - const nonExistentTags = findNonExistentItems(tags, tagIds); - - // FIXME break out back into route / function response - // FIXME causes function to error if a beat or tag does not exist - addNonExistentItemToResponse( - response, - assignments, - nonExistentBeatIds, - nonExistentTags, - 'assignments' - ); - - // FIXME abstract this - const validAssignments = assignments - .map((assignment, idxInRequest) => ({ - beatId: assignment.beatId, - idxInRequest, // so we can add the result of this assignment to the correct place in the response - tag: assignment.tag, - })) - .filter((assignment, idx) => response.assignments[idx].status === null); - - if (validAssignments.length > 0) { - const assignmentResults = await this.adapter.assignTagsToBeats(user, validAssignments); - - // TODO This should prob not mutate - return addToResultsToResponse('assignments', response, assignmentResults); - } - return response; - } -} - -// FIXME abstract to the route, also the key arg is a temp fix -function addNonExistentItemToResponse( - response: any, - assignments: any, - nonExistentBeatIds: any, - nonExistentTags: any, - key: string -) { - assignments.forEach(({ beatId, tag }: BeatsTagAssignment, idx: any) => { - const isBeatNonExistent = nonExistentBeatIds.includes(beatId); - - const isTagNonExistent = nonExistentTags.includes(tag); - - if (isBeatNonExistent && isTagNonExistent) { - response[key][idx].status = 404; - response[key][idx].result = `Beat ${beatId} and tag ${tag} not found`; - } else if (isBeatNonExistent) { - response[key][idx].status = 404; - response[key][idx].result = `Beat ${beatId} not found`; - } else if (isTagNonExistent) { - response[key][idx].status = 404; - response[key][idx].result = `Tag ${tag} not found`; - } - }); -} - -// TODO dont mutate response -function addToResultsToResponse(key: string, response: any, assignmentResults: any) { - assignmentResults.forEach((assignmentResult: any) => { - const { idxInRequest, status, result } = assignmentResult; - response[key][idxInRequest].status = status; - response[key][idxInRequest].result = result; - }); - return response; -} - -export function findNonExistentItems(items: Array<{ id: string }>, requestedItems: string[]) { - return requestedItems.reduce((nonExistentItems: string[], requestedItem: string, idx: number) => { - if (items.findIndex((item) => item && item.id === requestedItem) === -1) { - nonExistentItems.push(requestedItems[idx]); - } - return nonExistentItems; - }, []); -} diff --git a/x-pack/plugins/beats_management/server/lib/compose/kibana.ts b/x-pack/plugins/beats_management/server/lib/compose/kibana.ts deleted file mode 100644 index d3606bf24071df..00000000000000 --- a/x-pack/plugins/beats_management/server/lib/compose/kibana.ts +++ /dev/null @@ -1,85 +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 { camelCase } from 'lodash'; -import type { ElasticsearchServiceStart, Logger } from 'src/core/server'; -import { SecurityPluginSetup } from '../../../../security/server'; -import { LicensingPluginStart } from '../../../../licensing/server'; -import { PLUGIN } from '../../../common/constants'; -import { BeatsManagementConfigType } from '../../../common'; -import { ElasticsearchBeatsAdapter } from '../adapters/beats/elasticsearch_beats_adapter'; -import { ElasticsearchConfigurationBlockAdapter } from '../adapters/configuration_blocks/elasticsearch_configuration_block_adapter'; -import { KibanaDatabaseAdapter } from '../adapters/database/kibana_database_adapter'; -import { KibanaBackendFrameworkAdapter } from '../adapters/framework/kibana_framework_adapter'; -import { ElasticsearchTagsAdapter } from '../adapters/tags/elasticsearch_tags_adapter'; -import { ElasticsearchTokensAdapter } from '../adapters/tokens/elasticsearch_tokens_adapter'; -import { BeatEventsLib } from '../beat_events'; -import { CMBeatsDomain } from '../beats'; -import { ConfigurationBlocksLib } from '../configuration_blocks'; -import { CMTagsDomain } from '../tags'; -import { CMTokensDomain } from '../tokens'; -import { CMServerLibs } from '../types'; -import { BackendFrameworkLib } from './../framework'; - -interface ComposeOptions { - elasticsearch: ElasticsearchServiceStart; - licensing: LicensingPluginStart; - security?: SecurityPluginSetup; - config: BeatsManagementConfigType; - logger: Logger; - kibanaVersion: string; -} - -export function compose({ - elasticsearch, - config, - kibanaVersion, - logger, - licensing, - security, -}: ComposeOptions): CMServerLibs { - const backendAdapter = new KibanaBackendFrameworkAdapter( - camelCase(PLUGIN.ID), - kibanaVersion, - config, - logger, - licensing, - security - ); - const framework = new BackendFrameworkLib(backendAdapter, config); - const database = new KibanaDatabaseAdapter(elasticsearch); - const beatsAdapter = new ElasticsearchBeatsAdapter(database); - const configAdapter = new ElasticsearchConfigurationBlockAdapter(database); - - const tags = new CMTagsDomain( - new ElasticsearchTagsAdapter(database), - configAdapter, - beatsAdapter - ); - const configurationBlocks = new ConfigurationBlocksLib(configAdapter, tags); - const tokens = new CMTokensDomain(new ElasticsearchTokensAdapter(database), { - framework, - }); - const beats = new CMBeatsDomain(beatsAdapter, { - tags, - tokens, - framework, - }); - const beatEvents = new BeatEventsLib(beats); - - const libs: CMServerLibs = { - beatEvents, - framework, - database, - beats, - tags, - tokens, - configurationBlocks, - }; - - return libs; -} diff --git a/x-pack/plugins/beats_management/server/lib/configuration_blocks.ts b/x-pack/plugins/beats_management/server/lib/configuration_blocks.ts deleted file mode 100644 index 06f1674af93fb0..00000000000000 --- a/x-pack/plugins/beats_management/server/lib/configuration_blocks.ts +++ /dev/null @@ -1,77 +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 { UNIQUENESS_ENFORCING_TYPES } from '../../common/constants/configuration_blocks'; -import { ConfigurationBlock } from '../../common/domain_types'; -import { ConfigurationBlockAdapter } from './adapters/configuration_blocks/adapter_types'; -import { FrameworkUser } from './adapters/framework/adapter_types'; -import { CMTagsDomain } from './tags'; - -export class ConfigurationBlocksLib { - constructor( - private readonly adapter: ConfigurationBlockAdapter, - private readonly tags: CMTagsDomain - ) {} - - public async getForTags( - user: FrameworkUser, - tagIds: string[], - page: number = 0, - size: number = 10 - ) { - if ((page + 1) * size > 10000) { - throw new Error('System error, too many results. To get all results, request page: -1'); - } - - const result = await this.adapter.getForTags(user, tagIds, page, size); - - return { ...result, error: null }; - } - - public async delete(user: FrameworkUser, ids: string[]) { - return await this.adapter.delete(user, ids); - } - - public async save(user: FrameworkUser, block: ConfigurationBlock) { - const tags = await this.tags.getWithIds(user, [block.tag]); - const tag = tags[0]; - - if (!tag) { - return { - error: 'Invalid tag, tag not found', - }; - } - - if (!tag.hasConfigurationBlocksTypes) { - tag.hasConfigurationBlocksTypes = []; - } - - if ( - !block.id && - UNIQUENESS_ENFORCING_TYPES.includes(block.type) && - tag.hasConfigurationBlocksTypes.some((type: string) => - UNIQUENESS_ENFORCING_TYPES.includes(type) - ) - ) { - return { - error: - 'Block is of type that already exists on this tag, and only one config of this type can exist at a time on a beat. Config not saved', - }; - } - - if (UNIQUENESS_ENFORCING_TYPES.includes(block.type)) { - tag.hasConfigurationBlocksTypes.push(block.type); - await this.tags.upsertTag(user, tag); - } - - const ids = await this.adapter.create(user, [block]); - return { - success: true, - blockID: ids[0], - }; - } -} diff --git a/x-pack/plugins/beats_management/server/lib/framework.ts b/x-pack/plugins/beats_management/server/lib/framework.ts deleted file mode 100644 index 072bbae6d46c0a..00000000000000 --- a/x-pack/plugins/beats_management/server/lib/framework.ts +++ /dev/null @@ -1,54 +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 { Headers, KibanaRequest } from 'kibana/server'; -import { BackendFrameworkAdapter, FrameworkUser } from './adapters/framework/adapter_types'; -import { BeatsManagementConfigType } from '../../common'; - -export class BackendFrameworkLib { - public log = this.adapter.log; - public internalUser = this.adapter.internalUser; - - constructor( - private readonly adapter: BackendFrameworkAdapter, - private readonly config: BeatsManagementConfigType - ) { - this.validateConfig(); - } - - public getConfig(): BeatsManagementConfigType { - return this.config; - } - - public getUser(request: KibanaRequest): FrameworkUser { - return this.adapter.getUser(request); - } - - /** - * Expired `null` happens when we have no xpack info - */ - public get license() { - return { - type: this.adapter.info ? this.adapter.info.license.type : 'unknown', - expired: this.adapter.info ? this.adapter.info.license.expired : null, - }; - } - - public get securityIsEnabled() { - return this.adapter.info ? this.adapter.info.security.enabled : false; - } - - private validateConfig() { - const encryptionKey = this.config.encryptionKey; - - if (!encryptionKey) { - this.adapter.log( - 'Using a default encryption key for xpack.beats.encryptionKey. It is recommended that you set xpack.beats.encryptionKey in kibana.yml with a unique token' - ); - } - } -} diff --git a/x-pack/plugins/beats_management/server/lib/tags.ts b/x-pack/plugins/beats_management/server/lib/tags.ts deleted file mode 100644 index 2750e73b898b06..00000000000000 --- a/x-pack/plugins/beats_management/server/lib/tags.ts +++ /dev/null @@ -1,62 +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 { uniq } from 'lodash'; -import { UNIQUENESS_ENFORCING_TYPES } from '../../common/constants/configuration_blocks'; -import { BeatTag } from '../../common/domain_types'; -import { CMBeatsAdapter } from './adapters/beats/adapter_types'; -import { ConfigurationBlockAdapter } from './adapters/configuration_blocks/adapter_types'; -import { FrameworkUser } from './adapters/framework/adapter_types'; -import { CMTagsAdapter } from './adapters/tags/adapter_types'; - -export class CMTagsDomain { - constructor( - private readonly adapter: CMTagsAdapter, - private readonly configurationBlocksAdapter: ConfigurationBlockAdapter, - private readonly beatsAdabter: CMBeatsAdapter - ) {} - - public async getAll(user: FrameworkUser, ESQuery?: any): Promise { - const tags = await this.adapter.getAll(user, ESQuery); - return tags; - } - - public async getWithIds(user: FrameworkUser, tagIds: string[]): Promise { - const tags = await this.adapter.getTagsWithIds(user, tagIds); - return tags; - } - - public async delete(user: FrameworkUser, tagIds: string[]) { - const beats = await this.beatsAdabter.getAllWithTags(user, tagIds); - if (beats.filter((b) => b.active).length > 0) { - return false; - } - await this.configurationBlocksAdapter.deleteForTags(user, tagIds); - return await this.adapter.delete(user, tagIds); - } - - public async getNonConflictingTags(user: FrameworkUser, existingTagIds: string[]) { - const tags = await this.adapter.getTagsWithIds(user, existingTagIds); - const existingUniqueBlockTypes = uniq( - tags.reduce((existingUniqueTypes, tag) => { - if (tag.hasConfigurationBlocksTypes) { - existingUniqueTypes = existingUniqueTypes.concat(tag.hasConfigurationBlocksTypes); - } - return existingUniqueTypes; - }, [] as string[]) - ).filter((type) => UNIQUENESS_ENFORCING_TYPES.includes(type)); - - const safeTags = await this.adapter.getWithoutConfigTypes(user, existingUniqueBlockTypes); - return safeTags; - } - - public async upsertTag(user: FrameworkUser, tag: BeatTag): Promise { - const tagId = await this.adapter.upsertTag(user, tag); - - return tagId; - } -} diff --git a/x-pack/plugins/beats_management/server/lib/tokens.ts b/x-pack/plugins/beats_management/server/lib/tokens.ts deleted file mode 100644 index 8ff130190f661a..00000000000000 --- a/x-pack/plugins/beats_management/server/lib/tokens.ts +++ /dev/null @@ -1,144 +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 { randomBytes, timingSafeEqual } from 'crypto'; -import { sign as signToken, verify as verifyToken } from 'jsonwebtoken'; -import { chunk } from 'lodash'; -import moment from 'moment'; -import { FrameworkUser } from './adapters/framework/adapter_types'; -import { CMTokensAdapter } from './adapters/tokens/adapter_types'; -import { CMServerLibs } from './types'; - -const RANDOM_TOKEN_1 = 'b48c4bda384a40cb91c6eb9b8849e77f'; -const RANDOM_TOKEN_2 = '80a3819e3cd64f4399f1d4886be7a08b'; - -export class CMTokensDomain { - private adapter: CMTokensAdapter; - private framework: CMServerLibs['framework']; - - constructor(adapter: CMTokensAdapter, libs: { framework: CMServerLibs['framework'] }) { - this.adapter = adapter; - this.framework = libs.framework; - } - - public async getEnrollmentToken(enrollmentToken: string) { - const fullToken = await this.adapter.getEnrollmentToken( - this.framework.internalUser, - enrollmentToken - ); - if (!fullToken) { - return { - token: null, - expired: true, - expires_on: null, - }; - } - - const { verified, expired } = this.verifyToken(enrollmentToken, fullToken.token || '', false); - - if (!verified) { - return { - expired, - token: null, - expires_on: null, - }; - } - - return { ...fullToken, expired }; - } - - public async deleteEnrollmentToken(enrollmentToken: string) { - return await this.adapter.deleteEnrollmentToken(this.framework.internalUser, enrollmentToken); - } - - public verifyToken(recivedToken: string, token2: string, decode = true) { - let tokenDecoded = true; - let expired = false; - - if (decode) { - const enrollmentTokenSecret = this.framework.getConfig().encryptionKey; - - try { - verifyToken(recivedToken, enrollmentTokenSecret); - tokenDecoded = true; - } catch (err) { - if (err.name === 'TokenExpiredError') { - expired = true; - } - tokenDecoded = false; - } - } - - if ( - typeof recivedToken !== 'string' || - typeof token2 !== 'string' || - recivedToken.length !== token2.length - ) { - // This prevents a more subtle timing attack where we know already the tokens aren't going to - // match but still we don't return fast. Instead we compare two pre-generated random tokens using - // the same comparison algorithm that we would use to compare two equal-length tokens. - return { - expired, - verified: - timingSafeEqual( - Buffer.from(RANDOM_TOKEN_1, 'utf8'), - Buffer.from(RANDOM_TOKEN_2, 'utf8') - ) && tokenDecoded, - }; - } - - return { - expired, - verified: - timingSafeEqual(Buffer.from(recivedToken, 'utf8'), Buffer.from(token2, 'utf8')) && - tokenDecoded, - }; - } - - public generateAccessToken() { - const enrollmentTokenSecret = this.framework.getConfig().encryptionKey; - - const tokenData = { - created: moment().toJSON(), - randomHash: randomBytes(26).toString(), - }; - - return signToken(tokenData, enrollmentTokenSecret); - } - - public async createEnrollmentTokens( - user: FrameworkUser, - numTokens: number = 1 - ): Promise { - const tokens = []; - const enrollmentTokensTtlInSeconds = this.framework.getConfig().enrollmentTokensTtlInSeconds; - - const enrollmentTokenExpiration = moment() - .add(enrollmentTokensTtlInSeconds, 'seconds') - .toJSON(); - const enrollmentTokenSecret = this.framework.getConfig().encryptionKey; - - while (tokens.length < numTokens) { - const tokenData = { - created: moment().toJSON(), - expires: enrollmentTokenExpiration, - randomHash: randomBytes(26).toString(), - }; - - tokens.push({ - expires_on: enrollmentTokenExpiration, - token: signToken(tokenData, enrollmentTokenSecret), - }); - } - - await Promise.all( - chunk(tokens, 100).map((tokenChunk) => this.adapter.insertTokens(user, tokenChunk)) - ); - - return tokens.map((token) => token.token); - } -} diff --git a/x-pack/plugins/beats_management/server/lib/types.ts b/x-pack/plugins/beats_management/server/lib/types.ts deleted file mode 100644 index 8342018469450b..00000000000000 --- a/x-pack/plugins/beats_management/server/lib/types.ts +++ /dev/null @@ -1,61 +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 type { IRouter, RequestHandlerContext } from 'src/core/server'; -import { DatabaseAdapter } from './adapters/database/adapter_types'; -import { FrameworkUser } from './adapters/framework/adapter_types'; -import { BeatEventsLib } from './beat_events'; -import { CMBeatsDomain } from './beats'; -import { ConfigurationBlocksLib } from './configuration_blocks'; -import { BackendFrameworkLib } from './framework'; -import { CMTagsDomain } from './tags'; -import { CMTokensDomain } from './tokens'; - -export type UserOrToken = FrameworkUser | string; - -export interface CMServerLibs { - framework: BackendFrameworkLib; - database: DatabaseAdapter; - beats: CMBeatsDomain; - tags: CMTagsDomain; - beatEvents: BeatEventsLib; - tokens: CMTokensDomain; - configurationBlocks: ConfigurationBlocksLib; -} - -export enum BeatEnrollmentStatus { - Success = 'Success', - ExpiredEnrollmentToken = 'Expired enrollment token', - InvalidEnrollmentToken = 'Invalid enrollment token', -} - -export interface AsyncResponse { - error: { - code: number | string; - message: string; - }; -} -export interface AsyncResponse { - data: DataType; -} - -/** - * @internal - */ -export type BeatsManagementApiRequestHandlerContext = CMServerLibs; - -/** - * @internal - */ -export interface BeatsManagementRequestHandlerContext extends RequestHandlerContext { - beatsManagement: CMServerLibs; -} - -/** - * @internal - */ -export type BeatsManagementRouter = IRouter; diff --git a/x-pack/plugins/beats_management/server/plugin.ts b/x-pack/plugins/beats_management/server/plugin.ts deleted file mode 100644 index 3093d5d9b8d299..00000000000000 --- a/x-pack/plugins/beats_management/server/plugin.ts +++ /dev/null @@ -1,89 +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 { CoreSetup, CoreStart, Plugin, PluginInitializerContext, Logger } from 'src/core/server'; -import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server'; -import { SecurityPluginSetup } from '../../security/server'; -import { LicensingPluginStart } from '../../licensing/server'; -import { BeatsManagementConfigType } from '../common'; -import type { BeatsManagementRequestHandlerContext, CMServerLibs } from './lib/types'; -import { registerRoutes } from './routes'; -import { compose } from './lib/compose/kibana'; -import { INDEX_NAMES } from '../common/constants'; -import { beatsIndexTemplate } from './index_templates'; - -interface SetupDeps { - security?: SecurityPluginSetup; - features: FeaturesPluginSetup; -} - -interface StartDeps { - licensing: LicensingPluginStart; -} - -export class BeatsManagementPlugin implements Plugin<{}, {}, SetupDeps, StartDeps> { - private readonly logger: Logger; - private securitySetup?: SecurityPluginSetup; - private beatsLibs?: CMServerLibs; - - constructor( - private readonly initializerContext: PluginInitializerContext - ) { - this.logger = initializerContext.logger.get(); - } - - public setup(core: CoreSetup, { features, security }: SetupDeps) { - this.securitySetup = security; - - const router = core.http.createRouter(); - registerRoutes(router); - - core.http.registerRouteHandlerContext( - 'beatsManagement', - (_, req) => { - return this.beatsLibs!; - } - ); - - features.registerElasticsearchFeature({ - id: 'beats_management', - management: { - ingest: ['beats_management'], - }, - privileges: [ - { - ui: [], - requiredClusterPrivileges: [], - requiredRoles: ['beats_admin'], - }, - ], - }); - - return {}; - } - - public start({ elasticsearch }: CoreStart, { licensing }: StartDeps) { - const config = this.initializerContext.config.get(); - const logger = this.initializerContext.logger.get(); - const kibanaVersion = this.initializerContext.env.packageInfo.version; - - this.beatsLibs = compose({ - elasticsearch, - licensing, - security: this.securitySetup, - config, - logger, - kibanaVersion, - }); - - this.beatsLibs.database.putTemplate(INDEX_NAMES.BEATS, beatsIndexTemplate).catch((e) => { - this.logger.error(`Error create beats template: ${e.message}`); - }); - - return {}; - } -} diff --git a/x-pack/plugins/beats_management/server/routes/beats/configuration.ts b/x-pack/plugins/beats_management/server/routes/beats/configuration.ts deleted file mode 100644 index 2adbe46524c6a8..00000000000000 --- a/x-pack/plugins/beats_management/server/routes/beats/configuration.ts +++ /dev/null @@ -1,83 +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 { schema } from '@kbn/config-schema'; -import type { BeatsManagementRouter } from '../../lib/types'; -import { ConfigurationBlock } from '../../../common/domain_types'; -import { ReturnTypeList } from '../../../common/return_types'; -import { wrapRouteWithSecurity } from '../wrap_route_with_security'; - -export const registerGetBeatConfigurationRoute = (router: BeatsManagementRouter) => { - router.get( - { - path: '/api/beats/agent/{beatId}/configuration', - validate: { - params: schema.object({ - beatId: schema.string(), - }), - }, - options: { - authRequired: false, - }, - }, - wrapRouteWithSecurity({}, async (context, request, response) => { - const beatsManagement = context.beatsManagement!; - const accessToken = request.headers['kbn-beats-access-token']; - if (!accessToken) { - return response.badRequest({ - body: 'beats access token required', - }); - } - const beatId = request.params.beatId; - - let configurationBlocks: ConfigurationBlock[]; - const beat = await beatsManagement.beats.getById( - beatsManagement.framework.internalUser, - beatId - ); - if (beat === null) { - return response.notFound({ - body: { - message: `Beat "${beatId}" not found`, - }, - }); - } - - const isAccessTokenValid = beat.access_token === accessToken; - if (!isAccessTokenValid) { - return response.unauthorized({ - body: { - message: 'Invalid access token', - }, - }); - } - - await beatsManagement.beats.update(beatsManagement.framework.internalUser, beat.id, { - last_checkin: new Date(), - }); - - if (beat.tags) { - const result = await beatsManagement.configurationBlocks.getForTags( - beatsManagement.framework.internalUser, - beat.tags, - -1 - ); - - configurationBlocks = result.blocks; - } else { - configurationBlocks = []; - } - - return response.ok({ - body: { - list: configurationBlocks, - success: true, - } as ReturnTypeList, - }); - }) - ); -}; diff --git a/x-pack/plugins/beats_management/server/routes/beats/enroll.ts b/x-pack/plugins/beats_management/server/routes/beats/enroll.ts deleted file mode 100644 index 8af93a30b61b57..00000000000000 --- a/x-pack/plugins/beats_management/server/routes/beats/enroll.ts +++ /dev/null @@ -1,90 +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 { schema } from '@kbn/config-schema'; -import type { BeatsManagementRouter } from '../../lib/types'; -// eslint-disable-next-line @kbn/eslint/no-restricted-paths -import { ensureRawRequest } from '../../../../../../src/core/server/http/router'; -import { REQUIRED_LICENSES } from '../../../common/constants/security'; -import { BeatEnrollmentStatus } from '../../lib/types'; -import { wrapRouteWithSecurity } from '../wrap_route_with_security'; - -export const registerBeatEnrollmentRoute = (router: BeatsManagementRouter) => { - // TODO: write to Kibana audit log file https://github.com/elastic/kibana/issues/26024 - router.post( - { - path: '/api/beats/agent/{beatId}', - validate: { - params: schema.object({ - beatId: schema.string(), - }), - body: schema.object( - { - host_name: schema.string(), - name: schema.string(), - type: schema.string(), - version: schema.string(), - }, - { unknowns: 'ignore' } - ), - }, - options: { - authRequired: false, - }, - }, - wrapRouteWithSecurity( - { - requiredLicense: REQUIRED_LICENSES, - }, - async (context, request, response) => { - const beatsManagement = context.beatsManagement!; - - const { beatId } = request.params; - const enrollmentToken = request.headers['kbn-beats-enrollment-token'] as string; - if (!enrollmentToken) { - return response.badRequest({ - body: 'beats enrollment token required', - }); - } - - // TODO: fixme eventually, need to access `info.remoteAddress` from KibanaRequest. - const legacyRequest = ensureRawRequest(request); - - const { status, accessToken } = await beatsManagement.beats.enrollBeat( - enrollmentToken, - beatId, - legacyRequest.info.remoteAddress, - request.body - ); - - switch (status) { - case BeatEnrollmentStatus.ExpiredEnrollmentToken: - return response.badRequest({ - body: { - message: BeatEnrollmentStatus.ExpiredEnrollmentToken, - }, - }); - case BeatEnrollmentStatus.InvalidEnrollmentToken: - return response.badRequest({ - body: { - message: BeatEnrollmentStatus.InvalidEnrollmentToken, - }, - }); - case BeatEnrollmentStatus.Success: - default: - return response.ok({ - body: { - item: accessToken, - action: 'created', - success: true, - }, - }); - } - } - ) - ); -}; diff --git a/x-pack/plugins/beats_management/server/routes/beats/events.ts b/x-pack/plugins/beats_management/server/routes/beats/events.ts deleted file mode 100644 index 8df18224845ea4..00000000000000 --- a/x-pack/plugins/beats_management/server/routes/beats/events.ts +++ /dev/null @@ -1,67 +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 { schema } from '@kbn/config-schema'; -import type { BeatsManagementRouter } from '../../lib/types'; -import { ReturnTypeBulkAction } from '../../../common/return_types'; -import { wrapRouteWithSecurity } from '../wrap_route_with_security'; - -export const registerBeatEventsRoute = (router: BeatsManagementRouter) => { - router.post( - { - path: '/api/beats/{beatId}/events', - validate: { - params: schema.object({ - beatId: schema.string(), - }), - body: schema.arrayOf(schema.any(), { defaultValue: [] }), - }, - options: { - authRequired: false, - }, - }, - wrapRouteWithSecurity({}, async (context, request, response) => { - const beatsManagement = context.beatsManagement!; - const accessToken = request.headers['kbn-beats-access-token']; - if (!accessToken) { - return response.badRequest({ - body: 'beats access token required', - }); - } - const beatId = request.params.beatId; - const events = request.body; - const internalUser = beatsManagement.framework.internalUser; - - const beat = await beatsManagement.beats.getById(internalUser, beatId); - if (beat === null) { - return response.badRequest({ - body: { - message: `Beat "${beatId}" not found`, - }, - }); - } - - const isAccessTokenValid = beat.access_token === accessToken; - if (!isAccessTokenValid) { - return response.unauthorized({ - body: { - message: `Invalid access token`, - }, - }); - } - - const results = await beatsManagement.beatEvents.log(internalUser, beat.id, events); - - return response.ok({ - body: { - results, - success: true, - } as ReturnTypeBulkAction, - }); - }) - ); -}; diff --git a/x-pack/plugins/beats_management/server/routes/beats/get.ts b/x-pack/plugins/beats_management/server/routes/beats/get.ts deleted file mode 100644 index e9a31030831434..00000000000000 --- a/x-pack/plugins/beats_management/server/routes/beats/get.ts +++ /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 { schema } from '@kbn/config-schema'; -import type { BeatsManagementRouter } from '../../lib/types'; -import { CMBeat } from '../../../common/domain_types'; -import { ReturnTypeGet } from '../../../common/return_types'; -import { wrapRouteWithSecurity } from '../wrap_route_with_security'; - -export const registerGetBeatRoute = (router: BeatsManagementRouter) => { - router.get( - { - path: '/api/beats/agent/{beatId}/{token?}', - validate: { - params: schema.object({ - beatId: schema.string(), - token: schema.string({ defaultValue: '' }), - }), - }, - }, - wrapRouteWithSecurity( - { requiredRoles: ['beats_admin'] }, - async (context, request, response) => { - const beatsManagement = context.beatsManagement!; - const user = beatsManagement.framework.getUser(request); - const beatId = request.params.beatId; - - let beat: CMBeat | null; - if (beatId === 'unknown') { - beat = await beatsManagement.beats.getByEnrollmentToken(user, request.params.token); - if (beat === null) { - return response.ok({ body: { success: false } }); - } - } else { - beat = await beatsManagement.beats.getById(user, beatId); - if (beat === null) { - return response.notFound({ - body: { - message: 'Beat not found', - }, - }); - } - } - - delete beat.access_token; - - return response.ok({ - body: { - item: beat, - success: true, - } as ReturnTypeGet, - }); - } - ) - ); -}; diff --git a/x-pack/plugins/beats_management/server/routes/beats/index.ts b/x-pack/plugins/beats_management/server/routes/beats/index.ts deleted file mode 100644 index c39248b6766ae4..00000000000000 --- a/x-pack/plugins/beats_management/server/routes/beats/index.ts +++ /dev/null @@ -1,15 +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. - */ - -export { registerGetBeatConfigurationRoute } from './configuration'; -export { registerBeatEnrollmentRoute } from './enroll'; -export { registerBeatEventsRoute } from './events'; -export { registerGetBeatRoute } from './get'; -export { registerListAgentsRoute } from './list'; -export { registerTagAssignmentsRoute } from './tag_assignment'; -export { registerTagRemovalsRoute } from './tag_removal'; -export { registerBeatUpdateRoute } from './update'; diff --git a/x-pack/plugins/beats_management/server/routes/beats/list.ts b/x-pack/plugins/beats_management/server/routes/beats/list.ts deleted file mode 100644 index 549c274bfc1ada..00000000000000 --- a/x-pack/plugins/beats_management/server/routes/beats/list.ts +++ /dev/null @@ -1,70 +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 { schema } from '@kbn/config-schema'; -import type { BeatsManagementRouter } from '../../lib/types'; -import { REQUIRED_LICENSES } from '../../../common/constants/security'; -import { CMBeat } from '../../../common/domain_types'; -import { ReturnTypeList } from '../../../common/return_types'; -import { wrapRouteWithSecurity } from '../wrap_route_with_security'; - -export const registerListAgentsRoute = (router: BeatsManagementRouter) => { - router.get( - { - path: '/api/beats/agents/{listByAndValue*}', - validate: { - params: schema.object({ - listByAndValue: schema.maybe(schema.string()), - }), - query: schema.object( - { - ESQuery: schema.maybe(schema.string()), - }, - { defaultValue: {} } - ), - }, - }, - wrapRouteWithSecurity( - { - requiredRoles: ['beats_admin'], - requiredLicense: REQUIRED_LICENSES, - }, - async (context, request, response) => { - const beatsManagement = context.beatsManagement; - const user = beatsManagement.framework.getUser(request); - - const listByAndValueParts = request.params.listByAndValue?.split('/') ?? []; - let listBy: string | null = null; - let listByValue: string | null = null; - if (listByAndValueParts.length === 2) { - listBy = listByAndValueParts[0]; - listByValue = listByAndValueParts[1]; - } - - let beats: CMBeat[]; - - switch (listBy) { - case 'tag': - beats = await beatsManagement.beats.getAllWithTag(user, listByValue || ''); - break; - - default: - beats = await beatsManagement.beats.getAll( - user, - request.query.ESQuery ? JSON.parse(request.query.ESQuery) : undefined - ); - - break; - } - - return response.ok({ - body: { list: beats, success: true, page: -1, total: -1 } as ReturnTypeList, - }); - } - ) - ); -}; diff --git a/x-pack/plugins/beats_management/server/routes/beats/tag_assignment.ts b/x-pack/plugins/beats_management/server/routes/beats/tag_assignment.ts deleted file mode 100644 index 44274ac8af4011..00000000000000 --- a/x-pack/plugins/beats_management/server/routes/beats/tag_assignment.ts +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { schema } from '@kbn/config-schema'; -import type { BeatsManagementRouter } from '../../lib/types'; -import { REQUIRED_LICENSES } from '../../../common/constants/security'; -import { ReturnTypeBulkAction } from '../../../common/return_types'; -// eslint-disable-next-line @kbn/eslint/no-restricted-paths -import type { BeatsTagAssignment } from '../../../public/lib/adapters/beats/adapter_types'; -import { wrapRouteWithSecurity } from '../wrap_route_with_security'; - -export const registerTagAssignmentsRoute = (router: BeatsManagementRouter) => { - // TODO: write to Kibana audit log file https://github.com/elastic/kibana/issues/26024 - router.post( - { - path: '/api/beats/agents_tags/assignments', - validate: { - body: schema.object({ - assignments: schema.arrayOf( - schema.object({ - beatId: schema.string(), - tag: schema.string(), - }), - { defaultValue: [] } - ), - }), - }, - }, - wrapRouteWithSecurity( - { - requiredLicense: REQUIRED_LICENSES, - requiredRoles: ['beats_admin'], - }, - async (context, request, response) => { - const beatsManagement = context.beatsManagement!; - const user = beatsManagement.framework.getUser(request); - const { assignments }: { assignments: BeatsTagAssignment[] } = request.body; - - const result = await beatsManagement.beats.assignTagsToBeats(user, assignments); - - return response.ok({ - body: { - success: true, - results: result.assignments.map((assignment) => ({ - success: assignment.status && assignment.status >= 200 && assignment.status < 300, - error: - !assignment.status || assignment.status >= 300 - ? { - code: assignment.status || 400, - message: assignment.result, - } - : undefined, - result: - assignment.status && assignment.status >= 200 && assignment.status < 300 - ? { - message: assignment.result, - } - : undefined, - })), - } as ReturnTypeBulkAction, - }); - } - ) - ); -}; diff --git a/x-pack/plugins/beats_management/server/routes/beats/tag_removal.ts b/x-pack/plugins/beats_management/server/routes/beats/tag_removal.ts deleted file mode 100644 index d00b16c4ae176f..00000000000000 --- a/x-pack/plugins/beats_management/server/routes/beats/tag_removal.ts +++ /dev/null @@ -1,67 +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 { schema } from '@kbn/config-schema'; -import type { BeatsManagementRouter } from '../../lib/types'; -import { REQUIRED_LICENSES } from '../../../common/constants/security'; -import { ReturnTypeBulkAction } from '../../../common/return_types'; -import { wrapRouteWithSecurity } from '../wrap_route_with_security'; - -export const registerTagRemovalsRoute = (router: BeatsManagementRouter) => { - // TODO: write to Kibana audit log file https://github.com/elastic/kibana/issues/26024 - router.post( - { - path: '/api/beats/agents_tags/removals', - validate: { - body: schema.object({ - removals: schema.arrayOf( - schema.object({ - beatId: schema.string(), - tag: schema.string(), - }), - { defaultValue: [] } - ), - }), - }, - }, - wrapRouteWithSecurity( - { - requiredLicense: REQUIRED_LICENSES, - requiredRoles: ['beats_admin'], - }, - async (context, request, response) => { - const beatsManagement = context.beatsManagement; - const user = beatsManagement.framework.getUser(request); - const { removals } = request.body; - - const result = await beatsManagement.beats.removeTagsFromBeats(user, removals); - - return response.ok({ - body: { - success: true, - results: result.removals.map((removal) => ({ - success: removal.status && removal.status >= 200 && removal.status < 300, - error: - !removal.status || removal.status >= 300 - ? { - code: removal.status || 400, - message: removal.result, - } - : undefined, - result: - removal.status && removal.status >= 200 && removal.status < 300 - ? { - message: removal.result, - } - : undefined, - })), - } as ReturnTypeBulkAction, - }); - } - ) - ); -}; diff --git a/x-pack/plugins/beats_management/server/routes/beats/update.ts b/x-pack/plugins/beats_management/server/routes/beats/update.ts deleted file mode 100644 index 982005bcf84e93..00000000000000 --- a/x-pack/plugins/beats_management/server/routes/beats/update.ts +++ /dev/null @@ -1,105 +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 { schema } from '@kbn/config-schema'; -import type { BeatsManagementRouter } from '../../lib/types'; -// eslint-disable-next-line @kbn/eslint/no-restricted-paths -import { ensureRawRequest } from '../../../../../../src/core/server/http/router'; -import { REQUIRED_LICENSES } from '../../../common/constants/security'; -import { CMBeat } from '../../../common/domain_types'; -import { ReturnTypeUpdate } from '../../../common/return_types'; -import { internalUser } from '../../lib/adapters/framework/adapter_types'; -import { wrapRouteWithSecurity } from '../wrap_route_with_security'; - -export const registerBeatUpdateRoute = (router: BeatsManagementRouter) => { - // TODO: write to Kibana audit log file (include who did the verification as well) https://github.com/elastic/kibana/issues/26024 - router.put( - { - path: '/api/beats/agent/{beatId}', - validate: { - params: schema.object({ - beatId: schema.string(), - }), - body: schema.object( - { - active: schema.maybe(schema.boolean()), - ephemeral_id: schema.maybe(schema.string()), - host_name: schema.maybe(schema.string()), - local_configuration_yml: schema.maybe(schema.string()), - metadata: schema.maybe(schema.recordOf(schema.string(), schema.any())), - name: schema.maybe(schema.string()), - type: schema.maybe(schema.string()), - version: schema.maybe(schema.string()), - }, - { defaultValue: {} } - ), - }, - }, - wrapRouteWithSecurity( - { - requiredLicense: REQUIRED_LICENSES, - requiredRoles: ['beats_admin'], - }, - async (context, request, response) => { - const beatsManagement = context.beatsManagement; - const accessToken = request.headers['kbn-beats-access-token'] as string; - const { beatId } = request.params; - const user = beatsManagement.framework.getUser(request); - const userOrToken = accessToken || user; - - // TODO: fixme eventually, need to access `info.remoteAddress` from KibanaRequest. - const legacyRequest = ensureRawRequest(request); - const remoteAddress = legacyRequest.info.remoteAddress; - - if (user.kind === 'unauthenticated' && request.body.active !== undefined) { - return response.unauthorized({ - body: { - message: 'access-token is not a valid auth type to change beat status', - }, - }); - } - - const status = await beatsManagement.beats.update(userOrToken, beatId, { - ...request.body, - host_ip: remoteAddress, - }); - - switch (status) { - case 'beat-not-found': - return response.notFound({ - body: { - message: 'Beat not found', - }, - }); - case 'invalid-access-token': - return response.unauthorized({ - body: { - message: 'Invalid access token', - }, - }); - } - - const beat = await beatsManagement.beats.getById(internalUser, beatId); - if (!beat) { - return response.notFound({ - body: { - message: 'Beat not found', - }, - }); - } - - return response.ok({ - body: { - item: beat, - action: 'updated', - success: true, - } as ReturnTypeUpdate, - }); - } - ) - ); -}; diff --git a/x-pack/plugins/beats_management/server/routes/configurations/delete.ts b/x-pack/plugins/beats_management/server/routes/configurations/delete.ts deleted file mode 100644 index 2596204017c114..00000000000000 --- a/x-pack/plugins/beats_management/server/routes/configurations/delete.ts +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { schema } from '@kbn/config-schema'; -import type { BeatsManagementRouter } from '../../lib/types'; -import { wrapRouteWithSecurity } from '../wrap_route_with_security'; -import { REQUIRED_LICENSES } from '../../../common/constants/security'; -import { ReturnTypeBulkDelete } from '../../../common/return_types'; - -export const registerDeleteConfigurationBlocksRoute = (router: BeatsManagementRouter) => { - router.delete( - { - path: '/api/beats/configurations/{ids}', - validate: { - params: schema.object({ - ids: schema.string(), - }), - }, - }, - wrapRouteWithSecurity( - { - requiredLicense: REQUIRED_LICENSES, - requiredRoles: ['beats_admin'], - }, - async (context, request, response) => { - const beatsManagement = context.beatsManagement; - const ids = request.params.ids.split(',').filter((id) => id.length > 0); - const user = beatsManagement.framework.getUser(request); - - const results = await beatsManagement.configurationBlocks.delete(user, ids); - return response.ok({ - body: { - success: true, - results: results.map((result) => ({ - success: result.success, - action: 'deleted', - error: result.success ? undefined : { message: result.reason }, - })), - } as ReturnTypeBulkDelete, - }); - } - ) - ); -}; diff --git a/x-pack/plugins/beats_management/server/routes/configurations/get.ts b/x-pack/plugins/beats_management/server/routes/configurations/get.ts deleted file mode 100644 index 8018420bda7733..00000000000000 --- a/x-pack/plugins/beats_management/server/routes/configurations/get.ts +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { schema } from '@kbn/config-schema'; -import type { BeatsManagementRouter } from '../../lib/types'; -import { wrapRouteWithSecurity } from '../wrap_route_with_security'; -import { REQUIRED_LICENSES } from '../../../common/constants/security'; -import { ConfigurationBlock } from '../../../common/domain_types'; -import { ReturnTypeList } from '../../../common/return_types'; - -export const registerGetConfigurationBlocksRoute = (router: BeatsManagementRouter) => { - router.get( - { - path: '/api/beats/configurations/{tagIds}/{page?}', - validate: { - params: schema.object({ - tagIds: schema.string(), - page: schema.maybe(schema.number()), - }), - }, - }, - wrapRouteWithSecurity( - { - requiredLicense: REQUIRED_LICENSES, - requiredRoles: ['beats_admin'], - }, - async (context, request, response) => { - const beatsManagement = context.beatsManagement; - const tagIds = request.params.tagIds.split(',').filter((id) => id.length > 0); - const user = beatsManagement.framework.getUser(request); - const result = await beatsManagement.configurationBlocks.getForTags( - user, - tagIds, - request.params.page, - 5 - ); - - return response.ok({ - body: { - page: result.page, - total: result.total, - list: result.blocks, - success: true, - } as ReturnTypeList, - }); - } - ) - ); -}; diff --git a/x-pack/plugins/beats_management/server/routes/configurations/index.ts b/x-pack/plugins/beats_management/server/routes/configurations/index.ts deleted file mode 100644 index f1e0875c8919de..00000000000000 --- a/x-pack/plugins/beats_management/server/routes/configurations/index.ts +++ /dev/null @@ -1,10 +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. - */ - -export { registerGetConfigurationBlocksRoute } from './get'; -export { registerDeleteConfigurationBlocksRoute } from './delete'; -export { registerUpsertConfigurationBlocksRoute } from './upsert'; diff --git a/x-pack/plugins/beats_management/server/routes/configurations/upsert.ts b/x-pack/plugins/beats_management/server/routes/configurations/upsert.ts deleted file mode 100644 index d490cadabf236c..00000000000000 --- a/x-pack/plugins/beats_management/server/routes/configurations/upsert.ts +++ /dev/null @@ -1,73 +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 { PathReporter } from 'io-ts/lib/PathReporter'; -import { isLeft } from 'fp-ts/lib/Either'; -import { schema } from '@kbn/config-schema'; -import type { BeatsManagementRouter } from '../../lib/types'; -import { REQUIRED_LICENSES } from '../../../common/constants'; -import { - ConfigurationBlock, - createConfigurationBlockInterface, -} from '../../../common/domain_types'; -import { ReturnTypeBulkUpsert } from '../../../common/return_types'; -import { wrapRouteWithSecurity } from '../wrap_route_with_security'; - -export const registerUpsertConfigurationBlocksRoute = (router: BeatsManagementRouter) => { - // TODO: write to Kibana audit log file - router.put( - { - path: '/api/beats/configurations', - validate: { - body: schema.arrayOf(schema.recordOf(schema.string(), schema.any()), { defaultValue: [] }), - }, - }, - wrapRouteWithSecurity( - { - requiredLicense: REQUIRED_LICENSES, - requiredRoles: ['beats_admin'], - }, - async (context, request, response) => { - const beatsManagement = context.beatsManagement; - const user = beatsManagement.framework.getUser(request); - const input = request.body as ConfigurationBlock[]; - - const result = await Promise.all( - input.map(async (block: ConfigurationBlock) => { - const assertData = createConfigurationBlockInterface().decode(block); - if (isLeft(assertData)) { - return { - error: `Error parsing block info, ${PathReporter.report(assertData)[0]}`, - }; - } - - const { blockID, success, error } = await beatsManagement.configurationBlocks.save( - user, - block - ); - if (error) { - return { success, error }; - } - - return { success, blockID }; - }) - ); - - return response.ok({ - body: { - results: result.map((r) => ({ - success: r.success as boolean, - // TODO: we need to surface this data, not hard coded - action: 'created' as 'created' | 'updated', - })), - success: true, - } as ReturnTypeBulkUpsert, - }); - } - ) - ); -}; diff --git a/x-pack/plugins/beats_management/server/routes/index.ts b/x-pack/plugins/beats_management/server/routes/index.ts deleted file mode 100644 index 8ea1ca9502959f..00000000000000 --- a/x-pack/plugins/beats_management/server/routes/index.ts +++ /dev/null @@ -1,55 +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 type { BeatsManagementRouter } from '../lib/types'; -import { - registerDeleteConfigurationBlocksRoute, - registerGetConfigurationBlocksRoute, - registerUpsertConfigurationBlocksRoute, -} from './configurations'; -import { registerCreateTokenRoute } from './tokens'; -import { - registerSetTagRoute, - registerListTagsRoute, - registerGetTagsWithIdsRoute, - registerDeleteTagsWithIdsRoute, - registerAssignableTagsRoute, -} from './tags'; -import { - registerBeatUpdateRoute, - registerTagRemovalsRoute, - registerTagAssignmentsRoute, - registerListAgentsRoute, - registerGetBeatRoute, - registerBeatEventsRoute, - registerBeatEnrollmentRoute, - registerGetBeatConfigurationRoute, -} from './beats'; - -export const registerRoutes = (router: BeatsManagementRouter) => { - // configurations - registerGetConfigurationBlocksRoute(router); - registerDeleteConfigurationBlocksRoute(router); - registerUpsertConfigurationBlocksRoute(router); - // beats - registerBeatUpdateRoute(router); - registerTagRemovalsRoute(router); - registerTagAssignmentsRoute(router); - registerListAgentsRoute(router); - registerGetBeatRoute(router); - registerBeatEventsRoute(router); - registerBeatEnrollmentRoute(router); - registerGetBeatConfigurationRoute(router); - // tags - registerSetTagRoute(router); - registerListTagsRoute(router); - registerGetTagsWithIdsRoute(router); - registerDeleteTagsWithIdsRoute(router); - registerAssignableTagsRoute(router); - // tokens - registerCreateTokenRoute(router); -}; diff --git a/x-pack/plugins/beats_management/server/routes/tags/assignable.ts b/x-pack/plugins/beats_management/server/routes/tags/assignable.ts deleted file mode 100644 index 9ab89dbcfbcd4e..00000000000000 --- a/x-pack/plugins/beats_management/server/routes/tags/assignable.ts +++ /dev/null @@ -1,51 +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 { schema } from '@kbn/config-schema'; -import { flatten } from 'lodash'; -import type { BeatsManagementRouter } from '../../lib/types'; -import { REQUIRED_LICENSES } from '../../../common/constants/security'; -import { BeatTag } from '../../../common/domain_types'; -import { ReturnTypeBulkGet } from '../../../common/return_types'; -import { wrapRouteWithSecurity } from '../wrap_route_with_security'; - -export const registerAssignableTagsRoute = (router: BeatsManagementRouter) => { - router.get( - { - path: '/api/beats/tags/assignable/{beatIds}', - validate: { - params: schema.object({ - beatIds: schema.string(), - }), - }, - }, - wrapRouteWithSecurity( - { - requiredLicense: REQUIRED_LICENSES, - requiredRoles: ['beats_admin'], - }, - async (context, request, response) => { - const beatsManagement = context.beatsManagement!; - const user = beatsManagement.framework.getUser(request); - const beatIds = request.params.beatIds.split(',').filter((id) => id.length > 0); - - const beats = await beatsManagement.beats.getByIds(user, beatIds); - const tags = await beatsManagement.tags.getNonConflictingTags( - user, - flatten(beats.map((beat) => beat.tags)) - ); - - return response.ok({ - body: { - items: tags, - success: true, - } as ReturnTypeBulkGet, - }); - } - ) - ); -}; diff --git a/x-pack/plugins/beats_management/server/routes/tags/delete.ts b/x-pack/plugins/beats_management/server/routes/tags/delete.ts deleted file mode 100644 index 54b3cf03a08bb3..00000000000000 --- a/x-pack/plugins/beats_management/server/routes/tags/delete.ts +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { schema } from '@kbn/config-schema'; -import type { BeatsManagementRouter } from '../../lib/types'; -import { REQUIRED_LICENSES } from '../../../common/constants/security'; -import { ReturnTypeBulkDelete } from '../../../common/return_types'; -import { wrapRouteWithSecurity } from '../wrap_route_with_security'; - -export const registerDeleteTagsWithIdsRoute = (router: BeatsManagementRouter) => { - router.delete( - { - path: '/api/beats/tags/{tagIds}', - validate: { - params: schema.object({ - tagIds: schema.string(), - }), - }, - }, - wrapRouteWithSecurity( - { - requiredLicense: REQUIRED_LICENSES, - requiredRoles: ['beats_admin'], - }, - async (context, request, response) => { - const beatsManagement = context.beatsManagement!; - const user = beatsManagement.framework.getUser(request); - const tagIds = request.params.tagIds.split(',').filter((id) => id.length > 0); - - const success = await beatsManagement.tags.delete(user, tagIds); - - return response.ok({ - body: { - results: tagIds.map(() => ({ - success, - action: 'deleted', - })), - success, - } as ReturnTypeBulkDelete, - }); - } - ) - ); -}; diff --git a/x-pack/plugins/beats_management/server/routes/tags/get.ts b/x-pack/plugins/beats_management/server/routes/tags/get.ts deleted file mode 100644 index 2fe1eb8ab5515e..00000000000000 --- a/x-pack/plugins/beats_management/server/routes/tags/get.ts +++ /dev/null @@ -1,46 +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 { schema } from '@kbn/config-schema'; -import type { BeatsManagementRouter } from '../../lib/types'; -import { REQUIRED_LICENSES } from '../../../common/constants/security'; -import { BeatTag } from '../../../common/domain_types'; -import { ReturnTypeBulkGet } from '../../../common/return_types'; -import { wrapRouteWithSecurity } from '../wrap_route_with_security'; - -export const registerGetTagsWithIdsRoute = (router: BeatsManagementRouter) => { - router.get( - { - path: '/api/beats/tags/{tagIds}', - validate: { - params: schema.object({ - tagIds: schema.string(), - }), - }, - }, - wrapRouteWithSecurity( - { - requiredLicense: REQUIRED_LICENSES, - requiredRoles: ['beats_admin'], - }, - async (context, request, response) => { - const beatsManagement = context.beatsManagement!; - const user = beatsManagement.framework.getUser(request); - const tagIds = request.params.tagIds.split(',').filter((id) => id.length > 0); - - const tags = await beatsManagement.tags.getWithIds(user, tagIds); - - return response.ok({ - body: { - items: tags, - success: true, - } as ReturnTypeBulkGet, - }); - } - ) - ); -}; diff --git a/x-pack/plugins/beats_management/server/routes/tags/index.ts b/x-pack/plugins/beats_management/server/routes/tags/index.ts deleted file mode 100644 index a4208a56793599..00000000000000 --- a/x-pack/plugins/beats_management/server/routes/tags/index.ts +++ /dev/null @@ -1,12 +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. - */ - -export { registerAssignableTagsRoute } from './assignable'; -export { registerDeleteTagsWithIdsRoute } from './delete'; -export { registerGetTagsWithIdsRoute } from './get'; -export { registerListTagsRoute } from './list'; -export { registerSetTagRoute } from './set'; diff --git a/x-pack/plugins/beats_management/server/routes/tags/list.ts b/x-pack/plugins/beats_management/server/routes/tags/list.ts deleted file mode 100644 index cee2231808aa63..00000000000000 --- a/x-pack/plugins/beats_management/server/routes/tags/list.ts +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { schema } from '@kbn/config-schema'; -import type { BeatsManagementRouter } from '../../lib/types'; -import { REQUIRED_LICENSES } from '../../../common/constants/security'; -import { BeatTag } from '../../../common/domain_types'; -import { ReturnTypeList } from '../../../common/return_types'; -import { wrapRouteWithSecurity } from '../wrap_route_with_security'; - -export const registerListTagsRoute = (router: BeatsManagementRouter) => { - router.get( - { - path: '/api/beats/tags', - validate: { - query: schema.object( - { - ESQuery: schema.maybe(schema.string()), - }, - { defaultValue: {} } - ), - }, - }, - wrapRouteWithSecurity( - { - requiredLicense: REQUIRED_LICENSES, - requiredRoles: ['beats_admin'], - }, - async (context, request, response) => { - const beatsManagement = context.beatsManagement!; - const user = beatsManagement.framework.getUser(request); - - const tags = await beatsManagement.tags.getAll( - user, - request.query && request.query.ESQuery ? JSON.parse(request.query.ESQuery) : undefined - ); - - return response.ok({ - body: { - list: tags, - success: true, - page: -1, - total: -1, - } as ReturnTypeList, - }); - } - ) - ); -}; diff --git a/x-pack/plugins/beats_management/server/routes/tags/set.ts b/x-pack/plugins/beats_management/server/routes/tags/set.ts deleted file mode 100644 index b556531e8c113a..00000000000000 --- a/x-pack/plugins/beats_management/server/routes/tags/set.ts +++ /dev/null @@ -1,63 +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 { schema } from '@kbn/config-schema'; -import type { BeatsManagementRouter } from '../../lib/types'; -import { REQUIRED_LICENSES } from '../../../common/constants'; -import { BeatTag } from '../../../common/domain_types'; -import { ReturnTypeUpsert } from '../../../common/return_types'; -import { wrapRouteWithSecurity } from '../wrap_route_with_security'; - -export const registerSetTagRoute = (router: BeatsManagementRouter) => { - // TODO: write to Kibana audit log file - router.put( - { - path: '/api/beats/tag/{tagId}', - validate: { - params: schema.object({ - tagId: schema.string(), - }), - body: schema.object( - { - color: schema.maybe(schema.string()), - name: schema.maybe(schema.string()), - }, - { defaultValue: {} } - ), - }, - }, - wrapRouteWithSecurity( - { - requiredLicense: REQUIRED_LICENSES, - requiredRoles: ['beats_admin'], - }, - async (context, request, response) => { - const beatsManagement = context.beatsManagement!; - const user = beatsManagement.framework.getUser(request); - - const config = { - id: request.params.tagId, - name: request.params.tagId, - color: '#DD0A73', - hasConfigurationBlocksTypes: [], - ...request.body, - }; - const id = await beatsManagement.tags.upsertTag(user, config); - const tag = await beatsManagement.tags.getWithIds(user, [id]); - - // TODO the action needs to be surfaced - return response.ok({ - body: { - success: true, - item: tag[0], - action: 'created', - } as ReturnTypeUpsert, - }); - } - ) - ); -}; diff --git a/x-pack/plugins/beats_management/server/routes/tokens/create.ts b/x-pack/plugins/beats_management/server/routes/tokens/create.ts deleted file mode 100644 index c44f9c2dd4e7dc..00000000000000 --- a/x-pack/plugins/beats_management/server/routes/tokens/create.ts +++ /dev/null @@ -1,58 +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 { schema } from '@kbn/config-schema'; -import type { BeatsManagementRouter } from '../../lib/types'; -import { REQUIRED_LICENSES } from '../../../common/constants/security'; -import { ReturnTypeBulkCreate } from '../../../common/return_types'; -import { wrapRouteWithSecurity } from '../wrap_route_with_security'; - -const DEFAULT_NUM_TOKENS = 1; - -export const registerCreateTokenRoute = (router: BeatsManagementRouter) => { - // TODO: write to Kibana audit log file - router.post( - { - path: '/api/beats/enrollment_tokens', - validate: { - body: schema.nullable( - schema.object({ - num_tokens: schema.number({ defaultValue: DEFAULT_NUM_TOKENS, min: 1 }), - }) - ), - }, - }, - wrapRouteWithSecurity( - { - requiredLicense: REQUIRED_LICENSES, - requiredRoles: ['beats_admin'], - }, - async (context, request, response) => { - const beatsManagement = context.beatsManagement!; - const user = beatsManagement.framework.getUser(request); - - const numTokens = request.body?.num_tokens ?? DEFAULT_NUM_TOKENS; - try { - const tokens = await beatsManagement.tokens.createEnrollmentTokens(user, numTokens); - return response.ok({ - body: { - results: tokens.map((token) => ({ - item: token, - success: true, - action: 'created', - })), - success: true, - } as ReturnTypeBulkCreate, - }); - } catch (err) { - beatsManagement.framework.log(err.message); - throw new Error('An error occurred, please check your Kibana logs'); - } - } - ) - ); -}; diff --git a/x-pack/plugins/beats_management/server/routes/tokens/index.ts b/x-pack/plugins/beats_management/server/routes/tokens/index.ts deleted file mode 100644 index f04a8e0d5bc5a0..00000000000000 --- a/x-pack/plugins/beats_management/server/routes/tokens/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export { registerCreateTokenRoute } from './create'; diff --git a/x-pack/plugins/beats_management/server/routes/wrap_route_with_security.ts b/x-pack/plugins/beats_management/server/routes/wrap_route_with_security.ts deleted file mode 100644 index 327d599ec27036..00000000000000 --- a/x-pack/plugins/beats_management/server/routes/wrap_route_with_security.ts +++ /dev/null @@ -1,70 +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 { KibanaRequest, KibanaResponseFactory, RequestHandler, RouteMethod } from 'src/core/server'; -import { difference } from 'lodash'; -import type { BeatsManagementRequestHandlerContext } from '../lib/types'; - -export function wrapRouteWithSecurity< - P, - Q, - B, - Context extends BeatsManagementRequestHandlerContext ->( - { - requiredLicense = [], - requiredRoles = [], - }: { requiredLicense?: string[]; requiredRoles?: string[] }, - handler: RequestHandler -): RequestHandler { - return async ( - context: Context, - request: KibanaRequest, - response: KibanaResponseFactory - ) => { - const beatsManagement = context.beatsManagement!; - const license = beatsManagement.framework.license; - const user = beatsManagement.framework.getUser(request); - - if ( - requiredLicense.length > 0 && - (license.expired || !requiredLicense.includes(license.type)) - ) { - return response.forbidden({ - body: { - message: `Your ${license.type} license does not support this API or is expired. Please upgrade your license.`, - }, - }); - } - - if (requiredRoles.length > 0) { - if (user.kind !== 'authenticated') { - return response.forbidden({ - body: { - message: `Request must be authenticated`, - }, - }); - } - - if ( - user.kind === 'authenticated' && - !user.roles.includes('superuser') && - difference(requiredRoles, user.roles).length !== 0 - ) { - return response.forbidden({ - body: { - message: `Request must be authenticated by a user with one of the following user roles: ${requiredRoles.join( - ',' - )}`, - }, - }); - } - } - - return handler(context, request, response); - }; -} diff --git a/x-pack/plugins/beats_management/tsconfig.json b/x-pack/plugins/beats_management/tsconfig.json deleted file mode 100644 index ad68cc900e6382..00000000000000 --- a/x-pack/plugins/beats_management/tsconfig.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "composite": true, - "outDir": "./target/types", - "emitDeclarationOnly": true, - "declaration": true, - "declarationMap": true - }, - "include": [ - "common/**/*", - "public/**/*", - "server/**/*", - "types/**/*", - "scripts/**/*", - "server/index_templates/*.json", - ], - "references": [ - { "path": "../../../src/core/tsconfig.json" }, - { "path": "../../../src/plugins/data/tsconfig.json" }, - { "path": "../../../src/plugins/management/tsconfig.json" }, - { "path": "../licensing/tsconfig.json" }, - { "path": "../features/tsconfig.json" }, - { "path": "../security/tsconfig.json" } - ] -} diff --git a/x-pack/plugins/beats_management/types/formsy.d.ts b/x-pack/plugins/beats_management/types/formsy.d.ts deleted file mode 100644 index 46231b2385991c..00000000000000 --- a/x-pack/plugins/beats_management/types/formsy.d.ts +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -declare module 'formsy-react' { - import React, { FC } from 'react'; - let Formsy: FC; - export interface FormsyInputProps { - getErrorMessage(): any; - getValue(): any; - hasValue(): boolean; - isFormDisabled(): boolean; - isFormSubmitted(): boolean; - isPristine(): boolean; - isRequired(): boolean; - isValid(): boolean; - isValidValue(): boolean; - resetValue(): void; - setValidations(validations: any, required: boolean): void; - setValue(value: any): void; - showError(): boolean; - showRequired(): boolean; - } - - // eslint-disable-next-line import/no-default-export - export default Formsy; - export type FormData = { [fieldName in keyof FormShape]: string }; - export type FieldValue = string | null | undefined; - - type ValidationMethod = ( - values: FormData, - value: string | null | undefined - ) => void; - - export function addValidationRule( - validationName: string, - validationMethod: ValidationMethod - ): void; - export function withFormsy(component: any): any; - - // function withFormsy( - // component: - // | React.Component - // | FC - // ): React.Component; -} diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index 66941a8fb591dc..845f4b2fb8643d 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -6156,185 +6156,6 @@ "xpack.banners.settings.textColor.description": "バナーテキストの色を設定します。{subscriptionLink}", "xpack.banners.settings.textColor.title": "バナーテキスト色", "xpack.banners.settings.textContent.title": "バナーテキスト", - "xpack.beatsManagement.beat.actionSectionTypeLabel": "タイプ：{beatType}。", - "xpack.beatsManagement.beat.actionSectionVersionLabel": "バージョン：{beatVersion}", - "xpack.beatsManagement.beat.beatNameAndIdTitle": "ビート：{nameOrNoName} (ID：{id}) ", - "xpack.beatsManagement.beat.beatNotFoundErrorMessage": "ビートが見つかりません", - "xpack.beatsManagement.beat.beatNotFoundErrorTitle": "ビートが見つかりません", - "xpack.beatsManagement.beat.beatNotFoundMessage": "ビートが見つかりません", - "xpack.beatsManagement.beat.configTabLabel": "構成", - "xpack.beatsManagement.beat.configurationTagsTabLabel": "構成タグ", - "xpack.beatsManagement.beat.detailsConfigurationDescription": "1 つのタグに複数の構成を適用することができます。これらの構成は必要に応じて同じタイプを繰り返したり、タイプを組み合わせることができます。たとえば、3 つの Metricbeat 構成と同時に 1 つのインプットと Filebeat 構成を使用することができます。", - "xpack.beatsManagement.beat.detailsConfigurationTitle": "構成", - "xpack.beatsManagement.beat.lastConfigUpdateMessage": "前回の構成の更新：{lastUpdateTime}。", - "xpack.beatsManagement.beat.loadingTitle": "読み込み中", - "xpack.beatsManagement.beatConfigurations.descriptionColumnName": "説明", - "xpack.beatsManagement.beatConfigurations.moduleColumnName": "モジュール", - "xpack.beatsManagement.beatConfigurations.tagColumnName": "タグ", - "xpack.beatsManagement.beatConfigurations.typeColumnName": "型", - "xpack.beatsManagement.beats.beatDisenrolledNotificationDescription": "ID {firstBeatId} のビートの登録が解除されました。", - "xpack.beatsManagement.beats.beatDisenrolledNotificationTitle": "{firstBeatNameOrId} の登録解除", - "xpack.beatsManagement.beats.configurationTagsTabTitle": "構成タグ", - "xpack.beatsManagement.beats.disenrolledBeatsNotificationTitle": "{beatsLength} 個のビートの登録解除", - "xpack.beatsManagement.beats.enrollBeatsButtonLabel": "ビートを登録", - "xpack.beatsManagement.beats.enrolledBeatsTabTitle": "登録済みのビート", - "xpack.beatsManagement.beats.enrollNewBeatsTitle": "新規ビートの登録", - "xpack.beatsManagement.beats.installBeatsLearningButtonLabel": "ビートのインストール方法", - "xpack.beatsManagement.beatsListAssignmentOptions.setTagsButtonLabel": "タグを設定", - "xpack.beatsManagement.beatsListAssignmentOptions.unenrollBeatsWarninigMessage": "選択されたビートは今後集中管理を使用しません", - "xpack.beatsManagement.beatsListAssignmentOptions.unenrollBeatsWarninigTitle": "選択されたビートの登録を解除しますか？", - "xpack.beatsManagement.beatsListAssignmentOptions.unenrollButtonLabel": "選択項目の登録を解除", - "xpack.beatsManagement.beatsTable.beatNameTitle": "ビート名", - "xpack.beatsManagement.beatsTable.configErrorStatusLabel": "構成エラー", - "xpack.beatsManagement.beatsTable.configStatus.errorTooltip": "このビートにエラーがあります。このホストのログを確認してください。", - "xpack.beatsManagement.beatsTable.configStatus.noConnectionTooltip": "このビートは 10 分以上 Kibana に接続していません", - "xpack.beatsManagement.beatsTable.configStatus.notStartedLabel": "未開始", - "xpack.beatsManagement.beatsTable.configStatus.notStartedTooltip": "このビートはまだ開始していません。", - "xpack.beatsManagement.beatsTable.configStatus.offlineLabel": "オフライン", - "xpack.beatsManagement.beatsTable.configStatus.okLabel": "OK", - "xpack.beatsManagement.beatsTable.configStatus.okTooltip": "最新の構成にビートが適用されました", - "xpack.beatsManagement.beatsTable.configStatus.progressTooltip": "このビートは現在 CM から構成を再読み込み中です。", - "xpack.beatsManagement.beatsTable.configStatus.runningTooltip": "このビートは問題なく動作中です。", - "xpack.beatsManagement.beatsTable.configStatus.startingTooltip": "このビートは開始中です。", - "xpack.beatsManagement.beatsTable.configStatusTitle": "構成ステータス", - "xpack.beatsManagement.beatsTable.disenrollSelectedLabel": "選択項目の登録を解除", - "xpack.beatsManagement.beatsTable.failedStatusLabel": "エラー", - "xpack.beatsManagement.beatsTable.runningStatusLabel": "実行中", - "xpack.beatsManagement.beatsTable.startingStatusLabel": "開始中", - "xpack.beatsManagement.beatsTable.stoppedStatusLabel": "停止中", - "xpack.beatsManagement.beatsTable.tagsTitle": "タグ", - "xpack.beatsManagement.beatsTable.typeLabel": "型", - "xpack.beatsManagement.beatsTable.typeTitle": "型", - "xpack.beatsManagement.beatsTable.updatingStatusLabel": "更新中", - "xpack.beatsManagement.beatTagsTable.addTagLabel": "タグを追加", - "xpack.beatsManagement.beatTagsTable.lastUpdateTitle": "最終更新", - "xpack.beatsManagement.beatTagsTable.removeSelectedLabel": "選択項目を削除", - "xpack.beatsManagement.beatTagsTable.tagNameTitle": "タグ名", - "xpack.beatsManagement.breadcrumb.beatDetails": "{beatId} のビート詳細", - "xpack.beatsManagement.breadcrumb.beatTags": "{beatId} のビートタグ", - "xpack.beatsManagement.breadcrumb.configurationTags": "構成タグ", - "xpack.beatsManagement.breadcrumb.enrolledBeats": "登録済みのビート", - "xpack.beatsManagement.centralManagementLinkLabel": "Beatsの集中管理", - "xpack.beatsManagement.config.other.error": "有効な YAML フォーマットを使用してください", - "xpack.beatsManagement.config.otherConfigDescription": "YAML フォーマットで Filebeat インプットの他の設定を指定します", - "xpack.beatsManagement.config.otherConfigLabel": "他の構成", - "xpack.beatsManagement.confirmModal.cancelButtonLabel": "キャンセル", - "xpack.beatsManagement.confirmModal.confirmButtonLabel": "確認", - "xpack.beatsManagement.confirmModal.confirmWarningTitle": "確認", - "xpack.beatsManagement.createTag.errorSavingTagTitle": "タグの保存中にエラーが発生", - "xpack.beatsManagement.createTag.saveAndContinueButtonLabel": "保存して続行", - "xpack.beatsManagement.disabledSecurityDescription": "ビートの集中管理を使用するには、Kibana と Elasticsearch でセキュリティを有効にする必要があります。", - "xpack.beatsManagement.disabledSecurityTitle": "セキュリティが有効ではありません", - "xpack.beatsManagement.enrollBeat.assignTagToBeatInvalidURLNoTagFoundTitle": "無効な URL、createdTag が見つかりません", - "xpack.beatsManagement.enrollBeat.assignTagToBeatInvalidURLNoTokenFountTitle": "無効な URL、enrollmentToken が見つかりません", - "xpack.beatsManagement.enrollBeat.assignTagToBeatNotEnrolledProperlyTitle": "エラー：ビートは正常に登録されていません", - "xpack.beatsManagement.enrollBeat.beatEnrolledTitle": "このビートは現在集中管理に登録されています：", - "xpack.beatsManagement.enrollBeat.beatsCentralManagementDescription": "一か所で構成を集中管理できます。", - "xpack.beatsManagement.enrollBeat.beatTypeColumnName": "ビートタイプ", - "xpack.beatsManagement.enrollBeat.beatTypeTitle": "ビートタイプ：", - "xpack.beatsManagement.enrollBeat.copyButtonLabel": "コマンドをコピー", - "xpack.beatsManagement.enrollBeat.createTagStepLabel": "タグを作成", - "xpack.beatsManagement.enrollBeat.enrollBeatButtonLabel": "ビートを登録", - "xpack.beatsManagement.enrollBeat.enrollBeatStepLabel": "ビートを登録", - "xpack.beatsManagement.enrollBeat.finishStepLabel": "終了", - "xpack.beatsManagement.enrollBeat.firstBeatEnrollingDoneButtonLabel": "完了", - "xpack.beatsManagement.enrollBeat.getStartedBeatsCentralManagementTitle": "ビートの集中管理を開始", - "xpack.beatsManagement.enrollBeat.hostnameColumnName": "ホスト名", - "xpack.beatsManagement.enrollBeat.nextStepDescription": "ビートを起動して構成エラーを確認し、「完了」をクリックしてください。", - "xpack.beatsManagement.enrollBeat.nextStepTitle": "ビートが登録されました。次のステップ", - "xpack.beatsManagement.enrollBeat.platformTitle": "プラットフォーム：", - "xpack.beatsManagement.enrollBeat.versionColumnName": "バージョン", - "xpack.beatsManagement.enrollBeat.waitingBeatTypeToEnrollTitle": "{beatType} の登録待ち…", - "xpack.beatsManagement.enrollBeat.yourBeatTypeHostTitle": "{beatType} がインストールされているホストでは次を実行：", - "xpack.beatsManagement.filebeatInputConfig.otherConfigDescription": "YAML フォーマットで Filebeat インプットの他の設定を指定します", - "xpack.beatsManagement.filebeatInputConfig.otherConfigErrorMessage": "有効な YAML フォーマットを使用してください", - "xpack.beatsManagement.filebeatInputConfig.otherConfigLabel": "他の構成", - "xpack.beatsManagement.filebeatInputConfig.pathsDescription": "それぞれのパスを別々の行に入力します", - "xpack.beatsManagement.filebeatInputConfig.pathsErrorMessage": "1 行につき 1 つのパスを入力してください", - "xpack.beatsManagement.filebeatInputConfig.pathsLabel": "パス", - "xpack.beatsManagement.filebeatModuleConfig.moduleDescription": "YAML フォーマットで Filebeat モジュールの他の設定を指定します", - "xpack.beatsManagement.filebeatModuleConfig.moduleErrorMessage": "モジュールを選択してください。", - "xpack.beatsManagement.filebeatModuleConfig.moduleLabel": "モジュール", - "xpack.beatsManagement.filebeatModuleConfig.otherConfigErrorMessage": "有効な YAML フォーマットを使用してください", - "xpack.beatsManagement.filebeatModuleConfig.otherConfigLabel": "他の構成", - "xpack.beatsManagement.invalidLicenseDescription": "現在のライセンスは期限切れです。登録されたビートは引き続き動作しますが、ビート管理 UI にアクセスするには有効なライセンスが必要です。", - "xpack.beatsManagement.invalidLicenseTitle": "ライセンスの期限切れ", - "xpack.beatsManagement.management.breadcrumb": "管理", - "xpack.beatsManagement.management.deprecationMessage": "Beats集中管理の開発は中止され、現在はそれに代わる包括的なソリューションを検討しています。ベータ版に参加して、フィードバックを提出していただき、どうもありがとうございます。ご質問や問題点がありましたら、{forumLink}からお問い合わせください。", - "xpack.beatsManagement.management.deprecationTitle": "Beats集中管理は廃止予定です", - "xpack.beatsManagement.management.forumLink": "ディスカッションフォーラム", - "xpack.beatsManagement.metricbeatModuleConfig.hostsDescription": "それぞれのパスを別々の行に入力します", - "xpack.beatsManagement.metricbeatModuleConfig.hostsErrorMessage": "1 行につき 1 つのファイルホストを入力してください", - "xpack.beatsManagement.metricbeatModuleConfig.hostsLabel": "ホスト", - "xpack.beatsManagement.metricbeatModuleConfig.moduleErrorMessage": "モジュールを選択してください。", - "xpack.beatsManagement.metricbeatModuleConfig.moduleLabel": "モジュール", - "xpack.beatsManagement.metricbeatModuleConfig.otherConfigDescription": "YAML フォーマットで Metricbeat モジュールの他の設定を指定します", - "xpack.beatsManagement.metricbeatModuleConfig.otherConfigErrorMessage": "有効な YAML フォーマットを使用してください", - "xpack.beatsManagement.metricbeatModuleConfig.otherConfigLabel": "他の構成", - "xpack.beatsManagement.metricbeatModuleConfig.periodErrorMessage": "無効な期間、10 秒は「10s」というフォーマットを使用してください", - "xpack.beatsManagement.metricbeatModuleConfig.periodLabel": "期間", - "xpack.beatsManagement.noAccess.accessDeniedDescription": "ビート集中管理へのアクセス権がありません。ビート集中管理を使用するには、{beatsAdminRole} ロールから権限が必要です。", - "xpack.beatsManagement.noAccess.accessDeniedTitle": "アクセスが拒否されました", - "xpack.beatsManagement.noContentFoundErrorMessage": "コンテンツがありません", - "xpack.beatsManagement.outputConfig.hostsErrorMessage": "1 行につき 1 つのファイルホストを入力してください", - "xpack.beatsManagement.outputConfig.hostsLabel": "ホスト", - "xpack.beatsManagement.outputConfig.outputTypeErrorMessage": "アウトプットタイプを選択してください", - "xpack.beatsManagement.outputConfig.outputTypeLabel": "アウトプットタイプ", - "xpack.beatsManagement.outputConfig.passwordErrorMessage": "処理不能なパスワードです", - "xpack.beatsManagement.outputConfig.passwordLabel": "パスワード", - "xpack.beatsManagement.outputConfig.usernameErrorMessage": "処理不能なユーザー名です", - "xpack.beatsManagement.outputConfig.usernameLabel": "ユーザー名", - "xpack.beatsManagement.overview.betaBadgeText": "ベータ", - "xpack.beatsManagement.table.filterResultsPlaceholder": "フィルター結果", - "xpack.beatsManagement.table.selectOptionLabel": "オプションを選択してください", - "xpack.beatsManagement.table.selectThisBeatTooltip": "このビートを選択します", - "xpack.beatsManagement.tag.addConfigurationButtonLabel": "構成ブロックを追加", - "xpack.beatsManagement.tag.beatsAssignedToTagTitle": "このタグが付いたビート", - "xpack.beatsManagement.tag.cancelButtonLabel": "キャンセル", - "xpack.beatsManagement.tag.createTagTitle": "タグの作成", - "xpack.beatsManagement.tag.saveButtonLabel": "保存", - "xpack.beatsManagement.tag.tagColorLabel": "タグの色", - "xpack.beatsManagement.tag.tagConfigurationsDescription": "タグには異なるタイプのビートの構成ブロックが使用できます。たとえば、1 つのタグに 2 つの Metricbeat 構成ブロックと 1 つの Filebeat インプット構成ブロックを使用することができます。", - "xpack.beatsManagement.tag.tagConfigurationsTitle": "構成ブロック", - "xpack.beatsManagement.tag.tagDetailsDescription": "タグとは、1 つまたは複数のビートに適用できる構成ブロックのグループです。", - "xpack.beatsManagement.tag.tagDetailsTitle": "タグの詳細", - "xpack.beatsManagement.tag.tagName.validationErrorMessage": "タグ名には文字、数字、ハイフンのみが使用できます。", - "xpack.beatsManagement.tag.tagNameLabel": "タグ名", - "xpack.beatsManagement.tag.tagNamePlaceholder": "タグ名 (必須) ", - "xpack.beatsManagement.tag.updateTagTitle": "タグ {tagId} を更新", - "xpack.beatsManagement.tagConfig.addConfigurationTitle\"": "構成ブロックを追加", - "xpack.beatsManagement.tagConfig.closeButtonLabel": "閉じる", - "xpack.beatsManagement.tagConfig.configurationTypeText": "{configType}‘構成", - "xpack.beatsManagement.tagConfig.descriptionLabel": "説明", - "xpack.beatsManagement.tagConfig.descriptionPlaceholder": "説明 (オプション) ", - "xpack.beatsManagement.tagConfig.editConfigurationTitle": "構成ブロックの編集", - "xpack.beatsManagement.tagConfig.filebeatInputLabel": "Filebeat インプット", - "xpack.beatsManagement.tagConfig.filebeatModuleLabel": "Filebeat モジュール", - "xpack.beatsManagement.tagConfig.invalidSchema": "エラー：この構成は無効です。Beats でサポートされておらず、削除する必要があります", - "xpack.beatsManagement.tagConfig.metricbeatModuleLabel": "Metricbeat モジュール", - "xpack.beatsManagement.tagConfig.outputLabel": "アウトプット", - "xpack.beatsManagement.tagConfig.saveButtonLabel": "保存", - "xpack.beatsManagement.tagConfig.typeLabel": "型", - "xpack.beatsManagement.tagConfig.viewConfigurationTitle\"": "構成ブロックの表示", - "xpack.beatsManagement.tagConfigAssignmentOptions.removeTagsButtonLabel": "タグを削除", - "xpack.beatsManagement.tagConfigAssignmentOptions.removeTagsWarninigMessage": "選択されたビートからタグを削除しますか？", - "xpack.beatsManagement.tagConfigAssignmentOptions.removeTagsWarninigTitle": "タグを削除", - "xpack.beatsManagement.tagListAssignmentOptions.removeTagsButtonLabel": "選択項目を削除", - "xpack.beatsManagement.tagListAssignmentOptions.removeTagsWarninigTitle": "タグを削除", - "xpack.beatsManagement.tagListAssignmentOptions.removeTagWarninigMessage": "タグを削除しますか？", - "xpack.beatsManagement.tags.addTagButtonLabel": "タグを追加", - "xpack.beatsManagement.tags.someTagsMightBeAssignedToBeatsTitle": "これらのタグのいくつかはビートに割り当てられている可能性があります。削除するタグが現在割り当てられていないことを確認してください", - "xpack.beatsManagement.tagsTable.lastUpdateTitle": "最終更新", - "xpack.beatsManagement.tagsTable.removeSelectedLabel": "選択項目を削除", - "xpack.beatsManagement.tagsTable.tagNameTitle": "タグ名", - "xpack.beatsManagement.tagTable.actions.removeButtonAriaLabel": "削除", - "xpack.beatsManagement.tagTable.actions.removeTooltip": "タグからこの構成を削除します", - "xpack.beatsManagement.tagTable.actionsColumnName": "アクション", - "xpack.beatsManagement.tagTable.descriptionColumnName": "説明", - "xpack.beatsManagement.tagTable.moduleColumn.notAvailibaleLabel": "N/A", - "xpack.beatsManagement.tagTable.moduleColumnName": "モジュール", - "xpack.beatsManagement.tagTable.typeColumnName": "型", - "xpack.beatsManagement.walkthrough.initial.betaBadgeText": "ベータ", "xpack.canvas.app.loadErrorMessage": "メッセージ：{error}", "xpack.canvas.app.loadErrorTitle": "Canvas の読み込みに失敗", "xpack.canvas.app.loadingMessage": "Canvas を読み込み中", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index 306ac0bf744e2d..d223ba08185b4b 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -6195,189 +6195,6 @@ "xpack.banners.settings.textColor.description": "设置横幅广告文本的颜色。{subscriptionLink}", "xpack.banners.settings.textColor.title": "横幅广告文本颜色", "xpack.banners.settings.textContent.title": "横幅广告文本", - "xpack.beatsManagement.beat.actionSectionTypeLabel": "类型：{beatType}。", - "xpack.beatsManagement.beat.actionSectionVersionLabel": "版本：{beatVersion}。", - "xpack.beatsManagement.beat.beatNameAndIdTitle": "Beat：{nameOrNoName} (ID：{id}) ", - "xpack.beatsManagement.beat.beatNotFoundErrorMessage": "未找到 Beat", - "xpack.beatsManagement.beat.beatNotFoundErrorTitle": "未找到 Beat", - "xpack.beatsManagement.beat.beatNotFoundMessage": "未找到 Beat", - "xpack.beatsManagement.beat.configTabLabel": "配置", - "xpack.beatsManagement.beat.configurationTagsTabLabel": "配置标签", - "xpack.beatsManagement.beat.detailsConfigurationDescription": "可以将多个配置应用到单个标签。这些配置类型可以根据需要进行重复或混合。例如，您可以同时使用三个 Metricbeat 配置以及一个输入和 Filebeat 配置。", - "xpack.beatsManagement.beat.detailsConfigurationTitle": "配置", - "xpack.beatsManagement.beat.lastConfigUpdateMessage": "上次配置更新：{lastUpdateTime}。", - "xpack.beatsManagement.beat.loadingTitle": "正在加载", - "xpack.beatsManagement.beatConfigurations.descriptionColumnName": "描述", - "xpack.beatsManagement.beatConfigurations.moduleColumnName": "模块", - "xpack.beatsManagement.beatConfigurations.tagColumnName": "标签", - "xpack.beatsManagement.beatConfigurations.typeColumnName": "类型", - "xpack.beatsManagement.beats.addedNotificationDescription": "将标签 {tag} 添加到 {assignmentsLength, plural, one {Beat {beatName}} other {# 个 Beats}}。", - "xpack.beatsManagement.beats.addedNotificationTitle": "{assignmentsLength, plural, other {标签}}已添加", - "xpack.beatsManagement.beats.beatDisenrolledNotificationDescription": "ID 为 {firstBeatId} 的 Beat 已除名。", - "xpack.beatsManagement.beats.beatDisenrolledNotificationTitle": "{firstBeatNameOrId} 已除名", - "xpack.beatsManagement.beats.configurationTagsTabTitle": "配置标签", - "xpack.beatsManagement.beats.disenrolledBeatsNotificationTitle": "{beatsLength} 个 Beats 已除名", - "xpack.beatsManagement.beats.enrollBeatsButtonLabel": "注册 Beats", - "xpack.beatsManagement.beats.enrolledBeatsTabTitle": "已注册 Beats", - "xpack.beatsManagement.beats.enrollNewBeatsTitle": "注册新 Beat", - "xpack.beatsManagement.beats.installBeatsLearningButtonLabel": "了解如何安装 Beats", - "xpack.beatsManagement.beats.removedNotificationDescription": "已从 {assignmentsLength, plural, one {Beat {beatName}} other {# 个 Beat}} 移除标签 {tag}", - "xpack.beatsManagement.beats.removedNotificationTitle": "{assignmentsLength, plural, other {标签}}已删除", - "xpack.beatsManagement.beatsListAssignmentOptions.setTagsButtonLabel": "设置标签", - "xpack.beatsManagement.beatsListAssignmentOptions.unenrollBeatsWarninigMessage": "选定的 Beats 将不再使用集中管理", - "xpack.beatsManagement.beatsListAssignmentOptions.unenrollBeatsWarninigTitle": "取消注册选定的 Beats？", - "xpack.beatsManagement.beatsListAssignmentOptions.unenrollButtonLabel": "取消注册选定", - "xpack.beatsManagement.beatsTable.beatNameTitle": "Beat 名称", - "xpack.beatsManagement.beatsTable.configErrorStatusLabel": "配置错误", - "xpack.beatsManagement.beatsTable.configStatus.errorTooltip": "此 Beat 有错误，请查看此主机的日志。", - "xpack.beatsManagement.beatsTable.configStatus.noConnectionTooltip": "此 Beat 未连接到 Kibana 的时间已超过 10 分钟", - "xpack.beatsManagement.beatsTable.configStatus.notStartedLabel": "未开始", - "xpack.beatsManagement.beatsTable.configStatus.notStartedTooltip": "此 Beat 尚未启动。", - "xpack.beatsManagement.beatsTable.configStatus.offlineLabel": "脱机", - "xpack.beatsManagement.beatsTable.configStatus.okLabel": "确定", - "xpack.beatsManagement.beatsTable.configStatus.okTooltip": "Beat 成功应用最新的配置", - "xpack.beatsManagement.beatsTable.configStatus.progressTooltip": "此 Beat 当前正在从 CM 重新加载配置。", - "xpack.beatsManagement.beatsTable.configStatus.runningTooltip": "此 Beat 正在运行，没有任何问题。", - "xpack.beatsManagement.beatsTable.configStatus.startingTooltip": "此 Beat 正在启动。", - "xpack.beatsManagement.beatsTable.configStatusTitle": "配置状态", - "xpack.beatsManagement.beatsTable.disenrollSelectedLabel": "取消注册选定", - "xpack.beatsManagement.beatsTable.failedStatusLabel": "错误", - "xpack.beatsManagement.beatsTable.runningStatusLabel": "正在运行", - "xpack.beatsManagement.beatsTable.startingStatusLabel": "正在启动", - "xpack.beatsManagement.beatsTable.stoppedStatusLabel": "已停止", - "xpack.beatsManagement.beatsTable.tagsTitle": "标签", - "xpack.beatsManagement.beatsTable.typeLabel": "类型", - "xpack.beatsManagement.beatsTable.typeTitle": "类型", - "xpack.beatsManagement.beatsTable.updatingStatusLabel": "正在更新", - "xpack.beatsManagement.beatTagsTable.addTagLabel": "添加标签", - "xpack.beatsManagement.beatTagsTable.lastUpdateTitle": "上次更新", - "xpack.beatsManagement.beatTagsTable.removeSelectedLabel": "删除选定", - "xpack.beatsManagement.beatTagsTable.tagNameTitle": "标签名称", - "xpack.beatsManagement.breadcrumb.beatDetails": "{beatId} 的 Beat 详情", - "xpack.beatsManagement.breadcrumb.beatTags": "{beatId} 的 Beat 标签", - "xpack.beatsManagement.breadcrumb.configurationTags": "配置标签", - "xpack.beatsManagement.breadcrumb.enrolledBeats": "已注册 Beats", - "xpack.beatsManagement.centralManagementLinkLabel": "Beats 集中管理", - "xpack.beatsManagement.config.other.error": "使用有效的 YAML 格式", - "xpack.beatsManagement.config.otherConfigDescription": "使用 YAML 格式指定 Filebeat 输入的其他设置", - "xpack.beatsManagement.config.otherConfigLabel": "其他配置", - "xpack.beatsManagement.confirmModal.cancelButtonLabel": "取消", - "xpack.beatsManagement.confirmModal.confirmButtonLabel": "确认", - "xpack.beatsManagement.confirmModal.confirmWarningTitle": "确认", - "xpack.beatsManagement.createTag.errorSavingTagTitle": "保存标签时出错", - "xpack.beatsManagement.createTag.saveAndContinueButtonLabel": "保存并继续", - "xpack.beatsManagement.disabledSecurityDescription": "必须在 Kibana 和 Elasticsearch 启用安全性，才能使用 Beats 集中管理。", - "xpack.beatsManagement.disabledSecurityTitle": "安全性未启用", - "xpack.beatsManagement.enrollBeat.assignTagToBeatInvalidURLNoTagFoundTitle": "URL 无效，未找到 createdTag", - "xpack.beatsManagement.enrollBeat.assignTagToBeatInvalidURLNoTokenFountTitle": "URL 无效，未找到 enrollmentToken", - "xpack.beatsManagement.enrollBeat.assignTagToBeatNotEnrolledProperlyTitle": "错误：Beat 未正确注册", - "xpack.beatsManagement.enrollBeat.beatEnrolledTitle": "该 Beat 当前已在集中管理中注册：", - "xpack.beatsManagement.enrollBeat.beatsCentralManagementDescription": "在集中位置管理您的配置。", - "xpack.beatsManagement.enrollBeat.beatTypeColumnName": "Beat 类型", - "xpack.beatsManagement.enrollBeat.beatTypeTitle": "Beat 类型：", - "xpack.beatsManagement.enrollBeat.copyButtonLabel": "复制命令", - "xpack.beatsManagement.enrollBeat.createTagStepLabel": "创建标签", - "xpack.beatsManagement.enrollBeat.enrollBeatButtonLabel": "注册 Beat", - "xpack.beatsManagement.enrollBeat.enrollBeatStepLabel": "注册 Beat", - "xpack.beatsManagement.enrollBeat.finishStepLabel": "完成", - "xpack.beatsManagement.enrollBeat.firstBeatEnrollingDoneButtonLabel": "完成", - "xpack.beatsManagement.enrollBeat.getStartedBeatsCentralManagementTitle": "开始使用 Beats 集中管理", - "xpack.beatsManagement.enrollBeat.hostnameColumnName": "主机名", - "xpack.beatsManagement.enrollBeat.nextStepDescription": "启动您的 Beat 以检查是否有配置错误，然后单击“完成”。", - "xpack.beatsManagement.enrollBeat.nextStepTitle": "您的 Beat 已注册。后续操作", - "xpack.beatsManagement.enrollBeat.platformTitle": "平台：", - "xpack.beatsManagement.enrollBeat.versionColumnName": "版本", - "xpack.beatsManagement.enrollBeat.waitingBeatTypeToEnrollTitle": "正在等待注册 {beatType}……", - "xpack.beatsManagement.enrollBeat.yourBeatTypeHostTitle": "在安装您的 {beatType} 的主机上，运行：", - "xpack.beatsManagement.filebeatInputConfig.otherConfigDescription": "使用 YAML 格式指定 Filebeat 输入的其他设置", - "xpack.beatsManagement.filebeatInputConfig.otherConfigErrorMessage": "使用有效的 YAML 格式", - "xpack.beatsManagement.filebeatInputConfig.otherConfigLabel": "其他配置", - "xpack.beatsManagement.filebeatInputConfig.pathsDescription": "将每个路径放置在单独的行上", - "xpack.beatsManagement.filebeatInputConfig.pathsErrorMessage": "每行一个文件路径", - "xpack.beatsManagement.filebeatInputConfig.pathsLabel": "路径", - "xpack.beatsManagement.filebeatModuleConfig.moduleDescription": "使用 YAML 格式指定 Filebeat 模块的其他设置", - "xpack.beatsManagement.filebeatModuleConfig.moduleErrorMessage": "请选择模块", - "xpack.beatsManagement.filebeatModuleConfig.moduleLabel": "模块", - "xpack.beatsManagement.filebeatModuleConfig.otherConfigErrorMessage": "使用有效的 YAML 格式", - "xpack.beatsManagement.filebeatModuleConfig.otherConfigLabel": "其他配置", - "xpack.beatsManagement.invalidLicenseDescription": "您当前的许可证已过期。已注册的 Beats 将继续工作，但您需要有效的许可，才能访问 Beats 管理 UI。", - "xpack.beatsManagement.invalidLicenseTitle": "已过期许可证", - "xpack.beatsManagement.management.breadcrumb": "管理", - "xpack.beatsManagement.management.deprecationMessage": "我们已停止开发 Beats 集中管理，正开发一款全面的解决方案来替代它。感谢您参与公测版测试并提供反馈。如果您有任何问题或顾虑，请在 {forumLink} 上联系我们。", - "xpack.beatsManagement.management.deprecationTitle": "Beats 集中管理已弃用", - "xpack.beatsManagement.management.forumLink": "讨论论坛", - "xpack.beatsManagement.metricbeatModuleConfig.hostsDescription": "将每个路径放置在单独的行上", - "xpack.beatsManagement.metricbeatModuleConfig.hostsErrorMessage": "每行一个文件主机", - "xpack.beatsManagement.metricbeatModuleConfig.hostsLabel": "主机", - "xpack.beatsManagement.metricbeatModuleConfig.moduleErrorMessage": "请选择模块", - "xpack.beatsManagement.metricbeatModuleConfig.moduleLabel": "模块", - "xpack.beatsManagement.metricbeatModuleConfig.otherConfigDescription": "使用 YAML 格式指定 Metricbeat 模块的其他设置", - "xpack.beatsManagement.metricbeatModuleConfig.otherConfigErrorMessage": "使用有效的 YAML 格式", - "xpack.beatsManagement.metricbeatModuleConfig.otherConfigLabel": "其他配置", - "xpack.beatsManagement.metricbeatModuleConfig.periodErrorMessage": "期间无效，10 秒的格式必须为 `10s`。", - "xpack.beatsManagement.metricbeatModuleConfig.periodLabel": "期间", - "xpack.beatsManagement.noAccess.accessDeniedDescription": "您无权访问 Beats 集中管理。要使用 Beats 集中管理，您需要 {beatsAdminRole} 角色授予的权限。", - "xpack.beatsManagement.noAccess.accessDeniedTitle": "访问被拒绝", - "xpack.beatsManagement.noContentFoundErrorMessage": "未找到任何内容", - "xpack.beatsManagement.outputConfig.hostsErrorMessage": "每行一个文件主机", - "xpack.beatsManagement.outputConfig.hostsLabel": "主机", - "xpack.beatsManagement.outputConfig.outputTypeErrorMessage": "请选择输出类型", - "xpack.beatsManagement.outputConfig.outputTypeLabel": "输出类型", - "xpack.beatsManagement.outputConfig.passwordErrorMessage": "无法处理的密码", - "xpack.beatsManagement.outputConfig.passwordLabel": "密码", - "xpack.beatsManagement.outputConfig.usernameErrorMessage": "无法处理的用户名", - "xpack.beatsManagement.outputConfig.usernameLabel": "用户名", - "xpack.beatsManagement.overview.betaBadgeText": "公测版", - "xpack.beatsManagement.table.filterResultsPlaceholder": "筛选结果", - "xpack.beatsManagement.table.selectOptionLabel": "请选择选项", - "xpack.beatsManagement.table.selectThisBeatTooltip": "选择此 Beat", - "xpack.beatsManagement.tag.addConfigurationButtonLabel": "添加配置块", - "xpack.beatsManagement.tag.beatsAssignedToTagTitle": "具有此标签的 Beats", - "xpack.beatsManagement.tag.cancelButtonLabel": "取消", - "xpack.beatsManagement.tag.createTagTitle": "创建标签", - "xpack.beatsManagement.tag.saveButtonLabel": "保存", - "xpack.beatsManagement.tag.tagColorLabel": "标签颜色", - "xpack.beatsManagement.tag.tagConfigurationsDescription": "标签可以有不同类型 Beats 的配置块。例如，标签可以有两个 Metricbeat 配置块和一个 Filebeat 输入配置块。", - "xpack.beatsManagement.tag.tagConfigurationsTitle": "配置块", - "xpack.beatsManagement.tag.tagDetailsDescription": "标签是可以应用到一个或多个 Beats 的一组配置块。", - "xpack.beatsManagement.tag.tagDetailsTitle": "标签详情", - "xpack.beatsManagement.tag.tagName.validationErrorMessage": "标签名称只能由字母、数字和短划线构成", - "xpack.beatsManagement.tag.tagNameLabel": "标签名称", - "xpack.beatsManagement.tag.tagNamePlaceholder": "标签名称 (必填) ", - "xpack.beatsManagement.tag.updateTagTitle": "创建标签：{tagId}", - "xpack.beatsManagement.tagConfig.addConfigurationTitle\"": "添加配置块", - "xpack.beatsManagement.tagConfig.closeButtonLabel": "关闭", - "xpack.beatsManagement.tagConfig.configurationTypeText": "{configType} 配置", - "xpack.beatsManagement.tagConfig.descriptionLabel": "描述", - "xpack.beatsManagement.tagConfig.descriptionPlaceholder": "描述 (可选) ", - "xpack.beatsManagement.tagConfig.editConfigurationTitle": "编辑配置块", - "xpack.beatsManagement.tagConfig.filebeatInputLabel": "Filebeat 输入", - "xpack.beatsManagement.tagConfig.filebeatModuleLabel": "Filebeat 模块", - "xpack.beatsManagement.tagConfig.invalidSchema": "错误：此配置无效，其不受 Beats 支持，应移除", - "xpack.beatsManagement.tagConfig.metricbeatModuleLabel": "Metricbeat 模块", - "xpack.beatsManagement.tagConfig.outputLabel": "输出", - "xpack.beatsManagement.tagConfig.saveButtonLabel": "保存", - "xpack.beatsManagement.tagConfig.typeLabel": "类型", - "xpack.beatsManagement.tagConfig.viewConfigurationTitle\"": "查看配置块", - "xpack.beatsManagement.tagConfigAssignmentOptions.removeTagsButtonLabel": "删除标签", - "xpack.beatsManagement.tagConfigAssignmentOptions.removeTagsWarninigMessage": "从选定 Beats 删除该标签？", - "xpack.beatsManagement.tagConfigAssignmentOptions.removeTagsWarninigTitle": "删除标签", - "xpack.beatsManagement.tagListAssignmentOptions.removeTagsButtonLabel": "删除选定", - "xpack.beatsManagement.tagListAssignmentOptions.removeTagsWarninigTitle": "删除标签", - "xpack.beatsManagement.tagListAssignmentOptions.removeTagWarninigMessage": "删除标签？", - "xpack.beatsManagement.tags.addTagButtonLabel": "添加标签", - "xpack.beatsManagement.tags.someTagsMightBeAssignedToBeatsTitle": "以下部分标签可能已分配给 Beats。请确保正要删除的标签当前未被分配", - "xpack.beatsManagement.tagsTable.lastUpdateTitle": "上次更新", - "xpack.beatsManagement.tagsTable.removeSelectedLabel": "删除选定", - "xpack.beatsManagement.tagsTable.tagNameTitle": "标签名称", - "xpack.beatsManagement.tagTable.actions.removeButtonAriaLabel": "移除", - "xpack.beatsManagement.tagTable.actions.removeTooltip": "从标签删除此配置", - "xpack.beatsManagement.tagTable.actionsColumnName": "操作", - "xpack.beatsManagement.tagTable.descriptionColumnName": "描述", - "xpack.beatsManagement.tagTable.moduleColumn.notAvailibaleLabel": "不可用", - "xpack.beatsManagement.tagTable.moduleColumnName": "模块", - "xpack.beatsManagement.tagTable.typeColumnName": "类型", - "xpack.beatsManagement.walkthrough.initial.betaBadgeText": "公测版", "xpack.canvas.app.loadErrorMessage": "消息：{error}", "xpack.canvas.app.loadErrorTitle": "Canvas 加载失败", "xpack.canvas.app.loadingMessage": "Canvas 正在加载", diff --git a/x-pack/test/api_integration/apis/beats/assign_tags_to_beats.js b/x-pack/test/api_integration/apis/beats/assign_tags_to_beats.js deleted file mode 100644 index c11bdb7112640a..00000000000000 --- a/x-pack/test/api_integration/apis/beats/assign_tags_to_beats.js +++ /dev/null @@ -1,254 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import expect from '@kbn/expect'; -import { ES_INDEX_NAME } from './constants'; - -export default function ({ getService }) { - const supertest = getService('supertest'); - const esArchiver = getService('esArchiver'); - const es = getService('legacyEs'); - const randomness = getService('randomness'); - - describe('assign_tags_to_beats', () => { - const archive = 'beats/list'; - - beforeEach('load beats archive', () => esArchiver.load(archive)); - afterEach('unload beats archive', () => esArchiver.unload(archive)); - - it('should add a single tag to a single beat', async () => { - const { body: apiResponse } = await supertest - .post('/api/beats/agents_tags/assignments') - .set('kbn-xsrf', 'xxx') - .send({ - assignments: [{ beatId: 'bar', tag: 'production' }], - }) - .expect(200); - - expect(apiResponse.results).to.eql([{ success: true, result: { message: 'updated' } }]); - - const esResponse = await es.get({ - index: ES_INDEX_NAME, - id: `beat:bar`, - }); - - const beat = esResponse._source.beat; - expect(beat.tags).to.eql(['production']); - }); - - it('should not re-add an existing tag to a beat', async () => { - const tags = ['production']; - - let esResponse; - let beat; - - // Before adding the existing tag - esResponse = await es.get({ - index: ES_INDEX_NAME, - id: `beat:foo`, - }); - - beat = esResponse._source.beat; - expect(beat.tags).to.eql([...tags, 'qa']); - - // Adding the existing tag - const { body: apiResponse } = await supertest - .post('/api/beats/agents_tags/assignments') - .set('kbn-xsrf', 'xxx') - .send({ - assignments: [{ beatId: 'foo', tag: 'production' }], - }) - .expect(200); - - expect(apiResponse.results).to.eql([{ success: true, result: { message: 'updated' } }]); - - // After adding the existing tag - esResponse = await es.get({ - index: ES_INDEX_NAME, - id: `beat:foo`, - }); - - beat = esResponse._source.beat; - expect(beat.tags).to.eql([...tags, 'qa']); - }); - - it('should add a single tag to a multiple beats', async () => { - const { body: apiResponse } = await supertest - .post('/api/beats/agents_tags/assignments') - .set('kbn-xsrf', 'xxx') - .send({ - assignments: [ - { beatId: 'foo', tag: 'development' }, - { beatId: 'bar', tag: 'development' }, - ], - }) - .expect(200); - - expect(apiResponse.results).to.eql([ - { success: true, result: { message: 'updated' } }, - { success: true, result: { message: 'updated' } }, - ]); - - let esResponse; - let beat; - - // Beat foo - esResponse = await es.get({ - index: ES_INDEX_NAME, - id: `beat:foo`, - }); - - beat = esResponse._source.beat; - expect(beat.tags).to.eql(['production', 'qa', 'development']); // as beat 'foo' already had 'production' and 'qa' tags attached to it - - // Beat bar - esResponse = await es.get({ - index: ES_INDEX_NAME, - id: `beat:bar`, - }); - - beat = esResponse._source.beat; - expect(beat.tags).to.eql(['development']); - }); - - it('should add multiple tags to a single beat', async () => { - const { body: apiResponse } = await supertest - .post('/api/beats/agents_tags/assignments') - .set('kbn-xsrf', 'xxx') - .send({ - assignments: [ - { beatId: 'bar', tag: 'development' }, - { beatId: 'bar', tag: 'production' }, - ], - }) - .expect(200); - - expect(apiResponse.results).to.eql([ - { success: true, result: { message: 'updated' } }, - { success: true, result: { message: 'updated' } }, - ]); - - const esResponse = await es.get({ - index: ES_INDEX_NAME, - id: `beat:bar`, - }); - - const beat = esResponse._source.beat; - expect(beat.tags).to.eql(['development', 'production']); - }); - - it('should add multiple tags to a multiple beats', async () => { - const { body: apiResponse } = await supertest - .post('/api/beats/agents_tags/assignments') - .set('kbn-xsrf', 'xxx') - .send({ - assignments: [ - { beatId: 'foo', tag: 'development' }, - { beatId: 'bar', tag: 'production' }, - ], - }) - .expect(200); - - expect(apiResponse.results).to.eql([ - { success: true, result: { message: 'updated' } }, - { success: true, result: { message: 'updated' } }, - ]); - - let esResponse; - let beat; - - // Beat foo - esResponse = await es.get({ - index: ES_INDEX_NAME, - id: `beat:foo`, - }); - - beat = esResponse._source.beat; - expect(beat.tags).to.eql(['production', 'qa', 'development']); // as beat 'foo' already had 'production' and 'qa' tags attached to it - - // Beat bar - esResponse = await es.get({ - index: ES_INDEX_NAME, - id: `beat:bar`, - }); - - beat = esResponse._source.beat; - expect(beat.tags).to.eql(['production']); - }); - - it('should return errors for non-existent beats', async () => { - const nonExistentBeatId = randomness.word(); - - const { body: apiResponse } = await supertest - .post('/api/beats/agents_tags/assignments') - .set('kbn-xsrf', 'xxx') - .send({ - assignments: [{ beatId: nonExistentBeatId, tag: 'production' }], - }) - .expect(200); - - expect(apiResponse.results).to.eql([ - { success: false, error: { code: 404, message: `Beat ${nonExistentBeatId} not found` } }, - ]); - }); - - it('should return errors for non-existent tags', async () => { - const nonExistentTag = randomness.word(); - - const { body: apiResponse } = await supertest - .post('/api/beats/agents_tags/assignments') - .set('kbn-xsrf', 'xxx') - .send({ - assignments: [{ beatId: 'bar', tag: nonExistentTag }], - }) - .expect(200); - - expect(apiResponse.results).to.eql([ - { success: false, error: { code: 404, message: `Tag ${nonExistentTag} not found` } }, - ]); - - const esResponse = await es.get({ - index: ES_INDEX_NAME, - id: `beat:bar`, - }); - - const beat = esResponse._source.beat; - expect(beat).to.not.have.property('tags'); - }); - - it('should return errors for non-existent beats and tags', async () => { - const nonExistentBeatId = randomness.word(); - const nonExistentTag = randomness.word(); - - const { body: apiResponse } = await supertest - .post('/api/beats/agents_tags/assignments') - .set('kbn-xsrf', 'xxx') - .send({ - assignments: [{ beatId: nonExistentBeatId, tag: nonExistentTag }], - }) - .expect(200); - - expect(apiResponse.results).to.eql([ - { - success: false, - error: { - code: 404, - message: `Beat ${nonExistentBeatId} and tag ${nonExistentTag} not found`, - }, - }, - ]); - - const esResponse = await es.get({ - index: ES_INDEX_NAME, - id: `beat:bar`, - }); - - const beat = esResponse._source.beat; - expect(beat).to.not.have.property('tags'); - }); - }); -} diff --git a/x-pack/test/api_integration/apis/beats/constants.js b/x-pack/test/api_integration/apis/beats/constants.js deleted file mode 100644 index 9e8064f4d1b5b1..00000000000000 --- a/x-pack/test/api_integration/apis/beats/constants.js +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export const ES_INDEX_NAME = '.management-beats'; diff --git a/x-pack/test/api_integration/apis/beats/create_enrollment_tokens.js b/x-pack/test/api_integration/apis/beats/create_enrollment_tokens.js deleted file mode 100644 index 5ac59b690465fb..00000000000000 --- a/x-pack/test/api_integration/apis/beats/create_enrollment_tokens.js +++ /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 expect from '@kbn/expect'; -import moment from 'moment'; -import { ES_INDEX_NAME } from './constants'; - -export default function ({ getService }) { - const supertest = getService('supertest'); - const es = getService('legacyEs'); - - describe('create_enrollment_token', () => { - it('should create one token by default', async () => { - const { body: apiResponse } = await supertest - .post('/api/beats/enrollment_tokens') - .set('kbn-xsrf', 'xxx') - .send() - .expect(200); - - const tokensFromApi = apiResponse.results.map((r) => r.item); - - const esResponse = await es.search({ - index: ES_INDEX_NAME, - q: 'type:enrollment_token', - }); - - const tokensInEs = esResponse.hits.hits.map((hit) => hit._source.enrollment_token.token); - - expect(tokensFromApi.length).to.eql(1); - expect(tokensFromApi).to.eql(tokensInEs); - }); - - it('should create the specified number of tokens', async () => { - const numTokens = 1000; - - const { body: apiResponse } = await supertest - .post('/api/beats/enrollment_tokens') - .set('kbn-xsrf', 'xxx') - .send({ - num_tokens: numTokens, - }) - .expect(200); - - const tokensFromApi = apiResponse.results.map((r) => r.item); - - const esResponse = await es.search({ - index: ES_INDEX_NAME, - q: 'type:enrollment_token', - size: numTokens, - }); - - const tokensInEs = esResponse.hits.hits.map((hit) => hit._source.enrollment_token.token); - - expect(tokensFromApi).to.be.an('array'); - expect(tokensFromApi.length).to.eql(numTokens); - expect(tokensInEs.length).to.eql(numTokens); - expect(tokensFromApi.sort()).to.eql(tokensInEs.sort()); - }); - - it('should set token expiration to 10 minutes from now by default', async () => { - await supertest - .post('/api/beats/enrollment_tokens') - .set('kbn-xsrf', 'xxx') - .send() - .expect(200); - - const esResponse = await es.search({ - index: ES_INDEX_NAME, - q: 'type:enrollment_token', - }); - - const tokenInEs = esResponse.hits.hits[0]._source.enrollment_token; - - // We do a fuzzy check to see if the token expires between 9 and 10 minutes - // from now because a bit of time has elapsed been the creation of the - // tokens and this check. - const tokenExpiresOn = moment(tokenInEs.expires_on).valueOf(); - const tenMinutesFromNow = moment().add('10', 'minutes').valueOf(); - const almostTenMinutesFromNow = moment(tenMinutesFromNow).subtract('2', 'seconds').valueOf(); - expect(tokenExpiresOn).to.be.lessThan(tenMinutesFromNow); - expect(tokenExpiresOn).to.be.greaterThan(almostTenMinutesFromNow); - }); - }); -} diff --git a/x-pack/test/api_integration/apis/beats/enroll_beat.js b/x-pack/test/api_integration/apis/beats/enroll_beat.js deleted file mode 100644 index a1ac449e7fcb85..00000000000000 --- a/x-pack/test/api_integration/apis/beats/enroll_beat.js +++ /dev/null @@ -1,184 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import expect from '@kbn/expect'; -import moment from 'moment'; - -import { ES_INDEX_NAME } from './constants'; - -export default function ({ getService }) { - const supertest = getService('supertest'); - const randomness = getService('randomness'); - const es = getService('legacyEs'); - - describe('enroll_beat', () => { - let validEnrollmentToken; - let beatId; - let beat; - - beforeEach(async () => { - validEnrollmentToken = randomness.word(); - - beatId = randomness.word(); - const version = - randomness.integer({ min: 1, max: 10 }) + - '.' + - randomness.integer({ min: 1, max: 10 }) + - '.' + - randomness.integer({ min: 1, max: 10 }); - - beat = { - type: 'filebeat', - host_name: 'foo.bar.com', - name: randomness.word(), - version, - }; - - await es.index({ - index: ES_INDEX_NAME, - id: `enrollment_token:${validEnrollmentToken}`, - body: { - type: 'enrollment_token', - enrollment_token: { - token: validEnrollmentToken, - expires_on: moment().add(4, 'hours').toJSON(), - }, - }, - }); - }); - - it('should enroll beat in a verified state', async () => { - await supertest - .post(`/api/beats/agent/${beatId}`) - .set('kbn-xsrf', 'xxx') - .set('kbn-beats-enrollment-token', validEnrollmentToken) - .send(beat) - .expect(200); - - const esResponse = await es.get({ - index: ES_INDEX_NAME, - id: `beat:${beatId}`, - }); - - expect(esResponse._source.beat).to.have.property('verified_on'); - expect(esResponse._source.beat).to.have.property('host_ip'); - }); - - it('should contain an access token in the response', async () => { - const { body: apiResponse } = await supertest - .post(`/api/beats/agent/${beatId}`) - .set('kbn-xsrf', 'xxx') - .set('kbn-beats-enrollment-token', validEnrollmentToken) - .send(beat) - .expect(200); - - const accessTokenFromApi = apiResponse.item; - - const esResponse = await es.get({ - index: ES_INDEX_NAME, - id: `beat:${beatId}`, - }); - - const accessTokenInEs = esResponse._source.beat.access_token; - - expect(accessTokenFromApi.length).to.be.greaterThan(0); - expect(accessTokenFromApi).to.eql(accessTokenInEs); - }); - - it('should reject an invalid enrollment token', async () => { - const { body: apiResponse } = await supertest - .post(`/api/beats/agent/${beatId}`) - .set('kbn-xsrf', 'xxx') - .set('kbn-beats-enrollment-token', randomness.word()) - .send(beat) - .expect(400); - - expect(apiResponse).to.eql({ - statusCode: 400, - error: 'Bad Request', - message: 'Invalid enrollment token', - }); - }); - - it('should reject an expired enrollment token', async () => { - const expiredEnrollmentToken = - 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.' + - 'eyJjcmVhdGVkIjoiMjAxOC0wNi0zMFQwMzo0MjoxNS4yMzBaIiwiaWF0IjoxNTMwMzMwMTM1LCJleHAiOjE1MzAzMzAxMzV9.' + - 'Azf4czAwWZEflR7Pf8pi-DUTcve9xyxWyViNYeUSGog'; - - await es.index({ - index: ES_INDEX_NAME, - id: `enrollment_token:${expiredEnrollmentToken}`, - body: { - type: 'enrollment_token', - enrollment_token: { - token: expiredEnrollmentToken, - expires_on: moment().subtract(1, 'minute').toJSON(), - }, - }, - }); - - const { body: apiResponse } = await supertest - .post(`/api/beats/agent/${beatId}`) - .set('kbn-xsrf', 'xxx') - .set('kbn-beats-enrollment-token', expiredEnrollmentToken) - .send(beat) - .expect(400); - - expect(apiResponse).to.eql({ - statusCode: 400, - error: 'Bad Request', - message: 'Expired enrollment token', - }); - }); - - it('should delete the given enrollment token so it may not be reused', async () => { - await supertest - .post(`/api/beats/agent/${beatId}`) - .set('kbn-xsrf', 'xxx') - .set('kbn-beats-enrollment-token', validEnrollmentToken) - .send(beat) - .expect(200); - - const esResponse = await es.get({ - index: ES_INDEX_NAME, - id: `enrollment_token:${validEnrollmentToken}`, - ignore: [404], - }); - - expect(esResponse.found).to.be(false); - }); - - it('should fail if the beat with the same ID is enrolled twice', async () => { - await supertest - .post(`/api/beats/agent/${beatId}`) - .set('kbn-xsrf', 'xxx') - .set('kbn-beats-enrollment-token', validEnrollmentToken) - .send(beat) - .expect(200); - - await es.index({ - index: ES_INDEX_NAME, - id: `enrollment_token:${validEnrollmentToken}`, - body: { - type: 'enrollment_token', - enrollment_token: { - token: validEnrollmentToken, - expires_on: moment().add(4, 'hours').toJSON(), - }, - }, - }); - - await supertest - .post(`/api/beats/agent/${beatId}`) - .set('kbn-xsrf', 'xxx') - .set('kbn-beats-enrollment-token', validEnrollmentToken) - .send(beat) - .expect(200); - }); - }); -} diff --git a/x-pack/test/api_integration/apis/beats/get_beat.js b/x-pack/test/api_integration/apis/beats/get_beat.js deleted file mode 100644 index 610ea72bb3d423..00000000000000 --- a/x-pack/test/api_integration/apis/beats/get_beat.js +++ /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 expect from '@kbn/expect'; -import { ES_INDEX_NAME } from './constants'; - -export default function ({ getService }) { - const supertest = getService('supertest'); - const esArchiver = getService('esArchiver'); - const es = getService('legacyEs'); - - describe('get_beat_configuration', () => { - const archive = 'beats/list'; - - beforeEach('load beats archive', () => esArchiver.load(archive)); - afterEach('unload beats archive', () => esArchiver.unload(archive)); - - it('should return no configurations for the beat without tags', async () => { - await es.index({ - index: ES_INDEX_NAME, - id: `beat:empty`, - body: { - type: 'beat', - beat: { - type: 'filebeat', - active: true, - host_ip: '1.2.3.4', - host_name: 'empty.com', - id: 'empty', - name: 'empty_filebeat', - access_token: - 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjcmVhdGVkIjoiMjAxOC0wNi0zMFQwMzo0MjoxNS4yMzBaIiwiaWF0IjoxNTMwMzMwMTM1fQ.SSsX2Byyo1B1bGxV8C3G4QldhE5iH87EY_1r21-bwbI', // eslint-disable-line - }, - }, - }); - - const { body: apiResponse } = await supertest - .get('/api/beats/agent/empty/configuration') - .set( - 'kbn-beats-access-token', - 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.' + - 'eyJjcmVhdGVkIjoiMjAxOC0wNi0zMFQwMzo0MjoxNS4yMzBaIiwiaWF0IjoxNTMwMzMwMTM1fQ.' + - 'SSsX2Byyo1B1bGxV8C3G4QldhE5iH87EY_1r21-bwbI' - ) - .expect(200); - - const configurationBlocks = apiResponse.list; - - expect(configurationBlocks).to.be.an(Array); - expect(configurationBlocks.length).to.be(0); - }); - - it('should return merged configuration for the beat', async () => { - const { body: apiResponse } = await supertest - .get('/api/beats/agent/foo/configuration') - .set( - 'kbn-beats-access-token', - 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.' + - 'eyJjcmVhdGVkIjoiMjAxOC0wNi0zMFQwMzo0MjoxNS4yMzBaIiwiaWF0IjoxNTMwMzMwMTM1fQ.' + - 'SSsX2Byyo1B1bGxV8C3G4QldhE5iH87EY_1r21-bwbI' - ) - .expect(200); - - const configurationBlocks = apiResponse.list; - - expect(configurationBlocks).to.be.an(Array); - expect(configurationBlocks.length).to.be(3); - - expect(configurationBlocks[1].type).to.be('metricbeat.modules'); - expect(configurationBlocks[1].config).to.eql({ - module: 'memcached', - hosts: ['localhost:11211'], - }); - - expect(configurationBlocks[2].type).to.be('metricbeat.modules'); - expect(configurationBlocks[2].config).to.eql({ - module: 'memcached', - hosts: ['localhost:4949'], - 'node.namespace': 'node', - }); - }); - }); -} diff --git a/x-pack/test/api_integration/apis/beats/index.js b/x-pack/test/api_integration/apis/beats/index.js deleted file mode 100644 index b490ddd24da388..00000000000000 --- a/x-pack/test/api_integration/apis/beats/index.js +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { ES_INDEX_NAME } from './constants'; - -export default function ({ getService, loadTestFile }) { - const es = getService('legacyEs'); - - describe('beats', () => { - const cleanup = () => - es.indices.delete({ - index: ES_INDEX_NAME, - ignore: [404], - }); - - beforeEach(cleanup); - - loadTestFile(require.resolve('./create_enrollment_tokens')); - loadTestFile(require.resolve('./enroll_beat')); - loadTestFile(require.resolve('./list_beats')); - loadTestFile(require.resolve('./update_beat')); - loadTestFile(require.resolve('./set_tag')); - loadTestFile(require.resolve('./assign_tags_to_beats')); - loadTestFile(require.resolve('./remove_tags_from_beats')); - loadTestFile(require.resolve('./get_beat')); - }); -} diff --git a/x-pack/test/api_integration/apis/beats/list_beats.js b/x-pack/test/api_integration/apis/beats/list_beats.js deleted file mode 100644 index a844b814f7ca8c..00000000000000 --- a/x-pack/test/api_integration/apis/beats/list_beats.js +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import expect from '@kbn/expect'; - -export default function ({ getService }) { - const supertest = getService('supertest'); - const esArchiver = getService('esArchiver'); - - describe('list_beats', () => { - const archive = 'beats/list'; - - beforeEach('load beats archive', () => esArchiver.load(archive)); - afterEach('unload beats archive', () => esArchiver.unload(archive)); - - it('should return all beats', async () => { - const { body: apiResponse } = await supertest.get('/api/beats/agents').expect(200); - - const beatsFromApi = apiResponse.list; - - expect(beatsFromApi.length).to.be(4); - expect(beatsFromApi.filter((beat) => beat.hasOwnProperty('verified_on')).length).to.be(1); - expect(beatsFromApi.find((beat) => beat.hasOwnProperty('verified_on')).id).to.be('foo'); - }); - - it('should not return access tokens', async () => { - const { body: apiResponse } = await supertest.get('/api/beats/agents').expect(200); - - const beatsFromApi = apiResponse.list; - - expect(beatsFromApi.length).to.be(4); - expect(beatsFromApi.filter((beat) => beat.hasOwnProperty('access_token')).length).to.be(0); - }); - }); -} diff --git a/x-pack/test/api_integration/apis/beats/remove_tags_from_beats.js b/x-pack/test/api_integration/apis/beats/remove_tags_from_beats.js deleted file mode 100644 index 1c9ce2ffb7d484..00000000000000 --- a/x-pack/test/api_integration/apis/beats/remove_tags_from_beats.js +++ /dev/null @@ -1,218 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import expect from '@kbn/expect'; -import { ES_INDEX_NAME } from './constants'; - -export default function ({ getService }) { - const supertest = getService('supertest'); - const esArchiver = getService('esArchiver'); - const es = getService('legacyEs'); - const randomness = getService('randomness'); - - describe('remove_tags_from_beats', () => { - const archive = 'beats/list'; - - beforeEach('load beats archive', () => esArchiver.load(archive)); - afterEach('unload beats archive', () => esArchiver.unload(archive)); - - it('should remove a single tag from a single beat', async () => { - const { body: apiResponse } = await supertest - .post('/api/beats/agents_tags/removals') - .set('kbn-xsrf', 'xxx') - .send({ - removals: [{ beatId: 'foo', tag: 'production' }], - }) - .expect(200); - - expect(apiResponse.results).to.eql([{ success: true, result: { message: 'updated' } }]); - - const esResponse = await es.get({ - index: ES_INDEX_NAME, - id: `beat:foo`, - }); - - const beat = esResponse._source.beat; - expect(beat.tags).to.eql(['qa']); - }); - - it('should remove a single tag from a multiple beats', async () => { - const { body: apiResponse } = await supertest - .post('/api/beats/agents_tags/removals') - .set('kbn-xsrf', 'xxx') - .send({ - removals: [ - { beatId: 'foo', tag: 'development' }, - { beatId: 'bar', tag: 'development' }, - ], - }) - .expect(200); - - expect(apiResponse.results).to.eql([ - { success: true, result: { message: 'updated' } }, - { success: true, result: { message: 'updated' } }, - ]); - - let esResponse; - let beat; - - // Beat foo - esResponse = await es.get({ - index: ES_INDEX_NAME, - id: `beat:foo`, - }); - - beat = esResponse._source.beat; - expect(beat.tags).to.eql(['production', 'qa']); // as beat 'foo' already had 'production' and 'qa' tags attached to it - - // Beat bar - esResponse = await es.get({ - index: ES_INDEX_NAME, - id: `beat:bar`, - }); - - beat = esResponse._source.beat; - expect(beat).to.not.have.property('tags'); - }); - - it('should remove multiple tags from a single beat', async () => { - const { body: apiResponse } = await supertest - .post('/api/beats/agents_tags/removals') - .set('kbn-xsrf', 'xxx') - .send({ - removals: [ - { beatId: 'foo', tag: 'development' }, - { beatId: 'foo', tag: 'production' }, - ], - }) - .expect(200); - - expect(apiResponse.results).to.eql([ - { success: true, result: { message: 'updated' } }, - { success: true, result: { message: 'updated' } }, - ]); - - const esResponse = await es.get({ - index: ES_INDEX_NAME, - id: `beat:foo`, - }); - - const beat = esResponse._source.beat; - expect(beat.tags).to.eql(['qa']); // as beat 'foo' already had 'production' and 'qa' tags attached to it - }); - - it('should remove multiple tags from a multiple beats', async () => { - const { body: apiResponse } = await supertest - .post('/api/beats/agents_tags/removals') - .set('kbn-xsrf', 'xxx') - .send({ - removals: [ - { beatId: 'foo', tag: 'production' }, - { beatId: 'bar', tag: 'development' }, - ], - }) - .expect(200); - - expect(apiResponse.results).to.eql([ - { success: true, result: { message: 'updated' } }, - { success: true, result: { message: 'updated' } }, - ]); - - let esResponse; - let beat; - - // Beat foo - esResponse = await es.get({ - index: ES_INDEX_NAME, - id: `beat:foo`, - }); - - beat = esResponse._source.beat; - expect(beat.tags).to.eql(['qa']); // as beat 'foo' already had 'production' and 'qa' tags attached to it - - // Beat bar - esResponse = await es.get({ - index: ES_INDEX_NAME, - id: `beat:bar`, - }); - - beat = esResponse._source.beat; - expect(beat).to.not.have.property('tags'); - }); - - it('should return errors for non-existent beats', async () => { - const nonExistentBeatId = randomness.word(); - - const { body: apiResponse } = await supertest - .post('/api/beats/agents_tags/removals') - .set('kbn-xsrf', 'xxx') - .send({ - removals: [{ beatId: nonExistentBeatId, tag: 'production' }], - }) - .expect(200); - - expect(apiResponse.results).to.eql([ - { success: false, error: { code: 404, message: `Beat ${nonExistentBeatId} not found` } }, - ]); - }); - - it('should return errors for non-existent tags', async () => { - const nonExistentTag = randomness.word(); - - const { body: apiResponse } = await supertest - .post('/api/beats/agents_tags/removals') - .set('kbn-xsrf', 'xxx') - .send({ - removals: [{ beatId: 'bar', tag: nonExistentTag }], - }) - .expect(200); - - expect(apiResponse.results).to.eql([ - { success: false, error: { code: 404, message: `Tag ${nonExistentTag} not found` } }, - ]); - - const esResponse = await es.get({ - index: ES_INDEX_NAME, - id: `beat:bar`, - }); - - const beat = esResponse._source.beat; - expect(beat).to.not.have.property('tags'); - }); - - it('should return errors for non-existent beats and tags', async () => { - const nonExistentBeatId = randomness.word(); - const nonExistentTag = randomness.word(); - - const { body: apiResponse } = await supertest - .post('/api/beats/agents_tags/removals') - .set('kbn-xsrf', 'xxx') - .send({ - removals: [{ beatId: nonExistentBeatId, tag: nonExistentTag }], - }) - .expect(200); - - expect(apiResponse.results).to.eql([ - { - success: false, - error: { - code: 404, - message: `Beat ${nonExistentBeatId} and tag ${nonExistentTag} not found`, - }, - }, - ]); - - const esResponse = await es.get({ - index: ES_INDEX_NAME, - id: `beat:bar`, - }); - - const beat = esResponse._source.beat; - expect(beat).to.not.have.property('tags'); - }); - }); -} diff --git a/x-pack/test/api_integration/apis/beats/set_config.js b/x-pack/test/api_integration/apis/beats/set_config.js deleted file mode 100644 index fbc3db30313bfb..00000000000000 --- a/x-pack/test/api_integration/apis/beats/set_config.js +++ /dev/null @@ -1,246 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import expect from '@kbn/expect'; -import { ES_INDEX_NAME } from './constants'; - -export default function ({ getService }) { - const supertest = getService('supertest'); - const es = getService('legacyEs'); - const esArchiver = getService('esArchiver'); - - describe('set_config', () => { - const archive = 'beats/list'; - - beforeEach('load archive', () => esArchiver.load(archive)); - afterEach('unload archive', () => esArchiver.unload(archive)); - - it('should create a configuration block', async () => { - const tagId = 'qa'; - await supertest - .put(`/api/beats/configurations`) - .set('kbn-xsrf', 'xxx') - .send([ - { - type: 'output', - description: 'smething', - config: { elasticsearch: { hosts: ['localhost:9200'], username: 'foo' } }, - }, - ]) - .expect(200); - const esResponse = await es.get({ - index: ES_INDEX_NAME, - id: `tag:${tagId}`, - }); - - const tagInEs = esResponse._source; - - expect(tagInEs.type).to.be('tag'); - expect(tagInEs.tag.id).to.be(tagId); - expect(tagInEs.tag.configuration_blocks).to.be.an(Array); - expect(tagInEs.tag.configuration_blocks.length).to.be(1); - expect(tagInEs.tag.configuration_blocks[0].type).to.be('output'); - expect(tagInEs.tag.configuration_blocks[0].configs).to.eql([ - { - elasticsearch: { - hosts: ['localhost:9200'], - username: 'foo', - }, - }, - ]); - }); - - // it('should create a tag with two configuration blocks', async () => { - // const tagId = 'production'; - // await supertest - // .put(`/api/beats/tag/${tagId}`) - // .set('kbn-xsrf', 'xxx') - // .send({ - // configuration_blocks: [ - // { - // type: 'filebeat.inputs', - // configs: [ - // { - // paths: ['./foo'], - // }, - // ], - // }, - // { - // type: 'output', - // configs: [ - // { - // elasticsearch: { - // hosts: ['localhost:9200'], - // username: 'foo', - // }, - // }, - // ], - // }, - // ], - // }) - // .expect(201); - - // const esResponse = await es.get({ - // index: ES_INDEX_NAME, - // type: ES_TYPE_NAME, - // id: `tag:${tagId}`, - // }); - - // const tagInEs = esResponse._source; - - // expect(tagInEs.type).to.be('tag'); - // expect(tagInEs.tag.id).to.be(tagId); - // expect(tagInEs.tag.configuration_blocks).to.be.an(Array); - // expect(tagInEs.tag.configuration_blocks.length).to.be(2); - // expect(tagInEs.tag.configuration_blocks[0].type).to.be('filebeat.inputs'); - // expect(tagInEs.tag.configuration_blocks[0].configs).to.eql([ - // { - // paths: ['./foo'], - // }, - // ]); - // expect(tagInEs.tag.configuration_blocks[1].type).to.be('output'); - // expect(tagInEs.tag.configuration_blocks[1].configs).to.eql([ - // { - // elasticsearch: { - // hosts: ['localhost:9200'], - // username: 'foo', - // }, - // }, - // ]); - // }); - - // it('should fail when creating a tag with two configuration blocks of type output', async () => { - // const tagId = 'production'; - // await supertest - // .put(`/api/beats/tag/${tagId}`) - // .set('kbn-xsrf', 'xxx') - // .send({ - // configuration_blocks: [ - // { - // type: 'output', - // configs: [ - // { - // elasticsearch: { - // hosts: ['localhost:9200'], - // username: 'foo', - // }, - // }, - // ], - // }, - // { - // type: 'output', - // configs: [ - // { - // elasticsearch: { - // hosts: ['localhost:9200'], - // username: 'foo', - // }, - // }, - // ], - // }, - // ], - // }) - // .expect(400); - // }); - - // it('should fail when creating a tag with an invalid configuration block type', async () => { - // const tagId = 'production'; - // await supertest - // .put(`/api/beats/tag/${tagId}`) - // .set('kbn-xsrf', 'xxx') - // .send({ - // configuration_blocks: [ - // { - // type: chance.word(), - // configs: [ - // { - // elasticsearch: { - // hosts: ['localhost:9200'], - // username: 'foo', - // }, - // }, - // ], - // }, - // ], - // }) - // .expect(400); - // }); - - // it('should update an existing tag', async () => { - // const tagId = 'production'; - // await supertest - // .put(`/api/beats/tag/${tagId}`) - // .set('kbn-xsrf', 'xxx') - // .send({ - // configuration_blocks: [ - // { - // type: 'filebeat.inputs', - // configs: [ - // { - // paths: ['./test'], - // }, - // ], - // }, - // { - // type: 'output', - // configs: [ - // { - // elasticsearch: { - // hosts: ['localhost:9200'], - // username: 'foo', - // }, - // }, - // ], - // }, - // ], - // }) - // .expect(201); - - // await supertest - // .put(`/api/beats/tag/${tagId}`) - // .set('kbn-xsrf', 'xxx') - // .send({ - // configuration_blocks: [ - // { - // type: 'output', - // configs: [ - // { - // elasticsearch: { - // hosts: ['localhost:9000'], - // username: 'foo', - // }, - // }, - // ], - // }, - // ], - // }) - // .expect(200); - - // const esResponse = await es.get({ - // index: ES_INDEX_NAME, - // type: ES_TYPE_NAME, - // id: `tag:${tagId}`, - // }); - - // const tagInEs = esResponse._source; - - // expect(tagInEs.type).to.be('tag'); - // expect(tagInEs.tag.id).to.be(tagId); - // expect(tagInEs.tag.configuration_blocks).to.be.an(Array); - // expect(tagInEs.tag.configuration_blocks.length).to.be(1); - // expect(tagInEs.tag.configuration_blocks[0].type).to.be('output'); - // expect(tagInEs.tag.configuration_blocks[0].configs).to.eql([ - // { - // elasticsearch: { - // hosts: ['localhost:9000'], - // username: 'foo', - // }, - // }, - // ]); - // }); - }); -} diff --git a/x-pack/test/api_integration/apis/beats/set_tag.js b/x-pack/test/api_integration/apis/beats/set_tag.js deleted file mode 100644 index 742fe9db251bde..00000000000000 --- a/x-pack/test/api_integration/apis/beats/set_tag.js +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import expect from '@kbn/expect'; -import { ES_INDEX_NAME } from './constants'; - -export default function ({ getService }) { - const supertest = getService('supertest'); - const es = getService('legacyEs'); - - describe('set_tag', () => { - it('should create a tag', async () => { - const tagId = 'production'; - await supertest - .put(`/api/beats/tag/${tagId}`) - .set('kbn-xsrf', 'xxx') - .send({ - color: 'green', - }) - .expect(200); - - const esResponse = await es.get({ - index: ES_INDEX_NAME, - id: `tag:${tagId}`, - }); - - const tagInEs = esResponse._source; - - expect(tagInEs.type).to.be('tag'); - expect(tagInEs.tag.id).to.be(tagId); - }); - - it('should update an existing tag', async () => { - const tagId = 'production'; - await supertest - .put(`/api/beats/tag/${tagId}`) - .set('kbn-xsrf', 'xxx') - .send({ - color: 'blue', - }) - .expect(200); - - await supertest - .put(`/api/beats/tag/${tagId}`) - .set('kbn-xsrf', 'xxx') - .send({ - color: 'yellow', - }) - .expect(200); - - const esResponse = await es.get({ - index: ES_INDEX_NAME, - id: `tag:${tagId}`, - }); - - const tagInEs = esResponse._source; - - expect(tagInEs.type).to.be('tag'); - expect(tagInEs.tag.id).to.be(tagId); - expect(tagInEs.tag.color).to.be('yellow'); - }); - }); -} diff --git a/x-pack/test/api_integration/apis/beats/update_beat.js b/x-pack/test/api_integration/apis/beats/update_beat.js deleted file mode 100644 index 8c67f43839fcc7..00000000000000 --- a/x-pack/test/api_integration/apis/beats/update_beat.js +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import expect from '@kbn/expect'; -import { ES_INDEX_NAME } from './constants'; -import moment from 'moment'; - -export default function ({ getService }) { - const supertest = getService('supertest'); - const randomness = getService('randomness'); - const es = getService('legacyEs'); - const esArchiver = getService('esArchiver'); - - describe('update_beat', () => { - let validEnrollmentToken; - let beat; - const archive = 'beats/list'; - - beforeEach('load beats archive', () => esArchiver.load(archive)); - beforeEach(async () => { - validEnrollmentToken = - 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.' + - 'eyJjcmVhdGVkIjoiMjAxOC0wNi0zMFQwMzo0MjoxNS4yMzBaIiwiaWF0IjoxNTMwMzMwMTM1fQ.' + - 'SSsX2Byyo1B1bGxV8C3G4QldhE5iH87EY_1r21-bwbI'; - - const version = - randomness.integer({ min: 1, max: 10 }) + - '.' + - randomness.integer({ min: 1, max: 10 }) + - '.' + - randomness.integer({ min: 1, max: 10 }); - - beat = { - type: `${randomness.word()}beat`, - host_name: `www.${randomness.word()}.net`, - name: randomness.word(), - version, - ephemeral_id: randomness.word(), - }; - - await es.index({ - index: ES_INDEX_NAME, - id: `enrollment_token:${validEnrollmentToken}`, - body: { - type: 'enrollment_token', - enrollment_token: { - token: validEnrollmentToken, - expires_on: moment().add(4, 'hours').toJSON(), - }, - }, - }); - }); - - afterEach('unload beats archive', () => esArchiver.unload(archive)); - - it('should update an existing verified beat', async () => { - const beatId = 'foo'; - await supertest - .put(`/api/beats/agent/${beatId}`) - .set('kbn-xsrf', 'xxx') - .set( - 'kbn-beats-access-token', - 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.' + - 'eyJjcmVhdGVkIjoiMjAxOC0wNi0zMFQwMzo0MjoxNS4yMzBaIiwiaWF0IjoxNTMwMzMwMTM1fQ.' + - 'SSsX2Byyo1B1bGxV8C3G4QldhE5iH87EY_1r21-bwbI' - ) - .send(beat) - .expect(200); - - const beatInEs = await es.get({ - index: ES_INDEX_NAME, - id: `beat:${beatId}`, - }); - - expect(beatInEs._source.beat.id).to.be(beatId); - expect(beatInEs._source.beat.type).to.be(beat.type); - expect(beatInEs._source.beat.host_name).to.be(beat.host_name); - expect(beatInEs._source.beat.version).to.be(beat.version); - expect(beatInEs._source.beat.ephemeral_id).to.be(beat.ephemeral_id); - expect(beatInEs._source.beat.name).to.be(beat.name); - }); - - it('should return an error for an invalid access token', async () => { - const beatId = 'foo'; - const { body } = await supertest - .put(`/api/beats/agent/${beatId}`) - .set('kbn-xsrf', 'xxx') - .set('kbn-beats-access-token', randomness.word()) - .send(beat) - .expect(401); - - expect(body.message).to.be('Invalid access token'); - - const beatInEs = await es.get({ - index: ES_INDEX_NAME, - id: `beat:${beatId}`, - }); - - expect(beatInEs._source.beat.id).to.be(beatId); - expect(beatInEs._source.beat.type).to.not.be(beat.type); - expect(beatInEs._source.beat.host_name).to.not.be(beat.host_name); - expect(beatInEs._source.beat.version).to.not.be(beat.version); - expect(beatInEs._source.beat.ephemeral_id).to.not.be(beat.ephemeral_id); - }); - - it('should return an error for a non-existent beat', async () => { - const beatId = randomness.word(); - const { body } = await supertest - .put(`/api/beats/agent/${beatId}`) - .set('kbn-xsrf', 'xxx') - .set('kbn-beats-access-token', validEnrollmentToken) - .send(beat) - .expect(404); - - expect(body.message).to.be('Beat not found'); - }); - }); -} diff --git a/x-pack/test/api_integration/apis/index.ts b/x-pack/test/api_integration/apis/index.ts index e0328444701777..0d345db58d24f7 100644 --- a/x-pack/test/api_integration/apis/index.ts +++ b/x-pack/test/api_integration/apis/index.ts @@ -22,7 +22,6 @@ export default function ({ loadTestFile }: FtrProviderContext) { loadTestFile(require.resolve('./logstash')); loadTestFile(require.resolve('./kibana')); loadTestFile(require.resolve('./metrics_ui')); - loadTestFile(require.resolve('./beats')); loadTestFile(require.resolve('./console')); loadTestFile(require.resolve('./management')); loadTestFile(require.resolve('./uptime')); diff --git a/x-pack/test/tsconfig.json b/x-pack/test/tsconfig.json index 63a9f8998a99db..7c95a53b75ee78 100644 --- a/x-pack/test/tsconfig.json +++ b/x-pack/test/tsconfig.json @@ -41,7 +41,6 @@ { "path": "../plugins/alerting/tsconfig.json" }, { "path": "../plugins/apm/tsconfig.json" }, { "path": "../plugins/banners/tsconfig.json" }, - { "path": "../plugins/beats_management/tsconfig.json" }, { "path": "../plugins/cases/tsconfig.json" }, { "path": "../plugins/cloud/tsconfig.json" }, { "path": "../plugins/console_extensions/tsconfig.json" }, From 77452e686be6a3b202e3a9e7bcf0fe0174a07ee9 Mon Sep 17 00:00:00 2001 From: Spencer Date: Thu, 27 May 2021 04:16:02 -0700 Subject: [PATCH 02/14] [ftr] migrate "comboBox" service to FtrService class (#100592) Co-authored-by: spalger --- test/functional/services/combo_box.ts | 518 +++++++++++++------------- test/functional/services/index.ts | 4 +- 2 files changed, 261 insertions(+), 261 deletions(-) diff --git a/test/functional/services/combo_box.ts b/test/functional/services/combo_box.ts index 4615a7378415cf..a198aec1d16960 100644 --- a/test/functional/services/combo_box.ts +++ b/test/functional/services/combo_box.ts @@ -6,301 +6,301 @@ * Side Public License, v 1. */ -import { FtrProviderContext } from '../ftr_provider_context'; +import { FtrService } from '../ftr_provider_context'; import { WebElementWrapper } from './lib/web_element_wrapper'; // @ts-ignore not supported yet import { scrollIntoViewIfNecessary } from './lib/web_element_wrapper/scroll_into_view_if_necessary'; -export function ComboBoxProvider({ getService, getPageObjects }: FtrProviderContext) { - const config = getService('config'); - const testSubjects = getService('testSubjects'); - const find = getService('find'); - const log = getService('log'); - const retry = getService('retry'); - const browser = getService('browser'); - const PageObjects = getPageObjects(['common']); +/** + * wrapper around EuiComboBox interactions + */ +export class ComboBoxService extends FtrService { + private readonly config = this.ctx.getService('config'); + private readonly testSubjects = this.ctx.getService('testSubjects'); + private readonly find = this.ctx.getService('find'); + private readonly log = this.ctx.getService('log'); + private readonly retry = this.ctx.getService('retry'); + private readonly browser = this.ctx.getService('browser'); + private readonly PageObjects = this.ctx.getPageObjects(['common']); - const WAIT_FOR_EXISTS_TIME: number = config.get('timeouts.waitForExists'); + private readonly WAIT_FOR_EXISTS_TIME: number = this.config.get('timeouts.waitForExists'); - // wrapper around EuiComboBox interactions - class ComboBox { - /** - * Finds combobox element and sets specified value - * - * @param comboBoxSelector data-test-subj selector - * @param value option text - */ + /** + * Finds combobox element and sets specified value + * + * @param comboBoxSelector data-test-subj selector + * @param value option text + */ - public async set(comboBoxSelector: string, value: string): Promise { - log.debug(`comboBox.set, comboBoxSelector: ${comboBoxSelector}`); - const comboBox = await testSubjects.find(comboBoxSelector); - await this.setElement(comboBox, value); - } + public async set(comboBoxSelector: string, value: string): Promise { + this.log.debug(`comboBox.set, comboBoxSelector: ${comboBoxSelector}`); + const comboBox = await this.testSubjects.find(comboBoxSelector); + await this.setElement(comboBox, value); + } - /** - * Clicks option in combobox dropdown - * - * @param isMouseClick if 'true', click will be done with mouse - * @param element element that wraps up option - */ - private async clickOption(isMouseClick: boolean, element: WebElementWrapper): Promise { - // element.click causes scrollIntoView which causes combobox to close, using _webElement.click instead - return isMouseClick ? await element.clickMouseButton() : await element._webElement.click(); - } + /** + * Clicks option in combobox dropdown + * + * @param isMouseClick if 'true', click will be done with mouse + * @param element element that wraps up option + */ + private async clickOption(isMouseClick: boolean, element: WebElementWrapper): Promise { + // element.click causes scrollIntoView which causes combobox to close, using _webElement.click instead + return isMouseClick ? await element.clickMouseButton() : await element._webElement.click(); + } - /** - * Finds combobox element options - * - * @param comboBoxSelector data-test-subj selector - */ - public async getOptions(comboBoxSelector: string) { - const comboBoxElement = await testSubjects.find(comboBoxSelector); - await this.openOptionsList(comboBoxElement); - return await find.allByCssSelector('.euiFilterSelectItem', WAIT_FOR_EXISTS_TIME); - } + /** + * Finds combobox element options + * + * @param comboBoxSelector data-test-subj selector + */ + public async getOptions(comboBoxSelector: string) { + const comboBoxElement = await this.testSubjects.find(comboBoxSelector); + await this.openOptionsList(comboBoxElement); + return await this.find.allByCssSelector('.euiFilterSelectItem', this.WAIT_FOR_EXISTS_TIME); + } - /** - * Sets value for specified combobox element - * - * @param comboBoxElement element that wraps up EuiComboBox - * @param value - */ - public async setElement( - comboBoxElement: WebElementWrapper, - value: string, - options = { clickWithMouse: false } - ): Promise { - log.debug(`comboBox.setElement, value: ${value}`); - const isOptionSelected = await this.isOptionSelected(comboBoxElement, value); + /** + * Sets value for specified combobox element + * + * @param comboBoxElement element that wraps up EuiComboBox + * @param value + */ + public async setElement( + comboBoxElement: WebElementWrapper, + value: string, + options = { clickWithMouse: false } + ): Promise { + this.log.debug(`comboBox.setElement, value: ${value}`); + const isOptionSelected = await this.isOptionSelected(comboBoxElement, value); - if (isOptionSelected) { - return; - } + if (isOptionSelected) { + return; + } - await comboBoxElement.scrollIntoViewIfNecessary(); - await this.setFilterValue(comboBoxElement, value); - await this.openOptionsList(comboBoxElement); + await comboBoxElement.scrollIntoViewIfNecessary(); + await this.setFilterValue(comboBoxElement, value); + await this.openOptionsList(comboBoxElement); - if (value !== undefined) { - const selectOptions = await find.allByCssSelector( - `.euiFilterSelectItem[title^="${value.toString().trim()}"]`, - WAIT_FOR_EXISTS_TIME - ); + if (value !== undefined) { + const selectOptions = await this.find.allByCssSelector( + `.euiFilterSelectItem[title^="${value.toString().trim()}"]`, + this.WAIT_FOR_EXISTS_TIME + ); - if (selectOptions.length > 0) { - await this.clickOption(options.clickWithMouse, selectOptions[0]); - } else { - // if it doesn't find the item which text starts with value, it will choose the first option - const firstOption = await find.byCssSelector('.euiFilterSelectItem', 5000); - await this.clickOption(options.clickWithMouse, firstOption); - } + if (selectOptions.length > 0) { + await this.clickOption(options.clickWithMouse, selectOptions[0]); } else { - const firstOption = await find.byCssSelector('.euiFilterSelectItem'); + // if it doesn't find the item which text starts with value, it will choose the first option + const firstOption = await this.find.byCssSelector('.euiFilterSelectItem', 5000); await this.clickOption(options.clickWithMouse, firstOption); } - await this.closeOptionsList(comboBoxElement); - } - - /** - * Finds combobox element and sets custom value - * It applies changes by pressing Enter key. Sometimes it may lead to auto-submitting a form. - * - * @param comboBoxSelector data-test-subj selector - * @param value option text - */ - public async setCustom(comboBoxSelector: string, value: string): Promise { - log.debug(`comboBox.setCustom, comboBoxSelector: ${comboBoxSelector}, value: ${value}`); - const comboBoxElement = await testSubjects.find(comboBoxSelector); - await this.setFilterValue(comboBoxElement, value); - await PageObjects.common.pressEnterKey(); - await this.closeOptionsList(comboBoxElement); + } else { + const firstOption = await this.find.byCssSelector('.euiFilterSelectItem'); + await this.clickOption(options.clickWithMouse, firstOption); } + await this.closeOptionsList(comboBoxElement); + } - /** - * Finds combobox element and sets filter value - * - * @param comboBoxSelector data-test-subj selector - * @param filterValue text - */ - public async filterOptionsList(comboBoxSelector: string, filterValue: string): Promise { - log.debug( - `comboBox.filterOptionsList, comboBoxSelector: ${comboBoxSelector}, filter: ${filterValue}` - ); - const comboBox = await testSubjects.find(comboBoxSelector); - await this.setFilterValue(comboBox, filterValue); - await this.closeOptionsList(comboBox); - } + /** + * Finds combobox element and sets custom value + * It applies changes by pressing Enter key. Sometimes it may lead to auto-submitting a form. + * + * @param comboBoxSelector data-test-subj selector + * @param value option text + */ + public async setCustom(comboBoxSelector: string, value: string): Promise { + this.log.debug(`comboBox.setCustom, comboBoxSelector: ${comboBoxSelector}, value: ${value}`); + const comboBoxElement = await this.testSubjects.find(comboBoxSelector); + await this.setFilterValue(comboBoxElement, value); + await this.PageObjects.common.pressEnterKey(); + await this.closeOptionsList(comboBoxElement); + } - /** - * Sets new filter value in specified combobox element - * - * @param comboBoxElement element that wraps up EuiComboBox - * @param filterValue text - */ - private async setFilterValue( - comboBoxElement: WebElementWrapper, - filterValue: string - ): Promise { - const input = await comboBoxElement.findByTagName('input'); - await input.clearValue(); - await this.waitForOptionsListLoading(comboBoxElement); - await input.type(filterValue); - await this.waitForOptionsListLoading(comboBoxElement); - } + /** + * Finds combobox element and sets filter value + * + * @param comboBoxSelector data-test-subj selector + * @param filterValue text + */ + public async filterOptionsList(comboBoxSelector: string, filterValue: string): Promise { + this.log.debug( + `comboBox.filterOptionsList, comboBoxSelector: ${comboBoxSelector}, filter: ${filterValue}` + ); + const comboBox = await this.testSubjects.find(comboBoxSelector); + await this.setFilterValue(comboBox, filterValue); + await this.closeOptionsList(comboBox); + } - /** - * Waits options list to be loaded - * - * @param comboBoxElement element that wraps up EuiComboBox - */ - private async waitForOptionsListLoading(comboBoxElement: WebElementWrapper): Promise { - await comboBoxElement.waitForDeletedByCssSelector('.euiLoadingSpinner'); - } + /** + * Sets new filter value in specified combobox element + * + * @param comboBoxElement element that wraps up EuiComboBox + * @param filterValue text + */ + private async setFilterValue( + comboBoxElement: WebElementWrapper, + filterValue: string + ): Promise { + const input = await comboBoxElement.findByTagName('input'); + await input.clearValue(); + await this.waitForOptionsListLoading(comboBoxElement); + await input.type(filterValue); + await this.waitForOptionsListLoading(comboBoxElement); + } - /** - * Returns options list as a single string - * - * @param comboBoxSelector data-test-subj selector - */ - public async getOptionsList(comboBoxSelector: string): Promise { - log.debug(`comboBox.getOptionsList, comboBoxSelector: ${comboBoxSelector}`); - const comboBox = await testSubjects.find(comboBoxSelector); - const menu = await retry.try(async () => { - await testSubjects.click(comboBoxSelector); - await this.waitForOptionsListLoading(comboBox); - const isOptionsListOpen = await testSubjects.exists('~comboBoxOptionsList'); - if (!isOptionsListOpen) { - throw new Error('Combo box options list did not open on click'); - } - return await testSubjects.find('~comboBoxOptionsList'); - }); - const optionsText = await menu.getVisibleText(); - await this.closeOptionsList(comboBox); - return optionsText; - } + /** + * Waits options list to be loaded + * + * @param comboBoxElement element that wraps up EuiComboBox + */ + private async waitForOptionsListLoading(comboBoxElement: WebElementWrapper): Promise { + await comboBoxElement.waitForDeletedByCssSelector('.euiLoadingSpinner'); + } - /** - * Finds combobox element and checks if it has selected options - * - * @param comboBoxSelector data-test-subj selector - */ - public async doesComboBoxHaveSelectedOptions(comboBoxSelector: string): Promise { - log.debug(`comboBox.doesComboBoxHaveSelectedOptions, comboBoxSelector: ${comboBoxSelector}`); - const comboBox = await testSubjects.find(comboBoxSelector); - const $ = await comboBox.parseDomContent(); - return $('.euiComboBoxPill').toArray().length > 0; - } + /** + * Returns options list as a single string + * + * @param comboBoxSelector data-test-subj selector + */ + public async getOptionsList(comboBoxSelector: string): Promise { + this.log.debug(`comboBox.getOptionsList, comboBoxSelector: ${comboBoxSelector}`); + const comboBox = await this.testSubjects.find(comboBoxSelector); + const menu = await this.retry.try(async () => { + await this.testSubjects.click(comboBoxSelector); + await this.waitForOptionsListLoading(comboBox); + const isOptionsListOpen = await this.testSubjects.exists('~comboBoxOptionsList'); + if (!isOptionsListOpen) { + throw new Error('Combo box options list did not open on click'); + } + return await this.testSubjects.find('~comboBoxOptionsList'); + }); + const optionsText = await menu.getVisibleText(); + await this.closeOptionsList(comboBox); + return optionsText; + } - /** - * Returns selected options - * @param comboBoxSelector data-test-subj selector - */ - public async getComboBoxSelectedOptions(comboBoxSelector: string): Promise { - log.debug(`comboBox.getComboBoxSelectedOptions, comboBoxSelector: ${comboBoxSelector}`); - const comboBox = await testSubjects.find(comboBoxSelector); - const $ = await comboBox.parseDomContent(); - return $('.euiComboBoxPill') - .toArray() - .map((option) => $(option).text()); - } + /** + * Finds combobox element and checks if it has selected options + * + * @param comboBoxSelector data-test-subj selector + */ + public async doesComboBoxHaveSelectedOptions(comboBoxSelector: string): Promise { + this.log.debug( + `comboBox.doesComboBoxHaveSelectedOptions, comboBoxSelector: ${comboBoxSelector}` + ); + const comboBox = await this.testSubjects.find(comboBoxSelector); + const $ = await comboBox.parseDomContent(); + return $('.euiComboBoxPill').toArray().length > 0; + } - /** - * Finds combobox element and clears value in the input field by clicking clear button - * - * @param comboBoxSelector data-test-subj selector - */ - public async clear(comboBoxSelector: string): Promise { - log.debug(`comboBox.clear, comboBoxSelector:${comboBoxSelector}`); - const comboBox = await testSubjects.find(comboBoxSelector); - await retry.try(async () => { - const clearButtonExists = await this.doesClearButtonExist(comboBox); - if (!clearButtonExists) { - log.debug('Unable to clear comboBox, comboBoxClearButton does not exist'); - return; - } + /** + * Returns selected options + * @param comboBoxSelector data-test-subj selector + */ + public async getComboBoxSelectedOptions(comboBoxSelector: string): Promise { + this.log.debug(`comboBox.getComboBoxSelectedOptions, comboBoxSelector: ${comboBoxSelector}`); + const comboBox = await this.testSubjects.find(comboBoxSelector); + const $ = await comboBox.parseDomContent(); + return $('.euiComboBoxPill') + .toArray() + .map((option) => $(option).text()); + } - const clearBtn = await comboBox.findByTestSubject('comboBoxClearButton'); - await clearBtn.click(); + /** + * Finds combobox element and clears value in the input field by clicking clear button + * + * @param comboBoxSelector data-test-subj selector + */ + public async clear(comboBoxSelector: string): Promise { + this.log.debug(`comboBox.clear, comboBoxSelector:${comboBoxSelector}`); + const comboBox = await this.testSubjects.find(comboBoxSelector); + await this.retry.try(async () => { + const clearButtonExists = await this.doesClearButtonExist(comboBox); + if (!clearButtonExists) { + this.log.debug('Unable to clear comboBox, comboBoxClearButton does not exist'); + return; + } - const clearButtonStillExists = await this.doesClearButtonExist(comboBox); - if (clearButtonStillExists) { - throw new Error('Failed to clear comboBox'); - } - }); - await this.closeOptionsList(comboBox); - } + const clearBtn = await comboBox.findByTestSubject('comboBoxClearButton'); + await clearBtn.click(); - public async doesClearButtonExist(comboBoxElement: WebElementWrapper): Promise { - const found = await comboBoxElement.findAllByTestSubject( - 'comboBoxClearButton', - WAIT_FOR_EXISTS_TIME - ); - return found.length > 0; - } + const clearButtonStillExists = await this.doesClearButtonExist(comboBox); + if (clearButtonStillExists) { + throw new Error('Failed to clear comboBox'); + } + }); + await this.closeOptionsList(comboBox); + } - public async checkValidity(comboBoxElement: WebElementWrapper): Promise { - const invalidClassName = 'euiComboBox-isInvalid'; + public async doesClearButtonExist(comboBoxElement: WebElementWrapper): Promise { + const found = await comboBoxElement.findAllByTestSubject( + 'comboBoxClearButton', + this.WAIT_FOR_EXISTS_TIME + ); + return found.length > 0; + } - return !(await comboBoxElement.elementHasClass(invalidClassName)); - } + public async checkValidity(comboBoxElement: WebElementWrapper): Promise { + const invalidClassName = 'euiComboBox-isInvalid'; - /** - * Closes options list - * - * @param comboBoxElement element that wraps up EuiComboBox - */ - public async closeOptionsList(comboBoxElement: WebElementWrapper): Promise { - const isOptionsListOpen = await testSubjects.exists('~comboBoxOptionsList'); - if (isOptionsListOpen) { - const input = await comboBoxElement.findByTagName('input'); - await input.pressKeys(browser.keys.ESCAPE); - } - } + return !(await comboBoxElement.elementHasClass(invalidClassName)); + } - /** - * Opens options list - * - * @param comboBoxElement element that wraps up EuiComboBox - */ - public async openOptionsList(comboBoxElement: WebElementWrapper): Promise { - const isOptionsListOpen = await testSubjects.exists('~comboBoxOptionsList'); - if (!isOptionsListOpen) { - await retry.try(async () => { - const toggleBtn = await comboBoxElement.findByTestSubject('comboBoxInput'); - await toggleBtn.click(); - }); - } + /** + * Closes options list + * + * @param comboBoxElement element that wraps up EuiComboBox + */ + public async closeOptionsList(comboBoxElement: WebElementWrapper): Promise { + const isOptionsListOpen = await this.testSubjects.exists('~comboBoxOptionsList'); + if (isOptionsListOpen) { + const input = await comboBoxElement.findByTagName('input'); + await input.pressKeys(this.browser.keys.ESCAPE); } + } - /** - * Checks if specified option is already selected - * - * @param comboBoxElement element that wraps up EuiComboBox - * @param value option text - */ - public async isOptionSelected( - comboBoxElement: WebElementWrapper, - value: string - ): Promise { - log.debug(`comboBox.isOptionSelected, value: ${value}`); - const $ = await comboBoxElement.parseDomContent(); - const selectedOptions = $('.euiComboBoxPill') - .toArray() - .map((option) => $(option).text()); - return selectedOptions.length === 1 && selectedOptions[0] === value; + /** + * Opens options list + * + * @param comboBoxElement element that wraps up EuiComboBox + */ + public async openOptionsList(comboBoxElement: WebElementWrapper): Promise { + const isOptionsListOpen = await this.testSubjects.exists('~comboBoxOptionsList'); + if (!isOptionsListOpen) { + await this.retry.try(async () => { + const toggleBtn = await comboBoxElement.findByTestSubject('comboBoxInput'); + await toggleBtn.click(); + }); } + } - /** - * Clears input field - * @param comboBoxSelector data-test-subj selector - */ - public async clearInputField(comboBoxSelector: string): Promise { - log.debug(`comboBox.clearInputField, comboBoxSelector:${comboBoxSelector}`); - const comboBoxElement = await testSubjects.find(comboBoxSelector); - const input = await comboBoxElement.findByTagName('input'); - await input.clearValueWithKeyboard(); - } + /** + * Checks if specified option is already selected + * + * @param comboBoxElement element that wraps up EuiComboBox + * @param value option text + */ + public async isOptionSelected( + comboBoxElement: WebElementWrapper, + value: string + ): Promise { + this.log.debug(`comboBox.isOptionSelected, value: ${value}`); + const $ = await comboBoxElement.parseDomContent(); + const selectedOptions = $('.euiComboBoxPill') + .toArray() + .map((option) => $(option).text()); + return selectedOptions.length === 1 && selectedOptions[0] === value; } - return new ComboBox(); + /** + * Clears input field + * @param comboBoxSelector data-test-subj selector + */ + public async clearInputField(comboBoxSelector: string): Promise { + this.log.debug(`comboBox.clearInputField, comboBoxSelector:${comboBoxSelector}`); + const comboBoxElement = await this.testSubjects.find(comboBoxSelector); + const input = await comboBoxElement.findByTagName('input'); + await input.clearValueWithKeyboard(); + } } diff --git a/test/functional/services/index.ts b/test/functional/services/index.ts index 294b68c5488658..03c43ffc302146 100644 --- a/test/functional/services/index.ts +++ b/test/functional/services/index.ts @@ -17,7 +17,7 @@ import { SnapshotsService, TestSubjects, } from './common'; -import { ComboBoxProvider } from './combo_box'; +import { ComboBoxService } from './combo_box'; import { DashboardAddPanelService, DashboardReplacePanelService, @@ -68,7 +68,7 @@ export const services = { dashboardReplacePanel: DashboardReplacePanelService, dashboardPanelActions: DashboardPanelActionsService, flyout: FlyoutService, - comboBox: ComboBoxProvider, + comboBox: ComboBoxService, dataGrid: DataGridService, embedding: EmbeddingProvider, renderable: RenderableProvider, From 11b3ab167d931652d55aa95070c1be98146c8fc9 Mon Sep 17 00:00:00 2001 From: Patrick Mueller Date: Thu, 27 May 2021 09:17:12 -0400 Subject: [PATCH 03/14] [alerting] add ignore_above to alerts params mappings to handle immense params (#100726) resolves https://github.com/elastic/kibana/issues/100607 This fixes a problem when very large parameters (over 32K bytes) are saved with an alert. Before this fix, an error from elasticsearch would be thrown with the following message, and a 400 returned from create (and presumably update). Document contains at least one immense term in field=\"alert.params\" (whose UTF8 encoding is longer than the max length 32766), all of which were skipped. After the fix, alerts with immense params can be saved and executed. Note that the immense params will not be searchable, since they won't be indexed, but that seems both unavoidable, and not a severe issue. --- .../server/saved_objects/mappings.json | 3 +- .../spaces_only/tests/alerting/create.ts | 47 +++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/x-pack/plugins/alerting/server/saved_objects/mappings.json b/x-pack/plugins/alerting/server/saved_objects/mappings.json index 136dc530aa1199..43292c6a543463 100644 --- a/x-pack/plugins/alerting/server/saved_objects/mappings.json +++ b/x-pack/plugins/alerting/server/saved_objects/mappings.json @@ -47,7 +47,8 @@ } }, "params": { - "type": "flattened" + "type": "flattened", + "ignore_above": 4096 }, "scheduledTaskId": { "type": "keyword" diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/create.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/create.ts index 9033b1f303943b..96534c192d67c1 100644 --- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/create.ts +++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/create.ts @@ -112,6 +112,53 @@ export default function createAlertTests({ getService }: FtrProviderContext) { }); }); + // see: https://github.com/elastic/kibana/issues/100607 + // note this fails when the mappings for `params` does not have ignore_above + it('should handle alerts with immense params', async () => { + const { body: createdAction } = await supertest + .post(`${getUrlPrefix(Spaces.space1.id)}/api/actions/connector`) + .set('kbn-xsrf', 'foo') + .send({ + name: 'MY action', + connector_type_id: 'test.noop', + config: {}, + secrets: {}, + }) + .expect(200); + + const lotsOfSpaces = ''.padEnd(100 * 1000); // 100K space chars + const response = await supertest + .post(`${getUrlPrefix(Spaces.space1.id)}/api/alerting/rule`) + .set('kbn-xsrf', 'foo') + .send( + getTestAlertData({ + params: { + ignoredButPersisted: lotsOfSpaces, + }, + actions: [ + { + id: createdAction.id, + group: 'default', + params: {}, + }, + ], + }) + ); + + expect(response.status).to.eql(200); + objectRemover.add(Spaces.space1.id, response.body.id, 'rule', 'alerting'); + + expect(response.body.params.ignoredButPersisted).to.eql(lotsOfSpaces); + + // Ensure AAD isn't broken + await checkAAD({ + supertest, + spaceId: Spaces.space1.id, + type: 'alert', + id: response.body.id, + }); + }); + it('should allow providing custom saved object ids (uuid v1)', async () => { const customId = '09570bb0-6299-11eb-8fde-9fe5ce6ea450'; const response = await supertest From 7cfa0d2b061106ee764702a1cd3806c6bbfaab21 Mon Sep 17 00:00:00 2001 From: Stratoula Kalafateli Date: Thu, 27 May 2021 16:18:15 +0300 Subject: [PATCH 04/14] [TSVB] Support triggers only for timeseries chart (#100323) * [TSVB] Support triggers only for timeseries chart * fix the type * Fix type falure Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- src/plugins/vis_type_timeseries/public/metrics_type.ts | 7 +++++-- .../public/embeddable/visualize_embeddable.ts | 2 +- src/plugins/visualizations/public/vis_types/types.ts | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/plugins/vis_type_timeseries/public/metrics_type.ts b/src/plugins/vis_type_timeseries/public/metrics_type.ts index 3cb4faaacf25be..a2efe39b2c7f0e 100644 --- a/src/plugins/vis_type_timeseries/public/metrics_type.ts +++ b/src/plugins/vis_type_timeseries/public/metrics_type.ts @@ -74,8 +74,11 @@ export const metricsVisDefinition = { showIndexSelection: false, }, toExpressionAst, - getSupportedTriggers: () => { - return [VIS_EVENT_TO_TRIGGER.filter, VIS_EVENT_TO_TRIGGER.brush]; + getSupportedTriggers: (params?: VisParams) => { + if (params?.type === PANEL_TYPES.TIMESERIES) { + return [VIS_EVENT_TO_TRIGGER.filter, VIS_EVENT_TO_TRIGGER.brush]; + } + return []; }, inspectorAdapters: {}, getUsedIndexPattern: async (params: VisParams) => { diff --git a/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts b/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts index f5bf6b59aa0ae4..03fa8d415aca2a 100644 --- a/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts +++ b/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts @@ -420,7 +420,7 @@ export class VisualizeEmbeddable }; public supportedTriggers(): string[] { - return this.vis.type.getSupportedTriggers?.() ?? []; + return this.vis.type.getSupportedTriggers?.(this.vis.params) ?? []; } inputIsRefType = (input: VisualizeInput): input is VisualizeByReferenceInput => { diff --git a/src/plugins/visualizations/public/vis_types/types.ts b/src/plugins/visualizations/public/vis_types/types.ts index 7cfa31adfca4a0..77654c8a157e36 100644 --- a/src/plugins/visualizations/public/vis_types/types.ts +++ b/src/plugins/visualizations/public/vis_types/types.ts @@ -91,7 +91,7 @@ export interface VisTypeDefinition { /** * If given, it will return the supported triggers for this vis. */ - readonly getSupportedTriggers?: () => string[]; + readonly getSupportedTriggers?: (params?: VisParams) => string[]; /** * Some visualizations are created without SearchSource and may change the used indexes during the visualization configuration. From f6266c431b604d667242d3c3db9f74cdcd0e0909 Mon Sep 17 00:00:00 2001 From: Joe Reuter Date: Thu, 27 May 2021 15:25:10 +0200 Subject: [PATCH 05/14] [Lens] Improve caching with more stable Elasticsearch requests (#100414) --- .../indexpattern.test.ts | 20 +++++++++---------- .../definitions/date_histogram.test.tsx | 6 ++++-- .../operations/definitions/index.ts | 3 ++- .../definitions/last_value.test.tsx | 3 ++- .../definitions/percentile.test.tsx | 3 ++- .../definitions/ranges/ranges.test.tsx | 12 +++++++---- .../operations/definitions/terms/index.tsx | 6 ++++-- .../definitions/terms/terms.test.tsx | 6 ++++-- .../indexpattern_datasource/to_expression.ts | 14 +++++++------ 9 files changed, 44 insertions(+), 29 deletions(-) diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts index c0a502df142346..81dff1da578094 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts +++ b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts @@ -359,7 +359,7 @@ describe('IndexPattern Data Source', () => { true, ], "id": Array [ - "col1", + "0", ], "schema": Array [ "metric", @@ -388,7 +388,7 @@ describe('IndexPattern Data Source', () => { "timestamp", ], "id": Array [ - "col2", + "1", ], "interval": Array [ "1d", @@ -442,7 +442,7 @@ describe('IndexPattern Data Source', () => { Object { "arguments": Object { "idMap": Array [ - "{\\"col-0-col1\\":{\\"label\\":\\"Count of records\\",\\"dataType\\":\\"number\\",\\"isBucketed\\":false,\\"sourceField\\":\\"Records\\",\\"operationType\\":\\"count\\",\\"id\\":\\"col1\\"},\\"col-1-col2\\":{\\"label\\":\\"Date\\",\\"dataType\\":\\"date\\",\\"isBucketed\\":true,\\"operationType\\":\\"date_histogram\\",\\"sourceField\\":\\"timestamp\\",\\"params\\":{\\"interval\\":\\"1d\\"},\\"id\\":\\"col2\\"}}", + "{\\"col-0-0\\":{\\"label\\":\\"Count of records\\",\\"dataType\\":\\"number\\",\\"isBucketed\\":false,\\"sourceField\\":\\"Records\\",\\"operationType\\":\\"count\\",\\"id\\":\\"col1\\"},\\"col-1-1\\":{\\"label\\":\\"Date\\",\\"dataType\\":\\"date\\",\\"isBucketed\\":true,\\"operationType\\":\\"date_histogram\\",\\"sourceField\\":\\"timestamp\\",\\"params\\":{\\"interval\\":\\"1d\\"},\\"id\\":\\"col2\\"}}", ], }, "function": "lens_rename_columns", @@ -563,7 +563,7 @@ describe('IndexPattern Data Source', () => { "{\\"language\\":\\"kuery\\",\\"query\\":\\"bytes > 5\\"}", ], "id": Array [ - "col1-filter", + "0-filter", ], "schema": Array [ "bucket", @@ -585,7 +585,7 @@ describe('IndexPattern Data Source', () => { true, ], "id": Array [ - "col1-metric", + "0-metric", ], "schema": Array [ "metric", @@ -602,7 +602,7 @@ describe('IndexPattern Data Source', () => { true, ], "id": Array [ - "col1", + "0", ], "schema": Array [ "metric", @@ -795,9 +795,9 @@ describe('IndexPattern Data Source', () => { const ast = indexPatternDatasource.toExpression(state, 'first') as Ast; expect(ast.chain[0].arguments.metricsAtAllLevels).toEqual([false]); expect(JSON.parse(ast.chain[1].arguments.idMap[0] as string)).toEqual({ - 'col-0-bucket1': expect.any(Object), - 'col-1-bucket2': expect.any(Object), - 'col-2-metric': expect.any(Object), + 'col-0-0': expect.objectContaining({ id: 'bucket1' }), + 'col-1-1': expect.objectContaining({ id: 'bucket2' }), + 'col-2-2': expect.objectContaining({ id: 'metric' }), }); }); @@ -919,7 +919,7 @@ describe('IndexPattern Data Source', () => { const ast = indexPatternDatasource.toExpression(state, 'first') as Ast; expect(JSON.parse(ast.chain[1].arguments.idMap[0] as string)).toEqual({ - 'col-0-col1': expect.objectContaining({ + 'col-0-0': expect.objectContaining({ id: 'col1', }), }); diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.test.tsx index eaaf13171124b0..92741b9b5ed09d 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.test.tsx +++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.test.tsx @@ -205,7 +205,8 @@ describe('date_histogram', () => { 'col1', indexPattern1, layer, - uiSettingsMock + uiSettingsMock, + [] ); expect(esAggsFn).toEqual( expect.objectContaining({ @@ -258,7 +259,8 @@ describe('date_histogram', () => { ]), }, layer, - uiSettingsMock + uiSettingsMock, + [] ); expect(esAggsFn).toEqual( expect.objectContaining({ diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/index.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/index.ts index a7402bc13c0a88..6772432664d8cd 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/index.ts +++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/index.ts @@ -355,7 +355,8 @@ interface FieldBasedOperationDefinition { columnId: string, indexPattern: IndexPattern, layer: IndexPatternLayer, - uiSettings: IUiSettingsClient + uiSettings: IUiSettingsClient, + orderedColumnIds: string[] ) => ExpressionAstFunction; /** * Validate that the operation has the right preconditions in the state. For example: diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/last_value.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/last_value.test.tsx index 280cfe9471c9d0..15ce3bdcd0b0f5 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/last_value.test.tsx +++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/last_value.test.tsx @@ -75,7 +75,8 @@ describe('last_value', () => { 'col1', {} as IndexPattern, layer, - uiSettingsMock + uiSettingsMock, + [] ); expect(esAggsFn).toEqual( expect.objectContaining({ diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/percentile.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/percentile.test.tsx index 59da0f6f7bcdea..2b7104112d63eb 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/percentile.test.tsx +++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/percentile.test.tsx @@ -123,7 +123,8 @@ describe('percentile', () => { 'col1', {} as IndexPattern, layer, - uiSettingsMock + uiSettingsMock, + [] ); expect(esAggsFn).toEqual( expect.objectContaining({ diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.test.tsx index cfbe0f8903dafb..295f988c6e3906 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.test.tsx +++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.test.tsx @@ -172,7 +172,8 @@ describe('ranges', () => { 'col1', {} as IndexPattern, layer, - uiSettingsMock + uiSettingsMock, + [] ); expect(esAggsFn).toMatchInlineSnapshot(` Object { @@ -219,7 +220,8 @@ describe('ranges', () => { 'col1', {} as IndexPattern, layer, - uiSettingsMock + uiSettingsMock, + [] ); expect(esAggsFn).toEqual( @@ -240,7 +242,8 @@ describe('ranges', () => { 'col1', {} as IndexPattern, layer, - uiSettingsMock + uiSettingsMock, + [] ); expect(esAggsFn).toEqual( @@ -261,7 +264,8 @@ describe('ranges', () => { 'col1', {} as IndexPattern, layer, - uiSettingsMock + uiSettingsMock, + [] ); expect((esAggsFn as { arguments: unknown }).arguments).toEqual( diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/index.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/index.tsx index d226fe6f2a7452..52adf83752363e 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/index.tsx +++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/index.tsx @@ -132,14 +132,16 @@ export const termsOperation: OperationDefinition { + toEsAggsFn: (column, columnId, _indexPattern, layer, uiSettings, orderedColumnIds) => { return buildExpressionFunction('aggTerms', { id: columnId, enabled: true, schema: 'segment', field: column.sourceField, orderBy: - column.params.orderBy.type === 'alphabetical' ? '_key' : column.params.orderBy.columnId, + column.params.orderBy.type === 'alphabetical' + ? '_key' + : String(orderedColumnIds.indexOf(column.params.orderBy.columnId)), order: column.params.orderDirection, size: column.params.size, otherBucket: Boolean(column.params.otherBucket), diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/terms.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/terms.test.tsx index b094d3f0ff5cd7..aab957c8ecebe4 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/terms.test.tsx +++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/terms.test.tsx @@ -71,7 +71,8 @@ describe('terms', () => { 'col1', {} as IndexPattern, layer, - uiSettingsMock + uiSettingsMock, + [] ); expect(esAggsFn).toEqual( expect.objectContaining({ @@ -95,7 +96,8 @@ describe('terms', () => { 'col1', {} as IndexPattern, layer, - uiSettingsMock + uiSettingsMock, + [] ); expect(esAggsFn).toEqual( expect.objectContaining({ diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/to_expression.ts b/x-pack/plugins/lens/public/indexpattern_datasource/to_expression.ts index 4905bd75d64987..430e139a85ccae 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/to_expression.ts +++ b/x-pack/plugins/lens/public/indexpattern_datasource/to_expression.ts @@ -77,27 +77,29 @@ function getExpressionForLayer( } }); - esAggEntries.forEach(([colId, col]) => { + const orderedColumnIds = esAggEntries.map(([colId]) => colId); + esAggEntries.forEach(([colId, col], index) => { const def = operationDefinitionMap[col.operationType]; if (def.input !== 'fullReference' && def.input !== 'managedReference') { const wrapInFilter = Boolean(def.filterable && col.filter); let aggAst = def.toEsAggsFn( col, - wrapInFilter ? `${colId}-metric` : colId, + wrapInFilter ? `${index}-metric` : String(index), indexPattern, layer, - uiSettings + uiSettings, + orderedColumnIds ); if (wrapInFilter) { aggAst = buildExpressionFunction( 'aggFilteredMetric', { - id: colId, + id: String(index), enabled: true, schema: 'metric', customBucket: buildExpression([ buildExpressionFunction('aggFilter', { - id: `${colId}-filter`, + id: `${index}-filter`, enabled: true, schema: 'bucket', filter: JSON.stringify(col.filter), @@ -121,7 +123,7 @@ function getExpressionForLayer( return null; } const idMap = esAggEntries.reduce((currentIdMap, [colId, column], index) => { - const esAggsId = `col-${index}-${colId}`; + const esAggsId = `col-${index}-${index}`; return { ...currentIdMap, [esAggsId]: { From 1c4d338668186073827cf0230da68598d0f78c8d Mon Sep 17 00:00:00 2001 From: Candace Park <56409205+parkiino@users.noreply.github.com> Date: Thu, 27 May 2021 09:32:32 -0400 Subject: [PATCH 06/14] [Security Solution][Endpoint][Host Isolation] User can unisolate host from alert details (#100401) --- .../common/endpoint/actions.ts | 14 ++ .../common/endpoint/constants.ts | 3 + .../common/endpoint/types/index.ts | 2 +- .../endpoint/host_isolation/index.ts | 1 + .../host_isolation/isolate_success.tsx | 37 +++-- .../endpoint/host_isolation/translations.ts | 29 +++- .../host_isolation/unisolate_form.tsx | 81 ++++++++++ .../hooks/endpoint/use_isolate_privileges.ts | 40 +++++ .../components/host_isolation/index.tsx | 148 ++++++------------ .../components/host_isolation/isolate.tsx | 113 +++++++++++++ .../host_isolation/take_action_dropdown.tsx | 48 ++++-- .../components/host_isolation/translations.ts | 9 +- .../components/host_isolation/unisolate.tsx | 113 +++++++++++++ .../containers/detection_engine/alerts/api.ts | 45 +++++- .../detection_engine/alerts/translations.ts | 5 + .../alerts/use_host_isolation_status.tsx | 64 ++++++++ .../alerts/use_host_unisolation.tsx | 45 ++++++ .../pages/endpoint_hosts/store/middleware.ts | 15 +- .../side_panel/event_details/index.tsx | 52 ++++-- .../endpoint/routes/actions/isolation.ts | 9 +- .../endpoint/routes/metadata/handlers.ts | 4 +- 21 files changed, 714 insertions(+), 163 deletions(-) create mode 100644 x-pack/plugins/security_solution/common/endpoint/actions.ts create mode 100644 x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/unisolate_form.tsx create mode 100644 x-pack/plugins/security_solution/public/common/hooks/endpoint/use_isolate_privileges.ts create mode 100644 x-pack/plugins/security_solution/public/detections/components/host_isolation/isolate.tsx create mode 100644 x-pack/plugins/security_solution/public/detections/components/host_isolation/unisolate.tsx create mode 100644 x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/use_host_isolation_status.tsx create mode 100644 x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/use_host_unisolation.tsx diff --git a/x-pack/plugins/security_solution/common/endpoint/actions.ts b/x-pack/plugins/security_solution/common/endpoint/actions.ts new file mode 100644 index 00000000000000..287ebddacad9a0 --- /dev/null +++ b/x-pack/plugins/security_solution/common/endpoint/actions.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. + */ + +export const userCanIsolate = (roles: readonly string[] | undefined): boolean => { + // only superusers can write to the fleet index (or look up endpoint data to convert endp ID to agent ID) + if (!roles || roles.length === 0) { + return false; + } + return roles.includes('superuser'); +}; diff --git a/x-pack/plugins/security_solution/common/endpoint/constants.ts b/x-pack/plugins/security_solution/common/endpoint/constants.ts index a5718af1d42c53..1c0b09a4648e5f 100644 --- a/x-pack/plugins/security_solution/common/endpoint/constants.ts +++ b/x-pack/plugins/security_solution/common/endpoint/constants.ts @@ -15,6 +15,9 @@ export const telemetryIndexPattern = 'metrics-endpoint.telemetry-*'; export const LIMITED_CONCURRENCY_ENDPOINT_ROUTE_TAG = 'endpoint:limited-concurrency'; export const LIMITED_CONCURRENCY_ENDPOINT_COUNT = 100; +export const HOST_METADATA_LIST_API = '/api/endpoint/metadata'; +export const HOST_METADATA_GET_API = '/api/endpoint/metadata/{id}'; + export const TRUSTED_APPS_GET_API = '/api/endpoint/trusted_apps/{id}'; export const TRUSTED_APPS_LIST_API = '/api/endpoint/trusted_apps'; export const TRUSTED_APPS_CREATE_API = '/api/endpoint/trusted_apps'; diff --git a/x-pack/plugins/security_solution/common/endpoint/types/index.ts b/x-pack/plugins/security_solution/common/endpoint/types/index.ts index 512adffc70eef4..dd0ff540cb4af0 100644 --- a/x-pack/plugins/security_solution/common/endpoint/types/index.ts +++ b/x-pack/plugins/security_solution/common/endpoint/types/index.ts @@ -414,7 +414,7 @@ export type PolicyInfo = Immutable<{ id: string; }>; -export interface HostMetaDataInfo { +export interface HostMetadataInfo { metadata: HostMetadata; query_strategy_version: MetadataQueryStrategyVersions; } diff --git a/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/index.ts b/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/index.ts index de51df283251d2..f5387a1b1a99c6 100644 --- a/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/index.ts +++ b/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/index.ts @@ -7,3 +7,4 @@ export * from './isolate_success'; export * from './isolate_form'; +export * from './unisolate_form'; diff --git a/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/isolate_success.tsx b/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/isolate_success.tsx index 32ac1177d6e80b..f822b3c287a02a 100644 --- a/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/isolate_success.tsx +++ b/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/isolate_success.tsx @@ -7,27 +7,44 @@ import React, { memo, ReactNode } from 'react'; import { EuiButtonEmpty, EuiCallOut, EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui'; -import { GET_SUCCESS_MESSAGE } from './translations'; +import { GET_ISOLATION_SUCCESS_MESSAGE, GET_UNISOLATION_SUCCESS_MESSAGE } from './translations'; export interface EndpointIsolateSuccessProps { hostName: string; + isolateAction?: 'isolateHost' | 'unisolateHost'; completeButtonLabel: string; onComplete: () => void; additionalInfo?: ReactNode; } export const EndpointIsolateSuccess = memo( - ({ hostName, onComplete, completeButtonLabel, additionalInfo }) => { + ({ + hostName, + isolateAction = 'isolateHost', + onComplete, + completeButtonLabel, + additionalInfo, + }) => { return ( <> - - {additionalInfo} - + {isolateAction === 'isolateHost' ? ( + + {additionalInfo} + + ) : ( + + {additionalInfo} + + )} diff --git a/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/translations.ts b/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/translations.ts index baeced2a7a69fb..790c951f61ccd9 100644 --- a/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/translations.ts +++ b/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/translations.ts @@ -24,8 +24,33 @@ export const COMMENT_PLACEHOLDER = i18n.translate( { defaultMessage: 'You may leave an optional note here.' } ); -export const GET_SUCCESS_MESSAGE = (hostName: string) => - i18n.translate('xpack.securitySolution.endpoint.hostIsolation.successfulMessage', { +export const GET_ISOLATION_SUCCESS_MESSAGE = (hostName: string) => + i18n.translate('xpack.securitySolution.endpoint.hostIsolation.isolation.successfulMessage', { defaultMessage: 'Host Isolation on {hostName} successfully submitted', values: { hostName }, }); + +export const GET_UNISOLATION_SUCCESS_MESSAGE = (hostName: string) => + i18n.translate('xpack.securitySolution.endpoint.hostIsolation.unisolate.successfulMessage', { + defaultMessage: 'Host Unisolation on {hostName} successfully submitted', + values: { hostName }, + }); + +export const ISOLATE = i18n.translate('xpack.securitySolution.endpoint.hostisolation.isolate', { + defaultMessage: 'isolate', +}); + +export const UNISOLATE = i18n.translate('xpack.securitySolution.endpoint.hostisolation.unisolate', { + defaultMessage: 'unisolate', +}); + +export const NOT_ISOLATED = i18n.translate( + 'xpack.securitySolution.endpoint.hostIsolation.notIsolated', + { + defaultMessage: 'not isolated', + } +); + +export const ISOLATED = i18n.translate('xpack.securitySolution.endpoint.hostIsolation.isolated', { + defaultMessage: 'isolated', +}); diff --git a/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/unisolate_form.tsx b/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/unisolate_form.tsx new file mode 100644 index 00000000000000..98006524844c4d --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/unisolate_form.tsx @@ -0,0 +1,81 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { ChangeEventHandler, memo, useCallback } from 'react'; +import { + EuiButton, + EuiButtonEmpty, + EuiFlexGroup, + EuiFlexItem, + EuiSpacer, + EuiText, + EuiTextArea, + EuiTitle, +} from '@elastic/eui'; +import { FormattedMessage } from '@kbn/i18n/react'; +import { CANCEL, COMMENT, COMMENT_PLACEHOLDER, CONFIRM, UNISOLATE, ISOLATED } from './translations'; +import { EndpointIsolatedFormProps } from './isolate_form'; + +export const EndpointUnisolateForm = memo( + ({ hostName, onCancel, onConfirm, onChange, comment = '', messageAppend, isLoading = false }) => { + const handleCommentChange: ChangeEventHandler = useCallback( + (event) => { + onChange({ comment: event.target.value }); + }, + [onChange] + ); + + return ( + <> + +

+ {hostName}, + isolated: {ISOLATED}, + unisolate: {UNISOLATE}, + }} + />{' '} + {messageAppend} +

+ + + + + +

{COMMENT}

+ + + + + + + + + {CANCEL} + + + + + {CONFIRM} + + + + + ); + } +); + +EndpointUnisolateForm.displayName = 'EndpointUnisolateForm'; diff --git a/x-pack/plugins/security_solution/public/common/hooks/endpoint/use_isolate_privileges.ts b/x-pack/plugins/security_solution/public/common/hooks/endpoint/use_isolate_privileges.ts new file mode 100644 index 00000000000000..23ef6d586adc54 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/hooks/endpoint/use_isolate_privileges.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 { useEffect, useState } from 'react'; +import { userCanIsolate } from '../../../../common/endpoint/actions'; +import { useKibana } from '../../lib/kibana'; +import { useLicense } from '../use_license'; + +interface IsolationPriviledgesStatus { + isLoading: boolean; + isAllowed: boolean; +} + +/* + * Host isolation requires superuser privileges and at least a platinum license + */ +export const useIsolationPrivileges = (): IsolationPriviledgesStatus => { + const [isLoading, setIsLoading] = useState(false); + const [canIsolate, setCanIsolate] = useState(false); + + const isPlatinumPlus = useLicense().isPlatinumPlus(); + const services = useKibana().services; + + useEffect(() => { + setIsLoading(true); + const user = services.security.authc.getCurrentUser(); + if (user) { + user.then((authenticatedUser) => { + setCanIsolate(userCanIsolate(authenticatedUser.roles)); + setIsLoading(false); + }); + } + }, [services.security.authc]); + + return { isLoading, isAllowed: canIsolate && isPlatinumPlus ? true : false }; +}; diff --git a/x-pack/plugins/security_solution/public/detections/components/host_isolation/index.tsx b/x-pack/plugins/security_solution/public/detections/components/host_isolation/index.tsx index e6fd3a8459f764..bb1585b5392bd5 100644 --- a/x-pack/plugins/security_solution/public/detections/components/host_isolation/index.tsx +++ b/x-pack/plugins/security_solution/public/detections/components/host_isolation/index.tsx @@ -5,33 +5,27 @@ * 2.0. */ -import React, { useMemo, useState, useCallback } from 'react'; +import React, { useMemo } from 'react'; import { find } from 'lodash/fp'; -import { EuiText, EuiSpacer } from '@elastic/eui'; +import { EuiText } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; -import { useHostIsolation } from '../../containers/detection_engine/alerts/use_host_isolation'; -import { CASES_ASSOCIATED_WITH_ALERT, RETURN_TO_ALERT_DETAILS } from './translations'; import { Maybe } from '../../../../../observability/common/typings'; import { useCasesFromAlerts } from '../../containers/detection_engine/alerts/use_cases_from_alerts'; import { CaseDetailsLink } from '../../../common/components/links'; import { TimelineEventsDetailsItem } from '../../../../common/search_strategy'; -import { - EndpointIsolatedFormProps, - EndpointIsolateForm, - EndpointIsolateSuccess, -} from '../../../common/components/endpoint/host_isolation'; +import { IsolateHost } from './isolate'; +import { UnisolateHost } from './unisolate'; export const HostIsolationPanel = React.memo( ({ details, cancelCallback, + isolateAction, }: { details: Maybe; cancelCallback: () => void; + isolateAction: string; }) => { - const [comment, setComment] = useState(''); - const [isIsolated, setIsIsolated] = useState(false); - const agentId = useMemo(() => { const findAgentId = find({ category: 'agent', field: 'agent.id' }, details)?.values; return findAgentId ? findAgentId[0] : ''; @@ -54,25 +48,15 @@ export const HostIsolationPanel = React.memo( }, [details]); const { caseIds } = useCasesFromAlerts({ alertId }); - const { loading, isolateHost } = useHostIsolation({ agentId, comment, caseIds }); - - const confirmHostIsolation = useCallback(async () => { - const hostIsolated = await isolateHost(); - setIsIsolated(hostIsolated); - }, [isolateHost]); - - const backToAlertDetails = useCallback(() => cancelCallback(), [cancelCallback]); - const handleIsolateFormChange: EndpointIsolatedFormProps['onChange'] = useCallback( - ({ comment: newComment }) => setComment(newComment), - [] - ); + // Cases related components to be used in both isolate and unisolate actions from the alert details flyout entry point + const caseCount: number = useMemo(() => caseIds.length, [caseIds]); const casesList = useMemo( () => caseIds.map((id, index) => { return ( -
  • +
  • caseIds.length, [caseIds]); - - const hostIsolated = useMemo(() => { - return ( - <> - - 0 && ( - <> - -

    - -

    -     - -
      {casesList}
    -     - - ) - } - /> - - ); - }, [backToAlertDetails, hostName, caseCount, casesList]); - - const hostNotIsolated = useMemo(() => { - return ( - <> - - - {caseCount} - {CASES_ASSOCIATED_WITH_ALERT(caseCount)} - {alertRule} - - ), - }} - /> - } - /> - - ); - }, [ - hostName, - backToAlertDetails, - confirmHostIsolation, - handleIsolateFormChange, - comment, - loading, - caseCount, - alertRule, - ]); - - return isIsolated ? hostIsolated : hostNotIsolated; + const associatedCases = useMemo(() => { + if (caseCount > 0) { + return ( + <> + +

    + +

    +     + +
      {casesList}
    +     + + ); + } + }, [caseCount, casesList]); + + return isolateAction === 'isolateHost' ? ( + + ) : ( + + ); } ); diff --git a/x-pack/plugins/security_solution/public/detections/components/host_isolation/isolate.tsx b/x-pack/plugins/security_solution/public/detections/components/host_isolation/isolate.tsx new file mode 100644 index 00000000000000..10c9082976a0e5 --- /dev/null +++ b/x-pack/plugins/security_solution/public/detections/components/host_isolation/isolate.tsx @@ -0,0 +1,113 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { useMemo, useState, useCallback, ReactNode } from 'react'; +import { EuiSpacer } from '@elastic/eui'; +import { FormattedMessage } from '@kbn/i18n/react'; +import { useHostIsolation } from '../../containers/detection_engine/alerts/use_host_isolation'; +import { CASES_ASSOCIATED_WITH_ALERT, RETURN_TO_ALERT_DETAILS } from './translations'; +import { + EndpointIsolatedFormProps, + EndpointIsolateForm, + EndpointIsolateSuccess, +} from '../../../common/components/endpoint/host_isolation'; + +export const IsolateHost = React.memo( + ({ + agentId, + hostName, + alertRule, + cases, + caseIds, + cancelCallback, + }: { + agentId: string; + hostName: string; + alertRule: string; + cases: ReactNode; + caseIds: string[]; + cancelCallback: () => void; + }) => { + const [comment, setComment] = useState(''); + const [isIsolated, setIsIsolated] = useState(false); + + const { loading, isolateHost } = useHostIsolation({ agentId, comment, caseIds }); + + const confirmHostIsolation = useCallback(async () => { + const hostIsolated = await isolateHost(); + setIsIsolated(hostIsolated); + }, [isolateHost]); + + const backToAlertDetails = useCallback(() => cancelCallback(), [cancelCallback]); + + const handleIsolateFormChange: EndpointIsolatedFormProps['onChange'] = useCallback( + ({ comment: newComment }) => setComment(newComment), + [] + ); + + const caseCount: number = useMemo(() => caseIds.length, [caseIds]); + + const hostIsolatedSuccess = useMemo(() => { + return ( + <> + + + + ); + }, [backToAlertDetails, hostName, cases]); + + const hostNotIsolated = useMemo(() => { + return ( + <> + + + {caseCount} + {CASES_ASSOCIATED_WITH_ALERT(caseCount)} + {alertRule} + + ), + }} + /> + } + /> + + ); + }, [ + hostName, + backToAlertDetails, + confirmHostIsolation, + handleIsolateFormChange, + comment, + loading, + caseCount, + alertRule, + ]); + + return isIsolated ? hostIsolatedSuccess : hostNotIsolated; + } +); + +IsolateHost.displayName = 'IsolateHost'; diff --git a/x-pack/plugins/security_solution/public/detections/components/host_isolation/take_action_dropdown.tsx b/x-pack/plugins/security_solution/public/detections/components/host_isolation/take_action_dropdown.tsx index 36f2553e1b9272..a10ad901441ea5 100644 --- a/x-pack/plugins/security_solution/public/detections/components/host_isolation/take_action_dropdown.tsx +++ b/x-pack/plugins/security_solution/public/detections/components/host_isolation/take_action_dropdown.tsx @@ -7,30 +7,33 @@ import React, { useState, useCallback, useMemo } from 'react'; import { EuiContextMenuItem, EuiContextMenuPanel, EuiButton, EuiPopover } from '@elastic/eui'; -import { ISOLATE_HOST } from './translations'; +import { ISOLATE_HOST, UNISOLATE_HOST } from './translations'; import { TAKE_ACTION } from '../alerts_table/alerts_utility_bar/translations'; +import { useHostIsolationStatus } from '../../containers/detection_engine/alerts/use_host_isolation_status'; export const TakeActionDropdown = React.memo( - ({ onChange }: { onChange: (action: 'isolateHost') => void }) => { + ({ + onChange, + agentId, + }: { + onChange: (action: 'isolateHost' | 'unisolateHost') => void; + agentId: string; + }) => { + const { loading, isIsolated: isolationStatus } = useHostIsolationStatus({ agentId }); const [isPopoverOpen, setIsPopoverOpen] = useState(false); const closePopoverHandler = useCallback(() => { setIsPopoverOpen(false); }, []); - const takeActionItems = useMemo(() => { - return [ - { - setIsPopoverOpen(false); - onChange('isolateHost'); - }} - > - {ISOLATE_HOST} - , - ]; - }, [onChange]); + const isolateHostHandler = useCallback(() => { + setIsPopoverOpen(false); + if (isolationStatus === false) { + onChange('isolateHost'); + } else { + onChange('unisolateHost'); + } + }, [onChange, isolationStatus]); const takeActionButton = useMemo(() => { return ( @@ -38,6 +41,7 @@ export const TakeActionDropdown = React.memo( iconSide="right" fill iconType="arrowDown" + disabled={loading} onClick={() => { setIsPopoverOpen(!isPopoverOpen); }} @@ -45,7 +49,7 @@ export const TakeActionDropdown = React.memo( {TAKE_ACTION} ); - }, [isPopoverOpen]); + }, [isPopoverOpen, loading]); return ( - + + {isolationStatus === false ? ( + + {ISOLATE_HOST} + + ) : ( + + {UNISOLATE_HOST} + + )} + ); } diff --git a/x-pack/plugins/security_solution/public/detections/components/host_isolation/translations.ts b/x-pack/plugins/security_solution/public/detections/components/host_isolation/translations.ts index 027a97cc3846ef..449a09b932cd31 100644 --- a/x-pack/plugins/security_solution/public/detections/components/host_isolation/translations.ts +++ b/x-pack/plugins/security_solution/public/detections/components/host_isolation/translations.ts @@ -8,12 +8,19 @@ import { i18n } from '@kbn/i18n'; export const ISOLATE_HOST = i18n.translate( - 'xpack.securitySolution.endpoint.hostIsolation.isolateHost.isolateHost', + 'xpack.securitySolution.endpoint.hostIsolation.isolateHost', { defaultMessage: 'Isolate host', } ); +export const UNISOLATE_HOST = i18n.translate( + 'xpack.securitySolution.endpoint.hostIsolation.unisolateHost', + { + defaultMessage: 'Unisolate host', + } +); + export const CASES_ASSOCIATED_WITH_ALERT = (caseCount: number): string => i18n.translate( 'xpack.securitySolution.endpoint.hostIsolation.isolateHost.casesAssociatedWithAlert', diff --git a/x-pack/plugins/security_solution/public/detections/components/host_isolation/unisolate.tsx b/x-pack/plugins/security_solution/public/detections/components/host_isolation/unisolate.tsx new file mode 100644 index 00000000000000..74149f2a692d3c --- /dev/null +++ b/x-pack/plugins/security_solution/public/detections/components/host_isolation/unisolate.tsx @@ -0,0 +1,113 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { useMemo, useState, useCallback, ReactNode } from 'react'; +import { EuiSpacer } from '@elastic/eui'; +import { FormattedMessage } from '@kbn/i18n/react'; +import { CASES_ASSOCIATED_WITH_ALERT, RETURN_TO_ALERT_DETAILS } from './translations'; +import { + EndpointIsolatedFormProps, + EndpointIsolateSuccess, + EndpointUnisolateForm, +} from '../../../common/components/endpoint/host_isolation'; +import { useHostUnisolation } from '../../containers/detection_engine/alerts/use_host_unisolation'; + +export const UnisolateHost = React.memo( + ({ + agentId, + hostName, + alertRule, + cases, + caseIds, + cancelCallback, + }: { + agentId: string; + hostName: string; + alertRule: string; + cases: ReactNode; + caseIds: string[]; + cancelCallback: () => void; + }) => { + const [comment, setComment] = useState(''); + const [isUnIsolated, setIsUnIsolated] = useState(false); + + const { loading, unIsolateHost } = useHostUnisolation({ agentId, comment, caseIds }); + + const confirmHostUnIsolation = useCallback(async () => { + const hostIsolated = await unIsolateHost(); + setIsUnIsolated(hostIsolated); + }, [unIsolateHost]); + + const backToAlertDetails = useCallback(() => cancelCallback(), [cancelCallback]); + + const handleIsolateFormChange: EndpointIsolatedFormProps['onChange'] = useCallback( + ({ comment: newComment }) => setComment(newComment), + [] + ); + + const caseCount: number = useMemo(() => caseIds.length, [caseIds]); + + const hostUnisolatedSuccess = useMemo(() => { + return ( + <> + + + + ); + }, [backToAlertDetails, hostName, cases]); + + const hostNotUnisolated = useMemo(() => { + return ( + <> + + + {caseCount} + {CASES_ASSOCIATED_WITH_ALERT(caseCount)} + {alertRule} + + ), + }} + /> + } + /> + + ); + }, [ + hostName, + backToAlertDetails, + confirmHostUnIsolation, + handleIsolateFormChange, + comment, + loading, + caseCount, + alertRule, + ]); + + return isUnIsolated ? hostUnisolatedSuccess : hostNotUnisolated; + } +); + +UnisolateHost.displayName = 'UnisolateHost'; diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/api.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/api.ts index 28a6076421e837..65185b4d05135b 100644 --- a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/api.ts +++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/api.ts @@ -7,13 +7,14 @@ import { UpdateDocumentByQueryResponse } from 'elasticsearch'; import { getCasesFromAlertsUrl } from '../../../../../../cases/common'; -import { HostIsolationResponse } from '../../../../../common/endpoint/types'; +import { HostIsolationResponse, HostMetadataInfo } from '../../../../../common/endpoint/types'; import { DETECTION_ENGINE_QUERY_SIGNALS_URL, DETECTION_ENGINE_SIGNALS_STATUS_URL, DETECTION_ENGINE_INDEX_URL, DETECTION_ENGINE_PRIVILEGES_URL, } from '../../../../../common/constants'; +import { HOST_METADATA_GET_API } from '../../../../../common/endpoint/constants'; import { KibanaServices } from '../../../../common/lib/kibana'; import { BasicSignals, @@ -24,7 +25,8 @@ import { UpdateAlertStatusProps, CasesFromAlertsResponse, } from './types'; -import { isolateHost } from '../../../../common/lib/host_isolation'; +import { resolvePathVariables } from '../../../../management/pages/trusted_apps/service/utils'; +import { isolateHost, unIsolateHost } from '../../../../common/lib/host_isolation'; /** * Fetch Alerts by providing a query @@ -130,6 +132,30 @@ export const createHostIsolation = async ({ case_ids: caseIds, }); +/** + * Unisolate a host + * + * @param agent id + * @param optional comment for the unisolation action + * @param optional case ids if associated with an alert on the host + * + * @throws An error if response is not OK + */ +export const createHostUnIsolation = async ({ + agentId, + comment = '', + caseIds, +}: { + agentId: string; + comment?: string; + caseIds?: string[]; +}): Promise => + unIsolateHost({ + agent_ids: [agentId], + comment, + case_ids: caseIds, + }); + /** * Get list of associated case ids from alert id * @@ -143,3 +169,18 @@ export const getCaseIdsFromAlertId = async ({ KibanaServices.get().http.fetch(getCasesFromAlertsUrl(alertId), { method: 'get', }); + +/** + * Get Host metadata + * + * @param host id + */ +export const getHostMetadata = async ({ + agentId, +}: { + agentId: string; +}): Promise => + KibanaServices.get().http.fetch( + resolvePathVariables(HOST_METADATA_GET_API, { id: agentId }), + { method: 'get' } + ); diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/translations.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/translations.ts index ed6a22375a7769..9e4497f2f096bb 100644 --- a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/translations.ts +++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/translations.ts @@ -37,3 +37,8 @@ export const CASES_FROM_ALERTS_FAILURE = i18n.translate( 'xpack.securitySolution.endpoint.hostIsolation.casesFromAlerts.title', { defaultMessage: 'Failed to find associated cases' } ); + +export const ISOLATION_STATUS_FAILURE = i18n.translate( + 'xpack.securitySolution.endpoint.hostIsolation.isolationStatus.title', + { defaultMessage: 'Failed to retrieve current isolation status' } +); diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/use_host_isolation_status.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/use_host_isolation_status.tsx new file mode 100644 index 00000000000000..adc6d3a6b054b8 --- /dev/null +++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/use_host_isolation_status.tsx @@ -0,0 +1,64 @@ +/* + * Copyright 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 { useEffect, useState } from 'react'; +import { Maybe } from '../../../../../../observability/common/typings'; +import { useAppToasts } from '../../../../common/hooks/use_app_toasts'; +import { getHostMetadata } from './api'; +import { ISOLATION_STATUS_FAILURE } from './translations'; + +interface HostIsolationStatusResponse { + loading: boolean; + isIsolated: Maybe; +} + +/* + * Retrieves the current isolation status of a host */ +export const useHostIsolationStatus = ({ + agentId, +}: { + agentId: string; +}): HostIsolationStatusResponse => { + const [isIsolated, setIsIsolated] = useState>(); + const [loading, setLoading] = useState(false); + + const { addError } = useAppToasts(); + + useEffect(() => { + // isMounted tracks if a component is mounted before changing state + let isMounted = true; + const fetchData = async () => { + try { + const metadataResponse = await getHostMetadata({ agentId }); + if (isMounted) { + setIsIsolated(Boolean(metadataResponse.metadata.Endpoint.state.isolation)); + } + } catch (error) { + addError(error.message, { title: ISOLATION_STATUS_FAILURE }); + } + if (isMounted) { + setLoading(false); + } + }; + + setLoading((prevState) => { + if (prevState) { + return prevState; + } + if (!isEmpty(agentId)) { + fetchData(); + } + return true; + }); + return () => { + // updates to show component is unmounted + isMounted = false; + }; + }, [addError, agentId]); + return { loading, isIsolated }; +}; diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/use_host_unisolation.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/use_host_unisolation.tsx new file mode 100644 index 00000000000000..1a0ecb0d158781 --- /dev/null +++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/use_host_unisolation.tsx @@ -0,0 +1,45 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { useCallback, useState } from 'react'; +import { useAppToasts } from '../../../../common/hooks/use_app_toasts'; +import { HOST_ISOLATION_FAILURE } from './translations'; +import { createHostUnIsolation } from './api'; + +interface HostUnisolationStatus { + loading: boolean; + unIsolateHost: () => Promise; +} + +interface UseHostIsolationProps { + agentId: string; + comment: string; + caseIds?: string[]; +} + +export const useHostUnisolation = ({ + agentId, + comment, + caseIds, +}: UseHostIsolationProps): HostUnisolationStatus => { + const [loading, setLoading] = useState(false); + const { addError } = useAppToasts(); + + const unIsolateHost = useCallback(async () => { + try { + setLoading(true); + const isolationStatus = await createHostUnIsolation({ agentId, comment, caseIds }); + setLoading(false); + return isolationStatus.action ? true : false; + } catch (error) { + setLoading(false); + addError(error.message, { title: HOST_ISOLATION_FAILURE }); + return false; + } + }, [agentId, comment, caseIds, addError]); + return { loading, unIsolateHost }; +}; 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 ffde8b09317521..9db9932dd4387b 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 @@ -36,8 +36,13 @@ import { sendGetFleetAgentsWithEndpoint, } from '../../policy/store/services/ingest'; import { AGENT_POLICY_SAVED_OBJECT_TYPE } from '../../../../../../fleet/common'; -import { metadataCurrentIndexPattern } from '../../../../../common/endpoint/constants'; +import { + HOST_METADATA_GET_API, + HOST_METADATA_LIST_API, + metadataCurrentIndexPattern, +} from '../../../../../common/endpoint/constants'; import { IIndexPattern, Query } from '../../../../../../../../src/plugins/data/public'; +import { resolvePathVariables } from '../../trusted_apps/service/utils'; import { createFailedResourceState, createLoadedResourceState, @@ -95,7 +100,7 @@ export const endpointMiddlewareFactory: ImmutableMiddlewareFactory('/api/endpoint/metadata', { + endpointResponse = await coreStart.http.post(HOST_METADATA_LIST_API, { body: JSON.stringify({ paging_properties: [{ page_index: pageIndex }, { page_size: pageSize }], filters: { kql: decodedQuery.query }, @@ -244,7 +249,7 @@ export const endpointMiddlewareFactory: ImmutableMiddlewareFactory( - `/api/endpoint/metadata/${selectedEndpoint}` + resolvePathVariables(HOST_METADATA_GET_API, { id: selectedEndpoint as string }) ); dispatch({ type: 'serverReturnedEndpointDetails', @@ -426,7 +431,7 @@ const getAgentAndPoliciesForEndpointsList = async ( const endpointsTotal = async (http: HttpStart): Promise => { try { return ( - await http.post('/api/endpoint/metadata', { + await http.post(HOST_METADATA_LIST_API, { body: JSON.stringify({ paging_properties: [{ page_index: 0 }, { page_size: 1 }], }), diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/index.tsx index de4795869f4b4b..341397da09e1d9 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/index.tsx +++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/index.tsx @@ -26,9 +26,13 @@ import { useTimelineEventsDetails } from '../../../containers/details'; import { TimelineTabs } from '../../../../../common/types/timeline'; import { HostIsolationPanel } from '../../../../detections/components/host_isolation'; import { TakeActionDropdown } from '../../../../detections/components/host_isolation/take_action_dropdown'; -import { ISOLATE_HOST } from '../../../../detections/components/host_isolation/translations'; +import { + ISOLATE_HOST, + UNISOLATE_HOST, +} from '../../../../detections/components/host_isolation/translations'; import { ALERT_DETAILS } from './translations'; import { useIsExperimentalFeatureEnabled } from '../../../../common/hooks/use_experimental_features'; +import { useIsolationPrivileges } from '../../../../common/hooks/endpoint/use_isolate_privileges'; const StyledEuiFlyoutBody = styled(EuiFlyoutBody)` .euiFlyoutBody__overflow { @@ -74,13 +78,17 @@ const EventDetailsPanelComponent: React.FC = ({ const [isHostIsolationPanelOpen, setIsHostIsolationPanel] = useState(false); + const [isolateAction, setIsolateAction] = useState('isolateHost'); + const showAlertDetails = useCallback(() => { setIsHostIsolationPanel(false); }, []); + const { isAllowed: isIsolationAllowed } = useIsolationPrivileges(); const showHostIsolationPanel = useCallback((action) => { - if (action === 'isolateHost') { + if (action === 'isolateHost' || action === 'unisolateHost') { setIsHostIsolationPanel(true); + setIsolateAction(action); } }, []); @@ -91,6 +99,11 @@ const EventDetailsPanelComponent: React.FC = ({ return findEndpointAlert ? findEndpointAlert[0] === 'endpoint' : false; }, [detailsData]); + const agentId = useMemo(() => { + const findAgentId = find({ category: 'agent', field: 'agent.id' }, detailsData)?.values; + return findAgentId ? findAgentId[0] : ''; + }, [detailsData]); + const backToAlertDetailsLink = useMemo(() => { return ( <> @@ -105,11 +118,11 @@ const EventDetailsPanelComponent: React.FC = ({ -

    {ISOLATE_HOST}

    +

    {isolateAction === 'isolateHost' ? ISOLATE_HOST : UNISOLATE_HOST}

     ); - }, [showAlertDetails]); + }, [showAlertDetails, isolateAction]); if (!expandedEvent?.eventId) { return null; @@ -126,7 +139,11 @@ const EventDetailsPanelComponent: React.FC = ({ {isHostIsolationPanelOpen ? ( - + ) : ( = ({ /> )} - {isHostIsolationEnabled && isEndpointAlert && isHostIsolationPanelOpen === false && ( - - - - - - - - - - )} + {isIsolationAllowed && + isHostIsolationEnabled && + isEndpointAlert && + isHostIsolationPanelOpen === false && ( + + + + + + + + + + )} ) : ( <> 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 09d26a20f10956..68420411284651 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 @@ -20,14 +20,7 @@ import { } from '../../../types'; import { getAgentIDsForEndpoints } from '../../services'; import { EndpointAppContext } from '../../types'; - -export const userCanIsolate = (roles: readonly string[] | undefined): boolean => { - // only superusers can write to the fleet index (or look up endpoint data to convert endp ID to agent ID) - if (!roles || roles.length === 0) { - return false; - } - return roles.includes('superuser'); -}; +import { userCanIsolate } from '../../../../common/endpoint/actions'; /** * Registers the Host-(un-)isolation routes diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/handlers.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/handlers.ts index 104383f3986462..98610c2e84c02c 100644 --- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/handlers.ts +++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/handlers.ts @@ -17,7 +17,7 @@ import { import { HostInfo, HostMetadata, - HostMetaDataInfo, + HostMetadataInfo, HostResultList, HostStatus, MetadataQueryStrategyVersions, @@ -182,7 +182,7 @@ export async function getHostMetaData( metadataRequestContext: MetadataRequestContext, id: string, queryStrategyVersion?: MetadataQueryStrategyVersions -): Promise { +): Promise { if ( !metadataRequestContext.esClient && !metadataRequestContext.requestHandlerContext?.core.elasticsearch.client From 806566c62ecb4577ea73d622dcd45fec94787841 Mon Sep 17 00:00:00 2001 From: Anton Dosov Date: Thu, 27 May 2021 15:47:30 +0200 Subject: [PATCH 07/14] [Index Patterns] Migrate tests to the new es client (#100760) --- .../apis/index_patterns/es_errors/errors.js | 14 ++++++-------- .../index_patterns/es_errors/lib/get_es_errors.js | 4 ++-- .../management/_create_index_pattern_wizard.js | 2 +- test/functional/apps/management/_handle_alias.js | 2 +- .../apps/management/_handle_version_conflict.js | 6 +++--- .../apps/management/_index_patterns_empty.ts | 6 ++---- .../apps/management/create_index_pattern_wizard.js | 2 +- 7 files changed, 16 insertions(+), 20 deletions(-) diff --git a/test/api_integration/apis/index_patterns/es_errors/errors.js b/test/api_integration/apis/index_patterns/es_errors/errors.js index 3b5b4628f0f20f..fab59ef256a050 100644 --- a/test/api_integration/apis/index_patterns/es_errors/errors.js +++ b/test/api_integration/apis/index_patterns/es_errors/errors.js @@ -7,7 +7,7 @@ */ import expect from '@kbn/expect'; -import { errors as esErrors } from 'elasticsearch'; +import { errors as esErrors } from '@elastic/elasticsearch'; import Boom from '@hapi/boom'; import { @@ -20,7 +20,7 @@ import { import { getIndexNotFoundError, getDocNotFoundError } from './lib'; export default function ({ getService }) { - const es = getService('legacyEs'); + const es = getService('es'); const esArchiver = getService('esArchiver'); describe('index_patterns/* error handler', () => { @@ -98,8 +98,8 @@ export default function ({ getService }) { }); it('wraps other errors in Boom', async () => { - const error = new esErrors.AuthenticationException( - { + const error = new esErrors.ResponseError({ + body: { root_cause: [ { type: 'security_exception', @@ -109,10 +109,8 @@ export default function ({ getService }) { type: 'security_exception', reason: 'action [indices:data/read/field_caps] is unauthorized for user [standard]', }, - { - statusCode: 403, - } - ); + statusCode: 403, + }); expect(error).to.not.have.property('isBoom'); const converted = convertEsError(indices, error); diff --git a/test/api_integration/apis/index_patterns/es_errors/lib/get_es_errors.js b/test/api_integration/apis/index_patterns/es_errors/lib/get_es_errors.js index 047d9f781421e2..c55f8dd8d6d834 100644 --- a/test/api_integration/apis/index_patterns/es_errors/lib/get_es_errors.js +++ b/test/api_integration/apis/index_patterns/es_errors/lib/get_es_errors.js @@ -14,7 +14,7 @@ export async function getIndexNotFoundError(es) { index: 'SHOULD NOT EXIST', }); } catch (err) { - expect(err).to.have.property('status', 404); // sanity check + expect(err).to.have.property('statusCode', 404); // sanity check return err; } @@ -28,7 +28,7 @@ export async function getDocNotFoundError(es) { id: '1234', }); } catch (err) { - expect(err).to.have.property('status', 404); // sanity check + expect(err).to.have.property('statusCode', 404); // sanity check return err; } diff --git a/test/functional/apps/management/_create_index_pattern_wizard.js b/test/functional/apps/management/_create_index_pattern_wizard.js index 306d2516293960..d4b49d74d1b901 100644 --- a/test/functional/apps/management/_create_index_pattern_wizard.js +++ b/test/functional/apps/management/_create_index_pattern_wizard.js @@ -11,7 +11,7 @@ import expect from '@kbn/expect'; export default function ({ getService, getPageObjects }) { const kibanaServer = getService('kibanaServer'); const testSubjects = getService('testSubjects'); - const es = getService('legacyEs'); + const es = getService('es'); const PageObjects = getPageObjects(['settings', 'common', 'header']); const security = getService('security'); diff --git a/test/functional/apps/management/_handle_alias.js b/test/functional/apps/management/_handle_alias.js index b88dfe0f25524e..6c90556d77cf05 100644 --- a/test/functional/apps/management/_handle_alias.js +++ b/test/functional/apps/management/_handle_alias.js @@ -10,7 +10,7 @@ import expect from '@kbn/expect'; export default function ({ getService, getPageObjects }) { const esArchiver = getService('esArchiver'); - const es = getService('legacyEs'); + const es = getService('es'); const retry = getService('retry'); const security = getService('security'); const PageObjects = getPageObjects(['common', 'home', 'settings', 'discover', 'timePicker']); diff --git a/test/functional/apps/management/_handle_version_conflict.js b/test/functional/apps/management/_handle_version_conflict.js index 16c427e9bbe20b..2daad1e457a6be 100644 --- a/test/functional/apps/management/_handle_version_conflict.js +++ b/test/functional/apps/management/_handle_version_conflict.js @@ -21,7 +21,7 @@ export default function ({ getService, getPageObjects }) { const testSubjects = getService('testSubjects'); const esArchiver = getService('esArchiver'); const browser = getService('browser'); - const es = getService('legacyEs'); + const es = getService('es'); const retry = getService('retry'); const scriptedFiledName = 'versionConflictScript'; const PageObjects = getPageObjects(['common', 'home', 'settings', 'discover', 'header']); @@ -49,7 +49,7 @@ export default function ({ getService, getPageObjects }) { }, }); log.debug(JSON.stringify(response)); - expect(response.result).to.be('updated'); + expect(response.body.result).to.be('updated'); await PageObjects.settings.setFieldFormat('url'); await PageObjects.settings.clickSaveScriptedField(); await retry.try(async function () { @@ -80,7 +80,7 @@ export default function ({ getService, getPageObjects }) { }, }); log.debug(JSON.stringify(response)); - expect(response.result).to.be('updated'); + expect(response.body.result).to.be('updated'); await PageObjects.settings.controlChangeSave(); await retry.try(async function () { //await PageObjects.common.sleep(2000); diff --git a/test/functional/apps/management/_index_patterns_empty.ts b/test/functional/apps/management/_index_patterns_empty.ts index 90dd8cdc35c300..3a09340f06ba04 100644 --- a/test/functional/apps/management/_index_patterns_empty.ts +++ b/test/functional/apps/management/_index_patterns_empty.ts @@ -15,7 +15,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { const PageObjects = getPageObjects(['common', 'settings']); const testSubjects = getService('testSubjects'); const globalNav = getService('globalNav'); - const es = getService('legacyEs'); + const es = getService('es'); describe('index pattern empty view', () => { before(async () => { @@ -28,7 +28,6 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { after(async () => { await esArchiver.loadIfNeeded('makelogs'); - // @ts-expect-error await es.transport.request({ path: '/logstash-a', method: 'DELETE', @@ -42,14 +41,13 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { `\n\nNOTE: If this test fails make sure there aren't any non-system indices in the _cat/indices output (use esArchiver.unload on them)` ); log.debug( - // @ts-expect-error await es.transport.request({ path: '/_cat/indices', method: 'GET', }) ); await testSubjects.existOrFail('createAnyway'); - // @ts-expect-error + await es.transport.request({ path: '/logstash-a/_doc', method: 'POST', diff --git a/x-pack/test/functional/apps/management/create_index_pattern_wizard.js b/x-pack/test/functional/apps/management/create_index_pattern_wizard.js index 149c0fd09c0972..246256cb4c2a1d 100644 --- a/x-pack/test/functional/apps/management/create_index_pattern_wizard.js +++ b/x-pack/test/functional/apps/management/create_index_pattern_wizard.js @@ -7,7 +7,7 @@ export default function ({ getService, getPageObjects }) { const kibanaServer = getService('kibanaServer'); - const es = getService('legacyEs'); + const es = getService('es'); const PageObjects = getPageObjects(['settings', 'common']); describe('"Create Index Pattern" wizard', function () { From 7fc4a1f80f69dfbb4b7ace3922328c840838e339 Mon Sep 17 00:00:00 2001 From: Nathan L Smith Date: Thu, 27 May 2021 09:43:12 -0500 Subject: [PATCH 08/14] Add kibana.yml configuration for cases (#100583) Make it so `xpack.observability.unsafe.alertingExperience.enabled` only shows and hides the Alerts page, and `xpack.observability.unsafe.cases.enabled` show and hides the Cases page. --- .../resources/base/bin/kibana-docker | 1 + x-pack/plugins/observability/README.md | 12 ++++++++++-- .../public/application/application.test.tsx | 2 +- .../public/components/app/section/apm/index.test.tsx | 2 +- .../public/components/app/section/ux/index.test.tsx | 2 +- .../public/hooks/use_time_range.test.ts | 4 ++-- x-pack/plugins/observability/public/index.ts | 2 +- .../public/pages/overview/overview.stories.tsx | 2 +- x-pack/plugins/observability/public/plugin.ts | 2 ++ .../observability/public/utils/test_helper.tsx | 2 +- x-pack/plugins/observability/server/index.ts | 3 ++- 11 files changed, 23 insertions(+), 11 deletions(-) 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 2f54bd1d818b56..47b5888da4ce87 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 @@ -231,6 +231,7 @@ kibana_vars=( xpack.maps.showMapVisualizationTypes xpack.ml.enabled xpack.observability.unsafe.alertingExperience.enabled + xpack.observability.unsafe.cases.enabled xpack.reporting.capture.browser.autoDownload xpack.reporting.capture.browser.chromium.disableSandbox xpack.reporting.capture.browser.chromium.inspect diff --git a/x-pack/plugins/observability/README.md b/x-pack/plugins/observability/README.md index 943a7482a25eec..cfa13315734159 100644 --- a/x-pack/plugins/observability/README.md +++ b/x-pack/plugins/observability/README.md @@ -9,13 +9,21 @@ case management. If you have: +```yaml +xpack.observability.unsafe.cases.enabled: true +``` + +In your Kibana configuration, the Cases page will be available. + +If you have: + ```yaml xpack.observability.unsafe.alertingExperience.enabled: true ``` -In your Kibana configuration, the Alerts and Cases pages will be available. +In your Kibana configuration, the Alerts page will be available. -This will only enable the UI for these pages. In order to have alert data indexed +This will only enable the UI for this page when. In order to have alert data indexed you'll need to enable writing in the [Rule Registry plugin](../rule_registry/README.md): ```yaml diff --git a/x-pack/plugins/observability/public/application/application.test.tsx b/x-pack/plugins/observability/public/application/application.test.tsx index 9182a0e8196c89..76b8eb5c7fd085 100644 --- a/x-pack/plugins/observability/public/application/application.test.tsx +++ b/x-pack/plugins/observability/public/application/application.test.tsx @@ -45,7 +45,7 @@ describe('renderApp', () => { uiSettings: { get: () => false }, http: { basePath: { prepend: (path: string) => path } }, } as unknown) as CoreStart; - const config = { unsafe: { alertingExperience: { enabled: true } } }; + const config = { unsafe: { alertingExperience: { enabled: true }, cases: { enabled: true } } }; const params = ({ element: window.document.createElement('div'), history: createMemoryHistory(), diff --git a/x-pack/plugins/observability/public/components/app/section/apm/index.test.tsx b/x-pack/plugins/observability/public/components/app/section/apm/index.test.tsx index 67fede05f3ced6..aa83c49c9f52a2 100644 --- a/x-pack/plugins/observability/public/components/app/section/apm/index.test.tsx +++ b/x-pack/plugins/observability/public/components/app/section/apm/index.test.tsx @@ -41,7 +41,7 @@ describe('APMSection', () => { http: { basePath: { prepend: jest.fn() } }, } as unknown) as CoreStart, appMountParameters: {} as AppMountParameters, - config: { unsafe: { alertingExperience: { enabled: true } } }, + config: { unsafe: { alertingExperience: { enabled: true }, cases: { enabled: true } } }, observabilityRuleTypeRegistry: createObservabilityRuleTypeRegistryMock(), plugins: ({ data: { diff --git a/x-pack/plugins/observability/public/components/app/section/ux/index.test.tsx b/x-pack/plugins/observability/public/components/app/section/ux/index.test.tsx index b4227cc122dde3..5c237bfbc31ecb 100644 --- a/x-pack/plugins/observability/public/components/app/section/ux/index.test.tsx +++ b/x-pack/plugins/observability/public/components/app/section/ux/index.test.tsx @@ -40,7 +40,7 @@ describe('UXSection', () => { http: { basePath: { prepend: jest.fn() } }, } as unknown) as CoreStart, appMountParameters: {} as AppMountParameters, - config: { unsafe: { alertingExperience: { enabled: true } } }, + config: { unsafe: { alertingExperience: { enabled: true }, cases: { enabled: true } } }, plugins: ({ data: { query: { diff --git a/x-pack/plugins/observability/public/hooks/use_time_range.test.ts b/x-pack/plugins/observability/public/hooks/use_time_range.test.ts index 8808d6390e3651..3b0bdb8dc96033 100644 --- a/x-pack/plugins/observability/public/hooks/use_time_range.test.ts +++ b/x-pack/plugins/observability/public/hooks/use_time_range.test.ts @@ -24,7 +24,7 @@ describe('useTimeRange', () => { jest.spyOn(pluginContext, 'usePluginContext').mockImplementation(() => ({ core: {} as CoreStart, appMountParameters: {} as AppMountParameters, - config: { unsafe: { alertingExperience: { enabled: true } } }, + config: { unsafe: { alertingExperience: { enabled: true }, cases: { enabled: true } } }, plugins: ({ data: { query: { @@ -66,7 +66,7 @@ describe('useTimeRange', () => { jest.spyOn(pluginContext, 'usePluginContext').mockImplementation(() => ({ core: {} as CoreStart, appMountParameters: {} as AppMountParameters, - config: { unsafe: { alertingExperience: { enabled: true } } }, + config: { unsafe: { alertingExperience: { enabled: true }, cases: { enabled: true } } }, plugins: ({ data: { query: { diff --git a/x-pack/plugins/observability/public/index.ts b/x-pack/plugins/observability/public/index.ts index 8dd2f6a57eefe9..a49d3461529c28 100644 --- a/x-pack/plugins/observability/public/index.ts +++ b/x-pack/plugins/observability/public/index.ts @@ -22,7 +22,7 @@ export type { export { enableInspectEsQueries } from '../common/ui_settings_keys'; export interface ConfigSchema { - unsafe: { alertingExperience: { enabled: boolean } }; + unsafe: { alertingExperience: { enabled: boolean }; cases: { enabled: boolean } }; } export const plugin: PluginInitializer< diff --git a/x-pack/plugins/observability/public/pages/overview/overview.stories.tsx b/x-pack/plugins/observability/public/pages/overview/overview.stories.tsx index ebd1c738591690..12f8900034eb26 100644 --- a/x-pack/plugins/observability/public/pages/overview/overview.stories.tsx +++ b/x-pack/plugins/observability/public/pages/overview/overview.stories.tsx @@ -45,7 +45,7 @@ const withCore = makeDecorator({ appMountParameters: ({ setHeaderActionMenu: () => {}, } as unknown) as AppMountParameters, - config: { unsafe: { alertingExperience: { enabled: true } } }, + config: { unsafe: { alertingExperience: { enabled: true }, cases: { enabled: true } } }, core: options as CoreStart, plugins: ({ data: { diff --git a/x-pack/plugins/observability/public/plugin.ts b/x-pack/plugins/observability/public/plugin.ts index 6856bc97b4a360..16363d4181c5be 100644 --- a/x-pack/plugins/observability/public/plugin.ts +++ b/x-pack/plugins/observability/public/plugin.ts @@ -119,7 +119,9 @@ export class Plugin mount, updater$, }); + } + if (config.unsafe.cases.enabled) { coreSetup.application.register({ id: 'observability-cases', title: 'Cases', diff --git a/x-pack/plugins/observability/public/utils/test_helper.tsx b/x-pack/plugins/observability/public/utils/test_helper.tsx index ef7c62a143f250..2434f0eec10edc 100644 --- a/x-pack/plugins/observability/public/utils/test_helper.tsx +++ b/x-pack/plugins/observability/public/utils/test_helper.tsx @@ -31,7 +31,7 @@ export const core = ({ }, } as unknown) as CoreStart; -const config = { unsafe: { alertingExperience: { enabled: true } } }; +const config = { unsafe: { alertingExperience: { enabled: true }, cases: { enabled: true } } }; const plugins = ({ data: { query: { timefilter: { timefilter: { setTime: jest.fn() } } } }, diff --git a/x-pack/plugins/observability/server/index.ts b/x-pack/plugins/observability/server/index.ts index ec471df164fe1d..52a60a92f5b957 100644 --- a/x-pack/plugins/observability/server/index.ts +++ b/x-pack/plugins/observability/server/index.ts @@ -17,7 +17,7 @@ export * from './types'; export const config = { exposeToBrowser: { - unsafe: { alertingExperience: { enabled: true } }, + unsafe: { alertingExperience: { enabled: true }, cases: { enabled: true } }, }, schema: schema.object({ enabled: schema.boolean({ defaultValue: true }), @@ -27,6 +27,7 @@ export const config = { }), unsafe: schema.object({ alertingExperience: schema.object({ enabled: schema.boolean({ defaultValue: false }) }), + cases: schema.object({ enabled: schema.boolean({ defaultValue: false }) }), }), }), }; From 06d276e06054229010f43ff51a2c7e5d3afb3307 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20St=C3=BCrmer?= Date: Thu, 27 May 2021 16:58:15 +0200 Subject: [PATCH 09/14] [Logs UI] Add shared observability page template and navigation (#99380) Co-authored-by: Kerry Gallagher <471693+Kerry350@users.noreply.github.com> Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- x-pack/plugins/observability/README.md | 4 + .../public/application/application.test.tsx | 2 + .../public/application/index.tsx | 19 ++- .../components/app/header/header_menu.tsx | 41 ++++++ .../components/app/header/index.test.tsx | 18 --- .../public/components/app/header/index.tsx | 79 +---------- .../components/app/layout/with_header.tsx | 48 ------- .../components/app/section/apm/index.test.tsx | 2 + .../components/app/section/ux/index.test.tsx | 2 + .../public/components/shared/index.tsx | 2 + .../components/shared/page_template/README.md | 104 +++++++++++++++ .../components/shared/page_template/index.ts | 8 ++ .../page_template/lazy_page_template.tsx | 26 ++++ .../shared/page_template/page_template.png | Bin 0 -> 311243 bytes .../page_template/page_template.test.tsx | 112 ++++++++++++++++ .../shared/page_template/page_template.tsx | 125 ++++++++++++++++++ .../public/context/plugin_context.tsx | 4 +- .../public/hooks/use_time_range.test.ts | 2 + .../public/pages/alerts/index.tsx | 17 +-- .../public/pages/cases/index.tsx | 8 +- .../public/pages/landing/index.tsx | 13 +- .../public/pages/overview/index.tsx | 39 +++--- .../pages/overview/loading_observability.tsx | 58 +++----- .../pages/overview/overview.stories.tsx | 2 + x-pack/plugins/observability/public/plugin.ts | 38 +++++- .../services/navigation_registry.test.ts | 74 +++++++++++ .../public/services/navigation_registry.ts | 51 +++++++ .../public/utils/test_helper.tsx | 14 +- .../translations/translations/ja-JP.json | 1 - .../translations/translations/zh-CN.json | 1 - 30 files changed, 680 insertions(+), 234 deletions(-) create mode 100644 x-pack/plugins/observability/public/components/app/header/header_menu.tsx delete mode 100644 x-pack/plugins/observability/public/components/app/header/index.test.tsx delete mode 100644 x-pack/plugins/observability/public/components/app/layout/with_header.tsx create mode 100644 x-pack/plugins/observability/public/components/shared/page_template/README.md create mode 100644 x-pack/plugins/observability/public/components/shared/page_template/index.ts create mode 100644 x-pack/plugins/observability/public/components/shared/page_template/lazy_page_template.tsx create mode 100644 x-pack/plugins/observability/public/components/shared/page_template/page_template.png create mode 100644 x-pack/plugins/observability/public/components/shared/page_template/page_template.test.tsx create mode 100644 x-pack/plugins/observability/public/components/shared/page_template/page_template.tsx create mode 100644 x-pack/plugins/observability/public/services/navigation_registry.test.ts create mode 100644 x-pack/plugins/observability/public/services/navigation_registry.ts diff --git a/x-pack/plugins/observability/README.md b/x-pack/plugins/observability/README.md index cfa13315734159..8d87bacc431e02 100644 --- a/x-pack/plugins/observability/README.md +++ b/x-pack/plugins/observability/README.md @@ -32,6 +32,10 @@ xpack.ruleRegistry.write.enabled: true When both of the these are set to `true`, your alerts should show on the alerts page. +## Shared navigation + +The Observability plugin maintains a navigation registry for Observability solutions, and exposes a shared page template component. Please refer to the docs in [the component directory](./components/shared/page_template/README.md) for more information on registering your solution's navigation structure, and rendering the navigation via the shared component. + ## Unit testing Note: Run the following commands from `kibana/x-pack/plugins/observability`. diff --git a/x-pack/plugins/observability/public/application/application.test.tsx b/x-pack/plugins/observability/public/application/application.test.tsx index 76b8eb5c7fd085..3b276df08e5afb 100644 --- a/x-pack/plugins/observability/public/application/application.test.tsx +++ b/x-pack/plugins/observability/public/application/application.test.tsx @@ -9,6 +9,7 @@ import { createMemoryHistory } from 'history'; import React from 'react'; import { Observable } from 'rxjs'; import { AppMountParameters, CoreStart } from 'src/core/public'; +import { KibanaPageTemplate } from '../../../../../src/plugins/kibana_react/public'; import { ObservabilityPublicPluginsStart } from '../plugin'; import { createObservabilityRuleTypeRegistryMock } from '../rules/observability_rule_type_registry_mock'; import { renderApp } from './'; @@ -59,6 +60,7 @@ describe('renderApp', () => { plugins, appMountParameters: params, observabilityRuleTypeRegistry: createObservabilityRuleTypeRegistryMock(), + ObservabilityPageTemplate: KibanaPageTemplate, }); unmount(); }).not.toThrowError(); diff --git a/x-pack/plugins/observability/public/application/index.tsx b/x-pack/plugins/observability/public/application/index.tsx index 460aa6c35bdb8e..f8dce3ce1d487e 100644 --- a/x-pack/plugins/observability/public/application/index.tsx +++ b/x-pack/plugins/observability/public/application/index.tsx @@ -10,7 +10,7 @@ import React, { MouseEvent, useEffect } from 'react'; import ReactDOM from 'react-dom'; import { Route, Router, Switch } from 'react-router-dom'; import { EuiThemeProvider } from '../../../../../src/plugins/kibana_react/common'; -import { AppMountParameters, CoreStart } from '../../../../../src/core/public'; +import { AppMountParameters, APP_WRAPPER_CLASS, CoreStart } from '../../../../../src/core/public'; import { KibanaContextProvider, RedirectAppLinks, @@ -19,6 +19,7 @@ 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'; @@ -74,12 +75,14 @@ export const renderApp = ({ plugins, appMountParameters, observabilityRuleTypeRegistry, + ObservabilityPageTemplate, }: { config: ConfigSchema; core: CoreStart; plugins: ObservabilityPublicPluginsStart; observabilityRuleTypeRegistry: ObservabilityRuleTypeRegistry; appMountParameters: AppMountParameters; + ObservabilityPageTemplate: React.ComponentType; }) => { const { element, history } = appMountParameters; const i18nCore = core.i18n; @@ -92,15 +95,25 @@ export const renderApp = ({ links: [{ linkType: 'discuss', href: 'https://ela.st/observability-discuss' }], }); + // ensure all divs are .kbnAppWrappers + element.classList.add(APP_WRAPPER_CLASS); + ReactDOM.render( - + diff --git a/x-pack/plugins/observability/public/components/app/header/header_menu.tsx b/x-pack/plugins/observability/public/components/app/header/header_menu.tsx new file mode 100644 index 00000000000000..707cb241501fdc --- /dev/null +++ b/x-pack/plugins/observability/public/components/app/header/header_menu.tsx @@ -0,0 +1,41 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { EuiHeaderLink, EuiHeaderLinks } from '@elastic/eui'; +import { i18n } from '@kbn/i18n'; +import React from 'react'; +import { usePluginContext } from '../../../hooks/use_plugin_context'; +import HeaderMenuPortal from '../../shared/header_menu_portal'; + +export function ObservabilityHeaderMenu(): React.ReactElement | null { + const { + appMountParameters: { setHeaderActionMenu }, + core: { + http: { + basePath: { prepend }, + }, + }, + } = usePluginContext(); + + return ( + + + + {addDataLinkText} + + + + ); +} + +const addDataLinkText = i18n.translate('xpack.observability.home.addData', { + defaultMessage: 'Add data', +}); diff --git a/x-pack/plugins/observability/public/components/app/header/index.test.tsx b/x-pack/plugins/observability/public/components/app/header/index.test.tsx deleted file mode 100644 index 65724dd74598de..00000000000000 --- a/x-pack/plugins/observability/public/components/app/header/index.test.tsx +++ /dev/null @@ -1,18 +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 { render } from '../../../utils/test_helper'; -import { Header } from './'; - -describe('Header', () => { - it('renders', () => { - const { getByText, getByTestId } = render(
    ); - expect(getByTestId('observability-logo')).toBeInTheDocument(); - expect(getByText('Observability')).toBeInTheDocument(); - }); -}); diff --git a/x-pack/plugins/observability/public/components/app/header/index.tsx b/x-pack/plugins/observability/public/components/app/header/index.tsx index 8b86e0b25379b8..f7f69c22173fc5 100644 --- a/x-pack/plugins/observability/public/components/app/header/index.tsx +++ b/x-pack/plugins/observability/public/components/app/header/index.tsx @@ -5,81 +5,4 @@ * 2.0. */ -import { - EuiFlexGroup, - EuiFlexItem, - EuiHeaderLink, - EuiHeaderLinks, - EuiIcon, - EuiSpacer, - EuiTitle, -} from '@elastic/eui'; -import { i18n } from '@kbn/i18n'; -import React, { ReactNode } from 'react'; -import styled from 'styled-components'; -import { usePluginContext } from '../../../hooks/use_plugin_context'; -import HeaderMenuPortal from '../../shared/header_menu_portal'; - -const Container = styled.div<{ color: string }>` - background: ${(props) => props.color}; - border-bottom: ${(props) => props.theme.eui.euiBorderThin}; -`; - -const Wrapper = styled.div<{ restrictWidth?: number }>` - width: 100%; - max-width: ${(props) => `${props.restrictWidth}px`}; - margin: 0 auto; - overflow: hidden; - padding: 0 16px; -`; - -interface Props { - color: string; - datePicker?: ReactNode; - restrictWidth?: number; -} - -export function Header({ color, datePicker = null, restrictWidth }: Props) { - const { appMountParameters, core } = usePluginContext(); - const { setHeaderActionMenu } = appMountParameters; - const { prepend } = core.http.basePath; - - return ( - - - - - {i18n.translate('xpack.observability.home.addData', { defaultMessage: 'Add data' })} - - - - - - - - - - - - - -

    - {i18n.translate('xpack.observability.home.title', { - defaultMessage: 'Observability', - })} -

    -     -     -     -     - {datePicker} -     - -     -     - ); -} +export * from './header_menu'; diff --git a/x-pack/plugins/observability/public/components/app/layout/with_header.tsx b/x-pack/plugins/observability/public/components/app/layout/with_header.tsx deleted file mode 100644 index f2d50539395bdf..00000000000000 --- a/x-pack/plugins/observability/public/components/app/layout/with_header.tsx +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { EuiPage, EuiPageBody, EuiPageProps } from '@elastic/eui'; -import React, { ReactNode } from 'react'; -import styled from 'styled-components'; -import { Header } from '../header/index'; - -const Page = styled(EuiPage)` - background: transparent; -`; - -const Container = styled.div<{ color?: string }>` - overflow-y: hidden; - min-height: calc( - 100vh - ${(props) => props.theme.eui.euiHeaderHeight + props.theme.eui.euiHeaderHeight} - ); - background: ${(props) => props.color}; -`; - -interface Props { - datePicker?: ReactNode; - headerColor: string; - bodyColor: string; - children?: ReactNode; - restrictWidth?: number; -} - -export function WithHeaderLayout({ - datePicker, - headerColor, - bodyColor, - children, - restrictWidth, -}: Props) { - return ( - -
    - - {children} - - - ); -} diff --git a/x-pack/plugins/observability/public/components/app/section/apm/index.test.tsx b/x-pack/plugins/observability/public/components/app/section/apm/index.test.tsx index aa83c49c9f52a2..ad3ecd27408029 100644 --- a/x-pack/plugins/observability/public/components/app/section/apm/index.test.tsx +++ b/x-pack/plugins/observability/public/components/app/section/apm/index.test.tsx @@ -16,6 +16,7 @@ import { HasDataContextValue } from '../../../../context/has_data_context'; import { AppMountParameters, CoreStart } from 'kibana/public'; import { ObservabilityPublicPluginsStart } from '../../../../plugin'; import { createObservabilityRuleTypeRegistryMock } from '../../../../rules/observability_rule_type_registry_mock'; +import { KibanaPageTemplate } from '../../../../../../../../src/plugins/kibana_react/public'; jest.mock('react-router-dom', () => ({ useLocation: () => ({ @@ -57,6 +58,7 @@ describe('APMSection', () => { }, }, } as unknown) as ObservabilityPublicPluginsStart, + ObservabilityPageTemplate: KibanaPageTemplate, })); }); diff --git a/x-pack/plugins/observability/public/components/app/section/ux/index.test.tsx b/x-pack/plugins/observability/public/components/app/section/ux/index.test.tsx index 5c237bfbc31ecb..fab461476e7136 100644 --- a/x-pack/plugins/observability/public/components/app/section/ux/index.test.tsx +++ b/x-pack/plugins/observability/public/components/app/section/ux/index.test.tsx @@ -16,6 +16,7 @@ import { render } from '../../../../utils/test_helper'; import { UXSection } from './'; import { response } from './mock_data/ux.mock'; import { createObservabilityRuleTypeRegistryMock } from '../../../../rules/observability_rule_type_registry_mock'; +import { KibanaPageTemplate } from '../../../../../../../../src/plugins/kibana_react/public'; jest.mock('react-router-dom', () => ({ useLocation: () => ({ @@ -56,6 +57,7 @@ describe('UXSection', () => { }, } as unknown) as ObservabilityPublicPluginsStart, observabilityRuleTypeRegistry: createObservabilityRuleTypeRegistryMock(), + ObservabilityPageTemplate: KibanaPageTemplate, })); }); it('renders with core web vitals', () => { diff --git a/x-pack/plugins/observability/public/components/shared/index.tsx b/x-pack/plugins/observability/public/components/shared/index.tsx index d4d7521a6b0964..f04ca5b8579163 100644 --- a/x-pack/plugins/observability/public/components/shared/index.tsx +++ b/x-pack/plugins/observability/public/components/shared/index.tsx @@ -9,6 +9,8 @@ import React, { lazy, Suspense } from 'react'; import type { CoreVitalProps, HeaderMenuPortalProps } from './types'; import type { FieldValueSuggestionsProps } from './field_value_suggestions/types'; +export { createLazyObservabilityPageTemplate } from './page_template'; + const CoreVitalsLazy = lazy(() => import('./core_web_vitals/index')); export function getCoreVitalsComponent(props: CoreVitalProps) { diff --git a/x-pack/plugins/observability/public/components/shared/page_template/README.md b/x-pack/plugins/observability/public/components/shared/page_template/README.md new file mode 100644 index 00000000000000..e360e6d95a9d8a --- /dev/null +++ b/x-pack/plugins/observability/public/components/shared/page_template/README.md @@ -0,0 +1,104 @@ +## Overview + +Observability solutions can register their navigation structures via the Observability plugin, this ensures that these navigation options display in the Observability page template component. This is a two part process, A) register your navigation structure and B) consume and render the shared page template component. These two elements are documented below. + +## Navigation registration + +To register a solution's navigation structure you'll first need to ensure your solution has the observability plugin specified as a dependency in your `kibana.json` file, e.g. + +```json +"requiredPlugins": [ + "observability" +], +``` + +Now within your solution's **public** plugin `setup` lifecycle method you can call the `registerSections` method, this will register your solution's specific navigation structure with the overall Observability navigation registry. E.g. + +```typescript +// x-pack/plugins/example_plugin/public/plugin.ts + +export class Plugin implements PluginClass { + constructor(_context: PluginInitializerContext) {} + + setup(core: CoreSetup, plugins: PluginsSetup) { + plugins.observability.navigation.registerSections( + of([ + { + label: 'A solution section', + sortKey: 200, + entries: [ + { label: 'Example Page', app: 'exampleA', path: '/example' }, + { label: 'Another Example Page', app: 'exampleA', path: '/another-example' }, + ], + }, + { + label: 'Another solution section', + sortKey: 300, + entries: [ + { label: 'Example page', app: 'exampleB', path: '/example' }, + ], + }, + ]) + ); + } + + start() {} + + stop() {} +} +``` + +Here `app` would match your solution - e.g. logs, metrics, APM, uptime etc. The registry is fully typed so please refer to the types for specific options. + +Observables are used to facilitate changes over time, for example within the lifetime of your application a license type or set of user permissions may change and as such you may wish to change the navigation structure. If your navigation needs are simple you can pass a value and forget about it. **Solutions are expected to handle their own permissions, and what should or should not be displayed at any time**, the Observability plugin will not add and remove items for you. + +The Observability navigation registry is now aware of your solution's navigation needs ✅ + +## Page template component + +The shared page template component can be used to actually display and render all of the registered navigation structures within your solution. + +The `start` contract of the public Observability plugin exposes a React component, under `navigation.PageTemplate`. + +This can be accessed like so: + +``` +const [coreStart, pluginsStart] = await core.getStartServices(); +const pageTemplateComponent = pluginsStart.observability.navigation.PageTemplate; +``` + +Now that you have access to the component you can render your solution's content using it. + +```jsx + , + ], + }} + > + // Render anything you like here, this is just an example. + + + // Content + + + + // Content + + + +``` + +The `` component is a wrapper around the `` component (which in turn is a wrapper around the `` component). As such the props mostly reflect those available on the wrapped components, again everything is fully typed so please refer to the types for specific options. The `pageSideBar` prop is handled by the component, and will take care of rendering out and managing the items from the registry. + +After these two steps we should see something like the following (note the navigation on the left): + +![Page template rendered example](./page_template.png) \ No newline at end of file diff --git a/x-pack/plugins/observability/public/components/shared/page_template/index.ts b/x-pack/plugins/observability/public/components/shared/page_template/index.ts new file mode 100644 index 00000000000000..14793ba4022515 --- /dev/null +++ b/x-pack/plugins/observability/public/components/shared/page_template/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { createLazyObservabilityPageTemplate } from './lazy_page_template'; diff --git a/x-pack/plugins/observability/public/components/shared/page_template/lazy_page_template.tsx b/x-pack/plugins/observability/public/components/shared/page_template/lazy_page_template.tsx new file mode 100644 index 00000000000000..7c61cae4f2c73c --- /dev/null +++ b/x-pack/plugins/observability/public/components/shared/page_template/lazy_page_template.tsx @@ -0,0 +1,26 @@ +/* + * Copyright 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 type { + ObservabilityPageTemplateDependencies, + WrappedPageTemplateProps, +} from './page_template'; + +export const LazyObservabilityPageTemplate = React.lazy(() => import('./page_template')); + +export type LazyObservabilityPageTemplateProps = WrappedPageTemplateProps; + +export function createLazyObservabilityPageTemplate( + injectedDeps: ObservabilityPageTemplateDependencies +) { + return (pageTemplateProps: LazyObservabilityPageTemplateProps) => ( + + + + ); +} diff --git a/x-pack/plugins/observability/public/components/shared/page_template/page_template.png b/x-pack/plugins/observability/public/components/shared/page_template/page_template.png new file mode 100644 index 0000000000000000000000000000000000000000..7dc88b937c27bf2bb43851d641b4b11213b71045 GIT binary patch literal 311243 zcmb5W2UJtvwl_+bBB-Du2!bFW(lqoA(mMjut8_x|ErcQ>N-v=kM0)Q?4Or;CMLJ3e zB@}4^0?Et&oO{1}$9r#_4;drLX74@M+H0=0X8FxIceJ*q5+yl3IUXJ!rHZn=4jvvE z77vdINlJn{BcSZ$h=+$S<0vPmts*DKtnKM$=jd#Uhxatm+R~C*nfqy7b`}Z+Amf(S|fvz82!;?84;KxCLz&_lwA?>ukQ2P8;HLM#nk#Pt#kQ%L>rR)rzI1*};~vwCyG!cO+E zSg2sAd2V0Vf!}W|7DkK3V*Or>UC!UUdE*&A)WX7GXStFQ$5MS;Llrv>4ZLT#V^Tc) zC`UXZ+z~$RLy!C5;Snai!@Gg|rN({a^9cU?Dj7D9@V}3VkpJ8$t1G9Xg8S9A_O!Ki z^>T3YzCV$?jce+sqn@F+p@zDcwVMmCm5tjQTV8(`_kT$6B>cs2hc33>R?Pk`&aPf! z{*o;Jx_Mb6C3Ea7QmC#EB>_+R9> z|0G!)yuIDU`1t(%{CNHNdEGqi`Cf>Mit;@N@BsikxI1{f0$jbV{CQlxSpVI~f43uV z>t*ff=F>S1xM*E^*;>$ zFXI1w@&8TuuRe|br_UDvq38d*&;NDlzepwc{u%rK;>Eui{jak)PD_zX@co}zlOpHP z{&9eZCxfRVFRSN|k6a|q)|;m7`cq%8z`eM*$jRfF=RLc~XvsqUAuQz$&4<{MJj|Ut zcO17Md**@Bl)hgj(`j_Vd+0L;lJRp51iJB*9}fPneW~BtM2MPUUYq*|r4;#r?$`GKb3e-eo@I6Ytzv;Qt$TcG>c*h=4Jd zwje_1M}POANcI&{Qqn$G)X){n->`<+-H3w7aRY{=#yi`K(*SIBJu(WqDER)pw|Fa- z!b7A$(@<*5AV212i8hahmoC4En2>p#Qje;c6fDHT`njTaw%)$bvOAm_B95{RR&r*%F0aEX_!4*qFm?h5 zqem`Ncrs>_Od9+c#^>GkM3{3qeh`o$=DkXaORf8-mr4BgamPH6Vf!2@kYXI8I6M7q zWw~n$r?4R!chjwPjm9ZAMF56Pp&Gb7N9WQz+QUvRF}N8xqy_C-q8X27hdeU^%%^q9Zsbg|f!4FUk^G-FCN0MHCQc~shu_?;(><680BP(;tXcvQ;en)PpyO;pf)7ULJ@^KWl@7 zimToc>L`3fIBFf0k*1UO#mms8_RvVbHqw$B+JK8jeEkPvKSQ z7Q-89pW#31eu-Usq-S!>$`Rg|jCh;zv1Sc|kjlH~YaibZ-s|I=IDD2k!l>}_CG|!9 z&++UN^x6(ssK4lnqd>;64vC3%!l~5lrW!1r!YiOiVA==-iog-MDdsST*CTl{wI+ z;2SU2G-K)n;e6UgrPR0gt@sJMkmdr~=eM}7 zzVa+fz}os!ET}3uQIiLoC9IUUM&{Friln%g^!~jr^}TzkWww6%ORS@?gEGAmZB5tC zmiTN*Fa3~npUesinC!cDDQ!>l0-die^G%S$^+D>hv@*X~*=sKXQ*(l_>I~li7g3is z#`Y7~8izy8a=QY{sN`dv;v(f_5|-Co(U;F(7wCB;eppY=!5Xg{_vdPDt>M!+Kp?(C zV)~D+oa0R4HQ6^i8e8=EUdv<}a6OJZT1)v;k4Y{ErY3z2@ERx}HYxD_^nBKHcEeqHr1_>n)~N7pF!HBO)n2S zzWD;bj|0@e0oM7eITWHy(zB1~w$sM9z;%kj9rg!x2``?ScNx|BWzMGU)oTpvR0TB& zWeo5oB7PSt8`c25t4u{Jsavb!Y^bC#{_U^X&xSum6gZ_0=yU|WcKlhBdwG0Rt-}nK z;!0lmS!-cvghxTkYf~v;KN6gA4tI8(s_D#@e8`#ExDTGR>#H(rD|}N(PEF0=TzBhH zA{k9*(n^Bm`L8HW>Nj=g!|5;7;vPw|-{T90y3RMrb)IkBDAg%ULJBR-2#>WS_+kq&b2d?^Hc)HbYrF7; zuTVbvjUDW~0y7odpTS@JHu7AU%i5`G@WHk9AFps2t}Rt>@0a<_0Na5lK@>r#%yi*N z2IJGTjmKj(Rqx5nlTv|_nx+?N;#3NKvzuNM&9IjqX6_irX6I!&1=G-Ps{#<3=BZdVQJA2tR#>4)G) zyUUe$FC~k+gZV%m%5k|Ll9JfJR9oh1( zX?@#Y`9BW3Z$MQ?Ohun?`?-3ghxRkEYc+;b`qYYg(f0LdWEF;TT7aHPnBM0zcQRY; zOZX0p7z<`S3LGSb9lGM#?Q_q64GPblukC{<(4T} z?a*n;{@MJcqcLR?`mkSfrse~C{W4K9ehs*pr0)02&=nub0hQ^b^YvB|+sc+Z><4=$ z$&?4{QW^!lukTd`G{;`(Zd^56l%@2!b#&Hx1QOKS3_)tA;-8+hG@>-=HxKLrGZJw`Im> zg{r9u58b}#?}1myW}P-1@$#F*_rEAqb+)GZFg$qhbh3D~A^hT*{!_jq1fPIc75^+1 z4Y4B$%(omM3*Sd0YUbkZtwcX{095z^iSJIVh08Z;Zu;S-t4eQ zISn#1&`*uQv!%)I6nUXaeIxq}V@WD9@)X={Mj00k0{a&1gDZKR8Yd~QlTbmrz9=S| z2PGNgjgE8{ZH`8kl$VqG^)dX~n*4+_JZUwZl0t%`IooNeC`_|4#6|K+=B#!-fl!&A zfS_(NgRX?z%M~b<-iTB>S;Wzmu@=kigo2nsDH~W>W&NpciArbr!)cNvd zednA~I4vc2(#(F1c(w;t%pNqX3uRnFZ~Rg0jv|yq*t^WOG{Cp{_8m%T3MXaLZI54?!qL$ z6djifDM=UUzeD}>MjW(pWPRjLwu8E{`Q1^dTBaT^dwuLTCmQ*mm5vHtTG92(g|;20 zkK^Qxuy5YHd2)G>csGrdiYn<@Dp!BD=ux3{R8!UH3{FpISS~)>f>#$eDt3nxR{**` zrg0|^XEm#~`Bwh0T8fw`%n5PpIL}-gg~EM0vWsq>gb_xWR__vCA)DObikR&4=I`n1 zpwwrt6O!0I%om%D8o%^M$K?QyV+~9}fe9R1kGNqjtQLt9Tl z<-JL|odWdyq`dViy&m_Q)VM+QL13KRAA4S^-)ply z>G_Qb)2S#n!^Ik)0g<86dREIG^rk<&r4sp8nrF_=_Svzi^;$KTLj6_jnQfs@nQY|O zT)CuRM!VB8*^sPLM!(o`?zg(?0l#*mSk{bnCq!5)y+iEZDFnrW(5NglKp662rp?c9 zw#g;xCesT={Yqo5kN0^JyXBUe>d zHqLt#N|%|k&jqQRB0Wg_TG`te1>8bX9o#?JQ8oIjs#bsenu!6J{;i(r# z#@%OcGY$22G43X(M@l-kHp)`YwV_|mz&!mDUe=W~s!`&R& z*~r%*@9Re_8}N=gH$_|mxqshm_j>ekVXF0m1p1ty#b*jycd)ypPxia1QEhNVMNPh* zRi8I;G&3ug&v;K*%i(2{91p5|-CK8ld!~|&@Iu;Z-~z+EfAgWOM!5wnZovz+o5W?H z2?xZ|PdCR6LU>qh2h#V&Ctu3Rt?f3G3>HH*67WYm-Vp!x*$b}Jt1^A%ySLyHTgzBU zyP-CoAF05Pa#{FdROK}Hb5HZww9@!qz(uK&?d99*wJbMq0yVq%%CPW>?{4qF9%}fB zEhAGeqA>{Sp5|A zSo$OvHbO*Zm&dd0CAL_+Kqsz)T~8IFMlD7;ec{ z$v&dbmRE8%ZO;~@BLwpS#C>Y&Y!Ip;)KKJ6_)!G3@sSqzaj#=vPSO5@7nX9u*cQ=)V4zzlK z=S#=9;W0cOxd~det4ia;&f263?ac^0*0nN*k0`fTSilEz#G9-4?xK(ROV|Cb7Q-VV z)L#w`QC=RQa*b|X7hb|AY9|iAWIRLc4}q3UG)=VLljVPSfghJK?!6n+w9Ub&yNgz`)Bd*m8pDgC%&XA{TFgZ>`APWt4)B%znz|Vo`N2J zpNm?ksae2*bej7#$Ja;bLzjsd@bU3OOt{N=1xiEsVI+7?E6}Q~`1?)+7|8Q=yCX#V zZ?5O)h{1iJ_8uHoK!0XXV=3z)Qgv34kBPJvytWB5@ic*lW#rj9d9p2!*g%`OP=5ho zkPQw{qo!ekvX|Ya8Pen6hB}m5fNd_lU|;MogLKG*H;8aHvD5bN-wR#b_JAJQLSZl2 zkMe^)#>GLtMv}Mqd1Qx&lH9&QLagebT;kATL4ei4TNSuAL>+Qlnc;jbin#uen!W+C z-z5oNbW32B`Ko@~(y#=kZhV=O?zRjw7wPxj-j63Lf)<`{No*r|YHwV>b!Ayx{8r}plLnNKkg!sTd@@Ob@h$_k zGcmQJOrntZ=4gnfCp*V&nU#EsY-#9$Xl%SRUyJ8E(_=|@*}v$eEi`BaI^rwBKu3X@ z-0WVlv>$^8^}wcxu!VN&b8d-rq|7U7UFYZCBK4RI%f--8e=>5GBPbu&#kKdzmvjPO zOAAkUL+@rinzco=KZjyMK_FZ^E9XipUY8uHw$)zs&ko0uiV$L{2Rwlo=_t<8%I-FS z>yHEHpZU65=!knryY(VlP;7#Hr6F7{>4=v^r))nIqzTd#yCl!FBD_!Jm}og{Fl_>E zHw>;1NShJ()Fh1%`0=3#;-v0~@TOc$6S7s>~6!FbtTONtyZ1lc|!NNWzYyYdP#KAFAp2w0|VQ@XY+3OgnhAz&Dh$v;-Nqaq+RWxyZh z2Im^#^NsL+A;11oI#cV?#DgrIguk)2*0}#7imTi(koL_Z0#ci}P{vKf&?RCBZ}W16 z0y;nR*#7mkH&|VJ=(h%Ln2OMQoV8U$h()5c`tbbCf3J?tFG^fLb}l1CgNtKlb^Kb` zOMRSho5W+0+AJ9h*4 z`LB~61ax>VsqGQ{g<&f~KuE|BfVPk_yGIj|61B@8nBKoOIXAN<0Baj&Rzpm5TlvWf zR}J5%_**V4+~(Id7!xRoarWZuK~;+_5wA5q<&_%l8DiYtR{q5tv=WE^UR|A(oQ2X% z(huF0naYZ$|UU2)-G5U)%LFQY%_a;{_1OYyPM zkeS+3<2}$Ry#%X!3#mx*Wg)|!Js4)ei~1q;pYuw1b7amECp~}b704^~wuV#(Zux#o z{WnS91pz(yExdgqVr*-=`ReQ2Gsv;tMiE(!I04-PvTIW_Vi5Zf#XT zM$l0HsrAO?*4$oovT<6-|8+yGsNR1c9i6(xj~M(iDwSZXc0Y3kRx-HlD<|irylPju zc8X?7E}I6bRC*HgmS5Ey{nKLDpf2;04aek~&8u<5+V_5C(OOoWfwX7Lj~|y(G|u@x zQM~|l8bS7@Kmi0ct7gE2qE5Gqv94hiKZ8`&NG}_sMCL2SVWi!Si&^+M{DPF+Q@N&J zB0cxM&BoShHVJ-@*nYR)=iVveO}-7fY!=`)@jT$LGi$BGV>xRDroSgAqWEvKPnW3SO({Dkg%H_*=Nc(w zm1AUJ1k_vT6vFBs z;e%0-q?sIiLeR$rwXt)thY(d zs)ed*+GqfX??iIAjOVG8)Ch7|e&oExaV5uoaz%pX0g!knAa}427~4eoBC%2&K>7~u`7z9E=hMkwNFqE;@5(@YGA(duDB4bcAw11Ui&tgpl{S%z)k z*-1HcOTefqb<;a*DQnf|3s$l0}`1!tZk75(B3Z$7xy3BTWnk3thJ_Q zyyrrkpUPvRsG9nW?eXIbnuDyIVS{ROR=D5ZZx;W421=0i`vnjxr%HTWd`?R}8@yT*Y!=b^kt-o}Sy%Ve zKvxW1jjTopw|IdP^O&QENW=hU=GAu|Jg^MMzQyZOho6GN-s=|I^u*BV6l=Panpd`t z$_AYx6NxGAt45vf7AlXkNcD~d$aeK&Y3g2{FU$S<1@J}sX8_h|$GN>#8c%oU2XwWh z9>+cuR&^r1a=hyg9*Q#OH-99e>w!=#(>O~L1$ z=NCKGw$o*To@WP-IW0QFO@nqDJ$o6O)jEUEP1Dk!hlF2B*nT((+@9hzP=BuJw7=6a zzTbcLXSLA%*ULJGah7Niy2pM?K56S7%OI2rYHx8ZH)szxkxhM+IpTv+OaV6lEzd>! zJc&aD^H87Tr4ogg136yrk1T_+tQQW`b&)q8Nhmu_l_Zu0+*CDYz8rfD<^my1N+ZZnsBfx#w1WNioLh1tDpaLAU7i_xzFmD zC5fyH(%c12SG=BVZT@hNOU2#2Ci`QoM*xFl;CC^2o-Amm#p%R}H)^Q^ZHS*L8FcJ@ z;*roul%Jo!mZ`gqA6G7TZKMqh#7nciZh8i!=zZ?S`Az%pI*V z#E(*mN2Fz`@s{w4{KVQmg_-%v<5Wt{+EQ|xooCQV>v413#_p&ARBkt)smC}6%7HkBnm~rt)byiK5+iN8=dK9W> z9)on!60E+x>mNwvTI=V?b&rjPt;%i;S!*WhGXQkfspG$ z%AR2Q)5A0C_;lu>s0w7}HZHf<>-=~!KJU7iL!TmnF)e(*xxCx@VoXLb>YH?TWT#Mz zdoQQOVwF@!(_Z&d{Ej^Rt#>yA76q+)Vx(piNg(Gh@x696CwLW4CTF!qR{8o788pi|ptj1R zcH?X{UJ9~Pwc{K+UTdLw33wF>wHpR5e5t(|aOFcM=3O#XZZIkqf;mT2hDa9AlJ5!~ ztcO)$k~y@D7h9X{a|0B&r%J7Jf)2WG*mhqMpQgx<_AkQc_uE++#eGvYhE3QrS1~V9 z^QF2RTUcjsxe2QI&ARH2|H=0B%n1kf?DLm>X#ilN@jDlxg~u-TXRUQr2o*rf5*L;| z#Gsj;1mW}S&X*h9IszHL==Y$<``NraoNq+rxJ5G-lSyb1@=CwT@R@j%8-$4i%(p(6 zsH9KCQZ(FC`+=0{c?92A=J6z z_HkU#-EeXOmn?ES0I}<5x+8Vj$9fpopJKl+7jZ_?aZz@>U-@*T;B*0% zo;XJP%HptiTx_-G;$-3X53DiJ>G`iIiz4Hz=`#J~;Pb=&dllU2y+zwwc?D z*pyOTQ#7ApO&(e=j$c-W(7__u(K3lEo?g)O6uHDJeR+@*698@)f(o0=RGM+Zy|*{L z;yPi{Scz#w%g5<}?J39E7O&!+dPMw=(^yqii*+v*tSW123Fi^v)V4tBWdCVY6qC^U z07_L|UA=Bq&iy+qP@QJAc6ef-I6#`&lfv~_coKHJ_NGx>2o=tx4-)w<1h z*E^@msJ>|Dr_@uEq6*N{Hosj@#`zo5S*QlHwGWs7H&HN68#mX4^qXDzLgkai+qE2RxL%mx=0S z;y3L*mGwl~#;Xk0L&#=g-pw5c{P?gw(d=fiHC7t|%xF2vmQ4o2D^KQNz}q)6SPlmH zV9^lRsk4=p)gdBgxzJ)+>i2oQd<1|){Q*~e26bcST>333Z`Qa5^y@k2_MtF7{WA%}!QpAE3HaK76c2c*FvpfST@(s*^N7(KW>4GbP> z6!&o%1%%GUTCdk%LH}vOYvoU;GIumyCY-ys!Y7NBpS%(WeUk+gk3V#vDU4e z#1irwW~BL(N5+8$^L>e|JmpvnS_>ySnT%`+h<2O&_8+0gPO=w3EhL4%m~n~t)SgzO z^zwH0N0SwHrx;ug5odKfU<@h!_o-!LzG8U=>okO6 zq{js%OoojGCE9Gh^~B=TmR3LbVYZQk$3EFP2V2j+${=RTI z$)ZN@t%)B*7nkhD)P`#4x!uKI`>N2T4%;*nyGjF#pkb-qz@;`n=#Js7DyJFlS1Zs{ zpPi*)a?B(iR3l5sSoZzgazBxo<5-T+;`cf4sL(FNxW`)%Ux&WEBxt@d zC~fFskPffZh6O4+e)Wt1j)$8&ctv;iXQd*r`cj-X|E`plk>i_R%(@xkQvZy4zKoOH$_?o^<3B-XF4HJ`Dc7kDs$Y`%J&$ zY2iZ1USKXl@ITn_XBL)Y4Q7Bc1GZ9qf#Sw5B^Ms96L-JS%FM- zSYZqKMD}DUz`mgIV@Zj_cma8)KbsPjeSR9PxxYTn8h1*1+|K-2k&?fk!uV|APl1ZG z%5+(3eel6@F;p|bX}YYBMoZ%Nk<_L5yGh@_2=zfZoNJqH4E@jKy%%JF_Xf2$k_4mgIy+m{GE5uy>_kbsL#Im3 zOk7*m?~jMdTJW@>4+W)IK`wI*9vV=w6I$KO>5SBxa;1bcoI($|HwI%qcj^c_X~5h| ztoF(UnYH=;p}Rzw3+eOkojYZ|8Z|grhSCmLwT+GgzE_$wd;2(+&f~IsHUo3!2q{$` z3OLlnJd$Mj!Kq?P)4&1YGti_LbY>njsAy=bupcHWGs1+2Q)3h&bCsW!)B@8U(hO@2 ze-!oFDB?UAHTOdP{G(HEM_Ha-e@dJsx#a%s1mI%)Qq+AH3bXtq)iT!|aRX#$J%t~L zz2H}_Pj;F_7E?%U0KvU+yC>2ADRxc!YDGpqhU-9!Z-?#-FcW9xV!gEXUXr`E8MqnroHmY`FQ8lAUr&O1_Uu|r9VOD)%~ zIdC=h6T8T!D%VNs;=NH-SnR1SM18HfAtcu3*0a63et@ppUC$K6} z)i*z^Fre>pX!doPH;!ss9Jr7=9*da3IjEumhc-!JU@^`XblrW8-n2XlTQF*Oo~t+R zQ6s@;Z@NYBawn+bo>DBsx^W9g9Kkea#>imvp(~Mq@r;3;I{WKo`Xc4~six<(@Lx1GY7uA+xImP(Vdu-Lqfjf*)qvM8!Jw9DMOhfo4fhvu5s$dwg@*%%S@^v%opbSue5RYHmT!9tJ8MpC{ zk<@0*nmG+ugQ9{#zkZ~3%uG=6?4og&t?kmnEWl~4jh&fq2)N*&OJW#7vpaLTUA`*^ zug5rxhg^QyIjLLcGVSf8(yvk{4PEF2MUA40V#)N2{zDQ#*ALpUp%BM_f`)G+Ox4L2 z@FIpMdDh;@LWhf>IJgB^E%3D6Xern$y;Qyl-WdDpvs3~TID0$r3bl;w>k5mgwET)Y zQl`ox;_95MvHEOtc@|xzs|MjtZrcwT({q?dZU>=v?*OdAk5Ek);yeAx#p%m5(oP}v z3-ImuXi)@x)yd$(a`?jt;Z?r3@Wc2pmPcYt;>F zmK!0UgL<+(ptNU;&sC2bFGMse2UffkB%xYH<;h+da1k}EW8Vimy*umw+-kIS4>qsW zIA!-}Zp!>Tw;DQ)0QnZi3PNsAmC{UUZ^@m(PykZ*Ci16&^+P)giVAGVTmNanj>I zKQ2=Jed^*!aO>k>8SS>pamhxVmpdz+zl&oKMHS)}TK{ebyf1OsMjcAd?(pIldQNbY zT>5#fOPqR}!c~N_=|UkcvjMpC2r%c`d2ZM8=jA~*BzKxSAoHHv!WWOKLZz4oyq`Xe z=#5utdL1-#?#_0CZUp@K@fK+vFL|0SSP*!!U1!rzZDd98hF-{tdw0$!q1HMFs9&P} z>X|_mi|~?v#LxA&fwEAkaC(*H=CQTGHY#h8@$ACib`EF76+z-e!8r5 zr40+VDMO_|ySz{wZjv@iR=Vjt(GV@DT2EQlYe74JcCv4-TBNQVYct>*4+R)+P%ub` zd_^b>q?}?tZF{Xmj^JSAfSl8zO!(?cA=S|^HFb6=6t31h7?oDFT4m{u^5y>#OlS%E|1pxN;Lq=jF~ybtoolbVY19G%ZsM?gjQ_}06^2&L3WQG2_L66p^4@wCez>3;kBohr*<>xrMz zY>hy89VRl%?)4>bgUOr=IftvK!M^x5yx)J~$&`3gxB`ODY*Bm)52Y?8xg6D? zQj2js8 z!o1k#m$(mua-$ZG^3EmO_@lK{5sTH*pbKbG>-5eTw4lNJX)^Gs1GkkO)8utPZO4B7$8~dM$7G@;T1aw0DMOvFf#kY zhvZ<w+bA-f_7q=>XXRYDPt~Bc{3$wW)$`qk*X)ULv=q(Ya$d+D* zfJ!w5E}1{ADE)!3-CXs%|J^qTt7a{_N{92yA3+}<2YC|X^9aPiL6FNgp3 z=5~|8U@sFGY3zkFpk}zuj&OER-9VVr{d$$;&gSrw;{r1w-Cp&x;BW!ACFIxCByell z?CUDeEU`LZ+FMI8%6v4kUdya744!fL-ES!%O2B11rpt%;ebHej!9vegrZw+LFT6s11?-`SoPi$^x<1k)(*)VU+hnS@DcI0>^Ky6 zr1&7wbYRohND3o-kS~^=$>_v;C|OHX&2)bC*ht!*uj8yeD9s01&Rq#-p8PXw&y+R# zaefppUiQa_d&xpB?fi4Y2T#o;grn7S&D3wZ8_#<(8J!8NTJ6kKwnHXhB{+ke|LN>i z0h)e&FpZYd^Vr$AYQa^7*tT_K)WVV}6M$Ii2J;vTXdQbE2&NPMC)fu`H21onZ`HLl z(*`e(@vPXoA?BdaVRzobg#eSwKYMx6N5Ln-^-$OqA{W)puj_cfBb=C`4}@A|%MrH# zmVN86rtXnQ*+k`?Vgx^Z#Z|5-MBHd}?CIK`F2{wm6=rr`muE-ct7^qV$o z;IqqM-F<0%f+o?Nq^dOn|Pp5w2 z8j6FyZ|%lTrsYffyeuEU#}H17=X$=Gp+i#*#d87JIBCHnfxbNrniXN}me>R=V$yH( zrag&_nJ&M=#um1E%HO(h3It4TTpN2h*k3Y>w!LIQV3njZgS6-3ji8&JG_+A_-H5cl zN*dw8w#7js{Loce#w2P!zSNgR;6k$d-1d9>bM)txQJRnJN18!yIeL%UU-s}wJc-ic zu<4yXf`c!iDPW(L2Jmu*!WWBgU*~cvjT4lzAr@}t5j`V6dZJOi!oL7yR-R-ajMxOQ zjQ|e#;!s0|*S^~{U(t&z=41mL#@yx9nL;pang{ysbG3 zjMfHiW^!od-lnAXiE0@KZbrP zO|NYu6KI1&){Cb0tvI#w^5BoW&2hm)ADSnnx7zM;>6_vzG^}6^xuD(Vl0TQ8ziFvG zwo|@mf%}uB!6EQ$FT_YjUS50EO7Hzj7UDxpZg@&MT!mJN!7qK)F2)&(+}n>4>WicbTo5mhzTVQcxI7$GNK= zzS5+({4m|$I&d|0JTtI?!^?%%`0=FfSb8D%{lkC-TwvwT%{`Mg-<)%bwZ}VN)ybI5 zlVhLopzPKN<;Z`LASiSYc;!7$O zd?fN?Hda+*@^`s`rv^WvqN1X)kvJ`{_lOtM^69qF9-rvH6D|IKLo;D&%z1_2M#uYI z1#!AZdM(Xct@Z}xkTAAACLhVzRn)fQQ*09`nJ zrf&|sGW=0uR_5LMV)nq9y6BTtId}=B$zu!PGD)89~+Vf-W-CSg)q{D3+eYbOs(BEXq zTfBuuvf)~dJe;5HIc#jz9pgYt_3c$8CoU3qIdO1g&C3q^S~{ua^ya1rgeL;W}rqTgr3pjK6Ar$HGrFr?E=|J10VWS{Aa%C2M~TGh$i z^D5wIO~v~H7nZLbUuUT)q*Hl%nfBRS^622z8O%(X|+)7$2WfS{bZ4bmba$G@!s@gIbR{wRm+}{ zjuB!L_M{#wXrv0V_P#UWhmK$*V9}8ZaZXT!m@rH^cQgoq7PSZzL`ww^quUI9-gyrP6Y2l zXw^9_DV33i9eKyFqHKw)Z+7U0QG|bT2Cp{UgMwu$?#snX{AkQrbV z_Br1+UeLj#Urj?pbpAVP`-mW|<_OBep`i9V#HwzS4ZfW=viqzpYeB>UVH|I6?}No? zQ*yQCGg{gQ(Z5XIdSSIeqT7R7i>#X<>sV4cMOWG*ZG18n#>|1s(GSLzQx<#kZM#o( z^?P8bK!X|p5z0|p`S{O4!R}%IWyH*HF?h#TXPq_0L?|D4xg8U>(Qc#%WsH*%4HDAv zTtCdg@~v%`QJ_ZKTmBEZmSSf=uFreF`@7MrY4z^A36b_Ho`^ z8Ql9Mg3Xbk*u85GGTCfE~*-FdduRlNK+Os41{ImTq0^(dF>|KaSb zzrZkLB$$?l%N;fJc-HaXxQlo3afFa%8gY9>5 z-{W8Bk(Ew>d^62U}f z5Kqp=4?r$$jphXYJtR296$ia|Kql6pzBaaQbmJ#L)JB#oiX7-PZl^KXl#@{Nqa8yPeiA?I+TEb{@A*ba!1{*vIs=q7ov+V0J2Ekljl;Mo(-A@QhR6gt&TeP^iXx0m6>y86E)GIOh z9ZG2n9m;y{kJ6bYups8V1BdI6xi8i_!A!6;fKGmtFaJ5Rwp?qRJ>&t0SQcao(| z4cQ_^sy?YdKk78Q?CLOxVk|KRu_q$EMs9vpLQ-@zQ1@>e#J$%lle5ozwNA{slS)b} zlo!$KTeDJS^I+j*X(hb9o;#(445}v7_{D|ngE=#aHrcZNf^S*xUhw*&<8U=?|aIy;nR850fry8I_1D3$^l=G7H?G8`+Z<8&#P4J#hctqv%4XyhsG2-uA zm-cD{@xs9}DnHB@yT8Ajwui!iFd_6Xuap(2GKn`3%tZE9E{RIzpm3MN)<@H8QRaSF zj6gqECjMl`s0Qq-9DVPHAX_E{xjih{RH5Ouqu zFO>PE_1A@L`2sw>jpn=n*KTb`Xc<)m-2-+jC{Yk1A58^ns6LDas|q0)BL_UO(*g4bs|?8^K8IlE&1Y40xMMV^lnEr7hV>EQcEBhKG=qEp-;;(3gKN=vul7eY^^ivD_z z_MozoC61$&hWWM~iq22k3mLDR`U#}%T+}>`xC!fl9G_<%R8)W8(CDZNBJY`}B6^U+ z&IGHRiipX#mub`5MiLLpA4mY<$@ZF&PNrGIl_kuljLREOCJi9r%r;APxb>NimXDb) zhB;ki9!_?-PNtEfmJm{X^DBB-0r}Ec+u<&|27_ncZc_=BzkSDJDz%w6M-OS9J&C6c zI__<~D|cLz)(2e@Tx*oZ>bKo>Ta`+i$-nb)Ll-Cul=ZwR{h_`qxfxTU&fXfDbd#7= zA}L?l%q-)wx5umA2i%El6qn1+yRD4Lv#K6`^|O}53$8c-NW8cCMk}Y%+l5BimL*< za}11xr2j0Ho=NA}yBRmMm5DJQbB}nc1lfV!FPg_;&9E63!``QR9<%%CjfxruL7SWD z3Y1Y9FYyl_zMQLB5liS)LS`t_SUSGx=^x3__Ffsq@i|WI@R_xvvtDgp$;&hOw!OWN zE>e--spYX_Pl1yf9ctx1RiYPKCHGt{vCQy06=VJJnD<~1FdZ^N*AAx(4V*Vx@Me8Q z==`@-RzZ^x<^o$2`5Y2Va zIZJB^z$|n23<9s}u8Gcx6{R$L>&CP-pzp0c=87{-A2UcG!mQ}3r3%lzWaIT9-LJ?^ zhBVZm^h4J_31yl$uq*kX=vE2@hi6}}bbIcIoLHZe=NIQ0bu&0t{XT0rv81@BQ>Rk^gzaS$0XkKCHb=s?aOC?laZ{+E_(9oFaZ(4LgX|XFGWqs?`yiiw#B$iB6gU0_^RYyCbF2bod?z&l4`El{{ z)vrQsh#I^J|0CuLgm@an1&K6!BU)dGt5eJsv>8{WxS^Qbb2y)b?RfX2IWlp27{5Ds zS})-<5vOj5u#dTRPqPskYKfI*OZ4oow|>(&hs3$L0XPPgSROZAFnMj6ZV?mT{AvF_ zQm%KucRkvVhxMR-s$r^=MkPb9#AF^)T<~E<+`~zFZs$e+S5MHfR~p-r+)pfqD_Q<% zF=VVV_fC`Qp;sOkR71 zz#ApH>P5chzuIhnk)e(Zmkn%AW=Y-YB66c$@TcHULs{=D^ z12kP2H|{<%4&<+H=C@8k@S@7CwS(R{#u|=PB(Z(aL^iB{mhZV3N5NVf(vki30ncP+^R7ZHS*kNV162S2ttn zV88}PFiB!xkkpI@z9IKU0`;m?6hR%3lI>tx_S(OEGDuzTeMF(WTLI~Qbug@psTy&S zKHM!U(W+4;$uTI16>#V`5X1E8*w>z_i+bS zOM;f$q=vNG2e*~FbgbaV-BfSp2(3&c_yCjZCf+~Qq)S>q?^f-#mu$UUuU_T$w7}ro z#goB8AdQijU-aDGvYrwd!>KZrCVWZqKNA%U1p;!jE^n|#nX^@>wJj&FjsTgdn+aDB zv%_lawE%L8XxhZ&rFA;Oa|5g&6Hd$P?7fKbyEcjaMLwUB6Q~ZeSK_*u6V3h{g!&93 z{I1VOcF|R)Lx8gIM(+SfX=?OB3BU$Kcvp3h4d6oZ)8j^hNUzVs>`UBy9uVP&WQf_~ zHacDaN(2?_jrwT;Ffa8$qB20iX`Lmn@}_vLo`r3nWMHgC%s^Yo3|poQt_}o}f*ETE zhPv9ly>knlW{mNr#MLoDZ$(U;OZ7Zf>X(s**nKbl!TS2pk<&lVs{gYw{er~8?)rqb zfq=vOXv$(mERKg2_K)+dxioUjcZxLosC zcCh%1&Fdp#*&1m==A9Zy02C*$g0dkqf>nYF!1_&&UZJxF0Ej43JY~9Ce53Bs<4`{g z)Uems*ZjMOB*76~F-P~FG!SRC8|!(+fYT1ImIJexl07!$hV9M70q zV2OCVo8Qr#ZY^>}zxQWSH&X*-5<|JKE+@`&mBl3*SxsU5DKfSBqaXbDL?_(4V)oLT ze_Q~W>fNCzxxZQ#xM`vm^CMkBLs3ebNJK#3ZZm3x1i;mwk!`;9@$9Xn9`#C9rn!Y- zOB#S$xXd<@!Pr5H$7J+E8jQUofZ=|2_-vv@fVcS+vV**&XEsAZpry7)i0up!h5xKArl5!8u;b~(KTCBq8k%n zbS2($L#i?T-sJf(MD>mOD1uK1li(|wvV^i%HLvv{zRSwmKI47&p8WdzcUr3g*X2*2 z$jOq(Ubz}!{Ah#wmQ1G+4%<_LG`eu>7MW7J2h)bThr5OQybJ5B=k|OGXB0V3WqcCB zyYSyb`M+L8Y!T_|@Nyh~{_ldK884ykWBca3YYe;DvLgHa=N9y3z1~tV$C$R=9?Z`) zwQ7|X-|WTfyEi^hWd2HU;pVe*_8Y!QbteN6mqsp-lYi)lYEucK`ozwVo=tN%&Tz?Z zhP-2%J^2*@X_8qd(a@e??3dCwDEv{Si@A8Bd1N>>27nEhoh6GE> zmXDa%K1%qek}l5yDjDjj?_+$i6pBxuZlfWrd#-C`4j5VfH(}sTN+EDY;L5h)+?(qIm2*Xsh4%U<-xkv1?Y!1%qHhRp z7U}k8l;N!LxjK134K*|BMy?%ND3TY_;O{-x86&8FgP21D0#wFSFVgWO4{ajjPebHTIH%PnGyH`r|#bze$|XZ_om@UY`|?ym(u{G@0VwP|0bUTj401Fv?}`6CjV>bHVCyeKi8d zmFCCySm4Eqp*;L>_-5(SU_%@);zYGGR?RDT(q*s6u)0*hX6Swg8s%!m`z@GGW7~MT zlaTlrnRdyKT5>tLN5^ZwO5g9)JQm2JVJ=EB;AGg2Y2tjkeHkWXHMG#uKVDa)PeMvtgqKl++c3wz^hYIRCHp86dFd#y3$Lg&9;Vzh6?Ts z9Wens9b4Ia*&vnzZu<#)4`(CZAny-Po|HmSJfjE)M6#Hh^4G6l^FMZ#&hJcPXIQqb zmRwBKY{fOs@a%% zuh_lW*jiKks6|1RlDqC&Td@H2TC2?cRU;;TD*EzlM@ZW>*kb%r>bQ( zCDZdh(p;Gf=hmjgy;ZSdTTjvocnjdYfq{YDLZ1MPovPsmMjM_Jm4wSO9|xal*kwcQ5BK1=3a-RuMQ zU*3p}`n7uo_tFF|Ik3QdPGg@!$Bg&o79JF>TKotNk2!)M*t>aZC2G}Dj{Y2N!`nn9 zC0owB- zZnm|s>79&JD9Y(4F~vWQKOXad$WJ7h8>f_=KT=j^2ie3s->~p^(>9Kpch?MWctLy8 zq=uhRY#8vu4}9;}s-}4Ub$btqY9=;5v`0~GY`w>!y&AUVYD)*ozaF7e8~}?0WKp09f z2|sBKrDq?UtkyL#Q8&+HSposb%$F5-gWev~l}I-Zw)k4ymcIL@Aqj_X<5ow<$~A@FI|-5H1$rS}Sua@{L^ zw2djW3fkM;aL{_JU%&%wlp$WQjB6eyIAM!dLc;L&ojZ(SvD{#>1*H@&gYx#LwZH~Z z%dpW39Vk;r+>1QEHGnfw^64#rtYt<&EjfckrzohE_)At7eoh2H+2f%PLI9cx;@^iZz zE7Gh#^XvZghyb>~;WE+sIi=zeD|0+@_Tha9D~v$mxB6S$L|>=^B=yR=%@XeYa-jeD z2HsUkF!56S^8EN`O_PYwbB3}Bh#3c=X_MUF`(LvLeJ4z$s|96k_pWnMl zLsSUpuRRsWX8+BJG^_MSawJHePYwU)x%%hn{_kMozh32B0W@rA^aTF4e$=0tB0vo6 z%1IoJ6v_NAFYr$bM26#>AsHE2j+MIh?`&CMf4AEb>N+|)TJ#1i{G=%N?;akwW_}ke z$4c$DFX>9CtErjQ8$kA7qxDY@^Y1S9=X+;QXH!`kL(1yP)fbnAkr;aX|$p@H2-OavPKlr(Q`JdO}NtB5ao8uiT z)7rV|VZ$&8hzL2y%79K=W6GpRK*9fUp#J59#!(`kQd~;tL-OBS{rdWi<}vva((^wf ze*C+s3p$%8wkI@k|L((|ycZEeqKJ))k!JkOE6Pw2*cmJCWWoAwYMME4w zsmw0Fqa6txN&#|2g;P^gays-L)mXg{AGj@|P70dmQ}H5vH9Vxd>TRa;?7@P49G}MN ztuhd^vbjd$@9i!}Cz5evjaEyXisBVd-+hqhQZ~0`!FuLOUguy6M~V)tgwyYM!~e$n zu&6W?Q>41vBcA;kPe8%zceWHet)q%&#Jk4}=FjN)VcFD&x}}=-)&?aJT%!!uFW26j zlt|9x$|ZYW+CO3tv7t3jO_X%aBIlMoIKTnQiNqu0oR>{ zwTP2yBWIPe`<}gHBk&gihNX)g^H~#}Mo$JzyI}J^2KYDI`@L67pY1#tH6yttHTmgt z4l}~6$Y&QzF(@7s-@H}v zo-5%ZGt`HciZ6a^11YloX>`QMV|MT79mt6bFUPPiCa)+>@R201ynB?LabTX=T|s)u zhO}|!0aL%fB)12gixZ(w=ypknksp<)w()&4FT-@=3boQ7{`|JjYgrbtpUHKp&GDD?dUBrxqF>E=)<-?J#LlC zj%0YwDXm({nxu0y({b`ynV@}O>1)+iDe?jIb$Y0Mt&yy=-Gn9-i@8u+EwNqU!1=>S z!8hR;l-jdsDg2^Ro29x2^Z=`64=1{WDXF9!`G_F2>r5h$toMwom~fmfb>DExws~2x zS7bpZLBH_8jbR+Vpci5YksdN5Iq{u&!fs=S&C67jf_G4fc%;x|Sec(28mRUobD8~1 z7U+MPoPYAT{^f&!T`ETsl1!AQQn+@#ncqTd5hzvyzr8c|sKftL*NpmO!@UHcwR3{Z_D!a zHg?M|-Rbw70huw9{0uLit-Hw`jdA<8h!wstf@E@I+j)~HlOqVDMwC1`@A1}YJ%?f^ z)3?8SG_3kEJk=FIpj}r-^P?q>*Svy6T(#Vpw#@fxkz?DsDwdq+$zbWD%7fD%0gtIn z%*Vmyb6@E5oEH;rJ{lD12X||cWN0Z$@voN+3MJImgAXg|)rW?FGH=C8oB$HDlai-M zw^E(Bwy`5$o2iF0)XH_VFQcdpwO7k`spghYWs0vF870+284TE{{M~fWU!L$yNfJY* zA_sBw?hS!0y|i&-uHJp^h zJb4+-_d6*2OO>A-t(9b1pbhb{46|@AMU|W{v#A5>9q@qLh> zfg~wR$%#|XQ6|Zm@1xz3|ATyyx-#Vr+UM#i7KB5#{z1VL8)f1voo9!Ee*>bDDJuR& zk)f`%oYa~xtLE16aRY%Y!%j~&oOq-Lx{_L5gu3>7PWHf~oA-F6ZZ)lRSJ}a+ zHTXs@en!J2K%Lh*sILsgRZScfh9|$HX3Tr~Lt+7%n1y9Ck#xQ%rrt@@&6&6s{!-@g zrMq{nEIQ9UI4@bIzFPDoyzS2ZU-^m;Mttegl&ycaFd%dD4$0T%W)?tN$5RfFGfCOW zP^aZKFw32wXY7kzXo5s}`Gw_r&%CkWEB5_%qr!srZ~K^k+At>~`)(%MYtc?%d~1kp zoKu;l+3$^%^G6`u5_KHq`VFnwGk0v2Q)U*jf4Ukk`a2$w3-B?Zdt;-P*iE1{|+_;fU9M>KBd(n1#0}%*lmnrUP@tZ9{)vp03_FRj3 znZ@r-L}`&fa%Il~Gs^Gsd;j=hLCnap%J|PS9$;(9=Ipx{M+MZ(LRp+t2V-|I;lLeK?f}0KR6zA9wO=NVB`y zpoE~tRgND{HfJ=H3Nb5^Fz4Lpa-e*o=zLQC6li6UHY~~F(yz{L9TzENspfwX7^o?U zKjS`ycj&(x7Fd!EebIkZc#vvJM2TI*Us z^4Be^v#`}Hx3R$&Yu5ZG)OoS*IiLWk3MihjyuL&ywU8{q6mAPpV@{@kZV9)n2Qoff z<2HB-^vU7QR!`wO6<~A&(Dp>F?}CG)fUZ+#J^fT`fo6Lu6*fAVFSe!$*Q)+=#_2EI zPrxNQJ-Dzztejk@-H+!~s~0c+aZhNHGb(O93Z(O1F~kiw)>W|G#9fgA#3h7l16Y$z z1a|I#Tw(UqSa8sL(N@wpRl+m*DD8dFg9SVnR=38rx+w=0C5?;cEiiz8=ucNridzv^ zv9-maNRAj-|J;4AKPSWE_>49NC8n%ryOGSlB}3uhL#6HI@G!5$|~$<*!uXbQ7|j3Rk{ zhMrW(M;GZh?y~F0;U;UK@b&%s^IxDo&)b0zD8U06ajW0bf>JxAH93~yM7t_NNm|J$=mV9~yAzu{t+!h`v*S}PqHRI-dAnBWlC#LKm7oOzW zTNaMJdgrm2Y#?FEuP5i}rL*u^TpG+$2Er26oScsbLWXKOPmalR7t{?)bp`b9rz3?y zjX%C%+~fV5L;OG>W?1c>IEnk@nntLN=hT5jZ~7O*8OpOVgEjrY9N_$jPk4!Y5LmzWm%Ubl{KfFW!f)zXpd)Kovp2 zh)%HbyO@rRC}|I+h2u|zcS69$DxEaQJ8B%)go?mPZ2iyR$^y2N(S>fCpho$r1>8@x;C%r`FK( z+Z^9!|63M7ldDHk{mjoOzo3UnJ8Zkh?Y}F3lkK8wO<}Dn{s(NqsHU>Nl3rhcaVJVc zl6v#qWIbLZ6^7H_p`+d>KYi}_^_9|orjN+-jDMr_X>bIvG>{oFBhfwX2A0{)OVnyC zYmiAlX#80(+<~oKNa3R7>5mbBGY|9b`IVz^(~al=qOa~(UV4)9PBLm#t?cx)Za!jB zl3V3=m{JNI-TM(}iMvCLuBB~EBJT;iJaYC0#}y-`4@aIr`Rw zwDBzn*BG~&@sUb-_oFD3xdH1#^8FoNhH~B9r|g`881-y}GGeK%*}?ft@Zy*`26w9U zS?IJ9?AnRba~d-^c?v?^DnUjDznZt z@^W$_3xM_j-$Kn?F^)&SY~ScPiJZ9j!vEI-*vND>vO^oQ1FB_$ri-+VMfFl$cPny0 z^_3mbixTgs0Xuq=oXEaN7w>dQx%rB#JV8J*>t-ji7kP&`O$fO@QsEMbL^UD+U028? zv)?@Lok-jG*3LAX@SU4|_I-^Cvs-QF6P`HKXJ(gItva(sY}6kp#3R1HM{@;p1@OrjB9d*DPhVf( zZ9Rrw`=#E0hSA5~IrF)S1hDxsU{)$=8@QYx`1;<R^j3- z8STW_L2<>LXF;9&&1~jJVfV7#2XWM_@kQWtDj?$Wq<`R1n?FI#jXV#TFE7zB znXY&K23G0j-y3CeczHRA=2mr}5#MxdVpc+!M_YDYhDtNlwn<#>_8g=(b7B)VyI~1d zEPMZ2KCP%J!XBH3~O;QckQ%$ZRSb*|oD1FgrHRu}CmH zGNSKF_DUAejTI1(ocEf^Qd6(DxF+E^aGE zBzA}^vO-6g_XWtyU>4Hk(||Bmc^OXAv(R~O*e(SeOvn3SBo6*T*Vxx+zU%1QIa;ax z?=saz4$J_Et7b6lY&rksoBW3mr^+#)^V3mA15L5;$k;rJ$CPe0nl>g_G2yf4D#t<< z)+&VT#5-GoJYk^dQ=P91d4l+tgjETuJJNcxE)3%y@_V28+^TuC$HO@(l|T5{58~qn z>G!jEFl-YAjZM+96mAb^Yq8fm^Ms#L`>wxFdBXbQz7q`2sc5_e(xH{6=Hb;3@GWx9 zW3A6$d!Jo&q02y*Ki@wA8>kx-he)M}dpVK}IkpbwH>{%(IIORzWD^HPej0gE^SJv} zl^>*haNZZ?0YE0|)1NAffRA}jEfXqUJ19|?!)^8$JeM**@tL$J z?s$VIz7<&Zg4HUeyKf)1UN7o=dk5o@g@B^$fu7EvTqLcxQB;hK+yE6cDhCwtk#=H9 z4L(|+gN!TCSb1zfe{RpC#sR@UZu=nLZGrR0kM0y!=CET$0sc>{8U3oSC@;TI#2M6y zd|P2KUwiCfdcd?j?h-iHdcC#-(1o~nx{m0jhb(BEc}W8tQ~O>5JIrSxieidPcjB-b z!IY#gX?&PFsSLhR+AgZ!y!n`%F#O9(+_b(!c~$=F6I+t`QSEh0kD*G82dCN z7gS*4C$dXNaStw{&{CVIknl|2pPW`Wej|A+$zco?|mjhmx=7szVT3UxqhV)ieOy#&akWHI@1 zA{sAM;V%gsY_vMZasd%RilJ36hI`-Bml7^JWV!G;;Ox*N_v{VqOIt7TYTo^*TTFA} zq0>Fh=WzP`=-E1jel@4Ez{;~TU%}m|ARp%Lq>t`#&%b^<7|v9d*HxkxYSL3t2^%u# zMT~esV>zaVAo-(5p16ZNO_8u?X730`SHN;^-ptAUraGVZ7AdG9QJVZ zF1JxlIiO(KRz5f-&dm`2rNg90SInaUv>cMp4IL?r0pwn6jNO^Z@2`%{d6n@SDvxC9 zlM8+bi9IGyR0LX_h6Ea~c@6#S+!CueHxxP6>;ww;SU zdUal>$~JxCbF)J zXeU62CbW1AYJbrwip*wk0k+xnmX#j@w>Rn@fhYEB1ml=00pjRqGzpB)zC4H1xUTBt z7|CTlS(i{(p=G)_?py$$%*or5+DL^xlM0y;`B&mGn%^9&^d?fqn zRRVFwURxyA6Ezh;@cOdnDrb7YJB$zi6R*8p67sQ>L?LS~j30kThgp22n~|Fim|lF| zG&`JB#%9Uc*Ye0~`y6$?Re0~!vj|6%5S|=nkLV*@1mLow;6@4pAG0ZK(ueTl`akIL z0BJ6Ub2NMYaATW>5PaH`hPXN9m#IwCdn{`|>3|?9*WcgR_FrkC1ES2BUMWV-l9H0o z(l2=6siIB;W-jIEp7;ma%fl+iyrHW?H-6~`niDacxZBlh(p%b{dh_*|63uTfP+X2E zQyA#-G7!@r-CnQ#oGgm!d#6(yp0pNN@eqEg5X6VLeC!@bMl>XY@G>_s{}>~=ks^xD z@Ljt?Eny{=J%g^>Q<&9sO&;ABu8ZX5d{$J#+3WQ+1W(afh61@S<1LMJ;qy>Bazn!! zZmrb^76npP_QO0WTl)C-*Vu2@df1g^Pu~#SnS6P)lMKbm5zn2a7Jz=UJKSQ@hrfU{;$^xC7$Vt7~yYBt)psGn78N&pi)65rSwDfsrWXlg}ya)NgAtE~{x`6~Qm%bXm`RS6n; zdhGoKkIr1C2xFqcbE4Grsm6hP0Ay>Hi;#RjNznAYXQszgn#H=xG7TNGLj>3WeS93J z1iF%nTERkND?l9c--6>r;LxEjJV!eVbZVjnFf|jpi5idbDvfT+NbiI77!QnZZv%~^ zVXb}2`1lO%S^lEj*6p<_?)W^9nOeUYRA*;On|V`K`gS}`%NJAOq8IM>4P~-bYx-2Zfsjj)Z?hMsToVii zWd5QqSC*jxMnuxu%czSdW$48nAj+LTha26?5w&rAUhQlim7=1I()pq(Tjurvpr#z1 zvjQ^9>{lIEgyqBA=DQk0+BK%Uq}Ae7FqsW4EIT3^mXcODis6ccTY1!cV(0b00Y zVA47xh5BqX1(#v`mOXrK`{+x7X>g6X{s2m(@4=o&A>@zk$VJX-t$G8&(Hg;r`>Ug- ziGWP9OR32>Wp;37epl+LiwtU$wwt)H`sa?&S+qxHXlafcTyxveLmwIYiq&GOA199? zKDb`5FeFtquuQbl#C%7uC`Mg;ox)RNw+ZEkD|!unXnS&%?>g*aq(>FX z7AT0dVMByOUuE6pQw;46M`UkYzay^oj^CYkyS1gsbti+gOVZB^a$rA>IS6;SjP8aH zv1@BGP#Br5Lus26Cd*E4r4%1U?njKMlFn4 z+ONkCSiRYG$DPO?UqQz0Y2k~e~5*OmB;l;<6Dw7(r|%i zhSkNd5MF7AZl?oz<7{RO9}fKj<>2Uaj)EyXN`&)PBq`E7)A{zuo%5fkGfWgG{jHZa zf{ae*+gqge=0@h9m+rK)laN1OJ)MuCVx0M41?3{Q&-l}KF@pqb zZaM~qNJOPn0&?peJQn@8A)D~vFB@hlRe-WQoqpq-bLMf-aGq`yWWFm>9AIvMAQQ_6 zJH4$W=Wy0{e0%!hAOfSr4)qmr0A64743sbR$5!g-SK;rBJ|lVt{RLp%1nf%hK<@A; z#_Z9fM`rC23v*FU>0~D=TH(sSFtj{{GFDB7`aGK&B(6z6S^{879nqYz!Z$a0ovu$z z$2THcI1JB*OjM!qB85i~TYw$RrAMJh`D*(Zk^7tap`Ox*ueZ0)ywbi;yq$#;wJbbB z>YZ`CY@R!$xXciI)q@8QERa(QOn!>x2qU1q3LE|u-q{d+h4V`S$c&HFU$!N-N=zd)yrnE-C| zh2%)?_ubP0td;&%B2jG__*lWyl4(ymm_r)Ye7;LR%Lr%-Ul0OoW|63?27D)7DJDtQ zkFc^VHR8gx;Hjx+)X%ISF26jm9 zWhkin3jEfl5HoGz$cckpHRnB@+@~La9v0EFl7E{5aiyJ$kWL@Z7o56q+h4}wV!4Ay zg%4n5`txB69NkI6QCkpSR{8hWM0Kf`e`S&XE6i%YMhMRe$vj)IqE9}8;e`X0cGvYQ zyh8IKaAP66F|O*J*;r?Dr1A`)znHW4Kd4DR_0IuQMnf{bwY5cc&5VWM&;1~(DN}Y_ zVLv=j=RCEo&-V)l|Np!HGD0+t`YcK6Db~N(z5fECir^=CcY;hv6VLmJFv9;1GuvB< z&f(2xD8qAp>vFTIgt`wOKI}0R{k_Y{+)TRoCyaM#C_(6Nj>tbkBT?-}wP{51QB#@C zFZTIAf@+}RUg!mjIcX5xPJT2=W2_~$X0(=kQ2l4~!U!=!4^7Qwu|9_XJtqI&6a};p zF&r*1_H#H@RJ%*oX-Yv#G0D^f@pqrZ77d* zdIn|4-u&U3sELh#^J(#Kpd%tEh-9<*rAFIa|KMwWtJq7>h-Gt#rOyi&ap|F1jZDnk z?&MZ`I2W7sDY9+NdEF_}J)kXHzP;AP136m@Rpdp+0~<1dcgnrmaC++sLHrRj3BSxu z=tV1_A8KbJKOo=oi-qhj({rsj3U0Lt{5=H~1A$(DCzJ4O&9-&odMk0Z*+ReGlBd`e zJ5>K4`o*Hk76qal4qc-x2x%=1W!lb|EK9S69^!1dcJCc`m9OWOEKODI?UeTFbG@!6 zz<9Ak_oP_O{*PL9T8dl;%taBe z0{6n5SICSEwZ@MfhIa*H+j1|fTTo>SFN!(4*tp zuy9FsKu9dlEY`R1M~(tPz}<6aHA_A`3*jRgq6>QXsZ^ZOLzv8E3W_&>qctVar@+dD z&ewcyn(=D9Z_nQ5*UJfoq-l~9pYro3ydO3gI?Ke`iu3%Sxs+%rpSu0dp5|mQ_l~nf z>z%px^Rc>xMK?Vv@6q3nTjHb)ws)%S=;Zp+^x9~JF3t(Bt8;N~>vXd27>VqPr(Tz! zb`@Dl3v}*%rB-^f^hT@9Oll{&8WdaCR>*Uw7hi5fA>XD_n<#H)fHBz4qDdC9!5M33 z>tDh&eEJ;C8{3x9e0<6_x4xA$>i}Kf0=XIwZj;PKp>vg+OG#9(WA!nU+JhnWCc3-& z(42!YXZ`wxSJr6`eUN!vD_vsz3ZNC((TuT+IZC=S_gyLc)ip;XR#-O{ofvcfpm!MM zw|)^CDwr>5qhEWFF)seVv5+M5YJf6L z)&mFNthEVPy}F*VY~D`@q-q|?0IEETytOChieC8%4}OtT16;{f){lrmx7rEymvO5C zcoPloo`@wW7d27-LeeDb{?!+I1^!hXpomGe(1){gJv6G%Fh-z=6w>KY`3-1mL74HNcW^6 zdu={@ zu3iyL|JLMaVgMT)y08Y77GB?F5PVnMw1S+&r1Wnqq6aJ*7^+^(dFQF7NNEJp4bNTW z{O&l>5M@zFlP}XoXSo_d>4!;Iy9bOkDIvTqs^kNvzrPDH{S=7U)VwTRm|1YG_1J@zOWzbd^B=u zlhr*lVkq!To&N%ee6K(jUFmlq?djX2PCuIde#eU3B-zIcIfLcpWvR&DLV*1g6Ls$0 zt51r%pFk|=J(Uh}{AeWLxY5L^q7t=DlI%G#{Q1?>7eAPz5_qc{_W#&-ilF)a#l>h# z^-&J>yvq_yKHmH|T;jR8`pH~Vjk|V#uOAwz*1cD3Pm{Sx9XyAIQ3f$)ED6j4r-v5H z)QH0geZsL$;3ZT6*nxHUv;59ewXjxTHmZqi_mZk{5{$pJT8g1EAmz+J~9KZ<#rUf7C#z)+%5c$$Jm5ZSw*X|q-eCF&c z!Hq2=mn}I8;NAwQqlJ2K1|I!;aVM4iaP?ZXX;UXoWSYHOzWGj*_I7v-yJJ)AJ(v0c zK1HDI*>jpcL1ztS8OA~A>{HOoiM2Rsa1_W4|Ocl1*>Kfz?d2XmenS@V&l5; za;>E*<%Ep@3;t$ic?zkpMdspu$P?42f6F^)?;v6is%U4IN}SUOW{l4QZ`wE}H=L-T zmtO;|3@GwW`=c5Pe9*&O)0o+py%V7OX{2i`JWYOXvVIT58M41Ly*;*(c6OV#FU7_? zpdr}DqqnQqv|YF&#P!tM#7Kv*5WQQX+g;)4*%=b=l>A_lopV@WrT%J3R8KblAIBbA z+TD&X#>Y&)^UM|8l*Mb^b68GW!lVIp-A%HpGO88_L~q>I3|q&0ng-tiaQTHe@AZa9 zi2~NMs{A}W>a8KCPyG&mumLRT4?q|gHQ$}o0rYdT9IM0j+|L2S!&WD1bz4J@p5hFv z6e*acZUda>D2lbBSfEb#;j{d}LQ*+D`&kY3m&@qvPi_Q6+hbQ;6&IpDAT}P{Sr)1^ zP}Y})ak|SV`3vBm!Og`#cb}Gm91|^whDxoV(c`|O3He@GeEne85aEyWR-d`Ui0!jB zADR*g&OCc<;yHVuu$(f?8AqcUKeB!L{*lF{8QPeO2J{4+o#rD?B)7?rIdvYPU5sib z78Wo^%z5g8Om5@NY(9iBxC4N84`6yl>eq^RzgZuXCmnxaRXct>$tZREZg0I_k6piTw2sYDugw|si%wfO;pp#g7)sw_3U6s`RYKq>&jct^+yQm4Jz)&8 z)ST1o>#JU^X#KvWF0#MrnaaE;;d4P_*g^hiaTgDj8E2A~o@o#Bim%%{HR*h&dsmm1 z;CmYfNXi76im~TM1?djnMr+c?vAH1IActxQkLb-ie&{=xN$?|%x3e+xG?zN_1r<_c z9(HF5TQ4Ob3}^jB%p5%Aw^Z?xrXIT zTs-DuD*V25X$1R4S7#=jao%3UBJ~GGG^YV~uvb@2qbCY;$yg14@50CNICZ;ST0BhL zlx@8kXor(g0Wg{?0e3(S>#n=!{@e)+Wtm2lOYpuVqxP@FKOtS3RGNNi0}eY zn3W>R7(fb0$nki@W2hS}Bpv|sEl`E2(Dn-30U*XZ)y@l%YiN&i`#&!Jt;Gd6erPhQ zXXC}9wX@_a!w%cD)_k_F#|7-`&%A|0@jUSrdPnp44ml4r-Ss&m&ik9dE}4_ce6vT zZ5Y5gkZHYG1rSHS&2)?tG`g(_i{!0N)+a@CfP<`-qj-wHl%0?F z20m(kt&s2ZEDi3EyldKTnq&J| zqiLJ3P!?{X7Zef_>AqGZID_%DbntYPL6oKLt--ZtffA+Q-b_A0{TuS-q#br`STWyz zy>*WQOhT)2yy8Kr|ok7ZXp_aoyQHa%^jj4b5Wg(A*QYwR5<0XLij zd~!^i$*UMK+c~FVxeN<;Iam5p=H=0Q)hpOb+C^)ZQ<$J&D3*qqnfH0-!?Lf@3B-Tr zz@fYQvFYXH)dHR`8?W8RsOdS`OzO41b?BkTeFxixN=HShhc7a?uu zuygQIQVY3Juf^!u?m50Dm^Dz{%#kPFSv7fmsbiivTlJY~;grkyX_jFWQ?rzT_%&o@ zbGGVy3!l6Xm3h4Cp@s!7%rtzS4HBtVeh?(PJ42^QSlU4y$05C{+~$lw+< zxCeK4cXxNU;oCWHopbBft*=g=w`%?XYR|A|clYYmYyE`t*ybBkdE+EQfyd5oC3?A0pn=faZ zFF8JsMcZAW7D@bGkp)Z&#I12Ox>}C)%W{onJ@V*?xZ&IwWRv+XdsBz~9YLV}JGfYK zpx1%meMPdrP*YWHyR7t%|0d3|*6p;#??&gp9l`(I4$diSi#BAKa1#>$7o`Ul*&32-cmu=EIyNXwPhDTR**kGT%)`QwZu?J5B%9LfV$tFjKf%F@OEe~j8x}0#2mS_ zg^B#p<%^}NmT=#^=o%a^pb~1j(KRZISMmo$@tioGo#S2aIO6_KsR_%_0Y*mr$q!6} z=w-8X!5@g?m+CJi);ofrb};bpr~ot1*yYAs382lFBYthQ1MxbIii1O=1lIeie9Xo6 zAn&u0k@5Ce`&Ts~1LppWmnSbUF9G)_;#g=@)GO(Ufqst%I_0wKL*cOAO$WU{1wS>~ zsj16LHuQ=3UObGl&Nide9jV^e< zRi$RXh7wD1c2Kk+HFdsuv1kWMv;@p-^adyf4ic!`Y-yD9hPw6Mjs7Frmk@C$v`*>d z;)&TD+Ju7v;uc`e!T@w-!bLx40H#aH>wuzrd<&3HDF?76NB^@K(MCc4uY&YNrF@%C z+Cq)Vz-_GQ?8$N^gHa>6=Hn-+1f*EN1y8So2u=E*-Sk>GP-vdN_Cy<*GWp7y=Hy}R zrSGHox0&q!T-Rp_ReBV6&6MxMRs0WC6>_gXdL8rea&iw1xLfi|dk@VuYl&tyjpN+)4RvQL- zT*>a});}Bw2Pnp}*_8i`;Do%v;|&3e!-mOx>x<9>;()|oJl=m@(*M4$IOfY6+do1t zShUC(E;>A}2Ve96qnEthQVqRWdhZMqy4 z5ED>>(kuH6d9(w29M3m$N)I#eQ?Y^|P&CTFvpn`ad| zh^zLCvD8CuPDEsZEsafzN@LE!ipQ?3X0ug20-&1pQvGHm_5f>)I0)-J-3g{Rf0k8= z3nTe2NxMn3ZRxE^1EZaQq&;RLyY+A9#&t>>?b4Y33)jJtX4CPk)}zH8Y%DCQvexrF zHj6n?tC>P7dA|GVr?bwe9j!x%Zp%{jV!cxW0{&fH0h4-5CAYxs6TIVAU$o!(QP_MH z$hBw8V^6IcgH{a;49OpaAt1h&;0W|_!y>0Er!mZqLTnagZkbwfnQm|DR|%y~PC11b zTQ_KTwK4#=`B6!LIgteMWU4>%gE%E|o^s-xt##&Ql%8fs^(L|FAI3t54kZ0R;FIbH;uwTY6wQaEflTnesT-fjFvDf`b-?Aw8|jp|JqPH4LV zEVLTo!wDWk5j@Vf{Y(KbXYcXZ1btu1<3(MYljgGy>5J|JeePpQnM86RTcZ9$ZE$Ib zsDF2O{eLJE-ni(scV!eT<|8t2@83I~?DqrSFfy4L>4Hyv#O8d%F`O5jQCr8gtJB(f zdvy;FtKmr(w=qGe1U?;>Wr#=hdmezOGu-#d-9?}a&G0Xd1LW~x0ANEbPLGU(7;z;m zqVkOq2p$UEOWIlh8Mu@ipVLDC?QD)^Q}iivGVg^rmMS6v@Nt(^F^SVmxdEM#=$o|w z9;b7)OzmNF|@&@o9~g4@pE+=y9>7Yx0}Te@aHwXYyTAt z_&?FW#O-y0YULwtq98!5G4}r-0s}xziVuQ+`2k1+#sRKN$*PEid|f7$i_KoOXm?n+ zxTFAJCuY5K6-fhl=0L``0su(AjAd6^n+IBIR~WtRPon~ol1lbW`He7u>D4#Lgvk6U z*r*#80(m4-YH+sn*a+=4IgCeS`7&pn7xr$!(yXKLw4pQHF6#39Gnr}shTw4SJER5w zFIr`v>^|^~jV|Hwn-v%9x3-_eZ&fJ#6lSqKvhZ-4JB;joBoqGwsWUxUT1{;eM0__@ zagCz|fp`^o-#*7x^#Jcl4}V(o@wgnG9c|dvR|JqNNo?nI^?4#*$|cqcmt|D)y}T#-O-JKa}o#Y*cW@(eV<1g zr2-={l*85&&K2T@+)}e7fby^dePy`_d4Bvu4@$AMo-K`KHtv}hNfhFLG^$nw(Nc=z za#{iFL6&)b=g4c92M`kcwPgDCYTopr`c#&q9pEldD(A~3a0|W|tyZ$EAA|pp@Wx5a zS@td4^nm1177r1BD$CzVQL(qA_-iY`LklUGtOXq08QHC8>`T!yu1?)Dblh~QluH)3 z3xnSg6!vGej(iE#;h`T2FF|CtP+GKjwRYTW2akQhPp47&8^ge(F2OI)RLhO4_ARA5 zEf8K5RHY@$qLuEj$I{7zLxh37wkr;`bP|eE{5|~ibWqBH(zBY9Rhw$$3iQ0(y%Fq!)5;i zi0r33{lIC8Rr4n-WU%c+z)zIE0H_E4c1B?Th&LPde%+48X;WEL(pFLKx7MgyG@D58 zydcE7LBW{JeEKjlt2r-@H2~0xOa`Vb^IqmEGWxb>II0Qc?95Z@^fwMOKn>$w$u)kStT&5dDL>xJSj{g!&ZfnbDFXc)Y0Zz~VdhbdQ5&bqL z+his=`=TdR_u`T4I>&@W-!ZYM5G&dP4`2e7KS_qiJr~9wbJ;?@G|VtD+Bug{n}+R- z_=Xwuz&;6jnZG8Oo)%k|MS%K*sv~0W=0+zMCQYN46SSeWU?hmdAoe~^i5i_+?i|zR zXB}@lgHQmpG%<<)OFFMdY*Hu;RL-(_Nz(1g^=&h+h{pVUFtlEZpVZ@{5+W*XoBJ_J zC(c^mc=q08Z4@R%(uD<#>9lZV$>sXQ)%E(IS5wgFq^W)Zr`#dCXK$?H4d9OvWj36g z4d}sY)cW%Cje1!9T%+6WY_MM!F4nHq*c)E{Xl2m+{tofLvVF;lVlMUv+wUY6Qzgp|k>v-okzAK+Us-zLN!FTQlpU#DH{of{(%-5>&Gt4P3FFiZDQt|2X9mZ9h-T34sVaaxCA z-x}~hHo$z7Og9zUEcV`M^b$*th^(o?FPoJcRx3}6Z4ssOy%~%B$&S4+58-(B4rZm zRS1hO=6oj*oLjYicOE;IBS}V=FK&E%b92)}BTD=rv25-Lwz_w@PlnlsgZuI7FJ5hU zWMk&j7(>=+Z&c&v7%T4%JIJmyU9M}oKrFtbpLyw3ZGFWhJXg=Po6oivtS#;)xsUd( z2P)NC{phwZ^dyMjPh-xKg}iHyR{WYM3+uBAIWc!Hw}J$YwFDS0@~Sw(m={FNhuaGk z%NsbU9_N;I+@1OoZ|tDr9mx1%Ucre*(i}M5{&c{uuzeRrmyEFI13C#1KXQXJ8ln!#xrOc ztT0`U)j6PD)+y)9c8(c#DhR_F1ANWz0JgNCg@4$M*cb_Wj3}wnM4W#cfkQep1Rz&L zN+&R`$8wZ7>|bCY;B)mYrBjg$LD_w4n=lWTZcNb!F`Wht)#M68SLQ3vQMY`?fz4`Kx4IYQpcb)o6 zItOEsV{vzY>J0wI8C5UPgoc7RQ?{xQn#r5!adk8=0uL|vRNkVw#A(z;y)~+j{T3c$ z@|N*7W0cg?-rczMgDGH6_>sxDy$t?bv6FJH$}OXQhzrHRE&7Lfh2dqEXNu5!+PHfPxBImnqGO~14F zP2-h{zugk~jf+9Rm#}zOZUNM)=d@#oWC-yk8a#Q><7H?G!Mq$HQ_S%B#lIO|n&48K zPSjva!*(*x8kmx!74KRFssF0-^}`;wm5g9S{_A$^hV=$Ur@b2WD4$NwHY+_nU_mu` zK)Et~?Y?KSHSP$6`=wLBBJf;Yg=&x9?gx2ee|KhhnG*!QR9|VjR~h)snWn{Rt@go5 z7jXVzc9;+aG_MhE!E5F_;YmNv#UluVMjJtq0PdWQvqE{U(Y)+LxyVemSf?JU+3Qw3 z40CwA*3J%}%U&oSm*btyLNU&}54bstAs^58Cwmi_jo%4aF5~LcCbVr1L@VqV0XNsh z@LH0Wkp#&Hpbk$mf_lRDC-Zxw1V@A>DI+3CLmpT56v-4TP2d>b9WLf4Nagd6=rCED zEH5pU+Z+-#M5u)L$q9EE7pXIRo+;M6uGvnxf@kU~D9d<2ibih#85Q+`Qm#B*{-A5v z`CzKwv2YWpa=PCf;Q(evc@t@NV@NJaBs6{$rl(XH-r+9R>SU$^V{yHC=`*J>v~$SK zlClYm8Gv>5-d>0*UBXXGWi%ojZ5>p+sj}d=@H;=790}q=_Ewy8yS1GcHJ$x+p+N;G z(;DCQmX`V9F(EwqtkDja+rwe?f}vrR{{ki*{PGZX-*bdKBEOIKe+TCV^&`y`h zE(7AKn6NDs3rlur>fb1(%J*dx@k-Z6wYGvl8LN;J<&odpjHNfGa>r@ZxJgPxhh3c| zEo*jG5L`kuK8fZ7+T&DuweGCGuRo zDlW3$`tB&KuFG)yHd?Do%>o);7q1uMAQnt>^h{0&OPeWSS=^Jv@4(!nP+k=PMO{N2JIDp{w zH)Dx~kz&G=hLiQ|;2pN^ot{5~6oT^l{%G~00n?Po;pT9%k;>C|TsQRSghVk*^uepM z(%8U&ST2>TV6Zn5CkQw^9~=PE6DcXVGW&U>m$WGJ$*bz5#Kf;wRs^I>cE6EJ#w0Gz zr+eQSzUdp}5Y3q>(rM#iyU!^F1grf zbdQ==IJ3G+L~0doE1|U%fj84JJBuX=Zd2gW{5HhuGGG!;#3`QtPA-K*HjxA190oLH zeLus7{k*uFpvGLzu-IsxFnxwHY`G}UqgtdU7TW%yZFO|?X=v0dJ)X7*8D%SdnfKbs z-qm&HBzR)Yihmj+d)~d z_?(Ff+O*b}-jbBnxEA*n0itT^c&ReQg%G?|m+jx2H3cv&zrH*yU$x=ltT7+KK9sb4 zmk0NavNWIO8g~C6sgFHA8*k8?Vx+>w;=ozif~+bIdx+FFeVkFVIAVVC6%MbJxy3K} zG#>&jLEHmrFLfI`E=%|qiK z*6bVFmIvs-pPikJZ36z1pK~uu%0xk4KUBdkdt(AacW}Z>Jsm3Le$WzYX{g8*x(n5o z!=xVvyPK3UULwpU2AyHmc6EiK1zSGwcy}W7K>g)Ny34mA&xGRXxhsy46)?tE*K32F((0hTYiEW$ zlS5i8CaS6#z~cINcG{j>oi)+jVEa+(&<71JV^n;V{oroPvpz(@I`Zn?#CIosu``-( zkyZ?fqXt$awSXMH|%e zQ0~h`;s)jDK)n&ce-q(IDCq~iLjM{j)=3YcCEAGVrRH!}C3yg{Hw}!=4r@aKgEo?K zo=niGh(5V=ybKo1+qZbr>x6(Sa@L@90!_p_L>We1QdrbkK@*6MwGd!UTY?mvLM?x34U4f2 z_&hddBSb3~E@&C<3&DfV@F?u8fAzS5At4q(NnDzHe#9{G)~Pe7iS z%)X5c3`=D%zjCR6{5qC}Pg*xS2@)bbbXl9-lgTCOye9s{)z zdqd`T%}{~n>@<>350+sBF1td3qp9=$1V;1Y)r_3~P7fy4W=}+C+o!K%jc#_j$*ksb zPaij7wg$k``tnIEV!7xiK|oNqCNa3gWU$}f9UQQo9x;j=Q%(}}M-{@2CeBH#V9ZYa z3{3FbuYR!cRc6D5`lr3$SB_|va;4xrnE(C(qgrV6AzoA-*29o-EVo7b2Pu*(FL6Hw z^;%4yKi;`MGN7wo;#zv!EQZ2ouxsbLoVwqZd{6BtoMViQweB*Fl6`muhTW$bhI=j65 zT2)nriKy4?*xtXc{B^B>C+1=#Yu|S}I>j3RZoFj3%CzvrUB&=~pyw z5a#rAbuV7$q1nv7=ViWp@orN2H2f@K;siq2*a!LS<2N5lMn zaCxOvFCEIX7JYBnkxpRXCVJS+CDU4-BhFCP5(Y@oGGdgbVndy_+a7h>62sJm$JICpSEX+;*=tmHH)xgjw!F}-?^W@8x0O;;Q>*J3E4gFHL(>-k z1*H(D!o~S{5}yZzXxUDlzuThzlQa8skrLB@x?g`}?3BaNlSI(-k|hGezVn#m&X%7> zxYK{8S2N-ydy|uBBKaq=sMfUql)uUj7HWhZu|uQ9URvVMz?^t4zeL)iP^8MBdpF%@ z;oN>9SATv#F{nkJxHM15s%tl^Hb9IwN2dss3v*KFkJLy%UJ z$onl7`_>RYmn*314bl};pqUf@xZSntvQnaVNg#*}0PD~8q*MrOYDF@{X|KUCfsR$E zM?$x&D5fn#AB!rE=&34?az;Awq$S;)1J{1M|IbQ zDyzoWrK=*#*J<^(MBRG_1JmjLmS%U**;2&DQ{PSRhU!00=D+^n|AOn!8>PSI{{nB~ zAPbuic(cCJQU*fK(KS=ghh4m*hG}P$B@`a{ul=!h0+ zYFnPL4#M*rebSU~!@cBWz@CX-VQGq*Gelq4 z7E5Og^PI^=H_{`K5j5J=j{NW={+FL1L2L^**X(`I^6zPJh6^1@AQ%dib6b00 zkE|pOPFLO}K2P!ulBV}E`+triG=7XsgGEA$+)P?oKD*#y(wn>+ag1=Voh8-=tPpCcUN*JL#y}!)C{8 z+=nXy1VOXFF*%qstwemqM?N;lCf#E+#0X_D=($A@!im zS>;WuKO;dL5B&~tF9PDz>i6}l2>oXRPGG8&lzVQIUT-Qxb^O0m`v3PY{%+!JzIP!g zo%+q5*J_x^=;(n!+xMV;X=!O?AhnD&w0N4L06vCXGC-Ht&2V_3hFZ7b>JXv7g&dg< zs>fU-mac@O2%i-Tl(_%Y%+aW1+lNzX z%SCd<(%39%0lI&1I1VeZ%>r9Pb6sez6d2WXFm7TNkK-wH+?a|4)WT=)7DSzkLO-P3bxjt2HKg-NAT^Pou>}LQsuq8h|!X%e0!73bEpo+~zS@<7~*_dlO2dY;H7NSaY}b)#_p4#-`TOcQS8Sso2~& z-x0@oG-m#ZKKHog8HV{2|7DWZaR>Kj*AI0K4avcw#dFL!@EzM6kMLmv= z5!ewuK^{Hh=rs{yTVGzYnvJwi=KJ;~k@2EZ%KVyTyd@pVE2v>ojC6E6T@hRFc)Ol? zGJJ=htMcg6J-}{tDm#-AE0e^MJpY|{=K`a3bD;(gTfm4uH5ETvo&OYQdeW|}9`4@s zW@xV;rNVMMnoK$&;W58^oWA^c^8g5Oj%|j$?)yPPur&|j^x!#|x^Ejgy*cLH8?S18 z@b*aDWhYEM-es%w$dy-loWkZTjjUYxB`{bCYDwdh<*&lwDs|71jKzJ1@s3!kcieNj zKe@PQD7i5Zc&`8cr73q%ZQn<;+0*n{6A{7tr@-LXwM{21fbsp_DMj)4`W%h&(7f4o zSv(wxE; z=bfRX;obGLr6vz$tk&t&*2ml9&k2mW%wO(8&StLk!2L`sg3r~ga_M}zvo$u497B-v z&v^shW$CC`Xhg91ysl7DV2zOwzunhdKLynNU;8)gP2|#HXLosHG3p6V<{>(~v@i)+ zF5Kj#W;eAD9DSQXxXue{?r*nBM@agNM-#rRW9*I^{bd(-U)6%qWve9ccOz@SIqemN; zBu^_Asks0&L20-IP7CHFwgy1GU?lx|>Np#>%>E~o7CxsM9Kkm4`BVX`l*v6EF8ddQ z^wA5^K(7q9)37cnh1pyuFLJ3ki7HIPl)&<%g%T_!IugTPB%8CXeq}bR3EbP0ip%c@YKWja-&jMmEdBnwZHYdbhYur~{W zt)yl)dUP#uI2%K0P7oD+{B6|L=g^lMnCxN&^7CkYD%2cUiV3JM(^{Od;Z-QJW$>QM zjBKgZ_tmt}OFp`67x}iHgv#Z5y!7dGlY`_@1GnD^+)M-279~(z1fAk>1f|&Mfm?B?=&! zq#RytcSt{)HH$3_r;2e}e$Bf2G*SL_TH-DU%LNV7%D>(Tq$4%bGlGq-1^S7r!VgzC zD<9sEYjl?zcAibo>UTyLuw;JLF`XP*$QKMlF9Mu?ehH_Q~8 zvNG(=H+z*~s%bLNA~7|%90$I;KHS4er-tEnkUg4PM`I8|HLv@*iXa}_Lv-+{n+W8;TIr^9>;E)ifHLTyLyUb#$V1e#sv5nV~+e>__t( zHU?)flp!6n@q?S0xdh5|sb(V~qF`ZgmekR-Oa(5#S&Uw<9L0!EvsJ}TEJI2#W+J5C zG{u!Z&S9oxF{j&#^dOublU^sQh%8w>(6M4ZKYAEvu^~iYaBzP`7=jUv8THv zn16q3Tto_X@^=-qIgWG685-Vl!d?)k# zo1P_+mZP$k-9p@iKkeeb%!azqprqu_U58$})-Ah%*>!DK2Qj_Xq7Wz#2Z}nIhh;5l zGPN&{cI4zn^>pBZnJ=p!tv}+ zxa_s};IP?ySpCDXShta}0klGpo=(|IXFT-w5^F7%!$vi^@nCPUwhVRD9ZyxQS5>Nx z%f$XyTgRw;iRltoGbWDqPEELRZLvP6u3qoFXkIU;^-q6feJ>C*oBs6`ODmM#+wH3WH7wt#wcDO!p*}N#hXAp}P zgU9N~9Za}xN+{Er?yZ!XGZS6mtIv|L!5epH`L<-8v9erqc5yImy*GObZ@l;Mvm|0F zzcxqOhU-*f=v}cF(Xx1#Oi$Gh=T7mE5E;>=?(Z1Du3T4}-79bLIzFVFe7Ynsq?-I- z=2@r_-}U4nNGh#SIKPEGT~(|G#)JS74-`HxIQ(_CWKm1zmSckbu)Co4g0{ID1<>&x zBUN^Ij^(G>54Brv$etvTKG@d>`;FLxSszrW^=G)IeMC(>MlPG`Wpv((Jy~@DEe7ZJ z>SPqvanj$d9WG-*u@s&+dwC-nzpiG#PPeA%8p1B;$l()m($>mqZem;?ZC9xXiaOI? zqll?o;*PT9J+fup8)*~Ho8NDA4?cMH#RTWfM9`Ds$v;e&s*0R56)A(Iah*^mzG1z~ z=(}mSLi<^L42c*f{87<$9R2qdDdZPe;Dmznq^8#Fa;U~Hf2>tAUaiSWF{EL|UUr+t zt5Iix0$?CM=kgba4bie^hg?Sz@)s_Ke$00{oYANEdZE-#$Vr>;zxZ}pgUzR%|4sU0vm#Aq%XyHED-?O=&&=y zeYH0}$(Ozz8s!+m<8e^Uh}xUSkx|_~fI)ZmY50Re-WN;nn|X6=cB|^r+lvdOQmF`g z`CP-J`Ac{TA@4|eEl|KCNdW^x?>0Bw(=2S0H^z(&+t1kkGzL=4glY3ylTag#8czmW zjS#4a8@b5Ho&vdGE1jnIlKaW@no8LcMB59Pn*wDgQ!4kIi8RVj~2Y>qaXtAbT2N8;xwYmR(= zR8I=5;dT{?rGM=&=edpVnhGThJSg)`70dbKNt~26;V#%d^n!zOa*+cJbg2SKqZ1DfaukoU8U~a5J1n@Sl_XjN++~V z+Rit7!JRAO;O`&HPGU(!dXUGLsj;(QQ81ARO;GRB_`TG)J&t>TgPL>0$`B4~fy1IT zik{TAf+_%N0DrGcCDecC>>}&WsN1kn;rI!4T}re~DvQ1xB+gO!lQHFpILp%*0o3@2RtxLz}%mBr0#F3xX6^)xXR>-<_j{XMEJm zFIsM}f!TS!0C<5~gANqnBK!2GV-4M-Eh}b`qG%q>8kZc)5{?nAIAeB&BwNvqlj+ zxoBB>MiEx^4`(0|y=z*`Us#v@a2L4(w8cx7;S-p&Upd&uVsk zwJ(Gxh6^}vW2`(%q^5Z@K}^{a&)Uus834spkEq*Fp{s`H`E)LnTD`OyQma6_z1jr` zu^UYiY1<#o!GWb33B&|B1!-CvKEg?|a}s5Bi+406sNO&#|Ee4>q2=%NE? z-fn!NC}zzPz8||v2e5oM)vdfoG!GDFtpcVe|Y!~Ny40xE=HaR@=d`D*}oYewQT)MSRvy5>H1)tC;Ww1vq z=t=!Soc=(1YXBT97W{4YD^-E>|0DKldGkX$>iOK(X-_*4ok$N**VUajzT!@wrAWPQ z)Z|VGUCe-e_>-nbX$Lh-sHz9ld<~AY_!(R0Cb_WwWuC8kO>zRNHvw6_NsS@Js3Yg} zeDF!^&amf;^V8MktQI7$fYte>{p*8KU&1r9NGLf4MPXo0)bm}e9FI?lj`Vk3Nq_J4 z4vOO(F3%%!8V*4^$=W8f<9AQ@yK2k3z4J~aG`8FGQle^1s~M#9ard0RRH`>#al0(Y zcu)PJ5LLiMN6(ooKq3&(noYZG@^ji9v91-yd0afr`>DKp!UdE>O7&a)J3q@5%<1aH zNL=$qR9ngxc$(@1jt20gS#kW_u4MDF3#bed^Y*wME~;;p8mZ z`0VN4i9d&8^w*82%nb5$RY(`t#wq}+BwpaiVHom=KTL<7^ul82nr0wp zJ*!hr<%{OaDcRUfY}6b zt!cv=!zt_?brocB2KESlvirBjq^_u+S;=TsKEj34sUcu|P%qMwR8OGM?Xbv;x;bFA z!(qN3sW`gL8(}!r?Lm)TQP)Rm`-TXzI$sP~*Dr{xeVfIfw(Y*5LMdErC<1eMRlZOl zldF&EpVrm?+1Xkrg*p?FuJDdbu-qWxZxRR>W!n zK1qz@#BhX}ES|7v*{U}?G5|E68Hw%@+8#_8A63x7i`XT1Q3wAz+pE}AvkZ=CMw@P$ zcyYNc2tRK?nK#$;g=kzX@@*sQAi`rY1m$d`<=se|pv=1izl{sac$lF!gWu!=b+;!r z^Olz1+c@)jvjkc9m}%xH!$0T3|GLP%#!vo(nEGzIXl<e4MW`KfApBTo^|aL0V+2a(#in?L=&8X(J*)*FhXqi1sPPhR=Pi zXf_2%L>CL)dB{LYZq-W7-4CsDD?Y#>G^Px#P z*w9gj|B6y%ET&T{4Pwp?-e;>3uRm`_pT{LlxwSb}HeP1t{vMXw=w)_EL=d8F(kqu? ze4bTL+wA-c-a)1({FjX=AKBs|N(6?Uhsh{u(+&OK_nzDvp{2mIxy}qx!?E!U)-07Q zSaYd=^m!7vn!=6OSAqP@VSB(-Ch_A4{X%S#Sev>`Zm({QQ7-1od@<9IX*8)=wZ(3V z-8ZAPHh&(~m0yb4HGY3cW`+x&Rex|*RJrc+x*k!}suu)artdOaZqzoU#OR7GG?#0I zalIho@Kl`p6{hPEPscKTPincWdKi`BvxCjI3PZn2kEmK1G~VdWT*etgpM zaQf7=G_cS(cL$~7^k>Q?G{gKHn@DQWSGO(SLNIKCKe=7a33afhc(}HYLubHAb^V{000f7_8VNRXoJ_Z&Xl2EJZQnck23HF zEH7j~|7$FmHATMM3d!skX#aH+(7#r`O-^&6Yrh!aip>iD*ys)mPRe(fq(rXe7pbA9 zac1b0z@RbRP^-4wq=cq{A#)gyb#4v?yKnUpnTt^i{m{>&QpkcKLk-MHk8?x`0qW*& z0TT-GZ7Ee^8owg7qO26H5jq>2PQ`j12F*%nffWJT8WZcOQe7;FFC>xQD;^Vz-D*yO z`-@M&NLu5sxbSUN&k57JgQ7BpQg80XpYF1M_B^|AKkqW1mt`&rxq)|*@QZeB$XqZj${O& zdGyNRCqCC69#Fr92hNb)qk^(gW8*Bp`R1bjI*j>28%Yy?GRPcw#9LfB&CJN@Y4kc} zOhu!Zv82#lgubF9;N}wt%N*(oRb2wQ*rG}2zx|v%h0>@nf3waG z*GCxan87BHD9$56LRNqmq3$jHI7sym_W4taH69B=LVozjam1EXDYRVd*T%*`%^t+y zuaW=Eo?C}_XnWfdgG$xHNt1^LlXbPv+V$W{rY${@!)Pa(iGA2z@s}w1e^;!U-a?T+ zg@q=LmhPt4meb0S^oY!QzxgrEU|9Dtz12Mw2J)%z#}dub1E-?<=|23IYwtjME5vQS zn3hly?ssrMgkWDc&ebhP6aH-l>_3IFrVr4+X$&PI=JLR$5MddoXCJh#$qYj?Wd46hA5?>;ni zb)og$U6U;N;$!b~Rg^r5moQx?z>FUxT<+CBNqq?pRTQk}^cZO^@_H^4tv{8^>b)3z z0WWU*Xd#!wBl%i7^eg}MI{SC=IfUOoYcpzdPPSD7M&jfPk)@9_-RCb2KZ8JxOoE>@ zw`pfHGm9`QU9_B0WI+Pv6t9{t@7~%9AasQp;HeroQ+bUpcz6nSPCvemE-kbg*`iLS zfxF0+E?!)|WMw}4z_uThj4l~Ez#Y>*J^yLej%PCrTK}m1<}!+ufRhKj!NX-6hQ*R= z-x2*OsN%PE`ku4bF^8kwMe1phSA;ytqte_5EhmPaL4ngtgoKkM=rrb&A*AzUzpn#X z@b~3^4Fvm7-+avl?y4|`Fk&aQQ<36M3WbywU_!WgTP|i{>k~CV&^tL-gx13)%X2>q zG`n_*Gf*w8lxR0d`g}wUu_}d8U8R+EB<(*kK^~5IuWG{7w z+YqYj$5H|R$FWX(1)6}g#}kp4Y4wtYy9XGRt_utEIFlrDfrf7lZrI7op%LW$f#L#PThi!bZ;h{_v_@iSkkGZlRQ< z!OO6xl=s(lCk|IZ^N*ZWfe`C$<(eq+t$MsBO54kcCKFjy-+_JwjX}a#7aT7R7MMX+ zx2JK-bFpEuog%?Qdbw|%V)AXZ?y_x+ce$2m-G_~98~+sXv4RH`o8rDE0uGqvAQXTX zt|`c`c~vwQxcTF7uICelV^JE@Tb4#j1lGXV%K1Y@8h#*9_qgaEPSp*^B{HbvnulBd zc$>SdOAOVF1kaS%YawvU*Hh$Nqv}M_S@&Ui{g5b}(ut2GfELcdkM83`BIcuy4k?(h zcYH-I>@{L^Cf5o-=v)aNzB$fMZV85NTjJZdpe5(~RQ{En`z@0jTRUAnUc2`pi84x5 zWrEvb3m&@6m3o+Ul&)j8-{Lz2_G|CP_!-{gE0Dc;r!pEcX%%7G${!l$CQD=R{O0R* z9SU4GAuS;LATydNiNaY;1J?Q`7R+LK)l4OAQkI^bvUB$s3iGGE*FNgy^MhZN)I`P7 z$0pn8#^f$Tt2Qvl7&B5;<-HLcin@RT)8NM$9Q2qN%^8YY;*K7cLXdV%>9cx9)?j<0Tqn0m)kH&6$Z=`Rxl#OWPLqhp z;_eDMJHj-Ux#h#n(O)OQCSBx9;~TC%?aR85k`5kV(jph9vL?x)(G#>5CrQE&VB*(> zz0eqfLna*P_r@ab6<*YIXZQDY&lDwx@r`vmrPwVm}m79}}mM(ZG&Y|#Y zne4O9$=bTVR#<2Zmm*%k9~rL|d-U?~cXob{{G5ChHfL9~E5b&5^bP?0X<<`!h@pTa z2XsPja+S%#9O-njq1`De>-JbSZS-3Mv{ET&hr@D3`$MU!%fA>lri#Z}5Ny|nG_LZw zfEd2#3STc#R_INV(u`Y>o3fi-aze@=1A!8ioK?$jzG%DL!4?6oBOi>~3;|)=>E8wiGJT0`NBZC9Zg_oW z;S&fSe))d5zT?)J%(BOw6by*B*?hdeZj`q_*%1MVlh_xmX6?l^isag~T)YKkHxe5a zAmWjgvu=#jURVUrQ0LN6MU`vmw52N%IdWai>vyow4|k+(yjM&{Iu~YQP%vKnl|c3a z>x(-Rz|&+&5JTZ#<<)RjsDUX0Ra?d{>h}V_JoxGPRR&FCibtUJ?uoE(W~5wQuFEGD zPT$C^&hIw=6$=N^hAx!j4IEwS3VTsrQ!6&(MXn(`5{z(e7UAJ4-`C<4g7) zhBsE@GWT2zn1741`UE{uA@g&`<^RyPz*%>5=GH{aG*ou1c7>Xf$B8P#@RdlcCw zwC||gk?VJ{~&_Y>d$$Jtj$Rn?|% zBZ8<%iqaw7-GX#?Hz*<9orjbZkZz>AySt@Jx?8&8aL%`RXXcGrGryVnT>h~+>+G|i z{lwk(bz!YPyBYFQdbutqnUn%+@ZL%JA?XcUFkz0)>zZeD5G8siV#w>YwC=wBTa7Ol z6&TPhC0GTtivjy@%54rVnS$v^}81sdIKgysPfSW0I{I6JffoZpyu6-dMl% z=U4ibn6!OyE2p4ryfu z&tgjb(Dy386ogvCI}`GDZLUOYtOJddGqnUPF92lD!QkGl%7BIv%>BTX+l7%&p=Q^E z+ksl9DKrKzJtiyR(7BWRO+G#Q*kO+5@&+SJORBEJeOR{0_Dt>|)ZbKwk5)Ia8SaVm zk=C@B!&=nn(}pk3A^AyL<3y|1H(cysJB)Z)*JQ2tWDfjork9tOh?khEp=}G6rJ?)T zk{ceBTJP1Aht=i&bMO;N1xuWg4D@&a2B*+5HMYb4#J6NC6HFFcNKsVRCOxJSy6uFO-2bWwFso zyB75R*;6Ha2gO_E+xBRt*x!^JM&?A7$Uek4)UM-Dtn*2v(}aWA?DEEBwq_gjN}IlD zKo`gNoO0y%yF#NhijPI+W1QsfM0-HYxt!qO8|wnM;2_KCiu?S$8T$3g`j=}~t}7Bk zSXc!<3;{fWcGPs`Mlou#esS-7dz{*I$4q0$@T>fvlXit}O8zwQm*9TMS%@(q>YtV< z32ZCog={fdGp2YZFPA>Dz~fK-jR!!beRcq&aLHOtEHhd+BnPfmX3AJL1#T-A=mc`A zEY>5k>&gl0HN3r-YJUgxsCzO6JY>3p;(x?GLJd&B>dJXA*g0z|*Nka%;wc~yExK_YeG%G);dKH2@+PBuB&&`5b` zq_pTMS19qhJmvt(fse0WHUNznJ}y%Ha2`vL6hg~2z3+B+$sRUUu_tnPki`_8Vk{n2 z!Pb?LFA#Z>hgQDoxx%lU4{u}+kc|V!2u%!mUte2SnqjWclb3Ltk%6VM6=PJX641!( zzG$Kh@#1qHe?_d5R-Lr-Jn@yoTGMljJ>rluGp}8zu6Kf}>~*>b!GU?oHozz8S-{OH zbWhQZWM3Z*G38w9<&l=}w5?Ql3O8}Mt&jHfWdTi8E27zhk+hv^f;(f!m>N>B^HhCT z-^vO9Q{17w&EH#Rl(*ay+tjnFk*vE}&aNHsS({Tdkx_c%JDtB)W_D$UaykLLpLE>f z-NDDVq4B%qsjI8DQm3-mUahKc-F%M2yyZ1j*AX-rV2eZaw#vMss%* zw=|f2LM}fnzUhRv2;WecdTi-hcI^xxR*|Gk4e*A3EOv<_t(D1gv;+?h^>wz$b4xY^ z?OYXAR~bMqCiJ_xZ}oSG)h3qUo9KCam12XX1pSlR@I!v~i*mf&DT%S;jJbK}_AHvO zVIRFth);j(Gon}k3ZV#fyXiES5U;h)^U8}Owcwa*ylCP{LyUEqH%yP!v_ z(!~?eBm27W#4s_O_76|KFnlm+4aLTl{baZE^3Lse?)|nM*WQD|r0E~hhh&h z77f+&l>Z!BfGEKUk725?-tFPJsYsORz>w)!92a6c#G^@C)HT|thi|q?zT?q6tKB&@E=#9Qnljl{lv*6i4L<^n%5iR&W z^A@4CyW6tvWGP$=3#y=ccy-++J9&Ify~7#|Y0XbTHi(H%%07Cdp!)!8b+b{-uw8i3 z0+`?;Qe+b$)UPOb(I&SfH^Q3t1eIQ^DVJKx2Oql?uwAKimWYk|j>$F5ieSXH@&!~7 zHVS#=@z@NrEmVul#|-pl)%h zQz0w;P{F@EdKwbj!j=75G^l7D3Ss23jH{9OX0Z@Idm7<=R{iNQ63M@a-oF|J%VJg| zQsiMooN97;OR|0EKX_^_9&{r2(kQGo$1F>>R`5<`n3oVJzT^*%8N?o=j5iqa$Z>2q zRV6oY+E6A;hYtvGET&#Q4=wsI6W4Mn*_a#vs=V;fSd64n$&XH-_2k0>E!g$V>NQ0L zvm{nUKOOw?9Gb0nBuy1bs*vwDcZfiqkv+w<3=k1ahh&ZY>JZmt-0mFwP60WYtM6;Z z5}VDoDU$!`F&v%nx?Cx3k4+OpI38{K+Z5XcpW-tzC@?7zQyDpLVcGR z1nI_?gNr6+w$LPvby}#BL7l0vz;Vfz_Gd?=|NhV!$_;;ZEGbTv$@#*-E0LkuT*-9T zoqWrQ(kfW(7=eFci=f8F2;*DkH|E+RbS}|18Lx`9Lh@yRe1HAP!eO2Apstv-B7G#f zQ?KA<>}9eo!&%b@lG=jmabj4EisbUB9mcwvJ?F|^b)c0}RD=u${AmY&D%JHZ5Z@~h zwk0<}F_6PD(2}*LXCYS-Bk3rt_%b_(7!@_o{7-SWzr zhta5{xTfAhOC(J0X?MrjJvqUNa=}-vAMYbd%?LwbPG)PlF4JmKqi0W(`F*|HiE@x$ zG$pQITiRZdqJmyDqw{Hz%}pS1DN!)!B^A2^aQmN{eSLi+=`E)~bSLx@{izo9E_j#r z3Br=@&Gh;gX^z`uHNQCzN&apfWxDHKZ>ZyD6AstpWpidx&1tWs{XQ2KIM`-F{%&^(y96(n3(Xsf z=Gh}=lr)g09;x)f=T_w7&28}4lQ~ps$k2Qhb`NOHC*<>-Y?j2k}7jSy7Ed(h7BFh6Yad$Z*5c8yo?t{v~reWFKXtL z61}bswV>RymAz8bU&}bLL|NOITC-g|2`~JkAk!ms#0f$n@-Q1%lcsSrDA(n z%vwDdYQ=Zb#g?8YTJu4-?VeQfbY)a)Bq0DaQ6Tv)m%hgLCJB@HSE%G7<{XAV#DmRs zgy%MSI8}5NHy|2ghl!0#kip@8e@64;E5%A{l#?g30XI5%uwfATP zKE{Tnf9rWqs7fnF#J|MNvKd1pv z3wG8Ml1wI!B@swxC#xH?{$Gq#NqK&e(zq%?JTZGY44)<_%m5b zESz|IoOjp46w2adL+EP?xm5t4ray%Wky^D7#+D!~f(aUbE1t@Zv_DhunlOHpExO%Z zY_%XjD7}L7+K{T|<0zW~dhrF1e?Xp0T#jPf)w)78jXHtsRmR&c(YBNDC{>pmzP2p$ zZ-wJdB(JPfoONdIvpTV=ewAx%Ixox;@>zc{*NtnrI|%(~)Mg=^gc1C8l2Hr|Qu5Pt zK>O&Ub>O(Alu+--WDJ3u!qEGO()G^Z_b#jW`{f$-&F`ZcdzbVO z9>kc=YyX=Jz%mJJl$jF-=9@k?#_HWr9l0aIbq&SWV_k;3yc!BY4`oglom zX!?yE?XPd>BwFz=)xO7*c-pa+VGW8O4X~?}+otn9xb{lkQ24feOOFwp7w`5J)gxFT z@L8a#)sl%T_==v=CNteS{i_)jcELg$O6?UB|M5SD`+m!G>B$gf_~A=7G~u>A7GuWOqIAo_<)+az^-CuD6#SIPi8=V5iN-AJ z0!=LK+BAinh=sBM?kx?K?PM8%H+D>yfWA}>7D=bxsUZTCd*7Jig&V&-)2n%$?L z$S!vxeJ$5+twz`tm&Nhpu=`Z*F2p7B6oTqvwENm0C%;~%ExYMq1ln9*~%>g080T1;!y$EiBN35AMJ~-_O{2%o~%|=Soqvd z{C>}n9QKER#sd9RyR{|&oCs8 z*#+g&_MQ@-bTa#!Cg)=X-)i}669^DdNNBi8OEKs~}WUu)^-cre>_olo|ngN;h7?#s~akKN z+iq!*?VwceDnAmuU%${UCP<&PZd_BoiYkgY(ug&Z`lhKDvD8G6cjUHr4!3`A;Su|} zKVfQmk-bIg<#|JjwwKH7K6k4&58`vdbS`K+qs4G66Z{IcA!M-4-E4BQ%{YjW=W}AIlTBEKuf{`V#HbO8g7g0!@%L3kE#CRE86|-DNNAplkYU%XFBkuSk z+bFKgp*+A|9JISygRidPd9F~pdln+b)LuLlDYpVA`|j#q> zHnfrQ{k|H%9UlaTeH_=0xI$51xAol>ZT_-M+6z$r%O9SMlGL4?q_w%O6ThkI3@8PC zCiri$@qq4cmwPz8b+OjCFlEO#m}|ovu{a6!x*otc;+%v5F_w- zLk<_}-f7iZG*WA+qR<)sD!_wb&}%FndiLrUit}}`*@L6aYP&!^sbdA+mmNSFQk=L} znEiCz;PKUKnW7c`Rd=~>%2{~PM*OTg42Xpg35W}PExxVT?o_b99Hu}S^E@w`zdXtb z01Cb3-)jkMurA{t#5(kiCJRlzEn9ZSKCAp{7@R8qPA|XzH1IOd=HU^ok@yBTAI@j3 zCnZhgodM%Ak`EBY*OW;q(9vmxXrQ?cVM?MjInGHGNziyD^!=As#NW+~liC-Ya5Sf4 z+5i@=Aa8RUC|^rf_mKx3tOgQ`POC? zGktrpNAZ=wkKX6Mt5Zo%P6&Se#e{)~^Z8ljD_ih^c6LaE_yqKdMg@0;;HFEPoT3*i zE+GAFsXw@YS@UgA(K$-U=Px_Mfj2v0d+*7cdng>8x_4`HN($59HCd_)U+wrFf!6q4 zr9>DAczPcW1Ba`~q&Gq^a?TUWT+gmvr11U<=tD_Mq@Y)nXn>H({jcf<@lo+QEWg5L z-aQqWGRBRfcV4KqtamyrEZv{Xi+J0AI9G-6_e$;sdezx4<$VL=FOaF<}L z-hxaeSBMAM{NV0z{ABceXS_m4EH&u{z(QgtIgNq?QiA9SE%$=QO-b&$KMJRjHKOw- zMm#gv9(4rwn?nD@n)xq#R1dw%Rv~z$rgTla_7Z3*O0gil4FlFeBfGaqlay%~{Vf;Z za@5A@fe6xIyb{&av2g;Cs+>-gbQRHgjND_UET2f(-TrR=tS+J2xZEEr4cG=R2IDowF>HkJD4p6A`J^#BTx!iu`?RdKXZ;=+t~QZ zYAT(X0bs4|Rq*gs?i(muM-{5~0z6{)6L}oL_~{=m{o0^PyxZqHqqb0pr^9`5vX@Sy z!;9&n+4hmt_rnL_X2>(q?QK5%4Pjj685-%7)?@~XYGC=QuTDqzeD2Oq2zyR@o`A_3 z;G$4{p9QYciwKSpb>v_;(}58&idJ>A#cc!i1Be6Gk4i;+-EC29V?|Pwyfo*$VU}nqMgm6!^W-@{3@oZQ%>Q+{D)roBxf*mlx*JINEHZCL3k~k4 zKj-&jpazl^K-tE=QJZWbj|IT{;o#>7f4KrM2H8N*&qS-|y~%#e%I5PyNKRc4y0S$FLMFIXL6Ct-so*JfO|hcVLLmxf(VI`Pg+uTr>V zW6xKw%~htB>af3KtxXQ?ZvT=7jmLz6Dmo8HOgWmfxl7`wq;!$p6`=lQT64Cuig z@!)PLeV;b^djC)&m8}jXb>op3ftd}y|Kdda>BWd_U)I;xM@B?MxSarPLGtl6Z)H=t z$%-8DK4KD-qR>w4W6e4`IXUTv=)I5bvg6l_qt%e9wfAdj@vL?d6YDc^)MhdoRQ~2@ z^ZN2&Hsa+b1Am@uI(o#UzS)Xi=0zRqWN5F5d|Cq&XFgD@j+lkVsQTZX+CPtR?&U7= zI@8Iq6eSdVE|*<3Gyd4a4YcGa14IW&jGuf{AlFiOC|583_f@@7ei9lv_ME9`_x@Id z&ym#v<;io8N|@Y-2SdSE|CM<8$3T6ANlx_g9%@M8AY@6QVNV18PoeaWyZ$oba&IHj zcL#)4@c-KyKK>TJK6-g|Wu>HaU#P+V$CF9jpA4Ox1Q|xa!2EwcyIfp4@c--4{OuDH zo#-$BgAo6h^F>Mwj5_E<*rA?N`F|fa3>>Y95A6S?IsWBC0fiGR&MyqnAkFOR$q@W^ z-}yh@=cB35PrgO?|Kl6~X5;w?lYPW~`!+5g84CgNFFWTyYe8U~;zzJ?nWWB7Q~3V( zmnKqpL3GBTphJ&G`@i4p{k#KIkN7{Idtjoa+nIrX-|(4{G5-hs_4hT2Y=);TDK3tx zgBc=WeI5`uA8cXJt@gIt{_!rJE7Sl$;MuYRsGLmrp{@I9Bgu8% zwH8a{vlI{9J^(AW?1J;JYyg^ItdLJN|6$#3t+OYT)v({jY%%}c<=kK-qtH_6UAJJ`MOJ*)kZ_elF_~2xT~#YG^##-%W`#f9S4Bi_Qp3T zHdS-bZF}1Q-(E2%q_kSj@L>anG41YpR${Wh#LS4>WtZ~y=0-l5oi1N_VEy9m5;uw6 z6Z!IZHk8@OE)&2F8c%5mH5qG%=<6x?y?%Ijx*MTlzPn$8t6VMqX@9YRZf<@)$}X%K zI=qh625m*qY4r&B_3PIzfEtxuRhygcwM!ClI?6XY`MLt-8fSXRh zfF6UbXM6R_HHpuXpkKs^~$O- zpB=hGiqP=K+AkarjP8uwb|+m|Yn6M9{zd##alAN|u&`@2wImt5@**HVCm#@KRUMK0)5`}hb{yPi8~ zHXFh>G{(K|a2+)rTm5ENb#h{}KT*QL>wcB8Xs((?x8OA9AFQ-@YVdFzfAx!(Usrdz zl7S&2nK2RIxe$_-#V%0VfqqL*Pk)6h{f!uYIDt#4 z$6-Yj;W)MX!Y+L@y(RKV5Qo)rCbe=B!#z#o{%qN^jZHK6v7Xg z6ml1{Kl^6YkibQnH7|1{jmoSH>f2`-a`g-4{Od>S{rmJ^9bsZ)QxP_UnaJ1|61jUL z=1}e)HE>XgH(4d5C+_9LKM4_1!Y6$WR0XSBUF3wfRSV>VuTrS~dIJ6?C&brbQ`Sb6 znPxvX53l+>H5^+ET6;PmWH{-5JrX(swf}as0^)BA!TF&|7L;b>@@%?XXCFL-cWJ2OJT;oZh8l&=W+HCbtdtJ%7aQX>}}mD9u4N;%6A z?0I_EcnK;v{DP>hmuK~KFm6fXgNrNF$M1{I)K+|%?m&f0GyZ$0@$xm20>c7kyC%~~ zW5uBUkEZHQhx0-yK9Qp&=C#^(gP)K+Htm3ng(K~VTYt~wq*BTKX`fGJIP^Z(6j5U( z$K1IF8Szo-NWV}I(Jw^0{AURi*$vnE;76I0S~DPKXfvg!PF6A5xA(729S>0-@a_5F zxGRnxeJk-vFw1r~j!L7-60EUnOcD`Cy%R80gU$R!y2LqQoqk8$Cc0p9;NK$D$Bm30GMKs5X zsyd@7T+y#?&QHeVY?Jx)bOpl#((-g$xb1v~ImM5F$gaafFOo()wF>pE2l(fU+aHss z)IE&mM6zJU^_>@*a6T%x8Idxw|7$dvsDY>v6V&B-)vY1=H_XbHhyn|0=~`e7YGv8k>t) zjmjo^7}kwJnb}U$sYd>8fc@2S;3ukuZ3s1FotxH99{BnShm+`JrsRG1B-CyVCeK{I zaVdhXd8u^i-jH$mDz%9%&%$veHFP3JN~+1(DwDT~eW>p=%e~-}Ut`6*4gl04>^)~t zV=XU_3gF|0{F0GYDsqzkf;e5+P+;sSVCc+azn#(u*@$@9I_nS$+;n_|gwo!z@JV4C zt5+@rlK!RIqI6oUYRNHSzCe65uUMl>K8*+X)m4Q?+a)1G{~uKMmOpRmJX*aDncpzz zO4Fa8Pt#x)$Q;B0w@b`lTxO2?aN-c6ouGw0xG|KWI+4{iVihLOW#gGphBlq50 z?i(h3@GMNIRVQ4mmy!N79Izl7jzbb}K9w&@A%~X%pk*k1d9`P>P;JW6KR6h&KUF|> zPr2iC^$UR|ZTSx9geET93ZxANIOwAuP6;0cmp!cby|FBUCE)R8qMy{eMb{p4^K)3Q zC`H_Z;ZfL->NJD@@E#-K-~}IG0XlT|Xq2{Ol;~BBjhKHDkpIvzg5T}B1hcCuLfB(Q z=0oZal_UW~R4M>kNPm7N*g+F6NG9QC0d#l2)Z11U#9zo!?R99!6tMr43F&~qRlQ8F zEh8W_Zg918y(dK8#)k0_RX}%UhTDyt8RB?26S~}d88%H--xwFGgt+onKpoGb9#SU5 zoKXJJXZMMD1rFm2=fYJ@UEcS|`tQB8)3?fGQ|I+H4Lw!)kwco?E|Zd`%dD2>_u0Q7 z8uWz`UnjAd+?-^X)dcpvX;{pWqTu#0;VaRt5rl&*WvdiHlv!ZxM0x3X0;;~&)M#%L zH35*k1Mae_Sm1am!xbgT7e#ew++)~yOB563D08meKzRRQ`51?Z^{KxG)qlT@9kkdL7<4?JFR}w z@|&Tz6ZuT9cL4*=XjM0U`jr8g9>D6GNYPL- zB1#Mxh*l1iQbh!6j=JZd$b=sR@fNo?veFf@drR6?@&$-5luT}DNaNCldQpyUsnIFpb)VeeUN8y)k2H9-6Z=Ixtp>kdEH&9| z4TR-~dOjY*^@d9_06kTZOsiL+sH6Ip^Ctr-sXw)C+6bRrWC6NsqF^#l zgfZiTe2o*GGm}W|*LlLftEF8|&D5~gjKuvgx8H0z6(S=^TpX~0oaA9-2%ggWvAOej z!;|#2)1!HJb@0by;T%Z}rs7`aKP(LIFYUPLMBG{pnWCYs)T=tED(rJ1&wgLtKMP2o zZt`{kuVHu4bJ@FujnOzd8l6@ww$Q}2yJ!kI({=xGX4J?$XvysN#QqCanIrw6RZ1!kz62A;K6DwBJ4!Y$bfV0->;sVDXK@XyG9La8 zdAN&ga@R?GaWcNqhk=b<@GMkxj`2$@fYwpKORskosr2-`0U4V+1zUL1^m|?o5~n@BaKf805u%e(T2!2OfI25Rk<7kd zuDB<ZtEh9Ge7keGVRuhkCwlS6 zkO>zFZ|)d9usaU?AT_VcB5okw#}T&Y4@`n!Jm!{_K)F7g*5wnsl9`?Yi?7YS(@6*5 zyNlk*h~*eMdXQJegvdh&X{wnlJMF^5xrDl1B0-36=RDHZD=hK!d}m$z`Ba zl_|Z}b%=!Kb%Y%QH{sG^}hT`}`6Y2Zx^dP&jo4 zd6r{OTd#x^rM^{S=T6kqsP}*cku>%`*-z7@QG6pxc_d<#h6@5V_Ta6MH8eMuqKRk7 zo-`gA2Y3q$0JuL^$3f1-0i+MXT10xS&31#@BPo43R!iLbFJkGmM0K{|0hN?l-1j-a zkDKdxc-47{Zp)Waou*RRSo3Dj+cSFREJB2_Hw+3%akRSPK%D&R#8(!mVfke-w4 z3&+QtyRn!eYR+9@y_NF;H9ti@I{2BvTLLzCV>w?f^5K=U1s3VR5P-s@n(Ufdr8Hyb zoX2K9JK%;4$C~n4{V?n|m5&3AE4XT~Y2b1mWCZ;9Zd_0$PWpA=Oj+=TJyby!{P6OM&{>ZV zoPjPCatDjFQh(m_fU5&@t+u$N2fj4dUd3JN9;2+d5$+$D%N!kxQx9JmTeRV7AZ*Kk zj{|U;IkV9_WTv+^gy`a;d|~8{0gZ3xNDG^Vf+TXPilJX@1*J`O1pYG;3 zj}Rd;H8u5zxJiOhnOfO#cXb<|Fm{C6tBCQ=Rb$gGx2>n_00GlGioCGuk8Apl`?|>5 z7V>QbK%JBT{z6YqO5+bD?08xQ?NYT8O${VSk;)M7VCyte`J)ox7iuRaCDq=b^AnX* z24vkSaeKNqI$DF7G<_LOdgHd7H&sM=Ipbgol~6ODlHkgV`-@vsR;1nO0Kk=($s5(l zX46m7Lx$jTTEJc&EX9VWa*EAbFK3K*-G$0=YW2EE`VdbdEi3@XwW7>6(7XL3wwh&1 zL3=&n%=N>71UzqXgIF_KK^TS&g-!7cVv*+N{@DW^ zspuP}C#nhzsjG9URbWZ*yuvp?I3-^FJ>1!B(swMoc~5NXIhosWpLr7-k=_DCLBX7$ zf)>)tYZ1Lcwv1o1lS69F43YuYA}_XlyVq=i$S9t^J|&|%frtC}QJHQt!0Hbr1rz3H3;@{QhzYeJW@o8iNyu)*_)Q@?12r1L1i9e>L`yo$ueCNdzVn( z>A99WZq=bl7{~{M%F%G^z`(AL%A%X1QT|`O$zPrwmFi8;L#&;`3Q>>wRmvla^~YSS zh9bJOUQO~mLx$XI2lyfD@p$BMd2}dhPAzJIffjmQz8!$=eJ3&7Jw@z4s``{_#kkQIhYI#t%X# zD?4jF`G5Xq5TOrdMDvd$O8XJk&kN(v|8yCkK5k_!JBETgUVO6*T*ugLH4FWpzj zj6*S#`b-WtDEEuZYCX-ime~j{F4FS08C^q-bAi3awjht~4Er{HZ&>Afzc`ixXT-qM zhwB_du0#uwf44b4w6y~iI|Y5to~8%ej_DxdbW@b2Mv$D}v#UJV+jGxc-jC{kds+TP z#NE!$&i>9$<|8rLRTA9>x36hDUXpC)suZ}m2XJ21oIHP;mTuyYMWNY|&hr{K7A)NP zd1%|1{B!o%=m+C`UtgnPWnOg&PP}=J@-^smv$&XUV1k`Yrgr#qrS)tkyiD!CUE7K` z&+DOKY1W+LtpwMb1iC9V)>FC3OTSYBkkzLhjXrgB_BgC}n>J{cYGdyM9Lp0J zJEPVstvRJSP>MdJ=O=lehg*ZsJwNgTV$>GVW;?Ba^maX=-qq&fw?#)qfGvF+G0?YB zx-DK1!dY|)f;b6!$W0)lS5;SLvOlFR^fai7T$%{1+^L;7+JBHNK|z^Z&YS3vjIaK{ zznMapV`ny=_LPth(=ou%Q^9zW5bvx7;+?e=Ljn z#}53{X7U-OX!iltiP7fxyvz$BQ^XmGJ!;(*D>U%Z^E3IPd1cfmG`Ix;#a)(8+^YYm@m4uBkRX zhQXMD;It2(qW0VLQHfyHVr?M+rju;;Y-=+C1>z|VMDa4ekv#h*n-}fa3l$L-9?KnG z*xMYKT<1J2P#d+Tvfq}j)N*m*e7N0lbNvO>8fWmh+6_H8nyk#bU=<7fZ6-c6d0#nK zaxPi|xyPkuS1EkkE0`GYgOJ%_-Mx^XNo# zyX@A|;n1ekX2)gQ%Ycd`e)81U9RWSSiNJwwdUDqq3{5pC5M-@R z_L;HzJFh#+Sci~U@Y92rnDqR8;i=ij_Yh&BXHfA1Vfkfm!e>fttu6Tjvq+RcSd7(R znSiRdqixzg`^FCmJ4P^TjdA3rZI@~6-nIO9)!;X&nVH!oF6nS z!u2}MbE*w`9rMA{t;RGWKU8LI*KI`Eq|_#+rJz%z`R0?Qr3@}daYlPPzhrDko@S`7 zepT7ei{KB;X1~wjznquO-kuMu!)7h#d()pDVK!rvC8=UI3D6%<8i)U? z{&nrjEPw)SSzZ`Qjw?|o^Ml45V$vm0L7nvKO5dy476~~YEk|$IxThaO#lGUqMC&F~Ic&;cXZ z7f5tc`5_o(^@2J&I*7kpzoFA$4Fm!MbnZY6Z_3p%AL$4gZiyDOjx+sMxzRzQP^&L> zx%F}i3tr{#Gk1eFwwG5^9hBbEvN9Bo-&9~A_CWE}1!_L~U}Oiy`%z~$jWb_m+;;N} zq?QXgoIVFlHQ#bDquOk&B%1=s!2K(sFX53s0eFiX#z!7NQv?N9a1f-{QfoX6yJ}#Z z328W;!*9O!fVS@TsEOc0CR)_)cDd!A71TkT81i$4&s#E%RshHXpr!NYXNH63HeS-* zdUENYjV=bVJg>Ey79@x$h-u&NRsT~oPy7sa8S)N8gD8I6_0DvrSH@^$RV`*xS@FPG zZv8U_R!=bu2t5(8txtpT#|1))q^fOh$mPofe8j(Rmp@6ozg>!l!Q$QY1w@}@OU1`| zG<#AKYr)~a_mVW6crR@{3L!Z_8ZEI|^EI0wprN6m*2-noskZ?flc88CK1W7tdnn}T zo!&M5{x(@pOq<`ch!{|l+{UiB=lw-?a2rJQb??`x$xAyid*E9Ky~vhh@Bo z5A=W>?><&9A|O{|RLCSTRFVf{sL1l}Ealt6i)l1}bx^Colv0E{)go48p7LLbNT5I3F6jLy1dffVy6(D+f z`RaMhN`EZ!Vkrin9td!2DF{i#!eghwLeCH|?0DnbVLYKUYGn$urO;@{K~Ow{J1XBZ zl)G<9Z1-OXcwG2bycU#9<3{DuKV+@s4rlK$=uLQgt%#X+y##D&7x)XG@!)HK+55L$ zb+QF_6?+o`X}H%shk0ozBV@#?^`V7XDxczZ#VwmF(qL~B*Tm_5okiw#PG!5AMr;qK z=at*}nx{kxa#+W|Ifp0MaCnlNWXI@!xtV=e$pBz`s-IVHFKbhk7el2Sif;)apVrgjqfe?E2Yq4 zpSh|7Q2Na(q^-NJb8E(OQscD|0vO?M+vz3@miTc-!Q1g0JZp;aIiq+PZJ4zFjatGW4fd$e503{(Iq zye)tXc@M~ddE=uLY~|b^YRpQj8A4)v%S-nPUPKD-_5Wi2;=u0UF{7%yMR_gqVzvtT zMYhLCLC}T7R^}D5ptpu{L)fhJ~?2Fwt7CDhaCr-;sWm?r>4oq?mTxfVmEIF`f)QaGGvGg@8M z!(|@_aCA)`=C`IQ9gXKJ3{coC)YYuCszliU8Y5x=cHJ+IHjU(fbJb?Al216@Er!gV z+>wyV!s4;8;@jRa1I~>-U!uB6XpsHxL;>%qh4*C-YbO9So@J%OJ@$YAomg%`=x_PV z=IBn_T>^vP((3jQ(h8(4tq^)mpc1Qtu|@j5GGc>?EPbGPh!T5e%L$d+Pj)KA-Q`i~ zHw-%o3v-Es@y=)~<)b0i{mH`0o?i1UVtn|jEKFY?*(@^g`T{~RryVKKs+})>N;Ftm zTT@g$*s8YX%CzN9AtRgdjr`i#P0-X)dn+1_CwP0l2es+#2>jABI~xIj^uH@wT%;Zn z2kBz7JA4PP`NjhU@|2;^nUx2pRz9QWT{u#yg##Q{(zUgr=D$IweoyFdquvFV>32O3@dzEsi*oo$5m#uJ&FenWua}-9Cv#_zu z-DL>8K(DT?AZ}XV;A6$2Gom}TQ1(;#mj)?NVoLC&iASTL{pZnzN0$ILT)(@74l|*V zm1=4|U9LX$QG4fvqI88;+F8h+6OF1iFtLqstguE6 zWr?BWkV&bIWm8QSNbi*iH}i|R-N?JE#$9)jHRKV3Fe)&NN5{wB`3Zj!@$@!|FJ0OL zGMKEOWeaNEW~_jK0EMMSBq~bIgcMuDvmYl8cqlV5+pdm-7UB~gy7Oh@Zi$H-7UB$ zxJz&g?vUVajk~+M_gA@dXXf7dXWoCUTCCO3O;=Z+dY*Ik*?S)`gQNPm$EW)f(iYEs z+BK!K{)1@gM{idYWMs-Wwq;jNPOQIFKlhxRon;3`v}W-)q?rTG;T4MqIrpya?x3_r z7U*-0DhR!a7a68kXUZ+n5Nbv_cf7ej9;yaUTQ$1w zW5;25FYk;ukgJxJK<~R$S0EL&;+M(76v7)DNPnMJi9_9iN(9 zP)BX|=5H95gE1RDIsnsgzpW8H2Irw)9vq!RRs;{%H)9x=qj_(Qwm@_lZSSB#?{kTT z=zYBd9sAG1An?T@|MUV#AnvABt1eJx)RW~g%v9FydV^8}o{R;doMZm9-`exOS-FZK z4^qwvyo@Vz`73!%*bft-Zal{N_2grwrN zO|;&U?;#YjYB~@f$D}tweXjJ9+u>7C<%jcad1_)}J+$a=U&CMAaR&n{{IZdIk;;{l zpX$}oQc2`5M1BsNs3V4E{-5$_iEmup4)kJ=Kt;6jt zn`Sk0;sOaCGyzdXn@cM=7_J{wD?GP zH&qBbjri68Y`@&2klt(f8tu6XOB^o5G~`(!a<$iDhQ$fcK1;Olrpv3gnkWcC*rLN{ z6ds)5)E?1bm_4z_8NT5x2r)=n|2lCxgb> z?OzcZE460owRwTc)B!D%mr^(mM;G=gDNR8^x$OmR9V}nga9d!Hp$?Wt+S+7^?ZP{|LQ*!UDeEX@1UL55^_VA=hoL zB+tYbtCvF_;MxY-pj=>1mVOfgS)i<%5?-%di{fy2dVu43JO%~?neW%8RlBTyUbm8R zYf08p#pAN_`*7!=olZ^dquj5gG+jLHOqQ|^r=i-WD}YvDE<%8G(^E8gaWiH}2dYK# zyly*+6_s5q!9GpeHy%(MjUksTl=@a)XuBTBih8k82)Y2~ysY68Iv>xH`=`$V<7k53 z5a!L3wdQEmF>O#q1|h)SjE5o_$(R-f3e#Je>>ue5tj z8D@6W3}<)MFO5ZC5TxIH0w}?$t{Z^2Bsg|~5nJN=`>U1fS$vqB- zy$#ygsR|H$j2z_Rl&;6x%KM#y z5NreWo7r}m&P0hhh$YRLL$liD)hR!qVf7Y zl>6Iud7FIvbow!z5e)mp?b$%%$qyU!^6FD33Qo?c31FtKW`#jq<4Aei6RJ+RT4(^! z;DrFGU|&%anZV}(wV^(R=FB&Qg3?pAB>G1S4N|5j$iI=jHMsmQChxLVX95Ry$8*V_ zC}2k3cu&|XpsHBfZx}%1 zQVr$$ZU`S1ira4R7tI*S66_Ph$55->v+)JJ-DX^~A0{#nYAtifWw z*?9KhkEpIrp@KKlr1DbpSyhdJSXX9>)r zcK8G((&&NOQiYZ-T`^0}0SFB6QPY_luhf?d@=Dg5EA) z@5ei6W@J~yeC=^2AfXLLN?b0Q$74>MCx$2H#GHk5CD!IP3r8fzfrp-|l!LrenD%2o zM>edFe%0T!9f znj|6bECO)%#qxx^FWWN<4O&B|of!!MA(WRKgFdGHvkSEzgnN_L6vxhj&aGbfoKK9b zhleD=NIJ~{d8 z^kPdR($V@b(7PwS*1RlKOAA~J+aSKBiPp=YsuKS7W|!48*z1tbLA57p2*y{0RTRaGeAD1axcVP0&}(Rsj4Tf`vvo*fUn*iqCQKdlOkqbLQdl)zZFq(6Mpi8PR(j&tT+zD)Es?9MpD_uw}7kH4;kUHz$iA=2A0fy)UU50RkWtDf%w6JBiIJhtpEC(D39omCrp?tz1(C z061eVwK%Q6hv5t>KabIgc+u-pq>*c5GjnDvvq7hD-(-4?;>O_jeAd^$k~{NgBZRy% z?Zw6*mi_&FgMA%Rc(HaN*dA)9n$ z*LIgkKxzYX-XqQWNrT<${>2BQ0F}xqLP3w%qhJbsexhY?ASB>irM6p*H%%V*>-#7? z(kMxuD@35hW2rgJV%g-l&xw1}^W4b;dZyCsp-r$;pvwL1YM*Loq9-OtvZhg@c%6l( z{+o;|P6AC5Y20wC$EVrK<;`jQWwA7g_@ANyp<{_G>qb-ExNCwN?ok6*hbfzw3%vA% zav6egSI6^mVc5e7mISH2v+Qx@LmA#rF#uomJwPsr1*N&WXvaL>2n{3k`FeMS;p8;f zo5o}%%)LU?Q~Aj%cx^>%CCbEOw~;9wN8cMffz6nb#1H$lrb98lK2@$RdA0hJKb>`^ z#l$h0#WVB++!6d?hOk$He>G`Nl3ZP>Sjg7wx z-hGYL4@|>Z@7wj{m+IUg`_XQNF0FZ)_M6Og%|0yl_6|6d~>81?-oE=E24pcD)VvonoBff>9r9X zWsZ;M4j8wA@-JtfyXN{87b9uXG58Gu@s+-pz=miMhe!6_e_e`BwS*?6rMbn}q{i96 zV(JwJwbGJDfY}(CCyCC7-XL6amxX?VKq(a6jdsuyHpZ)B15ovqxfNgfQKD()#pR{y zi@E;L-N?hk!%12Ya=y$I-hO)G?N>yFivFaN)U>n^wvmd%Hs}-md^i+nsIWA(0b-SY zxgynas-cBNaDf;sENpKkXPFI#NCOH=VL@{5!duYlK_r37_L{Q1)8@Xul~CaNsY3@a z!#QR;#s8q*#;M`{`Z&xy{ks3sV)6pQI}rErK^?R}?7?3~)*Td9m*C7$JMKI-cXiZq zUm3$jXP3F?EYOy)-(Nl5?VmvV7>87}@l)C>mJu{pAJ*qc`N?*pfaPMv_vsGbdFyl} zO+bpz`72ME46Wg8>VADd2-eZ zzx8Z5%=CYvR!ILE#!tw#+(z?CK^TXK=u{($uBJX@I8A`al9(-Tmplbfa$9{gtfxx= z;)yejLGh=&p%e9ba++j46c(cQ06c9045MjVSn?hxl z)+OTryNGk2I{fSpYh`^|ckT~78D|J-%>{`(JkIOyHLEs4^H6k5nZVfuK~a6x6GSUH zBI9F2vzfWujdaGp03~?c7XY97I#^rGu(W;U$Vw{6;ieT%%Pz>O=Q{ z4c5TFR^WdY3I7iM=$~+OY7+{Ng|f(6Et(ujW07pnj%F%kh&)R*?|jHmel*!_77Yrj zRf@lQjewLHy@JYu@tsYl%}ea6n7UYeJh^VoC+(6A5FWod<;O|_jMc=yoVZ)~RH@}tpw3RV_V2Prfi_qVr_ z8eBDJ*US4|(|ruMgVS}#&th(E#bVtriV_Q}-J^~>F$X1ft|<{WF{e{sohImYLpEg$ zuD+uXzgIizGl!V;B7G&8QI~;LE%mC5>Td7)`$7U$sgb7(TRiJyIK{f4X)KAEBO9&ZyzfRp(K zhq`OX@=0U<2DwJ!sD$eJw4X1SHRXSk2Yxe6nSVu1D8G@j;-v0bE zfl-~sWrhit=hZ<{uZ4P8G8b4HgX+Pcw!Go}=3Cc070`3n2s{o}uS#zCo0<^iKz?%%f{bvH4>Ts~d5>0ZdgrrNI3x({`AC(dV}qxMYu zyl6$r*WIev4@u$yv~LQ4%q<^qTj(=fy^CU01yDVvyemU)qKr2<=~wZ`QOdc}(!{!^ z%O1C9cuolenrdUbNd-4Emh|dl8HlD-4(NT|+@F9N=#brF!e+>j52!+r-=2JHye5-) z9Y&j_HQ!||D(yb|U&Ti>IMpqa;JC5mi+m1u3ZipSr$Tz9$8>8V^X%kSck35~sJN`WS!dwF&wUNh=8{g3$*{ zi3a=JaSzxQw_+lLJ#~fNqhZF|4~|fj+2u)QdmS~&$9%!b;nNn9Y*gyJA@G@P`KPBF zL9&B4|C59xoQi0J&BAoV0q!+db4>!23ai3Yl!kclu*1n5I>UMoZI}-7t^ycA7yX9*v z3A-`0dHAtjHkln@uz8xVcRP{^7vovZxB5qBaMSw#m>K`^mN=#1(ROsJENy;++vCXa zeH1%EsMp)ksK7V)WPXScrTD?5LIA9=Xgc+ZeOY>!c$M>cV1$4mfiBK#i-fDLh!vva zi1xYrH*NN8_C|=2J~!(0^rNOGjocYvuQ#-@Ar8oJ;;Vw5=*kBAK=}or9+ZjFeR%v1 z!jsrZf{Oxv`E*{(nUX1cKGRt?CVu17lB7E@ztw~I+KNK1OpVC_oIanC zB(}VeeKbcmz2WZO=MB=r*#xLi%D2zMR-)gUXhjgXrnhLOP%TX~9_vYyu_dyf(_tNRI!yFT^aM?>4vGu2BG;rZj5Xe_@iGb~Sx_ zzg4+hBiNQS^pLRcz1-`i?k=AfT_xBXv*gg~XV#={V$p^1tBhP2$-5&p=PoJ00A|hz9 zlBbWF55-_OL8@cN$a0~f-(a#s%n&CZR)Fv1a3X03l zVPHYSx~cUGp5v z*QDw^Z1H&LyeH!WXrsY6+Za(&t<31tT$Xr%ie9`Qw!zh-m03Fanbbq3$0JN%_j^g& z&n4e(lBh-?=ND&K$6?CmFEJ<-V!qo?0V;ckGRk3CKunh={NY0|!ozufwK*ht!6#pm z1BIV;RwKvv#nyrNiOT1^b7UkW6@P4wz)(jlsQgS%PZ0OYkoM|hg~;c-(_=B$K-pXu zclWT2>(7FFE;U!zz$kaz4~g>H{@9GkV}0N93sm==SV;~}vK}iB1A9OBB<-c9vMT2f zFK)y(55zOYKTqyI?Ytm>cp1zI)*gC9cB^H8wIU~7u7_n{pXX7g8(+%cv?lmSf zzZY6>Kc(;`+Y&KfcSO0`81&PmWM@~Y?QyWSuncRg$FQ-rjVY(>5B}{PgUykl5F)I? zbe#V<`LrIl6<_e>U-Xhca;)eNu=0}MDWI8(Lphe({7ohTbpJzf@f*D*IfCPMi6GwU z&xd_FtuG`rfa+5X|G>rx@EooCLw;!9!$T76ITaQw`0G7GC)t-z= zxx1@dU8eKcN;Z?>_&2#RY^|z=${HFGllHRrA(JE(JKv45!iJ0zq88(;B<$V~d{G|s z6tF!hM!)Il8Q9N*fz~h1&GD*TzXOaDTwr)T-?JD!$+#rEl!X0va`=0nx1n;@CG#@F z#HT0Z0Z-)oCf@)3GyfHb_PxPbdG^E8-5C;sLA`Ud=pHNNEokS+SpG85@o2&q(7xm% z;xP3y1Yps{<^%0|FNeIQ#48M_X{3NC$?oeNZq~SbVX^;U|DII95Y?LR>}nnEIu~Q# zzoR_JeSix&14or1)_vEWlcNIjI5))Qw0w@*Fn8(NPKq_x_m{YH!~7qe$v?q~Y($_9 z2N1x*BriD2XqCVJ@Gz_EZsp8-?DV3z0KV42S36{=H>ShCm56`&z`_Iwsq!(&x~+&4 z1cfGjQ5jy&^0w+{CRA1g)<+UO3dg`*%=;hL<6kF( zp7jj=DMH&ZUbMY^GDpaH8%qb<*T-DflJw0rOSddjS(&mw%Ef7rlky5I6G6 zba;a+F1_hD9-#n((d~4NGLBBwZ?48tYHDiA?*6y_CXx_<3Aqz38r0R<(C+TxM~RE4 zMkm2s1!ghr6Ad7(%9@(E`GuxyAE$!_@@tKTuk@aa^}Z$701>ErP7a63Rq@n7qR=>u zDi&xI&IUsN3?5tBPv*wPSPAR;e;A7BiLdO0RI!`>dVPi=l5zFC)yqYbZilPg#~prIYIcBFUPiq=FLyPVr}dJK=!sk zzKFkM|I_N~>O`)VwcFJJPs4P{d#&2T%vTushX0_k%yi+%b5m*d=LI|qkw?3?Y)L%GG)L%H8dKGfs(E*W+$SV}wB^DV|2 zD@YQzVnrTz!LE}y%{y5elXoM;JC{4;{VN}$(DX3}XTOW>i` zuPY-gw9Yu*a9b6HGk*CKuzBc3@`Jy&PUu<6^s=-o){Xkj7p^oNcn`ROX9EGK48WGX zfHae%W2Fyd3W)!hR8)<4N>=tn3B>=9Gy+%ch5&{anC9g%^2a(KT>v*%_w-)iX`kyj z+CK909xwC%k~jYA*8j^@`)9b51N>)gm*3V1t*sXivxsy$jo*>d|MW(n?FdWGjYen& zh1!>CZ#;U%Gou{r&*xLiJzR1nzq5)>rTVy=&u<^SSh1eJ^Yd4S!_|RMER&9AZU~W} zhd4lWR-9%t9Ts=&@<)WHc7oP^n^P-E6ih-eW!o_K2G?_`%)2}S+*j6_a>?uAi9Abn zfXNw@cvfGVXizV3dJsk)_$GUmyn8&mYhZ)DTcB+}PadlT<;$Nkc3?-@VPIsSEf-!Lo+w#kSNPnocTA(S3ZC3WFX$5A-Ul^gHwz~2cN4>?-X-DFw=a-TafS!4 zntB_zZ3&WeLL6uwWe?t~1qG$ljn2gjMSzQJ27(?#6dL)Sy(ipx^Y*Ph z{C^#f?-f8vy7EItT4XxeF?yiK> zT;|%#C&4yD6pZz)A@_F{o~G@c1#@kLS4y>OpN zSJce0V+~gn4mvuSKRO~7oiOz2{=>@)TX;dWbcrz@XC_?XdSl2O%{_3-1rX#rmlFX? zvU^2FF}vj*!E3`Nt!AeG~{V1>etb5#Xy=)U1&93Bk>s~*0ZC+X?@>1kU^H9?)vF=Q%4Lbvf1e-6nT4 z+#$6GN^=p5r*{eLy3p7#g6Zk$qetdGq3N4?XzRhFDS^k^>FYOT#|bU1{nMpq;rl6H zmY`-2B>wv;4rSI~T%ex}ElWLi`%Sf%zuSBA2$RCC-r+5+NbNpFzVl$adZPF?etSww zIh}D#)^)5$MwSEhdN$2v+a`$LicOifxfOTzwa32>)8OJ>0sr(~!RkI%x!y)Z8ZZZn zAYzLF3TCnUYvTCX3qhyB2yg2wfRj0TS2Iv(ygyuR*h6G7^Mk3y>+!wpZc|+A;Z%s9 z#5-bmcx-?Z`ta~*KDp<(XGK>ZpOaLzH3rZM`fB_T89)B`Vzt~VX}|qI#RgNR1?7sP z(@3o}9g+6Ddz1w_VT$)orAETbC}^K=0FL#=$ruKnpa;WHGKa*Gb9-lD^`|9=q}kC~ zo_qvU3R|nEiB`imcx-MoSoE5S(y=t}qcZqaqh9=><_Fe|`rkq?&Cp)Ah~>S`P2G3c zKqBWm!fNEiMxE#eolK%O?4C5I1!+^;3eTl?E?rsk z^C}K?%sN8c$q-H=_!qvCt?RL&-Sk+pV0~+w!a#ngYXHpnzte(D$A70bYRz~Y3lpTJ z5rUbY9{9M4QeHd&%wf^gG3I{~Ajir90%W5z6tHw}`vP!ygyZPq^P64mL0$bvb`Ntk z76tdKB%Qbr>al439ODyG1p$7CUWLjQ)qy-fHYHv<=McYtxjzXQ;U@RV2GGYdepfQ2 z8ZG~pH^AVd!&{fnV9@x9nx)2eiNB$*)XlR2S%G$;RR_#NXgh!{S0L7NRM}d9@Qi@p z#z(u``_JO09vjs=V%<6o;VBIKF&yApcb5NbmY_E_Y17Le{>E2}lLXCs}Rb@UoCpS@HS#=}8eSrM0g0s`#$G0el2hULu6!q zf33ZE8yU$0uRwR-&h}@qW(em%MSddWL~-%kjpzgpj_Q$B-2V8ta&=!4<>=n~Y8a-q zuNZMXs8+>>@yJRnw5e(T2a9$P66Yte!27rF7L0p+R^Jf>HsR17$!FzG+zvNv$}NAF zN)}xO57^)2HXL8xw_PJ!o^23_;k`nA_WX~-SAo=r`At#|PI`}!y=BQ}2(`#t1fOUB z{SbGCIbLeX(I@X#@`F7sqzIZ9u;1eU%|)#+2q3pKC+mcygd6u!z*g`NCh4LUFykBt z^nIn8G{qf{pX27^!w*3~Mvi{w`v!LDt~sZkcZ}xe7gU$~sUQI}%_wEGNe#G{FUKRa zoM|14FfoO67YYP*2APvFY@%P_(8q5^8;*H+CJO#OH4n_^w?70bg?>T{LNd|*I9cIX z(&*)FUSpR-DV2;h6w0!QX+}? zM7XRLzMBxpJFk6-0fs3wj|i~eK?h+`hSTC>kQ^89Sgb0 zt}(Jmt$pE~oTl^q+|+Bs==izR@p^0ouzH**y(Y1^)&Zp?&9ctKfw^c5 z1FJV4L{@k|^>Xh`)bbb)$1cThne1y{)=Pm*8D4`pKPwV9_OGY$+WWdWf${SerjQ;} znH%+TUwIE^Ng2MZSmCTF)fru<9xG4FB2^S*Eh}XS9XD53Puh$H9X4iYQ}*`gJwNl6 zMk$ydAFg+-X6S)+JjbgLCho2ddfR_k3lYg^~`UdUTSsE zxH=NbZiZmdMJG&y)F%0CZeS^mkDb=w6t^^6Wm)F>?B#yyvfxjYzNZCIs9)-~ohmnX zHR+($J#35^G^@~R^H?$vq&{qWsCqwrRaL1~VJXtiif!~dIeB%sdMW^*GMbZgioVu% z#U5a=I+m=L(ZJU+3hIO0cT3(Y1$f1ZzdS7XS53?nM_t>TFO?HUQo|ABQ?*HZPvG1uE}U_ zULLRSt17Uc$Bqq__?kbWt757tipN!?=YO`*U$$qxRGXr$ox0m!lY%+_E1kCne40f~ zhHJPtC^1py2$D``2ZkHL_Z0 z7Q>%C&p)u-49(p+8G}qDPRF-%;A-%m2X>L76~eX#&$o31MMVb%Nq(0nNc-zu?ejB% z!lrL2fGF01?f&FL+@6d)GdldJ2niI%aY4|cZI`5=+}2%>!d zk?5=5m@Z1?9tqR`E2KX~_#gnI8T~uH6ql;BVh&~S=)QuAf8;dUICj`Q2M&|&bwP*O=!mY8Jk1gGRWty2wcu<#cUgrOet zoNX4ILR9hf^n|eQ8z9|`e1#ul{G^RctrjE>N)<(MygTgC(WZQU8OGI1^Coe4^BfwY zWeye_(r6@gs>j7V3;T#%%G@L*5i+uCTM0%2-qKywdm_-a89>D zXGP)K`a1l2x7ls`2`1AJUcn=$d{D?}Q#q8tY;bzybi23-;Y?j^5S>M*)2X(3-k;8q zL+Z_OO~2N6VGg1tT{y=fO}{HCT^!|xd38-s#BO{CBb~+@ki35mkWL0`W@p}Co-54?X2n|6W+jJ+MtN^ zY<{x-q!zo&my8?sBv)s-)W}4FQXx1pnD(G0TGJhV1Zl!qb#rEWtSPsFSQbJ+ftD_S zLzNe5Ec3N041;i8u@hv%K!K(pok8{<(>HUbX1~t7@67uq-Bx*9WjO)C%vcag$ZOTB z+atS~+WN^lj8%b}TJkGLZ^Mn}9KWiLM(j_^CsPZ|*TJ)iv6x+1_QU#Q8l77t40 zs-%hei$iS8yJKTE4mQ5SN~gIYeYeLckH&X*lu0BJG?vW>Jlh)1;$Y)%(rYM#H3~r7 zT>sG?P-y#tdDB&{6O?!8W*7VsO|0+jE+jV(l=DO)w?IV*h(qLEVPdPRC+l#c-0x>( z7Jqsza^Fc~7m5NRB6Z!nWR9}ZPFeKi>y&05DOe-2+Ry?4!?E<>E>T$5q*%!&Zrefc ztS0+=fB`MWtD1lOGe+8nD!Y$McZps9g4rTsZLD1E`pG0e%k^TQM;4Ng=&4Yv77?ma zXJS10p8q@qhxe4#%>2+&lk+vCEm&aQVGrDkQ?Xbr)qynq6*bUM5=k)~L!#Q{?tqfl z`;^t4ltKEBU?!u39JJ>aQ#|A;5dGR_jN}z-x+XM;a`Eby$x%~C4?@0+i7(ZbB=3P1 zeu>BGk5yd42&mb8s|>Bva|ad0mPx;*_NefD87mmTHqa@u`?Qp+C0jYpA7EWM8GD<#Tmn;_016%2hSq&#P`KF>3;X=)i~ ztDn;Pz6`2zV_oX94(7yCUej^SX|o&nLei_C6I^~J-D5ey1o`gc$?@e%93ujTzI zN<5R+d*l9i-y7!8V~o7N#L-xc5BdHckz3%CZIPbX@D1tF7Uc-vtbm=JM9R~D-c14Cd!ue1 zjJk*IY-qe8+fBnl528u4-!u(TF6pv?^xk%z^KijF+Ule#&GW;F44T<&1&(mV1VeYF zkwQj`qQts)hH(LzJy7R@M>HI$;@R9y#59hyXLnwPost=ly~9{tp~21#`BdpL1~U;W zHaJ(+!wJGz&G^WQ0>`j*c$m{pCUc{Q#uXX@FM_5c(Rs1zW-Msk+^o_z9@J2ivai)l z_ax}_Ba0?p=Ogv=4(C@oc>J09YF#G`dd)(%djy1=Rdl)x#_7p@4U?UIU#a!; zb-o38o$86Ahg}v;bB3QNU?tw3rgp$@_YtCRsfSW-l)LBv3+2bgH(8;R0ex@K+L)m3 zFBZK|f>DV1Ze+g&GvbDmi>HJsf*mQL$DJUSv*Y25dn z1C%YTHPW1ghMpnrBLMYOzDM9{wcBKUWIa*8Yw-3?Zu=ytb6qdOsKuGTHI(v=oVfE? zvnCIlQA;t6H~APdTPRO9i#m!JlE`8>;Sz*Glnob#{k4bV&2L5G;{#+Qmcf-(mD8gW zp+A;|yhqwww8{A}%V8IyTxX?I_{rDrVeK-u(P1xpFM@z46r1Ve2YR(K#cAiGg*;kN z-gpw*_RJy}-2$@3*FjLteGAop7 z)+j%&!T+sfOe9}Hy%%Uf!c_3lXOugD)o1JIb4^)e>WTy}-6uPf-M$!SOeG>yCZH#a z%aPD=zCYi<$Nc0}wrujqFDhH*Pm1xE#QHCL!9No2Y;Io%0zox#J8A_zlG9=8cJfmc zr=4CY$|spPRyf4xFJcQUSP{DoJW<#BDpQAomt+&@(;<2C4|1=nI{6lF`l=>t3ZE(R z*UDwIe8HP2d@sQ3oiCah`e{_{n`;>Irx9;AmRJ{)s=6w5V_;hYr7vuVcA9O;iklk% zsh(=DA=>-h!+W&|jT3d5S5@(4H$fdkFW>Ul?(Qea$h@6xo3=8^*A<}{ZlTyXG)x0r zdo4frRnuZ`gA*k9mfFm#uxUrUDhzPF^K8RAAZ3du%pudg{0uwI z9+!>0lH&>Cw0_D%;_w^W$JVHNp$V;n1XI@|8e!%Oy}q&h8tA1(UE4r{?K+ZP5!Mz> zm+UM?jdF>f-etU+6ATCCbMQMZW!oc=!cW>hY`R7s3JBw0>vmKklcN3MK!hC8F7**# zOuPYoOQXvD4UvV^q)tR1M?z3E)eOvXca*>4x?oP~l8EG3R_w~j_z1$0{6BKp;76t0hh z2=>4X2n75t2s#aR5+Sekepob%JO)xcc81|c@jC5&zl(p@c{o=G+NB1jive+{@#*G^ z+rwzu!ousZH$oTR0X6TMuO5KB=Q))fS$KPQ_utKgPJ|KA}^g7h4XLh3C< z<2<2ov_8Fjd9)Q8Ss7FrLHEU68>J?hT+8IONt6$;lbW!66%cSe3-@}oglX}>I(w@8 zV%XyJh<$5^pbq+Wl7(M;ph9%?8V5;9w&e}V>E~Q)oVRbkCx?;@gh&JwLuW1KR1?9T z?vmIsA=EW;TFy$s!anFT5$W&JhSTlU+q+5#`W+y(ItOx0A6^kMH|QZkGK_+s$u^gj zYSgK|!lryEFKRe-Ky{yc`?9{A?3J^L-K0#mNo{7IwvDnznFD34ij)eUM?krTYi zkmOR)WOvwj=3`nIxuK=ilu&4xmmlovWCA*re{R(BVaBu3u-aULXNAJ0Zn z>vo9kC@-!}mrmh1(~-HAP>3PZo21XcrA5abUZq1!L-G*PItz znh#Xfuq=GMaDUt)#Im^M4x`;>(l*~2pG(4d6R0j=g||nB#sf>Rf%+g+qJFG9QJ^oz zQO!ks0vO9HCY0&KDjwh0E<*sxIjw5Zgu}^-h?DVMe9OtCnqyBSz9c|1&s_F~>gaG; zkEOoGX7~V%M$K;Z6k7|+mrV-Y8cxbts0R$bLx3KDL{AiB388B^*M^JJ4| z2R`)O;CNMK?YgQWx$ zS#h}QaDp2)#B0O|u3(_U3O*_Cjd+2bAKPlh7G_NIC&c()up!jobXZMJ0DlM{O1@4I z38!lRUVE@9FWWqUOf>T?Z%A8qpVLyk{rjG3KP|JbvTlxrYw}GG0cCg!k8!LKu57=_ zpoa85r1$!fd8dIkos1MM3ozb?jrzLh{n;!D=lq&*F{0WPvupW-kUw< znv~^V;n?`mZIJ9N;;6qB#C?vgKYxSv!hE zyR2k_LnOJhis;(Ih5U9Z=g;%0;@U-AXiYVyBj04=%T-O~`YDcki0AN&c6)Yi9_y+N zub=PD@ljAXUcDg`D@9rce^*_|L2bezw0^^_^l9Xc^G?eFRFZDK)tO0k?{;G`P;`)F~ z(l*P~^+a z9}~WRLqY&hSqGK^>F53DItHdYo#sw$?6U}ousFs4ff@e;_)tpp`J((-YfEU+-p+se zfr`{suA|tbKRS{s@+p8{&t1s?1-F=aB#jOKH~J9(bb|WwoHk$vZS&@^p9F;Az!Y(jf4!m);BY`F!G&zOj4TO(GcU zVXs!^z(S|m{H~lu{AMQGTt}=X!_Aq@8XI}83SJ1u)Ku*0z&r=p9MZ5?PHcxcka6#z z#`_k{E#$iCYu6%@EllC`8%rQZGJ9fI1ZC z1IsITMzGuFZ8AC~`;ztVP_1(5fJEgEk0y%jg-d0`%Zg{7MYn_=zU2!S9(4#u6T2%C z)cMGsA7D9khh1w0cTQ^^aXK@QYvSqlCG=GqkI`}LE3q1~98+8wqU4ZZrD3y2Ue!qf zk|k;m$aUdnl3}j?}g@;s5_BiEh5E^!obiE!VdImtf(#w^CJV@OO5A$O+@Wk2` z2Mqax1hJcd;6^76Racx9lQGq8W>upBm$WDouJll&*&v{E6}Y+XQ9GKt8%pXBIJ^2n zWUY$cN8m$*7`}tAEZOFM=#$H3psk6rMK5NCN-cnG5sNii+#G3uQKNH|^co#eVU`6C zq%kxV9?x(rUI}*6c|Y;9V>dkskre_{BAG5{Djn%>PY^H9x0wr=M&Mrl4Ls08e9m`& z9Xrf%5vBLoxO~&frrnS83RD@yZNIf?eUQDZofb7DlfFqvSvPv)wIasUXO(raUbT7r zGGk@5Cgo}ab)KEtO;6}@qsFA}K@KuM(%g4bUb@qwJ4p0@Bonbd2%aS&m7TWV3Vjs7 zjK{gs^}6;{ezaQiQV7$*i4C@;r6T9NZ5r&!Tv;+@U56;yfw3&?P$&)F6JLyi~ znJE53!;~mg-er8qU%wtYpzt9 zUx#-_jtZ>~a=JjSg1xD3r#HI%TkHl{f&&flYv{>?sU_}jB_}YL6SClXu2K_!5Q(V7cq~RNNL5oj zpj@|wbt8o;xk}h}E(5YNv_GvR~T zB-W~sjDN9Hn!l=<(fgG%<7qt4Ar!NM7A~M*2j&J*?yRRRjnF&y>*3S>=i8|p~X&m}7r~vtIQSxsH^<)y&Wsqoy*Kt=0f4cn6 zVk$hqPgoowIH-Z8;~uhGg`3wz0EKdb7Fe!mT2bH-C@V zpYLG=cgsOO8Ls87$6rHdnCtd-)ly|PcK0#Hi~DfI_Klg0*3An3enb8HQUR-SCR+W| z-YZ6DA!*a}1yzjzWs}UUhES!cPTFd^|3}$dK*h0U?ZSaTfDj-+fZz!p+}(n^y9NmE z?lc64Ai-!0Y-HA!cJBnbW8$1kiZH4h3p zkS@zYQYKY0f~&55wtVZUV#7hqsT^}G91gp8v2?mW(naNN2$sV9L1YFTcHGv@NCb>Q z;ds1KfU+&e`D9rh@W3*e%nhqLPQL%VU<-1 z6i6!_BN6^>E{sQbZ>_BG9cbvoMnfK6RH8T?!~O3N+uPeWFhaLClgq7pbDhbXgzxeR zLTmYqwjzPj_O#&d!jB|iOAO*CiVw{>LzdqvQ zCl;0dpsTB^(QJf&^t(DfcQiqe$NfoavGyc$b@hv&YlqVE9}XqjAHFk*lZe2-;lk&zOA!f66MKSt!*H4L`t0SO1D}Zig)>_MV_+>D(0Jds^Sadqf0yEnWtc5yj9X%O!B(HA0!B2bV zhR&Q$hw!QFw%@$=XGh1J<|jy*ZQ5RRR+E4qtof>eHY$;-q0LvRT+ZRYm*}vYUWdT7 z0p6sO<5_|I0QU8|bKXKJhRej5`W2Bbr!ju!Q5oKN~eEoA`uPNqJu;qM%FEli?lG{W060_Z<%RmwfQ~j^Wbk-GT z6@6jlAi_Tv$y;f7b{IIgGbMlppj=;LC6m)pNve1!|-1?LH(Va_922)^8y1!UZotRW6TKfWP$YVe^|j}R5Bn!~07J6k$57s``gClr2Dtwe(Elyg z2g;5zd@TmH+cN{ytc;5Et2?|gG@6)zk;r@HQjK_>=5yvLG=_9|2oReI07U}U&3J$# z)!<-NR(i73C>w}On1eYRGbv?wU<-1f{qw3!BY1e#g5*=% z$cL-}ZI%P1{iQ~g4XWWt${o6!fa2R1K7AifuS-x$v?_ypo_Iq`m+DFy9sz{<+~bLi zu|f2om-oMhg}{#yiu3z{^!ua96-RY+boSM~E_df6>^A#ET<4?Hm%A#{jZ7!9S>az< z1KqX(-uP??1qkfn0PY}-8but8p>3CkT#o^^T)XX^fm79zaF|d8*+92Cps^hx2E}Pu zhW1Db$D6(H*o9<_6qv5!Kn_QJz1nTK{n0tWTgxwAA}C4~8J zY2p7|75{j}qZ#IPu9&s$*~~zdNX7g`TEZw?#!QxIL^V-zT0CuHQ3up$3d?BjJ%_!K zYPeg~0MOn>N!-|&d?1yJoP&d7{G0#aT&S-4K(}LaQsy}l*Ree9RMesYd68q&tG;*+;MUX#&K)th;2HJM!&Y)GMt)~a)0v0SN! zguVd?Z7qG?@(ynsS65dlI9a3+pZ6~!kq@@(eoAF3$`T3mpA!NGA@YUVzvnw+ zKK^ry`!_zo|0r9w7(vt6#eWceD9>c?H~-P-QfH!&ZA0oxy=~Lv%)xzfiEZC$nN@Zw z-NMamxi6H&4zkk1L(GVLCi zR!VAqG2mGLE9cG)3Fxi0U;*lTguDe(Kh&^f=E?Qd@bK`dT4Pa4Es814tnL9w-Z$?y zez&{*D=gfle~=|4!e%RuYNzsbu4HlChq|yYH~a0Udv{jxmkB@ZuG{Z*nm7M)5@! zjAFD)*GxgQvUz48`_0Ga1c^!P?MioKTo*2#0oEi19N`mG`(4{p1|N!xXOMas%6&6S z{58rO`gqH}NgcvRU+Tv78)LR74IV*3CImhz&xC@~Umb{0Kf`dpar>q{RH$?m(`sD))1oAQbg??|1 z>P^Y@%LnsEE^7x~!q1O4{>0dbtmUl?#-QP+)ZnKu?1zW66+wV(_y9(@W^+3!yM|ae zxQ`^w#gZwRhzu@8j3tsgPhTSD4Dk=!V`LQvE6!D=czL={BveG3?ES)+x_(d*S` zM+()NcO^QN;USo|imo{l7oZI^HXDwo%0 z6F$J^9d38UufP^}jNJuoZ1sZV79SmtI}8^~DBuH^2jNlxFOpb<4w6!Cvu{$vzFBLOJyixa0oRV;MroN5EpP zl&o;k#Nstg8J_`iKF*sv4Er@*i$ozFB~(ad`3QL7jpq!`<_jdEDYaOrp&oZjs(w=c zMH0g(Y&R{lL5+GLalZVFD{k@qlRQ!x-|-!LLZLFC`V;cSAA}ZOP(P)P?jL*>RBHsN z$I$>w2cV!hUCMD%!Q?*uE}7T(69$!*cQ_tjNr&ZZiE^Ud&QR_^72)=^+BTJO-e1@{ z0BcOgHH6E4By|(gV-`E8kOA$g%w|V}3YJN4%pTz{*~j?gJ|k5q#T_=_TIY4aYB-$Y zGb%`fc9Ncp*_G~GywVg+Td$jA@q6advHLfN%k`sS!o?@c;c1qmQHRGMoj_-+f%s1% zT#4G>T+YOf$t@wet!J6j2Q?GK%hqe=!&Vpd%Z(8Der)ua4y~aWXMiiz&*C~^GpGc+ zgmRWt_w|m?;ow@EH`KoX;7Alt!{50papj@qHp@TZ#E`2xMO9w!9ClCTcuGq2-K4>- zFhMLH@z;PL_fdcM2>I$QtB3$cC>pm`ggtpb-MN0P=M*uE8AYC zJHCYX4WO(Yy9eF*zJT`=lD@HuzD6@Q~Z2qI&E9 z)Tc#-mV5*|?CZJ^`mBT_zQUFvUJ6ot8w)v6OVwY}T{b9Ue zx>iHM_4Z(@f~MMJ*{`=UtIl@g{Q!wP&>lC7p-`#xivx`#z+E7ceU;2<*z_^X&k?$X zdVa=QKNbkBZ%n#7VD-p8PD zF0~**Hr%ZIih8Hr=#>ma=mHo6vDwz=+nJ=Gk{lP?jr05SPva{@$mW!pIq^+k;XxHm zJi#WM`-}L!A{9!(osq^#fR1E(zqxi;!swUYdzGvdHcLcQ%N3ycV-$4{&Wt^*-YAvx6X3AAz1|v3_N9!a z%MtQMtS@%Yn~{igjN4I;5%vJ8AxfSHu0RMB?5}o~FVW5Da6bgQ&-LY+2UwSD=ZE{!l^8UDstae0%9xCirpf*S;H`BZ_f;r9Q>c>I?^Q`N z@tG}%ayBoBJ4W#vQSv?eJB=5opyxHW5)hbfmuWKh!Oc#Ht+@+lJgORJyk6(j7qqe{ zgnT(rzP%IHzV~wXRRtw+iQyj~K0Rng`ukIXm-)lPD`MYY%>`FdZvJv9cCbZ2{TUKe ztFdM0009$6T~K6B`-;j$J{Y1jv_a1jS*?r_U{WTbJMH&Y&)g8}g!=WX7>5hjTwsQvFJ6tzRh9yYu-pjB}B~9{>9k0nROA(}nO+X$Vg1BB{!ug&FGYzd}!!hER z_YlS%Q84X!1cpiq5?D8&)qexhzq6vysw?RwlxZXUD%$1n?)5cg-7pG`@@Kjpgo zcIb3e*7;21NhL+DC1&{@KN96f8;?+(r3ax?sZvX?`^ZQMYyr@sYK}DM@^B_@XREl& z?oT$>&mB4efoqASYs(g8PYI2tmuc*tY5Oz9)bTMvJUGaQv(h<}I-$eu_8CMl^gU(vW@HUz3P%#GFX8}%&DPq}Ysf+N0h-R!@+4!D(O+Z6~fB4<# zb7oMf1k+?`vzMW)AHn8zJC*LR8AgH3utecf{Y8ANDmQAHDcLft^o^R3ntpR*t)j8$ zM75cc(nBJJJT&R|-z^7x4ZB{_!8kV+#yte7i|$@YWpvo&U&UtLt^Q6aY8}wQK@vQevTVU zuB9fA9BInszS)cEZ2?w3u6kJl?MW!N7QId(EW_%!ifIFAB3%GktV1R zRS8r`aBYX8F>Rrn@jPO-OTjya!XT@y<;RS{8@--!W3>a#t{_u|Jm#TKi0&bH=A@f- zEi1c`Mz!x|_!2^pL)-A4OSx?^-W3ENFj>sCl108JiwvriW}RsGJ&pEO@%($K_kSd4 ze@)-0(cc0jCA{m^Sb9AV(#L4?v!CPwL=0yNHKqqv3-{JR{4z~x8lm5#iG+XAcku0r z3d~Bl$e@CQgU6I$1ocTnF^JB-&E!FBltumg*DXhrnhhdci8#?@4bZOHSVe{UV~LA0 z#91*%P093>Nny$pTplI^YcWR6;(#J}gTqdmuY+%THQn|@#jXURZYq^%P@BYk>}mV@ z4;gewFq^>eFB>(jHK&IWPa3MBiwnT@&$Lq`z(cx;^jj_4YCZR|3 z#8UcJYb^NSmr?(h-2oO?wDa?8R;|GJv61j8bRTswwPkaO7_uEfZWvy7uz(}64k8Ox zyE_fpI=|jT$?S&`G3`Ou$whn2hTyHCwE0LH3u}+L(bEy13{-N90^GJV0$~$ORP=~M zw_dchR9xU9kZ#z_=`SzyKBtgdNb-n-)DP79Z1!XVatNJNI`6u(49_xQZx5$fPYFhK z@L14$Mn*;`rD``5sV4XL)30tKzB@;ELPGjEhNHO}GYa9UyBo7yTB+CLbg$?fo7A!w z!kQIjQY(T;gerupV;g3MG*%)KWsg(tAGo5cOEa|-JKZs22Gq#Vk5qgRfS}OZJN$Y7 zMpE4nebN_0!5*886oLM;E=eT8-@=H#_-&T^lkeXk!T(wEc#kd?+Y$S^(wOgTC^ymX zA}l|6ha1&yuiJOMc_^6YM0{@N<4gBXvNn11igV}6xD-%=)=YmGf0$hGR$=8BU`WNPO+5`bYBa19o?oE+JmGa|z-vo`T&_!< zjTqmorLm~yp0G7lrA+oVVO_S*=WQcQ1lMnUvGyT~dU{BwiJ>xPMHWsC-r4G1U+~=5 z*wz~^zDngV;KW#0HwT@x3({Z{ryX7HkH4=VqW#knNPB{%xCVq#Q8C*8#aT`z?++BG=-Gs-n1V0wY_biN34om=Y*tu{rvylQ9r zUKKE$U#N4=n8D$INm-bu(Vpv>lJ9 zuVVeHr5JDB5ugi&Z1qoKsa?7b%XKes(5E(5Hv}N_G3X7}GqCx=Z*>9M`r;<50iKTn z;s6fGcNT@+=AK3;i`=b!j2U(V)DG$_z0o4Ww{0fTzRhYR)-zCVVGN~<*__$<9jIVtdxd9kFYU zSS17a-)@b(|9=9@^XSaQL3C{i$LpFf|Ddtw3N5gqd(-y)0f+UetROIOA8st*sxn_Yp08vAs#PDg;gvEF05R^DpmunIIn0B(|K zs2E>-evn}%aX4eMtl89|xhYvYnknV}*vOS{Eajs@v2&9(R*=1L%Bx1Tw%4C7ipf$< zD=QFP$uKL9B7Hrnhe?#A5!HoIU{R3CY%%msIU8l8XgapM#Pij6xp=e@m3?!vk52KW zYNAX#G#ljuBU81iqJni_O2X6PZLTjaRL!I8uw@0{2YCi8X6e2sDH?Kyyg6O!X%d8zM{o$yEKVeY7G{NuDU&fb9Yd&lX5_Q9>R2tl?}1`F~0#|1aQ=XEelzPL|)#;hE3zMhhTo zL{9+i+u{KrR#R*&oYIl=nQ!qp~0b~^Iyl8 zvqsx?;$JBxA(%iT3$mstRH$I?7c7>I7;_C#J6R-i%y$}=2&o@ZtOO_?lt#4FL=HAK zW51^Dn>Cc5%WVN;^|?(TLbinEQ#>i`;bh*Cd_u_#tKp*x@SzxajvBvuN_WKavUS)D zrQt6p4&t;lYb6R}F6|&)M* z)|hZbgDI;8%ndd0U0It!m&Pi`SoP%lvjv669QA>hD#c<@z_1VnO^51NdmPQrw2;23 z;qHmR%THPcovOLw#zw9IiQu9By!@EE3nUaFIhf_|+r?iblKhyR^~V6qiqjcPoqC;H<3X1*>Y&8p z;aR1(`Gle_AZlVyzO@p?o{Ab3#qqS6+90TI%`_UL0u)no%dlMgT9w&2*Exk=2Pw@3 zF?`fnb#(CFLxqD%c6g3EbrYi}WM(2=(ZRU%r16GuLI@d&HjQpFTc$n3Z}gM(&lw%u z;$gnRSPmFi$&|BlD}t;AAqK+#$Jq|`w%p&_j~AoNS$-I;+__rh%3Li)1t`%{=rq+~ z4$1>5^jik#byB;bQ?SGKZ&J6rf#|M-To;Kc_s8#Q5%NVfzWHB#eFgPPL`w?vSpP)p z{sOWAh+TAT*(c3cgQaI>Egn*&6oyK=ueSf9viSRF-gd%wg&(!)Nm^cv-H^u9>byOe zDYmff6M#L}pcaIJ_ipP&6DCxA*t^27e3*&{!jJ zgfpdzy%uNBT>X!4`0t|+yxZ1`ZWD9`O9Tc++iw{TPO)GjXK3US{PeJSd@SSt8Z+~2 ze{^EW1w$fWV#91YL1H$Q|8Z+5@xY*=d~SOncF^JGxS4*d^pjQrKNwo?oH%K1Z%@28 zf-vtj29<&Z+>A*F5bwP6DI#FoTe#AU;j^ZdNT;p#8CY^h*?Y{PilLRJ97w0T^a9MI z1bb!Da@Ze_g3*K#qh219zhol$KM4;}JU?|K-D$7#rVMuT-_QL&ou!ZgG&11Kgx5KD zTuH09JC?Dzw)Qy?89y612|sM}4nKq{y-tyP^LfVPZjdh=Qf^#{h8o6|t6NKEz5R~- z{pDWC3?kD&xl5F9rCu=J+9?&eSiC`CQ%r zxULUC$Pj@;A!F&> zP%K^q;RT&`OW{4oNZOMIbBUxfWn4yJ1mz?lXhe0r6^Jhtt}PM^tVhG&4K0f{-e4EQ z_|T4w5VG*%{A+l;S)fmRTgM1hX2<}KtiM6jX~hE zPvJ9qa8Bod7lK7cOJmTk18~7<<4pil+QK1 ze6L35gHmoZGk<_}0(e{GDI6_0<{RY6R2d$qlu&exO2*SFUtFJ^$y+`>Jrw{Kk=gwk z&+%!oTrZ>-X!Bj5(|m7sd@xf|%N`CN5A^wykWOY*v?shg_;CI8dQJ{>#0QDo98Tv; zFH|a!pi(VWFpOiD$jD(0koob#heBxeNR#mV%vIF=hA?;eDG;EOF9LCtzF7bk`)})T z3w0$MASrc$NYnJW%TTjbJn7W|19{#&H9#GQCRs* zVC=STERu(M%vi6wV=p@wxZ$W$;SRW}6zI-F1v*{^HjY++W%c~{4mDjCZ_>cB7om?x zpCkUhQ31Q$DTw&(^2!RNHdyb=^Y7etz+lp9O9O&=!sGlKLT;6GICG4^h*XJ6Eb3X> ztgZ{+z=#3>1i+V%-gOq0O$jz(ngVzkw*v_59tBsmW=l!Wq*pHW6xB)*B$i@7JRP9F zOts}=T(0!PBz-JUn2{?^@_G z$#R{wSz224rCp$O_Pf*Z@6R$aGMATU=o;6vx-p*=jqa}(jbi9@b$<0!02E=PML+EK z*dN{s!#ACst1LfgX=$1Cd8b|8EYMVa>8ISE+2e8p&;wE#JRAZpoyWSAn{Nc%Zc^$T zn`K7g=;TCq!c?FZEseNoV?tdJ5I6Lrk&i{~-`y3liOfF3*FJ53hp)YQb??iK77jWa zz4=3@AMb9ymZWt{XniR`kvw{Q=}V1K;9;r7m*z`)vBqL{MLqrFv6f8tu|h?a3h|97 zYF?OmNzyErE&yzA?c^buUtGBVqD_mrYu*9P3=NWh^@935bFp*81QnVJ6<(5>mz3#M@Im+Z%LjEdY-CxlFV`utRQ^p3Y7ybAQzR zMA!-Tawum5^D-RkZa|o_9uA_L`?1~vz_d9?JLP-U<`)o9N9N?j0d4v|g{eQ7Uk+mE zegRdq-ZP;tfgnMq7qcfw6TqadL3i1@6WL?wFs}f-9G<=L3YD8P3l{)V!RAm>aQ;`Q zM*ul54$g0O*%LpxeX{(6fhFYUEg01Mee|T_qjE^h)X&eJ_vU+yzPBfPxro~4Y7x*Mi{;!|tAlu>89K2f5{X4=t(V3wwkA(hA&1JF{kz*ksAtnbP^ z-3}%jQDV#F!u`d9O@|T~fYvWO1xf`9fZI34bZyWZmWyqa!R_I6Q6eM27z(QS`Z8NQ znk*0%!UMVn)GPrggfc6hvl=Y%3?aYT&Mx(l@%sr%l1(_RWTFg=>bcZ5}sRgd@S@EcSq z5&53H-<_!rV?(pf0!?#Ss-7H!Egv(!x1=$}n_gYs<(irUHT>z)RQ=wWD5Lah+tk|| z8%fOg6|wPs^+Mu1Tl|s;!_pGp)U8(OO?wkdEqAJ`^$W;~29Ldgi7UdLb$E~lHClzQ z;dt72^Lyu@z4vDuey51=HNPXO#7(wt-cIsbHpks{yBSl@(OV`{l!mTjeSM-(Tz9dR zN)B+xUvBxyZPp4Fz6QgcZXXkW@`Q3O$UDfG?TpbQuSUN-?v@RH!o{GCM4 z8`A>y&V_g6;fSfNF8)9Tgoxaj+-cRp$8Ni?(9g}bUh43-|6moQP2Oq!GT=4FkZ5(G zvRpdEEMfWXeqt&yG++B5_gQTh>j?-G8{8ooXm@{jbU3CBU`s8|Nbj!a6vcc$$dUS? z)y&pt*~`o6d5mVxuQgQ%;Cl+5zqd!DZvaIKVD_cB-VQ+fW`a08)_|+TNQ%9xr#L<; zPKb1RWz2Iz3+SE5Y-N;dRSdI6(+tA_)qZKpOyAB-oYXSk%=T`_cMUe{zLCNxoWfSG zBLKWCC62(YEszNtP^y#T6`ThuH-KwIG>N<=fb`42w)B?_kbGNSK!QwMCD+EB zMq@0aGjI>+s%zGl1ENvZZ<#7k#FbuqtiO22=Outy7M6obEK=AD^d#B?lo=vdL)tOa z@*P^NcNMBA2uNDhW-NmBLB}HDIO4*gn0m0TT7?SLfMX3c!7T}lH4p;C1dWchk^EpZ zq{Q53VRg$MjU16Hl1b&HhM^wak}hCIM8IV;`$`e*7t@c&Or_eAf+pAkUM-LtYz6zM z0=>klsJ9B}LEuM+)m11#ospFKHywQaRsLC~xPr!F-u&-~S33y3LY?{U4CN2sK{69q z9bd=Ns(nBK zQB#2lCS;29ScCd6jOG{6@?mWUY&y&qm+#IuC>UY~;xnmKt;aeH&8L{txjkiYYmYMr zRZH!=dY~P=VQqCs`8q2;O|0%AT~q zpN$?3z1Z&myv|H!9w(*Lb%d+z0f?0v+)pwj=+-$NE6;QXy1#XP6-Ni4Y|sSI96k1B z;VNSHdlMf@wH6DBI!m}EjqPxwotMgg}rtEPufXJ%wJB`8f-7Z zGqh$X59m}I>Ts-w?@J1$gxr|6sWY?=4@F?Y6kV;*pw+wl1Vz9y@wB>GQQfb{hc%rG zPTJ(nhFc!DhU~F^yEb#V(!EwtFk0_Ie#3eOHmNaQ(Tk#c{rNTzwVerGh!6Vk?qpC} zL*UYAFfL4`Sgk+9sx@n=(P?smRI)<~uv$#u0nZl&s_bs71o1p!DCqH(H1De2ds8Po zybB#oYonf*x~8tPdU9K+HKs!%;1*NX?AHTbY$M6rCD%x%Qj%7iO%E_H?s8i0Gw*Xs z?<n!Ou@r{&a0_EfG7R96Y-0;yM{;*@(nc zX^djW2Odl7!j2W9(yFwg@?0ro05Bi_9so_{UV?>%9S8Udb9aM=l$wS486_l?aa7_! zlqw21Vydn;8;|P#dSCkfnW^QuocsgUC3pGiQLT+k=g7^$%HZuQASnIOtPA&}>c%io zUU=R<9e$_lAl2m)bF~HwB_)GFrVv8RM&eN;_&Eljnp3DXst!@gGa{Wn{Czh#5SkH$ zz;>|!K(?0f!iRm(jU|gWNlv3OMUSy^a!rS(Iu8VuYUdx^k%po;d<*Hm1HM^B6KFYB zfc}3ffe)qC?I_odcB^L@ExLR%MS=7+6($y~w!D5jwxS5-Xb@4);grFLRD(Ru0#{I% zo3piOfucYA%qQJan4>v+@8%YF`ER#pyL}atm!1bbg#=zey+=qE8d-ND(GUJ&!DA($ z$Btd&?gN$Q{iRY!^So&XHjHIWfw#ywCS)G`YeHo30^10Di&E_JLn60GHqH1MQ8>*uGL)P(64Gw`FwCb>| zHQ%5Ync4Z68|WwHBOkQ<1UXWLjGHWDq2O~1ovnB0WcNqe>HdcgpU@P74`MaJM>DB(*C8ESv5dt+M##-VH(#m_b$=kC*6NbL4zou#x+vd z9mB)Z*dq!1_?Db zfa<;VG@9~Wv||M*Cd3CI;fes7nq0sqTW&b1dbc)15NR?xvhiSEa>XAJ>y7IgX`xD~ zRMBj4#&9xQ5jamORbr{pQFVWp%lX&_etn<$NY?4$e)nT4w`~;g3*!Az^Bd@g&sDiAQT}re;NPU@{S*Z1*fiE<5-<>$40j zh}X(n-kAPt4g?j#tlrTT9>3X!{Wp!vU(;V*HXj4>(Fq{hP{_JxF}bc9pK88vW`$C( zFp56Eyb+vbt@^U&)NBi4L7pRTvUoOJ6Co|)4e|?M3;i2Zb zGl{tWos+rVWWJEp@%VQz;5X$n5Jw{lv09W-%#&GjIWPERzdiJvog{G?BfIZV2|s!5 z7j*>#igV^Y(oIIpZXy&E6riYBF>cToxuWEMcd<=%whGuUOD<6uWRp%)Ob2 zsU|xPOB?LJ?mf>X@HSEOAVaLd+?s_Io;Br~Y8{uSpLl;l?f<9V_}3>y(fr;Z@7D~; zp@LKQx3?1_*Kx+7!RR@FJnNHUfP+Is^F2PdM~6NW!c${t=cJphm>$AxQ6l^nKw&f7 z{2@C)GF9pV4*-@-%`SHm!DoL$mSi^opwi17Oq&QGjdq5k&fCkwS2rlx7I>sj;4}r5pGWJFs0^rb0TVXC0x;t=bF^ zeTj~wv_4rgfp@c$(X$mz$9c8QXR1h*&TUZVCh7u2>1ICv3zo&|w^;C{kdm?Vdk&Y= z4^e@n2MZ-s{eqPw;?Wa8r^af@s}vGbv?O|4Xu$PY<4KexBbddWNj>6`{PaSWPo5l; z_*EsN_Wfk?o{L5zOL*LZiRIawe_!8k?_eyhc8$%O`_ezU!TdM4Y!D`-ZYvL90m{uT ze@qHKq~@>e-k-{sBJP#Wa?%E=Ebm{gndCHs5yycx;AC9xTy|8EqZGw9VTD_!M4_uB zk4HnFvc7N9KCAuJFCdwOaNm_IDOITjIqbj6chpQ3C@742wHBC4)GY>F6&6*2MMHBP zpOyOqMS7Wj2x0_o=oP6I{#vSK3gOQQ4uNN2pKY-*BU9@UAaCP}uiQIl29% z`^2B{r`ZxC;ThxYu5Hi`|FqAsDEBo{Lb4$GO7lbHFF-XZvD|W{H@@yA5l@z5M)i=) zAgBQp?Xlb?xMh3UyX?a#w;Y>407AjH%JA%SmFH|h%5C!FLhmTnJZTbx?$*144GQM; zTdFFiM*91MfevPt6-PT1VhQva!%JimF@4(&8r`StW>=?w8>iDdgx!_4`^PLjn1Ais ze-9ObluiqJWJHEpUrcvvZ=}0>p2ET+HY7(JkZ&6|xK8#K3_6%97SOj7#h~k@f}1A* z7_y8-ezc{gM{FS|P&j-2jcs+KG(Rb5B~+H;%2>Wv}#~UI3Tz%K#O5+kCMQ zfu&Sc(Ek*JMiOxHdb4%!clmH2yVQSig&Q)s5Ia{PD0m!>vmmP+OBdjNhKE)j&o>-p z55FFq1yUvw?2l()Mwbmi7lm|qy2-B#WoRkpIOKHOlbKF`PxFsn&K`xWB%{#F*o?qm zUTHgN#6&8XuD!aN{_zU9G6FCHy26=b*)0JDL51An`itwGASCW`k$=0Kw;J$mSu3-@ zCe_IQeW&~juF_=zjrQ%@fZCSm06EI(m_tmn_T=Lk1qG1Yp^yKJj?OZzS>r@STpdbu zX+j(oqA;O+L@WzaAwVU_)q$<%-Bh2+!vgOOQddOx#jSrjRg{`3O*GAxnlvvVcn;XW z5E#77Lcq|FFKLv^_iUpVv~CYF5>f|*G=*E z&A0dU%`%!>p_6&}5`YziT%iFgl&D?+jUu&wH2~1u^jd)JHTxpIRIY)!fC8wY26))+ zc^q!4Z|T$vjeirN%|nWf{MWqm5&Lk;d+SMZ`Hl9kw~4<$Up*lE32C}HAoH1iCV27R z!W@3{_3bG0$9WDg-onB^I`6VSahNl>wq9kZUw|{09*_&vwG9|n$K<2;z)zygmfJ)N zO_sF-pq&HBC%A}=O03_eOFbad4#LW;HcEQfKSt4~Ecr#39)l~y05ERqAM9NC`*Hjy z7GdUls6Yx9bM#Ysh{Mf+BW6xL7@X*>RsWjm}(0@*>+a{O~$PY~(g zHvpd?bQ^eN=k3E+5&fP=;x*BLaQ&+VH#gkSR4H{UNt#`(2KmC7UY+95M{-oZCJ z`ym{o{3cvz{x~}R1Rg8v*5ah6=+mnCD60wjQf_Fg{Q(kQI?cq)91ZVbU5~;vt*r7E z0*FzoY<-J|M>ip2l284dL}u+OGbF+bkHsb2-Z%V3#+Duso9h7!&AZ9|fmO!RSpDf7 z(3if)N8gh4*wcaG5xNwq#PqV`8(jP8C*GkGZI>(P;?Wh06*A9tNMP9m1g=r7M^}Wo z*&0xs+}zQ7BDDd$?3IX$*6{~$)%87&#kMp5?^cE#aO_I-krXc?@OH`*k_t%oJ)C<7 zxaa2+%SA2YHJj04S(EGq!2|BbG9T-cC-&^WBI;8P1opYbMMW3F7hWR>KdqmKBnaLI z7}3dZ-9;w5Wu6o|zu5~5xL5vBVEznXxR)V3kpEC%rupb=S^dFFaB7853D5F=yRH@V zQ(hIQFrU5zIPRBh@Xr_c{^ISDF5#s)Lp-vVwf1Rl2~Zfm8&fVawt7QDw@cjRc+&YJ z*K{MveS^b6>yB^Y)=`FPk`E5npWJtH795G(OO?iIRUX^oAF47s1Rp?+dM`S)tU14; z=2S6NHv{vXQRhSG0f2P0&tSiT5%KU^D-i|sex6!)o)Y`8XO%1u33rLdh+xod0|aE_ zWXH^@&raBLqvg=bcZmPJI~6GWR=0|<(E)IU!3a3%;Rxvg*B&VUj+EQOdzMKa8y;G} zS#KrtWg?DDP{`z0>D=!^X;A+He+rfnlLh~QY zQdel_W1gQtSA_|0uO$jc301+IZ?NZMBRp{PgSsLMl@R(r>x8d2b6Nqhf-<;w*|SYl z-UA8`R1YJ7(5(7{QYDE(jlVmj8GHnbfvZrQ|K)S}7g$&*VI}^GNg@8XIWUpS?(sS= zVHEC0lgoRz?A+^>^v`j5H?M1kM!bxj>6~3}wtt0wy-92S<+zBxPGjnkylIjc{=U%*^9WA)*@WHQldrKn%k3M{i%MaTV{ zTl|R>l=u1*n*Kw`o#EA$%G<9*Lz@z)wxce2M~Im01G&#l?(%I5&8}u0^^cPQ9{O;h_YB_-;g)1${No7z$1nYPXylR~ z))P!l)3F&tzX2~j_QHC+gm|Fj*dV`2+|lHl{Ku#LXxp%?1!@Oc%>$Cg>87sE%if6w z{PX1g<5$0xYC|U=Ah6&V{O2Y9^Uws|vd7_R*cj(yKM82l`Q=u;{_hur_uVN8Dd|pU z=X&H{zNs%1`s?qJ(B>#@%hwlvGp!j$mxzwdhh}_N|M6&^$Ka1Q9&2HUI)+yA!u{iZ zuD3dVt-^f1Seg6+0>8Q>v;xe<#l(JP6%ca8omnz9F|qbJ`fP4~<-ozBgZaA2=^1_^ z$7Dg8Sgc(kTIXbs_ds&^fq_9iDuUFo0ECV<{IrxqLYB(zjE07;J%c7L#yK9~_x0v} zT~JH*z-DB=>x1sTIQ^i2#wgxK@YU}XlCETf%Tlb(VIi%K;H#+cde9yP?Z{d^^s~Z!Cuf zTy^+Ym`EO)*!nJza(%GT#H1u*01t@Dun&ORTj?X!&L=3(bk|Lj(;FSv!ggk|uTT$( z*`quBAFcaBTorz*jrVcS)8hE^dtnAKr9X}85E3I5y^BAW_dmbLu(JTh$-9VOO@F<@ zK%6Yn2bh$uf*%ZB*e)0j&RS~^?2%X}qP{M_;Dn$L6E0DyQl_)vq{?cx!!6xa8E{ZP zujPNPfxkcdkPHhC9yF3G9Grx{&l!;z1#ejzjCT;Y-gfLyTor04uoFGBP_WwUV+5ZWjpdViMFVN0Cn>SwX)R@b1eA?LmJx6Z zCe2dD8u8R(gGv_2rDZ>TlK-)0RkV5gh~ysL*TX~JQodB^m58@O&h@Nmps=qvDnWc#Bxe>>)?v_|_eD4gJbJEwo1EHvUFN6H7^ z6Fxy4B}y`gMbHoD9_vVdP2_>mh*WeJU#X!bcXs)jLoU?QZOv}B${O*b*TRNdxLCI% z$n4FIpp+PzxF~En-(BQhSi;!u)~K12(I2j5DRg1xF{ipQ#G@eX@<}y<^O>jp>S{w@ zgvaDxc4gFa9&#eIzez8o-Ep=Q+?$Z}prK&Sv-$mc-;APK^c8c@o8kEXbLIW_b@{<& z0*3j$%*!#2nNKv+1409-zL=rNswW7Dl~88sPu0T6c;b<>rA5T5DLNyIBPftLiY%<7 zngb`+`CBXYyl>iZkq%PJ?<-})1i!^uy_gaN@x_cda}qE9&)yAW}K)w@wnR@ z9j;kd6)F8OEA72Pq3LbK?kwwzqf@Wo(+Meuqb zl4Ka#XHZfoDUSY*&GX1B8Dn(*3pm%8(O}7I$Fw0LU22}%I!x30ri7~2%R0O(k-zyG zOSy7!dAax(lGxO05707m;1CHeyOWgVYaX^&oyu&1-L4C3yF3}yN_1zuWavVUrCjza zk`@l9R6J?1nyc^XO`2r1iw1!oYnUFrOpFAO9w)!>?X;F=VneJBTlu{_n^3VKk3%jY z{GYLc=%M~U&fYv8>i+v1FQincR4!zR5JFkAE0wZGk-f5SBiq7wy|c*Iv7mW zNh<5u8H};-W{h4%`Ty&3#S4$#%%#Ccl8PCw@%ClnJJso6cO%g|J018(VBSpAva^42_i3t(klq0uM_x&OjjLVdUW_kAtO=->_ z#m=oR{xU1}E%^9v+<5ry+ihggyca7A>wi)Z|0Pa*+@Y32YZ*zYYb@=8%$=RuCRxr| zFzf}fCY_5-zHROmy=)1w4_*liN)M-HRBlCdyeb?c$e3sLpxbsEVn=<raWI(`H__T^ko1%v3`+C^s?DzN%STOVb(t8mcDWHyg$W=o>#p z{(W!%2kr6eet*Tk(SzD`m1}$kukBC?Pab{er+D5yTr2Gs?2~eTeFP$Ht`Y*A=k0}3 zXF=PZuB8W*w?FbjNGsrs0HJKXu1@YsxsoiswLWA{(l?=mN!0|VJ`pkBOGyJi_|pql zROQMa-mWEq1hs2CNHVrALyN&57I>xT$EbpwFlaLVOjs@)L=L zX8U^ynv%s5OFM6pF87<~f8yZW4^zyiFT4066EvqZL`Zy0w(aa}+8X!qp)2pzVK{Tu zk1p>}%rCg-tiWG3%iqp@jQ@qnwx}GJRUyG-`~c+m=oX_M_Idcx=(Nl3SqI?PjZ&Uv zmf$O@rhsA<^btLuaMr6f+MaIclg3=_XG^UBO0Cr_Tf)N9z7pP`9{lWt+IY&f&{hX` zxakQdd=DZM76J6`gzEq;*D`p}NzblCC6F8bsIX(y!0zG)NSio1IIDd4Lo# zcl{)ejb)@^$A^OVX5b~7QH*!NoRtGC4z6O%n{Ap1`HG`Sm&<#cPw*KWId+@XOXB6t zOHzMp{r&gl@v`Bi&{y(K&)~e4wCnme@#712(uXj{eOZ660_^?Bj*Py_s0`{?1~`_s zaBjsu>}W~i+iF@yT4arq_B!=>e+ct-Via8E)kcr>omeD*U{9;E*E?Vo6?UzQkDo$hZ3@IFp z#bIJ0^05@4ANMOM3g;-#z3Qlg#|CB^E`Ud$GxxcGwH}yfNHNrR&MUJI(J+XMcpUW0lpsg=Ww29u*#1~<_XnoU&XDf%h&O}AdFGD`kFQC} z5Y+k^nUm60y~<0U)ERdsiwoR+n|H`x7cys`ig+4TI#n@7jlFhBL{R(AG35dZ*=8Q* z1h>TyGYreL1h?^ViSdK1Jc`%);ftMB7hLk5|JX9TBDEn|bc$UvSz((UvyiX#abw*E zXnypG)|D)_ma(McI^OuW;2sS~cfKUsl6fJ0Y@M$3?5U40c)W+ zA6wed4d;ltK=dYr)t7_ZVhtj?|SD;{qRddUJeEJKQ zXv7xX&9m*!Q&f7XRtt2`ZVAPp^0tCWhMkyk*NyFarGA@{2h4X3<#^8W$J4O;gx{8$5RvQxyU;IV1$fCLQQ&Ch%sbhe$m{5L$#}uX%Mh z7piS+6}U@Taouhp@NZ{oLeQc!TbZ4-$tI^R<5YXAKoVYw?{UeaMD?k9UnSv*1C`zW zi;WJUjZz1b?KIWWkrhhJJlM*Kb&uAwfDsE_m#tUs^VkEK7!=a`+wJ(sOQUmWDmPn# zeoA?bD4W&?eY~?G%llaQX)=Q|to%N$V8OE?qRP`9OgzUGc!w&NZh>|I z^?6PX*}c-~K06)|*H0Fkn-=>X>w5e9n_hWlE7hT|o7d2yCPS(jb?Yx(N4>6~Xuq5c zT888%#1RzRQc3<02V$n2{HQ zy{T-6$(1YtOW{vGEFF*9wB6B{9B_~VeYv&go zw)f|5xuWF-B`)7u>^8r0>Y{i;w3!@x25q3ENmu=0)pw|!bqJ-&VxTym>5m88jo0lb zuIvYl>Mv?+&PsWIhj|`2?dGL3-A=#hpBA(=W^#@VJ9;kNN)nijx5ntbPHZD3^95 z8yygG<#CB|RZ9k^&gj9XZKL5zzm=0KgEVcfI{~PV$)k2tlM|;AKvVZ; zYOhpWd(`y5v=Q?$3Ns@~kCeop>Q9s|qOAFIA zfUtNo7dUV)r}wemZ)iS7^M_b z*ko4Pk@!#Nc$1&PW&(U%j-CFp11UT0&8$cs)I?B8Fip6~cG{X)@}`sgTIoa^Asi{96 zPun+0MLsP8>}it9QhIPbg?rTLNp>KDdbviQcG(af@OU2+)Zsk5y6Xutnq*V3Pxbe1 zh>+U)bxtqge6LK&F)G4^qf0lW} z1)J^qm6kI!V=TW7oFn&BwsL!t--NF#xbt2v(*PU>DUod6h-LZfYLtpd=K26+FP~|h zbB2r*ByPOY3o!v6l$HBK^2u&}GvlPn_KpDfk40f6U-&IQ?WFR=w?axoY_XFL^7>j@ zNg@!iJ+M-6?F+=2f(PH>!>%hV6_CjCIlLo3}?$2m@ zSig@?Mgs_GC4t=GPw**!AGFiKUTcM@JuiOl(44=BGch*vivqyestIr}U8ObP>%C(~ z%2=4E2U+!D?wFs9ld3j!>bvHo!n7k&g_qtaTyc}AGr0Gj(wb@))^f5dx>p$lzwbPq zH3E4SZNIgyNk9KCVt0WE#f+=HU{n;I7@sX`Jfio-QcVerPx69h2>4ETx*1$xE*CeG zG1S{;qMrUShBs64TaLrGeJmLnr>sWKb7%Sw6aCAKiW?@~Ct?H~=eGC1;l8LHuV);D zvv}*_lwPQ>*U#N!8x1ah40M$#ag~Riy|EaZ=H7(XXCy(;&0vNA@jm7WD~BzA_JTk^ z5IWwzWBBDEdA(ln>AlBOZzFSzCuZLGdtLNXtq&k0RNtZU!BO}u6d_cZ>hoI?>-OV z1(Ugpiv3{==MmehiJZd&|2htu;&ZX4P4W)&iaTx@G?gbXtXGe-;}m)|ARt8Cves}X zJsT3da61e9>qOOkgs3S5qDf^3^`-?nR)#fM)t=V>>nIQjzN+xf7s&;V6plVTm!b`-@wxj6QZ9o2);;P&Gql z%DTzQ&NnWpZrgb;DKU_&Mw22hj38_&nL#w@qhh$gTtq~ukYsUWUuu^*W zSWpRht4ZsG_s9udw?58WS-7=Ca4T~1%0vRCL%~sOWhaGxC5 zm-L_~XKlcM!iBXMl+tIgaSoM)LO7>OQe*kMH{g%EU#v0fOe2UeA{?*ZrnM&omSFQm2#Q_Y>^mcM#ecUg zYtZ&br!2ASVLdaT)!7fKF|v8GwhNQ#j;gt(^~XX66}za@ZEWXq=T%`;PkMq;t? z;#+7XrpXlMyX0%Xt4CPRUkc6gq&n9g{#vAhN+vu@FPg$ zR7#J7akDcAw5JGdg&=k5t4)lgm zF4JFY%6oije-UGyr;n7(ui)4+3UBIh`*3b~p|sR}IalkvZ|1m~H({a%O`h=mbU*&S z(yPxsgFZW`W}|ABvaT}m0~9&z$wc~U3bmfp16|mO*v0XlpIXK0Gw$F8T}IsE&Z@;! zKDzs!q}{8w;2i9e5qmui&DY3T@)2(97C14$i=^AgO7wl>=OYT%3v8)!_kR zvG!eB14Y#rpNsLiq}eGxtHH45Id?&-v=Mr+S>D zMGLd1(xB57n?l!JB6pSHf#HvIT2`0s4t%Mf>}vI!d58&#k|sjKwIF?Gbg@&UyH#ya z&FMdsEmYSj#n-OyCd!At9FGNr*W7%9m@u_;9Pa!yEF%4rhKQP7#N_a&*0y|;f5|AZ zaKAQq+y4D`dm@xB%=HNRcD<61QdJvJ*NOTrUhT;suk(`%d%@YdKgw~u!RTq^?Ag(7bc1K7{ zuaT&T`a{7!tRt*Z&kB+sEiHy^`}X?OnB?5@^-ucV>-JOb+;XW(SB_yFwoNnC)EZfA@anqxvt?VWp@}ve%IY zTqz~6u}~{SaJVOS(&f0bNS5g_!v_#6y(VIPleHf5?sGNRtaOP%-jm~hB1`}lnYr}>;JF-U@!|W zuhch#3NbD!W?3T*3sd-krZ%$NeIVA5j(Aa2y|FLw#<+m@XQK2Nqp(hzb7Wu!;4jL6 zyzhObEc4zeyi2o5UIFX}mK)iCe3~Vjo6{LTIbvV0u(F|{c)pZnp)}Qzh>wkbd!h5# zd5;pC+4-U^iloiL+b#*IRwEuZ?lg@^qZ7v7e{=~qcqhxcj9`YJvv6;fmydm~jtvKJ z61Pob!>>YNrcOUm9&80q&Y~7gD{pH>{4jWP+k<7-Y;dNzjY=)#wjckOY~FTq53y`R zX~QrEgkGv#Y7Gyq&3b^G8w$QU&cIg6&Cc$Ce!{OfiF=3P1=hs z7hrB2R8{rd`ON&ny3V=mQ3>as>`eg>#|p&COPU`F#y%Y}ty3$+CXg>#d12kEs;(3s zfaew=ZnZe}tl--~J-{CoQGjf&MNB~Hw_eK(;$_9eU`_RNB8%FOAi7XNNo3zGna_NQ zTeqfq?W#Kt3I#_PXiojzh7(!hcMC$k{M&p*+90OlgV0_|upqQY!GFnQ;W`S0epWH! zBor9jTheknfN;}$xq=kEu;YGRfn*0l8yK&n4lHRUlJ0H?Z48f~@q#iK%w#ax4eT|Q z^aU#)gzk5;3Z&e<4O#z}@yhtl%F{y|gJ?hn8jA;_9FkTpAY3xhlRNVh$xDBFazuAP z^!B4)QI!j=0;RV@#_*&Y>!=)(unYg6i1)rF-?bYnqcJ0*E#(|B8V zlHdOR%u<80kdL0qkB~3x0OoMve4H>y@1SgF(*BPQ)FLa}IMNrIV<1ESG<()K(#nAl ztbBi@6#G3na8rKCG73_ZEG%m+p;Jm&XUC)Aq64f&GBA6u2vvhLRIGzX?8)2MWDMme{$>zD9JubSawfBeyJ?)KhsR0jeQH)AwsaA)@DdgRwt6#l zv1XPhYJ{Gs+fbQ!@9v#V!RTumh!1zZgjeaLYC-gyFz?fZU)bNt3rxdN&3oJrzhQ z5I09v0BxU>Gh(zFnY8+KdQ7bQ6^G?OOLriBh-MX1vVNy_SPk~>66XOHaJ!Wb z_Uh<#0U*f(D)oFP!KS5$2@xXsCb;v)UvVLS%WR;f#yK{&IX8QtA6nyJsL-d}Ts*Gg z%U<5x<$IyVHavjKSNpR0fxw=m!;tJ7ss7VG>se8^QFA)eR`LAtE9*B^Ra;JDxj?jv zg$B=0Ox;5-UcboVJ3F<|Qys#`-WigUjUEP%RENNwu z*tV2UbmDIA_Pv>*j`@NgbPLH=JlUx%&xY8~`SPmD&Awa~L4IE=k{BE@Ks>CDftuV~ z?+sO!vMDpA?S#y5?JQX%051;El^FK#OCbA$gCfBcU;8GhL7?#EON|=bt;-!#S67GX zjhb7Ml^1@5wT64vyGt7(F+QD53LAAZiywy3lV1Z*shYsQUW|Ho`hZ;j%Pl0dkWy&L z_5Le|zx*Vz*IP;-F#ZeH$+YdKc+@i4fmXjgx1GLmazSwiF+?44x!$DO8AUum2qKkz z8zMaCCUGPBEw0%07Es&S((sqhvPAyslFwX;l zUx4wY{roJcz)K(r(6+{yzI`q80_g_Ai~k8Sa=>cj)?Xp%cJ5G}<21o5JW2(~orgdi z$o<6f@c;(e!u#gz|B$Qo{|SZ8SF78H)08_pM8@Pi>qCcP|FkRrHdy%IKQJaR-I3}1 z`PiR#{r^8#=C9%Y&j+5`Uv0EN_-M*+e&){)s>_{7c?L;<=WrJP&ma7+u=M}sbHBX2 ziE|sTA|sbZnnziGGgSEJQrL#S6jq4phKx<$|NVvi*Tm-2UTS{(=IQ2uJMj+}s7hiw z-lnYzU{?L7D^$+p7sJ#7sVhLm{KrN4AA@RV41Ke)@#2A&R!>CnXCMRTw_fK{W9l}q zRZ!z*Y5N5Y*+#1;47%8AtC*Hu3HypHJy)gjd#fF%c5F-Qr8aeF;q$NEDrNHf_N~hJ zsQF)N>Q52)b65V)>!QAX(ogwW<^)zC@D~{STT}S=|Ak&-^84^1q3Y35uK$N`>U3aL zs^tI4_kh8*e|Q;nc&f|rnCrX0pVj~Nv`%cANq{Kn`(upj_m=lhlgJdvf)o<6uRJNI z`45+8;`~O+2PoOb`u8^CuOY|XJ<3n3I?=xP&)%D_Jpu@^cn|d-Y~imZ{q%Baw9>}3 zGz@k2pJ@m_`D4m6Gc$E{YQ*2oHT&;Hy`D;|dO{EVr-D;{5|DCF9|-RBKN8iW3{_XB zAL!}zJip)?^VdTEIhwy;=Q@$;8-ntrw&s7fuIhZzbeVbI^R5}U{KJjpi-Z1h|28Hj zc*(baSLXO^L%)B&lX_MKs3U)Vd$J(AbdP{Ex1)v~b7EnK%UtPJ=d(U}ebK!cXUuZ) z_tvgGB-9jc-}Rc^^1~tou@371SoQEgkRb57w$fyUM{ak9{1g{XegTGD7%?Zrv8v$` zW&$9z;Kqpn3@tAtTsrS=SF~+=9BcuQuStN|0rIWZAKe`-ZkS2FKq4+)HCVNBjcV6;h&t4zH@^6EQH3<=zP3Z~nj&^*Qer1w%!z}WfX1Ny zE*zT_)`0@l;}NSh4i)=SUsHSGpx7I5A6qn-^J$Sp0PZ}4UXuD9L&L3(ae4CHBcaL? z*~pDouU{{08V@M{hTgf*{vNsc^XJb_pr!2^UYqE-odf-pgg7DUdWqE8_a;iY?>;~ZgWusz5Yk@i z=^bCumUI&bDxoWBU6%+(4SZ~Bz#_3h9oB?6Zx^G#0VS~T8Y@u^J^{M3Jh7S|5}1y3 zpWs~MH!xtBotqPslB&wSB+(Z2A5Y9-;jwe)&gH$B`Bvw7+Qic5_0IlY>m%|2&a3&Z zbS{O6xw*eaDEb6}sL~p@=OMHP%Wti%ZpKItASaFtT1Fbsh!J6&R=YFZ- z?!m48w&1(rlcFX?SJp;gKx=^{t=2(3wld%43U|SPdqDHFs6?^yFBau)f$s_BZbHh! z8!-2**!c*q@&o{R=(LGd6JZmgURI;*L{E72T28tFtR$DSLdLCuta0rnJ$>zuqK|P> zDD}Oic{RKKPd^MB^xXVQDFTLdo^}ncKi+=aLiIhX@*lK!8ZRxfEP&XcpZTfLf+{RL zAGlx^Z@)hIpr8M)Z5h+~z||sQ+>KJJrk|Irc@=7m#r=t65>;Tlq6^Rnk*>%b5i=3c zg&F{ex7^7@99F;`IcV^eBtjA zk?=TxqX#9yE3+Y;khpRV ztIxPA)|0L8X{Acp&DWZ{-#BVziSu$;0;m|_JFB||$}eb5J=eIr3-$FB@(U(ByL7=+ zr$X5{j5|_yG6Pm!KjYyVcpme%@q|AJwehpM@$^uP!+7L>wmYfBl z-d*g;5O*<#C3SVj)tc?>$!y@0twTOOfV@lQ#`umBouD<z{@V>NKn&> zOJ~e$8gGKaM^zQw4B++lS=0i~yw7BJ17tHZl}jxoEVw-M4an}LLWp?U>xXN@10_pP z!<^gxD?=-HzGnA8C^hRuq@K&zbE#|2MJBNFVDFHd_?;R~dpf18K@Z zK$mvmk-$tWkBal4#!|<Bq4W6`*i1+##gP}*P+P_2IqEOAOz zgX9Dc@tRmn-W!3L+l61+tz%@3Fr!OV#CsfQNaLOAsP!)N#wDRqir-;LU_8%Gd2T3V z^-c`+V$q)$}Rw58Orj#t`-SA}|zv&Qy1XRuqmjMKrto^6SM-CoLQ&ny%Zw{8Z~!gB+5 zA7QF*Xnb4UXmpck7_z^b{w(5r$js{{S7W4zkjuorxI}f!b5@m|Y-T+Rr-*^!fl8ZI z9sho52OtRVGH!>q2(EclVmz$3_M+aop!I~LdF_O1rq4(!_>DE{Y2mGK7_z_Bo(AVi z;bmgl?8&q6baLr;4K}g#uWQ^H5EJ@}XC+j1>o^9=v>U+Xoz?SI74b}ure21I<8ThT zBR>c7wU3(#PB*$Exi9xBlN)Qu;5~W6(kGQK*A$G?jy{AXImr%-6D@_-(3>~iSwuGZLU--~129|CYD&?82uY`=xaZulyUd&BT)risqe z$vCT}RENxG{29G+e{un!n|21Y^Bns>0Tx&OWI(F=v@O#wSOL}Csy9L%ll)DW>MKNN zdT6{b06wpvI|UaObkxogPP^vDjjAY7oWQ+2O34eV^YrX06EQuMF`p?zVELC)rs2%? zj#D>mAZ(~N=wXH$3ef06&*!M-=MocnyV23%5~Hdurx6X5sL2S!QRfJyLK$c8+6;@@ zpt|l72Lgvc&Kwo=5z zA%Xlr&7XuN<@s-W-KB52C~3vd8?u*~?nN9s7x?|O=_Pi_!c4O+Tbwr2&3C|01a*nq zw?Aj52JU}c2iHnp+H8-{U4S2@FLO|0v$(muE$Ir@m~xXZopQ`_HdYkZdyyObA(Ypd zaGu%Eyy9t2V}EXPhR>R~yi&BG%IcY3z&e?-H}|fhI;n7ao&S}JYB?oLIS3YVCkAPI zFI(Z!X|gVR5_+=uCm*kw4wNHNw)Tg?6MrbZ+YO~Zjtg1kAp|9#b zS*sGL%h=udQMAL1?K`?=O-wHPVdTN^Q`9=FfFXIcZr_T4Sh(fYTxyBXYu*n?;r@mw z;NVw$lF^lvZ|gHr@hlum5c29VICFE1?rgwWAwj1je7}udh3*_H(2q^($;jF*_d8f& zz8h)kqgC2rUwG6)Q5lvL8s7Zk;uy{am6qWiX)x>xNsH2rwl^C5)LQA>pW~yQc=cIf z25(`?kurcdsY{WqdU$#GIG%t~yM(Xi*+PZ5^-@ z_sA&HaZ!cYDqY6E%5tbcceT`yx<*zb$q$!8YE>5Z(sSOxR8(auX|?pR4wOJ#rDi_B zcPe)kj<1m)y%qz}Ike>GH$1MeO4Nu5a-*kt9}F3}bhHH@tmer8**HAG^Usv^UbI zd|{`#hbXmT%bL2ZghO zEF`2g8YVs3+&oEG-_9wB{>Q?s^=kmlNwT~ZWSC_t5G8B!0J!SYE_=z3+T0AfX&kT{ zU)l+Qm*tRXgZ*hzR>!FI3;K=IGRwO6Py zyW01iJ2T+63DXmAr71TbL5NX?Nr!Fw;MaTNinyvYaxy@&jp=^N`F*U%c69KQDec3D z4?4ze8k4wpRI+)Kkf3yKxth(rYM@;0>4TabaVln|D%m=q-%rgha$(ptn3*e6C@XkG zUq&q3$XjXmlFESz^w=ieH=yg?vSXk`b>Q-?ht@s=>RoMF%X|*$9`)Fv_BV{h&T7ua zTFg%^s~szqZDa5)#|f-vh4$u`0C!+*XD(JPP}>Gv*KLKJJ>{2^o=z} z0Ue%qBF`eWt^3q`)RIW6S9I{^5W4{d=Hv*}db0i&YUXdO4h$U`u4GC%Xm06CAdF&HFfS=}=Bcb7Kv`SE#Kcrv29U53u|w2g>c&j#QOr4B zUdj5>cO2lGC3j;rrPt~%$VR{MQ z;_VDrO-m2zwuR_)@T}Cn|7n23Af_0OCY_CKOK`6FgKgTR+cxoZVupdrPGev5HtX%v z#)X-}oNYNAd?F`olhwBuQFxW!A{ao1+GG2*&5;dPEO<>-wIjU~sCa7^qdS;=K0D7u z?God@t@JxkP`d*iKxQ9rTxJx(qDq>u-x`b+pkr)bfVVEbIMWWNOJ$};U%z~BFV^$&;{tAEp-elE#m{Qu2 z73n1zY5#1J>U@}E%Fn)2?UY3S;Wy(F=rVzd<@D05f4HvdKdDtv*S*W-bC`DhV}^a9u-05Z8~kwl1~|t9WDqs;XpvG#pP=y5S zTv{0qS)Lj+uLd|K~Pb ztt4}h1<)AQ*F!JEe3Ev4#UFmjRuh*UV_Ie?;kT+hjM!#|mn5?Ro9=oJfw+}g?iI3R+aI8t5^0FOS z*qgKwh81?lpR;tbA`gWywfMM2R8OVPv4b44b*1O~iIA=u@MeUrx$SIT(N=r7uU3HD zc9}jr_JX+C9ph3n;n)1%7WyLrSPKD4wrM=$EmcgnGAk8XbDLf9eSaY}N@ z(_ExzczFyy{y3otdBBvuL!SrYRa#BcU>?+T&LKQ7XnhKri-Js98imu5kG7Qr8c58TQyV zo02{q|7~^&IC+4wN)7Jfh3F+{L_T-J_%ySqkv)(to*0xHeqY96@_FhFub3;)+FCgu zc}22!V6#(_W}yUP&Wo6Rm$8o}_^Q7I4EIUes?!eZey=TV{ah<6=Zo6RxUv$~j)yFznzv@N|3%o@z zR|+ANUM^HSDW55Qc-#MjM;(wdY&Z6H*r^w2>`qe*2*ZumX-l|zlv{+Xyq?_dQLqm_ zZ41jZqQ+cg{v5c}+FRQ4Azv&%Xury^&hS{ne&aFid3|^c3nVbQ&bZg{$y5*P2zuPT z9tH5w;1s;=pvHzxW_Ar31lBea_>tAh+U8~DRL7Vap!jOSw#TcGxf!$U{U~bI5T++i z8*|D$u4r%hAUs}JHx;C^hAt6Dr+qb7k!#NhJX{D)G_eKUegdfUe>x3V{Sa{}Oz1w=QQmY6xTO0w>xxXYQ zb<|5~KDAuM?RrW%hJs?XUDY?xI32U&S{Oi>n`|PxHF4UaXB!L7skoHyaLEiw zpikRrC&Oxwf@g%jlrJ@81t6fv7g66+UfwUfCU?|QNyp%mS@Up1)_KwM&&qxk;GB+C zMwQFiF2_oZ@1VvCbU8=&o+A);gGpt27bZ2C)yaE&52uI8m+fy( z00Dgka(BemZbg>uWLQ3UOdlBozvcYCS3!d_3 z?2_)K$K9-xb<0>M|$n!h`3g zB-+plBLoPK*!y19R>r<&(xy6XSbApypHlPT)*`jKli~7O@PqKs<01QHcT%s#pmg|3 zF4puNxj*G4Hd^B--%F>4Cy9c@Q#@Yx%MpjO22K!rH`r~#> z>BD_o%fxDqRpam-?>8f9vc;VfnY~T8hoD@&<3i zTF?|gLoE5hURMYFwM4QeG(K(jVR-S7T@(|}#b?GJY)SD*Vp6{L=yP0=R}@pRt8Lgx z2W_wIdXY1g6wkLF{6kh*qca8veOX%_?v*D3;PTe{}UBMY6J*w@B2v#031s?jR~ z(Nn5308SCQWJ!EG~m54Qqn8VtJ0 zyu357G5Ib=QF7N`UduV9nJ{qK?!Fr;sR)gY&(+L8;cc#yjk@a!Q<>H^9v0(b4?{xE_aW$qg~otrjn0Kcku zv3be3!sW(r%=T!)n=1(s{qtenHmFYue{UT9_f!9e>h$o;ki(P)|Fj5kpLcJ(AtfB+U4zMz#Inn{r~`@ ztMvV|Wl9e#qW0KHYKceC6Pq$a=|2t_2`ew^#(9{-P6EP~8+HL}99ir0cEr5$_9?P= z4M#b6cHXIKL^MIm;Nx_-^tBhBs{gp?A2>YAQ3mvo5jjF9j%BF0yoUiAwM3<%>dbdBv z2Qt$EkbfTTTM}xXumZ<>tf^Z0Q$-ry+J_HyM`l?2X^1|)<_@p5^ccI_42{NYzJ|Vg z*Ss)Mu=Iv!4I~X@K(pOE_?}Bj(+ShS#kF?`JxG(TE+fc=76ivWCY3GKLB^aT7KVw= z_6p*h?aK_k$CTuYQ>PWgdklJrQTy=+jTi|oIZ%8gPhgL!E3Yp>FXQ2j^W;YtEYTTEfhNVy6%=_qrL;{_bGBQe&c2HG*UDNw~$J80TK$52mNXm$T`Q z(VXIP-Cx=Rrs%*UZd?j)tz4w3jm-^(zzGpr@?bvA4i!9FhJdQ=>%oi)ZxbCIE1!CB zZhr8nb(b#MQbfN7*~=nd8fvW9Kc^gYQ&3$yd@m>x9Xy?BuKU&6oGWDyg;0Y6FEr1k z9$3kw(t^TKGJ{aaKC!J|=%stUx8Gq1G~aEHlxxuxj2OObQ({uW4{MruAY*_#CSCd> zdtlu5ZP3Dd63*Zozyk3=MfyAJBJ&^k$(mf$5ry8l5VDM@arZuKD|pHKyDOZLx+(3g|}2qgD${dqcR?Ogle{ z+c0M8aQGXBXNT0>MxD<>F)cP3n90b zLZ609`=}{iDTnlf9~D1oVWhfIeW5zg%~+b~(X6&M;c*?0`d(A7i*Fd;GK$I;n^Z1! zZJb4pUwhr7I1X!4IuXgL~ zUqao+^EK#>i?$qy^d0mltN7L&ZVW!bv<>DijpC95CJTK*H+{aStnTOB3USeS>G+T> zj$OqivvJo-O<@sn>pJ<9P{Z7>xQSy-&voD}n;h=Q zDeG#a47~&Vr$~Hw+XssILaooi_T1d;!gNmSBrTF9>%_88Em&!>RmkO8q=S|0t(rCb z{_<(BGR%b=w-N$aN2~X($;(6eu^{v(f}+2NVpu7}ztY^1?e~C>I1&S3LyFGm09j@wHB*pP80P|HiG;gdM4h+; z`cy4$Ob>7OmA$n)1X63d;GAJ-DbR=mH>-K?4Ue#ANK({zox`_*YBs>ZyS7_?uGDSv zWA`h_Fz3s?IE8ijsTG&-2$}71FTglXVRua(@!!2rwxGf`RB+3mqPD)$zy;kcr)cXu??iHd29|XkF2J+cQd#MD z69|>7)orxz*JYg|v{ih`JLG}PZN-T#0oF;8AG&=G0ZS2x%WcAkKueG}0U^IiKDnlg zd=L#ZqD+f_3l0js90#17u}n4sa@VuiiyYx1$tABFfL{qVELAtM+E?Xw6QV^Wuy zH6Lg8=ezU?yP5g<#T@mfuw;;mYTPgPpOG7LY%$UX4-r@F+FrGJavNZ4Ti#qlGarWi@inq6TAL1g&UBhjGN*W zczu$+>Xu%QhttK%B5C_BE|_80Z|cAX^>V@q=y(fM4F*t7+M;p=mCadzK8dm_k8Dk-}@ea z=Rf4)@~M5__uhN0y;eyf$o*M`%?Z{Mx|OfoSzsUH}*g76WcxM&kV7fahNMVtQ2wfPNNz4 zXxU9?kAJ#ODxy_>P3{n2;Tee#d?GR#&JbjQW$@cEUo_L(O~p3etSMTq=^1nOb9Ced3PbuO=$*=Wg2iXX# zOyMI{)jlJ;%=hDdYwL&08iGCvY!)H>&z?OKMngt)3$@jMEX=xI!u^?x?fH=PX@TGZ zKJop1G;Um`v^^{hF7T8bNG#fkNq0$pbSrERftVn*$K~q;(+KP=@zHDkF;;d6%A3V? zhD_$OrO(Nw8z;<>AXWJVo0c&f&7Aa)w9sK%K1KdX61UK!O-m!EcaR<=ux$ficQ_f_jw$ zH*tV|8;NG2c4?ZOi8_GJd{w++zc>p3jb-9S+uw| zrEAlE>p{mES30}h)WT~xo>7dLKpFmbteUo>Qn{6$);-kx%kf04p!HVurl(`6vFBQ< z-O5|85wbsC{%=jB@Zh`Gzby-L|2MkdlTHlS2F3xfT(8u6M&^%j8DC`Vv)t~yG&-c( zt5-SDn{_~h10DM><0VENWUFuAW?l}PZw0lM7**--kMQ6I_5o92)EHn+7*(d=HXm$P zIsV`PNE@Cd3t9+7Ynr5sx!gZzQcUXQd)i0^?teeUVf2giOMmz=*xlvgQq?at2Go^K zoe)J9nMg95vJ6Q|$j!wsw$=a!X?*M`f&}pW+V>d4?e7tz}7uGrU?s zuO)HLdM#lB15J0LdUxkCm`1_AJW(QJ&0VD_Ed&{@K3c)V+(`W1Y345MN679D6Q!rO z!t=jT#uWpJZvfbMzTGcR03o|btQ<+HLwzdo>K7Fo1PIoh(MmnKk(X~mH1H<}D+jO! zjbeSe8F&I0o`)$5z0&x>d8StDoTeb-wi!rf{3UVv~K;3ylREvxD7;uYuAa%Ja?nS&vlx!Ht1if7_^7t%+iy zZjlGr=syA?N;|o&;^jggz)5Lpgz<%DgM_AVvQxhzSq|cSsT9(GY4k<#7x%^K2=wo? zDY*QCP-SyQ;>^_-Ez+2K8AJf3FHRvLp2v4`*$0?}*jta2nPmL>Pd=rG*yYQF9JxC; zAXZ>BSGFoIN&9KrvaHt}W@ttePFmz_k^O`dq2W*MAd3Z z)!;3t{rGI(d5!Ad}9Hp^XFzR6{UsC&Ql$_Wi8O?E>N-I`{Hgs#yd zt4kw%Z?s3geeV8v43(ew+U?fL@S6{epu9b-b8>imZ$cc8qk7O$w>}_PIiD#K{{KOF z{}Mfl0$0!VS3imyoxNJtIpybDv(M2qw2im^VqqcC0xk#~WHHVzgv7hP=jeyda9 zoD698RwK4Tw|vqCI&57MoK6NIxQ4yGPOvX5s-ZcFIa|_x`lu~7-%}k{q@#L)D$o0(mTQE)Yi?k*wJ@3qG3#ApxEI|f+ z`B6G#!JKmQ=mbZ%-rnAGaBZGoW*)59bt-S<-I6>3jIP^6r<6UZ$&`oJJH?oZ`vmrV zcXH6b{IZLoK<*+L71c}Vu>Od+kN?_>#@+WU-91%iK>-q{hmp^APkG&Xfic~{^?Zp+ zYq)wqj+X?y+0G)c*cRtW`4K?v%xYl>lW${@EqfUb1S^Y5$5O^m(O$H6Cqj)|z1|le zP7PyccQBEbwrtOtM(^VeSz-a8ajy&qIz$t<{Me;jJn9f{XjE>HA<5g(DH8o)8Fp9w zNmLZ+l@C{P?y{=C|H{hAnfWuXv9VFLYLOt1Sv5u1HVV17k+s5xe07@Eq{0tjdzh!x&t=OL<|uO#zh~f~oC{W-u@h{+5s1 z&IZxDp2ee2M4VR2b7yB5#7hJLlW6zyAOVUyvcJ4uaOvD}Q{Qc2WdY502*}8Y1qb?9Z$A?Ds2oOe>etJj_FuZj zn7Fgd-2jn$R{2^})GH8&f>@t5!N0veF3?PM#7VWk9aPd$c%idj?6LfAcPv&(Jhn0j z>$+>4ZqRHi;r)4;=HHj_;Zygvx2RJ&@2$MkG!FVHhp*&~nOU8r5uSmC@wS7p<23cY zB5mc+@BE|7q)FlGqfymtilppaC-_de;!# zmB=`ld_UMT_M%-`PeTOVtQXv82~4@BacihMnJKIGcb=$td%*m3&DZNi`xEz5o6v8X zoWV4;Wna`nh3F|3GVA*1%({a-rnu@Y*LHiy>VI|L@-7(x)s#%LSmHL0#cqQ;Ff%Ll z!t^Vj?i<-`=P2(EwE3Wg(B~2vbT+G7lwhZ!Q0nL2eB(TV<_#P}Vgc&Xe)jx2ll~8F zp++1El(@OWdfRyL#+d_Xh|1?<*+3R#3f<^`j22n0aX82jEwhlBo$_l`qOKtM;xwU; z=5PiRLaHg^i_o-^RDW0iJ4wzNH*KKY~oMre|bDj}ZNCWC1fYE;HjA zm~sg1;WRE7pUbEa+GhfjnWi;co*hxcR8*}8aU(a(z97C;%{d&|r6S z+*?DQ#dQS2Nm!*mr`T$h=79sr^*Ri3zD7#oO9iUL$?{srdKp2p`KgyXF`-(gB^UyR zzumgknN*;a{^Xq0jFAgEd{1cY=S(2qPX`FnL2qdJvn2983Fp!2JY5ZMP7|_H^&sAw zWssxwMK>MLImSRCX5)(;4L-StDc!*S{_YN@rq+d{EIWH{ZF!k}fpS9-AyFs)3}7PO zZIlCCCBJ<>E?9to{d*Mv=!j+n`94$HC-xQ(nqWbpto4EB519x$uFcBfruq%)3W;%& z-kN(UBUv^Z3XyrUR=u2hAC7(x2CmGCnQ$GY7X;)xL6N?o<@n9~pDDc7AIQ_3p5M)U z-k0!@EA>K?wivi~oU)K3;Gu#Pi1W!>8b#1SbiNqw^GxV(vKY&b1X8{JquNg7JhF)T z$;?9S^kVz-0_#e@HfKl%F;7#foGn}?XQtM=PEGDb*AgDc<{$~F#nAvho zahgiJpD}B;_6)n;3>~D~{=o`K6#=x?G(E}@#hcmfl7i|MtnaRoLH~w;P7Tyfyd5}R z^xXoxN3~W5m%aR6Wiym)1h#?l1$eH;CiW)u53v&-^qOb+VMm-@3WqYpl-zkx;`|eh z?!B#OJj7(mZ!wn7a7D2Db9Q2U=T(i;v?LT;y11J}(!8!3;CXDbsFR!bJnAQSeBcF$ z1?Rk6XdT%r``v3OODsXuzahB@nQSQTJZ&p-v*1ab=BYtRQic>*J%P-J!@SA=TY<;+ z@H2RANXiNn|79QV`<{f1tT&IRYGpfaIi59CHlbt{Ouq*@yxp8dq;M^v;M0~`Enn*F zvc2W(EU5-6BXh4y=eh+T6>;x)Z#6lvrdVU?QCXho`bB}BI`T23STfHG&9X~m>RtPr zd74Ez;vRzwRdju62k9;Z+9B}=Q7)#KNUwEbXUnBz7a2~stc=}6`n}OrUSZDx5^{0+ z+pS0i!#k-?Lsn%SRSvW*Q6Oj{fE=lf=Bbq!6nxxNsp_I+5i{>g7U0^WJ!KaZb>oPk zXCK-_G);6mAS7IqjJ)X5No2_Lz6tflOXX5t@h)p7P_<5#wVq1r173aHV#O~K`)xl{ z@1F)8s-ZLB`3@a{1=86FyIDBI4ilQdc&{05V4z#@L}0#a1XqS-tJ*9?0qat2^QH=C z$cZSV`SXkvmp1Z5u7znTI9+6cgys^dS|;H|P5L{+VWBlNqt`sf^|t6fpu@DfC5D?H zk&0}lQX2?*nl2&I*s(lQ-MX#@wpOzln!gBMIHh=Av|qQw>$I>i?J_y50`|qz;?9P% z$?Z_t&Qi;C7S1;6G;|5IE;GHGV}){!6@QpaZc}F8 zZs5T*+IJfkCvlO1U*$E6mT&oAT>_xN5ToGBJ_=?3aRO4m^Z-mL1F1>XT z4~pS-u=1I(QrI0vLryn!21frW5n-A&YH$|`t2C5bo3ZG{y_#O}+l$WNa%qb~DLjn1E-7vp z?pJP3_r)^jzD{Do53VEo-q9rVeb@QH!c^!|ceJ3#K#jddyksS1MY;%v#SaTID65Im z6Wu`gYDJWu1Rv!7`UKSY%z~VH1w&#)K4q1@$Z76N*O)7nOUzo;R6nJ1kX~JhyFmQ} zwmepD14vu#`ll|5vpV)wOVuvyP#0SFeXJJ_StD-Li8yX(#s<_mjfSSzqAR+emz%b? zB=eh@UP=4fTC%{&k(!V! zbLO?=J@W$U-NLP%Sqb|-Pt8T(e;iW}Hg_!gU1U3`aup!#`(i?m-ZDzAG@!q+pH(P* z7Aux}d2ulG&RL_7jy3V(hp9>*^c`0ES_l0$sEOZnn6L#k-*Lb~cy07x0KSX=@T4z^ zhpkAjusZ)Uw{|KI=|D}P5F#6kZy!ME`)cz?nKs!gQC|;GI|)YhiEjj;Chn&|tcoq> zXQfIG9%mm^iPQ8YRkynYQtg{Ny;Yop*v_d2G&z&+HSSb(tudIWOCu$vzt8(MFKEx$ z6F-c}mgT%*)}1LSZ6#eErRkoV(78LB-_O;9wn!Cn3ZDxZos|i(C=^iw4+e3Aaf{Fa zshGVV7|e~_vs+q+`ql14$AEP0@{;<8JWNclo}EV2tG68440H1bxA6e zY}H|Mb%F@lst77C#<3Hk zOc}=)o^49yX_kT>M#Lb35VC5}P#0tUqtNP($DiSg-#)Brq?dR_X{s#7mu2`th~MFjX1x=Pd4L63nc zHT#Q*SteJ34NQ(0F01w~>0Xqr)cA_1$8wigxM8|!cyPb|6C>*3!f^dKvF5`v0P1cx zCD&w~JW>-`Sxwe*rj_KEIDLV^YU#HhiOb9vqZTTa%_Q;@#59(I+-ed|1H9la+?tj- zwhx1gRIK1FUJ%(Ah3_a6#|GT){K}`_ze3aF6w#4UADIbDFJP>+-5T3-P_3KD2JseZ ze$5<{hPb)hKgdsUf|;&kh7UO*%IFL!&D9ahAf{(~8*1Ea3@B765eijvSp`T1>OP;^J z1it_Cv(=?$sKmN7x=RQ-e8;{JV?`M}?wm-kRZ%G5G}%?d#hYvURnt}Y02pE_e2Iym z7Ttsn^qOxlmY3Iiu0DX%nf1Q;{Kc!(xKT+xh41dc)^oa=5sKtH8{bpuBvLOtryQNY zez(=x_r(;aV{t&PFy#rCrmLBBetjasG$O}iGjCA+h0XE|w8-8rfgWNx6IzZ>B_+Q6 zs4$HB!c8Q}F^jU7h@wk$sluut09KEChEA;TTSXM0~eB1P#DggZ+wQL1! zs;AA2@A^$@!U{Ql9yVJb;9wg{pC4N3647=>7W^7bmhE?E9!DIt94&eI5xAWuuj8-O zxhvJW%yALYZuTe;ga=SL@(rcxGzQX6*l@l-&`YoPlZqadYX279t>VE4aXv7-b4!Oi zYU%B@STBKRA_#|K7w~Gces2=f(}cS&(w-y9RFfgb0+N0Wk46uMm~uG1#fHn>3lO87 ziGz6C!O$Wj)*4FY@s<%dt+N7ep&)7BF1Ak{&e)3@9=bMn9eqngJS!fHkX@UXpDS4x z+Ve>p4462(fW57~Z5jTtZ1#^BR;&aK04jVbinSM+vy(-a0KL(w8oX9*1N?=Hn${@&kTrjiE*B&m)Sy$Y6_GD`q}Gp8&37>R&3!+ymVR86RZE0$ z;NRHcLIr&V20PG7xZJttySnwFF&N->G?syxf8kT@9`Ih;rTAT1H&4Z?=8ScL3bWVs>qU1jx@K zZ@W}?VpXeF-bI@=o$SnE%u+oQM@rqZK~G}m7Z^O|934oBl0I;En>e86va(>@%TE3> zSrRZU`W37Xy^jv{YgjaW>@Df|z~VE~$ocESJU-I-oh<)CF&0$AvuZkME&kDQ&(?NJ zHd4k^!$C%CLByEYFr6$+TO7_Owwy=Sy@fN3xB%=%ieCFuy@z)0@LjRm70(YVy(<=a z#4&`f_}1ym1UL@vVM#Ya2G z#5c^fUL}Z?2M@07p5>X{wC+1`444h|qUx#0kF+_sw3=sKYkfFnTTtTW1~^gyb)XCD z@ADF|A#cYT7S;ca7;{&4#0)v?WuIRAJJDWo*#e={SNEd3Q^e~l+M)rML17;J#4+vb zub2Iwr@(Cy#&25IV4#`%?B)V|LEy4*EBmeeNNYE5V}Cf%O7ZWRe77{GzP0v2 zg2!3-tkke(kc_cYq;+9pvU$%5V4ywP8x8~CnYiCak>H^z(n`ahp)k5wQL$|A+hqG` ztCvO4x^2Zb=J+-eZ}e0RjH6S^>f(s#SFLn1NT)<=2Uh>a zQxQ`02JgilLN=;uP_>}?>>d8kc4l7$a+j? zAb}-RD7>0}HGxWcrftMelV{_*DCIDpv+x4}aRpevR_c-+gMtlJG&1Xvjp@lO3(=lk z5h8NwEaP+4`S$6@JzQ;+;C`w0!D^TrY`SS$`gsar;s@{CLMSYBqHHgbl42I@Q+!(G zoeI6V;Vtm&R6jP0Y&l6_ua5GT_u&G{>BM_8&!*pGZ@$Vd=6P_=2T`X<(n5sN}bp&AgsS>1wThK}JjD zies?_UuhMOdU+O4itO&kH!`)4Ci6zi9Q8NFLSk+m`KR)Wl+aVwd@Q#MYWAevlyZq# zId(5X?TzS3b$VsdCv>O0PK|$3X?~`=$xCf-t7+?Z-+}m>?BjZg{&YwK_(Kf{r84r- z^JJn-OM{`VCODs0Qsjr-q-PV3ic!4%4R4-nspIc!W1~g9`sGv*vx{d9O=Eh*5wA6C z+k@i=t>5CxQ_7THfwVJTM)U!_g1CNzvgxp2?%Xlf%K8bNf;DQgB3;(c#s=OH@*R97 zpeQI>^&JaTDShnL+Fres9n5Jrm<7RkhbeGtLQ;{*C*@#z z;sa)fJ;ukdy;R*EAbzX%(k%P#Ia%gF)=axIrQb1WR4JodQbTkiFx9sz00PwFGc&50 zyNy&Yar3<=2MDFZEW}WUC-ujmS!-f%aG+4qs@XLVE_2EaR03CjWag> zt5f9_A#$)*#|(pg4U-H>uBD&LO$}Ni+i&LzW-`Sq0z$olnWX~Qo`MT~lN@{wrOK1E zY9B)P{Wg#mHGS2L|J2Z-05gy{=HL&D&+5LDEzjrBL4 zOQuB+Q}5|0X>8NpkA;yr(DbCp%z6NwuN0x>f+z3?`F?w=PzRtp5G%28@{2i_Gmv4z zkJDfzXi3z9#ehrJ%&#^w#OI_yD?wefVh1C26;+U8ELxdwn<-q|Fd{YS`(Q!zs@asw zL~&w@f)+sPRgaOGLvOuE2sl6;WSxqh`q9g8>F^lkRPc9iQA`$vI2{N4Vi`R~W%(x9 zx{m4grQyrZljUxj+lBwF1<)xGf%K(R4PLcX{iRu8>e)^lu+m|U&zrcar3`)6&uma; zs4tHaX=5(L-*pN+Yj6FST!sm?jlekSmvaCeG|v<~Wl#x(B18vP>VUyqqZXaoIY?RQ zz|JRPE`3T=)3bvMIVl)*X0ATPhG3W7gFw~eUg`Q!7c~btohgqjq2*8o|2Iu;uP+@) z@6W4_pQq`D(k&;e{R#c(QQao#?orO@y2ij3ouBiUD8YM^O{os86*HL>8AB35T`d+| zr($~5&gG#}TA+7;>bD!nwq1}7xk=4HX|?WS0HGsA`f3o^<(e0%GH z6gAD3;lzNjgiMhIA@%8u&$%|y=niyHe0vBkWp#3^H$|{~r7v><&VgwfGm~zHw>Otv zH7GNUsvhc$PO+Y<_`TcFrt}Sr=TwV-B<&XpFxK&4wOqy%7S=$#T+jh6ly(CyYX2;P z4lz+mjRx&z;SE*)FiR5th5u_S_hCTD=Z^t3??nX@+7Z@`I#X=9DJ%)>A-q9zga3Fk-h~QC@x^%le@%VxT@tZ_8yq zr31_dDDqNqpIH=M5|#i#vp}`2RYB>j$Su5Nz-}VtT7QOA!g1mowJ&!*X+=osWJta| z+x46eo@Oo0Q%g9h&9x9Ah{*eI$5K*ENO1~-;&RU^MgM}u{y+azMA8i}wpP#4_PtNJ z+N-D1oWgwOIVqo7efS3Id>dCTxy!pT19}hTFl;gH?U6a_Zq8~4`N@pi=($2#c}5z8 zu=1Nb+K+o3`gYG!d=Iw7HqVsY^rXeZq1AOhI9Gt3Q5QT{7zq`|T6C=$0*e4JWM?|{ zlN-)E%iVGtXv`hhh@)XW!o)Qnm`eWJJN>U44~q=5P0~mct>jnOs+5|hqhgf48%f2I zK)7lBo&I76o?)jGyt#Cu`#bpG70l@`*^Pi0k`zMlWuC+cs-mO1BasRMV|M^~DWrta0NLIRy z4&46dU;mr`W3iq5sN9e}p>Qx65RKDV`W2NoneZadywvgLIx}g`Kt|OQAoE#2c)fs` z*A}+xTl87jeg;zSqS(x$1$Fz0dL%gnM#9-bqNf@Z-H6it{1pH+0+hqXZp= zdL`7twy?7jD;c?@Lhi{{u*0HjJV(^4VZPLVZ;bw5A=K6(;Eq4>IsQpf*F2jO1wBlW zexcrbY$)EFAXE79BqZl~k)ifYE=|^ppgWv9OI=A0BJ2I$d--r|b@|w2$qa{87oHPf z<%-Sdy{B%IKw$zrk-vD1DyA&X(!^(chmyq-IMfq|564>0ZLR>gRsGnL6D4i|D9i!9 zEhz%W$nwRD5y%YDtKSG8YU25fZt^^5Eob5d?=egHKC~S&ac)U|^2)0v41k4KHg>?l ztJ1w`QVC3tFGX#b;z36$pP3YRf)1Ht7Z1wie9E*k{&;uHS>x|6m!zYf+24Kku^9}zI~1A#+|>sz#-I<-bY_3iHmi6 zlYE9YEgpbe89vt9-~<{SP$ycu9kFp-O`3Vmo3BP81WW2_$WOFMWnlB^1OL1{tpwxU zRVXLE1!uG-aMX>SsdUQz_#i(pBqSu?{x|V1VuKuPJ7?P{nB$h_vE8B5T1(`#+MitA z{%+wKBW)QDHCVi^9(T8%{E;UA#ZX28q>vyI}m#Mqy5M-<-m*i*_DJiL1c6n%God-Ve=W@Pv z-+sL-JCg|O;_F6S7j$Ozs8`QdPS~&87n_CGE!7Q36}Bp)I18wjL+__n?Yt%N@LSjkLc76MjnHLH+kA2fcK0XIqh}D#qi5OFXedJe)*E8ul9$( zZrN!v8Pfb}H@Rt{m+5Nrg^i8}GvwCiO)G;P945d;X04v9X?*6jy1*C_ z@A=-+P*bc1ptGo!y3kPZMl-0R&eVY^*Aw*HHA)oNcG={7l3Bp$S6L8F+zb7x*AaZt z7j^Vuu9SXP9)XJh7&Kzfu``*Fr|nInCC}tc;)Xz-cZy7k)5c5mM@ZP#Qv4K7bj#98 zOye?({YPFO2CHbcS=N?7`p(213=OhM&<(XEZ1h@+7N*q0b-g5`G%1|tt?j)nI||tu z01rVPn})xMQR`iL>vE_(B!7ed@k$w9tZt_nG7VQ2u^Y4`rnuDSRGQw;XZ2;0M6Tsz zw93~alsXZPkC+!<{yJyb;^VqtENr8RDcJ?yp^zf$em0|!DWTYi!;&Nx|J5f}TYjUktU{zCD^2R5m zsZo_Rg^#=)XEZt3D=nse5a?VccXD0LA-n3h*2?VW=kD8RQKJdAy?HuIBIH=Hx@;4j z-uA2T7tDIC(JZ>hEQZ&RH3qkBT3}i=T|D=jz1t;O*{;x5LG!voi!;2oKk>FN>FJH5 z^^NThiUT*c$L=fx$+Y64FR_H{Y=v0{Z05jD;m=FEt(nFhjFBqG9y*teh~;LIeJmAE zMX0Abduz+MZ&&o5_?e4-9RMKREO%O!l$tlCwI4Uf)HZchTmp;=J3#gCoVgI$$-Stf zuKq#yL$PN+Nxn_yE;l`sGx$y&X;kE>jy~KtuIW92j3%oOCg3U`$e9)kLY!ZT+;F@w z|9yeGuLcn=E|N{gW!|uIrENUu8)uN5$s_di`g`(3?`a1;0V9*wBs*FKKQ+OaHa5Ey zs5CHuNzJXjF@K&O{*on9_;l}@5a{~w`3dYsdjhucV-)H=d^ zh{Gf2jc&0m4X}eI^3dU$?31M^PjNei3jjmnE-;RmAr2Z5HW4;}Kr6=|nQ2ArZ#QczG$T{Fd z#>@=H@f6!2=5|tjbaK+O_^lPr7iJ8G=yrm4AMU;TrkyFFqis^FUo~dan=yj)BgM*@ zK?+Q%C=z4j5q7vjiEx)W8Hf)HBEYO+q?1XtjGcYB?%-j|0ArCds2hi6nHKn7?$inv66rsr~p7;DZtSc6b1NG{y#9&c7)vjb%3dq_={eA8Tp zCUjt#$c*;(_N8Elz9ovyu}AV#pxNT}QQy|H*GDXc{lEWoiiEYX^L%a9n-s*)m6exc zEvtfva+N{=?GSLjQ|1Mkb=mS-(Bpoc>O;1*h5n>k4!~%{Oq>E3t)wJ6VVUrUf4Sv<0MM^EL#BgFpaSCaX3%(pGH;=P zdK>EA455%}i-*?e7raRc9Ol9gRB;@)uM?4=(-kwmE;2~Gju5*L3-s!Qlvufv@Sn(; z2mZow$m&RZg0qcpdIbGo4g`>*=FPepaH~8U$ysL}uE+G>lrsOc=))UtvTkF_rX z-^^kh-8T6(^3atV7ygr?7VvEmCqMc^o4(d>`XAQOE2Nq$78#G3i7x#4$o)qy2E@^; zgfJb(SABxbmzbKC>bfsT_`{%ze{@oP_oYDU8KHsYk$LB&fu?l z5L~wjUyNmlFF-uR8ch1p^%ssE_V`eLq{~DVaz?Jye`9FA7O?x%M{U%j<_oxp)sV{d`q6eMUZ4dF~jyC!Wj~YXiK`8<~-NKIMZQbwK`( zBRLHY4qoZ{G$r9-`v?BoKf=SEK&owVCGn*o%{iB}w=aZfceNx0d^Sv)dK6e`pFWVP zq2vkl!^@XH8HYaiEYP|)6QsZ2u;8^E=LO?&Kpu-Eyodu3VG^l z{zXFrMb@q>_75`1zP{*5dMI4@Q4p$?+;Tl3qz@p&F?<#GA7KO7v`^&&q*G4IEgi8w z`w~V+1+J1dINzdFvn@IeCoC!1LTnaS#9~HiVSWz%*a~1#uX@6AgGsp`KZ$HL4t059 z=sg4Aw|!nV!c$i71ZD0L8NANZ`{ZoieYx>j740=6PeZN}DS`S?u6O~lDz)F5YAc)J z2xpjqs%x@ARu3Pl*fyyu<>G2bt8ag6(2z!vbMFek2If=?wwS@dzcJ*Q$5rnZr|NXv z+;kQe0Hh-?$h!n)kwr{uWWTG=H%#7cf5Se|M3+VZ5;W+s#>p)FSkvO+xp~riS)?p5 zQv{}ZzI#1qeXVf6{r?&x{bBhn9ujw7EYq0I+i_l8$S#i20J^^}wk>@Dy6VjsSRd8Z zYtu@Br#1b_mqWWqDmGil6v`4V+L^-f#@A-<8E-+7$b)A*_v3@*W?uY|K*IZ1o(P;I z@xLGrXjZ3HvwgjkjFz{nT9OI@_=l|hhZ$b_Zn%?Y2g*fZ82!?3v2`u><+K|6EzF+K zw6}4^ef6)cbpX-j*gnX>$MXaP8wEX3TyvFU&z9(Mi6M+zV}cs>uVDjE>*Pm=thW%B zuUF?w@n5Qo<6j8pzZaw{BZE_fR%t!RuthRJw(15p3?FXY(q?zzwX0O}o#%S~!0MIB zYwYYQtAnm^Gep3z$>pq8BxhM%e7X6#d_roFKon-3U5CcUhO-3Va#A+ng2s3lO6oS3 zcjHCFvr*|ed&FM&!hEG2@582MhP4}%6yy4$UN_Y&%LwHM+$%=Zir?wUv&CRPtRC0A z1$^pDKvKHg@3(&MD_;nYG;JG#!3o}50~fXzMlk!|8gWyr3!kl_Zt!j&*jx%=du^-f1-Afi$uUdHS$!_hi&+$p>M zSby8%wkwEX!}Bc?~MfN{H;l6y59(k~e~e<%hFi!y(uCvpHDC5+utm>?Am zbe#UNq5b=x+=Ide8CEOd+p2;J_xU4T!1O!Sx7=Fx)06}=tBbe#LJQgFKH?J!FO?J5JkUd5@HfG5iH9hU7?T>$cEwlN)@fnQ!Gw)ZAbn?psDf424 zr?58nLr1kF9zbd;m-w-fY(CwdmVpg|Y!Z#bLdcLK>&YT}z2!E{8 zc3ibF(&$jjTJG9M-iIl6?>pgk8O?m9`n{C9}B#@c% z%t`nD(r$-J6~_(A4@gs^#zsx zJAFl&n&OL4Krn7q({i6zC9hMEfin~r5HI^JTlR%$X-3P+eSYNrPOuM{e5=+rU*yYT ztCj9qKTSNRO>mI`$0s|3ot+KFb=xj^fXJ3LATUHZ$I7BJ$FH`8>!af;epzs<4BTow zSck}#vED>`3AeZi?SLR9vLf!8-ltaS{3aztf%#S3RUJ~RpX9nHS7E$%aae9lym*pu zm5?pDdSlQBp{}5Xy*6YJ0c>Y^Z3e@EAbSY z%7nL^cM98|{*^U8Thj*b4?mnrj9PkkhrP#oT*hao!TQPCm9ncfVQ)yaEAE|L zp?psCE1nlzuM|67dT;aC`GQTvQW-MhWss)1-@_j(T0A#UR5RH=z}YYNj~eXFKi6P5 z(o3Y#{!xyHzSn2|_iz3G9C>w_ic?<|3R}sBRc;*>hGcvU(k93ROq7K9%`BaC?Eun3 z%bnOgatj>eUp7}As0ux*!Ncx*Blc?5fX9UBqcJ)y?dl0TrH?=;9iKr ztPdOcX_$cKM?o0N&A;-|{>Iz9-c0Ne|10U*1XvaG_2W5j!vFG7?7@(7gvx)I5r>Dx zI8<7uY2Ns2OY0x6n~^9xHrCQE)!;w7-u3sS#CiB=Qi&*@zr11p*LJ?hqX@Uqp-ld( zFZ^#216&QLlArK>;nF)FXa37!1U%;Bwr&^CAM*_hV=kF8ehHp227qn$d_&>7 z2U$!HCXywzIcJ{FCPFI5`swfV?*DHayj$Lo8tGPL+dg zajZ%6ZQMH>g=wXWH{vR;SB80km}Ky9Bz(`S-n*B^uo(LY>jFqd$h|+y*sP6f{p{&x z#b$dYn1F9{S6~=yW|lkg!{MaN2q=gU`sy$VLxUD*UFGk^eE1aGBD=@Zug|H%8o=SP zK|*}-qRmj2oF^Jt{}krCzai8pH{Nww{~aX@n~uVqqQLBF_nFs_Sb}_rd;$_)rQ-gp z8IC-TVGWtO4p;uLk*4%0v`{CzGE_;a-7n+^P*fv+P;J=%FDq5in)nXM_zxcjc%@b3 zc(F;hFaB%yHq>f~MeLb{=m(>wYn~R4gyjP0 z+MDSD-mwC$l&eH^){_I9!VaSrU?-R>9O9N8d^A!xTBH~0j)%Kri3gjn;us0&$NQlx zfQ!`XA{!>jM>I_BB0==R(*ybyadhYg%+DK%+j+!J_D|97@Sm;sT( zp2xj%nW^`{HuZ}nd~=MDOb;UP3pO9U4tbxOO@bQDPq6M!eqlTCh3CXU*Tu~TWH9fK z7n2G-eFIpc=w|&efSs}LH)24sKsffqa}s)lsGlDh&xm_=oGz;R znRy@A+NYF&DqEta$@4+z--Hbfp`(%M)JIqpWTB@{p*y-|OPuloa)E&8xz;R*+yC7? z{H=9LN7}Y0R;j@k#kV<{U$ZVBeDq#3TS)m7pQ7<@e{*%hz(nISBRn4m)NXhYJ7_!u zfTplC*|ChjC^J>_ZnDw9=RX8ycYaLtyXM-Q5&DpDuSXgzbb|WhpOYTEe7Fe%h2guc z0GSKxrC+_ebx)N7mOs_*CZvv~O*rMv>-ppZlm1Iq%=hiP+DEKHQ$S}%_ji^$6FxId zYn+`Pqob+0|K}<%T!wCV{ViZo^%fY&d6dj&&Z<2;;RQ9BwrjvN&CSW#XHM7TSv@we zm8YZ~UvC74mWW~ zU0r4mX^@R_9J?Y1(n`J0FzFUMTki#5?*)AOz_>$<0&4^rWgMVj`lPBr3t9WV1vOQ# z*K*uYUSiyA97+gr{_e`Hol%VtY#RPaCj54~S3Qwb79=hfw3b*j_6QSqChM~?JV=K4 z%phT|UuMh+w1^Xl77j%e_M&oS<(XJMD$X_3sI*pZV#Y@cb-0@YLtnu%-7F694~<*4 zO^12Mkspxm*H%L(BvagT^3A0={YAqq>q*n`n-@NHd zi3!BK>oaal{?YEife=w}*`h4v=$;Tln*gk%-c1oZq=(nqKou43{uJp|IyC?Y;tZ;F zt}Q`jH3ywj!BEQY@4s-Gy7WBhz8qjfcal1gE@RR42`8uPJ=CT!^cgF1;c2;7dHuCQ zV58(CTH&_(_2ZcKj=276sgjPR)Q zisvs9z|(9;fnFiBWNzJ*rTl;1)vkMy)Vj{uMuZzz+n+O&;glykK~jLtJv?~;O(nDZ zoJVh3%eZ$%+ay!EW;G~5s^ZB=d=87DxqTMSF$hXhGK|g+Bg1Zb`MA*BPfTeEX$5qE z3j6mrLGbuNXjaI)yhbS4R_oYj+&)z_;6sV=rki@7d2(U4gQY@S`4B#nA~s+zFgu74 zY7w1%%oHXcd2L2J!yC|sWGxE4Y@Th=>UxuO9Dt9V4JLE%EhdiWdjUtJPj!BMqpug~ z?hhB>wsIuz%)M$*JlJ{xNSbF0w??Phx9?EHRBuJ&c$Mu^)D(lebgjMKL@A^p3sgpJP?Q?YB2iv%@ z^~5xX?d2HxShq{TZo+XPR>V+Z&f({D-{x4tEkfyCbwpPMsYUnKSq|ab$)zS*zI7A6 zK?-}nw_EKr6NU!%*0v^oO!LJUX9dhR0j`YuCT>18L+FEm5Njy;!@WuFsaZFubP=W$ zY|}qAIwsgMrLI4h5dpE9qBXZnJI+*sK<33;y^8qtw2V-I4}Ek(zRyVStuP327v zNpqGB2w(1TJZ$B0F&dT1GoFj|XZOfbYE>K8qxk6?4JdEtDs7rpf8LZNN;Kp5xXFKU zTq{rkH|od)T|q7nwHE1ZbcIuXR+v{QD;IvTyIYfFf6gZ_OdHQ-P3WN@2x<2$kNCnz zmB9JP0k+~*-x6;}K zFIyD@e^mM&o@RV~9L3f6yFsao%KQHMX!BgFY*HY?q28_C;^XI;QY|@?XeR1MmEQ-r zt{S}ZHH%fXfcCW#GmUsylu!KTw0gF<-Cgn6a2+GUrKt?L#{Gg2JaMk&VNe@dT3@oG zbqoj)LG4Xc0;F`%Vjf^NI&pMyCViJ98y!|bjAneM=kNKaku)BOFoN%PG?pGLeB*(9Fx zPkB(k%hcap6A_kfcHFaS+T=$ob=*1I%p^Zuv^Cl)X$L0v{`Lk6nC~v29}CINP4b>+f;?8WQSDy2IP!3sse$n}c!mM+A<0xADefQT(b;>l@@~ z2lV(G27Mn|tY1YT?>z2Z0G5rZL7L3F<_%94exq*~&KV8154SHOF$g9B5v;NP-L{U% zRY~y2&jc!3TQ0WC^Y|mkqYf7_+_Er>Br|JJ3{@Pj!_L6$>UqL9%>BjPR=t*`LHvY{ z58jKmtMG@*Y2KCcrS*na^y-6Gt1lciPVCs^pQ4~FtxHEZUvX8m8`iLJL5{TU`2C#@ zW?DqN;ckhT&ply!F$CkW_tX1gvI#dWS2frzPt+^4EFV|b`MXDuz=q%t&y3e1{EV(7 zSUvtDww?+V8;7j? zoB7=~D9sR`^PyFP20ImUEiWRHl*`Khj`Yg8kJ!7!LWsD~dVGyMd;V1D?jHRYgAdSM zkfIZil2LnjCSgF7I@|7dfFzp+L@A`D#v}16LbtzFbo4i?-tr#i?bBG)F;sAkG&h+4 zGHiJ}->}@`vbaq6fd>K?z4B}74@YZJWPgm$opGFca<#evLsWRZ*DSK;7dF0Lx>m-o8*?l-SIme|JxwuM$4M24F89oB8zkLZ8?ED!a)4P`ANpz$x( zNLT$;-3sW!5s~F;5nae;Fl!VYx|gr~6lfr2-+6JjZZD`6wm%K^)&n|mYYsW{ydlI+ z^g6mXeWbH`J3X(P}?}+(oV{Et)zI$?&-)=axU_u7L-pG4-uMHxf?!=@n5OS5;%5ZYp*kTXSMt0e&h`B!jr|L zvG}r8nl#xnJFB?jy(_5n?!n(ArZ-HS9mRX*Kt-p#!P~F5+Oy}m+d)}*cE-`fnsD1Q zK$R~x+%_3#ZXE9XJ-6rP`QW(>c=y&eyx1k=c2nm-&lH++NUngDd5?1Kavm;ye}T|C z|EZ{P79lTK5zjKC_;~W~8v)tQb92c`mleAwk-yJ=YUOWP0HONuvt|hE7`3e+DaM_^ zcvCh&SMNX6n#>aoIQ^4vvbpvvMw5wn60l@u6pboR@9lU``!IWXUtee#NZ+3CK^;DN zjp~*-3!bfSB<*zVge`k%1(NtSo$U-g6BM$CST9$PcsCkklpLHr0L_{2kdSswek=M> zX_Ti<^b52wo3rsdL+`}Gb8UD?AOvKgzjin?9#$p>PPrh~)$j`0rzQXkE@bghqJ#)t) zBak`ObZCrcIE`R&n;$FcOB$-k;UBl%+_9R4i^;1?JqSj^ZGKnvk>FvD!%st2oUdA7 zUTcp3zt)stBAnUO@~f#bCIO2!ETXSXN=$2lV z>$RA|zQc3i&hoIVaEAux^vw)GkC~@<`@$T5fRMkyA3!E_PLQRp^6Lea$J2-9fkRHb zIH4T*D2kr6x273+wu|k0wVgo?X8kT4Z_;4WA7DxG^YVZYQX_DHSG1D~2x}fWKIa&_ z^Bb;GpdvK8TW;S!+cO@B4!9-mS`P2A`^QzYp3GSBzHxtS`H!EJt3S<{tNm%Sc<`uW zHwTmq(MS>CxgHX)4zHDdY^eUth1JpPEl>v7A1Jrk+KJlB**+y zAzWKQ6?gF&YD=QZ`BT1&$oE+tkqM93nRb{4PL$0j#VOHPx0Sy;gjj-4UJs)DJzn}t z?XB@Kk}xANAx-!g@mtY9Rns*%+Dm4Ax$}^J#+rY>k^k~se{|7(*_50rx#IJZf9i~k zAerGtnGN{MbN?@&`R~6y{_-6A=IYCeM*061Y5&KatdZjbZ6W0CO}hUKnf^N6{@=^~ z=%QWQoI-fyw@*~oAouOCc$7_EU)Abt7 zPmI6s=l^9CeKjdR0*g(PL+3x}LC0iI?!Wqdl_-3;BZDFBO0H$ST4T<80WI6^{2#yT zKgWcm(kG%K1NJx_x!~{N$G;gnfIi5NbKDd&dj5Z74n6XH#=M62_U-AK+5h5(|NF(s z29bsGC7RfY|JN(=7)23%5~cEi&uc@we#wqK6U^&$TP2scD}oVLEZzWofBzaXAb$= z?k#!vnYk{bM$muXwEo|15!W|25=xRUakJTIYMlb0hZ!qJz}`3(MJ9p_jN7hGD_Ma;TD)LOLrD1D=;E@;?2%qH zpOeMaO?LJ8P93-LOzC`mNjuGX+j#As!$g}0_uj;fyxj_OpJHm@;FlMt2$tJ;>4#buZIQtLhs#MB#n>K_F zZ}6E1H+p234)`L7xNZ7}%Jl307{tU|&Xy1Sse11)>Kx7AO$Z|48^-zo>hu+E4$axF zMpMIy82=Lyu-n`>O=@&teKLU(^tBPFsuwU)c3%+Y(2Q>VV}-zLK0p@`F|eoS4I)y> zQC0}}<7%7bKmK~LBf;GJ4ZrM*wkKrW417NKSOcp}}i`r99q^`l9Lkz~Qew+*_=l!{Eu?NiD!FPV>oY<`a$ z7@zGhM$@WL?@cx3m>vjX^C?T%V+*t`}n zQb1*rBl{B@H#>k=@1Kl}e|V;B(Q1a1b9@fS>vso2_aKXKOrn{D+l!20q6Dpih1gO5)eN+CEDf;DJc=S(yjTpXqsFlu(-_QburD& zb*$L8x73v4creowTYvF-gwkcbQvzt63bI;l7ds~*;d7Nf-5PmkZD9EhJmHUpp=(^d z0VurKkP6+u2AZ`SF_kUh_vqQXg*pY7WktyyBp9SZ%IArIBsP&>L3b>D9g>qn*s>we z&ky*KD>tixz{|HLphT7|K`x5fF(KGHV6cIVn{dv}B6EGL1EWU7Zq;*H1F)B&fgl8B z^W`&`>fl#^C7X_v>F~7(CnthY|V0Fpyd8~?c<5}55%KK+6o zSHY$iCEjNbyXRLNL;|kT?@Sy(vl@VnK=@o+DtgA&oNa@;7FD-TvOVP8s#S zf$lbf06Z1M<}u?q0O%v6oLyIKUbX_jfx{D(B*6u4miHg^EzgQWNgi4pfn;aVpk{ur z-OXWlC{skZ-`DRM)EToAFhg&^{9)< zVsl;{%>ChX!IWkA9jOtt#C!6_W}#Kf-SapdgNRF12%cL|r~~AHTW2c<{rG1jgx6gz zSw~`;8fNWy)N<9E_1wNW$pc@q+$sR^{2JvdQ8$8{gZD(CbJaa(Y*yE(H(N3K*)a5x z;(|VKk^!ct(cDU!Drh?xg(`3#}9x4f;Z%e(hCk6IMdaA_0{ zS4KO#nAdWCW&Y_?`pcRAU*20&c=A=S`W`B5_mkvkvkOKFn~H)12k{51m*Zq5>Sc@4 zRU3I$&#W5CwIBOCc5Cdol#HBip^DGnYPzbcL|wwH$l&R5sM zdh^GGoEBulFNi7ddL!a?Ga#c!I)>G|;2TZM)=4V|SleB_Tsnuo_uK2XKaz_o`Eqr> z5Jqi|hFub?uNSoyPjB2T_v9ph5HB|LyR2R`w7h20wKC{9yo>Xiu5P!SEsboYK1+LA zy4NIyftWvorEY)h6xrEJSwYA|3YP8?q9NLLJ zeG$9f_01h14Eh1;5)V(qmJRwMzB8qjh*-I7o&$hsW6d=XENFE;eZ_b6QTFO+u3c-P z0n+s})_Sh;mww2ZHB3n3cpfp&kA7Sj&V)e<=-8vsGy;0nuUwcJ8GDvPRF;Bk&F$!q zj^La4OF?T)XlRs3a0k<-l$Mm`5o&3%>(Mi-@{!>*H#286?p1H8C6WuJ%1#;slb6uy$Uc5hEjEKSIL3zDMacfld{v^r{x< zaM_a4;CF(WHG`P+np2j}`<0x1Wlg^L#-NjsJYAn-bZ&@o%+n6+S6D*Ha9CK?s@YK< zQn#*^rPH%ao+<(?l1&u$n#1VS%Ja)Ptv+U`ASdj+ENhsm;yD?RMaQuNwz9+h{4{33 z6c^X<6{E6v8tyJ9Xp-J21{*0M_Z<`92#d=TJgN5?KYCBhpxrU)^j6j}N~OmcI+64g zZPCF zC?dSQr1f{mJNeK+vL$G+t!qHsx?0J`+u}O})rgjv+3s=d)X1sDL~fM5ZK{A9-GFR& zrhUaY@Km`BpGj!B;0mjjX4Xd^HLOXA7>ePqfh<Dwn_yG<1#FC;xbmfBy1cU%oJ3A3wjYD;Bv>oIlf}-2-`J>hj6} zuh4Xa&vE~pz&kA;gJ41hpcceogEzYEV)-?gPS37#d>W8q0mO#Sp?A4oeo#ibS=-Jy z#O^-eLkOzoaG%4nki02guxg0Jb1i zTEDyq3Wb`N8%%{w<66z$F+Jhy>r-tyuZK1J#Z86JcXpa4TjA4IzBo{IwOlm7?pH$C4Lb9MEgipPg>gFVtK; z0wLN9uzzNtB8qpMs`(C;wTP{QAD5|fw0wc5lUlc5FC89299$7?(ptk%UN>VlW@f9_MijC7Cd5_1D`#|IffKUq_W7Ej&P))DNz!@~ED39s zwHy_qT5TW~zAG0vFQ7iFP}=!yX5JU~x;Qz{!CvHu|7=_=*?kRZ*%Nok45~k~51th^ zAzHa;hTY0?!qtux2l{~hH&3w;9hvOWzr2pE@#b1!neO@wW1)2k+z7il?YDx?U$KaV zETGjVtpXX&F2YiPlw%&yX{4^sB49P61+l8I#~9|Ya50$QK;e5U(d0Y*E zjh32>t{a3)Q*)6T#BGX+anyo6QiTTN*oQw0vynm!CrS*&(9FKh0q{g6 zH2lV(L}mkcr$s82EWy6a{)(sD8R3vYvu9E=>uZn^19{Q6o+p(myEdxzx)Si^J(fJP ztXzBw_nO{|hr38f-vj{YtEoVPWpj8ib_U~Oo)p4mQj6k}crC;0Evun(MJ35FRwE2U zRXa}%*+lkNQk~xp<=$@yxJ{SnNCks}C);J0yI=AdsL@NH@LkWK9+T>jqZW z54s*Va5p=_#GYN*7R*)YiA{x-((D{zeGG@thogL?ZXlCMVHr0rtngfoY0$vV3lgb4 zTca;lVNDvisC>&H01w2^a236he2FSs$Ei8BbBXNgJw%wjBCI{Slq_pxmAbntrXxc3cXal9ajyiFum zDx+t+1q9Y2r9s-B71Oa>Jy+<-yI1gJ7CcaqR0#4m!;RAF2-B}U-VJ>@bkhO(?HVpo zQ9V;^90G_)YrUS|e|DALrwZPuYQF5xpq^HgO_QNfOOQaFH=URFQhIKv^ch=26F?$4 zhZ76+UF8Ds5?5Ouf05Ek2!$>YW*^~FK#f~6``d2eveRn z{^jMVgR;fzJZsZ7pG5tXx2Etz2o_W)CJ=vk^ZG<(D&P8bFsU#Jbh&N*zWRiRg(dR# z#TyyGk=1lvO#33>3b!X@;@a+AY^2EZg)gH!scxco+@I zoQ_WU3qCMNM>tzF*~a+vJZmnhooTj(C^KZV#bU^r645sD9J?owx}%X~}9~SmONn z7asghj$trrWNpJl`O&j1+#mPff>ECcy+gw31|_TF^pB)8_yFl*S9VK~OfBV}4OQ4d ze^gf-wwx}ElB2IpjXt3oedWXUCG{?q^}+97?_z%_SgMHYI_*y>gI#jIm=0OZS5J(S zL&oQX`{w@C>9wwxu#?<6m7Xm0>gp+{!GA(G)Uv^zXlZh1{56C1cQ znkLcaexY6j$qNnK0J6orZU_bS)%uvcrJABh+`0_P!4!jJnWA#umHliyy&vY9-G_rY-< zJ~nZ+JSxxPDubZA^lj^ePg`<)%kW$?fY0zLgF{gy; zUq4g2#5tM@m&o|uvdf{4XZ8Wd$C<$dn{@EWnFED@70WJN+$eU6v&*0Y*8NaE>Opcf zS&er1^-K0-5o~k)G1nNxr(K8ulh!*Ui@f|*dddO~+m(~+v5$AJ8h-1p3Lr!xzR3PH zjt&%GLqbGp8{SkuiDi?pPtl9va2ER(rYtIw^5kYCzKlQi7*G$MPd#EHDri2-%z%J< zu)Gg`?`9B|>|Y9qt+ttwPM4{~xL^L38_}uF0ib63lhxAsGc}?zZFqLQ!G2!@+^n~9 zxT1GF-3?8#Mf(oN>A>rb$;oC`H*XW8ECR1!I4jD}L&=;rvxk;Nb_YWeC$iRK_vkUz zeaPTm&efqX@`-_YrSPQFFw6}3CXM6W*L)9`HaW?bFY5v^o3|JHbWw{y>23a;D*YrG z^~bprmHeRqexKm(RBJS{I*Ng|bV>z}yd{S70N(4yA{A6pul?9%(2 z(}^R!#hV3ms@{fkE#s9Jpv4kc0<}O4M=?@rlLDSGm>63rSvTe`_%2hN6#vd?e=c1G z6GEn;*Q|+CL(J>>5pBuv_>BZhLC=o-0SL}Goe^W{b$4H`ug!Z_)?Tr`O^GaQTaj`& zb1iwHv7<&BZPREvvM=LlD&+0Oi&NyZW!GT6sGT=GJ=PG*Zos^uS@0Ssn0LH5ZYb6= zw~=CqZ(Q^(ZkgS3gG++?ura;Uxo2$%n*mfymqt{U_8qvWZm!zRuf9Y)MOjiOWXDos zwcd?%I4L-1HLgTMZLzvn{G|o$(@Ky0*7K-D6}8n?JBbT5e#p@w*jfXP@WP8#|Hr6{ z)Q_L!!Rs$7SC{))KLO`As>p}8H~7ODS^kiTtnQ%Y_loJdTY%3H*{XA*pc&G`wFXxP>0ek!~_0e6;6Ib+_=Jm?cCra7gV*S&s#kh}zQVp*qzvZ1gtA4C?#hD)KK2AHx zIhbZj>|Ln*EqvLea*wORVQTU_8C;Ayvt=Fxk@Yp-wI6eo%Oyz{9LiWIrA?vovV3Psqx5^s!9oyx!DyW) zPcZw{DB}HUVohx2nB9Kugx{J^#E>;6V^fDBRfi$pQ5gIz%{KqIoZ&SYob7 zK+A9Z+k7yV^|4x!Zq&|*fw;pi<3w_x>SCtH!TZItdetc?Mo-9&EJ(NZnYN8;sV3`% zy#sr0tXC2bfduH2>-e_I4&}|;CCey@t|kre#)`*O?I+ROyh@@A?OjmGs6gK0*kjRH z;XSA<6^(vo>VVv3&B78B!!PeRuAhnqWBi^;bQ zsXH4vAgOG81$y3ViV}Sp8egk@<5WJ9t(G2GyofPH+yK@iJ+umW!fo`_1wdl2j0jti zF{XJUoCg_lmAf!C$a`s*^Q+RLD3)D&9`qXY=6BA_F#X{Qe#))7oJb0@Pyw>hSkc}7 zP`~#q8%XU|bFU4w=ujuE~+xmvTlYEbyTN zeCB!#Rk(i7(Y;cep(QA;Wg#@`6m?4cN5yt~!2iHxda5GQr48*3ca}$=^Zsz~aL;Hh zfJo)5UaPQ!`vYNwV>Q0TC~7-oh>F{s?5rgH9m&NV`4i%cX`;+l1=Z7dvPi!lQk?dER`73;5m+OVc@llx13uFM|h03 zjy+o3t%2j@`H*RZ=H$Bqs0A_+GA7?6=v4*J!@fU=JAn0Bu0n%oF) zTHU2gS6?;BvM%O}GBKSB3anw)(@?v%9a(}HItLj;F!0`~P|WX|pCRINbe10E1s~#7 zXHowau^?eLB7Pii&jIR+DkWTL=EsprbU9(XNe8pGbU&9feWNLO=Bj#IQ=L7}W*FJV zbX5vJ2%Vmu=99s3>-~XEqeQhxTBqKsz=Ct1z9G%i&A}nKUAWNfN+Fh9j1TH;V3ooI zvbwGFG%Z%)Adc&gSGCTOs$rP8HcY$r{{~GncwjtCN;s}9>F9&h3A^8O5DI?Q4qObO zUy3OhqlKiuB`;6Pkj~)ZoGw+5;(?6$P4ORG{31M!l1I>2C#ZQZP?s=_G)@_-bx zqgHi80lNk5X$tg^b?G3uc&bCaBFSLf5*fu{G7sNF)i&3I8grS<>TNLb#yPo-$p*)a zQ(b{QD;{f%f8dqj1yAqS`nz+*O-Byn18XV;z7_fed*zsy`P}pCvM46nfjs4&J3O`L zvvT{Y^!QmIBJIE-eb+l01!sxL=85EZEma2!d)WnqKQ7TL=~uEXPcSRegWY3g^TW~E zT25n_*(M8A6M7-dWu^Ei%JjQ0%o_a46S`de3 zja7PKOW^PdX(ft;w@8{$V_LV_pGoF=ugl2Z2@B3OJc>0RX4w_hM>85~#A|K&HSy=F z@#q$Qnnk6wVt43YPQ9QPaiNo%wUJ#5lfu*Wlt40#hT+ngNL{%%L!cnB3j2j+ z&0pDc&jzy?7G7rMiTkypy?@oBbJTRHjD`%%(jp>l1NCZ6XKr*w#bfQbI%|6WF==N? zD+4w(D){@*$%FK2H% zZryHL#t0OP471YlM+HdPR@uH2TH5`_GZWJSID}0a<_8z6coEa?f)^e(xa%4IrLVzK z=r}YAW(A@k2ZjxKG%dWzxhia=e<@S`qi|`<8)qx$JlWzj6l1^BuV6WAy@kQq0-hPB zjTKB;C&&=sC*iZgP%BsU1-J_`CF&IoXrp6e8TuWUMlPw1)Z4Y20M8|61w6jM?pTz{ zXo;`g;Y_gH=8|E*J*;4axR;%_UZ{-%EgGDX*|jFdCU!_A(KhY5wr>dvYb*jmQ=P|r za)KgwcHyCY;byJRu~)}t)yao0o*pcKWnG{UM*6$EsOEe&wu!^W7~&jmkD;`^6fpEM zB%s1z#O1{4-&V%;Jy9*6#`VWLfc8DUA z!1U@;rVt7FGv$vClL69b#(Q+q-fth@{y{K=0zRA=N|=P9#Gbjmp1hLg3hxA>HVR0vM;#g`a2Et?SKOP&4G zF`W~~{4?qc@i%#Bh%FM%#@5`auY>7p0W;i_T-43OGy`y-x`FsGjbRH{Pt1Fy{Md$9Mp}>PI(tOaM4RCt zL66y(!0m339S8aclcO#|rh9#y2EjAzKItY?#%fF#?)Hw{&_H-O*03c5lePNR%Sp7G zHbGd<`xAzOck!s!ZG(3PcyQ1Sp+JHANk*fMjJuiL*nOBpICpw$76HOT`eIi%@3Ed3 zg1V+Q=r2GR5_VuKiZ{FoZ9q1}*;=P^NdK{Rl|3frO-=@1oBN16E=@-eo)oyp%7&9X zR={%RdoD(NApXcXK|-C`Z|!CAAl&Fyppj8QHlZwAo=9V2AjZsmY~?}KKcgan*1E%7 z*7D3_eu2GXMsx0;%jEoqMlnNa*Lh^xdd7N5q)zJx4Y}d8n3ST@q~udTvz9HE)bPV( znGyOvzc~h@ZgsNuJ+5--zBil=-GV)(w$`kJe7hnfgk8|{+`p%c0K6H$e13Q%8%)X^ z4$^w-ANFX6+p6{BKY`!&SIFV&97L-!h+m38Vk#|4rdAwFSpnE-C;`IV;EAohsY(%I z_q!Rg%U~SAX1iRa97!rOGqcT;gq5J3m#Lzh#bT8Qa|!LRS({bfG4WGjU5#a~0jT;p z#fgmbwTB|0ugcPl7-;t&_U+28l3}~t;VY;hX4OxdMF5a8*{PkO6b~Z<+7pTQ@d?YD z-4C`utE2|?1yp{wnsvHM9WdS=X=G~kPNl6mt~?mBeUqso0#`Uf(#SAP}i&+{ypkt+O|PVX64 zpaa1o4#m>`DA?wL99eSYP@@-jm?l_eDAg}O(HrS$pVUL!$gYULs;RkjDxx-$V-UA~ z=Z7{TH+@M5aTi40cxK8CVjQ0Aws@%f9ue3#Jgb1~j4~zKTM|UJow~#I-n#Gh(=~?l zn;}Pdx6?$(-Rt<9xO(f0yj^X@?X~w5QXmm}@{M+}2G93`9WT0RRYEjUZM2q1`D3dO zZ)vtUB&%($1+Cl8Q@!O# zFAqQL-QUsw5AW8tw#284)w4%ZEi^=RZ@)!c$9NZNhL5JT6prdOxyuW#t^g3=_BwM5 zK;*h-ka{jnWPgNIAUNIk@a)CZ=Tx423K~lwh5VG)Q=%a>W%~o0@LtNmeK@-a0D>kf zIymyYAHI)ofi~Ym+6AFCY)4z7H^?}{H!C~jyaL)SW{=O!DvZP51mBx$0O%&i2;l}@FmK(i2E3}Tv^#LqFL_nzL636JpM>q0cyq1*vx4HZpn0Z%_wM! zinbRlJ(@`T838^<)eA2p|H5Bp2sO8&qC8(cdmOLaz5m+p~2?yX6(SeWvH3)@%fdU23d-5Z_q7A8>8(|Zc^!DNKFBDj@{lj~H4SL=-tB(lygw&sIIm8bqO{PzvQiC@2@~_X2R2ih8g6c0$I&Hm63djSBef$YXds zuIlWkhD^o$bAyg@TXR|C65L`<%=m%^wKfU*sNK8K8NT4!B(tyKScqz-sKle;0jV&OpOHmzf-rJW<&I{v3w_5d@k|#Ic3dikKQLIr2$2CRKHzfFL7BO%!c;VdRxmj83HZl=wJbP&#pTSUCImc zPGuZJi=vF}WYjP!8;9c0fryvS@Bea2_`>3UWJ3~8*!Rq)@*F(gJ;u4B+A*8QRZJIB z6Kw}j;K)|Wtq^GRjLY0HD+hcmio6@5od3z!v({-*A?}G(I29nNA|?^?a-(CJpxufH zh_xPGZ%aj_ec#d0z4a_gQ5!14{a9`oVp9vk1`7Jnl2`460< zCwq0Py<1+1ttjdb!QD7*@VY{(GpN=SSsA21RLZhK<8wY`kiRj@0&S->w8r)`o7E5Z zp7kj-mN@v`I_5Xp`DIXz>Q|49tEAdYY0sj`8RlHnSsN{7b6tDXe;LM@=biV>#7x#nXwJDGw687 z-Z1eb~RS^Q%X+N++r;Z0tH*^Q-d6 zGxYqtze;{-hxxTa*kw7#nF>#Z3;!elzj|f|5gXN$FJh6FE59cCM5RYL+`m&}#wq!l zsg)@$F|NTvLHU{N9Dhe~Wf-Z>f(fSGbkPt_@{a?}mV}qsN~NJ??lUR!>)6b$02 zKgBpU2F%8`o z_q+wL;rA}5iFAUEGu+$?ub3!C$7c>I0+y#dIgO;ma5#nBi2Dz=>#Mxxqb?Tgwizv| zww`h_MoKsFV6E8el=U3v3UPtoKKlzj;}Pn0oVQF=^-!$&_}jku4B`^JXkOW|1aWzQFDo$nqZ zQ}xooEdpJHo==cO7;*eEb`CfPzjmJ9p_-Jd%uA6X6h z-VL58Ei}B^kfcTaxs-!xE&EUgttRN}@Y~HgqkGXKy%5zjzrxH%(4m?O_J(G^MR)t!}V`g$fC1U#RkiZb(L?86?lh`kc5T@D(!L(|XZE!*u zOwVp~aYabSe40VuU>h!;_S&TlYVH2gb(ykYA*y=~*XWo^TSTR?r&bC&-x$v(+WjizSbctF%AVcu$^p&Og z;1q$yv0h8929`&?v~;qDm#e$mB*9h9;qy0{69t2>SNlRqWQ=+ha&OS_>2aohAhi`4 z4;c1Z0Ej3Ae*ffw)fEMkU?~Han#0qr5vZ$!A8tofb2Z)Q)Js|7X!SbhsGa4|{JA=! z(=Rvj=(i3IEKALS6LO}!stUEz=;-sDfGIZ60&)5&_=ro65&fVONX|VFw=Pw?^JjAAgGf+<1;L@d9yw@E#8n z+qbWuWFC+mkKnPik_*2f=H1qW8_}K|E%R^6Dm&AFQjb$eE4&|_`cQBop0UuiAZZ5! z0$oMlNtu|wsfNZ6t}PYdU1MK=)wc!7DuBH?gCFHh`;cYNl0Kh2*s}$RLzwHWGBN16 zRi-q{)otm(T2z?DsLPb;HLfh)uuYCk<>yq+HQK)pJFRW{rm5(9!bpG?{#*jD&OITO z8v696Pck;^edYEP*Eq8RXOWgJ`mJinAE3!RcrwD_SHpQ}%8QE7jNFE4^qcdrkivtX zB_CRPG&*@!q*iX78KAG#Ay`In>Z@8M4Qk>GijAwr`-~S`WHgIB^PPjk>0o$BOM9L1Qfu(Awj@ zV){UzlO-s|4U4#!|M~rirCrl9Gl3A?*AZF{HjNY5!zJt(zN3OYG%eP1b#yB4^iH%c zvNO*tJS;uDu=MDt-vgbQg}#F=x~NU7(#CwR3;GfV=>k_RI_^ugwKU{eX|a7P!Bl;o z1|-~$lJEanpTi0IkR=-MdwXaN!@4K<352#^Ss38{mMZWQ`b*9r-hD1&8wKzrpC1Wi zWcb(h6e3@*>zOte%qXyXXqlQ`rb^i=aBzcJBXw!Nw9LUe)H;PhSC+EZG@>aRc%wCi zjL$EOstmFpuSB6p&gsKKBZV*l7~J|?!|@*87Tsv8j+uXS;mw9R&V`q&Dc zM(b&6eWUydB^|W1u`sC1usya)E*ZlbOYZpr))qm5psrEPo5_{P8!TDrU}MX@m^@<3 z><>_qb>bFvgsfFpbGlI7i~1Ev#zMWDm*s&PJq_~WIhxq(2%10wuBfURq58j{?9Y4w zeJSC-dI^zk;9elged*3(9^Y)dZJTBj@Zkf3dO7?`aEx!I)H`0+GvQ?;esyj!C-Z+E zTiAQg_W0k5L=_pUM8%rrC?#UCMupAPM}xIERULLDb{ zMEb{eMuv?2MNU1%aJtxf0&g2OJGT`(@)&19T6;->Ua%0z>f@Aab@O>@n@vpVqI;Wl zGDjpkHhLh0c{DT%P9ltPi)YP_>_vTFGCnR0$8&m$kF=!oN;b?HtItDl6?G=y?xz`ve6eJCd^rW z=42b(;>8Ihw-w(Ax&MQ({|HHfOy<-0_ZQkSN-RhKfggtEIR=IxJZ^s@{S7hx@2oXX zQWQ!?D_074$Jfd5+2dnXiL?r70Hl5Oc~kwL8zBLzKR>i0cUtUU8E^mY9ZzADov}Ap z4;YvHZ)ta~_){G*2>vnLYb}&(kN!W(zB(+feA#wFAXp$c1Pu_}f;$9vcP9|s-66OI zcXt|hg1ZHGw*+h49U9)w%$)b;-aB*OIsf$6UpKwk_S;ppYOPiC9Vhl{jHZ9Ltp9b) z|9ColZIZvd9AIDZawPbhaP&U|)PMQpM+Z3|tb{%Hx!CDA77b{A2I#imdk&lf_R+b} zo8UOw5#7ZCRytxVR2gyqv%S0RhAtdY|2Ur2k?-rpg?IA)EhYCAjwO$?bEN3@5Jp}J ze>^c`QL}fC|5GYg)Y7-d7<=P!16m61C_?@MV$$cr{;N_YU@DY!g-)AyIJr!k4G(x9 zHxAdXskN!5)M1liG}rIWL5WJIjooHlF^Z4WbRnA%gI^avmZ^c~wIHq7Kv6ue7P=BTKJ^!meNyg_r6@qcXkL%_%xxdbX1yp9m7$ zy{#fNRAy-GB_ogrT)XWhnZAX-#XE}?`tH>pMrxmAfc(qX?ezLjDat?I1OMYD2}y?b z^z_{8Ep{kza5?7FpVUM%6!X&SC`{~N$$d}zTeID8+&9Z*DL_|Y(xs;au;4%1dri;r z0@XUVGm-qfC*<*~l^M6MukY5$iJX^*lYYi9w>`f{D0wZ;DSNwIXfDj|UM=?4!Gk7E z#kUP%iksMGG@#CZ(pF9%4*z1kTmhLenZQZq@eXNz(tF~t-R00}xA(ulG&QNlBOyU& z)PO9hP$~7-IsTkt)jU0+cE3GkWGz!$RR`BSh!BDu&=RjK)D--rHv7g~4cEYum{JOB zJg*pcOxjffEXO<_cQRJmPEeeVZqpR9&AoYP2e@w@qn>oWB?6pfX$>ZmcR;W*8$7?d z{5tPgOLP!aK-Drlw|TV*wz0Lx=QC!4+$(vJ$zuL2D|da`m{r4^iNs}(2twYK1;`r> zv*qF*ql{CLuV23WA7}P|zXrD?(7l25)mnniGvQJX$b>mrxbuunQE+yO1=6x_r$ITc zb{i9iFvGh&!9)>8z2#EE=I|Q>N?<<@hwXNMv55KdBXJKj4W{)sNjw?rw$)V5kNzS8#ePj!Lheyl5Id$ytvu87rg%^EeGLaUuTZGu0)i^2p zFNYp)7Hxxl5Qq$5$bTZR5_I$+T6rXrFQ@kuo9mv!BpIH4xKmv8nJ)QDF((4SxpR1Dzs5-4n&m>1)J!Q%VE*(CW!WSeX!b(FX6qjTY^9xZ9CCi zXn>5#hGOVy&r-jkFL_;nM|0*%%2?f^bT;o|#uH~+gL)UISXHHGXI3BHBpm$g5sSKm z=tcuA$Q=AP6tXFK72_I>>GPJKVy{OuhQML1Z$7U|x~?~g(ac*G(jWQcO$2-`5rlsJ z2?QiKKA~O0|9`mrYrGTw07Y^i6JJXr%I&%vfEJ{2kjrt!DdxadND+a_T!^N7v;yHb zOaLV7(Qt{vuZ?Y5H!*r9^I*fb4$DCaaTtAQ^z^UJlALwF8TQMWoGmz!1%wZE=c5{e zN`{#dUkLS2=246nsmDA@KGwOfsy09W$Z6(#URR-JwW&BvX|kc8G5KLi#ugiHGNzl& zN$ZF4DLZooTg8+odvll_}hU zhyA*xR!q!O~`P6YRIYO9HHL<4^MVW!iHSwwv9g4pV|6oSGMuykXtnq{kv83t82ioN>&L2~lltp5bW*Rv zM!RREXd7pilF!GXB*#yPQN^wg+5P6XNoS>9=L(#Cq?R{9W3ekVz(BwFl)y%G^3g&a zT5Xo7iQ^X2LCv8=R?;>Df%4YM>qGvs9Z~3NJhmg{(a@HkAKS@E7IFj6&mNC{&ir(k zt*GnL)vExxiEZ|{+;!g(9u!$dBoAZt!!y!5X6f0OV1{qtE0 zTKFruAhkpm9<%7{R8ALoP)?h9Z2!%^(;N4`Vqcq;OT{s}4RTNvHIRj%IdfoNw}SAX`HRv)k2hvu-fBpIs4%&Fxg+QJvSR}->bbMP9dy{jubZRE-wuVevmR`3F_FS-mg0Gcw`vEpK6}F%R*=mK957}?C_bMH-D%%_&*3VXt zOma&+JD=Hks398L=rp*9sf9JjMQ8t{U>#e)bau!{1=pODp<72nhE7n1?$C{YrsB-sAeGd@825uC ze!a~VGnquXIBT`xjexmiJtyzY3(3KguHy{Nq6-of!Y4Z`i?PIRjdW4g>b%SXIA}7f z8V=_$bwxh*x|_VYc^kKb+b0P3amUY|pIU@)_sD-wKKa`c?$?K>+wdU=S#W^LY^}h0 z=MY~8e&tu9+uFoo!^z26JkvnZjv5oihp;u=NAF6r+dEhr?+2sl!a-IBcV`*;od2{E zNTb3`;(lM=S4fWaFE0QMp`lFHxM~g5SrtljT0Zxq6FJBejzudyH)uiOaA-DdgR=9WKcFe2%z;7;>cL?CWuPTZ~3wwx?e}K*w969fva<>8%-}Ke=rv zsmqx}>{V5pqm_G0?NqHgx5Q?BxUe;DI4Rg0RmmYz6;c|RVGHt1-&dZZ2)9UWya^S` zAdly^KYX1)V`VEgy|1-o{P`>ki=;gkqZ5rpS9<{25}QFssW{qbO#~W86T?KUw{Lj9 z*o}9@fCkkv^urk?Xc?3IsO9wsHsS#w`DY}w;EvsK9`oC#PN*EI%}<;I3C#_q*z`#N zJ+?lHhfH0Unc~~C4a%Qc_}|rqlPUa!B_K3rWmiWgMg#2^Tnf2m)2IEsvRW49UNQh~ znZVW|hA%ri{pN5%(kj=x)KG-9{%#Afr?Ny0IP+7U%;-m916W+L_*yzZYK%*I`g?&R*J5jkX;1-&zNONK& zkj=ZnAO7xktCz|_Jv}A<)y+wXa8w&-L^Urev+-*(KJHG7Z5)uJwetA88Vqa^RB2g! z-ss%jUIY4(1)g3F#i<`_m#4WZ>E5neSxTlG$pYzEoYZaC7tB~4&p)aqsmd}M2MieL zGHZsj1IYJ1?xqGfTo0bjN7@4KhlTlqgf z$u;SHuoJu7aU2-uXsg+|r+}cxeCmH~rlQuj&D0!TtI1%$;ZQN0AG%ufTZ?j-Lmn0` z`_ZjK8&N<;e&F%Uv0AxVeZ-l<2UGj0Aps4nPD$K-mWDVbV%a-diw`x>K8dL%^rXX` zACUjE;`le;aVbDX=KoSVcy2TvJ*}}Ccud8iO^2Y+(JEAH!=InG4;yrE<{+GRPaT62 zkq}~OQ}dxiNglPDjKixX?7pK@baoVu6-?9ir*@MFpc+erc%;Ks1LbVNN}upMj##C! z=B&2QWj0n6TrDrx+8y)?$XOXk1-U+5ji>u0d_V6SR;xSdRM4z3@ZUEa!I@OiRI}rV zb1Y<{I5%Hxg?C$T0x2F#rfoFeq)smfkwHQEiT5A&kC_dq|Df8-tgo6ip;D@lW?ZTV zzq_kSR&>xDPG=-&GXZz6J|NSet_xwUUlBcm(5lUjhOSvbACG4?-!ywq3$5}?73zz% z93CFJ#1kOdtexkggT|=9d|s<*hnkdz32qp$k`gIp1+fWDv3H(5^pRqbS>*iB>|vh@ zUu$+CQ~72#zK}%Fp!2G1_p;)zJG0pSjF)*`f6vqb6cUAdwOEs9N+yeR=d2*oc2Ps} zk?cn|hnm}I8JZH|*jQDKmGc!&)^8k^-b2kSY?j~RqLf%p3}Gig=?L7ohaKs1yM~jQ`B>vCTAgd=&PIglO#&TkBl)+#84V^^g2z} z(wJo#4|Ctruhsazyp}w)DZkidfcx^Xm)!P#>L_GY;1c=YeH@VB_UI9=UaQCn5!AJ2BT zj<>#+CXuVKl%!1Imy^w#PHiMZK3q;Am(%-b!EUVvrctA{as*A|qI9J-4n+|1>tw{% z_0ugJ$qV*-1&C+^)Ub{C20KcZG0XkdYoWQR+yaYP*FJ&@u_V>QpxtbG#5bs8R;x{N z1kY1-?UL{`uv3*Cg(E6XeMXAOAQ>xHeo?28lA!~i`0C5Px zf$rT%P|qr3s~O;a6+;ge2iw4yGE}q3#BzM<-DPqA7v%nrX~oRiUye8 zqo_3k*gdsC3ddmm3DXzcxl-d;D3z5vgZ_|D7;Sq8%S%Zf%^ciXbR;+E6uc5KW$#AAQrV&kpLqpc=Gt|dKnyLT8dAgfnpt$KB915w956Pmjn!6>LQBYSaQO?g zYfNvXZZbY-Okq&u1kvug-wh4qkN-k!kO}!@gb57| z=hU0DBgsA7v(+`B5Z*t9eyJMIW~|fSaoskjBvG;}XNfwkkh*ZLGqf{}|KJm4I$wVT zZnXLM@wdAUHwz|^=0k2y49gTrSREE5_$#R$YT1p#J4#v~i{rh$ zIuuF$S{O7~hw`R8#mk(Yw^dyB7&J1_|5^F_s}%nD;e`}QD?2S;Dx(R!h=~}d-N#nX zt3t`MG$jEg-kSHW?qjTEaN7{*Ux61mJvW8qc=k6 z5VLLm0WY$Ms#e;-MgvVmiMOqv``q2H4>?uJwdd3i*V=;j+qM!Zea}`J8aKZ)$yZ}N zU_C_g{jGNUua*6Of8VJ_`fe{$4CzP)P*z7L-RP947Sn<b5rDoTrJUcU;btd{^&3-&k4}zB#++Q&ao8r(=tzg^ z<+U{8aK4vF4*^WdKk+=Ny5vGb+pewK)Zgr~!wCyQi9g`MQ(y}H3+n&(<1P(!ciQ#* z&zA!CCV^D4|M4OJ(Ixm8@czdsue!Ua`1vlze|~%XzL9{qFFk<4L5~LJ?0>=H|E`<- zPk-=)2!*VW`-t7p$NRTk=zsd%UqA1b`X$vAay`iXH*ua$7is<2)s zuX9@_Y<4(#Q6Q1whdWy?%V;1Ba=@;bxWXgcI^2*3ji-ZXQ<&xJhqfun_2L@0f65%N zpX6s}yC?(cS?LO!)v8RjL0>-LNijKX!ce3bsE7gNy0I6z4rcNo+ye1T;aQ&}u$;x5 zO#xm*tFqoNG?9L6Y=3DcC7e=jtn9KQj{*?+q$}rG+HoCu`(6`r2zqN*%8p9LlWG~4 zLONl7oz9S5Xb!MVe8`&E<(q#mg?Q(OzToqd(2dU%v&$p&_*Z-NH#kpf-=s=U)9>Fq z_N+esmcXEtUZLG4aq*;6km_~23vabh6Hc$!Bmj&W$?*@4oE~CLiy{W=n zM)ar2lE4My@x)Nvx$?qeyRBQZ63yZ=`{UsRQpBsbETZs_6*@QiCY@jwds~L~B<2K4 z%`Zz%dve$edM2O_{F2dorxIM9SHFxU0QZN2`})!n3)#rXIxDcZ^?Wnpr;x~>zb_@> zcTkZ60sni@6_nqQD zCZ&8f`JDgwj)dX`>SKmJY+D}1${sxk;$+VRN&6IrA(3z@Cz|!%js)obiTb*po-%UZ z7%>SB#uJy@txw4gVGPdfQ68F;k+cETc9EglygJ|>=1&H(HE0Nsyam2TyKsE2srK2 zRm-%cK(Z|~9=j9$&i9uZ%}&Flbq1H2J{oa=15;*$=A32(TStZ`3V*@k*0YF>!lr9t0QogC%UI$*1O1r}TZ}v-w%bFLS*Q&EEXA7r9 zpWmhpOtbH&m+4&0XJEfDzr8M_h?wq5t2DhFYpL5gR66&IzBn1VzIYX%>4cpeokQBLx+&q%*7et-y3w#bH7`S?znq8i88v@<{`IwbA7~3 zK7YLK^AQ#qpNTWrKN`BO1O5AoPNOZ=jN3$m?b#IOQp0ohQ+%J7g@Z};sT$W}#le>k z>t>g?W-RXAETvat=`G^(Htw3O-nY9{SgSm&O*@+psm)h}k~c&=Oq?fsUcvdTa9>e= z0t!PUBKDb@sLtxR<2rW;TZvi=!e}y2ELWYGv0C3uaqM(P%bTx8WFn^^(USPV-Ng%R z@+|C|TV^uRue(@jvZ)IZ`*S7Ias6);DvQyBC%52*=o0%Rew~k7EV$&M%8o$7ykAQ{ zCam)pu|C%bw%Hl-sz5d)thKdu*14sQ^Uzh0kM$i zWM~|ySb5NZ#ciq)#mFk*?DR6%di7zV3$jebrlsb?!06)g#r{#t?)?|0CK!dK0AF$; zpY4at);2#%nb)})uzCs^VL>)4$rv>k`ajRa>TY|{o7r=}WU#htR~u%wUk>LUDD%rf zg`v_7CAGv5(4824TCRLv%O*m6U#Hppfcs`Bi3w};naZD<8PFd}z8z2Trr9vA9|LKd zc06LK3=>9?vsXco%H*1Y+nk=)T%s!YJcTHH#*M1Oco6T+x|}r6Ey&Gd*HeT)&)MW* z(>-#M_Sr|8SC7r}xJC9^{?!KP;eG0iq!Pnqz1R~=vA5>FGFNdkt>AaIVe9>HMU-#^ z|Hkg~9m~Kh2I9rq%zR(t6_5xm35F=iql05eE)H0haC*TTp#Sboz2rAn{T@+6@$=0K zWGS#PttP+|w6|mO9L(Pwy6Jy1jnF6o=}g;1x!zJTS|%|K7Rj6Uu-{$ISHJmtP*gAV z3-5UK%a<>UpTFePc@0lBF50~|^)&yCrPv7de zO!Zb0`w=4KZ8l$_wVZt3gs56{nFZJbsmN;IU%#I<2KvZ~cT8OeXWf0Jm*)jh_OGUs zGT0nYLn$ep57iIR5;c6_ADjVSpe1;OzHX6s(a#ZfcFu)mDN}I(5of8&45V|kH5`}m z?Px&^5c4kfG0@ZL5j>ux=pd<6##0G#xj!HC9<8~Ed$nr=VnFyX#GQsmmweB31lM(6 z(s&9JHd%r6keySo>PRx<3^*=u#}46FRzSk@BIKFm5hKU{9ZD1Yh+dUC{4<-Cx&W0@ zVfHT`;+q7Eiw698`Lwx?K#$XNx`BOGT*^tk9Kk!fZ-#Pj!!b$E24SPJCc{X(4D!E; z*eJ+n7ki{KYneYdSxb!3z7G4=@4J?-Axi)DjOgUqU89Wu=4(wg&Vf|u^V7kZ*ARrL zs&sRycKkc&XA2zh6XLkK@F`_C|AlGq2A|uWA;8dPF|B1!7}Bq5pVzDX=93KLO!6sw{SJ1Chn!y*?fjq z;Oaw#5<0MV#&cgHNvbHQs`ZIm;;dfY3stJJGYt&1#~{nnq3p}!n$ zHlX7WJ*zy%`AW1v7E`#LLQ>0gkRj%2#cA0zpeQsqh%nQ8*XaOn$f;g)%l6qh1 zbf#cYqa1WlCvAGBlA^mgafLp>6J|*VI+VV*axX6e8V5FB2GW;z zX2@|VOog=;0ejPhh2%&UlT`|F9C-5{)X@xTA@NJ*a4rOpk^&K_`I7O-!U%Jvr5P%f#UgDvBGwYs?BB4C-u!|(663o7sACeli|_Zm zQVAL#Np)~ZY?FP~#SsgTrlO&si1FR^=fFL`N2?vR&*W+P9{%i59+=OY%>JyG;K%;0 zlxDVEOR43v(?e!?N6;HQ@n39N{#Q}?;BleC#Cp)zl^>6R;rsl@=T(KGSJZ&*)2jFZ z^sbXNX4{)G5oB4$BDFpW;sBrSO*&AC_>2vl7Y@5L^4`z*v-tay6!Y~*v3K0jSGp%6 zrK?$r>AMOES}FM!qiH1M5MAOXH#@HVJwS8SDx0x5E1f>7+vX;wqvkOoE6XsXw~&L% zs;J<=opCf*jbptP$u0Rog+#|Pb&`XZEDCSbRjx@5aFU@WFzXw!E6#=yt6mHyn$mkX zo|ckjr-q_oSEHC6V5O@qat7o^v8pOlrD54LQX9K0&Bo@`ag)krWM(R2)*V8}E_zDa zWv}LWrDW{@7a0nP2x9o^ylsaBl#tf?%qPQr`vnXpfM^0k-Afb0o`p>AxkssWJ*MPB1${E} z!ZbFfRtjG=2$vH;RF_sfAY`*cZ?m3unv!PfWzH!K6tvClomoQWw!%lc<$CSq^k8eg z)3eDGr6o@Fy0EbsjX&Zd2G@}8dHCpo3+A4Q(){`H=v2@L`1Z7x(IhA(4)uvEZnlgIg1v3)8!AYpGD z14bLqZrwFDck=Iy=m`7z3hYZ=kciF%hm<~Q;8POI>M<^~?c#$_GC3^>L$gN*2QN8e z+K-c#e9rFa`Xb&wwjN5Yf*tA(wlE@=8Z3&Tlc#h`l&K`7VXRlqs}@@y+p-tOBg~es zb=dlRzU_?dAd&p&BLfI0edh&~{4K_d2oeW-+g?d?)(aJieoNFIPu-ZZ9U6W4-vPc+ ze4hHKIi~4VbNOY^>f63gug{DCp?L@G`uDkJKv#=|H{%b`$fy7=B-Rg@2U!(bHNUL_ z5o4@ZW0_o{1Yr|u6$!Me@&r=cbGcdrSma5CviRmaSfF+o<^jAYkzMvrBOlQk)*25p zOR+JeG!48$)TUOCIRq~-7AM&+FgfWtK zqLf6zb;EBSi+67?F3C@Mk;>Bjpze%Gm}Um}pFKX7bMzI51h}h7%eGXs=Re`KC3MOT zc}YGeo+a;(?kE$|iehx7a^xjsI4Uqs+~fe>GLq_Z4F(8Ho@bnxI3BXAYI>sAEr}8( zQv;HEMm&R?(Bb%_!$Z|yrJ%JJ<3vG;w2$a7boz5ZDkbVoYo==|SS~Q*T5_4}QJ|pU zV0#^CH%_tUXouF6W3pU0>#9*@cxa)F><fFJTe)6#K%lHqvViF`8Z1<=|QS zLKVY5x01*8M~Y$}Kg1P$%g?Mw`IKAM(ID`uot>~FM-O}T$K?w0OwMP;Svfa;GvX5$ zs=POQ(~u#6WAuUu!kot> zC9%VtVVBT}{1k+VUtaH*(HfkePjWt9k^%%6g$C*EYDDvu>&k-d0xvykFZ84#Wc7Ll zk|My^#}<2}%d@i_Pd5jpb#EW}@#BoIe&0|M+E3w8pS@^^$Gq;Pg-Jfgu(ScA3u-u_ z?UWsnMWV5mRu)^kd>rlmsO;)cT(H#|0d`+7^JXfHd>+S*=feybR}3}mAUU3of&nNiyy~_Mie(&uf;m3EP<>(38^`e* zij;j+$H#LU(eGaPiQ1x}y|aG2SsAr-W^Wl3jgCIy88`bty8w3foYU z;PTf2a$7G#ZYt6*S2Az;>mubk=jKGEZm~Opp3tx$WbYrR*QtLhIwLw&HB6&DkgUW^x8eC#`|95h>{xy$Ey6yy)@{ettnTLvnbK6>?ycd{+f6< zL+_Ii*rI#XbQYLq9pztua{>$>tE<}jpVEuiD)!~_h-Z7W%glHXT4a))!(wfq@;dlujFz5FuZ+X1XiC0&i zeq2^md-)us1}^a0-bBpzZaRdmn01HRHvZ`EGI9d;# z2#1|*`QFAX;NqmNi*_ZzxPpV?3rp^-j9g#>^Y9S)*F!A~!0cp^mvqJL?5+eRgkFNo zeUL;lrIoZ1kql;e2jVG1M$&L-jW7Mr*PjOXMypUE)MI|>-<-8>49*ERxMbO|6!G_| zv~jIyM@_fyl2{Z%*fdNBCo8nEhPba0s!Pcbp(1qjtkV{>zro$~849|(ORSVOR|Ku- zGAF;`7P&4?$f$u&l3dky;W0d>ux2-}Y`_?%rVl;j7`(x%>`@ar`i!ev0jm5uKdvz| zkK{~pi3xsv)fXA1AgEpvkPuir=T5WTY6Lq_z8W@|>)CBr4ep1%Q0ll$MsttHHm`N|F4bB@F>8h`X#xV= z04jN{a!b%RO4ZfhxFslnrOU-!_a}_+JD&W76Xg868ln?KE}!SFlFH?V4|!PUB(C6= zHVVYk558WX$`f0&H&-c9Rg|k14mH>~5>3F7*13J*0tEh&<2K7h#dDmTgpYrsv-Bazsm&DKV37cvLLT~NWTFIfk@XLodN?MBOp>1fVroR40eEaF=TSPzS zOL_R`+ef#U_C$Xe9m%Sqke&+>N?wfaP9oKHCE3BFHC?izb`)|uNzDQ29Zj&tf)k|J zT$c8{ltS^)e5{}#8AS4A_z5?BnFTyXrKeFf;N|e%#hZuzrYq7=@*esW}Rlrj)Q^I3E~juI8n}vlh4id})I) zz=FuEVy-3YQ7Rnaw{*~dq|QZtjFm*|G=$x=)y_G$-OLqvy~Ek!Lwx74_LL3j#+q?n84ELgo;4z7 zuvAYD=<`+<WdVqp2^exUAI280w%gHD5yS7)E$3@RovAvv?&15SiGMRv zSY9AM(|K;psJ@wQma5E;BLU^^)XSNxho2yTBIl5tziv4MbsN>R+&}a=sW5ySR@lO9>o@RY;ozaCyKAF9*+J%v2=+S5enRwrqF){Iejn1Iwu?~ z5fL5W{j=~aUV-+utLkQ+TlYJ=Nb3y2gyyp)Z&k__Lo2kMk{Ehyuo!xM<}2zgTdW@F z4b-|g9SR2xh4^cXok*V2xm^Hjv=vE@8_S&Gq}AQqP$gv*9=%Gf0oTdI9L88h!nbLC z#8g&%!OgW``dlT@QvuR**~CFjay%z)i?hVuh0y%fg^vux!zH2TaK#~66aEDeETZ-^ zw@)Bfy;=&(_ikZtTP}0iMNWgm*P0jOZ2NPZ?KrcLek*Dn$*b7Psns*3lK758I6!?# z)D%xC2$bb{^Dk_^Pj<-`2U#(}>3hY!K$7_rq<@Em@&Vi+i}HI{s~CQ3G%fgcy3ULg z82uxCflV9phP}H-#h~)*Tc#q=_q`$X+9@?P*+2rR@J5Uh<3hU%!{Ui6li9$81AGMD zWzjLJ7MnK+Bi}?g9{VOB4>z;NKCRl7K}c`8E`shPJivzC^tgTqc@C+G1hW! zpxL*iE4@fgF%;33^w28hP>5xc8&)SyR~%3zWi_)0W20L%rHO=~v-(GAz!kntbznj7 zmTo5`yDB#3^?IOP!7bY~=!X)`L5k~|M;jOrE;OPiQ``y?F2W~b9hlRB#ZuhQjv4bA z;^By35)-u0H}zhL9GLUu6hK|MgJYKdikd{6UTNi3 zlTF%9$@&XfwxxrCinuicZwU>(WA2=$*Q-B8XoZbpHdED!DZ(F~JZ>WqLQh_B8&P)^ z1G0r`8!JeKkG9;W-iM%L3an0u%_#34;rGat!O%yIvfYHnB+kIvLM`HpNsNU3YcGS3 z5(p7886#kpKDTBk%p_6zd3>RU%pAkj_5@aAUlORlZ_K?${cwrD+}-VmPe8ESB>t)7 z?RX}CQn0i0J&Y8MYFR-LQhP4^rs$Bn3@&^2&Blqd)RQ)SR#dIwk1eW>VXpZ~kMCSA zJSS-U?EKyvEKOlayKdTKYwccQq+)W}XPcrEG{mX69IiM{dn=)$k*OaMcgAxOwsjIp ziknq3InAAMV_x<70FxQ=>MhtOHbiOzf0Q-uY`=Ho2fX^WUhv8LZJMJ8kl_=Ch8DUT{#i1>xXA~JeBmy!ASBiy`SoH!etG(ZB4?2X|$aK z=|F{e!=m;v(vj1UofGS&{rwCKD06V8gw}E6M_o3py+INyvJ9A01LYyF4yAhAsV-lI zA43&;9V^n77I}-3d1q zwtPS1vW-VEOK>~laBa1oRrd4?)Q^}CK5@WGc-zvxA}8o@h7=M_A0p)JYNz6K>NPl) zl)BNeCq`JR{fv9y0@>^jU6p%;SXN&~N|Uzjw)pLz#WpLI${TZHw+~>>i(=8%L|4m} zNoBS3g~Nk7X5gMOx(`6TFFUGSJ6y)#O%!D8HrCQ!C|Zu(kp07IafE+=ji08cTB%&k zQyoWSQm3%-J!Vt6+}!9a*J1^6YKU`<&+R^*g?Zdo1DM3KeQ^>JA`VR9N!n;1R$B?- z$ESS+v?OulD#*RQEi@wRvef=Wds> zht70>-#tx}B-gzxvzcLr^sJ8{Cvl5)o;m! zD!5f+BsnP)wOsdjqH;N_=9J%}*9CPqI9vakPO~Q6erH7B+qZ8l9>?8vZq;V`b8|*u z`P0dB`$E|_+|vh-U`n1jc-fTpf+o(kELI85{B%-^q8nD11*7AZb6FP4qz1=2#MhyP z9ph~iWx4eo#{;>_1~quIX+Cj;UrRqa8BU*jx2(jGd&ULZ!zsvCM!d=2-5cDJ?1kbL znyg4ik5~l@<=x!N2P4QjYK9Elhp{v|ENy{&yOApOj__ypE4h1fOV(Ixr;8tKc8g5X zZ=)WLG??)qtv_El0TyOq=U7>86=d%u2Oqgq9di{tJc|Svx!p4GD(_>0QP#^L)gg0a z5m-*@C`P2(@SG5umJG8(?%A@DViS$%ekcYky|)`Z+v)ADTZA@lytGs4UK>>995=BQ zkE)47;KBDIv82u(N~pw%Be8>i%{KC!eAJtE)aoW$h)t@ruG};MI_a@$%xGFKN1Ib0 zc!=7^kZDe)Vy|IB1D$xE+&(rP(HTjaj5d!1C|&U(f6bPFB~nUwWb4H@7{#1baab;e zPU|4@l5DduBE=@&kfOcS)w&WwC1#6=y^-*xol~Z&jCiC#zu11@>d32aWS}$cwI*65 z03q*uaP~6VhW0)@(IHvW2!8=K{ni+jP~8X>Zg98cje5gc8J;7)>uq3X*>*?Bq~okc z%)z^VC%P(AF8Hl?-NZ02_ebx>cx37E6qlV`?E^T<;$)E3QhjA@!8%qaN{7!Q?8*?_ zyCL{`=qAXzs+dD1 ziHXX&0g}mV23xLx^Ah{j-s-A6yXLlp26uT-)~P;tO=#*$E(NOPvEF(ur0}^~{gE!k z^!5keQ1N>kpS?R$q_>P3r39cyBa=?)l#R@JLVl;jUq+vS2s_gy!%*FK;c8Q)HhR?2 z_bii*({Qwi*&%Sn!zV&f>FNLZNZTjEM1GFZ*&f5u%CBFXsi&ml zf}|JXyVL6ICVK0IkRPCK*yeo|jCWSdhtP6OMx-*d$(X<CpocBvYf<8KmbhT89*Hkh#9 z&1JYK&HYp!5W8i;hvBdkh4}p5{FWJ(?GfsHe!dGUs$8mi=XbLdpx2V*G_*4$yxf94zb|{Y zQ@d#hrXH(1y=30I{SKkPIK&@->Z+Mm@p5>0*`_ly@1tHO^jseGp7c0)-dL{^P4IOQ z+S^FWVRhg7SLE<2T4OCn4n}UGjc;X3C<8rG zjY5xzPSj#?8QROAj%)BXa`@;&S()zv$GXvz7cQqdceIX&$9VTbjY{V(K8n+=g4uiJ zvo7e^uzSerma+R0cZDQ@=S1Zf7PDRd;9Woo{nagUl%aY&nJ>n8BwYybwN3IXWXuZ& z#O05gb}gI886;cwdEQuv&DPrGW?)@kM@!m$~Qc(Jk}Y>wH@5$y!B%w=z1yzphQ ze#A)q;Eln_X%qv(Wi69yaX!i`nLSXt+E*#E&PYv_QS|CCrT5qvPm6{_K#a;iL^cz9 zY_NK;9yB~z^Y0}hLkKGq;r>=mAuD%acYq87(`S?>zkfO>os5rz*KA>8+44q5ZXT0< z&Gix14yJ4VT=QgQ@v;o~yS) zA|q9Oa&vPjJ=j1D`}cP*M2ye)zXUyrEv`S;d!iUv5%33gV#92p>y12o|A?@r_l5S{ zMIrn*H%U|l;jWWX`O{cigGs#~PpitV!+cD&)vO$bvcp4W@*2DSsPB6HBYWtlc14>C z7Dn}jGSJ&|iL@-3YsRzp#lUr4LbA;J6jMDr=+?H)epJ>NB--1L{-gz3>DCmU$9DRS z7{5`27gD0Zc6O$33&gFJxcFslN@?^JU+F8%Uo^yshF2z63(?vXyb;pkCpO+v?xJ;` z#+D1nBSc(wMRM|2dQsbw)_wIw9DQV?WBR3(1X!TJ+rT1wW_tC!QgCP7kiwBS{Z;B) zs+(kM{?viiLP3V)?C{k}?lw~h8NWMML9QdgYpk1SV)nMA6B3C>=An1|+e_%0dZTw< zUm^Kxa#R`U%s;?>=?Gj+)sR&F>X*CA8Y;0fZ`Sd6D(s`EHJwjQF5h# zwzxK+Ct_L)6rEb7@YNJ*#Bx;Z7%6oki6HzSr7NdI{P7_+S86<`&U}yd{LG7lfyO3N zn`ryITljuI6CyfQ)z$XBz%?d{$=Dqq`XG%^jbQ%u@8p!|M0mifFJ-MYba+Cw&3z?Y z_`c%caIv;#0l%By%T@jrAl0LS#y7Pca1Q4E39EG17r#*Kf@l9A#xy~L z!M0}7TS)!Jlm6wVdmD06h3l2b(ncn0&2U{U`kPzHBvvdHGg07TYp6M7WrgGRu-2j& z;^MWgNx;j-SW38bsDvdGtDqBC3&h&q5XK^@X8_T8U$gm9!znCZV%_b|SMragMG>7T#_?c)8n#&) z(BIrE4yd?L#U)U&((H)~?SrM|X_K~m`2=2qq_N`XCta(zDUuDEanBpY*N2hg(j__T z{W5TBL;rDl!0*o=Iib$Uu1N3QiTml-kqZ1AFUn3}#lF7y6Y%*M{zbx7IR4al>Knm) ziSJ9`ffXhBju!-h6lF8w{QXk->!rvygi6O^w`j%D9KO5BH(M;X`S)=qw`QqT zH^d@vjJoFiHOx`PJ$mey&UgDd(2JMcvPfW^oaq~=%Q*!EA6=JlW1_3XV6y&>{HXceeWVk-KU)13wb^wbNowS>}K>eTyk6}{N%%pnaxfz#g$BPtQ&QBUuQwMy>f5o@8&5{EVWTpY28wVv~Gu zGA=!3j@wTFm5tgK`OfBj%uZe=+%JYPpA^&%%9B^(fuF=5Z1exJcYm}!{`R%gMCwbQ zE$zor-S3(9oa&P|-31Jy$#N+O=+sz65Vw8CHu#AAvr$9^p(NVwc(*h9_6%MtV?=PMY@q12dHUKvS}+jTiR;VVXQ)}_2fTBF)C z4c3GRaH08(Erb*QhqJ4Iiet;R34sI&5;VcxEx1Dn1b6oYcc*b02u^U<4%)c81`^!e zJ-EBWue^~p^8TAQvsNz_G~HEo>()K@$lm*0i`nD}FZQ2_HD($b7*Xz4Kko9dGo-~$ z23=P%Zqie5)5jVDnd68t^B(r($p+@Q0RlbgI?4XqY}>0{MSf^e>0O@IxX&JI;u!4+ z(}yd?yy8{udM}ds?I!znzglC^ zGj^Tj4@h!Xz2Rbq4NOX~wP-LL0#oMYyw^>t^|$wBtIzEUmP&-LK)V{u13X2N6NS84 zlGpn|g02L``D$tNu^K_E5AJBxI>)gM)&hrHd*6lDnMd~9V_MkuzmaissFm>UviKuq z=niSt8_pfl8YlRQU~@Le@-QjAxGYQv)D1cNel3=&0EJs*5Q*@7te2TUoRv}_M?$AM zbQk{=RS?_lZgVvfrS+i9=T6z|pl>3K{ZKwFcWo;Qy0fVMkp{W|`L98A?WtjX&ZNH0 z_xFFv%u?b!bi3&Yru&5z`SULyCdjuUvc*`SG3&g?(&)%sshMP9`$;Ah{AJ4$?z$S0 zmPX>J<;wVFC|Vz~jkfpAc+Y$8{o*Yh^;pLvUiu%ld(*YoCrGnPrTFYL>mvLXoAIQ) zo|roJhS4-G&)#R|SzTM+6p+{NU8PO^xc8#F+0|x%Cc2YUuyE!W8!4Cgg-IGmWi~$J zyw6rY-l#J-w6J2_okis%DOrMO*7Nk)L2DR=>0kb&j_C_1>Nr1axQL!bdP>5JUV}5$ z>xqZg&@KqN?}K#APH*JB0K5}_4CcV2LnOUV+Jx{UZ!<>!rUme4*V}K4Fq_3kt^GWF z?e06La%m!2n5Ci+p`Z(vu#$i1V*h*H6E4~f{-l)T?)zJ&_okV)?FN^PfYH(zoD=iP zIPoA@ae<25uZBCm%bvV{{Wjm|lR4iZ?aYNBqc$At*tn`FwYzbl%ljoSLTUdrR>>8J zeRS#lSFzNqQsqG|H9=Op1$s*D<0U0?%F(BX%?}|D_r=kpY$L@bM-g~sWW>MiV3;r) zq!SJOZ%Z&g{%%X+KQ!P7uM$UcgB-tWfmhxD4|}fTk2U3{j*9Zn>8$7Zh4!s$0{Ye9 zagQjxxIrVS1TmG2%)z9*t?9>~Xrg{!!-0xnkmLE9r|i9jr8**2^OF_WJipD*j}=3v zCHRyL3<+KF>5saB)&j_xt%H0S&mBs;*DRA5s%PT|tfT-N8#MNqT(SJ&2LTB@eY^}i zxVX3ch2T`Lj1g5@mda*&bftKhc2;C_i@950U6^sfQjGJnt?W$;+@+?-#T#nar)c6} zSiid2*vuueeVZFCH|@9Z9xgCyHrHNP@0el!?7raf4z{=PNASjIyOC2->gUc-<<@7M z?xPpFM)^4ws+ypUa_OYL%sOie>nHH`cy(FvSC`q zUkPLu9)l*G=|q7g+oRl|f;j!gf7xOMoy+o;e@By_iXY`AnJmSfj_8^a44C~k#Bm&N zq3TKXtM(2!Di3N+E^Jx{gEj&vT#3qbdS>R**lJ8fekmF!;j3*gjl0?lsN(ZY4a!>N za%%f!N;%wDyWyr~6@$U`OITwxZ6v>jYl^`f5gv?9LCaooL4*HmdlBk|&#nf?=I)t~ z{AvGWl;|nPH-k@lWKkTKvun<5lJN8DKh?ZWToFEx{Ujum*F6}*)~^|)vl&g)L8T5% zi@T%#0gPHE?V;tJs%J!$&T|JE!ZTFW9BkDcQ)?{FcZ|0s`k{s*HNbpXA9_#XFX77ADgYUfTE85Z|O2B#!|dtb#2%$;_;%;3D;`ogEG+C+ng zvx%iz{ip0b$6}OOsK!^dw|d4iY0-=7l{SlqD!iOw^R5uL@!lMF#I9eSN+c-^WfW<> zn{<&Twsd{XSro|AV`cq!c zUlvuQFw9eusEQYXU$8a#5t0zE;Y8&x`f2UbCME2S*qF5$n#TAOrtRcisxS{JROObg z#aFg2SFP&MP&K=F2?(*?8w(5N1>IiZ0(%qMs;HFH&5}zP8=}_&C_&cc`S5y_3Y+BG zVF}NzG9tBBJx`Y)jU=d{HJeA2pnKT0IZPfN7$qhAU&1uktaOX>or#It8_-}nKV7J( zuLI~_Nh1#6&9eMAyTEVzg*f64?_vp-1YsSf5X3M?5k39c_U7Z*UzU=+7GgieIBu%@ULM&Ir-Ef5n>B-7o0yV8N zu-64qd>qVwFC$%r)%*3??~^S4XnrF-U;yaMnN%}h&*2k>UzbPx3MQ8nJ>PfikG}SY zCKiJ6l=@KsI`K{W|MgD(V8p<`zQMzwJ-&I0pz=R{f7yZbZ?NABH1xty_fSLJV`HE_Hj}Fzx81RLmNQKdbD*{HM7iw!&a$XJwU|Q}dqrvwTx@ zn9Fq7UOSuXf*Ob+`fE(se;ghV6DgV9CCD-nCj8cu?LXiBNPC#JPf;|7u>AkBzmo@h z=OeH@P$Imh{gapWF9+}jFghP`F)&W^H@%PlY1n@}Z~y$?XrXWOc{A%Q6Oo@#Nl{Ld3jf zx1rn~KmuV>+d~xc{XGrD+xBL&LeG~t+^r>}Pv9NGq{KkX3!4|wb8E}vdn_}aI%g=E zYtBpL(_Z)MYCq|?yuy!9bh4YKNHb$Do{aB0)mb_}swCc25MBrNu(UWk2}V3qX_X4A zhs2@`@wrHiMet?pPuNw0Pm^=i6jHz`}xy&0qHh&d`LdKr8 z)^XDryfKHS%57iFXF0Q-9~o%c?!18$TNX`-JrQyLU3-Z2G(yXH3*Zg9*&S8>1V8dp zL7bNARz8ha8m(WS0X&$kjR7sUIa>nf%iSMNjCyuid3kv*Yl5yP%ITNqo<&XvGnJc; zH)mi?qkPY=hcr`-!#^OW&7HC% zM9l$g9r711+&?FiH6C}bg?@5~H*Bv=BP7qUR&C5c%?kf9fHUuYOb?0_x1J3ad_t4o8a(NSE*vW zpW{4`*w5@ZdZRZ|UT2Py9ocNR#7;~ua0;8%mwCk&*uAD^C+|9$YsN5yrzedTJa^Pb zdOpUq%@HYF^Kn$|1h!WU`aNrj?P?40D%i0slaZ7?n>mY2j(7YDw~v^eouX{Ud-zl7 z#N*Y61TbAzt)Lh7+4mjyGr5G!Gfy}={ivC4{>7>duxNK@ue41{gocYwknXjv#j3uX zhSkeZOZLqlOp=_Mj-dxFFLSP~kmOr=xPdx|@WuRg2Ja*)3SUEg`1Klj5iK~ zb}s}&xQnq!g^ho-3pyxa^we3FNbfv=7mvKH`B5{7=y;WS_ErC^q5*Sc(wwR?T9ZpcgGvD5NY#BZ({!HdQ&{X7kKKr|-2}mfm zwUMydJm}9>xi&T(Sy-D?KRLR#<_BbQ=F($%on_tbu4u3r6cghgt0VXJSS%(~P};wL z-`>=HmR%-irj+YQqj|H**PHnEa}oBNHxgMN+kVwakl^dRy$k z#T@=*a*9hf5ALr!x>=g{4pW8MJuNf%S4l(a;};P4G_Jr~P(N!vr!R1dGv?{w`&LN3i+68L>HCK?4!P9cct=T*kV5WpgsT z$8k-Q(451Uqt)5|9Rzk)Olwb~F;&Gvyw0Mnrd<4%r?728U`Mo1?C*t+|RC88O*uOwm9+E*Xv<0 zf_W#L!U+T=tTb!Ue81%bO@?1JIBpm4T~3{-*w1CTn>gw0ZBa!|-|Se#si$l*>2@2Z zaFpa?bY0{N1{{!h8hBV63AD)Nfe%aAJj5X)P!5xor5`16!En5A*i5R4($cHCz2Li_ z^_UMyNy($fN}K4rFq=xjPbN9zgfj8|YO$}nVWqROFdoIG#L_VW0I^|lG1%!SoAZL4 zSSmSd*NK@5?wCT0Hz$*2&6~;yeUG{_1mLX?&2FgK-^IeIB&k2BgJsg$0yc(j)9ek0 zN@`o)I@PU&r4X{2cEg*G6g<1H_FzArbJH_-(OZ&y8%1(*;$^igrVw>JmKzWni>@Ii zORTkmZ$XjTrb~bKoj6>4MTod#kOF;O4X+*aw*Ub-k4(G50n&c{7mOZ3#<6QE8{m zh1jX#PwP5vSlRpSdD4ERpOvU>8g|6sy7Y1^~g7~kh13aP6!XLPlm$ib>vjq?WVi9gO{X} z?53uEMM@Lr^o-mRUZ>W=eSY)DE`{sM-4idx+1)vNh=)!gQ&aW{Yf04DQRui$9~t75 zi&B!#6=m1S+Nm}~>BKzX?QWrlV1}pc((RnAP4XyTspFbd9wYCCUBR3#d!^Dv|7?jb z!h)O!6DPg3T+aKzVd+C}z%|c*|0&xXh?w<#{3n8?Wx@gPp7K&(*aQt+S zHy8|tDz_%4Vd9^>ZG0p+*d<*+yuM0A>)EL}d>DFmt+RHzm)pJRihO;E4Mx3cS!OrB z6nz*hb07o1_zjx+Z|?tgpwOwYj9=EGIjvG|>|*G}>1jeZ*dGZec5|ku)UXF#bEv@y zPg7l85wf@-VfNkH_KxNDJ}_cjrPg{ultGIvM=?j+P$NSaE>9*UUUOAYi6jycgV7g% z?<`J%Yd{CbEHL4|IyzT|Kn@#wb|~0T^lq3GSbOFw;r!x71EJGwHG_k*;h>uvNjjrP z%SF-JLvs_-5zb416Vt=i0w|V`I%^j0bq??! zt`JWkeDqWzpy2`1EWcH5B7}wR9-s6-3Lu)jgn=Rcn(zeaUb`4n2}omWf{JYo%O^PZ95GWVefcj7m9h!RLW27tc2-W@S zbaI_dWVeit77*oVerzlE1oNobP% z%5&t}S%+YLMxMvM6bie2JYCuxf1k~@e*MxSGBg~qZ8(o#pn^#N5`ArjId!&gANBB_ z3o2utoFMJbQ?TfPs{cHB#D0dLfMI^@16#MuEgwwYYX7di_5e?lV3{?__GqWW`fiUA z)ZTEc7>a-DRPJ4982)m+S(8K4W1}8Zr@{bF>^3f)?e$gV!G|?Hkg)*v62xElG(M}<;|U$?4uA3(@v}< zVw!Ka02q@-F$HuLtjz>mh296|>x}3fT>|n0e_1RHui*_0G+B3R*kLB&qp1vEjB{*K zo)#QU`Y^oKTfs}SFUwO!vCqOR6H^8S5z#M!U;=&xFR*-zT zep<;@uaXyHP3|bj&iF|#&`&6w;Dk$^xR0pY2gMqoWhvuLMKZ#*`qf&l!3a6G8lMkiz=}@r2LXO&ruE8g&7f3kQ zUNk$Y?+EqKSDQ;iXU2{e78RSiE^{NU(oPMGCT77Zi0}9nF5azXT3S=CF}ETx`xdS??VUidr+>TJ|#kl+o}VwG87{{rK70 z-Eo7orRVtoc{#^WdZBK?VwD-*`PNKCr(7Z>E6Mimt^;k#LzjNCfV*82O*vgE1pGwB zc7n-!!crb+z-~TL^>lv`982hm=M{b-4Nv~w?_;&)Hu}!SVaNMM)<>PpINH2WJKc__-;Rr=*))Z!75wqTcpfh-W1>Jj=Na;I?>Uy8;SzI$e6_uN zXK1b#{~QYSZpl|k6J7o=?)w)XHuwt{?mAMQVcf*mGx_QnxX>_oNZ=&Zy9Rlmd`a2@B=j z3|)CrRUfi-iW8?kyz!;v?2~%m(n}LThX6Xqae>c$82=DN!oJ2Eb>nmsMfF3!utY@# zMh4_P=Ge!IrHu~Pqd{aE8I{wy-UCD)4XG6>=zcZU zZpn|R7K(|>fciQCkZ~%_K`njK>Y}0XJN3U%%6MnWpM=5bJ+wtha@zM@##H-DUUiao zTP=k4xChDcAhh9xzULR6)xncu-4^2h2T~c`{7U$eCmEbiX9-iSj3uL%pL%@S4r8!; z+~K~T@3k~mxSyxF5!ABA?qw`T=c1f8cwEyry02Kh9BvpC{rQ?{QFN5? z?L);OQjfv!_453cvH`juEA6Tdn4Kj`n7=;XnM7x*0v8L&ng&AnBXC)xxOin38rY2{ zA|vGyQBX*LFuORn_jq^e>5me7Mv9QJ5(2#Ko-q^UTt|uI>sxJ&#e60AVi3_O@rIN< zY%ZF*i~4ILbjB~JL~aV(iWI?0?}-HLzdUHxL`pW~r6WUagHWgVei75Yycd&G`dn(B zAAvDvw$MbP(_kOA!KnSNGB+F@C3fRDS-aIW#gfH{bhF5AsEOZtDNYt#ZJ|uk*k1$m zT+rpQ+o7K*`J^t6S89MsF8yRTg_$VzudIC^whzP)trerwa333ft@P(UxD$Z#dC%I` z(&He4-NGkYy7?!(Rgdw6{3r1^>N(~V=l=233epd#l?}_!4#)EpRQQEwDsl`9`~Y?u z6RV1^e8;qZdhR^8XSbm8`c+Pg%QN19d8|@|43t39?v?u;;iFDch5>jqUm{tpKH)S1 ze&u#S0k8l^4%9g0BQ}NO>31L|?UKJs~&hxM2G8q@MPmC|PyZn~9!`j+XG{Vv*2M6vewu z%96QBO$veWCQe}UM8M&rqxoR)DYbmJ@1BYc2m7>qy2K=GPcu{ANVj1wN%%)+dq=s< zYU6{Qj=>=nXwrbHV_W!1uLWeh40{PnmY^7K?{&}SOaDGY=kv?Z-7?!T2WjpC@*mKq zMS73*L&POLDPGLXT+*~!h`JQ^3KmZLM{GWG0i_n+np8_pxgh_(V9Y@>KMdl~M=nXj zA!5-s&yGvKRyBIq$*@kwg4^)c+q>Ir$)eYByK((dZzasSoo+k-mY({jwCcA6v1Ne1 zrZ_)Qpu$?9nS-uVzr(0!xkRsP{aB*2E5hV*F)!-4Gu~RY0>N6nuHEt15~c4L%3>#D zQ9M_y$}yUEC@a!P3laocY-R&n(dZ(-*4Bv;Cy&=ErV7^3)b8Y4-KrdJRr|~04ymeb z{)fxf!(c(lvx5nlI@X%30j-)bKRdFx)gklU&Bx@M%LCfYDu^?;7*Yc*&eu*Y@|u4q(x^(-vt+>S@(g0w=1 z)9<^soW9}NJC=TgCnUeh!0c6m@I?PvpXbL<>pX$NLp4$36}J~(zgcSeeb;-r&Qnh7aCjNt7tZ=N&Tpuu?S1;?I;&-Ys6q&^U*Mwav@z(%)ZB%BVr?H66nCRg(I& z>I+so&3Zg;zC;Xf>+2dfj408dV77l|w1G%iDb?#bXd-~#FVZ1gA*B@I5y6gJbpOU? zBLO`q`HoRLkXJnq*y!4Ku>_eY3IAs{Th6n2_ld(NRCxR622&C?Z(FmAm@d(kY2`t;y|6K|6 zpVqGe^QdX;4$pUdVDG7 z$MIBmD0hi1)00&6bQ2e7)RnC|fU9t<@4poX5j?iLWF*+?pOI3|GKT~5h6gt6o!aj? zOsICITPTVb%0APojeDgJStq2Yqi$_l6HMs%2Lla+{>p6Qm(dyIg+4YCZ{(trnWug8 z8G$Wp`H&?n$`4zzcru|BLi#I~6kh@g?pvHj*VD=(vwGOCmP=EJ@c24`bdLP1M80!p zTJ5qYPFusOVLxVOG;&#%Yu`Ams|F`9>a`TeMl7$dzfT=}64e0P?@&WpS>!~0GeN@= z<{~_ZeYvIKNRqUXpmc8@un-D8Ta;6YAE_2@ifz?avy)xJtdMk@In_PPc9E!LlKt+c z5_C07-%6%4I4u+2;XU9tH|MJ~WN5B}&0}Y)DUZ!v-iI5Qdzwlgbg!TpG=0LOIa)x3 zSQu)9B*uk}Y=?=#`00g>#nO8qq?>SJMX;0i2lCbf3lOi8D4F=mn3;Tcn_zz#e3~Sp z#(;9uV5Jb+@*y%I#D-XdMM6wjXTgr#{`!qg+bXe^~^)35(A z`EB?Pvt;iiujmw@5E)I;%PRY(yi+)te;hCw2fkYSY+Mok|o3n*ODB`tL9Aa#(=iFPW@iSf}%g@K(785Z*=|x5xGz z06iQw=SBS+&ke)Xm)s2s`TDN(YL^sc@MzF4}<9ZHqS5uII9Wk?zE z^_L2U3lhBCl0+rsBjv2MAd#Y#s%)eZ)&jz3n7fb3&(99CTJCt$ooQ08 z@VYl&{~P&@$HZjy&ynBeD}VeB`3>X&0}1^`@z5_1I}X2^ zu^Nx%4$N&2rZoZ`;~6y{E@^Le3VB8sNXY~L42?6`4@$;uyE9F+CphXw^8C=A#}SyxVV1}d8z$PCbG z-tKzQ({|{dZ!E>qIPZ4muHS>|q0)iwBfLQ^$%pTZa_ccdi_t>>A3aDk5a79qE6lC3 z4)qv?-~pT)X^ver-WLEqkrG>F0gUwl3~_%a#=rIhtetN%VCkqH+4#gn7Hw~NT1edc{LLr2Yo=2*SRB(P$_)v(E7rph`?M>n)-i#gq zqBg=wxjDYy7TJRmFX2$AdtRutD%v=MrZ|WknuGCfMrKs>FMySDV z@F5PgcApj&D%Md=Lu4?I$=+2&%~gICQ*TRa(ZZy~*vK$d_Q}qDpy0zHCvAp#*V2@# zkqS-zTE1CyTriB=-M~=ekwmc8#=QVKa(oN=dEk|{5mfc?e zIPOwuu>v1Vb;4eAr(=hTJvj5RTvx@0Yf~rZ z1AcOy$JnPc>!nVoAK30AI@lhE;v@iQ%+1O^6F(R;Q((fgG}fV45A?i0mgXSm5NOw> zSdu!EFW=@7D?0zZHxSOx$7XSq%ubFhS`3Jk_^eI;UWfAWcKss09rRm%R8I8c@K-%U z#2LYahhosF#Y`p*GQp@Ge~!j#SXV}CST2#*9!Xyd4x`V_qPa5X@XXt{q|RAyo!A;D zJhK!}wKW$xtDPzONS{%!F7mm)fxEv|G7M0(hhWsVAO(}gRK{bza*qn%=ZO{t#qkM;uBL?(YKu375Q=ZoXgf<$qeYqrom18ScNnd`yb}y;8 z)=@jLq=UUlu(KAe&iZ-tnpgW*$>F=|fDPR)&0wIFPFmG$xwoUlt*_!;m&M>nzP@Vm zSg!ZHi2@lEO?Rq3NZP+YQv$oaVtCqJA5KH;@Qk&`Fpd)8svN+7(_b?4UOiA7( zN@1_QzmR%0_E#Dk1q}B2FB%(eU_vb_P}<8nI)bOko~`k$<*Ri*e772b4kucZN-#Is z_uh-!tMe?F&0qsxv)Zj0-{1?{6%eiIACUB1n}FG)UDG-qO+=%-r~m;I<8RRo25Z9w{<2aAhhZc3jEKK_3Frf!VBUo1K!s zsBU*xsIWBfK%(NzVd~Iqq@sG2yO5Tm>L00YKw0izsBX%{dV~vOT(W*Zz3`O~*WWNh zW~ts1e%-IANyGG>=c2;sp*)?qJm#m-lM+zP*`&PYAZ~rt4av)+?oF4`I*Od6IeHe- zzY2bWd>>KK`e(8QKfxftl6?~F3=#Jtf^c~Ba~v+&mA^*KGQ&f=~^yex|cx&=NL5P3SC z#n~k*2u2ZdKx{vcVM*KFqpc8c5#i@gF@z5RFwq1Up`1hXn1!EwY&ug{+LD`H+g9xU z9=$G2M*l>18}K^YzeRXU21PV3Pib)>ogY)5?zG6mOGQjvSimfKA(H$N`!S7BU6N;w z<{U%oSx)*vJop6*n2-#+4Hkr?~Z}m>g6&7A2%@ zm5}9U?&XONxoBuG?kZHXXQyC7 zgM3EuCrQl`YC^l9>}5*ik=#~!UgsX3@VK!sng29XVHo#-V7~o|xn}RX!owdZXF2vV zMaU47l|+G+mh37$=qSP{G>1z3zi(Yxx z$4~Yux@c^|!uhw?n#QE%_}Bsbm3;pm(XGIz6Q8Lt(^^ zNuk1u&ZmN{YylR=B#7)BF3mCMsjCTs0qv30^7)W|VY%r^-pUs7FTIzzJ|LeY8vI=( ziZ|e2zvSOFK32E)2lLf5d$tb^J8gCuc$%&dMVO_u`O;#l8nKV0eNV7Yjdn74E}_#H zF|cnC{1Cf~h=7pwTyG*f(;taeblOV@;7_5#Y?H)|37V zvtyYIjd^G$#8R_n6j$Ppscnj*Aj;`BDuHX0TVX?zQ5DC2EiCJ z1Ki(zhX49zq%k}f&-4f?fhIKRT0c|bmoy(P)A-*iCb8(u!RXgJnOO#kv#7tIJ=y3! zXQ>yQacF->GW>EG{=b)x2)wQ4^iPq1my=b72S0zZiKaw|KiR!~^~r$xuip}fgXxjI zMOx9L9Tvm+qbvQ#+H_<9e32#(9r6ISk__$BA{)ivjNfF50q-wc1}2xX`znP)4W;t0 zqxk=>?*DmTycSkkMn-yUzhkZae*{SqGoUkvg$K)qo_41GuZLJbXU2-MW+KEv`R~!c zzuhadC~x_Pr0fn?gTX(0U;ptQ1HVUFBP1pZ-6mM$5dDu=5y^p&_(4=OXCTR7@_)Su zS%kz8acDw#-~Tq9PkgE*p7gd>)mtaB|6aWP?-BUFyd%Uz`Q%uSN7qA}=YRYDEcsth z%MLMB-0r`~mCKcsw&(GOCj5fZf4V=M04L14&WVS$(#_A)UoijB1V*L&XvSD>hYdLa zBI(~Cx&k;b8^*@Qm;?l;_5CkSfn|B+3%^X1qc^O-s`z(Q?SJ@12(8X`g%tS>4?SV1 z+xgCLWZScRjnhfxG9fR`N@JrYo=$8RSN9metDse^i^RN5<8w;(x+|wUzpH-{hQ~QO z4JZ%vh1S?CNi<&WJW|x*ZZT=IBXV)`waB;P5a`Dt9}j{VPav)1fm?|NGGw3 z0Nb4DNvxUUMt`esAi+e5N{rXN6Eim#*NhlFi-b7!@hmnI{-5yL|KaZZcAp*L{rvofzXziBban=WU@>G0SkQ%M zWo4~%JAGnt-WW`hOYw)dKFtN^84utp=hz$3(BI{nVPv^`oNgdjo6ZE>-QDGXZ1XiV zHkM7{u*op!iWpm$+Uyw}jphN}K=>Yye5f?EwD5pfRTP_!B?d?UEhz06NYP34Mt3N9 z_MbMoUlIZ$Dg}MO$D?E+0$Bpa>8T@?Qd0+xYn?K*It{UyZ%Z_r1Nf{LGIe-s^LHst z#FCs14VCSaq2?)N!^}NL9eoM;vrIhCe3;U_>j6}`*S5u%-T$uXy^k`*aGl-zWI>y7 zRmj7`gJxH1iSy&bGe=4ISyI36guI7NTSsYVt4SkswKm(|+TNcXwmvFkqYbc|jRt7~ zeV>6|SQ)IDUknbK;LZ+o(2Rzn!UzT2ME1tjGF|LeLU2TPCvCnum<&b5Rb#PRPJ1V_ z-+!>MbiTAuoK{nY$COLwq8&me5(u$gswcyL+6;7WSUBN>yyminM}ET+goxQ~W80#A zxK+MZWpn7|c6&geQlK2w;Iu1=y|LjTNkGq$%I8We+9fj9{pvflSUCQP_5kh#P+RFw z<(3M0Y{B7+t)qbTRDw!p=8qZ6%gduhp`ABj>T_W~0D^xcsZTBy3=PTS=+`9^L~sqU z(Pn36Xa;h4mjQ{5Jf}j{D$s%(?!}xuE&V*kRPk-#U>Yw|18atWr<+0&OU{H9oAbf^ zaqPZ_r$@eU2jY0432H?}MYPHwq*X{Pf-p(hW-26MVM zw^qR4+6(yKBo(U z8T~;(gRV>fml$0rUfQQ_{O~wPOoS#NI-$2(e#!-w-)cA z(~6luUPfuMNS4igP&@8QF106~0gvBvwYcOIK*76)i~6UctFx;6bxi^8_zhwPq`kL? zCbX{8w#Rj*g5vl`Gypu$z0u>0-=C(5@^|G0?O{6bh)mhcf8|*6qFNwC!t7=$y`MhD z72pVxbqu-B&^&S@Es%m?giqj<=3w1q6YYC z3-do~mY6)v<|bv>zz_Jes!f1w;0c-MmF zNv(Yid{bJ4Q+aOZ=8Bj&`1tgF*Immbt&%HC5s$Y%ZkIP2Iwg&j%Kd=`-OE0PHa4XK z1MRJTz63A8dqwE|c3KVuQ}1&2ZQ75A=5C(?g&|2*`VC&Elh*_SO?s*`4HRAt%M@V7 zn9YrW6oz?JXQ@j8Y;-r5c~XZc7T3X44ac+YcbYYh!9`tzpZ9uQb|lx*8F zBY$31;V(;ym>)e)z9kiH$4OPs%^z`n{I)kdC&wRiuAEvnI5HBgp4V0gjLUC~@3dQj z-cz1veUgnJ$^Ll`XsX=fz%GKQ^Ww#eYi{R@FN-&Vcf(QYv7N%zp94|GdgBU%30_FW zJ4S7PcEWp;%mk(0aBRT`Y#BC6U~ZLD--m?_N7cF+yQ;%s#zpR&~6Eq zVaOn)z3FYSB$ztzqh6jt7s~ULn#Yo2N3Ne|o%pCk0`{iX&>zz8#+JJ6z~Q+#j(RQ%m9_o45F zQ#tj2n$DJchK|D7@h?y-)|JsWI3Kpm+ZQZ!NX18Ip}|yGd_~`#yni2x&GahY=#fh2 z3Xq?r!QW`w1`OQjK#9ols-z0HtnleTDtD!{#qHh) z^o&Wnj#|_{5aj{VeETFKQ}a95gAs1xzen7+POqYF)TS-)SV;kW6Cg zuf)xBPx2MtABwu6Qur$$T+1dJVSr+W+19}aF?+GBtR`Npee13+_k;93ktCnpA(cnx zoMd~er$d69B{$Hi3zZHz-d)U&v_o)rz|~pZX8Qha>fkQ4HGdphY&pYnp#)W(MEo)< zn`i>~hm?39tMC{f3N))jkg?7ETLBP^lxbp;FE^jCWE`y-^kl+36nCfbdV^zQ#t9Ti za$fgl4BB0y(`eMu8<(kq%|2Z3(1l$)GtbRR;dyfgs1Lq5zP#jIqoq?RRE?W3p8a`$ zdlC9v;++30iTAfSB<9V-xD-2B77y@;ToNB~|e8Hhq)MOOng^rJp57kR+sFsgmW#{LM=Z&p<_jpU|`>! z^sRtsR}U5lD^pMjc*x@h9Dgu1WAZXoj7?p?L_vuH?c3B|7Ag_!a@`6(`rgkpI+udt(ia!?yA`kQ6Nf#Od1Dtw>7Bp_Uge$c5y!}wm+ zn$T1B)aOy0xW@7rPDzyu^rYdyLkx&92G|zL1vM{fKl(I1j!@Ur|Hl;uOkyz7R#nr@ z;i9Zc>y_A+a#@nhd6Q$VVyelQ0l=`{Md@)paESLL*xhp$7)nFp@cDkm5xHUMAaK64 z_`Q8libH8aR!e_vA~HREpmG)BP*QmRl2rxW^IChKdyNPO6VtG(XzY-3yo%O9Ts-I} z%NU@!<}~U)wVYm?d--+dxecRROJX9DwZYKZc`6ToMF6oGe72F#&H3(}WM25Ywa&0K z(Nc(%Otp;FQ%y-Fa%&p7#z4J4Wj=mc812tOz;lDaH=FN`(;B1deOf)VoignOg<$MC zO!5mlxoHmF2ZwPwZ1krG>Lsk>5!{Wv>qI@h#;pr@)(i(b(W7=GHxxI_?}7x&Gu8Sk zeX#yogqQ)oZnRy-KH^Vb#c%5=oAPObS^ll9!Z!Qe+c zC+oq`ConYH#Psy^{!354i~Yv~jRttD-XkF+%iwYL>5%@qzv@2TiKeuV$Be|@-p)^p zU*ck7k|(hkMZW}MEC>X08Ez^1ACHQ5B?rrPhC@ims5$R%27ZhY`zHEI=!wsxH1W4= z*B^J=j}T;UBrYWhalfD1X2Q3rT{^j%Ey#MX9;#x3_zF@OmABWoiYSw7< zzB#?iyGb}9B6I#V-aly>;fW*TVYPv<*KFIXUhO|j&%aEbVv{!=4-aL>5-jI`bw+O? zO?2Dq>ztgqbzR{0{ilcGAI>U%4a1lKp<7>q`|rl+Erg413xvqfjJb8y|NfL?iVr%r zFaGo`z3YP^A<39J4_O>^UTKFz-~~T4=yuKZ48jF=*AO&P(9#0iK@CYHxliP98TonE z*!e5w9>LaK2g*UfeEzA^L{h?HGigyUwcM0Ay6=Eb_CjrX+B?8hDYpWkyX>>=#~Wm# zq0WK1?5WDq-r$&b(c>0_si%Q=%w82!<*w;A!N>P|eF`;8L#_R>n=eqx`&L$7aeUo8 zhn*^WYkP0JeLrt;vW>GOVLDy?0(t+c_2vQhLo5h|;9)`i+VdfL7xeudbg0|sb71MU z$1`1bInd#Zv*>0p;OXez>(=KAqJFq%R@iu`ISMIBiRW#+>wd^t-yCWt`*Y8U8u{0@ z)K^)ZQez*^e|9|Z=a{YCu-tU%8MbF9sX3)41g3!{Hl(K5fE)`tBXnaB?P?xbYh&u#cZFis`u$f^_1+w+`i1W)sRS zxHmP1L-FUyLuOszlW}$k6+~0Be1q0OJXr*`;^O^#Aa2pH{Yz*8_!5`x#*N)*q_)2yENFH zN96Ukiz9MrgDHMbqq0}Wxhl>V?qtS+0;GN4!2T1}VV(?io&n&xMfSLb>9|v*AOOsG z$3{#>W#V^%rzx zbX^t#7%FT>?72NRiU8L^#@b@8_ostCouiq&Jl&HL-Ntw3lX;}IwT%*YI*i9oEda5k zZ_t>_~)F6$|D%_RwQM?CT zblu1OFcRn?(OriyCd1yQW50FuiW>)?zB%26e9*3;!hGPlMuSJ(k3^cF^ZLR#j!oD7 z#nT8(mW#{9iN)}-1Gd(Uy9OcE5?w$dC6?uKW|n}S&*dslI_DZ3)Hu!}5QaAyhY(}ZYo|1Fd~v}kQM{wFx9!O1W0u zK?k>uumP{bMJmt`Qws&}8NZ(59LX4Xa$a!#TL#(1wNuM2sK>Hocjk#T%6-EqgbOSy!7hwiMqJ* zx28fny-AS>K%C`I*&T18WK1qoUol*P)0glxKV%qEx}Ei!Z9ao>uUxH;x;UC9>fTx5 z73~NfS&hJ`Yz_tXH6W+RBwEBH+Y#`32@BxggjGxT+KrjqQzGw7RIHE|d)J!vq2NuA z9?j1kqDq}5UGY$U&R6F!xHvpmd(Ts4{9j2O4cZ8t3glu&v~zz-7UNZvIZh}PIiCeEmt9Ke%WY^n!B zKgWbHt!KK&pTXw0J6c3DCUy?H#`Xu6WoJZ3HT7M#`AUTa2sXyGPn#(zO>tVy&`$bn zI>jk44n~*bWyL&}mtW!Sjcztk+J0s$(vy-+-j2|7JtYf%dl*;)z95J_PpOg2dhR6s zgjv2baXGU_2`bxHXyZkVOKzpyT7z8mf1JH%RFiGACM+l@Afh6mAczH!E?qhnl#bFn z(t9tF8WlxF>Ae>rq4ypj6zL^M=)H%QgdQM}e2?#Y&U|NP&5WK|iyxFMp671+zV@~E zzIK3pL*;toK*HH)>RP*P^=Iz<@SUa`UGcg~H~8%#Y%F$jchQ@hb!##RNXvk}2TEDf z!=*jsMihy4{f067xjZNQK;v#>qV?$9oN2yp(F2PPH9=fO_ns?ktDz<}?Y7 z6lg^N!G+1a{8&*_3nX@cdv*3e=3r*<&CDnowk1GuHq<yA>OoW;eO|XGVB-W1XIQ9mlQPkCGP&+O>rsP=e-4oTGCYm zdJr8f+S-0nc9q`^Ha(pGHIEfEOy1CRTVh-%4p}-B-FUG_LUW|ZwdJ(hB^*Pely|+| zF{hDm{^C@RIbPLODaee1c?`SmjM)f8ByfU6Jaa}iLm0Su3g!sI%xdm54`)A=SQu2> zK7bSI6of5vkh6Svzfh^eF6l#C)6SogRen`j6nc%4w(p8aq1pstmFmDHdc)Uhl6J4$ zwjIuj%w{G>vek)WXs;QL?XnE**?cW77w*-O0$Rx;`-0Wb=g_T#+o1T*62{)a)XCLf zWeV=PoFa5SI85di?{DGDsntgXMy_}yY=GEQBMM$rDaA7b9fh2iQo280C{V;0iD!Qm z*TFl)HZ5_eb(gA>PrS*JLCMndL_VSo8HV5{;0RjLFS#UTB`;3j)F95z_&Kf9#ykS* zr@V?Ti;sV7Z5>Fj**uZLOO3RjIL_8<4&_jlj%)}w*IG_+O_T>fsl!fu`4|N~lE^Q6 zF&Y)kuW1!YntuR&>-XtN*tF-?gk0X0$V<-tqJ(6Vp4)a>vr5%F7oQ_~mZ?to9^!@1v@YGK7pFdU!y za4(rX4W{)W_GYI#tnlCm-^MAy1Cm*E^iy+_N|^QWS#Nb4()SWxHEMf>u|ic*KXi77 zbw>4a6OqnBBaB$vxsGD{92x3@S$9n#*ld%N!}=R80ei!mz;6@>&Smdkz*_|-+yeY(=-T_g#A9zRxLYIm0Dj;3+uGVqaROtVilnfnLSKFwty_8YV=R}NdkPEC2+AHh5 z+Uu&>&6lbFD1ccr+x5w>`IumWuoRsgr!Gzr>+0;YbHV1>_ zK068HLLstJa_R#cCV2rD$I<+NaIsRdSy~^Sb(+Do5DjDQ<3|r2wOPO(Tcq*U3#xCzoj* z7>|(a(ecUHgp+kQMW>TSqcKN72{meKdr7z5m}wBs$y*;R{^W&C5HysW29fry zXbp<*jr&TizTr;ruS3WDs^1dsY%&;8*1Rkxh>a3W<4`irC*j64F`HOCC3b^Zju7;G4|A=ZyfxS$R_fMU4R^LiUHV}>b^i5Zx z`%FGNurW!rFK%35mhUkk{uX;*jq1t%mU#hFSn{J8@;j+bFICO~%S~5q(k2vx+EU)I z;nu8rRWK#KbVz?$b4v3G)M?}~$J<IpsIG&8}}7kbcFYPsur`%UUZ@C&O+Fg_^`moTMNH<=LWK}T8bK-STS!PXYRJKU z+huWif+Ecj#O|#U{o=q;yK04dRB4kw6n%VMvSUiViqic3>9OOs3!FlS*Q8!ht!6&r zY9bE*l<6Ik)3u5+dDc(E;00|2vUCOj!)PcAveIm(w}Y8zw9+equ>4A$;v~HAvyJ@} zrP9d=hoep^_2JzY(*y5MsC;UzhcKGgd#5ZBM)@>-6)!a_=wcBLhTw#rxX2aVFr99IbYYqOD zs`Rv)?-Z5&31_gP>v@@Vckf(|ZuUy1^+)u?^I9QrsMefn1IVNV-8HYzGi_1!OvcnwLKZr^TQTyyh__o?^LA#CH zezh3nMxtb2#h|@EeegHp_IG}R^eGg0%MydhQO;mpSw;oD*W2$gzgP`RQzL*Zl zW6UX87+M*fRMem+C=vh_tCalLI|j+0?YrJ=+;}cQ!rq1|GBc`8X9SLQT&rOvi?n9tHUQ3P7d4?Cg zZU!j}1Y7~{6p6DvV&Bcm^(G*r8Q-)~-((0%a8g6!Mk?B6!pC`caN>yWIj_8{sf^TO zxRdF3Er+l{h?h{FUgr0JxqyI|`&&EdUr{&p!no%d=mHi#Gzkk|xT?THTBhk{`bZH! zzO&~0T@meo%&y)0!RAVp6>9hi2cTB-`%O&qta9ujbMVoOE}2s+6n%x6tVl z+P(yZer$?TwRKE7yF@`#xBZYWRf#w%Q0LC>k7dk; zO|DM20p5fPS&N_`%hy z%yj59F$wA!v6_&-M0xMzLg*jrR7R}P@OoWZ?oQ?Qn!W_uDWRx6?f35oHs^nj%M>Rq zjuFy&@z)RkkC)_{4+#rl{bWqg8%k$5tC$3pFSm47)mkRzBlE) z6$hv*g1s)k3{Q=aCTk^!Dlk?8AX)tp-S*R zn!6On0s{WGGmmxi1cHB~fKd967(;wBmGd zA}508_F|D?(#(qqxG;XL&h78knDv-K>!I$8lfw-zA9vL0*hSn_`nMd_0?6*jU=5pJ zbz!_QF_i`$^W&v@ZB6=PA0NnkB$b8sObN$ve&LwanA3**n14zzFb^gUIF|(vo z0q|Gq{S`#KF2K6ow*aTHA8d|Zm6etC1JWdsY>yxOOvA@>dSu)EsQ1RVw7u-Ff^_wX zgB2_-W2B)hd+4?F-`q_W3Tf|uCxB3-KVVTDsjQYR&ixF|$mZps8~yIxyT{>o9|)@i z60Cw%(qwcGF_NqR$50ipe^M}77_ABYV2PUz&?r$0ecTyfo=?Ie?mLb778X{vlpuo# zalS6h?K^hLw3SmnA4EpA>~RN$o}H2G|6qM?mbmZ0^iaxwIbm&lcctGc^oJ_nn_(K- z?6<#Kql9d{6ZbYrk9~G|^y_?6V|a}<$}PY4Up^J|s_uIvsvKA1PP`##(Ur;#Jt{YZ zyA|-5)DKPf1|D~7F-zI!7sT?sRvCgSqr|0_%AQ#F5&CCw^qL2y&PDd+{_O@|zkH9$ zlBb;5kz6up^bU&Q)NYmLbHP4MiS{cjoGO)PS4raB3nVHJByy(r#&X)tQ3b5N?DOo} zBO0(HtqJzw4^0Y7@u~Xdj!rdTaP@vtz&5;_Ja?OL;>H5SJNhY4Niw#a~L0w10 zu0=^=xQI=mGTh7%XAF)yuG z1V)n|*ej+<)mbhlP^``Zw4+e5IlHIW{0PWu3Q%5Gpq-1%q1bQ<$A+Wg^)Mlu0mbizrcPD2DWZjJ2H8(dml`UfXU}gbyt3o&un} z*lA>0qp`Y8tA&SZtQ0kwovm^KLi?faq*k<{MG(ktADH+?7&`chD(u6w@v+dJ>YHZ>a_=GIqc^gIePc1 z_N#nB>!#x{w+rYlr@C$UC?_~b;^qKuSEKe736uYD##BWk4Az-3vRzr8Nd73*&2H@# zcfFV2zKmhOEAEcta^$8%vy!ohWVZHRV4|QQi{BB8jqPED9HGHmB@=QlQ%DUOMDS}0 z=D#R2r_7b~23l=lZM4V07tKfGRlb>q{V+4X63>FiWRO(b|4`e>UuZgDs!`bc_M}me z{rO4PdCwuD_U7F&#zc`BCeM!w=&!$lH&n$gkO%L}Z8IVgyy(#=o z8a78~O?i!Z)WW}R6KK*_mwtmQVNS${-WuGkNR9q>%&{P~g?J(AxWK+;$;)F=ZYpVK?OYU7&zqC;!>vhr2=^{Vezmdtn zt2C4XSM4&@!;<53Z6=Pw!VCrgmtdeZY3gX={I!g?cZsl1Dx%e1sBCJp={af(H|eA$FghLG5xk zw(2~*MKb+BCmj2EEwWCX>M51!5^B)A<1L@~RuzMG%$a&{vYk(X@;3;zW6j5{%4e@N zM}E`9p84j~S|*B;))30kLqccU%;)vJ5!Otk)Et?O;VGiDbWb!Pr$sfjSlqb&oFrWZ z5`on1tOGzXY*TB{4v;rYL8=0Q29(h0*!qCsN?YcfLbwdS;(AoO<72fT*RNGQt0`*S z79a9_!6z~jNFzTy%W(1Qc9y8YJuYjAd(&iG3}`$a7QF4rxVXZ7UVe_IswpXM{ARt3 ze@RhKE=fOEY)@|+Zq5qs!J(EGg~v3-RJcCE@5yL1)-KE6 z5Gu3)S{lOTxVM+*iJjW8w~SK!Y&}U#r_U)i4_6 zd{6zE=1$!E^QMt2y}Dft>EI1Qugd8&dLF%pKO~TbkHM5N(I<5%QjU-BciS}G%Fu=EyQ- z(%|fYGsO%()`%O37+2$8(`NGo3J80TAK8d%&PbpQh1%_664#6U;s*xU4W;|ze+TEL z&x*ZUZjGJOJVsD(ZPbyHnxFrqD2;uqS>%dbby~dziqv2W`KrS+Ja1{PT9QX13gw!4 zBGg||0*O74!EaMfnHJDB5xd8{jj71VE`F}3k#yfr@Y83wlDH>{&QAPbkZj{RJcVm^ z15AcEsv!yC;PaViLiaFQT zmyhSEj+Yz9p2KM`USX*oId|Z1ur9#9`hhxa<1uDqP{$YdcDQdVVU}D(y2OXASH7=u z(GSP$3TI**S1Ib3-{!B9F~Cs0kKw-x6jvZ2syN^K71oHudTBz(P>!-Pl07uXpsJTh zMJn!?=*`TwPzM&5FT;-h6bK-eL%#m zjHEe~-4lY`>PR0N-MfjfDvGK0!mBYU>`!By#54VHqjO`TsRKF%BdW>A$&JN2qDBpl zIm0D}NR})!QLpub<+iNYtB6Ff!x-xubMK~N2CyHyX15FReVhBLqoe#Y8+e#R@TjKxDau&1? zE;dam|2c`OnIk;1%C=Cx*(n?RM*~tTLuwfQu`8s}W+n54tY53lt%Ca6Yk^&4{*R$r z&npySz0X#+A`#eb##6X>rqFqDrM*YY>AYtmw{ zc>Dpz`ErK>&V+x`iCR^=%3G|av={KqD$;{y&!%UH1V0G{n4tl?Eeey;^}%33aD?tZ z+2Ez`6h|1Ym$Ye& zz+*I?&5*U$XP(`f39cdaAlyoQ9eag@~V0 zAqk9DNpW|2{}jd8jYjfwowR?hSa`tb9X!?wJ9BJay2h0Gu@Iw|Jh=3RPXt?=Cc9 zXUhFnk`sUAd~_d_T8`P-oe-1~Ctz{YI=mQoxSCOb76xzKSQuFMzEJWi&&&&#C^r7# z=ngA)lV2jmm3wFRMZ2;^Ua}qSjYi#V_R9GTJt7#eximXqyVqP~%C%R8k033nKa+IM zBjegF@+W_W?M#=9EVK@MRu0>mkPR(2`UWyI8|2oP0QcyIKoD={1C4$ zIP++&8`SpzOEiMI7v<6HMU>(bDxlK?)Uy=6ZcGKBg7CWl1y{=`=DcNcSY7IA=V;CL zZa!U%r5dO{0rR?^?5{s=flEqE^QB76&~coKd5k))<5jTSjP~@JA8Ooll*)a2>2Yo+ z45^o82p_UiUxc2>s2#Zg@|z|>U<_^fA6IouKI1FJ?utO{X_KM*cKP;P%{LmQUq-jG zy?3?_QSW`p*evR^Ka~|*xh~x)VUPT!{UCtxGNB#x?auU9_?*X?L7S9BY(BxL1kxhy zg1pSJaym<@Nx=*%!eM-zsXLABU?$!a(%7FJfOOz%rma1?Q>0)0Br39BxwbDk@^{iY zvC`!!4uY2s0@q_Eu1kmtFd+8U+@GRC=5WA$^0Dta<1@hR&JYxnY_5RcW5Ds%tFjQ610NDdC7(~Dvwp-o7bZb_;gR*zjXUnUcN$dA?j0e5gHq3 zhqPgnphy1*D1r3j4~80ceNUZgYT}bb>=kAk;t5pmzS43S@8p5dlgu1Px>?WNN?PEf zMTYf=M&EveiH2hhJ=f{l^l7}XLW0QV3a1z7BK@DZ{`sT}zQX)mLZi&_gI{cMJ_Bjt zQKn+)H)fzt?XyA}$Duh{Q&sC99b6Ez_vuUw?}_94;|a7iy~kbSx5nboGWT;#O?dp& zJ9M&;gnn5g&eWHMWAan+>lu z*jai-rXRJ3>z!#E>t3_^oP9XIQmvkzUOkx?K9lM^|I}O4r$n>UTWp&$MM8w~22X@K zdE=<8{ER`bHFdW2L9Gy#gjh4KIZ`1lU985L>wFrP?Ngs$e5Xq0Y0tNS=TMwlXupb= z|B@y)?^>AOQ&wK8%YmD8KE$9*3i5LzN6>&u>_{c2CZt`w(CQogq9Aca9tz|CL;=Ez zK9LE3Ws-89ulTmOKj4(@h1*s&nW|=#jv)gUJsrj~o}_r$ zZu>2M?%(aHOx4J7)%mpqH>#ccxKBT|r^O#Na+pg0cABN&ZnM0kTJJ~gmuwHDMBn80 zLZ9Btd5iguagdHThd{R4#l)XS0*v#!~t znw~Srq#1&~-SVjQynAP<98TPM`GZaw>_UH|e3}}`swND-3>Pz1GVl4sf%*!2g%pRP#(&c2mf9K&jzpwXl=+B93t_h)lM$gpv#UhZ>O0lFSFIYkK9+U_@JcirfchjU49v` zY@XCQj+g!lXwcd6TOgYwTDANLm)gSM&(;L8JZ3kw+FDv#Flf;9ua?F>(m&C&M&S1v zK0=BjwBt->Pul4-uDV+I(XuYu9uG+&6uf zbj&p4=_hxS^Y7At+4T@{!c6;x3pmIDj%lz z2A`)%+Rh*+!xm{avqZ<3rUe+rA)II?e5CfvpPi{5m1uvOE?=_EEt-ZRsW)R9pIMRjU1eJ?siZ4K^7^smFc=W;?m4#>#-Q>39$^6qPK@=2-tN=xFf za%(C8nl#8#&b_JWO!vN%1<1;_!waYh>tET`(>7$%`3jBddI&!!-ny-9FSM15K6+(8 zmcQauLye<*colED4CDgK_r&sZ#B%AxsHI|lN349LJ0^1Rcl@^lk5`jj&_H9g;GcOX zxaRYzsm1>Plnwn~B4W+dH{RBo-SwGN@sM*vJvDOhj z9uPQ`^V%%Wp6inRre*$#^d3^@IG|UNi7REgqIOGyg&o^BasNQcx~6kROF;A|gP(sZ zTnGZwdaHOou*u++ZFY>G)z=h?Z&9PGr>ecHQBwLtz0;~3i?_342~viK-$|}t^WvP! z#H9}qhrG%Y&n7($%ou+kBe}_ImmZP0{r=u{gjDTZDYk-t(!NGA{Vzf z;YnYB1H?*%pTrD$bMSc$2;*NOd5RLBajCM`&H>uRd}UF;_$OMW)|-SHUR98!+a#h% z43>YP+?jOD=5bO>B97uR&{v--f*8z3_nQ}-->@`iq9L0C3c%CV7>q>0);`XQ-oH3K zMb>nyTt7-lnkD=1Pst8JG+3BehMUGJ`se5$a6G$*u7n>bua-hFQs!q?@d=F!9~*{? zWBl+u6($4U$Lu6lwTUTosM~69OEofi)ENHVJ45f}GsIVua}F36@RSK5z~=_9yeO(Wi)oh)9CE_l<`39O@0iCFXwPdvh}EJ z79f`bPw_Ih>XtKp1L$GCv>6t^^u$rnm%RP446Q3n4|rn5qL&eICf+Pmp|lNqKA8pM znPY>Z9%mH4YzryiPco_r}z2qhnUM+UzeBP>THkH1COG`g-`{qy7 z(-!xWQ94P!`Xdcy@^xG;GcD+!%P``EjMRuP-nKRM_m2-Qz6bp0_FFGXOw<);8+;ZW zk+HIbQ_YTW;)JuT+hTU1UYQ1?i2YlA_-0vVuSK{CJz;Zj;c(Ns%&USx4t~jT8tm^Iul)njH@J3Ja zCfEEVtZ2WSu2i%r0bT}Vh(E+^rxzm<1U7>|5hrV4+9o|G`LLmR;PT>`D7PBv9r_~# zG`+qpmRDcO@4V|Djm8_OLb-NW&kIncG_5SZNvCEIuY_pU!`tIgX-dwlkGnltYhT{ zeK>79SmxPYA6eAo?^dnTUcctl7K#bd|0nlDL5Q>umu$@py%Wl%l@Phg4EIcnOiZsE{e}s0-+uE zr^>l`*&AKSBB^8ZbKu7h{MP%{&jQGaQk^=&x-Wo9g@&uS6>3xeo1|r@*~~9>uSexX zd1kEg_^57k`C$f$=-ym#Ep%!0AR*zV>ty^GLR#rApB;372f0Oo4;DGgAv-YJm zSq9W5T&@XR7&2`#gCB0g_D^wZjEFGmzpIUg);efw6L- zQjX`VNFf-tNybEoEzS$-S=NyilZ=DYp-UL2mePNMXh6`!0kV6 zlK&-+!P#x%Ba6dsh}Sbmh6LrP3|IrRTtZEQY<~W)J2Bm%z9< ze*gRzFQJhs=h;Wrjh`mPsh5#}yOV`L${#6~j1hymHo$66~F3&hYow{?~%Q%g4?I|EUG=fAU}-$j@6UWPjh%kmtJ5#lwwD zi^Z*?W4$g8bT32gAFOOYI1s11&UW#`fFBy)HupKlvq_~KUBqsJ^K+K+lrVC)QL_=V z`@*+O8RX9^Yry7UV)w8r#A;6pO>LOQ__j}v9EKpCpmVIS-FxM4rZ_34!D^5qNj``E zxAp|(B{!OnWWYe;NJ)OZW>4*#hIj8SJbL&yQ+!p9Rh-iHrrLSi(B9>kdv$_c=OId_ zeV?cn1#jJ;&ZRbeD>v{_zK4mqr;9gsuhwOOR`Zif#|dpUw!%s2w=tXui2TK{%&Yli zyM~t|=c_n0&uXPA)Wln1|F*=8OR~C7Z$h!Qd`)amvLdELcaTNMe*LaE6Fpmi3m4|# z_KukSNNWiLbBv-xm{OvD;>v_*dyf4=;gFeL26{4JpM8C{@{80=dBTNHFM0})-rc*> zHrZ-BTf4s+SJ)iL!BZuBUk=<2tNaB!zN3l_j@we*I)gQ>$%vcNa>^G!HuNC^trlKL>}P1|F(cJ>;5Dedyd>jI8ELLxRvv z9_5}mI~$Q-2!8slc+l!r+1Tg+udET<0(z|3&Um^^6*jU7b6ZKi7qFj5jb+-RN0-)*UL?+dOSZP$RaUBfPydlU5m zY{}^Zv(WcT5>q{BVwjBcEU{5QMTM*8G|jT}h|P~`3>C-=aHa?arAXef;yyaFZ*?^& za{B-{hB5M04BSF;;OxT>%gkX!L*_iP>yGCP-2<(T~RtE5V(|k$VdUTPGo!DsZ5>p z-_FG51J`M-Mr5@=?v|bQ-J0JZ(Rj{FN-H>l%NL87av1wz&ZqFM7r}>>qUUl+RC;T0 z#`joi(s>La&C$9=p#NQw;+&sgND$TBBrrJ*rdq9xW;#5W5&|dXf0(dR=ycb3WlRdGo~bJ^ZMuIr^D-9sAhlA5B4eFmV#;j2&kUsVt=a+X zjb8-MxVO^m+N%x+u;@L&BcXL||M?u+2wM&N6O{PRTdP=qzUAbTqew#_ZS{o5jJ{C1 zf5qB6>hsounzM&2aBY*s>Rt@hw=aapX$+&%S|SQjny;n%>_pdUI(nNfRq05{U^85|msK;eG$d~lR71gM|4o#Rs%m{) z*p$( z_klN*iS$zTllR%3DM;2UHQ)ajsr+|==MCkk=BfQMvMNQ8tHqM8Y9^vcqJ38hK*Jrf zrn2M4nyS#do$P(1R>LoRMm~~It#rKsrwE0kO;lM_ZEq^YX~|5W4M z+TS_#%%|9>#&6IIFTn2)tu@kV2 z5|Qoe4(43$_Z~l`v<{~pYoD;w0pg0Fi`Yf1vZFL`*n@G`H&IUD?7TJ5zGE!~jdg=# zjn3Jg7|BzPX(-Nh-|-^_KLn&s^qY9X!bA|WgY^MEXn~3SeA&TnJ2sxBoTMjA#G-(v z11li1od6IZ%Kqr^xpW|Ms31=IZ{qzx?ZxR@Hw#>O&8HmY_{n~fvdpY;pRPtP%ilZ0 ziG=!0T-MI;1MJUrE>ZFCG=Ivsfd|yxZ<(DArVH^=4<1tz?CwAp(~v|ZnJW9ak!nvu zAi((hHeDtueheM)d+1&!_$GyUM@Q}Ri*9Dq;#e!#KvxvQX8V-iaenZLyY-bvPg*qN zvBHM-H~L>}BML76d*=WWAdo0Ml}Wn!fopQj(09Q>sc@bS;=a#S$v@rBz*!~Gksw0A zCoc8%825JS{4?(J3-?UODxb~=cv1Fjf96tNd8*%VxHFyGB1?TvV*;W1$qJY;1y`;E_m;Q&rdV|7GO= z7Xt4;CnB4TB>HquSsB;c_}`jT)`&$iqd-fd#_6+V^1nDF|NlpZ;@)v{adA1#2!H@# zqyNU+%26`7CdRe8ykGbW1NmQu9#MTkfsj*#>Yw>)K0nC zYoYZMfbyn!|2v~QN7}8$3aI0tx}ylB;lXC0sdse-11b#k*$ln?F z_gdUnuhP<5I1liT%(99BAUy?@Qn}CY0l)5 z#9Z9lR7zHVwtWV3&~e2?+u)@GL_Tw@Cs_6Bbakj2E`RNWJ;;+y{kt>rewg)Y#z;-p z50P^~?GwO{!J9LlV5jUoquB`$0nO&9`S~~N6Pw~b$FX8oqu))7iDdj~Zavv$i>UbB zpnik8!90`PCp~^xKdlabqH2ngF9TmTdZTDV&~KpRBhh)h<}2-A*<(5P8?NnFPnE+E zp9Jnk*k2fR8GqsFB4;nXY+Z_y}<=o|-Jn!Dj=KOm3l zg)$)iBQh9ZTrb1su}WY+OAGjg2@eU0>P%nb^+27mblM$_&2<|F%~nmxoUREaK5`53 z1KZjr_)F|7*AZKace{S5_uzhXCe3?P`TtzE&2pTf zWC-~xpr_SfbJF<6cm&iItctO)9!TOYX(Uwp88ZY29EX0teGuel_-fG3ZvZACZ5c3{ zyfgxe&ijcH_9E;SxD=fs8}YsQ+72nkfs=|of3~%^;B7x8Xrr8;+ z(xnLhaI3;dExs-6o>2js=TiXjaA?BQNM3OY&KlgcFx z>sR49QnQWUfT~nOdR_xA^@9zL z<2_V#nz}S!;Hr<*=^AahMJJ!%beTmbaORyb9&4?##4WMR*7M%U!H+}|>df2iefA^q zISq-{btM$n?dLV29Nv>OvINVvcPEbb@7>RaQ8=f`cywTN@DmlNZWwz?F1Du;=UIu^ z39XrRyTTAautB7Fm3&U8sTuonDLf*WdPDKYivy?HO6B;AIqo@>m_VNY*&zQPt#_V2 ztK86$XJp>-g1gJ_0F{_2Sh14QcrK8C@|AINvO)I@Xzs3vgH}Zw(%#EJQ4R04^%gcW zn(g-N*LG@f52I+IO^viGQCe`m9W`C!IpyT!lv8{EWtdXS2Qtg!T{=-$Z-*&SjLbl5 zR=cv(k>hmuoMJ3j?AEHgRc}{P)#lc2xCJ;45QpqiUwZjf?Gs@z2-jV4cCn`hlAl68 z1T=;)YqOG0+p<6ZO@h7A**#h32r|mMGNNlziPM6paIWuYnM$f1{L%rkiH_ah0eJEnUn+cPh!x`14$Y9q@A zxt<2B(s_rmrkVbs>HrzL^*Q+aY?CrO_a+Z zC|7zDBNn{@h1%ZU!wQnWyImEENJ$u$Kh%lk6LUr{_66MCHl?zS*bKs5R0h+=8J6$6 zBuaQeJbem3dv2b5Nj#~6Zp~JVU2#L#AC!BHIl~Hpcs%k=A}s;A;ha|Vx^3LvMS>aI zM&lJ%=K+p~s4`B3yh}Ut)Q4`5oHJkx&v#|?Mc#3ekawyEw0NO=UP-~%Q}Y~>MF9Vu zERdfW8~DmuEVC_mb#kOY+pV5G89~pRRNtvlWN!uYZ&r!i{73}U&=;=|>~fx`p6CXJ zsUelV^Y)9=6RMv3N=@`nZ0&iV24*xeXM?iuW;oACskHt-fk{Z#^H^6dXY_m zuUkXCYQeGHRHL6u)`IL*wTtEcC$|2BO!(bsx7I1%tWQi-4>Cd+NTrIS z5-58D_go*E$oD(3iP8y2u6tE!q#_B3S^Z`)FK@HcSNwDhpB8U`Kp>mT$wF`NZ)#QE zFfmQt6dZTGg~4F1v2ijRqI)|ao>^tMKiWSGETqN_I5FS8oon9i?zuk>e&Hay?DcUMg@E<| zI<^Or*@4EEJmD4_UUw)`v@|t7RVw?Y2*VveDEO=M^37prkuU&2aKB_*8K+m^r|^M`kIe6S+(lvi^-d4>AMkl z=<`wpvMwTKgaCAOaz`#YX~BStZ|!B7RT6k>Da)zsAJu7fz# z6Q3}NIpqM;`3orG%GKTs*TUE8JhbSt=owBNE;e?cUlUJo;^VYxH+CLgb5qLo-q_dQ zm~c3kx?J?UDnB;%i_>y$ndeH6h=kjsa1}B4e(25P@O&aZonm-plf`pkk*(eXRcw;7 zy0w+PF*gDwKiC}l|2TW=pt$}gYd9e!KuCfGNFW4)1h?Q$a39C=6dDQL~+&UJeCYWLV3U;^+mRmHPGOGbE z8-*#cH<9T~&;`6uC7;_gi!i`mVysoP&up(gywY)o<~p<_*1%{mPBNIM1FA5}M)sE$ z1G>aMKQrV2isO3NKF@*_F74>o zdq^H6usWE)WwMZKysqzIbNB<}!~wAO=5z(*o2LXXkzn~;=W&px>EP-rlG*8{6u!nI zZ$OiH*584F@D>Nkb(qX;)0P9V&fL$RB%h2;ddKJ0*L#8Coi0Puae>wPK6i5A^maeA z*iGL_>#gasm3&?%Dyl(yl|(-{$$PbR$nmNqwmYRaK5=-J|4z&;%NG$$CeY8$5G7%; zX1|+sH(n~h?avh#$y{BB*Rs>-+NqoA`n)0iR5(}|@x$jyTtV{dkk~~`o0An#OCCEZ z72(;G{PAhO}%pwvDGlNeZsN>+(5Lvt)&teB*_9^ zjv$EjJkPQCJP(7suFgOd?7K5rw0HMisCVzGEY;xoDzpkM_fNKxZFF+ArWmfdcmHR% z;Q!|T^$4}`Jrdw-m3_3*`Q|0VzC*x=JW~$q*?tqU8!kevH!8)-!Ti^`d_6AVF|95v z4aY>Bc2TWut$C8MV&mn;=$bV)e0v+8g3DGuQjKU$TJ6(OHA-#_rou`6(PP6J^q0OI ze^E&1GX+~tmp*2*ogBBbSo6C$`K_li<9B43r&56DxHs#xeJ+c^E-~|&R;?H|#D61# z*Z>X=tNG~bkS{M~Tbi4w0a_$q?j5Sj!EBLV&=v2=(M7Z#;CrK?vH)=D=J((H9TQ}Y z02Lp6yZw>)=;7dZ=Fsi&yrM}fOH1hpD-(y*4of}{XSEGGXhnKB5l7nbdXF%|Yc72N zY(u3AK!;^3>$LIefk5S4`OkOPX?)(Di10|#t*Ist4jQ%Uuza4?wGI7ueu1A@gpaWgL3Eo-v!pJ;dnBcpL3&o)jv}~ z2iwhkvpZcEDiTO;kf%+k-X8V@R18RpJ>LT7whI=T5$8_`ZUq;{`Tqd;o%Q{ zh(~loa`L2Xi^|2%Z=xx|ho#px8sFpSG=wH7*P3GwN>>P!{EC3-91v$bwN8kTkkF~+ zuUDvzvPkUF3emhRZ+~^qY2&T~?mH4}$RdL5PQB{)B>00Zx2{4O<+2A_2GjYN8L|5ZmdMkM)S%Dud{{$GZ16jQ1mOcN1&dG35rRA zBsNQtaKb55c&q6)K04`}aiKwj-fZSx6}jG=hdETNoALTc6%usf*7t1qr8J%lTC7Wye0_tRit!cgZDr;ujBjH1x(LN|m&kb#D0d-_5yS zKzM#|oNdoQ1xWlA>m7^5&g$&fvL$gIOnkmX>DtY#x5ZzxleWg~khRc7pZ5RDbN&Ba zWB5#g1e+glYdGkSOM?c+yNxDyxmb<5iLH*KL0o&mzvV`EUcDKPbide#i@4@!NKi0X z0B&9KFbY!a7pSQ6ZHq=IpCu{!_0&eUCoHLf;5S}uO^D}rrq(q(Ppev(Y0wrhnm{Bl z6%w~8_sV`_P!vG(s%yYPgUs{2xslG$#UG=R>@auDI-uD1o_z(sFh@-@>IuMkl9x8YgC8;hQ6F+ zI=Cw9TU&YU-Z2sC+oEQaLfwjHvO2%ExeST<6NT1K+L@=999>lmk=~OB!6i-&0yI1!dCXuv^HXO zF~PCN#zx}{+C!z=?%r8#%xo(uFfYYO=dtbM^ja9*E>`k9{jS70oE$e#=PvH z`T7^xJ?t%Z+kZH0{_jDvkss;id=IWlTsb0ezCVX=S$>;#wUyo?J~By9sNM*}f$tgN z^8sTcpnU6+G(NMnkQ`R8+cz}r%Z-dJx8IW3M}oII!|#&$?`wT6;Cu^4D1ul;!6cw| zuz2JDl(HDKi^;Qu+VC9XUno5UV@b9y?Pd1{Vz)*Jd{P5SrR^`2Y2xb%u5 zTCb`}4pq@gt8n|Ww$`+CkUygQ3o*D}pa$vNt%pfg>i@#Nz7PB*RjUDamc1@@LJvif z9;75fHkvm@}ErznWU{b|8n zGsHbMdu{I+%Fw5-;@nAi-DP|29PeC=sLjjIS1HJ!-)Q$4+!?-CA7BB>`(C-UAn;J^ zH^3e*?>L3aKDX#xx#csTafo7zt_~FY5)=OVekt%E&T{F!Gg_f`PJJ&75c5z{$Tjxo zIZ|AoGCTL4aC?5Y-{{TRPGUE2MFhI%LL}j|{p8_?K-`$9771Ra=_uh`3^qHgK|ILs zd*?q9@DB_$Z%~HYSfBA(t%$wc1Po$S&F#;ilGD*=LEZB6grb)pwXFHp18!Vq9aV1W z8`xnW;@E*9?YZ{2V3w?p!;PJJkra3g+J*0DIZ4}JoAT4!EH)N7+u9MVed&<4?C7PI zA3gcF)*Nan1D1X51M|z~!86R5b+Q-%niXM>d}?HWiWMqgk^GyrYSe3_wW}wMyfFm8 zx>!;-lE1807wM6J%~lf)tLC)c=evp3(pXqnDPm4vr8sU5T4JdkU^3&dqQQ=XwZ4S$ zY8^tFj^zrilv$UyPT3T5E5esw6y~;7`pyg`c*dxr1X^h7-BmVv@v*UmV&S*aZ#9sq zUb$$-G3Y4ng$V9k9z96R-;nzs08 zq})SannG{CGl4(dolTkLtCu0+GU|o_hBD&7q9m9ig|y;fsQz>GmsyQ&C#8nza&~5h zeQDayMgo-ZLN5>C>D~%Cn%v7(mQ!Qn-oT<89d&I^NN2w~HP}`ZebGj|1cbvu@FM+( zjxcO*t||vu2R?S-{Xz*cSA8|S`z8k0W;C0+*IL2hE*1<(UE?qZt>DObnp#~1N}5dS&I<6*S~U(#N!J6{7!p)cYU46%;~y$Ga(d2P~lXmPzLy z%e7=`n0X7EOf``w#>4CU(%3r=;EUCb4e@0m%B9WC-0BzxH6g{F5Y7Q65kHD8-Hx-O zJ~f@K-DN>d910|PsOJ2<|GKN~insW|e58{S|wQ$F%1ktXF^59vb8e||kM zUzJGxUI>gJRGN)o({$~mFdO0-pLB~Qe%hKx-rL*Dvq|O7M-*x}NN6LWyu422w;D^^ z7jV^QEnfN@`!RfcDVj`tqS}o`hvv6djgy@7pxmJ2{`{4CtAIJ(phxS?&V!Q@1PF@o zYBb2FE@iFA_>fvRM~g3G%y7|$d#9aq0iYfy3O+2+I8jwD@gk!*X0=WqU)g4Jq)wVD z(i+P1tZ|^(1f1ILx+)!}7_vS%to7#YKd$45r_&J|)twC|VoB32eZxw9p`&dGGcc{{ z40oI=ZWB*e1S;t`^$9ZtPT;)~`5Cf8FB@+DPyLk_MUhBLHS4YF?!nzVOu-UT=xX@* z*XMKhQgOhzu#41CCNmnLvpdewe4)k|G&w2zUZ>WKxyouJCE)I=!D6f#!h`LTmOZ!7 zXk0K-JF36dn?t_k23W8QpFH z{sEddjJ1Ht2;qc5mCQ@vBJaG>)kkPm?0e3R#L;I$ez8SM42rv`1VF(2!slOt@S zcCgJm?fCrp7pv8@JPqK1R(NLNP}@+a08}>P27t4aBytEg@ewbnMGB8C{~en}B{v5( z$LdwbMmjatJm4Ct3@J%l$O)c_@(O_DL{lqKJD7?$0p)2ogXFBSfeisDjaOwbWZ7%V zpXiEQbwmcE0}kQ?~FUyTx=qQ+=5XkxcR!Mljf=?>c}m2qS;X~T?vs# z{rtrVxZRt>+4SWA#_I`EJ^rfn{gXV}IK#3WXp}(OtgtpuMZM`HTPw@o@j3rOZP|iI zG4X267n9m|G6__J-sY((-IE_b-W60v^8-4aUh~1qNN20O5>?yUv!&Cr;^Ja3Ebk=- zhS~{W-ul*AW#1WSC7Vo8@3vFN@Esz}Sh{0NNNt+qGDU<0)u<`sbVp$(bY zjQc+``}_jT@I)r{-50QD1&WlT2!zTonmWFb?Jp%nm?@Mq7A8Mls(s5V3K&RmCMG}{x>t9iT|5n1g>Y-^jxrbX! zOy;~Qme1fV(k_d$l0p7{Kuegyf!g>INfP&AX46lMxw^pC@aQ`Z@?U10|8v>z0ZcpD zjr>u(jo!rA-gx>aONiuO5gLLdGicN5T3QYS3OZ6FM#MxCDsN~h}MuV7inm43t-rvMF6|uP) zIc7e8y3jo`_;K*0`TA$14exOl%Fs8e)L6bXXNQdPs|tC=2jqD-Y(ceyn~^3{pVd`; zX)YEXrJlybWgYR9P!WoMaCZOPEx~VS(;}iD)@;9-XM6xY#-J5y)kHJ{^P=vzmt|gI zqM>*rKnYVQ5Py-?3#HwOT$yz{{QVf{OVJm9%*)@`5JU~va|vKrJPUTxHCOLg$hDH& zp8p|HSTB9yY4+~IW1SegU~sZCq}g0EB_Cgwvuh{v)_nPz#W7vf4`yHu4cLbEe%2wt zm5s_h3`U?oN1H<9+jFJg-x^DL6>Rtq4(7j(CpxlKVPWC4F*=eUx~KdLB$C4rWRdKt z1{Yh+I(y?rva9Rs&bf7n73O;^QN$px$mb7BCZGq34O_%9g6KKwt1SK^fSjL)5JPE z@&LdcG4nA}+}*8YP`IG%fl9LW*lb?;(}t4adNPi)Gu?#u)JJ-6&>JX^c%)%9XSpBMSZRbau-s|=}Mn+jpE zq&1z%AZ(Y?XqA~f+^^48o@WnGeiLf*BC^0E!6IEeJ)gS3$@p>*Pm$-kFEeg?{rGsp zu}70`)Kez z|6b9|RVM$7^*gSI&kjvyjtLe(lgyc~f%I9R*c)i@*pdivkRrYY05vJOLzt#p%>8{n z!J1LcXXJktakG_?*i}_kU*kS~tS{9hsE&`?*oQ1~3rBmvwto-&)4)DVdH?6QVfEIF zjfrAmZ$5jR?`8l3A%cmfNR;Jx4%05tEG1j{kMNPQx+k^>{aKfNpXT1h$t0=O!CZmr z%CW$OoWQ!CrlwZM#pDy_b+QoJQd+ha?s zrGzI!w~&3!xuACaX7&4|y|FiWb`htq+vS2Zd%xsC@5VUN6{wwwSzpRtQkqAmqxfwX zw2@^>jNbKrSG?#K5YeOLNsd^670ZUag)aS1w#xq}x&L3^Dq=rQ&ZPn?j^@P5NTRoC z{&^z=kQNsgkJ20k1s_3a)gl0dC*2W>A6WyjuqIiq)xVT-`OR*F-ua$C?j>soid z9xZ7}~)bt^dA& z*9VPW1@E6bG;IzJb|$&A(q`C}1fQQiZ9KU##g%;bk^*MiBsd4^8rUg;C0f0P5LqXlm* zBI9Z;3ek`SNmQ`S#&fZp_U99&;^`!9Y-}pc$38wsM-?DUWUP8Dr zYZ`(3kzx5P&!ZySA^W~ax+{3eO%V0Wbc0{`m+rvwd*vGC2+kXGXiejjO}Ja&S*t+N zyj{cnCjGV3(un#XB)~eRoRQjH#+jy zOX>Nv=Gv5lU;mQM{g0F&(Sr=^MM?UoF4H63ISV{pMOvSDdaW2%qdxF6@8uOUrQK*^TYX7vH4yl4fe+8Hg3pM=l|uv{+F*v(2!R> zdbC{jqm^bWSK}#^u*C!uY9vXhE}!Z(d_PD=Olp4n_N}Lf+PYjWU2%|J1GLTezMqEX z`M%h}(OFlX?@u1#pS`^y`D!J_dIvzy=k(^FPflI}`79kgEOD98GvU+erIVUMWJUj_ z_P#s)SwF84`E7x6cj~h$TFbIX^A6Zb%~>W_o~1H7{@Kls*U;|R;3SpqHp^UtIPS~g z4sn=p<0$xb0}+APYj638pfKv#*Uf+V2z@w&e@9>7BsJ-CLB=*Hw@(&qEdgH?e zlb3BQ$-rhvAfLyE8iqYmc=!Bnnx3g{dHab#Rt5v&gbka_#2(C)-}U(K;{DH^43$^Dg#ow#Vts)kU0$VQEE0*5jrY*s(F9kl~kOlmBy9 z#q|ADDkY$K%8%0as!bg9(e?nIziFMCyyRY*-iU0K`2zVv4-c!@6X31%@x#G16(A%e zoNdv&C_tHEx0;T!7|+dkrqS%lRixLVE1;hv1wFmVgKT7gnC_V7rt3g{-ri36y*3`^ zVSbR9dR2#CC-tX6oyB~HGPdrih*a}cb`IzLaTS|JVodeG2H<(T8BXs5qso6O<^NDqsuJ_++Yl_sX3J-at2eookK$ zX-d5Lf!AR_#@-f3`0Whwb>E}s#-`OOmNmmwJ2l-M9f{nP=5p_6=2v)^B*)g3a*lI) zb~e#sl=JD6C*T0dpUY2bHs5HCk;)0t&2hi0Y(t?@DdB|e&A5E8hn(eE)Hn=%u7_;! zJKbkCaWB>y<8yIND>cndoH`)tF20)dYh*^Oc_y;5extr{zl zj!?YOiu##E!nIfYpYcS*|Cj$m%DWxAm~(Z@cYS?&9kw@+j#XUlFL8JjpmY2y?i z7Zsd`q7qbWg=)U+R*RAm5w9G#dS8}TmBAjI?%PR~w&+%fxjnTZ51I{P#xy$Rxn6t$ zJnNGm&tUyYY{k+~Pc~F^L@#Si+MM0bce!vG;?nt7PjLCZifF%6_T8kE-dp94XHf8a zbvWAxW%zuyqntHn$~d}s7bv+uP;M+GUm@nS*)z7m>M|k~vU($S37O8s!u@@Q_5ig% zn6DMRI$47`7bWLensL_b9tb#weKPJ9T#n=LxPP9nlZ9<Mq$`rPpjhc4nwhINz|oPi?-@CnR2%z@S|(1!z*T*8AlYkCKYjiq9ezP$uq3?tpHA z><;_hkDwrle7zb1y%wDDbKj4v`|*kI4=v^PyFB{&LHqBYkJ6FHUYNBiBR z^GvFwLK2*9bj9zpe*VtAXQLq-@ID#D-LO9)zXWSf!%> zo_}!XT@zr@gWH>Ac~(kdStbgLs!mFZH~Hplb9n zvJlP@f(36p5xv`r*ydEXsHw8h0LB|of#Tfg)h9xtWS;H>woX2I{x@D+CX^5sw~{(o zzSaGH-+1)Kt<~wPdV9oFu1+99J;vHU(1bZ7y&Z*bTfFi%RgL zoVJvwv}Syv`BHea*~pGhP$K1piVJNt;?(7(8|uM*HqhtnQ60Y6q_sFcP=jpHhSZwI z*N+M{CMvz#`(ok`JhH%BWjtc|kw$qq_WrGaFxpl2KrdS|RK8p$?~8Jfzy8X{A(-h9 zgvvC+Dvkrh;0)>e(TR0554Eh>99%#dmF?JTxY(jWC!xr;Sa&9A%-Ncb=pG`A~7?4ZntFawV2Y!K8HtDcycwKWUx7Ly`mrG2i6C%?&~-NG(T^ z3)^RA)l99smh;UZp&CzJgnb(DR%9Thxy608d56$@|9)S&%AU)lP6h2EC3TcQ2L)@i z=VG+w#a-Y*Dy?#rqDG8|#m^rC8Z!6>oK3R{Znt+&sQfyh@FCqF#&p}XO66~Obop~e zR$zJT=ew9x7vXpf=cRcVh>I^?Mq6ny)nivx4*q&P$4PaLR|K-jP2c;A)Yjvxq)_J& z;$iTxx1%f$pd@AwY9c-_sf9ML#z90txKgG%R;F&fXQ~poME-7jyfCvGSL0HX$@_g( zNow+ZUWj}<{?qza#j}*!snLGhb!ix7^fzwB#+%-zJ)bpSA)Q8;+F)=2Ym-R@ThXy-OG@u$GHI?&NetsMHp@)S0OIt9|0JSnFZcDm7^&$Q-|R_fsldQEZz$>UkQxP7@ts|_yT zC{~>k)cZ=zsjl7k8WVif#%Z_p1X!t~>ctCD>DP+Yg*H;Zsq#uV%9&Jz931I>$;H;$ zo2VJj#?CWVS6BBgl_>g;(k1aqK{Z~Rw+%)g={&K1VTIs-oSZ-|gjM^{bSLeD`}OCI zxS&_G0Rfp<*pKCo&@o`M@n(M_i`c|K5?fZw{dH&v9-A$P)i@_E(f41k4}fmncz8{j zq;Gvr`PiV+g|hjIeVqhhf#+k6q~W4x0|2!p2Tsz%+Ibs53%{~fVk2hzv}verTd$Y# zgV4!RF$_Sg`mB?(w%#-;WWEX~!2Z2h6!cqFqWTQ}LW!JgJR7xzSWUGaxUHqTxQ0ez z{AO}zT~>}5T!Oq#an#S7dDD$a` zyFPdWpwi*?tmD@jvmsjZ*Rnk3I6Np)-IvSiR3C(dC8KF0EI)X@Qe=p*l?+Z9G5?-p zt1Z)UCim{@`tGm+nL?RO}P?!OY>H5m7_W2D|_ zYro4b!aJ&pjjPmb)PD@iZor-51{AMfl)+@I_~q;dh^C>TYYVRUD}W%rmkjF5@XPLl zI!W~EVBH008M(T0s!(agymu2&u%=s3O69lgVu+K5I%K2X^WWrF&5XBML~X*w7eQRI zPW^7Uhy4X5ct^jPofCLHcjM~!TS-2AND2p>RH!)Qu+W~j{d(e&SA3-7>lYTuZX575 z9H4?}ZE^N#&P?L{fi+Udiex^35MtY33!I8DO^1jbqoShz0EEIvfmA&AqC$hN0=XS* z>kZl*@bvuz%3!WQM>*$8EB&l?$B~-7+1fW%C28qy@C-+~O_moIr{-IM)%6(GF`Adr zAWW|5nJ95F%6rTt*9@HnMXuae0`G60(VDiTB&I@hLE85+S;FDBQrfN;<|JG^(~9wq zo#!*7i_t_#E8GV;0<5e=s^0I^Qk${<4qgA|qa-nRWz?xFPMILbEy~8JDldnjDQ)B) z_;v(?Msv@XG;8R>}l3fTnJEy~tye8vQqU zlZ_B5A^e_xh~eupE8O2Co~-yQSGlRup!G7%euD4ANo4I2IeP+BeCk{fmO|5 zX6Vjg-w*!Yry#%Z(D-5sH8oRgae=ndO7`%XCwOCPeaX^J(c@*uL>2wC%QEyL-|-0W zU@7Oz%Rj0TtcB(z=Q?O7E9{OxA#91DEa{x@HL*{6W<}m`n6&Fl;m|k7F~7TfFJ&=a zpaWI*I=ATU#sdgY=ZjWq*EKSf6)5AvFy76X#qP_I={3gXQiPt0M^z>9lmn zA&3w}?n_G3zq6n3=dD>+S5$i^$>Y!};IOCg?C)r?s77QFPIk-1Pnvx;PRsHazcV=C zdkdn8pG-)wDxvf$GJxo_>`{NTQep`0EO7Hxbfq*Tb?~J3ekZ+Iwg4%{haB2o<;w<41TW&V5P$$GC9cAloxrPH4YRj{&ZFtbhrm?xZoCtO=QWr9m$dy3Vh zJU~-3xzh@OUo^PowJ)6a*n*068*+-*CM-GrfJputCZ`fqP%uykrU?RvgE+Bmfj$)b ze!*D0=Ly}Hu~wg_@a0{XjeSTJy)p^0XxZo4LB2p`3oTpc%^UM>D);>rxRc~*wI=j= zuk`_Nn`nxvUi>&>b^$#F6Kv={@iO*Vm33OEQXU%}a%@tBiE_z-AmJqq*>n887d@vl z(v>vNG0@ePdr4EOxj8xgCXXz~m_!a;w|dzqdfDg_AXsT8Jt@&oe^}u9Ako4g7vXpQeYoD^=J9&h9nrwU{Q zKMWc(>mYOSaDi{muUTtibd?p);%Rk+>PjWywbwz#9ZckFb^{i;TQy57%4M8K6s%v+ z=N)}7wnh>GC@lnOdC+-DvF{hq%0H73mz$KO)q^b>_Xs5Ym=JMGpEL<)l0&=c8}?RK zlEl5yK@?j&#Gcce&+c~g*2yZ8^a-PbiQ?j_n_7s3yfGdm>*(Cex_2+IRwOy&XcUw! zdt0UNif4mE%_pSR%pQJaovK6)+I;}A z`Ds6FRp5;&<1HFrbW1HXUn@hqIzAJa*#v>BDohe2+ssC?`Ck%o`EYxmG-(EAcw~vI za>U#i9uhyu!-wV+_6VTnhd&ls4SKbm4nnAk!M>W;I~JV9Tf6~IMbosoHoFeoa~*%#GqM+|#m3v!Tccr( z*v!?XH*Xb4n`#gLNFPTBfkhfym-}@WxR2R5OsIA=T3>~E7IPV zkZJ!%x|IC_>5E%mjCK>1T0~Z+Ue+=Clf4h@JsJxv@GwzBT#~4MWb(a(1ViU-@gkt{ zc6LK@9w-ZW^49`+Fj8~#y^*D@WAsVBHv+MY_i0{%4 zzTn%@WLw+m3zZA{1*LKrlk={F@rCFZlTOKasOswR1fg)K0e4U; zhSMw-c+AnLMp%;1iXf9YTDfcT<5W*&>K0h21ZpnujxtTKBLuf+i1COa&RnRCRNdT& z^g;IacJnb3Nt6sS$-VT)s5k4WA2ELsk3KBe>w3RhJ84kJ5!$~t{M%dkM+NZnM(FqY zUc+hE;SqVU*9_l0*V%!&{TG9^LqzjbC;z-LNK|2HGq7C_~gbm=vE5WFg|2tVgWE zY=6hr|EFgP%-(>~`QY++m5HIL90*HDDhHos7`xAJ2b_B(Ve8gT_C?<|}C_asta?>Ms+Wq>Ir1$#= zBFK?BA)lcKk5<*e$__|Q&irgGc%jba;Y0YX$Mb=td>kAY%ra3PZ&EnmmR*GMk&GFB zCBWRfjv-f03j&NUdg!G;POJl@TP4tu;0C%h!3BB% zhhcUHBLbKvuHM$Y{Y4Lnhe2%-03XBiSny+NE|e&)W8<>kYb=;`?fZ_`i;}TT-l0UA z-7im6g8LY-@tLsNawKB|O!{?tk+`(dSXli10!9%yCb?I}I?Z19tTw$?G4sT0%jX|LXKiy15}#gTciC$U=dYvhz=0zBL>zmO%j?>>2PSkjPRp&$kT)#TX17Niy+_#_m2>rxbAof9&E*R z{5=e|m)em4AVg-;1g*j|Jf$M_ibP<7=yNf{Ah=k#Q@hEAwn)7x_ZT5P(%vrmNnc7JvNt*ETmgs4a>Ol-L}#ySHbyxUAwBUt$WFqNun1&Q5xI;-uMX z;|@@NAFxaTGqXr5D=RAIi-;x9n*DjD9sEGfw>;jJzenOqOc&?fKO|}=9G2Q?Hhv-U z_wySK*K(2AZvf`TCx&CH-TK=T<7ma5W8y|Pu5{^CD}UsV?awvcL`Iph9Iy6f^sXcg z*)^4ygd4aXNLws!9j(AUeN=y?t-U9u}gJ(h`l-f!yw+k()V_)g|V z#+VyTKsC*WJH_`yj^SETcZ2bgZMxhX;`K6HEz)sITcv1fBzF5uwJ<2+Zj#93ihn`o z=8ElOSozV8PHTebw_^gmo{L+u1IoCB0}nSMPIWz zBKHc*T&9Y0sl;G=z+raqz#wDW6X(PzC+q=x?1}YXkrDqX@GVLsnG+G2wXN%H&-<#s zt2RX#%vL(paC;q}auM-6$IQ=vqK%%d?Wuse7CsNX7BQn}eUFBvB}pTXRXtInBpZCD z{8S)VeWPZ{FwZO+iLSU$%E?kyMFqDn0hZ|>)?qP}b~F4N@t{gt>0VXvrvoFUO+f_2 zQL~}@w)}&-6Sd9Ojsht&il=Zny&otTjZhB+&}|skv`{X{oqa{jr*Wo&f|pjT-5~0+ z&o5s^2};jObV!ij*PekM+O7&HN!Ch8Bz?j9iM!-vIvD43e`}eE&79x6Nr?qZZE+RV zBS&J7PIT}thazvkmKlM>Kt6k>86 zL%8e?QK8rxH2z(Uq6O+y-^CYvNxQXcz&!pHmYMB9NKhwt_AjqDRY(~U)$`4INc~u6 ztD`Qj@vSSh&!L--0c*-L|MO`qD(k?)O~k8Lt1Bz;V*g1mHWs-)(wf>@^G4%4z#Lj( zs%w<f0~&D`!G`5{aJlC15>f%)3Ctdedhq)(}6Wfl76NL5dxBLBfcqA!h=%w?HSv0oz#c z2&7>A!=xej2@BI80@arMu9&ktm?dHNrVMp&b?Zb*20A$5FET#U!qlu%DFJU;F2R4Hxp{l~ zGcGQ}rX=EyRfa29g-%VX4n?X14ewj9a2jee`8|(Qd?lDsyB^lAyo{utx^OXD{Ysv} zDc=AoJ&8SE8h|xQMWFP$?$+8+ZC;EWumnuzk8(6O?I!QmQ6vk9}7LB3K&2=+!Iq3~t+rQr{Ii8!Y;PN%emV+O?m zGlOjN^kN-;1C;6%a)%dhSe1hdft(;nTA##glZ&kuLUr;l($;xFdb7!pGZIxw6qR~; z=-bsvew_#%ekXON{{cW^#};ZWGo!b(L&^*t-Dj$clJh;}x9yuw^&e*x*{>ETXRwA6 zL@FBNQT9U2-xN&$Dsv9+9p5@}&gT^1(GJNn5?UYY4BlBR(JG*6_`DBeFCr-L&=>?= zhVZ0O0Nw@EBQ@ft$KC72=k(!OG+F7(1T553t#(${hkSR%3@&lBe-|6oaw=?tK(%gH=+PW@$fdMgkD+#57MODcMivYJPsT5`MG0 zNV%n06;;_vO7r@&-d2ogoZ0T+!VUSiMt(l-5me_hoH8h9bJg$H+1RA5*i-ezOf8bWqGOHu_bRu9M7aV9nOerbxyrHmjV)m(%yFS4e)F+&!4QY7G z@ACY!8HxulpxMa`Kz|zh+pG7}(gl;Y{%SWE$y}1 zQh}bEKsTUOz1=>L>#nE}@s30GkLb?mz4VHiWt6qO9(r3@6~y7BR!BkpXYr&_42krR$7?wZ8^6jzRgWtl=(8mO#E@jV_q^sn z%D_VSdp>ueY?l2o^u^toqCQ2>(PoMsPO|$nA@BQZ9Xd7kF|Rs%cdCoeMcT;1$9DGi z%KMNQZr8SWo!10-`HC%g%j0!1u<_nmDI#eBFwQ#x_aG?_Iyrmq@GCVUO4UcXMW5$F zh9!hX(L)W>{jyW4%B8Z-t0)1@NYxD~xgRI-{&plb~C0gjj)cCs2&JzYnlp zZN|+=uYD^O^yG{3xb#{8RTo+!W3h)GvNfstg3I9>cqhLk(JX6%0X2gSsXE(BN;x-6 zn|E!_;Be}_7<>8`U7-GEB0X>LX(%l@n=9aAXVwjZKz%ncQaUw4Ep~gUsUu4ejk2_y ze21k9IOhG`dX*LxT3inWQ?^?>?et8nbTVjuXa0HmT{NFaKjEf4lY9IR2OWOPV&?v& zc4FJ$#M+T~t{}<04NPRU^OQfMo@?IuDuqJ#t?_Jk8W?gW^(ue;r?kFrYF2z@&$7-? zHZG&b;Go^?nJPj;naJ3IE8}N+b-dZ`4DE%Q_)JjK^laI5Toq|=Vbd}2c39FDM;Mb} z5fm@frj~mcD4%^%$8XS0MdE;`dLMbw?|->8dZmtH`SrG{q4HI zYmU=E+?f~q1j+X_Qjn#jptKZ~q8DoE>8A%znq~`H5b}6=2`%Z7RVk@s?j?BljwsGB zlhZTAA=4mk?E(dh+=GZOW0ZX;sU}R+H}*wxb_j&f(kr^{icv*dIt3ZEkpp=!r9tGl zGZn!Sd2L5UxesXJDCJVeSh}~7D{M(vxb(oC~=`-w&+K`cNw27sXZL_Ryv!0qwHU-#A!EGs=agwuh)GT;Z zC_Eam2H%S*!eg@DR>`A4+#O*+1*rJoBMhY~^I9NK{=R@BJ9h6ingP|E0#F;dHG^(5 z?Al{}K$f`1R@D0iamiqb=S+;nJL`|(iOyE$M0c)4p$R4MI&`(%gBky=yTCBD$K!fURGYQUl7Tqjixqy zw%uCdfhHMDHzl#i$PHPH5N*m==fnMd5%`Ay-=gzO?QIprx^%wT9{c_*&xlc0WVJ5= z^C2guAb3my7rEUeZj&M}eD^5gR_L?Pu2GdZa=|Px*QUC5FgAvLFGwoHuP}G8xFJeh zV<|Z?vv~Gn3VdcDb0eHa33`>^A77%T-ofX2YSg5&heA)Fc=GWqEUKqOV6qSa<3|p1 z_r#n->I-c5J6&-3P4yu3E0Eu8q}xp9-QUt+k5HrRK{#NLCf;FVF=knOE&4|`l@d>k zgAL+bv1jdIv8Y}4sg^2ky2vRk8_lJnM z9vI|Bq%ESZ1UZ}_y`>AJc5-Tblv0OzLWHGjo=N9my-bUf>RY1s$XNfwT0vOW0GS+k zlJ0x#csJ~WkSx5?{7i^@>^l2hpXYMYram!`tdr0N&c@I7#hac1*}*%fu*BCev@NoI zh|ex&?m|HTWR>lGCv`f7afP`=Dqn+jQp42h-RBgtR9TTmm|^4I3NU3Clb$~KfrZ(! z44B?vt{uih7W{3EV`o>I<@2Oj!FK)FgfYIK^!~)_IF2TcQ4~l~9GaQqq1=s+AGnu) zwOzBuJG3W@+`$haZN4qltBj}In4j395OLV}`lgcU2PaVkw|1VYMfBh=Y?`xjr z;tnT0_VA9AFq6$f9b6HgFrLCmF9mr89VSlCbR;BBW&2!s1T)BrD@RRt-k0VGZOQ<1evKd3Qpwwg|GZY5naK zc12^gvP~QDb=}WncBldd2% z$IEHS{S`^?$n=c3Eej#uzvq6lQIXgRRI?fR&0|R?kMlz}$FgwXl6OJ70Jf8{62rI& z?v0~6&u_~V0EX_Klj!5%;`a10Nw}sU;rUbid6@*Yk>6MJAv)E%6*7>Qb6(Q20y&n_fI?8Mbo8?v*mPdA8PM|YIu$mwkn<4~8jQOLK$roz z+bfp}@=tIS!|~~qUl^kU*q;!>0rX;8#My(_6>3EThqGLePY(^KU3`6QO+P13ka3a)z7(5_(ZeO_BL29JrDFtK4EtRWqk9ADc zo@5&%#S`kA-z$4u-^V%MA~6bptKN8jj1zs%3M}o82h9gYZ|0d9a*k)e*_Ja}NL?^K zZy&&wj$!h<4#Tic1@+V~gwURXr2z0q*3<1NODW4k?0t%*SNqQsfh!DMNgA<~+atsHhx?uW-Y3B?^uB-_IEQ zST+c`V_w?$o>jk{No7p3yE42Q;yaf!byd#~nL2N4k;_0@;a*A?mw?YSjL9xWEnyGe z!PtxL+VH%~|NIT9B~cm`dE%g93WrhMzI5l~8?L<}bcioNMsGi|yhJ%2p8G>mYbYeer1%5Wh2ajm`c2~gPG^vkOuzjjQX zaO5(a+mAIt(PjBhN@)`DUL7Ef#4-I*fWENfYqn6mGMZPxBp7SNn0~_)fcLGX>d^~* ziJ|W6GT$70R&@P6L8KEgp+GJovML?-$)TjM5HLNThxK(IfjU5pLCC=V+YON!AFt^0 z12SC(KvAmJTBtu&yDKGUJ~O_$qm4fz8(2zjCe2>&%5ll>mgF?GNa`}69At55uR>jicT649<{;+fgzP4lt>;Rg0Zxm*ffcKBO?F%cZD#AHuv_ zQWBb*1h&5tw&FOZA2|TBK!JAVd=EWpInOhff;*f1!y0Ate$a-kJ04w8Jf52*6QQd? zzY{Rc^$!Dvh@Buc*S+D*!Im<;V?}6Gz}tAx`qs&a1FM(2Fm!Q&IL%2;!)m)Hkci|? zUPyHeE6qd`dR#ZY8kfmS%OV<9w@1_@v~}zg>Obws;2M^Pk>R`OOxfWaG}A6qRITd* zesQHmy3|oIqt<+i@ej}a zcK-bD6esXW<(tu5*LN0FoWkUREe#Ojb>It)^E#jFuzK;wl*jF! zBdA+4Q0M zGSlLncuk6Cby+woLwCwODzOkbT=P8mP&7frj)L`q?F+t?F1^4oR_j< zOO!1!?tkI;7`C-d^U+n%W+aMM>&URINuQg8M7c$CI`8aC8rbjl`z^I|{b{7M?P`2_ zjY&sYI|tE-EfE8D?hd@8#ds17=KxY#Z`u-_Zd}JQoLd3`RVx#&HL9$F4AQc$pS!}S z_Wb$z`PsG8*EgvHO^KkFha?L{5fVEggTr%EZ3qD+B>+dBGm&)p;VL%=s;!;$-TWJB zXBblE6!L3UqVJ#9DSrBaB=l8ips4KK>n)*y{(c}VpI&FU&5e)M1@5~w;1j<{G{wg}zCXQ%errL+A(_>5<*oa6T@mW1+4r1rSRJv$`&hm&b+ z0G6yQM0(jR4M;*^D8lQW@%1Gv0~r%AVTz;I%{~gv?{xV$N2uq_k9m=4xAW1it+8#y z?YfY*n*Vi0M!z^sK|wKijObRfR2vjy+pUcQ<>hxZ#}|jIt*l;Zz$EP_n-YObUW&)w zgakWrRdS4d_Da-bm-t!b0xhIDOBZ?EkC`-!&06)@$;ud8f0em|gQHj|Br|ul+Hj+_ z;dRe52B!!9M{8c?rS|MJAf{UevBhRDZl6=?p|IPnRnW#5%uXEJ*J;}G=T36`&*{Qi zQi0@aM~gsyhOniQy3d}^fE9bCnB>AlZMk-78uC+s6cdiZ<0Frl^Q!vc@aa0adG5`BEn@ zWrQy#K3>qc{@!p{!L0`&t~w3Y*IXVHl}Gn$7*@K|7}xuU0}8HB4^kKBKlG%3i*VS( zU(%_6#5vZ4J5ehsrHxLA;3@K9tS~#~QQbE&FTPIDjHsoGG`WR@gbV--$?{@}6rkVt z0^F}N$e&M(B)(nRnqQ&m-r@v^0pP+5!O~7{)l~KP&O|O)4mS@EPm-Znk-7p6lZM-% zJEls;b#~Y5n5yi#g2+7v(IpMWA4?!us(Bzy6T_u$B7S)?zyV~~gvVUkP| z`E%U8gKUe8=Pp0I(e@-)7Uen!Q+8`%0G!iXWO_m?7RC23{_k<$uTKVWl3jNw(rvsz zGs`zb3~Gzx>CqYoY+-qIh5mgRo4K|5hle}!AJ?Vmm+P+r)SaEZUEDcUu=Qt`nL*tv z;x>$4o;4M>ORts~z~lGWCG!lQ)w+i-z8ZUGYikQA(@*yp)x@Z!Ny1hi?uxr?XbB1x zQ@nCvyd{2l#M5IQrM-*?csgn8o|dmb+Qr8!ZvbW$SQysG!U&x_^E+zl__#+=sg@HG zN6S3n(_CulDnLG1_We^bE6{C`dlsb|(sPFSu8Ho~fAY7sG=1+H9sJtbHd4Tkuv^4T zKC*axDd+yFoq=Pb@s$>zdWLMPJ%|SztGL7Kq(6!C!tL# z3k^F~7KpY9Js{1vG~Urr~+KFg*LRd|u` z#xmGINqjac5XhcoKtH=4U$fa=8{Rpi{sU_s`n3-W!ie%*Uc{zB1BJZ52UHJ?#e zil(MASO7D3hr*5nA08Me^S@$;zf>cEHPmm>(9@OQ%2ZpXrqps@iC!d?jMt>6Puj(g zXMBVafIPPxc>q-Gh;-{({<%E_C@=Kt0I`Z63RVQ%uK_ST$D$5Nx5d{NCc|vg?v2@8 zTM4d=c5R3udpcVi1(T&My~@O|)tr5>$(N6tY(k$fUMh*N6tsB7BQ;{P5~OgzeNE8& zLSW!mb3P)2els@JeK1deWVNX_omSlYJqi?SzQ;@%?PmIu>HNhnHJRD7qlP7e-o~Xz zFyOZ7+?VmAf_f#1g^0>ZXN6Byf+daij<8Av1%dF)fb7hG*BpYnj9F`EEBbCGle~Jn zQLdL#dY)4w!(Cuaot3hpk?r$&i^Fs4!?~>0GpC^z;K96^| zhy%Bgd!f!A3?*Z}$g)x_ztOxADw%5e%G|NS&Y^YN{qfP`(5=Xfm>K(vytG{)W5 zyP;!CM-QO3<09Q4tV_a@?vng>^81I`;*_b#qqN+x%4f#uC`;t?gtMa-SuW035)Ma{ z)?rx7fElK4Q;-a|E7$$>Q#&6SxH@vd^>Pi1($|49@n{NPX66@p7(3%@&i_*p6QJmh zE9j(guWsTYD`fbxluFu}C$~k2CEh;itVszLlz5wif&C_d2ahR{_SNi?nH$A6`Ryt+ ziDSNXw;VO2?pGI!ZKy-MzMl0Tzl8w1RHplFMv?X#Sc@4eVDa?dw!~o7}NIPkba(GZ=(jU#Us81kr<@ zQ!3HLK_`!7q;7BKjc=$vP3?^?cpfS-b-p$9r#)*@z6frmI7G5w^Q(_z?EBAwVG@>G z>2v`T6;@E=D^JHu2qi&eMl7!El3Q9`Qf)91VY=HvS48pSx}+DB_;eu_(7{uGQa=2# zs(m`XZ6vYMU3^|KbDSp0w$8@YsTy(O_j*eITylXUuNjwm#S&V-F%C{F5+oH8AnVno zl!%ISU@OTpx&VI%b z*hzeSy*?7pYdx7?+7jILn*A-g8mqfGx{NKknjgw1inG~J5(tOLL-#{t))NwQN2v=r zz@{m)^qMi{ur_ubZ8EOkYcB!eYMG1mUnb6s)Fn3Tg%ljRSW+rliNPP@&Z@JEbRyf( z?k6$@MH`0B5{DLi-I`JRj&%=K@%|M$yH5w^oI?~B7w6ln)}?ZHHIhrz5{-#a5+T*N z^r;oM-Q`{6?V_34T>iBSZ8JCvmcR|JX&MUb;=;50lj~a&CP4W>(UX4LV2i2StJQ+L zsmziiWeiisaOGXqsXL2CoJRs=+;)>y52k!bB9=GIdnT*8^zFF#jtQ!^m zgG?o{kylbq&{sk~9l1Wt+cqxmsI4yB^j#5EWc9%y#N&N>vXCz|xcW?!^AvIiyx;Qy z0$*%%&&=vwW@1Z2E~MQ{pHXW~?3FO4yLu~rlW3Y?EVw_<8@mt@?DGokYJYIdz zW$J`Mk7A{96R36J)&Uh-v{vJXteL}ZG|`yNZ6EwcT{xIEdB=~MqT~ag63_R{5l+&Y8PXvGP z61o-F(Z*^9UwMV0hgG7K4z}jh7c#)z@xZOTG1Z6$?jg8y>9bc;2IpU_^VZva=fkXr zlIKkcJsL(bs}~m9u8CjYadsKgAp{0lSf;GK?jIhvFMM;K_eQ2;QdehTcPa@VXCp#u z50!IME%Ayt{n+1ReB=E3xKu8EsGOHYuGfAnV#GTRt^mVU3=0!Xlm@_$x2NHzSCEw%}u&6J+`%8^omN5lLTCvKjTm; zVrO^LF7h_#DOV0Coj(mb4JTFfo z>YJFH_pq6Nij(l%ir)PU;g9rX9qPMApOBD@GEM;s;!?8NYg}9Ao45q{wcOX1Uel`3Q zv!2kgNbh-)1qNJTduS%%GsatP)#vZ!*vggcJnJL|PBbfj@Q)SSI8L2%t!l1%)51vi z!i6%e(t>@)Lh@xlR6C!}pMQ0rO6W57ZV+zbHC@^eGyUXix){67W>AU#IBQYgnH|i8 zyZu}X?kn@b((uy77t_!iU(GxiUs;}B@1?vd1yuTcD_5Gltwu#$pR5Nn3K?HxPYQIE zJmp%MeBO~1s3oYIOf7tS!IUGGr&Ja;EmLN4dYa)&OG0s{!V`mMtL+FARWrRlOYNyeh!o))3xT0*;;7T5E-6DR zQ36R}wL|00bajt7d>^luB5(M}0|#4-JO^>IFWEqX*>J2%Y&o%NmfdW8HTNP=ODpJv zzK8HGnf-B5JxMjWO|X1)YBKija*nLW z>%}4bgU9deb$mKk|Qv- zFI3;ICL^oO%vT4WBQ+b{no_0gg!dsYC%qrMSKM5=wf4>6ildN`)IbI)OGg|-Qegl z)#m0(NCU0-5&Pkv2H=wCZjGQIJH&{6#|GK&5K;n^rFLFue`&Y|RE;I1m+rVsYt(9| zq56yt_rrARWh37LMrCBIk03=PNR4s3KCcM;txBTYnKS0Yqo-E2A(Zbg#^raM{&vo~ zh6DY*RuEfTstvnl>R;wcL^n?YcH&z>uFpdfaQIs`Vjegn;l2tE2Qz*1VYT~VeM_;l zmb}w#83#GtUeoTiM5+q&AL6jjD(FI_IIK~b?dW^o{h@1#Y<#vZ2D(ICHo|C!CG^;jXJSc^Nu7luc%i2Ak>W;ZQzblr{AQkx84I_p8_$ERIDWOZKskxWT znqdxKAS}YTdKhhGDQBm0&ys^AFVWpnt$p@QI3sE z2EG(o7CQIKR+o&k)W*uoQJn!ybr>5@%vpP>XZAloTR(NSXV*@}nq>Yc-q18cC$_wv_~^(_ zyLLISv+yO(Vsj#`{bT^Ewp8WKoaV0&7AvJu4GF3Huior3^~2kit?o2>38<5L7f=6Q zo>A#SAcNYyuf7QyW2>WE8(&7uFUp+=Y~}pyHcnT&@q-li?%iXl)1?g)-5X}3Wdf_3 z)|LZkUK+50L*lNnx#f_Q`=ICe6Tji5x&~ODt!xi0h*;%-8ptc3X@kM%_4V{Z6gxU~ zZPzjJMTqvT=bYzlq>s1#|5Ri#^9IFbJmUPjVPLr#U(Zy*X5912_C<6r?w6qbuS0$7 zbOn=%7WJEGOJC!RRJexa#H;Y-_daS3va2o;2-lwcnGp;Ag-ef_ik2=Fu8@itOSoUB4AFG=I<5UG~fZ-#wF;(7| z%152o0_5r`p6-d?feHrd*(MCMI~l0STOHWiG#FaFp>45MMQ-W6lyP(OXV7IgoT{Ga zR(l!^Wy&a-9KVGdcW80YJ=sNcFWRW0>MDm%!ukyMs=c7>y%vzJqL&M}DEL5wX2hM= zqf6~2iKGP`Km892Ge)_Y>1_GDqp;g)K>Po%WgOVc^z^f3Dt_n|9L;#fSvdGB z#6kGmf3N3#Gd7@aZd-|?`9!n%>cz3w|LTyO{^>aV5v~bUdBKV?u7}sj|Dmg)^36kr>BV#MV1K}8B58aG2`@zl&oWl>41$bFHCpuV|EfYqMj*ir( zXh!}SR_GAYn4|A3RHyH#2|OIk=MXt$c|rpiy+E~dTNGqp)d~{$j{oXC|8(z&&+A|S zrR=4UD}8jpJ|C|Su9h0BS-Iim^|k2OiNnE*8(MxqtSPB`>(KJZCcpgd!x2XdVi)YL zZPE{$l*NGt!$%KPIt7i&9xpb2&NKiNkN>zpS9s2y9#w&|fN2RrhaJMTenim6(X&6$ z?OW)D@r4~!u}6usx$}m~kWy<7um!&;C_!JWeXYxDuI9Ep2m1eUpVW&Mtcu?+4>IP2EJ<^wTE_z zqUs(;N;-eJDq;CidVlu11p2+UIU=Lc89yK9jQq~@@M>paHKOBEq6yDZnuM<4{=*KIe#8YLXX8jQ_+fP(C*S&{dx{uvvvxf3|_sw_(l>`-C-AdpF|E@1X`Rx@L zlY}hJAoIzi2;rH6GUwH}j#+vNyM|G?4W`X`?~C@@iSPSjb}_u%Y*rYByKlMwabwF} zpjj&_h~;yq4D4+ux>tH+&UE`DJgM-mqjrL*ieDifdJ(4lIP_d z6??~Rk$$z-4H?`#fF6AipYl}80@J$=f7?s10ar#n~nw(sNIjYu` z6JKH#_u}Lm%NM{sxBR{yd2gGW|2+9Js;SEOanb6$6_}ZKiOucdauVC!imk@2DU;NF zoE3e1IM-gKja#61ZEH72jrEYM#P?yF#d2p_xKZtcFOiK4Zq9o_o9#oWB#tZM4eF)O z{P8D@7C(u*w`cLeyQOX4+OiIOkhGmK>jEWOA=Y9(_+jROul+#%{nSpp;wZ8hg`dRj z^k`FcxLL)u2X;! zO#82l6!EyeJr#WDo;e*I6C$o6X{|Armg!abKIEYVX2;n=WBWu$Z*Ri2pzz$Ps?mg0 zuO9I=S*o+k{OYoV_pJE*ieeKlq(aQ|spVcD|G;N%hprOY9zq5U=E1&I7OC%<~mb}aY6sB%HQ398rmZffIV zCWS7I>+3T`2OMgJ4)r}l(FQf7cQrdXWy~?G%+-AJesT%EI#%~I)O5~v6~A{SY=cx2 z{N#m7B)pJ|NF^`;n+e-v&Y1c_^8Qr%DYjvvooM^mk>`@1@5lUJboCww0pZu@*r;yq zc^#hCflZx4!1lbFi+{{Ccq|=lHX%U!q+MUakgX9!1mPor@Yt_yN|!~T$EbH9M|+Tx zLsk)~Rh7vGh|1=^BNn@eIZQF!7He``I#NTSjW%Z_kOsXa6SB^J`TJPb0i?7|MRVzc z%E9W}U37S##dKrm?{k2$%%@FgStFBx^cs3?4VLXp+Hmd+Ey*T?COTA*lL63=)6i0B ztib-0_-l$^f$48vFCni9iRz{+cyM z%t^AziQrbn6M;7w`*U5O_(`b6XbCFuHC}pru*{O$l>6CHC1#->lw<*Yd6ZBxzCKvz z4+qmF84%ySOKFnN8o!cnBMa?YbX$F*Gl~T7nmwO0ZMk1@@s*cXuKYSD{x;~=>!`_{hQPs)VJr|FDBz#DL zzCn6bOskf+S9@|$Ry;nh=8f#wLLSO&A^g(jTA-_93*pYB-$Ya$ub6Hm>OJ%=%kI4k ztl>td!aA+JZ-0g9q@)$FRr}edX$zXV&sMQ;AIHa&r?y-?oL+1@-JD>T8dO9zDZqo! z?MIW50Y{TMDYKH3ZEJk36F<$?x%C=`?hmq3?<@LF7^gk;y-K~`7P;lL`iiY}f1Xj% zJNAUEDx-tZLCvST-`z^ock8Qv!q93o^;LeoCaG*lNNn)9o{H}*!5jM;BRC^=HLHHETkbWnr+#(l#n_1~ zuP0jO$+F`2V})oFZPkT7%w{09^wz6I4g~H7&A9$(BKi0vHn&Nu6H?|-+(X>hiuwjzQOP(h@Xx}Kl=y(9DlnT?=n0$~ImElN7Y*%Ou8`rt(1#Y;cS z*Im4 zU?<(OXEQcrJum)3?nBaH-SydQsCf##^96}ViB1_(3opC7Lu!#dQ3J{zJBpx~sU{r1 z|A7Knd!|on2VWp2^7erILr#)ZIdRKfYJ3>t+2`nI-;d(WvAUQAxk7OdM8A0$2Eh^B z#G(x`#Gal(f!^9Z?1$YwT&T|@M~^%hQLjH4i!RfE2&c36z%vv`H?>I*!Gv|VziTj5 z8pB-Q6zW2=3-QLnMIKZSA$A?Tv9KYSbQRcC-JrG8+L4%}lNYfrP@N_|p?B1g@wgVZ zpuRvn1w}6TW4>F0=TJPLDPvxb2J3`9QF3CZEt!}JJ806#0+YceHaBUYxR+4fJy>Ua zext!U&UXclP@17t=`MaPGrzHtV<8u{xJ1l@=(QL4d$~_ThXiHz;BeI41IPPLL!B;? zX2o<|zB^b}=RgCxr&i~mZO_f6XH&E1P!Vkcmkmxb=-sCT_!QfdP=qZ}<0^K>*^vDX z6|lH?1#a&n)Kx5WD<^Q_wR`t=db<7L4f|q;tHIzH9J}xEt;2e`^78U|fTMUmBm@Nb zwYa6I_V+9fWe|PX-_RSWaDI-+r(& zaKDd*%W!d`I%BuM6RRyiCYc5d)4`L31J?kaj4RXYlQB>_Wbv2D>pfPhlT5gVZ8?cEJ9D8 zl>1?S+#;5Nkqd|}U1?5&qXQw6**OwQ6oU%WO;V2TGI23q$t`-xt5w|GBIc9iJ=Az^ z-HHYrp-%>Q1*SB9rVL1AkC^j;hL>HhOwZ0YKJ;)&6yXT_L6N=AXm#zZEjGIgHw8fm zXqjj-8^%1v$jI)?`hAw)Uw9MpHLzEN?RWg?7~K62;b`FSg__wnfjc43^SRXxt>;-)bn4xQp@#E2|>fXHYSz6^5SX}`{l6jvwW_dp6(WW&*B36vSa z*-9J!E82&x;@s_ctk1eu9XFjLG7;7%RzWefi-?+M;b!XE3mVB*p$1FVE~t<}54$|p z-g|>&AT_={XP>22xE4`#zYkU$cWq7=q>*;hQLpfR(Ae$gR{zY3Qe05Di?BKkN0D$8 zsfhKqJ3%xLsTBM-`%)Jce<06K?$mzoX>u(#y6Xf4HF8SL+>*G9;S-^9#}ULZ<7xH- zCjXlb+sv93o3#rAk}tkXVQpoA3lA-M6GLoDM4Otsm6ZO=2>lwmL1Q`6S|K^E$vUCO z&%-Bq;w5Fx3I}|Sh*tGku6wf4lH7(|2d8|s(+5?`JNRrcFh7m6CrQad4i*QT7Z}i- zxH|ohJP0c)`i&y%BbMUWJ}*~GhT)||H8u{&Gpu^DGm4LSg5RhYR2LQ7BkSEFtVl|K zDuSO*%W^&h+-?IQ-|MH4Cbfv}mro}uo)0n`_a6MPl8r-vBzPdncQo~g^AxpPAKaV? zB!AOHfzgxRv7vjPaZU;1Rq8GNzDr-eI(IchEf{H21%EFO1NPz6(4MG z1EKZjp#2oBhl`N?pZ!CHp?zoULmih*zY^%xVvR#zc29pz+qzi+J-;(2L?=?zoU9qi zwJZlO*;fw zgY%_CHiFwKU5%{PZEf3kE$^}b)KL67=3eTaX4G?yx$c1T)SBvadPfT_wYC-u+_^hP zs%?t7Vh~9`Ef8RXVskB%pI6^@dX;6(Mh48q^yz~J6Bq@V{E|e}{}rXnrJh=Z5ueDS zjLui!53(8;hI1%?JmLNWY5Vsb9_V_0iweCkD0DVj5hndO@=6kP>$B@Lly1W;0DPZM z7}za20a1aFG@8HuPQNA@7K`2KtRFYi%Lmv!7WcJqnIsML&T{obpM}aQ!=3+(3-x~@ ztGl}Gkst56DqCp^ZN<*$m{|?{sJ+yD<31=lMxNYa zc3|%Q_6*B9FN+EN_&>D%U+|Y}a6qU5sqS^MA26kg)Y3=a*yq0|CbkC#{j7Ho7H>l>(&W>~L)Dy#_s^n9z08-DOYF40ju8L*-Nx%)ovmbOF zVX=2|LdM(p1sgSbC0q*EetK1P`yWu(PB&CszcMoV|ATS$YSsJ#xy<`A2s=|Ds=^E3 z=Iol@Qf^cH(dOG^n?y5M!@*ucw1TR!T)8h>hc%wl;akA=G>+?WL$SKQ7=?bT5aHAc5`UbNl<(RHMqMb;do5dN>7Rkno?h%Gx+0}&F_J8$A zQO8JS$ym_P>{$Hl|El%>vb*8n*nebq6UW9R^ChJJgyYYXp}SAWEs^r#X z&ZDgfw0NYviRQj^qz^D-17{HX&`*F{$aHfuV}@QVb;%1J^&-swy8=Ax{{$k`*c zO$2-T2|19@D@I+FC5(~!+J?Wcg3L}$Q!B+Ffyn4yVE6k3M>~@>#o6AWJ%%8Jw$hR{ zH(R5K*Q!aok8HDoPS7VY6I{8pp?%y&RSp0O5d!W678?3OLrUrIDuU5ZH;&3aJ8`_o zGB{Jy&@j_V2V=%B-5OZJdf())n2GW>fg;Y14n&F^VR6YqQIXR(Bc7RrNO=8P+9z^p;X6A%AEBIWru_4A;@PTR3j1zh z7%9EX(OxavTiFpsxCFvK6U1rgC}yx%y7^O6yw0j~%ejG$DyZ3}#Zjy z=nZG8=fjqvt>d7Bxy@(c4p9OUpx29-jPmj`2p=z%&iZvkSdR2kzKdXujI+P%5}A$s8swMD_StcjDqRQNYL&D{mxVkT8X|x2vk3KUNcB#8 z3#2ZKN}CYE23rV|J26v@Fvla1+YxG=?hz?hja0c#OnnZ&$yfw6`!0pME;HFjAK52? zm}JwQ!S~$`B6aI-97!4SeL?k1hUE~-VCsG{ZQNB+89*tuxe>5%&V5N%@NgC~f0A%; z@v9Z(i672yFKs@J$uQgxT@GVeh7YfTmg-#C7_iXTD8=7T7%k0a2Eq@{OZ2bBZUo5f zpDQRW{gCfZVgl}wipEcKdvv}>J0^fZSZ<#!M9)Fp^7{Z0hZ+U<%_;uGC#3QSgrZ+5 zP|)M>ZbO}2?k6;J{p8rc)6jJdn>0d#F}9Xde8=KIeXv(qm?QC8H0#N8Cg*>hvLC|& zM275BuF{46g9|J-cqU1xz%x~VKlV#W?(@?e{UxWIoy!+I;Qq}crt@1_J3rHW9#Wlt zDa(D4k+EIIV`BIgF`K40o~94fW@&40kniBPhJZy$AN5aaStTrA_*9KLs3(;geQd}U z{<8ad(Z_eg@5nT$YKXeRA!EgE=k32-od5nxF8q|QCHCa84;d{+HbYKoq3;xs^|riT zEp4b+?3wRh!p+aG{nFMpz2I#iBunYfGcWM&#e<&L5l&I7v$2Xwn=NTIUP=%DbIb^w zsn(4FeeVsf{Tp}u@Y3%-%S~uA)C9-lkVC}o4u~~oI5K^Ad))RdXrZ$FD988?y($&y zHx}SOdl`}@01Heh)ui|GxFvO;0_aZM{N3S+jwCCRo#2FS7QK@Bl6DJrFNliH zck`GL{cl6`#i-frem#E{*?<1ozjXtaB~OBz+0Q*+N0l;IssH6iK9-#TsDGy=XY0Sb z`Ik2I3!ECYn-~>{N)0;ZcxS1vdgv%O%nPbuy!=e4DV`oxcYQ;i|4XxNZZ(&~Z6<23 zUir(LfB9}#l|Xam=|O>Q32UGa9DyfniCibHGymb`9Q)XYg3a9!f$HnrfBy}Cwr>6W z)*Uq1=YR*`FGICW0Y*(3I@S0Q43~ADHvLp=Px4gD=yYNdv<#EY$5xy~oxhno&heS@F=HT_$0HoC;{mn$ev97?L zv7n?Rc4ER#!nymc25bG^TKpWhdR&)a6UW7TmZB*WZvAK8S!phdI><7NT{2;d!TGC~ zmBRcV&Tg)!DTG<##ajUp%i*mz79Q(U{NV|=5(^7ocJ%cn+T^Q$uv%)o^+1KPqYler z(V}U#Fw7hKo&EGr&l1ScV${N#P5#f5?>6m!-qco;?p+MGKBxZs`c!&;(vqk$)0?yM zm$mWd%>L^=Ue4w(5Z)2vyNo9(bTai}*K3#YF1ZB-il@!@GyKY(N3J9v=8P}Mi!{TE zizo6*#JdQQtTKZR=;?X_)#Kc{IxZcxYEiYJyVfQGIoC9iEw6o<#ausMWZF+Gv*dWu ze|E>m=Bw5rZWb|bEwZ(Fct~UMb=D&5K)?u8{To@jv$$HB*RA9=oz z;+eiC)^!4HD$jlK;$muzpYX?zKOe1B{g9A9UK3%Riwg^#zx%EN4=9;Z<$WuwCc15# zp6^ST%7MLhR;y*3*jJ7QRfDiuFEkd&Hqw2FCEPeTFP| zt2Z`8IQsK~Of3)j`S@JR$Lu49?n3*lexI}uzOXSKyQ@#0S|^YR3c)^qG7&lGGoTzm zW0UCpL|A71Ohl6IgBa}$`Z?dATP+2*| z?1UQ+cF{hHxN42VwJjaW`aWVh`~&DL$Y2@c!r6?!gCf_%jrE z%RJ90=J}~t?5c|x5hRR#EOBDLdSeW9l$ty>jy37U_H0^tv)&6t?C*N{(I*MrKlC+F zLyRdNiTfStOWi#pmOyJqhlfL&Oxe@bNcs9CE5>Gt zdk|nEdo~j-`Uzdh`B1y#sVeI{<^m+6VSqwSy7LyOK`$@Ex1so1`)A-}$WVKSdG*k7QD(OMwoMV3SK0j#FMFr=J1!Mw78ToJgOg{htb!x1x^!r0 zM4Rn{qnW%=;k_x2r40G$12*ekrEcE7v?3?k3c0&{jT%JuN^mMVj#l|r;{Knmjh5}- z-UNAHTx`$kq`a|oCk{0}442utPI{Gawhe*wAMPU{YZ(iB*v}I*fwH(DV7mH+f>$=< zB#=FueiI}*5}E}8_69?Y0nzUk?8}!4Y@?z68p_Mh$;X_O?%|KlcL=7Ig|@;m`1&Jk zMR{QzlJgNMPn{%&e#Vf+j|aBZ5nHc7KWSxzG{7L<4__GpLXz9ZU^Za$J{AT5di1Z( zg>0wSfsk;6clxXu?(b+E`D2~t|4iekYzO%7u_OX#286UKO=(Lj`c5prvYeOJbVj zV?l{Z8?mJ%X5~MP_}`lN&t$S9;+09F+%w0Y(^8urb0okuQdKDF<0R-O91^uU?gVY5 zX#hH&{Rt=Sii2>$d-{UXq^qg+zx?Zzg)rUGPe$xGEc!;2tZVh~$ck{#U&s)fL|XS9 zS%3_&8rtac$_}EZ{xzDh0TtbTlB^7Ee~|+Ioy!P-iJq4a65mhWPX!c>CBJ#o=vU!U zY-!U8ifACJ8HQoalNUT&AISUTSNd8p<-hY=a+1`yFRb?)uY8b@Nl6IfQS5M))h$dY{+Xn1HiXMYP0`H zzWw30FW)+;PH9Gx>`L%HFP9lhA&V+gIo^x-qfa1Z3yb*4uH(chAQP;_4%MV>If>2m z1>9hOXU5k4u&rARr~5rm>e%aD=JSgDbDaLRFaLTfmw)B}?+-UO|Gev%&-WXCTOeoP zRr{V@{E-;sK)GPbf`2MT%AsEK9o61%sXND7#bXWP+}{Znvz+S&{=abBD*InfZhM9d zZlRGj)x0yT4e5KH_Fs8^{mNtz<3oCC%GY;n*~j1-k?fNoOUYlG`9CeUjvL2nOf4`} znl_sgSRiuO18=mwzeoT%67Q#0*3~@%1c5*<=G_;+WPqtvL<0T%7wyujamfQUj14g@ z&5i|;Q67BiP}pwSlvhTF%dGAFZHN**kPe&B2?*?+d%tKeNDMUry8YwS6fqMjj+ZPO z4IYtCfc#ep_gT+lhj*bYbR(g-_{lh%|DP?jKM$lafG1usgs`1|OoCrh1!taC5OcsU z&ngdSN-O^NeWrC198(o;c^sJtF#ZIfS-{y1-PvE&y;^O61*Coa*;{9gmTTN7@+evDQ zD+!XL?}Ja(oT34g+lJGTJbKhLuN5a~m*W4EOrD@Z>{53&MX<%a#PQKAAws6 zZ+jPif%?2$=MIgO--%`{9wWqj8ag^WRNe3W>)zKA%j~*F*R`UdR!;vF1#aQ;>6r#C zk)MPiZWtufiVy(!LF6g-p6R>gI+?`>!NtWtt2aDt3={LD*58(nD|>`{%o=LJV-f2g zcFJ&Sjgo_keMJGx))&|$0UeHay8Y^A9nr13m0hHV(B~-Y8aYB=Hk&S~1Zp67)DY4! z9HTi^eREFCx)V?3wA0MCk`Yy&*St+t8XDA65G+2Z6z;AxQXQ$d`+%@4g1xuyy1MaJ zv7|z5Ct)d+&fIv*mx-hNy^GK}E{SD$-S|lz;_MkfI<+OHi70 z>79tKAR{Y0D%O-5FkJxBm|O>ybtc~z5D&$yI%MGFXbuc%$Yg! zna`Oy2Q+#Ftl3h1fW^gQIe}OXCMqyUBP{haM2PGjNxI_BExfEqAMYoCJyFyY+{y#E zPd|HZf=zLw(_kUv(=bW{!gzo^hhw|af<>cQ`k5@)1<3ix1Hc6oH!s}0=ccoo?0^$U zWTo~@19r7p)+6LCZR0XK--jIrDRTbZv&1^?K!jZuU129BIC5$R0<(JH-oImyPyb)` z7^n%RL+lrTqK`+G|Ajn0WVxeOi|FD^E@-qAw9Nfw1)NS zH26!0Gge)1^d3GaW8K>>HP}&Lbnou4d11Yp;JVMxYVs-unrZmziBU!YYsnKjjI#F< zhWcf(2O8MklbML{$RQM&EX(D-?`Rw9!n7IvY3GUHOk-_)@ z)mA5Ab1C}GMV-bSKtozxYpRQ-2G^~pesd@Hj8QK#UWvNA44Ec9%_(t z!5T+e6csKuX0eWC{15N@7eCC;(bWZYk-T{UfO?bXxm3xWDp#bAUkWNzRUin;4wy!L z`(_h9#l^+-EkniCkr&#>LFjl!$h2Oqs&+2)sOW=1g#0Plz*%v6iGGEO6?DIEtOnOt zW6(XM*`{EBvwKS{7yxgB}&@*d6Boz~U%%wIGRd|3>7tmv=@uLY!q(zq$z&Bqj~?~8 zVA;q!m0XWMVX|;L2a8M>CC_lOUygP_)q-CJ-8aG|%`NJ#FG{3Z8@rD>cH#HZA9 zZ+-vq#$W%nQv2V~>74i^*LwFIz1upFeBwtBi~r}Ec9}Bg<^z`uz|&*BV2;tL{VdP! zA2Zv%y1P`tnKh}W#KX7pdj5qq{^uu+fIWWw)901;{VBR1!jFGNboDWhMGx-r$;`#y z_-Tau{pK4xw`aCZzp{$m{@9^6@zjnT6K0c5AMcn}xL*BYrNKsA3>iPp2qIPskg*J* z8|_)47guK8vsJ(HlS*;FVn8^twwLO6!s3pGzc#z05SPsTuVw>vA|nuEDOfQ^u*N0v zmcTK^^lSh6^G}fdul57H`RJ~ok5)~UVj`nsnt@yTWW3jTobsx%aq@0*(D;RFi;$3v zVCG-Sw_!%Hs*ZMklVnUo{^@I2Y^+!#E zjL*-N{r??e##-z^HL`AY?G{k4hjz*Rur@5z=GgKXr{;%zz)<#{47Chg>sWas+F{EF zIe6Q72t)k#LPsXfvnNel#V13mLMUXbZvOwl>CY4TK0+fpmd4;Fyg)HMuwV}CL@YC) zmw8&*@6p3{VbhwB+*?YH#c9g6^M81qA#+Tu~*Xl-O;&HXpGF0Ck~%H;I@ zd>yH9=wnkV`j22vgUq!6)c+fonu*9ly&6;>?p}|NkH=hx{U^cfrSZKa=MSQmm-ky| zS@zSs+FImG0of~0>|$|SkQ>K`Jgb!&3PqtH=eT%fxIVj$((5Kr>9n3#z&3mGw%0p$ z@~BAz$Cvm(nSUAQAM0~g9>7!Lvf6<{P$>=(A)pw(psDhmX#34JA&INu`^$CKLCg_S z7a5Ljca?1h!@!!^*ZKZMFSq_D#1NNq{^_G+9 zpMYIMTD1x|TjE^Av65SB^3BT@L2uec4?cG;%HU}q1i9!_Hf}ObGm5J~0Zw~%r!E~T zk&1ybn1&Pjuy(&+=eK;ImpQUy_nR*QytBateE zI+@gvKlcK7wmS9{GQTkwcn==w0O^OmLqmJ23Svs;)PZ9x&A^@Rn?U6Yw8;X8Fb)Cf zu=DlU^VH+Pn@(x0kmPK)sawzW3ZRA!&|HQLc_@ zw$^5 z;>pAD+;mrM zN&%@G8H?3rWW~js)Sn5T5`XXHqLK@XF$hy|o&At_R}l_sxNB$~{qcf_j+=hkFu$8~ zYRK2lQD4oG{a;)el0^@L*@NplUGF}d0%+G3V7-g{;{8^jm3PUvGCjRt9lv64HVh2% z_}Fkp?QB49OblfW&dPg}$uf?OA6gE4;@OiourhbSou!3PeWC4gv(n-=KAQ~@l!I|MdK*M|`yChT{G59te`EL|8Y z3ZYJu6rZFYIP!e$X3eVlg2CwTh(H*>E9mlWR-Q#cpB1q3EWO-2USLBh{OW_L15!j zut;-w{BQPdG#@>mgm3tnmSRzQV#(}Ffcx%}{H+gX;?xmes5M^m635DYD6Z4CD z&~Jo+#ZN&rPdR1C`s(mRefUN9nx@~ zB-t*CFP4AQ!?qEy1n05f zOZq_i;J~PJUv7ohqsWVI_Ws$t8=l+KyLJe)8C>`vkEuYl71!CL9 zW8;ByU+i(o#of7<|Gv@k+`&!FH`3$s4OjkFn82KSdJ@Rwn)qgL=@uaWtW}P`Yzwe8 z9(K+%r+(nALwk6alZM29C;P-s1GPqC{kP?g{2{D*_%;%zep77Q4EAE5B8s2zy?t*ok7(GP&6An_gMHH)z{EL%f+H+NiwR*a|1+7^FZjq>fd zFdY*IFo)TyQd`>qaPW5t4{&^0*zqq(ZQGL6w$pci5MF3lY>&Z_Vp2o5z_)Nb2Z*_D znCy*yS{}^MOI|I)bpR~3gOAdWay7OFvlkAmJHP^I>RK^>JGQ{?4eP3cF@tE|&!r<< zUcZ;R<8SjZ&ug_LeudRRe>-`vvP~~@86$MSBK=M zgETYJY32K+PW%egKE>_Tii$TZxWx+87eDR1~D24qRJE{AZ=~e|F>7gUi3( z5Z%hwx#18>wX4H@$kiIN29kssJaO9I-nz3%Ugpzsx=&}m!w)IRFNycBa_YFdL;qTw zj+6<}jaJyn&d5X>@JfPtU*O8Ao(-8Qq;wItQm|9U%Q#NK01HPa;sVQz{Pcv4Sj82;kQE+8?uJP-u}a(tYpf%g6Pdh2dsgqgYP zj6AN4aq4^)Om%}IdvUSy%{6;dH~@ODagw_KCL=gOmy%nbKfEA%up=RPj@yNJ-O|!9 z1;nF|z6tK^D3Vh?`e{J^BG|v*5G8s~D6Zpu{>M^^+X7KUpof%VhD`3hbS?yHz#}?E z*AJhbX1av193h-LXP{+>ZW?KR*UsLpifd2~i>0wJ_sRS0O8?dPwQ&iUb3JL~d7)5B zDJ_3~EX-40{1TM=n&Qvyeol#o&zG`t0t?nIpOzuo2sSIsd z!@S#S5ChL?B_*7CQKXO%eLG#fT>WbDNyW-18qGPLi3rsmhR4s_gTxx zw;hw2y`XemelJ}Mlk9-FZgN+ET}y5Bri%vQq=MOZ-45>fXjN#bC-4>jG^Jn#flKg` zYTlG52Q1vc4X?$l`LAz^PB03pK=Xa^n**b)0481YyndLL<4Kb3*ETeEQ@9IBc--iQTl zvoMIVGPi1^48>qr3G2JMNe^xD@iSG8_g&*3WnRN$QnA=+9V&T|>g4IaYF3KGh>B;< zBNkntr!$+=1&Qlqj|%yS-zQ0p4z6{|&OL`#BaUpXqTaX~`tPg~60LK)Y$xRQ?fbJg zyaAi)CajKb6~pF~XKUvu?BnM=!kd!!xU*Bj`8^t7SnL*81Jrb&q2=H{R$>KC5ZDcubd%I>UW`vMBqzhLc9UB|&%&3zqR?dcYK8f@x_Vm3EkEz>pftK@ z%>2Lo#D^s3ub=(OvMUa@{&@$+m)5GKKH85pI0jO3oLh_3Z*iI6%0Pr zPH)WJ%!#RhQ?=0OK2%k(^1ZBzD>>8pmAJJ8eIw}mf|?;wm7+P{Ng*i94Wc~= zw5O#H-2*p|#FJiF-GMRTUJy0k^oCL$)(RTnG7jwkl3^sa%UbXGu0L9#)}m2~nsz?$+ah7@uhH1^6^qok9KmNZ=4jhB zWY0)}JFq2}w0%ZMd3TYmT#GpW(p#Y^V`GIbuWv0di>kk5y+kstE8i59#AvFW+CYjF*nyJkjA2$wt|MdWkr-!E}#&1WO(27?r z^ijy8kUuWke7gD+xNRFjOI2V=C{3t6IHbi*;N9=&;n%9i1<#J?ouOXtRoZgA2~B4P zkdh6)r1%qx@_6zfDf7ctjQe}CByjlkuVdh9>{xlZH9RMP?{Hz>ei4A%s6T>lYe!#){Z| zr;OX1xN22)-={}I*vf9+c^%d{cwiP+FwGyEFK=vuelDxl;Q8EkN`W+JAakSw7E^GZ0wmdqb^!2wRZ!0SYrNms*+D;f9Rpg5R#HR6r z>lzPppn0#*dI4&J+!BeF<2KVbHnwYi)0)Y#u{VJb^`-mBpGfQPG43DlF%z{iE~HeJ z?yCEa#Vk00+G?An1r^JI=Rah%{~DEKiEyZHhh~WobESdzW|?!%ZqwLG<^CVS{sUX2 zOHHoO8`I%D^FLlh{txdTdf=#4H|{{oTk)Un?e|vKUuinBXIH}m^@abr@y%a*35Zhp zMw5!u@S=JV3`WYDF9b?4m9I9{U8nYK2<_jUmn967_0dYVJh!zuo+-kk%INOh&d03a z#f++$t-Xqa=%We@Xj{(&kmIRjS2RA~+oi$=j-*8*w0#!F&zyP6`J!zgs2u&2lc(KD z0$c9S$-N--iU8zmU=;k}-HG8)-_5iBfr|m{?L7%OIiCzL530_@g>t)Bs5~k&!uqYI z8)OnUdSRqP7pk@%o~q8g28OP>ynFYKJ6*poes&{^%{bMEIXic$j2Sgl?oITW!xYrm z*xG9H9YW&V=7Y6BBg_cO+=LEL6>!!6`_rS6LNZ-P&pHje?4btw7*|uyNj?|j4c4u0 z0U2k^t_lYgd|2XI>3OTq3jU3t*w{9Je(KvrT%5eT zGgYijMKp)FSLPHEF*(dy_Hb6@dsN}P=oCPa=MP>CC&|-;3T0s^H$>HSERK?WG|4l+ zOjunt@FAuoJ>^Db`18ZAE%n$jh8bcb7Yb}WI((yv=~_T)9=}q|iu5gQsfV^HAE?>% zq1E0CEAf|#LD+Rlh~uMbunGF03Gv|Wz?FrC8B)WL8Xd8W4dbz)s*tpMnHjT<;W0~@ z_t2ij)6b<*p0vORPLQ@-m=4tqMKWv5@Lfut^MSgMh<-ZQKrI}iEG4i@QVb!9u?`3Z_z> zNg6pr>?V2^qnvU{IH@|t7Du;6&yNl~G3jW6)FsFRYI?OeJ=oF@^0_|2dP4S7XZeKi zq}|9En!HS`$|G&&khrCQ4*E(p2yh0!{KNhxOePhP8&MnPP~D>Kjq00oF6u`dSXxcS z=xe|nF)O!yGw0*ZO))Z2whTa%Z?8 zpTN-^Az}LF_AT7+)bL>F!{`0q=%bbucy@)a(6aYk>dq#p|4rJHYK_qHL?atRg&h}n zwQPT)WI!Ql9Hf1c5-+U1oxjsP@`RP>U`go}9pVzUp=WvUAAeIJ)#~aBRuH-(P(m9MNh;8gaj#ARcZ>k7 zB^sj}P2nlVWvtPZNS`_%)TGy-cEZ8!ph9u^1hR5Q;Kw}ou}oHS@E6t7to0h`=eOt* zzUlJEWjXbON0poSUM#rQQA?EwOdadG3%RSFprG}#`cT0L*tr-TX{2}vn;`pu8d21; z!3P$s00+w}j9X2dT#1xv5D)R6B3WY_H$LEJ_zBy!wL(@oFSw4AFHqYHrb+f`LV-)w zhJvRkC*V~*{f6y&&+^K%8eibnLRa%4U4L_2auNdE5{}Nx_ zuFfY&%uFsfES5TZt53GN!X*G6SdE24O1r*a&~+gtBGxvUqzy{ww@h}3&%#E&fDX>~-7D5SH)KdXd zunqJ*V<7(i>YTOlz*@(;B^0^=U5`mfbfTuRH+ftbi`9-a+m|^69k^5WctSx?J6l7)67P~pw8aeWhE6xANASDWt6}R=OZcG;CpeO*9H0<~^4FqD)$=;;tL_yc z;pWpNeWK6hBv> z)PyAT?_D^cY=zSlw7e}iw=;*rQ&_W9Vb0nNfc~;Md@{*1!{4iS37P*)9LmVf^Usqcn^cs81`tF z53G78Jd7G$kQR#cyVG?!%q6uTzII8FoP%oD@asRHE=onnaax-&$I8gd+P-Jv&{jJq^oIP~Z@SvgNzN}z& z;2LZr3z=bx@f_^)Ho_vY-me2*uMgfA>dNfHxWfH|HVcIa?I=|S?p44cZ4^1j=k2T# zu-BiNbiY%)#w%-k4CQE?n)67kpXJ>$wvG(y#e~o3FFhdA>-VpDdw4C6I2BhrHUw3E zU0e^a(fpSUEy5u{kbu5gk5u$;4ts@7%@eb9^2K>Vb@?+8y9|s_IZo9;Q@J=^EY(oJ zg(@x^)B36>gxFsgWZHI^IW%2~*cdsjJId$wz9456y=K;zU{d4_MF7^Vy=6Y>2@|0W+&DG{%)s4l&vamnw zhZnG)9AuSoJ8M`*UlYZ*=x_S49nPx;X&8v+gVRbuFRD>tIcutxqS)rUo!)MUSuoMn zJi{^my48)vWpZZ?`!r+>ObK!blrjQ#Pb-(1zXjV%xdt?_4&1X@>?za3 zHu0gU@x+Xp29JXpf z8jY-)^&c6nZp3bmCDTG&U~h7&$Jyw>wV=+ZE%VuP@Lr{c!af_uePKR$>QUgkaIa-3 zMGD6~Y%YpA%h3;yA&(wU2{`P~5hi4Li9bY{n;Nv> z8`Jf~V7MI?;pGyClX>fO)>0+CL?^FoyYia=vm!#GQa_y4hGa<~(d;;Cj_J~9RZwOD zTJG0tn80$`HGwTNagOEKUa*?p6WHgOojZLztDt(hEOP%qP4GbQ2DP}LloHB@!s>rP ziKG{iFG20bJU8mA35BvOK<06M3U3r6sl%qSJQT(NuIGiWVsacIb4Ry&U`zPwMvgr& zrGHb|7}Cr7@&WK1^s;3a#=;@%azU$3!+lF59u-lYk@7H2^ffqO9`asl<-PyMJVvY0 z&1Ltmt~MdPqVlj%QUg1i8F_NZ#ZQYWS#MX=DTg%3nhnu0CsyG%=nAB-^XVj-042JE zZ(F~Cp_ARmh9N^O0&KA=M+%leWCh*kzc-jrKzoF*Ze+4b7S&RB_}|e8N$JOVzcZ=b zJIYv^e+Srpk9UAj$YxZ{XQT|`boIyr_lEQsdCN!esU1HW_gv&&-hToUE^sQaMM3&I_5a&n)j6zLT6JtG7Fn_W8i16<&Mp>jc4)mMcf}4He+g|_&gW3n248kRk+b?*@@fy~tQ`rf2h!Yuz zOsf1E;NR4Gp-oUoRKVBkZT3gkFCfazfv{17hIfhZ995qQ|AzIR3&<~F!Kuj{JfI97 zcEXNN?+bu!8O{!OcZlmxCqSh6$+YA~zGQMends3ewg37JoPsV@QhzSyn^Cyju_0UP zkg=GkP%mswh)2_>!RG2kw~8SmH4HVH+OE#m@jqFOh;M?6#}gK`IOYD6r$@3w7!{ozdCH7S5cx=34{~1JTfQW@uY$cl}be!Mra+Qpo5S_hF z5N&ITI70pkWv|6}uBL}`3mk@QOo@)&=A8&%JUncA0m^!!L}TiZvCpu;nFPuC*`}A~ zM0GV$OF7dw)S{BdxQ<@($5BP2wa5pEYv2s0bz6vjPu4pl^HoAvKHPv@TgP}U7JO>jU_mKe9^=lU| zfMqo6Yb*wL^H$*{qJ?U{(A@AR^8~LWGO4v`Ah}!c4R5;u1>zZ1xPB0R$i(`YyY;GN zB|iNXF(@U+{(*kwG?g_hjxNq6=v>m>xElygm}NO>q0md!(^PDrZ+yfTA z&<8h$Ns+p6_;=r+wrcN@AO_pQTc*^-$p~-~jEtguDH=4X`lTg!$S%U{W${7x3T#Z?994;wYaj4*{5ghIwc{CI1X{kL_u| zCPMQh&U>^h`z@@z`_T86n~a6q*{ID&osbn5>Jj7EmFG~fC~E)Firus0dH!d_C}+f6 zLBRaEm|P_FSuHg>ko?tDpE00r&8)>2`F3~uQ$D=&M;SOYi;ObgE@UQ9^D*T?t@c8I zOUMhz$9_pE-}b?X{ayL^gZW04?!xJCxoU_{&>Lm+tnukeIW3`QbBbVKdP84>Q?8F z(KdvhuozwJ(<+!j>uI$a-gM6ImFaU<@n3z>i!eo{BtraMKopuUVx_Kw9w3|kfpjay z13Q;F{*KV@#hv%{+lve?YUxuCK``XVxr?`&@d)?ulGWelGNE&MKkc?M`3c#u(J zR6+TiCbYTm_MRd!-WR6kv*cxK$kGbltZ+xcd0KBGH$9om5w{u0`Mw0-lt-`jMrK6J zna#SYfJts89?z5m5OD)>kSc<0#1hg6h$6QBfcq+=B2(t82t6A)gUU#FZeU5F6lBnI z6NnsN0{ef+9r%K<@}7g1_Ux>LwX=N7_19>Y^BnJ0kEuaAFrBa=7ysMAD)l~{8-AAO zdWWhTWdV(6r>ee*>WzJ}0;?s{Z$Qcs^JA%GnXl3vaBRgd!R~GB2fSy{8;d$qX}%OJ z%%UR4qZ3mEQ9~EW|2g-=XrtN~v$wQhDwa{jJ>uE`F)KwUFxUZVV#Mz{zb*9483V^d z>osqk@j8IgAK*~HP^j)JwkG)I0VeW~9un^tmmv6y1JDaOlN@_pV z*83mBZ(Z4nL#fKF`3*#mhTkgL=)L2h6fy4*sjK*c=vpt|uP#Y~KGIgDQYsq>HS==# zjX?$uMxe4C=8+VFYcC7%S<#!|fF z+E5j$8A0SZW*RO89qf;Kh0hMa%ou`Mv@<3xAJkPYv4uTCczZATE{zuxlD;60_NGy# zJ^VpTuX*nCmi%)kZ=$v9?fR<*Zd-P21V%A4-V+j+NFwFJD7kMQDND6P>^*P%-t^Nz zvcG+Q99N(;za8@llr5@G(nLMWA!Y&L4SLrL00#vPT*_3l*AvtTX7A)_dtc{%AM8+NnMXV^@=7ukbE-V z>Z4btI;B^{pPXpl{eB@|3T8n00z~g0R2KdEaArftqyrE}1!5>CROjId=;G|gSh`Q+ zEZkR1UfK~g0P6AA^034hd%?U5fKx2Hclo11*c1 zVG{tXPY#akDDgd@iYC63#MVb=giknh@)6*W+vZDbVx+I@qUQHlc#kAPqq%WIY7|#j z5}El_ZSTR^+o8{B)=s?ZRp&947J~J%n;#8WH`QRe_Z;q%9;umaPnMDoO_sI)+-FL1 z*0;r-6i~K#6tq$i-m2_W@``7>zq7)rZ%0PM>!YIb{M;1MuFY>R!y3hD)q_GPtAWM42mcyj&}ZDx>kL)9+R3m6_)CTGC>lWYCbPDEE(K<4SGn&Dyrj3X|>@({*oc< zZ;n{^jQekJ#zQtfeZ3&gU;e&OI(~n*&DHbhn!pG111rs$8OK*=x+4KTri~A@`QaS> z`u*F2?|i>N(v~sLuKL+E%R#A;THiubTt;DyGp)4@Eay}&JJ3z={Bnh4uN;*Q1iX!( z?f5@u3xz;zCU&3~5}v5CnY0SB_nVrLUv*Zos*ei`rR7!3zdW@eZsdWthXjt{RvAH8 z*0R}&AkT*iUR`BZKFt4){of%Dyyse&tuycvFe15u$W4nm_QZEkRkhOE`7q~)J^76U zq}={T`&x?>tJJj8sW60|U?$y2p>bKvv}`RcDKYqXd;qTtX21ZL*mIq-!NHvL`qOQL zPqhFAxA9|&L7(d?jGYG%@gsf1`9&%}Zu90T+O!*?a|o$ie|Buf5DNp|Zp0=7C!}#5 zH3h(qew{I{!l7;vo;e&}0HA*dD9hf0g(K#CFzN`WZ+O!r`}F$V)dCS z0H<@Y%wWC7*#xsP&$vjf98X79^*i)s$katv{BA_DB>2FgyXyS?9k{j=UU|i1} zY)J%IO!)dj0jOU(3psltea!_3iwP!M=1>y=S=Cu0k;`4^S16+8>{J$TIt6etNTabj zQf1Y7wy;}zi%Y8PwI<=-W5_M_h3siBucdz05Q*6D;V%w=`T)B)8nxaa>q}V?(7VmC z(eLqaPbFTH=F#V_g!&!oG&LPdQuX&}r1a}p?tYl02&+3~J%~?V+yeewZ`F@iKyUA1 z5&g$Nsn+!HzTWJsV?#0}La#YEcsat1NCt6Qmy(K=T`(K|t26dj*A-@j&Q?tf_j%k- z)+DNQIAys=TogBhpbE~p^w9(S2t4~z=OlkvDkRKeu?etzT*i-?}Dt3~CO4hEWPV=xJGCvVW^ za(c|&(4MAB1WlT`FNWMRax@(oy(Se9!Y81m<b@DWcG1t5Jv={~=4FJ_tl|>DtHf4I?QQO9q`5j3tGP*(+ayGeH6g|l z_=Xhcj#@V8TrXwMm<{e;12~unWM||&rmw0Oit2g&&i~bY-yVPaH7Rl5+ghexGJGWv zBLMXUzPj5-?>U|q+(5^|WL^BVXdb@vm}KkMVZYNDv+6q{1(=Gy*e8twY4>ASYz&QTJm2;0FYaG2D?5E{NSe>r;(M& zq0P+=x7hjlABfuW@VTnWN-qb_pI7Z|q1a>RYz_Z$hqSx7QW`3s{`?3%)*$VRJDGYi zux7Wm=+EnE{jXMCIBEBrxBiP<|NF27K(YqM$NL#o|3DWsvIchKInR4N*!vIc8_Nes zTaFeYHTctQ+jDTX^06yhS@+B@KW*Q${5!%n7x@X7rGCQLepgD30*>$@f2f%dS0M##u*8 zO44;D1h((kc`IvZ_5R~@_i!La{Ci1iKzWx>xIsaI^LjuiS;`e>c6Awo9$mO>Wwoa( zRng7rRAKIqTitX~cv2Q?JNc{fE(Mn;}}dwp2=eC#eeREApY0rZE%Ka^J% zZr@ulJE#@orl0u&FlMU{yHZk8&3T=)R1OK3EpSy3FKD@Wa zGj`~IJXC1!+bm?ACt)TO3TTIxsNP*bb9;C0&=pG%b>h4Q=)ptL^F9kBKE&c5whoXB zLL^q%{e-gDL)L(=W8T><6)Kb4rJWbn-+xZ)#6Otkc=m2Nyufo3qd)D9x9`xoniZ$3 zlY7ecAKat%Ypf8J4lu(%82|tCS3;P^yUPo>{zt~U|6XJM&mDlZUI^`f!od|F zDSP73{}AI}o~Z-g>JsAUnSauyv%+Lp+d127Ki{9|$CJps>Efe5ZQ{MwJMxByhXp%t zUH|z}ZFdjM6qv-)J_|BvwG|FQ5MUw{U_yz}#;WHkq1 z%~bOQy_?$qz#;;!0eY(T`qizUb}Rr1EdtE<4q)XoV$c48><(?8U{Uwv{``xY`j4Dn zAoW)mAO4G7{a9&d4~069;1UGeZ+xG^eok4N`VW2A?)2AjSAN>^_E4T{yvs91LDf!+ z9rS}p4QF3# zylFy8`vZWl=`im)mKGhMBMq07v1P8iySFXY3`(u^#z0T!-%5V%h6y0HyU&~`Kxz{-fvQ zpL!EHJjJ=tCl5ZDIVb$7N7yCk85lj3L2QNy^mrLm>@)Lvb{YON$+a{r zV+x-LiQaqUY)if=>uT8kcZq|_KeCw4w5DKG<6%Wrx<{ig`L~CXL#+y3=DmlZa0fHz znzf{))NY~Rk0S2lmtm0~M0QKv4wrQeRw(tey3S-;@=Nx4*Z@cmkRk7xUL*1NoV+~m z+jGu9xS@eOxIV>)IHid5Z~~(zu$4}YtLY4YsbpW%ov0ae>{P;kJ7WF$n8_D3o5|Pq z8Nwphq{tD{eJ{VwylFa#JCkT}yawkJ*htKx8TY4!&>_}99+pcDt6y^QkXF#yEj7~~ zJ6h&DPYOALLM{h25-mv)a|4+$XN)y%Vv2!dg9S%SOq09c3b%@YR_0QI`qy5GXtnZz z*rV%Tv{*3ZI{zOE=55m|tSg3xxm0>Qk%O|h8nzwa6wX+!n5f_~S?zBuz>b7kv=WbrRY!rhy`Uc^x`e=2cH?T56BrcyO5K3a^GmDdWEZrazt}Kq{_e``YQ-v^;#43sah#-#kM1Df z<$)&^_%okfiucARLs*0eKgQk~Lgc$NDk8+2IY%$BCQZ9`cLva4q?h5Dfl?%L2p*km zD!_Azx^!>)i-dK&3`_CA<^Vk2T7p1JdCF%b z+r9TP=WsD(@ROd(;&C*@_imbJ4{{7&hXMtDmN#K5;u6TE8Tp_M8-(9d9f5H93Erhm z2x<{Tev|oSl}ibJZzeWnCue1PPpsMkqQubg-a?k-Mg4x}q@|Nv7bJ;Tgg5JTv^D+BhDSpd|s+ zXO`(BFx+A3Ny5m=Na_@%MvXt*xkfwaA>;0pqA5=p1T>wkO^(Acpn)b`UGwCUV06Tt zt1YP^0iHnSW2b+LQOLe9W(#B~@@YBtfI6#nXsSgbzttS-ZGMJFb_-9PKffzQJMWI* z3h4X+^le~pj_fdZt@CHDp^-0mg4dT-8*1R*nJLblp-{2z-TcKS6)q0aFNM^l*Kj0( z_|v%Muqbi{?G8_nL%?JxXKr0x-NkX&Gxrtk4)_sReS>jPg&Demq|KQdYLxhb8iY6Q z;X1^(=v~dn=@|77jbbxB$*CxuFMBiI+uV@5Uq6ZX`w_A- z<-6y^Ec3g{Tjs0H`zsAwV$#Dyiz~`+9d?R}xSPP=zqFhg;O+{#wH(89PaV{NIk~a6 zsR$9PW_;v!_u-YR!P!Z)MiZs@?CrMuWd;n)yY~nTSa+4>`#G#Vsr{9BpX8ES9P5&r zP~ep4|MA6yXjCLL$oWkW@#J(^Ya7eYO;A-yfxo;qz_H`>27*!T{Qw>x*0x(B>WiWp zotdUYT(h6%<8(2&S^x33L+-8FT&pV1goq0>hKX%8sPw~xQwWEQvm94hvKWMxv1>|e z%&DW9EXJlgyV68_V}_skJ?q2P%%RT{A;4gX)zSFrA7XKdcC%d!z+?Arb|bTnzcv zIugS=;P{nit0fMq6VCO-c2j=?+;;O@&rx7PeGGD0zQ&*57W=kU5MOweD;vrF{%Q$KNmrN}!w82$+!AG7@!|5M_U8h9C}^fTmG5cMa9)&@l$3vrAO5%IFm4Id zaAUO%oL-d<4)DKkGJ>Z*-8~dCkl%=?0UNp%4-L?Xe6%#B`=6Xb!-g11KO!^BiuX3U zrN*yLBGqxrx4PQH)^yco?{bdc6>`%VmH?;hR*WZman;DTa8_HMQRoObcx!-VN`huG ziNWsea8%ndp04MzAVdH!Q&A0*-wUJ{g|#SI9-Ss zyg1*O_|dY0>3h$2 zW#8>+MAiIgtA`6g_&L~$ahv*d!)u*3zAZ=aUR4SOf^62Zndl|8NX;wBKIGqlj9OJ`wqWhPC&=^k1Qr+bi|0YSE~DsdvJGXdQ> zZ=P`{-7R1NuPun5{K#zrULSpUDc$6|a#e59rBwcATSl1xKuM~J#qQW9qso5C6z%r4 zAG;sE=;Wh5^(Hgg5Xue*A}}-7Y9f*;1=@Ir8h$(K^+wk*p@=Vfvo9uh{249TJ|muE zXU}_Q?4xG%-5E@e>T=Ul7Za&?yj1l_V}2TRleo}9W^Sxb$6jU0_+V{o{Mte|TW)Iw z!^*pV6i$ZPT24;8r5&%aze)$4UmQ}BOO;8vZUdijX;@2I??~qPyu$WBz0~uB1!9H= zKA6re?GD=>Qdf=%9W6u9)K;~f;loL)v5!htnjd_={d79p9ul>)W`P-tjNh+v;Z4Vl zfjZw?s7}^Lq)-%aG;7I3hKV}!LE1X*oxdf53=5wcO>%lF5x2o%l=bPnK?rp_Up|*O$#0|G(m9w1Jw#o@cYzd03J{T8%w1uY&{v3iF z57VT-Q(P?D^!d;x*f4~NgQ?)-a4mI&453b$8jEpH5?p@n0Asz)F<}eP*RHgtlD!jc z)OIbEO-rw=)hzO7vV&a8?sw~{HI|`MX)oo6@2PD8J5>TKWRc%}Xb9cX5>eE8%!H}< z{^?=bXdp~b+S2DoqyxRQ2@B8w4t^8Aj6Om%uwcH(oUx3J72RoB(%*`E`!TQ!V_vVv{O6zKncR;Zirz zg&zk$YO(7xuzZzrN@^?G1|UrDw~t844CA(IS?qmpu{YS1He6dlId-!LL>NE7W3yO= zj-HNYm>#8CDTgp?gV+U`AOq^aq_L3&f=l3KXIZ|G)I23V?IUTO> z;!U|6tjnqADZhkD>hI9>JDqjnJSR~D$lDRx0feX#kj;5McM1)01PF7qUY@#Cogv@Fzk-+>0ykxcg#=#T9yKYYd#GHYDQ?IFtEJw493U#y&@fEaI(&7&lH)7u^!x z%m4=&ksnIlE6cJR%V%>ZV-;e^^h(ct-y~8}QXIoAU|{USTy&cz8w7KG1ljlSdl-VV zrwS=J-%p&>w7vJkh$)NfrO>59*GY(5!+xRhd&k#JENdbv&ntI9>Dm&SdeW&b$vP@Yb`#yFe+gN9qnfIEW=lA!})`l(RxxBq1^VamhJqyX8Iy9q;yPqT( zR|b0Qv5j_^&VzN_(XuKl)e3{od)Z`{SmcCcsZ%`pzglZpwj5`5YZDoI5BtoYQNb6SSrb2-St)VUL-akq8E zw>HXi#&k~KE*Pt!cY%8OLk0>8NTG;87v$C=fd4|)}qpy2d0a(e!weOP7@0QaKs~?ChbF#8RTX-AOq4lE$L?DIe z%&qdwA7w__FJ4o;c9LkPO3aTF{pGG-E}>{p8kY{+=2Pz%nWy{#0gtZf|3PxmoZFS$ zPBYSKZNclCKZx^J$My52_+2OsfMU@{+fi>jw1g-*foOtmOuP414(JDK17l9fQ6T94 z_ZHE=Nc891ezHYW1z&t$Wrd64HU<*)XgV{^q@~0LZp@+!J0iSN%GHwKu$-TjF@tqvgM1R?y$b~^ zD>Ef$GM7dIrRD-5uUsCKokbG4umMbng(1mx1pT|dPA)+W1M+%GWo>s}gAzj>d^}WZ z$(kF!P&O(ScSQ&|EYC#U`mHHX-zO&or8#|-qoEz|bdHvgSyc&6s3>e(o{VeWMefa> z|BO=>%;JzRL@JceR1tBu7L5@HLE>o97%P(^)ze$#Ps3Gdl32Xix-=4%A>s=T{y$T( z(sXi^Nk`p+VYm3!+wx!b;q(`akElOJ*_98_Dn8>lii8lKML>{Vs_6yI6~|f&3)>E< z-3Z9>BBr{{^fCD{!53PJ7qH>CU%okR&g4Z_qM)0;YRCx{_bAretDtRf>0(xo`UEe& z`=CSLtZQ9Imp(goz4Hs65X4K0T<>WP${BN`otQ}P7NX^eDeyv$f3nkHe%ipU|@GvzY2;?zVf^ZUz;);&2Px|sfH|;^iS3V zd$oP`vg&jl`}krpuxOqOOPbKa$u;sP%jyVJOi6>pY8T$!Yqe+ctX1VgZBFf4#v}Uq zlC=uyCdX#gAlzlaQjxQf5mc;Qp_4R8yHAotPNuY)Fi(}yq_J198%7)?myDz z9?d~+D3!0t&}()kMY4Wd$#&&^S?M)a&FiBo;VuvV+JNfz!P-$g;qiffh|8cm22KKSnXf$4hErzo z2*cu{JcOGuNuzw8$m>hb3zx(iij4LtAt0Bqw!z(IK?X}Jyi&_h2Rt(S*<-Ayx^3=z z!iz^=>`U>Ta6Kb@D9!L^2pPLb{L!1`reGThbOIgM)HZ=1-7HC+Inn%4^ml6( z)Jra$Xt`~DM!_*-kR0}6>Fc>Y%hyq?cZ&e7G=V11R`iLu^FYADVNGaR*`x0dThIcn_jIb>wDpmqw>6P zBXiFv9rMsovzbqNbq)?1<%^`2aX3=I{3!wH(A zS2{m+B^eoA#x32-hB54cf6K#+roxcokg&IiK0AI)ludT5#YX!w&_!KN;D&>37@bJ6 z)$-J>7apS0Li?QbojdM$WMx}L;3<`_SorkU@&i0E-a&|E`8>>ASzU*gQMkd$jT%OY zLGDBR*(}f$+0eD=h|e|*HT{U9C#cBr$J33@x3)&j{&tNmadgT}!cD{y5};m!I9k$} zT!dki=;sDscGfl=tpv{E=))phyP~BN zRT=JW4<8q%8k!u!E(KRb{b}XXEiqS&IBg&RiiMLxk_&!hLj#>~3qII81#|cH1(Q6L zPDf*g*BkX+6+DwMYxCun@5k$&rM>y8BF1HRF-;@Ju5j>dT-=56FZHE^QIVG&EuL|T zpSa?9RHJHwvInGve`KYNc(ik^e^k}MfK8IHxg=VHUK`|o?aS#O9vmdbeudTE+zcmR}SLVC)1lrRmR|K5xf;-qh`l;c9&w!1HlE_@&8k zt(AHk&XSROoe*bKQoP`r+{#H=rlj>cKW8U)*47cMtR?3%1Tg?%tHE3TmL(Q_F8 zU}d3Nz<4gf+h}I*;)I@kL)#5~yN)PC_{1MLmFmqvo-(*?MNjgV$ff74$?;zf-CTD* zN?ZIX8Ri3|5+V>(V?##Unp#uvIG61ps89c|LF3dez1wV&p;R2p19r+hvYJn#px|( zjH-QV+?X7C* zf5M;$B)Kd&f2h)Iq%97wk@QSv%?%14UW!ZK`%E8+b~ej;*XdJ)9*vhan3kE}P(o%5 zoU04H5mt4BVQ91JIB$caA>fmYt^^yhV>b!mxGMAm2OvJFZ@G4x>-?D7Kq-5pL1C8x z^OW+nO1tT0Zk_8PO-@b*w^PKnDhmG{Tu%kjFfL6<6crY(f}UV8lsVLRn6Za*eB**} z%5i8L=#S9HUq_XJns24;iOqR!3KYte&vo&hdQp($T)F#;(koe?Z9c!cyohTMD;V~~ zbj&`3nRAw_DY)%m#x?+xcv+1L=v>C=mk_K5_xk-c;qW27X2 z_u(?Ddp38|K?RPjz09OiuEFqA3iQu0G~h1&uc+G^Ra)-NLy4wYX+h|^bllK0J@w*U z+diwQmV_5xr5BRmd^fby1k0A)dhZrYr)LOVz#f->`X9pAnYNKv-k|Annu?06b}LQY zhC%BG97wRMG*~%gJe=4#ig6l3w{HEMQ2vm({P6DR<1Obv|C?*>tOAV4s6Q5aY-bT4%nHQz;_#kqlxkm%~`_1d`UHmyn z>U4GGsLtmAwecFD6cbZR)0O{OTK^=`kSO+xP%2F0zpp`fA(xhymdATXi_-J3by4Gg zibCqNqltzyi~#HK7PK z6HpA|W;?00-}kAko0G8PWNijC)=%qb6sM|=j8bNi?tTO3Cq7RrwEJZDq$>Z@)P8jw?zlHMi)D=v)>HG&&G8@xN<()YWD zkMA-82T%z_v&ASg0Ap~H9~$=N4Fpj0Yk(%zua?ea`(F>{t6k|b!UkxB5e=ZZt1(Qn z9U==kgpYA<9*WYd?fW`1Jj`WRR$a+jH#51`!_T%~KwgzzMnlbdFKewR6IrP+fT?+! zq_D6FlGpxewTE)N?2@>TC(Y_Z1VVMQi%0w%7T(ii2s1fGIuZasTAxyaa0=_d9Fhq% zL6#`QKDKtk{-f<20d|jy#%GMmbXxxX`i*gVKxw*Y&FpPh2sGL$@GH!jo(hDFune zW5z=X7cYjHK2Br`SgBk=p8q--7kC((k1*GZa-Yr#Z>Nq|to`<(36kCJ6x~jm0cOdS zcBsv&>}t1}S;=@HE$7{7$5T1%w>QHn16Y?NimIpl3jhbB4 zN%0uhYLUyHPoKY?Vg$x^MQ~y0F_Y%YKu+Vwl$V#^&wHuZV&L1Qjdol8NBbOOJ+k@M9AN#K7A42IlHKsLgX#tL zq$N=*IoMO$-}|;481#U{XkkQMtbw^Jqr6mAb5_z*W+ltYj@vl?w^{C2m(Ipm3O9opP)&vq|*q4xYfkX=vxK0 z)D+L-&He(CuJGlD?m*QZzE=HN77(yP2eiNeg!S;1#y|HSN@pJhY>+gaLgw?xt9Ei@ zLsw^a713)kCPg=T2(Qma_6}7h->UA5`H(!W*pV46HTxvWeBbYV&rTYieIfaIC!}tg z2m+n3L60#i=*b9ctM_>txa;)+iWB2m7>)ozJxzUQn{_hyk#I(eMw(09w4KU>iUhm) zK)dPC@BzMs^7eMw2#4#Pw+4SdCW<7Y?&op!2$7iD9=8J}dop*ij!SDAx7?_I$IkP97J2b9k6V~=& zlijj2lS|sfwke;A6l@175LEVW^+9iAKG{(YsqCWd)Uk}IKj7N$pj1w<-jK_UhEEUB~+ky3NcWi3M@r;^Rk>baw@hSe4k}9XQ!$HMMhbRUZaH%)dVjeJy<1H@JkyIluB<0(KeJHCj z+FjLnJ@&D8q*@1(ciY=|g@eUwh2zdgTDa+Q)S?nRUgCGd0u1qGZlWq)KsOv#J)1xb$h z0NdI}r^zjmo~%^U<2Zp4Ycu*RkxbH?kJgZK!bQBO_6V>q5jJ91HB-D@ALq~%vpC}H zDyskaX%un{gY@l8FSM*J`lf!}hMLBUc*nn@R*O6iPF8*emXPY0z!-TJ;VswX*pNPkpB^3LP1ZT6=FG zCTiVQpG4lVIl;6ibB!5UO~|N;Pad4XkTr6UTx7z> zd)!|<-}{M&Zb?x4JG{}ZrwQg)3k)~(NNY$618p86^LHuy11E){)Wkr)7}voPi||4e zGMG=*?~s~w9$&x{UDO>d&O_Bt52Wkph%Uf74r7+Bhm6vPien^#@}z7vpj~ugMt1D$ zMV%>3EbCf{cd76!Etdh-q2f5Hp-kymsb%GWc)cfvt$xQ}vp%k5AwxnJR!DbgTl=hZY9H6+gp`)2cNs#1yllL154C3> z!+cv?-p@{-zx$!Md%-)-XS^`B-9Gy8?>zuOirMZ(RK_R0OR6od^iO{I2sB)2vw0J< z!c;I4fKlWINW-Q9;+;Mq)_?#~OnPv{{F|y*B}=18I*zXe_Pym2v(_f{eliI6$j6J8 zbLYrz-tBC_ws2IeraSMV3HL~1z4rS^b86T3D4We8xHO1mvy1+7!dYexW}39MQs+(` ze)17!`f^&P2UE|lzVIScU%dBiiX)g9K~4Pbp%{M~HuW*~ldcFg!uac+s+Y`Xgtc>x zua60;Q5}lQ8SmX2l5e%wTv%@#&s^W*v#H0Dj-#UD|97aWqAs_9WvK}j|6k<1lZK2P zJv@Hs_TVZH>!>0obJ$iFV@Z}S(@rck zx|~hR?``9ew{im_v6~W{caHwMvVXP~<_H1xhWy6H@NLi(_Oqp$W9gOr{yyxR8Z)zC zXh#?0VSKrO^Fq!2;GT23@!2z1u0W}u%CU2|;tfUmYTUk1I|iue+(VTLC7z^S`8#RE z=&TK<8{s|M7{nOm(IfKsWG&SuMj2&#F)C6t`WJQm*UtZ8X>$nO@5dMI4`kiOa%p5u z_4g!O5b6Oth{}859AXBX5_+nB#J%Axj?NJ`6eqH^{a9> zL%XgDabXx8P2T<5kNRSv7~LGU(r7vdHW=cZC58;5eu2svKd%BGicv;vtQO^SV~Jc4 z!)=(vn&86JmqgscaJ2@+i=gjC`ihw`ijvqlx3Nkjjgu}=t@s59OX|BYw_Yp=wChJP zK@H)eM)l{*1m*{chK6WDLb(@F1;4&XTx6~Cuoddc*%e4nGl&pg@QUd$W1igbdSw*H zp{*<}c5aY&K7eb_5)l&}7z3O4U#n5;2OTnR-V^&ggVqdSvYQ0nk+r3uqY5ecYF#Aw zY!|WwiFYsESQ8z$Fd#el^q@T@Fq2br9K7MVl9i@~c6zR&6N~jTBi(vMktJ~jjrSZM zh+29<$d0hrTs<-U{$?=59Mm)R$oU4FK4QezIMPb#i-AvQ$<@wD*>{tX2Mfvz2ZAC= zUyXA9|Ly-EnV!myO3UWhP@wNHc2PrpWUuq*SP0TERu;i2F%_zY*+nL;FXiAQVvJ_~ VXno#evIG2GSGf6~>_3bj{U5)Ckh=f? literal 0 HcmV?d00001 diff --git a/x-pack/plugins/observability/public/components/shared/page_template/page_template.test.tsx b/x-pack/plugins/observability/public/components/shared/page_template/page_template.test.tsx new file mode 100644 index 00000000000000..42d520786afcfa --- /dev/null +++ b/x-pack/plugins/observability/public/components/shared/page_template/page_template.test.tsx @@ -0,0 +1,112 @@ +/* + * Copyright 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 { I18nProvider } from '@kbn/i18n/react'; +import { render } from '@testing-library/react'; +import { shallow } from 'enzyme'; +import React from 'react'; +import { of } from 'rxjs'; +import { createNavigationRegistry } from '../../../services/navigation_registry'; +import { createLazyObservabilityPageTemplate } from './lazy_page_template'; +import { ObservabilityPageTemplate } from './page_template'; + +jest.mock('react-router-dom', () => ({ + ...jest.requireActual('react-router-dom'), + useLocation: () => ({ + pathname: '/test-path', + }), +})); + +const navigationRegistry = createNavigationRegistry(); + +navigationRegistry.registerSections( + of([ + { + label: 'Test A', + sortKey: 100, + entries: [ + { label: 'Section A Url A', app: 'TestA', path: '/url-a' }, + { label: 'Section A Url B', app: 'TestA', path: '/url-b' }, + ], + }, + { + label: 'Test B', + sortKey: 200, + entries: [ + { label: 'Section B Url A', app: 'TestB', path: '/url-a' }, + { label: 'Section B Url B', app: 'TestB', path: '/url-b' }, + ], + }, + ]) +); + +describe('Page template', () => { + it('Provides a working lazy wrapper', () => { + const LazyObservabilityPageTemplate = createLazyObservabilityPageTemplate({ + currentAppId$: of('Test app ID'), + getUrlForApp: () => '/test-url', + navigateToApp: async () => {}, + navigationSections$: navigationRegistry.sections$, + }); + + const component = shallow( + Test side item], + }} + > +
    Test structure
    +     + ); + + expect(component.exists('lazy')).toBe(true); + }); + + it('Utilises the KibanaPageTemplate for rendering', () => { + const component = shallow( + '/test-url'} + navigateToApp={async () => {}} + navigationSections$={navigationRegistry.sections$} + pageHeader={{ + pageTitle: 'Test title', + rightSideItems: [Test side item], + }} + > +
    Test structure
    +     + ); + + expect(component.is('KibanaPageTemplate')); + }); + + it('Handles outputting the registered navigation structures within a side nav', () => { + const { container } = render( + + '/test-url'} + navigateToApp={async () => {}} + navigationSections$={navigationRegistry.sections$} + pageHeader={{ + pageTitle: 'Test title', + rightSideItems: [Test side item], + }} + > +
    Test structure
    +     +     + ); + + expect(container).toHaveTextContent('Section A Url A'); + expect(container).toHaveTextContent('Section A Url B'); + expect(container).toHaveTextContent('Section B Url A'); + expect(container).toHaveTextContent('Section B Url B'); + }); +}); diff --git a/x-pack/plugins/observability/public/components/shared/page_template/page_template.tsx b/x-pack/plugins/observability/public/components/shared/page_template/page_template.tsx new file mode 100644 index 00000000000000..8025c6d658692f --- /dev/null +++ b/x-pack/plugins/observability/public/components/shared/page_template/page_template.tsx @@ -0,0 +1,125 @@ +/* + * Copyright 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 { EuiSideNavItemType, ExclusiveUnion } from '@elastic/eui'; +import { i18n } from '@kbn/i18n'; +import React, { useMemo } from 'react'; +import { matchPath, useLocation } from 'react-router-dom'; +import useObservable from 'react-use/lib/useObservable'; +import type { Observable } from 'rxjs'; +import type { ApplicationStart } from '../../../../../../../src/core/public'; +import { + KibanaPageTemplate, + KibanaPageTemplateProps, +} from '../../../../../../../src/plugins/kibana_react/public'; +import type { NavigationSection } from '../../../services/navigation_registry'; + +export type WrappedPageTemplateProps = Pick< + KibanaPageTemplateProps, + | 'children' + | 'data-test-subj' + | 'paddingSize' + | 'pageBodyProps' + | 'pageContentBodyProps' + | 'pageContentProps' + | 'pageHeader' + | 'restrictWidth' +> & + // recreate the exclusivity of bottomBar-related props + ExclusiveUnion< + { template?: 'default' } & Pick, + { template: KibanaPageTemplateProps['template'] } + >; + +export interface ObservabilityPageTemplateDependencies { + currentAppId$: Observable; + getUrlForApp: ApplicationStart['getUrlForApp']; + navigateToApp: ApplicationStart['navigateToApp']; + navigationSections$: Observable; +} + +export type ObservabilityPageTemplateProps = ObservabilityPageTemplateDependencies & + WrappedPageTemplateProps; + +export function ObservabilityPageTemplate({ + children, + currentAppId$, + getUrlForApp, + navigateToApp, + navigationSections$, + ...pageTemplateProps +}: ObservabilityPageTemplateProps): React.ReactElement | null { + const sections = useObservable(navigationSections$, []); + const currentAppId = useObservable(currentAppId$, undefined); + const { pathname: currentPath } = useLocation(); + + const sideNavItems = useMemo>>( + () => + sections.map(({ label, entries }, sectionIndex) => ({ + id: `${sectionIndex}`, + name: label, + items: entries.map((entry, entryIndex) => { + const href = getUrlForApp(entry.app, { + path: entry.path, + }); + + const isSelected = + entry.app === currentAppId && + matchPath(currentPath, { + path: entry.path, + }) != null; + + return { + id: `${sectionIndex}.${entryIndex}`, + name: entry.label, + href, + isSelected, + onClick: (event) => { + if ( + event.button !== 0 || + event.defaultPrevented || + event.metaKey || + event.altKey || + event.ctrlKey || + event.shiftKey + ) { + return; + } + + event.preventDefault(); + navigateToApp(entry.app, { + path: entry.path, + }); + }, + }; + }), + })), + [currentAppId, currentPath, getUrlForApp, navigateToApp, sections] + ); + + return ( + + {children} + + ); +} + +// for lazy import +// eslint-disable-next-line import/no-default-export +export default ObservabilityPageTemplate; + +const sideNavTitle = i18n.translate('xpack.observability.pageLayout.sideNavTitle', { + defaultMessage: 'Observability', +}); diff --git a/x-pack/plugins/observability/public/context/plugin_context.tsx b/x-pack/plugins/observability/public/context/plugin_context.tsx index 9b0bacc4c1174d..7c710d1d84c3d8 100644 --- a/x-pack/plugins/observability/public/context/plugin_context.tsx +++ b/x-pack/plugins/observability/public/context/plugin_context.tsx @@ -5,11 +5,12 @@ * 2.0. */ -import { createContext } from 'react'; import { AppMountParameters, CoreStart } from 'kibana/public'; +import { createContext } from 'react'; import { ObservabilityPublicPluginsStart } from '../plugin'; import { ConfigSchema } from '..'; import { ObservabilityRuleTypeRegistry } from '../rules/create_observability_rule_type_registry'; +import type { LazyObservabilityPageTemplateProps } from '../components/shared/page_template/lazy_page_template'; export interface PluginContextValue { appMountParameters: AppMountParameters; @@ -17,6 +18,7 @@ export interface PluginContextValue { core: CoreStart; plugins: ObservabilityPublicPluginsStart; observabilityRuleTypeRegistry: ObservabilityRuleTypeRegistry; + ObservabilityPageTemplate: React.ComponentType; } export const PluginContext = createContext({} as PluginContextValue); diff --git a/x-pack/plugins/observability/public/hooks/use_time_range.test.ts b/x-pack/plugins/observability/public/hooks/use_time_range.test.ts index 3b0bdb8dc96033..7a241401722cf5 100644 --- a/x-pack/plugins/observability/public/hooks/use_time_range.test.ts +++ b/x-pack/plugins/observability/public/hooks/use_time_range.test.ts @@ -40,6 +40,7 @@ describe('useTimeRange', () => { }, } as unknown) as ObservabilityPublicPluginsStart, observabilityRuleTypeRegistry: createObservabilityRuleTypeRegistryMock(), + ObservabilityPageTemplate: () => null, })); jest.spyOn(kibanaUISettings, 'useKibanaUISettings').mockImplementation(() => ({ from: '2020-10-08T05:00:00.000Z', @@ -82,6 +83,7 @@ describe('useTimeRange', () => { }, } as unknown) as ObservabilityPublicPluginsStart, observabilityRuleTypeRegistry: createObservabilityRuleTypeRegistryMock(), + ObservabilityPageTemplate: () => null, })); }); it('returns ranges and absolute times from kibana default settings', () => { diff --git a/x-pack/plugins/observability/public/pages/alerts/index.tsx b/x-pack/plugins/observability/public/pages/alerts/index.tsx index 7b8055c82f0717..b76e9f82d8dfe7 100644 --- a/x-pack/plugins/observability/public/pages/alerts/index.tsx +++ b/x-pack/plugins/observability/public/pages/alerts/index.tsx @@ -5,15 +5,7 @@ * 2.0. */ -import { - EuiButton, - EuiCallOut, - EuiFlexGroup, - EuiFlexItem, - EuiLink, - EuiPageTemplate, - EuiSpacer, -} from '@elastic/eui'; +import { EuiButton, EuiCallOut, EuiFlexGroup, EuiFlexItem, EuiLink, EuiSpacer } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { ALERT_START, @@ -56,7 +48,7 @@ interface AlertsPageProps { } export function AlertsPage({ routeParams }: AlertsPageProps) { - const { core, observabilityRuleTypeRegistry } = usePluginContext(); + const { core, observabilityRuleTypeRegistry, ObservabilityPageTemplate } = usePluginContext(); const { prepend } = core.http.basePath; const history = useHistory(); const { @@ -131,7 +123,7 @@ export function AlertsPage({ routeParams }: AlertsPageProps) { } return ( - @@ -139,7 +131,6 @@ export function AlertsPage({ routeParams }: AlertsPageProps) { ), - rightSideItems: [ {i18n.translate('xpack.observability.alerts.manageDetectionRulesButtonLabel', { @@ -206,6 +197,6 @@ export function AlertsPage({ routeParams }: AlertsPageProps) { - +     ); } diff --git a/x-pack/plugins/observability/public/pages/cases/index.tsx b/x-pack/plugins/observability/public/pages/cases/index.tsx index dd7f7875b568e4..7f6bce7d486f3a 100644 --- a/x-pack/plugins/observability/public/pages/cases/index.tsx +++ b/x-pack/plugins/observability/public/pages/cases/index.tsx @@ -5,19 +5,21 @@ * 2.0. */ -import { EuiCallOut, EuiFlexGroup, EuiFlexItem, EuiPageTemplate } from '@elastic/eui'; +import { EuiCallOut, EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import React from 'react'; import { ExperimentalBadge } from '../../components/shared/experimental_badge'; import { RouteParams } from '../../routes'; +import { usePluginContext } from '../../hooks/use_plugin_context'; interface CasesProps { routeParams: RouteParams<'/cases'>; } export function CasesPage(props: CasesProps) { + const { ObservabilityPageTemplate } = usePluginContext(); return ( - @@ -44,6 +46,6 @@ export function CasesPage(props: CasesProps) { - + ); } diff --git a/x-pack/plugins/observability/public/pages/landing/index.tsx b/x-pack/plugins/observability/public/pages/landing/index.tsx index 73693e14d6ac1e..46c99bffbcc698 100644 --- a/x-pack/plugins/observability/public/pages/landing/index.tsx +++ b/x-pack/plugins/observability/public/pages/landing/index.tsx @@ -20,7 +20,7 @@ import { i18n } from '@kbn/i18n'; import React, { useContext } from 'react'; import styled, { ThemeContext } from 'styled-components'; import { FleetPanel } from '../../components/app/fleet_panel'; -import { WithHeaderLayout } from '../../components/app/layout/with_header'; +import { ObservabilityHeaderMenu } from '../../components/app/header'; import { usePluginContext } from '../../hooks/use_plugin_context'; import { useTrackPageview } from '../../hooks/use_track_metric'; import { appsSection } from '../home/section'; @@ -34,15 +34,12 @@ export function LandingPage() { useTrackPageview({ app: 'observability-overview', path: 'landing' }); useTrackPageview({ app: 'observability-overview', path: 'landing', delay: 15000 }); - const { core } = usePluginContext(); + const { core, ObservabilityPageTemplate } = usePluginContext(); const theme = useContext(ThemeContext); return ( - + + {/* title and description */} @@ -128,6 +125,6 @@ export function LandingPage() { - + ); } diff --git a/x-pack/plugins/observability/public/pages/overview/index.tsx b/x-pack/plugins/observability/public/pages/overview/index.tsx index 7aa473d0ebee96..4cb6792d501952 100644 --- a/x-pack/plugins/observability/public/pages/overview/index.tsx +++ b/x-pack/plugins/observability/public/pages/overview/index.tsx @@ -6,12 +6,12 @@ */ import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; -import React, { useContext } from 'react'; -import { ThemeContext } from 'styled-components'; +import { i18n } from '@kbn/i18n'; +import React from 'react'; import { useTrackPageview } from '../..'; import { Alert } from '../../../../alerting/common'; import { EmptySections } from '../../components/app/empty_sections'; -import { WithHeaderLayout } from '../../components/app/layout/with_header'; +import { ObservabilityHeaderMenu } from '../../components/app/header'; import { NewsFeed } from '../../components/app/news_feed'; import { Resources } from '../../components/app/resources'; import { AlertsSection } from '../../components/app/section/alerts'; @@ -39,8 +39,7 @@ 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 }); - const { core } = usePluginContext(); - const theme = useContext(ThemeContext); + const { core, ObservabilityPageTemplate } = usePluginContext(); const { relativeStart, relativeEnd, absoluteStart, absoluteEnd } = useTimeRange(); @@ -65,18 +64,20 @@ export function OverviewPage({ routeParams }: Props) { }); return ( - - } + , + ], + }} > + {/* Data sections */} @@ -107,6 +108,10 @@ export function OverviewPage({ routeParams }: Props) { - + ); } + +const overviewPageTitle = i18n.translate('xpack.observability.overview.pageTitle', { + defaultMessage: 'Overview', +}); diff --git a/x-pack/plugins/observability/public/pages/overview/loading_observability.tsx b/x-pack/plugins/observability/public/pages/overview/loading_observability.tsx index 36c9589e7e169f..e2d691c647acc7 100644 --- a/x-pack/plugins/observability/public/pages/overview/loading_observability.tsx +++ b/x-pack/plugins/observability/public/pages/overview/loading_observability.tsx @@ -5,49 +5,33 @@ * 2.0. */ -import React, { useContext } from 'react'; -import styled, { ThemeContext } from 'styled-components'; -import { EuiFlexItem } from '@elastic/eui'; -import { EuiPanel } from '@elastic/eui'; -import { EuiFlexGroup } from '@elastic/eui'; -import { EuiLoadingSpinner } from '@elastic/eui'; -import { EuiText } from '@elastic/eui'; +import { EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner, EuiText } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; -import { WithHeaderLayout } from '../../components/app/layout/with_header'; - -const CentralizedFlexGroup = styled(EuiFlexGroup)` - justify-content: center; - align-items: center; - // place the element in the center of the page - min-height: calc(100vh - ${(props) => props.theme.eui.euiHeaderChildSize}); -`; +import React from 'react'; +import { ObservabilityHeaderMenu } from '../../components/app/header'; +import { usePluginContext } from '../../hooks/use_plugin_context'; export function LoadingObservability() { - const theme = useContext(ThemeContext); + const { ObservabilityPageTemplate } = usePluginContext(); return ( - - + + + - - - - - - - - {i18n.translate('xpack.observability.overview.loadingObservability', { - defaultMessage: 'Loading Observability', - })} - - - - + + + + {observabilityLoadingMessage} - - + + ); } + +const observabilityLoadingMessage = i18n.translate( + 'xpack.observability.overview.loadingObservability', + { + defaultMessage: 'Loading Observability', + } +); diff --git a/x-pack/plugins/observability/public/pages/overview/overview.stories.tsx b/x-pack/plugins/observability/public/pages/overview/overview.stories.tsx index 12f8900034eb26..2482ae7a8e7abc 100644 --- a/x-pack/plugins/observability/public/pages/overview/overview.stories.tsx +++ b/x-pack/plugins/observability/public/pages/overview/overview.stories.tsx @@ -24,6 +24,7 @@ import { emptyResponse as emptyMetricsResponse, fetchMetricsData } from './mock/ import { newsFeedFetchData } from './mock/news_feed.mock'; import { emptyResponse as emptyUptimeResponse, fetchUptimeData } from './mock/uptime.mock'; import { createObservabilityRuleTypeRegistryMock } from '../../rules/observability_rule_type_registry_mock'; +import { KibanaPageTemplate } from '../../../../../../src/plugins/kibana_react/public'; function unregisterAll() { unregisterDataHandler({ appName: 'apm' }); @@ -55,6 +56,7 @@ const withCore = makeDecorator({ }, } as unknown) as ObservabilityPublicPluginsStart, observabilityRuleTypeRegistry: createObservabilityRuleTypeRegistryMock(), + ObservabilityPageTemplate: KibanaPageTemplate, }} > diff --git a/x-pack/plugins/observability/public/plugin.ts b/x-pack/plugins/observability/public/plugin.ts index 16363d4181c5be..c1b18e37faee8a 100644 --- a/x-pack/plugins/observability/public/plugin.ts +++ b/x-pack/plugins/observability/public/plugin.ts @@ -6,7 +6,7 @@ */ import { i18n } from '@kbn/i18n'; -import { BehaviorSubject } from 'rxjs'; +import { BehaviorSubject, of } from 'rxjs'; import { TriggersAndActionsUIPublicPluginSetup, TriggersAndActionsUIPublicPluginStart, @@ -31,9 +31,11 @@ import type { import type { LensPublicStart } from '../../lens/public'; import { registerDataHandler } from './data_handler'; import { createCallObservabilityApi } from './services/call_observability_api'; +import { createNavigationRegistry } from './services/navigation_registry'; import { toggleOverviewLinkInNav } from './toggle_overview_link_in_nav'; import { ConfigSchema } from '.'; import { createObservabilityRuleTypeRegistry } from './rules/create_observability_rule_type_registry'; +import { createLazyObservabilityPageTemplate } from './components/shared'; export type ObservabilityPublicSetup = ReturnType; @@ -50,7 +52,7 @@ export interface ObservabilityPublicPluginsStart { lens: LensPublicStart; } -export type ObservabilityPublicStart = void; +export type ObservabilityPublicStart = ReturnType; export class Plugin implements @@ -61,13 +63,14 @@ export class Plugin ObservabilityPublicPluginsStart > { private readonly appUpdater$ = new BehaviorSubject(() => ({})); + private readonly navigationRegistry = createNavigationRegistry(); constructor(private readonly initializerContext: PluginInitializerContext) { this.initializerContext = initializerContext; } public setup( - coreSetup: CoreSetup, + coreSetup: CoreSetup, pluginsSetup: ObservabilityPublicPluginsSetup ) { const category = DEFAULT_APP_CATEGORIES.observability; @@ -84,7 +87,7 @@ export class Plugin // Load application bundle const { renderApp } = await import('./application'); // Get start services - const [coreStart, pluginsStart] = await coreSetup.getStartServices(); + const [coreStart, pluginsStart, { navigation }] = await coreSetup.getStartServices(); return renderApp({ config, @@ -92,6 +95,7 @@ export class Plugin plugins: pluginsStart, appMountParameters: params, observabilityRuleTypeRegistry, + ObservabilityPageTemplate: navigation.PageTemplate, }); }; @@ -164,13 +168,39 @@ export class Plugin }); } + this.navigationRegistry.registerSections( + of([ + { + label: '', + sortKey: 100, + entries: [{ label: 'Overview', app: 'observability-overview', path: '/overview' }], + }, + ]) + ); + return { dashboard: { register: registerDataHandler }, observabilityRuleTypeRegistry, isAlertingExperienceEnabled: () => config.unsafe.alertingExperience.enabled, + navigation: { + registerSections: this.navigationRegistry.registerSections, + }, }; } public start({ application }: CoreStart) { toggleOverviewLinkInNav(this.appUpdater$, application); + + const PageTemplate = createLazyObservabilityPageTemplate({ + currentAppId$: application.currentAppId$, + getUrlForApp: application.getUrlForApp, + navigateToApp: application.navigateToApp, + navigationSections$: this.navigationRegistry.sections$, + }); + + return { + navigation: { + PageTemplate, + }, + }; } } diff --git a/x-pack/plugins/observability/public/services/navigation_registry.test.ts b/x-pack/plugins/observability/public/services/navigation_registry.test.ts new file mode 100644 index 00000000000000..8e46ed8aacabe7 --- /dev/null +++ b/x-pack/plugins/observability/public/services/navigation_registry.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; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { firstValueFrom } from '@kbn/std'; +import { of } from 'rxjs'; +import { createNavigationRegistry } from './navigation_registry'; + +describe('Navigation registry', () => { + it('Allows the registration of, and access to, navigation sections', async () => { + const navigationRegistry = createNavigationRegistry(); + + navigationRegistry.registerSections( + of([ + { + label: 'Test A', + sortKey: 100, + entries: [ + { label: 'Url A', app: 'TestA', path: '/url-a' }, + { label: 'Url B', app: 'TestA', path: '/url-b' }, + ], + }, + { + label: 'Test B', + sortKey: 200, + entries: [ + { label: 'Url A', app: 'TestB', path: '/url-a' }, + { label: 'Url B', app: 'TestB', path: '/url-b' }, + ], + }, + ]) + ); + + const sections = await firstValueFrom(navigationRegistry.sections$); + + expect(sections).toEqual([ + { + label: 'Test A', + sortKey: 100, + entries: [ + { + label: 'Url A', + app: 'TestA', + path: '/url-a', + }, + { + label: 'Url B', + app: 'TestA', + path: '/url-b', + }, + ], + }, + { + label: 'Test B', + sortKey: 200, + entries: [ + { + label: 'Url A', + app: 'TestB', + path: '/url-a', + }, + { + label: 'Url B', + app: 'TestB', + path: '/url-b', + }, + ], + }, + ]); + }); +}); diff --git a/x-pack/plugins/observability/public/services/navigation_registry.ts b/x-pack/plugins/observability/public/services/navigation_registry.ts new file mode 100644 index 00000000000000..f42f34fcfe9bb3 --- /dev/null +++ b/x-pack/plugins/observability/public/services/navigation_registry.ts @@ -0,0 +1,51 @@ +/* + * Copyright 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 { combineLatest, Observable, ReplaySubject } from 'rxjs'; +import { map, scan, shareReplay, switchMap } from 'rxjs/operators'; + +export interface NavigationSection { + label: string | undefined; + sortKey: number; + entries: NavigationEntry[]; +} + +export interface NavigationEntry { + label: string; + app: string; + path: string; +} + +export interface NavigationRegistry { + registerSections: (sections$: Observable) => void; + sections$: Observable; +} + +export const createNavigationRegistry = (): NavigationRegistry => { + const registeredSections$ = new ReplaySubject>(); + + const registerSections = (sections$: Observable) => { + registeredSections$.next(sections$); + }; + + const sections$: Observable = registeredSections$.pipe( + scan( + (accumulatedSections$, newSections) => accumulatedSections$.add(newSections), + new Set>() + ), + switchMap((registeredSections) => combineLatest([...registeredSections])), + map((registeredSections) => + registeredSections.flat().sort((first, second) => first.sortKey - second.sortKey) + ), + shareReplay(1) + ); + + return { + registerSections, + sections$, + }; +}; diff --git a/x-pack/plugins/observability/public/utils/test_helper.tsx b/x-pack/plugins/observability/public/utils/test_helper.tsx index 2434f0eec10edc..feacb011e0701c 100644 --- a/x-pack/plugins/observability/public/utils/test_helper.tsx +++ b/x-pack/plugins/observability/public/utils/test_helper.tsx @@ -10,7 +10,10 @@ import { AppMountParameters, CoreStart } from 'kibana/public'; import React from 'react'; import { IntlProvider } from 'react-intl'; import { of } from 'rxjs'; -import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public'; +import { + KibanaContextProvider, + KibanaPageTemplate, +} from '../../../../../src/plugins/kibana_react/public'; import translations from '../../../translations/translations/ja-JP.json'; import { PluginContext } from '../context/plugin_context'; import { ObservabilityPublicPluginsStart } from '../plugin'; @@ -44,7 +47,14 @@ export const render = (component: React.ReactNode) => { {component} diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index 845f4b2fb8643d..f694b2b39c605f 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -17657,7 +17657,6 @@ "xpack.observability.home.getStatedButton": "使ってみる", "xpack.observability.home.sectionsubtitle": "ログ、メトリック、トレースを大規模に、1つのスタックにまとめて、環境内のあらゆる場所で生じるイベントの監視、分析、対応を行います。", "xpack.observability.home.sectionTitle": "エコシステム全体の一元的な可視性", - "xpack.observability.home.title": "オブザーバビリティ", "xpack.observability.landing.breadcrumb": "はじめて使う", "xpack.observability.news.readFullStory": "詳細なストーリーを読む", "xpack.observability.news.title": "新機能", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index d223ba08185b4b..36985a729ec2f1 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -17894,7 +17894,6 @@ "xpack.observability.home.getStatedButton": "开始使用", "xpack.observability.home.sectionsubtitle": "通过根据需要将日志、指标和跟踪都置于单个堆栈上，来监测、分析和响应环境中任何位置发生的事件。", "xpack.observability.home.sectionTitle": "整个生态系统的统一可见性", - "xpack.observability.home.title": "可观测性", "xpack.observability.landing.breadcrumb": "入门", "xpack.observability.news.readFullStory": "详细了解", "xpack.observability.news.title": "最新动态", From 413132008bf52682d5998c6d7f11fe75ae2714e1 Mon Sep 17 00:00:00 2001 From: Shahzad Date: Thu, 27 May 2021 17:01:52 +0200 Subject: [PATCH 10/14] [Uptime] Waterfall use different styling for number (#97216) Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../waterfall_chart_wrapper.test.tsx | 18 +++-- .../waterfall/waterfall_chart_wrapper.tsx | 5 +- .../waterfall/waterfall_flyout.tsx | 10 ++- ...st.tsx => waterfall_sidebar_item.test.tsx} | 23 ++++-- .../waterfall/waterfall_sidebar_item.tsx | 9 ++- .../components/middle_truncated_text.test.tsx | 34 ++++++-- .../components/middle_truncated_text.tsx | 77 ++++++++++++++++--- .../synthetics/waterfall/components/styles.ts | 4 +- 8 files changed, 141 insertions(+), 39 deletions(-) rename x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/{waterfalll_sidebar_item.test.tsx => waterfall_sidebar_item.test.tsx} (73%) diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_chart_wrapper.test.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_chart_wrapper.test.tsx index 3a0a30980ab52b..da7ccd3679f57c 100644 --- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_chart_wrapper.test.tsx +++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_chart_wrapper.test.tsx @@ -131,17 +131,18 @@ describe('WaterfallChartWrapper', () => { }); it('opens flyout on sidebar click and closes on flyout close button', async () => { - const { getByText, getAllByText, getByTestId, queryByText, getByRole } = render( + const { getByText, getByTestId, queryByText, getByRole } = render( ); - expect(getByText(`1. ${mockNetworkItems[0].url}`)).toBeInTheDocument(); + expect(getByText(`${mockNetworkItems[0].url}`)).toBeInTheDocument(); + expect(getByText(`1.`)).toBeInTheDocument(); expect(queryByText('Content type')).not.toBeInTheDocument(); expect(queryByText(`${mockNetworkItems[0]?.mimeType}`)).not.toBeInTheDocument(); // open flyout - // selecter matches both button and accessible text. Button is the second element in the array; - const sidebarButton = getAllByText(/1./)[1]; + // selector matches both button and accessible text. Button is the second element in the array; + const sidebarButton = getByTestId(`middleTruncatedTextButton1`); fireEvent.click(sidebarButton); // check for sample flyout items @@ -163,17 +164,18 @@ describe('WaterfallChartWrapper', () => { }); it('opens flyout on sidebar click and closes on second sidebar click', async () => { - const { getByText, getAllByText, getByTestId, queryByText } = render( + const { getByText, getByTestId, queryByText } = render( ); - expect(getByText(`1. ${mockNetworkItems[0].url}`)).toBeInTheDocument(); + expect(getByText(`${mockNetworkItems[0].url}`)).toBeInTheDocument(); + expect(getByText(`1.`)).toBeInTheDocument(); expect(queryByText('Content type')).not.toBeInTheDocument(); expect(queryByText(`${mockNetworkItems[0]?.mimeType}`)).not.toBeInTheDocument(); // open flyout - // selecter matches both button and accessible text. Button is the second element in the array; - const sidebarButton = getAllByText(/1./)[1]; + // selector matches both button and accessible text. Button is the second element in the array; + const sidebarButton = getByTestId(`middleTruncatedTextButton1`); fireEvent.click(sidebarButton); // check for sample flyout items and that the flyout is focused diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_chart_wrapper.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_chart_wrapper.tsx index e4c08236e49de4..0cb44bce26848b 100644 --- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_chart_wrapper.tsx +++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_chart_wrapper.tsx @@ -81,6 +81,8 @@ export const WaterfallChartWrapper: React.FC = ({ data, total }) => { ); }, [flyoutData, isFlyoutVisible, onFlyoutClose]); + const highestSideBarIndex = Math.max(...series.map((sr) => sr.x)); + const renderSidebarItem: RenderItem = useCallback( (item) => { return ( @@ -88,10 +90,11 @@ export const WaterfallChartWrapper: React.FC = ({ data, total }) => { item={item} renderFilterScreenReaderText={hasFilters && !onlyHighlighted} onClick={onSidebarClick} + highestIndex={highestSideBarIndex} /> ); }, - [hasFilters, onlyHighlighted, onSidebarClick] + [hasFilters, onlyHighlighted, onSidebarClick, highestSideBarIndex] ); useTrackMetric({ app: 'uptime', metric: 'waterfall_chart_view', metricType: METRIC_TYPE.COUNT }); diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_flyout.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_flyout.tsx index 4f92c882340b94..53e6583e00cc29 100644 --- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_flyout.tsx +++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_flyout.tsx @@ -77,7 +77,7 @@ export const WaterfallFlyout = ({ return null; } - const { url, details, certificates, requestHeaders, responseHeaders } = flyoutData; + const { x, url, details, certificates, requestHeaders, responseHeaders } = flyoutData; trackMetric({ metric: 'waterfall_flyout', metricType: METRIC_TYPE.CLICK }); @@ -93,7 +93,13 @@ export const WaterfallFlyout = ({

    - +

    diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfalll_sidebar_item.test.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_sidebar_item.test.tsx similarity index 73% rename from x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfalll_sidebar_item.test.tsx rename to x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_sidebar_item.test.tsx index 7f32cac92bd9fc..2d08bbbadfbe4e 100644 --- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfalll_sidebar_item.test.tsx +++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_sidebar_item.test.tsx @@ -13,9 +13,10 @@ import { SidebarItem } from '../waterfall/types'; import { render } from '../../../../../lib/helper/rtl_helpers'; import { WaterfallSidebarItem } from './waterfall_sidebar_item'; import { SIDEBAR_FILTER_MATCHES_SCREENREADER_LABEL } from '../../waterfall/components/translations'; +import { getChunks } from '../../waterfall/components/middle_truncated_text'; describe('waterfall filter', () => { - const url = 'http://www.elastic.co'; + const url = 'http://www.elastic.co/observability/uptime'; const index = 0; const offsetIndex = index + 1; const item: SidebarItem = { @@ -25,26 +26,34 @@ describe('waterfall filter', () => { offsetIndex, }; - it('renders sidbar item', () => { - const { getByText } = render(); + it('renders sidebar item', () => { + const { getByText } = render(); - expect(getByText(`${offsetIndex}. ${url}`)); + const chunks = getChunks(url.replace('http://www.', '')); + + expect(getByText(`${offsetIndex}. ${chunks.first}`)); + expect(getByText(`${chunks.last}`)); }); it('render screen reader text when renderFilterScreenReaderText is true', () => { const { getByLabelText } = render( - + ); expect( - getByLabelText(`${SIDEBAR_FILTER_MATCHES_SCREENREADER_LABEL} ${offsetIndex}. ${url}`) + getByLabelText(`${SIDEBAR_FILTER_MATCHES_SCREENREADER_LABEL} ${url}`) ).toBeInTheDocument(); }); it('does not render screen reader text when renderFilterScreenReaderText is false', () => { const onClick = jest.fn(); const { getByRole } = render( - + ); const button = getByRole('button'); fireEvent.click(button); diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_sidebar_item.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_sidebar_item.tsx index be624352cd1e40..1aea9d9e69db74 100644 --- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_sidebar_item.tsx +++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_sidebar_item.tsx @@ -17,10 +17,12 @@ interface SidebarItemProps { item: SidebarItem; renderFilterScreenReaderText?: boolean; onClick?: OnSidebarClick; + highestIndex: number; } export const WaterfallSidebarItem = ({ item, + highestIndex, renderFilterScreenReaderText, onClick, }: SidebarItemProps) => { @@ -42,7 +44,8 @@ export const WaterfallSidebarItem = ({ return is400 || is500 || isSpecific300; }; - const text = `${offsetIndex}. ${item.url}`; + const text = item.url; + const ariaLabel = `${ isHighlighted && renderFilterScreenReaderText ? `${SIDEBAR_FILTER_MATCHES_SCREENREADER_LABEL} ` @@ -58,11 +61,13 @@ export const WaterfallSidebarItem = ({ @@ -70,11 +75,13 @@ export const WaterfallSidebarItem = ({ diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/middle_truncated_text.test.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/middle_truncated_text.test.tsx index de352186e26fda..5006ad927f313c 100644 --- a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/middle_truncated_text.test.tsx +++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/middle_truncated_text.test.tsx @@ -5,9 +5,10 @@ * 2.0. */ -import { getChunks, MiddleTruncatedText } from './middle_truncated_text'; -import { render, within, fireEvent, waitFor } from '@testing-library/react'; import React from 'react'; +import { within, fireEvent, waitFor } from '@testing-library/react'; +import { getChunks, MiddleTruncatedText } from './middle_truncated_text'; +import { render } from '../../../../../lib/helper/rtl_helpers'; const longString = 'this-is-a-really-really-really-really-really-really-really-really-long-string.madeup.extension'; @@ -28,7 +29,14 @@ describe('Component', () => { const url = 'http://www.elastic.co'; it('renders truncated text and aria label', () => { const { getByText, getByLabelText } = render( - + ); expect(getByText(first)).toBeInTheDocument(); @@ -39,7 +47,13 @@ describe('Component', () => { it('renders screen reader only text', () => { const { getByTestId } = render( - + ); const { getByText } = within(getByTestId('middleTruncatedTextSROnly')); @@ -49,7 +63,13 @@ describe('Component', () => { it('renders external link', () => { const { getByText } = render( - + ); const link = getByText('Open resource in new tab').closest('a'); @@ -61,13 +81,15 @@ describe('Component', () => { const handleClick = jest.fn(); const { getByTestId } = render( ); - const button = getByTestId('middleTruncatedTextButton'); + const button = getByTestId('middleTruncatedTextButton1'); fireEvent.click(button); await waitFor(() => { diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/middle_truncated_text.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/middle_truncated_text.tsx index 6a9d6660c901c7..cb7159485856c4 100644 --- a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/middle_truncated_text.tsx +++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/middle_truncated_text.tsx @@ -6,12 +6,22 @@ */ import React, { useMemo } from 'react'; -import styled from 'styled-components'; import { FormattedMessage } from '@kbn/i18n/react'; -import { EuiScreenReaderOnly, EuiToolTip, EuiButtonEmpty, EuiLink } from '@elastic/eui'; +import { + EuiScreenReaderOnly, + EuiToolTip, + EuiButtonEmpty, + EuiLink, + EuiText, + EuiIcon, +} from '@elastic/eui'; +import { i18n } from '@kbn/i18n'; import { FIXED_AXIS_HEIGHT } from './constants'; +import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common'; interface Props { + index: number; + highestIndex: number; ariaLabel: string; text: string; onClick?: (event: React.MouseEvent) => void; @@ -19,7 +29,7 @@ interface Props { url: string; } -const OuterContainer = styled.span` +const OuterContainer = euiStyled.span` position: relative; display: inline-flex; align-items: center; @@ -28,13 +38,21 @@ const OuterContainer = styled.span` } `; // NOTE: min-width: 0 ensures flexbox and no-wrap children can co-exist -const InnerContainer = styled.span` +const InnerContainer = euiStyled.span` overflow: hidden; display: flex; align-items: center; `; -const FirstChunk = styled.span` +const IndexNumber = euiStyled(EuiText)` + font-family: ${(props) => props.theme.eui.euiCodeFontFamily}; + margin-right: ${(props) => props.theme.eui.euiSizeXS}; + line-height: ${FIXED_AXIS_HEIGHT}px; + text-align: right; + background-color: ${(props) => props.theme.eui.euiColorLightestShade}; +`; + +const FirstChunk = euiStyled.span` text-overflow: ellipsis; white-space: nowrap; overflow: hidden; @@ -42,13 +60,13 @@ const FirstChunk = styled.span` text-align: left; `; // safari doesn't auto align text left in some cases -const LastChunk = styled.span` +const LastChunk = euiStyled.span` flex-shrink: 0; line-height: ${FIXED_AXIS_HEIGHT}px; text-align: left; `; // safari doesn't auto align text left in some cases -const StyledButton = styled(EuiButtonEmpty)` +const StyledButton = euiStyled(EuiButtonEmpty)` &&& { border: none; @@ -59,6 +77,10 @@ const StyledButton = styled(EuiButtonEmpty)` } `; +const SecureIcon = euiStyled(EuiIcon)` + margin-right: ${(props) => props.theme.eui.euiSizeXS}; +`; + export const getChunks = (text: string = '') => { const END_CHARS = 12; const chars = text.split(''); @@ -70,7 +92,18 @@ export const getChunks = (text: string = '') => { // Helper component for adding middle text truncation, e.g. // really-really-really-long....ompressed.js // Can be used to accomodate content in sidebar item rendering. -export const MiddleTruncatedText = ({ ariaLabel, text, onClick, setButtonRef, url }: Props) => { +export const MiddleTruncatedText = ({ + index, + ariaLabel, + text: fullText, + onClick, + setButtonRef, + url, + highestIndex, +}: Props) => { + const secureHttps = fullText.startsWith('https://'); + const text = fullText.replace(/https:\/\/www.|http:\/\/www.|http:\/\/|https:\/\//, ''); + const chunks = useMemo(() => { return getChunks(text); }, [text]); @@ -78,24 +111,44 @@ export const MiddleTruncatedText = ({ ariaLabel, text, onClick, setButtonRef, ur return ( - {text} + {fullText} - + <> {onClick ? ( + + {index + '.'} + + {secureHttps && ( + + )} {chunks.first} {chunks.last} ) : ( - {chunks.first} + + {index}. {chunks.first} + {chunks.last} )} diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/styles.ts b/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/styles.ts index e8125ebcf30cb4..9a884c6824284b 100644 --- a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/styles.ts +++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/styles.ts @@ -90,6 +90,7 @@ export const WaterfallChartSidebarWrapper = euiStyled(EuiFlexItem)` export const WaterfallChartSidebarContainer = euiStyled.div` height: ${(props) => `${props.height}px`}; overflow-y: hidden; + overflow-x: hidden; `; export const WaterfallChartSidebarContainerInnerPanel: StyledComponent< @@ -107,8 +108,7 @@ export const WaterfallChartSidebarContainerFlexGroup = euiStyled(EuiFlexGroup)` // Ensures flex items honour no-wrap of children, rather than trying to extend to the full width of children. export const WaterfallChartSidebarFlexItem = euiStyled(EuiFlexItem)` min-width: 0; - padding-left: ${(props) => props.theme.eui.paddingSizes.m}; - padding-right: ${(props) => props.theme.eui.paddingSizes.m}; + padding-right: ${(props) => props.theme.eui.paddingSizes.s}; justify-content: space-around; `; From c298efe6103d0c1ab015c86bea5a37480401801f Mon Sep 17 00:00:00 2001 From: Thomas Neirynck Date: Thu, 27 May 2021 11:25:28 -0400 Subject: [PATCH 11/14] [Maps] Add package to codeowners (#100786) --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index df7dc1040907cc..9c9200ce33e7ae 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -147,6 +147,7 @@ #CC# /x-pack/plugins/file_upload @elastic/kibana-gis /src/plugins/tile_map/ @elastic/kibana-gis /src/plugins/region_map/ @elastic/kibana-gis +/packages/kbn-mapbox-gl @elastic/kibana-gis # Operations /src/dev/ @elastic/kibana-operations From 7fd6539dcaa0aa4119abd2ee4f0462fd57de16d4 Mon Sep 17 00:00:00 2001 From: Georgii Gorbachev Date: Thu, 27 May 2021 18:28:19 +0300 Subject: [PATCH 12/14] [RAC] Rule monitoring: Event Log for Rule Registry (#98353) **Needed for:** rule execution log for Security https://github.com/elastic/kibana/pull/94143 **Related to:** - alerts-as-data: https://github.com/elastic/kibana/issues/93728, https://github.com/elastic/kibana/issues/93729, https://github.com/elastic/kibana/issues/93730 - RFC for index naming https://github.com/elastic/kibana/issues/98912 ## Summary This PR adds a mechanism for writing to / reading from / bootstrapping indices for RAC project into the `rule_registry` plugin. Particularly, indices for alerts-as-data and rule execution events. This implementation is similar to existing implementations like `event_log` plugin (see https://github.com/elastic/kibana/pull/98353#issuecomment-833045980 for historical perspective), but we're going to converge all of them into 1 or 2 implementations. At least we should have a single one in `rule_registry` itself. In this PR I tried to incorporate most of the feedback received in the RFC (https://github.com/elastic/kibana/issues/98912), but if you notice I missed/forgot something, please let me know in the comments. Done in this PR: - [x] Schema-agnostic APIs for working with Elasticsearch. - [x] Schema-aware log definition and bootstrapping API (creating hierarchical logs). - [x] Schema-aware write API (logging events). - [x] Schema-aware read API (searching logs, filtering, sorting, pagination, aggregation). - [x] Support for Kibana spaces, space-aware index bootstrapping (either at rule creation or rule execution time). As for reviewing this PR, perhaps it might be easier to start with: - checking description of https://github.com/elastic/kibana/issues/98912 - checking usage examples https://github.com/elastic/kibana/pull/98353/files#diff-c049ff2198cc69bd50a69e92d29e88da7e10b9a152bdaceaf3d41826e712c12b - checking public api https://github.com/elastic/kibana/pull/98353/files#diff-8e9ef0dbcbc60b1861d492a03865b2ae76a56ec38ada61898c991d3a74bd6268 ## Next steps Next steps towards rule execution log in Security (https://github.com/elastic/kibana/pull/94143): - define actual schema for rule execution events - inject instance of rule execution log into Security rule executors and route handlers - implement actual execution logging in rule executors - update route handlers to start fetching execution events and metrics from the log instead of custom saved objects Next steps in the context of RAC and unified implementation: - converge this implementation with `RuleDataService` implementation - implement robust index bootstrapping - reconsider using FieldMap as a generic type parameter - implement validation for documents being indexed - cover the final implementation with tests - write comprehensive docs: update plugin README, add JSDoc comments to all public interfaces --- x-pack/plugins/apm/server/plugin.ts | 19 +- x-pack/plugins/observability/server/plugin.ts | 2 +- x-pack/plugins/rule_registry/kibana.json | 2 + x-pack/plugins/rule_registry/server/config.ts | 20 +++ .../server/event_log/elasticsearch/index.ts | 14 ++ .../elasticsearch/index_bootstrapper.ts | 107 ++++++++++++ .../elasticsearch/index_management_gateway.ts | 139 +++++++++++++++ .../event_log/elasticsearch/index_reader.ts | 44 +++++ .../event_log/elasticsearch/index_writer.ts | 94 ++++++++++ .../elasticsearch/resources/ilm_policy.ts | 33 ++++ .../elasticsearch/resources/index_mappings.ts | 12 ++ .../elasticsearch/resources/index_names.ts | 84 +++++++++ .../elasticsearch/resources/index_template.ts | 51 ++++++ .../elasticsearch/utils/buffered_stream.ts | 52 ++++++ .../server/event_log/event_schema/index.ts | 9 + .../server/event_log/event_schema/schema.ts | 51 ++++++ .../event_log/event_schema/schema_types.ts | 20 +++ .../rule_registry/server/event_log/index.ts | 10 ++ .../server/event_log/log/event_log.ts | 51 ++++++ .../event_log/log/event_log_bootstrapper.ts | 51 ++++++ .../event_log/log/event_log_definition.ts | 37 ++++ .../event_log/log/event_log_provider.ts | 33 ++++ .../event_log/log/event_log_registry.ts | 56 ++++++ .../event_log/log/event_log_resolver.ts | 162 ++++++++++++++++++ .../server/event_log/log/event_log_service.ts | 67 ++++++++ .../server/event_log/log/event_logger.ts | 36 ++++ .../event_log/log/event_logger_template.ts | 55 ++++++ .../server/event_log/log/event_query.ts | 27 +++ .../event_log/log/event_query_builder.ts | 110 ++++++++++++ .../server/event_log/log/index.ts | 10 ++ .../server/event_log/log/internal_api.ts | 46 +++++ .../server/event_log/log/public_api.ts | 113 ++++++++++++ .../log/utils/mapping_from_field_map.ts | 33 ++++ .../server/event_log/utils/fields.ts | 18 ++ .../server/event_log/utils/predicates.ts | 16 ++ .../event_log/utils/ready_signal.test.ts | 22 +++ .../server/event_log/utils/ready_signal.ts | 29 ++++ .../server/event_log/utils/utility_types.ts | 12 ++ x-pack/plugins/rule_registry/server/index.ts | 14 +- x-pack/plugins/rule_registry/server/plugin.ts | 86 ++++++++-- x-pack/plugins/rule_registry/tsconfig.json | 2 + 41 files changed, 1809 insertions(+), 40 deletions(-) create mode 100644 x-pack/plugins/rule_registry/server/config.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/elasticsearch/index.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/elasticsearch/index_bootstrapper.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/elasticsearch/index_management_gateway.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/elasticsearch/index_reader.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/elasticsearch/index_writer.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/elasticsearch/resources/ilm_policy.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/elasticsearch/resources/index_mappings.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/elasticsearch/resources/index_names.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/elasticsearch/resources/index_template.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/elasticsearch/utils/buffered_stream.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/event_schema/index.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/event_schema/schema.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/event_schema/schema_types.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/index.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/log/event_log.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/log/event_log_bootstrapper.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/log/event_log_definition.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/log/event_log_provider.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/log/event_log_registry.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/log/event_log_resolver.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/log/event_log_service.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/log/event_logger.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/log/event_logger_template.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/log/event_query.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/log/event_query_builder.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/log/index.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/log/internal_api.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/log/public_api.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/log/utils/mapping_from_field_map.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/utils/fields.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/utils/predicates.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/utils/ready_signal.test.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/utils/ready_signal.ts create mode 100644 x-pack/plugins/rule_registry/server/event_log/utils/utility_types.ts diff --git a/x-pack/plugins/apm/server/plugin.ts b/x-pack/plugins/apm/server/plugin.ts index cf5be4369f79e3..8d83f762e2023e 100644 --- a/x-pack/plugins/apm/server/plugin.ts +++ b/x-pack/plugins/apm/server/plugin.ts @@ -130,19 +130,20 @@ export class APMPlugin registerFeaturesUsage({ licensingPlugin: plugins.licensing }); + const { ruleDataService } = plugins.ruleRegistry; const getCoreStart = () => core.getStartServices().then(([coreStart]) => coreStart); const ready = once(async () => { - const componentTemplateName = plugins.ruleRegistry.getFullAssetName( + const componentTemplateName = ruleDataService.getFullAssetName( 'apm-mappings' ); - if (!plugins.ruleRegistry.isWriteEnabled()) { + if (!ruleDataService.isWriteEnabled()) { return; } - await plugins.ruleRegistry.createOrUpdateComponentTemplate({ + await ruleDataService.createOrUpdateComponentTemplate({ name: componentTemplateName, body: { template: { @@ -167,16 +168,14 @@ export class APMPlugin }, }); - await plugins.ruleRegistry.createOrUpdateIndexTemplate({ - name: plugins.ruleRegistry.getFullAssetName('apm-index-template'), + await ruleDataService.createOrUpdateIndexTemplate({ + name: ruleDataService.getFullAssetName('apm-index-template'), body: { index_patterns: [ - plugins.ruleRegistry.getFullAssetName('observability-apm*'), + ruleDataService.getFullAssetName('observability-apm*'), ], composed_of: [ - plugins.ruleRegistry.getFullAssetName( - TECHNICAL_COMPONENT_TEMPLATE_NAME - ), + ruleDataService.getFullAssetName(TECHNICAL_COMPONENT_TEMPLATE_NAME), componentTemplateName, ], }, @@ -188,7 +187,7 @@ export class APMPlugin }); const ruleDataClient = new RuleDataClient({ - alias: plugins.ruleRegistry.getFullAssetName('observability-apm'), + alias: ruleDataService.getFullAssetName('observability-apm'), getClusterClient: async () => { const coreStart = await getCoreStart(); return coreStart.elasticsearch.client.asInternalUser; diff --git a/x-pack/plugins/observability/server/plugin.ts b/x-pack/plugins/observability/server/plugin.ts index 046a9a62d5fa79..9eff1b08cead98 100644 --- a/x-pack/plugins/observability/server/plugin.ts +++ b/x-pack/plugins/observability/server/plugin.ts @@ -57,7 +57,7 @@ export class ObservabilityPlugin implements Plugin { return coreStart.elasticsearch.client.asInternalUser; }, ready: () => Promise.resolve(), - alias: plugins.ruleRegistry.getFullAssetName(), + alias: plugins.ruleRegistry.ruleDataService.getFullAssetName(), }); registerRoutes({ diff --git a/x-pack/plugins/rule_registry/kibana.json b/x-pack/plugins/rule_registry/kibana.json index 7e3f8bf6afb721..8c1e8d0f5e40ed 100644 --- a/x-pack/plugins/rule_registry/kibana.json +++ b/x-pack/plugins/rule_registry/kibana.json @@ -8,6 +8,8 @@ ], "requiredPlugins": [ "alerting", + "data", + "spaces", "triggersActionsUi" ], "server": true diff --git a/x-pack/plugins/rule_registry/server/config.ts b/x-pack/plugins/rule_registry/server/config.ts new file mode 100644 index 00000000000000..498b6d16a6fdac --- /dev/null +++ b/x-pack/plugins/rule_registry/server/config.ts @@ -0,0 +1,20 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { schema, TypeOf } from '@kbn/config-schema'; + +export const config = { + schema: schema.object({ + enabled: schema.boolean({ defaultValue: true }), + write: schema.object({ + enabled: schema.boolean({ defaultValue: true }), + }), + index: schema.string({ defaultValue: '.alerts' }), + }), +}; + +export type RuleRegistryPluginConfig = TypeOf; diff --git a/x-pack/plugins/rule_registry/server/event_log/elasticsearch/index.ts b/x-pack/plugins/rule_registry/server/event_log/elasticsearch/index.ts new file mode 100644 index 00000000000000..1941208ed07cdf --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/elasticsearch/index.ts @@ -0,0 +1,14 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export * from './index_bootstrapper'; +export * from './index_management_gateway'; +export * from './index_reader'; +export * from './index_writer'; +export * from './resources/ilm_policy'; +export * from './resources/index_mappings'; +export * from './resources/index_names'; diff --git a/x-pack/plugins/rule_registry/server/event_log/elasticsearch/index_bootstrapper.ts b/x-pack/plugins/rule_registry/server/event_log/elasticsearch/index_bootstrapper.ts new file mode 100644 index 00000000000000..b0c3927cd7dfe6 --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/elasticsearch/index_bootstrapper.ts @@ -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 type { PublicMethodsOf } from '@kbn/utility-types'; +import { Logger } from 'src/core/server'; + +import { IndexNames } from './resources/index_names'; +import { IndexMappings } from './resources/index_mappings'; +import { createIndexTemplate } from './resources/index_template'; +import { IlmPolicy, defaultIlmPolicy } from './resources/ilm_policy'; +import { IIndexManagementGateway } from './index_management_gateway'; + +interface ConstructorParams { + gateway: IIndexManagementGateway; + logger: Logger; +} + +export interface IndexSpecification { + indexNames: IndexNames; + indexMappings: IndexMappings; + ilmPolicy?: IlmPolicy; +} + +export type IIndexBootstrapper = PublicMethodsOf; + +// TODO: Converge with the logic of .siem-signals index bootstrapping +// x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/create_index_route.ts + +// TODO: Handle race conditions and potential errors between multiple instances of Kibana +// trying to bootstrap the same index. Possible options: +// - robust idempotent logic with error handling +// - leveraging task_manager to make sure bootstrapping is run only once at a time +// - using some sort of distributed lock +// Maybe we can check how Saved Objects service bootstraps .kibana index + +export class IndexBootstrapper { + private readonly gateway: IIndexManagementGateway; + private readonly logger: Logger; + + constructor(params: ConstructorParams) { + this.gateway = params.gateway; + this.logger = params.logger.get('IndexBootstrapper'); + } + + public async run(indexSpec: IndexSpecification): Promise { + this.logger.debug('bootstrapping elasticsearch resources starting'); + + try { + const { indexNames, indexMappings, ilmPolicy } = indexSpec; + await this.createIlmPolicyIfNotExists(indexNames, ilmPolicy); + await this.createIndexTemplateIfNotExists(indexNames, indexMappings); + await this.createInitialIndexIfNotExists(indexNames); + } catch (err) { + this.logger.error(`error bootstrapping elasticsearch resources: ${err.message}`); + return false; + } + + this.logger.debug('bootstrapping elasticsearch resources complete'); + return true; + } + + private async createIlmPolicyIfNotExists(names: IndexNames, policy?: IlmPolicy): Promise { + const { indexIlmPolicyName } = names; + + const exists = await this.gateway.doesIlmPolicyExist(indexIlmPolicyName); + if (!exists) { + const ilmPolicy = policy ?? defaultIlmPolicy; + await this.gateway.createIlmPolicy(indexIlmPolicyName, ilmPolicy); + } + } + + private async createIndexTemplateIfNotExists( + names: IndexNames, + mappings: IndexMappings + ): Promise { + const { indexTemplateName } = names; + + const templateVersion = 1; // TODO: get from EventSchema definition + const template = createIndexTemplate(names, mappings, templateVersion); + + const exists = await this.gateway.doesIndexTemplateExist(indexTemplateName); + if (!exists) { + await this.gateway.createIndexTemplate(indexTemplateName, template); + } else { + await this.gateway.updateIndexTemplate(indexTemplateName, template); + } + } + + private async createInitialIndexIfNotExists(names: IndexNames): Promise { + const { indexAliasName, indexInitialName } = names; + + const exists = await this.gateway.doesAliasExist(indexAliasName); + if (!exists) { + await this.gateway.createIndex(indexInitialName, { + aliases: { + [indexAliasName]: { + is_write_index: true, + }, + }, + }); + } + } +} diff --git a/x-pack/plugins/rule_registry/server/event_log/elasticsearch/index_management_gateway.ts b/x-pack/plugins/rule_registry/server/event_log/elasticsearch/index_management_gateway.ts new file mode 100644 index 00000000000000..96b5860e143eea --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/elasticsearch/index_management_gateway.ts @@ -0,0 +1,139 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import type { PublicMethodsOf } from '@kbn/utility-types'; +import { ElasticsearchClient, Logger } from 'src/core/server'; +import { IlmPolicy } from './resources/ilm_policy'; +import { IndexTemplate } from './resources/index_template'; + +interface ConstructorParams { + elasticsearch: Promise; + logger: Logger; +} + +export type IIndexManagementGateway = PublicMethodsOf; + +export class IndexManagementGateway { + private readonly elasticsearch: Promise; + private readonly logger: Logger; + + constructor(params: ConstructorParams) { + this.elasticsearch = params.elasticsearch; + this.logger = params.logger.get('IndexManagementGateway'); + } + + public async doesIlmPolicyExist(policyName: string): Promise { + this.logger.debug(`Checking if ILM policy exists; name="${policyName}"`); + + try { + const es = await this.elasticsearch; + await es.transport.request({ + method: 'GET', + path: `/_ilm/policy/${policyName}`, + }); + } catch (e) { + if (e.statusCode === 404) return false; + throw new Error(`Error checking existence of ILM policy: ${e.message}`); + } + return true; + } + + public async createIlmPolicy(policyName: string, policy: IlmPolicy): Promise { + this.logger.debug(`Creating ILM policy; name="${policyName}"`); + + try { + const es = await this.elasticsearch; + await es.transport.request({ + method: 'PUT', + path: `/_ilm/policy/${policyName}`, + body: policy, + }); + } catch (e) { + throw new Error(`Error creating ILM policy: ${e.message}`); + } + } + + public async doesIndexTemplateExist(templateName: string): Promise { + this.logger.debug(`Checking if index template exists; name="${templateName}"`); + + try { + const es = await this.elasticsearch; + const { body } = await es.indices.existsTemplate({ name: templateName }); + return body as boolean; + } catch (e) { + throw new Error(`Error checking existence of index template: ${e.message}`); + } + } + + public async createIndexTemplate(templateName: string, template: IndexTemplate): Promise { + this.logger.debug(`Creating index template; name="${templateName}"`); + + try { + const es = await this.elasticsearch; + await es.indices.putTemplate({ create: true, name: templateName, body: template }); + } catch (e) { + // The error message doesn't have a type attribute we can look to guarantee it's due + // to the template already existing (only long message) so we'll check ourselves to see + // if the template now exists. This scenario would happen if you startup multiple Kibana + // instances at the same time. + const existsNow = await this.doesIndexTemplateExist(templateName); + if (!existsNow) { + const error = new Error(`Error creating index template: ${e.message}`); + Object.assign(error, { wrapped: e }); + throw error; + } + } + } + + public async updateIndexTemplate(templateName: string, template: IndexTemplate): Promise { + this.logger.debug(`Updating index template; name="${templateName}"`); + + try { + const { settings, ...templateWithoutSettings } = template; + + const es = await this.elasticsearch; + await es.indices.putTemplate({ + create: false, + name: templateName, + body: templateWithoutSettings, + }); + } catch (e) { + throw new Error(`Error updating index template: ${e.message}`); + } + } + + public async doesAliasExist(aliasName: string): Promise { + this.logger.debug(`Checking if index alias exists; name="${aliasName}"`); + + try { + const es = await this.elasticsearch; + const { body } = await es.indices.existsAlias({ name: aliasName }); + return body as boolean; + } catch (e) { + throw new Error(`Error checking existence of initial index: ${e.message}`); + } + } + + public async createIndex(indexName: string, body: Record = {}): Promise { + this.logger.debug(`Creating index; name="${indexName}"`); + this.logger.debug(JSON.stringify(body, null, 2)); + + try { + const es = await this.elasticsearch; + await es.indices.create({ + index: indexName, + body, + }); + } catch (e) { + if (e.body?.error?.type !== 'resource_already_exists_exception') { + this.logger.error(e); + this.logger.error(JSON.stringify(e.meta, null, 2)); + throw new Error(`Error creating initial index: ${e.message}`); + } + } + } +} diff --git a/x-pack/plugins/rule_registry/server/event_log/elasticsearch/index_reader.ts b/x-pack/plugins/rule_registry/server/event_log/elasticsearch/index_reader.ts new file mode 100644 index 00000000000000..84c0b41f7e1a03 --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/elasticsearch/index_reader.ts @@ -0,0 +1,44 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import type { PublicMethodsOf } from '@kbn/utility-types'; +import { estypes } from '@elastic/elasticsearch'; +import { Logger, ElasticsearchClient } from 'src/core/server'; + +interface ConstructorParams { + indexName: string; + elasticsearch: Promise; + logger: Logger; +} + +export type IIndexReader = PublicMethodsOf; + +export class IndexReader { + private readonly indexName: string; + private readonly elasticsearch: Promise; + private readonly logger: Logger; + + constructor(params: ConstructorParams) { + this.indexName = params.indexName; + this.elasticsearch = params.elasticsearch; + this.logger = params.logger.get('IndexReader'); + } + + public async search(request: estypes.SearchRequest) { + const requestToSend: estypes.SearchRequest = { + ...request, + index: this.indexName, + }; + + this.logger.debug(`Searching; request: ${JSON.stringify(requestToSend, null)}`); + + const esClient = await this.elasticsearch; + const response = await esClient.search(requestToSend); + + return response; + } +} diff --git a/x-pack/plugins/rule_registry/server/event_log/elasticsearch/index_writer.ts b/x-pack/plugins/rule_registry/server/event_log/elasticsearch/index_writer.ts new file mode 100644 index 00000000000000..7f83421ec80d85 --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/elasticsearch/index_writer.ts @@ -0,0 +1,94 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import type { PublicMethodsOf } from '@kbn/utility-types'; +import util from 'util'; +import { Logger, ElasticsearchClient } from 'src/core/server'; +import { BufferedStream } from './utils/buffered_stream'; + +type Document = Record; + +interface BufferItem { + index: string; + doc: Document; +} + +interface ConstructorParams { + indexName: string; + elasticsearch: Promise; + isWriteEnabled: boolean; + logger: Logger; +} + +export type IIndexWriter = PublicMethodsOf; + +export class IndexWriter { + private readonly indexName: string; + private readonly elasticsearch: Promise; + private readonly isWriteEnabled: boolean; + private readonly logger: Logger; + private readonly buffer: BufferedStream; + + constructor(params: ConstructorParams) { + this.indexName = params.indexName; + this.elasticsearch = params.elasticsearch; + this.isWriteEnabled = params.isWriteEnabled; + this.logger = params.logger.get('IndexWriter'); + + this.buffer = new BufferedStream({ + flush: (items) => this.bulkIndex(items), + }); + } + + public indexOne(doc: Document): void { + if (this.isWriteEnabled) { + this.logger.debug('Buffering 1 document'); + this.buffer.enqueue({ index: this.indexName, doc }); + } + } + + public indexMany(docs: Document[]): void { + if (this.isWriteEnabled) { + this.logger.debug(`Buffering ${docs.length} documents`); + docs.forEach((doc) => { + this.buffer.enqueue({ index: this.indexName, doc }); + }); + } + } + + public async close(): Promise { + await this.buffer.closeAndWaitUntilFlushed(); + } + + private async bulkIndex(items: BufferItem[]): Promise { + this.logger.debug(`Indexing ${items.length} documents`); + + const bulkBody: Array> = []; + + for (const item of items) { + if (item.doc === undefined) continue; + + bulkBody.push({ create: { _index: item.index } }); + bulkBody.push(item.doc); + } + + try { + const es = await this.elasticsearch; + const response = await es.bulk({ body: bulkBody }); + + if (response.body.errors) { + const error = new Error('Error writing some bulk events'); + error.stack += '\n' + util.inspect(response.body.items, { depth: null }); + this.logger.error(error); + } + } catch (e) { + this.logger.error( + `error writing bulk events: "${e.message}"; docs: ${JSON.stringify(bulkBody)}` + ); + } + } +} diff --git a/x-pack/plugins/rule_registry/server/event_log/elasticsearch/resources/ilm_policy.ts b/x-pack/plugins/rule_registry/server/event_log/elasticsearch/resources/ilm_policy.ts new file mode 100644 index 00000000000000..00fc9131523ace --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/elasticsearch/resources/ilm_policy.ts @@ -0,0 +1,33 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { estypes } from '@elastic/elasticsearch'; + +export interface IlmPolicy { + policy: estypes.Policy; +} + +export const defaultIlmPolicy: IlmPolicy = { + policy: { + phases: { + hot: { + min_age: '0ms', + actions: { + rollover: { + max_age: '90d', + max_size: '50gb', + }, + }, + }, + delete: { + actions: { + delete: {}, + }, + }, + }, + }, +}; diff --git a/x-pack/plugins/rule_registry/server/event_log/elasticsearch/resources/index_mappings.ts b/x-pack/plugins/rule_registry/server/event_log/elasticsearch/resources/index_mappings.ts new file mode 100644 index 00000000000000..064bde5001f7bf --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/elasticsearch/resources/index_mappings.ts @@ -0,0 +1,12 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export interface IndexMappings { + dynamic: 'strict' | boolean; + properties: Record; + _meta?: Record; +} diff --git a/x-pack/plugins/rule_registry/server/event_log/elasticsearch/resources/index_names.ts b/x-pack/plugins/rule_registry/server/event_log/elasticsearch/resources/index_names.ts new file mode 100644 index 00000000000000..1082c62b95e70d --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/elasticsearch/resources/index_names.ts @@ -0,0 +1,84 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export interface IndexParams { + /** @example '.alerts' */ + indexPrefix: string; + + /** @example 'security', 'security.alerts', 'observability.events' */ + logName: string; + + /** @example 'default' */ + kibanaSpaceId: string; +} + +export interface IndexNames extends IndexParams { + /** @example '.alerts-security.alerts' */ + indexBaseName: string; + + /** @example '.alerts-security.alerts-*' */ + indexBasePattern: string; + + /** @example '.alerts-security.alerts-default' */ + indexAliasName: string; + + /** @example '.alerts-security.alerts-default-*' */ + indexAliasPattern: string; + + /** @example '.alerts-security.alerts-default-policy' */ + indexIlmPolicyName: string; + + /** @example '.alerts-security.alerts-default-template' */ + indexTemplateName: string; + + /** @example '.alerts-security.alerts-default-000001' */ + indexInitialName: string; +} + +export abstract class IndexNames { + public static create(params: IndexParams): IndexNames { + const { indexPrefix, logName, kibanaSpaceId } = params; + + // TODO: validate params + + const indexBaseName = joinWithDash(indexPrefix, logName); + const indexBasePattern = joinWithDash(indexPrefix, logName, '*'); + const indexAliasName = joinWithDash(indexPrefix, logName, kibanaSpaceId); + const indexAliasPattern = joinWithDash(indexPrefix, logName, kibanaSpaceId, '*'); + const indexIlmPolicyName = joinWithDash(indexPrefix, logName, kibanaSpaceId, 'policy'); + const indexTemplateName = joinWithDash(indexPrefix, logName, kibanaSpaceId, 'template'); + const indexInitialName = joinWithDash(indexPrefix, logName, kibanaSpaceId, '000001'); + + return { + indexPrefix, + logName, + kibanaSpaceId, + indexBaseName, + indexBasePattern, + indexAliasName, + indexAliasPattern, + indexIlmPolicyName, + indexTemplateName, + indexInitialName, + }; + } + + public static createChild(parent: IndexNames, logName: string): IndexNames { + return this.create({ + indexPrefix: parent.indexPrefix, + logName: this.createChildLogName(parent.logName, logName), + kibanaSpaceId: parent.kibanaSpaceId, + }); + } + + public static createChildLogName(parentLogName: string, logName: string): string { + return joinWithDot(parentLogName, logName); + } +} + +const joinWithDash = (...names: string[]): string => names.join('-'); +const joinWithDot = (...names: string[]): string => names.join('.'); diff --git a/x-pack/plugins/rule_registry/server/event_log/elasticsearch/resources/index_template.ts b/x-pack/plugins/rule_registry/server/event_log/elasticsearch/resources/index_template.ts new file mode 100644 index 00000000000000..caf71dadf6e1e5 --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/elasticsearch/resources/index_template.ts @@ -0,0 +1,51 @@ +/* + * Copyright 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 { estypes } from '@elastic/elasticsearch'; +import { IndexNames } from './index_names'; +import { IndexMappings } from './index_mappings'; + +export type IndexTemplate = estypes.PutIndexTemplateRequest['body']; + +export const createIndexTemplate = ( + names: IndexNames, + mappings: IndexMappings, + version: number +): IndexTemplate => { + const { indexAliasName, indexAliasPattern, indexIlmPolicyName } = names; + + return { + index_patterns: [indexAliasPattern], + settings: { + number_of_shards: 1, // TODO: do we need to set this? + auto_expand_replicas: '0-1', // TODO: do we need to set? + index: { + lifecycle: { + name: indexIlmPolicyName, + rollover_alias: indexAliasName, + }, + }, + mapping: { + total_fields: { + limit: 10000, + }, + }, + sort: { + field: '@timestamp', + order: 'desc', + }, + }, + mappings: { + ...mappings, + _meta: { + ...mappings._meta, + version, + }, + }, + version, + }; +}; diff --git a/x-pack/plugins/rule_registry/server/event_log/elasticsearch/utils/buffered_stream.ts b/x-pack/plugins/rule_registry/server/event_log/elasticsearch/utils/buffered_stream.ts new file mode 100644 index 00000000000000..d968cd5a0ac685 --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/elasticsearch/utils/buffered_stream.ts @@ -0,0 +1,52 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { Subject } from 'rxjs'; +import { bufferTime, filter as rxFilter, switchMap } from 'rxjs/operators'; + +export const DEFAULT_BUFFER_TIME_MS = 1000; +export const DEFAULT_BUFFER_SIZE = 100; + +interface ConstructorParams { + maxBufferTimeMs?: number; + maxBufferSize?: number; + flush: (items: TItem[]) => Promise; +} + +// TODO: handle possible exceptions in flush and maybe add retry logic + +export class BufferedStream { + private readonly buffer$: Subject; + private readonly whenBufferCompleteAndFlushed: Promise; + + constructor(params: ConstructorParams) { + const maxBufferTime = params.maxBufferTimeMs ?? DEFAULT_BUFFER_TIME_MS; + const maxBufferSize = params.maxBufferSize ?? DEFAULT_BUFFER_SIZE; + + this.buffer$ = new Subject(); + + // Buffer items for time/buffer length, ignore empty buffers, + // then flush the buffered items; kick things off with a promise + // on the observable, which we'll wait on in shutdown + this.whenBufferCompleteAndFlushed = this.buffer$ + .pipe( + bufferTime(maxBufferTime, null, maxBufferSize), + rxFilter((docs) => docs.length > 0), + switchMap(async (docs) => await params.flush(docs)) + ) + .toPromise(); + } + + public enqueue(item: TItem): void { + this.buffer$.next(item); + } + + public async closeAndWaitUntilFlushed(): Promise { + this.buffer$.complete(); + await this.whenBufferCompleteAndFlushed; + } +} diff --git a/x-pack/plugins/rule_registry/server/event_log/event_schema/index.ts b/x-pack/plugins/rule_registry/server/event_log/event_schema/index.ts new file mode 100644 index 00000000000000..77c041a4059b56 --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/event_schema/index.ts @@ -0,0 +1,9 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export * from './schema_types'; +export * from './schema'; diff --git a/x-pack/plugins/rule_registry/server/event_log/event_schema/schema.ts b/x-pack/plugins/rule_registry/server/event_log/event_schema/schema.ts new file mode 100644 index 00000000000000..9b5d94918a83f6 --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/event_schema/schema.ts @@ -0,0 +1,51 @@ +/* + * Copyright 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 { EventSchema, Event } from './schema_types'; +import { FieldMap, runtimeTypeFromFieldMap, mergeFieldMaps } from '../../../common/field_map'; +import { + TechnicalRuleFieldMaps, + technicalRuleFieldMap, +} from '../../../common/assets/field_maps/technical_rule_field_map'; + +const baseSchema = createSchema(technicalRuleFieldMap); + +export abstract class Schema { + public static create(fields: TMap): EventSchema { + return createSchema(fields); + } + + public static combine( + s1: EventSchema, + s2: EventSchema + ): EventSchema { + const combinedFields = mergeFieldMaps(s1.objectFields, s2.objectFields); + return createSchema(combinedFields); + } + + public static getBase(): EventSchema { + return baseSchema; + } + + public static extendBase( + fields: TMap + ): EventSchema { + const extensionSchema = createSchema(fields); + return this.combine(baseSchema, extensionSchema); + } +} + +function createSchema(fields: TMap): EventSchema { + const objectType: Event = ({} as unknown) as Event; + const runtimeType = runtimeTypeFromFieldMap(fields); + + return { + objectFields: fields, + objectType, + runtimeType, + }; +} diff --git a/x-pack/plugins/rule_registry/server/event_log/event_schema/schema_types.ts b/x-pack/plugins/rule_registry/server/event_log/event_schema/schema_types.ts new file mode 100644 index 00000000000000..e5c665652fe974 --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/event_schema/schema_types.ts @@ -0,0 +1,20 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { FieldMap, FieldMapType, TypeOfFieldMap } from '../../../common/field_map'; + +export interface EventSchema { + objectFields: TMap; + objectType: Event; + runtimeType: EventRuntimeType; +} + +export type Event = TypeOfFieldMap; + +export type EventRuntimeType = FieldMapType; + +export { FieldMap }; diff --git a/x-pack/plugins/rule_registry/server/event_log/index.ts b/x-pack/plugins/rule_registry/server/event_log/index.ts new file mode 100644 index 00000000000000..cf7467588c22fe --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/index.ts @@ -0,0 +1,10 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export * from './elasticsearch'; +export * from './event_schema'; +export * from './log'; diff --git a/x-pack/plugins/rule_registry/server/event_log/log/event_log.ts b/x-pack/plugins/rule_registry/server/event_log/log/event_log.ts new file mode 100644 index 00000000000000..2b1ecde48d2db0 --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/log/event_log.ts @@ -0,0 +1,51 @@ +/* + * Copyright 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 { estypes } from '@elastic/elasticsearch'; +import { DeepPartial } from '../utils/utility_types'; +import { IndexNames } from '../elasticsearch'; +import { IEventLog, IEventLogger, IEventLoggerTemplate, IEventQueryBuilder } from './public_api'; +import { EventLogParams } from './internal_api'; +import { EventLoggerTemplate } from './event_logger_template'; +import { EventQueryBuilder } from './event_query_builder'; + +export class EventLog implements IEventLog { + private readonly params: EventLogParams; + private readonly initialTemplate: IEventLoggerTemplate; + + constructor(params: EventLogParams) { + this.params = params; + this.initialTemplate = new EventLoggerTemplate({ + ...params, + eventLoggerName: '', + eventFields: {}, + }); + } + + public getNames(): IndexNames { + return this.params.indexNames; + } + + public getLoggerTemplate(fields: DeepPartial): IEventLoggerTemplate { + return this.initialTemplate.getLoggerTemplate(fields); + } + + public getLogger(loggerName: string, fields?: DeepPartial): IEventLogger { + return this.initialTemplate.getLogger(loggerName, fields); + } + + public getQueryBuilder(): IEventQueryBuilder { + return new EventQueryBuilder(this.params); + } + + public async search( + request: estypes.SearchRequest + ): Promise> { + const response = await this.params.indexReader.search(request); + return response.body; + } +} diff --git a/x-pack/plugins/rule_registry/server/event_log/log/event_log_bootstrapper.ts b/x-pack/plugins/rule_registry/server/event_log/log/event_log_bootstrapper.ts new file mode 100644 index 00000000000000..0498a7cd97b2f5 --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/log/event_log_bootstrapper.ts @@ -0,0 +1,51 @@ +/* + * Copyright 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 { Logger } from 'kibana/server'; +import { IIndexBootstrapper, IndexSpecification } from '../elasticsearch'; + +interface ConstructorParams { + indexSpec: IndexSpecification; + indexBootstrapper: IIndexBootstrapper; + isWriteEnabled: boolean; + logger: Logger; +} + +export class EventLogBootstrapper { + private readonly indexSpec: IndexSpecification; + private readonly indexBootstrapper: IIndexBootstrapper; + private readonly logger: Logger; + private readonly isWriteEnabled: boolean; + private isIndexBootstrapped: boolean; + + constructor(params: ConstructorParams) { + this.indexSpec = params.indexSpec; + this.indexBootstrapper = params.indexBootstrapper; + this.logger = params.logger.get('EventLogBootstrapper'); + this.isWriteEnabled = params.isWriteEnabled; + this.isIndexBootstrapped = false; + } + + public async run(): Promise { + if (this.isIndexBootstrapped || !this.isWriteEnabled) { + return; + } + + const { logName, indexAliasName } = this.indexSpec.indexNames; + const logInfo = `log="${logName}" index="${indexAliasName}"`; + + this.logger.debug(`Bootstrapping started, ${logInfo}`); + this.isIndexBootstrapped = await this.indexBootstrapper.run(this.indexSpec); + this.logger.debug( + `Bootstrapping ${this.isIndexBootstrapped ? 'succeeded' : 'failed'}, ${logInfo}` + ); + + if (!this.isIndexBootstrapped) { + throw new Error(`Event log bootstrapping failed, ${logInfo}`); + } + } +} diff --git a/x-pack/plugins/rule_registry/server/event_log/log/event_log_definition.ts b/x-pack/plugins/rule_registry/server/event_log/log/event_log_definition.ts new file mode 100644 index 00000000000000..124664d5578b00 --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/log/event_log_definition.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 { IlmPolicy, defaultIlmPolicy, IndexNames } from '../elasticsearch'; +import { EventSchema, FieldMap, Schema } from '../event_schema'; +import { EventLogOptions, IEventLogDefinition } from './public_api'; + +export class EventLogDefinition implements IEventLogDefinition { + public readonly eventLogName: string; + public readonly eventSchema: EventSchema; + public readonly ilmPolicy: IlmPolicy; + + constructor(options: EventLogOptions) { + // TODO: validate options; options.name should not contain "-" and "." + this.eventLogName = options.name; + this.eventSchema = options.schema; + this.ilmPolicy = options.ilmPolicy ?? defaultIlmPolicy; + } + + public defineChild( + options: EventLogOptions + ): IEventLogDefinition { + const childName = IndexNames.createChildLogName(this.eventLogName, options.name); + const childSchema = Schema.combine(this.eventSchema, options.schema); + const childPolicy = options.ilmPolicy ?? this.ilmPolicy; + + return new EventLogDefinition({ + name: childName, + schema: childSchema, + ilmPolicy: childPolicy, + }); + } +} diff --git a/x-pack/plugins/rule_registry/server/event_log/log/event_log_provider.ts b/x-pack/plugins/rule_registry/server/event_log/log/event_log_provider.ts new file mode 100644 index 00000000000000..d1ecd6a977a080 --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/log/event_log_provider.ts @@ -0,0 +1,33 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { IIndexWriter } from '../elasticsearch'; +import { IEventLog } from './public_api'; +import { IEventLogProvider } from './internal_api'; +import { EventLogBootstrapper } from './event_log_bootstrapper'; + +interface ConstructorParams { + log: IEventLog; + logBootstrapper: EventLogBootstrapper; + indexWriter: IIndexWriter; +} + +export class EventLogProvider implements IEventLogProvider { + constructor(private readonly params: ConstructorParams) {} + + public getLog(): IEventLog { + return this.params.log; + } + + public async bootstrapLog(): Promise { + await this.params.logBootstrapper.run(); + } + + public async shutdownLog(): Promise { + await this.params.indexWriter.close(); + } +} diff --git a/x-pack/plugins/rule_registry/server/event_log/log/event_log_registry.ts b/x-pack/plugins/rule_registry/server/event_log/log/event_log_registry.ts new file mode 100644 index 00000000000000..52f6c6bd918d49 --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/log/event_log_registry.ts @@ -0,0 +1,56 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { Event, FieldMap } from '../event_schema'; +import { IEventLogDefinition } from './public_api'; +import { IEventLogRegistry, IEventLogProvider } from './internal_api'; + +const getRegistryKey = (definition: IEventLogDefinition, spaceId: string) => + `${definition.eventLogName}-${spaceId}`; + +interface RegistryEntry { + definition: IEventLogDefinition; + spaceId: string; + provider: IEventLogProvider; +} + +export class EventLogRegistry implements IEventLogRegistry { + private readonly map = new Map(); + + public get( + definition: IEventLogDefinition, + spaceId: string + ): IEventLogProvider> | null { + const key = getRegistryKey(definition, spaceId); + const entry = this.map.get(key); + return entry != null ? (entry.provider as IEventLogProvider>) : null; + } + + public add( + definition: IEventLogDefinition, + spaceId: string, + provider: IEventLogProvider> + ): void { + const key = getRegistryKey(definition, spaceId); + + if (this.map.has(key)) { + throw new Error(`Event log already registered, key="${key}"`); + } + + this.map.set(key, { + definition, + spaceId, + provider, + }); + } + + public async shutdown(): Promise { + const entries = Array.from(this.map.values()); + const promises = entries.map(({ provider }) => provider.shutdownLog()); + await Promise.all(promises); + } +} diff --git a/x-pack/plugins/rule_registry/server/event_log/log/event_log_resolver.ts b/x-pack/plugins/rule_registry/server/event_log/log/event_log_resolver.ts new file mode 100644 index 00000000000000..8440f554323041 --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/log/event_log_resolver.ts @@ -0,0 +1,162 @@ +/* + * Copyright 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 { + IndexBootstrapper, + IndexManagementGateway, + IndexNames, + IndexReader, + IndexSpecification, + IndexWriter, +} from '../elasticsearch'; + +import { Event, FieldMap } from '../event_schema'; +import { IEventLogRegistry, IEventLogProvider } from './internal_api'; +import { + EventLogServiceConfig, + EventLogServiceDependencies, + IEventLog, + IEventLogDefinition, + IEventLogResolver, +} from './public_api'; + +import { EventLog } from './event_log'; +import { EventLogBootstrapper } from './event_log_bootstrapper'; +import { EventLogProvider } from './event_log_provider'; +import { mappingFromFieldMap } from './utils/mapping_from_field_map'; + +export class EventLogResolver implements IEventLogResolver { + private readonly indexBootstrapper: IndexBootstrapper; + + constructor( + private readonly config: EventLogServiceConfig, + private readonly deps: EventLogServiceDependencies, + private readonly registry: IEventLogRegistry, + private readonly bootstrapLog: boolean + ) { + this.indexBootstrapper = this.createIndexBootstrapper(); + } + + public async resolve( + definition: IEventLogDefinition, + kibanaSpaceId: string + ): Promise>> { + const provider = this.resolveLogProvider(definition, kibanaSpaceId); + + if (this.bootstrapLog) { + await provider.bootstrapLog(); + } + + return provider.getLog(); + } + + private resolveLogProvider( + definition: IEventLogDefinition, + kibanaSpaceId: string + ): IEventLogProvider> { + const existingProvider = this.registry.get(definition, kibanaSpaceId); + if (existingProvider) { + return existingProvider; + } + + const indexSpec = this.createIndexSpec(definition, kibanaSpaceId); + const indexReader = this.createIndexReader(indexSpec); + const indexWriter = this.createIndexWriter(indexSpec); + const logBootstrapper = this.createEventLogBootstrapper(indexSpec); + const log = this.createEventLog(indexSpec, indexReader, indexWriter); + const logProvider = new EventLogProvider({ + log, + logBootstrapper, + indexWriter, + }); + + this.registry.add(definition, kibanaSpaceId, logProvider); + + return logProvider; + } + + private createIndexSpec( + definition: IEventLogDefinition, + kibanaSpaceId: string + ): IndexSpecification { + const { indexPrefix } = this.config; + const { eventLogName, eventSchema, ilmPolicy } = definition; + + const indexNames = IndexNames.create({ + indexPrefix, + logName: eventLogName, + kibanaSpaceId, + }); + + const indexMappings = mappingFromFieldMap(eventSchema.objectFields); + + return { indexNames, indexMappings, ilmPolicy }; + } + + private createIndexBootstrapper(): IndexBootstrapper { + const { clusterClient, logger } = this.deps; + + return new IndexBootstrapper({ + gateway: new IndexManagementGateway({ + elasticsearch: clusterClient.then((c) => c.asInternalUser), + logger, + }), + logger, + }); + } + + private createIndexReader(indexSpec: IndexSpecification): IndexReader { + const { clusterClient, logger } = this.deps; + const { indexNames } = indexSpec; + + return new IndexReader({ + indexName: indexNames.indexAliasPattern, + elasticsearch: clusterClient.then((c) => c.asInternalUser), // TODO: internal or current? + logger, + }); + } + + private createIndexWriter(indexSpec: IndexSpecification): IndexWriter { + const { clusterClient, logger } = this.deps; + const { isWriteEnabled } = this.config; + const { indexNames } = indexSpec; + + return new IndexWriter({ + indexName: indexNames.indexAliasName, + elasticsearch: clusterClient.then((c) => c.asInternalUser), // TODO: internal or current? + isWriteEnabled, + logger, + }); + } + + private createEventLogBootstrapper(indexSpec: IndexSpecification): EventLogBootstrapper { + const { logger } = this.deps; + const { isWriteEnabled } = this.config; + + return new EventLogBootstrapper({ + indexSpec, + indexBootstrapper: this.indexBootstrapper, + isWriteEnabled, + logger, + }); + } + + private createEventLog( + indexSpec: IndexSpecification, + indexReader: IndexReader, + indexWriter: IndexWriter + ): IEventLog> { + const { logger } = this.deps; + + return new EventLog>({ + indexNames: indexSpec.indexNames, + indexReader, + indexWriter, + logger, + }); + } +} diff --git a/x-pack/plugins/rule_registry/server/event_log/log/event_log_service.ts b/x-pack/plugins/rule_registry/server/event_log/log/event_log_service.ts new file mode 100644 index 00000000000000..b5b1d23f2e2158 --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/log/event_log_service.ts @@ -0,0 +1,67 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { KibanaRequest } from 'kibana/server'; + +import { Event, FieldMap } from '../event_schema'; +import { + EventLogServiceConfig, + EventLogServiceDependencies, + IEventLog, + IEventLogDefinition, + IEventLogResolver, + IEventLogService, + IScopedEventLogResolver, +} from './public_api'; + +import { EventLogRegistry } from './event_log_registry'; +import { EventLogResolver } from './event_log_resolver'; + +const BOOTSTRAP_BY_DEFAULT = true; + +interface ConstructorParams { + config: EventLogServiceConfig; + dependencies: EventLogServiceDependencies; +} + +export class EventLogService implements IEventLogService { + private readonly registry: EventLogRegistry; + + constructor(private readonly params: ConstructorParams) { + this.registry = new EventLogRegistry(); + } + + public getResolver(bootstrapLog = BOOTSTRAP_BY_DEFAULT): IEventLogResolver { + const { params, registry } = this; + const { config, dependencies } = params; + + return new EventLogResolver(config, dependencies, registry, bootstrapLog); + } + + public getScopedResolver( + request: KibanaRequest, + bootstrapLog = BOOTSTRAP_BY_DEFAULT + ): IScopedEventLogResolver { + const resolver = this.getResolver(bootstrapLog); + + return { + resolve: async ( + definition: IEventLogDefinition + ): Promise>> => { + const spaces = await this.params.dependencies.spacesService; + const spaceId = spaces.getSpaceId(request); + + const log = await resolver.resolve(definition, spaceId); + return log; + }, + }; + } + + public async stop(): Promise { + await this.registry.shutdown(); + } +} diff --git a/x-pack/plugins/rule_registry/server/event_log/log/event_logger.ts b/x-pack/plugins/rule_registry/server/event_log/log/event_logger.ts new file mode 100644 index 00000000000000..c6f88f49835d70 --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/log/event_logger.ts @@ -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 { DeepPartial } from '../utils/utility_types'; +import { mergeFields } from '../utils/fields'; +import { EventLoggerParams } from './internal_api'; +import { IEventLogger, IEventLoggerTemplate } from './public_api'; + +export class EventLogger implements IEventLogger { + private readonly params: EventLoggerParams; + private readonly ownTemplate: IEventLoggerTemplate; + + constructor(params: EventLoggerParams, template: IEventLoggerTemplate) { + this.params = params; + this.ownTemplate = template; + } + + public getLoggerTemplate(fields: DeepPartial): IEventLoggerTemplate { + return this.ownTemplate.getLoggerTemplate(fields); + } + + public getLogger(name: string, fields?: DeepPartial): IEventLogger { + return this.ownTemplate.getLogger(name, fields); + } + + public logEvent(fields: DeepPartial): void { + const { eventFields, indexWriter } = this.params; + + const event = mergeFields(eventFields, fields); + indexWriter.indexOne(event); + } +} diff --git a/x-pack/plugins/rule_registry/server/event_log/log/event_logger_template.ts b/x-pack/plugins/rule_registry/server/event_log/log/event_logger_template.ts new file mode 100644 index 00000000000000..3872a5c744269c --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/log/event_logger_template.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 { DeepPartial } from '../utils/utility_types'; +import { mergeFields } from '../utils/fields'; +import { IEventLogger, IEventLoggerTemplate } from './public_api'; +import { EventLoggerParams } from './internal_api'; +import { EventLogger } from './event_logger'; + +export class EventLoggerTemplate implements IEventLoggerTemplate { + private readonly params: EventLoggerParams; + + constructor(params: EventLoggerParams) { + this.params = params; + } + + public getLoggerTemplate(fields: DeepPartial): IEventLoggerTemplate { + const nextParams = this.getNextParams('', fields); + return new EventLoggerTemplate(nextParams); + } + + public getLogger(name: string, fields?: DeepPartial): IEventLogger { + const nextParams = this.getNextParams(name, fields); + const nextTemplate = new EventLoggerTemplate(nextParams); + return new EventLogger(nextParams, nextTemplate); + } + + private getNextParams( + extName: string, + extFields?: DeepPartial + ): EventLoggerParams { + const { indexNames, eventLoggerName, eventFields } = this.params; + + const baseName = eventLoggerName; + const nextName = [baseName, extName].filter(Boolean).join('.'); + + const baseFields = eventFields; + const nextFields = mergeFields(baseFields, extFields, { + // TODO: Define a schema for own fields used/set by event log. Add it to the base schema. + // Then maybe introduce a base type for TEvent. + 'kibana.rac.event_log.log_name': indexNames.logName, + 'kibana.rac.event_log.logger_name': nextName, + } as any); + + return { + ...this.params, + eventLoggerName: nextName, + eventFields: nextFields, + }; + } +} diff --git a/x-pack/plugins/rule_registry/server/event_log/log/event_query.ts b/x-pack/plugins/rule_registry/server/event_log/log/event_query.ts new file mode 100644 index 00000000000000..0eabe4be64837a --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/log/event_query.ts @@ -0,0 +1,27 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { estypes } from '@elastic/elasticsearch'; +import { IIndexReader } from '../elasticsearch'; +import { truthy } from '../utils/predicates'; +import { IEventQuery } from './public_api'; + +export interface EventQueryParams { + indexReader: IIndexReader; + request: estypes.SearchRequest; +} + +export class EventQuery implements IEventQuery { + constructor(private readonly params: EventQueryParams) {} + + public async execute(): Promise { + const { indexReader, request } = this.params; + + const response = await indexReader.search(request); + return response.body.hits.hits.map((hit) => hit._source).filter(truthy); + } +} diff --git a/x-pack/plugins/rule_registry/server/event_log/log/event_query_builder.ts b/x-pack/plugins/rule_registry/server/event_log/log/event_query_builder.ts new file mode 100644 index 00000000000000..48228ce5352b7b --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/log/event_query_builder.ts @@ -0,0 +1,110 @@ +/* + * Copyright 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 { getFlattenedObject } from '@kbn/std'; +import { estypes } from '@elastic/elasticsearch'; +import { esKuery } from '../../../../../../src/plugins/data/server'; + +import { DeepPartial } from '../utils/utility_types'; +import { mergeFields } from '../utils/fields'; +import { EventLogParams } from './internal_api'; +import { IEventQueryBuilder, IEventQuery, SortingParams, PaginationParams } from './public_api'; +import { EventQuery } from './event_query'; + +export class EventQueryBuilder implements IEventQueryBuilder { + private readonly params: EventLogParams; + private loggerName: string; + private fields: DeepPartial | null; + private kql: string; + private sorting: SortingParams; + private pagination: PaginationParams; + + constructor(params: EventLogParams) { + this.params = params; + this.loggerName = ''; + this.fields = null; + this.kql = ''; + this.sorting = [{ '@timestamp': { order: 'desc' } }, { 'event.sequence': { order: 'desc' } }]; + this.pagination = { page: 1, perPage: 20 }; + } + + public filterByLogger(loggerName: string): IEventQueryBuilder { + this.loggerName = loggerName; + return this; + } + + public filterByFields(fields: DeepPartial): IEventQueryBuilder { + this.fields = mergeFields(this.fields ?? {}, fields); + return this; + } + + public filterByKql(kql: string): IEventQueryBuilder { + this.kql = kql; + return this; + } + + public sortBy(params: SortingParams): IEventQueryBuilder { + this.sorting = params; + return this; + } + + public paginate(params: PaginationParams): IEventQueryBuilder { + this.pagination = params; + return this; + } + + public buildQuery(): IEventQuery { + const { indexReader } = this.params; + const { page, perPage } = this.pagination; + + const request: estypes.SearchRequest = { + track_total_hits: true, + body: { + from: (page - 1) * perPage, + size: perPage, + sort: this.sorting, + query: { + bool: { + filter: this.buildFilter(), + }, + }, + }, + }; + + return new EventQuery({ indexReader, request }); + } + + private buildFilter(): estypes.QueryContainer[] { + const result: estypes.QueryContainer[] = []; + + if (this.loggerName) { + result.push({ + term: { 'kibana.rac.event_log.logger_name': this.loggerName }, + }); + } + + if (this.fields) { + const flatFields = getFlattenedObject(this.fields); + Object.entries(flatFields) + .map(([key, value]) => { + const queryName = Array.isArray(value) ? 'terms' : 'term'; + return { [queryName]: { [key]: value } }; + }) + .forEach((query) => { + result.push(query); + }); + } + + if (this.kql) { + const dsl = esKuery.toElasticsearchQuery(esKuery.fromKueryExpression(this.kql)); + const queries = Array.isArray(dsl) ? dsl : [dsl]; + result.push(...queries); + } + + return result; + } +} diff --git a/x-pack/plugins/rule_registry/server/event_log/log/index.ts b/x-pack/plugins/rule_registry/server/event_log/log/index.ts new file mode 100644 index 00000000000000..e5593390733e4a --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/log/index.ts @@ -0,0 +1,10 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export * from './event_log_definition'; +export * from './event_log_service'; +export * from './public_api'; diff --git a/x-pack/plugins/rule_registry/server/event_log/log/internal_api.ts b/x-pack/plugins/rule_registry/server/event_log/log/internal_api.ts new file mode 100644 index 00000000000000..8db931b35912d1 --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/log/internal_api.ts @@ -0,0 +1,46 @@ +/* + * Copyright 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 { Logger } from 'kibana/server'; + +import { IIndexReader, IIndexWriter, IndexNames } from '../elasticsearch'; +import { Event, FieldMap } from '../event_schema'; +import { DeepPartial } from '../utils/utility_types'; +import { IEventLogDefinition, IEventLog } from './public_api'; + +export interface IEventLogRegistry { + get( + definition: IEventLogDefinition, + spaceId: string + ): IEventLogProvider> | null; + + add( + definition: IEventLogDefinition, + spaceId: string, + provider: IEventLogProvider> + ): void; + + shutdown(): Promise; +} + +export interface IEventLogProvider { + getLog(): IEventLog; + bootstrapLog(): Promise; + shutdownLog(): Promise; +} + +export interface EventLogParams { + indexNames: IndexNames; + indexReader: IIndexReader; + indexWriter: IIndexWriter; + logger: Logger; +} + +export interface EventLoggerParams extends EventLogParams { + eventLoggerName: string; + eventFields: DeepPartial; +} diff --git a/x-pack/plugins/rule_registry/server/event_log/log/public_api.ts b/x-pack/plugins/rule_registry/server/event_log/log/public_api.ts new file mode 100644 index 00000000000000..7807dd9ca6b36b --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/log/public_api.ts @@ -0,0 +1,113 @@ +/* + * Copyright 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 { estypes } from '@elastic/elasticsearch'; +import { IClusterClient, KibanaRequest, Logger } from 'kibana/server'; +import { SpacesServiceStart } from '../../../../spaces/server'; + +import { IlmPolicy, IndexNames, IndexSpecification } from '../elasticsearch'; +import { FieldMap, Event, EventSchema } from '../event_schema'; +import { DeepPartial } from '../utils/utility_types'; + +export { IlmPolicy, IndexSpecification }; + +// ------------------------------------------------------------------------------------------------- +// Definition API (defining log hierarchies as simple objects) + +export interface EventLogOptions { + name: string; + schema: EventSchema; + ilmPolicy?: IlmPolicy; +} + +export interface IEventLogDefinition { + eventLogName: string; + eventSchema: EventSchema; + ilmPolicy: IlmPolicy; + + defineChild( + options: EventLogOptions + ): IEventLogDefinition; +} + +// ------------------------------------------------------------------------------------------------- +// Resolving and bootstrapping API (creating runtime objects representing logs, bootstrapping indices) + +export interface EventLogServiceConfig { + indexPrefix: string; + isWriteEnabled: boolean; +} + +export interface EventLogServiceDependencies { + clusterClient: Promise; + spacesService: Promise; + logger: Logger; +} + +export interface IEventLogService { + getResolver(bootstrapLog?: boolean): IEventLogResolver; + getScopedResolver(request: KibanaRequest, bootstrapLog?: boolean): IScopedEventLogResolver; +} + +export interface IEventLogResolver { + resolve( + definition: IEventLogDefinition, + spaceId: string + ): Promise>>; +} + +export interface IScopedEventLogResolver { + resolve( + definition: IEventLogDefinition + ): Promise>>; +} + +export interface IEventLog extends IEventLoggerTemplate { + getNames(): IndexNames; + + getQueryBuilder(): IEventQueryBuilder; + + search( + request: estypes.SearchRequest + ): Promise>; +} + +// ------------------------------------------------------------------------------------------------- +// Write API (logging events) + +export interface IEventLoggerTemplate { + getLoggerTemplate(fields: DeepPartial): IEventLoggerTemplate; + getLogger(name: string, fields?: DeepPartial): IEventLogger; +} + +export interface IEventLogger extends IEventLoggerTemplate { + logEvent(fields: DeepPartial): void; +} + +// ------------------------------------------------------------------------------------------------- +// Read API (searching, filtering, sorting, pagination, aggregation over events) + +export interface IEventQueryBuilder { + filterByLogger(loggerName: string): IEventQueryBuilder; + filterByFields(fields: DeepPartial): IEventQueryBuilder; + filterByKql(kql: string): IEventQueryBuilder; + sortBy(params: SortingParams): IEventQueryBuilder; + paginate(params: PaginationParams): IEventQueryBuilder; + + buildQuery(): IEventQuery; +} + +export type SortingParams = estypes.Sort; + +export interface PaginationParams { + page: number; + perPage: number; +} + +export interface IEventQuery { + execute(): Promise; +} diff --git a/x-pack/plugins/rule_registry/server/event_log/log/utils/mapping_from_field_map.ts b/x-pack/plugins/rule_registry/server/event_log/log/utils/mapping_from_field_map.ts new file mode 100644 index 00000000000000..fd5dc3ae022881 --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/log/utils/mapping_from_field_map.ts @@ -0,0 +1,33 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { set } from '@elastic/safer-lodash-set'; +import { FieldMap } from '../../../../common/field_map'; +import { IndexMappings } from '../../elasticsearch'; + +export function mappingFromFieldMap(fieldMap: FieldMap): IndexMappings { + const mappings = { + dynamic: 'strict' as const, + properties: {}, + }; + + const fields = Object.keys(fieldMap).map((key) => { + const field = fieldMap[key]; + return { + name: key, + ...field, + }; + }); + + fields.forEach((field) => { + const { name, required, array, ...rest } = field; + + set(mappings.properties, field.name.split('.').join('.properties.'), rest); + }); + + return mappings; +} diff --git a/x-pack/plugins/rule_registry/server/event_log/utils/fields.ts b/x-pack/plugins/rule_registry/server/event_log/utils/fields.ts new file mode 100644 index 00000000000000..4f140cfb3434f1 --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/utils/fields.ts @@ -0,0 +1,18 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { merge } from 'lodash'; +import { DeepPartial } from './utility_types'; + +export const mergeFields = ( + base: DeepPartial, + ext1?: DeepPartial, + ext2?: DeepPartial, + ext3?: DeepPartial +): DeepPartial => { + return merge({}, base, ext1 ?? {}, ext2 ?? {}, ext3 ?? {}); +}; diff --git a/x-pack/plugins/rule_registry/server/event_log/utils/predicates.ts b/x-pack/plugins/rule_registry/server/event_log/utils/predicates.ts new file mode 100644 index 00000000000000..40daac1fedcc63 --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/utils/predicates.ts @@ -0,0 +1,16 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export function nonNullable(value: T): value is NonNullable { + return value !== null && value !== undefined; +} + +export type Truthy = T extends false | '' | 0 | null | undefined ? never : T; // from lodash + +export function truthy(value: T): value is Truthy { + return Boolean(value); +} diff --git a/x-pack/plugins/rule_registry/server/event_log/utils/ready_signal.test.ts b/x-pack/plugins/rule_registry/server/event_log/utils/ready_signal.test.ts new file mode 100644 index 00000000000000..f01d438ce79a00 --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/utils/ready_signal.test.ts @@ -0,0 +1,22 @@ +/* + * Copyright 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 { createReadySignal, ReadySignal } from './ready_signal'; + +describe('ReadySignal', () => { + let readySignal: ReadySignal; + + beforeEach(() => { + readySignal = createReadySignal(); + }); + + test('works as expected', async () => { + readySignal.signal(42); + const ready = await readySignal.wait(); + expect(ready).toBe(42); + }); +}); diff --git a/x-pack/plugins/rule_registry/server/event_log/utils/ready_signal.ts b/x-pack/plugins/rule_registry/server/event_log/utils/ready_signal.ts new file mode 100644 index 00000000000000..0512def2b59779 --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/utils/ready_signal.ts @@ -0,0 +1,29 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export interface ReadySignal { + wait(): Promise; + signal(value: T): void; +} + +export function createReadySignal(): ReadySignal { + let resolver: (value: T) => void; + + const promise = new Promise((resolve) => { + resolver = resolve; + }); + + async function wait(): Promise { + return await promise; + } + + function signal(value: T) { + resolver(value); + } + + return { wait, signal }; +} diff --git a/x-pack/plugins/rule_registry/server/event_log/utils/utility_types.ts b/x-pack/plugins/rule_registry/server/event_log/utils/utility_types.ts new file mode 100644 index 00000000000000..78e145740da544 --- /dev/null +++ b/x-pack/plugins/rule_registry/server/event_log/utils/utility_types.ts @@ -0,0 +1,12 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export type DeepWriteable = { -readonly [P in keyof T]: DeepWriteable }; + +export type DeepPartial = { + [P in keyof T]?: T[P] extends Array ? Array> : DeepPartial; +}; diff --git a/x-pack/plugins/rule_registry/server/index.ts b/x-pack/plugins/rule_registry/server/index.ts index b51ba3e10f91a9..9547f165cd7058 100644 --- a/x-pack/plugins/rule_registry/server/index.ts +++ b/x-pack/plugins/rule_registry/server/index.ts @@ -5,27 +5,15 @@ * 2.0. */ -import { schema, TypeOf } from '@kbn/config-schema'; import { PluginInitializerContext } from 'src/core/server'; import { RuleRegistryPlugin } from './plugin'; +export * from './config'; export type { RuleRegistryPluginSetupContract, RuleRegistryPluginStartContract } from './plugin'; export { RuleDataClient } from './rule_data_client'; export { IRuleDataClient } from './rule_data_client/types'; export { getRuleExecutorData, RuleExecutorData } from './utils/get_rule_executor_data'; export { createLifecycleRuleTypeFactory } from './utils/create_lifecycle_rule_type_factory'; -export const config = { - schema: schema.object({ - enabled: schema.boolean({ defaultValue: true }), - write: schema.object({ - enabled: schema.boolean({ defaultValue: true }), - }), - index: schema.string({ defaultValue: '.alerts' }), - }), -}; - -export type RuleRegistryPluginConfig = TypeOf; - export const plugin = (initContext: PluginInitializerContext) => new RuleRegistryPlugin(initContext); diff --git a/x-pack/plugins/rule_registry/server/plugin.ts b/x-pack/plugins/rule_registry/server/plugin.ts index 3c645f98f5c719..043b07f9d67c12 100644 --- a/x-pack/plugins/rule_registry/server/plugin.ts +++ b/x-pack/plugins/rule_registry/server/plugin.ts @@ -5,45 +5,99 @@ * 2.0. */ -import { PluginInitializerContext, Plugin, CoreSetup } from 'src/core/server'; +import { PluginInitializerContext, Plugin, CoreSetup, Logger } from 'src/core/server'; +import { SpacesPluginStart } from '../../spaces/server'; + +import { RuleRegistryPluginConfig } from './config'; import { RuleDataPluginService } from './rule_data_plugin_service'; -import { RuleRegistryPluginConfig } from '.'; +import { EventLogService, IEventLogService } from './event_log'; + +// eslint-disable-next-line @typescript-eslint/no-empty-interface +interface RuleRegistryPluginSetupDependencies {} + +interface RuleRegistryPluginStartDependencies { + spaces: SpacesPluginStart; +} + +export interface RuleRegistryPluginSetupContract { + ruleDataService: RuleDataPluginService; + eventLogService: IEventLogService; +} -export type RuleRegistryPluginSetupContract = RuleDataPluginService; export type RuleRegistryPluginStartContract = void; -export class RuleRegistryPlugin implements Plugin { - constructor(private readonly initContext: PluginInitializerContext) { - this.initContext = initContext; +export class RuleRegistryPlugin + implements + Plugin< + RuleRegistryPluginSetupContract, + RuleRegistryPluginStartContract, + RuleRegistryPluginSetupDependencies, + RuleRegistryPluginStartDependencies + > { + private readonly config: RuleRegistryPluginConfig; + private readonly logger: Logger; + private eventLogService: EventLogService | null; + + constructor(initContext: PluginInitializerContext) { + this.config = initContext.config.get(); + this.logger = initContext.logger.get(); + this.eventLogService = null; } - public setup(core: CoreSetup): RuleRegistryPluginSetupContract { - const config = this.initContext.config.get(); + public setup( + core: CoreSetup + ): RuleRegistryPluginSetupContract { + const { config, logger } = this; - const logger = this.initContext.logger.get(); + const startDependencies = core.getStartServices().then(([coreStart, pluginStart]) => { + return { + core: coreStart, + ...pluginStart, + }; + }); - const service = new RuleDataPluginService({ + const ruleDataService = new RuleDataPluginService({ logger, isWriteEnabled: config.write.enabled, index: config.index, getClusterClient: async () => { - const [coreStart] = await core.getStartServices(); - - return coreStart.elasticsearch.client.asInternalUser; + const deps = await startDependencies; + return deps.core.elasticsearch.client.asInternalUser; }, }); - service.init().catch((originalError) => { + ruleDataService.init().catch((originalError) => { const error = new Error('Failed installing assets'); // @ts-ignore error.stack = originalError.stack; logger.error(error); }); - return service; + const eventLogService = new EventLogService({ + config: { + indexPrefix: this.config.index, + isWriteEnabled: this.config.write.enabled, + }, + dependencies: { + clusterClient: startDependencies.then((deps) => deps.core.elasticsearch.client), + spacesService: startDependencies.then((deps) => deps.spaces.spacesService), + logger: logger.get('eventLog'), + }, + }); + + this.eventLogService = eventLogService; + return { ruleDataService, eventLogService }; } public start(): RuleRegistryPluginStartContract {} - public stop() {} + public stop() { + const { eventLogService, logger } = this; + + if (eventLogService) { + eventLogService.stop().catch((e) => { + logger.error(e); + }); + } + } } diff --git a/x-pack/plugins/rule_registry/tsconfig.json b/x-pack/plugins/rule_registry/tsconfig.json index 707e1ccb98dad9..5aefe9769da22b 100644 --- a/x-pack/plugins/rule_registry/tsconfig.json +++ b/x-pack/plugins/rule_registry/tsconfig.json @@ -10,7 +10,9 @@ "include": ["common/**/*", "server/**/*", "public/**/*", "../../../typings/**/*"], "references": [ { "path": "../../../src/core/tsconfig.json" }, + { "path": "../../../src/plugins/data/tsconfig.json" }, { "path": "../alerting/tsconfig.json" }, + { "path": "../spaces/tsconfig.json" }, { "path": "../triggers_actions_ui/tsconfig.json" } ] } From 57f59bd15dbb2075c4d8c7b93ab9bb4920248d6a Mon Sep 17 00:00:00 2001 From: Paul Tavares <56442535+paul-tavares@users.noreply.github.com> Date: Thu, 27 May 2021 11:55:50 -0400 Subject: [PATCH 13/14] [Security solution][Endpoint] Add Host Isolation related data to the endpoint generator and test data loader (#100727) * Generate random isolation values for endpoint metadata * Generator for Fleet Actions * Added creation of actions to the index test data loader --- .../data_generators/base_data_generator.ts | 19 ++++++ .../data_generators/fleet_action_generator.ts | 62 +++++++++++++++++++ .../common/endpoint/generate_data.ts | 6 +- .../common/endpoint/index_data.ts | 45 ++++++++++++++ .../common/endpoint/types/actions.ts | 15 +++++ 5 files changed, 145 insertions(+), 2 deletions(-) create mode 100644 x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_action_generator.ts 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 c0888a6c2a4bd4..d1b107b5396dd5 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 @@ -9,6 +9,8 @@ import seedrandom from 'seedrandom'; import uuid from 'uuid'; const OS_FAMILY = ['windows', 'macos', 'linux']; +/** Array of 14 day offsets */ +const DAY_OFFSETS = Array.from({ length: 14 }, (_, i) => 8.64e7 * (i + 1)); /** * A generic base class to assist in creating domain specific data generators. It includes @@ -33,6 +35,23 @@ export class BaseDataGenerator { throw new Error('method not implemented!'); } + /** Returns a future ISO date string */ + protected randomFutureDate(from?: Date): string { + const now = from ? from.getTime() : Date.now(); + return new Date(now + this.randomChoice(DAY_OFFSETS)).toISOString(); + } + + /** Returns a past ISO date string */ + protected randomPastDate(from?: Date): string { + const now = from ? from.getTime() : Date.now(); + return new Date(now - this.randomChoice(DAY_OFFSETS)).toISOString(); + } + + /** Generate either `true` or `false` */ + protected randomBoolean(): boolean { + return Math.random() < 0.5; + } + /** generate random OS family value */ protected randomOSFamily(): string { return this.randomChoice(OS_FAMILY); 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 new file mode 100644 index 00000000000000..af799de782f48c --- /dev/null +++ b/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_action_generator.ts @@ -0,0 +1,62 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { DeepPartial } from 'utility-types'; +import { merge } from 'lodash'; +import { BaseDataGenerator } from './base_data_generator'; +import { EndpointAction, EndpointActionResponse, ISOLATION_ACTIONS } from '../types'; + +const ISOLATION_COMMANDS: ISOLATION_ACTIONS[] = ['isolate', 'unisolate']; + +export class FleetActionGenerator extends BaseDataGenerator { + /** Generate an Action */ + generate(overrides: DeepPartial = {}): EndpointAction { + const timeStamp = new Date(this.randomPastDate()); + + return merge( + { + action_id: this.randomUUID(), + '@timestamp': timeStamp.toISOString(), + expiration: this.randomFutureDate(timeStamp), + type: 'INPUT_ACTION', + input_type: 'endpoint', + agents: [this.randomUUID()], + user_id: 'elastic', + data: { + command: this.randomIsolateCommand(), + comment: this.randomString(15), + }, + }, + overrides + ); + } + + /** Generates an action response */ + generateResponse(overrides: DeepPartial = {}): EndpointActionResponse { + const timeStamp = new Date(); + + return merge( + { + action_data: { + command: this.randomIsolateCommand(), + comment: '', + }, + action_id: this.randomUUID(), + agent_id: this.randomUUID(), + started_at: this.randomPastDate(), + completed_at: timeStamp.toISOString(), + error: 'some error happen', + '@timestamp': timeStamp.toISOString(), + }, + overrides + ); + } + + 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 fa7ee84441a9bc..436f1573639c83 100644 --- a/x-pack/plugins/security_solution/common/endpoint/generate_data.ts +++ b/x-pack/plugins/security_solution/common/endpoint/generate_data.ts @@ -439,6 +439,8 @@ export class EndpointDocGenerator extends BaseDataGenerator { private createHostData(): HostInfo { const hostName = this.randomHostname(); + const isIsolated = this.randomBoolean(); + return { agent: { version: this.randomVersion(), @@ -465,10 +467,10 @@ export class EndpointDocGenerator extends BaseDataGenerator { applied: this.randomChoice(APPLIED_POLICIES), }, configuration: { - isolation: false, + isolation: isIsolated, }, state: { - isolation: false, + isolation: isIsolated, }, }, }; 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 0dc7891560c2d8..021b9bcb1ecccf 100644 --- a/x-pack/plugins/security_solution/common/endpoint/index_data.ts +++ b/x-pack/plugins/security_solution/common/endpoint/index_data.ts @@ -28,8 +28,10 @@ import { policyFactory as policyConfigFactory } from './models/policy_config'; import { 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'; const fleetAgentGenerator = new FleetAgentGenerator(); +const fleetActionGenerator = new FleetActionGenerator(); export async function indexHostsAndAlerts( client: Client, @@ -175,6 +177,9 @@ async function indexHostDocs({ }, }, }; + + // Create some actions for this Host + await indexFleetActionsForHost(client, hostMetadata); } await client.index({ @@ -397,3 +402,43 @@ const indexFleetAgentForHost = async ( return agentDoc; }; + +const indexFleetActionsForHost = async ( + esClient: Client, + endpointHost: HostMetadata +): Promise => { + const ES_INDEX_OPTIONS = { headers: { 'X-elastic-product-origin': 'fleet' } }; + const agentId = endpointHost.elastic.agent.id; + + for (let i = 0; i < 5; i++) { + // create an action + const isolateAction = fleetActionGenerator.generate({ + data: { comment: 'data generator: this host is bad' }, + }); + + isolateAction.agents = [agentId]; + + await esClient.index( + { + index: '.fleet-actions', + body: isolateAction, + }, + ES_INDEX_OPTIONS + ); + + // Create an action response for the above + const unIsolateAction = fleetActionGenerator.generateResponse({ + action_id: isolateAction.action_id, + agent_id: agentId, + action_data: isolateAction.data, + }); + + await esClient.index( + { + index: '.fleet-actions-results', + body: unIsolateAction, + }, + ES_INDEX_OPTIONS + ); + } +}; diff --git a/x-pack/plugins/security_solution/common/endpoint/types/actions.ts b/x-pack/plugins/security_solution/common/endpoint/types/actions.ts index 99dac5ea5cda67..fcfda9c9a30d94 100644 --- a/x-pack/plugins/security_solution/common/endpoint/types/actions.ts +++ b/x-pack/plugins/security_solution/common/endpoint/types/actions.ts @@ -24,6 +24,21 @@ export interface EndpointAction { }; } +export interface EndpointActionResponse { + '@timestamp': string; + /** The id of the action for which this response is associated with */ + action_id: string; + /** The agent id that sent this action response */ + agent_id: string; + started_at: string; + completed_at: string; + error: string; + action_data: { + command: ISOLATION_ACTIONS; + comment?: string; + }; +} + export type HostIsolationRequestBody = TypeOf; export interface HostIsolationResponse { From 1ceecd395801fc5ab1c99e7677209cc420ea5fa4 Mon Sep 17 00:00:00 2001 From: Anton Dosov Date: Thu, 27 May 2021 18:02:25 +0200 Subject: [PATCH 14/14] [Index patterns] Default index pattern REST API (#100691) --- docs/api/index-patterns.asciidoc | 9 +- docs/api/index-patterns/default-get.asciidoc | 55 ++++++++++++ docs/api/index-patterns/default-set.asciidoc | 84 +++++++++++++++++++ ...ublic.indexpatternsservice.getdefaultid.md | 13 +++ ...lugins-data-public.indexpatternsservice.md | 3 +- ...-public.indexpatternsservice.setdefault.md | 2 +- ...erver.indexpatternsservice.getdefaultid.md | 13 +++ ...lugins-data-server.indexpatternsservice.md | 3 +- ...-server.indexpatternsservice.setdefault.md | 2 +- ...rver.searchstrategydependencies.request.md | 11 +++ .../index_patterns/index_patterns.ts | 12 ++- src/plugins/data/public/public.api.md | 3 +- .../data/server/index_patterns/routes.ts | 2 + .../routes/default_index_pattern.ts | 78 +++++++++++++++++ src/plugins/data/server/server.api.md | 3 +- .../default_index_pattern.ts | 49 +++++++++++ .../default_index_pattern/index.ts | 15 ++++ .../apis/index_patterns/index.js | 1 + 18 files changed, 347 insertions(+), 11 deletions(-) create mode 100644 docs/api/index-patterns/default-get.asciidoc create mode 100644 docs/api/index-patterns/default-set.asciidoc create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.getdefaultid.md create mode 100644 docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsservice.getdefaultid.md create mode 100644 docs/development/plugins/data/server/kibana-plugin-plugins-data-server.searchstrategydependencies.request.md create mode 100644 src/plugins/data/server/index_patterns/routes/default_index_pattern.ts create mode 100644 test/api_integration/apis/index_patterns/default_index_pattern/default_index_pattern.ts create mode 100644 test/api_integration/apis/index_patterns/default_index_pattern/index.ts diff --git a/docs/api/index-patterns.asciidoc b/docs/api/index-patterns.asciidoc index 47906e17611380..79d2f164fb8c3b 100644 --- a/docs/api/index-patterns.asciidoc +++ b/docs/api/index-patterns.asciidoc @@ -15,13 +15,16 @@ The following index patterns APIs are available: ** <> to create {kib} index pattern ** <> to partially updated {kib} index pattern ** <> to delete {kib} index pattern +* Default index pattern + ** <> to retrieve a default index pattern + ** <> to set a default index pattern * Fields - ** <> to change field metadata, such as `count`, `customLabel` and `format`. - - + ** <> to change field metadata, such as `count`, `customLabel` and `format` include::index-patterns/get.asciidoc[] include::index-patterns/create.asciidoc[] include::index-patterns/update.asciidoc[] include::index-patterns/delete.asciidoc[] +include::index-patterns/default-get.asciidoc[] +include::index-patterns/default-set.asciidoc[] include::index-patterns/update-fields.asciidoc[] diff --git a/docs/api/index-patterns/default-get.asciidoc b/docs/api/index-patterns/default-get.asciidoc new file mode 100644 index 00000000000000..5c7e8e01ce3990 --- /dev/null +++ b/docs/api/index-patterns/default-get.asciidoc @@ -0,0 +1,55 @@ +[[index-patterns-api-default-get]] +=== Get default index pattern API +++++ +Get default index pattern +++++ + +experimental[] Retrieve a default index pattern ID. Kibana UI uses default index pattern unless user picks a different one. + +[[index-patterns-api-default-get-request]] +==== Request + +`GET :/api/index_patterns/default` + +`GET :/s//api/index_patterns/default` + +[[index-patterns-api-default-get-params]] +==== Path parameters + +`space_id`:: +(Optional, string) An identifier for the space. If `space_id` is not provided in the URL, the default space is used. + +[[index-patterns-api-default-get-codes]] +==== Response code + +`200`:: +Indicates a successful call. + +[[index-patterns-api-default-get-example]] +==== Example + +Retrieve the default index pattern id: + +[source,sh] +-------------------------------------------------- +$ curl -X GET api/index_patterns/default +-------------------------------------------------- +// KIBANA + +The API returns an ID of a default index pattern: + +[source,sh] +-------------------------------------------------- +{ + "index_pattern_id": "..." +} +-------------------------------------------------- + +In case there is no default index pattern, the API returns: + +[source,sh] +-------------------------------------------------- +{ + "index_pattern_id": null +} +-------------------------------------------------- diff --git a/docs/api/index-patterns/default-set.asciidoc b/docs/api/index-patterns/default-set.asciidoc new file mode 100644 index 00000000000000..3b3cec6be6324b --- /dev/null +++ b/docs/api/index-patterns/default-set.asciidoc @@ -0,0 +1,84 @@ +[[index-patterns-api-default-set]] +=== Set default index pattern API +++++ +Set default index pattern +++++ + +experimental[] Set a default index pattern ID. Kibana UI will use default index pattern unless user picks a different one. +The API doesn't validate if given `index_pattern_id` is a valid id. + +[[index-patterns-api-default-set-request]] +==== Request + +`POST :/api/index_patterns/default` + +`POST :/s//api/index_patterns/default` + +[[index-patterns-api-default-set-params]] +==== Path parameters + +`space_id`:: +(Optional, string) An identifier for the space. If `space_id` is not provided in the URL, the default space is used. + +[[index-patterns-api-default-set-body]] +==== Request body + +`index_pattern_id`:: (Required, `string` or `null`) Sets a default index pattern id. Use `null` to unset a default index pattern. + +`force`:: (Optional, boolean) Updates existing default index pattern id. The default is `false`. + + +[[index-patterns-api-default-set-codes]] +==== Response code + +`200`:: +Indicates a successful call. + +[[index-patterns-api-default-set-example]] +==== Example + +Set the default index pattern id if none is set: + +[source,sh] +-------------------------------------------------- +$ curl -X POST api/index_patterns/default +{ + "index_pattern_id": "..." +} +-------------------------------------------------- +// KIBANA + + +Upsert the default index pattern: + +[source,sh] +-------------------------------------------------- +$ curl -X POST api/index_patterns/default +{ + "index_pattern_id": "...", + "force": true +} +-------------------------------------------------- +// KIBANA + +Unset the default index pattern: + +[source,sh] +-------------------------------------------------- +$ curl -X POST api/index_patterns/default +{ + "index_pattern_id": null, + "force": true +} +-------------------------------------------------- +// KIBANA + +The API returns: + +[source,sh] +-------------------------------------------------- +{ + "acknowledged": true +} +-------------------------------------------------- + diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.getdefaultid.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.getdefaultid.md new file mode 100644 index 00000000000000..3b64ce079b5222 --- /dev/null +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.getdefaultid.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [IndexPatternsService](./kibana-plugin-plugins-data-public.indexpatternsservice.md) > [getDefaultId](./kibana-plugin-plugins-data-public.indexpatternsservice.getdefaultid.md) + +## IndexPatternsService.getDefaultId property + +Get default index pattern id + +Signature: + +```typescript +getDefaultId: () => Promise; +``` diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.md index 1511de18cab513..26b393a5fb5b63 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.md @@ -27,6 +27,7 @@ export declare class IndexPatternsService | [get](./kibana-plugin-plugins-data-public.indexpatternsservice.get.md) | | (id: string) => Promise<IndexPattern> | Get an index pattern by id. Cache optimized | | [getCache](./kibana-plugin-plugins-data-public.indexpatternsservice.getcache.md) | | () => Promise<SavedObject<IndexPatternSavedObjectAttrs>[] | null | undefined> | | | [getDefault](./kibana-plugin-plugins-data-public.indexpatternsservice.getdefault.md) | | () => Promise<IndexPattern | null> | Get default index pattern | +| [getDefaultId](./kibana-plugin-plugins-data-public.indexpatternsservice.getdefaultid.md) | | () => Promise<string | null> | Get default index pattern id | | [getFieldsForIndexPattern](./kibana-plugin-plugins-data-public.indexpatternsservice.getfieldsforindexpattern.md) | | (indexPattern: IndexPattern | IndexPatternSpec, options?: GetFieldsOptions | undefined) => Promise<any> | Get field list by providing an index patttern (or spec) | | [getFieldsForWildcard](./kibana-plugin-plugins-data-public.indexpatternsservice.getfieldsforwildcard.md) | | (options: GetFieldsOptions) => Promise<any> | Get field list by providing { pattern } | | [getIds](./kibana-plugin-plugins-data-public.indexpatternsservice.getids.md) | | (refresh?: boolean) => Promise<string[]> | Get list of index pattern ids | @@ -34,7 +35,7 @@ export declare class IndexPatternsService | [getTitles](./kibana-plugin-plugins-data-public.indexpatternsservice.gettitles.md) | | (refresh?: boolean) => Promise<string[]> | Get list of index pattern titles | | [refreshFields](./kibana-plugin-plugins-data-public.indexpatternsservice.refreshfields.md) | | (indexPattern: IndexPattern) => Promise<void> | Refresh field list for a given index pattern | | [savedObjectToSpec](./kibana-plugin-plugins-data-public.indexpatternsservice.savedobjecttospec.md) | | (savedObject: SavedObject<IndexPatternAttributes>) => IndexPatternSpec | Converts index pattern saved object to index pattern spec | -| [setDefault](./kibana-plugin-plugins-data-public.indexpatternsservice.setdefault.md) | | (id: string, force?: boolean) => Promise<void> | Optionally set default index pattern, unless force = true | +| [setDefault](./kibana-plugin-plugins-data-public.indexpatternsservice.setdefault.md) | | (id: string | null, force?: boolean) => Promise<void> | Optionally set default index pattern, unless force = true | ## Methods diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.setdefault.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.setdefault.md index 2bf8eaa03d1ae9..1d216e781c7bb6 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.setdefault.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.setdefault.md @@ -9,5 +9,5 @@ Optionally set default index pattern, unless force = true Signature: ```typescript -setDefault: (id: string, force?: boolean) => Promise; +setDefault: (id: string | null, force?: boolean) => Promise; ``` diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsservice.getdefaultid.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsservice.getdefaultid.md new file mode 100644 index 00000000000000..107d1e4e94a0dd --- /dev/null +++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsservice.getdefaultid.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [IndexPatternsService](./kibana-plugin-plugins-data-server.indexpatternsservice.md) > [getDefaultId](./kibana-plugin-plugins-data-server.indexpatternsservice.getdefaultid.md) + +## IndexPatternsService.getDefaultId property + +Get default index pattern id + +Signature: + +```typescript +getDefaultId: () => Promise; +``` diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsservice.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsservice.md index d55a6e9b325a20..f5e845ced3cd13 100644 --- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsservice.md +++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsservice.md @@ -27,6 +27,7 @@ export declare class IndexPatternsService | [get](./kibana-plugin-plugins-data-server.indexpatternsservice.get.md) | | (id: string) => Promise<IndexPattern> | Get an index pattern by id. Cache optimized | | [getCache](./kibana-plugin-plugins-data-server.indexpatternsservice.getcache.md) | | () => Promise<SavedObject<IndexPatternSavedObjectAttrs>[] | null | undefined> | | | [getDefault](./kibana-plugin-plugins-data-server.indexpatternsservice.getdefault.md) | | () => Promise<IndexPattern | null> | Get default index pattern | +| [getDefaultId](./kibana-plugin-plugins-data-server.indexpatternsservice.getdefaultid.md) | | () => Promise<string | null> | Get default index pattern id | | [getFieldsForIndexPattern](./kibana-plugin-plugins-data-server.indexpatternsservice.getfieldsforindexpattern.md) | | (indexPattern: IndexPattern | IndexPatternSpec, options?: GetFieldsOptions | undefined) => Promise<any> | Get field list by providing an index patttern (or spec) | | [getFieldsForWildcard](./kibana-plugin-plugins-data-server.indexpatternsservice.getfieldsforwildcard.md) | | (options: GetFieldsOptions) => Promise<any> | Get field list by providing { pattern } | | [getIds](./kibana-plugin-plugins-data-server.indexpatternsservice.getids.md) | | (refresh?: boolean) => Promise<string[]> | Get list of index pattern ids | @@ -34,7 +35,7 @@ export declare class IndexPatternsService | [getTitles](./kibana-plugin-plugins-data-server.indexpatternsservice.gettitles.md) | | (refresh?: boolean) => Promise<string[]> | Get list of index pattern titles | | [refreshFields](./kibana-plugin-plugins-data-server.indexpatternsservice.refreshfields.md) | | (indexPattern: IndexPattern) => Promise<void> | Refresh field list for a given index pattern | | [savedObjectToSpec](./kibana-plugin-plugins-data-server.indexpatternsservice.savedobjecttospec.md) | | (savedObject: SavedObject<IndexPatternAttributes>) => IndexPatternSpec | Converts index pattern saved object to index pattern spec | -| [setDefault](./kibana-plugin-plugins-data-server.indexpatternsservice.setdefault.md) | | (id: string, force?: boolean) => Promise<void> | Optionally set default index pattern, unless force = true | +| [setDefault](./kibana-plugin-plugins-data-server.indexpatternsservice.setdefault.md) | | (id: string | null, force?: boolean) => Promise<void> | Optionally set default index pattern, unless force = true | ## Methods diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsservice.setdefault.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsservice.setdefault.md index 708d645a79f1a7..6dc584341eef3e 100644 --- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsservice.setdefault.md +++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsservice.setdefault.md @@ -9,5 +9,5 @@ Optionally set default index pattern, unless force = true Signature: ```typescript -setDefault: (id: string, force?: boolean) => Promise; +setDefault: (id: string | null, force?: boolean) => Promise; ``` diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.searchstrategydependencies.request.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.searchstrategydependencies.request.md new file mode 100644 index 00000000000000..18163bfebde7e2 --- /dev/null +++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.searchstrategydependencies.request.md @@ -0,0 +1,11 @@ + + +[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [SearchStrategyDependencies](./kibana-plugin-plugins-data-server.searchstrategydependencies.md) > [request](./kibana-plugin-plugins-data-server.searchstrategydependencies.request.md) + +## SearchStrategyDependencies.request property + +Signature: + +```typescript +request: KibanaRequest; +``` diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts index 04d27851377193..66e66051a6370e 100644 --- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts +++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts @@ -192,7 +192,7 @@ export class IndexPatternsService { * Get default index pattern */ getDefault = async () => { - const defaultIndexPatternId = await this.config.get('defaultIndex'); + const defaultIndexPatternId = await this.getDefaultId(); if (defaultIndexPatternId) { return await this.get(defaultIndexPatternId); } @@ -200,12 +200,20 @@ export class IndexPatternsService { return null; }; + /** + * Get default index pattern id + */ + getDefaultId = async (): Promise => { + const defaultIndexPatternId = await this.config.get('defaultIndex'); + return defaultIndexPatternId ?? null; + }; + /** * Optionally set default index pattern, unless force = true * @param id * @param force */ - setDefault = async (id: string, force = false) => { + setDefault = async (id: string | null, force = false) => { if (force || !this.config.get('defaultIndex')) { await this.config.set('defaultIndex', id); } diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md index 57aa2298039daa..fde7075d9e760e 100644 --- a/src/plugins/data/public/public.api.md +++ b/src/plugins/data/public/public.api.md @@ -1624,6 +1624,7 @@ export class IndexPatternsService { // (undocumented) getCache: () => Promise[] | null | undefined>; getDefault: () => Promise; + getDefaultId: () => Promise; getFieldsForIndexPattern: (indexPattern: IndexPattern | IndexPatternSpec, options?: GetFieldsOptions | undefined) => Promise; // Warning: (ae-forgotten-export) The symbol "GetFieldsOptions" needs to be exported by the entry point index.d.ts getFieldsForWildcard: (options: GetFieldsOptions) => Promise; @@ -1635,7 +1636,7 @@ export class IndexPatternsService { getTitles: (refresh?: boolean) => Promise; refreshFields: (indexPattern: IndexPattern) => Promise; savedObjectToSpec: (savedObject: SavedObject) => IndexPatternSpec; - setDefault: (id: string, force?: boolean) => Promise; + setDefault: (id: string | null, force?: boolean) => Promise; updateSavedObject(indexPattern: IndexPattern, saveAttempts?: number, ignoreErrors?: boolean): Promise; } diff --git a/src/plugins/data/server/index_patterns/routes.ts b/src/plugins/data/server/index_patterns/routes.ts index 84199fe60b997b..9bff590b54f1c1 100644 --- a/src/plugins/data/server/index_patterns/routes.ts +++ b/src/plugins/data/server/index_patterns/routes.ts @@ -20,6 +20,7 @@ import { registerGetScriptedFieldRoute } from './routes/scripted_fields/get_scri import { registerDeleteScriptedFieldRoute } from './routes/scripted_fields/delete_scripted_field'; import { registerUpdateScriptedFieldRoute } from './routes/scripted_fields/update_scripted_field'; import type { DataPluginStart, DataPluginStartDependencies } from '../plugin'; +import { registerManageDefaultIndexPatternRoutes } from './routes/default_index_pattern'; export function registerRoutes( http: HttpServiceSetup, @@ -42,6 +43,7 @@ export function registerRoutes( registerGetIndexPatternRoute(router, getStartServices); registerDeleteIndexPatternRoute(router, getStartServices); registerUpdateIndexPatternRoute(router, getStartServices); + registerManageDefaultIndexPatternRoutes(router, getStartServices); // Fields API registerUpdateFieldsRoute(router, getStartServices); diff --git a/src/plugins/data/server/index_patterns/routes/default_index_pattern.ts b/src/plugins/data/server/index_patterns/routes/default_index_pattern.ts new file mode 100644 index 00000000000000..cf5986943eb373 --- /dev/null +++ b/src/plugins/data/server/index_patterns/routes/default_index_pattern.ts @@ -0,0 +1,78 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. + */ + +import { schema } from '@kbn/config-schema'; +import { IRouter, StartServicesAccessor } from '../../../../../core/server'; +import type { DataPluginStart, DataPluginStartDependencies } from '../../plugin'; +import { handleErrors } from './util/handle_errors'; + +export const registerManageDefaultIndexPatternRoutes = ( + router: IRouter, + getStartServices: StartServicesAccessor +) => { + router.get( + { + path: '/api/index_patterns/default', + validate: {}, + }, + handleErrors(async (ctx, req, res) => { + const savedObjectsClient = ctx.core.savedObjects.client; + const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser; + const [, , { indexPatterns }] = await getStartServices(); + const indexPatternsService = await indexPatterns.indexPatternsServiceFactory( + savedObjectsClient, + elasticsearchClient + ); + + const defaultIndexPatternId = await indexPatternsService.getDefaultId(); + + return res.ok({ + body: { + index_pattern_id: defaultIndexPatternId, + }, + }); + }) + ); + + router.post( + { + path: '/api/index_patterns/default', + validate: { + body: schema.object({ + index_pattern_id: schema.nullable( + schema.string({ + minLength: 1, + maxLength: 1_000, + }) + ), + force: schema.boolean({ defaultValue: false }), + }), + }, + }, + handleErrors(async (ctx, req, res) => { + const savedObjectsClient = ctx.core.savedObjects.client; + const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser; + const [, , { indexPatterns }] = await getStartServices(); + const indexPatternsService = await indexPatterns.indexPatternsServiceFactory( + savedObjectsClient, + elasticsearchClient + ); + + const newDefaultId = req.body.index_pattern_id; + const force = req.body.force; + + await indexPatternsService.setDefault(newDefaultId, force); + + return res.ok({ + body: { + acknowledged: true, + }, + }); + }) + ); +}; diff --git a/src/plugins/data/server/server.api.md b/src/plugins/data/server/server.api.md index b1c90667c2d719..4abf4302521644 100644 --- a/src/plugins/data/server/server.api.md +++ b/src/plugins/data/server/server.api.md @@ -962,6 +962,7 @@ class IndexPatternsService { // (undocumented) getCache: () => Promise[] | null | undefined>; getDefault: () => Promise; + getDefaultId: () => Promise; getFieldsForIndexPattern: (indexPattern: IndexPattern | IndexPatternSpec, options?: GetFieldsOptions | undefined) => Promise; // Warning: (ae-forgotten-export) The symbol "GetFieldsOptions" needs to be exported by the entry point index.d.ts getFieldsForWildcard: (options: GetFieldsOptions) => Promise; @@ -973,7 +974,7 @@ class IndexPatternsService { getTitles: (refresh?: boolean) => Promise; refreshFields: (indexPattern: IndexPattern) => Promise; savedObjectToSpec: (savedObject: SavedObject_2) => IndexPatternSpec; - setDefault: (id: string, force?: boolean) => Promise; + setDefault: (id: string | null, force?: boolean) => Promise; updateSavedObject(indexPattern: IndexPattern, saveAttempts?: number, ignoreErrors?: boolean): Promise; } diff --git a/test/api_integration/apis/index_patterns/default_index_pattern/default_index_pattern.ts b/test/api_integration/apis/index_patterns/default_index_pattern/default_index_pattern.ts new file mode 100644 index 00000000000000..b12600f5ce4f3d --- /dev/null +++ b/test/api_integration/apis/index_patterns/default_index_pattern/default_index_pattern.ts @@ -0,0 +1,49 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0 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 expect from '@kbn/expect'; +import { FtrProviderContext } from '../../../ftr_provider_context'; + +export default function ({ getService }: FtrProviderContext) { + const supertest = getService('supertest'); + + describe('default index pattern api', () => { + const newId = () => `default-id-${Date.now()}-${Math.random()}`; + it('can set default index pattern', async () => { + const defaultId = newId(); + const response1 = await supertest.post('/api/index_patterns/default').send({ + index_pattern_id: defaultId, + force: true, + }); + expect(response1.status).to.be(200); + expect(response1.body.acknowledged).to.be(true); + + const response2 = await supertest.get('/api/index_patterns/default'); + expect(response2.status).to.be(200); + expect(response2.body.index_pattern_id).to.be(defaultId); + + const response3 = await supertest.post('/api/index_patterns/default').send({ + index_pattern_id: newId(), + // no force this time, so this new default shouldn't be set + }); + + expect(response3.status).to.be(200); + const response4 = await supertest.get('/api/index_patterns/default'); + expect(response4.body.index_pattern_id).to.be(defaultId); // original default id is used + + const response5 = await supertest.post('/api/index_patterns/default').send({ + index_pattern_id: null, + force: true, + }); + expect(response5.status).to.be(200); + + const response6 = await supertest.get('/api/index_patterns/default'); + expect(response6.body.index_pattern_id).to.be(null); + }); + }); +} diff --git a/test/api_integration/apis/index_patterns/default_index_pattern/index.ts b/test/api_integration/apis/index_patterns/default_index_pattern/index.ts new file mode 100644 index 00000000000000..7517c87ade25bf --- /dev/null +++ b/test/api_integration/apis/index_patterns/default_index_pattern/index.ts @@ -0,0 +1,15 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0 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 { FtrProviderContext } from '../../../ftr_provider_context'; + +export default function ({ loadTestFile }: FtrProviderContext) { + describe('default index pattern', () => { + loadTestFile(require.resolve('./default_index_pattern')); + }); +} diff --git a/test/api_integration/apis/index_patterns/index.js b/test/api_integration/apis/index_patterns/index.js index 8d279a57837032..9c1e1bba0ab9a5 100644 --- a/test/api_integration/apis/index_patterns/index.js +++ b/test/api_integration/apis/index_patterns/index.js @@ -14,5 +14,6 @@ export default function ({ loadTestFile }) { loadTestFile(require.resolve('./index_pattern_crud')); loadTestFile(require.resolve('./scripted_fields_crud')); loadTestFile(require.resolve('./fields_api')); + loadTestFile(require.resolve('./default_index_pattern')); }); }