RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #919 from prometheus/revert-consul-service-address 

Revert "Use Consul ServiceAddress instead of Address when set"
This commit is contained in:
Björn Rabenstein 2015-07-22 14:48:32 +02:00
parent 276dbf8a5d 9d98910fca
commit 31fdb85d2c
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
retrieval/discovery/consul.go
View File

@ -259,10 +259,6 @@ func (cd *ConsulDiscovery) watchService(srv *consulService, ch chan<- *config.Ta
for _, node := range nodes {
addr := fmt.Sprintf("%s:%d", node.Address, node.ServicePort)
// Use ServiceAddress instead of Address if not empty.
if len(node.ServiceAddress) > 0 {
addr = fmt.Sprintf("%s:%d", node.ServiceAddress, node.ServicePort)
}
// We surround the separated list with the separator as well. This way regular expressions
// in relabeling rules don't have to consider tag positions.
tags := cd.tagSeparator + strings.Join(node.ServiceTags, cd.tagSeparator) + cd.tagSeparator