mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-01-28 14:12:10 -08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

discovery: extract Consul shouldWatch logic

Browse source
This commit is contained in:
Fabian Reinartz 2016-04-25 18:47:21 +02:00
parent e805e68c01
commit 086f7caceb
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
retrieval/discovery/consul.go
View file

@ -19,5 +19,5 @@ import (
)
func NewConsul(cfg *config.ConsulSDConfig) (*consul.Discovery, error) {
return nil, nil
return consul.NewDiscovery(cfg)
}

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

@ -56,7 +56,7 @@ type Discovery struct {
clientConf *consul.Config
clientDatacenter string
tagSeparator string
scrapedServices map[string]struct{} // Set of services which will be discovered.
watchedServices []string // Set of services which will be discovered.
}
// NewDiscovery returns a new Discovery for the given config.
@ -79,7 +79,7 @@ func NewDiscovery(conf *config.ConsulSDConfig) (*Discovery, error) {
client: client,
clientConf: clientConf,
tagSeparator: conf.TagSeparator,
scrapedServices: map[string]struct{}{},
watchedServices: conf.Services,
}
// 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).
@ -92,12 +92,23 @@ func NewDiscovery(conf *config.ConsulSDConfig) (*Discovery, error) {
} else {
cd.clientDatacenter = clientConf.Datacenter
}
for _, name := range conf.Services {
cd.scrapedServices[name] = struct{}{}
}
return cd, nil
}
// shouldWatch returns whether the service of the given name should be watched.
func (cd *Discovery) shouldWatch(name string) bool {
// If there's no fixed set of watched services, we watch everything.
if len(cd.watchedServices) == 0 {
return true
}
for _, sn := range cd.watchedServices {
if sn == name {
return true
}
}
return false
}
// Run implements the TargetProvider interface.
func (cd *Discovery) Run(ctx context.Context, ch chan<- []*config.TargetGroup) {
defer close(ch)
@ -134,8 +145,7 @@ func (cd *Discovery) Run(ctx context.Context, ch chan<- []*config.TargetGroup) {
// Check for new services.
for name := range srvs {
// If no restriction on scraped services is set, we scrape everything.
if _, ok := cd.scrapedServices[name]; len(cd.scrapedServices) > 0 && !ok {
if !cd.shouldWatch(name) {
continue
}
if _, ok := services[name]; ok {