IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "removes dependencies install for plugins"

Browse Source 
This reverts commit 47e363ea15.
This commit is contained in:
bergquist
2018-02-16 09:49:29 +01:00
parent 3b04efa4c0
commit 5bbe047eaa
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/plugins/models.go
View File

@@ -59,6 +59,10 @@ func (pb *PluginBase) registerPlugin(pluginDir string) error {
plog.Info("Registering plugin", "name", pb.Name)
}
if len(pb.Dependencies.Plugins) == 0 {
pb.Dependencies.Plugins = []PluginDependencyItem{}
}
if pb.Dependencies.GrafanaVersion == "" {
pb.Dependencies.GrafanaVersion = "*"
}
@@ -75,7 +79,8 @@ func (pb *PluginBase) registerPlugin(pluginDir string) error {
}
type PluginDependencies struct {
GrafanaVersion string `json:"grafanaVersion"`
GrafanaVersion string `json:"grafanaVersion"`
Plugins []PluginDependencyItem `json:"plugins"`
}
type PluginInclude struct {
@@ -91,6 +96,13 @@ type PluginInclude struct {
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 {
Author PluginInfoLink `json:"author"`
Description string `json:"description"`