From 5be4dfd8c836c226321401a9d2f67b885068c4b3 Mon Sep 17 00:00:00 2001 From: ismail simsek Date: Thu, 2 Jan 2025 22:19:11 +0100 Subject: [PATCH] Chore: Remove prometheusConfigOverhaulAuth feature toggle (#98460) * remove toggle * remove toggle from code --- .../feature-toggles/index.md | 1 - .../src/types/featureToggles.gen.ts | 1 - pkg/services/featuremgmt/registry.go | 8 ------- pkg/services/featuremgmt/toggles_gen.csv | 1 - pkg/services/featuremgmt/toggles_gen.go | 4 ---- pkg/services/featuremgmt/toggles_gen.json | 1 + .../configuration/AzureAuthSettings.tsx | 10 +++------ .../configuration/AzureCredentialsForm.tsx | 22 +++++-------------- 8 files changed, 9 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 a1c363e4250..6c848e443d3 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -40,7 +40,6 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general- | `transformationsRedesign` | Enables the transformations redesign | Yes | | `traceQLStreaming` | Enables response streaming of TraceQL queries of the Tempo data source | | | `awsAsyncQueryCaching` | Enable caching for async queries for Redshift and Athena. Requires that the datasource has caching and async query support enabled | Yes | -| `prometheusConfigOverhaulAuth` | Update the Prometheus configuration page with the new auth component | Yes | | `alertingNoDataErrorExecution` | Changes how Alerting state manager handles execution of NoData/Error | Yes | | `angularDeprecationUI` | Display Angular warnings in dashboards and panels | Yes | | `dashgpt` | Enable AI powered features in dashboards | Yes | diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index b76935732b2..498ddd5ea60 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -88,7 +88,6 @@ export interface FeatureToggles { featureToggleAdminPage?: boolean; awsAsyncQueryCaching?: boolean; permissionsFilterRemoveSubquery?: boolean; - prometheusConfigOverhaulAuth?: boolean; configurableSchedulerTick?: boolean; alertingNoDataErrorExecution?: boolean; angularDeprecationUI?: boolean; diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 48c0755d0df..a2a0a84f160 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -523,14 +523,6 @@ var ( Stage: FeatureStageExperimental, Owner: grafanaBackendGroup, }, - { - Name: "prometheusConfigOverhaulAuth", - Description: "Update the Prometheus configuration page with the new auth component", - Owner: grafanaObservabilityMetricsSquad, - Stage: FeatureStageGeneralAvailability, - Expression: "true", // on by default - AllowSelfServe: false, - }, { Name: "configurableSchedulerTick", Description: "Enable changing the scheduler base interval via configuration option unified_alerting.scheduler_tick_interval", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 906ff00efe5..2f69909c040 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -69,7 +69,6 @@ grafanaAPIServerEnsureKubectlAccess,experimental,@grafana/grafana-app-platform-s featureToggleAdminPage,experimental,@grafana/grafana-operator-experience-squad,false,true,false awsAsyncQueryCaching,GA,@grafana/aws-datasources,false,false,false permissionsFilterRemoveSubquery,experimental,@grafana/grafana-backend-group,false,false,false -prometheusConfigOverhaulAuth,GA,@grafana/observability-metrics,false,false,false configurableSchedulerTick,experimental,@grafana/alerting-squad,false,true,false alertingNoDataErrorExecution,GA,@grafana/alerting-squad,false,true,false angularDeprecationUI,GA,@grafana/plugins-platform-backend,false,false,true diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index e6043312bb7..737798e721d 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -287,10 +287,6 @@ const ( // Alternative permission filter implementation that does not use subqueries for fetching the dashboard folder FlagPermissionsFilterRemoveSubquery = "permissionsFilterRemoveSubquery" - // FlagPrometheusConfigOverhaulAuth - // Update the Prometheus configuration page with the new auth component - FlagPrometheusConfigOverhaulAuth = "prometheusConfigOverhaulAuth" - // FlagConfigurableSchedulerTick // Enable changing the scheduler base interval via configuration option unified_alerting.scheduler_tick_interval FlagConfigurableSchedulerTick = "configurableSchedulerTick" diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index ca2f0132b57..e429e4838ca 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -2904,6 +2904,7 @@ "name": "prometheusConfigOverhaulAuth", "resourceVersion": "1720021873452", "creationTimestamp": "2023-07-26T16:09:53Z", + "deletionTimestamp": "2025-01-02T20:43:41Z", "annotations": { "grafana.app/updatedTimestamp": "2024-07-03 15:51:13.452477 +0000 UTC" } diff --git a/public/app/plugins/datasource/prometheus/configuration/AzureAuthSettings.tsx b/public/app/plugins/datasource/prometheus/configuration/AzureAuthSettings.tsx index 6152b70cb00..5ce68d35c9d 100644 --- a/public/app/plugins/datasource/prometheus/configuration/AzureAuthSettings.tsx +++ b/public/app/plugins/datasource/prometheus/configuration/AzureAuthSettings.tsx @@ -43,10 +43,6 @@ export const AzureAuthSettings = (props: HttpSettingsBaseProps) => { } }; - const prometheusConfigOverhaulAuth = config.featureToggles.prometheusConfigOverhaulAuth; - - const labelWidth = prometheusConfigOverhaulAuth ? 24 : 26; - // The auth type needs to be set on the first load of the data source useEffectOnce(() => { if (!dataSourceConfig.jsonData.authType) { @@ -70,15 +66,15 @@ export const AzureAuthSettings = (props: HttpSettingsBaseProps) => {
Azure configuration
- + {overrideAudienceChecked && ( - + diff --git a/public/app/plugins/datasource/prometheus/configuration/AzureCredentialsForm.tsx b/public/app/plugins/datasource/prometheus/configuration/AzureCredentialsForm.tsx index cecba3f9bc8..266bcc120a4 100644 --- a/public/app/plugins/datasource/prometheus/configuration/AzureCredentialsForm.tsx +++ b/public/app/plugins/datasource/prometheus/configuration/AzureCredentialsForm.tsx @@ -3,7 +3,6 @@ import { ChangeEvent, useMemo } from 'react'; import { AzureAuthType, AzureCredentials } from '@grafana/azure-sdk'; import { SelectableValue } from '@grafana/data'; -import { config } from '@grafana/runtime'; import { InlineFormLabel, Button, Select, Input } from '@grafana/ui'; export interface Props { @@ -113,8 +112,6 @@ export const AzureCredentialsForm = (props: Props) => { } }; - const prometheusConfigOverhaulAuth = config.featureToggles.prometheusConfigOverhaulAuth; - return (
{authTypeOptions.length > 1 && ( @@ -156,7 +153,7 @@ export const AzureCredentialsForm = (props: Props) => { Directory (tenant) ID
{ Application (client) ID
{ Client Secret - +
{!disabled && (
-
+
@@ -212,7 +200,7 @@ export const AzureCredentialsForm = (props: Props) => { Client Secret