Merge remote-tracking branch 'upstream/main' into fix-multiline-strin…

…g-diff

.buildkite/ftr_oblt_stateful_configs.yml

@@ -1,8 +1,8 @@
 disabled:
   # Cypress configs, for now these are still run manually
-  - x-pack/plugins/observability_solution/observability_onboarding/e2e/ftr_config_open.ts
-  - x-pack/plugins/observability_solution/observability_onboarding/e2e/ftr_config_runner.ts
-  - x-pack/plugins/observability_solution/observability_onboarding/e2e/ftr_config.ts
+  - x-pack/solutions/observability/plugins/observability_onboarding/e2e/ftr_config_open.ts
+  - x-pack/solutions/observability/plugins/observability_onboarding/e2e/ftr_config_runner.ts
+  - x-pack/solutions/observability/plugins/observability_onboarding/e2e/ftr_config.ts
   - x-pack/plugins/observability_solution/apm/ftr_e2e/ftr_config_run.ts
   - x-pack/plugins/observability_solution/apm/ftr_e2e/ftr_config.ts
   - x-pack/plugins/observability_solution/inventory/e2e/ftr_config_run.ts

.buildkite/scripts/pipelines/pull_request/pipeline.ts

@@ -317,12 +317,12 @@ const getPipeline = (filename: string, removeSteps = true) => {
         /^packages\/shared-ux/,
         /^src\/core/,
         /^src\/plugins\/charts/,
-        /^src\/plugins\/controls/,
+        /^src\/platform\/plugins\/shared\/controls/,
         /^src\/plugins\/data/,
         /^src\/plugins\/data_views/,
         /^src\/plugins\/discover/,
         /^src\/plugins\/field_formats/,
-        /^src\/plugins\/inspector/,
+        /^src\/platform\/plugins\/shared\/inspector/,
         /^src\/plugins\/kibana_react/,
         /^src\/plugins\/kibana_utils/,
         /^src\/plugins\/saved_search/,

.buildkite/scripts/steps/functional/observability_onboarding_cypress.sh

@@ -14,5 +14,5 @@ echo "--- Observability onboarding Cypress Tests"
 
 cd "$XPACK_DIR"
 
-node plugins/observability_solution/observability_onboarding/scripts/test/e2e.js \
+node solutions/observability/plugins/observability_onboarding/scripts/test/e2e.js \
   --kibana-install-dir "$KIBANA_BUILD_LOCATION" \

.eslintignore

@@ -22,9 +22,9 @@ snapshots.js
 # plugin overrides
 /src/core/lib/kbn_internal_native_observable
 /src/plugins/data/common/es_query/kuery/ast/_generated_/**
-/x-pack/plugins/canvas/canvas_plugin
-/x-pack/plugins/canvas/shareable_runtime/build
-/x-pack/plugins/canvas/storybook/build
+/x-pack/platform/plugins/private/canvas/canvas_plugin
+/x-pack/platform/plugins/private/canvas/shareable_runtime/build
+/x-pack/platform/plugins/private/canvas/storybook/build
 /x-pack/plugins/reporting/server/export_types/printable_pdf/server/lib/pdf/assets/**
 /x-pack/plugins/reporting/server/export_types/printable_pdf_v2/server/lib/pdf/assets/**
 /x-pack/plugins/cloud_integrations/cloud_full_story/server/assets/**
@@ -37,7 +37,7 @@ snapshots.js
 /packages/kbn-test/src/functional_test_runner/__tests__/fixtures/
 /packages/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/
 /packages/kbn-ui-framework/dist
-/packages/kbn-flot-charts/lib
+/src/platform/packages/shared/kbn-flot-charts/lib
 /packages/kbn-monaco/src/**/antlr
 /src/platform/packages/shared/kbn-esql-ast/src/**/antlr
 

.eslintrc.js

@@ -296,7 +296,7 @@ module.exports = {
       },
     },
     {
-      files: ['x-pack/plugins/canvas/**/*.{js,mjs,ts,tsx}'],
+      files: ['x-pack/platform/plugins/private/canvas/**/*.{js,mjs,ts,tsx}'],
       rules: {
         'jsx-a11y/click-events-have-key-events': 'off',
       },
@@ -989,7 +989,7 @@ module.exports = {
         'x-pack/plugins/observability_solution/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
         'x-pack/plugins/{streams,streams_app}/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
         'src/plugins/ai_assistant_management/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
-        'x-pack/packages/observability/logs_overview/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
+        'x-pack/platform/packages/shared/observability/logs_overview/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
       ],
       rules: {
         '@kbn/i18n/strings_should_be_translated_with_i18n': 'warn',
@@ -1692,7 +1692,7 @@ module.exports = {
      * Canvas overrides
      */
     {
-      files: ['x-pack/plugins/canvas/**/*.js'],
+      files: ['x-pack/platform/plugins/private/canvas/**/*.js'],
       rules: {
         radix: 'error',
 
@@ -1736,12 +1736,12 @@ module.exports = {
     },
     {
       files: [
-        'x-pack/plugins/canvas/gulpfile.js',
-        'x-pack/plugins/canvas/scripts/*.js',
-        'x-pack/plugins/canvas/tasks/*.js',
-        'x-pack/plugins/canvas/tasks/**/*.js',
-        'x-pack/plugins/canvas/__tests__/**/*.js',
-        'x-pack/plugins/canvas/**/{__tests__,__test__,__jest__,__fixtures__,__mocks__}/**/*.js',
+        'x-pack/platform/plugins/private/canvas/gulpfile.js',
+        'x-pack/platform/plugins/private/canvas/scripts/*.js',
+        'x-pack/platform/plugins/private/canvas/tasks/*.js',
+        'x-pack/platform/plugins/private/canvas/tasks/**/*.js',
+        'x-pack/platform/plugins/private/canvas/__tests__/**/*.js',
+        'x-pack/platform/plugins/private/canvas/**/{__tests__,__test__,__jest__,__fixtures__,__mocks__}/**/*.js',
       ],
       rules: {
         'import/no-extraneous-dependencies': [
@@ -1755,17 +1755,17 @@ module.exports = {
       },
     },
     {
-      files: ['x-pack/plugins/canvas/canvas_plugin_src/**/*.js'],
+      files: ['x-pack/platform/plugins/private/canvas/canvas_plugin_src/**/*.js'],
       globals: { canvas: true, $: true },
     },
     {
-      files: ['x-pack/plugins/canvas/public/**/*.js'],
+      files: ['x-pack/platform/plugins/private/canvas/public/**/*.js'],
       env: {
         browser: true,
       },
     },
     {
-      files: ['packages/kbn-flot-charts/lib/**/*.js'],
+      files: ['src/platform/packages/shared/kbn-flot-charts/lib/**/*.js'],
       env: {
         jquery: true,
       },