Skip to content

N
nexpie-grafana-theme
Commit 8b37e27d by Carl Bergquist
Options

use int64 for timestamps

parent 8a7c4556
Showing with 50 additions and 52 deletions
pkg/tsdb/models/proxy/wrapper.go
...@@ -77,10 +77,8 @@ func (tw *TsdbWrapper) Query(ctx context.Context, ds *models.DataSource, query * ...@@ -77,10 +77,8 @@ func (tw *TsdbWrapper) Query(ctx context.Context, ds *models.DataSource, query *
points := tsdb.TimeSeriesPoints{} points := tsdb.TimeSeriesPoints{}
for _, p := range s.Points { for _, p := range s.Points {
if p.Timestamp != nil { po := tsdb.NewTimePoint(null.FloatFrom(p.Value), float64(p.Timestamp))
po := tsdb.NewTimePoint(null.FloatFrom(p.Value), float64(p.Timestamp.Seconds)) points = append(points, po)
points = append(points, po)
}
} }
res.Results[r.RefId].Series = append(res.Results[r.RefId].Series, &tsdb.TimeSeries{ res.Results[r.RefId].Series = append(res.Results[r.RefId].Series, &tsdb.TimeSeries{
......
pkg/tsdb/models/tsdb_plugin.pb.go
...@@ -345,8 +345,8 @@ func (m *TimeSeries) GetPoints() []*Point { ...@@ -345,8 +345,8 @@ func (m *TimeSeries) GetPoints() []*Point {
} }
type Point struct { type Point struct {
Timestamp *google_protobuf.Timestamp `protobuf:"bytes,1,opt,name=timestamp" json:"timestamp,omitempty"` Timestamp int64 `protobuf:"varint,1,opt,name=timestamp" json:"timestamp,omitempty"`
Value float64 `protobuf:"fixed64,2,opt,name=value" json:"value,omitempty"` Value float64 `protobuf:"fixed64,2,opt,name=value" json:"value,omitempty"`
} }
func (m *Point) Reset() { *m = Point{} } func (m *Point) Reset() { *m = Point{} }
...@@ -354,11 +354,11 @@ func (m *Point) String() string { return proto1.CompactTextString(m) ...@@ -354,11 +354,11 @@ func (m *Point) String() string { return proto1.CompactTextString(m)
func (*Point) ProtoMessage() {} func (*Point) ProtoMessage() {}
func (*Point) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} } func (*Point) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
func (m *Point) GetTimestamp() *google_protobuf.Timestamp { func (m *Point) GetTimestamp() int64 {
if m != nil { if m != nil {
return m.Timestamp return m.Timestamp
} }
return nil return 0
} }
func (m *Point) GetValue() float64 { func (m *Point) GetValue() float64 {
...@@ -454,47 +454,47 @@ var _TsdbPlugin_serviceDesc = grpc.ServiceDesc{ ...@@ -454,47 +454,47 @@ var _TsdbPlugin_serviceDesc = grpc.ServiceDesc{
func init() { proto1.RegisterFile("tsdb_plugin.proto", fileDescriptor0) } func init() { proto1.RegisterFile("tsdb_plugin.proto", fileDescriptor0) }
var fileDescriptor0 = []byte{ var fileDescriptor0 = []byte{
// 672 bytes of a gzipped FileDescriptorProto // 663 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x54, 0x5d, 0x6f, 0xd3, 0x3c, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x54, 0x4d, 0x8f, 0xd3, 0x30,
0x14, 0x56, 0x92, 0x7e, 0xe5, 0x54, 0x6f, 0xf5, 0xce, 0xef, 0xf4, 0x12, 0x55, 0x7c, 0x54, 0x11, 0x10, 0x55, 0x92, 0x7e, 0x65, 0x2a, 0x2a, 0xd6, 0xac, 0x20, 0xaa, 0xf8, 0xa8, 0x22, 0xb4, 0xaa,
0x9a, 0x2a, 0x31, 0x65, 0x50, 0x2e, 0x36, 0x21, 0x6e, 0x40, 0x70, 0xb1, 0x49, 0x93, 0x86, 0x57, 0xc4, 0x2a, 0x0b, 0xe5, 0xb0, 0x08, 0xb8, 0x80, 0xe0, 0xb0, 0x2b, 0xad, 0xb4, 0x78, 0xcb, 0x05,
0x84, 0x84, 0x84, 0x90, 0xdb, 0xb8, 0x21, 0x90, 0xc4, 0xc5, 0x76, 0x36, 0x7a, 0xc9, 0x3f, 0xe1, 0x09, 0x21, 0xb7, 0x71, 0x43, 0x20, 0x89, 0x8b, 0xed, 0xec, 0xd2, 0x23, 0xff, 0x84, 0x03, 0x3f,
0x82, 0x9f, 0xc0, 0x35, 0xbf, 0x0d, 0xf9, 0xc4, 0x49, 0xd3, 0x81, 0xb8, 0x8a, 0xcf, 0x73, 0x1e, 0x81, 0x33, 0xbf, 0x0d, 0x79, 0xe2, 0xa4, 0xe9, 0xc2, 0x29, 0x33, 0x6f, 0x9e, 0xed, 0x97, 0x37,
0xdb, 0x4f, 0x9e, 0xe3, 0x73, 0x60, 0x4f, 0xab, 0x78, 0xf1, 0x7e, 0x9d, 0x95, 0x49, 0x5a, 0x44, 0x63, 0xc3, 0x9e, 0x56, 0xf1, 0xe2, 0xd3, 0x3a, 0x2b, 0x93, 0xb4, 0x88, 0xd6, 0x52, 0x68, 0x41,
0x6b, 0x29, 0xb4, 0x20, 0xfd, 0x2a, 0x52, 0xe3, 0x7b, 0x89, 0x10, 0x49, 0xc6, 0x8f, 0x10, 0x5e, 0xfa, 0x55, 0xa6, 0xc6, 0x0f, 0x12, 0x21, 0x92, 0x8c, 0x1f, 0x21, 0xbc, 0x28, 0x57, 0x47, 0x3a,
0x94, 0xab, 0x23, 0x9d, 0xe6, 0x5c, 0x69, 0x96, 0xaf, 0x2b, 0x66, 0xf8, 0xcd, 0x01, 0x7f, 0xae, 0xcd, 0xb9, 0xd2, 0x2c, 0x5f, 0x57, 0xcc, 0xf0, 0xa7, 0x03, 0xfe, 0x5c, 0xc5, 0x8b, 0x77, 0x25,
0xe2, 0xc5, 0xab, 0x92, 0xcb, 0x0d, 0x79, 0x08, 0xbe, 0x21, 0x48, 0x56, 0x24, 0x3c, 0x70, 0x26, 0x97, 0x1b, 0xf2, 0x18, 0x7c, 0x43, 0x90, 0xac, 0x48, 0x78, 0xe0, 0x4c, 0x9c, 0xe9, 0x70, 0x46,
0xce, 0x74, 0x38, 0x23, 0x91, 0x3d, 0x2b, 0x9a, 0xd7, 0x19, 0xba, 0x25, 0x91, 0x63, 0x80, 0x98, 0x22, 0xbb, 0x57, 0x34, 0xaf, 0x2b, 0x74, 0x4b, 0x22, 0xc7, 0x00, 0x31, 0xd3, 0x4c, 0x89, 0x52,
0x69, 0xa6, 0x44, 0x29, 0x97, 0x3c, 0x70, 0x71, 0xcb, 0xad, 0x66, 0xcb, 0x8b, 0x26, 0x75, 0x5a, 0x2e, 0x79, 0xe0, 0xe2, 0x92, 0x3b, 0xcd, 0x92, 0x37, 0x4d, 0xe9, 0xa4, 0x58, 0x09, 0xda, 0xa2,
0xac, 0x04, 0x6d, 0x51, 0xc9, 0x14, 0xfa, 0x9f, 0x4b, 0x2e, 0x53, 0xae, 0x02, 0x6f, 0xe2, 0x4d, 0x92, 0x29, 0xf4, 0xbf, 0x95, 0x5c, 0xa6, 0x5c, 0x05, 0xde, 0xc4, 0x9b, 0x0e, 0x67, 0xa3, 0x66,
0x87, 0xb3, 0x51, 0xb3, 0x0b, 0xb5, 0xd0, 0x3a, 0x1d, 0x7e, 0x75, 0xa0, 0x5b, 0xc9, 0xdb, 0x87, 0x15, 0x6a, 0xa1, 0x75, 0x39, 0xfc, 0xe1, 0x40, 0xb7, 0x92, 0xb7, 0x0f, 0x5d, 0xc9, 0x57, 0x27,
0xae, 0xe4, 0xab, 0xd3, 0x18, 0xa5, 0xf9, 0xb4, 0x0a, 0xc8, 0x6d, 0xf0, 0x73, 0x11, 0xf3, 0xec, 0x31, 0x4a, 0xf3, 0x69, 0x95, 0x90, 0xbb, 0xe0, 0xe7, 0x22, 0xe6, 0xd9, 0xa9, 0x12, 0x05, 0x2a,
0x4c, 0x89, 0x02, 0x15, 0xf8, 0x74, 0x0b, 0x90, 0xfb, 0xf0, 0xcf, 0x39, 0xfb, 0x62, 0x84, 0x5c, 0xf0, 0xe9, 0x16, 0x20, 0x0f, 0xe1, 0xc6, 0x19, 0xfb, 0x6e, 0x84, 0x9c, 0x8b, 0xb4, 0xd0, 0xe6,
0x88, 0xb4, 0xd0, 0xe6, 0x36, 0x67, 0xea, 0xd1, 0x5d, 0x90, 0xdc, 0x05, 0x48, 0x0b, 0xcd, 0xe5, 0x34, 0x67, 0xea, 0xd1, 0x5d, 0x90, 0xdc, 0x07, 0x48, 0x0b, 0xcd, 0xe5, 0x25, 0xcb, 0xce, 0x54,
0x15, 0xcb, 0xce, 0x55, 0xd0, 0x41, 0x4a, 0x0b, 0x09, 0xdf, 0x81, 0xdf, 0xfc, 0x3e, 0x21, 0xd0, 0xd0, 0x41, 0x4a, 0x0b, 0x09, 0x3f, 0x82, 0xdf, 0xfc, 0x3e, 0x21, 0xd0, 0x59, 0x49, 0x91, 0x5b,
0x59, 0x49, 0x91, 0x5b, 0x15, 0xb8, 0x26, 0x23, 0x70, 0xb5, 0xb0, 0xb7, 0xbb, 0x5a, 0x90, 0x43, 0x15, 0x18, 0x93, 0x11, 0xb8, 0x5a, 0xd8, 0xd3, 0x5d, 0x2d, 0xc8, 0x21, 0x78, 0x85, 0xb8, 0xc2,
0xf0, 0x0a, 0x71, 0x8d, 0x97, 0x0d, 0x67, 0xe3, 0xa8, 0x2a, 0x43, 0x54, 0x97, 0x01, 0xbd, 0xc4, 0xc3, 0x86, 0xb3, 0x71, 0x54, 0xb5, 0x21, 0xaa, 0xdb, 0x80, 0x5e, 0x62, 0x1b, 0xa8, 0xa1, 0x85,
0x32, 0x50, 0x43, 0x0b, 0xe7, 0x30, 0xa0, 0x5c, 0xad, 0x45, 0xa1, 0x38, 0x09, 0xa0, 0x9f, 0x73, 0x73, 0x18, 0x50, 0xae, 0xd6, 0xa2, 0x50, 0x9c, 0x04, 0xd0, 0xcf, 0xb9, 0x52, 0xcc, 0x76, 0xc0,
0xa5, 0x98, 0xad, 0x80, 0x4f, 0xeb, 0x90, 0x44, 0xd0, 0x97, 0x5c, 0x95, 0x99, 0x56, 0x81, 0x8b, 0xa7, 0x75, 0x4a, 0x22, 0xe8, 0x4b, 0xae, 0xca, 0x4c, 0xab, 0xc0, 0x45, 0xcb, 0xf6, 0xaf, 0x59,
0x96, 0xed, 0xdf, 0xb0, 0x0c, 0x93, 0xb4, 0x26, 0x85, 0xdf, 0x1d, 0x18, 0xb6, 0x12, 0xc6, 0x3e, 0x86, 0x45, 0x5a, 0x93, 0xc2, 0x5f, 0x0e, 0x0c, 0x5b, 0x05, 0x63, 0x1f, 0x97, 0x52, 0xc8, 0xda,
0x2e, 0xa5, 0x90, 0xb5, 0x7d, 0x18, 0x90, 0x09, 0x0c, 0x71, 0x71, 0xa9, 0x65, 0x5a, 0x24, 0xf6, 0x3e, 0x4c, 0xc8, 0x04, 0x86, 0x18, 0x5c, 0x68, 0x99, 0x16, 0x89, 0xfd, 0x85, 0x36, 0xb4, 0xb5,
0x17, 0xda, 0xd0, 0xd6, 0x76, 0xaf, 0x6d, 0xfb, 0x18, 0x06, 0x39, 0xd7, 0x0c, 0x5d, 0xef, 0x60, 0xdd, 0x6b, 0xdb, 0x3e, 0x86, 0x41, 0xce, 0x35, 0x43, 0xd7, 0x3b, 0x58, 0x68, 0x72, 0xf2, 0x08,
0xa2, 0x89, 0xc9, 0x03, 0xe8, 0xa9, 0xaa, 0xb6, 0x5d, 0x14, 0xfa, 0xdf, 0xce, 0x23, 0xba, 0xc4, 0x7a, 0xaa, 0xea, 0x6d, 0x17, 0x85, 0xde, 0xda, 0x19, 0xa2, 0x0b, 0x2c, 0x51, 0x4b, 0x09, 0xff,
0x14, 0xb5, 0x94, 0xf0, 0xa7, 0x0b, 0xa3, 0xdd, 0x87, 0x62, 0xdc, 0x4c, 0xab, 0x2a, 0x7b, 0xd4, 0xb8, 0x30, 0xda, 0x1d, 0x14, 0xe3, 0x66, 0x5a, 0x75, 0xd9, 0xa3, 0x6e, 0x1a, 0x1b, 0x05, 0x42,
0x4d, 0x63, 0xa3, 0x40, 0xc8, 0xe4, 0x34, 0x46, 0x75, 0x1e, 0xad, 0x02, 0x53, 0x87, 0x82, 0xe5, 0x26, 0x27, 0x31, 0xaa, 0xf3, 0x68, 0x95, 0x98, 0x3e, 0x14, 0x2c, 0xe7, 0x56, 0x16, 0xc6, 0x06,
0xdc, 0xca, 0xc2, 0xb5, 0xc1, 0xf4, 0x66, 0xcd, 0xad, 0x22, 0x5c, 0x93, 0xff, 0xa1, 0xc7, 0x96, 0xd3, 0x9b, 0x35, 0xb7, 0x8a, 0x30, 0x26, 0xb7, 0xa1, 0xc7, 0x96, 0x4b, 0xae, 0x8c, 0x1a, 0x83,
0x4b, 0xae, 0x8c, 0x1a, 0x83, 0xda, 0x88, 0xfc, 0x0b, 0x5e, 0x29, 0xb3, 0xa0, 0x87, 0xa0, 0x59, 0xda, 0x8c, 0xdc, 0x04, 0xaf, 0x94, 0x59, 0xd0, 0x43, 0xd0, 0x84, 0x66, 0x94, 0x16, 0x4c, 0xa5,
0x9a, 0xa7, 0xb4, 0x60, 0x2a, 0x5d, 0x3e, 0x2b, 0xf5, 0x87, 0xa0, 0x3f, 0x71, 0xa6, 0x03, 0xba, 0xcb, 0x57, 0xa5, 0xfe, 0x1c, 0xf4, 0x27, 0xce, 0x74, 0x40, 0xb7, 0x80, 0x19, 0xa5, 0x26, 0x79,
0x05, 0xcc, 0x53, 0x6a, 0x82, 0xd7, 0x8a, 0xcb, 0x60, 0x80, 0x3b, 0x77, 0x41, 0x72, 0x08, 0x7b, 0xaf, 0xb8, 0x0c, 0x06, 0xb8, 0x72, 0x17, 0x24, 0x87, 0xb0, 0xd7, 0x00, 0xe7, 0x4c, 0xa9, 0x2b,
0x0d, 0x70, 0xc1, 0x94, 0xba, 0x16, 0x32, 0x0e, 0x7c, 0x64, 0xfe, 0x9e, 0x30, 0x2e, 0x7e, 0x54, 0x21, 0xe3, 0xc0, 0x47, 0xe6, 0xbf, 0x05, 0xe3, 0xe2, 0x17, 0x25, 0x0a, 0xf3, 0xff, 0x01, 0x54,
0xa2, 0x30, 0xff, 0x1f, 0x40, 0xe5, 0x62, 0x1d, 0x93, 0x03, 0x18, 0x29, 0xbe, 0x2c, 0x25, 0x3f, 0x2e, 0xd6, 0x39, 0x39, 0x80, 0x91, 0xe2, 0xcb, 0x52, 0xf2, 0xd3, 0x9a, 0x31, 0x44, 0xc6, 0x35,
0xab, 0x19, 0x43, 0x64, 0xdc, 0x40, 0xc3, 0x1f, 0x0e, 0xc0, 0xd6, 0xd7, 0xc6, 0x16, 0xa7, 0x65, 0x34, 0xfc, 0xed, 0x00, 0x6c, 0x7d, 0x6d, 0x6c, 0x71, 0x5a, 0xb6, 0x3c, 0x81, 0x8e, 0x66, 0x49,
0xcb, 0x23, 0xe8, 0x68, 0x96, 0xd4, 0xef, 0xe6, 0xce, 0x1f, 0xca, 0x11, 0xcd, 0x59, 0xa2, 0x5e, 0x3d, 0x37, 0xf7, 0xfe, 0xd3, 0x8e, 0x68, 0xce, 0x12, 0xf5, 0xb6, 0xd0, 0x72, 0x43, 0x91, 0x4a,
0x16, 0x5a, 0x6e, 0x28, 0x52, 0xc9, 0x01, 0xf4, 0xd6, 0x75, 0xc7, 0xec, 0xf6, 0x27, 0xf6, 0x0c, 0x0e, 0xa0, 0xb7, 0xae, 0x6f, 0xcc, 0xee, 0xfd, 0xc4, 0x3b, 0x43, 0x6d, 0x75, 0x7c, 0x0c, 0x7e,
0xb5, 0xd9, 0xf1, 0x31, 0xf8, 0xcd, 0x56, 0x63, 0xe9, 0x27, 0xbe, 0xb1, 0x57, 0x9b, 0xa5, 0x29, 0xb3, 0xd4, 0x58, 0xfa, 0x95, 0x6f, 0xec, 0xd1, 0x26, 0x34, 0xad, 0xbb, 0x64, 0x59, 0xc9, 0xed,
0xdd, 0x15, 0xcb, 0x4a, 0x6e, 0x1f, 0x56, 0x15, 0x3c, 0x71, 0x4f, 0x9c, 0xf0, 0x0d, 0x74, 0xf1, 0x60, 0x55, 0xc9, 0x73, 0xf7, 0x99, 0x13, 0xbe, 0x80, 0x2e, 0xee, 0x64, 0x5c, 0x6f, 0x9e, 0x25,
0x24, 0x72, 0x52, 0x4d, 0x1d, 0xec, 0x07, 0x3b, 0x75, 0xfe, 0xd6, 0x31, 0x5b, 0xf2, 0xee, 0xe1, 0xdb, 0xf4, 0x2d, 0xb0, 0xbb, 0x81, 0x63, 0x37, 0x98, 0xbd, 0x04, 0x30, 0xcf, 0xd6, 0x39, 0x4a,
0x8e, 0x3d, 0x7c, 0xf6, 0x14, 0xc0, 0x8c, 0xb4, 0x0b, 0x94, 0x4b, 0xa2, 0x7a, 0x7a, 0xb4, 0x26, 0x22, 0x51, 0xfd, 0x42, 0xb4, 0x5e, 0xab, 0xfa, 0x51, 0x1b, 0xef, 0x35, 0x58, 0x7d, 0xc7, 0x5e,
0x59, 0x3d, 0xf0, 0xc6, 0x7b, 0x0d, 0x56, 0xf7, 0xdf, 0xf3, 0xfe, 0xdb, 0x6e, 0x75, 0x69, 0x0f, 0xf7, 0x3f, 0x74, 0xab, 0xab, 0xd8, 0xc3, 0xcf, 0xd3, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x55,
0x3f, 0x8f, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0xa3, 0x9d, 0x34, 0x4f, 0x60, 0x05, 0x00, 0x00, 0xe4, 0xba, 0x1a, 0x44, 0x05, 0x00, 0x00,
} }
pkg/tsdb/models/tsdb_plugin.proto
...@@ -61,7 +61,7 @@ message TimeSeries { ...@@ -61,7 +61,7 @@ message TimeSeries {
} }
message Point { message Point {
google.protobuf.Timestamp timestamp = 1; int64 timestamp = 1;
double value = 2; double value = 2;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment