From 6c8c4c32b5544b3ca899c9538339be57cdb582e0 Mon Sep 17 00:00:00 2001 From: Ashley Harrison Date: Thu, 13 Nov 2025 03:31:18 +0000 Subject: [PATCH] Chore: Cleanup FEP feature toggles (#113772) * reassign some feature toggles * remove templateVariablesUsesCombobox toggle as it's unused --- .../src/types/featureToggles.gen.ts | 4 -- pkg/services/featuremgmt/registry.go | 19 ++----- pkg/services/featuremgmt/toggles_gen.csv | 13 ++--- pkg/services/featuremgmt/toggles_gen.go | 4 -- pkg/services/featuremgmt/toggles_gen.json | 57 ++++++++++++------- 5 files changed, 50 insertions(+), 47 deletions(-) diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index f75588d2f77..9b85c451ecf 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -839,10 +839,6 @@ export interface FeatureToggles { */ teamHttpHeadersTempo?: boolean; /** - * Use new **Combobox** component for template variables - */ - templateVariablesUsesCombobox?: boolean; - /** * Enables Advisor app */ grafanaAdvisor?: boolean; diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index a1c30560996..0921c25d5ce 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -169,7 +169,7 @@ var ( Description: "populate star status from apiserver", Stage: FeatureStageExperimental, FrontendOnly: true, - Owner: grafanaFrontendPlatformSquad, + Owner: grafanaFrontendSearchNavOrganise, AllowSelfServe: false, HideFromDocs: true, }, @@ -1001,7 +1001,7 @@ var ( Name: "pinNavItems", Description: "Enables pinning of nav items", Stage: FeatureStageGeneralAvailability, - Owner: grafanaFrontendPlatformSquad, + Owner: grafanaFrontendSearchNavOrganise, Expression: "true", // enabled by default }, { @@ -1394,7 +1394,7 @@ var ( Name: "unifiedHistory", Description: "Displays the navigation history so the user can navigate back to previous pages", Stage: FeatureStageExperimental, - Owner: grafanaFrontendPlatformSquad, + Owner: grafanaFrontendSearchNavOrganise, FrontendOnly: true, }, { @@ -1442,13 +1442,6 @@ var ( FrontendOnly: false, Owner: identityAccessTeam, }, - { - Name: "templateVariablesUsesCombobox", - Description: "Use new **Combobox** component for template variables", - Stage: FeatureStageExperimental, - Owner: grafanaFrontendPlatformSquad, - FrontendOnly: true, - }, { Name: "grafanaAdvisor", Description: "Enables Advisor app", @@ -1517,7 +1510,7 @@ var ( Name: "useScopesNavigationEndpoint", Description: "Use the scopes navigation endpoint instead of the dashboardbindings endpoint", Stage: FeatureStageExperimental, - Owner: grafanaFrontendPlatformSquad, + Owner: grafanaOperatorExperienceSquad, FrontendOnly: true, HideFromDocs: true, HideFromAdminPage: true, @@ -1526,7 +1519,7 @@ var ( Name: "scopeSearchAllLevels", Description: "Enable scope search to include all levels of the scope node tree", Stage: FeatureStageExperimental, - Owner: grafanaFrontendPlatformSquad, + Owner: grafanaOperatorExperienceSquad, HideFromDocs: true, HideFromAdminPage: true, }, @@ -1779,7 +1772,7 @@ var ( Name: "restoreDashboards", Description: "Enables restore deleted dashboards feature", Stage: FeatureStageExperimental, - Owner: grafanaFrontendPlatformSquad, + Owner: grafanaFrontendSearchNavOrganise, HideFromAdminPage: true, Expression: "false", }, diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 7f4c7408a27..26f593dfcd3 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -19,7 +19,7 @@ lokiShardSplitting,experimental,@grafana/observability-logs,false,false,true lokiQuerySplitting,GA,@grafana/observability-logs,false,false,true individualCookiePreferences,experimental,@grafana/grafana-backend-group,false,false,false influxdbBackendMigration,GA,@grafana/partner-datasources,false,false,true -starsFromAPIServer,experimental,@grafana/grafana-frontend-platform,false,false,true +starsFromAPIServer,experimental,@grafana/grafana-search-navigate-organise,false,false,true kubernetesStars,experimental,@grafana/grafana-app-platform-squad,false,true,false influxqlStreamingParser,experimental,@grafana/partner-datasources,false,false,false influxdbRunQueriesInParallel,privatePreview,@grafana/partner-datasources,false,false,false @@ -130,7 +130,7 @@ preserveDashboardStateWhenNavigating,experimental,@grafana/dashboards-squad,fals alertingCentralAlertHistory,experimental,@grafana/alerting-squad,false,false,true pluginProxyPreserveTrailingSlash,GA,@grafana/plugins-platform-backend,false,false,false azureMonitorPrometheusExemplars,GA,@grafana/partner-datasources,false,false,false -pinNavItems,GA,@grafana/grafana-frontend-platform,false,false,false +pinNavItems,GA,@grafana/grafana-search-navigate-organise,false,false,false authZGRPCServer,experimental,@grafana/identity-access-team,false,false,false ssoSettingsLDAP,GA,@grafana/identity-access-team,false,true,false zanzana,experimental,@grafana/identity-access-team,false,false,false @@ -181,14 +181,13 @@ alertingNotificationsStepMode,GA,@grafana/alerting-squad,false,false,true feedbackButton,experimental,@grafana/grafana-operator-experience-squad,false,false,false unifiedStorageSearchUI,experimental,@grafana/search-and-storage,false,false,false elasticsearchCrossClusterSearch,GA,@grafana/partner-datasources,false,false,false -unifiedHistory,experimental,@grafana/grafana-frontend-platform,false,false,true +unifiedHistory,experimental,@grafana/grafana-search-navigate-organise,false,false,true lokiLabelNamesQueryApi,GA,@grafana/observability-logs,false,false,false investigationsBackend,experimental,@grafana/grafana-app-platform-squad,false,false,false k8SFolderCounts,experimental,@grafana/search-and-storage,false,false,false k8SFolderMove,experimental,@grafana/search-and-storage,false,false,false improvedExternalSessionHandlingSAML,GA,@grafana/identity-access-team,false,false,false teamHttpHeadersTempo,experimental,@grafana/identity-access-team,false,false,false -templateVariablesUsesCombobox,experimental,@grafana/grafana-frontend-platform,false,false,true grafanaAdvisor,privatePreview,@grafana/plugins-platform-backend,false,false,false elasticsearchImprovedParsing,experimental,@grafana/aws-datasources,false,false,false datasourceConnectionsTab,privatePreview,@grafana/plugins-platform-backend,false,false,true @@ -197,8 +196,8 @@ newLogsPanel,GA,@grafana/observability-logs,false,false,true grafanaconThemes,GA,@grafana/grafana-frontend-platform,false,true,false alertingJiraIntegration,experimental,@grafana/alerting-squad,false,false,true alertingUseNewSimplifiedRoutingHashAlgorithm,preview,@grafana/alerting-squad,false,true,false -useScopesNavigationEndpoint,experimental,@grafana/grafana-frontend-platform,false,false,true -scopeSearchAllLevels,experimental,@grafana/grafana-frontend-platform,false,false,false +useScopesNavigationEndpoint,experimental,@grafana/grafana-operator-experience-squad,false,false,true +scopeSearchAllLevels,experimental,@grafana/grafana-operator-experience-squad,false,false,false alertingRuleVersionHistoryRestore,GA,@grafana/alerting-squad,false,false,true newShareReportDrawer,preview,@grafana/grafana-operator-experience-squad,false,false,false rendererDisableAppPluginsPreload,experimental,@grafana/grafana-operator-experience-squad,false,false,true @@ -230,7 +229,7 @@ kubernetesAuthZHandlerRedirect,experimental,@grafana/identity-access-team,false, kubernetesAuthzResourcePermissionApis,experimental,@grafana/identity-access-team,false,false,false kubernetesAuthzZanzanaSync,experimental,@grafana/identity-access-team,false,false,false kubernetesAuthnMutation,experimental,@grafana/identity-access-team,false,false,false -restoreDashboards,experimental,@grafana/grafana-frontend-platform,false,false,false +restoreDashboards,experimental,@grafana/grafana-search-navigate-organise,false,false,false alertEnrichment,experimental,@grafana/alerting-squad,false,false,false alertEnrichmentMultiStep,experimental,@grafana/alerting-squad,false,false,false alertEnrichmentConditional,experimental,@grafana/alerting-squad,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 64faddf160c..1decb0d9f6e 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -763,10 +763,6 @@ const ( // Enables LBAC for datasources for Tempo to apply LBAC filtering of traces to the client requests for users in teams FlagTeamHttpHeadersTempo = "teamHttpHeadersTempo" - // FlagTemplateVariablesUsesCombobox - // Use new **Combobox** component for template variables - FlagTemplateVariablesUsesCombobox = "templateVariablesUsesCombobox" - // FlagGrafanaAdvisor // Enables Advisor app FlagGrafanaAdvisor = "grafanaAdvisor" diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index f09d9464884..48ca4bb3f18 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -3077,13 +3077,16 @@ { "metadata": { "name": "pinNavItems", - "resourceVersion": "1753448760331", - "creationTimestamp": "2024-06-10T11:40:03Z" + "resourceVersion": "1762958248290", + "creationTimestamp": "2024-06-10T11:40:03Z", + "annotations": { + "grafana.app/updatedTimestamp": "2025-11-12 14:37:28.29086 +0000 UTC" + } }, "spec": { "description": "Enables pinning of nav items", "stage": "GA", - "codeowner": "@grafana/grafana-frontend-platform", + "codeowner": "@grafana/grafana-search-navigate-organise", "expression": "true" } }, @@ -3603,13 +3606,16 @@ { "metadata": { "name": "restoreDashboards", - "resourceVersion": "1753448760331", - "creationTimestamp": "2025-05-23T14:35:54Z" + "resourceVersion": "1762958248290", + "creationTimestamp": "2025-05-23T14:35:54Z", + "annotations": { + "grafana.app/updatedTimestamp": "2025-11-12 14:37:28.29086 +0000 UTC" + } }, "spec": { "description": "Enables restore deleted dashboards feature", "stage": "experimental", - "codeowner": "@grafana/grafana-frontend-platform", + "codeowner": "@grafana/grafana-search-navigate-organise", "hideFromAdminPage": true, "expression": "false" } @@ -3704,13 +3710,16 @@ { "metadata": { "name": "scopeSearchAllLevels", - "resourceVersion": "1753448760331", - "creationTimestamp": "2025-04-14T07:42:16Z" + "resourceVersion": "1762958248290", + "creationTimestamp": "2025-04-14T07:42:16Z", + "annotations": { + "grafana.app/updatedTimestamp": "2025-11-12 14:37:28.29086 +0000 UTC" + } }, "spec": { "description": "Enable scope search to include all levels of the scope node tree", "stage": "experimental", - "codeowner": "@grafana/grafana-frontend-platform", + "codeowner": "@grafana/grafana-operator-experience-squad", "hideFromAdminPage": true, "hideFromDocs": true } @@ -3860,13 +3869,16 @@ { "metadata": { "name": "starsFromAPIServer", - "resourceVersion": "1758276055065", - "creationTimestamp": "2025-09-19T10:00:55Z" + "resourceVersion": "1762958248290", + "creationTimestamp": "2025-09-19T10:00:55Z", + "annotations": { + "grafana.app/updatedTimestamp": "2025-11-12 14:37:28.29086 +0000 UTC" + } }, "spec": { "description": "populate star status from apiserver", "stage": "experimental", - "codeowner": "@grafana/grafana-frontend-platform", + "codeowner": "@grafana/grafana-search-navigate-organise", "frontend": true, "hideFromDocs": true } @@ -3993,7 +4005,8 @@ "metadata": { "name": "templateVariablesUsesCombobox", "resourceVersion": "1753448760331", - "creationTimestamp": "2025-01-31T09:53:13Z" + "creationTimestamp": "2025-01-31T09:53:13Z", + "deletionTimestamp": "2025-11-12T14:40:39Z" }, "spec": { "description": "Use new **Combobox** component for template variables", @@ -4105,13 +4118,16 @@ { "metadata": { "name": "unifiedHistory", - "resourceVersion": "1753448760331", - "creationTimestamp": "2024-12-13T10:41:18Z" + "resourceVersion": "1762958248290", + "creationTimestamp": "2024-12-13T10:41:18Z", + "annotations": { + "grafana.app/updatedTimestamp": "2025-11-12 14:37:28.29086 +0000 UTC" + } }, "spec": { "description": "Displays the navigation history so the user can navigate back to previous pages", "stage": "experimental", - "codeowner": "@grafana/grafana-frontend-platform", + "codeowner": "@grafana/grafana-search-navigate-organise", "frontend": true } }, @@ -4339,13 +4355,16 @@ { "metadata": { "name": "useScopesNavigationEndpoint", - "resourceVersion": "1753448760331", - "creationTimestamp": "2025-03-31T15:20:00Z" + "resourceVersion": "1762958248290", + "creationTimestamp": "2025-03-31T15:20:00Z", + "annotations": { + "grafana.app/updatedTimestamp": "2025-11-12 14:37:28.29086 +0000 UTC" + } }, "spec": { "description": "Use the scopes navigation endpoint instead of the dashboardbindings endpoint", "stage": "experimental", - "codeowner": "@grafana/grafana-frontend-platform", + "codeowner": "@grafana/grafana-operator-experience-squad", "frontend": true, "hideFromAdminPage": true, "hideFromDocs": true