From dfdd81aa0d7a926b67c3e94544c01c3da9e2d853 Mon Sep 17 00:00:00 2001
From: Brendan O'Handley <brendan.ohandley@grafana.com>
Date: Tue, 13 Jun 2023 17:57:58 -0400
Subject: [PATCH] Revert "Prometheus: Fix series to rows frame name issue for
 custom name from legend option" (#70029)

Revert "Prometheus: Fix series to rows frame name issue for custom name from legend option (#69343)"

This reverts commit 32f27d10ff8f9f705a05b2518fdc32097611792c.
---
 .../transformers/seriesToRows.test.ts              |  4 ++--
 .../transformations/transformers/seriesToRows.ts   | 14 +-------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/packages/grafana-data/src/transformations/transformers/seriesToRows.test.ts b/packages/grafana-data/src/transformations/transformers/seriesToRows.test.ts
index ff8ba77e624..49829c3e377 100644
--- a/packages/grafana-data/src/transformations/transformers/seriesToRows.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/seriesToRows.test.ts
@@ -124,7 +124,7 @@ describe('Series to rows', () => {
     });
   });
 
-  it('combine two time series, where first series fields has displayName, into one and displayNameFromDS overrides frame.name', async () => {
+  it('combine two time series, where first serie fields has displayName, into one', async () => {
     const cfg: DataTransformerConfig<SeriesToRowsTransformerOptions> = {
       id: DataTransformerID.seriesToRows,
       options: {},
@@ -156,7 +156,7 @@ describe('Series to rows', () => {
 
       const expected: Field[] = [
         createField('Time', FieldType.time, [200, 150, 126, 125, 100, 100]),
-        createField('Metric', FieldType.string, ['dsName', 'dsName', 'B', 'B', 'dsName', 'B']),
+        createField('Metric', FieldType.string, ['A', 'A', 'B', 'B', 'A', 'B']),
         createField('Value', FieldType.number, [5, 4, 3, 2, 1, -1]),
       ];
 
diff --git a/packages/grafana-data/src/transformations/transformers/seriesToRows.ts b/packages/grafana-data/src/transformations/transformers/seriesToRows.ts
index 53ce4e8b501..69bb9ecef63 100644
--- a/packages/grafana-data/src/transformations/transformers/seriesToRows.ts
+++ b/packages/grafana-data/src/transformations/transformers/seriesToRows.ts
@@ -70,25 +70,13 @@ export const seriesToRowsTransformer: DataTransformerInfo<SeriesToRowsTransforme
         for (let frameIndex = 0; frameIndex < data.length; frameIndex++) {
           const frame = data[frameIndex];
 
-          const firstNonTimeField = frame.fields[1];
-
-          // To support consistent naming for dataplane and prometheus
-          // displayNameFromDS > frameDisplayName
-          // This supports new naming and custom names (from the prom legend option)
-          // and supports the older pattern of getting the frame name.
-          // if neither of those return a name we use getFieldDisplayName which is good.
-          const displayNameFromDS = firstNonTimeField.config.displayNameFromDS;
-          const frameDisplayName = getFrameDisplayName(frame);
-
-          const displayName = displayNameFromDS ?? frameDisplayName;
-
           for (let valueIndex = 0; valueIndex < frame.length; valueIndex++) {
             const timeFieldIndex = timeFieldByIndex[frameIndex];
             const valueFieldIndex = timeFieldIndex === 0 ? 1 : 0;
 
             dataFrame.add({
               [TIME_SERIES_TIME_FIELD_NAME]: frame.fields[timeFieldIndex].values[valueIndex],
-              [TIME_SERIES_METRIC_FIELD_NAME]: displayName,
+              [TIME_SERIES_METRIC_FIELD_NAME]: getFrameDisplayName(frame),
               [TIME_SERIES_VALUE_FIELD_NAME]: frame.fields[valueFieldIndex].values[valueIndex],
             });
           }