IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

docs: add version notes

Browse Source
This commit is contained in:
Marcus Efraimsson 2018-10-10 18:59:09 +02:00
parent 79929c1f00
commit 4757ca2242
No known key found for this signature in database
GPG Key ID: EBFE0FB04612DD4A
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/sources/administration/provisioning.md
View File

@ -168,9 +168,9 @@ Since not all datasources have the same configuration settings we only have the
| sslmode | string | PostgreSQL | SSLmode. 'disable', 'require', 'verify-ca' or 'verify-full' | | sslmode | string | PostgreSQL | SSLmode. 'disable', 'require', 'verify-ca' or 'verify-full' |
| postgresVersion | number | PostgreSQL | Postgres version as a number (903/904/905/906/1000) meaning v9.3, v9.4, ..., v10 | | postgresVersion | number | PostgreSQL | Postgres version as a number (903/904/905/906/1000) meaning v9.3, v9.4, ..., v10 |
| timescaledb | boolean | PostgreSQL | Enable usage of TimescaleDB extension | | timescaledb | boolean | PostgreSQL | Enable usage of TimescaleDB extension |
| maxOpenConns | number | MySQL, PostgreSQL & MSSQL | Maximum number of open connections to the database | | maxOpenConns | number | MySQL, PostgreSQL & MSSQL | Maximum number of open connections to the database (Grafana v5.4+) |
| maxIdleConns | number | MySQL, PostgreSQL & MSSQL | Maximum number of connections in the idle connection pool | | maxIdleConns | number | MySQL, PostgreSQL & MSSQL | Maximum number of connections in the idle connection pool (Grafana v5.4+) |
| connMaxLifetime | number | MySQL, PostgreSQL & MSSQL | Maximum amount of time in seconds a connection may be reused | | connMaxLifetime | number | MySQL, PostgreSQL & MSSQL | Maximum amount of time in seconds a connection may be reused (Grafana v5.4+) |
#### Secure Json Data #### Secure Json Data

12
docs/sources/features/datasources/mssql.md
View File

@ -32,9 +32,9 @@ Name | Description
*Database* | Name of your MSSQL database. *Database* | Name of your MSSQL database.
*User* | Database user's login/username *User* | Database user's login/username
*Password* | Database user's password *Password* | Database user's password
*Max open* | The maximum number of open connections to the database, default `unlimited`. *Max open* | The maximum number of open connections to the database, default `unlimited` (Grafana v5.4+).
*Max idle* | The maximum number of connections in the idle connection pool, default `2`. *Max idle* | The maximum number of connections in the idle connection pool, default `2` (Grafana v5.4+).
*Max lifetime* | The maximum amount of time in seconds a connection may be reused, default `14400` (4 hours). *Max lifetime* | The maximum amount of time in seconds a connection may be reused, default `14400`/4 hours (Grafana v5.4+).
### Min time interval ### Min time interval
@ -589,9 +589,9 @@ datasources:
database: grafana database: grafana
user: grafana user: grafana
jsonData: jsonData:
maxOpenConns: 0 maxOpenConns: 0 # Grafana v5.4+
maxIdleConns: 2 maxIdleConns: 2 # Grafana v5.4+
connMaxLifetime: 14400 connMaxLifetime: 14400 # Grafana v5.4+
secureJsonData: secureJsonData:
password: "Password!" password: "Password!"

12
docs/sources/features/datasources/mysql.md
View File

@ -35,9 +35,9 @@ Name | Description
*Database* | Name of your MySQL database. *Database* | Name of your MySQL database.
*User* | Database user's login/username *User* | Database user's login/username
*Password* | Database user's password *Password* | Database user's password
*Max open* | The maximum number of open connections to the database, default `unlimited`. *Max open* | The maximum number of open connections to the database, default `unlimited` (Grafana v5.4+).
*Max idle* | The maximum number of connections in the idle connection pool, default `2`. *Max idle* | The maximum number of connections in the idle connection pool, default `2` (Grafana v5.4+).
*Max lifetime* | The maximum amount of time in seconds a connection may be reused, default `14400` (4 hours). *Max lifetime* | The maximum amount of time in seconds a connection may be reused, default `14400`/4 hours. This should always be lower than configured [wait_timeout](https://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html#sysvar_wait_timeout) in MySQL (Grafana v5.4+).
### Min time interval ### Min time interval
@ -320,7 +320,7 @@ datasources:
user: grafana user: grafana
password: password password: password
jsonData: jsonData:
maxOpenConns: 0 maxOpenConns: 0 # Grafana v5.4+
maxIdleConns: 2 maxIdleConns: 2 # Grafana v5.4+
connMaxLifetime: 14400 connMaxLifetime: 14400 # Grafana v5.4+
``` ```

12
docs/sources/features/datasources/postgres.md
View File

@ -31,9 +31,9 @@ Name | Description
*User* | Database user's login/username *User* | Database user's login/username
*Password* | Database user's password *Password* | Database user's password
*SSL Mode* | This option determines whether or with what priority a secure SSL TCP/IP connection will be negotiated with the server. *SSL Mode* | This option determines whether or with what priority a secure SSL TCP/IP connection will be negotiated with the server.
*Max open* | The maximum number of open connections to the database, default `unlimited`. *Max open* | The maximum number of open connections to the database, default `unlimited` (Grafana v5.4+).
*Max idle* | The maximum number of connections in the idle connection pool, default `2`. *Max idle* | The maximum number of connections in the idle connection pool, default `2` (Grafana v5.4+).
*Max lifetime* | The maximum amount of time in seconds a connection may be reused, default `14400` (4 hours). *Max lifetime* | The maximum amount of time in seconds a connection may be reused, default `14400`/4 hours (Grafana v5.4+).
*Version* | This option determines which functions are available in the query builder (only available in Grafana 5.3+). *Version* | This option determines which functions are available in the query builder (only available in Grafana 5.3+).
*TimescaleDB* | TimescaleDB is a time-series database built as a PostgreSQL extension. If enabled, Grafana will use `time_bucket` in the `$__timeGroup` macro and display TimescaleDB specific aggregate functions in the query builder (only available in Grafana 5.3+). *TimescaleDB* | TimescaleDB is a time-series database built as a PostgreSQL extension. If enabled, Grafana will use `time_bucket` in the `$__timeGroup` macro and display TimescaleDB specific aggregate functions in the query builder (only available in Grafana 5.3+).
@ -377,9 +377,9 @@ datasources:
password: "Password!" password: "Password!"
jsonData: jsonData:
sslmode: "disable" # disable/require/verify-ca/verify-full sslmode: "disable" # disable/require/verify-ca/verify-full
maxOpenConns: 0 maxOpenConns: 0 # Grafana v5.4+
maxIdleConns: 2 maxIdleConns: 2 # Grafana v5.4+
connMaxLifetime: 14400 connMaxLifetime: 14400 # Grafana v5.4+
postgresVersion: 903 # 903=9.3, 904=9.4, 905=9.5, 906=9.6, 1000=10 postgresVersion: 903 # 903=9.3, 904=9.4, 905=9.5, 906=9.6, 1000=10
timescaledb: false timescaledb: false
``` ```