Add secure socks proxy to sdk #667
Merged
Conversation
This file contains 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
stephaniehingtgen
requested review from
wbrowne and
andresmgot
and removed request for
a team
|
|
|
|
marefr
requested changes
Apr 4, 2023
andresmgot
approved these changes
Apr 5, 2023
backend/proxy/options.go
Outdated
Comment on lines
12
to
15
| var DefaultOptions = Options{ | ||
| Timeout: 180 * time.Second, | ||
| KeepAlive: 30 * time.Second, | ||
| } |
There was a problem hiding this comment.
nit: you could use the DefaultTimeoutOptions from the httpclient package (there the timeout is 30s, not 180)
There was a problem hiding this comment.
For sure! Updated
marefr
approved these changes
Apr 5, 2023
xnyo
reviewed
Apr 6, 2023
marefr
requested changes
Apr 6, 2023
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What this PR does / why we need it:
Grafana users need to be able to connect to datasources that live in different networks than where Grafana is running. This PR adds new functionality that allows datasources to connect through a socks5 proxy with TLS. This will only be available to users if it is enabled on the instance (via the config.ini:
secure_socks_datasource_proxy.enabled) and the datasource hasenableSecureSocksProxy=trueset in the json data. Optionally, datasources may specify different usernames and passwords to connect to the proxy.Which issue(s) this PR fixes:
Relates to grafana/grafana#15045
Closes https://github.com/grafana/hosted-grafana/issues/3369
Special notes for your reviewer: