From d6f352cdf54d0d5ccae178711b04ab511900e090 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Mon, 11 Nov 2019 12:18:58 +0100
Subject: [PATCH] PanelLinks: fixed issue with old panel links and grafana
 behind a subpath (#20298)

(cherry picked from commit 6f3f0bf3e03b2608927f0745e920344bc801a59c)
---
 public/app/features/dashboard/state/DashboardMigrator.test.ts | 2 +-
 public/app/features/dashboard/state/DashboardMigrator.ts      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/app/features/dashboard/state/DashboardMigrator.test.ts b/public/app/features/dashboard/state/DashboardMigrator.test.ts
index bb16e688274..c0da0d99016 100644
--- a/public/app/features/dashboard/state/DashboardMigrator.test.ts
+++ b/public/app/features/dashboard/state/DashboardMigrator.test.ts
@@ -438,7 +438,7 @@ describe('DashboardModel', () => {
     });
 
     it('should slugify dashboard name', () => {
-      expect(model.panels[0].links[3].url).toBe(`/dashboard/db/my-other-dashboard`);
+      expect(model.panels[0].links[3].url).toBe(`dashboard/db/my-other-dashboard`);
     });
   });
 
diff --git a/public/app/features/dashboard/state/DashboardMigrator.ts b/public/app/features/dashboard/state/DashboardMigrator.ts
index fc1039227db..9445e314582 100644
--- a/public/app/features/dashboard/state/DashboardMigrator.ts
+++ b/public/app/features/dashboard/state/DashboardMigrator.ts
@@ -685,11 +685,11 @@ function upgradePanelLink(link: any): DataLink {
   let url = link.url;
 
   if (!url && link.dashboard) {
-    url = `/dashboard/db/${kbn.slugifyForUrl(link.dashboard)}`;
+    url = `dashboard/db/${kbn.slugifyForUrl(link.dashboard)}`;
   }
 
   if (!url && link.dashUri) {
-    url = `/dashboard/${link.dashUri}`;
+    url = `dashboard/${link.dashUri}`;
   }
 
   // some models are incomplete and have no dashboard or dashUri