From 7f68c2a53ddd7b3ce8933e9e0c84f704fdbf7735 Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 11 Dec 2017 12:53:01 +0100 Subject: [PATCH] backend plugins: add more datasource params --- pkg/tsdb/models/tsdb_plugin.pb.go | 145 +++++++++++++++++------------- pkg/tsdb/models/tsdb_plugin.proto | 26 +++--- 2 files changed, 95 insertions(+), 76 deletions(-) diff --git a/pkg/tsdb/models/tsdb_plugin.pb.go b/pkg/tsdb/models/tsdb_plugin.pb.go index ee937cce10b..a515f68f466 100644 --- a/pkg/tsdb/models/tsdb_plugin.pb.go +++ b/pkg/tsdb/models/tsdb_plugin.pb.go @@ -14,7 +14,7 @@ It has these top-level messages: Response QueryResult DatasourceInfo - TsdbSeries + TimeSeries Point */ package proto @@ -40,7 +40,6 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto1.ProtoPackageIsVersion2 // please upgrade the proto package -// Message represents a simple message sent to the Echo service. type TsdbQuery struct { Timerange *Timerange `protobuf:"bytes,1,opt,name=timerange" json:"timerange,omitempty"` Datasource *DatasourceInfo `protobuf:"bytes,2,opt,name=datasource" json:"datasource,omitempty"` @@ -182,7 +181,7 @@ type QueryResult struct { ErrorString string `protobuf:"bytes,2,opt,name=errorString" json:"errorString,omitempty"` RefId string `protobuf:"bytes,3,opt,name=refId" json:"refId,omitempty"` MetaJson string `protobuf:"bytes,4,opt,name=metaJson" json:"metaJson,omitempty"` - Series []*TsdbSeries `protobuf:"bytes,5,rep,name=series" json:"series,omitempty"` + Series []*TimeSeries `protobuf:"bytes,5,rep,name=series" json:"series,omitempty"` } func (m *QueryResult) Reset() { *m = QueryResult{} } @@ -218,7 +217,7 @@ func (m *QueryResult) GetMetaJson() string { return "" } -func (m *QueryResult) GetSeries() []*TsdbSeries { +func (m *QueryResult) GetSeries() []*TimeSeries { if m != nil { return m.Series } @@ -226,15 +225,17 @@ func (m *QueryResult) GetSeries() []*TsdbSeries { } type DatasourceInfo struct { - Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` - Type string `protobuf:"bytes,2,opt,name=type" json:"type,omitempty"` - Access string `protobuf:"bytes,3,opt,name=access" json:"access,omitempty"` - Url string `protobuf:"bytes,4,opt,name=url" json:"url,omitempty"` - BasicAuth bool `protobuf:"varint,5,opt,name=basicAuth" json:"basicAuth,omitempty"` - BasicAuthUser string `protobuf:"bytes,6,opt,name=basicAuthUser" json:"basicAuthUser,omitempty"` - BasicAuthPassword string `protobuf:"bytes,7,opt,name=basicAuthPassword" json:"basicAuthPassword,omitempty"` - JsonData string `protobuf:"bytes,8,opt,name=jsonData" json:"jsonData,omitempty"` - SecureJsonData string `protobuf:"bytes,9,opt,name=secureJsonData" json:"secureJsonData,omitempty"` + Id int64 `protobuf:"varint,1,opt,name=id" json:"id,omitempty"` + OrgId int64 `protobuf:"varint,2,opt,name=orgId" json:"orgId,omitempty"` + Name string `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"` + Type string `protobuf:"bytes,4,opt,name=type" json:"type,omitempty"` + Access string `protobuf:"bytes,5,opt,name=access" json:"access,omitempty"` + Url string `protobuf:"bytes,6,opt,name=url" json:"url,omitempty"` + BasicAuth bool `protobuf:"varint,7,opt,name=basicAuth" json:"basicAuth,omitempty"` + BasicAuthUser string `protobuf:"bytes,8,opt,name=basicAuthUser" json:"basicAuthUser,omitempty"` + BasicAuthPassword string `protobuf:"bytes,9,opt,name=basicAuthPassword" json:"basicAuthPassword,omitempty"` + JsonData string `protobuf:"bytes,10,opt,name=jsonData" json:"jsonData,omitempty"` + SecureJsonData string `protobuf:"bytes,11,opt,name=secureJsonData" json:"secureJsonData,omitempty"` } func (m *DatasourceInfo) Reset() { *m = DatasourceInfo{} } @@ -242,6 +243,20 @@ func (m *DatasourceInfo) String() string { return proto1.CompactTextS func (*DatasourceInfo) ProtoMessage() {} func (*DatasourceInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} } +func (m *DatasourceInfo) GetId() int64 { + if m != nil { + return m.Id + } + return 0 +} + +func (m *DatasourceInfo) GetOrgId() int64 { + if m != nil { + return m.OrgId + } + return 0 +} + func (m *DatasourceInfo) GetName() string { if m != nil { return m.Name @@ -305,32 +320,32 @@ func (m *DatasourceInfo) GetSecureJsonData() string { return "" } -type TsdbSeries struct { +type TimeSeries struct { Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` Tags map[string]string `protobuf:"bytes,2,rep,name=tags" json:"tags,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` Points []*Point `protobuf:"bytes,3,rep,name=points" json:"points,omitempty"` } -func (m *TsdbSeries) Reset() { *m = TsdbSeries{} } -func (m *TsdbSeries) String() string { return proto1.CompactTextString(m) } -func (*TsdbSeries) ProtoMessage() {} -func (*TsdbSeries) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} } +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 (m *TsdbSeries) GetName() string { +func (m *TimeSeries) GetName() string { if m != nil { return m.Name } return "" } -func (m *TsdbSeries) GetTags() map[string]string { +func (m *TimeSeries) GetTags() map[string]string { if m != nil { return m.Tags } return nil } -func (m *TsdbSeries) GetPoints() []*Point { +func (m *TimeSeries) GetPoints() []*Point { if m != nil { return m.Points } @@ -368,7 +383,7 @@ func init() { proto1.RegisterType((*Response)(nil), "plugins.Response") proto1.RegisterType((*QueryResult)(nil), "plugins.QueryResult") proto1.RegisterType((*DatasourceInfo)(nil), "plugins.DatasourceInfo") - proto1.RegisterType((*TsdbSeries)(nil), "plugins.TsdbSeries") + proto1.RegisterType((*TimeSeries)(nil), "plugins.TimeSeries") proto1.RegisterType((*Point)(nil), "plugins.Point") } @@ -447,46 +462,48 @@ var _TsdbPlugin_serviceDesc = grpc.ServiceDesc{ func init() { proto1.RegisterFile("tsdb_plugin.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 652 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0x4d, 0x6f, 0xd4, 0x3a, - 0x14, 0x55, 0xe6, 0x3b, 0x77, 0xf4, 0x46, 0xaf, 0x7e, 0xd5, 0x23, 0x1a, 0xf1, 0x51, 0x45, 0xa8, - 0x1a, 0x89, 0x2a, 0x85, 0x61, 0xd1, 0x0a, 0xb1, 0x01, 0xc1, 0xa2, 0x95, 0x2a, 0x15, 0x77, 0x10, - 0x12, 0x12, 0x42, 0x9e, 0x89, 0x27, 0x04, 0x92, 0x78, 0xb0, 0x9d, 0x96, 0xf9, 0x27, 0x2c, 0x59, - 0xf0, 0x13, 0x58, 0xf1, 0xeb, 0x90, 0x6f, 0xec, 0x64, 0xa6, 0x54, 0x88, 0x55, 0xee, 0x3d, 0xf7, - 0xd8, 0x39, 0x3e, 0xf7, 0xda, 0xb0, 0xa3, 0x55, 0x3c, 0x7f, 0xbf, 0xca, 0xca, 0x24, 0x2d, 0xa2, - 0x95, 0x14, 0x5a, 0x90, 0x7e, 0x95, 0xa9, 0xf1, 0xbd, 0x44, 0x88, 0x24, 0xe3, 0x87, 0x08, 0xcf, - 0xcb, 0xe5, 0xa1, 0x4e, 0x73, 0xae, 0x34, 0xcb, 0x57, 0x15, 0x33, 0xfc, 0xe6, 0x81, 0x3f, 0x53, - 0xf1, 0xfc, 0x55, 0xc9, 0xe5, 0x9a, 0x3c, 0x04, 0xdf, 0x10, 0x24, 0x2b, 0x12, 0x1e, 0x78, 0x7b, - 0xde, 0x64, 0x38, 0x25, 0x91, 0xdd, 0x2b, 0x9a, 0xb9, 0x0a, 0x6d, 0x48, 0xe4, 0x08, 0x20, 0x66, - 0x9a, 0x29, 0x51, 0xca, 0x05, 0x0f, 0x5a, 0xb8, 0xe4, 0x56, 0xbd, 0xe4, 0x45, 0x5d, 0x3a, 0x29, - 0x96, 0x82, 0x6e, 0x50, 0xc9, 0x04, 0xfa, 0x9f, 0x4b, 0x2e, 0x53, 0xae, 0x82, 0xf6, 0x5e, 0x7b, - 0x32, 0x9c, 0x8e, 0xea, 0x55, 0xa8, 0x85, 0xba, 0x72, 0xf8, 0xd3, 0x83, 0x6e, 0x25, 0x6f, 0x17, - 0xba, 0x92, 0x2f, 0x4f, 0x62, 0x94, 0xe6, 0xd3, 0x2a, 0x21, 0xb7, 0xc1, 0xcf, 0x45, 0xcc, 0xb3, - 0x53, 0x25, 0x0a, 0x54, 0xe0, 0xd3, 0x06, 0x20, 0xf7, 0xe1, 0x9f, 0x33, 0xf6, 0xc5, 0x08, 0x39, - 0x17, 0x69, 0xa1, 0xcd, 0xdf, 0xbc, 0x49, 0x9b, 0x6e, 0x83, 0xe4, 0x2e, 0x40, 0x5a, 0x68, 0x2e, - 0x2f, 0x59, 0x76, 0xa6, 0x82, 0x0e, 0x52, 0x36, 0x90, 0x6b, 0xc7, 0xec, 0xfe, 0xf5, 0x31, 0xc3, - 0x77, 0xe0, 0xd7, 0xbe, 0x11, 0x02, 0x9d, 0xa5, 0x14, 0xb9, 0x95, 0x8f, 0x31, 0x19, 0x41, 0x4b, - 0x0b, 0x2b, 0xbb, 0xa5, 0x05, 0x39, 0x80, 0x76, 0x21, 0xae, 0x50, 0xe5, 0x70, 0x3a, 0x8e, 0xaa, - 0xfe, 0x45, 0xae, 0x7f, 0xd8, 0x04, 0xec, 0x1f, 0x35, 0xb4, 0x70, 0x06, 0x03, 0xca, 0xd5, 0x4a, - 0x14, 0x8a, 0x93, 0x00, 0xfa, 0x39, 0x57, 0x8a, 0xd9, 0xd6, 0xf9, 0xd4, 0xa5, 0x24, 0x82, 0xbe, - 0xe4, 0xaa, 0xcc, 0xb4, 0x0a, 0x5a, 0xe8, 0xf5, 0xee, 0x35, 0xaf, 0xb1, 0x48, 0x1d, 0x29, 0xfc, - 0xee, 0xc1, 0x70, 0xa3, 0x60, 0x7c, 0xe7, 0x52, 0x0a, 0xe9, 0x7c, 0xc7, 0x84, 0xec, 0xc1, 0x10, - 0x83, 0x0b, 0x2d, 0xd3, 0x22, 0xb1, 0x47, 0xd8, 0x84, 0x9a, 0x7e, 0xb5, 0x37, 0xfb, 0x35, 0x86, - 0x41, 0xce, 0x35, 0xc3, 0x76, 0x75, 0xb0, 0x50, 0xe7, 0xe4, 0x01, 0xf4, 0x54, 0x35, 0x14, 0x5d, - 0x14, 0xfa, 0x5f, 0x33, 0x7d, 0x2a, 0x9e, 0x5f, 0x60, 0x89, 0x5a, 0x4a, 0xf8, 0xb5, 0x05, 0xa3, - 0x6d, 0xeb, 0x8d, 0xc3, 0x05, 0xcb, 0x9d, 0x01, 0x18, 0x1b, 0x4c, 0xaf, 0x57, 0xdc, 0x0a, 0xc4, - 0x98, 0xfc, 0x0f, 0x3d, 0xb6, 0x58, 0x70, 0xa5, 0xac, 0x34, 0x9b, 0x91, 0x7f, 0xa1, 0x5d, 0xca, - 0xcc, 0xca, 0x32, 0xa1, 0x99, 0xae, 0x39, 0x53, 0xe9, 0xe2, 0x59, 0xa9, 0x3f, 0x60, 0xe3, 0x07, - 0xb4, 0x01, 0xcc, 0x74, 0xd5, 0xc9, 0x6b, 0xc5, 0x65, 0xd0, 0xc3, 0x95, 0xdb, 0x20, 0x39, 0x80, - 0x9d, 0x1a, 0x38, 0x67, 0x4a, 0x5d, 0x09, 0x19, 0x07, 0x7d, 0x64, 0xfe, 0x5e, 0x30, 0xfe, 0x7c, - 0x54, 0xa2, 0x30, 0x27, 0x0b, 0x06, 0x95, 0x3f, 0x2e, 0x27, 0xfb, 0x30, 0x52, 0x7c, 0x51, 0x4a, - 0x7e, 0xea, 0x18, 0x3e, 0x32, 0xae, 0xa1, 0xe1, 0x0f, 0x0f, 0xa0, 0x71, 0xec, 0x46, 0x5b, 0x1e, - 0x41, 0x47, 0xb3, 0xc4, 0x4d, 0xc4, 0x9d, 0x1b, 0x8c, 0x8e, 0x66, 0x2c, 0x51, 0x2f, 0x0b, 0x2d, - 0xd7, 0x14, 0xa9, 0x64, 0x1f, 0x7a, 0x2b, 0x77, 0x89, 0xb6, 0xaf, 0x2c, 0x5e, 0x23, 0x6a, 0xab, - 0xe3, 0x23, 0xf0, 0xeb, 0xa5, 0xc6, 0xd2, 0x4f, 0x7c, 0x6d, 0x7f, 0x6d, 0x42, 0x33, 0x16, 0x97, - 0x2c, 0x2b, 0x5d, 0x47, 0xaa, 0xe4, 0x49, 0xeb, 0xd8, 0x0b, 0xdf, 0x40, 0x17, 0x77, 0x22, 0xc7, - 0xd5, 0x43, 0x84, 0x93, 0x6e, 0x1f, 0xa2, 0x3f, 0xdd, 0x85, 0x86, 0xbc, 0xbd, 0xb9, 0x67, 0x37, - 0x9f, 0x3e, 0xad, 0xec, 0x38, 0x47, 0xb9, 0x24, 0x72, 0x0f, 0x0a, 0xd9, 0x3a, 0x35, 0x62, 0xe3, - 0x9d, 0x1a, 0x73, 0x37, 0xeb, 0x79, 0xff, 0x6d, 0xb7, 0xfa, 0x69, 0x0f, 0x3f, 0x8f, 0x7f, 0x05, - 0x00, 0x00, 0xff, 0xff, 0x56, 0x20, 0xfa, 0x8b, 0x73, 0x05, 0x00, 0x00, + // 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, } diff --git a/pkg/tsdb/models/tsdb_plugin.proto b/pkg/tsdb/models/tsdb_plugin.proto index 94f3045dc9d..0d2bbe61ea7 100644 --- a/pkg/tsdb/models/tsdb_plugin.proto +++ b/pkg/tsdb/models/tsdb_plugin.proto @@ -35,24 +35,26 @@ message QueryResult { string errorString = 2; string refId = 3; string metaJson = 4; - repeated TsdbSeries series = 5; + repeated TimeSeries series = 5; - //repeat TsdbTables tables = x; + //repeat Table tables = x; } message DatasourceInfo { - string name = 1; - string type = 2; - string access = 3; - string url = 4; - bool basicAuth = 5; - string basicAuthUser = 6; - string basicAuthPassword = 7; - string jsonData = 8; - string secureJsonData = 9; + int64 id = 1; + int64 orgId = 2; + string name = 3; + string type = 4; + string access = 5; + string url = 6; + bool basicAuth = 7; + string basicAuthUser = 8; + string basicAuthPassword = 9; + string jsonData = 10; + string secureJsonData = 11; } -message TsdbSeries { +message TimeSeries { string name = 1; map tags = 2; repeated Point points = 3;