IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Prometheus: Fix passing of custom params when running queries (#42728)

Browse Source 
* Prometheus: Fix passing of custom params

* Remove prints
This commit is contained in:
Ivana Huckova
2021-12-03 16:28:05 +01:00
committed by GitHub
parent 8722c19cc3
commit 21fe78302b
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/tsdb/prometheus/custom_query_params_middleware.go
View File

@@ -11,14 +11,25 @@ import (
const (
customQueryParametersMiddlewareName = "prom-custom-query-parameters"
customQueryParametersKey = "customQueryParameters"
grafanaDataKey = "grafanaData"
)
func customQueryParametersMiddleware(logger log.Logger) sdkhttpclient.Middleware {
return sdkhttpclient.NamedMiddlewareFunc(customQueryParametersMiddlewareName, func(opts sdkhttpclient.Options, next http.RoundTripper) http.RoundTripper {
customQueryParamsVal, exists := opts.CustomOptions[customQueryParametersKey]
grafanaData, exists := opts.CustomOptions[grafanaDataKey]
if !exists {
return next
}
data, ok := grafanaData.(map[string]interface{})
if !ok {
return next
}
customQueryParamsVal, exists := data[customQueryParametersKey]
if !exists {
return next
}
customQueryParams, ok := customQueryParamsVal.(string)
if !ok || customQueryParams == "" {
return next

8
pkg/tsdb/prometheus/custom_query_params_middleware_test.go
View File

@@ -114,7 +114,9 @@ func TestCustomQueryParametersMiddleware(t *testing.T) {
mw := customQueryParametersMiddleware(log.New("test"))
rt := mw.CreateMiddleware(httpclient.Options{
CustomOptions: map[string]interface{}{
customQueryParametersKey: "custom=par/am&second=f oo",
grafanaDataKey: map[string]interface{}{
customQueryParametersKey: "custom=par/am&second=f oo",
},
},
}, finalRoundTripper)
require.NotNil(t, rt)
@@ -144,7 +146,9 @@ func TestCustomQueryParametersMiddleware(t *testing.T) {
mw := customQueryParametersMiddleware(log.New("test"))
rt := mw.CreateMiddleware(httpclient.Options{
CustomOptions: map[string]interface{}{
customQueryParametersKey: "custom=par/am&second=f oo",
grafanaDataKey: map[string]interface{}{
customQueryParametersKey: "custom=par/am&second=f oo",
},
},
}, finalRoundTripper)
require.NotNil(t, rt)