From 4c76cd335d2b2942de4c75949172538e4772e1ac Mon Sep 17 00:00:00 2001 From: Iris Scholten Date: Wed, 18 Apr 2018 16:48:44 -0700 Subject: [PATCH] Move FieldNames out of TableOptions and into DashboardCell as FieldOptions Add Precision to RenamableField --- bolt/internal/internal.go | 39 +++--- bolt/internal/internal.pb.go | 261 ++++++++++++++++++----------------- bolt/internal/internal.proto | 5 +- chronograf.go | 13 +- 4 files changed, 165 insertions(+), 153 deletions(-) diff --git a/bolt/internal/internal.go b/bolt/internal/internal.go index 78c8e28644..f6daf29812 100644 --- a/bolt/internal/internal.go +++ b/bolt/internal/internal.go @@ -273,24 +273,24 @@ func MarshalDashboard(d chronograf.Dashboard) ([]byte, error) { Visible: c.TableOptions.SortBy.Visible, } - fieldNames := make([]*RenamableField, len(c.TableOptions.FieldNames)) - for i, field := range c.TableOptions.FieldNames { - fieldNames[i] = &RenamableField{ - InternalName: field.InternalName, - DisplayName: field.DisplayName, - Visible: field.Visible, - } - } - tableOptions := &TableOptions{ TimeFormat: c.TableOptions.TimeFormat, VerticalTimeAxis: c.TableOptions.VerticalTimeAxis, SortBy: sortBy, Wrapping: c.TableOptions.Wrapping, - FieldNames: fieldNames, FixFirstColumn: c.TableOptions.FixFirstColumn, } + fieldOptions := make([]*RenamableField, len(c.FieldOptions)) + for i, field := range c.FieldOptions { + fieldOptions[i] = &RenamableField{ + InternalName: field.InternalName, + DisplayName: field.DisplayName, + Visible: field.Visible, + Precision: field.Precision, + } + } + cells[i] = &DashboardCell{ ID: c.ID, X: c.X, @@ -307,6 +307,7 @@ func MarshalDashboard(d chronograf.Dashboard) ([]byte, error) { Orientation: c.Legend.Orientation, }, TableOptions: tableOptions, + FieldOptions: fieldOptions, } } templates := make([]*Template, len(d.Templates)) @@ -442,20 +443,19 @@ func UnmarshalDashboard(data []byte, d *chronograf.Dashboard) error { sortBy.Visible = c.TableOptions.SortBy.Visible } tableOptions.SortBy = sortBy - - fieldNames := make([]chronograf.RenamableField, len(c.TableOptions.FieldNames)) - for i, field := range c.TableOptions.FieldNames { - fieldNames[i] = chronograf.RenamableField{} - fieldNames[i].InternalName = field.InternalName - fieldNames[i].DisplayName = field.DisplayName - fieldNames[i].Visible = field.Visible - } - tableOptions.FieldNames = fieldNames tableOptions.TimeFormat = c.TableOptions.TimeFormat tableOptions.VerticalTimeAxis = c.TableOptions.VerticalTimeAxis tableOptions.Wrapping = c.TableOptions.Wrapping tableOptions.FixFirstColumn = c.TableOptions.FixFirstColumn + } + fieldOptions := make([]chronograf.RenamableField, len(c.FieldOptions)) + for i, field := range c.FieldOptions { + fieldOptions[i] = chronograf.RenamableField{} + fieldOptions[i].InternalName = field.InternalName + fieldOptions[i].DisplayName = field.DisplayName + fieldOptions[i].Visible = field.Visible + fieldOptions[i].Precision = field.Precision } // FIXME: this is merely for legacy cells and @@ -478,6 +478,7 @@ func UnmarshalDashboard(data []byte, d *chronograf.Dashboard) error { CellColors: colors, Legend: legend, TableOptions: tableOptions, + FieldOptions: fieldOptions, } } diff --git a/bolt/internal/internal.pb.go b/bolt/internal/internal.pb.go index f805b26e95..8b8a23a8f8 100644 --- a/bolt/internal/internal.pb.go +++ b/bolt/internal/internal.pb.go @@ -220,18 +220,19 @@ func (m *Dashboard) GetOrganization() string { } 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 []*Query `protobuf:"bytes,5,rep,name=queries" json:"queries,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"` - ID string `protobuf:"bytes,8,opt,name=ID,proto3" json:"ID,omitempty"` - Axes map[string]*Axis `protobuf:"bytes,9,rep,name=axes" json:"axes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value"` - Colors []*Color `protobuf:"bytes,10,rep,name=colors" json:"colors,omitempty"` - Legend *Legend `protobuf:"bytes,11,opt,name=legend" json:"legend,omitempty"` - TableOptions *TableOptions `protobuf:"bytes,12,opt,name=tableOptions" json:"tableOptions,omitempty"` + 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 []*Query `protobuf:"bytes,5,rep,name=queries" json:"queries,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"` + ID string `protobuf:"bytes,8,opt,name=ID,proto3" json:"ID,omitempty"` + Axes map[string]*Axis `protobuf:"bytes,9,rep,name=axes" json:"axes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value"` + Colors []*Color `protobuf:"bytes,10,rep,name=colors" json:"colors,omitempty"` + 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"` } func (m *DashboardCell) Reset() { *m = DashboardCell{} } @@ -323,13 +324,19 @@ func (m *DashboardCell) GetTableOptions() *TableOptions { return nil } +func (m *DashboardCell) GetFieldOptions() []*RenamableField { + if m != nil { + return m.FieldOptions + } + return nil +} + 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"` - FieldNames []*RenamableField `protobuf:"bytes,5,rep,name=fieldNames" json:"fieldNames,omitempty"` - FixFirstColumn bool `protobuf:"varint,6,opt,name=fixFirstColumn,proto3" json:"fixFirstColumn,omitempty"` + 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"` + FixFirstColumn bool `protobuf:"varint,5,opt,name=fixFirstColumn,proto3" json:"fixFirstColumn,omitempty"` } func (m *TableOptions) Reset() { *m = TableOptions{} } @@ -365,13 +372,6 @@ func (m *TableOptions) GetWrapping() string { return "" } -func (m *TableOptions) GetFieldNames() []*RenamableField { - if m != nil { - return m.FieldNames - } - return nil -} - func (m *TableOptions) GetFixFirstColumn() bool { if m != nil { return m.FixFirstColumn @@ -383,6 +383,7 @@ type RenamableField struct { InternalName string `protobuf:"bytes,1,opt,name=internalName,proto3" json:"internalName,omitempty"` DisplayName string `protobuf:"bytes,2,opt,name=displayName,proto3" json:"displayName,omitempty"` Visible bool `protobuf:"varint,3,opt,name=visible,proto3" json:"visible,omitempty"` + Precision int32 `protobuf:"varint,4,opt,name=precision,proto3" json:"precision,omitempty"` } func (m *RenamableField) Reset() { *m = RenamableField{} } @@ -411,6 +412,13 @@ func (m *RenamableField) GetVisible() bool { return false } +func (m *RenamableField) GetPrecision() int32 { + if m != nil { + return m.Precision + } + return 0 +} + type Color struct { ID string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"` Type string `protobuf:"bytes,2,opt,name=Type,proto3" json:"Type,omitempty"` @@ -1338,105 +1346,106 @@ func init() { func init() { proto.RegisterFile("internal.proto", fileDescriptorInternal) } var fileDescriptorInternal = []byte{ - // 1599 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x6f, 0xdb, 0xc8, - 0x15, 0x07, 0x45, 0x51, 0x12, 0x9f, 0x1c, 0xd7, 0x98, 0x1a, 0x09, 0x9b, 0x16, 0x85, 0x4a, 0xf4, - 0x43, 0xfd, 0x88, 0x1b, 0x28, 0x28, 0x10, 0x04, 0x6d, 0x00, 0xd9, 0x6a, 0x52, 0x37, 0x4e, 0xec, - 0x8c, 0x6c, 0xf7, 0x54, 0x04, 0x23, 0x69, 0x24, 0x11, 0xa1, 0x48, 0x76, 0x48, 0xda, 0x62, 0xcf, - 0x3d, 0xf5, 0x8f, 0x28, 0x50, 0xa0, 0xfd, 0x07, 0x8a, 0x5e, 0xf6, 0xb4, 0xf7, 0xfd, 0x87, 0x76, - 0x8f, 0x8b, 0x37, 0x1f, 0x24, 0x65, 0x29, 0x41, 0x16, 0x58, 0xec, 0x6d, 0x7e, 0xef, 0x3d, 0xbd, - 0x99, 0xf7, 0xfd, 0x28, 0xd8, 0x0f, 0xa2, 0x8c, 0x8b, 0x88, 0x85, 0x47, 0x89, 0x88, 0xb3, 0x98, - 0x74, 0x0c, 0xf6, 0xff, 0x61, 0x43, 0x6b, 0x1c, 0xe7, 0x62, 0xca, 0xc9, 0x3e, 0x34, 0x4e, 0x47, - 0x9e, 0xd5, 0xb3, 0xfa, 0x36, 0x6d, 0x9c, 0x8e, 0x08, 0x81, 0xe6, 0x1b, 0xb6, 0xe2, 0x5e, 0xa3, - 0x67, 0xf5, 0x5d, 0x2a, 0xcf, 0x48, 0xbb, 0x2c, 0x12, 0xee, 0xd9, 0x8a, 0x86, 0x67, 0xf2, 0x10, - 0x3a, 0x57, 0x29, 0x6a, 0x5b, 0x71, 0xaf, 0x29, 0xe9, 0x25, 0x46, 0xde, 0x05, 0x4b, 0xd3, 0xdb, - 0x58, 0xcc, 0x3c, 0x47, 0xf1, 0x0c, 0x26, 0x07, 0x60, 0x5f, 0xd1, 0x33, 0xaf, 0x25, 0xc9, 0x78, - 0x24, 0x1e, 0xb4, 0x47, 0x7c, 0xce, 0xf2, 0x30, 0xf3, 0xda, 0x3d, 0xab, 0xdf, 0xa1, 0x06, 0xa2, - 0x9e, 0x4b, 0x1e, 0xf2, 0x85, 0x60, 0x73, 0xaf, 0xa3, 0xf4, 0x18, 0x4c, 0x8e, 0x80, 0x9c, 0x46, - 0x29, 0x9f, 0xe6, 0x82, 0x8f, 0xdf, 0x07, 0xc9, 0x35, 0x17, 0xc1, 0xbc, 0xf0, 0x5c, 0xa9, 0x60, - 0x07, 0x07, 0x6f, 0x79, 0xcd, 0x33, 0x86, 0x77, 0x83, 0x54, 0x65, 0x20, 0xf1, 0x61, 0x6f, 0xbc, - 0x64, 0x82, 0xcf, 0xc6, 0x7c, 0x2a, 0x78, 0xe6, 0x75, 0x25, 0x7b, 0x83, 0x86, 0x32, 0xe7, 0x62, - 0xc1, 0xa2, 0xe0, 0xef, 0x2c, 0x0b, 0xe2, 0xc8, 0xdb, 0x53, 0x32, 0x75, 0x1a, 0x7a, 0x89, 0xc6, - 0x21, 0xf7, 0xee, 0x29, 0x2f, 0xe1, 0x99, 0xfc, 0x08, 0x5c, 0x6d, 0x0c, 0xbd, 0xf0, 0xf6, 0x25, - 0xa3, 0x22, 0xf8, 0xff, 0xb7, 0xc0, 0x1d, 0xb1, 0x74, 0x39, 0x89, 0x99, 0x98, 0x7d, 0x52, 0x24, - 0x1e, 0x81, 0x33, 0xe5, 0x61, 0x98, 0x7a, 0x76, 0xcf, 0xee, 0x77, 0x07, 0x0f, 0x8e, 0xca, 0x10, - 0x97, 0x7a, 0x4e, 0x78, 0x18, 0x52, 0x25, 0x45, 0x1e, 0x83, 0x9b, 0xf1, 0x55, 0x12, 0xb2, 0x8c, - 0xa7, 0x5e, 0x53, 0xfe, 0x84, 0x54, 0x3f, 0xb9, 0xd4, 0x2c, 0x5a, 0x09, 0x6d, 0x19, 0xea, 0x6c, - 0x1b, 0xea, 0x7f, 0x66, 0xc3, 0xbd, 0x8d, 0xeb, 0xc8, 0x1e, 0x58, 0x6b, 0xf9, 0x72, 0x87, 0x5a, - 0x6b, 0x44, 0x85, 0x7c, 0xb5, 0x43, 0xad, 0x02, 0xd1, 0xad, 0xcc, 0x1c, 0x87, 0x5a, 0xb7, 0x88, - 0x96, 0x32, 0x5f, 0x1c, 0x6a, 0x2d, 0xc9, 0x2f, 0xa1, 0xfd, 0xb7, 0x9c, 0x8b, 0x80, 0xa7, 0x9e, - 0x23, 0x5f, 0xf7, 0xbd, 0xea, 0x75, 0x6f, 0x73, 0x2e, 0x0a, 0x6a, 0xf8, 0xe8, 0x0d, 0x99, 0x6b, - 0x2a, 0x71, 0xe4, 0x19, 0x69, 0x19, 0xe6, 0x65, 0x5b, 0xd1, 0xf0, 0xac, 0xbd, 0xa8, 0xb2, 0x05, - 0xbd, 0xf8, 0x3b, 0x68, 0xb2, 0x35, 0x4f, 0x3d, 0x57, 0xea, 0xff, 0xc9, 0x07, 0x1c, 0x76, 0x34, - 0x5c, 0xf3, 0xf4, 0x8f, 0x51, 0x26, 0x0a, 0x2a, 0xc5, 0xc9, 0x2f, 0xa0, 0x35, 0x8d, 0xc3, 0x58, - 0xa4, 0x1e, 0xdc, 0x7d, 0xd8, 0x09, 0xd2, 0xa9, 0x66, 0x93, 0x3e, 0xb4, 0x42, 0xbe, 0xe0, 0xd1, - 0x4c, 0xe6, 0x4d, 0x77, 0x70, 0x50, 0x09, 0x9e, 0x49, 0x3a, 0xd5, 0x7c, 0xf2, 0x0c, 0xf6, 0x32, - 0x36, 0x09, 0xf9, 0x79, 0x82, 0x5e, 0x4c, 0x65, 0x0e, 0x75, 0x07, 0xf7, 0x6b, 0xf1, 0xa8, 0x71, - 0xe9, 0x86, 0xec, 0xc3, 0x97, 0xe0, 0x96, 0x2f, 0xc4, 0x12, 0x7a, 0xcf, 0x0b, 0xe9, 0x6f, 0x97, - 0xe2, 0x91, 0xfc, 0x14, 0x9c, 0x1b, 0x16, 0xe6, 0x2a, 0x57, 0xba, 0x83, 0xfd, 0x4a, 0xe7, 0x70, - 0x1d, 0xa4, 0x54, 0x31, 0x9f, 0x35, 0x9e, 0x5a, 0xfe, 0x3f, 0x1b, 0xb0, 0x57, 0xbf, 0x87, 0xfc, - 0x18, 0x20, 0x0b, 0x56, 0xfc, 0x45, 0x2c, 0x56, 0x2c, 0xd3, 0x3a, 0x6b, 0x14, 0xf2, 0x2b, 0x38, - 0xb8, 0xe1, 0x22, 0x0b, 0xa6, 0x2c, 0xbc, 0x0c, 0x56, 0x1c, 0xf5, 0xc9, 0x5b, 0x3a, 0x74, 0x8b, - 0x4e, 0x1e, 0x43, 0x2b, 0x8d, 0x45, 0x76, 0x5c, 0xc8, 0x78, 0x77, 0x07, 0x5e, 0xf5, 0x0e, 0xca, - 0x23, 0xb6, 0xc2, 0x7b, 0x5f, 0x04, 0x3c, 0x9c, 0x51, 0x2d, 0x87, 0x15, 0x7e, 0x2b, 0x58, 0x92, - 0x04, 0xd1, 0xc2, 0x74, 0x11, 0x83, 0xc9, 0x53, 0x80, 0x39, 0x0a, 0x63, 0xe2, 0x9b, 0xfc, 0xf8, - 0xb0, 0xc6, 0x9a, 0x2c, 0xf9, 0x39, 0xec, 0xcf, 0x83, 0xf5, 0x8b, 0x40, 0xa4, 0xd9, 0x49, 0x1c, - 0xe6, 0xab, 0x48, 0x66, 0x4d, 0x87, 0xde, 0xa1, 0xfa, 0x09, 0xec, 0x6f, 0x6a, 0xc1, 0xf4, 0x37, - 0x17, 0xc8, 0xda, 0x53, 0xfe, 0xd8, 0xa0, 0x91, 0x1e, 0x74, 0x67, 0x41, 0x9a, 0x84, 0xac, 0xa8, - 0x95, 0x67, 0x9d, 0x84, 0xbd, 0xe6, 0x26, 0x48, 0x83, 0x49, 0xa8, 0x5a, 0x66, 0x87, 0x1a, 0xe8, - 0x2f, 0xc0, 0x91, 0xe9, 0x53, 0x2b, 0x76, 0xd7, 0x14, 0xbb, 0x6c, 0xb1, 0x8d, 0x5a, 0x8b, 0x3d, - 0x00, 0xfb, 0x4f, 0x7c, 0xad, 0xbb, 0x2e, 0x1e, 0xcb, 0x96, 0xd0, 0xac, 0xb5, 0x84, 0x43, 0x70, - 0xae, 0x65, 0xec, 0x55, 0xa9, 0x2a, 0xe0, 0x3f, 0x87, 0x96, 0x4a, 0xbf, 0x52, 0xb3, 0x55, 0xd3, - 0xdc, 0x83, 0xee, 0xb9, 0x08, 0x78, 0x94, 0xa9, 0x22, 0xd7, 0x26, 0xd4, 0x48, 0xfe, 0xff, 0x2c, - 0x68, 0xca, 0x98, 0xfa, 0xb0, 0x17, 0xf2, 0x05, 0x9b, 0x16, 0xc7, 0x71, 0x1e, 0xcd, 0x52, 0xcf, - 0xea, 0xd9, 0x7d, 0x9b, 0x6e, 0xd0, 0xc8, 0x7d, 0x68, 0x4d, 0x14, 0xb7, 0xd1, 0xb3, 0xfb, 0x2e, - 0xd5, 0x08, 0x9f, 0x16, 0xb2, 0x09, 0x0f, 0xb5, 0x09, 0x0a, 0xa0, 0x74, 0x22, 0xf8, 0x3c, 0x58, - 0x6b, 0x33, 0x34, 0x42, 0x7a, 0x9a, 0xcf, 0x91, 0xae, 0x2c, 0xd1, 0x08, 0x0d, 0x98, 0xb0, 0xb4, - 0xac, 0x7c, 0x3c, 0xa3, 0xe6, 0x74, 0xca, 0x42, 0x53, 0xfa, 0x0a, 0xf8, 0x9f, 0x5b, 0x38, 0x30, - 0x54, 0x2b, 0xdb, 0xf2, 0xf0, 0x0f, 0xa0, 0x83, 0x6d, 0xee, 0xdd, 0x0d, 0x13, 0xda, 0xe0, 0x36, - 0xe2, 0x6b, 0x26, 0xc8, 0x6f, 0xa1, 0x25, 0x2b, 0x64, 0x47, 0x5b, 0x35, 0xea, 0xa4, 0x57, 0xa9, - 0x16, 0x2b, 0x1b, 0x4f, 0xb3, 0xd6, 0x78, 0x4a, 0x63, 0x9d, 0xba, 0xb1, 0x8f, 0xc0, 0xc1, 0x0e, - 0x56, 0xc8, 0xd7, 0xef, 0xd4, 0xac, 0xfa, 0x9c, 0x92, 0xf2, 0xaf, 0xe0, 0xde, 0xc6, 0x8d, 0xe5, - 0x4d, 0xd6, 0xe6, 0x4d, 0x55, 0xb5, 0xbb, 0xba, 0xba, 0xb1, 0x94, 0x52, 0x1e, 0xf2, 0x69, 0xc6, - 0x67, 0x3a, 0xeb, 0x4a, 0xec, 0xff, 0xdb, 0xaa, 0xf4, 0xca, 0xfb, 0x30, 0x45, 0xa7, 0xf1, 0x6a, - 0xc5, 0xa2, 0x99, 0x56, 0x6d, 0x20, 0xfa, 0x6d, 0x36, 0xd1, 0xaa, 0x1b, 0xb3, 0x09, 0x62, 0x91, - 0xe8, 0x08, 0x36, 0x44, 0x82, 0xb9, 0xb3, 0xe2, 0x2c, 0xcd, 0x05, 0x5f, 0xf1, 0x28, 0xd3, 0x2e, - 0xa8, 0x93, 0xc8, 0x03, 0x68, 0x67, 0x6c, 0xf1, 0x0e, 0x7b, 0x94, 0x8e, 0x64, 0xc6, 0x16, 0xaf, - 0x78, 0x41, 0x7e, 0x08, 0xae, 0xac, 0x52, 0xc9, 0x52, 0xe1, 0xec, 0x48, 0xc2, 0x2b, 0x5e, 0xf8, - 0x5f, 0x59, 0xd0, 0x1a, 0x73, 0x71, 0xc3, 0xc5, 0x27, 0x4d, 0xc2, 0xfa, 0xfe, 0x61, 0x7f, 0x64, - 0xff, 0x68, 0xee, 0xde, 0x3f, 0x9c, 0x6a, 0xff, 0x38, 0x04, 0x67, 0x2c, 0xa6, 0xa7, 0x23, 0xf9, - 0x22, 0x9b, 0x2a, 0x80, 0xd9, 0x38, 0x9c, 0x66, 0xc1, 0x0d, 0xd7, 0x4b, 0x89, 0x46, 0x5b, 0x03, - 0xb2, 0xb3, 0x63, 0x13, 0xf8, 0x86, 0xbb, 0x89, 0xff, 0x2f, 0x0b, 0x5a, 0x67, 0xac, 0x88, 0xf3, - 0x6c, 0x2b, 0x6b, 0x7b, 0xd0, 0x1d, 0x26, 0x49, 0x18, 0x4c, 0x37, 0x2a, 0xb5, 0x46, 0x42, 0x89, - 0xd7, 0xb5, 0x78, 0x28, 0x5f, 0xd4, 0x49, 0x38, 0x1d, 0x4e, 0xe4, 0xd2, 0xa0, 0x36, 0x80, 0xda, - 0x74, 0x50, 0xbb, 0x82, 0x64, 0xa2, 0xd3, 0x86, 0x79, 0x16, 0xcf, 0xc3, 0xf8, 0x56, 0x7a, 0xa7, - 0x43, 0x4b, 0xec, 0x7f, 0xd1, 0x80, 0xe6, 0x77, 0x35, 0xe8, 0xf7, 0xc0, 0x0a, 0x74, 0x72, 0x58, - 0x41, 0x39, 0xf6, 0xdb, 0xb5, 0xb1, 0xef, 0x41, 0xbb, 0x10, 0x2c, 0x5a, 0xf0, 0xd4, 0xeb, 0xc8, - 0x6e, 0x64, 0xa0, 0xe4, 0xc8, 0xba, 0x53, 0xf3, 0xde, 0xa5, 0x06, 0x96, 0x75, 0x04, 0xb5, 0x3a, - 0xfa, 0x8d, 0x5e, 0x0d, 0xba, 0x77, 0x47, 0xcb, 0xae, 0x8d, 0xe0, 0xdb, 0x1b, 0xc1, 0x5f, 0x5a, - 0xe0, 0x94, 0x45, 0x78, 0xb2, 0x59, 0x84, 0x27, 0x55, 0x11, 0x8e, 0x8e, 0x4d, 0x11, 0x8e, 0x8e, - 0x11, 0xd3, 0x0b, 0x53, 0x84, 0xf4, 0x02, 0x83, 0xf5, 0x52, 0xc4, 0x79, 0x72, 0x5c, 0xa8, 0xa8, - 0xba, 0xb4, 0xc4, 0x98, 0xb9, 0x7f, 0x59, 0x72, 0xa1, 0x5d, 0xed, 0x52, 0x8d, 0x30, 0xcf, 0xcf, - 0x64, 0x83, 0x52, 0xce, 0x55, 0x80, 0xfc, 0x0c, 0x1c, 0x8a, 0xce, 0x93, 0x1e, 0xde, 0x88, 0x8b, - 0x24, 0x53, 0xc5, 0x45, 0xa5, 0xea, 0x83, 0x41, 0x27, 0xbc, 0xf9, 0x7c, 0xf8, 0x35, 0xb4, 0xc6, - 0xcb, 0x60, 0x9e, 0x99, 0x05, 0xeb, 0xfb, 0xb5, 0x06, 0x17, 0xac, 0xb8, 0xe4, 0x51, 0x2d, 0xe2, - 0xbf, 0x05, 0xb7, 0x24, 0x56, 0xcf, 0xb1, 0xea, 0xcf, 0x21, 0xd0, 0xbc, 0x8a, 0x82, 0xcc, 0x94, - 0x3a, 0x9e, 0xd1, 0xd8, 0xb7, 0x39, 0x8b, 0xb2, 0x20, 0x2b, 0x4c, 0xa9, 0x1b, 0xec, 0x3f, 0xd1, - 0xcf, 0x47, 0x75, 0x57, 0x49, 0xc2, 0x85, 0x6e, 0x1b, 0x0a, 0xc8, 0x4b, 0xe2, 0x5b, 0xae, 0x3a, - 0xbe, 0x4d, 0x15, 0xf0, 0xff, 0x0a, 0xee, 0x30, 0xe4, 0x22, 0xa3, 0x79, 0xc8, 0x77, 0x4d, 0xe2, - 0x3f, 0x8f, 0xcf, 0xdf, 0x98, 0x17, 0xe0, 0xb9, 0x6a, 0x11, 0xf6, 0x9d, 0x16, 0xf1, 0x8a, 0x25, - 0xec, 0x74, 0x24, 0xf3, 0xdc, 0xa6, 0x1a, 0xf9, 0xff, 0xb1, 0xa0, 0x89, 0xbd, 0xa8, 0xa6, 0xba, - 0xf9, 0xb1, 0x3e, 0x76, 0x21, 0xe2, 0x9b, 0x60, 0xc6, 0x85, 0x31, 0xce, 0x60, 0xe9, 0xf4, 0xe9, - 0x92, 0x97, 0x03, 0x5f, 0x23, 0xcc, 0x35, 0xfc, 0xba, 0x30, 0xb5, 0x54, 0xcb, 0x35, 0x24, 0x53, - 0xc5, 0xc4, 0xcd, 0x6e, 0x9c, 0x27, 0x5c, 0x0c, 0x67, 0xab, 0xc0, 0x6c, 0x40, 0x35, 0x8a, 0xff, - 0x5c, 0x7d, 0xaf, 0x6c, 0x75, 0x34, 0x6b, 0xf7, 0xb7, 0xcd, 0xdd, 0x97, 0xfb, 0xff, 0xb5, 0xa0, - 0xfd, 0x5a, 0xef, 0x6a, 0x75, 0x2b, 0xac, 0x0f, 0x5a, 0xd1, 0xd8, 0xb0, 0x62, 0x00, 0x87, 0x46, - 0x66, 0xe3, 0x7e, 0xe5, 0x85, 0x9d, 0x3c, 0xed, 0xd1, 0x66, 0x19, 0xac, 0x4f, 0xf9, 0x5c, 0xb9, - 0xdc, 0x94, 0xd9, 0x15, 0xf0, 0xad, 0xa8, 0xf4, 0xa0, 0x6b, 0x3e, 0xd3, 0xe2, 0xd0, 0x0c, 0x98, - 0x3a, 0xc9, 0x1f, 0x40, 0xeb, 0x24, 0x8e, 0xe6, 0xc1, 0x82, 0xf4, 0xa1, 0x39, 0xcc, 0xb3, 0xa5, - 0xd4, 0xd8, 0x1d, 0x1c, 0xd6, 0x0a, 0x3f, 0xcf, 0x96, 0x4a, 0x86, 0x4a, 0x09, 0xff, 0xf7, 0x00, - 0x15, 0x0d, 0xa7, 0x44, 0x15, 0x8d, 0x37, 0xfc, 0x16, 0x53, 0x26, 0x95, 0x5a, 0x3a, 0x74, 0x07, - 0xc7, 0xff, 0x03, 0xb8, 0xc7, 0x79, 0x10, 0xce, 0x4e, 0xa3, 0x79, 0x8c, 0xad, 0xe3, 0x9a, 0x8b, - 0xb4, 0x8a, 0x97, 0x81, 0xe8, 0x6e, 0xec, 0x22, 0x65, 0x0d, 0x69, 0x34, 0x69, 0xc9, 0x3f, 0x01, - 0x9e, 0x7c, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xb6, 0xb2, 0x98, 0x60, 0x16, 0x10, 0x00, 0x00, + // 1614 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x5b, 0x8f, 0xe3, 0x48, + 0x15, 0x96, 0xe3, 0x38, 0x89, 0x4f, 0x32, 0x4d, 0xab, 0x68, 0xed, 0x9a, 0x05, 0xa1, 0x60, 0x71, + 0x09, 0x97, 0x6d, 0x56, 0xbd, 0x42, 0x42, 0xab, 0x65, 0xa5, 0x74, 0x87, 0x59, 0x9a, 0xe9, 0x99, + 0xee, 0xa9, 0x74, 0x37, 0x4f, 0x68, 0x55, 0x49, 0x2a, 0x49, 0x69, 0x1d, 0xdb, 0x94, 0xed, 0xee, + 0x98, 0x67, 0x9e, 0xf9, 0x09, 0x48, 0x48, 0xf0, 0x07, 0x10, 0xef, 0xbc, 0xf3, 0xc4, 0xbf, 0x59, + 0x1e, 0xd1, 0xa9, 0x8b, 0xed, 0x74, 0x32, 0xa3, 0x41, 0x42, 0xbc, 0xd5, 0x77, 0x4e, 0xe5, 0x54, + 0x9d, 0xdb, 0x57, 0xc7, 0x81, 0x23, 0x11, 0xe7, 0x5c, 0xc6, 0x2c, 0x3a, 0x4d, 0x65, 0x92, 0x27, + 0xa4, 0x67, 0x71, 0xf8, 0x07, 0x17, 0x3a, 0xd3, 0xa4, 0x90, 0x73, 0x4e, 0x8e, 0xa0, 0x75, 0x39, + 0x09, 0x9c, 0xa1, 0x33, 0x72, 0x69, 0xeb, 0x72, 0x42, 0x08, 0xb4, 0x5f, 0xb1, 0x0d, 0x0f, 0x5a, + 0x43, 0x67, 0xe4, 0x53, 0xb5, 0x46, 0xd9, 0x6d, 0x99, 0xf2, 0xc0, 0xd5, 0x32, 0x5c, 0x93, 0x0f, + 0xa0, 0x77, 0x97, 0xa1, 0xb5, 0x0d, 0x0f, 0xda, 0x4a, 0x5e, 0x61, 0xd4, 0xdd, 0xb0, 0x2c, 0x7b, + 0x4c, 0xe4, 0x22, 0xf0, 0xb4, 0xce, 0x62, 0x72, 0x0c, 0xee, 0x1d, 0xbd, 0x0a, 0x3a, 0x4a, 0x8c, + 0x4b, 0x12, 0x40, 0x77, 0xc2, 0x97, 0xac, 0x88, 0xf2, 0xa0, 0x3b, 0x74, 0x46, 0x3d, 0x6a, 0x21, + 0xda, 0xb9, 0xe5, 0x11, 0x5f, 0x49, 0xb6, 0x0c, 0x7a, 0xda, 0x8e, 0xc5, 0xe4, 0x14, 0xc8, 0x65, + 0x9c, 0xf1, 0x79, 0x21, 0xf9, 0xf4, 0x4b, 0x91, 0xde, 0x73, 0x29, 0x96, 0x65, 0xe0, 0x2b, 0x03, + 0x07, 0x34, 0x78, 0xca, 0x4b, 0x9e, 0x33, 0x3c, 0x1b, 0x94, 0x29, 0x0b, 0x49, 0x08, 0x83, 0xe9, + 0x9a, 0x49, 0xbe, 0x98, 0xf2, 0xb9, 0xe4, 0x79, 0xd0, 0x57, 0xea, 0x1d, 0x19, 0xee, 0xb9, 0x96, + 0x2b, 0x16, 0x8b, 0xdf, 0xb3, 0x5c, 0x24, 0x71, 0x30, 0xd0, 0x7b, 0x9a, 0x32, 0x8c, 0x12, 0x4d, + 0x22, 0x1e, 0x3c, 0xd3, 0x51, 0xc2, 0x35, 0xf9, 0x16, 0xf8, 0xc6, 0x19, 0x7a, 0x13, 0x1c, 0x29, + 0x45, 0x2d, 0x08, 0xff, 0xee, 0x80, 0x3f, 0x61, 0xd9, 0x7a, 0x96, 0x30, 0xb9, 0x78, 0xa7, 0x4c, + 0x7c, 0x08, 0xde, 0x9c, 0x47, 0x51, 0x16, 0xb8, 0x43, 0x77, 0xd4, 0x3f, 0x7b, 0xff, 0xb4, 0x4a, + 0x71, 0x65, 0xe7, 0x82, 0x47, 0x11, 0xd5, 0xbb, 0xc8, 0x47, 0xe0, 0xe7, 0x7c, 0x93, 0x46, 0x2c, + 0xe7, 0x59, 0xd0, 0x56, 0x3f, 0x21, 0xf5, 0x4f, 0x6e, 0x8d, 0x8a, 0xd6, 0x9b, 0xf6, 0x1c, 0xf5, + 0xf6, 0x1d, 0x0d, 0xbf, 0x72, 0xe1, 0xd9, 0xce, 0x71, 0x64, 0x00, 0xce, 0x56, 0xdd, 0xdc, 0xa3, + 0xce, 0x16, 0x51, 0xa9, 0x6e, 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, 0xed, 0xbe, 0x56, 0xdf, 0xee, 0x75, 0xc1, 0x65, 0x49, 0xad, 0x1e, 0xa3, 0xa1, 0x6a, + 0x4d, 0x17, 0x8e, 0x5a, 0xa3, 0x2c, 0xc7, 0xba, 0xec, 0x6a, 0x19, 0xae, 0x4d, 0x14, 0x75, 0xb5, + 0x60, 0x14, 0x7f, 0x06, 0x6d, 0xb6, 0xe5, 0x59, 0xe0, 0x2b, 0xfb, 0xdf, 0x79, 0x43, 0xc0, 0x4e, + 0xc7, 0x5b, 0x9e, 0xfd, 0x32, 0xce, 0x65, 0x49, 0xd5, 0x76, 0xf2, 0x03, 0xe8, 0xcc, 0x93, 0x28, + 0x91, 0x59, 0x00, 0x4f, 0x2f, 0x76, 0x81, 0x72, 0x6a, 0xd4, 0x64, 0x04, 0x9d, 0x88, 0xaf, 0x78, + 0xbc, 0x50, 0x75, 0xd3, 0x3f, 0x3b, 0xae, 0x37, 0x5e, 0x29, 0x39, 0x35, 0x7a, 0xf2, 0x09, 0x0c, + 0x72, 0x36, 0x8b, 0xf8, 0x75, 0x8a, 0x51, 0xcc, 0x54, 0x0d, 0xf5, 0xcf, 0xde, 0x6b, 0xe4, 0xa3, + 0xa1, 0xa5, 0x3b, 0x7b, 0xc9, 0xa7, 0x30, 0x58, 0x0a, 0x1e, 0x2d, 0xec, 0x6f, 0x9f, 0xa9, 0x4b, + 0x05, 0xf5, 0x6f, 0x29, 0x8f, 0xd9, 0x06, 0x7f, 0xf1, 0x1c, 0xb7, 0xd1, 0x9d, 0xdd, 0x1f, 0x7c, + 0x0e, 0x7e, 0xe5, 0x1f, 0x36, 0xe0, 0x97, 0xbc, 0x54, 0xd9, 0xf2, 0x29, 0x2e, 0xc9, 0x77, 0xc1, + 0x7b, 0x60, 0x51, 0xa1, 0x2b, 0xad, 0x7f, 0x76, 0x54, 0x5b, 0x1d, 0x6f, 0x45, 0x46, 0xb5, 0xf2, + 0x93, 0xd6, 0xcf, 0x9d, 0xf0, 0x5f, 0x0e, 0x0c, 0x9a, 0xb7, 0x24, 0xdf, 0x06, 0xc8, 0xc5, 0x86, + 0x3f, 0x4f, 0xe4, 0x86, 0xe5, 0xc6, 0x66, 0x43, 0x42, 0x7e, 0x04, 0xc7, 0x0f, 0x5c, 0xe6, 0x62, + 0xce, 0xa2, 0x5b, 0xb1, 0xe1, 0x68, 0x4f, 0x9d, 0xd2, 0xa3, 0x7b, 0x72, 0xf2, 0x11, 0x74, 0xb2, + 0x44, 0xe6, 0xe7, 0xa5, 0xaa, 0x96, 0xb7, 0x79, 0x67, 0xf6, 0x21, 0x3f, 0x3c, 0x4a, 0x96, 0xa6, + 0x22, 0x5e, 0x59, 0x0e, 0xb2, 0x98, 0x7c, 0x1f, 0x8e, 0x96, 0x62, 0xfb, 0x5c, 0xc8, 0x2c, 0xbf, + 0x48, 0xa2, 0x62, 0xa3, 0x4b, 0xb9, 0x47, 0x9f, 0x48, 0xc3, 0x3f, 0x3a, 0x70, 0xb4, 0x6b, 0x1e, + 0x7b, 0xc0, 0x9e, 0xac, 0x1a, 0x50, 0xbb, 0xb5, 0x23, 0x23, 0x43, 0xe8, 0x2f, 0x44, 0x96, 0x46, + 0xac, 0x6c, 0xf4, 0x68, 0x53, 0x84, 0x84, 0xf3, 0x20, 0x32, 0x31, 0x8b, 0x34, 0x6f, 0xf6, 0xa8, + 0x85, 0x48, 0x0a, 0xa9, 0xe4, 0x73, 0x91, 0x61, 0x83, 0xe9, 0x5e, 0xa8, 0x05, 0xe1, 0x0a, 0x3c, + 0x55, 0x61, 0x0d, 0x3e, 0xf0, 0x2d, 0x1f, 0x28, 0x16, 0x6e, 0x35, 0x58, 0xf8, 0x18, 0xdc, 0x5f, + 0xf1, 0xad, 0x21, 0x66, 0x5c, 0x56, 0xac, 0xd1, 0x6e, 0xb0, 0xc6, 0x09, 0x78, 0xf7, 0x2a, 0xc1, + 0xba, 0x9b, 0x35, 0x08, 0x3f, 0x83, 0x8e, 0xae, 0xd0, 0xca, 0xb2, 0xd3, 0xb0, 0x3c, 0x84, 0xfe, + 0xb5, 0x14, 0x3c, 0xce, 0x35, 0x0f, 0x18, 0x07, 0x1b, 0xa2, 0xf0, 0x6f, 0x0e, 0xb4, 0x55, 0xe2, + 0x42, 0x18, 0x44, 0x7c, 0xc5, 0xe6, 0xe5, 0x79, 0x52, 0xc4, 0x8b, 0x2c, 0x70, 0x86, 0xee, 0xc8, + 0xa5, 0x3b, 0x32, 0xf2, 0x1e, 0x74, 0x66, 0x5a, 0xdb, 0x1a, 0xba, 0x23, 0x9f, 0x1a, 0x84, 0x57, + 0x8b, 0xd8, 0x8c, 0x47, 0xc6, 0x05, 0x0d, 0x70, 0x77, 0x2a, 0xf9, 0x52, 0x6c, 0x8d, 0x1b, 0x06, + 0xa1, 0x3c, 0x2b, 0x96, 0x28, 0xd7, 0x9e, 0x18, 0x84, 0x0e, 0xcc, 0x58, 0x56, 0x91, 0x03, 0xae, + 0xd1, 0x72, 0x36, 0x67, 0x91, 0x65, 0x07, 0x0d, 0xc2, 0x7f, 0x38, 0xf8, 0xa6, 0x68, 0xb6, 0xdb, + 0x8b, 0xf0, 0x37, 0xa0, 0x87, 0x4c, 0xf8, 0xc5, 0x03, 0x93, 0xc6, 0xe1, 0x2e, 0xe2, 0x7b, 0x26, + 0xc9, 0x4f, 0xa1, 0xa3, 0xda, 0xe0, 0x00, 0xf3, 0x5a, 0x73, 0x2a, 0xaa, 0xd4, 0x6c, 0xab, 0xb8, + 0xa9, 0xdd, 0xe0, 0xa6, 0xca, 0x59, 0xaf, 0xe9, 0xec, 0x87, 0xe0, 0x21, 0xc9, 0x95, 0xea, 0xf6, + 0x07, 0x2d, 0x6b, 0x2a, 0xd4, 0xbb, 0xc2, 0x3b, 0x78, 0xb6, 0x73, 0x62, 0x75, 0x92, 0xb3, 0x7b, + 0x52, 0xdd, 0xd2, 0xbe, 0x69, 0x61, 0xec, 0x97, 0x8c, 0x47, 0x7c, 0x9e, 0xf3, 0x85, 0xa9, 0xc9, + 0x0a, 0x87, 0x7f, 0x76, 0x6a, 0xbb, 0xea, 0x3c, 0x2c, 0xe0, 0x79, 0xb2, 0xd9, 0xb0, 0x78, 0x61, + 0x4c, 0x5b, 0x88, 0x71, 0x5b, 0xcc, 0x8c, 0xe9, 0xd6, 0x62, 0x86, 0x58, 0xa6, 0x26, 0x83, 0x2d, + 0x99, 0x62, 0xed, 0x6c, 0x38, 0xcb, 0x0a, 0xc9, 0x37, 0x3c, 0xce, 0x4d, 0x08, 0x9a, 0x22, 0xf2, + 0x3e, 0x74, 0x73, 0xb6, 0xfa, 0x02, 0x89, 0xc8, 0x64, 0x32, 0x67, 0xab, 0x17, 0xbc, 0x24, 0xdf, + 0x04, 0x5f, 0x51, 0x97, 0x52, 0xe9, 0x74, 0xf6, 0x94, 0xe0, 0x05, 0x2f, 0xc3, 0x7f, 0x3b, 0xd0, + 0x99, 0x72, 0xf9, 0xc0, 0xe5, 0x3b, 0x3d, 0x96, 0xcd, 0x11, 0xc5, 0x7d, 0xcb, 0x88, 0xd2, 0x3e, + 0x3c, 0xa2, 0x78, 0xf5, 0x88, 0x72, 0x02, 0xde, 0x54, 0xce, 0x2f, 0x27, 0xea, 0x46, 0x2e, 0xd5, + 0x00, 0xab, 0x71, 0x3c, 0xcf, 0xc5, 0x03, 0x37, 0x73, 0x8b, 0x41, 0x7b, 0x6f, 0x68, 0xef, 0xc0, + 0xb0, 0xf0, 0x5f, 0x8e, 0x2f, 0xe1, 0x9f, 0x1c, 0xe8, 0x5c, 0xb1, 0x32, 0x29, 0xf2, 0xbd, 0xaa, + 0x1d, 0x42, 0x7f, 0x9c, 0xa6, 0x91, 0x98, 0xef, 0x74, 0x6a, 0x43, 0x84, 0x3b, 0x5e, 0x36, 0xf2, + 0xa1, 0x63, 0xd1, 0x14, 0xe1, 0x13, 0x70, 0xa1, 0xe6, 0x0a, 0x3d, 0x24, 0x34, 0x9e, 0x00, 0x3d, + 0x4e, 0x28, 0x25, 0x06, 0x6d, 0x5c, 0xe4, 0xc9, 0x32, 0x4a, 0x1e, 0x0d, 0x9b, 0x56, 0x38, 0xfc, + 0x67, 0x0b, 0xda, 0xff, 0xaf, 0x59, 0x60, 0x00, 0x8e, 0x30, 0xc5, 0xe1, 0x88, 0x6a, 0x32, 0xe8, + 0x36, 0x26, 0x83, 0x00, 0xba, 0xa5, 0x64, 0xf1, 0x8a, 0x67, 0x41, 0x4f, 0xb1, 0x91, 0x85, 0x4a, + 0xa3, 0xfa, 0x4e, 0x8f, 0x04, 0x3e, 0xb5, 0xb0, 0xea, 0x23, 0x68, 0xf4, 0xd1, 0x4f, 0xcc, 0xf4, + 0xd0, 0x7f, 0xfa, 0xde, 0x1e, 0x1a, 0x1a, 0xfe, 0x77, 0xef, 0xec, 0x57, 0x0e, 0x78, 0x55, 0x13, + 0x5e, 0xec, 0x36, 0xe1, 0x45, 0xdd, 0x84, 0x93, 0x73, 0xdb, 0x84, 0x93, 0x73, 0xc4, 0xf4, 0xc6, + 0x36, 0x21, 0xbd, 0xc1, 0x64, 0x7d, 0x2e, 0x93, 0x22, 0x3d, 0x2f, 0x75, 0x56, 0x7d, 0x5a, 0x61, + 0xac, 0xdc, 0xdf, 0xac, 0xb9, 0x34, 0xa1, 0xf6, 0xa9, 0x41, 0x58, 0xe7, 0x57, 0x8a, 0xa0, 0x74, + 0x70, 0x35, 0x20, 0xdf, 0x03, 0x8f, 0x62, 0xf0, 0x54, 0x84, 0x77, 0xf2, 0xa2, 0xc4, 0x54, 0x6b, + 0xd1, 0xa8, 0xfe, 0xa6, 0x30, 0x05, 0x6f, 0xbf, 0x30, 0x7e, 0x0c, 0x9d, 0xe9, 0x5a, 0x2c, 0x73, + 0x3b, 0x83, 0x7d, 0xbd, 0x41, 0x70, 0x62, 0xc3, 0x95, 0x8e, 0x9a, 0x2d, 0xe1, 0x6b, 0xf0, 0x2b, + 0x61, 0x7d, 0x1d, 0xa7, 0x79, 0x1d, 0x02, 0xed, 0xbb, 0x58, 0xe4, 0xb6, 0xd5, 0x71, 0x8d, 0xce, + 0xbe, 0x2e, 0x58, 0x9c, 0x8b, 0xbc, 0xb4, 0xad, 0x6e, 0x71, 0xf8, 0xb1, 0xb9, 0x3e, 0x9a, 0xbb, + 0x4b, 0x53, 0x2e, 0x0d, 0x6d, 0x68, 0xa0, 0x0e, 0x49, 0x1e, 0xb9, 0x66, 0x7c, 0x97, 0x6a, 0x10, + 0xfe, 0x16, 0xfc, 0x71, 0xc4, 0x65, 0x4e, 0x8b, 0x88, 0x1f, 0x7a, 0x89, 0x7f, 0x3d, 0xbd, 0x7e, + 0x65, 0x6f, 0x80, 0xeb, 0x9a, 0x22, 0xdc, 0x27, 0x14, 0xf1, 0x82, 0xa5, 0xec, 0x72, 0xa2, 0xea, + 0xdc, 0xa5, 0x06, 0x85, 0x7f, 0x71, 0xa0, 0x8d, 0x5c, 0xd4, 0x30, 0xdd, 0x7e, 0x1b, 0x8f, 0xdd, + 0xc8, 0xe4, 0x41, 0x2c, 0xb8, 0xb4, 0xce, 0x59, 0xac, 0x82, 0x3e, 0x5f, 0xf3, 0xea, 0xc1, 0x37, + 0x08, 0x6b, 0x0d, 0x3f, 0x40, 0x6c, 0x2f, 0x35, 0x6a, 0x0d, 0xc5, 0x54, 0x2b, 0x71, 0x7c, 0x9b, + 0x16, 0x29, 0x97, 0xe3, 0xc5, 0x46, 0xc4, 0x2a, 0xe9, 0x3d, 0xda, 0x90, 0x84, 0x9f, 0xe9, 0x4f, + 0x9a, 0x3d, 0x46, 0x73, 0x0e, 0x7f, 0xfe, 0x3c, 0xbd, 0x79, 0xf8, 0x57, 0x07, 0xba, 0x2f, 0xcd, + 0x40, 0xd6, 0xf4, 0xc2, 0x79, 0xa3, 0x17, 0xad, 0x1d, 0x2f, 0xce, 0xe0, 0xc4, 0xee, 0xd9, 0x39, + 0x5f, 0x47, 0xe1, 0xa0, 0xce, 0x44, 0xb4, 0x5d, 0x25, 0xeb, 0x5d, 0xbe, 0x68, 0x6e, 0x77, 0xf7, + 0x1c, 0x4a, 0xf8, 0x5e, 0x56, 0x86, 0xd0, 0xb7, 0x5f, 0x72, 0x49, 0x64, 0x1f, 0x98, 0xa6, 0x28, + 0x3c, 0x83, 0xce, 0x45, 0x12, 0x2f, 0xc5, 0x8a, 0x8c, 0xa0, 0x3d, 0x2e, 0xf2, 0xb5, 0xb2, 0xd8, + 0x3f, 0x3b, 0x69, 0x34, 0x7e, 0x91, 0xaf, 0xf5, 0x1e, 0xaa, 0x76, 0x84, 0x9f, 0x02, 0xd4, 0x32, + 0x7c, 0x25, 0xea, 0x6c, 0xbc, 0xe2, 0x8f, 0x58, 0x32, 0x99, 0xb2, 0xd2, 0xa3, 0x07, 0x34, 0xe1, + 0x2f, 0xc0, 0x3f, 0x2f, 0x44, 0xb4, 0xb8, 0x8c, 0x97, 0x09, 0x52, 0xc7, 0x3d, 0x97, 0x59, 0x9d, + 0x2f, 0x0b, 0x31, 0xdc, 0xc8, 0x22, 0x55, 0x0f, 0x19, 0x34, 0xeb, 0xa8, 0xff, 0x09, 0x3e, 0xfe, + 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5f, 0x83, 0xed, 0xad, 0x39, 0x10, 0x00, 0x00, } diff --git a/bolt/internal/internal.proto b/bolt/internal/internal.proto index b680b62002..2fc1d65ce8 100644 --- a/bolt/internal/internal.proto +++ b/bolt/internal/internal.proto @@ -39,6 +39,7 @@ message DashboardCell { 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 } message TableOptions { @@ -46,14 +47,14 @@ message TableOptions { 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 - repeated RenamableField fieldNames = 5; // names and renames for column/row fields - bool fixFirstColumn = 6; // first column should be fixed/frozen + bool fixFirstColumn = 5; // first column should be fixed/frozen } message RenamableField { string internalName = 1; // name of column string displayName = 2; // what column is renamed to bool visible = 3; // Represents whether RenamableField is visible + int32 precision = 4; // Represents how precise the values of this field should be } message Color { diff --git a/chronograf.go b/chronograf.go index bdc9d5fc9d..a14de9a41e 100644 --- a/chronograf.go +++ b/chronograf.go @@ -575,6 +575,7 @@ type DashboardCell struct { CellColors []CellColor `json:"colors"` Legend Legend `json:"legend"` TableOptions TableOptions `json:"tableOptions,omitempty"` + FieldOptions []RenamableField `json:"fieldOptions"` } // RenamableField is a column/row field in a DashboardCell of type Table @@ -582,16 +583,16 @@ type RenamableField struct { InternalName string `json:"internalName"` DisplayName string `json:"displayName"` Visible bool `json:"visible"` + Precision int32 `json:"precision"` } // 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"` - FieldNames []RenamableField `json:"fieldNames"` - FixFirstColumn bool `json:"fixFirstColumn"` + TimeFormat string `json:"timeFormat"` + VerticalTimeAxis bool `json:"verticalTimeAxis"` + SortBy RenamableField `json:"sortBy"` + Wrapping string `json:"wrapping"` + FixFirstColumn bool `json:"fixFirstColumn"` } // DashboardsStore is the storage and retrieval of dashboards