Skip to content
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

http probe: skip DNS lookup if using proxy #338

Closed
wants to merge 11 commits into from
Closed

http probe: skip DNS lookup if using proxy #338

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4b4594d
http probe: skip DNS lookup if using proxy
Jun 29, 2018
11d5fe9
http prober: DNS lookup for proxy if proxy_url is defined
Jul 2, 2018
cde5205
http probe: skip DNS lookup if using proxy
Jun 29, 2018
3928ae1
fix typo in http prober
Apr 3, 2019
37ba50a
whitespace issues
Apr 3, 2019
eee2bbc
Merge remote-tracking branch 'origin/master' into proxy-check
Apr 3, 2019
97c29f6
update ChooseProtocol signature
Apr 3, 2019
51f60b3
log proxy usage
Apr 3, 2019
e7b89a6
Merge branch 'master' into master
veksh Apr 26, 2019
cf1bc47
add extra arg (cgx) to chooseProtocol
Apr 26, 2019
b1cefeb
Merge branch 'master' into master
veksh Jul 5, 2019
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
34 changes: 19 additions & 15 deletions prober/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,19 +271,31 @@ func ProbeHTTP(ctx context.Context, target string, module config.Module, registr
targetHost = targetURL.Host
}

ip, lookupTime, err := chooseProtocol(ctx, module.HTTP.IPProtocol, module.HTTP.IPProtocolFallback, targetHost, registry, logger)
if err != nil {
level.Error(logger).Log("msg", "Error resolving address", "err", err)
return false
}
durationGaugeVec.WithLabelValues("resolve").Add(lookupTime)

httpClientConfig := module.HTTP.HTTPClientConfig
if len(httpClientConfig.TLSConfig.ServerName) == 0 {
// If there is no `server_name` in tls_config, use
// the hostname of the target.
httpClientConfig.TLSConfig.ServerName = targetHost
}

origHost := targetURL.Host
if httpClientConfig.ProxyURL.URL == nil {
ip, lookupTime, err := chooseProtocol(ctx, module.HTTP.IPProtocol, module.HTTP.IPProtocolFallback, targetHost, registry, logger)
if err != nil {
level.Error(logger).Log("msg", "Error resolving address", "err", err)
return false
}
durationGaugeVec.WithLabelValues("resolve").Add(lookupTime)
if targetPort == "" {
targetURL.Host = "[" + ip.String() + "]"
} else {
targetURL.Host = net.JoinHostPort(ip.String(), targetPort)
}
} else {
level.Info(logger).Log("msg", "Using proxy", "proxy", httpClientConfig.ProxyURL.URL)
}

// client, err := pconfig.NewHTTPClientFromConfig(&httpClientConfig)
client, err := pconfig.NewClientFromConfig(httpClientConfig, "http_probe", true)
if err != nil {
level.Error(logger).Log("msg", "Error generating HTTP client", "err", err)
Expand Down Expand Up @@ -315,14 +327,6 @@ func ProbeHTTP(ctx context.Context, target string, module config.Module, registr
httpConfig.Method = "GET"
}

// Replace the host field in the URL with the IP we resolved.
origHost := targetURL.Host
if targetPort == "" {
targetURL.Host = "[" + ip.String() + "]"
} else {
targetURL.Host = net.JoinHostPort(ip.String(), targetPort)
}

var body io.Reader

// If a body is configured, add it to the request.
Expand Down