From 9ab2fd5ec95409118943610d0ba4b191bf72488c Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Fri, 18 Jun 2021 04:19:26 -0400
Subject: [PATCH] Prometheus: Fixes issue where legend name was replaced with
 name Value in stat & gauge panels (#35863) (#35905)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 22203fd4df0773af864d220b859f5087f71d86ff)

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
---
 .../src/field/fieldDisplay.test.ts            | 30 +++++++++++++++++++
 .../grafana-data/src/field/fieldDisplay.ts    |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/packages/grafana-data/src/field/fieldDisplay.test.ts b/packages/grafana-data/src/field/fieldDisplay.test.ts
index e08947ecdb8..7d39cd382d8 100644
--- a/packages/grafana-data/src/field/fieldDisplay.test.ts
+++ b/packages/grafana-data/src/field/fieldDisplay.test.ts
@@ -411,6 +411,36 @@ describe('FieldDisplay', () => {
       expect(result[1].display.title).toEqual('Norway Oslo');
       expect(result[1].display.text).toEqual('20');
     });
+
+    it('When showing all values for field with displayNameFromDS', () => {
+      const options = createDisplayOptions({
+        reduceOptions: {
+          values: true,
+          calcs: [],
+        },
+        fieldConfig: { overrides: [], defaults: {} },
+        data: [
+          toDataFrame({
+            fields: [
+              {
+                name: 'Time',
+                values: [1],
+              },
+              {
+                name: 'Value',
+                values: [10],
+                config: {
+                  displayNameFromDS: 'NewName',
+                },
+              },
+            ],
+          }),
+        ],
+      });
+
+      const result = getFieldDisplayValues(options);
+      expect(result[0].display.title).toEqual('NewName');
+    });
   });
 });
 
diff --git a/packages/grafana-data/src/field/fieldDisplay.ts b/packages/grafana-data/src/field/fieldDisplay.ts
index a173051fa73..3641ede023b 100644
--- a/packages/grafana-data/src/field/fieldDisplay.ts
+++ b/packages/grafana-data/src/field/fieldDisplay.ts
@@ -274,7 +274,7 @@ function getSmartDisplayNameForRow(
   }
 
   if (otherNumericFields || parts.length === 0) {
-    parts.push(getFieldDisplayName(field));
+    parts.push(getFieldDisplayName(field, frame));
   }
 
   return parts.join(' ');