Merge branch 'externalPlugin' of https://github.com/raintank/grafana into external-plugins

pkg/api/api.go

@@ -187,5 +187,7 @@ func Register(r *macaron.Macaron) {
 	// rendering
 	r.Get("/render/*", reqSignedIn, RenderToPng)
 
+	InitExternalPluginRoutes(r)
+
 	r.NotFound(NotFoundHandler)
 }

pkg/api/externalplugin.go

@@ -0,0 +1,74 @@
+package api
+
+import (
+	"encoding/json"
+	"github.com/Unknwon/macaron"
+	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/middleware"
+	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/util"
+	"net/http"
+	"net/http/httputil"
+	"net/url"
+)
+
+func InitExternalPluginRoutes(r *macaron.Macaron) {
+	/*
+		// Handle Auth and role requirements
+		if route.ReqSignedIn {
+			c.Invoke(middleware.Auth(&middleware.AuthOptions{ReqSignedIn: true}))
+		}
+		if route.ReqGrafanaAdmin {
+			c.Invoke(middleware.Auth(&middleware.AuthOptions{ReqSignedIn: true, ReqGrafanaAdmin: true}))
+		}
+		if route.ReqRole != nil {
+			if *route.ReqRole == m.ROLE_EDITOR {
+				c.Invoke(middleware.RoleAuth(m.ROLE_EDITOR, m.ROLE_ADMIN))
+			}
+			if *route.ReqRole == m.ROLE_ADMIN {
+				c.Invoke(middleware.RoleAuth(m.ROLE_ADMIN))
+			}
+		}
+	*/
+	for _, plugin := range plugins.ExternalPlugins {
+		log.Info("adding routes for external plugin")
+		for _, route := range plugin.Settings.Routes {
+			log.Info("adding route %s /plugins%s", route.Method, route.Path)
+			r.Route(util.JoinUrlFragments("/plugins/", route.Path), route.Method, ExternalPlugin(route.Url))
+		}
+	}
+}
+
+func ExternalPlugin(routeUrl string) macaron.Handler {
+	return func(c *middleware.Context) {
+		path := c.Params("*")
+
+		//Create a HTTP header with the context in it.
+		ctx, err := json.Marshal(c.SignedInUser)
+		if err != nil {
+			c.JsonApiErr(500, "failed to marshal context to json.", err)
+			return
+		}
+		targetUrl, _ := url.Parse(routeUrl)
+		proxy := NewExternalPluginProxy(string(ctx), path, targetUrl)
+		proxy.Transport = dataProxyTransport
+		proxy.ServeHTTP(c.RW(), c.Req.Request)
+	}
+}
+
+func NewExternalPluginProxy(ctx string, proxyPath string, targetUrl *url.URL) *httputil.ReverseProxy {
+	director := func(req *http.Request) {
+		req.URL.Scheme = targetUrl.Scheme
+		req.URL.Host = targetUrl.Host
+		req.Host = targetUrl.Host
+
+		req.URL.Path = util.JoinUrlFragments(targetUrl.Path, proxyPath)
+
+		// clear cookie headers
+		req.Header.Del("Cookie")
+		req.Header.Del("Set-Cookie")
+		req.Header.Add("Grafana-Context", ctx)
+	}
+
+	return &httputil.ReverseProxy{Director: director}
+}

pkg/api/index.go

@@ -3,6 +3,7 @@ package api
 import (
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/middleware"
+	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
@@ -52,6 +53,25 @@ func setIndexViewData(c *middleware.Context) error {
 		c.Data["GoogleTagManagerId"] = setting.GoogleTagManagerId
 	}
 
+	externalPluginJs := make([]string, 0)
+	externalPluginCss := make([]string, 0)
+	externalPluginMenu := make([]*plugins.ExternalPluginMenuItem, 0)
+	for _, plugin := range plugins.ExternalPlugins {
+		for _, js := range plugin.Settings.Js {
+			externalPluginJs = append(externalPluginJs, js.Src)
+		}
+		for _, css := range plugin.Settings.Css {
+			externalPluginCss = append(externalPluginCss, css.Href)
+		}
+		for _, item := range plugin.Settings.MenuItems {
+			externalPluginMenu = append(externalPluginMenu, item)
+		}
+
+	}
+	c.Data["ExternalPluginJs"] = externalPluginJs
+	c.Data["ExternalPluginCss"] = externalPluginCss
+	c.Data["ExternalPluginMenu"] = externalPluginMenu
+
 	return nil
 }
 

pkg/plugins/plugins.go

@@ -8,6 +8,7 @@ import (
 	"path/filepath"
 
 	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
@@ -16,8 +17,44 @@ type PluginMeta struct {
 	Name string `json:"name"`
 }
 
+type ExternalPluginRoute struct {
+	Path            string          `json:"path"`
+	Method          string          `json:"method"`
+	ReqSignedIn     bool            `json:"req_signed_in"`
+	ReqGrafanaAdmin bool            `json:"req_grafana_admin"`
+	ReqRole         models.RoleType `json:"req_role"`
+	Url             string          `json:"url"`
+}
+
+type ExternalPluginJs struct {
+	Src string `json:"src"`
+}
+
+type ExternalPluginMenuItem struct {
+	Text string `json:"text"`
+	Icon string `json:"icon"`
+	Href string `json:"href"`
+}
+
+type ExternalPluginCss struct {
+	Href string `json:"href"`
+}
+
+type ExternalPluginSettings struct {
+	Routes    []*ExternalPluginRoute    `json:"routes"`
+	Js        []*ExternalPluginJs       `json:"js"`
+	Css       []*ExternalPluginCss      `json:"css"`
+	MenuItems []*ExternalPluginMenuItem `json:"menu_items"`
+}
+
+type ExternalPlugin struct {
+	PluginType string                 `json:"pluginType"`
+	Settings   ExternalPluginSettings `json:"settings"`
+}
+
 var (
-	DataSources map[string]interface{}
+	DataSources     map[string]interface{}
+	ExternalPlugins []ExternalPlugin
 )
 
 type PluginScanner struct {
@@ -31,6 +68,7 @@ func Init() {
 
 func scan(pluginDir string) error {
 	DataSources = make(map[string]interface{})
+	ExternalPlugins = make([]ExternalPlugin, 0)
 
 	scanner := &PluginScanner{
 		pluginPath: pluginDir,
@@ -93,6 +131,14 @@ func (scanner *PluginScanner) loadPluginJson(path string) error {
 		}
 		DataSources[datasourceType.(string)] = pluginJson
 	}
+	if pluginType == "externalPlugin" {
+		p := ExternalPlugin{}
+		reader.Seek(0, 0)
+		if err := jsonParser.Decode(&p); err != nil {
+			return err
+		}
+		ExternalPlugins = append(ExternalPlugins, p)
+	}
 
 	return nil
 }