diff --git a/bolt/internal/internal.go b/bolt/internal/internal.go index f847897cbb..21ffd85af8 100644 --- a/bolt/internal/internal.go +++ b/bolt/internal/internal.go @@ -190,10 +190,10 @@ func UnmarshalLayout(data []byte, l *chronograf.Layout) error { // MarshalDashboard encodes a dashboard to binary protobuf format. func MarshalDashboard(d chronograf.Dashboard) ([]byte, error) { - cells := make([]*DashboardCell, len(l.Cells)) - for i, c := range l.Cells { + cells := make([]*chronograf.DashboardCell, len(d.Cells)) + for i, c := range d.Cells { - cells[i] = &DashboardCell{ + cells[i] = &chronograf.DashboardCell{ X: c.X, Y: c.Y, W: c.W, @@ -205,14 +205,14 @@ func MarshalDashboard(d chronograf.Dashboard) ([]byte, error) { } return proto.Marshal(&Dashboard{ - ID: d.ID, + ID: int64(d.ID), Cells: cells, Name: d.Name, }) } // UnmarshalDashboard decodes a layout from binary protobuf data. -func UnmarshalDashboard(data []byte, d *chonograf.Dashboard) error { +func UnmarshalDashboard(data []byte, d *chronograf.Dashboard) error { var pb Dashboard if err := proto.Unmarshal(data, &pb); err != nil { return err diff --git a/bolt/internal/internal.pb.go b/bolt/internal/internal.pb.go index 35f6951895..ee42d92130 100644 --- a/bolt/internal/internal.pb.go +++ b/bolt/internal/internal.pb.go @@ -11,6 +11,8 @@ It is generated from these files: It has these top-level messages: Exploration Source + Dashboard + DashboardCell Server Layout Cell @@ -67,6 +69,39 @@ func (m *Source) String() string { return proto.CompactTextString(m) func (*Source) ProtoMessage() {} func (*Source) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{1} } +type Dashboard struct { + ID int64 `protobuf:"varint,1,opt,name=ID,proto3" json:"ID,omitempty"` + Name string `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"` + Cells []*DashboardCell `protobuf:"bytes,3,rep,name=cells" json:"cells,omitempty"` +} + +func (m *Dashboard) Reset() { *m = Dashboard{} } +func (m *Dashboard) String() string { return proto.CompactTextString(m) } +func (*Dashboard) ProtoMessage() {} +func (*Dashboard) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{2} } + +func (m *Dashboard) GetCells() []*DashboardCell { + if m != nil { + return m.Cells + } + return nil +} + +type DashboardCell struct { + X int32 `protobuf:"varint,1,opt,name=x,proto3" json:"x,omitempty"` + Y int32 `protobuf:"varint,2,opt,name=y,proto3" json:"y,omitempty"` + W int32 `protobuf:"varint,3,opt,name=w,proto3" json:"w,omitempty"` + H int32 `protobuf:"varint,4,opt,name=h,proto3" json:"h,omitempty"` + Queries []string `protobuf:"bytes,5,rep,name=queries" json:"queries,omitempty"` + Name string `protobuf:"bytes,7,opt,name=name,proto3" json:"name,omitempty"` + Type string `protobuf:"bytes,10,opt,name=type,proto3" json:"type,omitempty"` +} + +func (m *DashboardCell) Reset() { *m = DashboardCell{} } +func (m *DashboardCell) String() string { return proto.CompactTextString(m) } +func (*DashboardCell) ProtoMessage() {} +func (*DashboardCell) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{3} } + type Server struct { ID int64 `protobuf:"varint,1,opt,name=ID,proto3" json:"ID,omitempty"` Name string `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"` @@ -79,7 +114,7 @@ type Server struct { func (m *Server) Reset() { *m = Server{} } func (m *Server) String() string { return proto.CompactTextString(m) } func (*Server) ProtoMessage() {} -func (*Server) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{2} } +func (*Server) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{4} } type Layout struct { ID string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"` @@ -92,7 +127,7 @@ type Layout struct { func (m *Layout) Reset() { *m = Layout{} } func (m *Layout) String() string { return proto.CompactTextString(m) } func (*Layout) ProtoMessage() {} -func (*Layout) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{3} } +func (*Layout) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{5} } func (m *Layout) GetCells() []*Cell { if m != nil { @@ -117,7 +152,7 @@ type Cell struct { func (m *Cell) Reset() { *m = Cell{} } func (m *Cell) String() string { return proto.CompactTextString(m) } func (*Cell) ProtoMessage() {} -func (*Cell) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{4} } +func (*Cell) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{6} } func (m *Cell) GetQueries() []*Query { if m != nil { @@ -139,7 +174,7 @@ type Query struct { func (m *Query) Reset() { *m = Query{} } func (m *Query) String() string { return proto.CompactTextString(m) } func (*Query) ProtoMessage() {} -func (*Query) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{5} } +func (*Query) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{7} } func (m *Query) GetRange() *Range { if m != nil { @@ -156,7 +191,7 @@ type Range struct { func (m *Range) Reset() { *m = Range{} } func (m *Range) String() string { return proto.CompactTextString(m) } func (*Range) ProtoMessage() {} -func (*Range) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{6} } +func (*Range) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{8} } type AlertRule struct { ID string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"` @@ -168,7 +203,7 @@ type AlertRule struct { func (m *AlertRule) Reset() { *m = AlertRule{} } func (m *AlertRule) String() string { return proto.CompactTextString(m) } func (*AlertRule) ProtoMessage() {} -func (*AlertRule) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{7} } +func (*AlertRule) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{9} } type User struct { ID uint64 `protobuf:"varint,1,opt,name=ID,proto3" json:"ID,omitempty"` @@ -178,11 +213,13 @@ type User struct { func (m *User) Reset() { *m = User{} } func (m *User) String() string { return proto.CompactTextString(m) } func (*User) ProtoMessage() {} -func (*User) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{8} } +func (*User) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{10} } func init() { proto.RegisterType((*Exploration)(nil), "internal.Exploration") proto.RegisterType((*Source)(nil), "internal.Source") + proto.RegisterType((*Dashboard)(nil), "internal.Dashboard") + proto.RegisterType((*DashboardCell)(nil), "internal.DashboardCell") proto.RegisterType((*Server)(nil), "internal.Server") proto.RegisterType((*Layout)(nil), "internal.Layout") proto.RegisterType((*Cell)(nil), "internal.Cell") @@ -195,45 +232,48 @@ func init() { func init() { proto.RegisterFile("internal.proto", fileDescriptorInternal) } var fileDescriptorInternal = []byte{ - // 636 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x94, 0x5f, 0x6e, 0xd3, 0x4e, - 0x10, 0xc7, 0xb5, 0xb1, 0x9d, 0xc4, 0xd3, 0x9f, 0xfa, 0x43, 0xab, 0x0a, 0x59, 0x88, 0x07, 0xcb, - 0x02, 0x29, 0x48, 0xa8, 0x0f, 0xf4, 0x04, 0x69, 0x5d, 0xa1, 0x40, 0x29, 0x65, 0xdb, 0x88, 0x27, - 0x1e, 0xb6, 0xcd, 0xb4, 0xb5, 0xe4, 0xd8, 0x66, 0x6d, 0x93, 0xfa, 0x0e, 0x9c, 0x81, 0x43, 0xc0, - 0x05, 0xb8, 0x03, 0x17, 0x42, 0x33, 0xbb, 0x4e, 0x82, 0xf8, 0xa3, 0xbe, 0xcd, 0x77, 0x66, 0x3c, - 0xfe, 0xcc, 0x1f, 0x1b, 0x76, 0xb3, 0xa2, 0x41, 0x53, 0xe8, 0x7c, 0xbf, 0x32, 0x65, 0x53, 0xca, - 0x71, 0xaf, 0x93, 0x6f, 0x02, 0x76, 0x8e, 0xef, 0xaa, 0xbc, 0x34, 0xba, 0xc9, 0xca, 0x42, 0xee, - 0xc2, 0x60, 0x96, 0x46, 0x22, 0x16, 0x13, 0x4f, 0x0d, 0x66, 0xa9, 0x94, 0xe0, 0x9f, 0xea, 0x25, - 0x46, 0x83, 0x58, 0x4c, 0x42, 0xc5, 0xb6, 0x7c, 0x08, 0xc3, 0x79, 0x8d, 0x66, 0x96, 0x46, 0x1e, - 0xe7, 0x39, 0x45, 0xb9, 0xa9, 0x6e, 0x74, 0xe4, 0xdb, 0x5c, 0xb2, 0xe5, 0x63, 0x08, 0x8f, 0x0c, - 0xea, 0x06, 0x17, 0xd3, 0x26, 0x0a, 0x38, 0x7d, 0xe3, 0xa0, 0xe8, 0xbc, 0x5a, 0xb8, 0xe8, 0xd0, - 0x46, 0xd7, 0x0e, 0x19, 0xc1, 0x28, 0xc5, 0x6b, 0xdd, 0xe6, 0x4d, 0x34, 0x8a, 0xc5, 0x64, 0xac, - 0x7a, 0x99, 0x7c, 0x17, 0x30, 0x3c, 0x2f, 0x5b, 0x73, 0x85, 0xf7, 0x02, 0x96, 0xe0, 0x5f, 0x74, - 0x15, 0x32, 0x6e, 0xa8, 0xd8, 0x96, 0x8f, 0x60, 0x4c, 0xd8, 0x05, 0xe5, 0x5a, 0xe0, 0xb5, 0xa6, - 0xd8, 0x99, 0xae, 0xeb, 0x55, 0x69, 0x16, 0xcc, 0x1c, 0xaa, 0xb5, 0x96, 0x0f, 0xc0, 0x9b, 0xab, - 0x13, 0x86, 0x0d, 0x15, 0x99, 0x7f, 0xc7, 0xa4, 0x3a, 0x17, 0x98, 0xe3, 0x8d, 0xd1, 0xd7, 0xd1, - 0xd8, 0xd6, 0xe9, 0x75, 0xf2, 0x99, 0x5a, 0x40, 0xf3, 0x09, 0xcd, 0xbd, 0x5a, 0xd8, 0xc6, 0xf5, - 0xfe, 0x81, 0xeb, 0xff, 0x19, 0x37, 0xd8, 0xe0, 0xee, 0x41, 0x70, 0x6e, 0xae, 0x66, 0xa9, 0x9b, - 0xb7, 0x15, 0xc9, 0x17, 0x01, 0xc3, 0x13, 0xdd, 0x95, 0x6d, 0xb3, 0x85, 0x13, 0x32, 0x4e, 0x0c, - 0x3b, 0xd3, 0xaa, 0xca, 0xb3, 0x2b, 0xbe, 0x10, 0x47, 0xb5, 0xed, 0xa2, 0x8c, 0x37, 0xa8, 0xeb, - 0xd6, 0xe0, 0x12, 0x8b, 0xc6, 0xf1, 0x6d, 0xbb, 0xe4, 0x13, 0x08, 0x8e, 0x30, 0xcf, 0xeb, 0xc8, - 0x8f, 0xbd, 0xc9, 0xce, 0x8b, 0xdd, 0xfd, 0xf5, 0x41, 0x92, 0x5b, 0xd9, 0x20, 0x35, 0x32, 0x6d, - 0x9b, 0xf2, 0x3a, 0x2f, 0x57, 0x4c, 0x3c, 0x56, 0x6b, 0x9d, 0xfc, 0x10, 0xe0, 0x53, 0x96, 0xfc, - 0x0f, 0xc4, 0x1d, 0xd3, 0x05, 0x4a, 0xdc, 0x91, 0xea, 0x18, 0x29, 0x50, 0xa2, 0x23, 0xb5, 0xe2, - 0xd7, 0x07, 0x4a, 0xac, 0x48, 0xdd, 0xf2, 0x40, 0x02, 0x25, 0x6e, 0xe5, 0x33, 0x18, 0x7d, 0x6c, - 0xd1, 0x64, 0x58, 0x47, 0x01, 0x43, 0xfc, 0xbf, 0x81, 0x78, 0xd7, 0xa2, 0xe9, 0x54, 0x1f, 0xa7, - 0x07, 0x33, 0xb7, 0x61, 0x91, 0xd1, 0x3a, 0x78, 0xec, 0x23, 0xbb, 0x0e, 0x1e, 0x79, 0x04, 0xa3, - 0xce, 0xe8, 0xe2, 0x06, 0xeb, 0x68, 0x1c, 0x7b, 0x13, 0x4f, 0xf5, 0x92, 0x23, 0xb9, 0xbe, 0xc4, - 0xbc, 0x8e, 0xc2, 0xd8, 0x9b, 0x84, 0xaa, 0x97, 0x54, 0xa7, 0xa1, 0x2b, 0x04, 0x5b, 0x87, 0xec, - 0xe4, 0xab, 0x80, 0x80, 0x5f, 0x4e, 0xcf, 0x1d, 0x95, 0xcb, 0xa5, 0x2e, 0x16, 0x6e, 0xf4, 0xbd, - 0xa4, 0x7d, 0xa4, 0x87, 0x6e, 0xec, 0x83, 0xf4, 0x90, 0xb4, 0x3a, 0x73, 0x43, 0x1e, 0xa8, 0x33, - 0x9a, 0xda, 0x4b, 0x53, 0xb6, 0xd5, 0x61, 0x67, 0xc7, 0x1b, 0xaa, 0xb5, 0xa6, 0x4f, 0xf5, 0xfd, - 0x2d, 0x1a, 0xd7, 0x73, 0xa8, 0x9c, 0xa2, 0x23, 0x38, 0x21, 0x2a, 0xd7, 0xa5, 0x15, 0xf2, 0x29, - 0x04, 0x8a, 0xba, 0xe0, 0x56, 0x7f, 0x19, 0x10, 0xbb, 0x95, 0x8d, 0x26, 0x07, 0x2e, 0x8d, 0xaa, - 0xcc, 0xab, 0x0a, 0x8d, 0xbb, 0x5d, 0x2b, 0xb8, 0x76, 0xb9, 0x42, 0xc3, 0xc8, 0x9e, 0xb2, 0x22, - 0xf9, 0x00, 0xe1, 0x34, 0x47, 0xd3, 0xa8, 0x36, 0xc7, 0xdf, 0x4e, 0x4c, 0x82, 0xff, 0xea, 0xfc, - 0xed, 0x69, 0x7f, 0xf1, 0x64, 0x6f, 0xee, 0xd4, 0xdb, 0xba, 0x53, 0x6a, 0xe8, 0xb5, 0xae, 0xf4, - 0x2c, 0xe5, 0xc5, 0x7a, 0xca, 0xa9, 0xe4, 0x39, 0xf8, 0xf4, 0x3d, 0x6c, 0x55, 0xf6, 0xb9, 0xf2, - 0x1e, 0x04, 0xc7, 0x4b, 0x9d, 0xe5, 0xae, 0xb4, 0x15, 0x97, 0x43, 0xfe, 0x0d, 0x1e, 0xfc, 0x0c, - 0x00, 0x00, 0xff, 0xff, 0x92, 0x9e, 0x41, 0x68, 0x18, 0x05, 0x00, 0x00, + // 688 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x94, 0x51, 0x6e, 0xd3, 0x4c, + 0x10, 0xc7, 0xb5, 0xb1, 0x9d, 0xc4, 0x93, 0x7e, 0xfd, 0xd0, 0xaa, 0x02, 0x0b, 0xf1, 0x60, 0x59, + 0x20, 0x05, 0x09, 0xfa, 0xd0, 0x9e, 0x20, 0x8d, 0x2b, 0x14, 0x28, 0xa5, 0x6c, 0x1b, 0xf1, 0x04, + 0xd2, 0x36, 0xd9, 0x36, 0x96, 0x36, 0xb6, 0x59, 0xdb, 0xa4, 0x3e, 0x02, 0x12, 0x67, 0xe0, 0x10, + 0x70, 0x01, 0xee, 0xc0, 0x85, 0xd0, 0xec, 0xae, 0x9d, 0x54, 0x14, 0x14, 0x89, 0xb7, 0xfd, 0xed, + 0x8c, 0xc7, 0xff, 0x99, 0xff, 0xd8, 0xb0, 0x9b, 0xa4, 0xa5, 0x50, 0x29, 0x97, 0xfb, 0xb9, 0xca, + 0xca, 0x8c, 0xf6, 0x1b, 0x8e, 0xbe, 0x13, 0x18, 0x1c, 0xdf, 0xe4, 0x32, 0x53, 0xbc, 0x4c, 0xb2, + 0x94, 0xee, 0x42, 0x67, 0x12, 0x07, 0x24, 0x24, 0x43, 0x87, 0x75, 0x26, 0x31, 0xa5, 0xe0, 0x9e, + 0xf2, 0xa5, 0x08, 0x3a, 0x21, 0x19, 0xfa, 0x4c, 0x9f, 0xe9, 0x7d, 0xe8, 0x4e, 0x0b, 0xa1, 0x26, + 0x71, 0xe0, 0xe8, 0x3c, 0x4b, 0x98, 0x1b, 0xf3, 0x92, 0x07, 0xae, 0xc9, 0xc5, 0x33, 0x7d, 0x04, + 0xfe, 0x58, 0x09, 0x5e, 0x8a, 0xf9, 0xa8, 0x0c, 0x3c, 0x9d, 0xbe, 0xbe, 0xc0, 0xe8, 0x34, 0x9f, + 0xdb, 0x68, 0xd7, 0x44, 0xdb, 0x0b, 0x1a, 0x40, 0x2f, 0x16, 0x57, 0xbc, 0x92, 0x65, 0xd0, 0x0b, + 0xc9, 0xb0, 0xcf, 0x1a, 0x8c, 0x7e, 0x10, 0xe8, 0x9e, 0x67, 0x95, 0x9a, 0x89, 0xad, 0x04, 0x53, + 0x70, 0x2f, 0xea, 0x5c, 0x68, 0xb9, 0x3e, 0xd3, 0x67, 0xfa, 0x10, 0xfa, 0x28, 0x3b, 0xc5, 0x5c, + 0x23, 0xb8, 0x65, 0x8c, 0x9d, 0xf1, 0xa2, 0x58, 0x65, 0x6a, 0xae, 0x35, 0xfb, 0xac, 0x65, 0x7a, + 0x0f, 0x9c, 0x29, 0x3b, 0xd1, 0x62, 0x7d, 0x86, 0xc7, 0x3f, 0xcb, 0xc4, 0x3a, 0x17, 0x42, 0x8a, + 0x6b, 0xc5, 0xaf, 0x82, 0xbe, 0xa9, 0xd3, 0x70, 0xf4, 0x01, 0xfc, 0x98, 0x17, 0x8b, 0xcb, 0x8c, + 0xab, 0xf9, 0x56, 0x4d, 0x3c, 0x07, 0x6f, 0x26, 0xa4, 0x2c, 0x02, 0x27, 0x74, 0x86, 0x83, 0x83, + 0x07, 0xfb, 0xad, 0xa7, 0x6d, 0x9d, 0xb1, 0x90, 0x92, 0x99, 0xac, 0xe8, 0x33, 0x81, 0xff, 0x6e, + 0x05, 0xe8, 0x0e, 0x90, 0x1b, 0xfd, 0x0e, 0x8f, 0x91, 0x1b, 0xa4, 0x5a, 0xd7, 0xf7, 0x18, 0xa9, + 0x91, 0x56, 0x7a, 0x3c, 0x1e, 0x23, 0x2b, 0xa4, 0x85, 0x1e, 0x8a, 0xc7, 0xc8, 0x02, 0xfb, 0xfb, + 0x58, 0x09, 0x95, 0x88, 0x22, 0xf0, 0x42, 0x67, 0xe8, 0xb3, 0x06, 0x51, 0xa6, 0x9e, 0x5f, 0xcf, + 0xc8, 0x4c, 0xed, 0xac, 0x4b, 0x9c, 0x35, 0x98, 0x3b, 0x3c, 0x47, 0x5f, 0xd0, 0x2e, 0xa1, 0x3e, + 0x09, 0xb5, 0x55, 0xa7, 0x9b, 0xd6, 0x38, 0x7f, 0xb1, 0xc6, 0xbd, 0xdb, 0x1a, 0x6f, 0x6d, 0xcd, + 0x1e, 0x78, 0xe7, 0x6a, 0x36, 0x89, 0xed, 0x6e, 0x19, 0x88, 0xbe, 0x12, 0xe8, 0x9e, 0xf0, 0x3a, + 0xab, 0xca, 0x0d, 0x39, 0xbe, 0x96, 0x13, 0xc2, 0x60, 0x94, 0xe7, 0x32, 0x99, 0xe9, 0xaf, 0xc1, + 0xaa, 0xda, 0xbc, 0xc2, 0x8c, 0xd7, 0x82, 0x17, 0x95, 0x12, 0x4b, 0x91, 0x96, 0x56, 0xdf, 0xe6, + 0x15, 0x7d, 0x0c, 0xde, 0x58, 0x1b, 0xe5, 0x6a, 0xa3, 0x76, 0xd7, 0x46, 0x19, 0x7f, 0x74, 0x10, + 0x1b, 0x19, 0x55, 0x65, 0x76, 0x25, 0xb3, 0x95, 0x56, 0xdc, 0x67, 0x2d, 0x47, 0x3f, 0x09, 0xb8, + 0xff, 0x64, 0xd9, 0xd3, 0xdb, 0x96, 0x0d, 0x0e, 0xfe, 0x5f, 0x8b, 0x78, 0x5b, 0x09, 0x55, 0xaf, + 0x3d, 0xdc, 0x01, 0x92, 0xd8, 0x6d, 0x26, 0xc9, 0x9d, 0x8e, 0x06, 0xd0, 0xab, 0x15, 0x4f, 0xaf, + 0x45, 0x11, 0xf4, 0x43, 0x67, 0xe8, 0xb0, 0x06, 0x75, 0x44, 0xf2, 0x4b, 0x21, 0x8b, 0xc0, 0x37, + 0x9b, 0x61, 0xf1, 0xce, 0x2d, 0xf8, 0x46, 0xc0, 0xd3, 0x2f, 0xc7, 0xe7, 0xc6, 0xd9, 0x72, 0xc9, + 0xd3, 0xb9, 0x1d, 0x7d, 0x83, 0xe8, 0x47, 0x7c, 0x64, 0xc7, 0xde, 0x89, 0x8f, 0x90, 0xd9, 0x99, + 0x1d, 0x72, 0x87, 0x9d, 0xe1, 0xd4, 0x5e, 0xa8, 0xac, 0xca, 0x8f, 0x6a, 0x33, 0x5e, 0x9f, 0xb5, + 0x8c, 0xbf, 0xa5, 0x77, 0x0b, 0xa1, 0xda, 0x35, 0xb5, 0x84, 0x4b, 0x70, 0x82, 0xaa, 0x6c, 0x97, + 0x06, 0xe8, 0x13, 0xf0, 0x18, 0x76, 0xa1, 0x5b, 0xbd, 0x35, 0x20, 0x7d, 0xcd, 0x4c, 0x34, 0x3a, + 0xb4, 0x69, 0x58, 0x65, 0x9a, 0xe7, 0x42, 0xd9, 0xdd, 0x35, 0xa0, 0x6b, 0x67, 0x2b, 0xa1, 0xb4, + 0x64, 0x87, 0x19, 0x88, 0xde, 0x83, 0x3f, 0x92, 0x42, 0x95, 0xac, 0x92, 0xe2, 0xb7, 0x15, 0xa3, + 0xe0, 0xbe, 0x3c, 0x7f, 0x73, 0xda, 0x6c, 0x3c, 0x9e, 0xd7, 0x7b, 0xea, 0x6c, 0xec, 0x29, 0x36, + 0xf4, 0x8a, 0xe7, 0x7c, 0x12, 0x6b, 0x63, 0x1d, 0x66, 0x29, 0x7a, 0x06, 0x2e, 0x7e, 0x0f, 0x1b, + 0x95, 0x5d, 0x5d, 0x79, 0x0f, 0xbc, 0xe3, 0x25, 0x4f, 0xa4, 0x2d, 0x6d, 0xe0, 0xb2, 0xab, 0x7f, + 0xf9, 0x87, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xf6, 0x0c, 0x35, 0x69, 0x04, 0x06, 0x00, 0x00, } diff --git a/bolt/internal/internal.proto b/bolt/internal/internal.proto index 5874f08386..269c54241c 100644 --- a/bolt/internal/internal.proto +++ b/bolt/internal/internal.proto @@ -22,6 +22,22 @@ message Source { string Telegraf = 8; // Telegraf is the db telegraf is written to. By default it is "telegraf" } +message Dashboard { + int64 ID = 1; // ID is the unique ID of the dashboard + string Name = 2; // Name is the user-defined name of the dashboard + repeated DashboardCell cells = 3; // a representation of all visual data required for rendering the dashboard +} + +message DashboardCell { + int32 x = 1; // X-coordinate of Cell in the Dashboard + int32 y = 2; // Y-coordinate of Cell in the Dashboard + int32 w = 3; // Width of Cell in the Dashboard + int32 h = 4; // Height of Cell in the Dashboard + repeated string queries = 5; // Time-series data queries for Dashboard + string name = 7; // User-facing name for this Dashboard + string type = 10; // Dashboard visualization type +} + message Server { int64 ID = 1; // ID is the unique ID of the server string Name = 2; // Name is the user-defined name for the server @@ -59,7 +75,7 @@ message Query { repeated string GroupBys= 4; // GroupBys define the groups to combine in the query repeated string Wheres = 5; // Wheres define the restrictions on the query string Label = 6; // Label is the name of the Y-Axis - Range Range = 7; // Range is the upper and lower bound of the Y-Axis + Range Range = 7; // Range is the upper and lower bound of the Y-Axis } message Range { diff --git a/server/dashboards_test.go b/server/dashboards_test.go deleted file mode 100644 index 52d3a3fbed..0000000000 --- a/server/dashboards_test.go +++ /dev/null @@ -1,15 +0,0 @@ -package handlers -// -// import ( -// "net/http" -// "testing" -// ) -// -// func TestDashboards(t *testing.T) { -// -// _, err := http.NewRequest("GET", "/chronograf/v1/dashbords", nil) -// if err != nil { -// t.Fatal(err) -// } -// -// }