opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-23 14:53:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add timeout option to datasource config (#31871)

Browse Source
This commit is contained in:
Arseny Smalyuk
2021-04-07 17:46:19 +03:00
committed by GitHub
parent 7a68852aa7
commit 8e70d5d181
4 changed files with 61 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/models/datasource_cache_test.go
View File

@ -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)