From 1a5ab1b30820b6af26de421f1a8c78d842844f1d Mon Sep 17 00:00:00 2001 From: Ezequiel Victorero Date: Tue, 7 Mar 2023 16:42:24 -0300 Subject: [PATCH] PublicDashboards: Remove dev mode for share by email toggle (#64330) Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com> --- .../configure-grafana/feature-toggles/index.md | 18 +++++++++--------- pkg/services/featuremgmt/registry.go | 3 +-- pkg/services/featuremgmt/toggles_gen.go | 2 +- 3 files changed, 11 insertions(+), 12 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 ce40c22e0d8..75a0e5119f9 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -59,6 +59,7 @@ Alpha features might be changed or removed without prior notice. | `live-service-web-worker` | This will use a webworker thread to processes events rather than the main thread | | `queryOverLive` | Use Grafana Live WebSocket to execute backend queries | | `publicDashboards` | Enables public access to dashboards | +| `publicDashboardsEmailSharing` | Enables public dashboard sharing to be restricted to only allowed emails | | `lokiLive` | Support WebSocket streaming for loki (early prototype) | | `lokiDataframeApi` | Use experimental loki api for WebSocket streaming (early prototype) | | `dashboardComments` | Enable dashboard-wide comments | @@ -98,12 +99,11 @@ 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 | -| ------------------------------ | ----------------------------------------------------------------------- | -| `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 | -| `grpcServer` | Run GRPC server | -| `entityStore` | SQL-based entity store (requires storage flag also) | -| `queryLibrary` | Reusable query library | -| `nestedFolders` | Enable folder nesting | +| Feature toggle name | Description | +| ----------------------- | --------------------------------------------------- | +| `k8s` | Explore native k8s integrations | +| `dashboardsFromStorage` | Load dashboards from the generic storage interface | +| `grpcServer` | Run GRPC server | +| `entityStore` | SQL-based entity store (requires storage flag also) | +| `queryLibrary` | Reusable query library | +| `nestedFolders` | Enable folder nesting | diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 722d9218855..b8376bbd187 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -74,10 +74,9 @@ var ( }, { Name: "publicDashboardsEmailSharing", - Description: "Allows public dashboard sharing to be restricted to only allowed emails", + Description: "Enables public dashboard sharing to be restricted to only allowed emails", State: FeatureStateAlpha, RequiresLicense: true, - RequiresDevMode: true, Owner: grafanaDashboardsSquad, }, { diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 85f7c502304..b1541eb9369 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -52,7 +52,7 @@ const ( FlagPublicDashboards = "publicDashboards" // FlagPublicDashboardsEmailSharing - // Allows public dashboard sharing to be restricted to only allowed emails + // Enables public dashboard sharing to be restricted to only allowed emails FlagPublicDashboardsEmailSharing = "publicDashboardsEmailSharing" // FlagLokiLive