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 25630afe2bd..84d3a0be11b 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -108,6 +108,7 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general- | `alertingSaveStateCompressed` | Enables the compressed protobuf-based alert state storage | | `tableNextGen` | Allows access to the new react-data-grid based table component. | | `improvedExternalSessionHandling` | Enables improved support for OAuth external sessions. After enabling this feature, users might need to re-authenticate themselves. | +| `enableSCIM` | Enables SCIM support for user and group management | | `elasticsearchCrossClusterSearch` | Enables cross cluster search in the Elasticsearch datasource | | `improvedExternalSessionHandlingSAML` | Enables improved support for SAML external sessions. Ensure the NameID format is correctly configured in Grafana for SAML Single Logout to function properly. | | `alertRuleRestore` | Enables the alert rule restore feature | diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 9faca508d2f..0840290f634 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -1306,7 +1306,7 @@ var ( { Name: "enableSCIM", Description: "Enables SCIM support for user and group management", - Stage: FeatureStageExperimental, + Stage: FeatureStagePublicPreview, Owner: identityAccessTeam, }, { diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 478ed422a32..23280010211 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -170,7 +170,7 @@ passwordlessMagicLinkAuthentication,experimental,@grafana/identity-access-team,f exploreMetricsRelatedLogs,experimental,@grafana/observability-metrics,false,false,true prometheusSpecialCharsInLabelValues,experimental,@grafana/oss-big-tent,false,false,true enableExtensionsAdminPage,experimental,@grafana/plugins-platform-backend,false,true,false -enableSCIM,experimental,@grafana/identity-access-team,false,false,false +enableSCIM,preview,@grafana/identity-access-team,false,false,false crashDetection,experimental,@grafana/observability-traces-and-profiling,false,false,true jaegerBackendMigration,experimental,@grafana/oss-big-tent,false,false,false alertingUIOptimizeReducer,GA,@grafana/alerting-squad,false,false,true diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 82b869e8a77..0ecf8f29855 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -985,12 +985,15 @@ { "metadata": { "name": "enableSCIM", - "resourceVersion": "1750434297879", - "creationTimestamp": "2024-11-07T14:38:46Z" + "resourceVersion": "1750952338509", + "creationTimestamp": "2024-11-07T14:38:46Z", + "annotations": { + "grafana.app/updatedTimestamp": "2025-06-26 15:38:58.509301321 +0000 UTC" + } }, "spec": { "description": "Enables SCIM support for user and group management", - "stage": "experimental", + "stage": "preview", "codeowner": "@grafana/identity-access-team" } },