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

Merge pull request #2973 from influxdata/features/insecure-skip-verfiy-kapacitor 

Unsafe SSL kapacitor insecure skip verify
pull/10616/head
Andrew Watkins 2018-03-15 09:21:17 -07:00 committed by GitHub
parent 88a2007ab1 ffea906eb8
commit a8d55591b2
19 changed files with 328 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -22,3 +22,4 @@ chronograf*.db
*_gen.go
canned/apps_gen.go
npm-debug.log
yarn-error.log

11
CHANGELOG.md
View File

@ -2,9 +2,12 @@
### Features
1. [#2973](https://github.com/influxdata/chronograf/pull/2973): Add unsafe SSL to Kapacitor UI configuration
### UI Improvements
### Bug Fixes
1. [#2911](https://github.com/influxdata/chronograf/pull/2911): Fix Heroku OAuth
1. [#2953](https://github.com/influxdata/chronograf/pull/2953): Fix error reporting in DataExplorer
1. [#2947](https://github.com/influxdata/chronograf/pull/2947): Fix Okta oauth2 provider support
@ -18,11 +21,11 @@
1. [#2910](https://github.com/influxdata/chronograf/pull/2910): Redesign system notifications
### Bug Fixes
1. [#2866](https://github.com/influxdata/chronograf/pull/2866): Change hover text on delete mappings confirmation button to 'Delete'
1. [#2911](https://github.com/influxdata/chronograf/pull/2911): Fix Heroku OAuth
1. [#2859](https://github.com/influxdata/chronograf/pull/2859): Enable Mappings save button when valid
1. [#2933](https://github.com/influxdata/chronograf/pull/2933): Include url in Kapacitor connection creation requests
1. [#2866](https://github.com/influxdata/chronograf/pull/2866): Change hover text on delete mappings confirmation button to 'Delete'
1. [#2911](https://github.com/influxdata/chronograf/pull/2911): Fix Heroku OAuth
1. [#2859](https://github.com/influxdata/chronograf/pull/2859): Enable Mappings save button when valid
1. [#2933](https://github.com/influxdata/chronograf/pull/2933): Include url in Kapacitor connection creation requests
## v1.4.2.1 [2018-02-28]

18
bolt/internal/internal.go
View File

@ -75,14 +75,15 @@ func UnmarshalSource(data []byte, s *chronograf.Source) error {
// MarshalServer encodes a server to binary protobuf format.
func MarshalServer(s chronograf.Server) ([]byte, error) {
return proto.Marshal(&Server{
ID: int64(s.ID),
SrcID: int64(s.SrcID),
Name: s.Name,
Username: s.Username,
Password: s.Password,
URL: s.URL,
Active: s.Active,
Organization: s.Organization,
ID: int64(s.ID),
SrcID: int64(s.SrcID),
Name: s.Name,
Username: s.Username,
Password: s.Password,
URL: s.URL,
Active: s.Active,
Organization: s.Organization,
InsecureSkipVerify: s.InsecureSkipVerify,
})
}
@ -101,6 +102,7 @@ func UnmarshalServer(data []byte, s *chronograf.Server) error {
s.URL = pb.URL
s.Active = pb.Active
s.Organization = pb.Organization
s.InsecureSkipVerify = pb.InsecureSkipVerify
return nil
}

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

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

1
bolt/internal/internal.proto
View File

@ -109,6 +109,7 @@ message 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
}
message Layout {

13
bolt/internal/internal_test.go
View File

@ -76,12 +76,13 @@ func TestMarshalSourceWithSecret(t *testing.T) {
func TestMarshalServer(t *testing.T) {
v := chronograf.Server{
ID: 12,
SrcID: 2,
Name: "Fountain of Truth",
Username: "docbrown",
Password: "1 point twenty-one g1g@w@tts",
URL: "http://oldmanpeabody.mall.io:9092",
ID: 12,
SrcID: 2,
Name: "Fountain of Truth",
Username: "docbrown",
Password: "1 point twenty-one g1g@w@tts",
URL: "http://oldmanpeabody.mall.io:9092",
InsecureSkipVerify: true,
}
var vv chronograf.Server

30
bolt/servers_test.go
View File

@ -20,22 +20,24 @@ func TestServerStore(t *testing.T) {
srcs := []chronograf.Server{
chronograf.Server{
Name: "Of Truth",
SrcID: 10,
Username: "marty",
Password: "I❤️ jennifer parker",
URL: "toyota-hilux.lyon-estates.local",
Active: false,
Organization: "133",
Name: "Of Truth",
SrcID: 10,
Username: "marty",
Password: "I❤️ jennifer parker",
URL: "toyota-hilux.lyon-estates.local",
Active: false,
Organization: "133",
InsecureSkipVerify: true,
},
chronograf.Server{
Name: "HipToBeSquare",
SrcID: 12,
Username: "calvinklein",
Password: "chuck b3rry",
URL: "toyota-hilux.lyon-estates.local",
Active: false,
Organization: "133",
Name: "HipToBeSquare",
SrcID: 12,
Username: "calvinklein",
Password: "chuck b3rry",
URL: "toyota-hilux.lyon-estates.local",
Active: false,
Organization: "133",
InsecureSkipVerify: false,
},
}

6
integrations/server_test.go
View File

@ -164,7 +164,8 @@ func TestServer(t *testing.T) {
"id": "5000",
"name": "Kapa 1",
"url": "http://localhost:9092",
"active": true,
"active": true,
"insecureSkipVerify": false,
"links": {
"proxy": "/chronograf/v1/sources/5000/kapacitors/5000/proxy",
"self": "/chronograf/v1/sources/5000/kapacitors/5000",
@ -222,7 +223,8 @@ func TestServer(t *testing.T) {
"id": "5000",
"name": "Kapa 1",
"url": "http://localhost:9092",
"active": true,
"active": true,
"insecureSkipVerify": false,
"links": {
"proxy": "/chronograf/v1/sources/5000/kapacitors/5000/proxy",
"self": "/chronograf/v1/sources/5000/kapacitors/5000",

6
server/kapacitors.go
View File

@ -16,7 +16,7 @@ type postKapacitorRequest struct {
URL *string `json:"url"` // URL for the kapacitor backend (e.g. http://localhost:9092);/ Required: true
Username string `json:"username,omitempty"` // Username for authentication to kapacitor
Password string `json:"password,omitempty"`
InsecureSkipVerify bool `json:"insecureSkipVerify,omitempty"` // InsecureSkipVerify as true means any certificate presented by the kapacitor is accepted.
InsecureSkipVerify bool `json:"insecureSkipVerify"` // InsecureSkipVerify as true means any certificate presented by the kapacitor is accepted.
Active bool `json:"active"`
Organization string `json:"organization"` // Organization is the organization ID that resource belongs to
}
@ -55,7 +55,7 @@ type kapacitor struct {
URL string `json:"url"` // URL for the kapacitor backend (e.g. http://localhost:9092)
Username string `json:"username,omitempty"` // Username for authentication to kapacitor
Password string `json:"password,omitempty"`
InsecureSkipVerify bool `json:"insecureSkipVerify,omitempty"` // InsecureSkipVerify as true means any certificate presented by the kapacitor is accepted.
InsecureSkipVerify bool `json:"insecureSkipVerify"` // InsecureSkipVerify as true means any certificate presented by the kapacitor is accepted.
Active bool `json:"active"`
Links kapaLinks `json:"links"` // Links are URI locations related to kapacitor
}
@ -225,7 +225,7 @@ type patchKapacitorRequest struct {
URL *string `json:"url,omitempty"` // URL for the kapacitor
Username *string `json:"username,omitempty"` // Username for kapacitor auth
Password *string `json:"password,omitempty"`
InsecureSkipVerify *bool `json:"insecureSkipVerify,omitempty"` // InsecureSkipVerify as true means any certificate presented by the kapacitor is accepted.
InsecureSkipVerify *bool `json:"insecureSkipVerify"` // InsecureSkipVerify as true means any certificate presented by the kapacitor is accepted.
Active *bool `json:"active"`
}

44
ui/mocks/dummy.ts
View File

@ -1,7 +1,51 @@
export const source = {
id: '2',
name: 'minikube-influx',
type: 'influx',
url: 'http://192.168.99.100:30400',
default: true,
telegraf: 'telegraf',
organization: 'default',
role: 'viewer',
links: {
self: '/chronograf/v1/sources/2',
kapacitors: '/chronograf/v1/sources/2/kapacitors',
proxy: '/chronograf/v1/sources/2/proxy',
queries: '/chronograf/v1/sources/2/queries',
write: '/chronograf/v1/sources/2/write',
permissions: '/chronograf/v1/sources/2/permissions',
users: '/chronograf/v1/sources/2/users',
databases: '/chronograf/v1/sources/2/dbs',
annotations: '/chronograf/v1/sources/2/annotations',
},
}
export const kapacitor = {
id: '1',
name: 'Test Kapacitor',
url: 'http://localhost:9092',
insecureSkipVerify: false,
active: true,
links: {
self: '/chronograf/v1/sources/47/kapacitors/1',
proxy: '/chronograf/v1/sources/47/kapacitors/1/proxy',
},
}
export const createKapacitorBody = {
name: 'Test Kapacitor',
url: 'http://localhost:9092',
insecureSkipVerify: false,
username: 'user',
password: 'pass',
}
export const updateKapacitorBody = {
name: 'Test Kapacitor',
url: 'http://localhost:9092',
insecureSkipVerify: false,
username: 'user',
password: 'pass',
active: true,
links: {
self: '/chronograf/v1/sources/47/kapacitors/1',

0
ui/mocks/shared/apis/index.js → ui/mocks/shared/apis/index.ts
View File

1
ui/mocks/utils/ajax.ts Normal file
View File

@ -0,0 +1 @@
export default jest.fn(() => Promise.resolve())

21
ui/src/kapacitor/components/KapacitorForm.tsx
View File

@ -4,6 +4,7 @@ import AlertOutputs from 'src/kapacitor/components/AlertOutputs'
import FancyScrollbar from 'src/shared/components/FancyScrollbar'
import Input from 'src/kapacitor/components/KapacitorFormInput'
import {insecureSkipVerifyText} from 'src/shared/copy/tooltipText'
import {Kapacitor, Source} from 'src/types'
export interface Notification {
@ -22,6 +23,7 @@ interface Props {
onReset: (e: MouseEvent<HTMLButtonElement>) => void
onSubmit: (e: ChangeEvent<HTMLFormElement>) => void
onInputChange: (e: ChangeEvent<HTMLInputElement>) => void
onCheckboxChange: (e: ChangeEvent<HTMLInputElement>) => void
onChangeUrl: (e: ChangeEvent<HTMLInputElement>) => void
source: Source
hash: string
@ -32,10 +34,11 @@ const KapacitorForm: SFC<Props> = ({
onChangeUrl,
onReset,
kapacitor,
kapacitor: {url, name, username, password},
kapacitor: {url, name, username, password, insecureSkipVerify},
onSubmit,
exists,
onInputChange,
onCheckboxChange,
source,
hash,
notify,
@ -92,6 +95,22 @@ const KapacitorForm: SFC<Props> = ({
inputType="password"
/>
</div>
{url.startsWith('https') &&
<div className="form-group col-xs-12">
<div className="form-control-static">
<input
type="checkbox"
id="insecureSkipVerifyCheckbox"
name="insecureSkipVerify"
checked={insecureSkipVerify}
onChange={onCheckboxChange}
/>
<label htmlFor="insecureSkipVerifyCheckbox">Unsafe SSL</label>
</div>
<label className="form-helper">
{insecureSkipVerifyText}
</label>
</div>}
<div className="form-group form-group-submit col-xs-12 text-center">
<button
className="btn btn-default"

35
ui/src/kapacitor/containers/KapacitorPage.tsx
View File

@ -44,6 +44,7 @@ interface Kapacitor {
username: string
password: string
active: boolean
insecureSkipVerify: boolean
links: {
self: string
}
@ -67,17 +68,8 @@ export class KapacitorPage extends PureComponent<Props, State> {
constructor(props) {
super(props)
this.state = {
kapacitor: {
url: this.parseKapacitorURL(),
name: defaultName,
username: '',
password: '',
active: false,
links: {
self: '',
},
},
exists: false,
kapacitor: this.defaultKapacitor,
exists: false
}
this.handleSubmit = this.handleSubmit.bind(this)
@ -99,6 +91,17 @@ export class KapacitorPage extends PureComponent<Props, State> {
}
}
handleCheckboxChange = (e: ChangeEvent<HTMLInputElement>) => {
const {checked} = e.target
this.setState({
kapacitor: {
...this.state.kapacitor,
insecureSkipVerify: checked
}
})
}
handleInputChange = (e: ChangeEvent<HTMLInputElement>) => {
const {value, name} = e.target
@ -159,18 +162,21 @@ export class KapacitorPage extends PureComponent<Props, State> {
handleResetToDefaults = e => {
e.preventDefault()
const defaultState = {
this.setState({kapacitor: {...this.defaultKapacitor}})
}
private get defaultKapacitor() {
return {
url: this.parseKapacitorURL(),
name: defaultName,
username: '',
password: '',
active: false,
insecureSkipVerify: false,
links: {
self: '',
},
}
this.setState({kapacitor: {...defaultState}})
}
private checkKapacitorConnection = async (kapacitor: Kapacitor) => {
@ -207,6 +213,7 @@ export class KapacitorPage extends PureComponent<Props, State> {
onReset={this.handleResetToDefaults}
onInputChange={this.handleInputChange}
notify={notify}
onCheckboxChange={this.handleCheckboxChange}
/>
)
}

5
ui/src/shared/apis/index.js
View File

@ -104,7 +104,7 @@ export const deleteKapacitor = async kapacitor => {
export function createKapacitor(
source,
{url, name = 'My Kapacitor', username, password}
{url, name = 'My Kapacitor', username, password, insecureSkipVerify}
) {
return AJAX({
url: source.links.kapacitors,
@ -114,6 +114,7 @@ export function createKapacitor(
url,
username,
password,
insecureSkipVerify,
},
})
}
@ -125,6 +126,7 @@ export function updateKapacitor({
username,
password,
active,
insecureSkipVerify,
}) {
return AJAX({
url: links.self,
@ -135,6 +137,7 @@ export function updateKapacitor({
username,
password,
active,
insecureSkipVerify,
},
})
}

1
ui/src/types/sources.tsx
View File

@ -31,6 +31,7 @@ export interface Kapacitor {
name: string
username?: string
password?: string
insecureSkipVerify: boolean
active: boolean
links: {
self: string

52
ui/test/kapacitor/containers/KapacitorPage.test.tsx
View File

@ -57,19 +57,53 @@ describe('Kapacitor.Containers.KapacitorPage', () => {
describe('user interactions ', () => {
describe('entering the url', () => {
it('renders the text that is inputted', () => {
const {wrapper} = setup()
const value = '/new/url'
const event = {target: {value}}
describe('with a http url', () => {
it('renders the text that is inputted', () => {
const {wrapper} = setup()
const value = 'http://example.com'
const event = {target: {value}}
let inputElement = wrapper.find('#kapaUrl')
let inputElement = wrapper.find('#kapaUrl')
inputElement.simulate('change', event)
wrapper.update()
inputElement.simulate('change', event)
inputElement = wrapper.find('#kapaUrl')
inputElement = wrapper.find('#kapaUrl')
const secureCheckbox = wrapper.find('#insecureSkipVerifyCheckbox')
expect(inputElement.prop('value')).toBe(value)
expect(secureCheckbox.exists()).toBe(false)
expect(inputElement.prop('value')).toBe(value)
})
})
describe('with a https url', () => {
let inputElement, secureCheckbox, wrapper
const value = 'https://example.com'
beforeEach(() => {
wrapper = setup().wrapper
const event = {target: {value}}
inputElement = wrapper.find('#kapaUrl')
inputElement.simulate('change', event)
inputElement = wrapper.find('#kapaUrl')
secureCheckbox = wrapper.find('#insecureSkipVerifyCheckbox')
})
describe('checking the insecure skip verify checkbox', () => {
it("changes the state", () => {
const checked = true
const event = {target: {checked}}
secureCheckbox.simulate('change', event)
secureCheckbox = wrapper.find('#insecureSkipVerifyCheckbox')
expect(secureCheckbox.prop('checked')).toBe(true)
})
})
it('renders the https secure checkbox', () => {
expect(secureCheckbox.exists()).toBe(true)
expect(inputElement.prop('value')).toBe(value)
})
})
})

1
ui/test/resources.ts
View File

@ -54,6 +54,7 @@ export const kapacitor = {
username: 'influx',
password: '',
active: false,
insecureSkipVerify: false,
links: {
self: '/kapa/1',
proxy: '/proxy/kapacitor/1',

42
ui/test/shared/apis/index.test.ts Normal file
View File

@ -0,0 +1,42 @@
import {createKapacitor, updateKapacitor} from 'src/shared/apis'
import {
source,
kapacitor,
updateKapacitorBody,
createKapacitorBody,
} from 'mocks/dummy'
import AJAX from 'src/utils/ajax'
jest.mock('src/utils/ajax', () => require('mocks/utils/ajax'))
describe('Shared.Apis', () => {
afterEach(() => {
jest.clearAllMocks()
})
describe('createKapacitor', () => {
it('is called with the expected body', () => {
createKapacitor(source, createKapacitorBody)
expect(AJAX).toHaveBeenCalledWith({
url: source.links.kapacitors,
method: 'POST',
data: createKapacitorBody,
})
})
})
describe('updateKapacitor', () => {
it('is called with the expected body', () => {
updateKapacitor(updateKapacitorBody)
let data = {...updateKapacitorBody}
delete data.links
expect(AJAX).toHaveBeenCalledWith({
url: kapacitor.links.self,
method: 'PATCH',
data,
})
})
})
})