Skip to content

[APM] Client new platform migration #64046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ogupte merged 12 commits into from
Apr 30, 2020
Merged

[APM] Client new platform migration #64046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c7ec626
migrate files from legacy path to new plugin path
ogupte Apr 21, 2020
cd7406f
update file paths to reflect migrated files
ogupte Apr 21, 2020
59b2033
move minimal legacy client files back to legacy path in order to run …
ogupte Apr 22, 2020
9e72500
Completes the full cutover to the new kibana platform removing all sh…
ogupte Apr 27, 2020
9fa801a
Adds APM to ignored list for casing check.
ogupte Apr 28, 2020
bc06a6d
Merge remote-tracking branch 'upstream/master' into apm-32894-np-migr…
ogupte Apr 29, 2020
9ca28aa
- moves public/utils/pickKeys.ts to common/utils/pick_keys.ts
ogupte Apr 29, 2020
72258bb
Merge branch 'master' of github.com:elastic/kibana into apm-32894-np-…
ogupte Apr 29, 2020
cf5d8d0
Merge branch 'master' of github.com:elastic/kibana into apm-32894-np-…
ogupte Apr 30, 2020
eec8279
Moves automatic index pattern saved object creation from
ogupte Apr 30, 2020
269f089
removed unnecessary legacy css imports
ogupte Apr 30, 2020
c47f3b3
fixed ci issues by:
ogupte Apr 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions src/cli/cluster/cluster_manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,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',
];
Expand Down
6 changes: 5 additions & 1 deletion src/dev/precommit_hook/casing_check_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/**/*',
'**/.*',
Expand All @@ -58,6 +57,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/**/*',
Copy link
Member

@sorenlouv sorenlouv Apr 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any automated way (eslint --fix) to update the filenames?

Copy link
Contributor Author

@ogupte ogupte Apr 30, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not for scripts or e2e. for public, i started working on a code mod to update all the imports with the new paths, but then it was suggested by the platform team to ignore them for now and address it in another PR

];

/**
Expand Down
4 changes: 2 additions & 2 deletions src/dev/run_check_lockfile_symlinks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }) => {
Expand Down
2 changes: 1 addition & 1 deletion src/dev/storybook/aliases.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion src/dev/typescript/projects.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}),
Expand Down
2 changes: 0 additions & 2 deletions x-pack/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -28,7 +27,6 @@ module.exports = function(kibana) {
security(kibana),
dashboardMode(kibana),
beats(kibana),
apm(kibana),
maps(kibana),
canvas(kibana),
infra(kibana),
Expand Down
4 changes: 0 additions & 4 deletions x-pack/legacy/plugins/apm/.prettierrc
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions x-pack/legacy/plugins/apm/e2e/cypress/integration/snapshots.js
View file
Open in desktop

This file was deleted.

166 changes: 0 additions & 166 deletions x-pack/legacy/plugins/apm/index.ts
View file
Open in desktop

This file was deleted.

Loading