mirror of
https://github.com/prometheus/prometheus.git
synced 2025-02-21 03:16:00 -08:00
Merge pull request #1612 from prometheus/stn-dns-mv
[discovery][dns] move dns to own package
This commit is contained in:
Fabian Reinartz
commit
2ca9ee7b0d
|
|
@ -1,4 +1,4 @@
|
||||||
// Copyright 2015 The Prometheus Authors
|
// Copyright 2016 The Prometheus Authors
|
||||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
// you may not use this file except in compliance with the License.
|
// you may not use this file except in compliance with the License.
|
||||||
// You may obtain a copy of the License at
|
// You may obtain a copy of the License at
|
||||||
|
|
@ -14,219 +14,12 @@
|
||||||
package discovery
|
package discovery
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"github.com/prometheus/prometheus/retrieval/discovery/dns"
|
||||||
"net"
|
|
||||||
"strings"
|
|
||||||
"sync"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/miekg/dns"
|
|
||||||
"github.com/prometheus/client_golang/prometheus"
|
|
||||||
"github.com/prometheus/common/log"
|
|
||||||
"github.com/prometheus/common/model"
|
|
||||||
"golang.org/x/net/context"
|
|
||||||
|
|
||||||
"github.com/prometheus/prometheus/config"
|
"github.com/prometheus/prometheus/config"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
// NewDNS creates a new DNS based discovery.
|
||||||
resolvConf = "/etc/resolv.conf"
|
func NewDNS(conf *config.DNSSDConfig) *dns.Discovery {
|
||||||
|
return dns.NewDiscovery(conf)
|
||||||
dnsNameLabel = model.MetaLabelPrefix + "dns_name"
|
|
||||||
|
|
||||||
// Constants for instrumentation.
|
|
||||||
namespace = "prometheus"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
dnsSDLookupsCount = prometheus.NewCounter(
|
|
||||||
prometheus.CounterOpts{
|
|
||||||
Namespace: namespace,
|
|
||||||
Name: "dns_sd_lookups_total",
|
|
||||||
Help: "The number of DNS-SD lookups.",
|
|
||||||
})
|
|
||||||
dnsSDLookupFailuresCount = prometheus.NewCounter(
|
|
||||||
prometheus.CounterOpts{
|
|
||||||
Namespace: namespace,
|
|
||||||
Name: "dns_sd_lookup_failures_total",
|
|
||||||
Help: "The number of DNS-SD lookup failures.",
|
|
||||||
})
|
|
||||||
)
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
prometheus.MustRegister(dnsSDLookupFailuresCount)
|
|
||||||
prometheus.MustRegister(dnsSDLookupsCount)
|
|
||||||
}
|
|
||||||
|
|
||||||
// DNSDiscovery periodically performs DNS-SD requests. It implements
|
|
||||||
// the TargetProvider interface.
|
|
||||||
type DNSDiscovery struct {
|
|
||||||
names []string
|
|
||||||
|
|
||||||
done chan struct{}
|
|
||||||
interval time.Duration
|
|
||||||
m sync.RWMutex
|
|
||||||
port int
|
|
||||||
qtype uint16
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewDNSDiscovery returns a new DNSDiscovery which periodically refreshes its targets.
|
|
||||||
func NewDNSDiscovery(conf *config.DNSSDConfig) *DNSDiscovery {
|
|
||||||
qtype := dns.TypeSRV
|
|
||||||
switch strings.ToUpper(conf.Type) {
|
|
||||||
case "A":
|
|
||||||
qtype = dns.TypeA
|
|
||||||
case "AAAA":
|
|
||||||
qtype = dns.TypeAAAA
|
|
||||||
case "SRV":
|
|
||||||
qtype = dns.TypeSRV
|
|
||||||
}
|
|
||||||
return &DNSDiscovery{
|
|
||||||
names: conf.Names,
|
|
||||||
done: make(chan struct{}),
|
|
||||||
interval: time.Duration(conf.RefreshInterval),
|
|
||||||
qtype: qtype,
|
|
||||||
port: conf.Port,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Run implements the TargetProvider interface.
|
|
||||||
func (dd *DNSDiscovery) Run(ctx context.Context, ch chan<- []*config.TargetGroup) {
|
|
||||||
defer close(ch)
|
|
||||||
|
|
||||||
ticker := time.NewTicker(dd.interval)
|
|
||||||
defer ticker.Stop()
|
|
||||||
|
|
||||||
// Get an initial set right away.
|
|
||||||
dd.refreshAll(ch)
|
|
||||||
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case <-ticker.C:
|
|
||||||
dd.refreshAll(ch)
|
|
||||||
case <-ctx.Done():
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (dd *DNSDiscovery) refreshAll(ch chan<- []*config.TargetGroup) {
|
|
||||||
var wg sync.WaitGroup
|
|
||||||
|
|
||||||
wg.Add(len(dd.names))
|
|
||||||
for _, name := range dd.names {
|
|
||||||
go func(n string) {
|
|
||||||
if err := dd.refresh(n, ch); err != nil {
|
|
||||||
log.Errorf("Error refreshing DNS targets: %s", err)
|
|
||||||
}
|
|
||||||
wg.Done()
|
|
||||||
}(name)
|
|
||||||
}
|
|
||||||
|
|
||||||
wg.Wait()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (dd *DNSDiscovery) refresh(name string, ch chan<- []*config.TargetGroup) error {
|
|
||||||
response, err := lookupAll(name, dd.qtype)
|
|
||||||
dnsSDLookupsCount.Inc()
|
|
||||||
if err != nil {
|
|
||||||
dnsSDLookupFailuresCount.Inc()
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
tg := &config.TargetGroup{}
|
|
||||||
|
|
||||||
for _, record := range response.Answer {
|
|
||||||
target := model.LabelValue("")
|
|
||||||
switch addr := record.(type) {
|
|
||||||
case *dns.SRV:
|
|
||||||
// Remove the final dot from rooted DNS names to make them look more usual.
|
|
||||||
addr.Target = strings.TrimRight(addr.Target, ".")
|
|
||||||
|
|
||||||
target = model.LabelValue(fmt.Sprintf("%s:%d", addr.Target, addr.Port))
|
|
||||||
case *dns.A:
|
|
||||||
target = model.LabelValue(fmt.Sprintf("%s:%d", addr.A, dd.port))
|
|
||||||
case *dns.AAAA:
|
|
||||||
target = model.LabelValue(fmt.Sprintf("%s:%d", addr.AAAA, dd.port))
|
|
||||||
default:
|
|
||||||
log.Warnf("%q is not a valid SRV record", record)
|
|
||||||
continue
|
|
||||||
|
|
||||||
}
|
|
||||||
tg.Targets = append(tg.Targets, model.LabelSet{
|
|
||||||
model.AddressLabel: target,
|
|
||||||
dnsNameLabel: model.LabelValue(name),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
tg.Source = name
|
|
||||||
ch <- []*config.TargetGroup{tg}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func lookupAll(name string, qtype uint16) (*dns.Msg, error) {
|
|
||||||
conf, err := dns.ClientConfigFromFile(resolvConf)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("could not load resolv.conf: %s", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
client := &dns.Client{}
|
|
||||||
response := &dns.Msg{}
|
|
||||||
|
|
||||||
for _, server := range conf.Servers {
|
|
||||||
servAddr := net.JoinHostPort(server, conf.Port)
|
|
||||||
for _, suffix := range conf.Search {
|
|
||||||
response, err = lookup(name, qtype, client, servAddr, suffix, false)
|
|
||||||
if err != nil {
|
|
||||||
log.Warnf("resolving %s.%s failed: %s", name, suffix, err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if len(response.Answer) > 0 {
|
|
||||||
return response, nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
response, err = lookup(name, qtype, client, servAddr, "", false)
|
|
||||||
if err == nil {
|
|
||||||
return response, nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return response, fmt.Errorf("could not resolve %s: No server responded", name)
|
|
||||||
}
|
|
||||||
|
|
||||||
func lookup(name string, queryType uint16, client *dns.Client, servAddr string, suffix string, edns bool) (*dns.Msg, error) {
|
|
||||||
msg := &dns.Msg{}
|
|
||||||
lname := strings.Join([]string{name, suffix}, ".")
|
|
||||||
msg.SetQuestion(dns.Fqdn(lname), queryType)
|
|
||||||
|
|
||||||
if edns {
|
|
||||||
opt := &dns.OPT{
|
|
||||||
Hdr: dns.RR_Header{
|
|
||||||
Name: ".",
|
|
||||||
Rrtype: dns.TypeOPT,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
opt.SetUDPSize(dns.DefaultMsgSize)
|
|
||||||
msg.Extra = append(msg.Extra, opt)
|
|
||||||
}
|
|
||||||
|
|
||||||
response, _, err := client.Exchange(msg, servAddr)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if msg.Id != response.Id {
|
|
||||||
return nil, fmt.Errorf("DNS ID mismatch, request: %d, response: %d", msg.Id, response.Id)
|
|
||||||
}
|
|
||||||
|
|
||||||
if response.MsgHdr.Truncated {
|
|
||||||
if client.Net == "tcp" {
|
|
||||||
return nil, fmt.Errorf("got truncated message on tcp")
|
|
||||||
}
|
|
||||||
if edns { // Truncated even though EDNS is used
|
|
||||||
client.Net = "tcp"
|
|
||||||
}
|
|
||||||
return lookup(name, queryType, client, servAddr, suffix, !edns)
|
|
||||||
}
|
|
||||||
|
|
||||||
return response, nil
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
234
retrieval/discovery/dns/dns.go
Normal file
234
retrieval/discovery/dns/dns.go
Normal file
|
|
@ -0,0 +1,234 @@
|
||||||
|
// Copyright 2016 The Prometheus Authors
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
package dns
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"net"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/miekg/dns"
|
||||||
|
"github.com/prometheus/client_golang/prometheus"
|
||||||
|
"github.com/prometheus/common/log"
|
||||||
|
"github.com/prometheus/common/model"
|
||||||
|
"golang.org/x/net/context"
|
||||||
|
|
||||||
|
"github.com/prometheus/prometheus/config"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
resolvConf = "/etc/resolv.conf"
|
||||||
|
|
||||||
|
dnsNameLabel = model.MetaLabelPrefix + "dns_name"
|
||||||
|
|
||||||
|
// Constants for instrumentation.
|
||||||
|
namespace = "prometheus"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
dnsSDLookupsCount = prometheus.NewCounter(
|
||||||
|
prometheus.CounterOpts{
|
||||||
|
Namespace: namespace,
|
||||||
|
Name: "dns_sd_lookups_total",
|
||||||
|
Help: "The number of DNS-SD lookups.",
|
||||||
|
})
|
||||||
|
dnsSDLookupFailuresCount = prometheus.NewCounter(
|
||||||
|
prometheus.CounterOpts{
|
||||||
|
Namespace: namespace,
|
||||||
|
Name: "dns_sd_lookup_failures_total",
|
||||||
|
Help: "The number of DNS-SD lookup failures.",
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
prometheus.MustRegister(dnsSDLookupFailuresCount)
|
||||||
|
prometheus.MustRegister(dnsSDLookupsCount)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Discovery periodically performs DNS-SD requests. It implements
|
||||||
|
// the TargetProvider interface.
|
||||||
|
type Discovery struct {
|
||||||
|
names []string
|
||||||
|
|
||||||
|
interval time.Duration
|
||||||
|
m sync.RWMutex
|
||||||
|
port int
|
||||||
|
qtype uint16
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewDiscovery returns a new Discovery which periodically refreshes its targets.
|
||||||
|
func NewDiscovery(conf *config.DNSSDConfig) *Discovery {
|
||||||
|
qtype := dns.TypeSRV
|
||||||
|
switch strings.ToUpper(conf.Type) {
|
||||||
|
case "A":
|
||||||
|
qtype = dns.TypeA
|
||||||
|
case "AAAA":
|
||||||
|
qtype = dns.TypeAAAA
|
||||||
|
case "SRV":
|
||||||
|
qtype = dns.TypeSRV
|
||||||
|
}
|
||||||
|
return &Discovery{
|
||||||
|
names: conf.Names,
|
||||||
|
interval: time.Duration(conf.RefreshInterval),
|
||||||
|
qtype: qtype,
|
||||||
|
port: conf.Port,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Run implements the TargetProvider interface.
|
||||||
|
func (dd *Discovery) Run(ctx context.Context, ch chan<- []*config.TargetGroup) {
|
||||||
|
defer close(ch)
|
||||||
|
|
||||||
|
ticker := time.NewTicker(dd.interval)
|
||||||
|
defer ticker.Stop()
|
||||||
|
|
||||||
|
// Get an initial set right away.
|
||||||
|
dd.refreshAll(ctx, ch)
|
||||||
|
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-ticker.C:
|
||||||
|
dd.refreshAll(ctx, ch)
|
||||||
|
case <-ctx.Done():
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (dd *Discovery) refreshAll(ctx context.Context, ch chan<- []*config.TargetGroup) {
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
|
||||||
|
wg.Add(len(dd.names))
|
||||||
|
for _, name := range dd.names {
|
||||||
|
go func(n string) {
|
||||||
|
if err := dd.refresh(ctx, n, ch); err != nil {
|
||||||
|
log.Errorf("Error refreshing DNS targets: %s", err)
|
||||||
|
}
|
||||||
|
wg.Done()
|
||||||
|
}(name)
|
||||||
|
}
|
||||||
|
|
||||||
|
wg.Wait()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (dd *Discovery) refresh(ctx context.Context, name string, ch chan<- []*config.TargetGroup) error {
|
||||||
|
response, err := lookupAll(name, dd.qtype)
|
||||||
|
dnsSDLookupsCount.Inc()
|
||||||
|
if err != nil {
|
||||||
|
dnsSDLookupFailuresCount.Inc()
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
tg := &config.TargetGroup{}
|
||||||
|
|
||||||
|
for _, record := range response.Answer {
|
||||||
|
target := model.LabelValue("")
|
||||||
|
switch addr := record.(type) {
|
||||||
|
case *dns.SRV:
|
||||||
|
// Remove the final dot from rooted DNS names to make them look more usual.
|
||||||
|
addr.Target = strings.TrimRight(addr.Target, ".")
|
||||||
|
|
||||||
|
target = model.LabelValue(fmt.Sprintf("%s:%d", addr.Target, addr.Port))
|
||||||
|
case *dns.A:
|
||||||
|
target = model.LabelValue(fmt.Sprintf("%s:%d", addr.A, dd.port))
|
||||||
|
case *dns.AAAA:
|
||||||
|
target = model.LabelValue(fmt.Sprintf("%s:%d", addr.AAAA, dd.port))
|
||||||
|
default:
|
||||||
|
log.Warnf("%q is not a valid SRV record", record)
|
||||||
|
continue
|
||||||
|
|
||||||
|
}
|
||||||
|
tg.Targets = append(tg.Targets, model.LabelSet{
|
||||||
|
model.AddressLabel: target,
|
||||||
|
dnsNameLabel: model.LabelValue(name),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
tg.Source = name
|
||||||
|
select {
|
||||||
|
case <-ctx.Done():
|
||||||
|
return ctx.Err()
|
||||||
|
case ch <- []*config.TargetGroup{tg}:
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func lookupAll(name string, qtype uint16) (*dns.Msg, error) {
|
||||||
|
conf, err := dns.ClientConfigFromFile(resolvConf)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("could not load resolv.conf: %s", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
client := &dns.Client{}
|
||||||
|
response := &dns.Msg{}
|
||||||
|
|
||||||
|
for _, server := range conf.Servers {
|
||||||
|
servAddr := net.JoinHostPort(server, conf.Port)
|
||||||
|
for _, suffix := range conf.Search {
|
||||||
|
response, err = lookup(name, qtype, client, servAddr, suffix, false)
|
||||||
|
if err != nil {
|
||||||
|
log.Warnf("resolving %s.%s failed: %s", name, suffix, err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if len(response.Answer) > 0 {
|
||||||
|
return response, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
response, err = lookup(name, qtype, client, servAddr, "", false)
|
||||||
|
if err == nil {
|
||||||
|
return response, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return response, fmt.Errorf("could not resolve %s: No server responded", name)
|
||||||
|
}
|
||||||
|
|
||||||
|
func lookup(name string, queryType uint16, client *dns.Client, servAddr string, suffix string, edns bool) (*dns.Msg, error) {
|
||||||
|
msg := &dns.Msg{}
|
||||||
|
lname := strings.Join([]string{name, suffix}, ".")
|
||||||
|
msg.SetQuestion(dns.Fqdn(lname), queryType)
|
||||||
|
|
||||||
|
if edns {
|
||||||
|
opt := &dns.OPT{
|
||||||
|
Hdr: dns.RR_Header{
|
||||||
|
Name: ".",
|
||||||
|
Rrtype: dns.TypeOPT,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
opt.SetUDPSize(dns.DefaultMsgSize)
|
||||||
|
msg.Extra = append(msg.Extra, opt)
|
||||||
|
}
|
||||||
|
|
||||||
|
response, _, err := client.Exchange(msg, servAddr)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if msg.Id != response.Id {
|
||||||
|
return nil, fmt.Errorf("DNS ID mismatch, request: %d, response: %d", msg.Id, response.Id)
|
||||||
|
}
|
||||||
|
|
||||||
|
if response.MsgHdr.Truncated {
|
||||||
|
if client.Net == "tcp" {
|
||||||
|
return nil, fmt.Errorf("got truncated message on tcp")
|
||||||
|
}
|
||||||
|
if edns { // Truncated even though EDNS is used
|
||||||
|
client.Net = "tcp"
|
||||||
|
}
|
||||||
|
return lookup(name, queryType, client, servAddr, suffix, !edns)
|
||||||
|
}
|
||||||
|
|
||||||
|
return response, nil
|
||||||
|
}
|
||||||
|
|
@ -360,7 +360,7 @@ func providersFromConfig(cfg *config.ScrapeConfig) map[string]TargetProvider {
|
||||||
}
|
}
|
||||||
|
|
||||||
for i, c := range cfg.DNSSDConfigs {
|
for i, c := range cfg.DNSSDConfigs {
|
||||||
app("dns", i, discovery.NewDNSDiscovery(c))
|
app("dns", i, discovery.NewDNS(c))
|
||||||
}
|
}
|
||||||
for i, c := range cfg.FileSDConfigs {
|
for i, c := range cfg.FileSDConfigs {
|
||||||
app("file", i, discovery.NewFileDiscovery(c))
|
app("file", i, discovery.NewFileDiscovery(c))
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue