Add support to use Proxy From Environment#462
Merged
roidelapluie merged 1 commit intoprometheus:mainfrom Mar 8, 2023
Merged
Conversation
6fc6baf to
26800d4
Compare
LeviHarrison
reviewed
Mar 7, 2023
config/http_config.go
Outdated
| // UnmarshalYAML implements the yaml.Unmarshaler interface. | ||
| func (c *ProxyConfig) Validate() error { | ||
| if len(c.ProxyConnectHeader) > 0 && (!c.ProxyFromEnvironment && (c.ProxyURL.URL == nil || c.ProxyURL.String() == "")) { | ||
| return fmt.Errorf("if proxy_connect_header is configured proxy_url or proxy_from_environment must also be configured") |
Contributor
There was a problem hiding this comment.
small readability nit (applies to other messages too)
Suggested change
| return fmt.Errorf("if proxy_connect_header is configured proxy_url or proxy_from_environment must also be configured") | |
| return fmt.Errorf("if proxy_connect_header is configured, proxy_url or proxy_from_environment must also be configured") |
55687a2 to
c240aee
Compare
This commit adds a new field `ProxyFromEnvironment` to the `HTTPClientConfig` and `OAuth2` structs to enable Prometheus to use the default proxy from the environment variable (as specified in net/http ProxyFromEnvironment.) This is opt-out by default, so does not change anything for existing users. This change is necessary because Prometheus previously had insufficient behavior to avoid proxying EC2 metadata requests when `proxy_url` is set in `ec2_sd_configs`. This commit also adds the ability to support `no_proxy`. See prometheus/prometheus#11991 Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
c240aee to
c8ca1fb
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This commit adds a new field
ProxyFromEnvironmentto theHTTPClientConfigandOAuth2structs to enable Prometheus to use the default proxy from the environment variable (as specified in net/http ProxyFromEnvironment.) This is opt-out by default, so does not change anything for existing users.This change is necessary because Prometheus previously had insufficient behavior to avoid proxying EC2 metadata requests when
proxy_urlis set inec2_sd_configs.See prometheus/prometheus#11991