From c59830652377986230523b778dc91045d1dd47ab Mon Sep 17 00:00:00 2001 From: Ryan McKinley Date: Tue, 2 Jan 2024 09:54:57 -0800 Subject: [PATCH] K8s: Enable api-server by default (#79942) --- .../setup-grafana/configure-grafana/feature-toggles/index.md | 2 +- pkg/services/featuremgmt/registry.go | 3 ++- pkg/services/featuremgmt/toggles_gen.csv | 2 +- 3 files changed, 4 insertions(+), 3 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 31c31cfa8130..288acc1e8899 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -48,6 +48,7 @@ Some features are enabled by default. You can disable these feature by setting t | `cloudWatchLogsMonacoEditor` | Enables the Monaco editor for CloudWatch Logs queries | Yes | | `recordedQueriesMulti` | Enables writing multiple items from a single query within Recorded Queries | Yes | | `transformationsRedesign` | Enables the transformations redesign | Yes | +| `grafanaAPIServer` | Enable Kubernetes API Server for Grafana resources | Yes | | `splitScopes` | Support faster dashboard and folder search by splitting permission scopes into parts | Yes | | `prometheusConfigOverhaulAuth` | Update the Prometheus configuration page with the new auth component | Yes | | `influxdbSqlSupport` | Enable InfluxDB SQL query language support with new querying UI | Yes | @@ -126,7 +127,6 @@ Experimental features might be changed or removed without prior notice. | `mlExpressions` | Enable support for Machine Learning in server-side expressions | | `traceQLStreaming` | Enables response streaming of TraceQL queries of the Tempo data source | | `metricsSummary` | Enables metrics summary queries in the Tempo data source | -| `grafanaAPIServer` | Enable Kubernetes API Server for Grafana resources | | `featureToggleAdminPage` | Enable admin page for managing feature toggles from the Grafana front-end | | `traceToProfiles` | Enables linking between traces and profiles | | `tracesEmbeddedFlameGraph` | Enables embedding a flame graph in traces | diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 729389cc58ef..3bd54c9b6d39 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -718,7 +718,8 @@ var ( { Name: "grafanaAPIServer", Description: "Enable Kubernetes API Server for Grafana resources", - Stage: FeatureStageExperimental, + Stage: FeatureStageGeneralAvailability, + Expression: "true", // enabled by default RequiresRestart: true, Owner: grafanaAppPlatformSquad, Created: time.Date(2023, time.July, 14, 12, 0, 0, 0, time.UTC), diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 2fb27bf5de39..c4957dcaba47 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -83,7 +83,7 @@ transformationsRedesign,GA,@grafana/observability-metrics,2023-07-12,false,false mlExpressions,experimental,@grafana/alerting-squad,2023-07-13,false,false,false,false traceQLStreaming,experimental,@grafana/observability-traces-and-profiling,2023-07-26,false,false,false,true metricsSummary,experimental,@grafana/observability-traces-and-profiling,2023-08-28,false,false,false,true -grafanaAPIServer,experimental,@grafana/grafana-app-platform-squad,2023-07-14,false,false,true,false +grafanaAPIServer,GA,@grafana/grafana-app-platform-squad,2023-07-14,false,false,true,false grafanaAPIServerWithExperimentalAPIs,experimental,@grafana/grafana-app-platform-squad,2023-10-06,true,false,true,false grafanaAPIServerEnsureKubectlAccess,experimental,@grafana/grafana-app-platform-squad,2023-12-06,true,false,true,false featureToggleAdminPage,experimental,@grafana/grafana-operator-experience-squad,2023-07-18,false,false,true,false