From 62d242b74e2d08b0e9a969bca2bb27bc69fa56d5 Mon Sep 17 00:00:00 2001
From: "grafana-delivery-bot[bot]"
 <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Date: Thu, 12 Sep 2024 17:02:59 +0300
Subject: [PATCH] [v11.2.x] InfluxDB: Fix variable interpolation in influx db
 (#93109)

InfluxDB: Fix variable interpolation in influx db (#92988)

Fix variable interpolation in influx db

(cherry picked from commit c0df15dcde8fe87c99c0ff8d753a006751c241dc)

Co-authored-by: Oscar Kilhed <oscar.kilhed@grafana.com>
---
 public/app/plugins/datasource/influxdb/datasource.ts | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts
index ea1c4e266f7..69fe4452405 100644
--- a/public/app/plugins/datasource/influxdb/datasource.ts
+++ b/public/app/plugins/datasource/influxdb/datasource.ts
@@ -324,11 +324,6 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
   }
 
   interpolateQueryExpr(value: string | string[] = [], variable: QueryVariableModel, query?: string) {
-    // If there is no query just return the value directly
-    if (!query) {
-      return value;
-    }
-
     if (typeof value === 'string') {
       // Check the value is a number. If not run to escape special characters
       if (!isNaN(parseFloat(value))) {
@@ -358,7 +353,7 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
     // regex below checks if the variable inside /^...$/ (^ and $ is optional)
     // i.e. /^$myVar$/ or /$myVar/ or /^($myVar)$/
     const regex = new RegExp(`\\/(?:\\^)?(.*)(\\$${variable.name})(.*)(?:\\$)?\\/`, 'gm');
-    if (regex.test(query)) {
+    if (query && regex.test(query)) {
       if (typeof value === 'string') {
         return escapeRegex(value);
       }