fix bugs
Jade McGough
parent
4a92be218b
commit
00f66e7593
|
|
@ -93,8 +93,8 @@ type DashboardCell struct {
|
|||
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"`
|
||||
Name string `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"`
|
||||
Type string `protobuf:"bytes,7,opt,name=type,proto3" json:"type,omitempty"`
|
||||
}
|
||||
|
||||
func (m *DashboardCell) Reset() { *m = DashboardCell{} }
|
||||
|
|
@ -232,48 +232,49 @@ func init() {
|
|||
func init() { proto.RegisterFile("internal.proto", fileDescriptorInternal) }
|
||||
|
||||
var fileDescriptorInternal = []byte{
|
||||
// 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,
|
||||
// 693 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x54, 0xdd, 0x6e, 0xd3, 0x4a,
|
||||
0x10, 0xd6, 0xc6, 0x76, 0x12, 0x4f, 0x7a, 0x7a, 0x8e, 0x56, 0xd5, 0xc1, 0x42, 0x5c, 0x44, 0x16,
|
||||
0x48, 0x41, 0x82, 0x5e, 0xb4, 0x4f, 0x90, 0xc6, 0x15, 0x0a, 0x94, 0x52, 0xb6, 0x8d, 0xb8, 0x02,
|
||||
0x69, 0x9b, 0x6c, 0x9b, 0x48, 0x9b, 0xd8, 0xac, 0x6d, 0xd2, 0x3c, 0x02, 0x12, 0xcf, 0xc0, 0x43,
|
||||
0xc0, 0x0b, 0xf0, 0x0e, 0xbc, 0x10, 0x9a, 0xd9, 0xb5, 0xe3, 0x8a, 0x1f, 0x55, 0xe2, 0x6e, 0xbe,
|
||||
0x99, 0xf1, 0xf8, 0x9b, 0xf9, 0x3e, 0x1b, 0x76, 0x17, 0xab, 0x42, 0x99, 0x95, 0xd4, 0xfb, 0x99,
|
||||
0x49, 0x8b, 0x94, 0x77, 0x2b, 0x1c, 0x7f, 0x65, 0xd0, 0x3b, 0xbe, 0xc9, 0x74, 0x6a, 0x64, 0xb1,
|
||||
0x48, 0x57, 0x7c, 0x17, 0x5a, 0xe3, 0x24, 0x62, 0x7d, 0x36, 0xf0, 0x44, 0x6b, 0x9c, 0x70, 0x0e,
|
||||
0xfe, 0xa9, 0x5c, 0xaa, 0xa8, 0xd5, 0x67, 0x83, 0x50, 0x50, 0xcc, 0xff, 0x87, 0xf6, 0x24, 0x57,
|
||||
0x66, 0x9c, 0x44, 0x1e, 0xf5, 0x39, 0x84, 0xbd, 0x89, 0x2c, 0x64, 0xe4, 0xdb, 0x5e, 0x8c, 0xf9,
|
||||
0x03, 0x08, 0x47, 0x46, 0xc9, 0x42, 0xcd, 0x86, 0x45, 0x14, 0x50, 0xfb, 0x36, 0x81, 0xd5, 0x49,
|
||||
0x36, 0x73, 0xd5, 0xb6, 0xad, 0xd6, 0x09, 0x1e, 0x41, 0x27, 0x51, 0x57, 0xb2, 0xd4, 0x45, 0xd4,
|
||||
0xe9, 0xb3, 0x41, 0x57, 0x54, 0x30, 0xfe, 0xc6, 0xa0, 0x7d, 0x9e, 0x96, 0x66, 0xaa, 0xee, 0x44,
|
||||
0x98, 0x83, 0x7f, 0xb1, 0xc9, 0x14, 0xd1, 0x0d, 0x05, 0xc5, 0xfc, 0x3e, 0x74, 0x91, 0xf6, 0x0a,
|
||||
0x7b, 0x2d, 0xe1, 0x1a, 0x63, 0xed, 0x4c, 0xe6, 0xf9, 0x3a, 0x35, 0x33, 0xe2, 0x1c, 0x8a, 0x1a,
|
||||
0xf3, 0xff, 0xc0, 0x9b, 0x88, 0x13, 0x22, 0x1b, 0x0a, 0x0c, 0x7f, 0x4f, 0x13, 0xe7, 0x5c, 0x28,
|
||||
0xad, 0xae, 0x8d, 0xbc, 0x8a, 0xba, 0x76, 0x4e, 0x85, 0xe3, 0x77, 0x10, 0x26, 0x32, 0x9f, 0x5f,
|
||||
0xa6, 0xd2, 0xcc, 0xee, 0xb4, 0xc4, 0x53, 0x08, 0xa6, 0x4a, 0xeb, 0x3c, 0xf2, 0xfa, 0xde, 0xa0,
|
||||
0x77, 0x70, 0x6f, 0xbf, 0xd6, 0xb4, 0x9e, 0x33, 0x52, 0x5a, 0x0b, 0xdb, 0x15, 0x7f, 0x64, 0xf0,
|
||||
0xcf, 0xad, 0x02, 0xdf, 0x01, 0x76, 0x43, 0xef, 0x08, 0x04, 0xbb, 0x41, 0xb4, 0xa1, 0xf9, 0x81,
|
||||
0x60, 0x1b, 0x44, 0x6b, 0x3a, 0x4f, 0x20, 0xd8, 0x1a, 0xd1, 0x9c, 0x8e, 0x12, 0x08, 0x36, 0xc7,
|
||||
0xfd, 0xde, 0x97, 0xca, 0x2c, 0x54, 0x1e, 0x05, 0x7d, 0x6f, 0x10, 0x8a, 0x0a, 0x22, 0x4d, 0xba,
|
||||
0x9f, 0x3d, 0x06, 0xc5, 0x98, 0x2b, 0xf0, 0xd6, 0x1d, 0x9b, 0xc3, 0x38, 0xfe, 0x84, 0x72, 0x29,
|
||||
0xf3, 0x41, 0x99, 0x3b, 0x6d, 0xda, 0x94, 0xc6, 0xfb, 0x83, 0x34, 0xfe, 0xaf, 0xa5, 0x09, 0xb6,
|
||||
0xd2, 0xec, 0x41, 0x70, 0x6e, 0xa6, 0xe3, 0xc4, 0x79, 0xcb, 0x82, 0xf8, 0x33, 0x83, 0xf6, 0x89,
|
||||
0xdc, 0xa4, 0x65, 0xd1, 0xa0, 0x13, 0x12, 0x9d, 0x3e, 0xf4, 0x86, 0x59, 0xa6, 0x17, 0x53, 0xfa,
|
||||
0x1a, 0x1c, 0xab, 0x66, 0x0a, 0x3b, 0x5e, 0x2a, 0x99, 0x97, 0x46, 0x2d, 0xd5, 0xaa, 0x70, 0xfc,
|
||||
0x9a, 0x29, 0xfe, 0x10, 0x82, 0x11, 0x09, 0xe5, 0x93, 0x50, 0xbb, 0x5b, 0xa1, 0xac, 0x3e, 0x54,
|
||||
0xc4, 0x45, 0x86, 0x65, 0x91, 0x5e, 0xe9, 0x74, 0x4d, 0x8c, 0xbb, 0xa2, 0xc6, 0xf1, 0x77, 0x06,
|
||||
0xfe, 0x5f, 0x49, 0xf6, 0xf8, 0xb6, 0x64, 0xbd, 0x83, 0x7f, 0xb7, 0x24, 0x5e, 0x97, 0xca, 0x6c,
|
||||
0xb6, 0x1a, 0xee, 0x00, 0x5b, 0x38, 0x01, 0xd9, 0xa2, 0x56, 0xb4, 0xd3, 0x50, 0x34, 0x82, 0xce,
|
||||
0xc6, 0xc8, 0xd5, 0xb5, 0xca, 0xa3, 0x6e, 0xdf, 0x1b, 0x78, 0xa2, 0x82, 0x54, 0xd1, 0xf2, 0x52,
|
||||
0xe9, 0x3c, 0x0a, 0xad, 0x33, 0x1c, 0xac, 0x5d, 0x00, 0x0d, 0x17, 0x7c, 0x61, 0x10, 0xd0, 0xcb,
|
||||
0xf1, 0xb9, 0x51, 0xba, 0x5c, 0xca, 0xd5, 0xcc, 0x9d, 0xbe, 0x82, 0xa8, 0x47, 0x72, 0xe4, 0xce,
|
||||
0xde, 0x4a, 0x8e, 0x10, 0x8b, 0x33, 0x77, 0xe4, 0x96, 0x38, 0xc3, 0xab, 0x3d, 0x33, 0x69, 0x99,
|
||||
0x1d, 0x6d, 0xec, 0x79, 0x43, 0x51, 0x63, 0xfc, 0x2d, 0xbd, 0x99, 0x2b, 0x53, 0xdb, 0xd4, 0x21,
|
||||
0x34, 0xc1, 0x09, 0xb2, 0x72, 0x5b, 0x5a, 0xc0, 0x1f, 0x41, 0x20, 0x70, 0x0b, 0x5a, 0xf5, 0xd6,
|
||||
0x81, 0x28, 0x2d, 0x6c, 0x35, 0x3e, 0x74, 0x6d, 0x38, 0x65, 0x92, 0x65, 0xca, 0x38, 0xef, 0x5a,
|
||||
0x40, 0xb3, 0xd3, 0xb5, 0x32, 0x44, 0xd9, 0x13, 0x16, 0xc4, 0x6f, 0x21, 0x1c, 0x6a, 0x65, 0x0a,
|
||||
0x51, 0x6a, 0xf5, 0x93, 0xc5, 0x38, 0xf8, 0xcf, 0xcf, 0x5f, 0x9d, 0x56, 0x8e, 0xc7, 0x78, 0xeb,
|
||||
0x53, 0xaf, 0xe1, 0x53, 0x5c, 0xe8, 0x85, 0xcc, 0xe4, 0x38, 0x21, 0x61, 0x3d, 0xe1, 0x50, 0xfc,
|
||||
0x04, 0x7c, 0xfc, 0x1e, 0x1a, 0x93, 0x7d, 0x9a, 0xbc, 0x07, 0xc1, 0xf1, 0x52, 0x2e, 0xb4, 0x1b,
|
||||
0x6d, 0xc1, 0x65, 0x9b, 0x7e, 0xf9, 0x87, 0x3f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x31, 0x9b, 0xcb,
|
||||
0xb7, 0x04, 0x06, 0x00, 0x00,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,8 +34,8 @@ message DashboardCell {
|
|||
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
|
||||
string name = 6; // User-facing name for this Dashboard
|
||||
string type = 7; // Dashboard visualization type
|
||||
}
|
||||
|
||||
message Server {
|
||||
|
|
|
|||
|
|
@ -247,6 +247,7 @@ type DashboardCell struct {
|
|||
|
||||
// DashboardsStore is the storage and retrieval of dashboards
|
||||
type DashboardsStore interface {
|
||||
// All lists all dashboards from the DashboardStore
|
||||
All(context.Context) ([]Dashboard, error)
|
||||
// Create a new Dashboard in the DashboardStore
|
||||
Add(context.Context, *Dashboard) (*Dashboard, error)
|
||||
|
|
|
|||
|
|
@ -142,6 +142,7 @@ func openService(boltPath, cannedPath string, logger chronograf.Logger, useAuth
|
|||
Logger: logger,
|
||||
},
|
||||
LayoutStore: layouts,
|
||||
DashboardsStore: db.DashboardsStore,
|
||||
AlertRulesStore: db.AlertsStore,
|
||||
Logger: logger,
|
||||
UseAuth: useAuth,
|
||||
|
|
|
|||
Loading…
Reference in New Issue