From 0f5b894256f44da16ff058a11a915898f6284c4b Mon Sep 17 00:00:00 2001
From: Dominik Prokop <dominik.prokop@grafana.com>
Date: Thu, 4 Jun 2020 08:35:15 +0200
Subject: [PATCH] Provide correct field scoped vars for data links
 interpolation (#25318)

---
 packages/grafana-data/src/field/fieldOverrides.test.ts | 8 ++++----
 packages/grafana-data/src/field/fieldOverrides.ts      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/grafana-data/src/field/fieldOverrides.test.ts b/packages/grafana-data/src/field/fieldOverrides.test.ts
index 1ccb40c2395..247951b82d4 100644
--- a/packages/grafana-data/src/field/fieldOverrides.test.ts
+++ b/packages/grafana-data/src/field/fieldOverrides.test.ts
@@ -118,8 +118,8 @@ describe('applyFieldOverrides', () => {
           "__field": Object {
             "text": "Field",
             "value": Object {
-              "label": undefined,
-              "labels": "",
+              "formattedLabels": "",
+              "labels": undefined,
               "name": "A message",
             },
           },
@@ -137,8 +137,8 @@ describe('applyFieldOverrides', () => {
           "__field": Object {
             "text": "Field",
             "value": Object {
-              "label": undefined,
-              "labels": "",
+              "formattedLabels": "",
+              "labels": undefined,
               "name": "B info",
             },
           },
diff --git a/packages/grafana-data/src/field/fieldOverrides.ts b/packages/grafana-data/src/field/fieldOverrides.ts
index 350104c3293..51d10b4153c 100644
--- a/packages/grafana-data/src/field/fieldOverrides.ts
+++ b/packages/grafana-data/src/field/fieldOverrides.ts
@@ -112,8 +112,8 @@ export function applyFieldOverrides(options: ApplyFieldOverrideOptions): DataFra
         text: 'Field',
         value: {
           name: displayName, // Generally appropriate (may include the series name if useful)
-          labels: formatLabels(field.labels!),
-          label: field.labels,
+          formattedLabels: formatLabels(field.labels!),
+          labels: field.labels,
         },
       };