From ed65c99e543ab1cecbc608fd29eeaf564dccca44 Mon Sep 17 00:00:00 2001 From: Carl Bergquist Date: Mon, 14 Apr 2025 09:42:16 +0200 Subject: [PATCH] Scopes: Adds feature toggle used by grafana-enterprise (#103870) Signed-off-by: bergquist --- .../src/types/featureToggles.gen.ts | 4 +++ pkg/services/featuremgmt/registry.go | 21 +++++++++++----- pkg/services/featuremgmt/toggles_gen.csv | 1 + pkg/services/featuremgmt/toggles_gen.go | 4 +++ pkg/services/featuremgmt/toggles_gen.json | 25 +++++++++++++++++-- 5 files changed, 47 insertions(+), 8 deletions(-) diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index 2ae9255e961..dfcc916893e 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -942,6 +942,10 @@ export interface FeatureToggles { */ useScopesNavigationEndpoint?: boolean; /** + * Enable scope search to include all levels of the scope node tree + */ + scopeSearchAllLevels?: boolean; + /** * Enables the alert rule version history restore feature * @default true */ diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 821263fdab0..15313d49837 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -1596,12 +1596,21 @@ var ( HideFromDocs: true, }, { - Name: "useScopesNavigationEndpoint", - Description: "Use the scopes navigation endpoint instead of the dashboardbindings endpoint", - Stage: FeatureStageExperimental, - Owner: grafanaFrontendPlatformSquad, - FrontendOnly: true, - HideFromDocs: true, + Name: "useScopesNavigationEndpoint", + Description: "Use the scopes navigation endpoint instead of the dashboardbindings endpoint", + Stage: FeatureStageExperimental, + Owner: grafanaFrontendPlatformSquad, + FrontendOnly: true, + HideFromDocs: true, + HideFromAdminPage: true, + }, + { + Name: "scopeSearchAllLevels", + Description: "Enable scope search to include all levels of the scope node tree", + Stage: FeatureStageExperimental, + Owner: grafanaFrontendPlatformSquad, + HideFromDocs: true, + HideFromAdminPage: true, }, { Name: "alertingRuleVersionHistoryRestore", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index d78da54546c..dc9ec21f9a1 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -211,6 +211,7 @@ grafanaconThemes,GA,@grafana/grafana-frontend-platform,false,true,false pluginsCDNSyncLoader,experimental,@grafana/plugins-platform-backend,false,false,false alertingJiraIntegration,experimental,@grafana/alerting-squad,false,false,true useScopesNavigationEndpoint,experimental,@grafana/grafana-frontend-platform,false,false,true +scopeSearchAllLevels,experimental,@grafana/grafana-frontend-platform,false,false,false alertingRuleVersionHistoryRestore,GA,@grafana/alerting-squad,false,false,true newShareReportDrawer,experimental,@grafana/sharing-squad,false,false,false rendererDisableAppPluginsPreload,experimental,@grafana/sharing-squad,false,false,true diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 43fba29d483..987c659c996 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -855,6 +855,10 @@ const ( // Use the scopes navigation endpoint instead of the dashboardbindings endpoint FlagUseScopesNavigationEndpoint = "useScopesNavigationEndpoint" + // FlagScopeSearchAllLevels + // Enable scope search to include all levels of the scope node tree + FlagScopeSearchAllLevels = "scopeSearchAllLevels" + // FlagAlertingRuleVersionHistoryRestore // Enables the alert rule version history restore feature FlagAlertingRuleVersionHistoryRestore = "alertingRuleVersionHistoryRestore" diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 554e5686297..95fcb09e592 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -2900,6 +2900,23 @@ "hideFromDocs": true } }, + { + "metadata": { + "name": "scopeSearchAllLevels", + "resourceVersion": "1744370973814", + "creationTimestamp": "2025-04-10T12:49:09Z", + "annotations": { + "grafana.app/updatedTimestamp": "2025-04-11 11:29:33.814419 +0000 UTC" + } + }, + "spec": { + "description": "Enable scope search to include all levels of the scope node tree", + "stage": "experimental", + "codeowner": "@grafana/grafana-frontend-platform", + "hideFromAdminPage": true, + "hideFromDocs": true + } + }, { "metadata": { "name": "secretsManagementAppPlatform", @@ -3272,14 +3289,18 @@ { "metadata": { "name": "useScopesNavigationEndpoint", - "resourceVersion": "1743693517832", - "creationTimestamp": "2025-04-03T15:18:37Z" + "resourceVersion": "1744289349951", + "creationTimestamp": "2025-04-03T15:18:37Z", + "annotations": { + "grafana.app/updatedTimestamp": "2025-04-10 12:49:09.951013 +0000 UTC" + } }, "spec": { "description": "Use the scopes navigation endpoint instead of the dashboardbindings endpoint", "stage": "experimental", "codeowner": "@grafana/grafana-frontend-platform", "frontend": true, + "hideFromAdminPage": true, "hideFromDocs": true } },