moves plugin proxy to plugin package

pkg/tsdb/models/proxy/datasource_plugin_wrapper.go → pkg/plugins/datasource/tsdb/datasource_plugin_wrapper.go

@@ -1,4 +1,4 @@
-package proxy
+package tsdb
 
 import (
 	"github.com/golang/protobuf/ptypes"

pkg/tsdb/models/proxy/grpc.go → pkg/plugins/datasource/tsdb/grpc.go

@@ -1,4 +1,4 @@
-package proxy
+package tsdb
 
 import (
 	proto "github.com/grafana/grafana/pkg/tsdb/models"

pkg/tsdb/models/proxy/interface.go → pkg/plugins/datasource/tsdb/interface.go

@@ -1,4 +1,4 @@
-package proxy
+package tsdb
 
 import (
 	"golang.org/x/net/context"

pkg/plugins/datasource_plugin.go

@@ -14,9 +14,8 @@ import (
 
 	"github.com/grafana/grafana/pkg/log"
 	"github.com/grafana/grafana/pkg/models"
-	"github.com/grafana/grafana/pkg/plugins/backend"
+	shared "github.com/grafana/grafana/pkg/plugins/datasource/tsdb"
 	"github.com/grafana/grafana/pkg/tsdb"
-	shared "github.com/grafana/grafana/pkg/tsdb/models/proxy"
 	plugin "github.com/hashicorp/go-plugin"
 )
 
@@ -89,7 +88,7 @@ func (p *DataSourcePlugin) spawnSubProcess() error {
 		Plugins:          map[string]plugin.Plugin{p.Id: &shared.TsdbPluginImpl{}},
 		Cmd:              exec.Command(cmd),
 		AllowedProtocols: []plugin.Protocol{plugin.ProtocolGRPC},
-		Logger:           backend.LogWrapper{Logger: p.log},
+		Logger:           LogWrapper{Logger: p.log},
 	})
 
 	rpcClient, err := p.client.Client()

pkg/plugins/hclog-wrapper.go

@@ -1,4 +1,4 @@
-package backend
+package plugins
 
 import (
 	"log"