Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Maintenance] Move Asset Manager, Metrics Data Access to /x-pack/plugins/observability_solution #181970

Merged
merged 8 commits into from
Apr 30, 2024
Merged

[Maintenance] Move Asset Manager, Metrics Data Access to /x-pack/plugins/observability_solution #181970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9c17dfb
Move Asset Manager
CoenWarmer Apr 29, 2024
5da6193
Update references for asset manager
CoenWarmer Apr 29, 2024
eeca657
Move Metrics Data Access
CoenWarmer Apr 29, 2024
b79ad7a
Update references for Metrics Data Access
CoenWarmer Apr 29, 2024
4203b9e
Merge branch 'main' into feat/move-additional-obs-plugins
CoenWarmer Apr 29, 2024
a3c7104
Merge branch 'main' of github.com:elastic/kibana into feat/move-addit…
CoenWarmer Apr 30, 2024
0d7d155
Update i18n reference for Metrics Data Access
CoenWarmer Apr 30, 2024
6e63e50
Merge branch 'main' of github.com:elastic/kibana into feat/move-addit…
CoenWarmer Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
View file
Open in desktop
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ packages/kbn-apm-synthtrace-client @elastic/obs-ux-infra_services-team @elastic/
packages/kbn-apm-utils @elastic/obs-ux-infra_services-team
test/plugin_functional/plugins/app_link_test @elastic/kibana-core
x-pack/test/usage_collection/plugins/application_usage_test @elastic/kibana-core
x-pack/plugins/asset_manager @elastic/obs-knowledge-team
x-pack/plugins/observability_solution/asset_manager @elastic/obs-knowledge-team
x-pack/test/security_api_integration/plugins/audit_log @elastic/kibana-security
packages/kbn-axe-config @elastic/kibana-qa
packages/kbn-babel-preset @elastic/kibana-operations
Expand Down Expand Up @@ -555,7 +555,7 @@ x-pack/examples/third_party_maps_source_example @elastic/kibana-gis
src/plugins/maps_ems @elastic/kibana-gis
x-pack/plugins/maps @elastic/kibana-gis
x-pack/packages/maps/vector_tile_utils @elastic/kibana-gis
x-pack/plugins/metrics_data_access @elastic/obs-knowledge-team @elastic/obs-ux-infra_services-team
x-pack/plugins/observability_solution/metrics_data_access @elastic/obs-knowledge-team @elastic/obs-ux-infra_services-team
x-pack/packages/ml/agg_utils @elastic/ml-ui
x-pack/packages/ml/anomaly_utils @elastic/ml-ui
x-pack/packages/ml/cancellable_search @elastic/ml-ui
Expand Down
4 changes: 2 additions & 2 deletions docs/developer/plugin-list.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ The plugin exposes the static DefaultEditorController class to consume.
|WARNING: Missing README.


|{kib-repo}blob/{branch}/x-pack/plugins/asset_manager/README.md[assetManager]
|{kib-repo}blob/{branch}/x-pack/plugins/observability_solution/asset_manager/README.md[assetManager]
|This plugin provides access to observed asset data, such as information about hosts, pods, containers, services, and more.


Expand Down Expand Up @@ -659,7 +659,7 @@ using the CURL scripts in the scripts folder.
|Visualize geo data from Elasticsearch or 3rd party geo-services.


|{kib-repo}blob/{branch}/x-pack/plugins/metrics_data_access/README.md[metricsDataAccess]
|{kib-repo}blob/{branch}/x-pack/plugins/observability_solution/metrics_data_access/README.md[metricsDataAccess]
|Exposes utilities to access metrics data.


Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
"@kbn/apm-utils": "link:packages/kbn-apm-utils",
"@kbn/app-link-test-plugin": "link:test/plugin_functional/plugins/app_link_test",
"@kbn/application-usage-test-plugin": "link:x-pack/test/usage_collection/plugins/application_usage_test",
"@kbn/assetManager-plugin": "link:x-pack/plugins/asset_manager",
"@kbn/assetManager-plugin": "link:x-pack/plugins/observability_solution/asset_manager",
"@kbn/audit-log-plugin": "link:x-pack/test/security_api_integration/plugins/audit_log",
"@kbn/banners-plugin": "link:x-pack/plugins/banners",
"@kbn/bfetch-error": "link:packages/kbn-bfetch-error",
Expand Down Expand Up @@ -577,7 +577,7 @@
"@kbn/maps-ems-plugin": "link:src/plugins/maps_ems",
"@kbn/maps-plugin": "link:x-pack/plugins/maps",
"@kbn/maps-vector-tile-utils": "link:x-pack/packages/maps/vector_tile_utils",
"@kbn/metrics-data-access-plugin": "link:x-pack/plugins/metrics_data_access",
"@kbn/metrics-data-access-plugin": "link:x-pack/plugins/observability_solution/metrics_data_access",
"@kbn/ml-agg-utils": "link:x-pack/packages/ml/agg_utils",
"@kbn/ml-anomaly-utils": "link:x-pack/packages/ml/anomaly_utils",
"@kbn/ml-cancellable-search": "link:x-pack/packages/ml/cancellable_search",
Expand Down
12 changes: 5 additions & 7 deletions tsconfig.base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@
"@kbn/app-link-test-plugin/*": ["test/plugin_functional/plugins/app_link_test/*"],
"@kbn/application-usage-test-plugin": ["x-pack/test/usage_collection/plugins/application_usage_test"],
"@kbn/application-usage-test-plugin/*": ["x-pack/test/usage_collection/plugins/application_usage_test/*"],
"@kbn/assetManager-plugin": ["x-pack/plugins/asset_manager"],
"@kbn/assetManager-plugin/*": ["x-pack/plugins/asset_manager/*"],
"@kbn/assetManager-plugin": ["x-pack/plugins/observability_solution/asset_manager"],
"@kbn/assetManager-plugin/*": ["x-pack/plugins/observability_solution/asset_manager/*"],
"@kbn/audit-log-plugin": ["x-pack/test/security_api_integration/plugins/audit_log"],
"@kbn/audit-log-plugin/*": ["x-pack/test/security_api_integration/plugins/audit_log/*"],
"@kbn/axe-config": ["packages/kbn-axe-config"],
Expand Down Expand Up @@ -1104,8 +1104,8 @@
"@kbn/maps-plugin/*": ["x-pack/plugins/maps/*"],
"@kbn/maps-vector-tile-utils": ["x-pack/packages/maps/vector_tile_utils"],
"@kbn/maps-vector-tile-utils/*": ["x-pack/packages/maps/vector_tile_utils/*"],
"@kbn/metrics-data-access-plugin": ["x-pack/plugins/metrics_data_access"],
"@kbn/metrics-data-access-plugin/*": ["x-pack/plugins/metrics_data_access/*"],
"@kbn/metrics-data-access-plugin": ["x-pack/plugins/observability_solution/metrics_data_access"],
"@kbn/metrics-data-access-plugin/*": ["x-pack/plugins/observability_solution/metrics_data_access/*"],
"@kbn/ml-agg-utils": ["x-pack/packages/ml/agg_utils"],
"@kbn/ml-agg-utils/*": ["x-pack/packages/ml/agg_utils/*"],
"@kbn/ml-anomaly-utils": ["x-pack/packages/ml/anomaly_utils"],
Expand Down Expand Up @@ -1832,9 +1832,7 @@
"@kbn/zod-helpers/*": ["packages/kbn-zod-helpers/*"],
// END AUTOMATED PACKAGE LISTING
// Allows for importing from `kibana` package for the exported types.
"@emotion/core": [
"typings/@emotion"
]
"@emotion/core": ["typings/@emotion"]
},
// Support .tsx files and transform JSX into calls to React.createElement
"jsx": "react",
Expand Down
62 changes: 16 additions & 46 deletions x-pack/.i18nrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,9 @@
"xpack.dataVisualizer": "plugins/data_visualizer",
"xpack.exploratoryView": "plugins/observability_solution/exploratory_view",
"xpack.fileUpload": "plugins/file_upload",
"xpack.globalSearch": [
"plugins/global_search"
],
"xpack.globalSearchBar": [
"plugins/global_search_bar"
],
"xpack.graph": [
"plugins/graph"
],
"xpack.globalSearch": ["plugins/global_search"],
"xpack.globalSearchBar": ["plugins/global_search_bar"],
"xpack.graph": ["plugins/graph"],
"xpack.grokDebugger": "plugins/grokdebugger",
"xpack.idxMgmt": "plugins/index_management",
"xpack.idxMgmtPackage": "packages/index-management",
Expand All @@ -62,14 +56,10 @@
"xpack.licenseMgmt": "plugins/license_management",
"xpack.licensing": "plugins/licensing",
"xpack.lists": "plugins/lists",
"xpack.logstash": [
"plugins/logstash"
],
"xpack.logstash": ["plugins/logstash"],
"xpack.main": "legacy/plugins/xpack_main",
"xpack.maps": [
"plugins/maps"
],
"xpack.metricsData": "plugins/metrics_data_access",
"xpack.maps": ["plugins/maps"],
"xpack.metricsData": "plugins/observability_solution/metrics_data_access",
"xpack.ml": [
"packages/ml/anomaly_utils",
"packages/ml/creation_wizard_utils",
Expand All @@ -82,9 +72,7 @@
"packages/ml/ui_actions",
"plugins/ml"
],
"xpack.monitoring": [
"plugins/monitoring"
],
"xpack.monitoring": ["plugins/monitoring"],
"xpack.observability": "plugins/observability_solution/observability",
"xpack.observabilityAiAssistant": [
"plugins/observability_solution/observability_ai_assistant",
Expand All @@ -94,20 +82,12 @@
"xpack.observabilityLogsExplorer": "plugins/observability_solution/observability_logs_explorer",
"xpack.observability_onboarding": "plugins/observability_solution/observability_onboarding",
"xpack.observabilityShared": "plugins/observability_solution/observability_shared",
"xpack.osquery": [
"plugins/osquery"
],
"xpack.osquery": ["plugins/osquery"],
"xpack.painlessLab": "plugins/painless_lab",
"xpack.profiling": [
"plugins/observability_solution/profiling"
],
"xpack.profiling": ["plugins/observability_solution/profiling"],
"xpack.remoteClusters": "plugins/remote_clusters",
"xpack.reporting": [
"plugins/reporting"
],
"xpack.rollupJobs": [
"plugins/rollup"
],
"xpack.reporting": ["plugins/reporting"],
"xpack.rollupJobs": ["plugins/rollup"],
"xpack.runtimeFields": "plugins/runtime_fields",
"xpack.screenshotting": "plugins/screenshotting",
"xpack.searchNotebooks": "plugins/search_notebooks",
Expand All @@ -125,30 +105,20 @@
"xpack.slo": "plugins/observability_solution/slo",
"xpack.snapshotRestore": "plugins/snapshot_restore",
"xpack.spaces": "plugins/spaces",
"xpack.savedObjectsTagging": [
"plugins/saved_objects_tagging"
],
"xpack.savedObjectsTagging": ["plugins/saved_objects_tagging"],
"xpack.taskManager": "legacy/plugins/task_manager",
"xpack.threatIntelligence": "plugins/threat_intelligence",
"xpack.timelines": "plugins/timelines",
"xpack.transform": "plugins/transform",
"xpack.triggersActionsUI": "plugins/triggers_actions_ui",
"xpack.upgradeAssistant": "plugins/upgrade_assistant",
"xpack.uptime": [
"plugins/observability_solution/uptime"
],
"xpack.synthetics": [
"plugins/observability_solution/synthetics"
],
"xpack.ux": [
"plugins/observability_solution/ux"
],
"xpack.uptime": ["plugins/observability_solution/uptime"],
"xpack.synthetics": ["plugins/observability_solution/synthetics"],
"xpack.ux": ["plugins/observability_solution/ux"],
"xpack.urlDrilldown": "plugins/drilldowns/url_drilldown",
"xpack.watcher": "plugins/watcher"
},
"exclude": [
"examples"
],
"exclude": ["examples"],
"translations": [
"@kbn/translations-plugin/translations/zh-CN.json",
"@kbn/translations-plugin/translations/ja-JP.json",
Expand Down
0 x-pack/plugins/asset_manager/README.md → ...vability_solution/asset_manager/README.md
View file
Open in desktop
File renamed without changes.
0 ...ck/plugins/asset_manager/common/config.ts → ...y_solution/asset_manager/common/config.ts
View file
Open in desktop
File renamed without changes.
0 .../asset_manager/common/constants_routes.ts → .../asset_manager/common/constants_routes.ts
View file
Open in desktop
File renamed without changes.
0 ...plugins/asset_manager/common/debug_log.ts → ...olution/asset_manager/common/debug_log.ts
View file
Open in desktop
File renamed without changes.
0 ...plugins/asset_manager/common/types_api.ts → ...olution/asset_manager/common/types_api.ts
View file
Open in desktop
File renamed without changes.
0 ...gins/asset_manager/common/types_client.ts → ...tion/asset_manager/common/types_client.ts
View file
Open in desktop
File renamed without changes.