Commit 4b8d9cac by Carl Bergquist Committed by GitHub

Merge pull request #6437 from dmvk/feature/grafana-cli-proxy

Take grafana-cli proxy settings from env
parents 39f9db86 c6257b30
...@@ -25,6 +25,7 @@ func Init(version string) { ...@@ -25,6 +25,7 @@ func Init(version string) {
grafanaVersion = version grafanaVersion = version
tr := &http.Transport{ tr := &http.Transport{
Proxy: http.ProxyFromEnvironment,
TLSClientConfig: &tls.Config{InsecureSkipVerify: false}, TLSClientConfig: &tls.Config{InsecureSkipVerify: false},
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment