From 8b551b08f9034a6b75ece345237da1d3394d100d Mon Sep 17 00:00:00 2001 From: Eric Leijonmarck Date: Fri, 1 Mar 2024 17:05:59 +0000 Subject: [PATCH] TeamLBAC: Change to public preview (#83761) change to public preview --- .../configure-grafana/feature-toggles/index.md | 2 +- pkg/services/featuremgmt/registry.go | 4 ++-- pkg/services/featuremgmt/toggles_gen.csv | 2 +- pkg/services/featuremgmt/toggles_gen.go | 2 +- pkg/services/featuremgmt/toggles_gen.json | 11 +++++++---- 5 files changed, 12 insertions(+), 9 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 beffe96e6f3..7571afd19c2 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -88,6 +88,7 @@ Some features are enabled by default. You can disable these feature by setting t | `formatString` | Enable format string transformer | | `transformationsVariableSupport` | Allows using variables in transformations | | `cloudWatchBatchQueries` | Runs CloudWatch metrics queries as separate batches | +| `teamHttpHeaders` | Enables Team LBAC for datasources to apply team headers to the client requests | | `awsDatasourcesNewFormStyling` | Applies new form styling for configuration and query editors in AWS plugins | | `managedPluginsInstall` | Install managed plugins directly from plugins catalog | | `addFieldFromCalculationStatFunctions` | Add cumulative and window functions to the add field from calculation transformation | @@ -152,7 +153,6 @@ Experimental features might be changed or removed without prior notice. | `enableNativeHTTPHistogram` | Enables native HTTP Histograms | | `kubernetesPlaylists` | Use the kubernetes API in the frontend for playlists, and route /api/playlist requests to k8s | | `kubernetesSnapshots` | Routes snapshot requests from /api to the /apis endpoint | -| `teamHttpHeaders` | Enables datasources to apply team headers to the client requests | | `cachingOptimizeSerializationMemoryUsage` | If enabled, the caching backend gradually serializes query responses for the cache, comparing against the configured `[caching]max_value_mb` value as it goes. This can can help prevent Grafana from running out of memory while attempting to cache very large query responses. | | `prometheusPromQAIL` | Prometheus and AI/ML to assist users in creating a query | | `alertmanagerRemoteSecondary` | Enable Grafana to sync configuration and state with a remote Alertmanager. | diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 9a7a64a48f0..f204bcc5c62 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -847,8 +847,8 @@ var ( }, { Name: "teamHttpHeaders", - Description: "Enables datasources to apply team headers to the client requests", - Stage: FeatureStageExperimental, + Description: "Enables Team LBAC for datasources to apply team headers to the client requests", + Stage: FeatureStagePublicPreview, FrontendOnly: false, Owner: identityAccessTeam, }, diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index bbfff4aa5f7..b177d1d9f5d 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -112,7 +112,7 @@ kubernetesQueryServiceRewrite,experimental,@grafana/grafana-app-platform-squad,t cloudWatchBatchQueries,preview,@grafana/aws-datasources,false,false,false recoveryThreshold,GA,@grafana/alerting-squad,false,true,false lokiStructuredMetadata,GA,@grafana/observability-logs,false,false,false -teamHttpHeaders,experimental,@grafana/identity-access-team,false,false,false +teamHttpHeaders,preview,@grafana/identity-access-team,false,false,false awsDatasourcesNewFormStyling,preview,@grafana/aws-datasources,false,false,true cachingOptimizeSerializationMemoryUsage,experimental,@grafana/grafana-operator-experience-squad,false,false,false panelTitleSearchInV1,experimental,@grafana/backend-platform,true,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 6b6f2fd8d20..2a0003e4a98 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -460,7 +460,7 @@ const ( FlagLokiStructuredMetadata = "lokiStructuredMetadata" // FlagTeamHttpHeaders - // Enables datasources to apply team headers to the client requests + // Enables Team LBAC for datasources to apply team headers to the client requests FlagTeamHttpHeaders = "teamHttpHeaders" // FlagAwsDatasourcesNewFormStyling diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 08bea50b84b..eb00277196b 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -19,12 +19,15 @@ { "metadata": { "name": "teamHttpHeaders", - "resourceVersion": "1708108588074", - "creationTimestamp": "2024-02-16T18:36:28Z" + "resourceVersion": "1709290509653", + "creationTimestamp": "2024-02-16T18:36:28Z", + "annotations": { + "grafana.app/updatedTimestamp": "2024-03-01 10:55:09.653587 +0000 UTC" + } }, "spec": { - "description": "Enables datasources to apply team headers to the client requests", - "stage": "experimental", + "description": "Enables Team LBAC for datasources to apply team headers to the client requests", + "stage": "preview", "codeowner": "@grafana/identity-access-team" } },