mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Revert "removes dependencies install for plugins"
This reverts commit 47e363ea15
.
This commit is contained in:
parent
3b04efa4c0
commit
5bbe047eaa
@ -91,7 +91,14 @@ func InstallPlugin(pluginName, version string, c CommandLine) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
logger.Infof("%s Installed %s successfully \n", color.GreenString("✔"), pluginName)
|
logger.Infof("%s Installed %s successfully \n", color.GreenString("✔"), pluginName)
|
||||||
return nil
|
|
||||||
|
res, _ := s.ReadPlugin(pluginFolder, pluginName)
|
||||||
|
for _, v := range res.Dependencies.Plugins {
|
||||||
|
InstallPlugin(v.Id, version, c)
|
||||||
|
logger.Infof("Installed dependency: %v ✔\n", v.Id)
|
||||||
|
}
|
||||||
|
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func SelectVersion(plugin m.Plugin, version string) (m.Version, error) {
|
func SelectVersion(plugin m.Plugin, version string) (m.Version, error) {
|
||||||
|
@ -15,6 +15,7 @@ type InstalledPlugin struct {
|
|||||||
|
|
||||||
type Dependencies struct {
|
type Dependencies struct {
|
||||||
GrafanaVersion string `json:"grafanaVersion"`
|
GrafanaVersion string `json:"grafanaVersion"`
|
||||||
|
Plugins []Plugin `json:"plugins"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type PluginInfo struct {
|
type PluginInfo struct {
|
||||||
|
@ -59,6 +59,10 @@ func (pb *PluginBase) registerPlugin(pluginDir string) error {
|
|||||||
plog.Info("Registering plugin", "name", pb.Name)
|
plog.Info("Registering plugin", "name", pb.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if len(pb.Dependencies.Plugins) == 0 {
|
||||||
|
pb.Dependencies.Plugins = []PluginDependencyItem{}
|
||||||
|
}
|
||||||
|
|
||||||
if pb.Dependencies.GrafanaVersion == "" {
|
if pb.Dependencies.GrafanaVersion == "" {
|
||||||
pb.Dependencies.GrafanaVersion = "*"
|
pb.Dependencies.GrafanaVersion = "*"
|
||||||
}
|
}
|
||||||
@ -76,6 +80,7 @@ func (pb *PluginBase) registerPlugin(pluginDir string) error {
|
|||||||
|
|
||||||
type PluginDependencies struct {
|
type PluginDependencies struct {
|
||||||
GrafanaVersion string `json:"grafanaVersion"`
|
GrafanaVersion string `json:"grafanaVersion"`
|
||||||
|
Plugins []PluginDependencyItem `json:"plugins"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type PluginInclude struct {
|
type PluginInclude struct {
|
||||||
@ -91,6 +96,13 @@ type PluginInclude struct {
|
|||||||
Id string `json:"-"`
|
Id string `json:"-"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type PluginDependencyItem struct {
|
||||||
|
Type string `json:"type"`
|
||||||
|
Id string `json:"id"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Version string `json:"version"`
|
||||||
|
}
|
||||||
|
|
||||||
type PluginInfo struct {
|
type PluginInfo struct {
|
||||||
Author PluginInfoLink `json:"author"`
|
Author PluginInfoLink `json:"author"`
|
||||||
Description string `json:"description"`
|
Description string `json:"description"`
|
||||||
|
Loading…
Reference in New Issue
Block a user