From 54f0fae4ebdc21e696d2417f68eb1630eddda4ab Mon Sep 17 00:00:00 2001
From: "grafana-delivery-bot[bot]"
 <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Date: Fri, 19 Apr 2024 11:51:26 +0200
Subject: [PATCH] [v11.0.x] InfluxDB: Fix interpolating field keys in influxql
 (#86560)

InfluxDB: Fix interpolating field keys in influxql (#86401)

* interpolate field keys

* use scopedVars

(cherry picked from commit 842c8dd20667f7646b0989f7d7ba6f854b840c7b)

Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
---
 .../plugins/datasource/influxdb/datasource.ts |  2 +-
 .../influxdb/datasource_backend_mode.test.ts  | 48 +++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts
index 3a12ed611e1..a346c6ad522 100644
--- a/public/app/plugins/datasource/influxdb/datasource.ts
+++ b/public/app/plugins/datasource/influxdb/datasource.ts
@@ -254,7 +254,7 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
         return selects.map((select) => {
           return {
             ...select,
-            params: select.params?.map((param) => this.templateSrv.replace(param.toString(), undefined)),
+            params: select.params?.map((param) => this.templateSrv.replace(param.toString(), 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 4ce1dff8e2f..691677ce07d 100644
--- a/public/app/plugins/datasource/influxdb/datasource_backend_mode.test.ts
+++ b/public/app/plugins/datasource/influxdb/datasource_backend_mode.test.ts
@@ -221,6 +221,26 @@ describe('InfluxDataSource Backend Mode', () => {
     const variablesMock = [
       queryBuilder().withId('var1').withName('var1').withCurrent('var1').build(),
       queryBuilder().withId('path').withName('path').withCurrent('/etc/hosts').build(),
+      queryBuilder()
+        .withId('field_var')
+        .withName('field_var')
+        .withMulti(true)
+        .withOptions(
+          {
+            text: `field_1`,
+            value: `field_1`,
+          },
+          {
+            text: `field_2`,
+            value: `field_2`,
+          },
+          {
+            text: `field_3`,
+            value: `field_3`,
+          }
+        )
+        .withCurrent(['field_1', 'field_3'])
+        .build(),
     ];
     const mockTemplateService = new TemplateSrv({
       getVariables: () => variablesMock,
@@ -328,6 +348,34 @@ describe('InfluxDataSource Backend Mode', () => {
       const expected = `/etc/hosts`;
       expect(res.tags?.[0].value).toEqual(expected);
     });
+
+    it('should interpolate field keys with given scopedVars', () => {
+      const query: InfluxQuery = {
+        refId: 'A',
+        tags: [
+          {
+            key: 'key',
+            operator: '=',
+            value: 'value',
+          },
+        ],
+        select: [
+          [
+            {
+              type: 'field',
+              params: ['$field_var'],
+            },
+            {
+              type: 'mean',
+              params: [],
+            },
+          ],
+        ],
+      };
+      const res = ds.applyVariables(query, { field_var: { text: 'field_3', value: 'field_3' } });
+      const expected = `field_3`;
+      expect(res.select?.[0][0].params?.[0]).toEqual(expected);
+    });
   });
 
   describe('metric find query', () => {