From e1764a7c025338ecb9440b55b142a28e9739afd6 Mon Sep 17 00:00:00 2001 From: Chris Goller Date: Fri, 24 Feb 2017 14:48:42 -0600 Subject: [PATCH] Update source timeseries client to change if meta server is set --- server/service.go | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/server/service.go b/server/service.go index 6734329455..8dfa115a4d 100644 --- a/server/service.go +++ b/server/service.go @@ -1,6 +1,9 @@ package server import ( + "context" + "strings" + "github.com/influxdata/chronograf" "github.com/influxdata/chronograf/enterprise" "github.com/influxdata/chronograf/influx" @@ -40,8 +43,16 @@ type InfluxClient struct{} // New creates a client to connect to OSS or enterprise func (c *InfluxClient) New(src chronograf.Source, logger chronograf.Logger) (chronograf.TimeSeries, error) { - if src.Type == "influx-enterprise" { - return enterprise.NewClientWithURL(src.URL, src.Username, src.Password, false, logger) + if src.Type == "influx-enterprise" && src.MetaURL != "" { + dataNode := &influx.Client{ + Logger: logger, + } + if err := dataNode.Connect(context.TODO(), &src); err != nil { + return nil, err + } + + tls := strings.Contains(src.MetaURL, "https") + return enterprise.NewClientWithTimeSeries(logger, src.MetaURL, src.Username, src.Password, tls, dataNode) } return &influx.Client{ Logger: logger,