Merge pull request #15356 from grafana/15258_fix

revert ds_proxy timeout and implement dataproxy timeout correctly

pkg/api/pluginproxy/ds_proxy.go

@@ -54,7 +54,7 @@ func NewDataSourceProxy(ds *m.DataSource, plugin *plugins.DataSourcePlugin, ctx
 
 
 func newHTTPClient() httpClient {
 func newHTTPClient() httpClient {
 	return &http.Client{
 	return &http.Client{
-		Timeout:   time.Duration(setting.DataProxyTimeout) * time.Second,
+		Timeout:   30 * time.Second,
 		Transport: &http.Transport{Proxy: http.ProxyFromEnvironment},
 		Transport: &http.Transport{Proxy: http.ProxyFromEnvironment},
 	}
 	}
 }
 }

pkg/models/datasource_cache.go

@@ -8,6 +8,8 @@ import (
 	"net/http"
 	"net/http"
 	"sync"
 	"sync"
 	"time"
 	"time"
+
+	"github.com/grafana/grafana/pkg/setting"
 )
 )
 
 
 type proxyTransportCache struct {
 type proxyTransportCache struct {
@@ -57,7 +59,7 @@ func (ds *DataSource) GetHttpTransport() (*http.Transport, error) {
 		TLSClientConfig: tlsConfig,
 		TLSClientConfig: tlsConfig,
 		Proxy:           http.ProxyFromEnvironment,
 		Proxy:           http.ProxyFromEnvironment,
 		Dial: (&net.Dialer{
 		Dial: (&net.Dialer{
-			Timeout:   30 * time.Second,
+			Timeout:   time.Duration(setting.DataProxyTimeout) * time.Second,
 			KeepAlive: 30 * time.Second,
 			KeepAlive: 30 * time.Second,
 			DualStack: true,
 			DualStack: true,
 		}).Dial,
 		}).Dial,