Plugins: Remove pluginsCDNSyncLoader feature toggle (#108389)

* remove pluginsCDNSyncLoader feature toggle

* fix lint issues

* fix other linter issue
This commit is contained in:
Will Browne
2025-07-22 09:33:23 +01:00
committed by GitHub
parent 56f6030c5e
commit 7f065c94de
8 changed files with 11 additions and 29 deletions

View File

@@ -847,10 +847,6 @@ export interface FeatureToggles {
*/
grafanaconThemes?: boolean;
/**
* Loads plugins from CDN synchronously
*/
pluginsCDNSyncLoader?: boolean;
/**
* Enables the new Jira integration for contact points in cloud alert managers.
*/
alertingJiraIntegration?: boolean;

View File

@@ -30,10 +30,9 @@ type PluginManagementCfg struct {
// Features contains the feature toggles used for the plugin management system.
type Features struct {
SkipHostEnvVarsEnabled bool
SriChecksEnabled bool
PluginsCDNSyncLoaderEnabled bool
LocalizationForPlugins bool
SkipHostEnvVarsEnabled bool
SriChecksEnabled bool
LocalizationForPlugins bool
// Needed only until Tempo Alerting / metrics TraceQL is stable
// https://github.com/grafana/grafana/issues/106888
TempoAlertingEnabled bool

View File

@@ -93,10 +93,8 @@ func (l *Loader) Load(ctx context.Context, src plugins.PluginSource) ([]*plugins
}
validateResults := make(chan validateResult, len(bootstrappedPlugins))
// If the PluginsCDNSyncLoaderEnabled feature is enabled, validate plugins in parallel.
// Otherwise, validate plugins sequentially.
var limitSize int
if l.cfg.Features.PluginsCDNSyncLoaderEnabled && src.PluginClass(ctx) == plugins.ClassCDN {
if src.PluginClass(ctx) == plugins.ClassCDN {
limitSize = min(len(bootstrappedPlugins), concurrencyLimit)
} else {
limitSize = 1

View File

@@ -1447,12 +1447,6 @@ var (
RequiresRestart: true,
Expression: "true",
},
{
Name: "pluginsCDNSyncLoader",
Description: "Loads plugins from CDN synchronously",
Stage: FeatureStageExperimental,
Owner: grafanaPluginsPlatformSquad,
},
{
Name: "alertingJiraIntegration",
Description: "Enables the new Jira integration for contact points in cloud alert managers.",

View File

@@ -189,7 +189,6 @@ datasourceConnectionsTab,privatePreview,@grafana/plugins-platform-backend,false,
fetchRulesUsingPost,experimental,@grafana/alerting-squad,false,false,false
newLogsPanel,experimental,@grafana/observability-logs,false,false,true
grafanaconThemes,GA,@grafana/grafana-frontend-platform,false,true,false
pluginsCDNSyncLoader,experimental,@grafana/plugins-platform-backend,false,false,false
alertingJiraIntegration,experimental,@grafana/alerting-squad,false,false,true
useScopesNavigationEndpoint,experimental,@grafana/grafana-frontend-platform,false,false,true
scopeSearchAllLevels,experimental,@grafana/grafana-frontend-platform,false,false,false
1 Name Stage Owner requiresDevMode RequiresRestart FrontendOnly
189 fetchRulesUsingPost experimental @grafana/alerting-squad false false false
190 newLogsPanel experimental @grafana/observability-logs false false true
191 grafanaconThemes GA @grafana/grafana-frontend-platform false true false
pluginsCDNSyncLoader experimental @grafana/plugins-platform-backend false false false
192 alertingJiraIntegration experimental @grafana/alerting-squad false false true
193 useScopesNavigationEndpoint experimental @grafana/grafana-frontend-platform false false true
194 scopeSearchAllLevels experimental @grafana/grafana-frontend-platform false false false

View File

@@ -767,10 +767,6 @@ const (
// Enables the temporary themes for GrafanaCon
FlagGrafanaconThemes = "grafanaconThemes"
// FlagPluginsCDNSyncLoader
// Loads plugins from CDN synchronously
FlagPluginsCDNSyncLoader = "pluginsCDNSyncLoader"
// FlagAlertingJiraIntegration
// Enables the new Jira integration for contact points in cloud alert managers.
FlagAlertingJiraIntegration = "alertingJiraIntegration"

View File

@@ -2526,7 +2526,8 @@
"metadata": {
"name": "pluginsCDNSyncLoader",
"resourceVersion": "1750434297879",
"creationTimestamp": "2025-02-07T10:07:08Z"
"creationTimestamp": "2025-02-07T10:07:08Z",
"deletionTimestamp": "2025-07-21T10:13:07Z"
},
"spec": {
"description": "Loads plugins from CDN synchronously",

View File

@@ -30,12 +30,11 @@ func ProvidePluginManagementConfig(cfg *setting.Cfg, settingProvider setting.Pro
cfg.PluginsCDNURLTemplate,
cfg.AppURL,
config.Features{
SkipHostEnvVarsEnabled: features.IsEnabledGlobally(featuremgmt.FlagPluginsSkipHostEnvVars),
SriChecksEnabled: features.IsEnabledGlobally(featuremgmt.FlagPluginsSriChecks),
PluginsCDNSyncLoaderEnabled: features.IsEnabledGlobally(featuremgmt.FlagPluginsCDNSyncLoader),
LocalizationForPlugins: features.IsEnabledGlobally(featuremgmt.FlagLocalizationForPlugins),
TempoAlertingEnabled: features.IsEnabledGlobally(featuremgmt.FlagTempoAlerting),
PluginAssetProvider: features.IsEnabledGlobally(featuremgmt.FlagPluginAssetProvider),
SkipHostEnvVarsEnabled: features.IsEnabledGlobally(featuremgmt.FlagPluginsSkipHostEnvVars),
SriChecksEnabled: features.IsEnabledGlobally(featuremgmt.FlagPluginsSriChecks),
LocalizationForPlugins: features.IsEnabledGlobally(featuremgmt.FlagLocalizationForPlugins),
TempoAlertingEnabled: features.IsEnabledGlobally(featuremgmt.FlagTempoAlerting),
PluginAssetProvider: features.IsEnabledGlobally(featuremgmt.FlagPluginAssetProvider),
},
cfg.GrafanaComAPIURL,
cfg.DisablePlugins,