Skip to content

Commit 517637e

Browse files
committed
[APM] Client new platform migration (#64046)
* migrate files from legacy path to new plugin path * update file paths to reflect migrated files * move minimal legacy client files back to legacy path in order to run kibana * Completes the full cutover to the new kibana platform removing all shims and legacy adapters. * Adds APM to ignored list for casing check. * - moves public/utils/pickKeys.ts to common/utils/pick_keys.ts - exposes getTraceUrl as a plugin static export of apm/public and updates import in infra - fixes FeaturesPluginSetup import in apm/public app - renames get_apm_index_pattern_titles -> get_apm_index_pattern_title - getApmIndexPatternTitle is now a synchronous getter function - removes unused comments and xpack.apm.apmForESDescription i18n translations * Moves automatic index pattern saved object creation from plugin start to when the Home screen first renders * removed unnecessary legacy css imports * fixed ci issues by: - moving readOnly badge, and help extension setup to occure only when apm app is mounted - registering saved object types - also moved createStaticIndexPattern from a react useEffect on the APM home screen to when the app is mounted
1 parent 38d4662 commit 517637e

559 files changed

Lines changed: 2161 additions & 1899 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/cli/cluster/cluster_manager.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,8 @@ export class ClusterManager {
264264
fromRoot('src/legacy/server/sass/__tmp__'),
265265
fromRoot('x-pack/legacy/plugins/reporting/.chromium'),
266266
fromRoot('x-pack/plugins/siem/cypress'),
267-
fromRoot('x-pack/legacy/plugins/apm/e2e'),
268-
fromRoot('x-pack/legacy/plugins/apm/scripts'),
267+
fromRoot('x-pack/plugins/apm/e2e'),
268+
fromRoot('x-pack/plugins/apm/scripts'),
269269
fromRoot('x-pack/legacy/plugins/canvas/canvas_plugin_src'), // prevents server from restarting twice for Canvas plugin changes,
270270
'plugins/java_languageserver',
271271
];

src/dev/precommit_hook/casing_check_config.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ export const IGNORE_FILE_GLOBS = [
3535
'**/Gruntfile.js',
3636
'tasks/config/**/*',
3737
'**/{Dockerfile,docker-compose.yml}',
38-
'x-pack/legacy/plugins/apm/**/*',
3938
'x-pack/legacy/plugins/canvas/tasks/**/*',
4039
'x-pack/legacy/plugins/canvas/canvas_plugin_src/**/*',
4140
'**/.*',
@@ -58,6 +57,11 @@ export const IGNORE_FILE_GLOBS = [
5857

5958
// filename required by api-extractor
6059
'api-documenter.json',
60+
61+
// TODO fix file names in APM to remove these
62+
'x-pack/plugins/apm/public/**/*',
63+
'x-pack/plugins/apm/scripts/**/*',
64+
'x-pack/plugins/apm/e2e/**/*',
6165
];
6266

6367
/**

src/dev/storybook/aliases.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919

2020
export const storybookAliases = {
21-
apm: 'x-pack/legacy/plugins/apm/scripts/storybook.js',
21+
apm: 'x-pack/plugins/apm/scripts/storybook.js',
2222
canvas: 'x-pack/legacy/plugins/canvas/scripts/storybook_new.js',
2323
codeeditor: 'src/plugins/kibana_react/public/code_editor/scripts/storybook.ts',
2424
drilldowns: 'x-pack/plugins/drilldowns/scripts/storybook.js',

src/dev/typescript/projects.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export const PROJECTS = [
3030
new Project(resolve(REPO_ROOT, 'x-pack/plugins/siem/cypress/tsconfig.json'), {
3131
name: 'siem/cypress',
3232
}),
33-
new Project(resolve(REPO_ROOT, 'x-pack/legacy/plugins/apm/e2e/tsconfig.json'), {
33+
new Project(resolve(REPO_ROOT, 'x-pack/plugins/apm/e2e/tsconfig.json'), {
3434
name: 'apm/cypress',
3535
disableTypeCheck: true,
3636
}),

x-pack/index.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { reporting } from './legacy/plugins/reporting';
1010
import { security } from './legacy/plugins/security';
1111
import { dashboardMode } from './legacy/plugins/dashboard_mode';
1212
import { beats } from './legacy/plugins/beats_management';
13-
import { apm } from './legacy/plugins/apm';
1413
import { maps } from './legacy/plugins/maps';
1514
import { spaces } from './legacy/plugins/spaces';
1615
import { canvas } from './legacy/plugins/canvas';
@@ -28,7 +27,6 @@ module.exports = function(kibana) {
2827
security(kibana),
2928
dashboardMode(kibana),
3029
beats(kibana),
31-
apm(kibana),
3230
maps(kibana),
3331
canvas(kibana),
3432
infra(kibana),

x-pack/legacy/plugins/apm/.prettierrc

Lines changed: 0 additions & 4 deletions
This file was deleted.

x-pack/legacy/plugins/apm/e2e/cypress/integration/snapshots.js

Lines changed: 0 additions & 10 deletions
This file was deleted.

x-pack/legacy/plugins/apm/index.ts

Lines changed: 0 additions & 166 deletions
This file was deleted.

0 commit comments

Comments
 (0)