Convert Axis Bounds to []string

Due to various limitations with the previous implementation of Bounds as a [2]int64{}, we've decided to change this to a []string{}. This will allow clients to store arbitrary data specifying a bound and interpret it as they wish.
2017-07-26 15:45:17 -04:00 · 2017-07-26 15:45:17 -04:00 · 2ff3e27e1f
parent 6a9bc36395
commit 2ff3e27e1f
7 changed files with 165 additions and 80 deletions
--- a/bolt/internal/internal.go
+++ b/bolt/internal/internal.go
@ -2,6 +2,7 @@ package internal

 import (
 	"encoding/json"
+	"strconv"

 	"github.com/gogo/protobuf/proto"
 	"github.com/influxdata/chronograf"
@ -181,14 +182,14 @@ func MarshalDashboard(d chronograf.Dashboard) ([]byte, error) {

 		axes := make(map[string]*Axis, len(c.Axes))
 		for a, r := range c.Axes {
-			// need to explicitly allocate a new array because r.Bounds is
-			// over-written and the resulting slices from previous iterations will
-			// point to later iteration's data. It is _not_ enough to simply re-slice
-			// r.Bounds
+			// we only marshal LegacyBounds for a data migration test. This should
+			// not be used by anything in production.
 			axis := [2]int64{}
-			copy(axis[:], r.Bounds[:2])
+			copy(axis[:], r.LegacyBounds[:2])
+
 			axes[a] = &Axis{
-				Bounds: axis[:],
+				Bounds:       r.Bounds,
+				LegacyBounds: axis[:],
 			}
 		}

@ -268,7 +269,14 @@ func UnmarshalDashboard(data []byte, d *chronograf.Dashboard) error {
 		axes := make(map[string]chronograf.Axis, len(c.Axes))
 		for a, r := range c.Axes {
 			axis := chronograf.Axis{}
-			copy(axis.Bounds[:], r.Bounds[:2])
+			// repair legacy bounds
+			for _, bound := range r.LegacyBounds {
+				axis.Bounds = append(axis.Bounds, strconv.FormatInt(bound, 10))
+			}
+
+			if len(r.Bounds) > 0 {
+				axis.Bounds = r.Bounds
+			}
 			axes[a] = axis
 		}

--- a/bolt/internal/internal.pb.go
+++ b/bolt/internal/internal.pb.go
@ -117,7 +117,8 @@ func (m *DashboardCell) GetAxes() map[string]*Axis {
 }

 type Axis struct {
-	Bounds []int64 `protobuf:"varint,1,rep,name=bounds" json:"bounds,omitempty"`
+	LegacyBounds []int64  `protobuf:"varint,1,rep,name=legacyBounds" json:"legacyBounds,omitempty"`
+	Bounds       []string `protobuf:"bytes,2,rep,name=bounds" json:"bounds,omitempty"`
 }

 func (m *Axis) Reset()                    { *m = Axis{} }
@ -312,64 +313,65 @@ func init() {
 func init() { proto.RegisterFile("internal.proto", fileDescriptorInternal) }

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

 message Axis {
-	repeated int64 bounds = 1; // bounds are an ordered 2-tuple consisting of lower and upper axis extents, respectively
+	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.
 }

 message Template {
--- a/bolt/internal/internal_test.go
+++ b/bolt/internal/internal_test.go
@ -128,7 +128,7 @@ func Test_MarshalDashboard(t *testing.T) {
 				},
 				Axes: map[string]chronograf.Axis{
 					"y": chronograf.Axis{
-						Bounds: [2]int64{0, 100},
+						Bounds: []string{"0", "3", "1-7", "foo"},
 					},
 				},
 				Type: "line",
@ -147,3 +147,76 @@ func Test_MarshalDashboard(t *testing.T) {
 		t.Fatalf("Dashboard protobuf copy error: diff follows:\n%s", cmp.Diff(dashboard, actual))
 	}
 }
+
+func Test_MarshalDashboard_WithLegacyBounds(t *testing.T) {
+	dashboard := chronograf.Dashboard{
+		ID: 1,
+		Cells: []chronograf.DashboardCell{
+			{
+				ID:   "9b5367de-c552-4322-a9e8-7f384cbd235c",
+				X:    0,
+				Y:    0,
+				W:    4,
+				H:    4,
+				Name: "Super awesome query",
+				Queries: []chronograf.DashboardQuery{
+					{
+						Command: "select * from cpu",
+						Label:   "CPU Utilization",
+						Range: &chronograf.Range{
+							Upper: int64(100),
+						},
+					},
+				},
+				Axes: map[string]chronograf.Axis{
+					"y": chronograf.Axis{
+						LegacyBounds: [2]int64{0, 5},
+					},
+				},
+				Type: "line",
+			},
+		},
+		Templates: []chronograf.Template{},
+		Name:      "Dashboard",
+	}
+
+	expected := chronograf.Dashboard{
+		ID: 1,
+		Cells: []chronograf.DashboardCell{
+			{
+				ID:   "9b5367de-c552-4322-a9e8-7f384cbd235c",
+				X:    0,
+				Y:    0,
+				W:    4,
+				H:    4,
+				Name: "Super awesome query",
+				Queries: []chronograf.DashboardQuery{
+					{
+						Command: "select * from cpu",
+						Label:   "CPU Utilization",
+						Range: &chronograf.Range{
+							Upper: int64(100),
+						},
+					},
+				},
+				Axes: map[string]chronograf.Axis{
+					"y": chronograf.Axis{
+						Bounds: []string{"0", "5"},
+					},
+				},
+				Type: "line",
+			},
+		},
+		Templates: []chronograf.Template{},
+		Name:      "Dashboard",
+	}
+
+	var actual chronograf.Dashboard
+	if buf, err := internal.MarshalDashboard(dashboard); err != nil {
+		t.Fatal("Error marshaling dashboard: err", err)
+	} else if err := internal.UnmarshalDashboard(buf, &actual); err != nil {
+		t.Fatal("Error unmarshaling dashboard: err:", err)
+	} else if !cmp.Equal(expected, actual) {
+		t.Fatalf("Dashboard protobuf copy error: diff follows:\n%s", cmp.Diff(expected, actual))
+	}
+}
--- a/chronograf.go
+++ b/chronograf.go
@ -568,7 +568,8 @@ type Dashboard struct {

 // Axis represents the visible extents of a visualization
 type Axis struct {
-	Bounds [2]int64 `json:"bounds"` // bounds are an ordered 2-tuple consisting of lower and upper axis extents, respectively
+	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
 }

 // DashboardCell holds visual and query information for a cell
--- a/server/cells_test.go
+++ b/server/cells_test.go
@ -20,13 +20,13 @@ func Test_Cells_CorrectAxis(t *testing.T) {
 			&chronograf.DashboardCell{
 				Axes: map[string]chronograf.Axis{
 					"x": chronograf.Axis{
-						Bounds: [2]int64{0, 100},
+						Bounds: []string{"0", "100"},
 					},
 					"y": chronograf.Axis{
-						Bounds: [2]int64{0, 100},
+						Bounds: []string{"0", "100"},
 					},
 					"y2": chronograf.Axis{
-						Bounds: [2]int64{0, 100},
+						Bounds: []string{"0", "100"},
 					},
 				},
 			},
@ -37,10 +37,10 @@ func Test_Cells_CorrectAxis(t *testing.T) {
 			&chronograf.DashboardCell{
 				Axes: map[string]chronograf.Axis{
 					"axis of evil": chronograf.Axis{
-						Bounds: [2]int64{666, 666},
+						Bounds: []string{"666", "666"},
 					},
 					"axis of awesome": chronograf.Axis{
-						Bounds: [2]int64{1337, 31337},
+						Bounds: []string{"1337", "31337"},
 					},
 				},
 			},
--- a/server/dashboards_test.go
+++ b/server/dashboards_test.go
@ -222,10 +222,10 @@ func Test_newDashboardResponse(t *testing.T) {
 						},
 						Axes: map[string]chronograf.Axis{
 							"x": chronograf.Axis{
-								Bounds: [2]int64{0, 100},
+								Bounds: []string{"0", "100"},
 							},
 							"y": chronograf.Axis{
-								Bounds: [2]int64{2, 95},
+								Bounds: []string{"2", "95"},
 							},
 						},
 					},
@ -268,10 +268,10 @@ func Test_newDashboardResponse(t *testing.T) {
 							},
 							Axes: map[string]chronograf.Axis{
 								"x": chronograf.Axis{
-									Bounds: [2]int64{0, 100},
+									Bounds: []string{"0", "100"},
 								},
 								"y": chronograf.Axis{
-									Bounds: [2]int64{2, 95},
+									Bounds: []string{"2", "95"},
 								},
 							},
 						},