From 9af2ea1b534e9e9262e44ab1fa3f29a23b39ef35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Wed, 24 Jul 2019 20:40:41 +0200
Subject: [PATCH] DataLinks: Fixed interpolation of series name, fixes #18250
 (#18251)

(cherry picked from commit 43543d5682760461f332cdf44dc2b69c5e77b43d)
---
 public/app/features/panel/panellinks/link_srv.ts     | 12 ++----------
 .../features/panel/panellinks/specs/link_srv.test.ts |  4 ++--
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/public/app/features/panel/panellinks/link_srv.ts b/public/app/features/panel/panellinks/link_srv.ts
index c8a3f22ce74..93cc7334a43 100644
--- a/public/app/features/panel/panellinks/link_srv.ts
+++ b/public/app/features/panel/panellinks/link_srv.ts
@@ -90,22 +90,14 @@ export class LinkSrv implements LinkService {
   }
 
   getDataPointVars = (seriesName: string, valueTime: DateTime) => {
-    // const valueTimeQuery = toUrlParams({
-    //   time: dateTime(valueTime).valueOf(),
-    // });
-
-    const seriesQuery = toUrlParams({
-      series: seriesName,
-    });
-
     return {
       [DataLinkBuiltInVars.valueTime]: {
         text: valueTime.valueOf(),
         value: valueTime.valueOf(),
       },
       [DataLinkBuiltInVars.seriesName]: {
-        text: seriesQuery,
-        value: seriesQuery,
+        text: seriesName,
+        value: seriesName,
       },
     };
   };
diff --git a/public/app/features/panel/panellinks/specs/link_srv.test.ts b/public/app/features/panel/panellinks/specs/link_srv.test.ts
index 6adae2fb387..fe7daf33b36 100644
--- a/public/app/features/panel/panellinks/specs/link_srv.test.ts
+++ b/public/app/features/panel/panellinks/specs/link_srv.test.ts
@@ -102,12 +102,12 @@ describe('linkSrv', () => {
         linkSrv.getDataLinkUIModel(
           {
             title: 'Any title',
-            url: `/d/1?$${DataLinkBuiltInVars.seriesName}`,
+            url: `/d/1?var-test=$${DataLinkBuiltInVars.seriesName}`,
           },
           {},
           dataPointMock
         ).href
-      ).toEqual('/d/1?series=A-series');
+      ).toEqual('/d/1?var-test=A-series');
     });
     it('should interpolate time range based on datapoint timestamp', () => {
       expect(