diff --git a/pkg/tsdb/models/proxy/wrapper.go b/pkg/tsdb/models/proxy/wrapper.go
index 880bed0c121..06ee63f8fd2 100644
--- a/pkg/tsdb/models/proxy/wrapper.go
+++ b/pkg/tsdb/models/proxy/wrapper.go
@@ -27,6 +27,8 @@ func (tw *TsdbWrapper) Query(ctx context.Context, ds *models.DataSource, query *
 			Name:              ds.Name,
 			Type:              ds.Type,
 			Url:               ds.Url,
+			Id:                ds.Id,
+			OrgId:             ds.OrgId,
 		},
 		Timerange: &proto.Timerange{
 			From: query.TimeRange.From,
diff --git a/pkg/tsdb/models/tsdb_plugin.pb.go b/pkg/tsdb/models/tsdb_plugin.pb.go
index a515f68f466..063af51792a 100644
--- a/pkg/tsdb/models/tsdb_plugin.pb.go
+++ b/pkg/tsdb/models/tsdb_plugin.pb.go
@@ -73,11 +73,10 @@ func (m *TsdbQuery) GetQueries() []*Query {
 }
 
 type Query struct {
-	RefId         string          `protobuf:"bytes,1,opt,name=refId" json:"refId,omitempty"`
-	ModelJson     string          `protobuf:"bytes,2,opt,name=modelJson" json:"modelJson,omitempty"`
-	MaxDataPoints int64           `protobuf:"varint,3,opt,name=MaxDataPoints" json:"MaxDataPoints,omitempty"`
-	IntervalMs    int64           `protobuf:"varint,4,opt,name=intervalMs" json:"intervalMs,omitempty"`
-	Datasource    *DatasourceInfo `protobuf:"bytes,5,opt,name=datasource" json:"datasource,omitempty"`
+	RefId         string `protobuf:"bytes,1,opt,name=refId" json:"refId,omitempty"`
+	ModelJson     string `protobuf:"bytes,2,opt,name=modelJson" json:"modelJson,omitempty"`
+	MaxDataPoints int64  `protobuf:"varint,3,opt,name=MaxDataPoints" json:"MaxDataPoints,omitempty"`
+	IntervalMs    int64  `protobuf:"varint,4,opt,name=intervalMs" json:"intervalMs,omitempty"`
 }
 
 func (m *Query) Reset()                    { *m = Query{} }
@@ -113,13 +112,6 @@ func (m *Query) GetIntervalMs() int64 {
 	return 0
 }
 
-func (m *Query) GetDatasource() *DatasourceInfo {
-	if m != nil {
-		return m.Datasource
-	}
-	return nil
-}
-
 type Timerange struct {
 	From string                     `protobuf:"bytes,1,opt,name=from" json:"from,omitempty"`
 	To   string                     `protobuf:"bytes,2,opt,name=to" json:"to,omitempty"`
@@ -462,48 +454,47 @@ var _TsdbPlugin_serviceDesc = grpc.ServiceDesc{
 func init() { proto1.RegisterFile("tsdb_plugin.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 681 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xdf, 0x6b, 0xd4, 0x4a,
-	0x14, 0x26, 0xc9, 0xfe, 0xca, 0x59, 0xee, 0x72, 0x3b, 0xb7, 0xdc, 0x1b, 0x96, 0xab, 0x2e, 0x41,
-	0xca, 0x82, 0x25, 0xd5, 0xf5, 0xa1, 0x45, 0x7c, 0x51, 0xf4, 0xa1, 0x85, 0x42, 0x9d, 0xae, 0x08,
-	0x82, 0xc8, 0xec, 0x66, 0x36, 0x46, 0x93, 0xcc, 0x3a, 0x33, 0x69, 0xdd, 0xff, 0xc6, 0x07, 0xff,
-	0x04, 0x9f, 0x7c, 0xf0, 0x6f, 0x93, 0x39, 0x99, 0x64, 0xb3, 0x55, 0xc4, 0xa7, 0xcc, 0x39, 0xe7,
-	0x9b, 0xc9, 0x37, 0xdf, 0x77, 0xe6, 0xc0, 0x9e, 0x56, 0xf1, 0xe2, 0xed, 0x3a, 0x2b, 0x93, 0xb4,
-	0x88, 0xd6, 0x52, 0x68, 0x41, 0xfa, 0x55, 0xa4, 0xc6, 0x77, 0x12, 0x21, 0x92, 0x8c, 0x1f, 0x61,
-	0x7a, 0x51, 0xae, 0x8e, 0x74, 0x9a, 0x73, 0xa5, 0x59, 0xbe, 0xae, 0x90, 0xe1, 0x67, 0x07, 0xfc,
-	0xb9, 0x8a, 0x17, 0x2f, 0x4a, 0x2e, 0x37, 0xe4, 0x3e, 0xf8, 0x06, 0x20, 0x59, 0x91, 0xf0, 0xc0,
-	0x99, 0x38, 0xd3, 0xe1, 0x8c, 0x44, 0xf6, 0xac, 0x68, 0x5e, 0x57, 0xe8, 0x16, 0x44, 0x8e, 0x01,
-	0x62, 0xa6, 0x99, 0x12, 0xa5, 0x5c, 0xf2, 0xc0, 0xc5, 0x2d, 0xff, 0x35, 0x5b, 0x9e, 0x35, 0xa5,
-	0xd3, 0x62, 0x25, 0x68, 0x0b, 0x4a, 0xa6, 0xd0, 0xff, 0x58, 0x72, 0x99, 0x72, 0x15, 0x78, 0x13,
-	0x6f, 0x3a, 0x9c, 0x8d, 0x9a, 0x5d, 0xc8, 0x85, 0xd6, 0xe5, 0xf0, 0x9b, 0x03, 0xdd, 0x8a, 0xde,
-	0x3e, 0x74, 0x25, 0x5f, 0x9d, 0xc6, 0x48, 0xcd, 0xa7, 0x55, 0x40, 0xfe, 0x07, 0x3f, 0x17, 0x31,
-	0xcf, 0xce, 0x94, 0x28, 0x90, 0x81, 0x4f, 0xb7, 0x09, 0x72, 0x17, 0xfe, 0x3a, 0x67, 0x9f, 0x0c,
-	0x91, 0x0b, 0x91, 0x16, 0xda, 0xfc, 0xcd, 0x99, 0x7a, 0x74, 0x37, 0x49, 0x6e, 0x03, 0xa4, 0x85,
-	0xe6, 0xf2, 0x8a, 0x65, 0xe7, 0x2a, 0xe8, 0x20, 0xa4, 0x95, 0xb9, 0x71, 0xcd, 0xee, 0x1f, 0x5f,
-	0x33, 0x7c, 0x03, 0x7e, 0xa3, 0x1b, 0x21, 0xd0, 0x59, 0x49, 0x91, 0x5b, 0xfa, 0xb8, 0x26, 0x23,
-	0x70, 0xb5, 0xb0, 0xb4, 0x5d, 0x2d, 0xc8, 0x21, 0x78, 0x85, 0xb8, 0x46, 0x96, 0xc3, 0xd9, 0x38,
-	0xaa, 0xfc, 0x8b, 0x6a, 0xff, 0xd0, 0x04, 0xf4, 0x8f, 0x1a, 0x58, 0x38, 0x87, 0x01, 0xe5, 0x6a,
-	0x2d, 0x0a, 0xc5, 0x49, 0x00, 0xfd, 0x9c, 0x2b, 0xc5, 0xac, 0x75, 0x3e, 0xad, 0x43, 0x12, 0x41,
-	0x5f, 0x72, 0x55, 0x66, 0x5a, 0x05, 0x2e, 0x6a, 0xbd, 0x7f, 0x43, 0x6b, 0x2c, 0xd2, 0x1a, 0x14,
-	0x7e, 0x71, 0x60, 0xd8, 0x2a, 0x18, 0xdd, 0xb9, 0x94, 0x42, 0xd6, 0xba, 0x63, 0x40, 0x26, 0x30,
-	0xc4, 0xc5, 0xa5, 0x96, 0x69, 0x91, 0xd8, 0x2b, 0xb4, 0x53, 0x5b, 0xbf, 0xbc, 0xb6, 0x5f, 0x63,
-	0x18, 0xe4, 0x5c, 0x33, 0xb4, 0xab, 0x83, 0x85, 0x26, 0x26, 0xf7, 0xa0, 0xa7, 0xaa, 0xa6, 0xe8,
-	0x22, 0xd1, 0x7f, 0x76, 0xba, 0xef, 0x12, 0x4b, 0xd4, 0x42, 0xc2, 0xef, 0x2e, 0x8c, 0x76, 0xa5,
-	0x37, 0x6a, 0xa6, 0x55, 0x7b, 0x78, 0xd4, 0x4d, 0x63, 0xc3, 0x40, 0xc8, 0xe4, 0x34, 0x46, 0x76,
-	0x1e, 0xad, 0x02, 0xe3, 0x43, 0xc1, 0x72, 0x6e, 0x69, 0xe1, 0xda, 0xe4, 0xf4, 0x66, 0xcd, 0x2d,
-	0x23, 0x5c, 0x93, 0x7f, 0xa1, 0xc7, 0x96, 0x4b, 0xae, 0x14, 0x3a, 0xee, 0x53, 0x1b, 0x91, 0xbf,
-	0xc1, 0x2b, 0x65, 0x16, 0xf4, 0x30, 0x69, 0x96, 0xa6, 0x07, 0x17, 0x4c, 0xa5, 0xcb, 0x27, 0xa5,
-	0x7e, 0x17, 0xf4, 0x27, 0xce, 0x74, 0x40, 0xb7, 0x09, 0xd3, 0x83, 0x4d, 0xf0, 0x52, 0x71, 0x19,
-	0x0c, 0x70, 0xe7, 0x6e, 0x92, 0x1c, 0xc2, 0x5e, 0x93, 0xb8, 0x60, 0x4a, 0x5d, 0x0b, 0x19, 0x07,
-	0x3e, 0x22, 0x7f, 0x2e, 0x18, 0x15, 0xdf, 0x2b, 0x51, 0x98, 0xfb, 0x07, 0x50, 0xa9, 0x58, 0xc7,
-	0xe4, 0x00, 0x46, 0x8a, 0x2f, 0x4b, 0xc9, 0xcf, 0x6a, 0xc4, 0x10, 0x11, 0x37, 0xb2, 0xe1, 0x57,
-	0x07, 0x60, 0xab, 0x6b, 0x23, 0x8b, 0xd3, 0x92, 0xe5, 0x01, 0x74, 0x34, 0x4b, 0xea, 0xbe, 0xb9,
-	0xf5, 0x0b, 0x3b, 0xa2, 0x39, 0x4b, 0xd4, 0xf3, 0x42, 0xcb, 0x0d, 0x45, 0x28, 0x39, 0x80, 0xde,
-	0xba, 0x7e, 0x6a, 0xbb, 0x0f, 0x1b, 0x1f, 0x1b, 0xb5, 0xd5, 0xf1, 0x31, 0xf8, 0xcd, 0x56, 0x23,
-	0xe9, 0x07, 0xbe, 0xb1, 0xbf, 0x36, 0x4b, 0x63, 0xdd, 0x15, 0xcb, 0x4a, 0x6e, 0x1b, 0xab, 0x0a,
-	0x1e, 0xb9, 0x27, 0x4e, 0xf8, 0x0a, 0xba, 0x78, 0x12, 0x39, 0xa9, 0xc6, 0x15, 0xbe, 0x07, 0x3b,
-	0xae, 0x7e, 0xf7, 0x62, 0xb6, 0xe0, 0xdd, 0xc3, 0x1d, 0x7b, 0xf8, 0xec, 0x31, 0x80, 0x99, 0x85,
-	0x17, 0x48, 0x97, 0x44, 0xf5, 0xd8, 0x69, 0x8d, 0xc0, 0x7a, 0x52, 0x8e, 0xf7, 0x9a, 0x5c, 0xfd,
-	0xfe, 0x9e, 0xf6, 0x5f, 0x77, 0xab, 0x9f, 0xf6, 0xf0, 0xf3, 0xf0, 0x47, 0x00, 0x00, 0x00, 0xff,
-	0xff, 0x3c, 0x7f, 0xa7, 0xd6, 0x99, 0x05, 0x00, 0x00,
+	// 672 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x54, 0x5d, 0x6f, 0xd3, 0x3c,
+	0x14, 0x56, 0x92, 0x7e, 0xe5, 0x54, 0x6f, 0xf5, 0xce, 0xef, 0xf4, 0x12, 0x55, 0x7c, 0x54, 0x11,
+	0x9a, 0x2a, 0x31, 0x65, 0x50, 0x2e, 0x36, 0x21, 0x6e, 0x40, 0x70, 0xb1, 0x49, 0x93, 0x86, 0x57,
+	0x84, 0x84, 0x84, 0x90, 0xdb, 0xb8, 0x21, 0x90, 0xc4, 0xc5, 0x76, 0x36, 0x7a, 0xc9, 0x3f, 0xe1,
+	0x82, 0x9f, 0xc0, 0x35, 0xbf, 0x0d, 0xf9, 0xc4, 0x49, 0xd3, 0x81, 0xb8, 0x8a, 0xcf, 0x73, 0x1e,
+	0xdb, 0x4f, 0x9e, 0xe3, 0x73, 0x60, 0x4f, 0xab, 0x78, 0xf1, 0x7e, 0x9d, 0x95, 0x49, 0x5a, 0x44,
+	0x6b, 0x29, 0xb4, 0x20, 0xfd, 0x2a, 0x52, 0xe3, 0x7b, 0x89, 0x10, 0x49, 0xc6, 0x8f, 0x10, 0x5e,
+	0x94, 0xab, 0x23, 0x9d, 0xe6, 0x5c, 0x69, 0x96, 0xaf, 0x2b, 0x66, 0xf8, 0xcd, 0x01, 0x7f, 0xae,
+	0xe2, 0xc5, 0xab, 0x92, 0xcb, 0x0d, 0x79, 0x08, 0xbe, 0x21, 0x48, 0x56, 0x24, 0x3c, 0x70, 0x26,
+	0xce, 0x74, 0x38, 0x23, 0x91, 0x3d, 0x2b, 0x9a, 0xd7, 0x19, 0xba, 0x25, 0x91, 0x63, 0x80, 0x98,
+	0x69, 0xa6, 0x44, 0x29, 0x97, 0x3c, 0x70, 0x71, 0xcb, 0xad, 0x66, 0xcb, 0x8b, 0x26, 0x75, 0x5a,
+	0xac, 0x04, 0x6d, 0x51, 0xc9, 0x14, 0xfa, 0x9f, 0x4b, 0x2e, 0x53, 0xae, 0x02, 0x6f, 0xe2, 0x4d,
+	0x87, 0xb3, 0x51, 0xb3, 0x0b, 0xb5, 0xd0, 0x3a, 0x1d, 0x7e, 0x75, 0xa0, 0x5b, 0xc9, 0xdb, 0x87,
+	0xae, 0xe4, 0xab, 0xd3, 0x18, 0xa5, 0xf9, 0xb4, 0x0a, 0xc8, 0x6d, 0xf0, 0x73, 0x11, 0xf3, 0xec,
+	0x4c, 0x89, 0x02, 0x15, 0xf8, 0x74, 0x0b, 0x90, 0xfb, 0xf0, 0xcf, 0x39, 0xfb, 0x62, 0x84, 0x5c,
+	0x88, 0xb4, 0xd0, 0xe6, 0x36, 0x67, 0xea, 0xd1, 0x5d, 0x90, 0xdc, 0x05, 0x48, 0x0b, 0xcd, 0xe5,
+	0x15, 0xcb, 0xce, 0x55, 0xd0, 0x41, 0x4a, 0x0b, 0x09, 0xdf, 0x81, 0xdf, 0xfc, 0x3e, 0x21, 0xd0,
+	0x59, 0x49, 0x91, 0x5b, 0x15, 0xb8, 0x26, 0x23, 0x70, 0xb5, 0xb0, 0xb7, 0xbb, 0x5a, 0x90, 0x43,
+	0xf0, 0x0a, 0x71, 0x8d, 0x97, 0x0d, 0x67, 0xe3, 0xa8, 0x2a, 0x43, 0x54, 0x97, 0x01, 0xbd, 0xc4,
+	0x32, 0x50, 0x43, 0x0b, 0xe7, 0x30, 0xa0, 0x5c, 0xad, 0x45, 0xa1, 0x38, 0x09, 0xa0, 0x9f, 0x73,
+	0xa5, 0x98, 0xad, 0x80, 0x4f, 0xeb, 0x90, 0x44, 0xd0, 0x97, 0x5c, 0x95, 0x99, 0x56, 0x81, 0x8b,
+	0x96, 0xed, 0xdf, 0xb0, 0x0c, 0x93, 0xb4, 0x26, 0x85, 0xdf, 0x1d, 0x18, 0xb6, 0x12, 0xc6, 0x3e,
+	0x2e, 0xa5, 0x90, 0xb5, 0x7d, 0x18, 0x90, 0x09, 0x0c, 0x71, 0x71, 0xa9, 0x65, 0x5a, 0x24, 0xf6,
+	0x17, 0xda, 0xd0, 0xd6, 0x76, 0xaf, 0x6d, 0xfb, 0x18, 0x06, 0x39, 0xd7, 0x0c, 0x5d, 0xef, 0x60,
+	0xa2, 0x89, 0xc9, 0x03, 0xe8, 0xa9, 0xaa, 0xb6, 0x5d, 0x14, 0xfa, 0xdf, 0xce, 0x23, 0xba, 0xc4,
+	0x14, 0xb5, 0x94, 0xf0, 0xa7, 0x0b, 0xa3, 0xdd, 0x87, 0x62, 0xdc, 0x4c, 0xab, 0x2a, 0x7b, 0xd4,
+	0x4d, 0x63, 0xa3, 0x40, 0xc8, 0xe4, 0x34, 0x46, 0x75, 0x1e, 0xad, 0x02, 0x53, 0x87, 0x82, 0xe5,
+	0xdc, 0xca, 0xc2, 0xb5, 0xc1, 0xf4, 0x66, 0xcd, 0xad, 0x22, 0x5c, 0x93, 0xff, 0xa1, 0xc7, 0x96,
+	0x4b, 0xae, 0x8c, 0x1a, 0x83, 0xda, 0x88, 0xfc, 0x0b, 0x5e, 0x29, 0xb3, 0xa0, 0x87, 0xa0, 0x59,
+	0x9a, 0xa7, 0xb4, 0x60, 0x2a, 0x5d, 0x3e, 0x2b, 0xf5, 0x87, 0xa0, 0x3f, 0x71, 0xa6, 0x03, 0xba,
+	0x05, 0xcc, 0x53, 0x6a, 0x82, 0xd7, 0x8a, 0xcb, 0x60, 0x80, 0x3b, 0x77, 0x41, 0x72, 0x08, 0x7b,
+	0x0d, 0x70, 0xc1, 0x94, 0xba, 0x16, 0x32, 0x0e, 0x7c, 0x64, 0xfe, 0x9e, 0x30, 0x2e, 0x7e, 0x54,
+	0xa2, 0x30, 0xff, 0x1f, 0x40, 0xe5, 0x62, 0x1d, 0x93, 0x03, 0x18, 0x29, 0xbe, 0x2c, 0x25, 0x3f,
+	0xab, 0x19, 0x43, 0x64, 0xdc, 0x40, 0xc3, 0x1f, 0x0e, 0xc0, 0xd6, 0xd7, 0xc6, 0x16, 0xa7, 0x65,
+	0xcb, 0x23, 0xe8, 0x68, 0x96, 0xd4, 0xef, 0xe6, 0xce, 0x1f, 0xca, 0x11, 0xcd, 0x59, 0xa2, 0x5e,
+	0x16, 0x5a, 0x6e, 0x28, 0x52, 0xc9, 0x01, 0xf4, 0xd6, 0x75, 0xc7, 0xec, 0xf6, 0x27, 0xf6, 0x0c,
+	0xb5, 0xd9, 0xf1, 0x31, 0xf8, 0xcd, 0x56, 0x63, 0xe9, 0x27, 0xbe, 0xb1, 0x57, 0x9b, 0xa5, 0x29,
+	0xdd, 0x15, 0xcb, 0x4a, 0x6e, 0x1f, 0x56, 0x15, 0x3c, 0x71, 0x4f, 0x9c, 0xf0, 0x0d, 0x74, 0xf1,
+	0x24, 0x72, 0x52, 0x4d, 0x1d, 0xec, 0x07, 0x3b, 0x75, 0xfe, 0xd6, 0x31, 0x5b, 0xf2, 0xee, 0xe1,
+	0x8e, 0x3d, 0x7c, 0xf6, 0x14, 0xc0, 0x8c, 0xb4, 0x0b, 0x94, 0x4b, 0xa2, 0x7a, 0x7a, 0xb4, 0x26,
+	0x59, 0x3d, 0xf0, 0xc6, 0x7b, 0x0d, 0x56, 0xf7, 0xdf, 0xf3, 0xfe, 0xdb, 0x6e, 0x75, 0x69, 0x0f,
+	0x3f, 0x8f, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0xa3, 0x9d, 0x34, 0x4f, 0x60, 0x05, 0x00, 0x00,
 }
diff --git a/pkg/tsdb/models/tsdb_plugin.proto b/pkg/tsdb/models/tsdb_plugin.proto
index 0d2bbe61ea7..374b856b82f 100644
--- a/pkg/tsdb/models/tsdb_plugin.proto
+++ b/pkg/tsdb/models/tsdb_plugin.proto
@@ -16,7 +16,7 @@ message Query {
   string modelJson = 2;
   int64 MaxDataPoints = 3;
   int64 intervalMs = 4;
-  DatasourceInfo datasource = 5;
+  // dont repeat. DatasourceInfo datasource = 5;
 }
 
 message Timerange {