From 645262d4a2d3c0de09f00e58d997b9f768ab2cb9 Mon Sep 17 00:00:00 2001
From: Ludovic Viaud <ludovic.viaud@gmail.com>
Date: Mon, 19 Dec 2022 14:52:06 +0100
Subject: [PATCH] Prometheus: Remove promQueryBuilder feature flag (#60153)

---
 .../configure-grafana/feature-toggles/index.md    |  1 -
 .../grafana-data/src/types/featureToggles.gen.ts  |  1 -
 pkg/services/featuremgmt/registry.go              |  7 -------
 pkg/services/featuremgmt/toggles_gen.go           |  4 ----
 .../components/PromQueryEditorByApp.test.tsx      | 15 ---------------
 5 files changed, 28 deletions(-)

diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index 169f0a6b0a0..d7de8d20ebb 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -21,7 +21,6 @@ Some stable features are enabled by default. You can disable a stable feature by
 
 | Feature toggle name          | Description                                                                          | Enabled by default |
 | ---------------------------- | ------------------------------------------------------------------------------------ | ------------------ |
-| `promQueryBuilder`           | Show Prometheus query builder                                                        | Yes                |
 | `disableEnvelopeEncryption`  | Disable envelope encryption (emergency only)                                         |                    |
 | `database_metrics`           | Add Prometheus metrics for database tables                                           |                    |
 | `lokiMonacoEditor`           | Access to Monaco query editor for Loki                                               | Yes                |
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index a6af682c83d..1a02a102a03 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -18,7 +18,6 @@ export interface FeatureToggles {
 
   returnUnameHeader?: boolean;
   alertingBigTransactions?: boolean;
-  promQueryBuilder?: boolean;
   trimDefaults?: boolean;
   disableEnvelopeEncryption?: boolean;
   database_metrics?: boolean;
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 4e125ec1aee..be7e0b0bdd9 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -19,13 +19,6 @@ var (
 			Description: "Use big transactions for alerting database writes",
 			State:       FeatureStateAlpha,
 		},
-		{
-			Name:         "promQueryBuilder",
-			Description:  "Show Prometheus query builder",
-			State:        FeatureStateStable,
-			Expression:   "true", // on by default
-			FrontendOnly: true,
-		},
 		{
 			Name:        "trimDefaults",
 			Description: "Use cue schema to remove values that will be applied automatically",
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index 5eba9115943..dc858beea0d 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -15,10 +15,6 @@ const (
 	// Use big transactions for alerting database writes
 	FlagAlertingBigTransactions = "alertingBigTransactions"
 
-	// FlagPromQueryBuilder
-	// Show Prometheus query builder
-	FlagPromQueryBuilder = "promQueryBuilder"
-
 	// FlagTrimDefaults
 	// Use cue schema to remove values that will be applied automatically
 	FlagTrimDefaults = "trimDefaults"
diff --git a/public/app/plugins/datasource/prometheus/components/PromQueryEditorByApp.test.tsx b/public/app/plugins/datasource/prometheus/components/PromQueryEditorByApp.test.tsx
index fdc69769f89..036513e42b0 100644
--- a/public/app/plugins/datasource/prometheus/components/PromQueryEditorByApp.test.tsx
+++ b/public/app/plugins/datasource/prometheus/components/PromQueryEditorByApp.test.tsx
@@ -21,21 +21,6 @@ jest.mock('./monaco-query-field/MonacoQueryFieldLazy', () => {
   };
 });
 
-jest.mock('@grafana/runtime', () => {
-  const runtime = jest.requireActual('@grafana/runtime');
-  return {
-    __esModule: true,
-    ...runtime,
-    config: {
-      ...runtime.config,
-      featureToggles: {
-        ...runtime.config.featureToggles,
-        promQueryBuilder: true,
-      },
-    },
-  };
-});
-
 function setup(app: CoreApp): RenderResult & { onRunQuery: jest.Mock } {
   const dataSource = {
     createQuery: jest.fn((q) => q),