From d4c72e984162116bc0c81948e84fedf5bc8f9d71 Mon Sep 17 00:00:00 2001
From: "grafana-delivery-bot[bot]"
 <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 12:47:36 +0200
Subject: [PATCH] [v11.0.x] InfluxDB: Fix measurement interpolation on visual
 query builder (#85456)

InfluxDB: Fix measurement interpolation on visual query builder (#85423)

* fix measurement interpolation

* fix unit test

* fix unit test 2

(cherry picked from commit 64236a392364af4bb0690c7a4008cde7b4080dcf)

Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
---
 public/app/plugins/datasource/influxdb/datasource.test.ts  | 2 +-
 public/app/plugins/datasource/influxdb/datasource.ts       | 7 ++++++-
 .../datasource/influxdb/datasource_backend_mode.test.ts    | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/public/app/plugins/datasource/influxdb/datasource.test.ts b/public/app/plugins/datasource/influxdb/datasource.test.ts
index 01f1ab2f7e6..31ab839a3e2 100644
--- a/public/app/plugins/datasource/influxdb/datasource.test.ts
+++ b/public/app/plugins/datasource/influxdb/datasource.test.ts
@@ -289,7 +289,7 @@ describe('InfluxDataSource Frontend Mode', () => {
     function influxChecks(query: InfluxQuery) {
       expect(templateSrv.replace).toBeCalledTimes(12);
       expect(query.alias).toBe(text);
-      expect(query.measurement).toBe(justText);
+      expect(query.measurement).toBe(textWithFormatRegex);
       expect(query.policy).toBe(justText);
       expect(query.limit).toBe(justText);
       expect(query.slimit).toBe(justText);
diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts
index 665ac390215..472aa8b196e 100644
--- a/public/app/plugins/datasource/influxdb/datasource.ts
+++ b/public/app/plugins/datasource/influxdb/datasource.ts
@@ -297,7 +297,12 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
       ), // The raw sql query text
       alias: this.templateSrv.replace(query.alias ?? '', scopedVars),
       limit: this.templateSrv.replace(query.limit?.toString() ?? '', scopedVars),
-      measurement: this.templateSrv.replace(query.measurement ?? '', scopedVars),
+      measurement: this.templateSrv.replace(
+        query.measurement ?? '',
+        scopedVars,
+        (value: string | string[] = [], variable: QueryVariableModel) =>
+          this.interpolateQueryExpr(value, variable, query.measurement)
+      ),
       policy: this.templateSrv.replace(query.policy ?? '', scopedVars),
       slimit: this.templateSrv.replace(query.slimit?.toString() ?? '', scopedVars),
       tz: this.templateSrv.replace(query.tz ?? '', scopedVars),
diff --git a/public/app/plugins/datasource/influxdb/datasource_backend_mode.test.ts b/public/app/plugins/datasource/influxdb/datasource_backend_mode.test.ts
index e6658da236d..4ce1dff8e2f 100644
--- a/public/app/plugins/datasource/influxdb/datasource_backend_mode.test.ts
+++ b/public/app/plugins/datasource/influxdb/datasource_backend_mode.test.ts
@@ -180,7 +180,7 @@ describe('InfluxDataSource Backend Mode', () => {
     function influxChecks(query: InfluxQuery) {
       expect(templateSrv.replace).toBeCalledTimes(12);
       expect(query.alias).toBe(text);
-      expect(query.measurement).toBe(justText);
+      expect(query.measurement).toBe(textWithFormatRegex);
       expect(query.policy).toBe(justText);
       expect(query.limit).toBe(justText);
       expect(query.slimit).toBe(justText);