Skip to content

grafana: disable unversioned plugin install #1846

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
umezawatakeshi merged 1 commit into from
Feb 26, 2026
+36 −2
Merged

grafana: disable unversioned plugin install #1846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion grafana/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ WORKDIR /work/grafana
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN curl -sSLf https://github.com/grafana/grafana/archive/v${GRAFANA_VERSION}.tar.gz | \
tar zxf - --strip-components 1 -C /work/grafana
COPY viewers_can_explore.patch /work/
COPY *.patch /work/
RUN patch -p1 < /work/viewers_can_explore.patch
RUN patch -p1 < /work/disable-unversioned-plugin-install.patch

# Install Node.js 24.x & yarn
# https://nodesource.com/products/distributions
Expand Down
2 changes: 1 addition & 1 deletion grafana/TAG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
12.3.0.1
12.3.0.2
33 changes: 33 additions & 0 deletions grafana/disable-unversioned-plugin-install.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
diff --git a/pkg/services/pluginsintegration/plugininstaller/service.go b/pkg/services/pluginsintegration/plugininstaller/service.go
index 7232703820c..16ec8fed66b 100644
--- a/pkg/services/pluginsintegration/plugininstaller/service.go
+++ b/pkg/services/pluginsintegration/plugininstaller/service.go
@@ -124,6 +124,9 @@ func (s *Service) installPlugins(ctx context.Context, pluginsToInstall []setting
}

s.log.Info("Installing plugin", "pluginId", installPlugin.ID, "version", installPlugin.Version)
+ if installPlugin.Version == "" {
+ return fmt.Errorf("failed to install plugin %s: Version is not specified", installPlugin.ID)
+ }
start := time.Now()
ctx = repo.WithRequestOrigin(ctx, "preinstall")
compatOpts := plugins.NewAddOpts(s.cfg.BuildVersion, runtime.GOOS, runtime.GOARCH, installPlugin.URL)
diff --git a/pkg/setting/setting_plugins.go b/pkg/setting/setting_plugins.go
index 0080f61d0a4..4ac0e97c72f 100644
--- a/pkg/setting/setting_plugins.go
+++ b/pkg/setting/setting_plugins.go
@@ -34,13 +34,7 @@ func extractPluginSettings(sections []*ini.Section) PluginSettings {
}

var (
- defaultPreinstallPlugins = map[string]InstallPlugin{
- // Default preinstalled plugins
- "grafana-lokiexplore-app": {ID: "grafana-lokiexplore-app"},
- "grafana-pyroscope-app": {ID: "grafana-pyroscope-app"},
- "grafana-exploretraces-app": {ID: "grafana-exploretraces-app"},
- "grafana-metricsdrilldown-app": {ID: "grafana-metricsdrilldown-app"},
- }
+ defaultPreinstallPlugins = map[string]InstallPlugin{}
)

func (cfg *Cfg) migrateInstallPluginsToPreinstallPluginsSync(rawInstallPlugins, installPluginsForce string, preinstallPluginsSync map[string]InstallPlugin) {
Loading