diff --git a/chronograf.go b/chronograf.go
index 5325eae93..88336ed01 100644
--- a/chronograf.go
+++ b/chronograf.go
@@ -219,12 +219,13 @@ type DashboardQuery struct {
 
 // TemplateQuery is used to retrieve choices for template replacement
 type TemplateQuery struct {
-	Command     string `json:"influxql"`     // Command is the query itself
-	DB          string `json:"db,omitempty"` // DB is optional and if empty will not be used.
-	RP          string `json:"rp,omitempty"` // RP is a retention policy and optional; if empty will not be used.
-	Measurement string `json:"measurement"`  // Measurement is the optionally selected measurement for the query
-	TagKey      string `json:"tagKey"`       // TagKey is the optionally selected tag key for the query
-	FieldKey    string `json:"fieldKey"`     // FieldKey is the optionally selected field key for the query
+	Command     string `json:"influxql"`       // Command is the query itself
+	Flux        string `json:"flux,omitempty"` // flux is the flux query, if available
+	DB          string `json:"db,omitempty"`   // DB is optional and if empty will not be used.
+	RP          string `json:"rp,omitempty"`   // RP is a retention policy and optional; if empty will not be used.
+	Measurement string `json:"measurement"`    // Measurement is the optionally selected measurement for the query
+	TagKey      string `json:"tagKey"`         // TagKey is the optionally selected tag key for the query
+	FieldKey    string `json:"fieldKey"`       // FieldKey is the optionally selected field key for the query
 }
 
 // Response is the result of a query against a TimeSeries
diff --git a/kv/internal/internal.go b/kv/internal/internal.go
index e4e94b75a..6368a289a 100644
--- a/kv/internal/internal.go
+++ b/kv/internal/internal.go
@@ -364,6 +364,7 @@ func MarshalDashboard(d chronograf.Dashboard) ([]byte, error) {
 		if t.Query != nil {
 			template.Query = &TemplateQuery{
 				Command:     t.Query.Command,
+				Flux:        t.Query.Flux,
 				Db:          t.Query.DB,
 				Rp:          t.Query.RP,
 				Measurement: t.Query.Measurement,
@@ -558,6 +559,7 @@ func UnmarshalDashboard(data []byte, d *chronograf.Dashboard) error {
 		if t.Query != nil {
 			template.Query = &chronograf.TemplateQuery{
 				Command:     t.Query.Command,
+				Flux:        t.Query.Flux,
 				DB:          t.Query.Db,
 				RP:          t.Query.Rp,
 				Measurement: t.Query.Measurement,
diff --git a/kv/internal/internal.pb.go b/kv/internal/internal.pb.go
index cfce951e7..ceac3937f 100644
--- a/kv/internal/internal.pb.go
+++ b/kv/internal/internal.pb.go
@@ -925,6 +925,7 @@ type TemplateQuery struct {
 	Measurement          string   `protobuf:"bytes,4,opt,name=measurement,proto3" json:"measurement,omitempty"`
 	TagKey               string   `protobuf:"bytes,5,opt,name=tag_key,json=tagKey,proto3" json:"tag_key,omitempty"`
 	FieldKey             string   `protobuf:"bytes,6,opt,name=field_key,json=fieldKey,proto3" json:"field_key,omitempty"`
+	Flux                 string   `protobuf:"bytes,7,opt,name=flux,proto3" json:"flux,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -996,6 +997,13 @@ func (m *TemplateQuery) GetFieldKey() string {
 	return ""
 }
 
+func (m *TemplateQuery) GetFlux() string {
+	if m != nil {
+		return m.Flux
+	}
+	return ""
+}
+
 type Server struct {
 	ID                   int64    `protobuf:"varint,1,opt,name=ID,proto3" json:"ID,omitempty"`
 	Name                 string   `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
@@ -2174,121 +2182,122 @@ func init() {
 func init() { proto.RegisterFile("internal.proto", fileDescriptor_41f4a519b878ee3b) }
 
 var fileDescriptor_41f4a519b878ee3b = []byte{
-	// 1854 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xdd, 0x6e, 0xdb, 0xc8,
-	0x15, 0x06, 0x25, 0x51, 0x16, 0x8f, 0x6c, 0xc7, 0x9d, 0x06, 0xbb, 0xdc, 0x6d, 0x51, 0xa8, 0x44,
-	0xbb, 0x75, 0x7f, 0x36, 0x5d, 0x38, 0xe8, 0x0f, 0x16, 0xbb, 0x0b, 0xf8, 0x27, 0x49, 0x9d, 0x38,
-	0x89, 0x33, 0x76, 0xdc, 0xab, 0x62, 0x31, 0x22, 0x47, 0xd2, 0x60, 0x29, 0x92, 0x1d, 0x92, 0xb6,
-	0xd9, 0x57, 0xe8, 0x5d, 0x1f, 0x20, 0x40, 0x81, 0xf6, 0xbe, 0x28, 0x7a, 0xd9, 0x27, 0xe8, 0x2b,
-	0xf4, 0x65, 0x8a, 0x33, 0x3f, 0xd4, 0x50, 0x56, 0x82, 0x14, 0x28, 0x7a, 0xa5, 0xf9, 0xce, 0x39,
-	0x3c, 0x73, 0xe6, 0xfc, 0xcd, 0x19, 0xc1, 0xae, 0xc8, 0x2a, 0x2e, 0x33, 0x96, 0x3e, 0x28, 0x64,
-	0x5e, 0xe5, 0x64, 0x64, 0x71, 0xf4, 0xa6, 0x0f, 0xc3, 0x8b, 0xbc, 0x96, 0x31, 0x27, 0xbb, 0xd0,
-	0x3b, 0x3d, 0x09, 0xbd, 0x89, 0xb7, 0xdf, 0xa7, 0xbd, 0xd3, 0x13, 0x42, 0x60, 0xf0, 0x82, 0x2d,
-	0x79, 0xd8, 0x9b, 0x78, 0xfb, 0x01, 0x55, 0x6b, 0xa4, 0x5d, 0x36, 0x05, 0x0f, 0xfb, 0x9a, 0x86,
-	0x6b, 0xf2, 0x31, 0x8c, 0x5e, 0x97, 0xa8, 0x6d, 0xc9, 0xc3, 0x81, 0xa2, 0xb7, 0x18, 0x79, 0xe7,
-	0xac, 0x2c, 0x6f, 0x72, 0x99, 0x84, 0xbe, 0xe6, 0x59, 0x4c, 0xf6, 0xa0, 0xff, 0x9a, 0x9e, 0x85,
-	0x43, 0x45, 0xc6, 0x25, 0x09, 0x61, 0xeb, 0x84, 0xcf, 0x58, 0x9d, 0x56, 0xe1, 0xd6, 0xc4, 0xdb,
-	0x1f, 0x51, 0x0b, 0x51, 0xcf, 0x25, 0x4f, 0xf9, 0x5c, 0xb2, 0x59, 0x38, 0xd2, 0x7a, 0x2c, 0x26,
-	0x0f, 0x80, 0x9c, 0x66, 0x25, 0x8f, 0x6b, 0xc9, 0x2f, 0xbe, 0x11, 0xc5, 0x15, 0x97, 0x62, 0xd6,
-	0x84, 0x81, 0x52, 0xb0, 0x81, 0x83, 0xbb, 0x3c, 0xe7, 0x15, 0xc3, 0xbd, 0x41, 0xa9, 0xb2, 0x90,
-	0x44, 0xb0, 0x7d, 0xb1, 0x60, 0x92, 0x27, 0x17, 0x3c, 0x96, 0xbc, 0x0a, 0xc7, 0x8a, 0xdd, 0xa1,
-	0xa1, 0xcc, 0x4b, 0x39, 0x67, 0x99, 0xf8, 0x03, 0xab, 0x44, 0x9e, 0x85, 0xdb, 0x5a, 0xc6, 0xa5,
-	0xa1, 0x97, 0x68, 0x9e, 0xf2, 0x70, 0x47, 0x7b, 0x09, 0xd7, 0xe4, 0xbb, 0x10, 0x98, 0xc3, 0xd0,
-	0xf3, 0x70, 0x57, 0x31, 0x56, 0x04, 0xb4, 0xe9, 0x8a, 0xcb, 0x12, 0x15, 0xde, 0xd3, 0x36, 0x19,
-	0x18, 0xfd, 0xc3, 0x83, 0xe0, 0x84, 0x95, 0x8b, 0x69, 0xce, 0x64, 0xf2, 0x5e, 0x31, 0xfa, 0x14,
-	0xfc, 0x98, 0xa7, 0x69, 0x19, 0xf6, 0x27, 0xfd, 0xfd, 0xf1, 0xc1, 0x87, 0x0f, 0xda, 0xe0, 0xb7,
-	0x7a, 0x8e, 0x79, 0x9a, 0x52, 0x2d, 0x45, 0x3e, 0x83, 0xa0, 0xe2, 0xcb, 0x22, 0x65, 0x15, 0x2f,
-	0xc3, 0x81, 0xfa, 0x84, 0xac, 0x3e, 0xb9, 0x34, 0x2c, 0xba, 0x12, 0xba, 0xe3, 0x02, 0xff, 0xae,
-	0x0b, 0xa2, 0x3f, 0xf9, 0xb0, 0xd3, 0xd9, 0x8e, 0x6c, 0x83, 0x77, 0xab, 0x2c, 0xf7, 0xa9, 0x77,
-	0x8b, 0xa8, 0x51, 0x56, 0xfb, 0xd4, 0x6b, 0x10, 0xdd, 0xa8, 0x9c, 0xf2, 0xa9, 0x77, 0x83, 0x68,
-	0xa1, 0x32, 0xc9, 0xa7, 0xde, 0x82, 0xfc, 0x18, 0xb6, 0x7e, 0x5f, 0x73, 0x29, 0x78, 0x19, 0xfa,
-	0xca, 0xba, 0x7b, 0x2b, 0xeb, 0x5e, 0xd5, 0x5c, 0x36, 0xd4, 0xf2, 0xd1, 0x1b, 0x2a, 0x0b, 0x75,
-	0x4a, 0xa9, 0x35, 0xd2, 0x2a, 0xcc, 0xd8, 0x2d, 0x4d, 0xc3, 0xb5, 0xf1, 0xa2, 0xce, 0x23, 0xf4,
-	0xe2, 0x2f, 0x60, 0xc0, 0x6e, 0x79, 0x19, 0x06, 0x4a, 0xff, 0xf7, 0xdf, 0xe2, 0xb0, 0x07, 0x87,
-	0xb7, 0xbc, 0x7c, 0x94, 0x55, 0xb2, 0xa1, 0x4a, 0x9c, 0xfc, 0x08, 0x86, 0x71, 0x9e, 0xe6, 0xb2,
-	0x0c, 0x61, 0xdd, 0xb0, 0x63, 0xa4, 0x53, 0xc3, 0x26, 0xfb, 0x30, 0x4c, 0xf9, 0x9c, 0x67, 0x89,
-	0xca, 0xa8, 0xf1, 0xc1, 0xde, 0x4a, 0xf0, 0x4c, 0xd1, 0xa9, 0xe1, 0x93, 0xcf, 0x61, 0xbb, 0x62,
-	0xd3, 0x94, 0xbf, 0x2c, 0xd0, 0x8b, 0xa5, 0xca, 0xae, 0xf1, 0xc1, 0x07, 0x4e, 0x3c, 0x1c, 0x2e,
-	0xed, 0xc8, 0x92, 0x2f, 0x60, 0x7b, 0x26, 0x78, 0x9a, 0xd8, 0x6f, 0x77, 0x94, 0x51, 0xe1, 0xea,
-	0x5b, 0xca, 0x33, 0xb6, 0xc4, 0x2f, 0x1e, 0xa3, 0x18, 0xed, 0x48, 0x93, 0xef, 0x01, 0x54, 0x62,
-	0xc9, 0x1f, 0xe7, 0x72, 0xc9, 0x2a, 0x93, 0xa0, 0x0e, 0x85, 0x7c, 0x09, 0x3b, 0x09, 0x8f, 0xc5,
-	0x92, 0xa5, 0xe7, 0x29, 0x8b, 0x79, 0xa9, 0xf2, 0xb4, 0x9b, 0x5d, 0x2e, 0x9b, 0x76, 0xa5, 0x55,
-	0x68, 0xf2, 0x8a, 0x87, 0x7b, 0x26, 0x34, 0x79, 0xc5, 0xc9, 0x27, 0xb0, 0x8b, 0xbf, 0x57, 0xa2,
-	0x14, 0x53, 0x91, 0x8a, 0xaa, 0x09, 0xbf, 0xa5, 0xb8, 0x6b, 0xd4, 0x8f, 0x9f, 0x40, 0xd0, 0xba,
-	0x1e, 0xbb, 0xc6, 0x37, 0xbc, 0x51, 0x89, 0x14, 0x50, 0x5c, 0x92, 0x1f, 0x80, 0x7f, 0xcd, 0xd2,
-	0x5a, 0x17, 0xc1, 0xf8, 0x60, 0x77, 0x65, 0xd1, 0xe1, 0xad, 0x28, 0xa9, 0x66, 0x7e, 0xde, 0xfb,
-	0xb5, 0x17, 0x3d, 0x81, 0x9d, 0x8e, 0x91, 0x78, 0x68, 0x51, 0x3e, 0xca, 0x66, 0xb9, 0x8c, 0x79,
-	0xa2, 0x74, 0x8e, 0xa8, 0x43, 0x21, 0x1f, 0xc0, 0x30, 0x11, 0x73, 0x51, 0x95, 0x26, 0x55, 0x0d,
-	0x8a, 0xfe, 0xe9, 0xc1, 0xb6, 0x1b, 0x09, 0xf2, 0x13, 0xd8, 0xbb, 0xe6, 0xb2, 0x12, 0x31, 0x4b,
-	0x2f, 0xc5, 0x92, 0xe3, 0xc6, 0xea, 0x93, 0x11, 0xbd, 0x43, 0x27, 0x9f, 0xc1, 0xb0, 0xcc, 0x65,
-	0x75, 0xd4, 0xa8, 0x8c, 0x7f, 0x57, 0x84, 0x8c, 0x1c, 0x76, 0xbf, 0x1b, 0xc9, 0x8a, 0x42, 0x64,
-	0x73, 0xdb, 0x61, 0x2d, 0x46, 0x27, 0xce, 0xc4, 0xed, 0x63, 0x21, 0xcb, 0xea, 0x38, 0x4f, 0xeb,
-	0x65, 0xa6, 0xb2, 0x7f, 0x44, 0xd7, 0xa8, 0x4f, 0x07, 0x23, 0x6f, 0xaf, 0xf7, 0x74, 0x30, 0xf2,
-	0xf7, 0x86, 0x51, 0x01, 0xbb, 0xdd, 0x9d, 0xb0, 0xa4, 0xad, 0x11, 0xaa, 0x9f, 0x68, 0xf7, 0x76,
-	0x68, 0x64, 0x02, 0xe3, 0x44, 0x94, 0x45, 0xca, 0x1a, 0xa7, 0xe5, 0xb8, 0x24, 0xec, 0x62, 0xd7,
-	0x18, 0xb6, 0x54, 0x5f, 0x10, 0x23, 0x6a, 0x61, 0x34, 0x07, 0x5f, 0x95, 0x84, 0xd3, 0xc0, 0x02,
-	0xdb, 0xc0, 0xd4, 0x85, 0xd2, 0x73, 0x2e, 0x94, 0x3d, 0xe8, 0xff, 0x86, 0xdf, 0x9a, 0x3b, 0x06,
-	0x97, 0x6d, 0x9b, 0x1b, 0x38, 0x6d, 0xee, 0x3e, 0xf8, 0x57, 0x2a, 0xec, 0xba, 0xfd, 0x68, 0x10,
-	0x7d, 0x05, 0x43, 0x5d, 0x52, 0xad, 0x66, 0xcf, 0xd1, 0x3c, 0x81, 0xf1, 0x4b, 0x29, 0x78, 0x56,
-	0xe9, 0xc6, 0x65, 0x8e, 0xe0, 0x90, 0xa2, 0xbf, 0x7b, 0x30, 0x50, 0x51, 0x8a, 0x60, 0x3b, 0xe5,
-	0x73, 0x16, 0x37, 0x47, 0x79, 0x9d, 0x25, 0x65, 0xe8, 0x4d, 0xfa, 0xfb, 0x7d, 0xda, 0xa1, 0x61,
-	0x7a, 0x4c, 0x35, 0xb7, 0x37, 0xe9, 0xef, 0x07, 0xd4, 0x20, 0x34, 0x2d, 0x65, 0x53, 0x9e, 0x9a,
-	0x23, 0x68, 0x80, 0xd2, 0x85, 0xe4, 0x33, 0x71, 0x6b, 0x8e, 0x61, 0x10, 0xd2, 0xcb, 0x7a, 0x86,
-	0x74, 0x7d, 0x12, 0x83, 0xf0, 0x00, 0x53, 0x56, 0xb6, 0xdd, 0x0c, 0xd7, 0xa8, 0xb9, 0x8c, 0x59,
-	0x6a, 0xdb, 0x99, 0x06, 0xd1, 0xbf, 0x3d, 0xbc, 0x1e, 0x75, 0x7b, 0xbe, 0xe3, 0xe1, 0x8f, 0x60,
-	0x84, 0xad, 0xfb, 0xeb, 0x6b, 0x26, 0xcd, 0x81, 0xb7, 0x10, 0x5f, 0x31, 0x49, 0x7e, 0x0e, 0x43,
-	0x55, 0x1c, 0x1b, 0xae, 0x0a, 0xab, 0x4e, 0x79, 0x95, 0x1a, 0xb1, 0xb6, 0x99, 0x0e, 0x9c, 0x66,
-	0xda, 0x1e, 0xd6, 0x77, 0x0f, 0xfb, 0x29, 0xf8, 0xd8, 0x95, 0x1b, 0x65, 0xfd, 0x46, 0xcd, 0xba,
-	0x77, 0x6b, 0x29, 0xcc, 0xf0, 0x52, 0x4d, 0x21, 0xa7, 0x27, 0xe6, 0x68, 0x2d, 0x8e, 0xe6, 0xb0,
-	0xd3, 0xb1, 0xa6, 0xb5, 0xc2, 0xeb, 0x5a, 0xb1, 0x6a, 0x02, 0x81, 0x29, 0x7a, 0xa5, 0x96, 0xa7,
-	0x3c, 0xae, 0x78, 0x62, 0x32, 0xb2, 0xc5, 0xb6, 0x91, 0x0c, 0xda, 0x46, 0x12, 0xfd, 0xd9, 0x5b,
-	0xed, 0xa4, 0xac, 0xc3, 0x84, 0x8e, 0xf3, 0xe5, 0x92, 0x65, 0x89, 0xd9, 0xcc, 0x42, 0xf4, 0x72,
-	0x32, 0x35, 0x9b, 0xf5, 0x92, 0x29, 0x62, 0x59, 0x98, 0x78, 0xf7, 0x64, 0x81, 0x99, 0xb6, 0xe4,
-	0xac, 0xac, 0x25, 0x5f, 0xf2, 0xac, 0x32, 0xbb, 0xb8, 0x24, 0xf2, 0x21, 0x6c, 0x55, 0x6c, 0xfe,
-	0x35, 0xda, 0x60, 0xe2, 0x5e, 0xb1, 0xf9, 0x33, 0xde, 0x90, 0xef, 0x40, 0xa0, 0x3a, 0xb3, 0x62,
-	0xe9, 0xe0, 0x8f, 0x14, 0xe1, 0x19, 0x6f, 0xa2, 0xbf, 0xf5, 0x60, 0x78, 0xc1, 0xe5, 0x35, 0x97,
-	0xef, 0x35, 0x0b, 0xb8, 0xb3, 0x59, 0xff, 0x1d, 0xb3, 0xd9, 0x60, 0xf3, 0x6c, 0xe6, 0xaf, 0x66,
-	0xb3, 0xfb, 0xe0, 0x5f, 0xc8, 0xf8, 0xf4, 0x44, 0x59, 0xd4, 0xa7, 0x1a, 0x60, 0xee, 0x1e, 0xc6,
-	0x95, 0xb8, 0xe6, 0x66, 0x60, 0x33, 0xe8, 0xce, 0x88, 0x30, 0xda, 0x30, 0x25, 0xfd, 0xb7, 0x73,
-	0x9b, 0x2d, 0x68, 0x70, 0x0a, 0x3a, 0x82, 0x6d, 0x1c, 0xde, 0x12, 0x56, 0xb1, 0xa7, 0x17, 0x2f,
-	0x5f, 0xd8, 0x89, 0xcd, 0xa5, 0x45, 0x6f, 0x3c, 0x18, 0x9e, 0xb1, 0x26, 0xaf, 0xab, 0x3b, 0xb5,
-	0x31, 0x81, 0xf1, 0x61, 0x51, 0xa4, 0x22, 0xee, 0xf4, 0x03, 0x87, 0x84, 0x12, 0xcf, 0x9d, 0x38,
-	0x6a, 0x1f, 0xba, 0x24, 0xbc, 0x7e, 0x8e, 0xd5, 0xb8, 0xa5, 0x67, 0x27, 0xe7, 0xfa, 0xd1, 0x53,
-	0x96, 0x62, 0xa2, 0xb3, 0x0f, 0xeb, 0x2a, 0x9f, 0xa5, 0xf9, 0x8d, 0xf2, 0xea, 0x88, 0xb6, 0x38,
-	0xfa, 0x57, 0x0f, 0x06, 0xff, 0xaf, 0x11, 0x69, 0x1b, 0x3c, 0x61, 0x92, 0xca, 0x13, 0xed, 0xc0,
-	0xb4, 0xe5, 0x0c, 0x4c, 0x21, 0x6c, 0x35, 0x92, 0x65, 0x73, 0x5e, 0x86, 0x23, 0xd5, 0xf3, 0x2c,
-	0x54, 0x1c, 0x55, 0xdd, 0x7a, 0x52, 0x0a, 0xa8, 0x85, 0x6d, 0x45, 0x82, 0x53, 0x91, 0x3f, 0x33,
-	0x43, 0xd5, 0x78, 0x7d, 0x0c, 0xd9, 0x34, 0x4b, 0xfd, 0xef, 0xee, 0xf8, 0x3f, 0xf6, 0xc0, 0x6f,
-	0x8b, 0xf7, 0xb8, 0x5b, 0xbc, 0xc7, 0xab, 0xe2, 0x3d, 0x39, 0xb2, 0xc5, 0x7b, 0x72, 0x84, 0x98,
-	0x9e, 0xdb, 0xe2, 0xa5, 0xe7, 0x18, 0xac, 0x27, 0x32, 0xaf, 0x8b, 0xa3, 0x46, 0x47, 0x35, 0xa0,
-	0x2d, 0xc6, 0x8c, 0xff, 0xed, 0x82, 0x4b, 0xe3, 0xea, 0x80, 0x1a, 0x84, 0xf5, 0x71, 0xa6, 0xda,
-	0xa0, 0x76, 0xae, 0x06, 0xe4, 0x87, 0xe0, 0x53, 0x74, 0x9e, 0xf2, 0x70, 0x27, 0x2e, 0x8a, 0x4c,
-	0x35, 0x17, 0x95, 0xea, 0x47, 0x98, 0x29, 0x14, 0xfb, 0x24, 0xfb, 0x29, 0x0c, 0x2f, 0x16, 0x62,
-	0x56, 0xd9, 0xd1, 0xf4, 0xdb, 0x4e, 0x1b, 0x15, 0x4b, 0xae, 0x78, 0xd4, 0x88, 0x6c, 0xaa, 0x8f,
-	0xe8, 0x15, 0x04, 0xad, 0xe0, 0xca, 0x44, 0xcf, 0x35, 0x91, 0xc0, 0xe0, 0x75, 0x26, 0x2a, 0xdb,
-	0x36, 0x70, 0x8d, 0x0e, 0x78, 0x55, 0xb3, 0xac, 0xc2, 0x99, 0xcc, 0xb4, 0x0d, 0x8b, 0xa3, 0x87,
-	0xe6, 0x48, 0xa8, 0xee, 0x75, 0x51, 0x70, 0x69, 0x5a, 0x90, 0x06, 0x6a, 0x93, 0xfc, 0x86, 0xeb,
-	0xbb, 0xa6, 0x4f, 0x35, 0x88, 0x7e, 0x07, 0xc1, 0x61, 0xca, 0x65, 0x45, 0xeb, 0x94, 0x6f, 0x9a,
-	0x01, 0x54, 0xf1, 0x1a, 0x0b, 0x70, 0xbd, 0x6a, 0x37, 0xfd, 0xb5, 0x76, 0xf3, 0x8c, 0x15, 0xec,
-	0xf4, 0x44, 0xe5, 0x7e, 0x9f, 0x1a, 0x14, 0xfd, 0xc5, 0x83, 0x01, 0xf6, 0x35, 0x47, 0xf5, 0xe0,
-	0x5d, 0x3d, 0xf1, 0x5c, 0xe6, 0xd7, 0x22, 0xe1, 0xd2, 0x1e, 0xce, 0x62, 0x15, 0x88, 0x78, 0xc1,
-	0xdb, 0x51, 0xc3, 0x20, 0xcc, 0x3f, 0x7c, 0xc5, 0xd9, 0xfa, 0x72, 0xf2, 0x0f, 0xc9, 0x54, 0x33,
-	0x71, 0x9c, 0xbc, 0xa8, 0x0b, 0x2e, 0x0f, 0x93, 0xa5, 0xb0, 0x73, 0x98, 0x43, 0x89, 0xbe, 0xd2,
-	0xef, 0xc2, 0x3b, 0xdd, 0xd1, 0xdb, 0xfc, 0x86, 0x5c, 0xb7, 0x3c, 0xfa, 0xab, 0x07, 0x5b, 0xcf,
-	0xcd, 0xdc, 0xe7, 0x9e, 0xc2, 0x7b, 0xeb, 0x29, 0x7a, 0x9d, 0x53, 0x1c, 0xc0, 0x7d, 0x2b, 0xd3,
-	0xd9, 0x5f, 0x7b, 0x61, 0x23, 0xcf, 0x78, 0x74, 0xd0, 0x06, 0xeb, 0x7d, 0x1e, 0x7f, 0x97, 0x5d,
-	0x99, 0x4d, 0x01, 0xbf, 0x13, 0x95, 0x09, 0x8c, 0xed, 0x73, 0x38, 0x4f, 0xed, 0x65, 0xe5, 0x92,
-	0xa2, 0x03, 0x18, 0x1e, 0xe7, 0xd9, 0x4c, 0xcc, 0xc9, 0x3e, 0x0c, 0x0e, 0xeb, 0x6a, 0xa1, 0x34,
-	0x8e, 0x0f, 0xee, 0x3b, 0xcd, 0xa0, 0xae, 0x16, 0x5a, 0x86, 0x2a, 0x89, 0xe8, 0x0b, 0x80, 0x15,
-	0x0d, 0x6f, 0x9c, 0x55, 0x34, 0x5e, 0xf0, 0x1b, 0x4c, 0x99, 0xd2, 0x8c, 0xfd, 0x1b, 0x38, 0x51,
-	0x0d, 0xc4, 0x3d, 0x87, 0xd1, 0xf2, 0x09, 0xec, 0xba, 0xd4, 0xf6, 0x64, 0x6b, 0x54, 0xf2, 0x2b,
-	0x08, 0xce, 0xf2, 0xf9, 0x95, 0xe0, 0xb6, 0x1a, 0xc6, 0x07, 0x1f, 0x39, 0x0f, 0x3f, 0xcb, 0x32,
-	0xf6, 0xae, 0x64, 0xa3, 0xc7, 0x70, 0x6f, 0x8d, 0x4b, 0x1e, 0x62, 0x2f, 0xc3, 0x39, 0x5e, 0x0f,
-	0xa2, 0x6f, 0xd3, 0x84, 0x12, 0xd4, 0x4a, 0x46, 0x4d, 0x47, 0x0f, 0xd2, 0x5a, 0xcf, 0x7b, 0x6b,
-	0xf5, 0x90, 0x97, 0xa2, 0xbd, 0x01, 0x7d, 0xda, 0x62, 0xf2, 0x4b, 0x08, 0x1e, 0x65, 0x71, 0x9e,
-	0x88, 0x6c, 0x6e, 0x87, 0xc4, 0xb0, 0xf3, 0xca, 0xad, 0x97, 0x99, 0x15, 0xa0, 0x2b, 0xd1, 0xe8,
-	0x05, 0xec, 0x76, 0x99, 0x1b, 0xc7, 0xf1, 0x76, 0x84, 0xef, 0x39, 0x23, 0x7c, 0x6b, 0x63, 0xdf,
-	0xc9, 0xfc, 0x2f, 0x21, 0x38, 0xaa, 0x45, 0x9a, 0x9c, 0x66, 0xb3, 0xdc, 0xfd, 0xb3, 0xc4, 0xeb,
-	0xfc, 0x59, 0x82, 0x89, 0x8f, 0x3d, 0xbe, 0xed, 0x66, 0x06, 0x4d, 0x87, 0xea, 0x6f, 0xaf, 0x87,
-	0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0xb0, 0x9c, 0x22, 0x45, 0x08, 0x13, 0x00, 0x00,
+	// 1861 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x5b, 0x8f, 0xe3, 0x48,
+	0x15, 0x96, 0x13, 0x3b, 0x1d, 0x9f, 0x74, 0xf7, 0x34, 0xc5, 0x68, 0xd7, 0xbb, 0x20, 0x14, 0x2c,
+	0x58, 0x9a, 0xcb, 0x0e, 0xab, 0x1e, 0x71, 0xd1, 0x6a, 0x77, 0xa5, 0xbe, 0xcc, 0x0c, 0x3d, 0x3b,
+	0x97, 0x9e, 0xea, 0x9e, 0xe6, 0x09, 0xad, 0x2a, 0x76, 0x25, 0x29, 0xad, 0x63, 0x9b, 0xb2, 0xdd,
+	0x9d, 0xf0, 0x17, 0x78, 0xe3, 0x07, 0xec, 0x13, 0xbc, 0x23, 0x04, 0x6f, 0xfc, 0x02, 0xfe, 0x02,
+	0x7f, 0x06, 0x9d, 0xba, 0x38, 0xe5, 0x74, 0x66, 0x34, 0x48, 0x88, 0xa7, 0xd4, 0x77, 0xce, 0xf1,
+	0xa9, 0x53, 0xe7, 0x56, 0xa7, 0x02, 0xfb, 0x22, 0xaf, 0xb9, 0xcc, 0x59, 0xf6, 0xa0, 0x94, 0x45,
+	0x5d, 0x90, 0xa1, 0xc5, 0xf1, 0x37, 0x7d, 0x18, 0x5c, 0x16, 0x8d, 0x4c, 0x38, 0xd9, 0x87, 0xde,
+	0xf9, 0x59, 0xe4, 0x8d, 0xbd, 0xc3, 0x3e, 0xed, 0x9d, 0x9f, 0x11, 0x02, 0xfe, 0x0b, 0xb6, 0xe0,
+	0x51, 0x6f, 0xec, 0x1d, 0x86, 0x54, 0xad, 0x91, 0x76, 0xb5, 0x2a, 0x79, 0xd4, 0xd7, 0x34, 0x5c,
+	0x93, 0x0f, 0x61, 0xf8, 0xba, 0x42, 0x6d, 0x0b, 0x1e, 0xf9, 0x8a, 0xde, 0x62, 0xe4, 0x5d, 0xb0,
+	0xaa, 0xba, 0x2d, 0x64, 0x1a, 0x05, 0x9a, 0x67, 0x31, 0x39, 0x80, 0xfe, 0x6b, 0xfa, 0x2c, 0x1a,
+	0x28, 0x32, 0x2e, 0x49, 0x04, 0x3b, 0x67, 0x7c, 0xca, 0x9a, 0xac, 0x8e, 0x76, 0xc6, 0xde, 0xe1,
+	0x90, 0x5a, 0x88, 0x7a, 0xae, 0x78, 0xc6, 0x67, 0x92, 0x4d, 0xa3, 0xa1, 0xd6, 0x63, 0x31, 0x79,
+	0x00, 0xe4, 0x3c, 0xaf, 0x78, 0xd2, 0x48, 0x7e, 0xf9, 0xb5, 0x28, 0xaf, 0xb9, 0x14, 0xd3, 0x55,
+	0x14, 0x2a, 0x05, 0x5b, 0x38, 0xb8, 0xcb, 0x73, 0x5e, 0x33, 0xdc, 0x1b, 0x94, 0x2a, 0x0b, 0x49,
+	0x0c, 0xbb, 0x97, 0x73, 0x26, 0x79, 0x7a, 0xc9, 0x13, 0xc9, 0xeb, 0x68, 0xa4, 0xd8, 0x1d, 0x1a,
+	0xca, 0xbc, 0x94, 0x33, 0x96, 0x8b, 0x3f, 0xb0, 0x5a, 0x14, 0x79, 0xb4, 0xab, 0x65, 0x5c, 0x1a,
+	0x7a, 0x89, 0x16, 0x19, 0x8f, 0xf6, 0xb4, 0x97, 0x70, 0x4d, 0xbe, 0x0b, 0xa1, 0x39, 0x0c, 0xbd,
+	0x88, 0xf6, 0x15, 0x63, 0x4d, 0x40, 0x9b, 0xae, 0xb9, 0xac, 0x50, 0xe1, 0x3d, 0x6d, 0x93, 0x81,
+	0xf1, 0xdf, 0x3d, 0x08, 0xcf, 0x58, 0x35, 0x9f, 0x14, 0x4c, 0xa6, 0xef, 0x14, 0xa3, 0x8f, 0x21,
+	0x48, 0x78, 0x96, 0x55, 0x51, 0x7f, 0xdc, 0x3f, 0x1c, 0x1d, 0xbd, 0xff, 0xa0, 0x0d, 0x7e, 0xab,
+	0xe7, 0x94, 0x67, 0x19, 0xd5, 0x52, 0xe4, 0x13, 0x08, 0x6b, 0xbe, 0x28, 0x33, 0x56, 0xf3, 0x2a,
+	0xf2, 0xd5, 0x27, 0x64, 0xfd, 0xc9, 0x95, 0x61, 0xd1, 0xb5, 0xd0, 0x1d, 0x17, 0x04, 0x77, 0x5d,
+	0x10, 0xff, 0x29, 0x80, 0xbd, 0xce, 0x76, 0x64, 0x17, 0xbc, 0xa5, 0xb2, 0x3c, 0xa0, 0xde, 0x12,
+	0xd1, 0x4a, 0x59, 0x1d, 0x50, 0x6f, 0x85, 0xe8, 0x56, 0xe5, 0x54, 0x40, 0xbd, 0x5b, 0x44, 0x73,
+	0x95, 0x49, 0x01, 0xf5, 0xe6, 0xe4, 0xc7, 0xb0, 0xf3, 0xfb, 0x86, 0x4b, 0xc1, 0xab, 0x28, 0x50,
+	0xd6, 0xdd, 0x5b, 0x5b, 0xf7, 0xaa, 0xe1, 0x72, 0x45, 0x2d, 0x1f, 0xbd, 0xa1, 0xb2, 0x50, 0xa7,
+	0x94, 0x5a, 0x23, 0xad, 0xc6, 0x8c, 0xdd, 0xd1, 0x34, 0x5c, 0x1b, 0x2f, 0xea, 0x3c, 0x42, 0x2f,
+	0xfe, 0x02, 0x7c, 0xb6, 0xe4, 0x55, 0x14, 0x2a, 0xfd, 0xdf, 0x7f, 0x83, 0xc3, 0x1e, 0x1c, 0x2f,
+	0x79, 0xf5, 0x28, 0xaf, 0xe5, 0x8a, 0x2a, 0x71, 0xf2, 0x23, 0x18, 0x24, 0x45, 0x56, 0xc8, 0x2a,
+	0x82, 0x4d, 0xc3, 0x4e, 0x91, 0x4e, 0x0d, 0x9b, 0x1c, 0xc2, 0x20, 0xe3, 0x33, 0x9e, 0xa7, 0x2a,
+	0xa3, 0x46, 0x47, 0x07, 0x6b, 0xc1, 0x67, 0x8a, 0x4e, 0x0d, 0x9f, 0x7c, 0x0a, 0xbb, 0x35, 0x9b,
+	0x64, 0xfc, 0x65, 0x89, 0x5e, 0xac, 0x54, 0x76, 0x8d, 0x8e, 0xde, 0x73, 0xe2, 0xe1, 0x70, 0x69,
+	0x47, 0x96, 0x7c, 0x06, 0xbb, 0x53, 0xc1, 0xb3, 0xd4, 0x7e, 0xbb, 0xa7, 0x8c, 0x8a, 0xd6, 0xdf,
+	0x52, 0x9e, 0xb3, 0x05, 0x7e, 0xf1, 0x18, 0xc5, 0x68, 0x47, 0x9a, 0x7c, 0x0f, 0xa0, 0x16, 0x0b,
+	0xfe, 0xb8, 0x90, 0x0b, 0x56, 0x9b, 0x04, 0x75, 0x28, 0xe4, 0x73, 0xd8, 0x4b, 0x79, 0x22, 0x16,
+	0x2c, 0xbb, 0xc8, 0x58, 0xc2, 0x2b, 0x95, 0xa7, 0xdd, 0xec, 0x72, 0xd9, 0xb4, 0x2b, 0xad, 0x42,
+	0x53, 0xd4, 0x3c, 0x3a, 0x30, 0xa1, 0x29, 0x6a, 0x4e, 0x3e, 0x82, 0x7d, 0xfc, 0xbd, 0x16, 0x95,
+	0x98, 0x88, 0x4c, 0xd4, 0xab, 0xe8, 0x5b, 0x8a, 0xbb, 0x41, 0xfd, 0xf0, 0x09, 0x84, 0xad, 0xeb,
+	0xb1, 0x6b, 0x7c, 0xcd, 0x57, 0x2a, 0x91, 0x42, 0x8a, 0x4b, 0xf2, 0x03, 0x08, 0x6e, 0x58, 0xd6,
+	0xe8, 0x22, 0x18, 0x1d, 0xed, 0xaf, 0x2d, 0x3a, 0x5e, 0x8a, 0x8a, 0x6a, 0xe6, 0xa7, 0xbd, 0x5f,
+	0x7b, 0xf1, 0x13, 0xd8, 0xeb, 0x18, 0x89, 0x87, 0x16, 0xd5, 0xa3, 0x7c, 0x5a, 0xc8, 0x84, 0xa7,
+	0x4a, 0xe7, 0x90, 0x3a, 0x14, 0xf2, 0x1e, 0x0c, 0x52, 0x31, 0x13, 0x75, 0x65, 0x52, 0xd5, 0xa0,
+	0xf8, 0x9f, 0x1e, 0xec, 0xba, 0x91, 0x20, 0x3f, 0x81, 0x83, 0x1b, 0x2e, 0x6b, 0x91, 0xb0, 0xec,
+	0x4a, 0x2c, 0x38, 0x6e, 0xac, 0x3e, 0x19, 0xd2, 0x3b, 0x74, 0xf2, 0x09, 0x0c, 0xaa, 0x42, 0xd6,
+	0x27, 0x2b, 0x95, 0xf1, 0x6f, 0x8b, 0x90, 0x91, 0xc3, 0xee, 0x77, 0x2b, 0x59, 0x59, 0x8a, 0x7c,
+	0x66, 0x3b, 0xac, 0xc5, 0xe8, 0xc4, 0xa9, 0x58, 0x3e, 0x16, 0xb2, 0xaa, 0x4f, 0x8b, 0xac, 0x59,
+	0xe4, 0x2a, 0xfb, 0x87, 0x74, 0x83, 0xfa, 0xd4, 0x1f, 0x7a, 0x07, 0xbd, 0xa7, 0xfe, 0x30, 0x38,
+	0x18, 0xc4, 0x25, 0xec, 0x77, 0x77, 0xc2, 0x92, 0xb6, 0x46, 0xa8, 0x7e, 0xa2, 0xdd, 0xdb, 0xa1,
+	0x91, 0x31, 0x8c, 0x52, 0x51, 0x95, 0x19, 0x5b, 0x39, 0x2d, 0xc7, 0x25, 0x61, 0x17, 0xbb, 0xc1,
+	0xb0, 0x65, 0xfa, 0x82, 0x18, 0x52, 0x0b, 0xe3, 0x19, 0x04, 0xaa, 0x24, 0x9c, 0x06, 0x16, 0xda,
+	0x06, 0xa6, 0x2e, 0x94, 0x9e, 0x73, 0xa1, 0x1c, 0x40, 0xff, 0x37, 0x7c, 0x69, 0xee, 0x18, 0x5c,
+	0xb6, 0x6d, 0xce, 0x77, 0xda, 0xdc, 0x7d, 0x08, 0xae, 0x55, 0xd8, 0x75, 0xfb, 0xd1, 0x20, 0xfe,
+	0x02, 0x06, 0xba, 0xa4, 0x5a, 0xcd, 0x9e, 0xa3, 0x79, 0x0c, 0xa3, 0x97, 0x52, 0xf0, 0xbc, 0xd6,
+	0x8d, 0xcb, 0x1c, 0xc1, 0x21, 0xc5, 0x7f, 0xf3, 0xc0, 0x57, 0x51, 0x8a, 0x61, 0x37, 0xe3, 0x33,
+	0x96, 0xac, 0x4e, 0x8a, 0x26, 0x4f, 0xab, 0xc8, 0x1b, 0xf7, 0x0f, 0xfb, 0xb4, 0x43, 0xc3, 0xf4,
+	0x98, 0x68, 0x6e, 0x6f, 0xdc, 0x3f, 0x0c, 0xa9, 0x41, 0x68, 0x5a, 0xc6, 0x26, 0x3c, 0x33, 0x47,
+	0xd0, 0x00, 0xa5, 0x4b, 0xc9, 0xa7, 0x62, 0x69, 0x8e, 0x61, 0x10, 0xd2, 0xab, 0x66, 0x8a, 0x74,
+	0x7d, 0x12, 0x83, 0xf0, 0x00, 0x13, 0x56, 0xb5, 0xdd, 0x0c, 0xd7, 0xa8, 0xb9, 0x4a, 0x58, 0x66,
+	0xdb, 0x99, 0x06, 0xf1, 0xbf, 0x3d, 0xbc, 0x1e, 0x75, 0x7b, 0xbe, 0xe3, 0xe1, 0x0f, 0x60, 0x88,
+	0xad, 0xfb, 0xab, 0x1b, 0x26, 0xcd, 0x81, 0x77, 0x10, 0x5f, 0x33, 0x49, 0x7e, 0x0e, 0x03, 0x55,
+	0x1c, 0x5b, 0xae, 0x0a, 0xab, 0x4e, 0x79, 0x95, 0x1a, 0xb1, 0xb6, 0x99, 0xfa, 0x4e, 0x33, 0x6d,
+	0x0f, 0x1b, 0xb8, 0x87, 0xfd, 0x18, 0x02, 0xec, 0xca, 0x2b, 0x65, 0xfd, 0x56, 0xcd, 0xba, 0x77,
+	0x6b, 0x29, 0xcc, 0xf0, 0x4a, 0x4d, 0x21, 0xe7, 0x67, 0xe6, 0x68, 0x2d, 0x8e, 0x67, 0xb0, 0xd7,
+	0xb1, 0xa6, 0xb5, 0xc2, 0xeb, 0x5a, 0xb1, 0x6e, 0x02, 0xa1, 0x29, 0x7a, 0xa5, 0x96, 0x67, 0x3c,
+	0xa9, 0x79, 0x6a, 0x32, 0xb2, 0xc5, 0xb6, 0x91, 0xf8, 0x6d, 0x23, 0x89, 0xff, 0xe1, 0xad, 0x77,
+	0x52, 0xd6, 0x61, 0x42, 0x27, 0xc5, 0x62, 0xc1, 0xf2, 0xd4, 0x6c, 0x66, 0x21, 0x7a, 0x39, 0x9d,
+	0x98, 0xcd, 0x7a, 0xe9, 0x04, 0xb1, 0x2c, 0x4d, 0xbc, 0x7b, 0xb2, 0xc4, 0x4c, 0x5b, 0x70, 0x56,
+	0x35, 0x92, 0x2f, 0x78, 0x5e, 0x9b, 0x5d, 0x5c, 0x12, 0x79, 0x1f, 0x76, 0x6a, 0x36, 0xfb, 0x0a,
+	0x6d, 0x30, 0x71, 0xaf, 0xd9, 0xec, 0x4b, 0xbe, 0x22, 0xdf, 0x81, 0x50, 0x75, 0x66, 0xc5, 0xd2,
+	0xc1, 0x1f, 0x2a, 0x02, 0x32, 0x09, 0xf8, 0xd3, 0xac, 0x59, 0xda, 0xeb, 0x0c, 0xd7, 0xf1, 0x5f,
+	0x7b, 0x30, 0xb8, 0xe4, 0xf2, 0x86, 0xcb, 0x77, 0x9a, 0x0f, 0xdc, 0x79, 0xad, 0xff, 0x96, 0x79,
+	0xcd, 0xdf, 0x3e, 0xaf, 0x05, 0xeb, 0x79, 0xed, 0x3e, 0x04, 0x97, 0x32, 0x39, 0x3f, 0x53, 0x56,
+	0xf6, 0xa9, 0x06, 0x98, 0xcf, 0xc7, 0x49, 0x2d, 0x6e, 0xb8, 0x19, 0xe2, 0x0c, 0xba, 0x33, 0x36,
+	0x0c, 0xb7, 0x4c, 0x4e, 0xff, 0xed, 0x2c, 0x67, 0x8b, 0x1c, 0x9c, 0x22, 0x8f, 0x61, 0x17, 0x07,
+	0xba, 0x94, 0xd5, 0xec, 0xe9, 0xe5, 0xcb, 0x17, 0x76, 0x8a, 0x73, 0x69, 0xf1, 0x37, 0x1e, 0x0c,
+	0x9e, 0xb1, 0x55, 0xd1, 0xd4, 0x77, 0xea, 0x65, 0x0c, 0xa3, 0xe3, 0xb2, 0xcc, 0x44, 0xd2, 0xe9,
+	0x11, 0x0e, 0x09, 0x25, 0x9e, 0x3b, 0xb1, 0xd5, 0x3e, 0x74, 0x49, 0x78, 0x25, 0x9d, 0xaa, 0x11,
+	0x4c, 0xcf, 0x53, 0xce, 0x95, 0xa4, 0x27, 0x2f, 0xc5, 0x44, 0x67, 0x1f, 0x37, 0x75, 0x31, 0xcd,
+	0x8a, 0x5b, 0xe5, 0xd5, 0x21, 0x6d, 0x71, 0xfc, 0xaf, 0x1e, 0xf8, 0xff, 0xaf, 0xb1, 0x69, 0x17,
+	0x3c, 0x61, 0x12, 0xcd, 0x13, 0xed, 0x10, 0xb5, 0xe3, 0x0c, 0x51, 0x11, 0xec, 0xac, 0x24, 0xcb,
+	0x67, 0xbc, 0x8a, 0x86, 0xaa, 0x0f, 0x5a, 0xa8, 0x38, 0xaa, 0xe2, 0xf5, 0xf4, 0x14, 0x52, 0x0b,
+	0xdb, 0x2a, 0x05, 0xa7, 0x4a, 0x7f, 0x66, 0x06, 0xad, 0xd1, 0xe6, 0x68, 0xb2, 0x6d, 0xbe, 0xfa,
+	0xdf, 0xdd, 0xfb, 0x7f, 0xec, 0x41, 0xd0, 0x16, 0xf4, 0x69, 0xb7, 0xa0, 0x4f, 0xd7, 0x05, 0x7d,
+	0x76, 0x62, 0x0b, 0xfa, 0xec, 0x04, 0x31, 0xbd, 0xb0, 0x05, 0x4d, 0x2f, 0x30, 0x58, 0x4f, 0x64,
+	0xd1, 0x94, 0x27, 0x2b, 0x1d, 0xd5, 0x90, 0xb6, 0x18, 0x33, 0xfe, 0xb7, 0x73, 0x2e, 0x8d, 0xab,
+	0x43, 0x6a, 0x10, 0xd6, 0xc7, 0x33, 0xd5, 0x1a, 0xb5, 0x73, 0x35, 0x20, 0x3f, 0x84, 0x80, 0xa2,
+	0xf3, 0x94, 0x87, 0x3b, 0x71, 0x51, 0x64, 0xaa, 0xb9, 0xa8, 0x54, 0x3f, 0xcc, 0x4c, 0xa1, 0xd8,
+	0x67, 0xda, 0x4f, 0x61, 0x70, 0x39, 0x17, 0xd3, 0xda, 0x8e, 0xab, 0xdf, 0x76, 0x5a, 0xab, 0x58,
+	0x70, 0xc5, 0xa3, 0x46, 0x64, 0x5b, 0x7d, 0xc4, 0xaf, 0x20, 0x6c, 0x05, 0xd7, 0x26, 0x7a, 0xae,
+	0x89, 0x04, 0xfc, 0xd7, 0xb9, 0xa8, 0x6d, 0xdb, 0xc0, 0x35, 0x3a, 0xe0, 0x55, 0xc3, 0xf2, 0x1a,
+	0xe7, 0x34, 0xd3, 0x36, 0x2c, 0x8e, 0x1f, 0x9a, 0x23, 0xa1, 0xba, 0xd7, 0x65, 0xc9, 0xa5, 0x69,
+	0x41, 0x1a, 0xa8, 0x4d, 0x8a, 0x5b, 0xae, 0xef, 0x9f, 0x3e, 0xd5, 0x20, 0xfe, 0x1d, 0x84, 0xc7,
+	0x19, 0x97, 0x35, 0x6d, 0x32, 0xbe, 0x6d, 0x2e, 0x50, 0xc5, 0x6b, 0x2c, 0xc0, 0xf5, 0xba, 0xdd,
+	0xf4, 0x37, 0xda, 0xcd, 0x97, 0xac, 0x64, 0xe7, 0x67, 0x2a, 0xf7, 0xfb, 0xd4, 0xa0, 0xf8, 0xcf,
+	0x1e, 0xf8, 0xd8, 0xd7, 0x1c, 0xd5, 0xfe, 0xdb, 0x7a, 0xe2, 0x85, 0x2c, 0x6e, 0x44, 0xca, 0xa5,
+	0x3d, 0x9c, 0xc5, 0x2a, 0x10, 0xc9, 0x9c, 0xb7, 0xe3, 0x87, 0x41, 0x98, 0x7f, 0xf8, 0xb2, 0xb3,
+	0xf5, 0xe5, 0xe4, 0x1f, 0x92, 0xa9, 0x66, 0xe2, 0x88, 0x79, 0xd9, 0x94, 0x5c, 0x1e, 0xa7, 0x0b,
+	0x61, 0x67, 0x33, 0x87, 0x12, 0x7f, 0xa1, 0xdf, 0x8a, 0x77, 0xba, 0xa3, 0xb7, 0xfd, 0x5d, 0xb9,
+	0x69, 0x79, 0xfc, 0x17, 0x0f, 0x76, 0x9e, 0x9b, 0x59, 0xd0, 0x3d, 0x85, 0xf7, 0xc6, 0x53, 0xf4,
+	0x3a, 0xa7, 0x38, 0x82, 0xfb, 0x56, 0xa6, 0xb3, 0xbf, 0xf6, 0xc2, 0x56, 0x9e, 0xf1, 0xa8, 0xdf,
+	0x06, 0xeb, 0x5d, 0x1e, 0x84, 0x57, 0x5d, 0x99, 0x6d, 0x01, 0xbf, 0x13, 0x95, 0x31, 0x8c, 0xec,
+	0x13, 0xb9, 0xc8, 0xec, 0x65, 0xe5, 0x92, 0xe2, 0x23, 0x18, 0x9c, 0x16, 0xf9, 0x54, 0xcc, 0xc8,
+	0x21, 0xf8, 0xc7, 0x4d, 0x3d, 0x57, 0x1a, 0x47, 0x47, 0xf7, 0x9d, 0x66, 0xd0, 0xd4, 0x73, 0x2d,
+	0x43, 0x95, 0x44, 0xfc, 0x19, 0xc0, 0x9a, 0x86, 0x37, 0xce, 0x3a, 0x1a, 0x2f, 0xf8, 0x2d, 0xa6,
+	0x4c, 0x65, 0x9e, 0x02, 0x5b, 0x38, 0x71, 0x03, 0xc4, 0x3d, 0x87, 0xd1, 0xf2, 0x11, 0xec, 0xbb,
+	0xd4, 0xf6, 0x64, 0x1b, 0x54, 0xf2, 0x2b, 0x08, 0x9f, 0x15, 0xb3, 0x6b, 0xc1, 0x6d, 0x35, 0x8c,
+	0x8e, 0x3e, 0x70, 0x1e, 0x83, 0x96, 0x65, 0xec, 0x5d, 0xcb, 0xc6, 0x8f, 0xe1, 0xde, 0x06, 0x97,
+	0x3c, 0xc4, 0x5e, 0x86, 0xb3, 0xbd, 0x1e, 0x4e, 0xdf, 0xa4, 0x09, 0x25, 0xa8, 0x95, 0x8c, 0x57,
+	0x1d, 0x3d, 0x48, 0x6b, 0x3d, 0xef, 0x6d, 0xd4, 0x43, 0x51, 0x89, 0xf6, 0x06, 0x0c, 0x68, 0x8b,
+	0xc9, 0x2f, 0x21, 0x7c, 0x94, 0x27, 0x45, 0x2a, 0xf2, 0x99, 0x1d, 0x1c, 0xa3, 0xce, 0xcb, 0xb7,
+	0x59, 0xe4, 0x56, 0x80, 0xae, 0x45, 0xe3, 0x17, 0xb0, 0xdf, 0x65, 0x6e, 0x1d, 0xd1, 0xdb, 0xb1,
+	0xbe, 0xe7, 0x8c, 0xf5, 0xad, 0x8d, 0x7d, 0x27, 0xf3, 0x3f, 0x87, 0xf0, 0xa4, 0x11, 0x59, 0x7a,
+	0x9e, 0x4f, 0x0b, 0xf7, 0x0f, 0x14, 0xaf, 0xf3, 0x07, 0x0a, 0x26, 0x3e, 0xf6, 0xf8, 0xb6, 0x9b,
+	0x19, 0x34, 0x19, 0xa8, 0xbf, 0xc2, 0x1e, 0xfe, 0x27, 0x00, 0x00, 0xff, 0xff, 0x7b, 0x21, 0x1e,
+	0x51, 0x1c, 0x13, 0x00, 0x00,
 }
diff --git a/kv/internal/internal.proto b/kv/internal/internal.proto
index c65dd42c1..971a67bdd 100644
--- a/kv/internal/internal.proto
+++ b/kv/internal/internal.proto
@@ -114,6 +114,7 @@ message TemplateQuery {
 	string measurement      = 4; // Measurement is the optinally selected measurement for the query
 	string tag_key          = 5; // TagKey is the optionally selected tag key for the query
 	string field_key        = 6; // FieldKey is the optionally selected field key for the query
+	string flux             = 7; // Flux script content 
 }
 
 message Server {
diff --git a/server/templates.go b/server/templates.go
index 9d6ba5f31..326ec52b7 100644
--- a/server/templates.go
+++ b/server/templates.go
@@ -15,7 +15,7 @@ func ValidTemplateRequest(template *chronograf.Template) error {
 	switch template.Type {
 	default:
 		return fmt.Errorf("Unknown template type %s", template.Type)
-	case "constant", "csv", "fieldKeys", "tagKeys", "tagValues", "measurements", "databases", "map", "influxql", "text":
+	case "constant", "csv", "fieldKeys", "tagKeys", "tagValues", "measurements", "databases", "map", "influxql", "text", "flux":
 	}
 
 	for _, v := range template.Values {