Merge branch 'master' of github.com:elastic/kibana into refactor-to-remove-deps

Author: spalger

.eslintignore

@@ -30,6 +30,7 @@ target
 /x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts
 /x-pack/legacy/plugins/canvas/shareable_runtime/build
 /x-pack/legacy/plugins/canvas/storybook
+/x-pack/plugins/monitoring/public/lib/jquery_flot
 /x-pack/legacy/plugins/infra/common/graphql/types.ts
 /x-pack/legacy/plugins/infra/public/graphql/types.ts
 /x-pack/legacy/plugins/infra/server/graphql/types.ts

.eslintrc.js

@@ -963,6 +963,12 @@ module.exports = {
         jquery: true,
       },
     },
+    {
+      files: ['x-pack/plugins/monitoring/public/lib/jquery_flot/**/*.js'],
+      env: {
+        jquery: true,
+      },
+    },
 
     /**
      * TSVB overrides

.github/CODEOWNERS

@@ -84,6 +84,7 @@
 /x-pack/legacy/plugins/ingest_manager/ @elastic/ingest-management
 /x-pack/plugins/observability/ @elastic/logs-metrics-ui @elastic/apm-ui @elastic/uptime @elastic/ingest-management
 /x-pack/legacy/plugins/monitoring/ @elastic/stack-monitoring-ui
+/x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui
 /x-pack/plugins/uptime @elastic/uptime
 
 # Machine Learning
@@ -203,6 +204,7 @@
 /x-pack/plugins/snapshot_restore/  @elastic/es-ui
 /x-pack/plugins/upgrade_assistant/  @elastic/es-ui
 /x-pack/plugins/watcher/  @elastic/es-ui
+/x-pack/plugins/ingest_pipelines/  @elastic/es-ui
 
 # Endpoint
 /x-pack/plugins/endpoint/ @elastic/endpoint-app-team @elastic/siem

src/cli/cluster/cluster_manager.ts

@@ -266,8 +266,8 @@ export class ClusterManager {
       fromRoot('src/legacy/server/sass/__tmp__'),
       fromRoot('x-pack/legacy/plugins/reporting/.chromium'),
       fromRoot('x-pack/plugins/siem/cypress'),
-      fromRoot('x-pack/legacy/plugins/apm/e2e'),
-      fromRoot('x-pack/legacy/plugins/apm/scripts'),
+      fromRoot('x-pack/plugins/apm/e2e'),
+      fromRoot('x-pack/plugins/apm/scripts'),
       fromRoot('x-pack/legacy/plugins/canvas/canvas_plugin_src'), // prevents server from restarting twice for Canvas plugin changes,
       'plugins/java_languageserver',
     ];

src/dev/precommit_hook/casing_check_config.js

@@ -35,9 +35,9 @@ export const IGNORE_FILE_GLOBS = [
   '**/Gruntfile.js',
   'tasks/config/**/*',
   '**/{Dockerfile,docker-compose.yml}',
-  'x-pack/legacy/plugins/apm/**/*',
   'x-pack/legacy/plugins/canvas/tasks/**/*',
   'x-pack/legacy/plugins/canvas/canvas_plugin_src/**/*',
+  'x-pack/plugins/monitoring/public/lib/jquery_flot/**/*',
   '**/.*',
   '**/{webpackShims,__mocks__}/**/*',
   'x-pack/docs/**/*',
@@ -58,6 +58,11 @@ export const IGNORE_FILE_GLOBS = [
 
   // filename required by api-extractor
   'api-documenter.json',
+
+  // TODO fix file names in APM to remove these
+  'x-pack/plugins/apm/public/**/*',
+  'x-pack/plugins/apm/scripts/**/*',
+  'x-pack/plugins/apm/e2e/**/*',
 ];
 
 /**
@@ -160,12 +165,11 @@ export const TEMPORARILY_IGNORED_PATHS = [
   'webpackShims/ui-bootstrap.js',
   'x-pack/legacy/plugins/index_management/public/lib/editSettings.js',
   'x-pack/legacy/plugins/license_management/public/store/reducers/licenseManagement.js',
-  'x-pack/legacy/plugins/monitoring/public/components/sparkline/__mocks__/plugins/xpack_main/jquery_flot.js',
-  'x-pack/legacy/plugins/monitoring/public/icons/alert-blue.svg',
-  'x-pack/legacy/plugins/monitoring/public/icons/health-gray.svg',
-  'x-pack/legacy/plugins/monitoring/public/icons/health-green.svg',
-  'x-pack/legacy/plugins/monitoring/public/icons/health-red.svg',
-  'x-pack/legacy/plugins/monitoring/public/icons/health-yellow.svg',
+  'x-pack/plugins/monitoring/public/components/sparkline/__mocks__/plugins/xpack_main/jquery_flot.js',
+  'x-pack/plugins/monitoring/public/icons/health-gray.svg',
+  'x-pack/plugins/monitoring/public/icons/health-green.svg',
+  'x-pack/plugins/monitoring/public/icons/health-red.svg',
+  'x-pack/plugins/monitoring/public/icons/health-yellow.svg',
   'x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/lib/pdf/assets/fonts/noto/NotoSansCJKtc-Medium.ttf',
   'x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/lib/pdf/assets/fonts/noto/NotoSansCJKtc-Regular.ttf',
   'x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/lib/pdf/assets/fonts/roboto/Roboto-Italic.ttf',

src/dev/run_check_lockfile_symlinks.js

@@ -35,9 +35,9 @@ const IGNORE_FILE_GLOBS = [
   // fixtures aren't used in production, ignore them
   '**/*fixtures*/**/*',
   // cypress isn't used in production, ignore it
-  'x-pack/legacy/plugins/apm/e2e/*',
+  'x-pack/plugins/apm/e2e/*',
   // apm scripts aren't used in production, ignore them
-  'x-pack/legacy/plugins/apm/scripts/*',
+  'x-pack/plugins/apm/scripts/*',
 ];
 
 run(async ({ log }) => {

src/dev/storybook/aliases.ts

@@ -18,7 +18,7 @@
  */
 
 export const storybookAliases = {
-  apm: 'x-pack/legacy/plugins/apm/scripts/storybook.js',
+  apm: 'x-pack/plugins/apm/scripts/storybook.js',
   canvas: 'x-pack/legacy/plugins/canvas/scripts/storybook_new.js',
   codeeditor: 'src/plugins/kibana_react/public/code_editor/scripts/storybook.ts',
   drilldowns: 'x-pack/plugins/drilldowns/scripts/storybook.js',

src/dev/typescript/projects.ts

@@ -30,7 +30,7 @@ export const PROJECTS = [
   new Project(resolve(REPO_ROOT, 'x-pack/plugins/siem/cypress/tsconfig.json'), {
     name: 'siem/cypress',
   }),
-  new Project(resolve(REPO_ROOT, 'x-pack/legacy/plugins/apm/e2e/tsconfig.json'), {
+  new Project(resolve(REPO_ROOT, 'x-pack/plugins/apm/e2e/tsconfig.json'), {
     name: 'apm/cypress',
     disableTypeCheck: true,
   }),

x-pack/.i18nrc.json

@@ -21,6 +21,7 @@
     "xpack.indexLifecycleMgmt": "plugins/index_lifecycle_management",
     "xpack.infra": "plugins/infra",
     "xpack.ingestManager": "plugins/ingest_manager",
+    "xpack.ingestPipelines": "plugins/ingest_pipelines",
     "xpack.lens": "plugins/lens",
     "xpack.licenseMgmt": "plugins/license_management",
     "xpack.licensing": "plugins/licensing",

x-pack/index.js

@@ -10,7 +10,6 @@ import { reporting } from './legacy/plugins/reporting';
 import { security } from './legacy/plugins/security';
 import { dashboardMode } from './legacy/plugins/dashboard_mode';
 import { beats } from './legacy/plugins/beats_management';
-import { apm } from './legacy/plugins/apm';
 import { maps } from './legacy/plugins/maps';
 import { spaces } from './legacy/plugins/spaces';
 import { canvas } from './legacy/plugins/canvas';
@@ -28,7 +27,6 @@ module.exports = function(kibana) {
     security(kibana),
     dashboardMode(kibana),
     beats(kibana),
-    apm(kibana),
     maps(kibana),
     canvas(kibana),
     infra(kibana),