From 617cf0646d2b0e27eb32b248c9c27c9961870d73 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Tue, 3 Aug 2021 14:00:14 +0100
Subject: [PATCH] influxdb: better query-has-variable check (#37453) (#37482)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit bc0ab3cc7a5c1ff1d98db4fc577864b883d608f9)

Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
---
 .../app/plugins/datasource/influxdb/datasource.ts   | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts
index 20051a9bde6..3ac840895e9 100644
--- a/public/app/plugins/datasource/influxdb/datasource.ts
+++ b/public/app/plugins/datasource/influxdb/datasource.ts
@@ -321,6 +321,19 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
   }
 
   targetContainsTemplate(target: any) {
+    if (this.isFlux) {
+      return this.templateSrv.variableExists(target.query);
+    }
+
+    // now we know it is an InfluxQL query.
+    // it can be either a raw-query or a not-raw-query
+
+    if (target.rawQuery) {
+      return this.templateSrv.variableExists(target.query);
+    }
+
+    // now we know it is an InfluxQL not-raw-query
+
     for (const group of target.groupBy) {
       for (const param of group.params) {
         if (this.templateSrv.variableExists(param)) {