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 01c8c2beb2a..52b10040c0e 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 stable features are enabled by default. You can disable a stable feature by | `panelTitleSearch` | Search for dashboards using panel title | | `prometheusAzureOverrideAudience` | Experimental. Allow override default AAD audience for Azure Prometheus endpoint | | `publicDashboards` | Enables public access to dashboards | -| `publicDashboardsEmailSharing` | Enables public dashboard sharing to be restricted to only allowed emails | | `migrationLocking` | Lock database during migrations | | `correlations` | Correlations page | | `newDBLibrary` | Use jmoiron/sqlx rather than xorm for a few backend services | diff --git a/pkg/services/featuremgmt/features.go b/pkg/services/featuremgmt/features.go index c74eaacfa32..b3a1d9b4dc4 100644 --- a/pkg/services/featuremgmt/features.go +++ b/pkg/services/featuremgmt/features.go @@ -96,4 +96,5 @@ type FeatureFlag struct { RequiresRestart bool `json:"requiresRestart,omitempty"` // The server must be initialized with the value RequiresLicense bool `json:"requiresLicense,omitempty"` // Must be enabled in the license FrontendOnly bool `json:"frontend,omitempty"` // change is only seen in the frontend + HideFromDocs bool `json:"hideFromDocs,omitempty"` // don't add the values to docs } diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 554494ada1c..a0d9172e344 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -59,6 +59,7 @@ var ( State: FeatureStateBeta, RequiresLicense: true, Owner: grafanaDashboardsSquad, + HideFromDocs: true, }, { Name: "lokiLive", diff --git a/pkg/services/featuremgmt/toggles_gen_test.go b/pkg/services/featuremgmt/toggles_gen_test.go index ea8620501dc..1ccfa2cd89b 100644 --- a/pkg/services/featuremgmt/toggles_gen_test.go +++ b/pkg/services/featuremgmt/toggles_gen_test.go @@ -309,7 +309,7 @@ func writeToggleDocsTable(include func(FeatureFlag) bool, showEnableByDefault bo data := [][]string{} for _, flag := range standardFeatureFlags { - if include(flag) { + if include(flag) && !flag.HideFromDocs { row := []string{"`" + flag.Name + "`", flag.Description} if showEnableByDefault { on := ""