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

Take grafana-cli proxy settings from env

Merge pull request #6437 from dmvk/feature/grafana-cli-proxy
Take grafana-cli proxy settings from env
4b8d9cac · Carl Bergquist · GitHub · 39f9db86 · c6257b30 · 4b8d9cac
Commit 4b8d9cac authored Nov 01, 2016 by Carl Bergquist Committed by GitHub Nov 01, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 0 deletions

pkg/cmd/grafana-cli/services/services.go
+1 -0

No files found.
--- a/pkg/cmd/grafana-cli/services/services.go
+++ b/pkg/cmd/grafana-cli/services/services.go
@@ -25,6 +25,7 @@ func Init(version string) {
 	grafanaVersion = version

 	tr := &http.Transport{
+		Proxy:           http.ProxyFromEnvironment,
 		TLSClientConfig: &tls.Config{InsecureSkipVerify: false},
 	}