opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-30 06:42:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Plugins: Remove secure socks proxy feature toggle (#66611)

Browse Source
This commit is contained in:
Stephanie Hingtgen
2023-04-18 12:11:23 -05:00
committed by GitHub
parent 743fdc159b
commit 255d8f3326
35 changed files with 44 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/tsdb/postgres/postgres.go
View File

@ -15,7 +15,6 @@ import (
"github.com/grafana/grafana-plugin-sdk-go/data/sqlutil"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/tsdb/sqleng"
)
@ -96,7 +95,7 @@ func (s *Service) newInstanceSettings(cfg *setting.Cfg) datasource.InstanceFacto
driverName := "postgres"
// register a proxy driver if the secure socks proxy is enabled
if cfg.IsFeatureToggleEnabled(featuremgmt.FlagSecureSocksDatasourceProxy) && cfg.SecureSocksDSProxy.Enabled && jsonData.SecureDSProxy {
if cfg.SecureSocksDSProxy.Enabled && jsonData.SecureDSProxy {
driverName, err = createPostgresProxyDriver(&cfg.SecureSocksDSProxy, cnnstr)
if err != nil {
return "", nil