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 d7f0588df06..a9d434a91a8 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -230,6 +230,7 @@ Experimental features might be changed or removed without prior notice. | `investigationsBackend` | Enable the investigations backend API | | `k8SFolderCounts` | Enable folder's api server counts | | `k8SFolderMove` | Enable folder's api server move | +| `teamHttpHeadersMimir` | Enables LBAC for datasources for Mimir to apply LBAC filtering of metrics to the client requests for users in teams | ## Development feature toggles diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index 8625b8880c8..88c11e84d6a 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -248,4 +248,5 @@ export interface FeatureToggles { k8SFolderCounts?: boolean; k8SFolderMove?: boolean; improvedExternalSessionHandlingSAML?: boolean; + teamHttpHeadersMimir?: boolean; } diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 81a96f9da58..d626a1e1b42 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -1713,6 +1713,14 @@ var ( Stage: FeatureStagePublicPreview, Owner: identityAccessTeam, }, + { + Name: "teamHttpHeadersMimir", + Description: "Enables LBAC for datasources for Mimir to apply LBAC filtering of metrics to the client requests for users in teams", + Stage: FeatureStageExperimental, + FrontendOnly: false, + AllowSelfServe: false, + Owner: identityAccessTeam, + }, } ) diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 7f182d4b200..fb959d92242 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -229,3 +229,4 @@ investigationsBackend,experimental,@grafana/grafana-app-platform-squad,false,fal k8SFolderCounts,experimental,@grafana/search-and-storage,false,false,false k8SFolderMove,experimental,@grafana/search-and-storage,false,false,false improvedExternalSessionHandlingSAML,preview,@grafana/identity-access-team,false,false,false +teamHttpHeadersMimir,experimental,@grafana/identity-access-team,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index b3aa97588cf..96c92618629 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -926,4 +926,8 @@ const ( // FlagImprovedExternalSessionHandlingSAML // Enables improved support for SAML external sessions. Ensure the NameID format is correctly configured in Grafana for SAML Single Logout to function properly. FlagImprovedExternalSessionHandlingSAML = "improvedExternalSessionHandlingSAML" + + // FlagTeamHttpHeadersMimir + // Enables LBAC for datasources for Mimir to apply LBAC filtering of metrics to the client requests for users in teams + FlagTeamHttpHeadersMimir = "teamHttpHeadersMimir" ) diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 5ae300fe69b..fedd1d2a2e7 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -3566,6 +3566,18 @@ "allowSelfServe": true } }, + { + "metadata": { + "name": "teamHttpHeadersMimir", + "resourceVersion": "1736763800062", + "creationTimestamp": "2025-01-13T10:23:20Z" + }, + "spec": { + "description": "Enables LBAC for datasources for Mimir to apply LBAC filtering of metrics to the client requests for users in teams", + "stage": "experimental", + "codeowner": "@grafana/identity-access-team" + } + }, { "metadata": { "name": "timeRangeProvider",