Skip to content

Add custom dns support. #1443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add custom dns support. #1443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,8 @@ type HTTPProbe struct {
Compression string `yaml:"compression,omitempty"`
BodySizeLimit units.Base2Bytes `yaml:"body_size_limit,omitempty"`
UseHTTP3 bool `yaml:"enable_http3,omitempty"`
DNSServer string `yaml:"dns_server,omitempty"`
DNSTimeout time.Duration `yaml:"dns_timeout,omitempty"`
}

type GRPCProbe struct {
Expand All @@ -305,6 +307,8 @@ type GRPCProbe struct {
TLSConfig config.TLSConfig `yaml:"tls_config,omitempty"`
IPProtocolFallback bool `yaml:"ip_protocol_fallback,omitempty"`
PreferredIPProtocol string `yaml:"preferred_ip_protocol,omitempty"`
DNSServer string `yaml:"dns_server,omitempty"`
DNSTimeout time.Duration `yaml:"dns_timeout,omitempty"`
}

type HeaderMatch struct {
Expand Down Expand Up @@ -332,6 +336,8 @@ type TCPProbe struct {
QueryResponse []QueryResponse `yaml:"query_response,omitempty"`
TLS bool `yaml:"tls,omitempty"`
TLSConfig config.TLSConfig `yaml:"tls_config,omitempty"`
DNSServer string `yaml:"dns_server,omitempty"`
DNSTimeout time.Duration `yaml:"dns_timeout,omitempty"`
}

type ICMPProbe struct {
Expand All @@ -341,6 +347,8 @@ type ICMPProbe struct {
PayloadSize int `yaml:"payload_size,omitempty"`
DontFragment bool `yaml:"dont_fragment,omitempty"`
TTL int `yaml:"ttl,omitempty"`
DNSServer string `yaml:"dns_server,omitempty"`
DNSTimeout time.Duration `yaml:"dns_timeout,omitempty"`
}

type DNSProbe struct {
Expand All @@ -358,6 +366,8 @@ type DNSProbe struct {
ValidateAnswer DNSRRValidator `yaml:"validate_answer_rrs,omitempty"`
ValidateAuthority DNSRRValidator `yaml:"validate_authority_rrs,omitempty"`
ValidateAdditional DNSRRValidator `yaml:"validate_additional_rrs,omitempty"`
DNSServer string `yaml:"dns_server,omitempty"`
DNSTimeout time.Duration `yaml:"dns_timeout,omitempty"`
}

type DNSRRValidator struct {
Expand Down
2 changes: 1 addition & 1 deletion prober/dns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ func ProbeDNS(ctx context.Context, target string, module config.Module, registry
}
targetAddr = target
}
ip, lookupTime, err := chooseProtocol(ctx, module.DNS.IPProtocol, module.DNS.IPProtocolFallback, targetAddr, registry, logger)
ip, lookupTime, err := chooseProtocol(ctx, module.DNS.IPProtocol, module.DNS.IPProtocolFallback, targetAddr, registry, logger, module.DNS.DNSServer, module.DNS.DNSTimeout)
if err != nil {
logger.Error("Error resolving address", "err", err)
return false
Expand Down
2 changes: 1 addition & 1 deletion prober/grpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ func ProbeGRPC(ctx context.Context, target string, module config.Module, registr
return false
}

ip, lookupTime, err := chooseProtocol(ctx, module.GRPC.PreferredIPProtocol, module.GRPC.IPProtocolFallback, targetHost, registry, logger)
ip, lookupTime, err := chooseProtocol(ctx, module.GRPC.PreferredIPProtocol, module.GRPC.IPProtocolFallback, targetHost, registry, logger, module.GRPC.DNSServer, module.GRPC.DNSTimeout)
if err != nil {
logger.Error("Error resolving address", "err", err)
return false
Expand Down
2 changes: 1 addition & 1 deletion prober/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ func ProbeHTTP(ctx context.Context, target string, module config.Module, registr
var ip *net.IPAddr
if shouldResolveDNSWithProxy(module.HTTP) {
var lookupTime float64
ip, lookupTime, err = chooseProtocol(ctx, module.HTTP.IPProtocol, module.HTTP.IPProtocolFallback, targetHost, registry, logger)
ip, lookupTime, err = chooseProtocol(ctx, module.HTTP.IPProtocol, module.HTTP.IPProtocolFallback, targetHost, registry, logger, module.HTTP.DNSServer, module.HTTP.DNSTimeout)
durationGaugeVec.WithLabelValues("resolve").Add(lookupTime)
if err != nil {
logger.Error("Error resolving address", "err", err)
Expand Down
2 changes: 1 addition & 1 deletion prober/icmp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ func ProbeICMP(ctx context.Context, target string, module config.Module, registr

registry.MustRegister(durationGaugeVec)

dstIPAddr, lookupTime, err := chooseProtocol(ctx, module.ICMP.IPProtocol, module.ICMP.IPProtocolFallback, target, registry, logger)
dstIPAddr, lookupTime, err := chooseProtocol(ctx, module.ICMP.IPProtocol, module.ICMP.IPProtocolFallback, target, registry, logger, module.ICMP.DNSServer, module.ICMP.DNSTimeout)

if err != nil {
logger.Error("Error resolving address", "err", err)
Expand Down
2 changes: 1 addition & 1 deletion prober/tcp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func dialTCP(ctx context.Context, target string, module config.Module, registry
return nil, err
}

ip, _, err := chooseProtocol(ctx, module.TCP.IPProtocol, module.TCP.IPProtocolFallback, targetAddress, registry, logger)
ip, _, err := chooseProtocol(ctx, module.TCP.IPProtocol, module.TCP.IPProtocolFallback, targetAddress, registry, logger, module.TCP.DNSServer, module.TCP.DNSTimeout)
if err != nil {
logger.Error("Error resolving address", "err", err)
return nil, err
Expand Down
15 changes: 14 additions & 1 deletion prober/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ var protocolToGauge = map[string]float64{
}

// Returns the IP for the IPProtocol and lookup time.
func chooseProtocol(ctx context.Context, IPProtocol string, fallbackIPProtocol bool, target string, registry *prometheus.Registry, logger *slog.Logger) (ip *net.IPAddr, lookupTime float64, err error) {
func chooseProtocol(ctx context.Context, IPProtocol string, fallbackIPProtocol bool, target string, registry *prometheus.Registry, logger *slog.Logger, dnsServer string, dnsTimeout time.Duration) (ip *net.IPAddr, lookupTime float64, err error) {
var fallbackProtocol string
probeDNSLookupTimeSeconds := prometheus.NewGauge(prometheus.GaugeOpts{
Name: "probe_dns_lookup_time_seconds",
Expand Down Expand Up @@ -67,6 +67,19 @@ func chooseProtocol(ctx context.Context, IPProtocol string, fallbackIPProtocol b
}()

resolver := &net.Resolver{}

if dnsServer != "" {
resolver = &net.Resolver{
PreferGo: true,
Dial: func(ctx context.Context, network, address string) (net.Conn, error) {
d := net.Dialer{
Timeout: dnsTimeout,
}
return d.DialContext(ctx, "udp", dnsServer)
},
}
}

if !fallbackIPProtocol {
ips, err := resolver.LookupIP(ctx, IPProtocol, target)
if err == nil {
Expand Down