mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-02-02 08:31:11 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #2034 from roman-vynar/consul-tolerance

Browse source 
Do not fail Consul discovery on Prometheus startup when Consul is down.
This commit is contained in:
Fabian Reinartz 2016-09-27 11:09:12 +02:00 committed by GitHub
parent 42c05dd3a2 db63a4bd2a
commit 0baab6a88c
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -77,21 +77,11 @@ func NewDiscovery(conf *config.ConsulSDConfig) (*Discovery, error) {
return nil, err return nil, err
} }
cd := &Discovery{ cd := &Discovery{
client: client, client: client,
clientConf: clientConf, clientConf: clientConf,
tagSeparator: conf.TagSeparator, tagSeparator: conf.TagSeparator,
watchedServices: conf.Services, watchedServices: conf.Services,
} clientDatacenter: clientConf.Datacenter,
// If the datacenter isn't set in the clientConf, let's get it from the local Consul agent
// (Consul default is to use local node's datacenter if one isn't given for a query).
if clientConf.Datacenter == "" {
info, err := client.Agent().Self()
if err != nil {
return nil, err
}
cd.clientDatacenter = info["Config"]["Datacenter"].(string)
} else {
cd.clientDatacenter = clientConf.Datacenter
} }
return cd, nil return cd, nil
} }
@ -144,6 +134,18 @@ func (cd *Discovery) Run(ctx context.Context, ch chan<- []*config.TargetGroup) {
} }
lastIndex = meta.LastIndex lastIndex = meta.LastIndex
// If the datacenter was not set from clientConf, let's get it from the local Consul agent
// (Consul default is to use local node's datacenter if one isn't given for a query).
if cd.clientDatacenter == "" {
info, err := cd.client.Agent().Self()
if err != nil {
log.Errorf("Error retrieving datacenter name: %s", err)
time.Sleep(retryInterval)
continue
}
cd.clientDatacenter = info["Config"]["Datacenter"].(string)
}
// Check for new services. // Check for new services.
for name := range srvs { for name := range srvs {
if !cd.shouldWatch(name) { if !cd.shouldWatch(name) {