Add Prefix, Suffix, and Base to Axes

We would like to add additional user-configurable options to the display
of axes on Dashboards. This adds three fields to expand settings that
the frontend can persist through the API.

One field of interest here is the "Base" field which controls when and
how axes transition the display of values such as bytes, kilobytes,
megabytes, etc. By default, it's returned from the API as "10" to
indicate decimal, but can be set to anything the frontend wishes--the
immediate differing value will be "2" for the aforementioned use case.
pull/10616/head
Tim Raymond 2017-08-09 13:06:34 -07:00 committed by Andrew Watkins
parent 0fdb1fa8b3
commit f6e029557b
5 changed files with 92 additions and 64 deletions

View File

@ -203,6 +203,9 @@ func MarshalDashboard(d chronograf.Dashboard) ([]byte, error) {
axes[a] = &Axis{
Bounds: r.Bounds,
Label: r.Label,
Prefix: r.Prefix,
Suffix: r.Suffix,
Base: r.Base,
}
}
@ -281,14 +284,24 @@ func UnmarshalDashboard(data []byte, d *chronograf.Dashboard) error {
axes := make(map[string]chronograf.Axis, len(c.Axes))
for a, r := range c.Axes {
// axis base defaults to 10
if r.Base == "" {
r.Base = "10"
}
if r.Bounds != nil {
axes[a] = chronograf.Axis{
Bounds: r.Bounds,
Label: r.Label,
Prefix: r.Prefix,
Suffix: r.Suffix,
Base: r.Base,
}
} else {
axes[a] = chronograf.Axis{
Bounds: []string{},
Base: r.Base,
}
}
}

View File

@ -121,6 +121,9 @@ type Axis struct {
LegacyBounds []int64 `protobuf:"varint,1,rep,name=legacyBounds" json:"legacyBounds,omitempty"`
Bounds []string `protobuf:"bytes,2,rep,name=bounds" json:"bounds,omitempty"`
Label string `protobuf:"bytes,3,opt,name=label,proto3" json:"label,omitempty"`
Prefix string `protobuf:"bytes,4,opt,name=prefix,proto3" json:"prefix,omitempty"`
Suffix string `protobuf:"bytes,5,opt,name=suffix,proto3" json:"suffix,omitempty"`
Base string `protobuf:"bytes,6,opt,name=base,proto3" json:"base,omitempty"`
}
func (m *Axis) Reset() { *m = Axis{} }
@ -323,67 +326,68 @@ func init() {
func init() { proto.RegisterFile("internal.proto", fileDescriptorInternal) }
var fileDescriptorInternal = []byte{
// 985 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xbc, 0x56, 0xcd, 0x6e, 0x23, 0x45,
0x10, 0x56, 0xcf, 0x8f, 0xed, 0x29, 0x67, 0x03, 0x6a, 0xad, 0xd8, 0x61, 0xb9, 0x98, 0x11, 0x48,
0x06, 0x41, 0x40, 0xbb, 0x42, 0x42, 0xdc, 0x9c, 0x18, 0xad, 0x42, 0xb2, 0x4b, 0x68, 0x27, 0x81,
0x0b, 0x5a, 0xb5, 0xc7, 0x95, 0x64, 0xb4, 0x63, 0xcf, 0xd0, 0x33, 0x13, 0x7b, 0xde, 0x82, 0x27,
0x40, 0x42, 0xe2, 0xc4, 0x81, 0x03, 0x2f, 0xc0, 0x9d, 0xa7, 0x42, 0xd5, 0xdd, 0x33, 0x1e, 0xb3,
0x59, 0xb4, 0x17, 0xf6, 0xd6, 0x5f, 0x55, 0xbb, 0xba, 0xe6, 0xab, 0xfa, 0x3e, 0x19, 0xf6, 0x93,
0x55, 0x89, 0x6a, 0x25, 0xd3, 0x83, 0x5c, 0x65, 0x65, 0xc6, 0x07, 0x0d, 0x8e, 0xfe, 0x70, 0xa0,
0x37, 0xcb, 0x2a, 0x15, 0x23, 0xdf, 0x07, 0xe7, 0x78, 0x1a, 0xb2, 0x11, 0x1b, 0xbb, 0xc2, 0x39,
0x9e, 0x72, 0x0e, 0xde, 0x33, 0xb9, 0xc4, 0xd0, 0x19, 0xb1, 0x71, 0x20, 0xf4, 0x99, 0x62, 0xe7,
0x75, 0x8e, 0xa1, 0x6b, 0x62, 0x74, 0xe6, 0x0f, 0x61, 0x70, 0x51, 0x50, 0xb5, 0x25, 0x86, 0x9e,
0x8e, 0xb7, 0x98, 0x72, 0x67, 0xb2, 0x28, 0xd6, 0x99, 0x5a, 0x84, 0xbe, 0xc9, 0x35, 0x98, 0xbf,
0x0d, 0xee, 0x85, 0x38, 0x0d, 0x7b, 0x3a, 0x4c, 0x47, 0x1e, 0x42, 0x7f, 0x8a, 0x57, 0xb2, 0x4a,
0xcb, 0xb0, 0x3f, 0x62, 0xe3, 0x81, 0x68, 0x20, 0xd5, 0x39, 0xc7, 0x14, 0xaf, 0x95, 0xbc, 0x0a,
0x07, 0xa6, 0x4e, 0x83, 0xf9, 0x01, 0xf0, 0xe3, 0x55, 0x81, 0x71, 0xa5, 0x70, 0xf6, 0x22, 0xc9,
0x2f, 0x51, 0x25, 0x57, 0x75, 0x18, 0xe8, 0x02, 0x77, 0x64, 0xe8, 0x95, 0xa7, 0x58, 0x4a, 0x7a,
0x1b, 0x74, 0xa9, 0x06, 0xf2, 0x08, 0xf6, 0x66, 0x37, 0x52, 0xe1, 0x62, 0x86, 0xb1, 0xc2, 0x32,
0x1c, 0xea, 0xf4, 0x4e, 0x2c, 0xfa, 0x99, 0x41, 0x30, 0x95, 0xc5, 0xcd, 0x3c, 0x93, 0x6a, 0xf1,
0x5a, 0x9c, 0x7d, 0x0a, 0x7e, 0x8c, 0x69, 0x5a, 0x84, 0xee, 0xc8, 0x1d, 0x0f, 0x1f, 0x3d, 0x38,
0x68, 0x87, 0xd1, 0xd6, 0x39, 0xc2, 0x34, 0x15, 0xe6, 0x16, 0xff, 0x1c, 0x82, 0x12, 0x97, 0x79,
0x2a, 0x4b, 0x2c, 0x42, 0x4f, 0xff, 0x84, 0x6f, 0x7f, 0x72, 0x6e, 0x53, 0x62, 0x7b, 0x29, 0xfa,
0xdd, 0x81, 0x7b, 0x3b, 0xa5, 0xf8, 0x1e, 0xb0, 0x8d, 0xee, 0xca, 0x17, 0x6c, 0x43, 0xa8, 0xd6,
0x1d, 0xf9, 0x82, 0xd5, 0x84, 0xd6, 0x7a, 0x7e, 0xbe, 0x60, 0x6b, 0x42, 0x37, 0x7a, 0x6a, 0xbe,
0x60, 0x37, 0xfc, 0x23, 0xe8, 0xff, 0x54, 0xa1, 0x4a, 0xb0, 0x08, 0x7d, 0xfd, 0xf2, 0x5b, 0xdb,
0x97, 0xbf, 0xab, 0x50, 0xd5, 0xa2, 0xc9, 0xd3, 0x97, 0xea, 0x89, 0x9b, 0xf1, 0xe9, 0x33, 0xc5,
0x4a, 0xda, 0x8e, 0xbe, 0x89, 0xd1, 0xd9, 0x32, 0x64, 0x66, 0x46, 0x0c, 0x7d, 0x01, 0x9e, 0xdc,
0x60, 0x11, 0x06, 0xba, 0xfe, 0xfb, 0xaf, 0x20, 0xe3, 0x60, 0xb2, 0xc1, 0xe2, 0xeb, 0x55, 0xa9,
0x6a, 0xa1, 0xaf, 0x3f, 0x7c, 0x02, 0x41, 0x1b, 0xa2, 0xcd, 0x79, 0x81, 0xb5, 0xfe, 0xc0, 0x40,
0xd0, 0x91, 0x7f, 0x00, 0xfe, 0xad, 0x4c, 0x2b, 0x43, 0xfc, 0xf0, 0xd1, 0xfe, 0xb6, 0xec, 0x64,
0x93, 0x14, 0xc2, 0x24, 0xbf, 0x72, 0xbe, 0x64, 0xd1, 0x0f, 0xe0, 0x51, 0x88, 0x66, 0x9d, 0xe2,
0xb5, 0x8c, 0xeb, 0xc3, 0xac, 0x5a, 0x2d, 0x8a, 0x90, 0x8d, 0xdc, 0xb1, 0x2b, 0x76, 0x62, 0xfc,
0x1d, 0xe8, 0xcd, 0x4d, 0xd6, 0x19, 0xb9, 0xe3, 0x40, 0x58, 0xc4, 0xef, 0x83, 0x9f, 0xca, 0x39,
0xa6, 0x56, 0x06, 0x06, 0x44, 0x7f, 0x31, 0x5a, 0x52, 0x33, 0x94, 0xce, 0x62, 0x98, 0xcf, 0x7e,
0x17, 0x06, 0x34, 0xb0, 0xe7, 0xb7, 0x52, 0xd9, 0xe5, 0xe8, 0x13, 0xbe, 0x94, 0x8a, 0x7f, 0x06,
0x3d, 0xdd, 0xde, 0x1d, 0x0b, 0xd2, 0x94, 0xbb, 0xa4, 0xbc, 0xb0, 0xd7, 0x5a, 0x9a, 0xbd, 0x0e,
0xcd, 0x6d, 0x4b, 0x7e, 0xa7, 0x25, 0x5a, 0x3d, 0x9a, 0x57, 0xad, 0xa7, 0x74, 0x67, 0x65, 0x33,
0x55, 0x73, 0x2b, 0xba, 0x80, 0x7b, 0x3b, 0x2f, 0xb6, 0x2f, 0xb1, 0xdd, 0x97, 0xb6, 0x54, 0x07,
0x96, 0x5a, 0x12, 0x68, 0x81, 0x29, 0xc6, 0x25, 0x2e, 0x34, 0x2b, 0x03, 0xd1, 0xe2, 0xe8, 0x57,
0xb6, 0xad, 0xab, 0xdf, 0x23, 0x09, 0xc6, 0xd9, 0x72, 0x29, 0x57, 0x0b, 0x5b, 0xba, 0x81, 0xc4,
0xdb, 0x62, 0x6e, 0x4b, 0x3b, 0x8b, 0x39, 0x61, 0x95, 0x5b, 0x9e, 0x1d, 0x95, 0xf3, 0x11, 0x0c,
0x97, 0x28, 0x8b, 0x4a, 0xe1, 0x12, 0x57, 0xa5, 0xa5, 0xa0, 0x1b, 0xe2, 0x0f, 0xa0, 0x5f, 0xca,
0xeb, 0xe7, 0xb4, 0x20, 0x86, 0x8b, 0x5e, 0x29, 0xaf, 0x4f, 0xb0, 0xe6, 0xef, 0x41, 0x70, 0x95,
0x60, 0xba, 0xd0, 0x29, 0xb3, 0xb6, 0x03, 0x1d, 0x38, 0xc1, 0x3a, 0xfa, 0x8d, 0x41, 0x6f, 0x86,
0xea, 0x16, 0xd5, 0x6b, 0x69, 0xba, 0xeb, 0x79, 0xee, 0x7f, 0x78, 0x9e, 0x77, 0xb7, 0xe7, 0xf9,
0x5b, 0xcf, 0xbb, 0x0f, 0xfe, 0x4c, 0xc5, 0xc7, 0x53, 0xdd, 0x91, 0x2b, 0x0c, 0xa0, 0xcd, 0x9b,
0xc4, 0x65, 0x72, 0x8b, 0xd6, 0x08, 0x2d, 0x8a, 0x7e, 0x61, 0xd0, 0x3b, 0x95, 0x75, 0x56, 0x95,
0x2f, 0x6d, 0xd8, 0x08, 0x86, 0x93, 0x3c, 0x4f, 0x93, 0x58, 0x96, 0x49, 0xb6, 0xb2, 0xdd, 0x76,
0x43, 0x74, 0xe3, 0x69, 0x87, 0x3b, 0xd3, 0x77, 0x37, 0x44, 0x32, 0x3a, 0xd2, 0x56, 0x65, 0x7c,
0xa7, 0x23, 0x23, 0xe3, 0x50, 0x3a, 0x49, 0x1f, 0x38, 0xa9, 0xca, 0xec, 0x2a, 0xcd, 0xd6, 0xfa,
0x4b, 0x06, 0xa2, 0xc5, 0xd1, 0xdf, 0x0e, 0x78, 0x6f, 0xca, 0x82, 0xf6, 0x80, 0x25, 0x76, 0x90,
0x2c, 0x69, 0x0d, 0xa9, 0xdf, 0x31, 0xa4, 0x10, 0xfa, 0xb5, 0x92, 0xab, 0x6b, 0x2c, 0xc2, 0x81,
0xd6, 0x77, 0x03, 0x75, 0x46, 0x6b, 0xc4, 0x38, 0x51, 0x20, 0x1a, 0xd8, 0xee, 0x3c, 0x74, 0x76,
0xfe, 0x13, 0x6b, 0x5a, 0x43, 0xdd, 0x51, 0xb8, 0x4b, 0xcb, 0xff, 0xe7, 0x55, 0x7f, 0x32, 0xf0,
0x5b, 0xc1, 0x1c, 0xed, 0x0a, 0xe6, 0x68, 0x2b, 0x98, 0xe9, 0x61, 0x23, 0x98, 0xe9, 0x21, 0x61,
0x71, 0xd6, 0x08, 0x46, 0x9c, 0xd1, 0xb0, 0x9e, 0xa8, 0xac, 0xca, 0x0f, 0x6b, 0x33, 0xd5, 0x40,
0xb4, 0x98, 0xb6, 0xec, 0xfb, 0x1b, 0x54, 0x96, 0xea, 0x40, 0x58, 0x44, 0x3b, 0x79, 0xaa, 0xcd,
0xc4, 0x90, 0x6b, 0x00, 0xff, 0x10, 0x7c, 0x41, 0xe4, 0x69, 0x86, 0x77, 0xe6, 0xa2, 0xc3, 0xc2,
0x64, 0xa3, 0xc7, 0xf6, 0x1a, 0x55, 0xb9, 0xc8, 0x73, 0x54, 0x56, 0x4a, 0x06, 0xe8, 0xda, 0xd9,
0x1a, 0x8d, 0x0b, 0xba, 0xc2, 0x80, 0xe8, 0x47, 0x08, 0x26, 0x29, 0xaa, 0x52, 0x54, 0xe9, 0xcb,
0xde, 0xc9, 0xc1, 0xfb, 0x66, 0xf6, 0xed, 0xb3, 0x46, 0x80, 0x74, 0xde, 0xca, 0xc6, 0xfd, 0x97,
0x6c, 0x4e, 0x64, 0x2e, 0x8f, 0xa7, 0x7a, 0x9f, 0x5c, 0x61, 0x51, 0xf4, 0x31, 0x78, 0x24, 0xcf,
0x4e, 0x65, 0xef, 0x55, 0xd2, 0x9e, 0xf7, 0xf4, 0x5f, 0xa4, 0xc7, 0xff, 0x04, 0x00, 0x00, 0xff,
0xff, 0x5a, 0xf0, 0x92, 0xd4, 0x34, 0x09, 0x00, 0x00,
// 998 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xbc, 0x56, 0xcd, 0x8e, 0xe3, 0x44,
0x10, 0x56, 0xc7, 0x76, 0x12, 0xd7, 0xec, 0x0e, 0xa8, 0xb5, 0x62, 0xcd, 0x72, 0x09, 0x16, 0x48,
0x01, 0x69, 0x07, 0xb4, 0x2b, 0x24, 0xc4, 0x2d, 0x33, 0x41, 0xab, 0x61, 0x66, 0x97, 0xa1, 0x33,
0x33, 0x9c, 0xd0, 0xaa, 0xe3, 0x54, 0x26, 0xd6, 0x3a, 0xb1, 0x69, 0xdb, 0x93, 0xf8, 0x2d, 0x78,
0x00, 0x84, 0x84, 0xc4, 0x89, 0x03, 0x07, 0x5e, 0x80, 0x87, 0xe0, 0x85, 0x50, 0x75, 0xb7, 0x7f,
0xc2, 0xce, 0xa2, 0x3d, 0x71, 0xeb, 0xaf, 0xaa, 0xf3, 0xb5, 0xab, 0xbe, 0xaf, 0x4a, 0x81, 0xc3,
0x78, 0x53, 0xa0, 0xda, 0xc8, 0xe4, 0x28, 0x53, 0x69, 0x91, 0xf2, 0x61, 0x8d, 0xc3, 0x3f, 0x7a,
0xd0, 0x9f, 0xa5, 0xa5, 0x8a, 0x90, 0x1f, 0x42, 0xef, 0x74, 0x1a, 0xb0, 0x11, 0x1b, 0x3b, 0xa2,
0x77, 0x3a, 0xe5, 0x1c, 0xdc, 0x17, 0x72, 0x8d, 0x41, 0x6f, 0xc4, 0xc6, 0xbe, 0xd0, 0x67, 0x8a,
0x5d, 0x56, 0x19, 0x06, 0x8e, 0x89, 0xd1, 0x99, 0x3f, 0x82, 0xe1, 0x55, 0x4e, 0x6c, 0x6b, 0x0c,
0x5c, 0x1d, 0x6f, 0x30, 0xe5, 0x2e, 0x64, 0x9e, 0x6f, 0x53, 0xb5, 0x08, 0x3c, 0x93, 0xab, 0x31,
0x7f, 0x17, 0x9c, 0x2b, 0x71, 0x1e, 0xf4, 0x75, 0x98, 0x8e, 0x3c, 0x80, 0xc1, 0x14, 0x97, 0xb2,
0x4c, 0x8a, 0x60, 0x30, 0x62, 0xe3, 0xa1, 0xa8, 0x21, 0xf1, 0x5c, 0x62, 0x82, 0x37, 0x4a, 0x2e,
0x83, 0xa1, 0xe1, 0xa9, 0x31, 0x3f, 0x02, 0x7e, 0xba, 0xc9, 0x31, 0x2a, 0x15, 0xce, 0x5e, 0xc5,
0xd9, 0x35, 0xaa, 0x78, 0x59, 0x05, 0xbe, 0x26, 0xb8, 0x23, 0x43, 0xaf, 0x3c, 0xc7, 0x42, 0xd2,
0xdb, 0xa0, 0xa9, 0x6a, 0xc8, 0x43, 0xb8, 0x37, 0x5b, 0x49, 0x85, 0x8b, 0x19, 0x46, 0x0a, 0x8b,
0xe0, 0x40, 0xa7, 0xf7, 0x62, 0xe1, 0x4f, 0x0c, 0xfc, 0xa9, 0xcc, 0x57, 0xf3, 0x54, 0xaa, 0xc5,
0x5b, 0xf5, 0xec, 0x31, 0x78, 0x11, 0x26, 0x49, 0x1e, 0x38, 0x23, 0x67, 0x7c, 0xf0, 0xe4, 0xe1,
0x51, 0x23, 0x46, 0xc3, 0x73, 0x82, 0x49, 0x22, 0xcc, 0x2d, 0xfe, 0x39, 0xf8, 0x05, 0xae, 0xb3,
0x44, 0x16, 0x98, 0x07, 0xae, 0xfe, 0x09, 0x6f, 0x7f, 0x72, 0x69, 0x53, 0xa2, 0xbd, 0x14, 0xfe,
0xde, 0x83, 0xfb, 0x7b, 0x54, 0xfc, 0x1e, 0xb0, 0x9d, 0xfe, 0x2a, 0x4f, 0xb0, 0x1d, 0xa1, 0x4a,
0x7f, 0x91, 0x27, 0x58, 0x45, 0x68, 0xab, 0xf5, 0xf3, 0x04, 0xdb, 0x12, 0x5a, 0x69, 0xd5, 0x3c,
0xc1, 0x56, 0xfc, 0x13, 0x18, 0xfc, 0x58, 0xa2, 0x8a, 0x31, 0x0f, 0x3c, 0xfd, 0xf2, 0x3b, 0xed,
0xcb, 0xdf, 0x95, 0xa8, 0x2a, 0x51, 0xe7, 0xa9, 0x52, 0xad, 0xb8, 0x91, 0x4f, 0x9f, 0x29, 0x56,
0x90, 0x3b, 0x06, 0x26, 0x46, 0x67, 0xdb, 0x21, 0xa3, 0x19, 0x75, 0xe8, 0x0b, 0x70, 0xe5, 0x0e,
0xf3, 0xc0, 0xd7, 0xfc, 0x1f, 0xbe, 0xa1, 0x19, 0x47, 0x93, 0x1d, 0xe6, 0x5f, 0x6f, 0x0a, 0x55,
0x09, 0x7d, 0xfd, 0xd1, 0x33, 0xf0, 0x9b, 0x10, 0x39, 0xe7, 0x15, 0x56, 0xba, 0x40, 0x5f, 0xd0,
0x91, 0x7f, 0x04, 0xde, 0xad, 0x4c, 0x4a, 0xd3, 0xf8, 0x83, 0x27, 0x87, 0x2d, 0xed, 0x64, 0x17,
0xe7, 0xc2, 0x24, 0xbf, 0xea, 0x7d, 0xc9, 0xc2, 0x9f, 0x19, 0xb8, 0x14, 0x23, 0xb1, 0x13, 0xbc,
0x91, 0x51, 0x75, 0x9c, 0x96, 0x9b, 0x45, 0x1e, 0xb0, 0x91, 0x33, 0x76, 0xc4, 0x5e, 0x8c, 0xbf,
0x07, 0xfd, 0xb9, 0xc9, 0xf6, 0x46, 0xce, 0xd8, 0x17, 0x16, 0xf1, 0x07, 0xe0, 0x25, 0x72, 0x8e,
0x89, 0x9d, 0x03, 0x03, 0xe8, 0x76, 0xa6, 0x70, 0x19, 0xef, 0xec, 0x18, 0x58, 0x44, 0xf1, 0xbc,
0x5c, 0x52, 0xdc, 0x8c, 0x80, 0x45, 0xd4, 0xae, 0xb9, 0xcc, 0x9b, 0x16, 0xd2, 0x39, 0xfc, 0x8b,
0x91, 0xd3, 0x8d, 0xb2, 0x1d, 0x77, 0x99, 0xde, 0xbd, 0x0f, 0x43, 0x52, 0xfd, 0xe5, 0xad, 0x54,
0xd6, 0x61, 0x03, 0xc2, 0xd7, 0x52, 0xf1, 0xcf, 0xa0, 0xaf, 0x6b, 0xbc, 0xc3, 0x65, 0x35, 0xdd,
0x35, 0xe5, 0x85, 0xbd, 0xd6, 0x68, 0xe5, 0x76, 0xb4, 0x6a, 0xca, 0xf2, 0xba, 0x65, 0x3d, 0x06,
0x8f, 0x44, 0xaf, 0xf4, 0x77, 0xde, 0xc9, 0x6c, 0xac, 0x61, 0x6e, 0x85, 0x57, 0x70, 0x7f, 0xef,
0xc5, 0xe6, 0x25, 0xb6, 0xff, 0x52, 0xab, 0x97, 0x6f, 0xf5, 0xa1, 0x29, 0xcf, 0x31, 0xc1, 0xa8,
0xc0, 0x85, 0xee, 0xec, 0x50, 0x34, 0x38, 0xfc, 0x95, 0xb5, 0xbc, 0xfa, 0x3d, 0x9a, 0xe3, 0x28,
0x5d, 0xaf, 0xe5, 0x66, 0x61, 0xa9, 0x6b, 0x48, 0x7d, 0x5b, 0xcc, 0x2d, 0x75, 0x6f, 0x31, 0x27,
0xac, 0x32, 0xab, 0x55, 0x4f, 0x65, 0x7c, 0x04, 0x07, 0x6b, 0x94, 0x79, 0xa9, 0x70, 0x8d, 0x9b,
0xc2, 0xb6, 0xa0, 0x1b, 0xe2, 0x0f, 0x61, 0x50, 0xc8, 0x9b, 0x97, 0xe4, 0x32, 0xab, 0x59, 0x21,
0x6f, 0xce, 0xb0, 0xe2, 0x1f, 0x80, 0xbf, 0x8c, 0x31, 0x59, 0xe8, 0x94, 0x11, 0x6e, 0xa8, 0x03,
0x67, 0x58, 0x85, 0xbf, 0x31, 0xe8, 0xcf, 0x50, 0xdd, 0xa2, 0x7a, 0xab, 0xc5, 0xd0, 0x5d, 0x9c,
0xce, 0x7f, 0x2c, 0x4e, 0xf7, 0xee, 0xc5, 0xe9, 0xb5, 0x8b, 0xf3, 0x01, 0x78, 0x33, 0x15, 0x9d,
0x4e, 0xf5, 0x17, 0x39, 0xc2, 0x00, 0xf2, 0xdd, 0x24, 0x2a, 0xe2, 0x5b, 0xb4, 0xdb, 0xd4, 0xa2,
0xf0, 0x17, 0x06, 0xfd, 0x73, 0x59, 0xa5, 0x65, 0xf1, 0x9a, 0xc3, 0x46, 0x70, 0x30, 0xc9, 0xb2,
0x24, 0x8e, 0x64, 0x11, 0xa7, 0x1b, 0xfb, 0xb5, 0xdd, 0x10, 0xdd, 0x78, 0xde, 0xe9, 0x9d, 0xf9,
0xee, 0x6e, 0x88, 0x66, 0xf1, 0x44, 0xef, 0x3b, 0xb3, 0xbc, 0x3a, 0xb3, 0x68, 0xd6, 0x9c, 0x4e,
0x52, 0x81, 0x93, 0xb2, 0x48, 0x97, 0x49, 0xba, 0xd5, 0x95, 0x0c, 0x45, 0x83, 0xc3, 0xbf, 0x19,
0xb8, 0xff, 0xd7, 0x1e, 0xbb, 0x07, 0x2c, 0xb6, 0x42, 0xb2, 0xb8, 0xd9, 0x6a, 0x83, 0xce, 0x56,
0x0b, 0x60, 0x50, 0x29, 0xb9, 0xb9, 0xc1, 0x3c, 0x18, 0xea, 0x1d, 0x51, 0x43, 0x9d, 0xd1, 0x33,
0x62, 0xd6, 0x99, 0x2f, 0x6a, 0xd8, 0x78, 0x1e, 0x5a, 0xcf, 0x87, 0x7f, 0x32, 0xf0, 0x1a, 0xe7,
0x9e, 0xec, 0x3b, 0xf7, 0xa4, 0x75, 0xee, 0xf4, 0xb8, 0x76, 0xee, 0xf4, 0x98, 0xb0, 0xb8, 0xa8,
0x9d, 0x2b, 0x2e, 0xa8, 0x6b, 0xcf, 0x54, 0x5a, 0x66, 0xc7, 0x95, 0x69, 0xaf, 0x2f, 0x1a, 0x4c,
0x72, 0x7f, 0xbf, 0x42, 0x65, 0x6b, 0xf6, 0x85, 0x45, 0x64, 0x8e, 0x73, 0x3d, 0xd5, 0xa6, 0x4a,
0x03, 0xf8, 0xc7, 0xe0, 0x09, 0xaa, 0x42, 0x97, 0xba, 0xd7, 0x20, 0x1d, 0x16, 0x26, 0x1b, 0x3e,
0xb5, 0xd7, 0x88, 0xe5, 0x2a, 0xcb, 0x50, 0x59, 0x4f, 0x1b, 0xa0, 0xb9, 0xd3, 0x2d, 0x9a, 0x75,
0xe4, 0x08, 0x03, 0xc2, 0x1f, 0xc0, 0x9f, 0x24, 0xa8, 0x0a, 0x51, 0x26, 0xaf, 0x2f, 0x31, 0x0e,
0xee, 0x37, 0xb3, 0x6f, 0x5f, 0xd4, 0x93, 0x40, 0xe7, 0xd6, 0xbf, 0xce, 0xbf, 0xfc, 0x7b, 0x26,
0x33, 0x79, 0x3a, 0xd5, 0xc2, 0x3a, 0xc2, 0xa2, 0xf0, 0x53, 0x70, 0x69, 0x4e, 0x3a, 0xcc, 0xee,
0x9b, 0x66, 0x6c, 0xde, 0xd7, 0x7f, 0x78, 0x9e, 0xfe, 0x13, 0x00, 0x00, 0xff, 0xff, 0x35, 0xc8,
0x8f, 0x51, 0x02, 0x09, 0x00, 0x00,
}

View File

@ -38,6 +38,9 @@ message Axis {
repeated int64 legacyBounds = 1; // legacyBounds are an ordered 2-tuple consisting of lower and upper axis extents, respectively
repeated string bounds = 2; // bounds are an arbitrary list of client-defined bounds.
string label = 3; // label is a description of this axis
string prefix = 4; // specifies the prefix for axis values
string suffix = 5; // specifies the suffix for axis values
string base = 6; // defines the base for axis values
}
message Template {

View File

@ -168,6 +168,9 @@ func Test_MarshalDashboard(t *testing.T) {
"y": chronograf.Axis{
Bounds: []string{"0", "3", "1-7", "foo"},
Label: "foo",
Prefix: "M",
Suffix: "m",
Base: "2",
},
},
Type: "line",
@ -241,6 +244,7 @@ func Test_MarshalDashboard_WithLegacyBounds(t *testing.T) {
Axes: map[string]chronograf.Axis{
"y": chronograf.Axis{
Bounds: []string{},
Base: "10",
},
},
Type: "line",
@ -260,7 +264,7 @@ func Test_MarshalDashboard_WithLegacyBounds(t *testing.T) {
}
}
func Test_MarshalDashboard_WithNoLegacyBounds(t *testing.T) {
func Test_MarshalDashboard_WithEmptyLegacyBounds(t *testing.T) {
dashboard := chronograf.Dashboard{
ID: 1,
Cells: []chronograf.DashboardCell{
@ -314,6 +318,7 @@ func Test_MarshalDashboard_WithNoLegacyBounds(t *testing.T) {
Axes: map[string]chronograf.Axis{
"y": chronograf.Axis{
Bounds: []string{},
Base: "10",
},
},
Type: "line",

View File

@ -644,6 +644,9 @@ type Axis struct {
Bounds []string `json:"bounds"` // bounds are an arbitrary list of client-defined strings that specify the viewport for a cell
LegacyBounds [2]int64 `json:"-"` // legacy bounds are for testing a migration from an earlier version of axis
Label string `json:"label"` // label is a description of this Axis
Prefix string `json:"prefix"` // specifies a prefix for axis values
Suffix string `json:"suffix"` // specifies a suffix for axis values
Base string `json:"base"` // defines the base for axis values
}
// DashboardCell holds visual and query information for a cell