diff --git a/bolt/internal/internal.go b/bolt/internal/internal.go index f6daf2981..51722f2e4 100644 --- a/bolt/internal/internal.go +++ b/bolt/internal/internal.go @@ -274,7 +274,6 @@ func MarshalDashboard(d chronograf.Dashboard) ([]byte, error) { } tableOptions := &TableOptions{ - TimeFormat: c.TableOptions.TimeFormat, VerticalTimeAxis: c.TableOptions.VerticalTimeAxis, SortBy: sortBy, Wrapping: c.TableOptions.Wrapping, @@ -308,6 +307,7 @@ func MarshalDashboard(d chronograf.Dashboard) ([]byte, error) { }, TableOptions: tableOptions, FieldOptions: fieldOptions, + TimeFormat: c.TimeFormat, } } templates := make([]*Template, len(d.Templates)) @@ -443,7 +443,6 @@ func UnmarshalDashboard(data []byte, d *chronograf.Dashboard) error { sortBy.Visible = c.TableOptions.SortBy.Visible } tableOptions.SortBy = sortBy - tableOptions.TimeFormat = c.TableOptions.TimeFormat tableOptions.VerticalTimeAxis = c.TableOptions.VerticalTimeAxis tableOptions.Wrapping = c.TableOptions.Wrapping tableOptions.FixFirstColumn = c.TableOptions.FixFirstColumn @@ -479,6 +478,7 @@ func UnmarshalDashboard(data []byte, d *chronograf.Dashboard) error { Legend: legend, TableOptions: tableOptions, FieldOptions: fieldOptions, + TimeFormat: c.TimeFormat, } } diff --git a/bolt/internal/internal.pb.go b/bolt/internal/internal.pb.go index ccc50f8b5..f4edc8b35 100644 --- a/bolt/internal/internal.pb.go +++ b/bolt/internal/internal.pb.go @@ -233,6 +233,7 @@ type DashboardCell struct { Legend *Legend `protobuf:"bytes,11,opt,name=legend" json:"legend,omitempty"` TableOptions *TableOptions `protobuf:"bytes,12,opt,name=tableOptions" json:"tableOptions,omitempty"` FieldOptions []*RenamableField `protobuf:"bytes,13,rep,name=fieldOptions" json:"fieldOptions,omitempty"` + TimeFormat string `protobuf:"bytes,14,opt,name=timeFormat,proto3" json:"timeFormat,omitempty"` } func (m *DashboardCell) Reset() { *m = DashboardCell{} } @@ -331,8 +332,14 @@ func (m *DashboardCell) GetFieldOptions() []*RenamableField { return nil } +func (m *DashboardCell) GetTimeFormat() string { + if m != nil { + return m.TimeFormat + } + return "" +} + type TableOptions struct { - TimeFormat string `protobuf:"bytes,1,opt,name=timeFormat,proto3" json:"timeFormat,omitempty"` VerticalTimeAxis bool `protobuf:"varint,2,opt,name=verticalTimeAxis,proto3" json:"verticalTimeAxis,omitempty"` SortBy *RenamableField `protobuf:"bytes,3,opt,name=sortBy" json:"sortBy,omitempty"` Wrapping string `protobuf:"bytes,4,opt,name=wrapping,proto3" json:"wrapping,omitempty"` @@ -344,13 +351,6 @@ func (m *TableOptions) String() string { return proto.CompactTextStri func (*TableOptions) ProtoMessage() {} func (*TableOptions) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{3} } -func (m *TableOptions) GetTimeFormat() string { - if m != nil { - return m.TimeFormat - } - return "" -} - func (m *TableOptions) GetVerticalTimeAxis() bool { if m != nil { return m.VerticalTimeAxis @@ -1346,106 +1346,107 @@ func init() { func init() { proto.RegisterFile("internal.proto", fileDescriptorInternal) } var fileDescriptorInternal = []byte{ - // 1615 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x5f, 0x8f, 0xe3, 0x48, - 0x11, 0x97, 0xe3, 0x38, 0x89, 0x2b, 0xd9, 0x61, 0xd4, 0x8c, 0xee, 0xcc, 0x81, 0x50, 0xb0, 0xf8, - 0x13, 0xfe, 0xdc, 0x70, 0x9a, 0x13, 0x12, 0x3a, 0x1d, 0x27, 0x65, 0x26, 0xec, 0x31, 0xec, 0xec, + // 1627 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xdd, 0x8f, 0xe3, 0x48, + 0x11, 0x97, 0x13, 0x3b, 0x89, 0x2b, 0xd9, 0x61, 0xd4, 0xac, 0xee, 0xcc, 0x81, 0x50, 0xb0, 0xf8, + 0x08, 0x1f, 0x37, 0x9c, 0xe6, 0x84, 0x84, 0x4e, 0xc7, 0x49, 0x99, 0x09, 0x7b, 0xcc, 0xee, 0xec, 0xce, 0x6c, 0x67, 0x66, 0x78, 0x42, 0xa7, 0x4e, 0xd2, 0x49, 0x5a, 0xe7, 0xd8, 0xa6, 0x6d, 0xcf, - 0xc4, 0x3c, 0xf3, 0xcc, 0x47, 0x40, 0x42, 0x82, 0x2f, 0x80, 0x78, 0xe7, 0x9d, 0x27, 0xbe, 0xcd, - 0xf1, 0x88, 0xaa, 0xff, 0xd8, 0xce, 0x24, 0xbb, 0x5a, 0x24, 0xc4, 0x5b, 0xff, 0xaa, 0x2a, 0xd5, - 0x5d, 0xd5, 0x55, 0xbf, 0x2e, 0x07, 0x8e, 0x44, 0x9c, 0x73, 0x19, 0xb3, 0xe8, 0x34, 0x95, 0x49, - 0x9e, 0x90, 0x9e, 0xc5, 0xe1, 0x1f, 0x5c, 0xe8, 0x4c, 0x93, 0x42, 0xce, 0x39, 0x39, 0x82, 0xd6, - 0xe5, 0x24, 0x70, 0x86, 0xce, 0xc8, 0xa5, 0xad, 0xcb, 0x09, 0x21, 0xd0, 0x7e, 0xc5, 0x36, 0x3c, - 0x68, 0x0d, 0x9d, 0x91, 0x4f, 0xd5, 0x1a, 0x65, 0xb7, 0x65, 0xca, 0x03, 0x57, 0xcb, 0x70, 0x4d, - 0x3e, 0x80, 0xde, 0x5d, 0x86, 0xde, 0x36, 0x3c, 0x68, 0x2b, 0x79, 0x85, 0x51, 0x77, 0xc3, 0xb2, - 0xec, 0x31, 0x91, 0x8b, 0xc0, 0xd3, 0x3a, 0x8b, 0xc9, 0x31, 0xb8, 0x77, 0xf4, 0x2a, 0xe8, 0x28, - 0x31, 0x2e, 0x49, 0x00, 0xdd, 0x09, 0x5f, 0xb2, 0x22, 0xca, 0x83, 0xee, 0xd0, 0x19, 0xf5, 0xa8, - 0x85, 0xe8, 0xe7, 0x96, 0x47, 0x7c, 0x25, 0xd9, 0x32, 0xe8, 0x69, 0x3f, 0x16, 0x93, 0x53, 0x20, - 0x97, 0x71, 0xc6, 0xe7, 0x85, 0xe4, 0xd3, 0x2f, 0x45, 0x7a, 0xcf, 0xa5, 0x58, 0x96, 0x81, 0xaf, - 0x1c, 0x1c, 0xd0, 0xe0, 0x2e, 0x2f, 0x79, 0xce, 0x70, 0x6f, 0x50, 0xae, 0x2c, 0x24, 0x21, 0x0c, - 0xa6, 0x6b, 0x26, 0xf9, 0x62, 0xca, 0xe7, 0x92, 0xe7, 0x41, 0x5f, 0xa9, 0x77, 0x64, 0x68, 0x73, - 0x2d, 0x57, 0x2c, 0x16, 0xbf, 0x67, 0xb9, 0x48, 0xe2, 0x60, 0xa0, 0x6d, 0x9a, 0x32, 0xcc, 0x12, - 0x4d, 0x22, 0x1e, 0x3c, 0xd3, 0x59, 0xc2, 0x35, 0xf9, 0x16, 0xf8, 0x26, 0x18, 0x7a, 0x13, 0x1c, - 0x29, 0x45, 0x2d, 0x08, 0xff, 0xee, 0x80, 0x3f, 0x61, 0xd9, 0x7a, 0x96, 0x30, 0xb9, 0x78, 0xa7, - 0x9b, 0xf8, 0x10, 0xbc, 0x39, 0x8f, 0xa2, 0x2c, 0x70, 0x87, 0xee, 0xa8, 0x7f, 0xf6, 0xfe, 0x69, - 0x75, 0xc5, 0x95, 0x9f, 0x0b, 0x1e, 0x45, 0x54, 0x5b, 0x91, 0x8f, 0xc0, 0xcf, 0xf9, 0x26, 0x8d, - 0x58, 0xce, 0xb3, 0xa0, 0xad, 0x7e, 0x42, 0xea, 0x9f, 0xdc, 0x1a, 0x15, 0xad, 0x8d, 0xf6, 0x02, - 0xf5, 0xf6, 0x03, 0x0d, 0xbf, 0x72, 0xe1, 0xd9, 0xce, 0x76, 0x64, 0x00, 0xce, 0x56, 0x9d, 0xdc, - 0xa3, 0xce, 0x16, 0x51, 0xa9, 0x4e, 0xed, 0x51, 0xa7, 0x44, 0xf4, 0xa8, 0x2a, 0xc7, 0xa3, 0xce, - 0x23, 0xa2, 0xb5, 0xaa, 0x17, 0x8f, 0x3a, 0x6b, 0xf2, 0x43, 0xe8, 0xfe, 0xae, 0xe0, 0x52, 0xf0, - 0x2c, 0xf0, 0xd4, 0xe9, 0xbe, 0x56, 0x9f, 0xee, 0x75, 0xc1, 0x65, 0x49, 0xad, 0x1e, 0xb3, 0xa1, - 0x6a, 0x4d, 0x17, 0x8e, 0x5a, 0xa3, 0x2c, 0xc7, 0xba, 0xec, 0x6a, 0x19, 0xae, 0x4d, 0x16, 0x75, - 0xb5, 0x60, 0x16, 0x7f, 0x06, 0x6d, 0xb6, 0xe5, 0x59, 0xe0, 0x2b, 0xff, 0xdf, 0x79, 0x43, 0xc2, - 0x4e, 0xc7, 0x5b, 0x9e, 0xfd, 0x32, 0xce, 0x65, 0x49, 0x95, 0x39, 0xf9, 0x01, 0x74, 0xe6, 0x49, - 0x94, 0xc8, 0x2c, 0x80, 0xa7, 0x07, 0xbb, 0x40, 0x39, 0x35, 0x6a, 0x32, 0x82, 0x4e, 0xc4, 0x57, - 0x3c, 0x5e, 0xa8, 0xba, 0xe9, 0x9f, 0x1d, 0xd7, 0x86, 0x57, 0x4a, 0x4e, 0x8d, 0x9e, 0x7c, 0x02, - 0x83, 0x9c, 0xcd, 0x22, 0x7e, 0x9d, 0x62, 0x16, 0x33, 0x55, 0x43, 0xfd, 0xb3, 0xf7, 0x1a, 0xf7, - 0xd1, 0xd0, 0xd2, 0x1d, 0x5b, 0xf2, 0x29, 0x0c, 0x96, 0x82, 0x47, 0x0b, 0xfb, 0xdb, 0x67, 0xea, - 0x50, 0x41, 0xfd, 0x5b, 0xca, 0x63, 0xb6, 0xc1, 0x5f, 0x3c, 0x47, 0x33, 0xba, 0x63, 0xfd, 0xc1, - 0xe7, 0xe0, 0x57, 0xf1, 0x61, 0x03, 0x7e, 0xc9, 0x4b, 0x75, 0x5b, 0x3e, 0xc5, 0x25, 0xf9, 0x2e, - 0x78, 0x0f, 0x2c, 0x2a, 0x74, 0xa5, 0xf5, 0xcf, 0x8e, 0x6a, 0xaf, 0xe3, 0xad, 0xc8, 0xa8, 0x56, - 0x7e, 0xd2, 0xfa, 0xb9, 0x13, 0xfe, 0xcb, 0x81, 0x41, 0xf3, 0x94, 0xe4, 0xdb, 0x00, 0xb9, 0xd8, - 0xf0, 0xe7, 0x89, 0xdc, 0xb0, 0xdc, 0xf8, 0x6c, 0x48, 0xc8, 0x8f, 0xe0, 0xf8, 0x81, 0xcb, 0x5c, - 0xcc, 0x59, 0x74, 0x2b, 0x36, 0x1c, 0xfd, 0xa9, 0x5d, 0x7a, 0x74, 0x4f, 0x4e, 0x3e, 0x82, 0x4e, - 0x96, 0xc8, 0xfc, 0xbc, 0x54, 0xd5, 0xf2, 0xb6, 0xe8, 0x8c, 0x1d, 0xf2, 0xc3, 0xa3, 0x64, 0x69, - 0x2a, 0xe2, 0x95, 0xe5, 0x20, 0x8b, 0xc9, 0xf7, 0xe1, 0x68, 0x29, 0xb6, 0xcf, 0x85, 0xcc, 0xf2, - 0x8b, 0x24, 0x2a, 0x36, 0xb1, 0xaa, 0x9c, 0x1e, 0x7d, 0x22, 0x0d, 0xff, 0xe8, 0xc0, 0xd1, 0xae, - 0x7b, 0xec, 0x01, 0xbb, 0xb3, 0x6a, 0x40, 0x1d, 0xd6, 0x8e, 0x8c, 0x0c, 0xa1, 0xbf, 0x10, 0x59, - 0x1a, 0xb1, 0xb2, 0xd1, 0xa3, 0x4d, 0x11, 0x12, 0xce, 0x83, 0xc8, 0xc4, 0x2c, 0xd2, 0xbc, 0xd9, - 0xa3, 0x16, 0x22, 0x29, 0xa4, 0x92, 0xcf, 0x45, 0x86, 0x0d, 0xa6, 0x7b, 0xa1, 0x16, 0x84, 0x2b, - 0xf0, 0x54, 0x85, 0x35, 0xf8, 0xc0, 0xb7, 0x7c, 0xa0, 0x58, 0xb8, 0xd5, 0x60, 0xe1, 0x63, 0x70, - 0x7f, 0xc5, 0xb7, 0x86, 0x98, 0x71, 0x59, 0xb1, 0x46, 0xbb, 0xc1, 0x1a, 0x27, 0xe0, 0xdd, 0xab, - 0x0b, 0xd6, 0xdd, 0xac, 0x41, 0xf8, 0x19, 0x74, 0x74, 0x85, 0x56, 0x9e, 0x9d, 0x86, 0xe7, 0x21, - 0xf4, 0xaf, 0xa5, 0xe0, 0x71, 0xae, 0x79, 0xc0, 0x04, 0xd8, 0x10, 0x85, 0x7f, 0x73, 0xa0, 0xad, - 0x2e, 0x2e, 0x84, 0x41, 0xc4, 0x57, 0x6c, 0x5e, 0x9e, 0x27, 0x45, 0xbc, 0xc8, 0x02, 0x67, 0xe8, - 0x8e, 0x5c, 0xba, 0x23, 0x23, 0xef, 0x41, 0x67, 0xa6, 0xb5, 0xad, 0xa1, 0x3b, 0xf2, 0xa9, 0x41, - 0x78, 0xb4, 0x88, 0xcd, 0x78, 0x64, 0x42, 0xd0, 0x00, 0xad, 0x53, 0xc9, 0x97, 0x62, 0x6b, 0xc2, - 0x30, 0x08, 0xe5, 0x59, 0xb1, 0x44, 0xb9, 0x8e, 0xc4, 0x20, 0x0c, 0x60, 0xc6, 0xb2, 0x8a, 0x1c, - 0x70, 0x8d, 0x9e, 0xb3, 0x39, 0x8b, 0x2c, 0x3b, 0x68, 0x10, 0xfe, 0xc3, 0xc1, 0x37, 0x45, 0xb3, - 0xdd, 0x5e, 0x86, 0xbf, 0x01, 0x3d, 0x64, 0xc2, 0x2f, 0x1e, 0x98, 0x34, 0x01, 0x77, 0x11, 0xdf, - 0x33, 0x49, 0x7e, 0x0a, 0x1d, 0xd5, 0x06, 0x07, 0x98, 0xd7, 0xba, 0x53, 0x59, 0xa5, 0xc6, 0xac, - 0xe2, 0xa6, 0x76, 0x83, 0x9b, 0xaa, 0x60, 0xbd, 0x66, 0xb0, 0x1f, 0x82, 0x87, 0x24, 0x57, 0xaa, - 0xd3, 0x1f, 0xf4, 0xac, 0xa9, 0x50, 0x5b, 0x85, 0x77, 0xf0, 0x6c, 0x67, 0xc7, 0x6a, 0x27, 0x67, - 0x77, 0xa7, 0xba, 0xa5, 0x7d, 0xd3, 0xc2, 0xd8, 0x2f, 0x19, 0x8f, 0xf8, 0x3c, 0xe7, 0x0b, 0x53, - 0x93, 0x15, 0x0e, 0xff, 0xec, 0xd4, 0x7e, 0xd5, 0x7e, 0x58, 0xc0, 0xf3, 0x64, 0xb3, 0x61, 0xf1, - 0xc2, 0xb8, 0xb6, 0x10, 0xf3, 0xb6, 0x98, 0x19, 0xd7, 0xad, 0xc5, 0x0c, 0xb1, 0x4c, 0xcd, 0x0d, - 0xb6, 0x64, 0x8a, 0xb5, 0xb3, 0xe1, 0x2c, 0x2b, 0x24, 0xdf, 0xf0, 0x38, 0x37, 0x29, 0x68, 0x8a, - 0xc8, 0xfb, 0xd0, 0xcd, 0xd9, 0xea, 0x0b, 0x24, 0x22, 0x73, 0x93, 0x39, 0x5b, 0xbd, 0xe0, 0x25, - 0xf9, 0x26, 0xf8, 0x8a, 0xba, 0x94, 0x4a, 0x5f, 0x67, 0x4f, 0x09, 0x5e, 0xf0, 0x32, 0xfc, 0xb7, - 0x03, 0x9d, 0x29, 0x97, 0x0f, 0x5c, 0xbe, 0xd3, 0x63, 0xd9, 0x1c, 0x51, 0xdc, 0xb7, 0x8c, 0x28, - 0xed, 0xc3, 0x23, 0x8a, 0x57, 0x8f, 0x28, 0x27, 0xe0, 0x4d, 0xe5, 0xfc, 0x72, 0xa2, 0x4e, 0xe4, - 0x52, 0x0d, 0xb0, 0x1a, 0xc7, 0xf3, 0x5c, 0x3c, 0x70, 0x33, 0xb7, 0x18, 0xb4, 0xf7, 0x86, 0xf6, - 0x0e, 0x0c, 0x0b, 0xff, 0xe5, 0xf8, 0x12, 0xfe, 0xc9, 0x81, 0xce, 0x15, 0x2b, 0x93, 0x22, 0xdf, - 0xab, 0xda, 0x21, 0xf4, 0xc7, 0x69, 0x1a, 0x89, 0xf9, 0x4e, 0xa7, 0x36, 0x44, 0x68, 0xf1, 0xb2, - 0x71, 0x1f, 0x3a, 0x17, 0x4d, 0x11, 0x3e, 0x01, 0x17, 0x6a, 0xae, 0xd0, 0x43, 0x42, 0xe3, 0x09, - 0xd0, 0xe3, 0x84, 0x52, 0x62, 0xd2, 0xc6, 0x45, 0x9e, 0x2c, 0xa3, 0xe4, 0x51, 0x65, 0xa7, 0x47, - 0x2b, 0x1c, 0xfe, 0xb3, 0x05, 0xed, 0xff, 0xd7, 0x2c, 0x30, 0x00, 0x47, 0x98, 0xe2, 0x70, 0x44, - 0x35, 0x19, 0x74, 0x1b, 0x93, 0x41, 0x00, 0xdd, 0x52, 0xb2, 0x78, 0xc5, 0xb3, 0xa0, 0xa7, 0xd8, - 0xc8, 0x42, 0xa5, 0x51, 0x7d, 0xa7, 0x47, 0x02, 0x9f, 0x5a, 0x58, 0xf5, 0x11, 0x34, 0xfa, 0xe8, - 0x27, 0x66, 0x7a, 0xe8, 0x3f, 0x7d, 0x6f, 0x0f, 0x0d, 0x0d, 0xff, 0xbb, 0x77, 0xf6, 0x2b, 0x07, - 0xbc, 0xaa, 0x09, 0x2f, 0x76, 0x9b, 0xf0, 0xa2, 0x6e, 0xc2, 0xc9, 0xb9, 0x6d, 0xc2, 0xc9, 0x39, - 0x62, 0x7a, 0x63, 0x9b, 0x90, 0xde, 0xe0, 0x65, 0x7d, 0x2e, 0x93, 0x22, 0x3d, 0x2f, 0xf5, 0xad, - 0xfa, 0xb4, 0xc2, 0x58, 0xb9, 0xbf, 0x59, 0x73, 0x69, 0x52, 0xed, 0x53, 0x83, 0xb0, 0xce, 0xaf, - 0x14, 0x41, 0xe9, 0xe4, 0x6a, 0x40, 0xbe, 0x07, 0x1e, 0xc5, 0xe4, 0xa9, 0x0c, 0xef, 0xdc, 0x8b, - 0x12, 0x53, 0xad, 0x45, 0xa7, 0xfa, 0x9b, 0xc2, 0x14, 0xbc, 0xfd, 0xc2, 0xf8, 0x31, 0x74, 0xa6, - 0x6b, 0xb1, 0xcc, 0xed, 0x0c, 0xf6, 0xf5, 0x06, 0xc1, 0x89, 0x0d, 0x57, 0x3a, 0x6a, 0x4c, 0xc2, - 0xd7, 0xe0, 0x57, 0xc2, 0xfa, 0x38, 0x4e, 0xf3, 0x38, 0x04, 0xda, 0x77, 0xb1, 0xc8, 0x6d, 0xab, - 0xe3, 0x1a, 0x83, 0x7d, 0x5d, 0xb0, 0x38, 0x17, 0x79, 0x69, 0x5b, 0xdd, 0xe2, 0xf0, 0x63, 0x73, - 0x7c, 0x74, 0x77, 0x97, 0xa6, 0x5c, 0x1a, 0xda, 0xd0, 0x40, 0x6d, 0x92, 0x3c, 0x72, 0xcd, 0xf8, - 0x2e, 0xd5, 0x20, 0xfc, 0x2d, 0xf8, 0xe3, 0x88, 0xcb, 0x9c, 0x16, 0x11, 0x3f, 0xf4, 0x12, 0xff, - 0x7a, 0x7a, 0xfd, 0xca, 0x9e, 0x00, 0xd7, 0x35, 0x45, 0xb8, 0x4f, 0x28, 0xe2, 0x05, 0x4b, 0xd9, - 0xe5, 0x44, 0xd5, 0xb9, 0x4b, 0x0d, 0x0a, 0xff, 0xe2, 0x40, 0x1b, 0xb9, 0xa8, 0xe1, 0xba, 0xfd, - 0x36, 0x1e, 0xbb, 0x91, 0xc9, 0x83, 0x58, 0x70, 0x69, 0x83, 0xb3, 0x58, 0x25, 0x7d, 0xbe, 0xe6, - 0xd5, 0x83, 0x6f, 0x10, 0xd6, 0x1a, 0x7e, 0x80, 0xd8, 0x5e, 0x6a, 0xd4, 0x1a, 0x8a, 0xa9, 0x56, - 0xe2, 0xf8, 0x36, 0x2d, 0x52, 0x2e, 0xc7, 0x8b, 0x8d, 0xb0, 0x03, 0x52, 0x43, 0x12, 0x7e, 0xa6, - 0x3f, 0x69, 0xf6, 0x18, 0xcd, 0x39, 0xfc, 0xf9, 0xf3, 0xf4, 0xe4, 0xe1, 0x5f, 0x1d, 0xe8, 0xbe, - 0x34, 0x03, 0x59, 0x33, 0x0a, 0xe7, 0x8d, 0x51, 0xb4, 0x76, 0xa2, 0x38, 0x83, 0x13, 0x6b, 0xb3, - 0xb3, 0xbf, 0xce, 0xc2, 0x41, 0x9d, 0xc9, 0x68, 0xbb, 0xba, 0xac, 0x77, 0xf9, 0xa2, 0xb9, 0xdd, - 0xb5, 0x39, 0x74, 0xe1, 0x7b, 0xb7, 0x32, 0x84, 0xbe, 0xfd, 0x92, 0x4b, 0x22, 0xfb, 0xc0, 0x34, - 0x45, 0xe1, 0x19, 0x74, 0x2e, 0x92, 0x78, 0x29, 0x56, 0x64, 0x04, 0xed, 0x71, 0x91, 0xaf, 0x95, - 0xc7, 0xfe, 0xd9, 0x49, 0xa3, 0xf1, 0x8b, 0x7c, 0xad, 0x6d, 0xa8, 0xb2, 0x08, 0x3f, 0x05, 0xa8, - 0x65, 0xf8, 0x4a, 0xd4, 0xb7, 0xf1, 0x8a, 0x3f, 0x62, 0xc9, 0x64, 0xca, 0x4b, 0x8f, 0x1e, 0xd0, - 0x84, 0xbf, 0x00, 0xff, 0xbc, 0x10, 0xd1, 0xe2, 0x32, 0x5e, 0x26, 0x48, 0x1d, 0xf7, 0x5c, 0x66, - 0xf5, 0x7d, 0x59, 0x88, 0xe9, 0x46, 0x16, 0xa9, 0x7a, 0xc8, 0xa0, 0x59, 0x47, 0xfd, 0x4f, 0xf0, - 0xf1, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xd1, 0xd1, 0x5d, 0x3c, 0x39, 0x10, 0x00, 0x00, + 0xc4, 0x3c, 0xf3, 0xcc, 0x2b, 0x6f, 0x48, 0x48, 0xf0, 0x0f, 0x20, 0x1e, 0x91, 0x78, 0xe7, 0x1f, + 0x82, 0x47, 0x54, 0xfd, 0x61, 0x3b, 0x93, 0xec, 0x6a, 0x91, 0xd0, 0xbd, 0xf5, 0xaf, 0xaa, 0x52, + 0xdd, 0x55, 0x5d, 0xf5, 0xeb, 0x72, 0xe0, 0x48, 0xc4, 0x39, 0x97, 0x31, 0x8b, 0x4e, 0x52, 0x99, + 0xe4, 0x09, 0xe9, 0x59, 0x1c, 0xfe, 0xbe, 0x0d, 0x9d, 0x69, 0x52, 0xc8, 0x39, 0x27, 0x47, 0xd0, + 0xba, 0x98, 0x04, 0xce, 0xd0, 0x19, 0xb5, 0x69, 0xeb, 0x62, 0x42, 0x08, 0xb8, 0xaf, 0xd8, 0x86, + 0x07, 0xad, 0xa1, 0x33, 0xf2, 0xa9, 0x5a, 0xa3, 0xec, 0xa6, 0x4c, 0x79, 0xd0, 0xd6, 0x32, 0x5c, + 0x93, 0x0f, 0xa0, 0x77, 0x9b, 0xa1, 0xb7, 0x0d, 0x0f, 0x5c, 0x25, 0xaf, 0x30, 0xea, 0xae, 0x59, + 0x96, 0x3d, 0x24, 0x72, 0x11, 0x78, 0x5a, 0x67, 0x31, 0x39, 0x86, 0xf6, 0x2d, 0xbd, 0x0c, 0x3a, + 0x4a, 0x8c, 0x4b, 0x12, 0x40, 0x77, 0xc2, 0x97, 0xac, 0x88, 0xf2, 0xa0, 0x3b, 0x74, 0x46, 0x3d, + 0x6a, 0x21, 0xfa, 0xb9, 0xe1, 0x11, 0x5f, 0x49, 0xb6, 0x0c, 0x7a, 0xda, 0x8f, 0xc5, 0xe4, 0x04, + 0xc8, 0x45, 0x9c, 0xf1, 0x79, 0x21, 0xf9, 0xf4, 0x4b, 0x91, 0xde, 0x71, 0x29, 0x96, 0x65, 0xe0, + 0x2b, 0x07, 0x07, 0x34, 0xb8, 0xcb, 0x4b, 0x9e, 0x33, 0xdc, 0x1b, 0x94, 0x2b, 0x0b, 0x49, 0x08, + 0x83, 0xe9, 0x9a, 0x49, 0xbe, 0x98, 0xf2, 0xb9, 0xe4, 0x79, 0xd0, 0x57, 0xea, 0x1d, 0x19, 0xda, + 0x5c, 0xc9, 0x15, 0x8b, 0xc5, 0xef, 0x58, 0x2e, 0x92, 0x38, 0x18, 0x68, 0x9b, 0xa6, 0x0c, 0xb3, + 0x44, 0x93, 0x88, 0x07, 0x4f, 0x74, 0x96, 0x70, 0x4d, 0xbe, 0x05, 0xbe, 0x09, 0x86, 0x5e, 0x07, + 0x47, 0x4a, 0x51, 0x0b, 0xc2, 0xbf, 0x3b, 0xe0, 0x4f, 0x58, 0xb6, 0x9e, 0x25, 0x4c, 0x2e, 0xde, + 0xe9, 0x26, 0x3e, 0x04, 0x6f, 0xce, 0xa3, 0x28, 0x0b, 0xda, 0xc3, 0xf6, 0xa8, 0x7f, 0xfa, 0xfe, + 0x49, 0x75, 0xc5, 0x95, 0x9f, 0x73, 0x1e, 0x45, 0x54, 0x5b, 0x91, 0x8f, 0xc0, 0xcf, 0xf9, 0x26, + 0x8d, 0x58, 0xce, 0xb3, 0xc0, 0x55, 0x3f, 0x21, 0xf5, 0x4f, 0x6e, 0x8c, 0x8a, 0xd6, 0x46, 0x7b, + 0x81, 0x7a, 0xfb, 0x81, 0x86, 0x7f, 0x74, 0xe1, 0xc9, 0xce, 0x76, 0x64, 0x00, 0xce, 0x56, 0x9d, + 0xdc, 0xa3, 0xce, 0x16, 0x51, 0xa9, 0x4e, 0xed, 0x51, 0xa7, 0x44, 0xf4, 0xa0, 0x2a, 0xc7, 0xa3, + 0xce, 0x03, 0xa2, 0xb5, 0xaa, 0x17, 0x8f, 0x3a, 0x6b, 0xf2, 0x43, 0xe8, 0xfe, 0xb6, 0xe0, 0x52, + 0xf0, 0x2c, 0xf0, 0xd4, 0xe9, 0xbe, 0x56, 0x9f, 0xee, 0x75, 0xc1, 0x65, 0x49, 0xad, 0x1e, 0xb3, + 0xa1, 0x6a, 0x4d, 0x17, 0x8e, 0x5a, 0xa3, 0x2c, 0xc7, 0xba, 0xec, 0x6a, 0x19, 0xae, 0x4d, 0x16, + 0x75, 0xb5, 0x60, 0x16, 0x7f, 0x06, 0x2e, 0xdb, 0xf2, 0x2c, 0xf0, 0x95, 0xff, 0xef, 0xbc, 0x21, + 0x61, 0x27, 0xe3, 0x2d, 0xcf, 0x7e, 0x19, 0xe7, 0xb2, 0xa4, 0xca, 0x9c, 0xfc, 0x00, 0x3a, 0xf3, + 0x24, 0x4a, 0x64, 0x16, 0xc0, 0xe3, 0x83, 0x9d, 0xa3, 0x9c, 0x1a, 0x35, 0x19, 0x41, 0x27, 0xe2, + 0x2b, 0x1e, 0x2f, 0x54, 0xdd, 0xf4, 0x4f, 0x8f, 0x6b, 0xc3, 0x4b, 0x25, 0xa7, 0x46, 0x4f, 0x3e, + 0x81, 0x41, 0xce, 0x66, 0x11, 0xbf, 0x4a, 0x31, 0x8b, 0x99, 0xaa, 0xa1, 0xfe, 0xe9, 0x7b, 0x8d, + 0xfb, 0x68, 0x68, 0xe9, 0x8e, 0x2d, 0xf9, 0x14, 0x06, 0x4b, 0xc1, 0xa3, 0x85, 0xfd, 0xed, 0x13, + 0x75, 0xa8, 0xa0, 0xfe, 0x2d, 0xe5, 0x31, 0xdb, 0xe0, 0x2f, 0x9e, 0xa1, 0x19, 0xdd, 0xb1, 0x26, + 0xdf, 0x06, 0xc8, 0xc5, 0x86, 0x3f, 0x4b, 0xe4, 0x86, 0xe5, 0xa6, 0x0c, 0x1b, 0x92, 0x0f, 0x3e, + 0x07, 0xbf, 0x8a, 0x1f, 0x1b, 0xf4, 0x4b, 0x5e, 0xaa, 0xdb, 0xf4, 0x29, 0x2e, 0xc9, 0x77, 0xc1, + 0xbb, 0x67, 0x51, 0xa1, 0x2b, 0xb1, 0x7f, 0x7a, 0x54, 0xef, 0x3a, 0xde, 0x8a, 0x8c, 0x6a, 0xe5, + 0x27, 0xad, 0x9f, 0x3b, 0xe1, 0x3f, 0x1c, 0x18, 0x34, 0xa3, 0x20, 0x3f, 0x82, 0xe3, 0x7b, 0x2e, + 0x73, 0x31, 0x67, 0xd1, 0x8d, 0xd8, 0x70, 0xb4, 0x57, 0x5e, 0x7a, 0x74, 0x4f, 0x4e, 0x3e, 0x82, + 0x4e, 0x96, 0xc8, 0xfc, 0xac, 0x54, 0xd5, 0xf2, 0xb6, 0xe8, 0x8c, 0x1d, 0xf2, 0xc3, 0x83, 0x64, + 0x69, 0x2a, 0xe2, 0x95, 0xe5, 0x20, 0x8b, 0xc9, 0xf7, 0xe1, 0x68, 0x29, 0xb6, 0xcf, 0x84, 0xcc, + 0xf2, 0xf3, 0x24, 0x2a, 0x36, 0xb1, 0xaa, 0x9c, 0x1e, 0x7d, 0x24, 0x7d, 0xee, 0xf6, 0x9c, 0xe3, + 0xd6, 0x73, 0xb7, 0xe7, 0x1d, 0x77, 0xc2, 0x3f, 0x38, 0x70, 0xb4, 0xbb, 0x15, 0xf6, 0x83, 0x3d, + 0x85, 0x6a, 0x46, 0x9d, 0x96, 0x1d, 0x19, 0x19, 0x42, 0x7f, 0x21, 0xb2, 0x34, 0x62, 0x65, 0xa3, + 0x5f, 0x9b, 0x22, 0x24, 0x9f, 0x7b, 0x91, 0x89, 0x59, 0xa4, 0x39, 0xb4, 0x47, 0x2d, 0x44, 0x82, + 0x48, 0x25, 0x9f, 0x8b, 0x0c, 0x9b, 0x4d, 0xf7, 0x45, 0x2d, 0x08, 0x57, 0xe0, 0xa9, 0x6a, 0x6b, + 0x70, 0x83, 0x6f, 0xb9, 0x41, 0x31, 0x72, 0xab, 0xc1, 0xc8, 0xc7, 0xd0, 0xfe, 0x15, 0xdf, 0x1a, + 0x92, 0xc6, 0x65, 0xc5, 0x20, 0x6e, 0x83, 0x41, 0x9e, 0x82, 0x77, 0xa7, 0x2e, 0x53, 0x77, 0xb6, + 0x06, 0xe1, 0x67, 0xd0, 0xd1, 0xd5, 0x5a, 0x79, 0x76, 0x1a, 0x9e, 0x87, 0xd0, 0xbf, 0x92, 0x82, + 0xc7, 0xb9, 0xe6, 0x04, 0x13, 0x60, 0x43, 0x14, 0xfe, 0xcd, 0x01, 0x57, 0x5d, 0x62, 0x08, 0x83, + 0x88, 0xaf, 0xd8, 0xbc, 0x3c, 0x4b, 0x8a, 0x78, 0x91, 0x05, 0xce, 0xb0, 0x3d, 0x6a, 0xd3, 0x1d, + 0x19, 0x79, 0x0f, 0x3a, 0x33, 0xad, 0x6d, 0x0d, 0xdb, 0x23, 0x9f, 0x1a, 0x84, 0x47, 0x8b, 0xd8, + 0x8c, 0x47, 0x26, 0x04, 0x0d, 0xd0, 0x3a, 0x95, 0x7c, 0x29, 0xb6, 0x26, 0x0c, 0x83, 0x50, 0x9e, + 0x15, 0x4b, 0x94, 0xeb, 0x48, 0x0c, 0xc2, 0x00, 0x66, 0x2c, 0xab, 0x88, 0x02, 0xd7, 0xe8, 0x39, + 0x9b, 0xb3, 0xc8, 0x32, 0x85, 0x06, 0xe1, 0x3f, 0x1d, 0x7c, 0x5f, 0x34, 0xf3, 0xed, 0x65, 0xf8, + 0x1b, 0xd0, 0x43, 0x56, 0xfc, 0xe2, 0x9e, 0x49, 0x13, 0x70, 0x17, 0xf1, 0x1d, 0x93, 0xe4, 0xa7, + 0xd0, 0x51, 0x25, 0x7f, 0x80, 0x85, 0xad, 0x3b, 0x95, 0x55, 0x6a, 0xcc, 0x2a, 0x9e, 0x72, 0x1b, + 0x3c, 0x55, 0x05, 0xeb, 0x35, 0x83, 0xfd, 0x10, 0x3c, 0x24, 0xbc, 0x52, 0x9d, 0xfe, 0xa0, 0x67, + 0x4d, 0x8b, 0xda, 0x2a, 0xbc, 0x85, 0x27, 0x3b, 0x3b, 0x56, 0x3b, 0x39, 0xbb, 0x3b, 0xd5, 0xed, + 0xeb, 0x9b, 0x76, 0xc5, 0xde, 0xc9, 0x78, 0xc4, 0xe7, 0x39, 0x5f, 0x98, 0x9a, 0xac, 0x70, 0xf8, + 0x67, 0xa7, 0xf6, 0xab, 0xf6, 0xc3, 0x02, 0x9e, 0x27, 0x9b, 0x0d, 0x8b, 0x17, 0xc6, 0xb5, 0x85, + 0x98, 0xb7, 0xc5, 0xcc, 0xb8, 0x6e, 0x2d, 0x66, 0x88, 0x65, 0x6a, 0x6e, 0xb0, 0x25, 0x53, 0xac, + 0x9d, 0x0d, 0x67, 0x59, 0x21, 0xf9, 0x86, 0xc7, 0xb9, 0x49, 0x41, 0x53, 0x44, 0xde, 0x87, 0x6e, + 0xce, 0x56, 0x5f, 0x20, 0xe9, 0x98, 0x9b, 0xcc, 0xd9, 0xea, 0x05, 0x2f, 0xc9, 0x37, 0xc1, 0x57, + 0x34, 0xa6, 0x54, 0xfa, 0x3a, 0x7b, 0x4a, 0xf0, 0x82, 0x97, 0xe1, 0x7f, 0x1c, 0xe8, 0x4c, 0xb9, + 0xbc, 0xe7, 0xf2, 0x9d, 0x1e, 0xce, 0xe6, 0xb8, 0xd2, 0x7e, 0xcb, 0xb8, 0xe2, 0x1e, 0x1e, 0x57, + 0xbc, 0x7a, 0x5c, 0x79, 0x0a, 0xde, 0x54, 0xce, 0x2f, 0x26, 0xea, 0x44, 0x6d, 0xaa, 0x01, 0x56, + 0xe3, 0x78, 0x9e, 0x8b, 0x7b, 0x6e, 0x66, 0x18, 0x83, 0xf6, 0xde, 0xd3, 0xde, 0x81, 0xc1, 0xe1, + 0x7f, 0x1c, 0x65, 0xc2, 0x3f, 0x39, 0xd0, 0xb9, 0x64, 0x65, 0x52, 0xe4, 0x7b, 0x55, 0x3b, 0x84, + 0xfe, 0x38, 0x4d, 0x23, 0x31, 0xdf, 0xe9, 0xd4, 0x86, 0x08, 0x2d, 0x5e, 0x36, 0xee, 0x43, 0xe7, + 0xa2, 0x29, 0x42, 0xba, 0x3f, 0x57, 0x33, 0x86, 0x1e, 0x18, 0x1a, 0x74, 0xaf, 0x47, 0x0b, 0xa5, + 0xc4, 0xa4, 0x8d, 0x8b, 0x3c, 0x59, 0x46, 0xc9, 0x83, 0xca, 0x4e, 0x8f, 0x56, 0x38, 0xfc, 0x57, + 0x0b, 0xdc, 0xaf, 0x6a, 0x2e, 0x18, 0x80, 0x23, 0x4c, 0x71, 0x38, 0xa2, 0x9a, 0x12, 0xba, 0x8d, + 0x29, 0x21, 0x80, 0x6e, 0x29, 0x59, 0xbc, 0xe2, 0x59, 0xd0, 0x53, 0x6c, 0x64, 0xa1, 0xd2, 0xa8, + 0xbe, 0xd3, 0xe3, 0x81, 0x4f, 0x2d, 0xac, 0xfa, 0x08, 0x1a, 0x7d, 0xf4, 0x13, 0x33, 0x49, 0xf4, + 0x1f, 0xbf, 0xbd, 0x87, 0x06, 0x88, 0xff, 0xdf, 0x9b, 0xfa, 0x6f, 0x07, 0xbc, 0xaa, 0x09, 0xcf, + 0x77, 0x9b, 0xf0, 0xbc, 0x6e, 0xc2, 0xc9, 0x99, 0x6d, 0xc2, 0xc9, 0x19, 0x62, 0x7a, 0x6d, 0x9b, + 0x90, 0x5e, 0xe3, 0x65, 0x7d, 0x2e, 0x93, 0x22, 0x3d, 0x2b, 0xf5, 0xad, 0xfa, 0xb4, 0xc2, 0x58, + 0xb9, 0xbf, 0x5e, 0x73, 0x69, 0x52, 0xed, 0x53, 0x83, 0xb0, 0xce, 0x2f, 0x15, 0x41, 0xe9, 0xe4, + 0x6a, 0x40, 0xbe, 0x07, 0x1e, 0xc5, 0xe4, 0xa9, 0x0c, 0xef, 0xdc, 0x8b, 0x12, 0x53, 0xad, 0x45, + 0xa7, 0xfa, 0xfb, 0xc2, 0x14, 0xbc, 0xfd, 0xda, 0xf8, 0x31, 0x74, 0xa6, 0x6b, 0xb1, 0xcc, 0xed, + 0x3c, 0xf6, 0xf5, 0x06, 0xc1, 0x89, 0x0d, 0x57, 0x3a, 0x6a, 0x4c, 0xc2, 0xd7, 0xe0, 0x57, 0xc2, + 0xfa, 0x38, 0x4e, 0xf3, 0x38, 0x04, 0xdc, 0xdb, 0x58, 0xe4, 0xb6, 0xd5, 0x71, 0x8d, 0xc1, 0xbe, + 0x2e, 0x58, 0x9c, 0x8b, 0xbc, 0xb4, 0xad, 0x6e, 0x71, 0xf8, 0xb1, 0x39, 0x3e, 0xba, 0xbb, 0x4d, + 0x53, 0x2e, 0x0d, 0x6d, 0x68, 0xa0, 0x36, 0x49, 0x1e, 0xb8, 0x66, 0xfc, 0x36, 0xd5, 0x20, 0xfc, + 0x0d, 0xf8, 0xe3, 0x88, 0xcb, 0x9c, 0x16, 0x11, 0x3f, 0xf4, 0x12, 0x3f, 0x9f, 0x5e, 0xbd, 0xb2, + 0x27, 0xc0, 0x75, 0x4d, 0x11, 0xed, 0x47, 0x14, 0xf1, 0x82, 0xa5, 0xec, 0x62, 0xa2, 0xea, 0xbc, + 0x4d, 0x0d, 0x0a, 0xff, 0xe2, 0x80, 0x8b, 0x5c, 0xd4, 0x70, 0xed, 0xbe, 0x8d, 0xc7, 0xae, 0x65, + 0x72, 0x2f, 0x16, 0x5c, 0xda, 0xe0, 0x2c, 0x56, 0x49, 0x9f, 0xaf, 0x79, 0xf5, 0xe0, 0x1b, 0x84, + 0xb5, 0x86, 0x1f, 0x23, 0xb6, 0x97, 0x1a, 0xb5, 0x86, 0x62, 0xaa, 0x95, 0x38, 0x24, 0x4e, 0x8b, + 0x94, 0xcb, 0xf1, 0x62, 0x23, 0xec, 0xb0, 0xd4, 0x90, 0x84, 0x9f, 0xe9, 0xcf, 0x9b, 0x3d, 0x46, + 0x73, 0x0e, 0x7f, 0x0a, 0x3d, 0x3e, 0x79, 0xf8, 0x57, 0x07, 0xba, 0x2f, 0xcd, 0x70, 0xd6, 0x8c, + 0xc2, 0x79, 0x63, 0x14, 0xad, 0x9d, 0x28, 0x4e, 0xe1, 0xa9, 0xb5, 0xd9, 0xd9, 0x5f, 0x67, 0xe1, + 0xa0, 0xce, 0x64, 0xd4, 0xad, 0x2e, 0xeb, 0x5d, 0xbe, 0x6e, 0x6e, 0x76, 0x6d, 0x0e, 0x5d, 0xf8, + 0xde, 0xad, 0x0c, 0xa1, 0x6f, 0xbf, 0xea, 0x92, 0xc8, 0x3e, 0x30, 0x4d, 0x51, 0x78, 0x0a, 0x9d, + 0xf3, 0x24, 0x5e, 0x8a, 0x15, 0x19, 0x81, 0x3b, 0x2e, 0xf2, 0xb5, 0xf2, 0xd8, 0x3f, 0x7d, 0xda, + 0x68, 0xfc, 0x22, 0x5f, 0x6b, 0x1b, 0xaa, 0x2c, 0xc2, 0x4f, 0x01, 0x6a, 0x19, 0xbe, 0x12, 0xf5, + 0x6d, 0xbc, 0xe2, 0x0f, 0x58, 0x32, 0x99, 0xf2, 0xd2, 0xa3, 0x07, 0x34, 0xe1, 0x2f, 0xc0, 0x3f, + 0x2b, 0x44, 0xb4, 0xb8, 0x88, 0x97, 0x09, 0x52, 0xc7, 0x1d, 0x97, 0x59, 0x7d, 0x5f, 0x16, 0x62, + 0xba, 0x91, 0x45, 0xaa, 0x1e, 0x32, 0x68, 0xd6, 0x51, 0xff, 0x19, 0x7c, 0xfc, 0xdf, 0x00, 0x00, + 0x00, 0xff, 0xff, 0x54, 0x72, 0x77, 0x46, 0x45, 0x10, 0x00, 0x00, } diff --git a/bolt/internal/internal.proto b/bolt/internal/internal.proto index f4693d29b..9373e54c8 100644 --- a/bolt/internal/internal.proto +++ b/bolt/internal/internal.proto @@ -27,27 +27,28 @@ message 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 Query queries = 5; // Time-series data queries for Dashboard - string name = 6; // User-facing name for this Dashboard - string type = 7; // Dashboard visualization type - string ID = 8; // id is the unique id of the dashboard. MIGRATED FIELD added in 1.2.0-beta6 - map axes = 9; // Axes represent the graphical viewport for a cell's visualizations - repeated Color colors = 10; // Colors represent encoding data values to color - Legend legend = 11; // Legend is summary information for a cell - TableOptions tableOptions = 12; // TableOptions for visualization of cell with type 'table' + 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 Query queries = 5; // Time-series data queries for Dashboard + string name = 6; // User-facing name for this Dashboard + string type = 7; // Dashboard visualization type + string ID = 8; // id is the unique id of the dashboard. MIGRATED FIELD added in 1.2.0-beta6 + map axes = 9; // Axes represent the graphical viewport for a cell's visualizations + repeated Color colors = 10; // Colors represent encoding data values to color + Legend legend = 11; // Legend is summary information for a cell + TableOptions tableOptions = 12; // TableOptions for visualization of cell with type 'table' repeated RenamableField fieldOptions = 13; // Options for each of the fields returned in a cell + string timeFormat = 14; // format for time } message TableOptions { - string timeFormat = 1; // format for time + reserved 1; bool verticalTimeAxis = 2; // time axis should be a column not row RenamableField sortBy = 3; // which column should a table be sorted by string wrapping = 4; // option for text wrapping - reserved 5 + reserved 5; bool fixFirstColumn = 6; // first column should be fixed/frozen } diff --git a/bolt/internal/internal_test.go b/bolt/internal/internal_test.go index cf66c41fd..ff4bf0ce9 100644 --- a/bolt/internal/internal_test.go +++ b/bolt/internal/internal_test.go @@ -194,10 +194,9 @@ func Test_MarshalDashboard(t *testing.T) { Value: "100", }, }, - TableOptions: chronograf.TableOptions{ - TimeFormat: "", - }, + TableOptions: chronograf.TableOptions{}, FieldOptions: []chronograf.RenamableField{}, + TimeFormat: "", }, }, Templates: []chronograf.Template{}, @@ -260,9 +259,8 @@ func Test_MarshalDashboard_WithLegacyBounds(t *testing.T) { Type: "static", Orientation: "bottom", }, - TableOptions: chronograf.TableOptions{ - TimeFormat: "MM:DD:YYYY", - }, + TableOptions: chronograf.TableOptions{}, + TimeFormat: "MM:DD:YYYY", FieldOptions: []chronograf.RenamableField{}, Type: "line", }, @@ -318,10 +316,9 @@ func Test_MarshalDashboard_WithLegacyBounds(t *testing.T) { Type: "static", Orientation: "bottom", }, - TableOptions: chronograf.TableOptions{ - TimeFormat: "MM:DD:YYYY", - }, + TableOptions: chronograf.TableOptions{}, FieldOptions: []chronograf.RenamableField{}, + TimeFormat: "MM:DD:YYYY", Type: "line", }, }, @@ -381,11 +378,10 @@ func Test_MarshalDashboard_WithEmptyLegacyBounds(t *testing.T) { Value: "100", }, }, - Type: "line", - TableOptions: chronograf.TableOptions{ - TimeFormat: "MM:DD:YYYY", - }, + Type: "line", + TableOptions: chronograf.TableOptions{}, FieldOptions: []chronograf.RenamableField{}, + TimeFormat: "MM:DD:YYYY", }, }, Templates: []chronograf.Template{}, @@ -435,10 +431,9 @@ func Test_MarshalDashboard_WithEmptyLegacyBounds(t *testing.T) { Value: "100", }, }, - TableOptions: chronograf.TableOptions{ - TimeFormat: "MM:DD:YYYY", - }, + TableOptions: chronograf.TableOptions{}, FieldOptions: []chronograf.RenamableField{}, + TimeFormat: "MM:DD:YYYY", Type: "line", }, }, diff --git a/chronograf.go b/chronograf.go index a14de9a41..9259f0e48 100644 --- a/chronograf.go +++ b/chronograf.go @@ -576,6 +576,7 @@ type DashboardCell struct { Legend Legend `json:"legend"` TableOptions TableOptions `json:"tableOptions,omitempty"` FieldOptions []RenamableField `json:"fieldOptions"` + TimeFormat string `json:"timeFormat"` } // RenamableField is a column/row field in a DashboardCell of type Table @@ -588,7 +589,6 @@ type RenamableField struct { // TableOptions is a type of options for a DashboardCell with type Table type TableOptions struct { - TimeFormat string `json:"timeFormat"` VerticalTimeAxis bool `json:"verticalTimeAxis"` SortBy RenamableField `json:"sortBy"` Wrapping string `json:"wrapping"` diff --git a/integrations/server_test.go b/integrations/server_test.go index 19b5911cf..84b2d11ca 100644 --- a/integrations/server_test.go +++ b/integrations/server_test.go @@ -548,7 +548,6 @@ func TestServer(t *testing.T) { "orientation": "bottom" }, "tableOptions":{ - "timeFormat": "", "verticalTimeAxis": false, "sortBy":{ "internalName": "", @@ -560,6 +559,7 @@ func TestServer(t *testing.T) { "fixFirstColumn": false }, "fieldOptions": null, + "timeFormat": "", "links": { "self": "/chronograf/v1/dashboards/1000/cells/8f61c619-dd9b-4761-8aa8-577f27247093" } @@ -800,7 +800,6 @@ func TestServer(t *testing.T) { } ], "tableOptions":{ - "timeFormat":"", "verticalTimeAxis":false, "sortBy":{ "internalName":"", @@ -812,6 +811,7 @@ func TestServer(t *testing.T) { "fixFirstColumn":false }, "fieldOptions":null, + "timeFormat":"", "legend":{ "type": "static", "orientation": "bottom" diff --git a/server/cells_test.go b/server/cells_test.go index 20eeec392..87018ea48 100644 --- a/server/cells_test.go +++ b/server/cells_test.go @@ -532,7 +532,7 @@ func TestService_ReplaceDashboardCell(t *testing.T) { } } `))), - want: `{"i":"3c5c4102-fa40-4585-a8f9-917c77e37192","x":0,"y":0,"w":4,"h":4,"name":"Untitled Cell","queries":[{"query":"SELECT mean(\"usage_user\") AS \"mean_usage_user\" FROM \"telegraf\".\"autogen\".\"cpu\" WHERE time \u003e :dashboardTime: AND \"cpu\"=:cpu: GROUP BY :interval: FILL(null)","queryConfig":{"id":"3cd3eaa4-a4b8-44b3-b69e-0c7bf6b91d9e","database":"telegraf","measurement":"cpu","retentionPolicy":"autogen","fields":[{"value":"mean","type":"func","alias":"mean_usage_user","args":[{"value":"usage_user","type":"field","alias":""}]}],"tags":{"cpu":["ChristohersMBP2.lan"]},"groupBy":{"time":"2s","tags":[]},"areTagsAccepted":true,"fill":"null","rawText":"SELECT mean(\"usage_user\") AS \"mean_usage_user\" FROM \"telegraf\".\"autogen\".\"cpu\" WHERE time \u003e :dashboardTime: AND \"cpu\"=:cpu: GROUP BY :interval: FILL(null)","range":{"upper":"","lower":"now() - 15m"},"shifts":[]},"source":""}],"axes":{"x":{"bounds":["",""],"label":"","prefix":"","suffix":"","base":"","scale":""},"y":{"bounds":["",""],"label":"","prefix":"","suffix":"","base":"","scale":""},"y2":{"bounds":["",""],"label":"","prefix":"","suffix":"","base":"","scale":""}},"type":"line","colors":[{"id":"0","type":"min","hex":"#00C9FF","name":"laser","value":"0"},{"id":"1","type":"max","hex":"#9394FF","name":"comet","value":"100"}],"legend":{},"tableOptions":{"timeFormat":"","verticalTimeAxis":false,"sortBy":{"internalName":"","displayName":"","visible":false,"precision":0},"wrapping":"","fixFirstColumn":false},"fieldOptions":null,"links":{"self":"/chronograf/v1/dashboards/1/cells/3c5c4102-fa40-4585-a8f9-917c77e37192"}} + want: `{"i":"3c5c4102-fa40-4585-a8f9-917c77e37192","x":0,"y":0,"w":4,"h":4,"name":"Untitled Cell","queries":[{"query":"SELECT mean(\"usage_user\") AS \"mean_usage_user\" FROM \"telegraf\".\"autogen\".\"cpu\" WHERE time \u003e :dashboardTime: AND \"cpu\"=:cpu: GROUP BY :interval: FILL(null)","queryConfig":{"id":"3cd3eaa4-a4b8-44b3-b69e-0c7bf6b91d9e","database":"telegraf","measurement":"cpu","retentionPolicy":"autogen","fields":[{"value":"mean","type":"func","alias":"mean_usage_user","args":[{"value":"usage_user","type":"field","alias":""}]}],"tags":{"cpu":["ChristohersMBP2.lan"]},"groupBy":{"time":"2s","tags":[]},"areTagsAccepted":true,"fill":"null","rawText":"SELECT mean(\"usage_user\") AS \"mean_usage_user\" FROM \"telegraf\".\"autogen\".\"cpu\" WHERE time \u003e :dashboardTime: AND \"cpu\"=:cpu: GROUP BY :interval: FILL(null)","range":{"upper":"","lower":"now() - 15m"},"shifts":[]},"source":""}],"axes":{"x":{"bounds":["",""],"label":"","prefix":"","suffix":"","base":"","scale":""},"y":{"bounds":["",""],"label":"","prefix":"","suffix":"","base":"","scale":""},"y2":{"bounds":["",""],"label":"","prefix":"","suffix":"","base":"","scale":""}},"type":"line","colors":[{"id":"0","type":"min","hex":"#00C9FF","name":"laser","value":"0"},{"id":"1","type":"max","hex":"#9394FF","name":"comet","value":"100"}],"legend":{},"tableOptions":{"verticalTimeAxis":false,"sortBy":{"internalName":"","displayName":"","visible":false,"precision":0},"wrapping":"","fixFirstColumn":false},"fieldOptions":null,"timeFormat":"","links":{"self":"/chronograf/v1/dashboards/1/cells/3c5c4102-fa40-4585-a8f9-917c77e37192"}} `, }, {