diff --git a/bolt/config.go b/bolt/config.go
index 9b9998918..592b060d6 100644
--- a/bolt/config.go
+++ b/bolt/config.go
@@ -36,8 +36,8 @@ func (s *ConfigStore) Initialize(ctx context.Context) error {
 		Auth: chronograf.AuthConfig{
 			SuperAdminNewUsers: false,
 		},
-		LogViewer: chronograf.LogViewerUIConfig{
-			Columns: []chronograf.LogViewerUIColumn{
+		LogViewer: chronograf.LogViewerConfig{
+			Columns: []chronograf.LogViewerColumn{
 				{
 					Name:     "time",
 					Position: 0,
diff --git a/bolt/config_test.go b/bolt/config_test.go
index 9e2e2d261..927a50c59 100644
--- a/bolt/config_test.go
+++ b/bolt/config_test.go
@@ -24,8 +24,8 @@ func TestConfig_Get(t *testing.T) {
 					Auth: chronograf.AuthConfig{
 						SuperAdminNewUsers: false,
 					},
-					LogViewer: chronograf.LogViewerUIConfig{
-						Columns: []chronograf.LogViewerUIColumn{
+					LogViewer: chronograf.LogViewerConfig{
+						Columns: []chronograf.LogViewerColumn{
 							{
 								Name:     "time",
 								Position: 0,
@@ -172,8 +172,8 @@ func TestConfig_Update(t *testing.T) {
 					Auth: chronograf.AuthConfig{
 						SuperAdminNewUsers: false,
 					},
-					LogViewer: chronograf.LogViewerUIConfig{
-						Columns: []chronograf.LogViewerUIColumn{
+					LogViewer: chronograf.LogViewerConfig{
+						Columns: []chronograf.LogViewerColumn{
 							{
 								Name:     "time",
 								Position: 1,
@@ -280,8 +280,8 @@ func TestConfig_Update(t *testing.T) {
 					Auth: chronograf.AuthConfig{
 						SuperAdminNewUsers: false,
 					},
-					LogViewer: chronograf.LogViewerUIConfig{
-						Columns: []chronograf.LogViewerUIColumn{
+					LogViewer: chronograf.LogViewerConfig{
+						Columns: []chronograf.LogViewerColumn{
 							{
 								Name:     "time",
 								Position: 1,
diff --git a/bolt/internal/internal.go b/bolt/internal/internal.go
index ce299acce..eb64d69a0 100644
--- a/bolt/internal/internal.go
+++ b/bolt/internal/internal.go
@@ -716,7 +716,7 @@ func UnmarshalOrganizationPB(data []byte, o *Organization) error {
 
 // MarshalConfig encodes a config to binary protobuf format.
 func MarshalConfig(c *chronograf.Config) ([]byte, error) {
-	columns := make([]*LogViewerUIColumn, len(c.LogViewer.Columns))
+	columns := make([]*LogViewerColumn, len(c.LogViewer.Columns))
 	for i, column := range c.LogViewer.Columns {
 		encodings := make([]*ColumnEncoding, len(column.Encodings))
 
@@ -728,7 +728,7 @@ func MarshalConfig(c *chronograf.Config) ([]byte, error) {
 			}
 		}
 
-		columns[i] = &LogViewerUIColumn{
+		columns[i] = &LogViewerColumn{
 			Name:      column.Name,
 			Position:  column.Position,
 			Encodings: encodings,
@@ -738,7 +738,7 @@ func MarshalConfig(c *chronograf.Config) ([]byte, error) {
 		Auth: &AuthConfig{
 			SuperAdminNewUsers: c.Auth.SuperAdminNewUsers,
 		},
-		LogViewer: &LogViewerUIConfig{
+		LogViewer: &LogViewerConfig{
 			Columns: columns,
 		},
 	})
@@ -761,10 +761,10 @@ func UnmarshalConfig(data []byte, c *chronograf.Config) error {
 	c.Auth.SuperAdminNewUsers = pb.Auth.SuperAdminNewUsers
 
 	if pb.LogViewer == nil {
-		return fmt.Errorf("Log Viewer UI config is nil")
+		return fmt.Errorf("Log Viewer config is nil")
 	}
 
-	columns := make([]chronograf.LogViewerUIColumn, len(pb.LogViewer.Columns))
+	columns := make([]chronograf.LogViewerColumn, len(pb.LogViewer.Columns))
 
 	for i, c := range pb.LogViewer.Columns {
 		columns[i].Name = c.Name
diff --git a/bolt/internal/internal.pb.go b/bolt/internal/internal.pb.go
index fb9ad5e0a..098c77191 100644
--- a/bolt/internal/internal.pb.go
+++ b/bolt/internal/internal.pb.go
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-gogo.
+// Code generated by protoc-gen-gogo. DO NOT EDIT.
 // source: internal.proto
-// DO NOT EDIT!
 
 /*
 Package internal is a generated protocol buffer package.
@@ -34,8 +33,8 @@ It has these top-level messages:
 	Organization
 	Config
 	AuthConfig
-	LogViewerUIConfig
-	LogViewerUIColumn
+	LogViewerConfig
+	LogViewerColumn
 	ColumnEncoding
 	BuildInfo
 */
@@ -78,6 +77,104 @@ func (m *Source) String() string            { return proto.CompactTextString(m)
 func (*Source) ProtoMessage()               {}
 func (*Source) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{0} }
 
+func (m *Source) GetID() int64 {
+	if m != nil {
+		return m.ID
+	}
+	return 0
+}
+
+func (m *Source) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Source) GetType() string {
+	if m != nil {
+		return m.Type
+	}
+	return ""
+}
+
+func (m *Source) GetUsername() string {
+	if m != nil {
+		return m.Username
+	}
+	return ""
+}
+
+func (m *Source) GetPassword() string {
+	if m != nil {
+		return m.Password
+	}
+	return ""
+}
+
+func (m *Source) GetURL() string {
+	if m != nil {
+		return m.URL
+	}
+	return ""
+}
+
+func (m *Source) GetDefault() bool {
+	if m != nil {
+		return m.Default
+	}
+	return false
+}
+
+func (m *Source) GetTelegraf() string {
+	if m != nil {
+		return m.Telegraf
+	}
+	return ""
+}
+
+func (m *Source) GetInsecureSkipVerify() bool {
+	if m != nil {
+		return m.InsecureSkipVerify
+	}
+	return false
+}
+
+func (m *Source) GetMetaURL() string {
+	if m != nil {
+		return m.MetaURL
+	}
+	return ""
+}
+
+func (m *Source) GetSharedSecret() string {
+	if m != nil {
+		return m.SharedSecret
+	}
+	return ""
+}
+
+func (m *Source) GetOrganization() string {
+	if m != nil {
+		return m.Organization
+	}
+	return ""
+}
+
+func (m *Source) GetRole() string {
+	if m != nil {
+		return m.Role
+	}
+	return ""
+}
+
+func (m *Source) GetDefaultRP() string {
+	if m != nil {
+		return m.DefaultRP
+	}
+	return ""
+}
+
 type Dashboard 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"`
@@ -91,6 +188,20 @@ func (m *Dashboard) String() string            { return proto.CompactTextString(
 func (*Dashboard) ProtoMessage()               {}
 func (*Dashboard) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{1} }
 
+func (m *Dashboard) GetID() int64 {
+	if m != nil {
+		return m.ID
+	}
+	return 0
+}
+
+func (m *Dashboard) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
 func (m *Dashboard) GetCells() []*DashboardCell {
 	if m != nil {
 		return m.Cells
@@ -105,6 +216,13 @@ func (m *Dashboard) GetTemplates() []*Template {
 	return nil
 }
 
+func (m *Dashboard) GetOrganization() string {
+	if m != nil {
+		return m.Organization
+	}
+	return ""
+}
+
 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"`
@@ -128,6 +246,34 @@ func (m *DashboardCell) String() string            { return proto.CompactTextStr
 func (*DashboardCell) ProtoMessage()               {}
 func (*DashboardCell) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{2} }
 
+func (m *DashboardCell) GetX() int32 {
+	if m != nil {
+		return m.X
+	}
+	return 0
+}
+
+func (m *DashboardCell) GetY() int32 {
+	if m != nil {
+		return m.Y
+	}
+	return 0
+}
+
+func (m *DashboardCell) GetW() int32 {
+	if m != nil {
+		return m.W
+	}
+	return 0
+}
+
+func (m *DashboardCell) GetH() int32 {
+	if m != nil {
+		return m.H
+	}
+	return 0
+}
+
 func (m *DashboardCell) GetQueries() []*Query {
 	if m != nil {
 		return m.Queries
@@ -135,6 +281,27 @@ func (m *DashboardCell) GetQueries() []*Query {
 	return nil
 }
 
+func (m *DashboardCell) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *DashboardCell) GetType() string {
+	if m != nil {
+		return m.Type
+	}
+	return ""
+}
+
+func (m *DashboardCell) GetID() string {
+	if m != nil {
+		return m.ID
+	}
+	return ""
+}
+
 func (m *DashboardCell) GetAxes() map[string]*Axis {
 	if m != nil {
 		return m.Axes
@@ -170,6 +337,13 @@ func (m *DashboardCell) GetFieldOptions() []*RenamableField {
 	return nil
 }
 
+func (m *DashboardCell) GetTimeFormat() string {
+	if m != nil {
+		return m.TimeFormat
+	}
+	return ""
+}
+
 func (m *DashboardCell) GetDecimalPlaces() *DecimalPlaces {
 	if m != nil {
 		return m.DecimalPlaces
@@ -187,6 +361,20 @@ func (m *DecimalPlaces) String() string            { return proto.CompactTextStr
 func (*DecimalPlaces) ProtoMessage()               {}
 func (*DecimalPlaces) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{3} }
 
+func (m *DecimalPlaces) GetIsEnforced() bool {
+	if m != nil {
+		return m.IsEnforced
+	}
+	return false
+}
+
+func (m *DecimalPlaces) GetDigits() int32 {
+	if m != nil {
+		return m.Digits
+	}
+	return 0
+}
+
 type TableOptions struct {
 	VerticalTimeAxis bool            `protobuf:"varint,2,opt,name=verticalTimeAxis,proto3" json:"verticalTimeAxis,omitempty"`
 	SortBy           *RenamableField `protobuf:"bytes,3,opt,name=sortBy" json:"sortBy,omitempty"`
@@ -199,6 +387,13 @@ func (m *TableOptions) String() string            { return proto.CompactTextStri
 func (*TableOptions) ProtoMessage()               {}
 func (*TableOptions) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{4} }
 
+func (m *TableOptions) GetVerticalTimeAxis() bool {
+	if m != nil {
+		return m.VerticalTimeAxis
+	}
+	return false
+}
+
 func (m *TableOptions) GetSortBy() *RenamableField {
 	if m != nil {
 		return m.SortBy
@@ -206,6 +401,20 @@ func (m *TableOptions) GetSortBy() *RenamableField {
 	return nil
 }
 
+func (m *TableOptions) GetWrapping() string {
+	if m != nil {
+		return m.Wrapping
+	}
+	return ""
+}
+
+func (m *TableOptions) GetFixFirstColumn() bool {
+	if m != nil {
+		return m.FixFirstColumn
+	}
+	return false
+}
+
 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"`
@@ -217,6 +426,27 @@ func (m *RenamableField) String() string            { return proto.CompactTextSt
 func (*RenamableField) ProtoMessage()               {}
 func (*RenamableField) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{5} }
 
+func (m *RenamableField) GetInternalName() string {
+	if m != nil {
+		return m.InternalName
+	}
+	return ""
+}
+
+func (m *RenamableField) GetDisplayName() string {
+	if m != nil {
+		return m.DisplayName
+	}
+	return ""
+}
+
+func (m *RenamableField) GetVisible() bool {
+	if m != nil {
+		return m.Visible
+	}
+	return false
+}
+
 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"`
@@ -230,6 +460,41 @@ func (m *Color) String() string            { return proto.CompactTextString(m) }
 func (*Color) ProtoMessage()               {}
 func (*Color) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{6} }
 
+func (m *Color) GetID() string {
+	if m != nil {
+		return m.ID
+	}
+	return ""
+}
+
+func (m *Color) GetType() string {
+	if m != nil {
+		return m.Type
+	}
+	return ""
+}
+
+func (m *Color) GetHex() string {
+	if m != nil {
+		return m.Hex
+	}
+	return ""
+}
+
+func (m *Color) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Color) GetValue() string {
+	if m != nil {
+		return m.Value
+	}
+	return ""
+}
+
 type Legend struct {
 	Type        string `protobuf:"bytes,1,opt,name=Type,proto3" json:"Type,omitempty"`
 	Orientation string `protobuf:"bytes,2,opt,name=Orientation,proto3" json:"Orientation,omitempty"`
@@ -240,8 +505,22 @@ func (m *Legend) String() string            { return proto.CompactTextString(m)
 func (*Legend) ProtoMessage()               {}
 func (*Legend) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{7} }
 
+func (m *Legend) GetType() string {
+	if m != nil {
+		return m.Type
+	}
+	return ""
+}
+
+func (m *Legend) GetOrientation() string {
+	if m != nil {
+		return m.Orientation
+	}
+	return ""
+}
+
 type Axis struct {
-	LegacyBounds []int64  `protobuf:"varint,1,rep,name=legacyBounds" json:"legacyBounds,omitempty"`
+	LegacyBounds []int64  `protobuf:"varint,1,rep,packed,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"`
@@ -255,6 +534,55 @@ func (m *Axis) String() string            { return proto.CompactTextString(m) }
 func (*Axis) ProtoMessage()               {}
 func (*Axis) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{8} }
 
+func (m *Axis) GetLegacyBounds() []int64 {
+	if m != nil {
+		return m.LegacyBounds
+	}
+	return nil
+}
+
+func (m *Axis) GetBounds() []string {
+	if m != nil {
+		return m.Bounds
+	}
+	return nil
+}
+
+func (m *Axis) GetLabel() string {
+	if m != nil {
+		return m.Label
+	}
+	return ""
+}
+
+func (m *Axis) GetPrefix() string {
+	if m != nil {
+		return m.Prefix
+	}
+	return ""
+}
+
+func (m *Axis) GetSuffix() string {
+	if m != nil {
+		return m.Suffix
+	}
+	return ""
+}
+
+func (m *Axis) GetBase() string {
+	if m != nil {
+		return m.Base
+	}
+	return ""
+}
+
+func (m *Axis) GetScale() string {
+	if m != nil {
+		return m.Scale
+	}
+	return ""
+}
+
 type Template struct {
 	ID      string           `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"`
 	TempVar string           `protobuf:"bytes,2,opt,name=temp_var,json=tempVar,proto3" json:"temp_var,omitempty"`
@@ -269,6 +597,20 @@ func (m *Template) String() string            { return proto.CompactTextString(m
 func (*Template) ProtoMessage()               {}
 func (*Template) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{9} }
 
+func (m *Template) GetID() string {
+	if m != nil {
+		return m.ID
+	}
+	return ""
+}
+
+func (m *Template) GetTempVar() string {
+	if m != nil {
+		return m.TempVar
+	}
+	return ""
+}
+
 func (m *Template) GetValues() []*TemplateValue {
 	if m != nil {
 		return m.Values
@@ -276,6 +618,20 @@ func (m *Template) GetValues() []*TemplateValue {
 	return nil
 }
 
+func (m *Template) GetType() string {
+	if m != nil {
+		return m.Type
+	}
+	return ""
+}
+
+func (m *Template) GetLabel() string {
+	if m != nil {
+		return m.Label
+	}
+	return ""
+}
+
 func (m *Template) GetQuery() *TemplateQuery {
 	if m != nil {
 		return m.Query
@@ -295,6 +651,34 @@ func (m *TemplateValue) String() string            { return proto.CompactTextStr
 func (*TemplateValue) ProtoMessage()               {}
 func (*TemplateValue) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{10} }
 
+func (m *TemplateValue) GetType() string {
+	if m != nil {
+		return m.Type
+	}
+	return ""
+}
+
+func (m *TemplateValue) GetValue() string {
+	if m != nil {
+		return m.Value
+	}
+	return ""
+}
+
+func (m *TemplateValue) GetSelected() bool {
+	if m != nil {
+		return m.Selected
+	}
+	return false
+}
+
+func (m *TemplateValue) GetKey() string {
+	if m != nil {
+		return m.Key
+	}
+	return ""
+}
+
 type TemplateQuery struct {
 	Command     string `protobuf:"bytes,1,opt,name=command,proto3" json:"command,omitempty"`
 	Db          string `protobuf:"bytes,2,opt,name=db,proto3" json:"db,omitempty"`
@@ -309,6 +693,48 @@ func (m *TemplateQuery) String() string            { return proto.CompactTextStr
 func (*TemplateQuery) ProtoMessage()               {}
 func (*TemplateQuery) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{11} }
 
+func (m *TemplateQuery) GetCommand() string {
+	if m != nil {
+		return m.Command
+	}
+	return ""
+}
+
+func (m *TemplateQuery) GetDb() string {
+	if m != nil {
+		return m.Db
+	}
+	return ""
+}
+
+func (m *TemplateQuery) GetRp() string {
+	if m != nil {
+		return m.Rp
+	}
+	return ""
+}
+
+func (m *TemplateQuery) GetMeasurement() string {
+	if m != nil {
+		return m.Measurement
+	}
+	return ""
+}
+
+func (m *TemplateQuery) GetTagKey() string {
+	if m != nil {
+		return m.TagKey
+	}
+	return ""
+}
+
+func (m *TemplateQuery) GetFieldKey() string {
+	if m != nil {
+		return m.FieldKey
+	}
+	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"`
@@ -328,6 +754,83 @@ func (m *Server) String() string            { return proto.CompactTextString(m)
 func (*Server) ProtoMessage()               {}
 func (*Server) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{12} }
 
+func (m *Server) GetID() int64 {
+	if m != nil {
+		return m.ID
+	}
+	return 0
+}
+
+func (m *Server) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Server) GetUsername() string {
+	if m != nil {
+		return m.Username
+	}
+	return ""
+}
+
+func (m *Server) GetPassword() string {
+	if m != nil {
+		return m.Password
+	}
+	return ""
+}
+
+func (m *Server) GetURL() string {
+	if m != nil {
+		return m.URL
+	}
+	return ""
+}
+
+func (m *Server) GetSrcID() int64 {
+	if m != nil {
+		return m.SrcID
+	}
+	return 0
+}
+
+func (m *Server) GetActive() bool {
+	if m != nil {
+		return m.Active
+	}
+	return false
+}
+
+func (m *Server) GetOrganization() string {
+	if m != nil {
+		return m.Organization
+	}
+	return ""
+}
+
+func (m *Server) GetInsecureSkipVerify() bool {
+	if m != nil {
+		return m.InsecureSkipVerify
+	}
+	return false
+}
+
+func (m *Server) GetType() string {
+	if m != nil {
+		return m.Type
+	}
+	return ""
+}
+
+func (m *Server) GetMetadataJSON() string {
+	if m != nil {
+		return m.MetadataJSON
+	}
+	return ""
+}
+
 type Layout struct {
 	ID          string  `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"`
 	Application string  `protobuf:"bytes,2,opt,name=Application,proto3" json:"Application,omitempty"`
@@ -341,6 +844,27 @@ func (m *Layout) String() string            { return proto.CompactTextString(m)
 func (*Layout) ProtoMessage()               {}
 func (*Layout) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{13} }
 
+func (m *Layout) GetID() string {
+	if m != nil {
+		return m.ID
+	}
+	return ""
+}
+
+func (m *Layout) GetApplication() string {
+	if m != nil {
+		return m.Application
+	}
+	return ""
+}
+
+func (m *Layout) GetMeasurement() string {
+	if m != nil {
+		return m.Measurement
+	}
+	return ""
+}
+
 func (m *Layout) GetCells() []*Cell {
 	if m != nil {
 		return m.Cells
@@ -348,6 +872,13 @@ func (m *Layout) GetCells() []*Cell {
 	return nil
 }
 
+func (m *Layout) GetAutoflow() bool {
+	if m != nil {
+		return m.Autoflow
+	}
+	return false
+}
+
 type Cell 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"`
@@ -356,7 +887,7 @@ type Cell struct {
 	Queries []*Query         `protobuf:"bytes,5,rep,name=queries" json:"queries,omitempty"`
 	I       string           `protobuf:"bytes,6,opt,name=i,proto3" json:"i,omitempty"`
 	Name    string           `protobuf:"bytes,7,opt,name=name,proto3" json:"name,omitempty"`
-	Yranges []int64          `protobuf:"varint,8,rep,name=yranges" json:"yranges,omitempty"`
+	Yranges []int64          `protobuf:"varint,8,rep,packed,name=yranges" json:"yranges,omitempty"`
 	Ylabels []string         `protobuf:"bytes,9,rep,name=ylabels" json:"ylabels,omitempty"`
 	Type    string           `protobuf:"bytes,10,opt,name=type,proto3" json:"type,omitempty"`
 	Axes    map[string]*Axis `protobuf:"bytes,11,rep,name=axes" json:"axes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value"`
@@ -367,6 +898,34 @@ func (m *Cell) String() string            { return proto.CompactTextString(m) }
 func (*Cell) ProtoMessage()               {}
 func (*Cell) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{14} }
 
+func (m *Cell) GetX() int32 {
+	if m != nil {
+		return m.X
+	}
+	return 0
+}
+
+func (m *Cell) GetY() int32 {
+	if m != nil {
+		return m.Y
+	}
+	return 0
+}
+
+func (m *Cell) GetW() int32 {
+	if m != nil {
+		return m.W
+	}
+	return 0
+}
+
+func (m *Cell) GetH() int32 {
+	if m != nil {
+		return m.H
+	}
+	return 0
+}
+
 func (m *Cell) GetQueries() []*Query {
 	if m != nil {
 		return m.Queries
@@ -374,6 +933,41 @@ func (m *Cell) GetQueries() []*Query {
 	return nil
 }
 
+func (m *Cell) GetI() string {
+	if m != nil {
+		return m.I
+	}
+	return ""
+}
+
+func (m *Cell) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Cell) GetYranges() []int64 {
+	if m != nil {
+		return m.Yranges
+	}
+	return nil
+}
+
+func (m *Cell) GetYlabels() []string {
+	if m != nil {
+		return m.Ylabels
+	}
+	return nil
+}
+
+func (m *Cell) GetType() string {
+	if m != nil {
+		return m.Type
+	}
+	return ""
+}
+
 func (m *Cell) GetAxes() map[string]*Axis {
 	if m != nil {
 		return m.Axes
@@ -398,6 +992,48 @@ func (m *Query) String() string            { return proto.CompactTextString(m) }
 func (*Query) ProtoMessage()               {}
 func (*Query) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{15} }
 
+func (m *Query) GetCommand() string {
+	if m != nil {
+		return m.Command
+	}
+	return ""
+}
+
+func (m *Query) GetDB() string {
+	if m != nil {
+		return m.DB
+	}
+	return ""
+}
+
+func (m *Query) GetRP() string {
+	if m != nil {
+		return m.RP
+	}
+	return ""
+}
+
+func (m *Query) GetGroupBys() []string {
+	if m != nil {
+		return m.GroupBys
+	}
+	return nil
+}
+
+func (m *Query) GetWheres() []string {
+	if m != nil {
+		return m.Wheres
+	}
+	return nil
+}
+
+func (m *Query) GetLabel() string {
+	if m != nil {
+		return m.Label
+	}
+	return ""
+}
+
 func (m *Query) GetRange() *Range {
 	if m != nil {
 		return m.Range
@@ -405,6 +1041,13 @@ func (m *Query) GetRange() *Range {
 	return nil
 }
 
+func (m *Query) GetSource() string {
+	if m != nil {
+		return m.Source
+	}
+	return ""
+}
+
 func (m *Query) GetShifts() []*TimeShift {
 	if m != nil {
 		return m.Shifts
@@ -423,6 +1066,27 @@ func (m *TimeShift) String() string            { return proto.CompactTextString(
 func (*TimeShift) ProtoMessage()               {}
 func (*TimeShift) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{16} }
 
+func (m *TimeShift) GetLabel() string {
+	if m != nil {
+		return m.Label
+	}
+	return ""
+}
+
+func (m *TimeShift) GetUnit() string {
+	if m != nil {
+		return m.Unit
+	}
+	return ""
+}
+
+func (m *TimeShift) GetQuantity() string {
+	if m != nil {
+		return m.Quantity
+	}
+	return ""
+}
+
 type Range struct {
 	Upper int64 `protobuf:"varint,1,opt,name=Upper,proto3" json:"Upper,omitempty"`
 	Lower int64 `protobuf:"varint,2,opt,name=Lower,proto3" json:"Lower,omitempty"`
@@ -433,6 +1097,20 @@ func (m *Range) String() string            { return proto.CompactTextString(m) }
 func (*Range) ProtoMessage()               {}
 func (*Range) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{17} }
 
+func (m *Range) GetUpper() int64 {
+	if m != nil {
+		return m.Upper
+	}
+	return 0
+}
+
+func (m *Range) GetLower() int64 {
+	if m != nil {
+		return m.Lower
+	}
+	return 0
+}
+
 type AlertRule struct {
 	ID     string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"`
 	JSON   string `protobuf:"bytes,2,opt,name=JSON,proto3" json:"JSON,omitempty"`
@@ -445,6 +1123,34 @@ func (m *AlertRule) String() string            { return proto.CompactTextString(
 func (*AlertRule) ProtoMessage()               {}
 func (*AlertRule) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{18} }
 
+func (m *AlertRule) GetID() string {
+	if m != nil {
+		return m.ID
+	}
+	return ""
+}
+
+func (m *AlertRule) GetJSON() string {
+	if m != nil {
+		return m.JSON
+	}
+	return ""
+}
+
+func (m *AlertRule) GetSrcID() int64 {
+	if m != nil {
+		return m.SrcID
+	}
+	return 0
+}
+
+func (m *AlertRule) GetKapaID() int64 {
+	if m != nil {
+		return m.KapaID
+	}
+	return 0
+}
+
 type User struct {
 	ID         uint64  `protobuf:"varint,1,opt,name=ID,proto3" json:"ID,omitempty"`
 	Name       string  `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
@@ -459,6 +1165,34 @@ func (m *User) String() string            { return proto.CompactTextString(m) }
 func (*User) ProtoMessage()               {}
 func (*User) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{19} }
 
+func (m *User) GetID() uint64 {
+	if m != nil {
+		return m.ID
+	}
+	return 0
+}
+
+func (m *User) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *User) GetProvider() string {
+	if m != nil {
+		return m.Provider
+	}
+	return ""
+}
+
+func (m *User) GetScheme() string {
+	if m != nil {
+		return m.Scheme
+	}
+	return ""
+}
+
 func (m *User) GetRoles() []*Role {
 	if m != nil {
 		return m.Roles
@@ -466,6 +1200,13 @@ func (m *User) GetRoles() []*Role {
 	return nil
 }
 
+func (m *User) GetSuperAdmin() bool {
+	if m != nil {
+		return m.SuperAdmin
+	}
+	return false
+}
+
 type Role struct {
 	Organization string `protobuf:"bytes,1,opt,name=Organization,proto3" json:"Organization,omitempty"`
 	Name         string `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
@@ -476,6 +1217,20 @@ func (m *Role) String() string            { return proto.CompactTextString(m) }
 func (*Role) ProtoMessage()               {}
 func (*Role) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{20} }
 
+func (m *Role) GetOrganization() string {
+	if m != nil {
+		return m.Organization
+	}
+	return ""
+}
+
+func (m *Role) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
 type Mapping struct {
 	Provider             string `protobuf:"bytes,1,opt,name=Provider,proto3" json:"Provider,omitempty"`
 	Scheme               string `protobuf:"bytes,2,opt,name=Scheme,proto3" json:"Scheme,omitempty"`
@@ -489,6 +1244,41 @@ func (m *Mapping) String() string            { return proto.CompactTextString(m)
 func (*Mapping) ProtoMessage()               {}
 func (*Mapping) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{21} }
 
+func (m *Mapping) GetProvider() string {
+	if m != nil {
+		return m.Provider
+	}
+	return ""
+}
+
+func (m *Mapping) GetScheme() string {
+	if m != nil {
+		return m.Scheme
+	}
+	return ""
+}
+
+func (m *Mapping) GetProviderOrganization() string {
+	if m != nil {
+		return m.ProviderOrganization
+	}
+	return ""
+}
+
+func (m *Mapping) GetID() string {
+	if m != nil {
+		return m.ID
+	}
+	return ""
+}
+
+func (m *Mapping) GetOrganization() string {
+	if m != nil {
+		return m.Organization
+	}
+	return ""
+}
+
 type Organization struct {
 	ID          string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"`
 	Name        string `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
@@ -500,9 +1290,30 @@ func (m *Organization) String() string            { return proto.CompactTextStri
 func (*Organization) ProtoMessage()               {}
 func (*Organization) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{22} }
 
+func (m *Organization) GetID() string {
+	if m != nil {
+		return m.ID
+	}
+	return ""
+}
+
+func (m *Organization) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Organization) GetDefaultRole() string {
+	if m != nil {
+		return m.DefaultRole
+	}
+	return ""
+}
+
 type Config struct {
-	Auth      *AuthConfig        `protobuf:"bytes,1,opt,name=Auth" json:"Auth,omitempty"`
-	LogViewer *LogViewerUIConfig `protobuf:"bytes,2,opt,name=LogViewer" json:"LogViewer,omitempty"`
+	Auth      *AuthConfig      `protobuf:"bytes,1,opt,name=Auth" json:"Auth,omitempty"`
+	LogViewer *LogViewerConfig `protobuf:"bytes,2,opt,name=LogViewer" json:"LogViewer,omitempty"`
 }
 
 func (m *Config) Reset()                    { *m = Config{} }
@@ -517,7 +1328,7 @@ func (m *Config) GetAuth() *AuthConfig {
 	return nil
 }
 
-func (m *Config) GetLogViewer() *LogViewerUIConfig {
+func (m *Config) GetLogViewer() *LogViewerConfig {
 	if m != nil {
 		return m.LogViewer
 	}
@@ -533,34 +1344,55 @@ func (m *AuthConfig) String() string            { return proto.CompactTextString
 func (*AuthConfig) ProtoMessage()               {}
 func (*AuthConfig) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{24} }
 
-type LogViewerUIConfig struct {
-	Columns []*LogViewerUIColumn `protobuf:"bytes,1,rep,name=Columns" json:"Columns,omitempty"`
+func (m *AuthConfig) GetSuperAdminNewUsers() bool {
+	if m != nil {
+		return m.SuperAdminNewUsers
+	}
+	return false
 }
 
-func (m *LogViewerUIConfig) Reset()                    { *m = LogViewerUIConfig{} }
-func (m *LogViewerUIConfig) String() string            { return proto.CompactTextString(m) }
-func (*LogViewerUIConfig) ProtoMessage()               {}
-func (*LogViewerUIConfig) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{25} }
+type LogViewerConfig struct {
+	Columns []*LogViewerColumn `protobuf:"bytes,1,rep,name=Columns" json:"Columns,omitempty"`
+}
 
-func (m *LogViewerUIConfig) GetColumns() []*LogViewerUIColumn {
+func (m *LogViewerConfig) Reset()                    { *m = LogViewerConfig{} }
+func (m *LogViewerConfig) String() string            { return proto.CompactTextString(m) }
+func (*LogViewerConfig) ProtoMessage()               {}
+func (*LogViewerConfig) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{25} }
+
+func (m *LogViewerConfig) GetColumns() []*LogViewerColumn {
 	if m != nil {
 		return m.Columns
 	}
 	return nil
 }
 
-type LogViewerUIColumn struct {
+type LogViewerColumn struct {
 	Name      string            `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
 	Position  int32             `protobuf:"varint,2,opt,name=Position,proto3" json:"Position,omitempty"`
 	Encodings []*ColumnEncoding `protobuf:"bytes,3,rep,name=Encodings" json:"Encodings,omitempty"`
 }
 
-func (m *LogViewerUIColumn) Reset()                    { *m = LogViewerUIColumn{} }
-func (m *LogViewerUIColumn) String() string            { return proto.CompactTextString(m) }
-func (*LogViewerUIColumn) ProtoMessage()               {}
-func (*LogViewerUIColumn) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{26} }
+func (m *LogViewerColumn) Reset()                    { *m = LogViewerColumn{} }
+func (m *LogViewerColumn) String() string            { return proto.CompactTextString(m) }
+func (*LogViewerColumn) ProtoMessage()               {}
+func (*LogViewerColumn) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{26} }
 
-func (m *LogViewerUIColumn) GetEncodings() []*ColumnEncoding {
+func (m *LogViewerColumn) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *LogViewerColumn) GetPosition() int32 {
+	if m != nil {
+		return m.Position
+	}
+	return 0
+}
+
+func (m *LogViewerColumn) GetEncodings() []*ColumnEncoding {
 	if m != nil {
 		return m.Encodings
 	}
@@ -578,6 +1410,27 @@ func (m *ColumnEncoding) String() string            { return proto.CompactTextSt
 func (*ColumnEncoding) ProtoMessage()               {}
 func (*ColumnEncoding) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{27} }
 
+func (m *ColumnEncoding) GetType() string {
+	if m != nil {
+		return m.Type
+	}
+	return ""
+}
+
+func (m *ColumnEncoding) GetValue() string {
+	if m != nil {
+		return m.Value
+	}
+	return ""
+}
+
+func (m *ColumnEncoding) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
 type BuildInfo struct {
 	Version string `protobuf:"bytes,1,opt,name=Version,proto3" json:"Version,omitempty"`
 	Commit  string `protobuf:"bytes,2,opt,name=Commit,proto3" json:"Commit,omitempty"`
@@ -588,6 +1441,20 @@ func (m *BuildInfo) String() string            { return proto.CompactTextString(
 func (*BuildInfo) ProtoMessage()               {}
 func (*BuildInfo) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{28} }
 
+func (m *BuildInfo) GetVersion() string {
+	if m != nil {
+		return m.Version
+	}
+	return ""
+}
+
+func (m *BuildInfo) GetCommit() string {
+	if m != nil {
+		return m.Commit
+	}
+	return ""
+}
+
 func init() {
 	proto.RegisterType((*Source)(nil), "internal.Source")
 	proto.RegisterType((*Dashboard)(nil), "internal.Dashboard")
@@ -614,8 +1481,8 @@ func init() {
 	proto.RegisterType((*Organization)(nil), "internal.Organization")
 	proto.RegisterType((*Config)(nil), "internal.Config")
 	proto.RegisterType((*AuthConfig)(nil), "internal.AuthConfig")
-	proto.RegisterType((*LogViewerUIConfig)(nil), "internal.LogViewerUIConfig")
-	proto.RegisterType((*LogViewerUIColumn)(nil), "internal.LogViewerUIColumn")
+	proto.RegisterType((*LogViewerConfig)(nil), "internal.LogViewerConfig")
+	proto.RegisterType((*LogViewerColumn)(nil), "internal.LogViewerColumn")
 	proto.RegisterType((*ColumnEncoding)(nil), "internal.ColumnEncoding")
 	proto.RegisterType((*BuildInfo)(nil), "internal.BuildInfo")
 }
@@ -623,118 +1490,117 @@ func init() {
 func init() { proto.RegisterFile("internal.proto", fileDescriptorInternal) }
 
 var fileDescriptorInternal = []byte{
-	// 1797 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xbc, 0x58, 0xdd, 0x6f, 0xe4, 0x48,
-	0x11, 0x97, 0x67, 0xec, 0xc9, 0xb8, 0x26, 0xc9, 0x85, 0x66, 0x75, 0x67, 0xee, 0x10, 0x1a, 0x2c,
-	0x3e, 0xc2, 0xc7, 0x2d, 0xa7, 0x9c, 0x0e, 0xc1, 0xe9, 0xee, 0xa4, 0x7c, 0xec, 0x2e, 0xd9, 0xcd,
-	0xee, 0x66, 0x3b, 0x1f, 0x3c, 0xa1, 0x53, 0xc7, 0xee, 0x99, 0xb4, 0xce, 0x63, 0x9b, 0xb6, 0x9d,
-	0x64, 0xe0, 0x95, 0xbf, 0x03, 0x09, 0x09, 0xde, 0x11, 0xe2, 0x11, 0x89, 0x77, 0xfe, 0x00, 0xfe,
-	0x15, 0x5e, 0x51, 0xf5, 0x87, 0xdd, 0xce, 0xcc, 0xae, 0x16, 0x09, 0xdd, 0x5b, 0xff, 0xaa, 0x6a,
-	0xaa, 0xab, 0xab, 0xab, 0x7e, 0x5d, 0x1e, 0xd8, 0x16, 0x79, 0xcd, 0x65, 0xce, 0xb2, 0x87, 0xa5,
-	0x2c, 0xea, 0x82, 0x8c, 0x2d, 0x8e, 0xff, 0x30, 0x84, 0xd1, 0x59, 0xd1, 0xc8, 0x84, 0x93, 0x6d,
-	0x18, 0x1c, 0x1f, 0x45, 0xde, 0xd4, 0xdb, 0x1d, 0xd2, 0xc1, 0xf1, 0x11, 0x21, 0xe0, 0xbf, 0x60,
-	0x0b, 0x1e, 0x0d, 0xa6, 0xde, 0x6e, 0x48, 0xd5, 0x1a, 0x65, 0xe7, 0xcb, 0x92, 0x47, 0x43, 0x2d,
-	0xc3, 0x35, 0x79, 0x1f, 0xc6, 0x17, 0x15, 0x7a, 0x5b, 0xf0, 0xc8, 0x57, 0xf2, 0x16, 0xa3, 0xee,
-	0x94, 0x55, 0xd5, 0x6d, 0x21, 0xd3, 0x28, 0xd0, 0x3a, 0x8b, 0xc9, 0x0e, 0x0c, 0x2f, 0xe8, 0x49,
-	0x34, 0x52, 0x62, 0x5c, 0x92, 0x08, 0x36, 0x8e, 0xf8, 0x8c, 0x35, 0x59, 0x1d, 0x6d, 0x4c, 0xbd,
-	0xdd, 0x31, 0xb5, 0x10, 0xfd, 0x9c, 0xf3, 0x8c, 0xcf, 0x25, 0x9b, 0x45, 0x63, 0xed, 0xc7, 0x62,
-	0xf2, 0x10, 0xc8, 0x71, 0x5e, 0xf1, 0xa4, 0x91, 0xfc, 0xec, 0x2b, 0x51, 0x5e, 0x72, 0x29, 0x66,
-	0xcb, 0x28, 0x54, 0x0e, 0xd6, 0x68, 0x70, 0x97, 0xe7, 0xbc, 0x66, 0xb8, 0x37, 0x28, 0x57, 0x16,
-	0x92, 0x18, 0x36, 0xcf, 0xae, 0x99, 0xe4, 0xe9, 0x19, 0x4f, 0x24, 0xaf, 0xa3, 0x89, 0x52, 0xf7,
-	0x64, 0x68, 0xf3, 0x52, 0xce, 0x59, 0x2e, 0x7e, 0xc7, 0x6a, 0x51, 0xe4, 0xd1, 0xa6, 0xb6, 0x71,
-	0x65, 0x98, 0x25, 0x5a, 0x64, 0x3c, 0xda, 0xd2, 0x59, 0xc2, 0x35, 0xf9, 0x36, 0x84, 0xe6, 0x30,
-	0xf4, 0x34, 0xda, 0x56, 0x8a, 0x4e, 0x10, 0xff, 0xdd, 0x83, 0xf0, 0x88, 0x55, 0xd7, 0x57, 0x05,
-	0x93, 0xe9, 0x5b, 0xdd, 0xc4, 0x87, 0x10, 0x24, 0x3c, 0xcb, 0xaa, 0x68, 0x38, 0x1d, 0xee, 0x4e,
-	0xf6, 0xde, 0x7b, 0xd8, 0x5e, 0x71, 0xeb, 0xe7, 0x90, 0x67, 0x19, 0xd5, 0x56, 0xe4, 0x23, 0x08,
-	0x6b, 0xbe, 0x28, 0x33, 0x56, 0xf3, 0x2a, 0xf2, 0xd5, 0x4f, 0x48, 0xf7, 0x93, 0x73, 0xa3, 0xa2,
-	0x9d, 0xd1, 0xca, 0x41, 0x83, 0xd5, 0x83, 0xc6, 0xff, 0xf6, 0x61, 0xab, 0xb7, 0x1d, 0xd9, 0x04,
-	0xef, 0x4e, 0x45, 0x1e, 0x50, 0xef, 0x0e, 0xd1, 0x52, 0x45, 0x1d, 0x50, 0x6f, 0x89, 0xe8, 0x56,
-	0x55, 0x4e, 0x40, 0xbd, 0x5b, 0x44, 0xd7, 0xaa, 0x5e, 0x02, 0xea, 0x5d, 0x93, 0x1f, 0xc1, 0xc6,
-	0x6f, 0x1b, 0x2e, 0x05, 0xaf, 0xa2, 0x40, 0x45, 0xf7, 0x4e, 0x17, 0xdd, 0xab, 0x86, 0xcb, 0x25,
-	0xb5, 0x7a, 0xcc, 0x86, 0xaa, 0x35, 0x5d, 0x38, 0x6a, 0x8d, 0xb2, 0x1a, 0xeb, 0x72, 0x43, 0xcb,
-	0x70, 0x6d, 0xb2, 0xa8, 0xab, 0x05, 0xb3, 0xf8, 0x09, 0xf8, 0xec, 0x8e, 0x57, 0x51, 0xa8, 0xfc,
-	0x7f, 0xf7, 0x35, 0x09, 0x7b, 0xb8, 0x7f, 0xc7, 0xab, 0x47, 0x79, 0x2d, 0x97, 0x54, 0x99, 0x93,
-	0x1f, 0xc2, 0x28, 0x29, 0xb2, 0x42, 0x56, 0x11, 0xdc, 0x0f, 0xec, 0x10, 0xe5, 0xd4, 0xa8, 0xc9,
-	0x2e, 0x8c, 0x32, 0x3e, 0xe7, 0x79, 0xaa, 0xea, 0x66, 0xb2, 0xb7, 0xd3, 0x19, 0x9e, 0x28, 0x39,
-	0x35, 0x7a, 0xf2, 0x29, 0x6c, 0xd6, 0xec, 0x2a, 0xe3, 0x2f, 0x4b, 0xcc, 0x62, 0xa5, 0x6a, 0x68,
-	0xb2, 0xf7, 0xae, 0x73, 0x1f, 0x8e, 0x96, 0xf6, 0x6c, 0xc9, 0x67, 0xb0, 0x39, 0x13, 0x3c, 0x4b,
-	0xed, 0x6f, 0xb7, 0x54, 0x50, 0x51, 0xf7, 0x5b, 0xca, 0x73, 0xb6, 0xc0, 0x5f, 0x3c, 0x46, 0x33,
-	0xda, 0xb3, 0x26, 0xdf, 0x01, 0xa8, 0xc5, 0x82, 0x3f, 0x2e, 0xe4, 0x82, 0xd5, 0xa6, 0x0c, 0x1d,
-	0x09, 0xf9, 0x1c, 0xb6, 0x52, 0x9e, 0x88, 0x05, 0xcb, 0x4e, 0x33, 0x96, 0xf0, 0x2a, 0x7a, 0x47,
-	0x85, 0xe6, 0x56, 0x97, 0xab, 0xa6, 0x7d, 0xeb, 0xf7, 0x9f, 0x40, 0xd8, 0xa6, 0x0f, 0xfb, 0xfb,
-	0x2b, 0xbe, 0x54, 0xc5, 0x10, 0x52, 0x5c, 0x92, 0xef, 0x41, 0x70, 0xc3, 0xb2, 0x46, 0x17, 0xf2,
-	0x64, 0x6f, 0xbb, 0xf3, 0xba, 0x7f, 0x27, 0x2a, 0xaa, 0x95, 0x9f, 0x0e, 0x7e, 0xe1, 0xc5, 0x4f,
-	0x60, 0xab, 0xb7, 0x11, 0x06, 0x2e, 0xaa, 0x47, 0xf9, 0xac, 0x90, 0x09, 0x4f, 0x95, 0xcf, 0x31,
-	0x75, 0x24, 0xe4, 0x5d, 0x18, 0xa5, 0x62, 0x2e, 0xea, 0xca, 0x94, 0x9b, 0x41, 0xf1, 0x3f, 0x3c,
-	0xd8, 0x74, 0xb3, 0x49, 0x7e, 0x0c, 0x3b, 0x37, 0x5c, 0xd6, 0x22, 0x61, 0xd9, 0xb9, 0x58, 0x70,
-	0xdc, 0x58, 0xfd, 0x64, 0x4c, 0x57, 0xe4, 0xe4, 0x23, 0x18, 0x55, 0x85, 0xac, 0x0f, 0x96, 0xaa,
-	0x6a, 0xdf, 0x94, 0x65, 0x63, 0x87, 0x3c, 0x75, 0x2b, 0x59, 0x59, 0x8a, 0x7c, 0x6e, 0xb9, 0xd0,
-	0x62, 0xf2, 0x03, 0xd8, 0x9e, 0x89, 0xbb, 0xc7, 0x42, 0x56, 0xf5, 0x61, 0x91, 0x35, 0x8b, 0x5c,
-	0x55, 0xf0, 0x98, 0xde, 0x93, 0x3e, 0xf5, 0xc7, 0xde, 0xce, 0xe0, 0xa9, 0x3f, 0x0e, 0x76, 0x46,
-	0x71, 0x09, 0xdb, 0xfd, 0x9d, 0xb0, 0x2d, 0x6d, 0x10, 0x8a, 0x13, 0x74, 0x7a, 0x7b, 0x32, 0x32,
-	0x85, 0x49, 0x2a, 0xaa, 0x32, 0x63, 0x4b, 0x87, 0x36, 0x5c, 0x11, 0x72, 0xe0, 0x8d, 0xa8, 0xc4,
-	0x55, 0xa6, 0xa9, 0x7c, 0x4c, 0x2d, 0x8c, 0xe7, 0x10, 0xa8, 0xb2, 0x76, 0x48, 0x28, 0xb4, 0x24,
-	0xa4, 0xa8, 0x7f, 0xe0, 0x50, 0xff, 0x0e, 0x0c, 0x7f, 0xc5, 0xef, 0xcc, 0x6b, 0x80, 0xcb, 0x96,
-	0xaa, 0x7c, 0x87, 0xaa, 0x1e, 0x40, 0x70, 0xa9, 0xae, 0x5d, 0x53, 0x88, 0x06, 0xf1, 0x17, 0x30,
-	0xd2, 0x6d, 0xd1, 0x7a, 0xf6, 0x1c, 0xcf, 0x53, 0x98, 0xbc, 0x94, 0x82, 0xe7, 0xb5, 0x26, 0x1f,
-	0x73, 0x04, 0x47, 0x14, 0xff, 0xcd, 0x03, 0x5f, 0xdd, 0x52, 0x0c, 0x9b, 0x19, 0x9f, 0xb3, 0x64,
-	0x79, 0x50, 0x34, 0x79, 0x5a, 0x45, 0xde, 0x74, 0xb8, 0x3b, 0xa4, 0x3d, 0x19, 0x96, 0xc7, 0x95,
-	0xd6, 0x0e, 0xa6, 0xc3, 0xdd, 0x90, 0x1a, 0x84, 0xa1, 0x65, 0xec, 0x8a, 0x67, 0xe6, 0x08, 0x1a,
-	0xa0, 0x75, 0x29, 0xf9, 0x4c, 0xdc, 0x99, 0x63, 0x18, 0x84, 0xf2, 0xaa, 0x99, 0xa1, 0x5c, 0x9f,
-	0xc4, 0x20, 0x3c, 0xc0, 0x15, 0xab, 0x5a, 0x46, 0xc2, 0x35, 0x7a, 0xae, 0x12, 0x96, 0x59, 0x4a,
-	0xd2, 0x20, 0xfe, 0xa7, 0x87, 0x0f, 0x99, 0xa6, 0xd8, 0x95, 0x0c, 0x7f, 0x0b, 0xc6, 0x48, 0xbf,
-	0x5f, 0xde, 0x30, 0x69, 0x0e, 0xbc, 0x81, 0xf8, 0x92, 0x49, 0xf2, 0x33, 0x18, 0xa9, 0xe6, 0x58,
-	0x43, 0xf7, 0xd6, 0x9d, 0xca, 0x2a, 0x35, 0x66, 0x2d, 0x21, 0xfa, 0x0e, 0x21, 0xb6, 0x87, 0x0d,
-	0xdc, 0xc3, 0x7e, 0x08, 0x01, 0x32, 0xeb, 0x52, 0x45, 0xbf, 0xd6, 0xb3, 0xe6, 0x5f, 0x6d, 0x15,
-	0xcf, 0x61, 0xab, 0xb7, 0x63, 0xbb, 0x93, 0xd7, 0xdf, 0xa9, 0x6b, 0xf4, 0xd0, 0x34, 0x36, 0x36,
-	0x47, 0xc5, 0x33, 0x9e, 0xd4, 0x3c, 0x35, 0x55, 0xd7, 0x62, 0x4b, 0x16, 0x7e, 0x4b, 0x16, 0xf1,
-	0x9f, 0xbc, 0x6e, 0x27, 0x15, 0x01, 0x16, 0x6d, 0x52, 0x2c, 0x16, 0x2c, 0x4f, 0xcd, 0x66, 0x16,
-	0x62, 0x26, 0xd3, 0x2b, 0xb3, 0xd9, 0x20, 0xbd, 0x42, 0x2c, 0x4b, 0x73, 0xa7, 0x03, 0x59, 0x62,
-	0x35, 0x2d, 0x38, 0xab, 0x1a, 0xc9, 0x17, 0x3c, 0xaf, 0xcd, 0x2e, 0xae, 0x88, 0xbc, 0x07, 0x1b,
-	0x35, 0x9b, 0x7f, 0x89, 0x31, 0x98, 0xbb, 0xad, 0xd9, 0xfc, 0x19, 0x5f, 0x92, 0x0f, 0x20, 0x54,
-	0x0c, 0xaa, 0x54, 0xfa, 0x82, 0xc7, 0x4a, 0xf0, 0x8c, 0x2f, 0xe3, 0xbf, 0x0e, 0x60, 0x74, 0xc6,
-	0xe5, 0x0d, 0x97, 0x6f, 0xf5, 0x66, 0xbb, 0x93, 0xd2, 0xf0, 0x0d, 0x93, 0x92, 0xbf, 0x7e, 0x52,
-	0x0a, 0xba, 0x49, 0xe9, 0x01, 0x04, 0x67, 0x32, 0x39, 0x3e, 0x52, 0x11, 0x0d, 0xa9, 0x06, 0x58,
-	0x9f, 0xfb, 0x49, 0x2d, 0x6e, 0xb8, 0x19, 0x9f, 0x0c, 0x5a, 0x79, 0xca, 0xc7, 0x6b, 0x66, 0x96,
-	0xff, 0x75, 0x8a, 0xb2, 0x4d, 0x0b, 0x4e, 0xd3, 0xc6, 0xb0, 0x89, 0xa3, 0x54, 0xca, 0x6a, 0xf6,
-	0xf4, 0xec, 0xe5, 0x0b, 0x3b, 0x3f, 0xb9, 0xb2, 0xf8, 0x8f, 0x1e, 0x8c, 0x4e, 0xd8, 0xb2, 0x68,
-	0xea, 0x95, 0xfa, 0x9f, 0xc2, 0x64, 0xbf, 0x2c, 0x33, 0x91, 0xf4, 0x7a, 0xde, 0x11, 0xa1, 0xc5,
-	0x73, 0xe7, 0x1e, 0x75, 0x0e, 0x5d, 0x11, 0x3e, 0x31, 0x87, 0x6a, 0x2c, 0xd2, 0x33, 0x8e, 0xf3,
-	0xc4, 0xe8, 0x69, 0x48, 0x29, 0x31, 0xd9, 0xfb, 0x4d, 0x5d, 0xcc, 0xb2, 0xe2, 0x56, 0x65, 0x75,
-	0x4c, 0x5b, 0x1c, 0xff, 0x6b, 0x00, 0xfe, 0xd7, 0x35, 0xca, 0x6c, 0x82, 0x27, 0x4c, 0x51, 0x79,
-	0xa2, 0x1d, 0x6c, 0x36, 0x9c, 0xc1, 0x26, 0x82, 0x8d, 0xa5, 0x64, 0xf9, 0x9c, 0x57, 0xd1, 0x58,
-	0xf1, 0x9a, 0x85, 0x4a, 0xa3, 0x3a, 0x58, 0x4f, 0x34, 0x21, 0xb5, 0xb0, 0xed, 0x48, 0x70, 0x3a,
-	0xf2, 0xa7, 0x66, 0xf8, 0x99, 0xdc, 0x1f, 0x17, 0xd6, 0xcd, 0x3c, 0xff, 0xbf, 0x77, 0xfc, 0x3f,
-	0x1e, 0x04, 0x6d, 0xf3, 0x1e, 0xf6, 0x9b, 0xf7, 0xb0, 0x6b, 0xde, 0xa3, 0x03, 0xdb, 0xbc, 0x47,
-	0x07, 0x88, 0xe9, 0xa9, 0x6d, 0x5e, 0x7a, 0x8a, 0x97, 0xf5, 0x44, 0x16, 0x4d, 0x79, 0xb0, 0xd4,
-	0xb7, 0x1a, 0xd2, 0x16, 0x63, 0xc5, 0xff, 0xfa, 0x9a, 0x4b, 0x93, 0xea, 0x90, 0x1a, 0x84, 0xfd,
-	0x71, 0xa2, 0xa8, 0x4e, 0x27, 0x57, 0x03, 0xf2, 0x7d, 0x08, 0x28, 0x26, 0x4f, 0x65, 0xb8, 0x77,
-	0x2f, 0x4a, 0x4c, 0xb5, 0x16, 0x9d, 0xea, 0x4f, 0x22, 0xd3, 0x28, 0xf6, 0x03, 0xe9, 0x27, 0x30,
-	0x3a, 0xbb, 0x16, 0xb3, 0xda, 0x8e, 0x90, 0xdf, 0x74, 0xa8, 0x52, 0x2c, 0xb8, 0xd2, 0x51, 0x63,
-	0x12, 0xbf, 0x82, 0xb0, 0x15, 0x76, 0xe1, 0x78, 0x6e, 0x38, 0x04, 0xfc, 0x8b, 0x5c, 0xd4, 0x96,
-	0x22, 0x70, 0x8d, 0x87, 0x7d, 0xd5, 0xb0, 0xbc, 0x16, 0xf5, 0xd2, 0x52, 0x84, 0xc5, 0xf1, 0xc7,
-	0x26, 0x7c, 0x74, 0x77, 0x51, 0x96, 0x5c, 0x1a, 0xba, 0xd1, 0x40, 0x6d, 0x52, 0xdc, 0x72, 0xfd,
-	0x76, 0x0c, 0xa9, 0x06, 0xf1, 0x6f, 0x20, 0xdc, 0xcf, 0xb8, 0xac, 0x69, 0x93, 0xf1, 0x75, 0x6f,
-	0xba, 0x6a, 0x54, 0x13, 0x01, 0xae, 0x3b, 0x6a, 0x19, 0xde, 0xa3, 0x96, 0x67, 0xac, 0x64, 0xc7,
-	0x47, 0xaa, 0xce, 0x87, 0xd4, 0xa0, 0xf8, 0xcf, 0x1e, 0xf8, 0xc8, 0x61, 0x8e, 0x6b, 0xff, 0x4d,
-	0xfc, 0x77, 0x2a, 0x8b, 0x1b, 0x91, 0x72, 0x69, 0x0f, 0x67, 0xb1, 0x4a, 0x7a, 0x72, 0xcd, 0xdb,
-	0xd1, 0xc1, 0x20, 0xac, 0x35, 0xfc, 0x7e, 0xb2, 0xbd, 0xe4, 0xd4, 0x1a, 0x8a, 0xa9, 0x56, 0xe2,
-	0x78, 0x78, 0xd6, 0x94, 0x5c, 0xee, 0xa7, 0x0b, 0x61, 0xe7, 0x2a, 0x47, 0x12, 0x7f, 0xa1, 0xbf,
-	0xc8, 0x56, 0x98, 0xd0, 0x5b, 0xff, 0xf5, 0x76, 0x3f, 0xf2, 0xf8, 0x2f, 0x1e, 0x6c, 0x3c, 0x37,
-	0x73, 0x9c, 0x7b, 0x0a, 0xef, 0xb5, 0xa7, 0x18, 0xf4, 0x4e, 0xb1, 0x07, 0x0f, 0xac, 0x4d, 0x6f,
-	0x7f, 0x9d, 0x85, 0xb5, 0x3a, 0x93, 0x51, 0xbf, 0xbd, 0xac, 0xb7, 0xf9, 0x20, 0x3b, 0xef, 0xdb,
-	0xac, 0xbb, 0xf0, 0x95, 0x5b, 0x99, 0xc2, 0xc4, 0x7e, 0x88, 0x16, 0x99, 0x7d, 0x98, 0x5c, 0x51,
-	0xbc, 0x80, 0xd1, 0x61, 0x91, 0xcf, 0xc4, 0x9c, 0xec, 0x82, 0xbf, 0xdf, 0xd4, 0xd7, 0xca, 0xe3,
-	0x64, 0xef, 0x81, 0xd3, 0xf8, 0x4d, 0x7d, 0xad, 0x6d, 0xa8, 0xb2, 0x20, 0xbf, 0x84, 0xf0, 0xa4,
-	0x98, 0x5f, 0x0a, 0x6e, 0x2b, 0x72, 0xb2, 0xf7, 0x81, 0xf3, 0x41, 0x64, 0x55, 0x17, 0xc7, 0xe6,
-	0x57, 0x9d, 0x75, 0xfc, 0x19, 0x40, 0xe7, 0x0e, 0x1f, 0xa6, 0xee, 0x22, 0x5f, 0xf0, 0x5b, 0xac,
-	0xb6, 0xca, 0x7c, 0x01, 0xac, 0xd1, 0xc4, 0x4f, 0xe1, 0x1b, 0x2b, 0xde, 0xc9, 0x27, 0xc8, 0x3e,
-	0x38, 0x5d, 0xeb, 0xf1, 0xf0, 0xf5, 0xb1, 0xa0, 0x0d, 0xb5, 0xb6, 0xf1, 0xef, 0xef, 0xf9, 0x42,
-	0x69, 0x9b, 0x43, 0xef, 0x5e, 0x65, 0x17, 0x95, 0x68, 0xdf, 0xad, 0x80, 0xb6, 0x98, 0xfc, 0x1c,
-	0xc2, 0x47, 0x79, 0x52, 0xa4, 0x22, 0x9f, 0xdb, 0xf1, 0x2d, 0xea, 0x7d, 0x43, 0x36, 0x8b, 0xdc,
-	0x1a, 0xd0, 0xce, 0x34, 0x7e, 0x01, 0xdb, 0x7d, 0xe5, 0xda, 0x41, 0xb9, 0x1d, 0xae, 0x07, 0xce,
-	0x70, 0xdd, 0xc6, 0x38, 0x74, 0x6a, 0xf8, 0x73, 0x08, 0x0f, 0x1a, 0x91, 0xa5, 0xc7, 0xf9, 0xac,
-	0x40, 0x3a, 0xbe, 0xe4, 0xb2, 0xea, 0x7a, 0xc0, 0x42, 0x2c, 0x61, 0x64, 0xe6, 0x96, 0x97, 0x0c,
-	0xba, 0x1a, 0xa9, 0xbf, 0x8e, 0x3e, 0xfe, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xac, 0x1a, 0xa5,
-	0x85, 0x4c, 0x12, 0x00, 0x00,
+	// 1792 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x4b, 0x6f, 0xdc, 0xc8,
+	0x11, 0x06, 0x67, 0x86, 0xa3, 0x61, 0x8d, 0x24, 0x0b, 0x1d, 0x63, 0x97, 0xbb, 0x09, 0x82, 0x09,
+	0x91, 0x87, 0xf2, 0x58, 0x67, 0x21, 0x23, 0x0f, 0x2c, 0x76, 0x17, 0xd0, 0xc3, 0x76, 0x64, 0xcb,
+	0xb6, 0xdc, 0x92, 0x95, 0x53, 0x60, 0xb4, 0xc8, 0x9e, 0x99, 0x86, 0x39, 0x24, 0xd3, 0x24, 0x25,
+	0x31, 0xe7, 0xfc, 0x8e, 0x00, 0x01, 0x92, 0x7b, 0x10, 0xe4, 0x18, 0x20, 0xf7, 0xfc, 0x80, 0xfc,
+	0x95, 0x5c, 0x83, 0xea, 0x07, 0xd9, 0x94, 0xc6, 0x86, 0x03, 0x04, 0xb9, 0xf5, 0x57, 0x55, 0x53,
+	0x5d, 0x5d, 0x5d, 0xf5, 0x75, 0x71, 0x60, 0x5b, 0x64, 0x15, 0x97, 0x19, 0x4b, 0x1f, 0x14, 0x32,
+	0xaf, 0x72, 0x32, 0xb1, 0x38, 0xfa, 0xfd, 0x10, 0xc6, 0x67, 0x79, 0x2d, 0x63, 0x4e, 0xb6, 0x61,
+	0x70, 0x7c, 0x14, 0x7a, 0x33, 0x6f, 0x77, 0x48, 0x07, 0xc7, 0x47, 0x84, 0xc0, 0xe8, 0x05, 0x5b,
+	0xf1, 0x70, 0x30, 0xf3, 0x76, 0x03, 0xaa, 0xd6, 0x28, 0x3b, 0x6f, 0x0a, 0x1e, 0x0e, 0xb5, 0x0c,
+	0xd7, 0xe4, 0x53, 0x98, 0xbc, 0x2e, 0xd1, 0xdb, 0x8a, 0x87, 0x23, 0x25, 0x6f, 0x31, 0xea, 0x4e,
+	0x59, 0x59, 0x5e, 0xe7, 0x32, 0x09, 0x7d, 0xad, 0xb3, 0x98, 0xec, 0xc0, 0xf0, 0x35, 0x3d, 0x09,
+	0xc7, 0x4a, 0x8c, 0x4b, 0x12, 0xc2, 0xc6, 0x11, 0x9f, 0xb3, 0x3a, 0xad, 0xc2, 0x8d, 0x99, 0xb7,
+	0x3b, 0xa1, 0x16, 0xa2, 0x9f, 0x73, 0x9e, 0xf2, 0x85, 0x64, 0xf3, 0x70, 0xa2, 0xfd, 0x58, 0x4c,
+	0x1e, 0x00, 0x39, 0xce, 0x4a, 0x1e, 0xd7, 0x92, 0x9f, 0xbd, 0x15, 0xc5, 0x05, 0x97, 0x62, 0xde,
+	0x84, 0x81, 0x72, 0xb0, 0x46, 0x83, 0xbb, 0x3c, 0xe7, 0x15, 0xc3, 0xbd, 0x41, 0xb9, 0xb2, 0x90,
+	0x44, 0xb0, 0x79, 0xb6, 0x64, 0x92, 0x27, 0x67, 0x3c, 0x96, 0xbc, 0x0a, 0xa7, 0x4a, 0xdd, 0x93,
+	0xa1, 0xcd, 0x4b, 0xb9, 0x60, 0x99, 0xf8, 0x1d, 0xab, 0x44, 0x9e, 0x85, 0x9b, 0xda, 0xc6, 0x95,
+	0x61, 0x96, 0x68, 0x9e, 0xf2, 0x70, 0x4b, 0x67, 0x09, 0xd7, 0xe4, 0x5b, 0x10, 0x98, 0xc3, 0xd0,
+	0xd3, 0x70, 0x5b, 0x29, 0x3a, 0x41, 0xf4, 0x37, 0x0f, 0x82, 0x23, 0x56, 0x2e, 0x2f, 0x73, 0x26,
+	0x93, 0x0f, 0xba, 0x89, 0xcf, 0xc0, 0x8f, 0x79, 0x9a, 0x96, 0xe1, 0x70, 0x36, 0xdc, 0x9d, 0xee,
+	0x7d, 0xfc, 0xa0, 0xbd, 0xe2, 0xd6, 0xcf, 0x21, 0x4f, 0x53, 0xaa, 0xad, 0xc8, 0xe7, 0x10, 0x54,
+	0x7c, 0x55, 0xa4, 0xac, 0xe2, 0x65, 0x38, 0x52, 0x3f, 0x21, 0xdd, 0x4f, 0xce, 0x8d, 0x8a, 0x76,
+	0x46, 0x77, 0x0e, 0xea, 0xdf, 0x3d, 0x68, 0xf4, 0xaf, 0x11, 0x6c, 0xf5, 0xb6, 0x23, 0x9b, 0xe0,
+	0xdd, 0xa8, 0xc8, 0x7d, 0xea, 0xdd, 0x20, 0x6a, 0x54, 0xd4, 0x3e, 0xf5, 0x1a, 0x44, 0xd7, 0xaa,
+	0x72, 0x7c, 0xea, 0x5d, 0x23, 0x5a, 0xaa, 0x7a, 0xf1, 0xa9, 0xb7, 0x24, 0x3f, 0x84, 0x8d, 0xdf,
+	0xd6, 0x5c, 0x0a, 0x5e, 0x86, 0xbe, 0x8a, 0xee, 0x5e, 0x17, 0xdd, 0xab, 0x9a, 0xcb, 0x86, 0x5a,
+	0x3d, 0x66, 0x43, 0xd5, 0x9a, 0x2e, 0x1c, 0xb5, 0x46, 0x59, 0x85, 0x75, 0xb9, 0xa1, 0x65, 0xb8,
+	0x36, 0x59, 0xd4, 0xd5, 0x82, 0x59, 0xfc, 0x19, 0x8c, 0xd8, 0x0d, 0x2f, 0xc3, 0x40, 0xf9, 0xff,
+	0xce, 0x3b, 0x12, 0xf6, 0x60, 0xff, 0x86, 0x97, 0x8f, 0xb2, 0x4a, 0x36, 0x54, 0x99, 0x93, 0x1f,
+	0xc0, 0x38, 0xce, 0xd3, 0x5c, 0x96, 0x21, 0xdc, 0x0e, 0xec, 0x10, 0xe5, 0xd4, 0xa8, 0xc9, 0x2e,
+	0x8c, 0x53, 0xbe, 0xe0, 0x59, 0xa2, 0xea, 0x66, 0xba, 0xb7, 0xd3, 0x19, 0x9e, 0x28, 0x39, 0x35,
+	0x7a, 0xf2, 0x05, 0x6c, 0x56, 0xec, 0x32, 0xe5, 0x2f, 0x0b, 0xcc, 0x62, 0xa9, 0x6a, 0x68, 0xba,
+	0xf7, 0x91, 0x73, 0x1f, 0x8e, 0x96, 0xf6, 0x6c, 0xc9, 0x97, 0xb0, 0x39, 0x17, 0x3c, 0x4d, 0xec,
+	0x6f, 0xb7, 0x54, 0x50, 0x61, 0xf7, 0x5b, 0xca, 0x33, 0xb6, 0xc2, 0x5f, 0x3c, 0x46, 0x33, 0xda,
+	0xb3, 0x26, 0xdf, 0x06, 0xa8, 0xc4, 0x8a, 0x3f, 0xce, 0xe5, 0x8a, 0x55, 0xa6, 0x0c, 0x1d, 0x09,
+	0xf9, 0x0a, 0xb6, 0x12, 0x1e, 0x8b, 0x15, 0x4b, 0x4f, 0x53, 0x16, 0xf3, 0x32, 0xbc, 0xa7, 0x42,
+	0x73, 0xab, 0xcb, 0x55, 0xd3, 0xbe, 0xf5, 0xa7, 0x4f, 0x20, 0x68, 0xd3, 0x87, 0xfd, 0xfd, 0x96,
+	0x37, 0xaa, 0x18, 0x02, 0x8a, 0x4b, 0xf2, 0x5d, 0xf0, 0xaf, 0x58, 0x5a, 0xeb, 0x42, 0x9e, 0xee,
+	0x6d, 0x77, 0x5e, 0xf7, 0x6f, 0x44, 0x49, 0xb5, 0xf2, 0x8b, 0xc1, 0x2f, 0xbd, 0xe8, 0x09, 0x6c,
+	0xf5, 0x36, 0xc2, 0xc0, 0x45, 0xf9, 0x28, 0x9b, 0xe7, 0x32, 0xe6, 0x89, 0xf2, 0x39, 0xa1, 0x8e,
+	0x84, 0x7c, 0x04, 0xe3, 0x44, 0x2c, 0x44, 0x55, 0x9a, 0x72, 0x33, 0x28, 0xfa, 0xbb, 0x07, 0x9b,
+	0x6e, 0x36, 0xc9, 0x8f, 0x60, 0xe7, 0x8a, 0xcb, 0x4a, 0xc4, 0x2c, 0x3d, 0x17, 0x2b, 0x8e, 0x1b,
+	0xab, 0x9f, 0x4c, 0xe8, 0x1d, 0x39, 0xf9, 0x1c, 0xc6, 0x65, 0x2e, 0xab, 0x83, 0x46, 0x55, 0xed,
+	0xfb, 0xb2, 0x6c, 0xec, 0x90, 0xa7, 0xae, 0x25, 0x2b, 0x0a, 0x91, 0x2d, 0x2c, 0x17, 0x5a, 0x4c,
+	0xbe, 0x0f, 0xdb, 0x73, 0x71, 0xf3, 0x58, 0xc8, 0xb2, 0x3a, 0xcc, 0xd3, 0x7a, 0x95, 0xa9, 0x0a,
+	0x9e, 0xd0, 0x5b, 0xd2, 0xa7, 0xa3, 0x89, 0xb7, 0x33, 0x78, 0x3a, 0x9a, 0xf8, 0x3b, 0xe3, 0xa8,
+	0x80, 0xed, 0xfe, 0x4e, 0xd8, 0x96, 0x36, 0x08, 0xc5, 0x09, 0x3a, 0xbd, 0x3d, 0x19, 0x99, 0xc1,
+	0x34, 0x11, 0x65, 0x91, 0xb2, 0xc6, 0xa1, 0x0d, 0x57, 0x84, 0x1c, 0x78, 0x25, 0x4a, 0x71, 0x99,
+	0x6a, 0x2a, 0x9f, 0x50, 0x0b, 0xa3, 0x05, 0xf8, 0xaa, 0xac, 0x1d, 0x12, 0x0a, 0x2c, 0x09, 0x29,
+	0xea, 0x1f, 0x38, 0xd4, 0xbf, 0x03, 0xc3, 0x5f, 0xf1, 0x1b, 0xf3, 0x1a, 0xe0, 0xb2, 0xa5, 0xaa,
+	0x91, 0x43, 0x55, 0xf7, 0xc1, 0xbf, 0x50, 0xd7, 0xae, 0x29, 0x44, 0x83, 0xe8, 0x6b, 0x18, 0xeb,
+	0xb6, 0x68, 0x3d, 0x7b, 0x8e, 0xe7, 0x19, 0x4c, 0x5f, 0x4a, 0xc1, 0xb3, 0x4a, 0x93, 0x8f, 0x39,
+	0x82, 0x23, 0x8a, 0xfe, 0xea, 0xc1, 0x48, 0xdd, 0x52, 0x04, 0x9b, 0x29, 0x5f, 0xb0, 0xb8, 0x39,
+	0xc8, 0xeb, 0x2c, 0x29, 0x43, 0x6f, 0x36, 0xdc, 0x1d, 0xd2, 0x9e, 0x0c, 0xcb, 0xe3, 0x52, 0x6b,
+	0x07, 0xb3, 0xe1, 0x6e, 0x40, 0x0d, 0xc2, 0xd0, 0x52, 0x76, 0xc9, 0x53, 0x73, 0x04, 0x0d, 0xd0,
+	0xba, 0x90, 0x7c, 0x2e, 0x6e, 0xcc, 0x31, 0x0c, 0x42, 0x79, 0x59, 0xcf, 0x51, 0xae, 0x4f, 0x62,
+	0x10, 0x1e, 0xe0, 0x92, 0x95, 0x2d, 0x23, 0xe1, 0x1a, 0x3d, 0x97, 0x31, 0x4b, 0x2d, 0x25, 0x69,
+	0x10, 0xfd, 0xc3, 0xc3, 0x87, 0x4c, 0x53, 0xec, 0x9d, 0x0c, 0x7f, 0x02, 0x13, 0xa4, 0xdf, 0x37,
+	0x57, 0x4c, 0x9a, 0x03, 0x6f, 0x20, 0xbe, 0x60, 0x92, 0xfc, 0x14, 0xc6, 0xaa, 0x39, 0xd6, 0xd0,
+	0xbd, 0x75, 0xa7, 0xb2, 0x4a, 0x8d, 0x59, 0x4b, 0x88, 0x23, 0x87, 0x10, 0xdb, 0xc3, 0xfa, 0xee,
+	0x61, 0x3f, 0x03, 0x1f, 0x99, 0xb5, 0x51, 0xd1, 0xaf, 0xf5, 0xac, 0xf9, 0x57, 0x5b, 0x45, 0x0b,
+	0xd8, 0xea, 0xed, 0xd8, 0xee, 0xe4, 0xf5, 0x77, 0xea, 0x1a, 0x3d, 0x30, 0x8d, 0x8d, 0xcd, 0x51,
+	0xf2, 0x94, 0xc7, 0x15, 0x4f, 0x4c, 0xd5, 0xb5, 0xd8, 0x92, 0xc5, 0xa8, 0x25, 0x8b, 0xe8, 0x8f,
+	0x5e, 0xb7, 0x93, 0x8a, 0x00, 0x8b, 0x36, 0xce, 0x57, 0x2b, 0x96, 0x25, 0x66, 0x33, 0x0b, 0x31,
+	0x93, 0xc9, 0xa5, 0xd9, 0x6c, 0x90, 0x5c, 0x22, 0x96, 0x85, 0xb9, 0xd3, 0x81, 0x2c, 0xb0, 0x9a,
+	0x56, 0x9c, 0x95, 0xb5, 0xe4, 0x2b, 0x9e, 0x55, 0x66, 0x17, 0x57, 0x44, 0x3e, 0x86, 0x8d, 0x8a,
+	0x2d, 0xde, 0x60, 0x0c, 0xe6, 0x6e, 0x2b, 0xb6, 0x78, 0xc6, 0x1b, 0xf2, 0x4d, 0x08, 0x14, 0x83,
+	0x2a, 0x95, 0xbe, 0xe0, 0x89, 0x12, 0x3c, 0xe3, 0x4d, 0xf4, 0x97, 0x01, 0x8c, 0xcf, 0xb8, 0xbc,
+	0xe2, 0xf2, 0x83, 0xde, 0x6c, 0x77, 0x52, 0x1a, 0xbe, 0x67, 0x52, 0x1a, 0xad, 0x9f, 0x94, 0xfc,
+	0x6e, 0x52, 0xba, 0x0f, 0xfe, 0x99, 0x8c, 0x8f, 0x8f, 0x54, 0x44, 0x43, 0xaa, 0x01, 0xd6, 0xe7,
+	0x7e, 0x5c, 0x89, 0x2b, 0x6e, 0xc6, 0x27, 0x83, 0xee, 0x3c, 0xe5, 0x93, 0x35, 0x33, 0xcb, 0x7f,
+	0x3b, 0x45, 0xd9, 0xa6, 0x05, 0xa7, 0x69, 0x23, 0xd8, 0xc4, 0x51, 0x2a, 0x61, 0x15, 0x7b, 0x7a,
+	0xf6, 0xf2, 0x85, 0x9d, 0x9f, 0x5c, 0x59, 0xf4, 0x07, 0x0f, 0xc6, 0x27, 0xac, 0xc9, 0xeb, 0xea,
+	0x4e, 0xfd, 0xcf, 0x60, 0xba, 0x5f, 0x14, 0xa9, 0x88, 0x7b, 0x3d, 0xef, 0x88, 0xd0, 0xe2, 0xb9,
+	0x73, 0x8f, 0x3a, 0x87, 0xae, 0x08, 0x9f, 0x98, 0x43, 0x35, 0x16, 0xe9, 0x19, 0xc7, 0x79, 0x62,
+	0xf4, 0x34, 0xa4, 0x94, 0x98, 0xec, 0xfd, 0xba, 0xca, 0xe7, 0x69, 0x7e, 0xad, 0xb2, 0x3a, 0xa1,
+	0x2d, 0x8e, 0xfe, 0x39, 0x80, 0xd1, 0xff, 0x6b, 0x94, 0xd9, 0x04, 0x4f, 0x98, 0xa2, 0xf2, 0x44,
+	0x3b, 0xd8, 0x6c, 0x38, 0x83, 0x4d, 0x08, 0x1b, 0x8d, 0x64, 0xd9, 0x82, 0x97, 0xe1, 0x44, 0xf1,
+	0x9a, 0x85, 0x4a, 0xa3, 0x3a, 0x58, 0x4f, 0x34, 0x01, 0xb5, 0xb0, 0xed, 0x48, 0x70, 0x3a, 0xf2,
+	0x27, 0x66, 0xf8, 0x99, 0xde, 0x1e, 0x17, 0xd6, 0xcd, 0x3c, 0xff, 0xbb, 0x77, 0xfc, 0xdf, 0x1e,
+	0xf8, 0x6d, 0xf3, 0x1e, 0xf6, 0x9b, 0xf7, 0xb0, 0x6b, 0xde, 0xa3, 0x03, 0xdb, 0xbc, 0x47, 0x07,
+	0x88, 0xe9, 0xa9, 0x6d, 0x5e, 0x7a, 0x8a, 0x97, 0xf5, 0x44, 0xe6, 0x75, 0x71, 0xd0, 0xe8, 0x5b,
+	0x0d, 0x68, 0x8b, 0xb1, 0xe2, 0x7f, 0xbd, 0xe4, 0xd2, 0xa4, 0x3a, 0xa0, 0x06, 0x61, 0x7f, 0x9c,
+	0x28, 0xaa, 0xd3, 0xc9, 0xd5, 0x80, 0x7c, 0x0f, 0x7c, 0x8a, 0xc9, 0x53, 0x19, 0xee, 0xdd, 0x8b,
+	0x12, 0x53, 0xad, 0x45, 0xa7, 0xfa, 0x93, 0xc8, 0x34, 0x8a, 0xfd, 0x40, 0xfa, 0x31, 0x8c, 0xcf,
+	0x96, 0x62, 0x5e, 0xd9, 0x11, 0xf2, 0x1b, 0x0e, 0x55, 0x8a, 0x15, 0x57, 0x3a, 0x6a, 0x4c, 0xa2,
+	0x57, 0x10, 0xb4, 0xc2, 0x2e, 0x1c, 0xcf, 0x0d, 0x87, 0xc0, 0xe8, 0x75, 0x26, 0x2a, 0x4b, 0x11,
+	0xb8, 0xc6, 0xc3, 0xbe, 0xaa, 0x59, 0x56, 0x89, 0xaa, 0xb1, 0x14, 0x61, 0x71, 0xf4, 0xd0, 0x84,
+	0x8f, 0xee, 0x5e, 0x17, 0x05, 0x97, 0x86, 0x6e, 0x34, 0x50, 0x9b, 0xe4, 0xd7, 0x5c, 0xbf, 0x1d,
+	0x43, 0xaa, 0x41, 0xf4, 0x1b, 0x08, 0xf6, 0x53, 0x2e, 0x2b, 0x5a, 0xa7, 0x7c, 0xdd, 0x9b, 0xae,
+	0x1a, 0xd5, 0x44, 0x80, 0xeb, 0x8e, 0x5a, 0x86, 0xb7, 0xa8, 0xe5, 0x19, 0x2b, 0xd8, 0xf1, 0x91,
+	0xaa, 0xf3, 0x21, 0x35, 0x28, 0xfa, 0x93, 0x07, 0x23, 0xe4, 0x30, 0xc7, 0xf5, 0xe8, 0x7d, 0xfc,
+	0x77, 0x2a, 0xf3, 0x2b, 0x91, 0x70, 0x69, 0x0f, 0x67, 0xb1, 0x4a, 0x7a, 0xbc, 0xe4, 0xed, 0xe8,
+	0x60, 0x10, 0xd6, 0x1a, 0x7e, 0x3f, 0xd9, 0x5e, 0x72, 0x6a, 0x0d, 0xc5, 0x54, 0x2b, 0x71, 0x3c,
+	0x3c, 0xab, 0x0b, 0x2e, 0xf7, 0x93, 0x95, 0xb0, 0x73, 0x95, 0x23, 0x89, 0xbe, 0xd6, 0x5f, 0x64,
+	0x77, 0x98, 0xd0, 0x5b, 0xff, 0xf5, 0x76, 0x3b, 0xf2, 0xe8, 0xcf, 0x1e, 0x6c, 0x3c, 0x37, 0x73,
+	0x9c, 0x7b, 0x0a, 0xef, 0x9d, 0xa7, 0x18, 0xf4, 0x4e, 0xb1, 0x07, 0xf7, 0xad, 0x4d, 0x6f, 0x7f,
+	0x9d, 0x85, 0xb5, 0x3a, 0x93, 0xd1, 0x51, 0x7b, 0x59, 0x1f, 0xf2, 0x41, 0x76, 0xde, 0xb7, 0x59,
+	0x77, 0xe1, 0x77, 0x6e, 0x65, 0x06, 0x53, 0xfb, 0x21, 0x9a, 0xa7, 0xf6, 0x61, 0x72, 0x45, 0xd1,
+	0x5b, 0x18, 0x1f, 0xe6, 0xd9, 0x5c, 0x2c, 0xc8, 0x2e, 0x8c, 0xf6, 0xeb, 0x6a, 0xa9, 0x3c, 0x4e,
+	0xf7, 0xee, 0x3b, 0x8d, 0x5f, 0x57, 0x4b, 0x6d, 0x43, 0x95, 0x05, 0xf9, 0x05, 0x04, 0x27, 0xf9,
+	0xe2, 0x42, 0x70, 0x5b, 0x91, 0xd3, 0xbd, 0x4f, 0x9c, 0x0f, 0x22, 0xab, 0x32, 0xbf, 0xe9, 0x6c,
+	0xa3, 0x2f, 0x01, 0x3a, 0x67, 0xf8, 0x2c, 0x75, 0xd7, 0xf8, 0x82, 0x5f, 0x63, 0xad, 0x95, 0x66,
+	0xfe, 0x5f, 0xa3, 0x89, 0x1e, 0xc3, 0xbd, 0x5b, 0xbe, 0xc9, 0x43, 0x64, 0x1e, 0x9c, 0xac, 0xf5,
+	0x68, 0xf8, 0xae, 0x38, 0xd0, 0x82, 0x5a, 0xcb, 0xa8, 0xe9, 0xf9, 0x41, 0x59, 0x9b, 0x3b, 0xef,
+	0x56, 0x45, 0xe7, 0xa5, 0x68, 0xdf, 0x2b, 0x9f, 0xb6, 0x98, 0xfc, 0x1c, 0x82, 0x47, 0x59, 0x9c,
+	0x27, 0x22, 0x5b, 0xd8, 0xb1, 0x2d, 0xec, 0x7d, 0x3b, 0xd6, 0xab, 0xcc, 0x1a, 0xd0, 0xce, 0x34,
+	0x7a, 0x01, 0xdb, 0x7d, 0xe5, 0xda, 0x01, 0xb9, 0x1d, 0xaa, 0x07, 0xce, 0x50, 0xdd, 0xc6, 0x38,
+	0x74, 0x6a, 0xf7, 0x2b, 0x08, 0x0e, 0x6a, 0x91, 0x26, 0xc7, 0xd9, 0x3c, 0x47, 0x1a, 0xbe, 0xe0,
+	0xb2, 0xec, 0x6a, 0xdf, 0x42, 0x2c, 0x5d, 0x64, 0xe4, 0x96, 0x8f, 0x0c, 0xba, 0x1c, 0xab, 0xbf,
+	0x8c, 0x1e, 0xfe, 0x27, 0x00, 0x00, 0xff, 0xff, 0x2c, 0x2d, 0x1b, 0x8f, 0x44, 0x12, 0x00, 0x00,
 }
diff --git a/bolt/internal/internal.proto b/bolt/internal/internal.proto
index 4ef43786f..ffcf22f4c 100644
--- a/bolt/internal/internal.proto
+++ b/bolt/internal/internal.proto
@@ -208,18 +208,18 @@ message Organization {
 
 message Config {
 	AuthConfig Auth         					= 1; // Auth is the configuration for options that auth related
-	LogViewerUIConfig LogViewer                 = 2; // LogViewerUI is the configuration for the Log Viewer UI
+	LogViewerConfig LogViewer                   = 2; // LogViewer is the configuration for the Log Viewer 
 }
 
 message AuthConfig {
 	bool SuperAdminNewUsers   = 1; // SuperAdminNewUsers configuration option that specifies which users will auto become super admin
 }
 
-message LogViewerUIConfig {
-	repeated LogViewerUIColumn Columns               = 1; // Columns is the array of columns in the log viewer UI
+message LogViewerConfig {
+	repeated LogViewerColumn Columns               = 1; // Columns is the array of columns in the log viewer
 }
 
-message LogViewerUIColumn {
+message LogViewerColumn {
 	string Name                                      = 1; // Name is the unique identifier of the log viewer column
 	int32 Position                                   = 2; // Position is the position of the column in the log viewer's array of columns
 	repeated ColumnEncoding Encodings                = 3; // Encodings is the array of encoded properties associated with a log viewer column
diff --git a/chronograf.go b/chronograf.go
index 8f428bae4..eff45f14c 100644
--- a/chronograf.go
+++ b/chronograf.go
@@ -739,8 +739,8 @@ type OrganizationsStore interface {
 // Config is the global application Config for parameters that can be set via
 // API, with different sections, such as Auth
 type Config struct {
-	Auth      AuthConfig        `json:"auth"`
-	LogViewer LogViewerUIConfig `json:"logViewer"`
+	Auth      AuthConfig      `json:"auth"`
+	LogViewer LogViewerConfig `json:"logViewer"`
 }
 
 // AuthConfig is the global application config section for auth parameters
@@ -748,13 +748,13 @@ type AuthConfig struct {
 	SuperAdminNewUsers bool `json:"superAdminNewUsers"`
 }
 
-// LogViewerUIConfig is the config sections for log viewer section of the application
-type LogViewerUIConfig struct {
-	Columns []LogViewerUIColumn `json:"columns"`
+// LogViewerConfig is the config sections for log viewer section of the application
+type LogViewerConfig struct {
+	Columns []LogViewerColumn `json:"columns"`
 }
 
-// LogViewerUIColumn is a specific column of the log viewer UI
-type LogViewerUIColumn struct {
+// LogViewerColumn is a specific column of the log viewer UI
+type LogViewerColumn struct {
 	Name      string           `json:"name"`
 	Position  int32            `json:"position"`
 	Encodings []ColumnEncoding `json:"encodings"`
diff --git a/server/config.go b/server/config.go
index 3b6219e8e..559e5ea5d 100644
--- a/server/config.go
+++ b/server/config.go
@@ -36,17 +36,17 @@ func newAuthConfigResponse(config chronograf.Config) *authConfigResponse {
 	}
 }
 
-type logViewerUIResponse struct {
+type logViewerResponse struct {
 	Links selfLinks `json:"links"`
-	chronograf.LogViewerUIConfig
+	chronograf.LogViewerConfig
 }
 
-func newLogViewerUIConfigResponse(config chronograf.Config) *logViewerUIResponse {
-	return &logViewerUIResponse{
+func newLogViewerConfigResponse(config chronograf.Config) *logViewerResponse {
+	return &logViewerResponse{
 		Links: selfLinks{
 			Self: "/chronograf/v1/config/logviewer",
 		},
-		LogViewerUIConfig: config.LogViewer,
+		LogViewerConfig: config.LogViewer,
 	}
 }
 
@@ -69,8 +69,8 @@ func (s *Service) Config(w http.ResponseWriter, r *http.Request) {
 	encodeJSON(w, http.StatusOK, res, s.Logger)
 }
 
-// LogViewerUIConfig retrieves the log viewer UI section of the global application configuration
-func (s *Service) LogViewerUIConfig(w http.ResponseWriter, r *http.Request) {
+// LogViewerConfig retrieves the log viewer UI section of the global application configuration
+func (s *Service) LogViewerConfig(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 
 	config, err := s.Store.Config(ctx).Get(ctx)
@@ -84,21 +84,21 @@ func (s *Service) LogViewerUIConfig(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	res := newLogViewerUIConfigResponse(*config)
+	res := newLogViewerConfigResponse(*config)
 
 	encodeJSON(w, http.StatusOK, res, s.Logger)
 }
 
-// ReplaceLogViewerUIConfig replaces the log viewer UI section of the global application configuration
-func (s *Service) ReplaceLogViewerUIConfig(w http.ResponseWriter, r *http.Request) {
+// ReplaceLogViewerConfig replaces the log viewer UI section of the global application configuration
+func (s *Service) ReplaceLogViewerConfig(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 
-	var logViewerUIConfig chronograf.LogViewerUIConfig
-	if err := json.NewDecoder(r.Body).Decode(&logViewerUIConfig); err != nil {
+	var logViewerConfig chronograf.LogViewerConfig
+	if err := json.NewDecoder(r.Body).Decode(&logViewerConfig); err != nil {
 		invalidJSON(w, s.Logger)
 		return
 	}
-	if err := validLogViewerUIConfig(logViewerUIConfig); err != nil {
+	if err := validLogViewerConfig(logViewerConfig); err != nil {
 		Error(w, http.StatusBadRequest, err.Error(), s.Logger)
 		return
 	}
@@ -112,9 +112,9 @@ func (s *Service) ReplaceLogViewerUIConfig(w http.ResponseWriter, r *http.Reques
 		Error(w, http.StatusBadRequest, "Configuration object was nil", s.Logger)
 		return
 	}
-	config.LogViewer = logViewerUIConfig
+	config.LogViewer = logViewerConfig
 
-	res := newLogViewerUIConfigResponse(*config)
+	res := newLogViewerConfigResponse(*config)
 	if err := s.Store.Config(ctx).Update(ctx, config); err != nil {
 		unknownErrorWithMessage(w, err, s.Logger)
 		return
@@ -173,14 +173,14 @@ func (s *Service) ReplaceAuthConfig(w http.ResponseWriter, r *http.Request) {
 	encodeJSON(w, http.StatusOK, res, s.Logger)
 }
 
-// validLogViewerUIConfig ensures that the request body log viewer UI config is valid
+// validLogViewerConfig ensures that the request body log viewer UI config is valid
 // to be valid, it must: not be empty, have at least one column, not have multiple
 // columns with the same name or position value, each column must have a visbility
 // of either "visible" or "hidden" and if a column is of type severity, it must have
 // at least one severity format of type icon, text, or both
-func validLogViewerUIConfig(cfg chronograf.LogViewerUIConfig) error {
+func validLogViewerConfig(cfg chronograf.LogViewerConfig) error {
 	if len(cfg.Columns) == 0 {
-		return fmt.Errorf("Invalid log viewer UI config: must have at least 1 column")
+		return fmt.Errorf("Invalid log viewer config: must have at least 1 column")
 	}
 
 	nameMatcher := map[string]bool{}
@@ -193,11 +193,11 @@ func validLogViewerUIConfig(cfg chronograf.LogViewerUIConfig) error {
 
 		// check that each column has a unique value for the name and position properties
 		if _, ok := nameMatcher[clm.Name]; ok {
-			return fmt.Errorf("Invalid log viewer UI config: Duplicate column name %s", clm.Name)
+			return fmt.Errorf("Invalid log viewer config: Duplicate column name %s", clm.Name)
 		}
 		nameMatcher[clm.Name] = true
 		if _, ok := positionMatcher[clm.Position]; ok {
-			return fmt.Errorf("Invalid log viewer UI config: Multiple columns with same position value")
+			return fmt.Errorf("Invalid log viewer config: Multiple columns with same position value")
 		}
 		positionMatcher[clm.Position] = true
 
@@ -205,7 +205,7 @@ func validLogViewerUIConfig(cfg chronograf.LogViewerUIConfig) error {
 			if e.Type == "visibility" {
 				visibility++
 				if !(e.Value == "visible" || e.Value == "hidden") {
-					return fmt.Errorf("Invalid log viewer UI config: invalid visibility in column %s", clm.Name)
+					return fmt.Errorf("Invalid log viewer config: invalid visibility in column %s", clm.Name)
 				}
 			}
 
@@ -219,12 +219,12 @@ func validLogViewerUIConfig(cfg chronograf.LogViewerUIConfig) error {
 		}
 
 		if visibility != 1 {
-			return fmt.Errorf("Invalid log viewer UI config: missing visibility encoding in column %s", clm.Name)
+			return fmt.Errorf("Invalid log viewer config: missing visibility encoding in column %s", clm.Name)
 		}
 
 		if clm.Name == "severity" {
 			if iconCount+textCount == 0 || iconCount > 1 || textCount > 1 {
-				return fmt.Errorf("Invalid log viewer UI config: invalid number of severity format encodings in column %s", clm.Name)
+				return fmt.Errorf("Invalid log viewer config: invalid number of severity format encodings in column %s", clm.Name)
 			}
 		}
 	}
diff --git a/server/config_test.go b/server/config_test.go
index ea3180c98..f39b96500 100644
--- a/server/config_test.go
+++ b/server/config_test.go
@@ -35,8 +35,8 @@ func TestConfig(t *testing.T) {
 						Auth: chronograf.AuthConfig{
 							SuperAdminNewUsers: false,
 						},
-						LogViewer: chronograf.LogViewerUIConfig{
-							Columns: []chronograf.LogViewerUIColumn{
+						LogViewer: chronograf.LogViewerConfig{
+							Columns: []chronograf.LogViewerColumn{
 								{
 									Name:     "severity",
 									Position: 0,
@@ -242,7 +242,7 @@ func TestReplaceAuthConfig(t *testing.T) {
 	}
 }
 
-func TestLogViewerUIConfig(t *testing.T) {
+func TestLogViewerConfig(t *testing.T) {
 	type fields struct {
 		ConfigStore chronograf.ConfigStore
 	}
@@ -262,8 +262,8 @@ func TestLogViewerUIConfig(t *testing.T) {
 			fields: fields{
 				ConfigStore: &mocks.ConfigStore{
 					Config: &chronograf.Config{
-						LogViewer: chronograf.LogViewerUIConfig{
-							Columns: []chronograf.LogViewerUIColumn{
+						LogViewer: chronograf.LogViewerConfig{
+							Columns: []chronograf.LogViewerColumn{
 								{
 									Name:     "severity",
 									Position: 0,
@@ -309,7 +309,7 @@ func TestLogViewerUIConfig(t *testing.T) {
 			w := httptest.NewRecorder()
 			r := httptest.NewRequest("GET", "http://any.url", nil)
 
-			s.LogViewerUIConfig(w, r)
+			s.LogViewerConfig(w, r)
 
 			resp := w.Result()
 			content := resp.Header.Get("Content-Type")
@@ -328,7 +328,7 @@ func TestLogViewerUIConfig(t *testing.T) {
 	}
 }
 
-func TestReplaceLogViewerUIConfig(t *testing.T) {
+func TestReplaceLogViewerConfig(t *testing.T) {
 	type fields struct {
 		ConfigStore chronograf.ConfigStore
 	}
@@ -352,8 +352,8 @@ func TestReplaceLogViewerUIConfig(t *testing.T) {
 			fields: fields{
 				ConfigStore: &mocks.ConfigStore{
 					Config: &chronograf.Config{
-						LogViewer: chronograf.LogViewerUIConfig{
-							Columns: []chronograf.LogViewerUIColumn{
+						LogViewer: chronograf.LogViewerConfig{
+							Columns: []chronograf.LogViewerColumn{
 								{
 									Name:     "severity",
 									Position: 0,
@@ -379,8 +379,8 @@ func TestReplaceLogViewerUIConfig(t *testing.T) {
 				},
 			},
 			args: args{
-				payload: chronograf.LogViewerUIConfig{
-					Columns: []chronograf.LogViewerUIColumn{
+				payload: chronograf.LogViewerConfig{
+					Columns: []chronograf.LogViewerColumn{
 						{
 							Name:     "severity",
 							Position: 1,
@@ -433,8 +433,8 @@ func TestReplaceLogViewerUIConfig(t *testing.T) {
 			fields: fields{
 				ConfigStore: &mocks.ConfigStore{
 					Config: &chronograf.Config{
-						LogViewer: chronograf.LogViewerUIConfig{
-							Columns: []chronograf.LogViewerUIColumn{
+						LogViewer: chronograf.LogViewerConfig{
+							Columns: []chronograf.LogViewerColumn{
 								{
 									Name:     "severity",
 									Position: 0,
@@ -460,14 +460,14 @@ func TestReplaceLogViewerUIConfig(t *testing.T) {
 				},
 			},
 			args: args{
-				payload: chronograf.LogViewerUIConfig{
-					Columns: []chronograf.LogViewerUIColumn{},
+				payload: chronograf.LogViewerConfig{
+					Columns: []chronograf.LogViewerColumn{},
 				},
 			},
 			wants: wants{
 				statusCode:  400,
 				contentType: "application/json",
-				body:        `{"code":400,"message":"Invalid log viewer UI config: must have at least 1 column"}`,
+				body:        `{"code":400,"message":"Invalid log viewer config: must have at least 1 column"}`,
 			},
 		},
 		{
@@ -475,8 +475,8 @@ func TestReplaceLogViewerUIConfig(t *testing.T) {
 			fields: fields{
 				ConfigStore: &mocks.ConfigStore{
 					Config: &chronograf.Config{
-						LogViewer: chronograf.LogViewerUIConfig{
-							Columns: []chronograf.LogViewerUIColumn{
+						LogViewer: chronograf.LogViewerConfig{
+							Columns: []chronograf.LogViewerColumn{
 								{
 									Name:     "procid",
 									Position: 0,
@@ -493,8 +493,8 @@ func TestReplaceLogViewerUIConfig(t *testing.T) {
 				},
 			},
 			args: args{
-				payload: chronograf.LogViewerUIConfig{
-					Columns: []chronograf.LogViewerUIColumn{
+				payload: chronograf.LogViewerConfig{
+					Columns: []chronograf.LogViewerColumn{
 						{
 							Name:     "procid",
 							Position: 0,
@@ -521,7 +521,7 @@ func TestReplaceLogViewerUIConfig(t *testing.T) {
 			wants: wants{
 				statusCode:  400,
 				contentType: "application/json",
-				body:        `{"code":400,"message":"Invalid log viewer UI config: Duplicate column name procid"}`,
+				body:        `{"code":400,"message":"Invalid log viewer config: Duplicate column name procid"}`,
 			},
 		},
 		{
@@ -529,8 +529,8 @@ func TestReplaceLogViewerUIConfig(t *testing.T) {
 			fields: fields{
 				ConfigStore: &mocks.ConfigStore{
 					Config: &chronograf.Config{
-						LogViewer: chronograf.LogViewerUIConfig{
-							Columns: []chronograf.LogViewerUIColumn{
+						LogViewer: chronograf.LogViewerConfig{
+							Columns: []chronograf.LogViewerColumn{
 								{
 									Name:     "procid",
 									Position: 0,
@@ -547,8 +547,8 @@ func TestReplaceLogViewerUIConfig(t *testing.T) {
 				},
 			},
 			args: args{
-				payload: chronograf.LogViewerUIConfig{
-					Columns: []chronograf.LogViewerUIColumn{
+				payload: chronograf.LogViewerConfig{
+					Columns: []chronograf.LogViewerColumn{
 						{
 							Name:     "procid",
 							Position: 0,
@@ -575,7 +575,7 @@ func TestReplaceLogViewerUIConfig(t *testing.T) {
 			wants: wants{
 				statusCode:  400,
 				contentType: "application/json",
-				body:        `{"code":400,"message":"Invalid log viewer UI config: Multiple columns with same position value"}`,
+				body:        `{"code":400,"message":"Invalid log viewer config: Multiple columns with same position value"}`,
 			},
 		},
 		{
@@ -583,8 +583,8 @@ func TestReplaceLogViewerUIConfig(t *testing.T) {
 			fields: fields{
 				ConfigStore: &mocks.ConfigStore{
 					Config: &chronograf.Config{
-						LogViewer: chronograf.LogViewerUIConfig{
-							Columns: []chronograf.LogViewerUIColumn{
+						LogViewer: chronograf.LogViewerConfig{
+							Columns: []chronograf.LogViewerColumn{
 								{
 									Name:     "severity",
 									Position: 0,
@@ -606,8 +606,8 @@ func TestReplaceLogViewerUIConfig(t *testing.T) {
 				},
 			},
 			args: args{
-				payload: chronograf.LogViewerUIConfig{
-					Columns: []chronograf.LogViewerUIColumn{
+				payload: chronograf.LogViewerConfig{
+					Columns: []chronograf.LogViewerColumn{
 						{
 							Name:     "severity",
 							Position: 1,
@@ -634,7 +634,7 @@ func TestReplaceLogViewerUIConfig(t *testing.T) {
 			wants: wants{
 				statusCode:  400,
 				contentType: "application/json",
-				body:        `{"code":400,"message":"Invalid log viewer UI config: missing visibility encoding in column severity"}`,
+				body:        `{"code":400,"message":"Invalid log viewer config: missing visibility encoding in column severity"}`,
 			},
 		},
 	}
@@ -653,7 +653,7 @@ func TestReplaceLogViewerUIConfig(t *testing.T) {
 			buf, _ := json.Marshal(tt.args.payload)
 			r.Body = ioutil.NopCloser(bytes.NewReader(buf))
 
-			s.ReplaceLogViewerUIConfig(w, r)
+			s.ReplaceLogViewerConfig(w, r)
 
 			resp := w.Result()
 			content := resp.Header.Get("Content-Type")
diff --git a/server/mux.go b/server/mux.go
index 0cccd383e..4be204c38 100644
--- a/server/mux.go
+++ b/server/mux.go
@@ -313,8 +313,8 @@ func NewMux(opts MuxOpts, service Service) http.Handler {
 
 	// Global application config for Chronograf
 	router.GET("/chronograf/v1/config", EnsureSuperAdmin(service.Config))
-	router.GET("/chronograf/v1/config/logviewer", EnsureViewer(service.LogViewerUIConfig))
-	router.PUT("/chronograf/v1/config/logviewer", EnsureEditor(service.ReplaceLogViewerUIConfig))
+	router.GET("/chronograf/v1/config/logviewer", EnsureViewer(service.LogViewerConfig))
+	router.PUT("/chronograf/v1/config/logviewer", EnsureEditor(service.ReplaceLogViewerConfig))
 	router.GET("/chronograf/v1/config/auth", EnsureSuperAdmin(service.AuthConfig))
 	router.PUT("/chronograf/v1/config/auth", EnsureSuperAdmin(service.ReplaceAuthConfig))
 
diff --git a/server/swagger.json b/server/swagger.json
index a2af65873..82ecc3290 100644
--- a/server/swagger.json
+++ b/server/swagger.json
@@ -2876,7 +2876,7 @@
             "schema": {
               "oneOf": [
                 {
-                  "$ref": "#/definitions/LogViewerUIConfig"
+                  "$ref": "#/definitions/LogViewerConfig"
                 },
                 {
                   "$ref": "#/definitions/AuthConfig"
@@ -2920,7 +2920,7 @@
             "schema": {
               "oneOf": [
                 {
-                  "$ref": "#/definitions/LogViewerUIConfig"
+                  "$ref": "#/definitions/LogViewerConfig"
                 },
                 {
                   "$ref": "#/definitions/AuthConfig"
@@ -2932,11 +2932,11 @@
         ],
         "responses": {
           "200": {
-            "description": "Returns an object with the updated UI settings for a specific section",
+            "description": "Returns an object with the updated settings for a specific section",
             "schema": {
               "oneOf": [
                 {
-                  "$ref": "#/definitions/LogViewerUIConfig"
+                  "$ref": "#/definitions/LogViewerConfig"
                 }
               ]
             }
@@ -5144,7 +5144,7 @@
         }
       }
     },
-    "LogViewerUIColumn": {
+    "LogViewerColumn": {
       "description": "Contains the settings for the log viewer page UI",
       "type": "object",
       "required": [
@@ -5215,7 +5215,7 @@
         ]
       }
     },
-    "LogViewerUIConfig": {
+    "LogViewerConfig": {
       "description": "Contains the settings for the log viewer page UI",
       "type": "object",
       "required": ["columns"],
@@ -5224,7 +5224,7 @@
           "description": "Defines the order, names, and visibility of columns in the log viewer table",
           "type": "array",
           "items": {
-            "$ref": "#/definitions/LogViewerUIColumn"
+            "$ref": "#/definitions/LogViewerColumn"
           }
         }
       },