From ef4ec14fe03f14459e764447320d5e40182c8cec Mon Sep 17 00:00:00 2001 From: Kyra Cho Date: Thu, 14 Nov 2024 01:28:36 +0000 Subject: [PATCH 1/3] Migrate SO _migrate route authorization to the new system --- .../src/routes/migrate.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/migrate.ts b/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/migrate.ts index 9fe591d9c5214..f8a50d39271d6 100644 --- a/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/migrate.ts +++ b/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/migrate.ts @@ -19,8 +19,10 @@ export const registerMigrateRoute = ( { path: '/_migrate', validate: false, - options: { - tags: ['access:migrateSavedObjects'], + security: { + authz: { + requiredPrivileges: ['migrateSavedObjects'], + }, }, }, catchAndReturnBoomErrors(async (context, req, res) => { From 17f3cd42eed330702bbb6b6646d45c6a14856ad2 Mon Sep 17 00:00:00 2001 From: Kyra Cho Date: Fri, 15 Nov 2024 03:17:33 +0000 Subject: [PATCH 2/3] Update 'APM' to 'Applications' in Platform nav and Kibana Search --- .../apm/public/plugin.ts | 31 ++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/x-pack/plugins/observability_solution/apm/public/plugin.ts b/x-pack/plugins/observability_solution/apm/public/plugin.ts index b21bdedac9ef8..e58eebdd1c163 100644 --- a/x-pack/plugins/observability_solution/apm/public/plugin.ts +++ b/x-pack/plugins/observability_solution/apm/public/plugin.ts @@ -350,12 +350,13 @@ export class ApmPlugin implements Plugin { core.application.register({ id: 'apm', - title: 'APM', + title: 'Applications', order: 8300, euiIconType: 'logoObservability', appRoute: '/app/apm', icon: 'plugins/apm/public/icon.svg', category: DEFAULT_APP_CATEGORIES.observability, + keywords: ['Applications', 'APM'], deepLinks: [ { id: 'service-groups-list', @@ -372,20 +373,42 @@ export class ApmPlugin implements Plugin { title: tracesTitle, path: '/traces', }, - { id: 'service-map', title: serviceMapTitle, path: '/service-map' }, + { + id: 'service-map', + title: serviceMapTitle, + path: '/service-map', + }, { id: 'dependencies', title: dependenciesTitle, path: '/dependencies/inventory', }, - { id: 'settings', title: apmSettingsTitle, path: '/settings' }, + { + id: 'settings', + title: apmSettingsTitle, + path: '/settings', + }, { id: 'storage-explorer', title: apmStorageExplorerTitle, path: '/storage-explorer', visibleIn: featureFlags.storageExplorerAvailable ? ['globalSearch'] : [], }, - { id: 'tutorial', title: apmTutorialTitle, path: '/tutorial' }, + { + id: 'tutorial', + title: apmTutorialTitle, + path: '/tutorial', + }, + // { + // id: 'alerts', + // title: 'Alerts', + // path: '/overview/alerts', + // }, + // { + // id: 'cases', + // title: 'Cases', + // path: '/overview/cases', + // }, ], mount: async (appMountParameters: AppMountParameters) => { From c247565b7e2f0c66ef333b4cbf2ee4a885bf1361 Mon Sep 17 00:00:00 2001 From: Kyra Cho Date: Fri, 15 Nov 2024 03:27:40 +0000 Subject: [PATCH 3/3] undo accidental changes --- .../apm/public/plugin.ts | 31 +++---------------- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/x-pack/plugins/observability_solution/apm/public/plugin.ts b/x-pack/plugins/observability_solution/apm/public/plugin.ts index e58eebdd1c163..b21bdedac9ef8 100644 --- a/x-pack/plugins/observability_solution/apm/public/plugin.ts +++ b/x-pack/plugins/observability_solution/apm/public/plugin.ts @@ -350,13 +350,12 @@ export class ApmPlugin implements Plugin { core.application.register({ id: 'apm', - title: 'Applications', + title: 'APM', order: 8300, euiIconType: 'logoObservability', appRoute: '/app/apm', icon: 'plugins/apm/public/icon.svg', category: DEFAULT_APP_CATEGORIES.observability, - keywords: ['Applications', 'APM'], deepLinks: [ { id: 'service-groups-list', @@ -373,42 +372,20 @@ export class ApmPlugin implements Plugin { title: tracesTitle, path: '/traces', }, - { - id: 'service-map', - title: serviceMapTitle, - path: '/service-map', - }, + { id: 'service-map', title: serviceMapTitle, path: '/service-map' }, { id: 'dependencies', title: dependenciesTitle, path: '/dependencies/inventory', }, - { - id: 'settings', - title: apmSettingsTitle, - path: '/settings', - }, + { id: 'settings', title: apmSettingsTitle, path: '/settings' }, { id: 'storage-explorer', title: apmStorageExplorerTitle, path: '/storage-explorer', visibleIn: featureFlags.storageExplorerAvailable ? ['globalSearch'] : [], }, - { - id: 'tutorial', - title: apmTutorialTitle, - path: '/tutorial', - }, - // { - // id: 'alerts', - // title: 'Alerts', - // path: '/overview/alerts', - // }, - // { - // id: 'cases', - // title: 'Cases', - // path: '/overview/cases', - // }, + { id: 'tutorial', title: apmTutorialTitle, path: '/tutorial' }, ], mount: async (appMountParameters: AppMountParameters) => {