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.

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

Support for secure socks proxy #1650

Merged
merged 5 commits into from Jul 25, 2023
Merged

Support for secure socks proxy #1650

merged 5 commits into from Jul 25, 2023

Conversation

leandro-deveikis
Copy link
Contributor

@leandro-deveikis leandro-deveikis commented Jun 28, 2023

Background

This PR enables support for the secure socks proxy, which is a new feature in Grafana 10. The feature allows datasource connections to be proxied through a socks5 proxy with TLS. This enables Grafana users to connect to datasources that live in different networks than where Grafana is running when they cannot open up ports to the public internet.

Implementation notes

  • Frontend:
    • Added configuration toggle for Secure socks proxy (see screenshot at the end)
  • Backend:
    • Updated dependency github.com/grafana/grafana-plugin-sdk-go v0.163.0 and underlying dependencies.
    • Updated tests.
    • Since this project is already using github.com/grafana/grafana-plugin-sdk-go/backend/httpclient, there are no more changes needed in the backend, the config is read and loaded in that library.

Fixes #1653

Screenshot:

image

@yesoreyeram
Copy link
Collaborator

LGTM. 🔥

Can you bump the version and update the CHANGELOG please?

@alexanderzobnin alexanderzobnin self-requested a review July 25, 2023 15:51
Copy link
Collaborator

@alexanderzobnin alexanderzobnin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, nice addition!

@alexanderzobnin alexanderzobnin added this to the 4.4 milestone Jul 25, 2023
@alexanderzobnin alexanderzobnin changed the title Enables PDC for zabbix datasource Support for secure socks proxy Jul 25, 2023
@alexanderzobnin alexanderzobnin merged commit 8205f7a into grafana:master Jul 25, 2023
5 checks passed
@alexanderzobnin alexanderzobnin removed this from the 4.4 milestone Jul 25, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Enable PDC for zabbix datasource
3 participants