Populate existing clusterConfig.Endpoint field and refactor NewEsProb…

…e to use it

Allows direct usage of API without having to use the ES API go package,
if needed.

probe/elasticsearch.go

@@ -80,15 +80,15 @@ type EsProbe struct {
 	controlChan chan bool
 }
 
-func NewEsProbe(clusterName string, endpoint string, clusterConfig common.Cluster, config *common.Config, consulClient *api.Client, controlChan chan bool) (EsProbe, error) {
+func NewEsProbe(clusterName string, clusterConfig common.Cluster, config *common.Config, consulClient *api.Client, controlChan chan bool) (EsProbe, error) {
 	var allEverKnownEsNodes []string
 	esNodesList, err := common.DiscoverNodesForService(consulClient, clusterConfig.Name)
 	if err != nil {
 		return EsProbe{}, errors.Wrapf(err, "Impossible to discover ES nodes during bootstrap for cluster %s", clusterName)
 	}
 	allEverKnownEsNodes = common.UpdateEverKnownNodes(allEverKnownEsNodes, esNodesList)
 
-	client, err := initEsClient(clusterConfig.Scheme, endpoint, config.ElasticsearchUser, config.ElasticsearchPassword)
+	client, err := initEsClient(clusterConfig.Scheme, clusterConfig.Endpoint, config.ElasticsearchUser, config.ElasticsearchPassword)
 	if err != nil {
 		return EsProbe{}, errors.Wrapf(err, "Failed to init elasticsearch client for cluster %s", clusterName)
 	}

watcher/watcher.go

@@ -90,8 +90,10 @@ func (w *Watcher) createNewEsProbes(servicesToAdd map[string]common.Cluster) {
 			continue
 		}
 
+		clusterConfig.Endpoint = endpoint
+
 		probeChan = make(chan bool)
-		esProbe, err := probe.NewEsProbe(cluster, endpoint, clusterConfig, w.config, w.consulClient, probeChan)
+		esProbe, err := probe.NewEsProbe(cluster, clusterConfig, w.config, w.consulClient, probeChan)
 
 		if err != nil {
 			log.Errorf("Error while creating probe: %s", err.Error())