From 923a9d3c31b6c09930351673277b58b7bfa25a0e Mon Sep 17 00:00:00 2001 From: Chris Goller Date: Fri, 18 Nov 2016 13:13:32 -0600 Subject: [PATCH] Update sources endpoint to take optional telegraf database name. --- bolt/internal/internal.go | 2 + bolt/internal/internal.pb.go | 72 +++++++++++++++++----------------- bolt/internal/internal.proto | 1 + bolt/internal/internal_test.go | 1 + chronograf.go | 1 + server/sources.go | 14 +++++++ server/sources_test.go | 58 +++++++++++++++++++++++++++ server/swagger.json | 5 +++ 8 files changed, 119 insertions(+), 35 deletions(-) create mode 100644 server/sources_test.go diff --git a/bolt/internal/internal.go b/bolt/internal/internal.go index 2e6bbfb0c..71a268866 100644 --- a/bolt/internal/internal.go +++ b/bolt/internal/internal.go @@ -51,6 +51,7 @@ func MarshalSource(s chronograf.Source) ([]byte, error) { Password: s.Password, URL: s.URL, Default: s.Default, + Telegraf: s.Telegraf, }) } @@ -68,6 +69,7 @@ func UnmarshalSource(data []byte, s *chronograf.Source) error { s.Password = pb.Password s.URL = pb.URL s.Default = pb.Default + s.Telegraf = pb.Telegraf return nil } diff --git a/bolt/internal/internal.pb.go b/bolt/internal/internal.pb.go index a4aee6b59..719a6036b 100644 --- a/bolt/internal/internal.pb.go +++ b/bolt/internal/internal.pb.go @@ -57,6 +57,7 @@ type Source struct { Password string `protobuf:"bytes,5,opt,name=Password,json=password,proto3" json:"Password,omitempty"` URL string `protobuf:"bytes,6,opt,name=URL,json=uRL,proto3" json:"URL,omitempty"` Default bool `protobuf:"varint,7,opt,name=Default,json=default,proto3" json:"Default,omitempty"` + Telegraf string `protobuf:"bytes,8,opt,name=Telegraf,json=telegraf,proto3" json:"Telegraf,omitempty"` } func (m *Source) Reset() { *m = Source{} } @@ -157,39 +158,40 @@ func init() { func init() { proto.RegisterFile("internal.proto", fileDescriptorInternal) } var fileDescriptorInternal = []byte{ - // 529 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x93, 0x4d, 0xae, 0xd3, 0x30, - 0x10, 0x80, 0xe5, 0x26, 0xce, 0x8f, 0x8b, 0x0a, 0xb2, 0x10, 0x8a, 0x10, 0x8b, 0x2a, 0x62, 0x51, - 0x36, 0x6f, 0x01, 0x27, 0x68, 0x1b, 0x84, 0x0a, 0xa5, 0xaf, 0xb8, 0x54, 0xac, 0x58, 0x98, 0xc4, - 0xd0, 0x40, 0xfe, 0x70, 0x6c, 0xda, 0x6c, 0xd9, 0xc2, 0x31, 0xb8, 0x01, 0x17, 0x44, 0xe3, 0x3a, - 0xa4, 0x12, 0xe8, 0xe9, 0x2d, 0xbf, 0x99, 0x49, 0xfc, 0xcd, 0x8c, 0x4d, 0x26, 0x79, 0xa5, 0x84, - 0xac, 0x78, 0x71, 0xd5, 0xc8, 0x5a, 0xd5, 0x34, 0xe8, 0x39, 0xfe, 0x8d, 0xc8, 0xf8, 0xf9, 0xa9, - 0x29, 0x6a, 0xc9, 0x55, 0x5e, 0x57, 0x74, 0x42, 0x46, 0xab, 0x24, 0x42, 0x53, 0x34, 0x73, 0xd8, - 0x28, 0x4f, 0x28, 0x25, 0xee, 0x86, 0x97, 0x22, 0x1a, 0x4d, 0xd1, 0x2c, 0x64, 0x6e, 0xc5, 0x4b, - 0x41, 0x1f, 0x10, 0x6f, 0xdf, 0x0a, 0xb9, 0x4a, 0x22, 0xc7, 0xd4, 0x79, 0xda, 0x10, 0xd4, 0x26, - 0x5c, 0xf1, 0xc8, 0x3d, 0xd7, 0x66, 0x5c, 0x71, 0xfa, 0x88, 0x84, 0x4b, 0x29, 0xb8, 0x12, 0xd9, - 0x5c, 0x45, 0xd8, 0x94, 0x87, 0x69, 0x1f, 0x80, 0xec, 0xbe, 0xc9, 0x6c, 0xd6, 0x3b, 0x67, 0x75, - 0x1f, 0xa0, 0x11, 0xf1, 0x13, 0xf1, 0x91, 0xeb, 0x42, 0x45, 0xfe, 0x14, 0xcd, 0x02, 0xe6, 0x67, - 0x67, 0x8c, 0x7f, 0x21, 0xe2, 0xed, 0x6a, 0x2d, 0x53, 0x71, 0x2b, 0x61, 0x4a, 0xdc, 0xb7, 0x5d, - 0x23, 0x8c, 0x6e, 0xc8, 0x5c, 0xd5, 0x35, 0x82, 0x3e, 0x24, 0x01, 0x34, 0x01, 0x79, 0x2b, 0x1c, - 0x68, 0xcb, 0x90, 0xdb, 0xf2, 0xb6, 0x3d, 0xd6, 0x32, 0x33, 0xce, 0x21, 0x0b, 0x1a, 0xcb, 0xf4, - 0x1e, 0x71, 0xf6, 0x6c, 0x6d, 0x64, 0x43, 0xe6, 0x68, 0xb6, 0xbe, 0x41, 0xf3, 0x27, 0x68, 0x0a, - 0xf9, 0x4d, 0xc8, 0x5b, 0x69, 0x5e, 0x2a, 0x39, 0x37, 0x28, 0xb9, 0xff, 0x57, 0xc2, 0x83, 0xd2, - 0x7d, 0x82, 0x77, 0x32, 0x5d, 0x25, 0x76, 0xa6, 0xb8, 0x05, 0x88, 0xbf, 0x23, 0xe2, 0xad, 0x79, - 0x57, 0x6b, 0x75, 0xa1, 0x13, 0x1a, 0x9d, 0x29, 0x19, 0xcf, 0x9b, 0xa6, 0xc8, 0x53, 0x73, 0x0b, - 0xac, 0xd5, 0x98, 0x0f, 0x21, 0xa8, 0x78, 0x2d, 0x78, 0xab, 0xa5, 0x28, 0x45, 0xa5, 0xac, 0xdf, - 0xb8, 0x1c, 0x42, 0xf4, 0x31, 0xc1, 0x4b, 0x51, 0x14, 0x6d, 0xe4, 0x4e, 0x9d, 0xd9, 0xf8, 0xe9, - 0xe4, 0xea, 0xef, 0xa5, 0x83, 0x30, 0xc3, 0x29, 0x24, 0xe3, 0x1f, 0x88, 0xb8, 0xc0, 0xf4, 0x0e, - 0x41, 0x27, 0x63, 0x80, 0x19, 0x3a, 0x01, 0x75, 0xe6, 0x58, 0xcc, 0x50, 0x07, 0x74, 0x34, 0x47, - 0x60, 0x86, 0x8e, 0x40, 0x07, 0xd3, 0x34, 0x66, 0xe8, 0x40, 0x9f, 0x10, 0xff, 0xab, 0x16, 0x32, - 0x17, 0x6d, 0x84, 0xcd, 0x41, 0x77, 0x87, 0x83, 0xde, 0x68, 0x21, 0x3b, 0xd6, 0xe7, 0xe1, 0xc3, - 0xdc, 0x6e, 0x0a, 0xe5, 0x30, 0x72, 0x33, 0x5a, 0x7f, 0x18, 0x79, 0xac, 0x09, 0x36, 0xdf, 0xc0, - 0x12, 0x97, 0x75, 0x59, 0xf2, 0x2a, 0xb3, 0x53, 0xf1, 0xd3, 0x33, 0xc2, 0xa8, 0x92, 0x85, 0x9d, - 0xc8, 0x28, 0x5b, 0x00, 0xb3, 0xad, 0xed, 0x7f, 0x24, 0xb7, 0xb0, 0x99, 0x17, 0xb2, 0xd6, 0xcd, - 0xa2, 0x3b, 0x77, 0x1e, 0xb2, 0xe0, 0x93, 0x65, 0x78, 0x29, 0xef, 0x0e, 0x42, 0x5a, 0xd5, 0x90, - 0x79, 0x47, 0x43, 0xf1, 0x7b, 0x12, 0xce, 0x0b, 0x21, 0x15, 0xd3, 0x85, 0xf8, 0x67, 0x17, 0x94, - 0xb8, 0x2f, 0x77, 0xd7, 0x9b, 0xfe, 0x6a, 0x7c, 0xde, 0x5d, 0x6f, 0x86, 0x85, 0x3a, 0x17, 0x0b, - 0x85, 0xdf, 0xbf, 0xe2, 0x0d, 0x5f, 0x25, 0x66, 0x3a, 0x0e, 0xf3, 0xbe, 0x18, 0xfa, 0xe0, 0x99, - 0x57, 0xfe, 0xec, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x6c, 0x02, 0xe9, 0x30, 0xf7, 0x03, 0x00, - 0x00, + // 547 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x94, 0xcd, 0x8e, 0xd3, 0x3e, + 0x10, 0xc0, 0xe5, 0x26, 0xce, 0x87, 0xfb, 0xd7, 0xfe, 0x91, 0x85, 0x50, 0x84, 0x38, 0x54, 0x11, + 0x87, 0x72, 0xd9, 0x03, 0x3c, 0x41, 0xdb, 0x20, 0x54, 0x28, 0xdd, 0xe2, 0x6e, 0xc5, 0x89, 0x83, + 0x49, 0x66, 0xb7, 0x81, 0x7c, 0xe1, 0xd8, 0xb4, 0xb9, 0x72, 0x85, 0xb7, 0xe1, 0x05, 0x78, 0x34, + 0x64, 0xc7, 0x25, 0x95, 0xf8, 0xd0, 0x1e, 0x7f, 0x33, 0x13, 0xfb, 0x37, 0x33, 0x6e, 0xc9, 0x45, + 0x5e, 0x49, 0x10, 0x15, 0x2f, 0x2e, 0x1b, 0x51, 0xcb, 0x9a, 0x06, 0x27, 0x8e, 0xbf, 0x23, 0x32, + 0x7e, 0x7e, 0x6c, 0x8a, 0x5a, 0x70, 0x99, 0xd7, 0x15, 0xbd, 0x20, 0xa3, 0x65, 0x12, 0xa1, 0x09, + 0x9a, 0x3a, 0x6c, 0x94, 0x27, 0x94, 0x12, 0x77, 0xcd, 0x4b, 0x88, 0x46, 0x13, 0x34, 0x0d, 0x99, + 0x5b, 0xf1, 0x12, 0xe8, 0x03, 0xe2, 0xed, 0x5a, 0x10, 0xcb, 0x24, 0x72, 0x4c, 0x9d, 0xa7, 0x0c, + 0xe9, 0xda, 0x84, 0x4b, 0x1e, 0xb9, 0x7d, 0x6d, 0xc6, 0x25, 0xa7, 0x8f, 0x48, 0xb8, 0x10, 0xc0, + 0x25, 0x64, 0x33, 0x19, 0x61, 0x53, 0x1e, 0xa6, 0xa7, 0x80, 0xce, 0xee, 0x9a, 0xcc, 0x66, 0xbd, + 0x3e, 0xab, 0x4e, 0x01, 0x1a, 0x11, 0x3f, 0x81, 0x1b, 0xae, 0x0a, 0x19, 0xf9, 0x13, 0x34, 0x0d, + 0x98, 0x9f, 0xf5, 0x18, 0xff, 0x40, 0xc4, 0xdb, 0xd6, 0x4a, 0xa4, 0x70, 0x27, 0x61, 0x4a, 0xdc, + 0xeb, 0xae, 0x01, 0xa3, 0x1b, 0x32, 0x57, 0x76, 0x0d, 0xd0, 0x87, 0x24, 0xd0, 0x4d, 0xe8, 0xbc, + 0x15, 0x0e, 0x94, 0x65, 0x9d, 0xdb, 0xf0, 0xb6, 0x3d, 0xd4, 0x22, 0x33, 0xce, 0x21, 0x0b, 0x1a, + 0xcb, 0xf4, 0x1e, 0x71, 0x76, 0x6c, 0x65, 0x64, 0x43, 0xe6, 0x28, 0xb6, 0xfa, 0xbb, 0xa6, 0x3e, + 0xe7, 0x1a, 0x0a, 0xb8, 0x15, 0xfc, 0x26, 0x0a, 0xfa, 0x73, 0xa4, 0xe5, 0xf8, 0x9b, 0x6e, 0x01, + 0xc4, 0x67, 0x10, 0x77, 0x6a, 0xe1, 0x5c, 0xd7, 0xf9, 0x87, 0xae, 0xfb, 0x67, 0x5d, 0x3c, 0xe8, + 0xde, 0x27, 0x78, 0x2b, 0xd2, 0x65, 0x62, 0xe7, 0x8d, 0x5b, 0x0d, 0xf1, 0x17, 0x44, 0xbc, 0x15, + 0xef, 0x6a, 0x25, 0xcf, 0x74, 0x42, 0xa3, 0x33, 0x21, 0xe3, 0x59, 0xd3, 0x14, 0x79, 0x6a, 0x5e, + 0x88, 0xb5, 0x1a, 0xf3, 0x21, 0xa4, 0x2b, 0x5e, 0x03, 0x6f, 0x95, 0x80, 0x12, 0x2a, 0x69, 0xfd, + 0xc6, 0xe5, 0x10, 0xa2, 0x8f, 0x09, 0x5e, 0x40, 0x51, 0xb4, 0x91, 0x3b, 0x71, 0xa6, 0xe3, 0xa7, + 0x17, 0x97, 0xbf, 0x1e, 0xa4, 0x0e, 0x33, 0x9c, 0xea, 0x64, 0xfc, 0x15, 0x11, 0x57, 0x33, 0xfd, + 0x8f, 0xa0, 0xa3, 0x31, 0xc0, 0x0c, 0x1d, 0x35, 0x75, 0xe6, 0x5a, 0xcc, 0x50, 0xa7, 0xe9, 0x60, + 0xae, 0xc0, 0x0c, 0x1d, 0x34, 0xed, 0x4d, 0xd3, 0x98, 0xa1, 0x3d, 0x7d, 0x42, 0xfc, 0x4f, 0x0a, + 0x44, 0x0e, 0x6d, 0x84, 0xcd, 0x45, 0xff, 0x0f, 0x17, 0xbd, 0x51, 0x20, 0x3a, 0x76, 0xca, 0xeb, + 0x0f, 0x73, 0xbb, 0x45, 0x94, 0xeb, 0x91, 0x9b, 0xd1, 0xfa, 0xc3, 0xc8, 0x63, 0x45, 0xb0, 0xf9, + 0x46, 0x2f, 0x78, 0x51, 0x97, 0x25, 0xaf, 0x32, 0x3b, 0x15, 0x3f, 0xed, 0x51, 0x8f, 0x2a, 0x99, + 0xdb, 0x89, 0x8c, 0xb2, 0xb9, 0x66, 0xb6, 0xb1, 0xfd, 0x8f, 0xc4, 0x46, 0x6f, 0xe6, 0x85, 0xa8, + 0x55, 0x33, 0xef, 0xfa, 0xce, 0x43, 0x16, 0xdc, 0x5a, 0xd6, 0xbf, 0xa2, 0xb7, 0x7b, 0x10, 0x56, + 0x35, 0x64, 0xde, 0xc1, 0x50, 0xfc, 0x8e, 0x84, 0xb3, 0x02, 0x84, 0x64, 0xaa, 0x80, 0xdf, 0x76, + 0x41, 0x89, 0xfb, 0x72, 0x7b, 0xb5, 0x3e, 0x3d, 0x8d, 0x0f, 0xdb, 0xab, 0xf5, 0xb0, 0x50, 0xe7, + 0x6c, 0xa1, 0xfa, 0xf8, 0x57, 0xbc, 0xe1, 0xcb, 0xc4, 0x4c, 0xc7, 0x61, 0xde, 0x47, 0x43, 0xef, + 0x3d, 0xf3, 0x0f, 0xf0, 0xec, 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0xad, 0x5d, 0x44, 0xfb, 0x13, + 0x04, 0x00, 0x00, } diff --git a/bolt/internal/internal.proto b/bolt/internal/internal.proto index 189db0b6a..13ef8092d 100644 --- a/bolt/internal/internal.proto +++ b/bolt/internal/internal.proto @@ -19,6 +19,7 @@ message Source { string Password = 5; string URL = 6; // URL are the connections to the source bool Default = 7; // Flags an exploration as the default. + string Telegraf = 8; // Telegraf is the db telegraf is written to. By default it is "telegraf" } message Server { diff --git a/bolt/internal/internal_test.go b/bolt/internal/internal_test.go index e0d321996..ebf1bbafe 100644 --- a/bolt/internal/internal_test.go +++ b/bolt/internal/internal_test.go @@ -39,6 +39,7 @@ func TestMarshalSource(t *testing.T) { Password: "1 point twenty-one g1g@w@tts", URL: "http://twin-pines.mall.io:8086", Default: true, + Telegraf: "telegraf", } var vv chronograf.Source diff --git a/chronograf.go b/chronograf.go index fc71f2d90..9a921c4ef 100644 --- a/chronograf.go +++ b/chronograf.go @@ -75,6 +75,7 @@ type Source struct { Password string `json:"password,omitempty"` // Password is in CLEARTEXT URL string `json:"url"` // URL are the connections to the source Default bool `json:"default"` // Default specifies the default source for the application + Telegraf string `json:"telegraf"` // Telegraf is the db telegraf is written to. By default it is "telegraf" } // SourcesStore stores connection information for a `TimeSeries` diff --git a/server/sources.go b/server/sources.go index e4c790dc8..c7c42fb12 100644 --- a/server/sources.go +++ b/server/sources.go @@ -21,6 +21,11 @@ type sourceResponse struct { } func newSourceResponse(src chronograf.Source) sourceResponse { + // If telegraf is not set, we'll set it to the default value. + if src.Telegraf == "" { + src.Telegraf = "telegraf" + } + httpAPISrcs := "/chronograf/v1/sources" return sourceResponse{ Source: src, @@ -39,11 +44,17 @@ func (h *Service) NewSource(w http.ResponseWriter, r *http.Request) { invalidJSON(w) return } + if err := ValidSourceRequest(src); err != nil { invalidData(w, err) return } + // By default the telegraf database will be telegraf + if src.Telegraf == "" { + src.Telegraf = "telegraf" + } + var err error if src, err = h.SourcesStore.Add(r.Context(), src); err != nil { msg := fmt.Errorf("Error storing source %v: %v", src, err) @@ -154,6 +165,9 @@ func (h *Service) UpdateSource(w http.ResponseWriter, r *http.Request) { if req.Type != "" { src.Type = req.Type } + if req.Telegraf != "" { + src.Telegraf = req.Telegraf + } if err := ValidSourceRequest(src); err != nil { invalidData(w, err) diff --git a/server/sources_test.go b/server/sources_test.go new file mode 100644 index 000000000..290fa0a89 --- /dev/null +++ b/server/sources_test.go @@ -0,0 +1,58 @@ +package server + +import ( + "reflect" + "testing" + + "github.com/influxdata/chronograf" +) + +func Test_newSourceResponse(t *testing.T) { + tests := []struct { + name string + src chronograf.Source + want sourceResponse + }{ + { + name: "Test empty telegraf", + src: chronograf.Source{ + ID: 1, + Telegraf: "", + }, + want: sourceResponse{ + Source: chronograf.Source{ + ID: 1, + Telegraf: "telegraf", + }, + Links: sourceLinks{ + Self: "/chronograf/v1/sources/1", + Proxy: "/chronograf/v1/sources/1/proxy", + Kapacitors: "/chronograf/v1/sources/1/kapacitors", + }, + }, + }, + { + name: "Test non-default telegraf", + src: chronograf.Source{ + ID: 1, + Telegraf: "howdy", + }, + want: sourceResponse{ + Source: chronograf.Source{ + ID: 1, + Telegraf: "howdy", + }, + Links: sourceLinks{ + Self: "/chronograf/v1/sources/1", + Proxy: "/chronograf/v1/sources/1/proxy", + Kapacitors: "/chronograf/v1/sources/1/kapacitors", + }, + }, + }, + } + for _, tt := range tests { + if got := newSourceResponse(tt.src); !reflect.DeepEqual(got, tt.want) { + t.Errorf("%q. newSourceResponse() = %v, want %v", tt.name, got, tt.want) + } + } +} diff --git a/server/swagger.json b/server/swagger.json index 164f7b211..b0f072d41 100644 --- a/server/swagger.json +++ b/server/swagger.json @@ -1481,6 +1481,11 @@ "type": "boolean", "description": "Indicates whether this source is the default source" }, + "telegraf": { + "type": "string", + "description": "Database where telegraf information is stored for this source", + "default": "telegraf" + }, "links": { "type": "object", "properties": {