From 5f0faf2dd6d52a502a79c5b77686b36c16f10adb Mon Sep 17 00:00:00 2001 From: Timur Olzhabayev Date: Wed, 19 Mar 2025 18:45:04 +0100 Subject: [PATCH] Chore: Promoting feature toggle pluginsSriChecks GA (#102212) * Making pluginsSriChecks GA * make it disabled by default --- .../configure-grafana/feature-toggles/index.md | 2 +- .../grafana-data/src/types/featureToggles.gen.ts | 1 + pkg/services/featuremgmt/registry.go | 3 ++- pkg/services/featuremgmt/toggles_gen.csv | 2 +- pkg/services/featuremgmt/toggles_gen.json | 12 ++++++++---- 5 files changed, 13 insertions(+), 7 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 66b0aab612d..0e770122fb2 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -73,6 +73,7 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general- | `newFiltersUI` | Enables new combobox style UI for the Ad hoc filters variable in scenes architecture | Yes | | `alertingQueryAndExpressionsStepMode` | Enables step mode for alerting queries and expressions | Yes | | `useSessionStorageForRedirection` | Use session storage for handling the redirection after login | Yes | +| `pluginsSriChecks` | Enables SRI checks for plugin assets | | | `userStorageAPI` | Enables the user storage API | Yes | | `azureMonitorDisableLogLimit` | Disables the log limit restriction for Azure Monitor when true. The limit is enabled by default. | | | `preinstallAutoUpdate` | Enables automatic updates for pre-installed plugins | Yes | @@ -203,7 +204,6 @@ Experimental features might be changed or removed without prior notice. | `homeSetupGuide` | Used in Home for users who want to return to the onboarding flow or quickly find popular config pages | | `appSidecar` | Enable the app sidecar feature that allows rendering 2 apps at the same time | | `rolePickerDrawer` | Enables the new role picker drawer design | -| `pluginsSriChecks` | Enables SRI checks for plugin assets | | `unifiedStorageBigObjectsSupport` | Enables to save big objects in blob storage | | `timeRangeProvider` | Enables time pickers sync | | `prometheusUsesCombobox` | Use new combobox component for Prometheus query editor | diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index ebda65fd2d7..43e3ccea8ef 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -826,6 +826,7 @@ export interface FeatureToggles { managedDualWriter?: boolean; /** * Enables SRI checks for plugin assets + * @default false */ pluginsSriChecks?: boolean; /** diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 35a4f9d66d0..6c32b17a087 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -1421,8 +1421,9 @@ var ( { Name: "pluginsSriChecks", Description: "Enables SRI checks for plugin assets", - Stage: FeatureStageExperimental, + Stage: FeatureStageGeneralAvailability, Owner: grafanaPluginsPlatformSquad, + Expression: "false", // disabled by default }, { Name: "unifiedStorageBigObjectsSupport", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index adbc4852c09..630ff33c163 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -186,7 +186,7 @@ unifiedStorageSearch,experimental,@grafana/search-and-storage,false,false,false unifiedStorageSearchSprinkles,experimental,@grafana/search-and-storage,false,false,false unifiedStorageSearchPermissionFiltering,experimental,@grafana/search-and-storage,false,false,false managedDualWriter,experimental,@grafana/search-and-storage,false,false,false -pluginsSriChecks,experimental,@grafana/plugins-platform-backend,false,false,false +pluginsSriChecks,GA,@grafana/plugins-platform-backend,false,false,false unifiedStorageBigObjectsSupport,experimental,@grafana/search-and-storage,false,false,false timeRangeProvider,experimental,@grafana/grafana-frontend-platform,false,false,false prometheusUsesCombobox,experimental,@grafana/oss-big-tent,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index ea5b78a2cdd..a00a44b6af5 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -3281,13 +3281,17 @@ { "metadata": { "name": "pluginsSriChecks", - "resourceVersion": "1727785264632", - "creationTimestamp": "2024-10-04T12:55:09Z" + "resourceVersion": "1742405194835", + "creationTimestamp": "2024-10-04T12:55:09Z", + "annotations": { + "grafana.app/updatedTimestamp": "2025-03-19 17:26:34.83562 +0000 UTC" + } }, "spec": { "description": "Enables SRI checks for plugin assets", - "stage": "experimental", - "codeowner": "@grafana/plugins-platform-backend" + "stage": "GA", + "codeowner": "@grafana/plugins-platform-backend", + "expression": "false" } }, {