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

Set DatasourceName and DatasourceType in proxy.Options (#80923)

Browse Source 
* Set DatasourceName and DatasourceType in proxy.Options

* upgrade github.com/grafana/grafana-plugin-sdk-go to v0.206.0 and fix merge conflicts
This commit is contained in:
Bruno authored and GitHub committed 2024-02-01 11:09:58 -03:00
1 parent d7ded807a2
commit 2332bfb007
11 files changed
+18 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pkg/tsdb/sqleng/proxyutil/proxy_util.go
+4 -2
View File
@@ -6,9 +6,11 @@ import (
"github.com/grafana/grafana/pkg/tsdb/sqleng"
)
func GetSQLProxyOptions(cfg setting.SecureSocksDSProxySettings, dsInfo sqleng.DataSourceInfo) *sdkproxy.Options {
func GetSQLProxyOptions(cfg setting.SecureSocksDSProxySettings, dsInfo sqleng.DataSourceInfo, datasource, datasourceType string) *sdkproxy.Options {
opts := &sdkproxy.Options{
Enabled: dsInfo.JsonData.SecureDSProxy && cfg.Enabled,
Enabled: dsInfo.JsonData.SecureDSProxy && cfg.Enabled,
DatasourceName: datasource,
DatasourceType: datasourceType,
Auth: &sdkproxy.AuthOptions{
Username: dsInfo.UID,
},