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 f384f9509dc..9293168cd08 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -95,7 +95,7 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general- | `reportingRetries` | Enables rendering retries for the reporting feature | | `externalServiceAccounts` | Automatic service account and token setup for plugins | | `cloudWatchBatchQueries` | Runs CloudWatch metrics queries as separate batches | -| `teamHttpHeaders` | Enables Team LBAC for datasources to apply team headers to the client requests | +| `teamHttpHeaders` | Enables LBAC for datasources to apply LogQL filtering of logs to the client requests for users in teams | | `pdfTables` | Enables generating table data as PDF in reporting | | `canvasPanelPanZoom` | Allow pan and zoom in canvas panel | | `regressionTransformation` | Enables regression analysis transformation | diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index a69c4e69a34..dfa3d42c4f4 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -801,11 +801,12 @@ var ( Expression: "true", }, { - Name: "teamHttpHeaders", - Description: "Enables Team LBAC for datasources to apply team headers to the client requests", - Stage: FeatureStagePublicPreview, - FrontendOnly: false, - Owner: identityAccessTeam, + Name: "teamHttpHeaders", + Description: "Enables LBAC for datasources to apply LogQL filtering of logs to the client requests for users in teams", + Stage: FeatureStagePublicPreview, + FrontendOnly: false, + AllowSelfServe: true, + Owner: identityAccessTeam, }, { Name: "cachingOptimizeSerializationMemoryUsage", diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index beae9a2e50d..35b257d632b 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -432,7 +432,7 @@ const ( FlagLokiStructuredMetadata = "lokiStructuredMetadata" // FlagTeamHttpHeaders - // Enables Team LBAC for datasources to apply team headers to the client requests + // Enables LBAC for datasources to apply LogQL filtering of logs to the client requests for users in teams FlagTeamHttpHeaders = "teamHttpHeaders" // FlagCachingOptimizeSerializationMemoryUsage diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index f2730d6f456..07275164723 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -2787,13 +2787,17 @@ { "metadata": { "name": "teamHttpHeaders", - "resourceVersion": "1718727528075", - "creationTimestamp": "2023-10-17T10:23:54Z" + "resourceVersion": "1726836253132", + "creationTimestamp": "2023-10-17T10:23:54Z", + "annotations": { + "grafana.app/updatedTimestamp": "2024-09-20 12:44:13.132845 +0000 UTC" + } }, "spec": { - "description": "Enables Team LBAC for datasources to apply team headers to the client requests", + "description": "Enables LBAC for datasources to apply LogQL filtering of logs to the client requests for users in teams", "stage": "preview", - "codeowner": "@grafana/identity-access-team" + "codeowner": "@grafana/identity-access-team", + "allowSelfServe": true } }, {