From 783d6679685480f6c03fc7810357c67d59d5dc84 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Thu, 11 May 2023 21:29:49 +0100 Subject: [PATCH] [v10.0.x] PublicDashboards: change wording and FF to public preview state (#68328) PublicDashboards: change wording and FF to public preview state (#68262) (cherry picked from commit 11c388a10f871c7d661d162cdfcf88cf01563f3d) Co-authored-by: Ezequiel Victorero --- .../setup-grafana/configure-grafana/feature-toggles/index.md | 4 ++-- pkg/services/featuremgmt/registry.go | 4 ++-- pkg/services/featuremgmt/toggles_gen.csv | 4 ++-- .../CreatePublicDashboard/CreatePublicDashboard.tsx | 2 +- .../SharePublicDashboard/SharePublicDashboard.test.tsx | 2 +- 5 files changed, 8 insertions(+), 8 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 bf553aa61a2..684d65cd00a 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -46,6 +46,8 @@ Some stable features are enabled by default. You can disable a stable feature by | `trimDefaults` | Use cue schema to remove values that will be applied automatically | | `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 | | `exploreMixedDatasource` | Enable mixed datasource in Explore | | `correlations` | Correlations page | @@ -70,8 +72,6 @@ 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) | | `storage` | Configurable storage for dashboards, datasources, and resources | | `newTraceViewHeader` | Shows the new trace view header | diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 6ad62a643ed..17b61ca5c0d 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -50,13 +50,13 @@ var ( { Name: "publicDashboards", Description: "Enables public access to dashboards", - State: FeatureStateAlpha, + State: FeatureStateBeta, Owner: grafanaDashboardsSquad, }, { Name: "publicDashboardsEmailSharing", Description: "Enables public dashboard sharing to be restricted to only allowed emails", - State: FeatureStateAlpha, + State: FeatureStateBeta, RequiresLicense: true, Owner: grafanaDashboardsSquad, }, diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index e3d7ba39bbd..93a86b00648 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -5,8 +5,8 @@ live-service-web-worker,alpha,@grafana/grafana-app-platform-squad,false,false,fa queryOverLive,alpha,@grafana/grafana-app-platform-squad,false,false,false,true panelTitleSearch,beta,@grafana/grafana-app-platform-squad,false,false,false,false prometheusAzureOverrideAudience,beta,@grafana/observability-metrics,false,false,false,false -publicDashboards,alpha,@grafana/dashboards-squad,false,false,false,false -publicDashboardsEmailSharing,alpha,@grafana/dashboards-squad,false,true,false,false +publicDashboards,beta,@grafana/dashboards-squad,false,false,false,false +publicDashboardsEmailSharing,beta,@grafana/dashboards-squad,false,true,false,false lokiLive,alpha,@grafana/observability-logs,false,false,false,false featureHighlights,stable,@grafana/grafana-as-code,false,false,false,false migrationLocking,beta,@grafana/backend-platform,false,false,false,false diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/CreatePublicDashboard/CreatePublicDashboard.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/CreatePublicDashboard/CreatePublicDashboard.tsx index 4814e40622c..f80103031e4 100644 --- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/CreatePublicDashboard/CreatePublicDashboard.tsx +++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/CreatePublicDashboard/CreatePublicDashboard.tsx @@ -45,7 +45,7 @@ const CreatePublicDashboard = ({ isError }: { isError: boolean }) => { return (
-

Welcome to public dashboards alpha!

+

Welcome to public dashboards public preview!

{!hasWritePermissions && } {dashboardHasTemplateVariables(dashboard.getVariables()) && } diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx index 5ac752ff596..403a88d3a61 100644 --- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx +++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx @@ -175,7 +175,7 @@ describe('SharePublic - New config setup', () => { it('renders when public dashboards feature is enabled', async () => { await renderSharePublicDashboard(); - await screen.findByText('Welcome to public dashboards alpha!'); + await screen.findByText('Welcome to public dashboards public preview!'); expect(screen.getByText('Generate public URL')).toBeInTheDocument(); expect(screen.queryByTestId(selectors.WillBePublicCheckbox)).toBeInTheDocument();