Merge branch 'master' of https://github.com/elastic/kibana into excep…

…tion-list-packager

src/core/server/ui_settings/saved_objects/ui_settings.ts

@@ -38,7 +38,7 @@ export const uiSettingsType: SavedObjectsType = {
     importableAndExportable: true,
     getInAppUrl() {
       return {
-        path: `/app/kibana#/management/kibana/settings`,
+        path: `/app/management/kibana/settings`,
         uiCapabilitiesPath: 'advancedSettings.show',
       };
     },

src/legacy/core_plugins/kibana/index.js

@@ -26,8 +26,7 @@ import { exportApi } from './server/routes/api/export';
 import { getUiSettingDefaults } from './server/ui_setting_defaults';
 import { registerCspCollector } from './server/lib/csp_usage_collector';
 import { injectVars } from './inject_vars';
-import { i18n } from '@kbn/i18n';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
+
 import { kbnBaseUrl } from '../../../plugins/kibana_legacy/server';
 
 const mkdirAsync = promisify(Fs.mkdir);
@@ -53,19 +52,7 @@ export default function (kibana) {
         main: 'plugins/kibana/kibana',
       },
       styleSheetPaths: resolve(__dirname, 'public/index.scss'),
-      links: [
-        {
-          id: 'kibana:stack_management',
-          title: i18n.translate('kbn.managementTitle', {
-            defaultMessage: 'Stack Management',
-          }),
-          order: 9003,
-          url: `${kbnBaseUrl}#/management`,
-          euiIconType: 'managementApp',
-          linkToLastSubUrl: false,
-          category: DEFAULT_APP_CATEGORIES.management,
-        },
-      ],
+      links: [],
 
       injectDefaultVars(server, options) {
         const mapConfig = server.config().get('map');

src/legacy/core_plugins/kibana/public/kibana.js

@@ -38,17 +38,22 @@ import 'uiExports/shareContextMenuExtensions';
 import 'uiExports/interpreter';
 
 import 'ui/autoload/all';
-import './management';
+
 import { localApplicationService } from './local_application_service';
 
 npSetup.plugins.kibanaLegacy.registerLegacyAppAlias('doc', 'discover', { keepPrefix: true });
 npSetup.plugins.kibanaLegacy.registerLegacyAppAlias('context', 'discover', { keepPrefix: true });
 
+npSetup.plugins.kibanaLegacy.forwardApp('management', 'management', (path) => {
+  return path.replace('/management', '');
+});
+
 localApplicationService.attachToAngular(routes);
 
 routes.enable();
 
 const { config } = npSetup.plugins.kibanaLegacy;
+
 routes.otherwise({
   redirectTo: `/${config.defaultAppId || 'discover'}`,
 });