From ef51a64b5753bdd9e3e35703ff9899512f81c698 Mon Sep 17 00:00:00 2001 From: Michael Mandrus <41969079+mmandrus@users.noreply.github.com> Date: Fri, 10 May 2024 14:34:53 -0400 Subject: [PATCH] Feature Toggles: Hide featureToggleAdminPage toggle from docs and note that it is cloud only. (#87660) update featureToggleAdminPage feature toggle to be hidden from docs and specify cloud only --- .../configure-grafana/feature-toggles/index.md | 1 - pkg/services/featuremgmt/registry.go | 3 ++- pkg/services/featuremgmt/toggles_gen.go | 2 +- pkg/services/featuremgmt/toggles_gen.json | 12 ++++++++---- 4 files changed, 11 insertions(+), 7 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 36958c862c9..95ff2873974 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -139,7 +139,6 @@ Experimental features might be changed or removed without prior notice. | `awsDatasourcesTempCredentials` | Support temporary security credentials in AWS plugins for Grafana Cloud customers | | `mlExpressions` | Enable support for Machine Learning in server-side expressions | | `metricsSummary` | Enables metrics summary queries in the Tempo data source | -| `featureToggleAdminPage` | Enable admin page for managing feature toggles from the Grafana front-end | | `permissionsFilterRemoveSubquery` | Alternative permission filter implementation that does not use subqueries for fetching the dashboard folder | | `aiGeneratedDashboardChanges` | Enable AI powered features for dashboards to auto-summary changes when saving | | `sseGroupByDatasource` | Send query to the same datasource in a single request when using server side expressions. The `cloudWatchBatchQueries` feature toggle should be enabled if this used with CloudWatch. | diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index ba9d668b09f..4cd5a1c531e 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -578,11 +578,12 @@ var ( }, { Name: "featureToggleAdminPage", - Description: "Enable admin page for managing feature toggles from the Grafana front-end", + Description: "Enable admin page for managing feature toggles from the Grafana front-end. Grafana Cloud only.", Stage: FeatureStageExperimental, FrontendOnly: false, Owner: grafanaOperatorExperienceSquad, RequiresRestart: true, + HideFromDocs: true, }, { Name: "awsAsyncQueryCaching", diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 47b41c68c7b..6a32db3ec32 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -316,7 +316,7 @@ const ( FlagGrafanaAPIServerEnsureKubectlAccess = "grafanaAPIServerEnsureKubectlAccess" // FlagFeatureToggleAdminPage - // Enable admin page for managing feature toggles from the Grafana front-end + // Enable admin page for managing feature toggles from the Grafana front-end. Grafana Cloud only. FlagFeatureToggleAdminPage = "featureToggleAdminPage" // FlagAwsAsyncQueryCaching diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 638d2f3ff1a..4c516b58498 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -784,14 +784,18 @@ { "metadata": { "name": "featureToggleAdminPage", - "resourceVersion": "1713545444177", - "creationTimestamp": "2024-04-19T16:50:44Z" + "resourceVersion": "1715364932183", + "creationTimestamp": "2024-04-19T16:50:44Z", + "annotations": { + "grafana.app/updatedTimestamp": "2024-05-10 18:15:32.183828 +0000 UTC" + } }, "spec": { - "description": "Enable admin page for managing feature toggles from the Grafana front-end", + "description": "Enable admin page for managing feature toggles from the Grafana front-end. Grafana Cloud only.", "stage": "experimental", "codeowner": "@grafana/grafana-operator-experience-squad", - "requiresRestart": true + "requiresRestart": true, + "hideFromDocs": true } }, {