From 6848bb24c85b2ee4987e51a69475e5242d51edd7 Mon Sep 17 00:00:00 2001
From: Lukas Olson <olson.lukas@gmail.com>
Date: Tue, 23 Aug 2016 17:14:18 -0700
Subject: [PATCH 1/2] Instead of hard-coding '/app/kibana', create a constant
 and export it for use in other plugins

---
 src/core_plugins/kibana/index.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/core_plugins/kibana/index.js b/src/core_plugins/kibana/index.js
index 6b22f5271fb0..b1f545e406fa 100644
--- a/src/core_plugins/kibana/index.js
+++ b/src/core_plugins/kibana/index.js
@@ -3,6 +3,7 @@ import search from './server/routes/api/search';
 import settings from './server/routes/api/settings';
 
 module.exports = function (kibana) {
+  const kbnBaseUrl = '/app/kibana';
   return new kibana.Plugin({
     id: 'kibana',
     config: function (Joi) {
@@ -43,7 +44,7 @@ module.exports = function (kibana) {
           id: 'kibana:discover',
           title: 'Discover',
           order: -1003,
-          url: '/app/kibana#/discover',
+          url: `${kbnBaseUrl}#discover`,
           description: 'interactively explore your data',
           icon: 'plugins/kibana/assets/discover.svg',
         },
@@ -51,7 +52,7 @@ module.exports = function (kibana) {
           id: 'kibana:visualize',
           title: 'Visualize',
           order: -1002,
-          url: '/app/kibana#/visualize',
+          url: `${kbnBaseUrl}#visualize`,
           description: 'design data visualizations',
           icon: 'plugins/kibana/assets/visualize.svg',
         },
@@ -59,7 +60,7 @@ module.exports = function (kibana) {
           id: 'kibana:dashboard',
           title: 'Dashboard',
           order: -1001,
-          url: '/app/kibana#/dashboard',
+          url: `${kbnBaseUrl}#dashboard`,
           description: 'compose visualizations for much win',
           icon: 'plugins/kibana/assets/dashboard.svg',
         },
@@ -67,7 +68,7 @@ module.exports = function (kibana) {
           id: 'kibana:management',
           title: 'Management',
           order: 1000,
-          url: '/app/kibana#/management',
+          url: `${kbnBaseUrl}#management`,
           description: 'define index patterns, change config, and more',
           icon: 'plugins/kibana/assets/settings.svg',
           linkToLastSubUrl: false
@@ -75,7 +76,8 @@ module.exports = function (kibana) {
       ],
       injectDefaultVars(server, options) {
         return {
-          kbnIndex: options.index
+          kbnIndex: options.index,
+          kbnBaseUrl
         };
       },
     },

From f27ac3c7d65d4188b221b52de72b9312477efdbd Mon Sep 17 00:00:00 2001
From: Lukas Olson <olson.lukas@gmail.com>
Date: Mon, 29 Aug 2016 12:42:21 -0700
Subject: [PATCH 2/2] Re-add the leading slash I accidentally removed

---
 src/core_plugins/kibana/index.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/core_plugins/kibana/index.js b/src/core_plugins/kibana/index.js
index b1f545e406fa..b99cc6dbfd2a 100644
--- a/src/core_plugins/kibana/index.js
+++ b/src/core_plugins/kibana/index.js
@@ -44,7 +44,7 @@ module.exports = function (kibana) {
           id: 'kibana:discover',
           title: 'Discover',
           order: -1003,
-          url: `${kbnBaseUrl}#discover`,
+          url: `${kbnBaseUrl}#/discover`,
           description: 'interactively explore your data',
           icon: 'plugins/kibana/assets/discover.svg',
         },
@@ -52,7 +52,7 @@ module.exports = function (kibana) {
           id: 'kibana:visualize',
           title: 'Visualize',
           order: -1002,
-          url: `${kbnBaseUrl}#visualize`,
+          url: `${kbnBaseUrl}#/visualize`,
           description: 'design data visualizations',
           icon: 'plugins/kibana/assets/visualize.svg',
         },
@@ -60,7 +60,7 @@ module.exports = function (kibana) {
           id: 'kibana:dashboard',
           title: 'Dashboard',
           order: -1001,
-          url: `${kbnBaseUrl}#dashboard`,
+          url: `${kbnBaseUrl}#/dashboard`,
           description: 'compose visualizations for much win',
           icon: 'plugins/kibana/assets/dashboard.svg',
         },
@@ -68,7 +68,7 @@ module.exports = function (kibana) {
           id: 'kibana:management',
           title: 'Management',
           order: 1000,
-          url: `${kbnBaseUrl}#management`,
+          url: `${kbnBaseUrl}#/management`,
           description: 'define index patterns, change config, and more',
           icon: 'plugins/kibana/assets/settings.svg',
           linkToLastSubUrl: false