opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-01 07:32:12 +08:00
Code Issues 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
2024-02-01 11:09:58 -03:00
committed by GitHub
parent d7ded807a2
commit 2332bfb007
11 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/tsdb/grafana-postgresql-datasource/postgres_test.go
View File

@ -212,7 +212,7 @@ func TestIntegrationPostgres(t *testing.T) {
cnnstr := postgresTestDBConnString()
db, exe, err := newPostgres(cfg, dsInfo, cnnstr, logger)
db, exe, err := newPostgres(cfg, dsInfo, cnnstr, logger, backend.DataSourceInstanceSettings{})
require.NoError(t, err)
@ -1268,7 +1268,7 @@ func TestIntegrationPostgres(t *testing.T) {
dsInfo := sqleng.DataSourceInfo{}
conf := setting.NewCfg()
conf.DataProxyRowLimit = 1
_, handler, err := newPostgres(conf, dsInfo, cnnstr, logger)
_, handler, err := newPostgres(conf, dsInfo, cnnstr, logger, backend.DataSourceInstanceSettings{})
require.NoError(t, err)