public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v11.2.x] Prometheus: Fix passing query timeout to upstream queries (#95263)

Browse Source 
Prometheus: Fix passing query timeout to upstream queries (#95104)

* remove queryTimeout from constructor

* use queryTimeout for range and instant queries

* remove comment

* remove default query timeout

* fix linting

(cherry picked from commit 78a00d09cd)

Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
This commit is contained in:
grafana-delivery-bot[bot]
2024-10-23 16:49:16 +02:00
committed by GitHub
co-authored by ismail simsek
parent ea458d3a15
commit bfbf8d6b9c
5 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/promlib/resource/resource.go
+3 -2
View File
@@ -35,8 +35,9 @@ func New(
}
return &Resource{
log: plog,
promClient: client.NewClient(httpClient, httpMethod, settings.URL),
log: plog,
// we don't use queryTimeout for resource calls
promClient: client.NewClient(httpClient, httpMethod, settings.URL, ""),
}, nil
}