From 131b857bd23f99e5f6b544252d6eb57d8600d934 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 15 Sep 2022 17:05:41 +0200
Subject: [PATCH] InfluxDB: add scopedVars to tags to fix repeated panels
 querying all selected variables (#54934) (#55245)

* add scoped vars for tags in influx to fix repeated panels

* test for adding scopedVars to tags

(cherry picked from commit cd6b7ba688457aeda44f009789667372ce7f5ee7)

Co-authored-by: Brendan O'Handley <brendan.ohandley@grafana.com>
---
 .../app/plugins/datasource/influxdb/datasource.ts   |  2 +-
 .../datasource/influxdb/specs/datasource.test.ts    | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts
index bc571d4260d..238f2e174a6 100644
--- a/public/app/plugins/datasource/influxdb/datasource.ts
+++ b/public/app/plugins/datasource/influxdb/datasource.ts
@@ -465,7 +465,7 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
       expandedQuery.tags = query.tags.map((tag) => {
         return {
           ...tag,
-          value: this.templateSrv.replace(tag.value, undefined, 'regex'),
+          value: this.templateSrv.replace(tag.value, scopedVars, 'regex'),
         };
       });
     }
diff --git a/public/app/plugins/datasource/influxdb/specs/datasource.test.ts b/public/app/plugins/datasource/influxdb/specs/datasource.test.ts
index f5db9a9dec2..574061ea4d1 100644
--- a/public/app/plugins/datasource/influxdb/specs/datasource.test.ts
+++ b/public/app/plugins/datasource/influxdb/specs/datasource.test.ts
@@ -298,6 +298,19 @@ describe('InfluxDataSource', () => {
         });
         influxChecks(query);
       });
+
+      it('should apply all scopedVars to tags', () => {
+        ds.isFlux = false;
+        ds.access = 'proxy';
+        config.featureToggles.influxdbBackendMigration = true;
+        const query = ds.applyTemplateVariables(influxQuery, {
+          interpolationVar: { text: text, value: text },
+          interpolationVar2: { text: 'interpolationText2', value: 'interpolationText2' },
+        });
+        const value = query.tags[0].value;
+        const scopedVars = 'interpolationText|interpolationText2';
+        expect(value).toBe(scopedVars);
+      });
     });
   });
 });