From c4d91e25966ee39213c7ed7cf06cdc263757b511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Tue, 5 Jan 2021 10:23:53 +0100
Subject: [PATCH] SeriesToRows: Fixes issue in transform so that value field is
 always named Value (#30054)

---
 .../src/transformations/transformers/seriesToRows.test.ts  | 7 ++++++-
 .../src/transformations/transformers/seriesToRows.ts       | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/grafana-data/src/transformations/transformers/seriesToRows.test.ts b/packages/grafana-data/src/transformations/transformers/seriesToRows.test.ts
index 8a372dfd844..21b6ea1b218 100644
--- a/packages/grafana-data/src/transformations/transformers/seriesToRows.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/seriesToRows.test.ts
@@ -134,7 +134,12 @@ describe('Series to rows', () => {
       name: 'A',
       fields: [
         { name: 'Time', type: FieldType.time, values: [100, 150, 200], config: { displayName: 'Random time' } },
-        { name: 'Temp', type: FieldType.number, values: [1, 4, 5], config: { displayName: 'Temp' } },
+        {
+          name: 'Temp',
+          type: FieldType.number,
+          values: [1, 4, 5],
+          config: { displayName: 'Temp', displayNameFromDS: 'dsName' },
+        },
       ],
     });
 
diff --git a/packages/grafana-data/src/transformations/transformers/seriesToRows.ts b/packages/grafana-data/src/transformations/transformers/seriesToRows.ts
index ae316891689..0a11ee07e67 100644
--- a/packages/grafana-data/src/transformations/transformers/seriesToRows.ts
+++ b/packages/grafana-data/src/transformations/transformers/seriesToRows.ts
@@ -93,7 +93,7 @@ const copyFieldStructure = (field: Field, name: string): Field => {
     name: name,
     values: new ArrayVector(),
     config: {
-      ...omit(field.config, 'displayName'),
+      ...omit(field.config, ['displayName', 'displayNameFromDS']),
     },
   };
 };