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

* 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
+1 -1
View File
@@ -116,9 +116,9 @@ datasources:
- name: MSSQL
type: mssql
url: localhost:1433
database: grafana
user: grafana
jsonData:
database: grafana
maxOpenConns: 0 # Grafana v5.4+
maxIdleConns: 2 # Grafana v5.4+
connMaxLifetime: 14400 # Grafana v5.4+
+1 -1
View File
@@ -91,9 +91,9 @@ datasources:
- name: MySQL
type: mysql
url: localhost:3306
database: grafana
user: grafana
jsonData:
database: grafana
maxOpenConns: 0 # Grafana v5.4+
maxIdleConns: 2 # Grafana v5.4+
connMaxLifetime: 14400 # Grafana v5.4+
+1 -1
View File
@@ -125,11 +125,11 @@ datasources:
- name: Postgres
type: postgres
url: localhost:5432
database: grafana
user: grafana
secureJsonData:
password: 'Password!'
jsonData:
database: grafana
sslmode: 'disable' # disable/require/verify-ca/verify-full
maxOpenConns: 0 # Grafana v5.4+
maxIdleConns: 2 # Grafana v5.4+