From 9579bf33fbd722049017f075503071be11e20d2d Mon Sep 17 00:00:00 2001 From: Eric Leijonmarck Date: Thu, 7 Aug 2025 11:04:46 +0200 Subject: [PATCH] LBAC for datasources: Remove ft `teamHttpHeadersMimir` (#109240) chore: remove ft for mimir --- .../configure-grafana/feature-toggles/index.md | 1 - packages/grafana-data/src/types/featureToggles.gen.ts | 5 ----- pkg/services/featuremgmt/registry.go | 9 --------- pkg/services/featuremgmt/toggles_gen.csv | 1 - pkg/services/featuremgmt/toggles_gen.go | 4 ---- pkg/services/featuremgmt/toggles_gen.json | 3 ++- 6 files changed, 2 insertions(+), 21 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 49062997533..e66178703ff 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -73,7 +73,6 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general- | `alertingNotificationsStepMode` | Enables simplified step mode in the notifications section | Yes | | `lokiLabelNamesQueryApi` | Defaults to using the Loki `/labels` API instead of `/series` | Yes | | `improvedExternalSessionHandlingSAML` | Enables improved support for SAML external sessions. Ensure the NameID format is correctly configured in Grafana for SAML Single Logout to function properly. | Yes | -| `teamHttpHeadersMimir` | Enables LBAC for datasources for Mimir to apply LBAC filtering of metrics to the client requests for users in teams | Yes | | `alertingMigrationUI` | Enables the alerting migration UI, to migrate data source-managed rules to Grafana-managed rules | Yes | | `alertingImportYAMLUI` | Enables a UI feature for importing rules from a Prometheus file to Grafana-managed rules | Yes | | `unifiedNavbars` | Enables unified navbars | | diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index cb400b4e5fa..6d2b6c7d02c 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -815,11 +815,6 @@ export interface FeatureToggles { */ improvedExternalSessionHandlingSAML?: boolean; /** - * Enables LBAC for datasources for Mimir to apply LBAC filtering of metrics to the client requests for users in teams - * @default true - */ - teamHttpHeadersMimir?: boolean; - /** * Enables LBAC for datasources for Tempo to apply LBAC filtering of traces to the client requests for users in teams */ teamHttpHeadersTempo?: boolean; diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index ed5d527799e..68daf7665a7 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -1395,15 +1395,6 @@ var ( Owner: identityAccessTeam, AllowSelfServe: true, }, - { - Name: "teamHttpHeadersMimir", - Description: "Enables LBAC for datasources for Mimir to apply LBAC filtering of metrics to the client requests for users in teams", - Stage: FeatureStageGeneralAvailability, - FrontendOnly: false, - AllowSelfServe: true, - Owner: identityAccessTeam, - Expression: "true", - }, { Name: "teamHttpHeadersTempo", Description: "Enables LBAC for datasources for Tempo to apply LBAC filtering of traces to the client requests for users in teams", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 8af78162673..62d51933df7 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -182,7 +182,6 @@ 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,GA,@grafana/identity-access-team,false,false,false -teamHttpHeadersMimir,GA,@grafana/identity-access-team,false,false,false teamHttpHeadersTempo,experimental,@grafana/identity-access-team,false,false,false templateVariablesUsesCombobox,experimental,@grafana/grafana-frontend-platform,false,false,true grafanaAdvisor,privatePreview,@grafana/plugins-platform-backend,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 3a745490f8d..e1638343dcc 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -739,10 +739,6 @@ const ( // 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" - // FlagTeamHttpHeadersTempo // Enables LBAC for datasources for Tempo to apply LBAC filtering of traces to the client requests for users in teams FlagTeamHttpHeadersTempo = "teamHttpHeadersTempo" diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 68fc984f930..10d99a492ed 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -3014,7 +3014,8 @@ "metadata": { "name": "teamHttpHeadersMimir", "resourceVersion": "1753448760331", - "creationTimestamp": "2025-01-13T10:42:47Z" + "creationTimestamp": "2025-01-13T10:42:47Z", + "deletionTimestamp": "2025-08-06T08:19:47Z" }, "spec": { "description": "Enables LBAC for datasources for Mimir to apply LBAC filtering of metrics to the client requests for users in teams",