Skip to content

Commit

Permalink
Sustainable Kibana Architecture: Move modules owned by `@elastic/flee…
Browse files Browse the repository at this point in the history
…t` (elastic#202422)

## 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.

Are you trying to rebase this PR to solve merge conflicts? Please follow
the steps describe
[here](https://elastic.slack.com/archives/C07TCKTA22E/p1734019532879269?thread_ts=1734019339.935419&cid=C07TCKTA22E).

#### 2 plugin(s) are going to be relocated:

| Id | Target folder |
| -- | ------------- |
| `@kbn/custom-integrations-plugin` |
`src/platform/plugins/shared/custom_integrations` |
| `@kbn/fleet-plugin` | `x-pack/platform/plugins/shared/fleet` |




#### 1 packages(s) are going to be relocated:

| Id | Target folder |
| -- | ------------- |
| `@kbn/deeplinks-fleet` |
`src/platform/packages/shared/deeplinks/fleet` |


<details open>
<summary>Script errors</summary>

```
Cannot replace multiple occurrences of "../.." in the same line, please fix manually:	/Users/pgayvallet/DEV/workspaces/elastic/kibana/x-pack/platform/plugins/shared/fleet/cypress/README.md:122
Cannot replace multiple occurrences of "../.." in the same line, please fix manually:	/Users/pgayvallet/DEV/workspaces/elastic/kibana/x-pack/platform/plugins/shared/fleet/cypress/README.md:128
Cannot replace multiple occurrences of "../.." in the same line, please fix manually:	/Users/pgayvallet/DEV/workspaces/elastic/kibana/x-pack/platform/plugins/shared/fleet/package.json:12
Cannot replace multiple occurrences of "../.." in the same line, please fix manually:	/Users/pgayvallet/DEV/workspaces/elastic/kibana/x-pack/platform/plugins/shared/fleet/package.json:12
Cannot replace multiple occurrences of "../.." in the same line, please fix manually:	/Users/pgayvallet/DEV/workspaces/elastic/kibana/x-pack/platform/plugins/shared/fleet/package.json:8
Cannot replace multiple occurrences of "../.." in the same line, please fix manually:	/Users/pgayvallet/DEV/workspaces/elastic/kibana/x-pack/platform/plugins/shared/fleet/package.json:8
Cannot replace multiple occurrences of "../../.." in the same line, please fix manually:	/Users/pgayvallet/DEV/workspaces/elastic/kibana/x-pack/platform/plugins/shared/fleet/cypress/README.md:122
Cannot replace multiple occurrences of "../../.." in the same line, please fix manually:	/Users/pgayvallet/DEV/workspaces/elastic/kibana/x-pack/platform/plugins/shared/fleet/cypress/README.md:128
Cannot replace multiple occurrences of "../../.." in the same line, please fix manually:	/Users/pgayvallet/DEV/workspaces/elastic/kibana/x-pack/platform/plugins/shared/fleet/package.json:16
Cannot replace multiple occurrences of "../../.." in the same line, please fix manually:	/Users/pgayvallet/DEV/workspaces/elastic/kibana/x-pack/platform/plugins/shared/fleet/package.json:16
Cannot replace multiple occurrences of "../../.." in the same line, please fix manually:	/Users/pgayvallet/DEV/workspaces/elastic/kibana/x-pack/platform/plugins/shared/fleet/package.json:16
Cannot replace multiple occurrences of "../../.." in the same line, please fix manually:	/Users/pgayvallet/DEV/workspaces/elastic/kibana/x-pack/platform/plugins/shared/fleet/package.json:16
Cannot replace multiple occurrences of "../../.." in the same line, please fix manually:	/Users/pgayvallet/DEV/workspaces/elastic/kibana/x-pack/platform/plugins/shared/fleet/package.json:16
Cannot replace multiple occurrences of "../../.." in the same line, please fix manually:	/Users/pgayvallet/DEV/workspaces/elastic/kibana/x-pack/platform/plugins/shared/fleet/package.json:16
Cannot replace multiple occurrences of "../../.." in the same line, please fix manually:	/Users/pgayvallet/DEV/workspaces/elastic/kibana/x-pack/platform/plugins/shared/fleet/package.json:16
Cannot replace multiple occurrences of "../../.." in the same line, please fix manually:	/Users/pgayvallet/DEV/workspaces/elastic/kibana/x-pack/platform/plugins/shared/fleet/package.json:16
```

</details><details >
<summary>Updated relative paths</summary>

```
src/platform/packages/shared/deeplinks/fleet/jest.config.js:12
src/platform/packages/shared/deeplinks/fleet/tsconfig.json:2
src/platform/packages/shared/deeplinks/fleet/tsconfig.type_check.json:2
src/platform/plugins/shared/custom_integrations/jest.config.js:12
src/platform/plugins/shared/custom_integrations/tsconfig.json:2
src/platform/plugins/shared/custom_integrations/tsconfig.json:7
src/platform/plugins/shared/custom_integrations/tsconfig.type_check.json:2
src/platform/plugins/shared/custom_integrations/tsconfig.type_check.json:20
src/platform/plugins/shared/custom_integrations/tsconfig.type_check.json:26
src/platform/plugins/shared/custom_integrations/tsconfig.type_check.json:29
src/platform/plugins/shared/custom_integrations/tsconfig.type_check.json:32
src/platform/plugins/shared/custom_integrations/tsconfig.type_check.json:35
src/platform/plugins/shared/custom_integrations/tsconfig.type_check.json:38
src/platform/plugins/shared/custom_integrations/tsconfig.type_check.json:41
src/platform/plugins/shared/custom_integrations/tsconfig.type_check.json:9
x-pack/platform/plugins/shared/fleet/cypress.config.js:22
x-pack/platform/plugins/shared/fleet/cypress.config.js:25
x-pack/platform/plugins/shared/fleet/cypress.config.space_awareness.ts:26
x-pack/platform/plugins/shared/fleet/cypress.config.space_awareness.ts:29
x-pack/platform/plugins/shared/fleet/cypress.config.ts:25
x-pack/platform/plugins/shared/fleet/cypress.config.ts:28
x-pack/platform/plugins/shared/fleet/cypress/README.md:122
x-pack/platform/plugins/shared/fleet/cypress/README.md:128
x-pack/platform/plugins/shared/fleet/cypress/reporter_config.json:6
x-pack/platform/plugins/shared/fleet/cypress/reporter_config.json:8
x-pack/platform/plugins/shared/fleet/cypress/tasks/login.ts:21
x-pack/platform/plugins/shared/fleet/cypress/tsconfig.json:2
x-pack/platform/plugins/shared/fleet/cypress/tsconfig.json:7
x-pack/platform/plugins/shared/fleet/cypress/tsconfig.type_check.json:2
x-pack/platform/plugins/shared/fleet/cypress/tsconfig.type_check.json:25
x-pack/platform/plugins/shared/fleet/cypress/tsconfig.type_check.json:28
x-pack/platform/plugins/shared/fleet/cypress/tsconfig.type_check.json:31
x-pack/platform/plugins/shared/fleet/cypress/tsconfig.type_check.json:37
x-pack/platform/plugins/shared/fleet/cypress/tsconfig.type_check.json:40
x-pack/platform/plugins/shared/fleet/cypress/tsconfig.type_check.json:7
x-pack/platform/plugins/shared/fleet/jest.config.js:10
x-pack/platform/plugins/shared/fleet/jest.integration.config.js:10
x-pack/platform/plugins/shared/fleet/package.json:11
x-pack/platform/plugins/shared/fleet/package.json:12
x-pack/platform/plugins/shared/fleet/package.json:15
x-pack/platform/plugins/shared/fleet/package.json:16
x-pack/platform/plugins/shared/fleet/package.json:8
x-pack/platform/plugins/shared/fleet/scripts/create_agent_policies/index.js:8
x-pack/platform/plugins/shared/fleet/scripts/create_agents/index.js:8
x-pack/platform/plugins/shared/fleet/scripts/get_all_packages/index.js:8
x-pack/platform/plugins/shared/fleet/scripts/install_all_packages/index.js:8
x-pack/platform/plugins/shared/fleet/scripts/verify_test_packages/index.js:8
x-pack/platform/plugins/shared/fleet/scripts/verify_test_packages/verify_test_packages.ts:25
x-pack/platform/plugins/shared/fleet/scripts/verify_test_packages/verify_test_packages.ts:26
x-pack/platform/plugins/shared/fleet/scripts/verify_test_packages/verify_test_packages.ts:27
x-pack/platform/plugins/shared/fleet/tsconfig.json:2
x-pack/platform/plugins/shared/fleet/tsconfig.json:22
x-pack/platform/plugins/shared/fleet/tsconfig.json:26
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:102
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:105
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:111
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:114
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:120
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:123
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:126
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:129
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:132
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:135
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:144
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:147
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:150
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:153
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:156
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:159
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:162
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:165
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:168
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:171
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:174
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:177
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:180
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:183
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:186
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:189
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:192
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:195
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:198
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:2
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:201
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:204
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:207
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:210
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:213
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:216
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:219
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:222
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:225
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:228
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:23
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:231
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:234
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:237
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:240
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:243
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:246
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:249
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:252
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:255
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:261
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:264
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:27
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:270
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:273
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:276
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:279
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:30
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:36
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:42
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:45
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:57
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:60
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:63
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:66
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:72
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:75
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:78
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:81
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:84
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:87
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:90
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:93
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:96
x-pack/platform/plugins/shared/fleet/tsconfig.type_check.json:99
```

</details>

---------

Co-authored-by: pgayvallet <[email protected]>
Co-authored-by: Nicolas Chaulet <[email protected]>
Co-authored-by: kibanamachine <[email protected]>
  • Loading branch information
4 people authored Dec 24, 2024
1 parent 47f675c commit fce686b
Show file tree
Hide file tree
Showing 1,837 changed files with 293 additions and 284 deletions.
7 changes: 5 additions & 2 deletions .buildkite/scripts/pipelines/pull_request/pipeline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
if (
(await doAnyChangesMatch([
/^x-pack\/solutions\/observability\/plugins\/observability_onboarding/,
/^x-pack\/plugins\/fleet/,
/^x-pack\/platform\/plugins\/shared\/fleet/,
])) ||
GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
) {
Expand All @@ -116,7 +116,10 @@ const getPipeline = (filename: string, removeSteps = true) => {
}

if (
(await doAnyChangesMatch([/^x-pack\/plugins\/fleet/, /^x-pack\/test\/fleet_cypress/])) ||
(await doAnyChangesMatch([
/^x-pack\/platform\/plugins\/shared\/fleet/,
/^x-pack\/test\/fleet_cypress/,
])) ||
GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
) {
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/fleet_cypress.yml'));
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/functional/fleet_cypress.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION}

echo "--- Fleet Cypress tests (Chrome)"

cd x-pack/plugins/fleet
cd x-pack/platform/plugins/shared/fleet

set +e
yarn cypress:run:reporter; status=$?; yarn cypress_space_awareness:run:reporter; space_status=$?; yarn junit:merge || :; [ "$status" -ne 0 ] && exit $status || [ "$space_status" -ne 0 ] && exit $space_status || exit 0
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -1029,7 +1029,7 @@ module.exports = {
* Fleet overrides
*/
{
files: ['x-pack/plugins/fleet/**/*.{js,mjs,ts,tsx}'],
files: ['x-pack/platform/plugins/shared/fleet/**/*.{js,mjs,ts,tsx}'],
plugins: ['testing-library'],
rules: {
'testing-library/await-async-utils': 'error',
Expand Down
20 changes: 10 additions & 10 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,6 @@ packages/core/user-settings/core-user-settings-server @elastic/kibana-security
packages/core/user-settings/core-user-settings-server-internal @elastic/kibana-security
packages/core/user-settings/core-user-settings-server-mocks @elastic/kibana-security
packages/deeplinks/analytics @elastic/kibana-data-discovery @elastic/kibana-presentation @elastic/kibana-visualizations
packages/deeplinks/fleet @elastic/fleet
packages/deeplinks/search @elastic/search-kibana
packages/deeplinks/shared @elastic/appex-sharedux
packages/default-nav/analytics @elastic/kibana-data-discovery @elastic/kibana-presentation @elastic/kibana-visualizations
Expand Down Expand Up @@ -564,6 +563,7 @@ src/platform/packages/private/kbn-management/settings/components/form @elastic/k
src/platform/packages/private/kbn-mapbox-gl @elastic/kibana-presentation
src/platform/packages/private/kbn-panel-loader @elastic/kibana-presentation
src/platform/packages/shared/deeplinks/devtools @elastic/kibana-management
src/platform/packages/shared/deeplinks/fleet @elastic/fleet
src/platform/packages/shared/deeplinks/management @elastic/kibana-management
src/platform/packages/shared/deeplinks/ml @elastic/ml-ui
src/platform/packages/shared/deeplinks/observability @elastic/obs-ux-management-team
Expand Down Expand Up @@ -617,6 +617,7 @@ src/platform/plugins/private/vis_type_markdown @elastic/kibana-presentation
src/platform/plugins/shared/ai_assistant_management/selection @elastic/obs-ai-assistant
src/platform/plugins/shared/console @elastic/kibana-management
src/platform/plugins/shared/controls @elastic/kibana-presentation
src/platform/plugins/shared/custom_integrations @elastic/fleet
src/platform/plugins/shared/dashboard @elastic/kibana-presentation
src/platform/plugins/shared/dev_tools @elastic/kibana-management
src/platform/plugins/shared/embeddable @elastic/kibana-presentation
Expand All @@ -643,7 +644,6 @@ src/plugins/chart_expressions/expression_tagcloud @elastic/kibana-visualizations
src/plugins/chart_expressions/expression_xy @elastic/kibana-visualizations
src/plugins/charts @elastic/kibana-visualizations
src/plugins/content_management @elastic/appex-sharedux
src/plugins/custom_integrations @elastic/fleet
src/plugins/data @elastic/kibana-visualizations @elastic/kibana-data-discovery
src/plugins/data_view_editor @elastic/kibana-data-discovery
src/plugins/data_view_field_editor @elastic/kibana-data-discovery
Expand Down Expand Up @@ -866,6 +866,7 @@ x-pack/platform/plugins/shared/dataset_quality @elastic/obs-ux-logs-team
x-pack/platform/plugins/shared/embeddable_enhanced @elastic/kibana-presentation
x-pack/platform/plugins/shared/entity_manager @elastic/obs-entities
x-pack/platform/plugins/shared/fields_metadata @elastic/obs-ux-logs-team
x-pack/platform/plugins/shared/fleet @elastic/fleet
x-pack/platform/plugins/shared/index_management @elastic/kibana-management
x-pack/platform/plugins/shared/inference @elastic/appex-ai-infra
x-pack/platform/plugins/shared/ingest_pipelines @elastic/kibana-management
Expand Down Expand Up @@ -895,7 +896,6 @@ x-pack/plugins/encrypted_saved_objects @elastic/kibana-security
x-pack/plugins/enterprise_search @elastic/search-kibana
x-pack/plugins/event_log @elastic/response-ops
x-pack/plugins/features @elastic/kibana-core
x-pack/plugins/fleet @elastic/fleet
x-pack/plugins/global_search @elastic/appex-sharedux
x-pack/plugins/global_search_bar @elastic/appex-sharedux
x-pack/plugins/global_search_providers @elastic/appex-sharedux
Expand Down Expand Up @@ -1384,7 +1384,7 @@ packages/kbn-monaco/src/esql @elastic/kibana-esql
/x-pack/test/fleet_cypress @elastic/fleet
/x-pack/test/fleet_functional @elastic/fleet
/src/dev/build/tasks/bundle_fleet_packages.ts @elastic/fleet @elastic/kibana-operations
/x-pack/plugins/fleet/server/services/elastic_agent_manifest.ts @elastic/fleet @elastic/obs-cloudnative-monitoring
/x-pack/platform/plugins/shared/fleet/server/services/elastic_agent_manifest.ts @elastic/fleet @elastic/obs-cloudnative-monitoring
/x-pack/test_serverless/**/test_suites/**/fleet/ @elastic/fleet

# APM
Expand Down Expand Up @@ -2507,10 +2507,10 @@ x-pack/solutions/security/plugins/security_solution/public/cloud_defend @elastic
x-pack/solutions/security/plugins/security_solution/public/cloud_security_posture @elastic/kibana-cloud-security-posture
x-pack/solutions/security/plugins/security_solution/public/kubernetes @elastic/kibana-cloud-security-posture
## Fleet plugin (co-owned with Fleet team)
x-pack/plugins/fleet/public/components/cloud_security_posture @elastic/fleet @elastic/kibana-cloud-security-posture
x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/components/cloud_security_posture @elastic/fleet @elastic/kibana-cloud-security-posture
x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/setup_technology.* @elastic/fleet @elastic/kibana-cloud-security-posture
x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/components/cloud_posture_third_party_support_callout.* @elastic/fleet @elastic/kibana-cloud-security-posture
x-pack/platform/plugins/shared/fleet/public/components/cloud_security_posture @elastic/fleet @elastic/kibana-cloud-security-posture
x-pack/platform/plugins/shared/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/components/cloud_security_posture @elastic/fleet @elastic/kibana-cloud-security-posture
x-pack/platform/plugins/shared/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/setup_technology.* @elastic/fleet @elastic/kibana-cloud-security-posture
x-pack/platform/plugins/shared/fleet/public/applications/integrations/sections/epm/screens/detail/components/cloud_posture_third_party_support_callout.* @elastic/fleet @elastic/kibana-cloud-security-posture
## Kubernetes Security tests
x-pack/test/functional/es_archives/kubernetes_security @elastic/kibana-cloud-security-posture
x-pack/test/kubernetes_security @elastic/kibana-cloud-security-posture
Expand Down Expand Up @@ -2543,7 +2543,7 @@ x-pack/solutions/security/plugins/security_solution/server/lib/security_integrat
**/*.scss @elastic/kibana-design

# Observability design
/x-pack/plugins/fleet/**/*.scss @elastic/observability-design
/x-pack/platform/plugins/shared/fleet/**/*.scss @elastic/observability-design
/x-pack/platform/plugins/private/monitoring/**/*.scss @elastic/observability-design

# Ent. Search design
Expand Down Expand Up @@ -2654,7 +2654,7 @@ oas_docs/kibana.info.yaml @elastic/platform-docs
# maintaining ESOs has been documented and consuming teams have acclimated to ZDT changes.
x-pack/plugins/actions/server/saved_objects/index.ts @elastic/response-ops @elastic/kibana-security
x-pack/plugins/alerting/server/saved_objects/index.ts @elastic/response-ops @elastic/kibana-security
x-pack/plugins/fleet/server/saved_objects/index.ts @elastic/fleet @elastic/kibana-security
x-pack/platform/plugins/shared/fleet/server/saved_objects/index.ts @elastic/fleet @elastic/kibana-security
x-pack/plugins/observability_solution/synthetics/server/saved_objects/saved_objects.ts @elastic/obs-ux-management-team @elastic/kibana-security
x-pack/plugins/observability_solution/synthetics/server/saved_objects/synthetics_monitor.ts @elastic/obs-ux-management-team @elastic/kibana-security
x-pack/plugins/observability_solution/synthetics/server/saved_objects/synthetics_param.ts @elastic/obs-ux-management-team @elastic/kibana-security
Expand Down
2 changes: 1 addition & 1 deletion .github/codeql/codeql-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ paths-ignore:
- x-pack/solutions/security/plugins/cloud_security_posture/common/scripts
- x-pack/solutions/security/plugins/elastic_assistant/scripts
- x-pack/plugins/event_log/scripts
- x-pack/plugins/fleet/scripts
- x-pack/platform/plugins/shared/fleet/scripts
- x-pack/solutions/security/plugins/lists/scripts
- x-pack/solutions/security/plugins/lists/server/scripts
- x-pack/plugins/observability_solution/*/scripts
Expand Down
2 changes: 1 addition & 1 deletion .github/paths-labeller.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
- 'packages/kbn-apm-utils/**/*.*'
- 'x-pack/solutions/observability/plugins/ux/**/*.*'
- 'Team:Fleet':
- 'x-pack/plugins/fleet/**/*.*'
- 'x-pack/platform/plugins/shared/fleet/**/*.*'
- 'x-pack/test/fleet_api_integration/**/*.*'
- 'Team:obs-ux-management':
- 'x-pack/solutions/observability/plugins/observability/**/*.*'
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ npm-debug.log*
/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_map/snapshots/*.diff.png

# transpiled cypress config
x-pack/plugins/fleet/cypress.config.d.ts
x-pack/plugins/fleet/cypress.config.js
x-pack/platform/plugins/shared/fleet/cypress.config.d.ts
x-pack/platform/plugins/shared/fleet/cypress.config.js
x-pack/platform/plugins/shared/osquery/cypress.config.d.ts
x-pack/platform/plugins/shared/osquery/cypress.config.js
x-pack/plugins/enterprise_search/cypress.config.d.ts
Expand Down
2 changes: 1 addition & 1 deletion .i18nrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"console": "src/platform/plugins/shared/console",
"contentManagement": "packages/content-management",
"core": ["src/core", "packages/core"],
"customIntegrations": "src/plugins/custom_integrations",
"customIntegrations": "src/platform/plugins/shared/custom_integrations",
"customIntegrationsPackage": "x-pack/solutions/observability/packages/kbn-custom-integrations",
"dashboard": "src/platform/plugins/shared/dashboard",
"cloud": "packages/cloud",
Expand Down
4 changes: 2 additions & 2 deletions docs/developer/plugin-list.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ as uiSettings within the code.
|The Controls plugin contains Embeddables which can be used to add user-friendly interactivity to apps.
|{kib-repo}blob/{branch}/src/plugins/custom_integrations/README.md[customIntegrations]
|{kib-repo}blob/{branch}/src/platform/plugins/shared/custom_integrations/README.md[customIntegrations]
|Register add-data cards
Expand Down Expand Up @@ -605,7 +605,7 @@ activities.
|WARNING: Missing README.
|{kib-repo}blob/{branch}/x-pack/plugins/fleet/README.md[fleet]
|{kib-repo}blob/{branch}/x-pack/platform/plugins/shared/fleet/README.md[fleet]
|Fleet provides a web-based UI in Kibana for centrally managing Elastic Agents and their policies.
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@
"@kbn/custom-branding-plugin": "link:x-pack/plugins/custom_branding",
"@kbn/custom-icons": "link:src/platform/packages/shared/kbn-custom-icons",
"@kbn/custom-integrations": "link:x-pack/solutions/observability/packages/kbn-custom-integrations",
"@kbn/custom-integrations-plugin": "link:src/plugins/custom_integrations",
"@kbn/custom-integrations-plugin": "link:src/platform/plugins/shared/custom_integrations",
"@kbn/dashboard-enhanced-plugin": "link:x-pack/platform/plugins/shared/dashboard_enhanced",
"@kbn/dashboard-plugin": "link:src/platform/plugins/shared/dashboard",
"@kbn/data-forge": "link:x-pack/platform/packages/shared/kbn-data-forge",
Expand All @@ -440,7 +440,7 @@
"@kbn/datemath": "link:packages/kbn-datemath",
"@kbn/deeplinks-analytics": "link:packages/deeplinks/analytics",
"@kbn/deeplinks-devtools": "link:src/platform/packages/shared/deeplinks/devtools",
"@kbn/deeplinks-fleet": "link:packages/deeplinks/fleet",
"@kbn/deeplinks-fleet": "link:src/platform/packages/shared/deeplinks/fleet",
"@kbn/deeplinks-management": "link:src/platform/packages/shared/deeplinks/management",
"@kbn/deeplinks-ml": "link:src/platform/packages/shared/deeplinks/ml",
"@kbn/deeplinks-observability": "link:src/platform/packages/shared/deeplinks/observability",
Expand Down Expand Up @@ -536,7 +536,7 @@
"@kbn/files-example-plugin": "link:examples/files_example",
"@kbn/files-management-plugin": "link:src/plugins/files_management",
"@kbn/files-plugin": "link:src/plugins/files",
"@kbn/fleet-plugin": "link:x-pack/plugins/fleet",
"@kbn/fleet-plugin": "link:x-pack/platform/plugins/shared/fleet",
"@kbn/flot-charts": "link:src/platform/packages/shared/kbn-flot-charts",
"@kbn/foo-plugin": "link:x-pack/test/ui_capabilities/common/plugins/foo_plugin",
"@kbn/formatters": "link:packages/kbn-formatters",
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-babel-preset/styled_components_files.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module.exports = {
/packages[\/\\]kbn-ui-shared-deps-src[\/\\]/,
/src[\/\\]plugins[\/\\]kibana_react[\/\\]/,
/x-pack[\/\\]platform[\/\\]packages[\/\\]shared[\/\\]kbn-elastic-assistant[\/\\]/,
/x-pack[\/\\]plugins[\/\\]fleet[\/\\]/,
/x-pack[\/\\]platform[\/\\]plugins[\/\\]shared[\/\\](fleet)[\/\\]/,
/x-pack[\/\\]plugins[\/\\]observability_solution[\/\\]observability_shared[\/\\]/,
/x-pack[\/\\]plugins[\/\\]security_solution[\/\\]/,
/x-pack[\/\\]solutions[\/\\]observability[\/\\]plugins[\/\\]exploratory_view[\/\\]/,
Expand Down
8 changes: 4 additions & 4 deletions run_fleet_setup_parallel.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
node scripts/jest_integration.js x-pack/plugins/fleet/server/integration_tests/es.test.ts &
node scripts/jest_integration.js x-pack/platform/plugins/shared/fleet/server/integration_tests/es.test.ts &

sleep 5
node scripts/jest_integration.js x-pack/plugins/fleet/server/integration_tests/fleet_setup.test.ts &
node scripts/jest_integration.js x-pack/plugins/fleet/server/integration_tests/fleet_setup.test.ts &
node scripts/jest_integration.js x-pack/plugins/fleet/server/integration_tests/fleet_setup.test.ts &
node scripts/jest_integration.js x-pack/platform/plugins/shared/fleet/server/integration_tests/fleet_setup.test.ts &
node scripts/jest_integration.js x-pack/platform/plugins/shared/fleet/server/integration_tests/fleet_setup.test.ts &
node scripts/jest_integration.js x-pack/platform/plugins/shared/fleet/server/integration_tests/fleet_setup.test.ts &
exit 0
4 changes: 2 additions & 2 deletions src/dev/build/lib/archive_utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import yauzl from 'yauzl';
import yazl from 'yazl';

// The utilities in this file are largely copied with minor modifications from
// `x-pack/plugins/fleet/server/services/epm/extract.ts`. We can't import them directly
// `x-pack/platform/plugins/shared/fleet/server/services/epm/extract.ts`. We can't import them directly
// in the bundled package task due to tsconfig limitation, so they're copied here instead.

export interface ZipEntry {
Expand Down Expand Up @@ -63,7 +63,7 @@ export async function createZipFile(entries: ZipEntry[], destination: string): P
});
}

// Copied over some utilities from x-pack/plugins/fleet/server/services/epm/archive/extract.ts since we can't
// Copied over some utilities from x-pack/platform/plugins/shared/fleet/server/services/epm/archive/extract.ts since we can't
// import them directly due to `tsconfig` limitations in the `kibana/src/` directory.
function yauzlFromBuffer(buffer: Buffer, opts: yauzl.Options): Promise<yauzl.ZipFile> {
return new Promise((resolve, reject) =>
Expand Down
3 changes: 2 additions & 1 deletion src/dev/build/tasks/fetch_agent_versions_list.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ export const FetchAgentVersionsList: Task = {
}

const versionsList = await getAvailableVersions(log);
const AGENT_VERSION_BUILD_FILE = 'x-pack/plugins/fleet/target/agent_versions_list.json';
const AGENT_VERSION_BUILD_FILE =
'x-pack/platform/plugins/shared/fleet/target/agent_versions_list.json';

if (versionsList.length !== 0) {
log.info(`Writing versions list to ${AGENT_VERSION_BUILD_FILE}`);
Expand Down
2 changes: 1 addition & 1 deletion src/dev/precommit_hook/casing_check_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const IGNORE_FILE_GLOBS = [
'x-pack/platform/plugins/private/canvas/server/templates/assets/*.{png,jpg,svg}',
'x-pack/plugins/cases/docs/**/*',
'x-pack/platform/plugins/private/monitoring/public/lib/jquery_flot/**/*',
'x-pack/plugins/fleet/cypress/packages/*.zip',
'x-pack/platform/plugins/shared/fleet/cypress/packages/*.zip',
'**/apm-diagnostics-*.json',
'**/.*',
'**/__mocks__/**/*',
Expand Down
4 changes: 2 additions & 2 deletions src/dev/storybook/aliases.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export const storybookAliases = {
chart_icons: 'packages/kbn-chart-icons/.storybook',
content_management_examples: 'examples/content_management_examples/.storybook',
custom_icons: 'src/platform/packages/shared/kbn-custom-icons/.storybook',
custom_integrations: 'src/plugins/custom_integrations/storybook',
custom_integrations: 'src/platform/plugins/shared/custom_integrations/storybook',
dashboard_enhanced: 'x-pack/platform/plugins/shared/dashboard_enhanced/.storybook',
dashboard: 'src/platform/plugins/shared/dashboard/.storybook',
data: 'src/plugins/data/.storybook',
Expand All @@ -43,7 +43,7 @@ export const storybookAliases = {
expression_reveal_image: 'src/platform/plugins/shared/expression_reveal_image/.storybook',
expression_shape: 'src/platform/plugins/shared/expression_shape/.storybook',
expression_tagcloud: 'src/plugins/chart_expressions/expression_tagcloud/.storybook',
fleet: 'x-pack/plugins/fleet/.storybook',
fleet: 'x-pack/platform/plugins/shared/fleet/.storybook',
grouping: 'packages/kbn-grouping/.storybook',
home: 'src/plugins/home/.storybook',
infra: 'x-pack/solutions/observability/plugins/infra/.storybook',
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@

module.exports = {
preset: '@kbn/test',
rootDir: '../../..',
roots: ['<rootDir>/packages/deeplinks/fleet'],
rootDir: '../../../../../..',
roots: ['<rootDir>/src/platform/packages/shared/deeplinks/fleet'],
};
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../../tsconfig.base.json",
"extends": "../../../../../../tsconfig.base.json",
"compilerOptions": {
"outDir": "target/types",
"types": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,7 @@ export const getDocLinks = ({ kibanaBranch, buildFlavor }: GetDocLinkOptions): D
dataStreams: `${ELASTIC_WEBSITE_URL}guide/en/ecs/${ECS_VERSION}/ecs-data_stream.html`,
},
clients: {
/** Changes to these URLs must also be synched in src/plugins/custom_integrations/server/language_clients/index.ts */
/** Changes to these URLs must also be synched in src/platform/plugins/shared/custom_integrations/server/language_clients/index.ts */
guide: `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/client/index.html`,
goConnecting: `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/client/go-api/${DOC_LINK_VERSION}/connecting.html`,
goGettingStarted: `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/client/go-api/${DOC_LINK_VERSION}/getting-started-go.html`,
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@

module.exports = {
preset: '@kbn/test',
rootDir: '../../..',
roots: ['<rootDir>/src/plugins/custom_integrations'],
coverageDirectory: '<rootDir>/target/kibana-coverage/jest/src/plugins/custom_integrations',
rootDir: '../../../../..',
roots: ['<rootDir>/src/platform/plugins/shared/custom_integrations'],
coverageDirectory:
'<rootDir>/target/kibana-coverage/jest/src/platform/plugins/shared/custom_integrations',
coverageReporters: ['text', 'html'],
collectCoverageFrom: ['<rootDir>/src/plugins/data/{common,public,server}/**/*.{ts,tsx}'],
};
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ addons.setConfig({
theme: create({
base: 'light',
brandTitle: 'Kibana Custom Integrations Storybook',
brandUrl: 'https://github.com/elastic/kibana/tree/main/src/plugins/custom_integrations',
brandUrl:
'https://github.com/elastic/kibana/tree/main/src/platform/plugins/shared/custom_integrations',
}),
showPanel: true.valueOf,
selectedPanel: PANEL_ID,
Expand Down
Loading

0 comments on commit fce686b

Please sign in to comment.