github-mirrors/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2024-11-21 14:44:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

lib/promscrape/discoveryutils: re-use checkRedirect function for both client and blockingClient

Browse source 
Also document follow_redirects option at https://docs.victoriametrics.com/sd_configs.html#http-api-client-options

This is a follow-up for b3d0ff463a

Updates https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4282
This commit is contained in:
Aliaksandr Valialkin 2023-07-06 10:31:35 -07:00
parent 45e345806c
commit 792860db10
No known key found for this signature in database
GPG key ID: A72BEC6CD3D0DED1
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/sd_configs.md
View file

@ -1607,4 +1607,8 @@ and in the majority of [supported service discovery configs](#supported-service-
# proxy_headers: # proxy_headers:
# - "HeaderName1: HeaderValue" # - "HeaderName1: HeaderValue"
# - "HeaderNameN: HeaderValueN" # - "HeaderNameN: HeaderValueN"
# follow_redirects can be used for disallowing HTTP redirects.
# By default HTTP redirects are followed.
# follow_redirects: false
``` ```

7
lib/promscrape/discoveryutils/client.go
View file

@ -143,12 +143,11 @@ func NewClient(apiServer string, ac *promauth.Config, proxyURL *proxy.URL, proxy
} }
} }
if httpCfg.FollowRedirects != nil && !*httpCfg.FollowRedirects { if httpCfg.FollowRedirects != nil && !*httpCfg.FollowRedirects {
client.CheckRedirect = func(req *http.Request, via []*http.Request) error { checkRedirect := func(req *http.Request, via []*http.Request) error {
return http.ErrUseLastResponse
}
blockingClient.CheckRedirect = func(req *http.Request, via []*http.Request) error {
return http.ErrUseLastResponse return http.ErrUseLastResponse
} }
client.CheckRedirect = checkRedirect
blockingClient.CheckRedirect = checkRedirect
} }
setHTTPProxyHeaders := func(req *http.Request) {} setHTTPProxyHeaders := func(req *http.Request) {}
if proxyAC != nil { if proxyAC != nil {