Plugins: Add option to disable TLS in the socks proxy #79246
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
PoorlyDefinedBehaviour
requested review from
torkelo,
a team and
chri2547
as code owners
PoorlyDefinedBehaviour
requested review from
wbrowne,
oshirohugo,
xnyo,
zserge,
mildwonkey and
undef1nd
and removed request for
a team
go.mod
Outdated
| @@ -475,6 +474,8 @@ require ( | |||
| go.opentelemetry.io/proto/otlp v1.0.0 // indirect | |||
| ) | |||
|
|
|||
| require github.com/grafana/grafana-plugin-sdk-go v0.196.1-0.20231205151856-c5479f051888 | |||
PoorlyDefinedBehaviour
changed the title
PoorlyDefinedBehaviour
force-pushed
the
secure-socks-proxy/add-insecure-option
branch
from
1bf4615
to
13d59e2
Compare
marefr
approved these changes
Dec 8, 2023
There was a problem hiding this comment.
Great LGTM
Sidenote: It's convenient to use a replace directive in go.mod when temporary working with dependency update. You can use go mod edit -replace=github.com/grafana/grafana-plugin-sdk-go=github.com/grafana/grafana-plugin-sdk-go@<branch name or commit>.
chri2547
approved these changes
Dec 8, 2023
dafydd-t
reviewed
Dec 11, 2023
| | `client_cert` | The file path of the client public key | /etc/client.crt | | ||
| | `server_name` | The domain name of the proxy, used for SNI | proxy.grafana.svc.cluster.local | | ||
| | `proxy_address` | The address of the proxy | localhost:9090 | | ||
| | `allow_insecure` | Disable TLS in the socks proxy | localhost:9090 | |
There was a problem hiding this comment.
I think we need to change the example value in the new line to be a boolean.
There was a problem hiding this comment.
Fixed. It was a copy pasting mistake
PoorlyDefinedBehaviour
changed the title
PoorlyDefinedBehaviour
changed the title
PoorlyDefinedBehaviour
deleted the
secure-socks-proxy/add-insecure-option
branch
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 is this feature?
Adds
allow_insecure: booltosecure_socks_datasource_proxyconfig section. The socks proxy won't use TLS whenallow_insecureis set totrue.Why do we need this feature?
From the issue description:
Who is this feature for?
Plugin developers
Which issue(s) does this PR fix?:
Part of https://github.com/grafana/hosted-grafana/issues/4935
Depends on grafana/grafana-plugin-sdk-go#833
TODO: