From 49956ec243a2aad61a3c8ef6d59ee3743505f2e3 Mon Sep 17 00:00:00 2001 From: Gerard Soldevila Date: Tue, 24 Dec 2024 09:54:24 +0100 Subject: [PATCH] Sustainable Kibana Architecture: Move modules owned by `@elastic/logstash` (#202756) ## Summary This PR aims at relocating some of the Kibana modules (plugins and packages) into a new folder structure, according to the _Sustainable Kibana Architecture_ initiative. > [!IMPORTANT] > * We kindly ask you to: > * Manually fix the errors in the error section below (if there are any). > * Search for the `packages[\/\\]` and `plugins[\/\\]` patterns in the source code (Babel and Eslint config files), and update them appropriately. > * Manually review `.buildkite/scripts/pipelines/pull_request/pipeline.ts` to ensure that any CI pipeline customizations continue to be correctly applied after the changed path names > * Review all of the updated files, specially the `.ts` and `.js` files listed in the sections below, as some of them contain relative paths that have been updated. > * Think of potential impact of the move, including tooling and configuration files that can be pointing to the relocated modules. E.g.: > * customised eslint rules > * docs pointing to source code > [!NOTE] > * This PR has been auto-generated. > * Any manual contributions will be lost if the 'relocate' script is re-run. > * Try to obtain the missing reviews / approvals before applying manual fixes, and/or keep your changes in a .patch / git stash. > * Please use [#sustainable_kibana_architecture](https://elastic.slack.com/archives/C07TCKTA22E) Slack channel for feedback. #### 1 plugin(s) are going to be relocated: | Id | Target folder | | -- | ------------- | | `@kbn/logstash-plugin` | `x-pack/platform/plugins/private/logstash` |
Updated references ``` ./docs/developer/plugin-list.asciidoc ./package.json ./packages/kbn-repo-packages/package-map.json ./packages/kbn-synthetic-package-map/synthetic-packages.json ./packages/kbn-ts-projects/config-paths.json ./tsconfig.base.json ./tsconfig.base.type_check.json ./tsconfig.refs.json ./x-pack/.i18nrc.json ./x-pack/build/plugin/kibana/x-pack/.i18nrc.json ./x-pack/platform/plugins/private/logstash/jest.config.js ./yarn.lock ```
Updated relative paths ``` x-pack/platform/plugins/private/logstash/jest.config.js:10 x-pack/platform/plugins/private/logstash/tsconfig.json:3 ```
--- .github/CODEOWNERS | 4 ++-- docs/developer/plugin-list.asciidoc | 2 +- package.json | 2 +- tsconfig.base.json | 4 ++-- x-pack/.i18nrc.json | 2 +- .../logstash/common/constants/es_scroll_settings.ts | 0 .../plugins/private}/logstash/common/constants/index.ts | 0 .../private}/logstash/common/constants/index_names.ts | 0 .../private}/logstash/common/constants/monitoring.ts | 0 .../private}/logstash/common/constants/pagination.ts | 0 .../private}/logstash/common/constants/pipeline.ts | 0 .../plugins/private}/logstash/common/constants/plugin.ts | 0 .../plugins/private}/logstash/common/constants/routes.ts | 0 .../private}/logstash/common/constants/tooltips.ts | 0 .../plugins/private}/logstash/jest.config.js | 9 +++++---- .../plugins/private}/logstash/kibana.jsonc | 0 .../private}/logstash/public/application/breadcrumbs.js | 0 .../confirm_delete_pipeline_modal.test.js.snap | 0 .../__snapshots__/flex_item_setting.test.js.snap | 0 .../__snapshots__/form_label_with_icon_tip.test.js.snap | 0 .../__snapshots__/pipeline_editor.test.js.snap | 0 .../pipeline_editor/confirm_delete_pipeline_modal.js | 0 .../confirm_delete_pipeline_modal.test.js | 0 .../application/components/pipeline_editor/constants.js | 0 .../components/pipeline_editor/flex_item_setting.js | 0 .../components/pipeline_editor/flex_item_setting.test.js | 0 .../pipeline_editor/form_label_with_icon_tip.js | 0 .../pipeline_editor/form_label_with_icon_tip.test.js | 0 .../application/components/pipeline_editor/index.js | 0 .../components/pipeline_editor/pipeline_editor.js | 0 .../components/pipeline_editor/pipeline_editor.test.js | 0 .../__snapshots__/add_role_alert.test.js.snap | 0 .../__snapshots__/alert_call_out.test.js.snap | 0 .../__snapshots__/confirm_delete_modal.test.js.snap | 0 .../__snapshots__/enable_monitoring_alert.test.js.snap | 0 .../pipeline_list/__snapshots__/info_alerts.test.js.snap | 0 .../__snapshots__/pipelines_table.test.js.snap | 0 .../components/pipeline_list/add_role_alert.js | 0 .../components/pipeline_list/add_role_alert.test.js | 0 .../components/pipeline_list/alert_call_out.js | 0 .../components/pipeline_list/alert_call_out.test.js | 0 .../components/pipeline_list/confirm_delete_modal.js | 0 .../pipeline_list/confirm_delete_modal.test.js | 0 .../application/components/pipeline_list/constants.js | 0 .../components/pipeline_list/enable_monitoring_alert.js | 0 .../pipeline_list/enable_monitoring_alert.test.js | 0 .../public/application/components/pipeline_list/index.js | 0 .../application/components/pipeline_list/info_alerts.js | 0 .../components/pipeline_list/info_alerts.test.js | 0 .../components/pipeline_list/pipeline_list.js | 0 .../components/pipeline_list/pipeline_list.test.js | 0 .../components/pipeline_list/pipelines_table.js | 0 .../components/pipeline_list/pipelines_table.test.js | 0 .../private}/logstash/public/application/index.tsx | 0 .../logstash/public/application/pipeline_edit_view.tsx | 0 .../plugins/private}/logstash/public/index.ts | 0 .../public/lib/get_search_value/get_search_value.js | 0 .../logstash/public/lib/get_search_value/index.js | 0 .../private}/logstash/public/models/cluster/cluster.js | 0 .../private}/logstash/public/models/cluster/index.js | 0 .../private}/logstash/public/models/pipeline/index.js | 0 .../private}/logstash/public/models/pipeline/pipeline.js | 0 .../private}/logstash/public/models/pipeline/props.ts | 0 .../logstash/public/models/pipeline_list_item/index.js | 0 .../models/pipeline_list_item/pipeline_list_item.js | 0 .../plugins/private}/logstash/public/plugin.ts | 0 .../logstash/public/services/cluster/cluster_service.js | 0 .../private}/logstash/public/services/cluster/index.js | 0 .../plugins/private}/logstash/public/services/index.js | 0 .../private}/logstash/public/services/license/index.js | 0 .../public/services/license/logstash_license_service.js | 0 .../logstash/public/services/monitoring/index.js | 0 .../public/services/monitoring/monitoring_service.js | 0 .../private}/logstash/public/services/pipeline/index.js | 0 .../public/services/pipeline/pipeline_service.js | 0 .../private}/logstash/public/services/pipelines/index.js | 0 .../public/services/pipelines/pipelines_service.js | 0 .../plugins/private}/logstash/server/index.ts | 0 .../server/lib/check_license/check_license.test.ts | 0 .../logstash/server/lib/check_license/check_license.ts | 0 .../private}/logstash/server/lib/check_license/index.ts | 0 .../logstash/server/models/cluster/cluster.test.ts | 0 .../private}/logstash/server/models/cluster/cluster.ts | 0 .../private}/logstash/server/models/cluster/index.ts | 0 .../private}/logstash/server/models/pipeline/index.ts | 0 .../logstash/server/models/pipeline/pipeline.test.ts | 0 .../private}/logstash/server/models/pipeline/pipeline.ts | 0 .../logstash/server/models/pipeline_list_item/index.ts | 0 .../models/pipeline_list_item/pipeline_list_item.test.ts | 0 .../models/pipeline_list_item/pipeline_list_item.ts | 0 .../plugins/private}/logstash/server/plugin.ts | 0 .../private}/logstash/server/routes/cluster/index.ts | 0 .../private}/logstash/server/routes/cluster/load.ts | 0 .../plugins/private}/logstash/server/routes/index.ts | 0 .../private}/logstash/server/routes/pipeline/delete.ts | 0 .../private}/logstash/server/routes/pipeline/index.ts | 0 .../private}/logstash/server/routes/pipeline/load.ts | 0 .../private}/logstash/server/routes/pipeline/save.ts | 0 .../private}/logstash/server/routes/pipelines/delete.ts | 0 .../private}/logstash/server/routes/pipelines/index.ts | 0 .../private}/logstash/server/routes/pipelines/list.ts | 0 .../plugins/private}/logstash/server/types.ts | 0 .../plugins/private}/logstash/tsconfig.json | 2 +- yarn.lock | 2 +- 104 files changed, 14 insertions(+), 13 deletions(-) rename x-pack/{plugins => platform/plugins/private}/logstash/common/constants/es_scroll_settings.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/common/constants/index.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/common/constants/index_names.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/common/constants/monitoring.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/common/constants/pagination.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/common/constants/pipeline.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/common/constants/plugin.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/common/constants/routes.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/common/constants/tooltips.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/jest.config.js (55%) rename x-pack/{plugins => platform/plugins/private}/logstash/kibana.jsonc (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/breadcrumbs.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_editor/__snapshots__/confirm_delete_pipeline_modal.test.js.snap (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_editor/__snapshots__/flex_item_setting.test.js.snap (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_editor/__snapshots__/form_label_with_icon_tip.test.js.snap (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_editor/__snapshots__/pipeline_editor.test.js.snap (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_editor/confirm_delete_pipeline_modal.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_editor/confirm_delete_pipeline_modal.test.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_editor/constants.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_editor/flex_item_setting.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_editor/flex_item_setting.test.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_editor/form_label_with_icon_tip.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_editor/form_label_with_icon_tip.test.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_editor/index.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_editor/pipeline_editor.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_editor/pipeline_editor.test.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_list/__snapshots__/add_role_alert.test.js.snap (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_list/__snapshots__/alert_call_out.test.js.snap (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_list/__snapshots__/confirm_delete_modal.test.js.snap (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_list/__snapshots__/enable_monitoring_alert.test.js.snap (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_list/__snapshots__/info_alerts.test.js.snap (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_list/__snapshots__/pipelines_table.test.js.snap (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_list/add_role_alert.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_list/add_role_alert.test.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_list/alert_call_out.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_list/alert_call_out.test.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_list/confirm_delete_modal.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_list/confirm_delete_modal.test.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_list/constants.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_list/enable_monitoring_alert.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_list/enable_monitoring_alert.test.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_list/index.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_list/info_alerts.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_list/info_alerts.test.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_list/pipeline_list.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_list/pipeline_list.test.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_list/pipelines_table.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/components/pipeline_list/pipelines_table.test.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/index.tsx (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/application/pipeline_edit_view.tsx (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/index.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/lib/get_search_value/get_search_value.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/lib/get_search_value/index.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/models/cluster/cluster.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/models/cluster/index.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/models/pipeline/index.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/models/pipeline/pipeline.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/models/pipeline/props.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/models/pipeline_list_item/index.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/models/pipeline_list_item/pipeline_list_item.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/plugin.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/services/cluster/cluster_service.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/services/cluster/index.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/services/index.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/services/license/index.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/services/license/logstash_license_service.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/services/monitoring/index.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/services/monitoring/monitoring_service.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/services/pipeline/index.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/services/pipeline/pipeline_service.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/services/pipelines/index.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/public/services/pipelines/pipelines_service.js (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/server/index.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/server/lib/check_license/check_license.test.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/server/lib/check_license/check_license.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/server/lib/check_license/index.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/server/models/cluster/cluster.test.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/server/models/cluster/cluster.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/server/models/cluster/index.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/server/models/pipeline/index.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/server/models/pipeline/pipeline.test.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/server/models/pipeline/pipeline.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/server/models/pipeline_list_item/index.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/server/models/pipeline_list_item/pipeline_list_item.test.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/server/models/pipeline_list_item/pipeline_list_item.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/server/plugin.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/server/routes/cluster/index.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/server/routes/cluster/load.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/server/routes/index.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/server/routes/pipeline/delete.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/server/routes/pipeline/index.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/server/routes/pipeline/load.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/server/routes/pipeline/save.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/server/routes/pipelines/delete.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/server/routes/pipelines/index.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/server/routes/pipelines/list.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/server/types.ts (100%) rename x-pack/{plugins => platform/plugins/private}/logstash/tsconfig.json (91%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index c4e33139b92fa..3296499e25355 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -846,6 +846,7 @@ x-pack/platform/plugins/private/file_upload @elastic/kibana-presentation @elasti x-pack/platform/plugins/private/grokdebugger @elastic/kibana-management x-pack/platform/plugins/private/index_lifecycle_management @elastic/kibana-management x-pack/platform/plugins/private/license_api_guard @elastic/kibana-management +x-pack/platform/plugins/private/logstash @elastic/logstash x-pack/platform/plugins/private/painless_lab @elastic/kibana-management x-pack/platform/plugins/private/remote_clusters @elastic/kibana-management x-pack/platform/plugins/private/rollup @elastic/kibana-management @@ -899,7 +900,6 @@ x-pack/plugins/global_search_providers @elastic/appex-sharedux x-pack/plugins/graph @elastic/kibana-visualizations x-pack/plugins/lens @elastic/kibana-visualizations x-pack/plugins/licensing @elastic/kibana-core -x-pack/plugins/logstash @elastic/logstash x-pack/plugins/monitoring @elastic/stack-monitoring x-pack/plugins/monitoring_collection @elastic/stack-monitoring x-pack/plugins/notifications @elastic/appex-sharedux @@ -2562,7 +2562,7 @@ x-pack/solutions/security/plugins/security_solution/server/lib/security_integrat /x-pack/test/functional/page_objects/logstash_page.ts @elastic/logstash /x-pack/test/functional/apps/logstash @elastic/logstash /x-pack/test/api_integration/apis/logstash @elastic/logstash -#CC# /x-pack/plugins/logstash/ @elastic/logstash +#CC# /x-pack/platform/plugins/private/logstash/ @elastic/logstash # EUI team /src/plugins/kibana_react/public/page_template/ @elastic/eui-team @elastic/appex-sharedux diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc index 9fbe0a9fd191b..fca166dee22ea 100644 --- a/docs/developer/plugin-list.asciidoc +++ b/docs/developer/plugin-list.asciidoc @@ -711,7 +711,7 @@ using the CURL scripts in the scripts folder. |Exposes the shared components and APIs to access and visualize logs. -|{kib-repo}blob/{branch}/x-pack/plugins/logstash[logstash] +|{kib-repo}blob/{branch}/x-pack/platform/plugins/private/logstash[logstash] |WARNING: Missing README. diff --git a/package.json b/package.json index 6d17b844de938..706e8d7c7e689 100644 --- a/package.json +++ b/package.json @@ -627,7 +627,7 @@ "@kbn/logs-data-access-plugin": "link:x-pack/platform/plugins/shared/logs_data_access", "@kbn/logs-explorer-plugin": "link:x-pack/solutions/observability/plugins/logs_explorer", "@kbn/logs-shared-plugin": "link:x-pack/platform/plugins/shared/logs_shared", - "@kbn/logstash-plugin": "link:x-pack/plugins/logstash", + "@kbn/logstash-plugin": "link:x-pack/platform/plugins/private/logstash", "@kbn/managed-content-badge": "link:packages/kbn-managed-content-badge", "@kbn/management-cards-navigation": "link:src/platform/packages/shared/kbn-management/cards_navigation", "@kbn/management-plugin": "link:src/platform/plugins/shared/management", diff --git a/tsconfig.base.json b/tsconfig.base.json index 49ae52af8bcfd..1e2b45e128eb7 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -1176,8 +1176,8 @@ "@kbn/logs-explorer-plugin/*": ["x-pack/solutions/observability/plugins/logs_explorer/*"], "@kbn/logs-shared-plugin": ["x-pack/platform/plugins/shared/logs_shared"], "@kbn/logs-shared-plugin/*": ["x-pack/platform/plugins/shared/logs_shared/*"], - "@kbn/logstash-plugin": ["x-pack/plugins/logstash"], - "@kbn/logstash-plugin/*": ["x-pack/plugins/logstash/*"], + "@kbn/logstash-plugin": ["x-pack/platform/plugins/private/logstash"], + "@kbn/logstash-plugin/*": ["x-pack/platform/plugins/private/logstash/*"], "@kbn/managed-content-badge": ["packages/kbn-managed-content-badge"], "@kbn/managed-content-badge/*": ["packages/kbn-managed-content-badge/*"], "@kbn/managed-vscode-config": ["packages/kbn-managed-vscode-config"], diff --git a/x-pack/.i18nrc.json b/x-pack/.i18nrc.json index 7400d9623680f..f964bf380f2a2 100644 --- a/x-pack/.i18nrc.json +++ b/x-pack/.i18nrc.json @@ -77,7 +77,7 @@ "xpack.licensing": "plugins/licensing", "xpack.lists": "solutions/security/plugins/lists", "xpack.logstash": [ - "plugins/logstash" + "platform/plugins/private/logstash" ], "xpack.main": "legacy/plugins/xpack_main", "xpack.maps": [ diff --git a/x-pack/plugins/logstash/common/constants/es_scroll_settings.ts b/x-pack/platform/plugins/private/logstash/common/constants/es_scroll_settings.ts similarity index 100% rename from x-pack/plugins/logstash/common/constants/es_scroll_settings.ts rename to x-pack/platform/plugins/private/logstash/common/constants/es_scroll_settings.ts diff --git a/x-pack/plugins/logstash/common/constants/index.ts b/x-pack/platform/plugins/private/logstash/common/constants/index.ts similarity index 100% rename from x-pack/plugins/logstash/common/constants/index.ts rename to x-pack/platform/plugins/private/logstash/common/constants/index.ts diff --git a/x-pack/plugins/logstash/common/constants/index_names.ts b/x-pack/platform/plugins/private/logstash/common/constants/index_names.ts similarity index 100% rename from x-pack/plugins/logstash/common/constants/index_names.ts rename to x-pack/platform/plugins/private/logstash/common/constants/index_names.ts diff --git a/x-pack/plugins/logstash/common/constants/monitoring.ts b/x-pack/platform/plugins/private/logstash/common/constants/monitoring.ts similarity index 100% rename from x-pack/plugins/logstash/common/constants/monitoring.ts rename to x-pack/platform/plugins/private/logstash/common/constants/monitoring.ts diff --git a/x-pack/plugins/logstash/common/constants/pagination.ts b/x-pack/platform/plugins/private/logstash/common/constants/pagination.ts similarity index 100% rename from x-pack/plugins/logstash/common/constants/pagination.ts rename to x-pack/platform/plugins/private/logstash/common/constants/pagination.ts diff --git a/x-pack/plugins/logstash/common/constants/pipeline.ts b/x-pack/platform/plugins/private/logstash/common/constants/pipeline.ts similarity index 100% rename from x-pack/plugins/logstash/common/constants/pipeline.ts rename to x-pack/platform/plugins/private/logstash/common/constants/pipeline.ts diff --git a/x-pack/plugins/logstash/common/constants/plugin.ts b/x-pack/platform/plugins/private/logstash/common/constants/plugin.ts similarity index 100% rename from x-pack/plugins/logstash/common/constants/plugin.ts rename to x-pack/platform/plugins/private/logstash/common/constants/plugin.ts diff --git a/x-pack/plugins/logstash/common/constants/routes.ts b/x-pack/platform/plugins/private/logstash/common/constants/routes.ts similarity index 100% rename from x-pack/plugins/logstash/common/constants/routes.ts rename to x-pack/platform/plugins/private/logstash/common/constants/routes.ts diff --git a/x-pack/plugins/logstash/common/constants/tooltips.ts b/x-pack/platform/plugins/private/logstash/common/constants/tooltips.ts similarity index 100% rename from x-pack/plugins/logstash/common/constants/tooltips.ts rename to x-pack/platform/plugins/private/logstash/common/constants/tooltips.ts diff --git a/x-pack/plugins/logstash/jest.config.js b/x-pack/platform/plugins/private/logstash/jest.config.js similarity index 55% rename from x-pack/plugins/logstash/jest.config.js rename to x-pack/platform/plugins/private/logstash/jest.config.js index 7296aa46adbb0..8beace007c71c 100644 --- a/x-pack/plugins/logstash/jest.config.js +++ b/x-pack/platform/plugins/private/logstash/jest.config.js @@ -7,11 +7,12 @@ module.exports = { preset: '@kbn/test', - rootDir: '../../..', - roots: ['/x-pack/plugins/logstash'], - coverageDirectory: '/target/kibana-coverage/jest/x-pack/plugins/logstash', + rootDir: '../../../../..', + roots: ['/x-pack/platform/plugins/private/logstash'], + coverageDirectory: + '/target/kibana-coverage/jest/x-pack/platform/plugins/private/logstash', coverageReporters: ['text', 'html'], collectCoverageFrom: [ - '/x-pack/plugins/logstash/{common,public,server}/**/*.{js,ts,tsx}', + '/x-pack/platform/plugins/private/logstash/{common,public,server}/**/*.{js,ts,tsx}', ], }; diff --git a/x-pack/plugins/logstash/kibana.jsonc b/x-pack/platform/plugins/private/logstash/kibana.jsonc similarity index 100% rename from x-pack/plugins/logstash/kibana.jsonc rename to x-pack/platform/plugins/private/logstash/kibana.jsonc diff --git a/x-pack/plugins/logstash/public/application/breadcrumbs.js b/x-pack/platform/plugins/private/logstash/public/application/breadcrumbs.js similarity index 100% rename from x-pack/plugins/logstash/public/application/breadcrumbs.js rename to x-pack/platform/plugins/private/logstash/public/application/breadcrumbs.js diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_editor/__snapshots__/confirm_delete_pipeline_modal.test.js.snap b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_editor/__snapshots__/confirm_delete_pipeline_modal.test.js.snap similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_editor/__snapshots__/confirm_delete_pipeline_modal.test.js.snap rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_editor/__snapshots__/confirm_delete_pipeline_modal.test.js.snap diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_editor/__snapshots__/flex_item_setting.test.js.snap b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_editor/__snapshots__/flex_item_setting.test.js.snap similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_editor/__snapshots__/flex_item_setting.test.js.snap rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_editor/__snapshots__/flex_item_setting.test.js.snap diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_editor/__snapshots__/form_label_with_icon_tip.test.js.snap b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_editor/__snapshots__/form_label_with_icon_tip.test.js.snap similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_editor/__snapshots__/form_label_with_icon_tip.test.js.snap rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_editor/__snapshots__/form_label_with_icon_tip.test.js.snap diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_editor/__snapshots__/pipeline_editor.test.js.snap b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_editor/__snapshots__/pipeline_editor.test.js.snap similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_editor/__snapshots__/pipeline_editor.test.js.snap rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_editor/__snapshots__/pipeline_editor.test.js.snap diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_editor/confirm_delete_pipeline_modal.js b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_editor/confirm_delete_pipeline_modal.js similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_editor/confirm_delete_pipeline_modal.js rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_editor/confirm_delete_pipeline_modal.js diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_editor/confirm_delete_pipeline_modal.test.js b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_editor/confirm_delete_pipeline_modal.test.js similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_editor/confirm_delete_pipeline_modal.test.js rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_editor/confirm_delete_pipeline_modal.test.js diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_editor/constants.js b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_editor/constants.js similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_editor/constants.js rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_editor/constants.js diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_editor/flex_item_setting.js b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_editor/flex_item_setting.js similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_editor/flex_item_setting.js rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_editor/flex_item_setting.js diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_editor/flex_item_setting.test.js b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_editor/flex_item_setting.test.js similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_editor/flex_item_setting.test.js rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_editor/flex_item_setting.test.js diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_editor/form_label_with_icon_tip.js b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_editor/form_label_with_icon_tip.js similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_editor/form_label_with_icon_tip.js rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_editor/form_label_with_icon_tip.js diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_editor/form_label_with_icon_tip.test.js b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_editor/form_label_with_icon_tip.test.js similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_editor/form_label_with_icon_tip.test.js rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_editor/form_label_with_icon_tip.test.js diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_editor/index.js b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_editor/index.js similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_editor/index.js rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_editor/index.js diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_editor/pipeline_editor.js b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_editor/pipeline_editor.js similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_editor/pipeline_editor.js rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_editor/pipeline_editor.js diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_editor/pipeline_editor.test.js b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_editor/pipeline_editor.test.js similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_editor/pipeline_editor.test.js rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_editor/pipeline_editor.test.js diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_list/__snapshots__/add_role_alert.test.js.snap b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/__snapshots__/add_role_alert.test.js.snap similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_list/__snapshots__/add_role_alert.test.js.snap rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/__snapshots__/add_role_alert.test.js.snap diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_list/__snapshots__/alert_call_out.test.js.snap b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/__snapshots__/alert_call_out.test.js.snap similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_list/__snapshots__/alert_call_out.test.js.snap rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/__snapshots__/alert_call_out.test.js.snap diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_list/__snapshots__/confirm_delete_modal.test.js.snap b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/__snapshots__/confirm_delete_modal.test.js.snap similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_list/__snapshots__/confirm_delete_modal.test.js.snap rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/__snapshots__/confirm_delete_modal.test.js.snap diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_list/__snapshots__/enable_monitoring_alert.test.js.snap b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/__snapshots__/enable_monitoring_alert.test.js.snap similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_list/__snapshots__/enable_monitoring_alert.test.js.snap rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/__snapshots__/enable_monitoring_alert.test.js.snap diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_list/__snapshots__/info_alerts.test.js.snap b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/__snapshots__/info_alerts.test.js.snap similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_list/__snapshots__/info_alerts.test.js.snap rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/__snapshots__/info_alerts.test.js.snap diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_list/__snapshots__/pipelines_table.test.js.snap b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/__snapshots__/pipelines_table.test.js.snap similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_list/__snapshots__/pipelines_table.test.js.snap rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/__snapshots__/pipelines_table.test.js.snap diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_list/add_role_alert.js b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/add_role_alert.js similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_list/add_role_alert.js rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/add_role_alert.js diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_list/add_role_alert.test.js b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/add_role_alert.test.js similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_list/add_role_alert.test.js rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/add_role_alert.test.js diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_list/alert_call_out.js b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/alert_call_out.js similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_list/alert_call_out.js rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/alert_call_out.js diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_list/alert_call_out.test.js b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/alert_call_out.test.js similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_list/alert_call_out.test.js rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/alert_call_out.test.js diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_list/confirm_delete_modal.js b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/confirm_delete_modal.js similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_list/confirm_delete_modal.js rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/confirm_delete_modal.js diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_list/confirm_delete_modal.test.js b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/confirm_delete_modal.test.js similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_list/confirm_delete_modal.test.js rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/confirm_delete_modal.test.js diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_list/constants.js b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/constants.js similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_list/constants.js rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/constants.js diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_list/enable_monitoring_alert.js b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/enable_monitoring_alert.js similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_list/enable_monitoring_alert.js rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/enable_monitoring_alert.js diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_list/enable_monitoring_alert.test.js b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/enable_monitoring_alert.test.js similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_list/enable_monitoring_alert.test.js rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/enable_monitoring_alert.test.js diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_list/index.js b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/index.js similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_list/index.js rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/index.js diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_list/info_alerts.js b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/info_alerts.js similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_list/info_alerts.js rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/info_alerts.js diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_list/info_alerts.test.js b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/info_alerts.test.js similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_list/info_alerts.test.js rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/info_alerts.test.js diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_list/pipeline_list.js b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/pipeline_list.js similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_list/pipeline_list.js rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/pipeline_list.js diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_list/pipeline_list.test.js b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/pipeline_list.test.js similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_list/pipeline_list.test.js rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/pipeline_list.test.js diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_list/pipelines_table.js b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/pipelines_table.js similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_list/pipelines_table.js rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/pipelines_table.js diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_list/pipelines_table.test.js b/x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/pipelines_table.test.js similarity index 100% rename from x-pack/plugins/logstash/public/application/components/pipeline_list/pipelines_table.test.js rename to x-pack/platform/plugins/private/logstash/public/application/components/pipeline_list/pipelines_table.test.js diff --git a/x-pack/plugins/logstash/public/application/index.tsx b/x-pack/platform/plugins/private/logstash/public/application/index.tsx similarity index 100% rename from x-pack/plugins/logstash/public/application/index.tsx rename to x-pack/platform/plugins/private/logstash/public/application/index.tsx diff --git a/x-pack/plugins/logstash/public/application/pipeline_edit_view.tsx b/x-pack/platform/plugins/private/logstash/public/application/pipeline_edit_view.tsx similarity index 100% rename from x-pack/plugins/logstash/public/application/pipeline_edit_view.tsx rename to x-pack/platform/plugins/private/logstash/public/application/pipeline_edit_view.tsx diff --git a/x-pack/plugins/logstash/public/index.ts b/x-pack/platform/plugins/private/logstash/public/index.ts similarity index 100% rename from x-pack/plugins/logstash/public/index.ts rename to x-pack/platform/plugins/private/logstash/public/index.ts diff --git a/x-pack/plugins/logstash/public/lib/get_search_value/get_search_value.js b/x-pack/platform/plugins/private/logstash/public/lib/get_search_value/get_search_value.js similarity index 100% rename from x-pack/plugins/logstash/public/lib/get_search_value/get_search_value.js rename to x-pack/platform/plugins/private/logstash/public/lib/get_search_value/get_search_value.js diff --git a/x-pack/plugins/logstash/public/lib/get_search_value/index.js b/x-pack/platform/plugins/private/logstash/public/lib/get_search_value/index.js similarity index 100% rename from x-pack/plugins/logstash/public/lib/get_search_value/index.js rename to x-pack/platform/plugins/private/logstash/public/lib/get_search_value/index.js diff --git a/x-pack/plugins/logstash/public/models/cluster/cluster.js b/x-pack/platform/plugins/private/logstash/public/models/cluster/cluster.js similarity index 100% rename from x-pack/plugins/logstash/public/models/cluster/cluster.js rename to x-pack/platform/plugins/private/logstash/public/models/cluster/cluster.js diff --git a/x-pack/plugins/logstash/public/models/cluster/index.js b/x-pack/platform/plugins/private/logstash/public/models/cluster/index.js similarity index 100% rename from x-pack/plugins/logstash/public/models/cluster/index.js rename to x-pack/platform/plugins/private/logstash/public/models/cluster/index.js diff --git a/x-pack/plugins/logstash/public/models/pipeline/index.js b/x-pack/platform/plugins/private/logstash/public/models/pipeline/index.js similarity index 100% rename from x-pack/plugins/logstash/public/models/pipeline/index.js rename to x-pack/platform/plugins/private/logstash/public/models/pipeline/index.js diff --git a/x-pack/plugins/logstash/public/models/pipeline/pipeline.js b/x-pack/platform/plugins/private/logstash/public/models/pipeline/pipeline.js similarity index 100% rename from x-pack/plugins/logstash/public/models/pipeline/pipeline.js rename to x-pack/platform/plugins/private/logstash/public/models/pipeline/pipeline.js diff --git a/x-pack/plugins/logstash/public/models/pipeline/props.ts b/x-pack/platform/plugins/private/logstash/public/models/pipeline/props.ts similarity index 100% rename from x-pack/plugins/logstash/public/models/pipeline/props.ts rename to x-pack/platform/plugins/private/logstash/public/models/pipeline/props.ts diff --git a/x-pack/plugins/logstash/public/models/pipeline_list_item/index.js b/x-pack/platform/plugins/private/logstash/public/models/pipeline_list_item/index.js similarity index 100% rename from x-pack/plugins/logstash/public/models/pipeline_list_item/index.js rename to x-pack/platform/plugins/private/logstash/public/models/pipeline_list_item/index.js diff --git a/x-pack/plugins/logstash/public/models/pipeline_list_item/pipeline_list_item.js b/x-pack/platform/plugins/private/logstash/public/models/pipeline_list_item/pipeline_list_item.js similarity index 100% rename from x-pack/plugins/logstash/public/models/pipeline_list_item/pipeline_list_item.js rename to x-pack/platform/plugins/private/logstash/public/models/pipeline_list_item/pipeline_list_item.js diff --git a/x-pack/plugins/logstash/public/plugin.ts b/x-pack/platform/plugins/private/logstash/public/plugin.ts similarity index 100% rename from x-pack/plugins/logstash/public/plugin.ts rename to x-pack/platform/plugins/private/logstash/public/plugin.ts diff --git a/x-pack/plugins/logstash/public/services/cluster/cluster_service.js b/x-pack/platform/plugins/private/logstash/public/services/cluster/cluster_service.js similarity index 100% rename from x-pack/plugins/logstash/public/services/cluster/cluster_service.js rename to x-pack/platform/plugins/private/logstash/public/services/cluster/cluster_service.js diff --git a/x-pack/plugins/logstash/public/services/cluster/index.js b/x-pack/platform/plugins/private/logstash/public/services/cluster/index.js similarity index 100% rename from x-pack/plugins/logstash/public/services/cluster/index.js rename to x-pack/platform/plugins/private/logstash/public/services/cluster/index.js diff --git a/x-pack/plugins/logstash/public/services/index.js b/x-pack/platform/plugins/private/logstash/public/services/index.js similarity index 100% rename from x-pack/plugins/logstash/public/services/index.js rename to x-pack/platform/plugins/private/logstash/public/services/index.js diff --git a/x-pack/plugins/logstash/public/services/license/index.js b/x-pack/platform/plugins/private/logstash/public/services/license/index.js similarity index 100% rename from x-pack/plugins/logstash/public/services/license/index.js rename to x-pack/platform/plugins/private/logstash/public/services/license/index.js diff --git a/x-pack/plugins/logstash/public/services/license/logstash_license_service.js b/x-pack/platform/plugins/private/logstash/public/services/license/logstash_license_service.js similarity index 100% rename from x-pack/plugins/logstash/public/services/license/logstash_license_service.js rename to x-pack/platform/plugins/private/logstash/public/services/license/logstash_license_service.js diff --git a/x-pack/plugins/logstash/public/services/monitoring/index.js b/x-pack/platform/plugins/private/logstash/public/services/monitoring/index.js similarity index 100% rename from x-pack/plugins/logstash/public/services/monitoring/index.js rename to x-pack/platform/plugins/private/logstash/public/services/monitoring/index.js diff --git a/x-pack/plugins/logstash/public/services/monitoring/monitoring_service.js b/x-pack/platform/plugins/private/logstash/public/services/monitoring/monitoring_service.js similarity index 100% rename from x-pack/plugins/logstash/public/services/monitoring/monitoring_service.js rename to x-pack/platform/plugins/private/logstash/public/services/monitoring/monitoring_service.js diff --git a/x-pack/plugins/logstash/public/services/pipeline/index.js b/x-pack/platform/plugins/private/logstash/public/services/pipeline/index.js similarity index 100% rename from x-pack/plugins/logstash/public/services/pipeline/index.js rename to x-pack/platform/plugins/private/logstash/public/services/pipeline/index.js diff --git a/x-pack/plugins/logstash/public/services/pipeline/pipeline_service.js b/x-pack/platform/plugins/private/logstash/public/services/pipeline/pipeline_service.js similarity index 100% rename from x-pack/plugins/logstash/public/services/pipeline/pipeline_service.js rename to x-pack/platform/plugins/private/logstash/public/services/pipeline/pipeline_service.js diff --git a/x-pack/plugins/logstash/public/services/pipelines/index.js b/x-pack/platform/plugins/private/logstash/public/services/pipelines/index.js similarity index 100% rename from x-pack/plugins/logstash/public/services/pipelines/index.js rename to x-pack/platform/plugins/private/logstash/public/services/pipelines/index.js diff --git a/x-pack/plugins/logstash/public/services/pipelines/pipelines_service.js b/x-pack/platform/plugins/private/logstash/public/services/pipelines/pipelines_service.js similarity index 100% rename from x-pack/plugins/logstash/public/services/pipelines/pipelines_service.js rename to x-pack/platform/plugins/private/logstash/public/services/pipelines/pipelines_service.js diff --git a/x-pack/plugins/logstash/server/index.ts b/x-pack/platform/plugins/private/logstash/server/index.ts similarity index 100% rename from x-pack/plugins/logstash/server/index.ts rename to x-pack/platform/plugins/private/logstash/server/index.ts diff --git a/x-pack/plugins/logstash/server/lib/check_license/check_license.test.ts b/x-pack/platform/plugins/private/logstash/server/lib/check_license/check_license.test.ts similarity index 100% rename from x-pack/plugins/logstash/server/lib/check_license/check_license.test.ts rename to x-pack/platform/plugins/private/logstash/server/lib/check_license/check_license.test.ts diff --git a/x-pack/plugins/logstash/server/lib/check_license/check_license.ts b/x-pack/platform/plugins/private/logstash/server/lib/check_license/check_license.ts similarity index 100% rename from x-pack/plugins/logstash/server/lib/check_license/check_license.ts rename to x-pack/platform/plugins/private/logstash/server/lib/check_license/check_license.ts diff --git a/x-pack/plugins/logstash/server/lib/check_license/index.ts b/x-pack/platform/plugins/private/logstash/server/lib/check_license/index.ts similarity index 100% rename from x-pack/plugins/logstash/server/lib/check_license/index.ts rename to x-pack/platform/plugins/private/logstash/server/lib/check_license/index.ts diff --git a/x-pack/plugins/logstash/server/models/cluster/cluster.test.ts b/x-pack/platform/plugins/private/logstash/server/models/cluster/cluster.test.ts similarity index 100% rename from x-pack/plugins/logstash/server/models/cluster/cluster.test.ts rename to x-pack/platform/plugins/private/logstash/server/models/cluster/cluster.test.ts diff --git a/x-pack/plugins/logstash/server/models/cluster/cluster.ts b/x-pack/platform/plugins/private/logstash/server/models/cluster/cluster.ts similarity index 100% rename from x-pack/plugins/logstash/server/models/cluster/cluster.ts rename to x-pack/platform/plugins/private/logstash/server/models/cluster/cluster.ts diff --git a/x-pack/plugins/logstash/server/models/cluster/index.ts b/x-pack/platform/plugins/private/logstash/server/models/cluster/index.ts similarity index 100% rename from x-pack/plugins/logstash/server/models/cluster/index.ts rename to x-pack/platform/plugins/private/logstash/server/models/cluster/index.ts diff --git a/x-pack/plugins/logstash/server/models/pipeline/index.ts b/x-pack/platform/plugins/private/logstash/server/models/pipeline/index.ts similarity index 100% rename from x-pack/plugins/logstash/server/models/pipeline/index.ts rename to x-pack/platform/plugins/private/logstash/server/models/pipeline/index.ts diff --git a/x-pack/plugins/logstash/server/models/pipeline/pipeline.test.ts b/x-pack/platform/plugins/private/logstash/server/models/pipeline/pipeline.test.ts similarity index 100% rename from x-pack/plugins/logstash/server/models/pipeline/pipeline.test.ts rename to x-pack/platform/plugins/private/logstash/server/models/pipeline/pipeline.test.ts diff --git a/x-pack/plugins/logstash/server/models/pipeline/pipeline.ts b/x-pack/platform/plugins/private/logstash/server/models/pipeline/pipeline.ts similarity index 100% rename from x-pack/plugins/logstash/server/models/pipeline/pipeline.ts rename to x-pack/platform/plugins/private/logstash/server/models/pipeline/pipeline.ts diff --git a/x-pack/plugins/logstash/server/models/pipeline_list_item/index.ts b/x-pack/platform/plugins/private/logstash/server/models/pipeline_list_item/index.ts similarity index 100% rename from x-pack/plugins/logstash/server/models/pipeline_list_item/index.ts rename to x-pack/platform/plugins/private/logstash/server/models/pipeline_list_item/index.ts diff --git a/x-pack/plugins/logstash/server/models/pipeline_list_item/pipeline_list_item.test.ts b/x-pack/platform/plugins/private/logstash/server/models/pipeline_list_item/pipeline_list_item.test.ts similarity index 100% rename from x-pack/plugins/logstash/server/models/pipeline_list_item/pipeline_list_item.test.ts rename to x-pack/platform/plugins/private/logstash/server/models/pipeline_list_item/pipeline_list_item.test.ts diff --git a/x-pack/plugins/logstash/server/models/pipeline_list_item/pipeline_list_item.ts b/x-pack/platform/plugins/private/logstash/server/models/pipeline_list_item/pipeline_list_item.ts similarity index 100% rename from x-pack/plugins/logstash/server/models/pipeline_list_item/pipeline_list_item.ts rename to x-pack/platform/plugins/private/logstash/server/models/pipeline_list_item/pipeline_list_item.ts diff --git a/x-pack/plugins/logstash/server/plugin.ts b/x-pack/platform/plugins/private/logstash/server/plugin.ts similarity index 100% rename from x-pack/plugins/logstash/server/plugin.ts rename to x-pack/platform/plugins/private/logstash/server/plugin.ts diff --git a/x-pack/plugins/logstash/server/routes/cluster/index.ts b/x-pack/platform/plugins/private/logstash/server/routes/cluster/index.ts similarity index 100% rename from x-pack/plugins/logstash/server/routes/cluster/index.ts rename to x-pack/platform/plugins/private/logstash/server/routes/cluster/index.ts diff --git a/x-pack/plugins/logstash/server/routes/cluster/load.ts b/x-pack/platform/plugins/private/logstash/server/routes/cluster/load.ts similarity index 100% rename from x-pack/plugins/logstash/server/routes/cluster/load.ts rename to x-pack/platform/plugins/private/logstash/server/routes/cluster/load.ts diff --git a/x-pack/plugins/logstash/server/routes/index.ts b/x-pack/platform/plugins/private/logstash/server/routes/index.ts similarity index 100% rename from x-pack/plugins/logstash/server/routes/index.ts rename to x-pack/platform/plugins/private/logstash/server/routes/index.ts diff --git a/x-pack/plugins/logstash/server/routes/pipeline/delete.ts b/x-pack/platform/plugins/private/logstash/server/routes/pipeline/delete.ts similarity index 100% rename from x-pack/plugins/logstash/server/routes/pipeline/delete.ts rename to x-pack/platform/plugins/private/logstash/server/routes/pipeline/delete.ts diff --git a/x-pack/plugins/logstash/server/routes/pipeline/index.ts b/x-pack/platform/plugins/private/logstash/server/routes/pipeline/index.ts similarity index 100% rename from x-pack/plugins/logstash/server/routes/pipeline/index.ts rename to x-pack/platform/plugins/private/logstash/server/routes/pipeline/index.ts diff --git a/x-pack/plugins/logstash/server/routes/pipeline/load.ts b/x-pack/platform/plugins/private/logstash/server/routes/pipeline/load.ts similarity index 100% rename from x-pack/plugins/logstash/server/routes/pipeline/load.ts rename to x-pack/platform/plugins/private/logstash/server/routes/pipeline/load.ts diff --git a/x-pack/plugins/logstash/server/routes/pipeline/save.ts b/x-pack/platform/plugins/private/logstash/server/routes/pipeline/save.ts similarity index 100% rename from x-pack/plugins/logstash/server/routes/pipeline/save.ts rename to x-pack/platform/plugins/private/logstash/server/routes/pipeline/save.ts diff --git a/x-pack/plugins/logstash/server/routes/pipelines/delete.ts b/x-pack/platform/plugins/private/logstash/server/routes/pipelines/delete.ts similarity index 100% rename from x-pack/plugins/logstash/server/routes/pipelines/delete.ts rename to x-pack/platform/plugins/private/logstash/server/routes/pipelines/delete.ts diff --git a/x-pack/plugins/logstash/server/routes/pipelines/index.ts b/x-pack/platform/plugins/private/logstash/server/routes/pipelines/index.ts similarity index 100% rename from x-pack/plugins/logstash/server/routes/pipelines/index.ts rename to x-pack/platform/plugins/private/logstash/server/routes/pipelines/index.ts diff --git a/x-pack/plugins/logstash/server/routes/pipelines/list.ts b/x-pack/platform/plugins/private/logstash/server/routes/pipelines/list.ts similarity index 100% rename from x-pack/plugins/logstash/server/routes/pipelines/list.ts rename to x-pack/platform/plugins/private/logstash/server/routes/pipelines/list.ts diff --git a/x-pack/plugins/logstash/server/types.ts b/x-pack/platform/plugins/private/logstash/server/types.ts similarity index 100% rename from x-pack/plugins/logstash/server/types.ts rename to x-pack/platform/plugins/private/logstash/server/types.ts diff --git a/x-pack/plugins/logstash/tsconfig.json b/x-pack/platform/plugins/private/logstash/tsconfig.json similarity index 91% rename from x-pack/plugins/logstash/tsconfig.json rename to x-pack/platform/plugins/private/logstash/tsconfig.json index 62240bd04b0cc..e5f89e5557317 100644 --- a/x-pack/plugins/logstash/tsconfig.json +++ b/x-pack/platform/plugins/private/logstash/tsconfig.json @@ -1,6 +1,6 @@ { - "extends": "../../../tsconfig.base.json", + "extends": "../../../../../tsconfig.base.json", "compilerOptions": { "outDir": "target/types", }, diff --git a/yarn.lock b/yarn.lock index 62b1cc151c1e5..c4c25c2ae4933 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6169,7 +6169,7 @@ version "0.0.0" uid "" -"@kbn/logstash-plugin@link:x-pack/plugins/logstash": +"@kbn/logstash-plugin@link:x-pack/platform/plugins/private/logstash": version "0.0.0" uid ""