From 93345820229624889f4bcbc7c4ed34a543dd05a5 Mon Sep 17 00:00:00 2001 From: Ieva Date: Wed, 4 Jan 2023 16:52:08 +0000 Subject: [PATCH] RBAC: move RBAC + OnCall feature toggle to beta state (#60991) * move RBAC + OnCall feature toggle to beta state * move accessControlOnCall to the correct section in the docs --- .../configure-grafana/feature-toggles/index.md | 2 +- pkg/services/featuremgmt/registry.go | 7 +++---- 2 files changed, 4 insertions(+), 5 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 d5b5fb996ee..cbb3ed87204 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -44,6 +44,7 @@ Some stable features are enabled by default. You can disable a stable feature by | `validateDashboardsOnSave` | Validate dashboard JSON POSTed to api/dashboards/db | | `autoMigrateGraphPanels` | Replace the angular graph panel with timeseries | | `datasourceLogger` | Logs all datasource requests | +| `accessControlOnCall` | Access control primitives for OnCall | ## Alpha feature toggles @@ -111,5 +112,4 @@ The following toggles require explicitly setting Grafana's [app mode]({{< relref | `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/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 73019442f5d..8214e24ad9f 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -353,10 +353,9 @@ var ( State: FeatureStateBeta, }, { - Name: "accessControlOnCall", - Description: "Access control primitives for OnCall", - State: FeatureStateAlpha, - RequiresDevMode: true, + Name: "accessControlOnCall", + Description: "Access control primitives for OnCall", + State: FeatureStateBeta, }, { Name: "nestedFolders",