From 27a6d700f879ebe33d5217aae4d263cd7e87e32d Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 23 Feb 2023 18:28:43 +0100
Subject: [PATCH] [v9.4.x] InfluxDB: Fix getting empty response when querying
 fields with retention policy (#63671)

InfluxDB: Fix getting empty response when querying fields with retention policy (#63669)

Revert "InfluxDB: Send retention policy with InfluxQL queries if its been specified. (#62149)"

This reverts commit a5a85e03985aca2d572f06adc3adf834b4a53338.

(cherry picked from commit ffed77987960533cc8e547742dd741f212a4310f)

Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
(cherry picked from commit 3e30c2024c6a859d6d0e344964d160c68430dcc6)
---
 public/app/plugins/datasource/influxdb/datasource.ts          | 4 ----
 .../app/plugins/datasource/influxdb/influxQLMetadataQuery.ts  | 3 +--
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts
index 419a95d210a..153c5304533 100644
--- a/public/app/plugins/datasource/influxdb/datasource.ts
+++ b/public/app/plugins/datasource/influxdb/datasource.ts
@@ -403,10 +403,6 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
       params.db = this.database;
     }
 
-    if (options?.policy) {
-      params.rp = options.policy;
-    }
-
     const { q } = data;
 
     if (method === 'POST' && has(data, 'q')) {
diff --git a/public/app/plugins/datasource/influxdb/influxQLMetadataQuery.ts b/public/app/plugins/datasource/influxdb/influxQLMetadataQuery.ts
index 40924a0faf5..edd35d3f0ac 100644
--- a/public/app/plugins/datasource/influxdb/influxQLMetadataQuery.ts
+++ b/public/app/plugins/datasource/influxdb/influxQLMetadataQuery.ts
@@ -11,8 +11,7 @@ const runExploreQuery = (
 ): Promise<Array<{ text: string }>> => {
   const builder = new InfluxQueryBuilder(target, datasource.database);
   const q = builder.buildExploreQuery(type, withKey, withMeasurementFilter);
-  const options = { policy: target.policy };
-  return datasource.metricFindQuery(q, options);
+  return datasource.metricFindQuery(q);
 };
 
 export async function getAllPolicies(datasource: InfluxDatasource): Promise<string[]> {