From 673aee30c2fac3d6eefdb4c8a3fa40865122564c Mon Sep 17 00:00:00 2001 From: gotjosh Date: Tue, 4 Apr 2023 08:42:07 +0100 Subject: [PATCH] Feature Flags: Remove dev-mode and alpha from grpc server feature flag (#65789) * Feature Flags: Remove dev-mode from grpc server feature flag --------- Co-authored-by: Todd Treece Co-authored-by: Ryan McKinley --- .../configure-grafana/feature-toggles/index.md | 2 +- pkg/services/featuremgmt/registry.go | 9 ++++----- pkg/services/featuremgmt/toggles_gen.csv | 2 +- pkg/services/featuremgmt/toggles_gen.go | 2 +- 4 files changed, 7 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 d6061a3ee0a..1da4beab3fd 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -47,6 +47,7 @@ Some stable features are enabled by default. You can disable a stable feature by | `validateDashboardsOnSave` | Validate dashboard JSON POSTed to api/dashboards/db | | `autoMigrateOldPanels` | Migrate old angular panels to supported versions (graph, table-old, worldmap, etc) | | `disableAngular` | Dynamic flag to disable angular at runtime. The preferred method is to set `angular_support_enabled` to `false` in the [security] settings, which allows you to change the state at runtime. | +| `grpcServer` | Run the GRPC server | | `accessControlOnCall` | Access control primitives for OnCall | | `alertingNoNormalState` | Stop maintaining state of alerts that are not firing | | `disableElasticsearchBackendExploreQuery` | Disable executing of Elasticsearch Explore queries trough backend | @@ -113,6 +114,5 @@ The following toggles require explicitly setting Grafana's [app mode]({{< relref | Feature toggle name | Description | | ------------------- | --------------------------------------------------- | | `k8s` | Explore native k8s integrations | -| `grpcServer` | Run GRPC server | | `entityStore` | SQL-based entity store (requires storage flag also) | | `nestedFolders` | Enable folder nesting | diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index b4b8e57d68d..c3f84f0dee1 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -237,11 +237,10 @@ var ( Owner: grafanaUserEssentialsSquad, }, { - Name: "grpcServer", - Description: "Run GRPC server", - State: FeatureStateAlpha, - RequiresDevMode: true, - Owner: grafanaAppPlatformSquad, + Name: "grpcServer", + Description: "Run the GRPC server", + State: FeatureStateBeta, + Owner: grafanaAppPlatformSquad, }, { Name: "entityStore", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 576b6897651..ee34a99f725 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -34,7 +34,7 @@ logRequestsInstrumentedAsUnknown,alpha,@grafana/hosted-grafana-team,false,false, dataConnectionsConsole,stable,@grafana/plugins-platform-backend,false,false,false,false internationalization,stable,@grafana/user-essentials,false,false,false,false topnav,stable,@grafana/user-essentials,false,false,false,false -grpcServer,alpha,@grafana/grafana-app-platform-squad,true,false,false,false +grpcServer,beta,@grafana/grafana-app-platform-squad,false,false,false,false entityStore,alpha,@grafana/grafana-app-platform-squad,true,false,false,false cloudWatchCrossAccountQuerying,stable,@grafana/aws-plugins,false,false,false,false redshiftAsyncQueryDataSupport,alpha,@grafana/aws-plugins,false,false,false,true diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index a18c1c22196..e7c96cbe473 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -148,7 +148,7 @@ const ( FlagTopnav = "topnav" // FlagGrpcServer - // Run GRPC server + // Run the GRPC server FlagGrpcServer = "grpcServer" // FlagEntityStore