From ebd8677607eec8a03e5bfda4409d3b32d8efb981 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Wed, 10 Jan 2018 12:11:57 +0100
Subject: [PATCH] moves plugin proxy to plugin package

---
 .../datasource/tsdb}/datasource_plugin_wrapper.go            | 2 +-
 pkg/{tsdb/models/proxy => plugins/datasource/tsdb}/grpc.go   | 2 +-
 .../models/proxy => plugins/datasource/tsdb}/interface.go    | 2 +-
 pkg/plugins/datasource_plugin.go                             | 5 ++---
 pkg/plugins/hclog-wrapper.go                                 | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)
 rename pkg/{tsdb/models/proxy => plugins/datasource/tsdb}/datasource_plugin_wrapper.go (99%)
 rename pkg/{tsdb/models/proxy => plugins/datasource/tsdb}/grpc.go (97%)
 rename pkg/{tsdb/models/proxy => plugins/datasource/tsdb}/interface.go (97%)

diff --git a/pkg/tsdb/models/proxy/datasource_plugin_wrapper.go b/pkg/plugins/datasource/tsdb/datasource_plugin_wrapper.go
similarity index 99%
rename from pkg/tsdb/models/proxy/datasource_plugin_wrapper.go
rename to pkg/plugins/datasource/tsdb/datasource_plugin_wrapper.go
index d7ebeb07ecb..5087ec27207 100644
--- a/pkg/tsdb/models/proxy/datasource_plugin_wrapper.go
+++ b/pkg/plugins/datasource/tsdb/datasource_plugin_wrapper.go
@@ -1,4 +1,4 @@
-package proxy
+package tsdb
 
 import (
 	"github.com/golang/protobuf/ptypes"
diff --git a/pkg/tsdb/models/proxy/grpc.go b/pkg/plugins/datasource/tsdb/grpc.go
similarity index 97%
rename from pkg/tsdb/models/proxy/grpc.go
rename to pkg/plugins/datasource/tsdb/grpc.go
index b5871fcc053..c9d696f236e 100644
--- a/pkg/tsdb/models/proxy/grpc.go
+++ b/pkg/plugins/datasource/tsdb/grpc.go
@@ -1,4 +1,4 @@
-package proxy
+package tsdb
 
 import (
 	proto "github.com/grafana/grafana/pkg/tsdb/models"
diff --git a/pkg/tsdb/models/proxy/interface.go b/pkg/plugins/datasource/tsdb/interface.go
similarity index 97%
rename from pkg/tsdb/models/proxy/interface.go
rename to pkg/plugins/datasource/tsdb/interface.go
index f472ff1d583..740718cc4a9 100644
--- a/pkg/tsdb/models/proxy/interface.go
+++ b/pkg/plugins/datasource/tsdb/interface.go
@@ -1,4 +1,4 @@
-package proxy
+package tsdb
 
 import (
 	"golang.org/x/net/context"
diff --git a/pkg/plugins/datasource_plugin.go b/pkg/plugins/datasource_plugin.go
index 57a43b55d98..2c1faf2581a 100644
--- a/pkg/plugins/datasource_plugin.go
+++ b/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()
diff --git a/pkg/plugins/hclog-wrapper.go b/pkg/plugins/hclog-wrapper.go
index 94f1e9c5be4..cab7fc1a373 100644
--- a/pkg/plugins/hclog-wrapper.go
+++ b/pkg/plugins/hclog-wrapper.go
@@ -1,4 +1,4 @@
-package backend
+package plugins
 
 import (
 	"log"