Completes the full cutover to the new kibana platform removing all sh…

…ims and legacy adapters.
elastic · Apr 27, 2020 · 7d86a57 · 7d86a57
1 parent eaea0d7
commit 7d86a57
Show file tree

Hide file tree

Showing 40 changed files with 1,410 additions and 1,510 deletions.
diff --git a/src/dev/precommit_hook/casing_check_config.js b/src/dev/precommit_hook/casing_check_config.js
@@ -35,7 +35,6 @@ 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/**/*',
   '**/.*',

diff --git a/src/dev/storybook/aliases.ts b/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',

diff --git a/x-pack/index.js b/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 { indexManagement } from './legacy/plugins/index_management';
 import { spaces } from './legacy/plugins/spaces';
@@ -36,7 +35,6 @@ module.exports = function(kibana) {
     security(kibana),
     dashboardMode(kibana),
     beats(kibana),
-    apm(kibana),
     maps(kibana),
     canvas(kibana),
     indexManagement(kibana),

diff --git a/x-pack/legacy/plugins/apm/index.ts b/x-pack/legacy/plugins/apm/index.ts
diff --git a/x-pack/legacy/plugins/apm/public/getConfigFromInjectedMetadata.ts b/x-pack/legacy/plugins/apm/public/getConfigFromInjectedMetadata.ts
diff --git a/x-pack/legacy/plugins/apm/public/index.scss b/x-pack/legacy/plugins/apm/public/index.scss
diff --git a/x-pack/legacy/plugins/apm/public/index.tsx b/x-pack/legacy/plugins/apm/public/index.tsx
diff --git a/x-pack/legacy/plugins/apm/public/legacy_register_feature.ts b/x-pack/legacy/plugins/apm/public/legacy_register_feature.ts
diff --git a/x-pack/plugins/apm/kibana.json b/x-pack/plugins/apm/kibana.json
@@ -2,7 +2,14 @@
   "id": "apm",
   "version": "8.0.0",
   "kibanaVersion": "kibana",
-  "requiredPlugins": ["apm_oss", "data", "home", "licensing"],
+  "requiredPlugins": [
+    "features",
+    "apm_oss",
+    "data",
+    "home",
+    "licensing",
+    "triggers_actions_ui"
+  ],
   "optionalPlugins": [
     "cloud",
     "usageCollection",
@@ -11,6 +18,6 @@
     "alerting"
   ],
   "server": true,
-  "ui": false,
+  "ui": true,
   "configPath": ["xpack", "apm"]
 }