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 b4b5cb665cb..d5b5fb996ee 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -99,16 +99,17 @@ Alpha features might be changed or removed without prior notice. The following toggles require explicitly setting Grafana's [app mode]({{< relref "../_index.md/#app_mode" >}}) to 'development' before you can enable this feature toggle. These features tend to be experimental. -| Feature toggle name | Description | -| -------------------------------------- | --------------------------------------------------------- | -| `dashboardPreviewsAdmin` | Manage the dashboard previews crawler process from the UI | -| `showFeatureFlagsInUI` | Show feature flags in the settings UI | -| `k8s` | Explore native k8s integrations | -| `dashboardsFromStorage` | Load dashboards from the generic storage interface | -| `export` | Export grafana instance (to git, etc) | -| `azureMonitorResourcePickerForMetrics` | New UI for Azure Monitor Metrics Query | -| `grpcServer` | Run GRPC server | -| `entityStore` | SQL-based entity store (requires storage flag also) | -| `queryLibrary` | Reusable query library | -| `accessControlOnCall` | Access control primitives for OnCall | -| `nestedFolders` | Enable folder nesting | +| Feature toggle name | Description | +| -------------------------------------- | ----------------------------------------------------------------------- | +| `dashboardPreviewsAdmin` | Manage the dashboard previews crawler process from the UI | +| `showFeatureFlagsInUI` | Show feature flags in the settings UI | +| `publicDashboardsEmailSharing` | Allows public dashboard sharing to be restricted to only allowed emails | +| `k8s` | Explore native k8s integrations | +| `dashboardsFromStorage` | Load dashboards from the generic storage interface | +| `export` | Export grafana instance (to git, etc) | +| `azureMonitorResourcePickerForMetrics` | New UI for Azure Monitor Metrics Query | +| `grpcServer` | Run GRPC server | +| `entityStore` | SQL-based entity store (requires storage flag also) | +| `queryLibrary` | Reusable query library | +| `accessControlOnCall` | Access control primitives for OnCall | +| `nestedFolders` | Enable folder nesting | diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index 50b7f2118b2..2e91c7d3fa4 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -33,6 +33,7 @@ export interface FeatureToggles { influxdbBackendMigration?: boolean; showFeatureFlagsInUI?: boolean; publicDashboards?: boolean; + publicDashboardsEmailSharing?: boolean; lokiLive?: boolean; lokiDataframeApi?: boolean; lokiMonacoEditor?: boolean; diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 57d14b58c14..73019442f5d 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -100,6 +100,13 @@ var ( Description: "Enables public access to dashboards", State: FeatureStateAlpha, }, + { + Name: "publicDashboardsEmailSharing", + Description: "Allows public dashboard sharing to be restricted to only allowed emails", + State: FeatureStateAlpha, + RequiresLicense: true, + RequiresDevMode: true, + }, { Name: "lokiLive", Description: "Support WebSocket streaming for loki (early prototype)", diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 4c10b89383b..8ab5ddce906 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -75,6 +75,10 @@ const ( // Enables public access to dashboards FlagPublicDashboards = "publicDashboards" + // FlagPublicDashboardsEmailSharing + // Allows public dashboard sharing to be restricted to only allowed emails + FlagPublicDashboardsEmailSharing = "publicDashboardsEmailSharing" + // FlagLokiLive // Support WebSocket streaming for loki (early prototype) FlagLokiLive = "lokiLive"