From f3f8972505156848a4c53bec53d6aaf1c2918126 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Mon, 26 Jul 2021 12:56:42 +0200
Subject: [PATCH] influxdb: influxql: fix dataframe column-names (#37195)
 (#37200)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit b254e4eb31a5ee265d453ecd0cacbc40c8d6012c)

Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
---
 public/app/plugins/datasource/influxdb/datasource.ts    | 4 +++-
 public/app/plugins/datasource/influxdb/influx_series.ts | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts
index 376e62ecbf8..20051a9bde6 100644
--- a/public/app/plugins/datasource/influxdb/datasource.ts
+++ b/public/app/plugins/datasource/influxdb/datasource.ts
@@ -85,7 +85,9 @@ function timeSeriesToDataFrame(timeSeries: TimeSeries): DataFrame {
   const valueField = {
     name: TIME_SERIES_VALUE_FIELD_NAME,
     type: getFieldType(values),
-    config: {},
+    config: {
+      displayNameFromDS: timeSeries.title,
+    },
     values: new ArrayVector<unknown>(values),
     labels: timeSeries.tags,
   };
diff --git a/public/app/plugins/datasource/influxdb/influx_series.ts b/public/app/plugins/datasource/influxdb/influx_series.ts
index 48cbc7bdd84..1c7fc7fcfb8 100644
--- a/public/app/plugins/datasource/influxdb/influx_series.ts
+++ b/public/app/plugins/datasource/influxdb/influx_series.ts
@@ -52,6 +52,7 @@ export default class InfluxSeries {
         }
 
         output.push({
+          title: seriesName,
           target: seriesName,
           datapoints: datapoints,
           tags: series.tags,