IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-08-13 06:34:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

SQL Datasources: Move database setting to jsonData (#58649)

Browse Source 
* Datasource settings: Add deprecation notice for database field

* SQL Datasources: Migrate from settings.database to settings.jsonData.database

* Check jsonData first

* Remove comment from docs
This commit is contained in:
Zoltán Bedi
2022-12-13 09:56:52 +01:00
committed by GitHub
parent ac19b920f1
commit d65899de7b
14 changed files with 79 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/mssql/mssql.go
+7 -1
View File
@@ -66,11 +66,17 @@ func newInstanceSettings(cfg *setting.Cfg) datasource.InstanceFactoryFunc {
if err != nil {
return nil, fmt.Errorf("error reading settings: %w", err)
}
database := jsonData.Database
if database == "" {
database = settings.Database
}
dsInfo := sqleng.DataSourceInfo{
JsonData: jsonData,
URL: settings.URL,
User: settings.User,
Database: settings.Database,
Database: database,
ID: settings.ID,
Updated: settings.Updated,
UID: settings.UID,
pkg/tsdb/mysql/mysql.go
+7 -1
View File
@@ -60,11 +60,17 @@ func newInstanceSettings(cfg *setting.Cfg, httpClientProvider httpclient.Provide
if err != nil {
return nil, fmt.Errorf("error reading settings: %w", err)
}
database := jsonData.Database
if database == "" {
database = settings.Database
}
dsInfo := sqleng.DataSourceInfo{
JsonData: jsonData,
URL: settings.URL,
User: settings.User,
Database: settings.Database,
Database: database,
ID: settings.ID,
Updated: settings.Updated,
UID: settings.UID,
pkg/tsdb/postgres/postgres.go
+7 -1
View File
@@ -66,11 +66,17 @@ func (s *Service) newInstanceSettings(cfg *setting.Cfg) datasource.InstanceFacto
if err != nil {
return nil, fmt.Errorf("error reading settings: %w", err)
}
database := jsonData.Database
if database == "" {
database = settings.Database
}
dsInfo := sqleng.DataSourceInfo{
JsonData: jsonData,
URL: settings.URL,
User: settings.User,
Database: settings.Database,
Database: database,
ID: settings.ID,
Updated: settings.Updated,
UID: settings.UID,
pkg/tsdb/sqleng/sql_engine.go
+1
View File
@@ -66,6 +66,7 @@ type JsonData struct {
Encrypt string `json:"encrypt"`
Servername string `json:"servername"`
TimeInterval string `json:"timeInterval"`
Database string `json:"database"`
}
type DataSourceInfo struct {