Merge branch 'main' into elastic#8565

alexwizp · Feb 21, 2024 · 6bde25f · 6bde25f
2 parents 962ca44 + 9f2bde1
commit 6bde25f
Show file tree

Hide file tree

Showing 735 changed files with 4,392 additions and 3,265 deletions.
diff --git a/.buildkite/ftr_configs.yml b/.buildkite/ftr_configs.yml
@@ -61,7 +61,7 @@ disabled:
   - x-pack/plugins/synthetics/e2e/config.ts
   - x-pack/plugins/uptime/e2e/uptime/synthetics_run.ts
   - x-pack/plugins/synthetics/e2e/synthetics/synthetics_run.ts
-  - x-pack/plugins/ux/e2e/synthetics_run.ts
+  - x-pack/plugins/observability_solution/ux/e2e/synthetics_run.ts
   - x-pack/plugins/exploratory_view/e2e/synthetics_run.ts
 
   # Configs that exist but weren't running in CI when this file was introduced

diff --git a/.buildkite/pipelines/pull_request/ux_plugin_e2e.yml b/.buildkite/pipelines/pull_request/ux_plugin_e2e.yml
@@ -8,7 +8,7 @@ steps:
       - quick_checks
     timeout_in_minutes: 60
     artifact_paths:
-      - 'x-pack/plugins/ux/e2e/.journeys/**/*'
+      - 'x-pack/plugins/observability_solution/ux/e2e/.journeys/**/*'
     retry:
       automatic:
         - exit_status: '-1'

diff --git a/.buildkite/scripts/steps/functional/ux_synthetics_e2e.sh b/.buildkite/scripts/steps/functional/ux_synthetics_e2e.sh
@@ -13,4 +13,4 @@ echo "--- User Experience @elastic/synthetics Tests"
 
 cd "$XPACK_DIR"
 
-node plugins/ux/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}
+node plugins/observability_solution/ux/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -874,7 +874,7 @@ module.exports = {
         'x-pack/plugins/apm/**/*.{js,mjs,ts,tsx}',
         'x-pack/plugins/observability/**/*.{js,mjs,ts,tsx}',
         'x-pack/plugins/exploratory_view/**/*.{js,mjs,ts,tsx}',
-        'x-pack/plugins/ux/**/*.{js,mjs,ts,tsx}',
+        'x-pack/plugins/observability_solution/ux/**/*.{js,mjs,ts,tsx}',
       ],
       rules: {
         'no-console': ['warn', { allow: ['error'] }],
@@ -915,12 +915,12 @@ module.exports = {
         'x-pack/plugins/exploratory_view/**/*.tsx',
         'x-pack/plugins/infra/**/*.tsx',
         'x-pack/plugins/observability/**/*.tsx',
-        'x-pack/plugins/observability_ai_assistant/**/*.tsx',
+        'x-pack/plugins/observability_shared/observability_ai_assistant/**/*.tsx',
         'x-pack/plugins/observability_onboarding/**/*.tsx',
         'x-pack/plugins/observability_shared/**/*.tsx',
         'x-pack/plugins/profiling/**/*.tsx',
         'x-pack/plugins/synthetics/**/*.tsx',
-        'x-pack/plugins/ux/**/*.tsx',
+        'x-pack/plugins/observability_solution/ux/**/*.tsx',
         'src/plugins/ai_assistant_management/**/*.tsx',
       ],
       rules: {
@@ -933,12 +933,12 @@ module.exports = {
         'x-pack/plugins/exploratory_view/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
         'x-pack/plugins/infra/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
         'x-pack/plugins/observability/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
-        'x-pack/plugins/observability_ai_assistant/**/!(*.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_onboarding/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
         'x-pack/plugins/observability_shared/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
         'x-pack/plugins/profiling/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
         'x-pack/plugins/synthetics/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
-        'x-pack/plugins/ux/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
+        'x-pack/plugins/observability_solution/ux/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
         'src/plugins/ai_assistant_management/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
       ],
       rules: {

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -569,7 +569,7 @@ test/common/plugins/newsfeed @elastic/kibana-core
 src/plugins/no_data_page @elastic/appex-sharedux
 x-pack/plugins/notifications @elastic/appex-sharedux
 packages/kbn-object-versioning @elastic/appex-sharedux
-x-pack/plugins/observability_ai_assistant @elastic/obs-knowledge-team
+x-pack/plugins/observability_solution/observability_ai_assistant @elastic/obs-knowledge-team
 x-pack/packages/observability/alert_details @elastic/obs-ux-management-team
 x-pack/packages/observability/alerting_test_data @elastic/obs-ux-management-team
 x-pack/test/cases_api_integration/common/plugins/observability @elastic/response-ops
@@ -856,7 +856,7 @@ x-pack/test/security_api_integration/plugins/user_profiles_consumer @elastic/kib
 packages/kbn-utility-types @elastic/kibana-core
 packages/kbn-utility-types-jest @elastic/kibana-operations
 packages/kbn-utils @elastic/kibana-operations
-x-pack/plugins/ux @elastic/obs-ux-infra_services-team
+x-pack/plugins/observability_solution/ux @elastic/obs-ux-infra_services-team
 examples/v8_profiler_examples @elastic/response-ops
 packages/kbn-validate-next-docs-cli @elastic/kibana-operations
 src/plugins/vis_default_editor @elastic/kibana-visualizations

diff --git a/.github/paths-labeller.yml b/.github/paths-labeller.yml
@@ -1,24 +1,24 @@
 ---
-  - "Feature:Embedding":
-    - "src/plugins/embeddable/**/*.*"
-    - "src/plugins/dashboard_embeddable_container/**/*.*"
-  - "Feature:Drilldowns":
-    - "x-pack/plugins/drilldowns/**/*.*"
-    - "x-pack/plugins/dashboard_enhanced/public/services/drilldowns/**/*.*"
-  - "Feature:ExpressionLanguage":
-    - "src/plugins/expressions/**/*.*"
-    - "src/plugins/bfetch/**/*.*"
-  - "Team:obs-ux-infra_services":
-    - "x-pack/plugins/apm/**/*.*"
-    - "x-pack/test/apm_api_integration/**/*.*"
-    - "packages/kbn-apm-synthtrace/**/*.*"
-    - "packages/kbn-apm-synthtrace-client/**/*.*"
-    - "packages/kbn-apm-utils/**/*.*"
-    - "x-pack/plugins/synthetics/**/*.*"
-    - "x-pack/plugins/ux/**/*.*"
-    - "x-pack/plugins/observability/public/components/shared/exploratory_view/**/*.*"
-  - "Team:Fleet":
-    - "x-pack/plugins/fleet/**/*.*"
-    - "x-pack/test/fleet_api_integration/**/*.*"
-  - "Team:obs-ux-management":
-    - "x-pack/plugins/observability/**/*.*"
+- 'Feature:Embedding':
+    - 'src/plugins/embeddable/**/*.*'
+    - 'src/plugins/dashboard_embeddable_container/**/*.*'
+- 'Feature:Drilldowns':
+    - 'x-pack/plugins/drilldowns/**/*.*'
+    - 'x-pack/plugins/dashboard_enhanced/public/services/drilldowns/**/*.*'
+- 'Feature:ExpressionLanguage':
+    - 'src/plugins/expressions/**/*.*'
+    - 'src/plugins/bfetch/**/*.*'
+- 'Team:obs-ux-infra_services':
+    - 'x-pack/plugins/apm/**/*.*'
+    - 'x-pack/test/apm_api_integration/**/*.*'
+    - 'packages/kbn-apm-synthtrace/**/*.*'
+    - 'packages/kbn-apm-synthtrace-client/**/*.*'
+    - 'packages/kbn-apm-utils/**/*.*'
+    - 'x-pack/plugins/synthetics/**/*.*'
+    - 'x-pack/plugins/observability_solution/ux/**/*.*'
+    - 'x-pack/plugins/observability/public/components/shared/exploratory_view/**/*.*'
+- 'Team:Fleet':
+    - 'x-pack/plugins/fleet/**/*.*'
+    - 'x-pack/test/fleet_api_integration/**/*.*'
+- 'Team:obs-ux-management':
+    - 'x-pack/plugins/observability/**/*.*'
diff --git a/api_docs/deprecations_by_plugin.mdx b/api_docs/deprecations_by_plugin.mdx
@@ -1623,7 +1623,7 @@ migrates to using the Kibana Privilege model: https://github.com/elastic/kibana/
 
 | Deprecated API | Reference location(s) | Remove By |
 | ---------------|-----------|-----------|
-| <DocLink id="kibKibanaReactPluginApi" section="def-public.KibanaThemeProvider" text="KibanaThemeProvider"/> | [ux_app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/ux/public/application/ux_app.tsx#:~:text=KibanaThemeProvider), [ux_app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/ux/public/application/ux_app.tsx#:~:text=KibanaThemeProvider), [ux_app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/ux/public/application/ux_app.tsx#:~:text=KibanaThemeProvider) | - |
+| <DocLink id="kibKibanaReactPluginApi" section="def-public.KibanaThemeProvider" text="KibanaThemeProvider"/> | [ux_app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/ux/public/application/ux_app.tsx#:~:text=KibanaThemeProvider), [ux_app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/ux/public/application/ux_app.tsx#:~:text=KibanaThemeProvider), [ux_app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/ux/public/application/ux_app.tsx#:~:text=KibanaThemeProvider) | - |
 
 
 
@@ -1725,4 +1725,4 @@ migrates to using the Kibana Privilege model: https://github.com/elastic/kibana/
 | Deprecated API | Reference location(s) | Remove By |
 | ---------------|-----------|-----------|
 | <DocLink id="kibKibanaReactPluginApi" section="def-public.KibanaThemeProvider" text="KibanaThemeProvider"/> | [shared_imports.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/watcher/public/application/shared_imports.ts#:~:text=KibanaThemeProvider), [index.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/watcher/public/application/index.tsx#:~:text=KibanaThemeProvider), [index.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/watcher/public/application/index.tsx#:~:text=KibanaThemeProvider), [index.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/watcher/public/application/index.tsx#:~:text=KibanaThemeProvider) | - |
-| <DocLink id="kibLicensingPluginApi" section="def-public.LicensingPluginSetup.license$" text="license$"/> | [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/watcher/public/plugin.ts#:~:text=license%24), [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/watcher/public/plugin.ts#:~:text=license%24) | 8.8.0 |
+| <DocLink id="kibLicensingPluginApi" section="def-public.LicensingPluginSetup.license$" text="license$"/> | [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/watcher/public/plugin.ts#:~:text=license%24), [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/watcher/public/plugin.ts#:~:text=license%24) | 8.8.0 |
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,4 +13,4 @@ echo "--- User Experience @elastic/synthetics Tests"

		cd "$XPACK_DIR"

		node plugins/ux/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}
		node plugins/observability_solution/ux/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}