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

Docs: Correct references to 'lockingMigration' (#51678) (#52289)

Browse Source 
Signed-off-by: Dave Henderson <dave.henderson@grafana.com>
(cherry picked from commit 19cf9fa87d)

Co-authored-by: Dave Henderson <dave.henderson@grafana.com>
This commit is contained in:
Grot (@grafanabot)andDave Henderson authored and GitHub committed 2022-08-09 13:21:20 +02:00
1 parent fdfa380fa9
commit fad3ffe4c8
3 files changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

conf/defaults.ini
+1 -1
View File
@@ -125,7 +125,7 @@ path = grafana.db
# For "sqlite3" only. cache mode setting used for connecting to the database
cache_mode = private
# For "mysql" only if lockingMigration feature toggle is set. How many seconds to wait before failing to lock the database for the migrations, default is 0.
# For "mysql" only if migrationLocking feature toggle is set. How many seconds to wait before failing to lock the database for the migrations, default is 0.
locking_attempt_timeout_sec = 0
#################################### Cache server #############################
conf/sample.ini
+1 -1
View File
@@ -126,7 +126,7 @@
# For "sqlite3" only. cache mode setting used for connecting to the database. (private, shared)
;cache_mode = private
# For "mysql" only if lockingMigration feature toggle is set. How many seconds to wait before failing to lock the database for the migrations, default is 0.
# For "mysql" only if migrationLocking feature toggle is set. How many seconds to wait before failing to lock the database for the migrations, default is 0.
;locking_attempt_timeout_sec = 0
################################### Data sources #########################
docs/sources/setup-grafana/configure-grafana/_index.md
+1 -1
View File
@@ -324,7 +324,7 @@ Sets the maximum amount of time a connection may be reused. The default is 14400
### locking_attempt_timeout_sec
For "mysql", if `lockingMigration` feature toggle is set, specify the time (in seconds) to wait before failing to lock the database for the migrations. Default is 0.
For "mysql", if the `migrationLocking` feature toggle is set, specify the time (in seconds) to wait before failing to lock the database for the migrations. Default is 0.
### log_queries