mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-27 22:49:40 -08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #812 from Marmelatze/consul_services

Browse source 
Use Consul ServiceAddress instead of Address when set
This commit is contained in:
Fabian Reinartz 2015-06-17 20:10:52 +02:00
parent 2bf7e1ac98 0ac7e7217e
commit 459d18cf18
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
retrieval/discovery/consul.go
View file

@ -258,6 +258,10 @@ 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