IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Playlists: Merge the frontend vs backend k8s feature flags (#77875)

Browse Source
This commit is contained in:
Ryan McKinley 2023-11-08 11:14:05 -08:00 committed by GitHub
parent 6ab79a9f2f
commit 4b5310dae7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
View File

@ -145,8 +145,7 @@ Experimental features might be changed or removed without prior notice.
| `enableNativeHTTPHistogram` | Enables native HTTP Histograms | | `enableNativeHTTPHistogram` | Enables native HTTP Histograms |
| `formatString` | Enable format string transformer | | `formatString` | Enable format string transformer |
| `transformationsVariableSupport` | Allows using variables in transformations | | `transformationsVariableSupport` | Allows using variables in transformations |
| `kubernetesPlaylists` | Use the kubernetes API in the frontend for playlists | | `kubernetesPlaylists` | Use the kubernetes API in the frontend for playlists, and route /api/playlist requests to k8s |
| `kubernetesPlaylistsAPI` | Route /api/playlist API to k8s handlers |
| `navAdminSubsections` | Splits the administration section of the nav tree into subsections | | `navAdminSubsections` | Splits the administration section of the nav tree into subsections |
| `recoveryThreshold` | Enables feature recovery threshold (aka hysteresis) for threshold server-side expression | | `recoveryThreshold` | Enables feature recovery threshold (aka hysteresis) for threshold server-side expression |
| `teamHttpHeaders` | Enables datasources to apply team headers to the client requests | | `teamHttpHeaders` | Enables datasources to apply team headers to the client requests |

1
packages/grafana-data/src/types/featureToggles.gen.ts
View File

@ -138,7 +138,6 @@ export interface FeatureToggles {
formatString?: boolean; formatString?: boolean;
transformationsVariableSupport?: boolean; transformationsVariableSupport?: boolean;
kubernetesPlaylists?: boolean; kubernetesPlaylists?: boolean;
kubernetesPlaylistsAPI?: boolean;
cloudWatchBatchQueries?: boolean; cloudWatchBatchQueries?: boolean;
navAdminSubsections?: boolean; navAdminSubsections?: boolean;
recoveryThreshold?: boolean; recoveryThreshold?: boolean;

2
pkg/api/playlist.go
View File

@ -26,7 +26,7 @@ import (
func (hs *HTTPServer) registerPlaylistAPI(apiRoute routing.RouteRegister) { func (hs *HTTPServer) registerPlaylistAPI(apiRoute routing.RouteRegister) {
// Register the actual handlers // Register the actual handlers
apiRoute.Group("/playlists", func(playlistRoute routing.RouteRegister) { 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 // Use k8s client to implement legacy API
handler := newPlaylistK8sHandler(hs) handler := newPlaylistK8sHandler(hs)
playlistRoute.Get("/", handler.searchPlaylists) playlistRoute.Get("/", handler.searchPlaylists)

11
pkg/services/featuremgmt/registry.go
View File

@ -873,15 +873,8 @@ var (
Owner: grafanaBiSquad, Owner: grafanaBiSquad,
}, },
{ {
Name: "kubernetesPlaylists", Name: "kubernetesPlaylists",
Description: "Use the kubernetes API in the frontend for playlists", Description: "Use the kubernetes API in the frontend for playlists, and route /api/playlist requests to k8s",
FrontendOnly: true,
Stage: FeatureStageExperimental,
Owner: grafanaAppPlatformSquad,
},
{
Name: "kubernetesPlaylistsAPI",
Description: "Route /api/playlist API to k8s handlers",
Stage: FeatureStageExperimental, Stage: FeatureStageExperimental,
Owner: grafanaAppPlatformSquad, Owner: grafanaAppPlatformSquad,
RequiresRestart: true, // changes the API routing RequiresRestart: true, // changes the API routing

3
pkg/services/featuremgmt/toggles_gen.csv
View File

@ -118,8 +118,7 @@ panelMonitoring,experimental,@grafana/dataviz-squad,false,false,false,true
enableNativeHTTPHistogram,experimental,@grafana/hosted-grafana-team,false,false,false,false enableNativeHTTPHistogram,experimental,@grafana/hosted-grafana-team,false,false,false,false
formatString,experimental,@grafana/grafana-bi-squad,false,false,false,true formatString,experimental,@grafana/grafana-bi-squad,false,false,false,true
transformationsVariableSupport,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 kubernetesPlaylists,experimental,@grafana/grafana-app-platform-squad,false,false,true,false
kubernetesPlaylistsAPI,experimental,@grafana/grafana-app-platform-squad,false,false,true,false
cloudWatchBatchQueries,preview,@grafana/aws-datasources,false,false,false,false cloudWatchBatchQueries,preview,@grafana/aws-datasources,false,false,false,false
navAdminSubsections,experimental,@grafana/grafana-frontend-platform,false,false,false,false navAdminSubsections,experimental,@grafana/grafana-frontend-platform,false,false,false,false
recoveryThreshold,experimental,@grafana/alerting-squad,false,false,true,false recoveryThreshold,experimental,@grafana/alerting-squad,false,false,true,false

1 Name Stage Owner requiresDevMode RequiresLicense RequiresRestart FrontendOnly
118 enableNativeHTTPHistogram experimental @grafana/hosted-grafana-team false false false false
119 formatString experimental @grafana/grafana-bi-squad false false false true
120 transformationsVariableSupport experimental @grafana/grafana-bi-squad false false false true
121 kubernetesPlaylists experimental @grafana/grafana-app-platform-squad false false false true true false
kubernetesPlaylistsAPI experimental @grafana/grafana-app-platform-squad false false true false
122 cloudWatchBatchQueries preview @grafana/aws-datasources false false false false
123 navAdminSubsections experimental @grafana/grafana-frontend-platform false false false false
124 recoveryThreshold experimental @grafana/alerting-squad false false true false

6
pkg/services/featuremgmt/toggles_gen.go
View File

@ -484,13 +484,9 @@ const (
FlagTransformationsVariableSupport = "transformationsVariableSupport" FlagTransformationsVariableSupport = "transformationsVariableSupport"
// FlagKubernetesPlaylists // 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" FlagKubernetesPlaylists = "kubernetesPlaylists"
// FlagKubernetesPlaylistsAPI
// Route /api/playlist API to k8s handlers
FlagKubernetesPlaylistsAPI = "kubernetesPlaylistsAPI"
// FlagCloudWatchBatchQueries // FlagCloudWatchBatchQueries
// Runs CloudWatch metrics queries as separate batches // Runs CloudWatch metrics queries as separate batches
FlagCloudWatchBatchQueries = "cloudWatchBatchQueries" FlagCloudWatchBatchQueries = "cloudWatchBatchQueries"

2
pkg/tests/apis/playlist/playlist_test.go
View File

@ -41,7 +41,7 @@ func TestPlaylist(t *testing.T) {
DisableAnonymous: true, DisableAnonymous: true,
EnableFeatureToggles: []string{ EnableFeatureToggles: []string{
featuremgmt.FlagGrafanaAPIServer, featuremgmt.FlagGrafanaAPIServer,
featuremgmt.FlagKubernetesPlaylistsAPI, // <<< The change we are testing! featuremgmt.FlagKubernetesPlaylists, // <<< The change we are testing!
}, },
})) }))
}) })