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

discovery: use consul service address if available

Browse source
This commit is contained in:
Nicholas Capo 2016-06-10 13:40:06 -05:00
parent a3c4beb6ee
commit 84334a8410
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
retrieval/discovery/consul/consul.go
View file

@ -229,12 +229,20 @@ func (srv *consulService) watch(ctx context.Context, ch chan<- []*config.TargetG
} }
for _, node := range nodes { for _, node := range nodes {
var (
// We surround the separated list with the separator as well. This way regular expressions
// in relabeling rules don't have to consider tag positions.
var tags = srv.tagSeparator + strings.Join(node.ServiceTags, srv.tagSeparator) + srv.tagSeparator
// If the service address is not empty it should be used instead of the node address
// since the service may be registered remotely through a different node
var addr string
if node.ServiceAddress != "" {
addr = fmt.Sprintf("%s:%d", node.ServiceAddress, node.ServicePort)
} else {
addr = fmt.Sprintf("%s:%d", node.Address, node.ServicePort) addr = fmt.Sprintf("%s:%d", node.Address, 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 = srv.tagSeparator + strings.Join(node.ServiceTags, srv.tagSeparator) + srv.tagSeparator
)
tgroup.Targets = append(tgroup.Targets, model.LabelSet{ tgroup.Targets = append(tgroup.Targets, model.LabelSet{
model.AddressLabel: model.LabelValue(addr), model.AddressLabel: model.LabelValue(addr),
addressLabel: model.LabelValue(node.Address), addressLabel: model.LabelValue(node.Address),