[Moving] Move Infra folder into /x-pack/observability_solution (#177443)

.eslintrc.js

@@ -915,6 +915,7 @@ module.exports = {
         'x-pack/plugins/observability_solution/apm/**/*.tsx',
         'x-pack/plugins/observability_solution/dataset_quality/**/*.tsx',
         'x-pack/plugins/observability_solution/exploratory_view/**/*.tsx',
+        'x-pack/plugins/observability_solution/infra/**/*.tsx',
         'x-pack/plugins/observability_solution/observability/**/*.tsx',
         'x-pack/plugins/observability_solution/observability_ai_assistant/**/*.tsx',
         'x-pack/plugins/observability_solution/observability_onboarding/**/*.tsx',
@@ -931,11 +932,10 @@ module.exports = {
     },
     {
       files: [
-        'x-pack/plugins/infra/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
-        'x-pack/plugins/observability_solution/exploratory_view/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
-        'x-pack/plugins/observability_solution/observability/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
         'x-pack/plugins/observability_solution/apm/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
         'x-pack/plugins/observability_solution/exploratory_view/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
+        'x-pack/plugins/observability_solution/infra/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
+        'x-pack/plugins/observability_solution/observability/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
         'x-pack/plugins/observability_solution/observability_ai_assistant/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
         'x-pack/plugins/observability_solution/observability_onboarding/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
         'x-pack/plugins/observability_solution/observability_shared/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',

.github/CODEOWNERS

@@ -464,7 +464,7 @@ x-pack/plugins/index_lifecycle_management @elastic/platform-deployment-managemen
 x-pack/plugins/index_management @elastic/platform-deployment-management
 test/plugin_functional/plugins/index_patterns @elastic/kibana-data-discovery
 x-pack/packages/kbn-infra-forge @elastic/obs-ux-management-team
-x-pack/plugins/infra @elastic/obs-ux-logs-team @elastic/obs-ux-infra_services-team
+x-pack/plugins/observability_solution/infra @elastic/obs-ux-logs-team @elastic/obs-ux-infra_services-team
 x-pack/plugins/ingest_pipelines @elastic/platform-deployment-management
 src/plugins/input_control_vis @elastic/kibana-presentation
 src/plugins/inspector @elastic/kibana-presentation
@@ -991,60 +991,60 @@ packages/kbn-monaco/src/esql @elastic/kibana-visualizations
 /.github/workflows/oblt-github-commands @elastic/observablt-robots
 
 # Infra Monitoring
-/x-pack/plugins/infra/server/routes @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/server/routes/log_analysis @elastic/obs-ux-logs-team
-/x-pack/plugins/infra/server/routes/log_alerts @elastic/obs-ux-logs-team
-/x-pack/plugins/infra/server/saved_objects/metrics_explorer_view @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/server/saved_objects/inventory_view @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/server/services @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/server/services/rules @elastic/obs-ux-infra_services-team @elastic/obs-ux-logs-team
-/x-pack/plugins/infra/server/lib @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/server/lib/log_analysis @elastic/obs-ux-logs-team
-/x-pack/plugins/infra/docs/state_machines @elastic/obs-ux-logs-team
-/x-pack/plugins/infra/common/inventory_models @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/common/http_api/metrics_api.ts @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/common/http_api/snapshot_api.ts @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/common/http_api/log_analysis @elastic/obs-ux-logs-team
-/x-pack/plugins/infra/common/http_api/metrics_explorer_views @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/common/http_api/host_details @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/common/http_api/log_alerts @elastic/obs-ux-logs-team
-/x-pack/plugins/infra/common/snapshot_metric_i18n.ts @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/common/inventory_views @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/common/color_palette.test.ts @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/common/performance_tracing.ts @elastic/obs-ux-logs-team
-/x-pack/plugins/infra/common/log_search_summary @elastic/obs-ux-logs-team
-/x-pack/plugins/infra/common/metrics_sources @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/common/saved_views @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/common/infra_ml @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/common/formatters @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/common/log_text_scale @elastic/obs-ux-logs-team
-/x-pack/plugins/infra/common/log_analysis @elastic/obs-ux-logs-team
-/x-pack/plugins/infra/common/search_strategies/log_entries @elastic/obs-ux-logs-team
-/x-pack/plugins/infra/common/metrics_explorer_views @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/common/source_configuration @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/common/color_palette.ts @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/common/log_search_result @elastic/obs-ux-logs-team
-/x-pack/plugins/infra/public/apps/logs_app.tsx @elastic/obs-ux-logs-team
-/x-pack/plugins/infra/public/apps/metrics_app.tsx @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/public/components/lens @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/public/components/try_it_button.tsx @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/public/components/fixed_datepicker.tsx
-/x-pack/plugins/infra/public/components/logging @elastic/obs-ux-logs-team
-/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/public/components/saved_views @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/public/components/feature_feedback_button.tsx @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/public/components/log_stream @elastic/obs-ux-logs-team
-/x-pack/plugins/infra/public/components/source_configuration @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/public/components/asset_details @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/public/containers/logs @elastic/obs-ux-logs-team
-/x-pack/plugins/infra/public/containers/metrics_source @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/public/containers/metrics_explorer @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/public/containers/ml @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/public/pages/logs @elastic/obs-ux-logs-team
-/x-pack/plugins/infra/public/pages/metrics @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/public/common @elastic/obs-ux-infra_services-team
-/x-pack/plugins/infra/public/observability_logs @elastic/obs-ux-logs-team
-/x-pack/plugins/infra/public/services @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/server/routes @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/server/routes/log_analysis @elastic/obs-ux-logs-team
+/x-pack/plugins/observability_solution/infra/server/routes/log_alerts @elastic/obs-ux-logs-team
+/x-pack/plugins/observability_solution/infra/server/saved_objects/metrics_explorer_view @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/server/saved_objects/inventory_view @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/server/services @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/server/services/rules @elastic/obs-ux-infra_services-team @elastic/obs-ux-logs-team
+/x-pack/plugins/observability_solution/infra/server/lib @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/server/lib/log_analysis @elastic/obs-ux-logs-team
+/x-pack/plugins/observability_solution/infra/docs/state_machines @elastic/obs-ux-logs-team
+/x-pack/plugins/observability_solution/infra/common/inventory_models @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/common/http_api/metrics_api.ts @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/common/http_api/snapshot_api.ts @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/common/http_api/log_analysis @elastic/obs-ux-logs-team
+/x-pack/plugins/observability_solution/infra/common/http_api/metrics_explorer_views @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/common/http_api/host_details @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/common/http_api/log_alerts @elastic/obs-ux-logs-team
+/x-pack/plugins/observability_solution/infra/common/snapshot_metric_i18n.ts @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/common/inventory_views @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/common/color_palette.test.ts @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/common/performance_tracing.ts @elastic/obs-ux-logs-team
+/x-pack/plugins/observability_solution/infra/common/log_search_summary @elastic/obs-ux-logs-team
+/x-pack/plugins/observability_solution/infra/common/metrics_sources @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/common/saved_views @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/common/infra_ml @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/common/formatters @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/common/log_text_scale @elastic/obs-ux-logs-team
+/x-pack/plugins/observability_solution/infra/common/log_analysis @elastic/obs-ux-logs-team
+/x-pack/plugins/observability_solution/infra/common/search_strategies/log_entries @elastic/obs-ux-logs-team
+/x-pack/plugins/observability_solution/infra/common/metrics_explorer_views @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/common/source_configuration @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/common/color_palette.ts @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/common/log_search_result @elastic/obs-ux-logs-team
+/x-pack/plugins/observability_solution/infra/public/apps/logs_app.tsx @elastic/obs-ux-logs-team
+/x-pack/plugins/observability_solution/infra/public/apps/metrics_app.tsx @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/public/components/lens @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/public/components/try_it_button.tsx @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/public/components/fixed_datepicker.tsx
+/x-pack/plugins/observability_solution/infra/public/components/logging @elastic/obs-ux-logs-team
+/x-pack/plugins/observability_solution/infra/public/components/infrastructure_node_metrics_tables @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/public/components/saved_views @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/public/components/feature_feedback_button.tsx @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/public/components/log_stream @elastic/obs-ux-logs-team
+/x-pack/plugins/observability_solution/infra/public/components/source_configuration @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/public/components/asset_details @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/public/containers/logs @elastic/obs-ux-logs-team
+/x-pack/plugins/observability_solution/infra/public/containers/metrics_source @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/public/containers/metrics_explorer @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/public/containers/ml @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/public/pages/logs @elastic/obs-ux-logs-team
+/x-pack/plugins/observability_solution/infra/public/pages/metrics @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/public/common @elastic/obs-ux-infra_services-team
+/x-pack/plugins/observability_solution/infra/public/observability_logs @elastic/obs-ux-logs-team
+/x-pack/plugins/observability_solution/infra/public/services @elastic/obs-ux-infra_services-team
 /x-pack/test/functional/apps/infra @elastic/obs-ux-infra_services-team
 /x-pack/test/functional/apps/infra/logs @elastic/obs-ux-logs-team
 /x-pack/test/api_integration/apis/infra @elastic/obs-ux-infra_services-team
@@ -1052,8 +1052,8 @@ packages/kbn-monaco/src/esql @elastic/kibana-visualizations
 # Observability UX management team
 x-pack/packages/observability/alert_details @elastic/obs-ux-management-team
 x-pack/test/observability_functional @elastic/obs-ux-management-team
-x-pack/plugins/infra/public/alerting @elastic/obs-ux-management-team
-x-pack/plugins/infra/server/lib/alerting @elastic/obs-ux-management-team
+x-pack/plugins/observability_solution/infra/public/alerting @elastic/obs-ux-management-team
+x-pack/plugins/observability_solution/infra/server/lib/alerting @elastic/obs-ux-management-team
 
 # Elastic Stack Monitoring
 /x-pack/test/functional/apps/monitoring @elastic/obs-ux-infra_services-team @elastic/stack-monitoring
@@ -1542,8 +1542,13 @@ x-pack/plugins/security_solution/server/lib/security_integrations @elastic/secur
 **/*.scss @elastic/kibana-design
 
 # Observability design
+<<<<<<< HEAD
+/x-pack/plugins/apm/**/*.scss @elastic/observability-design
+/x-pack/plugins/observability_solution/infra/**/*.scss @elastic/observability-design
+=======
 /x-pack/plugins/observability_solution/apm/**/*.scss @elastic/observability-design
 /x-pack/plugins/infra/**/*.scss @elastic/observability-design
+>>>>>>> 037d08745b89950be0631e06f0b39e275bd6a328
 /x-pack/plugins/fleet/**/*.scss @elastic/observability-design
 /x-pack/plugins/monitoring/**/*.scss @elastic/observability-design
 

api_docs/alerting.devdocs.json

@@ -3553,19 +3553,19 @@
               },
               {
                 "plugin": "infra",
-                "path": "x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts"
+                "path": "x-pack/plugins/observability_solution/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts"
               },
               {
                 "plugin": "infra",
-                "path": "x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts"
+                "path": "x-pack/plugins/observability_solution/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts"
               },
               {
                 "plugin": "infra",
-                "path": "x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts"
+                "path": "x-pack/plugins/observability_solution/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts"
               },
               {
                 "plugin": "infra",
-                "path": "x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/inventory_metric_threshold_executor.ts"
+                "path": "x-pack/plugins/observability_solution/infra/server/lib/alerting/inventory_metric_threshold/inventory_metric_threshold_executor.ts"
               },
               {
                 "plugin": "securitySolution",

api_docs/deprecations_by_plugin.mdx

@@ -997,9 +997,9 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 
 | Deprecated API | Reference location(s) | Remove By |
 | ---------------|-----------|-----------|
-| <DocLink id="kibAlertingPluginApi" section="def-server.RuleExecutorServices.alertFactory" text="alertFactory"/> | [log_threshold_executor.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts#:~:text=alertFactory), [log_threshold_executor.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts#:~:text=alertFactory), [log_threshold_executor.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts#:~:text=alertFactory), [inventory_metric_threshold_executor.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/inventory_metric_threshold_executor.ts#:~:text=alertFactory) | - |
-| <DocLink id="kibKibanaReactPluginApi" section="def-public.KibanaThemeProvider" text="KibanaThemeProvider"/> | [common_providers.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/public/apps/common_providers.tsx#:~:text=KibanaThemeProvider), [common_providers.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/public/apps/common_providers.tsx#:~:text=KibanaThemeProvider), [common_providers.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/public/apps/common_providers.tsx#:~:text=KibanaThemeProvider) | - |
-| <DocLink id="kibKbnCoreSavedObjectsServerPluginApi" section="def-common.SavedObjectsType.migrations" text="migrations"/> | [saved_object_type.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/server/lib/sources/saved_object_type.ts#:~:text=migrations) | - |
+| <DocLink id="kibAlertingPluginApi" section="def-server.RuleExecutorServices.alertFactory" text="alertFactory"/> | [log_threshold_executor.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts#:~:text=alertFactory), [log_threshold_executor.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts#:~:text=alertFactory), [log_threshold_executor.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts#:~:text=alertFactory), [inventory_metric_threshold_executor.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/infra/server/lib/alerting/inventory_metric_threshold/inventory_metric_threshold_executor.ts#:~:text=alertFactory) | - |
+| <DocLink id="kibKibanaReactPluginApi" section="def-public.KibanaThemeProvider" text="KibanaThemeProvider"/> | [common_providers.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/infra/public/apps/common_providers.tsx#:~:text=KibanaThemeProvider), [common_providers.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/infra/public/apps/common_providers.tsx#:~:text=KibanaThemeProvider), [common_providers.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/infra/public/apps/common_providers.tsx#:~:text=KibanaThemeProvider) | - |
+| <DocLink id="kibKbnCoreSavedObjectsServerPluginApi" section="def-common.SavedObjectsType.migrations" text="migrations"/> | [saved_object_type.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/infra/server/lib/sources/saved_object_type.ts#:~:text=migrations) | - |
 
 
 

api_docs/infra.devdocs.json

@@ -12,7 +12,7 @@
         "tags": [],
         "label": "InfraFormatterType",
         "description": [],
-        "path": "x-pack/plugins/infra/public/lib/lib.ts",
+        "path": "x-pack/plugins/observability_solution/infra/public/lib/lib.ts",
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
@@ -27,7 +27,7 @@
         "tags": [],
         "label": "FORMATTERS",
         "description": [],
-        "path": "x-pack/plugins/infra/common/formatters/index.ts",
+        "path": "x-pack/plugins/observability_solution/infra/common/formatters/index.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
@@ -38,10 +38,8 @@
             "tags": [],
             "label": "number",
             "description": [],
-            "signature": [
-              "(val: number) => string"
-            ],
-            "path": "x-pack/plugins/infra/common/formatters/index.ts",
+            "signature": ["(val: number) => string"],
+            "path": "x-pack/plugins/observability_solution/infra/common/formatters/index.ts",
             "deprecated": false,
             "trackAdoption": false,
             "returnComment": [],
@@ -53,7 +51,7 @@
                 "tags": [],
                 "label": "val",
                 "description": [],
-                "path": "x-pack/plugins/infra/common/formatters/number.ts",
+                "path": "x-pack/plugins/observability_solution/infra/common/formatters/number.ts",
                 "deprecated": false,
                 "trackAdoption": false
               }
@@ -68,10 +66,8 @@
             "description": [
               "// Because the implimentation for formatting large numbers is the same as formatting\n// bytes we are re-using the same code, we just format the number using the abbreviated number format."
             ],
-            "signature": [
-              "(bytes: number) => string"
-            ],
-            "path": "x-pack/plugins/infra/common/formatters/index.ts",
+            "signature": ["(bytes: number) => string"],
+            "path": "x-pack/plugins/observability_solution/infra/common/formatters/index.ts",
             "deprecated": false,
             "trackAdoption": false,
             "returnComment": [],
@@ -83,7 +79,7 @@
                 "tags": [],
                 "label": "bytes",
                 "description": [],
-                "path": "x-pack/plugins/infra/common/formatters/bytes.ts",
+                "path": "x-pack/plugins/observability_solution/infra/common/formatters/bytes.ts",
                 "deprecated": false,
                 "trackAdoption": false
               }
@@ -95,13 +91,9 @@
             "type": "Function",
             "tags": [],
             "label": "bytes",
-            "description": [
-              "// bytes in bytes formatted string out"
-            ],
-            "signature": [
-              "(bytes: number) => string"
-            ],
-            "path": "x-pack/plugins/infra/common/formatters/index.ts",
+            "description": ["// bytes in bytes formatted string out"],
+            "signature": ["(bytes: number) => string"],
+            "path": "x-pack/plugins/observability_solution/infra/common/formatters/index.ts",
             "deprecated": false,
             "trackAdoption": false,
             "returnComment": [],
@@ -113,7 +105,7 @@
                 "tags": [],
                 "label": "bytes",
                 "description": [],
-                "path": "x-pack/plugins/infra/common/formatters/bytes.ts",
+                "path": "x-pack/plugins/observability_solution/infra/common/formatters/bytes.ts",
                 "deprecated": false,
                 "trackAdoption": false
               }
@@ -125,13 +117,9 @@
             "type": "Function",
             "tags": [],
             "label": "bits",
-            "description": [
-              "// bytes in bits formatted string out"
-            ],
-            "signature": [
-              "(bytes: number) => string"
-            ],
-            "path": "x-pack/plugins/infra/common/formatters/index.ts",
+            "description": ["// bytes in bits formatted string out"],
+            "signature": ["(bytes: number) => string"],
+            "path": "x-pack/plugins/observability_solution/infra/common/formatters/index.ts",
             "deprecated": false,
             "trackAdoption": false,
             "returnComment": [],
@@ -143,7 +131,7 @@
                 "tags": [],
                 "label": "bytes",
                 "description": [],
-                "path": "x-pack/plugins/infra/common/formatters/bytes.ts",
+                "path": "x-pack/plugins/observability_solution/infra/common/formatters/bytes.ts",
                 "deprecated": false,
                 "trackAdoption": false
               }
@@ -156,10 +144,8 @@
             "tags": [],
             "label": "percent",
             "description": [],
-            "signature": [
-              "(val: number) => string"
-            ],
-            "path": "x-pack/plugins/infra/common/formatters/index.ts",
+            "signature": ["(val: number) => string"],
+            "path": "x-pack/plugins/observability_solution/infra/common/formatters/index.ts",
             "deprecated": false,
             "trackAdoption": false,
             "returnComment": [],
@@ -171,7 +157,7 @@
                 "tags": [],
                 "label": "val",
                 "description": [],
-                "path": "x-pack/plugins/infra/common/formatters/percent.ts",
+                "path": "x-pack/plugins/observability_solution/infra/common/formatters/percent.ts",
                 "deprecated": false,
                 "trackAdoption": false
               }
@@ -184,10 +170,8 @@
             "tags": [],
             "label": "highPrecision",
             "description": [],
-            "signature": [
-              "(val: number) => string"
-            ],
-            "path": "x-pack/plugins/infra/common/formatters/index.ts",
+            "signature": ["(val: number) => string"],
+            "path": "x-pack/plugins/observability_solution/infra/common/formatters/index.ts",
             "deprecated": false,
             "trackAdoption": false,
             "returnComment": [],
@@ -199,7 +183,7 @@
                 "tags": [],
                 "label": "val",
                 "description": [],
-                "path": "x-pack/plugins/infra/common/formatters/high_precision.ts",
+                "path": "x-pack/plugins/observability_solution/infra/common/formatters/high_precision.ts",
                 "deprecated": false,
                 "trackAdoption": false
               }
@@ -216,7 +200,7 @@
       "tags": [],
       "label": "InfraClientStartExports",
       "description": [],
-      "path": "x-pack/plugins/infra/public/types.ts",
+      "path": "x-pack/plugins/observability_solution/infra/public/types.ts",
       "deprecated": false,
       "trackAdoption": false,
       "children": [
@@ -227,10 +211,8 @@
           "tags": [],
           "label": "inventoryViews",
           "description": [],
-          "signature": [
-            "InventoryViewsServiceStart"
-          ],
-          "path": "x-pack/plugins/infra/public/types.ts",
+          "signature": ["InventoryViewsServiceStart"],
+          "path": "x-pack/plugins/observability_solution/infra/public/types.ts",
           "deprecated": false,
           "trackAdoption": false
         },
@@ -241,11 +223,8 @@
           "tags": [],
           "label": "metricsExplorerViews",
           "description": [],
-          "signature": [
-            "MetricsExplorerViewsServiceStart",
-            " | undefined"
-          ],
-          "path": "x-pack/plugins/infra/public/types.ts",
+          "signature": ["MetricsExplorerViewsServiceStart", " | undefined"],
+          "path": "x-pack/plugins/observability_solution/infra/public/types.ts",
           "deprecated": false,
           "trackAdoption": false
         },
@@ -256,10 +235,8 @@
           "tags": [],
           "label": "telemetry",
           "description": [],
-          "signature": [
-            "ITelemetryClient"
-          ],
-          "path": "x-pack/plugins/infra/public/types.ts",
+          "signature": ["ITelemetryClient"],
+          "path": "x-pack/plugins/observability_solution/infra/public/types.ts",
           "deprecated": false,
           "trackAdoption": false
         },
@@ -270,10 +247,8 @@
           "tags": [],
           "label": "locators",
           "description": [],
-          "signature": [
-            "InfraLocators"
-          ],
-          "path": "x-pack/plugins/infra/public/types.ts",
+          "signature": ["InfraLocators"],
+          "path": "x-pack/plugins/observability_solution/infra/public/types.ts",
           "deprecated": false,
           "trackAdoption": false
         }
@@ -293,7 +268,7 @@
         "tags": [],
         "label": "InfraConfig",
         "description": [],
-        "path": "x-pack/plugins/infra/common/plugin_config_types.ts",
+        "path": "x-pack/plugins/observability_solution/infra/common/plugin_config_types.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
@@ -307,7 +282,7 @@
             "signature": [
               "{ inventory_threshold: { group_by_page_size: number; }; metric_threshold: { group_by_page_size: number; }; }"
             ],
-            "path": "x-pack/plugins/infra/common/plugin_config_types.ts",
+            "path": "x-pack/plugins/observability_solution/infra/common/plugin_config_types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -318,7 +293,7 @@
             "tags": [],
             "label": "enabled",
             "description": [],
-            "path": "x-pack/plugins/infra/common/plugin_config_types.ts",
+            "path": "x-pack/plugins/observability_solution/infra/common/plugin_config_types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -329,10 +304,8 @@
             "tags": [],
             "label": "inventory",
             "description": [],
-            "signature": [
-              "{ compositeSize: number; }"
-            ],
-            "path": "x-pack/plugins/infra/common/plugin_config_types.ts",
+            "signature": ["{ compositeSize: number; }"],
+            "path": "x-pack/plugins/observability_solution/infra/common/plugin_config_types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -346,7 +319,7 @@
             "signature": [
               "{ default?: { fields?: { message?: string[] | undefined; } | undefined; } | undefined; } | undefined"
             ],
-            "path": "x-pack/plugins/infra/common/plugin_config_types.ts",
+            "path": "x-pack/plugins/observability_solution/infra/common/plugin_config_types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -360,7 +333,7 @@
             "signature": [
               "{ customThresholdAlertsEnabled: boolean; logsUIEnabled: boolean; metricsExplorerEnabled: boolean; osqueryEnabled: boolean; inventoryThresholdAlertRuleEnabled: boolean; metricThresholdAlertRuleEnabled: boolean; logThresholdAlertRuleEnabled: boolean; alertsAndRulesDropdownEnabled: boolean; profilingEnabled: boolean; }"
             ],
-            "path": "x-pack/plugins/infra/common/plugin_config_types.ts",
+            "path": "x-pack/plugins/observability_solution/infra/common/plugin_config_types.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -374,7 +347,8 @@
         "tags": [],
         "label": "InfraRequestHandlerContext",
         "description": [],
-        "path": "x-pack/plugins/infra/server/types.ts",
+        "signature": ["InfraMlRequestHandlerContext", " & ", "InfraSpacesRequestHandlerContext"],
+        "path": "x-pack/plugins/observability_solution/infra/server/types.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
@@ -487,7 +461,7 @@
       "tags": [],
       "label": "InfraPluginSetup",
       "description": [],
-      "path": "x-pack/plugins/infra/server/types.ts",
+      "path": "x-pack/plugins/observability_solution/infra/server/types.ts",
       "deprecated": false,
       "trackAdoption": false,
       "children": [
@@ -498,10 +472,8 @@
           "tags": [],
           "label": "inventoryViews",
           "description": [],
-          "signature": [
-            "void"
-          ],
-          "path": "x-pack/plugins/infra/server/types.ts",
+          "signature": ["void"],
+          "path": "x-pack/plugins/observability_solution/infra/server/types.ts",
           "deprecated": false,
           "trackAdoption": false
         },
@@ -512,10 +484,8 @@
           "tags": [],
           "label": "metricsExplorerViews",
           "description": [],
-          "signature": [
-            "void | undefined"
-          ],
-          "path": "x-pack/plugins/infra/server/types.ts",
+          "signature": ["void | undefined"],
+          "path": "x-pack/plugins/observability_solution/infra/server/types.ts",
           "deprecated": false,
           "trackAdoption": false
         }
@@ -530,7 +500,7 @@
       "tags": [],
       "label": "InfraPluginStart",
       "description": [],
-      "path": "x-pack/plugins/infra/server/types.ts",
+      "path": "x-pack/plugins/observability_solution/infra/server/types.ts",
       "deprecated": false,
       "trackAdoption": false,
       "children": [
@@ -541,10 +511,8 @@
           "tags": [],
           "label": "inventoryViews",
           "description": [],
-          "signature": [
-            "InventoryViewsServiceStart"
-          ],
-          "path": "x-pack/plugins/infra/server/types.ts",
+          "signature": ["InventoryViewsServiceStart"],
+          "path": "x-pack/plugins/observability_solution/infra/server/types.ts",
           "deprecated": false,
           "trackAdoption": false
         },
@@ -555,11 +523,8 @@
           "tags": [],
           "label": "metricsExplorerViews",
           "description": [],
-          "signature": [
-            "MetricsExplorerViewsServiceStart",
-            " | undefined"
-          ],
-          "path": "x-pack/plugins/infra/server/types.ts",
+          "signature": ["MetricsExplorerViewsServiceStart", " | undefined"],
+          "path": "x-pack/plugins/observability_solution/infra/server/types.ts",
           "deprecated": false,
           "trackAdoption": false
         }
@@ -576,4 +541,4 @@
     "misc": [],
     "objects": []
   }
-}
+}

api_docs/kbn_core_http_server.devdocs.json

@@ -4286,7 +4286,7 @@
               },
               {
                 "plugin": "infra",
-                "path": "x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts"
+                "path": "x-pack/plugins/observability_solution/infra/server/lib/adapters/framework/kibana_framework_adapter.ts"
               },
               {
                 "plugin": "ingestPipelines",
@@ -6740,7 +6740,7 @@
               },
               {
                 "plugin": "infra",
-                "path": "x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts"
+                "path": "x-pack/plugins/observability_solution/infra/server/lib/adapters/framework/kibana_framework_adapter.ts"
               },
               {
                 "plugin": "ingestPipelines",
@@ -8286,7 +8286,7 @@
               },
               {
                 "plugin": "infra",
-                "path": "x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts"
+                "path": "x-pack/plugins/observability_solution/infra/server/lib/adapters/framework/kibana_framework_adapter.ts"
               },
               {
                 "plugin": "ingestPipelines",
@@ -8740,7 +8740,7 @@
               },
               {
                 "plugin": "infra",
-                "path": "x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts"
+                "path": "x-pack/plugins/observability_solution/infra/server/lib/adapters/framework/kibana_framework_adapter.ts"
               },
               {
                 "plugin": "@kbn/core-http-router-server-internal",
@@ -9230,7 +9230,7 @@
               },
               {
                 "plugin": "infra",
-                "path": "x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts"
+                "path": "x-pack/plugins/observability_solution/infra/server/lib/adapters/framework/kibana_framework_adapter.ts"
               },
               {
                 "plugin": "ingestPipelines",
@@ -13580,7 +13580,7 @@
               },
               {
                 "plugin": "infra",
-                "path": "x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts"
+                "path": "x-pack/plugins/observability_solution/infra/server/lib/adapters/framework/kibana_framework_adapter.ts"
               },
               {
                 "plugin": "kubernetesSecurity",
@@ -14287,7 +14287,7 @@
               },
               {
                 "plugin": "infra",
-                "path": "x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts"
+                "path": "x-pack/plugins/observability_solution/infra/server/lib/adapters/framework/kibana_framework_adapter.ts"
               },
               {
                 "plugin": "lists",
@@ -14930,7 +14930,7 @@
               },
               {
                 "plugin": "infra",
-                "path": "x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts"
+                "path": "x-pack/plugins/observability_solution/infra/server/lib/adapters/framework/kibana_framework_adapter.ts"
               },
               {
                 "plugin": "lists",
@@ -15421,7 +15421,7 @@
               },
               {
                 "plugin": "infra",
-                "path": "x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts"
+                "path": "x-pack/plugins/observability_solution/infra/server/lib/adapters/framework/kibana_framework_adapter.ts"
               },
               {
                 "plugin": "lists",
@@ -15616,7 +15616,7 @@
               },
               {
                 "plugin": "infra",
-                "path": "x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts"
+                "path": "x-pack/plugins/observability_solution/infra/server/lib/adapters/framework/kibana_framework_adapter.ts"
               },
               {
                 "plugin": "lists",

api_docs/kbn_core_saved_objects_server.devdocs.json

@@ -10639,7 +10639,7 @@
               },
               {
                 "plugin": "infra",
-                "path": "x-pack/plugins/infra/server/lib/sources/saved_object_type.ts"
+                "path": "x-pack/plugins/observability_solution/infra/server/lib/sources/saved_object_type.ts"
               },
               {
                 "plugin": "lists",

api_docs/kibana_react.devdocs.json

@@ -1473,15 +1473,15 @@
           },
           {
             "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/apps/common_providers.tsx"
+            "path": "x-pack/plugins/observability_solution/infra/public/apps/common_providers.tsx"
           },
           {
             "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/apps/common_providers.tsx"
+            "path": "x-pack/plugins/observability_solution/infra/public/apps/common_providers.tsx"
           },
           {
             "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/apps/common_providers.tsx"
+            "path": "x-pack/plugins/observability_solution/infra/public/apps/common_providers.tsx"
           },
           {
             "plugin": "logstash",

docs/developer/plugin-list.asciidoc

@@ -613,7 +613,7 @@ Index Management by running this series of requests in Console:
 |This service is exposed from the Index Management setup contract and can be used to add content to the indices list and the index details page.
 
 
-|{kib-repo}blob/{branch}/x-pack/plugins/infra/README.md[infra]
+|{kib-repo}blob/{branch}/x-pack/plugins/observability_solution/infra/README.md[infra]
 |This is the home of the infra plugin, which aims to provide a solution for
 the infrastructure monitoring use-case within Kibana.
 

package.json

@@ -494,7 +494,7 @@
     "@kbn/index-management-plugin": "link:x-pack/plugins/index_management",
     "@kbn/index-patterns-test-plugin": "link:test/plugin_functional/plugins/index_patterns",
     "@kbn/infra-forge": "link:x-pack/packages/kbn-infra-forge",
-    "@kbn/infra-plugin": "link:x-pack/plugins/infra",
+    "@kbn/infra-plugin": "link:x-pack/plugins/observability_solution/infra",
     "@kbn/ingest-pipelines-plugin": "link:x-pack/plugins/ingest_pipelines",
     "@kbn/input-control-vis-plugin": "link:src/plugins/input_control_vis",
     "@kbn/inspector-plugin": "link:src/plugins/inspector",

packages/kbn-babel-preset/styled_components_files.js

@@ -14,7 +14,7 @@ module.exports = {
   USES_STYLED_COMPONENTS: [
     /packages[\/\\]kbn-ui-shared-deps-(npm|src)[\/\\]/,
     /src[\/\\]plugins[\/\\](kibana_react)[\/\\]/,
-    /x-pack[\/\\]plugins[\/\\](observability_solution\/apm|beats_management|cases|fleet|infra|lists|observability_solution\/observability|observability_solution\/observability_shared|observability_solution\/exploratory_view|security_solution|timelines|observability_solution\/synthetics|observability_solution\/ux|observability_solution\/uptime)[\/\\]/,
+    /x-pack[\/\\]plugins[\/\\](observability_solution\/apm|beats_management|cases|fleet|observability_solution\/infra|lists|observability_solution\/observability|observability_solution\/observability_shared|observability_solution\/exploratory_view|security_solution|timelines|observability_solution\/synthetics|observability_solution\/ux|observability_solution\/uptime)[\/\\]/,
     /x-pack[\/\\]test[\/\\]plugin_functional[\/\\]plugins[\/\\]resolver_test[\/\\]/,
     /x-pack[\/\\]packages[\/\\]elastic_assistant[\/\\]/,
     /x-pack[\/\\]packages[\/\\]security-solution[\/\\]ecs_data_quality_dashboard[\/\\]/,

src/dev/storybook/aliases.ts

@@ -42,7 +42,7 @@ export const storybookAliases = {
   fleet: 'x-pack/plugins/fleet/.storybook',
   grouping: 'packages/kbn-securitysolution-grouping/.storybook',
   home: 'src/plugins/home/.storybook',
-  infra: 'x-pack/plugins/infra/.storybook',
+  infra: 'x-pack/plugins/observability_solution/infra/.storybook',
   kibana_react: 'src/plugins/kibana_react/.storybook',
   lists: 'x-pack/plugins/lists/.storybook',
   logs_explorer: 'x-pack/plugins/observability_solution/logs_explorer/.storybook',

src/plugins/vis_types/timeseries/server/plugin.ts

@@ -62,7 +62,7 @@ export interface VisTypeTimeseriesSetup {
   getVisData: (
     requestContext: VisTypeTimeseriesRequestHandlerContext,
     fakeRequest: KibanaRequest,
-    // ideally this should be VisPayload type, but currently has inconsistencies with x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts
+    // ideally this should be VisPayload type, but currently has inconsistencies with x-pack/plugins/observability_solution/infra/server/lib/adapters/framework/kibana_framework_adapter.ts
     options: any
   ) => Promise<TimeseriesVisData>;
 }

tsconfig.base.json

@@ -922,8 +922,8 @@
       "@kbn/index-patterns-test-plugin/*": ["test/plugin_functional/plugins/index_patterns/*"],
       "@kbn/infra-forge": ["x-pack/packages/kbn-infra-forge"],
       "@kbn/infra-forge/*": ["x-pack/packages/kbn-infra-forge/*"],
-      "@kbn/infra-plugin": ["x-pack/plugins/infra"],
-      "@kbn/infra-plugin/*": ["x-pack/plugins/infra/*"],
+      "@kbn/infra-plugin": ["x-pack/plugins/observability_solution/infra"],
+      "@kbn/infra-plugin/*": ["x-pack/plugins/observability_solution/infra/*"],
       "@kbn/ingest-pipelines-plugin": ["x-pack/plugins/ingest_pipelines"],
       "@kbn/ingest-pipelines-plugin/*": ["x-pack/plugins/ingest_pipelines/*"],
       "@kbn/input-control-vis-plugin": ["src/plugins/input_control_vis"],

x-pack/.i18nrc.json

@@ -39,7 +39,7 @@
     "xpack.grokDebugger": "plugins/grokdebugger",
     "xpack.idxMgmt": "plugins/index_management",
     "xpack.indexLifecycleMgmt": "plugins/index_lifecycle_management",
-    "xpack.infra": "plugins/infra",
+    "xpack.infra": "plugins/observability_solution/infra",
     "xpack.logsExplorer": "plugins/observability_solution/logs_explorer",
     "xpack.logsShared": "plugins/logs_shared",
     "xpack.fleet": "plugins/fleet",

x-pack/plugins/observability_solution/infra/common/http_api/log_alerts/v1/chart_preview_data.ts

@@ -52,9 +52,9 @@ export type GetLogAlertsChartPreviewDataSuccessResponsePayload = rt.TypeOf<
 //
 // If it's removed before then you get:
 //
-//     x-pack/plugins/infra/common/http_api/log_alerts/chart_preview_data.ts:44:14 - error TS4023:
+//     x-pack/plugins/observability_solution/infra/common/http_api/log_alerts/chart_preview_data.ts:44:14 - error TS4023:
 //     Exported variable 'getLogAlertsChartPreviewDataAlertParamsSubsetRT' has or is using name 'Comparator'
-//     from external module "/Users/smith/Code/kibana/x-pack/plugins/infra/common/alerting/logs/log_threshold/types"
+//     from external module "/Users/smith/Code/kibana/x-pack/plugins/observability_solution/infra/common/alerting/logs/log_threshold/types"
 //     but cannot be named.
 //
 export const getLogAlertsChartPreviewDataAlertParamsSubsetRT: any = rt.intersection([