Plugins: Remove pluginsCDNSyncLoader feature toggle (#108389)
* remove pluginsCDNSyncLoader feature toggle * fix lint issues * fix other linter issue
This commit is contained in:
@@ -847,10 +847,6 @@ export interface FeatureToggles {
|
|||||||
*/
|
*/
|
||||||
grafanaconThemes?: boolean;
|
grafanaconThemes?: boolean;
|
||||||
/**
|
/**
|
||||||
* Loads plugins from CDN synchronously
|
|
||||||
*/
|
|
||||||
pluginsCDNSyncLoader?: boolean;
|
|
||||||
/**
|
|
||||||
* Enables the new Jira integration for contact points in cloud alert managers.
|
* Enables the new Jira integration for contact points in cloud alert managers.
|
||||||
*/
|
*/
|
||||||
alertingJiraIntegration?: boolean;
|
alertingJiraIntegration?: boolean;
|
||||||
|
|||||||
@@ -30,10 +30,9 @@ type PluginManagementCfg struct {
|
|||||||
|
|
||||||
// Features contains the feature toggles used for the plugin management system.
|
// Features contains the feature toggles used for the plugin management system.
|
||||||
type Features struct {
|
type Features struct {
|
||||||
SkipHostEnvVarsEnabled bool
|
SkipHostEnvVarsEnabled bool
|
||||||
SriChecksEnabled bool
|
SriChecksEnabled bool
|
||||||
PluginsCDNSyncLoaderEnabled bool
|
LocalizationForPlugins bool
|
||||||
LocalizationForPlugins bool
|
|
||||||
// Needed only until Tempo Alerting / metrics TraceQL is stable
|
// Needed only until Tempo Alerting / metrics TraceQL is stable
|
||||||
// https://github.com/grafana/grafana/issues/106888
|
// https://github.com/grafana/grafana/issues/106888
|
||||||
TempoAlertingEnabled bool
|
TempoAlertingEnabled bool
|
||||||
|
|||||||
@@ -93,10 +93,8 @@ func (l *Loader) Load(ctx context.Context, src plugins.PluginSource) ([]*plugins
|
|||||||
}
|
}
|
||||||
validateResults := make(chan validateResult, len(bootstrappedPlugins))
|
validateResults := make(chan validateResult, len(bootstrappedPlugins))
|
||||||
|
|
||||||
// If the PluginsCDNSyncLoaderEnabled feature is enabled, validate plugins in parallel.
|
|
||||||
// Otherwise, validate plugins sequentially.
|
|
||||||
var limitSize int
|
var limitSize int
|
||||||
if l.cfg.Features.PluginsCDNSyncLoaderEnabled && src.PluginClass(ctx) == plugins.ClassCDN {
|
if src.PluginClass(ctx) == plugins.ClassCDN {
|
||||||
limitSize = min(len(bootstrappedPlugins), concurrencyLimit)
|
limitSize = min(len(bootstrappedPlugins), concurrencyLimit)
|
||||||
} else {
|
} else {
|
||||||
limitSize = 1
|
limitSize = 1
|
||||||
|
|||||||
@@ -1447,12 +1447,6 @@ var (
|
|||||||
RequiresRestart: true,
|
RequiresRestart: true,
|
||||||
Expression: "true",
|
Expression: "true",
|
||||||
},
|
},
|
||||||
{
|
|
||||||
Name: "pluginsCDNSyncLoader",
|
|
||||||
Description: "Loads plugins from CDN synchronously",
|
|
||||||
Stage: FeatureStageExperimental,
|
|
||||||
Owner: grafanaPluginsPlatformSquad,
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
Name: "alertingJiraIntegration",
|
Name: "alertingJiraIntegration",
|
||||||
Description: "Enables the new Jira integration for contact points in cloud alert managers.",
|
Description: "Enables the new Jira integration for contact points in cloud alert managers.",
|
||||||
|
|||||||
@@ -189,7 +189,6 @@ datasourceConnectionsTab,privatePreview,@grafana/plugins-platform-backend,false,
|
|||||||
fetchRulesUsingPost,experimental,@grafana/alerting-squad,false,false,false
|
fetchRulesUsingPost,experimental,@grafana/alerting-squad,false,false,false
|
||||||
newLogsPanel,experimental,@grafana/observability-logs,false,false,true
|
newLogsPanel,experimental,@grafana/observability-logs,false,false,true
|
||||||
grafanaconThemes,GA,@grafana/grafana-frontend-platform,false,true,false
|
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
|
alertingJiraIntegration,experimental,@grafana/alerting-squad,false,false,true
|
||||||
useScopesNavigationEndpoint,experimental,@grafana/grafana-frontend-platform,false,false,true
|
useScopesNavigationEndpoint,experimental,@grafana/grafana-frontend-platform,false,false,true
|
||||||
scopeSearchAllLevels,experimental,@grafana/grafana-frontend-platform,false,false,false
|
scopeSearchAllLevels,experimental,@grafana/grafana-frontend-platform,false,false,false
|
||||||
|
|||||||
|
@@ -767,10 +767,6 @@ const (
|
|||||||
// Enables the temporary themes for GrafanaCon
|
// Enables the temporary themes for GrafanaCon
|
||||||
FlagGrafanaconThemes = "grafanaconThemes"
|
FlagGrafanaconThemes = "grafanaconThemes"
|
||||||
|
|
||||||
// FlagPluginsCDNSyncLoader
|
|
||||||
// Loads plugins from CDN synchronously
|
|
||||||
FlagPluginsCDNSyncLoader = "pluginsCDNSyncLoader"
|
|
||||||
|
|
||||||
// FlagAlertingJiraIntegration
|
// FlagAlertingJiraIntegration
|
||||||
// Enables the new Jira integration for contact points in cloud alert managers.
|
// Enables the new Jira integration for contact points in cloud alert managers.
|
||||||
FlagAlertingJiraIntegration = "alertingJiraIntegration"
|
FlagAlertingJiraIntegration = "alertingJiraIntegration"
|
||||||
|
|||||||
@@ -2526,7 +2526,8 @@
|
|||||||
"metadata": {
|
"metadata": {
|
||||||
"name": "pluginsCDNSyncLoader",
|
"name": "pluginsCDNSyncLoader",
|
||||||
"resourceVersion": "1750434297879",
|
"resourceVersion": "1750434297879",
|
||||||
"creationTimestamp": "2025-02-07T10:07:08Z"
|
"creationTimestamp": "2025-02-07T10:07:08Z",
|
||||||
|
"deletionTimestamp": "2025-07-21T10:13:07Z"
|
||||||
},
|
},
|
||||||
"spec": {
|
"spec": {
|
||||||
"description": "Loads plugins from CDN synchronously",
|
"description": "Loads plugins from CDN synchronously",
|
||||||
|
|||||||
@@ -30,12 +30,11 @@ func ProvidePluginManagementConfig(cfg *setting.Cfg, settingProvider setting.Pro
|
|||||||
cfg.PluginsCDNURLTemplate,
|
cfg.PluginsCDNURLTemplate,
|
||||||
cfg.AppURL,
|
cfg.AppURL,
|
||||||
config.Features{
|
config.Features{
|
||||||
SkipHostEnvVarsEnabled: features.IsEnabledGlobally(featuremgmt.FlagPluginsSkipHostEnvVars),
|
SkipHostEnvVarsEnabled: features.IsEnabledGlobally(featuremgmt.FlagPluginsSkipHostEnvVars),
|
||||||
SriChecksEnabled: features.IsEnabledGlobally(featuremgmt.FlagPluginsSriChecks),
|
SriChecksEnabled: features.IsEnabledGlobally(featuremgmt.FlagPluginsSriChecks),
|
||||||
PluginsCDNSyncLoaderEnabled: features.IsEnabledGlobally(featuremgmt.FlagPluginsCDNSyncLoader),
|
LocalizationForPlugins: features.IsEnabledGlobally(featuremgmt.FlagLocalizationForPlugins),
|
||||||
LocalizationForPlugins: features.IsEnabledGlobally(featuremgmt.FlagLocalizationForPlugins),
|
TempoAlertingEnabled: features.IsEnabledGlobally(featuremgmt.FlagTempoAlerting),
|
||||||
TempoAlertingEnabled: features.IsEnabledGlobally(featuremgmt.FlagTempoAlerting),
|
PluginAssetProvider: features.IsEnabledGlobally(featuremgmt.FlagPluginAssetProvider),
|
||||||
PluginAssetProvider: features.IsEnabledGlobally(featuremgmt.FlagPluginAssetProvider),
|
|
||||||
},
|
},
|
||||||
cfg.GrafanaComAPIURL,
|
cfg.GrafanaComAPIURL,
|
||||||
cfg.DisablePlugins,
|
cfg.DisablePlugins,
|
||||||
|
|||||||
Reference in New Issue
Block a user