Add timeout option to datasource config (#31871)

pkg/models/datasource_cache.go

@@ -124,6 +124,17 @@ var ptc = proxyTransportCache{
 	cache: make(map[int64]cachedTransport),
 }
 
+func (ds *DataSource) getTimeout() time.Duration {
+	timeout := 0
+	if ds.JsonData != nil {
+		timeout = ds.JsonData.Get("timeout").MustInt()
+	}
+	if timeout == 0 {
+		timeout = setting.DataProxyTimeout
+	}
+	return time.Duration(timeout) * time.Second
+}
+
 func (ds *DataSource) GetHttpClient() (*http.Client, error) {
 	transport, err := ds.GetHttpTransport()
 	if err != nil {
@@ -131,7 +142,7 @@ func (ds *DataSource) GetHttpClient() (*http.Client, error) {
 	}
 
 	return &http.Client{
-		Timeout:   time.Duration(setting.DataProxyTimeout) * time.Second,
+		Timeout:   ds.getTimeout(),
 		Transport: transport,
 	}, nil
 }
@@ -158,7 +169,7 @@ func (ds *DataSource) GetHttpTransport() (*dataSourceTransport, error) {
 		TLSClientConfig: tlsConfig,
 		Proxy:           http.ProxyFromEnvironment,
 		Dial: (&net.Dialer{
-			Timeout:   time.Duration(setting.DataProxyTimeout) * time.Second,
+			Timeout:   ds.getTimeout(),
 			KeepAlive: time.Duration(setting.DataProxyKeepAlive) * time.Second,
 		}).Dial,
 		TLSHandshakeTimeout:   time.Duration(setting.DataProxyTLSHandshakeTimeout) * time.Second,

pkg/models/datasource_cache_test.go

@@ -214,6 +214,25 @@ func TestDataSource_GetHttpTransport(t *testing.T) {
 		assert.Equal(t, "Ok", bodyStr)
 	})
 
+	t.Run("Should use request timeout if configured in JsonData", func(t *testing.T) {
+		clearDSProxyCache(t)
+
+		json := simplejson.NewFromAny(map[string]interface{}{
+			"timeout": 19,
+		})
+		ds := DataSource{
+			Id:       1,
+			Url:      "http://k8s:8001",
+			Type:     "Kubernetes",
+			JsonData: json,
+		}
+
+		client, err := ds.GetHttpClient()
+		require.NoError(t, err)
+
+		assert.Equal(t, 19*time.Second, client.Timeout)
+	})
+
 	t.Run("Should not include SigV4 middleware if not configured in JsonData", func(t *testing.T) {
 		clearDSProxyCache(t)