From 7f67bc816a442f1c8e50ff3cca285387b8784d1c Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 15 Jul 2021 16:32:25 +0200
Subject: [PATCH] InfluxDB: InfluxQL: adds tags to timeseries data (#36702)
 (#36757)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* influxdb: influxql: return tags in timeseries

* influxdb: influxql: added tests

(cherry picked from commit 815f9a755749676b43e43edb2fc8c17e0a21c13c)

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

diff --git a/public/app/plugins/datasource/influxdb/influx_series.ts b/public/app/plugins/datasource/influxdb/influx_series.ts
index 79f3d83858d..48cbc7bdd84 100644
--- a/public/app/plugins/datasource/influxdb/influx_series.ts
+++ b/public/app/plugins/datasource/influxdb/influx_series.ts
@@ -51,7 +51,13 @@ export default class InfluxSeries {
           }
         }
 
-        output.push({ target: seriesName, datapoints: datapoints, meta: this.meta, refId: this.refId });
+        output.push({
+          target: seriesName,
+          datapoints: datapoints,
+          tags: series.tags,
+          meta: this.meta,
+          refId: this.refId,
+        });
       }
     });
 
diff --git a/public/app/plugins/datasource/influxdb/specs/influx_series.test.ts b/public/app/plugins/datasource/influxdb/specs/influx_series.test.ts
index bf7b803130a..7bc8db097ff 100644
--- a/public/app/plugins/datasource/influxdb/specs/influx_series.test.ts
+++ b/public/app/plugins/datasource/influxdb/specs/influx_series.test.ts
@@ -138,12 +138,20 @@ describe('when generating timeseries from influxdb response', () => {
         expect(result[0].datapoints[0][1]).toBe(1431946625000);
         expect(result[0].datapoints[1][0]).toBe(12);
         expect(result[0].datapoints[1][1]).toBe(1431946626000);
+        expect(result[0].tags).toMatchObject({
+          app: 'test',
+          server: 'server1',
+        });
 
         expect(result[1].target).toBe('cpu.mean {app: test2, server: server2}');
         expect(result[1].datapoints[0][0]).toBe(15);
         expect(result[1].datapoints[0][1]).toBe(1431946625000);
         expect(result[1].datapoints[1][0]).toBe(16);
         expect(result[1].datapoints[1][1]).toBe(1431946626000);
+        expect(result[1].tags).toMatchObject({
+          app: 'test2',
+          server: 'server2',
+        });
       });
     });