Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(server/services): add generic services scoped under server

pull/10616/head
Chris Goller 2018-05-16 18:04:52 -05:00 committed by Andrew Watkins
parent 179e4259c6
commit b3de8947a4
9 changed files with 469 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bolt/internal/internal.go
View File

@ -86,6 +86,7 @@ func MarshalServer(s chronograf.Server) ([]byte, error) {
Active: s.Active,
Organization: s.Organization,
InsecureSkipVerify: s.InsecureSkipVerify,
Type: s.Type,
})
}
@ -105,6 +106,7 @@ func UnmarshalServer(data []byte, s *chronograf.Server) error {
s.Active = pb.Active
s.Organization = pb.Organization
s.InsecureSkipVerify = pb.InsecureSkipVerify
s.Type = pb.Type
return nil
}

220
bolt/internal/internal.pb.go
View File

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

17
bolt/internal/internal.proto
View File

@ -112,15 +112,16 @@ message TemplateQuery {
}
message Server {
int64 ID = 1; // ID is the unique ID of the server
string Name = 2; // Name is the user-defined name for the server
string Username = 3; // Username is the username to connect to the server
int64 ID = 1; // ID is the unique ID of the server
string Name = 2; // Name is the user-defined name for the server
string Username = 3; // Username is the username to connect to the server
string Password = 4;
string URL = 5; // URL is the path to the server
int64 SrcID = 6; // SrcID is the ID of the data source
bool Active = 7; // is this the currently active server for the source
string Organization = 8; // Organization is the organization ID that resource belongs to
bool InsecureSkipVerify = 9; // InsecureSkipVerify accepts any certificate from the client
string URL = 5; // URL is the path to the server
int64 SrcID = 6; // SrcID is the ID of the data source
bool Active = 7; // is this the currently active server for the source
string Organization = 8; // Organization is the organization ID that resource belongs to
bool InsecureSkipVerify = 9; // InsecureSkipVerify accepts any certificate from the client
string Type = 10; // Type is the kind of the server (e.g. ifql)
}
message Layout {

1
chronograf.go
View File

@ -368,6 +368,7 @@ type Server struct {
InsecureSkipVerify bool `json:"insecureSkipVerify"` // InsecureSkipVerify as true means any certificate presented by the server is accepted.
Active bool `json:"active"` // Is this the active server for the source?
Organization string `json:"organization"` // Organization is the organization ID that resource belongs to
Type string `json:"type"` // Type is the kind of service (e.g. kapacitor or ifql)
}
// ServersStore stores connection information for a `Server`

8
server/kapacitors.go
View File

@ -154,7 +154,7 @@ func (s *Service) Kapacitors(w http.ResponseWriter, r *http.Request) {
srvs := []kapacitor{}
for _, srv := range mrSrvs {
if srv.SrcID == srcID {
if srv.SrcID == srcID && srv.Type == "" {
srvs = append(srvs, newKapacitor(srv))
}
}
@ -182,7 +182,7 @@ func (s *Service) KapacitorsID(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
srv, err := s.Store.Servers(ctx).Get(ctx, id)
if err != nil || srv.SrcID != srcID {
if err != nil || srv.SrcID != srcID || srv.Type != "" {
notFound(w, id, s.Logger)
return
}
@ -207,7 +207,7 @@ func (s *Service) RemoveKapacitor(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
srv, err := s.Store.Servers(ctx).Get(ctx, id)
if err != nil || srv.SrcID != srcID {
if err != nil || srv.SrcID != srcID || srv.Type != "" {
notFound(w, id, s.Logger)
return
}
@ -258,7 +258,7 @@ func (s *Service) UpdateKapacitor(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
srv, err := s.Store.Servers(ctx).Get(ctx, id)
if err != nil || srv.SrcID != srcID {
if err != nil || srv.SrcID != srcID || srv.Type != "" {
notFound(w, id, s.Logger)
return
}

21
server/mux.go
View File

@ -203,6 +203,19 @@ func NewMux(opts MuxOpts, service Service) http.Handler {
router.DELETE("/chronograf/v1/sources/:id/roles/:rid", EnsureEditor(service.RemoveSourceRole))
router.PATCH("/chronograf/v1/sources/:id/roles/:rid", EnsureEditor(service.UpdateSourceRole))
// Services are resources that chronograf proxies to
router.GET("/chronograf/v1/sources/:id/services", EnsureViewer(service.Services))
router.POST("/chronograf/v1/sources/:id/services", EnsureEditor(service.NewService))
router.GET("/chronograf/v1/sources/:id/services/:kid", EnsureViewer(service.ServiceID))
router.PATCH("/chronograf/v1/sources/:id/services/:kid", EnsureEditor(service.UpdateService))
router.DELETE("/chronograf/v1/sources/:id/services/:kid", EnsureEditor(service.RemoveService))
// Service Proxy
router.GET("/chronograf/v1/sources/:id/services/:kid/proxy", EnsureViewer(service.ProxyGet))
router.POST("/chronograf/v1/sources/:id/services/:kid/proxy", EnsureEditor(service.ProxyPost))
router.PATCH("/chronograf/v1/sources/:id/services/:kid/proxy", EnsureEditor(service.ProxyPatch))
router.DELETE("/chronograf/v1/sources/:id/services/:kid/proxy", EnsureEditor(service.ProxyDelete))
// Kapacitor
router.GET("/chronograf/v1/sources/:id/kapacitors", EnsureViewer(service.Kapacitors))
router.POST("/chronograf/v1/sources/:id/kapacitors", EnsureEditor(service.NewKapacitor))
@ -221,10 +234,10 @@ func NewMux(opts MuxOpts, service Service) http.Handler {
router.DELETE("/chronograf/v1/sources/:id/kapacitors/:kid/rules/:tid", EnsureEditor(service.KapacitorRulesDelete))
// Kapacitor Proxy
router.GET("/chronograf/v1/sources/:id/kapacitors/:kid/proxy", EnsureViewer(service.KapacitorProxyGet))
router.POST("/chronograf/v1/sources/:id/kapacitors/:kid/proxy", EnsureEditor(service.KapacitorProxyPost))
router.PATCH("/chronograf/v1/sources/:id/kapacitors/:kid/proxy", EnsureEditor(service.KapacitorProxyPatch))
router.DELETE("/chronograf/v1/sources/:id/kapacitors/:kid/proxy", EnsureEditor(service.KapacitorProxyDelete))
router.GET("/chronograf/v1/sources/:id/kapacitors/:kid/proxy", EnsureViewer(service.ProxyGet))
router.POST("/chronograf/v1/sources/:id/kapacitors/:kid/proxy", EnsureEditor(service.ProxyPost))
router.PATCH("/chronograf/v1/sources/:id/kapacitors/:kid/proxy", EnsureEditor(service.ProxyPatch))
router.DELETE("/chronograf/v1/sources/:id/kapacitors/:kid/proxy", EnsureEditor(service.ProxyDelete))
// Layouts
router.GET("/chronograf/v1/layouts", EnsureViewer(service.Layouts))

28
server/proxy.go
View File

@ -11,8 +11,8 @@ import (
"time"
)
// KapacitorProxy proxies requests to kapacitor using the path query parameter.
func (s *Service) KapacitorProxy(w http.ResponseWriter, r *http.Request) {
// Proxy proxies requests to services using the path query parameter.
func (s *Service) Proxy(w http.ResponseWriter, r *http.Request) {
srcID, err := paramID("id", r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error(), s.Logger)
@ -88,24 +88,24 @@ func (s *Service) KapacitorProxy(w http.ResponseWriter, r *http.Request) {
proxy.ServeHTTP(w, r)
}
// KapacitorProxyPost proxies POST to kapacitor
func (s *Service) KapacitorProxyPost(w http.ResponseWriter, r *http.Request) {
s.KapacitorProxy(w, r)
// ProxyPost proxies POST to service
func (s *Service) ProxyPost(w http.ResponseWriter, r *http.Request) {
s.Proxy(w, r)
}
// KapacitorProxyPatch proxies PATCH to kapacitor
func (s *Service) KapacitorProxyPatch(w http.ResponseWriter, r *http.Request) {
s.KapacitorProxy(w, r)
// ProxyPatch proxies PATCH to Service
func (s *Service) ProxyPatch(w http.ResponseWriter, r *http.Request) {
s.Proxy(w, r)
}
// KapacitorProxyGet proxies GET to kapacitor
func (s *Service) KapacitorProxyGet(w http.ResponseWriter, r *http.Request) {
s.KapacitorProxy(w, r)
// ProxyGet proxies GET to service
func (s *Service) ProxyGet(w http.ResponseWriter, r *http.Request) {
s.Proxy(w, r)
}
// KapacitorProxyDelete proxies DELETE to kapacitor
func (s *Service) KapacitorProxyDelete(w http.ResponseWriter, r *http.Request) {
s.KapacitorProxy(w, r)
// ProxyDelete proxies DELETE to service
func (s *Service) ProxyDelete(w http.ResponseWriter, r *http.Request) {
s.Proxy(w, r)
}
func singleJoiningSlash(a, b string) string {

306
server/services.go Normal file
View File

@ -0,0 +1,306 @@
package server
import (
"encoding/json"
"fmt"
"net/http"
"net/url"
"github.com/influxdata/chronograf"
)
type postServiceRequest struct {
Name *string `json:"name"` // User facing name of service instance.; Required: true
URL *string `json:"url"` // URL for the service backend (e.g. http://localhost:9092);/ Required: true
Type *string `json:"type"` // Type is the kind of service (e.g. ifql); Required
Username string `json:"username,omitempty"` // Username for authentication to service
Password string `json:"password,omitempty"`
InsecureSkipVerify bool `json:"insecureSkipVerify"` // InsecureSkipVerify as true means any certificate presented by the service is accepted.
Organization string `json:"organization"` // Organization is the organization ID that resource belongs to
}
func (p *postServiceRequest) Valid(defaultOrgID string) error {
if p.Name == nil || p.URL == nil {
return fmt.Errorf("name and url required")
}
if p.Type == nil {
return fmt.Errorf("type required")
}
if p.Organization == "" {
p.Organization = defaultOrgID
}
url, err := url.ParseRequestURI(*p.URL)
if err != nil {
return fmt.Errorf("invalid source URI: %v", err)
}
if len(url.Scheme) == 0 {
return fmt.Errorf("Invalid URL; no URL scheme defined")
}
return nil
}
type serviceLinks struct {
Proxy string `json:"proxy"` // URL location of proxy endpoint for this source
Self string `json:"self"` // Self link mapping to this resource
}
type service struct {
ID int `json:"id,string"` // Unique identifier representing a service instance.
Name string `json:"name"` // User facing name of service instance.
URL string `json:"url"` // URL for the service backend (e.g. http://localhost:9092)
Username string `json:"username,omitempty"` // Username for authentication to service
Password string `json:"password,omitempty"`
InsecureSkipVerify bool `json:"insecureSkipVerify"` // InsecureSkipVerify as true means any certificate presented by the service is accepted.
Type string `json:"type"` // Type is the kind of service (e.g. ifql)
Links serviceLinks `json:"links"` // Links are URI locations related to service
}
// NewService adds valid service store store.
func (s *Service) NewService(w http.ResponseWriter, r *http.Request) {
srcID, err := paramID("id", r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error(), s.Logger)
return
}
ctx := r.Context()
_, err = s.Store.Sources(ctx).Get(ctx, srcID)
if err != nil {
notFound(w, srcID, s.Logger)
return
}
var req postServiceRequest
if err = json.NewDecoder(r.Body).Decode(&req); err != nil {
invalidJSON(w, s.Logger)
return
}
defaultOrg, err := s.Store.Organizations(ctx).DefaultOrganization(ctx)
if err != nil {
unknownErrorWithMessage(w, err, s.Logger)
return
}
if err := req.Valid(defaultOrg.ID); err != nil {
invalidData(w, err, s.Logger)
return
}
srv := chronograf.Server{
SrcID: srcID,
Name: *req.Name,
Username: req.Username,
Password: req.Password,
InsecureSkipVerify: req.InsecureSkipVerify,
URL: *req.URL,
Organization: req.Organization,
Type: *req.Type,
}
if srv, err = s.Store.Servers(ctx).Add(ctx, srv); err != nil {
msg := fmt.Errorf("Error storing service %v: %v", req, err)
unknownErrorWithMessage(w, msg, s.Logger)
return
}
res := newService(srv)
location(w, res.Links.Self)
encodeJSON(w, http.StatusCreated, res, s.Logger)
}
func newService(srv chronograf.Server) service {
httpAPISrcs := "/chronograf/v1/sources"
return service{
ID: srv.ID,
Name: srv.Name,
Username: srv.Username,
URL: srv.URL,
InsecureSkipVerify: srv.InsecureSkipVerify,
Type: srv.Type,
Links: serviceLinks{
Self: fmt.Sprintf("%s/%d/services/%d", httpAPISrcs, srv.SrcID, srv.ID),
Proxy: fmt.Sprintf("%s/%d/services/%d/proxy", httpAPISrcs, srv.SrcID, srv.ID),
},
}
}
type services struct {
Services []service `json:"services"`
}
// Services retrieves all services from store.
func (s *Service) Services(w http.ResponseWriter, r *http.Request) {
srcID, err := paramID("id", r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error(), s.Logger)
return
}
ctx := r.Context()
mrSrvs, err := s.Store.Servers(ctx).All(ctx)
if err != nil {
Error(w, http.StatusInternalServerError, "Error loading services", s.Logger)
return
}
srvs := []service{}
for _, srv := range mrSrvs {
if srv.SrcID == srcID && srv.Type != "" {
srvs = append(srvs, newService(srv))
}
}
res := services{
Services: srvs,
}
encodeJSON(w, http.StatusOK, res, s.Logger)
}
// ServiceID retrieves a service with ID from store.
func (s *Service) ServiceID(w http.ResponseWriter, r *http.Request) {
id, err := paramID("kid", r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error(), s.Logger)
return
}
srcID, err := paramID("id", r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error(), s.Logger)
return
}
ctx := r.Context()
srv, err := s.Store.Servers(ctx).Get(ctx, id)
if err != nil || srv.SrcID != srcID || srv.Type == "" {
notFound(w, id, s.Logger)
return
}
res := newService(srv)
encodeJSON(w, http.StatusOK, res, s.Logger)
}
// RemoveService deletes service from store.
func (s *Service) RemoveService(w http.ResponseWriter, r *http.Request) {
id, err := paramID("kid", r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error(), s.Logger)
return
}
srcID, err := paramID("id", r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error(), s.Logger)
return
}
ctx := r.Context()
srv, err := s.Store.Servers(ctx).Get(ctx, id)
if err != nil || srv.SrcID != srcID || srv.Type == "" {
notFound(w, id, s.Logger)
return
}
if err = s.Store.Servers(ctx).Delete(ctx, srv); err != nil {
unknownErrorWithMessage(w, err, s.Logger)
return
}
w.WriteHeader(http.StatusNoContent)
}
type patchServiceRequest struct {
Name *string `json:"name,omitempty"` // User facing name of service instance.
Type *string `json:"type,omitempty"` // Type is the kind of service (e.g. ifql)
URL *string `json:"url,omitempty"` // URL for the service
Username *string `json:"username,omitempty"` // Username for service auth
Password *string `json:"password,omitempty"`
InsecureSkipVerify *bool `json:"insecureSkipVerify"` // InsecureSkipVerify as true means any certificate presented by the service is accepted.
}
func (p *patchServiceRequest) Valid() error {
if p.URL != nil {
url, err := url.ParseRequestURI(*p.URL)
if err != nil {
return fmt.Errorf("invalid source URI: %v", err)
}
if len(url.Scheme) == 0 {
return fmt.Errorf("Invalid URL; no URL scheme defined")
}
}
if p.Type != nil && *p.Type == "" {
return fmt.Errorf("Invalid type; type must not be an empty string")
}
return nil
}
// UpdateService incrementally updates a service definition in the store
func (s *Service) UpdateService(w http.ResponseWriter, r *http.Request) {
id, err := paramID("kid", r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error(), s.Logger)
return
}
srcID, err := paramID("id", r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error(), s.Logger)
return
}
ctx := r.Context()
srv, err := s.Store.Servers(ctx).Get(ctx, id)
if err != nil || srv.SrcID != srcID || srv.Type == "" {
notFound(w, id, s.Logger)
return
}
var req patchServiceRequest
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
invalidJSON(w, s.Logger)
return
}
if err := req.Valid(); err != nil {
invalidData(w, err, s.Logger)
return
}
if req.Name != nil {
srv.Name = *req.Name
}
if req.Type != nil {
srv.Type = *req.Type
}
if req.URL != nil {
srv.URL = *req.URL
}
if req.Password != nil {
srv.Password = *req.Password
}
if req.Username != nil {
srv.Username = *req.Username
}
if req.InsecureSkipVerify != nil {
srv.InsecureSkipVerify = *req.InsecureSkipVerify
}
if err := s.Store.Servers(ctx).Update(ctx, srv); err != nil {
msg := fmt.Sprintf("Error updating service ID %d", id)
Error(w, http.StatusInternalServerError, msg, s.Logger)
return
}
res := newService(srv)
encodeJSON(w, http.StatusOK, res, s.Logger)
}

2
server/sources.go
View File

@ -17,6 +17,7 @@ import (
type sourceLinks struct {
Self string `json:"self"` // Self link mapping to this resource
Kapacitors string `json:"kapacitors"` // URL for kapacitors endpoint
Services string `json:"services"` // URL for services endpoint
Proxy string `json:"proxy"` // URL for proxy endpoint
Queries string `json:"queries"` // URL for the queries analysis endpoint
Write string `json:"write"` // URL for the write line-protocol endpoint
@ -49,6 +50,7 @@ func newSourceResponse(src chronograf.Source) sourceResponse {
Links: sourceLinks{
Self: fmt.Sprintf("%s/%d", httpAPISrcs, src.ID),
Kapacitors: fmt.Sprintf("%s/%d/kapacitors", httpAPISrcs, src.ID),
Services: fmt.Sprintf("%s/%d/services", httpAPISrcs, src.ID),
Proxy: fmt.Sprintf("%s/%d/proxy", httpAPISrcs, src.ID),
Queries: fmt.Sprintf("%s/%d/queries", httpAPISrcs, src.ID),
Write: fmt.Sprintf("%s/%d/write", httpAPISrcs, src.ID),