feat(plugins): a lot of work on #4298

pkg/api/api.go

@@ -171,7 +171,6 @@ func Register(r *macaron.Macaron) {
 			r.Put("/:id", bind(m.UpdateDataSourceCommand{}), UpdateDataSource)
 			r.Delete("/:id", DeleteDataSource)
 			r.Get("/:id", wrap(GetDataSourceById))
-			r.Get("/plugins", GetDataSourcePlugins)
 		}, reqOrgAdmin)
 
 		r.Group("/datasources/name/:name", func() {

pkg/api/datasources.go

@@ -6,7 +6,6 @@ import (
 	//"github.com/grafana/grafana/pkg/log"
 	"github.com/grafana/grafana/pkg/middleware"
 	m "github.com/grafana/grafana/pkg/models"
-	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/util"
 )
 
@@ -100,24 +99,6 @@ func UpdateDataSource(c *middleware.Context, cmd m.UpdateDataSourceCommand) {
 	c.JsonOK("Datasource updated")
 }
 
-func GetDataSourcePlugins(c *middleware.Context) {
-	dsList := make(map[string]*plugins.DataSourcePlugin)
-
-	if enabledPlugins, err := plugins.GetEnabledPlugins(c.OrgId); err != nil {
-		c.JsonApiErr(500, "Failed to get org apps", err)
-		return
-	} else {
-
-		for key, value := range enabledPlugins.DataSources {
-			if !value.BuiltIn {
-				dsList[key] = value
-			}
-		}
-
-		c.JSON(200, dsList)
-	}
-}
-
 // Get /api/datasources/name/:name
 func GetDataSourceByName(c *middleware.Context) Response {
 	query := m.GetDataSourceByNameQuery{Name: c.Params(":name"), OrgId: c.OrgId}

pkg/api/dtos/plugins.go

@@ -5,23 +5,23 @@ import "github.com/grafana/grafana/pkg/plugins"
 type PluginSetting struct {
 	Name         string                      `json:"name"`
 	Type         string                      `json:"type"`
-	PluginId     string                      `json:"pluginId"`
+	Id           string                      `json:"id"`
 	Enabled      bool                        `json:"enabled"`
 	Pinned       bool                        `json:"pinned"`
 	Module       string                      `json:"module"`
 	BaseUrl      string                      `json:"baseUrl"`
 	Info         *plugins.PluginInfo         `json:"info"`
 	Pages        []*plugins.AppPluginPage    `json:"pages"`
-	Includes     []*plugins.AppIncludeInfo   `json:"includes"`
+	Includes     []*plugins.PluginInclude    `json:"includes"`
 	Dependencies *plugins.PluginDependencies `json:"dependencies"`
 	JsonData     map[string]interface{}      `json:"jsonData"`
 }
 
 type PluginListItem struct {
-	Name     string              `json:"name"`
-	Type     string              `json:"type"`
-	PluginId string              `json:"pluginId"`
-	Enabled  bool                `json:"enabled"`
-	Pinned   bool                `json:"pinned"`
-	Info     *plugins.PluginInfo `json:"info"`
+	Name    string              `json:"name"`
+	Type    string              `json:"type"`
+	Id      string              `json:"id"`
+	Enabled bool                `json:"enabled"`
+	Pinned  bool                `json:"pinned"`
+	Info    *plugins.PluginInfo `json:"info"`
 }

pkg/api/plugin_setting.go

@@ -9,6 +9,10 @@ import (
 )
 
 func GetPluginList(c *middleware.Context) Response {
+	typeFilter := c.Query("type")
+	enabledFilter := c.Query("enabled")
+	embeddedFilter := c.Query("embedded")
+
 	pluginSettingsMap, err := plugins.GetPluginSettings(c.OrgId)
 
 	if err != nil {
@@ -17,16 +21,21 @@ func GetPluginList(c *middleware.Context) Response {
 
 	result := make([]*dtos.PluginListItem, 0)
 	for _, pluginDef := range plugins.Plugins {
-		// filter out plugin components
-		if pluginDef.IncludedInAppId != "" {
+		// filter out app sub plugins
+		if embeddedFilter == "0" && pluginDef.IncludedInAppId != "" {
+			continue
+		}
+
+		// filter on type
+		if typeFilter != "" && typeFilter != pluginDef.Type {
 			continue
 		}
 
 		listItem := &dtos.PluginListItem{
-			PluginId: pluginDef.Id,
-			Name:     pluginDef.Name,
-			Type:     pluginDef.Type,
-			Info:     &pluginDef.Info,
+			Id:   pluginDef.Id,
+			Name: pluginDef.Name,
+			Type: pluginDef.Type,
+			Info: &pluginDef.Info,
 		}
 
 		if pluginSetting, exists := pluginSettingsMap[pluginDef.Id]; exists {
@@ -34,6 +43,11 @@ func GetPluginList(c *middleware.Context) Response {
 			listItem.Pinned = pluginSetting.Pinned
 		}
 
+		// filter out disabled
+		if enabledFilter == "1" && !listItem.Enabled {
+			continue
+		}
+
 		result = append(result, listItem)
 	}
 
@@ -46,19 +60,20 @@ func GetPluginSettingById(c *middleware.Context) Response {
 	if def, exists := plugins.Plugins[pluginId]; !exists {
 		return ApiError(404, "Plugin not found, no installed plugin with that id", nil)
 	} else {
+
 		dto := &dtos.PluginSetting{
 			Type:         def.Type,
-			PluginId:     def.Id,
+			Id:           def.Id,
 			Name:         def.Name,
 			Info:         &def.Info,
 			Dependencies: &def.Dependencies,
+			Includes:     def.Includes,
+			BaseUrl:      def.BaseUrl,
+			Module:       def.Module,
 		}
 
 		if app, exists := plugins.Apps[pluginId]; exists {
 			dto.Pages = app.Pages
-			dto.Includes = app.Includes
-			dto.BaseUrl = app.BaseUrl
-			dto.Module = app.Module
 		}
 
 		query := m.GetPluginSettingByIdQuery{PluginId: pluginId, OrgId: c.OrgId}