mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Revert "Use Consul ServiceAddress instead of Address when set"

Browse source 
This reverts commit 0ac7e7217e.

See discussion on https://github.com/prometheus/prometheus/pull/812 for
reasoning. While fixing one use case, it breaks others, and we need a
more generic way of handling this.
This commit is contained in:
Julius Volz 2015-07-22 13:04:08 +02:00
parent d437fce299
commit 9d98910fca
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 { for _, node := range nodes {
addr := fmt.Sprintf("%s:%d", node.Address, node.ServicePort) 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 // We surround the separated list with the separator as well. This way regular expressions
// in relabeling rules don't have to consider tag positions. // in relabeling rules don't have to consider tag positions.
tags := cd.tagSeparator + strings.Join(node.ServiceTags, cd.tagSeparator) + cd.tagSeparator tags := cd.tagSeparator + strings.Join(node.ServiceTags, cd.tagSeparator) + cd.tagSeparator