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 cfbcd9975e2..2c82840b0fe 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -52,6 +52,7 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general- | `useSessionStorageForRedirection` | Use session storage for handling the redirection after login | Yes | | `pluginsSriChecks` | Enables SRI checks for plugin assets | | | `azureMonitorDisableLogLimit` | Disables the log limit restriction for Azure Monitor when true. The limit is enabled by default. | | +| `enableSCIM` | Enables SCIM support for user and group management | Yes | | `alertingUIOptimizeReducer` | Enables removing the reducer from the alerting UI when creating a new alert rule and using instant query | Yes | | `azureMonitorEnableUserAuth` | Enables user auth for Azure Monitor datasource only | Yes | | `alertingNotificationsStepMode` | Enables simplified step mode in the notifications section | Yes | @@ -91,7 +92,6 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general- | `queryLibrary` | Enables Saved queries (query library) feature | | `savedQueriesRBAC` | Enables Saved queries (query library) RBAC permissions | | `dashboardTemplates` | Enables a flow to get started with a new dashboard from a template | -| `enableSCIM` | Enables SCIM support for user and group management | | `alertRuleRestore` | Enables the alert rule restore feature | | `azureMonitorLogsBuilderEditor` | Enables the logs builder mode for the Azure Monitor data source | | `logsPanelControls` | Enables a control component for the logs panel in Explore | diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index c788ae7a685..576b94f2e96 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -806,7 +806,7 @@ export interface FeatureToggles { enableExtensionsAdminPage?: boolean; /** * Enables SCIM support for user and group management - * @default false + * @default true */ enableSCIM?: boolean; /** diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index e3e755bd460..fdc2e890135 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -1257,9 +1257,9 @@ var ( { Name: "enableSCIM", Description: "Enables SCIM support for user and group management", - Stage: FeatureStagePublicPreview, + Stage: FeatureStageGeneralAvailability, Owner: identityAccessTeam, - Expression: "false", + Expression: "true", }, { Name: "crashDetection", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index f65241403a6..86f7992dea9 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -156,7 +156,7 @@ Created,Name,Stage,Owner,requiresDevMode,RequiresRestart,FrontendOnly 2024-11-14,passwordlessMagicLinkAuthentication,experimental,@grafana/identity-access-team,false,false,false 2024-12-18,prometheusSpecialCharsInLabelValues,experimental,@grafana/oss-big-tent,false,false,true 2024-11-05,enableExtensionsAdminPage,experimental,@grafana/plugins-platform-backend,false,true,false -2024-11-07,enableSCIM,preview,@grafana/identity-access-team,false,false,false +2024-11-07,enableSCIM,GA,@grafana/identity-access-team,false,false,false 2024-11-12,crashDetection,experimental,@grafana/observability-traces-and-profiling,false,false,true 2024-11-18,alertingUIOptimizeReducer,GA,@grafana/alerting-squad,false,false,true 2024-11-27,azureMonitorEnableUserAuth,GA,@grafana/partner-datasources,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 04b7a3c6cb6..41f7dc1ed39 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -1603,17 +1603,17 @@ { "metadata": { "name": "enableSCIM", - "resourceVersion": "1768498862515", + "resourceVersion": "1769542829648", "creationTimestamp": "2024-11-07T14:38:46Z", "annotations": { - "grafana.app/updatedTimestamp": "2026-01-15 17:41:02.515355 +0000 UTC" + "grafana.app/updatedTimestamp": "2026-01-27 19:40:29.648759061 +0000 UTC" } }, "spec": { "description": "Enables SCIM support for user and group management", - "stage": "preview", + "stage": "GA", "codeowner": "@grafana/identity-access-team", - "expression": "false" + "expression": "true" } }, {