add global datasource proxy timeout setting

closes grafana#5699
This commit is contained in:
Benjamin Reed
2019-01-24 14:04:21 -05:00
parent c7b556c0e4
commit 9108fd1b9d
4 changed files with 9 additions and 1 deletions
+1 -1
View File
@@ -54,7 +54,7 @@ func NewDataSourceProxy(ds *m.DataSource, plugin *plugins.DataSourcePlugin, ctx
func newHTTPClient() httpClient {
return &http.Client{
Timeout: time.Second * 30,
Timeout: time.Duration(setting.DataProxyTimeout) * time.Second,
Transport: &http.Transport{Proxy: http.ProxyFromEnvironment},
}
}