Adds Tables types to protobuf

Makefile

@@ -27,5 +27,5 @@ test: test-go test-js
 run:
 	./bin/grafana-server
 
-pbuf:
+protoc:
 	protoc -I pkg/tsdb/models pkg/tsdb/models/*.proto --go_out=plugins=grpc:pkg/tsdb/models/.

pkg/tsdb/models/tsdb_plugin.pb.go

@@ -13,6 +13,9 @@ It has these top-level messages:
 	TimeRange
 	Response
 	QueryResult
+	Table
+	TableColumn
+	TableRow
 	DatasourceInfo
 	TimeSeries
 	Point
@@ -22,6 +25,7 @@ package proto
 import proto1 "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import google_protobuf "github.com/golang/protobuf/ptypes/any"
 
 import (
 	context "golang.org/x/net/context"
@@ -172,6 +176,7 @@ type QueryResult struct {
 	RefId    string        `protobuf:"bytes,2,opt,name=refId" json:"refId,omitempty"`
 	MetaJson string        `protobuf:"bytes,3,opt,name=metaJson" json:"metaJson,omitempty"`
 	Series   []*TimeSeries `protobuf:"bytes,4,rep,name=series" json:"series,omitempty"`
+	Tables   []*Table      `protobuf:"bytes,5,rep,name=tables" json:"tables,omitempty"`
 }
 
 func (m *QueryResult) Reset()                    { *m = QueryResult{} }
@@ -207,6 +212,69 @@ func (m *QueryResult) GetSeries() []*TimeSeries {
 	return nil
 }
 
+func (m *QueryResult) GetTables() []*Table {
+	if m != nil {
+		return m.Tables
+	}
+	return nil
+}
+
+type Table struct {
+	Columns []*TableColumn `protobuf:"bytes,1,rep,name=columns" json:"columns,omitempty"`
+	Rows    []*TableRow    `protobuf:"bytes,2,rep,name=rows" json:"rows,omitempty"`
+}
+
+func (m *Table) Reset()                    { *m = Table{} }
+func (m *Table) String() string            { return proto1.CompactTextString(m) }
+func (*Table) ProtoMessage()               {}
+func (*Table) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+
+func (m *Table) GetColumns() []*TableColumn {
+	if m != nil {
+		return m.Columns
+	}
+	return nil
+}
+
+func (m *Table) GetRows() []*TableRow {
+	if m != nil {
+		return m.Rows
+	}
+	return nil
+}
+
+type TableColumn struct {
+	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+}
+
+func (m *TableColumn) Reset()                    { *m = TableColumn{} }
+func (m *TableColumn) String() string            { return proto1.CompactTextString(m) }
+func (*TableColumn) ProtoMessage()               {}
+func (*TableColumn) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+
+func (m *TableColumn) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+type TableRow struct {
+	Values []*google_protobuf.Any `protobuf:"bytes,1,rep,name=values" json:"values,omitempty"`
+}
+
+func (m *TableRow) Reset()                    { *m = TableRow{} }
+func (m *TableRow) String() string            { return proto1.CompactTextString(m) }
+func (*TableRow) ProtoMessage()               {}
+func (*TableRow) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+
+func (m *TableRow) GetValues() []*google_protobuf.Any {
+	if m != nil {
+		return m.Values
+	}
+	return nil
+}
+
 type DatasourceInfo struct {
 	Id             int64  `protobuf:"varint,1,opt,name=id" json:"id,omitempty"`
 	OrgId          int64  `protobuf:"varint,2,opt,name=orgId" json:"orgId,omitempty"`
@@ -220,7 +288,7 @@ type DatasourceInfo struct {
 func (m *DatasourceInfo) Reset()                    { *m = DatasourceInfo{} }
 func (m *DatasourceInfo) String() string            { return proto1.CompactTextString(m) }
 func (*DatasourceInfo) ProtoMessage()               {}
-func (*DatasourceInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (*DatasourceInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
 
 func (m *DatasourceInfo) GetId() int64 {
 	if m != nil {
@@ -280,7 +348,7 @@ type TimeSeries struct {
 func (m *TimeSeries) Reset()                    { *m = TimeSeries{} }
 func (m *TimeSeries) String() string            { return proto1.CompactTextString(m) }
 func (*TimeSeries) ProtoMessage()               {}
-func (*TimeSeries) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (*TimeSeries) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
 
 func (m *TimeSeries) GetName() string {
 	if m != nil {
@@ -311,7 +379,7 @@ type Point struct {
 func (m *Point) Reset()                    { *m = Point{} }
 func (m *Point) String() string            { return proto1.CompactTextString(m) }
 func (*Point) ProtoMessage()               {}
-func (*Point) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (*Point) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
 
 func (m *Point) GetTimestamp() int64 {
 	if m != nil {
@@ -333,6 +401,9 @@ func init() {
 	proto1.RegisterType((*TimeRange)(nil), "plugins.TimeRange")
 	proto1.RegisterType((*Response)(nil), "plugins.Response")
 	proto1.RegisterType((*QueryResult)(nil), "plugins.QueryResult")
+	proto1.RegisterType((*Table)(nil), "plugins.Table")
+	proto1.RegisterType((*TableColumn)(nil), "plugins.TableColumn")
+	proto1.RegisterType((*TableRow)(nil), "plugins.TableRow")
 	proto1.RegisterType((*DatasourceInfo)(nil), "plugins.DatasourceInfo")
 	proto1.RegisterType((*TimeSeries)(nil), "plugins.TimeSeries")
 	proto1.RegisterType((*Point)(nil), "plugins.Point")
@@ -413,41 +484,47 @@ var _TsdbPlugin_serviceDesc = grpc.ServiceDesc{
 func init() { proto1.RegisterFile("tsdb_plugin.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 566 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x54, 0x51, 0x8b, 0xd3, 0x4c,
-	0x14, 0x25, 0x49, 0xdb, 0x6c, 0x6e, 0xf9, 0xca, 0xb7, 0xe3, 0x82, 0xa1, 0xa8, 0x94, 0x20, 0x4b,
-	0x41, 0x08, 0x5a, 0x1f, 0x56, 0x56, 0x9f, 0xc4, 0x7d, 0xd8, 0x05, 0x61, 0x1d, 0xfb, 0xe4, 0x8b,
-	0x4c, 0x9b, 0x69, 0x8c, 0x26, 0x99, 0x38, 0x33, 0x59, 0x2d, 0x3e, 0xe9, 0x2f, 0xf1, 0x47, 0xf8,
-	0x03, 0x65, 0x6e, 0x32, 0x49, 0x5a, 0x7c, 0xea, 0xdc, 0x73, 0xce, 0xcc, 0x3d, 0x39, 0x73, 0x3b,
-	0x70, 0xaa, 0x55, 0xb2, 0xf9, 0x58, 0xe5, 0x75, 0x9a, 0x95, 0x71, 0x25, 0x85, 0x16, 0xc4, 0x6f,
-	0x2a, 0x15, 0xfd, 0x76, 0x20, 0x58, 0xab, 0x64, 0xf3, 0xae, 0xe6, 0x72, 0x4f, 0x9e, 0x42, 0xa0,
-	0xb3, 0x82, 0x53, 0x56, 0xa6, 0x3c, 0x74, 0x16, 0xce, 0x72, 0xba, 0x22, 0x71, 0x2b, 0x8d, 0xd7,
-	0x96, 0xa1, 0xbd, 0x88, 0x5c, 0x00, 0x24, 0x4c, 0x33, 0x25, 0x6a, 0xb9, 0xe5, 0xa1, 0x8b, 0x5b,
-	0xee, 0x77, 0x5b, 0xde, 0x74, 0xd4, 0x75, 0xb9, 0x13, 0x74, 0x20, 0x25, 0x4b, 0xf0, 0xbf, 0xd6,
-	0x5c, 0x66, 0x5c, 0x85, 0xde, 0xc2, 0x5b, 0x4e, 0x57, 0xb3, 0x6e, 0x17, 0x7a, 0xa1, 0x96, 0x8e,
-	0x7e, 0x3a, 0x30, 0x6e, 0xec, 0x9d, 0xc1, 0x58, 0xf2, 0xdd, 0x75, 0x82, 0xd6, 0x02, 0xda, 0x14,
-	0xe4, 0x31, 0xfc, 0x57, 0xb0, 0xef, 0xa6, 0xd5, 0xad, 0xc8, 0x4a, 0xad, 0xd0, 0x85, 0x47, 0x0f,
-	0x41, 0xf2, 0x08, 0x20, 0x2b, 0x35, 0x97, 0x77, 0x2c, 0x7f, 0x6b, 0x5a, 0x1a, 0xc9, 0x00, 0x21,
-	0x0f, 0x20, 0x28, 0x44, 0xc2, 0xf3, 0x1b, 0x25, 0xca, 0x70, 0x84, 0xe7, 0xf7, 0x40, 0xf4, 0x03,
-	0x82, 0xee, 0xf3, 0x49, 0x08, 0xfe, 0x4e, 0x8a, 0x82, 0xb2, 0x6f, 0xad, 0x11, 0x5b, 0x1a, 0x83,
-	0x5a, 0x18, 0xdc, 0x6d, 0x0c, 0x62, 0x41, 0x16, 0x30, 0x35, 0x82, 0xab, 0x4a, 0x6c, 0x3f, 0x75,
-	0xbd, 0x87, 0x90, 0x69, 0xae, 0x85, 0xe5, 0x47, 0xc8, 0xf7, 0x40, 0x74, 0x09, 0x27, 0x94, 0xab,
-	0x4a, 0x94, 0x8a, 0x93, 0x18, 0x7c, 0xc9, 0x55, 0x9d, 0x6b, 0x15, 0x3a, 0x18, 0xdb, 0xd9, 0x51,
-	0x6c, 0x48, 0x52, 0x2b, 0x8a, 0x7e, 0x39, 0x30, 0x1d, 0x10, 0xc6, 0x21, 0x97, 0x52, 0x48, 0x1b,
-	0x21, 0x16, 0x7d, 0xb0, 0xee, 0x30, 0xd8, 0x39, 0x9c, 0x14, 0x5c, 0x33, 0x4c, 0xc4, 0x43, 0xa2,
-	0xab, 0xc9, 0x13, 0x98, 0xa8, 0xe6, 0xf6, 0x46, 0x68, 0xe3, 0xde, 0xc1, 0x98, 0xbc, 0x47, 0x8a,
-	0xb6, 0x92, 0xe8, 0x8f, 0x03, 0xb3, 0xc3, 0x51, 0x20, 0x33, 0x70, 0xb3, 0xe6, 0x1e, 0x3d, 0xea,
-	0x66, 0x89, 0x71, 0x20, 0x64, 0xda, 0x3a, 0xf0, 0x68, 0x53, 0x10, 0x02, 0xa3, 0x92, 0x15, 0xbc,
-	0xed, 0x8e, 0x6b, 0x83, 0xe9, 0x7d, 0xc5, 0xdb, 0x3b, 0xc2, 0x35, 0xf9, 0x1f, 0xbc, 0x5a, 0xe6,
-	0xe1, 0x18, 0x21, 0xb3, 0x34, 0xde, 0x3f, 0x2b, 0x51, 0x9a, 0xae, 0xe1, 0xa4, 0xf1, 0x6e, 0x6b,
-	0x72, 0x0e, 0x33, 0xc5, 0xb7, 0xb5, 0xe4, 0x37, 0x56, 0xe1, 0xa3, 0xe2, 0x08, 0x35, 0xb6, 0xa1,
-	0xff, 0x9a, 0xce, 0x8c, 0x33, 0x30, 0xf3, 0x0c, 0x46, 0x9a, 0xa5, 0x66, 0xe4, 0x4c, 0x08, 0x0f,
-	0xff, 0x11, 0x42, 0xbc, 0x66, 0xa9, 0xba, 0x2a, 0xb5, 0xdc, 0x53, 0x94, 0x92, 0x73, 0x98, 0x54,
-	0xcd, 0x9c, 0x1e, 0xcf, 0x3d, 0x4e, 0x2a, 0x6d, 0xd9, 0xf9, 0x05, 0x04, 0xdd, 0x56, 0xf3, 0x81,
-	0x5f, 0xf8, 0xbe, 0x6d, 0x6d, 0x96, 0x26, 0xb0, 0x3b, 0x96, 0xd7, 0xdc, 0x5e, 0x19, 0x16, 0x97,
-	0xee, 0x0b, 0x27, 0x7a, 0x09, 0x63, 0x3c, 0x09, 0xa7, 0x2a, 0x2b, 0xb8, 0xd2, 0xac, 0xa8, 0xda,
-	0xa8, 0x7b, 0xe0, 0xf0, 0x00, 0xa7, 0x3d, 0x60, 0xf5, 0x0a, 0xc0, 0x3c, 0x07, 0xb7, 0x68, 0x89,
-	0xc4, 0xf6, 0x9f, 0x37, 0x78, 0x05, 0xec, 0x63, 0x31, 0x3f, 0xed, 0x30, 0x3b, 0x9d, 0xaf, 0xfd,
-	0x0f, 0x63, 0x7c, 0x5f, 0x36, 0x13, 0xfc, 0x79, 0xfe, 0x37, 0x00, 0x00, 0xff, 0xff, 0xbf, 0x69,
-	0x3b, 0x74, 0x7b, 0x04, 0x00, 0x00,
+	// 665 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x54, 0x4d, 0x6f, 0xd4, 0x30,
+	0x10, 0x55, 0x36, 0xfb, 0xd1, 0x9d, 0x15, 0x2b, 0x6a, 0x2a, 0x11, 0x56, 0x80, 0x4a, 0x04, 0x55,
+	0x25, 0x50, 0x0a, 0xe5, 0xd0, 0xaa, 0x70, 0xe1, 0xa3, 0x87, 0x56, 0x42, 0x2a, 0x66, 0x4f, 0x1c,
+	0x40, 0xde, 0x5d, 0x6f, 0x08, 0x24, 0x76, 0xb0, 0x9d, 0x96, 0x15, 0x27, 0xfe, 0x09, 0x67, 0xce,
+	0xfc, 0x40, 0xe4, 0x49, 0x9c, 0x64, 0x97, 0x9e, 0x92, 0x99, 0xf7, 0x6c, 0x3f, 0xbf, 0x99, 0x31,
+	0x6c, 0x1b, 0xbd, 0x98, 0x7d, 0xce, 0xd3, 0x22, 0x4e, 0x44, 0x94, 0x2b, 0x69, 0x24, 0x19, 0x94,
+	0x91, 0x9e, 0xdc, 0x89, 0xa5, 0x8c, 0x53, 0x7e, 0x80, 0xe9, 0x59, 0xb1, 0x3c, 0x60, 0x62, 0x55,
+	0x72, 0xc2, 0xdf, 0x1e, 0x0c, 0xa7, 0x7a, 0x31, 0x7b, 0x5f, 0x70, 0xb5, 0x22, 0x4f, 0x61, 0x68,
+	0x92, 0x8c, 0x53, 0x26, 0x62, 0x1e, 0x78, 0xbb, 0xde, 0xfe, 0xe8, 0x90, 0x44, 0xd5, 0x2e, 0xd1,
+	0xd4, 0x21, 0xb4, 0x21, 0x91, 0x23, 0x80, 0x05, 0x33, 0x4c, 0xcb, 0x42, 0xcd, 0x79, 0xd0, 0xc1,
+	0x25, 0xb7, 0xeb, 0x25, 0x6f, 0x6b, 0xe8, 0x4c, 0x2c, 0x25, 0x6d, 0x51, 0xc9, 0x3e, 0x0c, 0xbe,
+	0x17, 0x5c, 0x25, 0x5c, 0x07, 0xfe, 0xae, 0xbf, 0x3f, 0x3a, 0x1c, 0xd7, 0xab, 0x50, 0x0b, 0x75,
+	0x70, 0xf8, 0xcb, 0x83, 0x5e, 0x29, 0x6f, 0x07, 0x7a, 0x8a, 0x2f, 0xcf, 0x16, 0x28, 0x6d, 0x48,
+	0xcb, 0x80, 0x3c, 0x84, 0x1b, 0x19, 0xfb, 0x61, 0x8f, 0xba, 0x90, 0x89, 0x30, 0x1a, 0x55, 0xf8,
+	0x74, 0x3d, 0x49, 0xee, 0x03, 0x24, 0xc2, 0x70, 0x75, 0xc9, 0xd2, 0x77, 0xf6, 0x48, 0x4b, 0x69,
+	0x65, 0xc8, 0x5d, 0x18, 0x66, 0x72, 0xc1, 0xd3, 0x73, 0x2d, 0x45, 0xd0, 0xc5, 0xfd, 0x9b, 0x44,
+	0xf8, 0x13, 0x86, 0xf5, 0xf5, 0x49, 0x00, 0x83, 0xa5, 0x92, 0x19, 0x65, 0x57, 0x95, 0x10, 0x17,
+	0x5a, 0x81, 0x46, 0xda, 0x7c, 0xa7, 0x14, 0x88, 0x01, 0xd9, 0x85, 0x91, 0x25, 0x9c, 0xe6, 0x72,
+	0xfe, 0xa5, 0x3e, 0xbb, 0x9d, 0xb2, 0x87, 0x1b, 0xe9, 0xf0, 0x2e, 0xe2, 0x4d, 0x22, 0x3c, 0x81,
+	0x2d, 0xca, 0x75, 0x2e, 0x85, 0xe6, 0x24, 0x82, 0x81, 0xe2, 0xba, 0x48, 0x8d, 0x0e, 0x3c, 0xb4,
+	0x6d, 0x67, 0xc3, 0x36, 0x04, 0xa9, 0x23, 0x85, 0x7f, 0x3c, 0x18, 0xb5, 0x00, 0xab, 0x90, 0x2b,
+	0x25, 0x95, 0xb3, 0x10, 0x83, 0xc6, 0xd8, 0x4e, 0xdb, 0xd8, 0x09, 0x6c, 0x65, 0xdc, 0x30, 0x74,
+	0xc4, 0x47, 0xa0, 0x8e, 0xc9, 0x63, 0xe8, 0xeb, 0xb2, 0x7a, 0x5d, 0x94, 0x71, 0x6b, 0xad, 0x4d,
+	0x3e, 0x20, 0x44, 0x2b, 0x0a, 0xd9, 0x83, 0xbe, 0x61, 0xb3, 0x94, 0xeb, 0xa0, 0xb7, 0x51, 0xea,
+	0xa9, 0x4d, 0xd3, 0x0a, 0x0d, 0x3f, 0x41, 0x0f, 0x13, 0xf6, 0x96, 0x73, 0x99, 0x16, 0x99, 0xf8,
+	0xff, 0x96, 0x48, 0x78, 0x83, 0x20, 0x75, 0x24, 0xf2, 0x08, 0xba, 0x4a, 0x5e, 0xd9, 0xca, 0x5b,
+	0xf2, 0xf6, 0xc6, 0xf6, 0xf2, 0x8a, 0x22, 0x1c, 0x3e, 0x80, 0x51, 0x6b, 0x39, 0x21, 0xd0, 0x15,
+	0x2c, 0xe3, 0x95, 0x15, 0xf8, 0x1f, 0x1e, 0xc3, 0x96, 0x5b, 0x44, 0x9e, 0x40, 0xff, 0x92, 0xa5,
+	0x05, 0x6f, 0x44, 0x94, 0x73, 0x14, 0xb9, 0x39, 0x8a, 0x5e, 0x89, 0x15, 0xad, 0x38, 0xe1, 0x5f,
+	0x0f, 0xc6, 0xeb, 0xfd, 0x4e, 0xc6, 0xd0, 0x49, 0xca, 0x66, 0xf5, 0x69, 0x27, 0x59, 0x58, 0x9b,
+	0xa5, 0x8a, 0x2b, 0x9b, 0x7d, 0x5a, 0x06, 0xb5, 0x0c, 0xbf, 0x91, 0x61, 0x73, 0x66, 0x95, 0xf3,
+	0xaa, 0x11, 0xf1, 0x9f, 0xdc, 0x04, 0xbf, 0x50, 0x69, 0xd0, 0xc3, 0x94, 0xfd, 0xb5, 0x05, 0xfa,
+	0xaa, 0xa5, 0xb0, 0xa7, 0x06, 0xfd, 0xb2, 0x40, 0x2e, 0x26, 0x7b, 0x30, 0xd6, 0x7c, 0x5e, 0x28,
+	0x7e, 0xee, 0x18, 0x03, 0x64, 0x6c, 0x64, 0xad, 0x6c, 0x68, 0x4a, 0x76, 0x9d, 0x27, 0xe4, 0x19,
+	0x74, 0x0d, 0x8b, 0x9d, 0xbb, 0xf7, 0xae, 0xa9, 0x74, 0x34, 0x65, 0xb1, 0x3e, 0x15, 0x46, 0xad,
+	0x28, 0x52, 0x6d, 0xc5, 0xf3, 0x72, 0x18, 0x37, 0x87, 0x1b, 0xc7, 0x91, 0x56, 0xe8, 0xe4, 0x08,
+	0x86, 0xf5, 0x52, 0x7b, 0xc1, 0x6f, 0x7c, 0x55, 0x1d, 0x6d, 0x7f, 0xad, 0x61, 0xe8, 0xae, 0xeb,
+	0x4b, 0x0c, 0x4e, 0x3a, 0xc7, 0x5e, 0xf8, 0x02, 0x7a, 0xb8, 0x13, 0x8e, 0x4e, 0x92, 0x71, 0x6d,
+	0x58, 0x96, 0x57, 0x56, 0x37, 0x89, 0xf5, 0x0d, 0xbc, 0x6a, 0x83, 0xc3, 0x97, 0x00, 0xf6, 0xcd,
+	0xbb, 0x40, 0x49, 0x24, 0x72, 0xcf, 0x4b, 0xeb, 0xa9, 0x73, 0x2f, 0xe2, 0xa4, 0xe9, 0x25, 0x37,
+	0x82, 0xaf, 0x07, 0x1f, 0x7b, 0x65, 0x03, 0xf4, 0xf1, 0xf3, 0xfc, 0x5f, 0x00, 0x00, 0x00, 0xff,
+	0xff, 0xa8, 0xec, 0x66, 0xef, 0x7b, 0x05, 0x00, 0x00,
 }

pkg/tsdb/models/tsdb_plugin.proto

@@ -3,6 +3,8 @@ option go_package = "proto";
 
 package plugins;
 
+import "google/protobuf/any.proto";
+
 message TsdbQuery {
   TimeRange timeRange = 1;
   DatasourceInfo datasource = 2;
@@ -32,8 +34,20 @@ message QueryResult {
   string refId = 2;
   string metaJson = 3;
   repeated TimeSeries series = 4;
+  repeated Table tables = 5;
+}
+
+message Table {
+  repeated TableColumn columns = 1;
+  repeated TableRow rows = 2;
+}
+
+message TableColumn {
+  string name = 1;
+}
 
-  //repeat Table tables = x;
+message TableRow {
+  repeated google.protobuf.Any values = 1;
 }
 
 message DatasourceInfo {