From a8819dedcfecb1ff4a3523168cc1ad274dbdc89e Mon Sep 17 00:00:00 2001
From: ismail simsek <ismailsimsek09@gmail.com>
Date: Mon, 17 Jul 2023 00:30:14 +0300
Subject: [PATCH] Chore: Remove prometheusAzureOverrideAudience feature toggle
 (#71599)

* Remove prometheusAzureOverrideAudience feature toggle

* Remove overrideAudienceAllowed flag
---
 .../feature-toggles/index.md                  |  1 -
 .../src/types/featureToggles.gen.ts           |  1 -
 pkg/services/featuremgmt/registry.go          |  6 ---
 pkg/services/featuremgmt/toggles_gen.csv      |  1 -
 pkg/services/featuremgmt/toggles_gen.go       |  4 --
 .../configuration/AzureAuthSettings.tsx       | 45 ++++++++-----------
 6 files changed, 19 insertions(+), 39 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 69bad43c626..f2269c09bf2 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -49,7 +49,6 @@ Some features are enabled by default. You can disable these feature by setting t
 | ------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `trimDefaults`                       | Use cue schema to remove values that will be applied automatically                                                                                                                           |
 | `panelTitleSearch`                   | Search for dashboards using panel title                                                                                                                                                      |
-| `prometheusAzureOverrideAudience`    | Experimental. Allow override default AAD audience for Azure Prometheus endpoint                                                                                                              |
 | `publicDashboards`                   | Enables public access to dashboards                                                                                                                                                          |
 | `migrationLocking`                   | Lock database during migrations                                                                                                                                                              |
 | `correlations`                       | Correlations page                                                                                                                                                                            |
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index a755050dc44..eaa5a4f25bb 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -23,7 +23,6 @@ export interface FeatureToggles {
   ['live-service-web-worker']?: boolean;
   queryOverLive?: boolean;
   panelTitleSearch?: boolean;
-  prometheusAzureOverrideAudience?: boolean;
   publicDashboards?: boolean;
   publicDashboardsEmailSharing?: boolean;
   lokiExperimentalStreaming?: boolean;
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index e12c59258cf..84d9d260f51 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -41,12 +41,6 @@ var (
 			Stage:       FeatureStagePublicPreview,
 			Owner:       grafanaAppPlatformSquad,
 		},
-		{
-			Name:        "prometheusAzureOverrideAudience",
-			Description: "Experimental. Allow override default AAD audience for Azure Prometheus endpoint",
-			Stage:       FeatureStagePublicPreview,
-			Owner:       grafanaObservabilityMetricsSquad,
-		},
 		{
 			Name:        "publicDashboards",
 			Description: "Enables public access to dashboards",
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index ce5e2287b32..157c262b242 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -4,7 +4,6 @@ disableEnvelopeEncryption,GA,@grafana/grafana-as-code,false,false,false,false
 live-service-web-worker,experimental,@grafana/grafana-app-platform-squad,false,false,false,true
 queryOverLive,experimental,@grafana/grafana-app-platform-squad,false,false,false,true
 panelTitleSearch,preview,@grafana/grafana-app-platform-squad,false,false,false,false
-prometheusAzureOverrideAudience,preview,@grafana/observability-metrics,false,false,false,false
 publicDashboards,preview,@grafana/dashboards-squad,false,false,false,false
 publicDashboardsEmailSharing,preview,@grafana/dashboards-squad,false,true,false,false
 lokiExperimentalStreaming,experimental,@grafana/observability-logs,false,false,false,false
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index 24e0cbcf9b8..b71d8c5335e 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -27,10 +27,6 @@ const (
 	// Search for dashboards using panel title
 	FlagPanelTitleSearch = "panelTitleSearch"
 
-	// FlagPrometheusAzureOverrideAudience
-	// Experimental. Allow override default AAD audience for Azure Prometheus endpoint
-	FlagPrometheusAzureOverrideAudience = "prometheusAzureOverrideAudience"
-
 	// FlagPublicDashboards
 	// Enables public access to dashboards
 	FlagPublicDashboards = "publicDashboards"
diff --git a/public/app/plugins/datasource/prometheus/configuration/AzureAuthSettings.tsx b/public/app/plugins/datasource/prometheus/configuration/AzureAuthSettings.tsx
index 9d5d90ec865..cc9cc37665f 100644
--- a/public/app/plugins/datasource/prometheus/configuration/AzureAuthSettings.tsx
+++ b/public/app/plugins/datasource/prometheus/configuration/AzureAuthSettings.tsx
@@ -11,9 +11,6 @@ import { AzureCredentialsForm } from './AzureCredentialsForm';
 export const AzureAuthSettings = (props: HttpSettingsBaseProps) => {
   const { dataSourceConfig, onChange } = props;
 
-  const [overrideAudienceAllowed] = useState<boolean>(
-    config.featureToggles.prometheusAzureOverrideAudience || !!dataSourceConfig.jsonData.azureEndpointResourceId
-  );
   const [overrideAudienceChecked, setOverrideAudienceChecked] = useState<boolean>(
     !!dataSourceConfig.jsonData.azureEndpointResourceId
   );
@@ -53,29 +50,25 @@ export const AzureAuthSettings = (props: HttpSettingsBaseProps) => {
         onCredentialsChange={onCredentialsChange}
         disabled={dataSourceConfig.readOnly}
       />
-      {overrideAudienceAllowed && (
-        <>
-          <h6>Azure configuration</h6>
-          <div className="gf-form-group">
-            <InlineFieldRow>
-              <InlineField labelWidth={26} label="Override AAD audience" disabled={dataSourceConfig.readOnly}>
-                <InlineSwitch value={overrideAudienceChecked} onChange={onOverrideAudienceChange} />
-              </InlineField>
-            </InlineFieldRow>
-            {overrideAudienceChecked && (
-              <InlineFieldRow>
-                <InlineField labelWidth={26} label="Resource ID" disabled={dataSourceConfig.readOnly}>
-                  <Input
-                    className="width-30"
-                    value={dataSourceConfig.jsonData.azureEndpointResourceId || ''}
-                    onChange={onResourceIdChange}
-                  />
-                </InlineField>
-              </InlineFieldRow>
-            )}
-          </div>
-        </>
-      )}
+      <h6>Azure configuration</h6>
+      <div className="gf-form-group">
+        <InlineFieldRow>
+          <InlineField labelWidth={26} label="Override AAD audience" disabled={dataSourceConfig.readOnly}>
+            <InlineSwitch value={overrideAudienceChecked} onChange={onOverrideAudienceChange} />
+          </InlineField>
+        </InlineFieldRow>
+        {overrideAudienceChecked && (
+          <InlineFieldRow>
+            <InlineField labelWidth={26} label="Resource ID" disabled={dataSourceConfig.readOnly}>
+              <Input
+                className="width-30"
+                value={dataSourceConfig.jsonData.azureEndpointResourceId || ''}
+                onChange={onResourceIdChange}
+              />
+            </InlineField>
+          </InlineFieldRow>
+        )}
+      </div>
     </>
   );
 };