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

Access: Remove split scopes feature toggle (#81874)

Browse Source 
* remove split scopes FT

* Revert "remove split scopes FT"

This reverts commit 349fb081d3.

* make toggle deprecated instead

* fix gen
This commit is contained in:
Jo 2024-02-05 17:00:19 +01:00 committed by GitHub
parent 596e828150
commit 7852ea012d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,7 +45,6 @@ Some features are enabled by default. You can disable these feature by setting t
| `recordedQueriesMulti` | Enables writing multiple items from a single query within Recorded Queries | Yes |
| `transformationsRedesign` | Enables the transformations redesign | Yes |
| `awsAsyncQueryCaching` | Enable caching for async queries for Redshift and Athena. Requires that the datasource has caching and async query support enabled | Yes |
| `splitScopes` | Support faster dashboard and folder search by splitting permission scopes into parts | Yes |
| `prometheusConfigOverhaulAuth` | Update the Prometheus configuration page with the new auth component | Yes |
| `influxdbSqlSupport` | Enable InfluxDB SQL query language support with new querying UI | Yes |
| `alertingNoDataErrorExecution` | Changes how Alerting state manager handles execution of NoData/Error | Yes |

2
pkg/services/accesscontrol/acimpl/service.go
View File

@ -50,7 +50,6 @@ func ProvideService(cfg *setting.Cfg, db db.DB, routeRegister routing.RouteRegis
return nil, err
}
if features.IsEnabledGlobally(featuremgmt.FlagSplitScopes) {
// Migrating scopes that haven't been split yet to have kind, attribute and identifier in the DB
// This will be removed once we've:
// 1) removed the feature toggle and
@ -58,7 +57,6 @@ func ProvideService(cfg *setting.Cfg, db db.DB, routeRegister routing.RouteRegis
if err := migrator.MigrateScopeSplit(db, service.log); err != nil {
return nil, err
}
}
return service, nil
}

2
pkg/services/accesscontrol/resourcepermissions/store.go
View File

@ -667,9 +667,7 @@ func (s *store) createPermissions(sess *db.Session, roleID int64, resource, reso
p.RoleID = roleID
p.Created = time.Now()
p.Updated = time.Now()
if s.features.IsEnabledGlobally(featuremgmt.FlagSplitScopes) {
p.Kind, p.Attribute, p.Identifier = p.SplitScope()
}
permissions = append(permissions, p)
}

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

@ -731,7 +731,7 @@ var (
{
Name: "splitScopes",
Description: "Support faster dashboard and folder search by splitting permission scopes into parts",
Stage: FeatureStageGeneralAvailability,
Stage: FeatureStageDeprecated,
FrontendOnly: false,
Expression: "true", // enabled by default
Owner: identityAccessTeam,

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

@ -85,7 +85,7 @@ grafanaAPIServerWithExperimentalAPIs,experimental,@grafana/grafana-app-platform-
grafanaAPIServerEnsureKubectlAccess,experimental,@grafana/grafana-app-platform-squad,2023-12-06,true,true,false
featureToggleAdminPage,experimental,@grafana/grafana-operator-experience-squad,2023-07-18,false,true,false
awsAsyncQueryCaching,GA,@grafana/aws-datasources,2023-07-21,false,false,false
splitScopes,GA,@grafana/identity-access-team,2023-07-21,false,true,false
splitScopes,deprecated,@grafana/identity-access-team,2023-07-21,false,true,false
permissionsFilterRemoveSubquery,experimental,@grafana/backend-platform,2023-08-02,false,false,false
prometheusConfigOverhaulAuth,GA,@grafana/observability-metrics,2023-07-21,false,false,false
configurableSchedulerTick,experimental,@grafana/alerting-squad,2023-07-26,false,true,false

1 Name Stage Owner Created requiresDevMode RequiresRestart FrontendOnly
85 grafanaAPIServerEnsureKubectlAccess experimental @grafana/grafana-app-platform-squad 2023-12-06 true true false
86 featureToggleAdminPage experimental @grafana/grafana-operator-experience-squad 2023-07-18 false true false
87 awsAsyncQueryCaching GA @grafana/aws-datasources 2023-07-21 false false false
88 splitScopes GA deprecated @grafana/identity-access-team 2023-07-21 false true false
89 permissionsFilterRemoveSubquery experimental @grafana/backend-platform 2023-08-02 false false false
90 prometheusConfigOverhaulAuth GA @grafana/observability-metrics 2023-07-21 false false false
91 configurableSchedulerTick experimental @grafana/alerting-squad 2023-07-26 false true false