From 171fd79305332bb1bf9c5e9865c7df2ef481cbb3 Mon Sep 17 00:00:00 2001
From: ismail simsek <ismailsimsek09@gmail.com>
Date: Mon, 31 Jul 2023 22:40:29 +0300
Subject: [PATCH] [v10.1.x] InfluxDB: Fix fetching retention policies after
 manually entering a non-existent retention policy (#72643)

InfluxDB: Fix fetching retention policies after manually entering a non-existent retention policy (#72564)

Don't fetch tag keys before fetching policies

(cherry picked from commit 31f4eddbb6b57e04d454b57c0c5e93684fa0154e)
---
 .../editor/query/influxql/visual/VisualInfluxQLEditor.tsx  | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/VisualInfluxQLEditor.tsx b/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/VisualInfluxQLEditor.tsx
index 9ef1616cdbf..a3d423cf27c 100644
--- a/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/VisualInfluxQLEditor.tsx
+++ b/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/VisualInfluxQLEditor.tsx
@@ -133,12 +133,7 @@ export const VisualInfluxQLEditor = (props: Props): JSX.Element => {
         <FromSection
           policy={policy}
           measurement={measurement}
-          getPolicyOptions={() =>
-            withTemplateVariableOptions(
-              allTagKeys.then(() => getAllPolicies(datasource)),
-              wrapPure
-            )
-          }
+          getPolicyOptions={() => withTemplateVariableOptions(getAllPolicies(datasource), wrapPure)}
           getMeasurementOptions={(filter) =>
             withTemplateVariableOptions(
               allTagKeys.then((keys) =>