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

PostgreSQL: Read postgresDSUsePGX from config (#112170)

Browse Source 
* PostgreSQL: Read `postgresDSUsePGX` from config

* Update plugins_test
This commit is contained in:
Zoltán Bedi
2025-10-10 15:55:55 +02:00
committed by GitHub
parent f33e6e47d5
commit 5e8267fcf8
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/grafana-postgresql-datasource/postgres_service.go
+7 -9
View File
@@ -7,30 +7,27 @@ import (
"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
"github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/setting"
sqlengpgx "github.com/grafana/grafana/pkg/tsdb/grafana-postgresql-datasource/pgx"
"github.com/grafana/grafana/pkg/tsdb/grafana-postgresql-datasource/sqleng"
)
type Service struct {
im instancemgmt.InstanceManager
features featuremgmt.FeatureToggles
im instancemgmt.InstanceManager
}
func ProvideService(cfg *setting.Cfg, features featuremgmt.FeatureToggles) *Service {
func ProvideService(cfg *setting.Cfg) *Service {
logger := backend.NewLoggerWith("logger", "tsdb.postgres")
usePGX := features.IsEnabled(context.Background(), featuremgmt.FlagPostgresDSUsePGX)
s := &Service{
im: datasource.NewInstanceManager(NewInstanceSettings(logger, usePGX, cfg.DataPath)),
features: features,
im: datasource.NewInstanceManager(NewInstanceSettings(logger, cfg.DataPath)),
}
return s
}
// NOTE: do not put any business logic into this method. it's whole job is to forward the call "inside"
func (s *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
if s.features.IsEnabled(ctx, featuremgmt.FlagPostgresDSUsePGX) {
cfg := backend.GrafanaConfigFromContext(ctx)
if cfg.FeatureToggles().IsEnabled("postgresDSUsePGX") {
dsHandler, err := s.getDSInfoPGX(ctx, req.PluginContext)
if err != nil {
return sqlengpgx.ErrToHealthCheckResult(err)
@@ -47,7 +44,8 @@ func (s *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthReque
// NOTE: do not put any business logic into this method. it's whole job is to forward the call "inside"
func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
if s.features.IsEnabled(ctx, featuremgmt.FlagPostgresDSUsePGX) {
cfg := backend.GrafanaConfigFromContext(ctx)
if cfg.FeatureToggles().IsEnabled("postgresDSUsePGX") {
dsInfo, err := s.getDSInfoPGX(ctx, req.PluginContext)
if err != nil {
return nil, err