Merge branch 'main' of github.com:elastic/kibana into feat/move-obs-p…

…lugins-infra
elastic · Feb 24, 2024 · 9cdaeb1 · 9cdaeb1
2 parents 8143329 + 4c8d8ef
commit 9cdaeb1
Show file tree

Hide file tree

Showing 933 changed files with 1,539 additions and 3,145 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -872,7 +872,7 @@ module.exports = {
     {
       files: [
         'x-pack/plugins/observability_solution/apm/**/*.{js,mjs,ts,tsx}',
-        'x-pack/plugins/observability/**/*.{js,mjs,ts,tsx}',
+        'x-pack/plugins/observability_solution/observability/**/*.{js,mjs,ts,tsx}',
         'x-pack/plugins/observability_solution/exploratory_view/**/*.{js,mjs,ts,tsx}',
         'x-pack/plugins/observability_solution/ux/**/*.{js,mjs,ts,tsx}',
       ],
@@ -895,7 +895,7 @@ module.exports = {
     {
       files: [
         'x-pack/plugins/observability_solution/apm/**/*.stories.*',
-        'x-pack/plugins/observability/**/*.stories.*',
+        'x-pack/plugins/observability_solution/observability/**/*.stories.*',
         'x-pack/plugins/observability_solution/exploratory_view/**/*.stories.*',
       ],
       rules: {
@@ -911,11 +911,12 @@ module.exports = {
     {
       files: [
         'x-pack/plugins/aiops/**/*.tsx',
-        'x-pack/plugins/observability/**/*.tsx',
+        'x-pack/plugins/infra/**/*.tsx',
         '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',
         'x-pack/plugins/observability_solution/observability_shared/**/*.tsx',
@@ -931,10 +932,10 @@ module.exports = {
     },
     {
       files: [
-        'x-pack/plugins/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)',

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -576,7 +576,7 @@ x-pack/test/cases_api_integration/common/plugins/observability @elastic/response
 x-pack/packages/observability/get_padded_alert_time_range_util @elastic/obs-ux-management-team
 x-pack/plugins/observability_solution/observability_logs_explorer @elastic/obs-ux-logs-team
 x-pack/plugins/observability_solution/observability_onboarding @elastic/obs-ux-logs-team
-x-pack/plugins/observability @elastic/obs-ux-management-team
+x-pack/plugins/observability_solution/observability @elastic/obs-ux-management-team
 x-pack/plugins/observability_solution/observability_shared @elastic/observability-ui
 x-pack/test/security_api_integration/plugins/oidc_provider @elastic/kibana-security
 test/common/plugins/otel_metrics @elastic/obs-ux-infra_services-team
@@ -1076,7 +1076,7 @@ x-pack/plugins/observability_solution/infra/server/lib/alerting @elastic/obs-ux-
 /packages/kbn-utility-types/src/dot.ts @dgieselaar
 /packages/kbn-utility-types/src/dot_test.ts @dgieselaar
 #CC# /src/plugins/apm_oss/ @elastic/apm-ui
-#CC# /x-pack/plugins/observability/ @elastic/apm-ui
+#CC# /x-pack/plugins/observability_solution/observability/ @elastic/apm-ui
 
 # Uptime
 /x-pack/test/functional_with_es_ssl/apps/discover_ml_uptime/uptime/ @elastic/obs-ux-infra_services-team
@@ -1097,7 +1097,7 @@ x-pack/plugins/observability_solution/infra/server/lib/alerting @elastic/obs-ux-
 /x-pack/test/functional/apps/infra/tour.ts @elastic/platform-onboarding
 
 # Observability settings
-/x-pack/plugins/observability/server/ui_settings.ts @elastic/obs-docs
+/x-pack/plugins/observability_solution/observability/server/ui_settings.ts @elastic/obs-docs
 
 ### END Observability Plugins
 

diff --git a/.github/paths-labeller.yml b/.github/paths-labeller.yml
@@ -21,4 +21,4 @@
     - 'x-pack/plugins/fleet/**/*.*'
     - 'x-pack/test/fleet_api_integration/**/*.*'
 - 'Team:obs-ux-management':
-    - 'x-pack/plugins/observability/**/*.*'
+    - 'x-pack/plugins/observability_solution/observability/**/*.*'