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 2d532682028..3ad792e1f73 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -145,8 +145,7 @@ Experimental features might be changed or removed without prior notice. | `enableNativeHTTPHistogram` | Enables native HTTP Histograms | | `formatString` | Enable format string transformer | | `transformationsVariableSupport` | Allows using variables in transformations | -| `kubernetesPlaylists` | Use the kubernetes API in the frontend for playlists | -| `kubernetesPlaylistsAPI` | Route /api/playlist API to k8s handlers | +| `kubernetesPlaylists` | Use the kubernetes API in the frontend for playlists, and route /api/playlist requests to k8s | | `navAdminSubsections` | Splits the administration section of the nav tree into subsections | | `recoveryThreshold` | Enables feature recovery threshold (aka hysteresis) for threshold server-side expression | | `teamHttpHeaders` | Enables datasources to apply team headers to the client requests | diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index d36bdf58eae..2c377fe3d16 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -138,7 +138,6 @@ export interface FeatureToggles { formatString?: boolean; transformationsVariableSupport?: boolean; kubernetesPlaylists?: boolean; - kubernetesPlaylistsAPI?: boolean; cloudWatchBatchQueries?: boolean; navAdminSubsections?: boolean; recoveryThreshold?: boolean; diff --git a/pkg/api/playlist.go b/pkg/api/playlist.go index 8ec920ad175..011751188da 100644 --- a/pkg/api/playlist.go +++ b/pkg/api/playlist.go @@ -26,7 +26,7 @@ import ( func (hs *HTTPServer) registerPlaylistAPI(apiRoute routing.RouteRegister) { // Register the actual handlers apiRoute.Group("/playlists", func(playlistRoute routing.RouteRegister) { - if hs.Features.IsEnabled(featuremgmt.FlagKubernetesPlaylistsAPI) { + if hs.Features.IsEnabled(featuremgmt.FlagKubernetesPlaylists) { // Use k8s client to implement legacy API handler := newPlaylistK8sHandler(hs) playlistRoute.Get("/", handler.searchPlaylists) diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 26bc1820b36..622c6d8d125 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -873,15 +873,8 @@ var ( Owner: grafanaBiSquad, }, { - Name: "kubernetesPlaylists", - Description: "Use the kubernetes API in the frontend for playlists", - FrontendOnly: true, - Stage: FeatureStageExperimental, - Owner: grafanaAppPlatformSquad, - }, - { - Name: "kubernetesPlaylistsAPI", - Description: "Route /api/playlist API to k8s handlers", + Name: "kubernetesPlaylists", + Description: "Use the kubernetes API in the frontend for playlists, and route /api/playlist requests to k8s", Stage: FeatureStageExperimental, Owner: grafanaAppPlatformSquad, RequiresRestart: true, // changes the API routing diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 035e80170e6..fda0776cfaa 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -118,8 +118,7 @@ panelMonitoring,experimental,@grafana/dataviz-squad,false,false,false,true enableNativeHTTPHistogram,experimental,@grafana/hosted-grafana-team,false,false,false,false formatString,experimental,@grafana/grafana-bi-squad,false,false,false,true transformationsVariableSupport,experimental,@grafana/grafana-bi-squad,false,false,false,true -kubernetesPlaylists,experimental,@grafana/grafana-app-platform-squad,false,false,false,true -kubernetesPlaylistsAPI,experimental,@grafana/grafana-app-platform-squad,false,false,true,false +kubernetesPlaylists,experimental,@grafana/grafana-app-platform-squad,false,false,true,false cloudWatchBatchQueries,preview,@grafana/aws-datasources,false,false,false,false navAdminSubsections,experimental,@grafana/grafana-frontend-platform,false,false,false,false recoveryThreshold,experimental,@grafana/alerting-squad,false,false,true,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index bc07d86027b..4a9b85e3f49 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -484,13 +484,9 @@ const ( FlagTransformationsVariableSupport = "transformationsVariableSupport" // FlagKubernetesPlaylists - // Use the kubernetes API in the frontend for playlists + // Use the kubernetes API in the frontend for playlists, and route /api/playlist requests to k8s FlagKubernetesPlaylists = "kubernetesPlaylists" - // FlagKubernetesPlaylistsAPI - // Route /api/playlist API to k8s handlers - FlagKubernetesPlaylistsAPI = "kubernetesPlaylistsAPI" - // FlagCloudWatchBatchQueries // Runs CloudWatch metrics queries as separate batches FlagCloudWatchBatchQueries = "cloudWatchBatchQueries" diff --git a/pkg/tests/apis/playlist/playlist_test.go b/pkg/tests/apis/playlist/playlist_test.go index fb6bdfce4a3..19d908eae65 100644 --- a/pkg/tests/apis/playlist/playlist_test.go +++ b/pkg/tests/apis/playlist/playlist_test.go @@ -41,7 +41,7 @@ func TestPlaylist(t *testing.T) { DisableAnonymous: true, EnableFeatureToggles: []string{ featuremgmt.FlagGrafanaAPIServer, - featuremgmt.FlagKubernetesPlaylistsAPI, // <<< The change we are testing! + featuremgmt.FlagKubernetesPlaylists, // <<< The change we are testing! }, })) })