Merge branch 'main' into logs_db_fts

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

@@ -253,7 +253,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
         /^package.json/,
         /^packages\/kbn-securitysolution-.*/,
         /^x-pack\/platform\/plugins\/shared\/alerting/,
-        /^x-pack\/plugins\/data_views\/common/,
+        /^x-pack\/platform\/plugins\/shared\/data_views\/common/,
         /^x-pack\/solutions\/security\/plugins\/lists/,
         /^x-pack\/platform\/plugins\/shared\/rule_registry\/common/,
         /^x-pack\/solutions\/security\/plugins\/security_solution/,
@@ -296,18 +296,18 @@ const getPipeline = (filename: string, removeSteps = true) => {
     if (
       (await doAnyChangesMatch([
         /^package.json/,
-        /^packages\/kbn-discover-utils/,
+        /^src\/platform\/packages\/shared\/kbn-discover-utils/,
         /^packages\/kbn-doc-links/,
         /^packages\/kbn-dom-drag-drop/,
-        /^packages\/kbn-es-query/,
+        /^src\/platform\/packages\/shared\/kbn-es-query/,
         /^packages\/kbn-i18n/,
         /^packages\/kbn-i18n-react/,
         /^src\/platform\/packages\/shared\/kbn-grouping/,
-        /^packages\/kbn-resizable-layout/,
+        /^src\/platform\/packages\/shared\/kbn-resizable-layout/,
         /^packages\/kbn-rison/,
         /^src\/platform\/packages\/shared\/kbn-rule-data-utils/,
         /^packages\/kbn-safer-lodash-set/,
-        /^packages\/kbn-search-types/,
+        /^src\/platform\/packages\/shared\/kbn-search-types/,
         /^packages\/kbn-securitysolution-.*/,
         /^src\/platform\/packages\/shared\/kbn-securitysolution-ecs/,
         /^x-pack\/solutions\/security\/packages\/kbn-securitysolution-io-ts-alerting-types/,
@@ -322,22 +322,22 @@ const getPipeline = (filename: string, removeSteps = true) => {
         /^src\/plugins\/charts/,
         /^src\/platform\/plugins\/shared\/controls/,
         /^src\/plugins\/data/,
-        /^src\/plugins\/data_views/,
-        /^src\/plugins\/discover/,
-        /^src\/plugins\/field_formats/,
+        /^src\/platform\/plugins\/shared\/data_views/,
+        /^src\/platform\/plugins\/shared\/discover/,
+        /^src\/platform\/plugins\/shared\/field_formats/,
         /^src\/platform\/plugins\/shared\/inspector/,
         /^src\/plugins\/kibana_react/,
         /^src\/plugins\/kibana_utils/,
-        /^src\/plugins\/saved_search/,
+        /^src\/platform\/plugins\/shared\/saved_search/,
         /^src\/plugins\/ui_actions/,
-        /^src\/plugins\/unified_histogram/,
+        /^src\/platform\/plugins\/shared\/unified_histogram/,
         /^src\/plugins\/unified_search/,
         /^x-pack\/platform\/packages\/shared\/kbn-elastic-assistant/,
         /^x-pack\/platform\/packages\/shared\/kbn-elastic-assistant-common/,
         /^x-pack\/solutions\/security\/packages/,
         /^x-pack\/platform\/plugins\/shared\/alerting/,
         /^x-pack\/platform\/plugins\/shared\/cases/,
-        /^x-pack\/plugins\/data_views\/common/,
+        /^x-pack\/platform\/plugins\/shared\/data_views\/common/,
         /^x-pack\/solutions\/security\/plugins\/elastic_assistant/,
         /^x-pack\/solutions\/security\/plugins\/lists/,
         /^x-pack\/platform\/plugins\/shared\/rule_registry\/common/,
@@ -391,7 +391,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
 
     if (
       (await doAnyChangesMatch([
-        /^x-pack\/plugins\/discover_enhanced\/ui_tests/,
+        /^x-pack\/platform\/plugins\/private\/discover_enhanced\/ui_tests/,
         /^packages\/kbn-scout/,
       ])) ||
       GITHUB_PR_LABELS.includes('ci:scout-ui-tests')

.buildkite/scripts/steps/functional/scout_ui_tests.sh

@@ -6,7 +6,7 @@ source .buildkite/scripts/steps/functional/common.sh
 
 export JOB=kibana-scout-ui-tests
 
-TEST_CONFIG="x-pack/plugins/discover_enhanced/ui_tests/playwright.config.ts"
+TEST_CONFIG="x-pack/platform/plugins/private/discover_enhanced/ui_tests/playwright.config.ts"
 KIBANA_DIR="$KIBANA_BUILD_LOCATION"
 
 declare -A TESTS=(

.eslintrc.js

@@ -364,7 +364,7 @@ module.exports = {
     {
       files: [
         'packages/kbn-eslint-config/**/*.{js,mjs,ts,tsx}',
-        'packages/kbn-datemath/**/*.{js,mjs,ts,tsx}',
+        'src/platform/packages/shared/kbn-datemath/**/*.{js,mjs,ts,tsx}',
       ],
       rules: {
         '@kbn/eslint/require-license-header': [
@@ -1577,7 +1577,10 @@ module.exports = {
      * Discover overrides
      */
     {
-      files: ['src/plugins/discover/**/*.{ts,tsx}', 'src/plugins/saved_search/**/*.{ts,tsx}'],
+      files: [
+        'src/platform/plugins/shared/discover/**/*.{ts,tsx}',
+        'src/platform/plugins/shared/saved_search/**/*.{ts,tsx}',
+      ],
       rules: {
         '@typescript-eslint/no-explicit-any': 'error',
         '@typescript-eslint/ban-ts-comment': [