From fad3ffe4c823f902ae493cbed34cd7a304b8a0bf Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Tue, 9 Aug 2022 07:21:20 -0400 Subject: [PATCH] Docs: Correct references to 'lockingMigration' (#51678) (#52289) Signed-off-by: Dave Henderson (cherry picked from commit 19cf9fa87d77bf3ed851c106720f00867eb62f83) Co-authored-by: Dave Henderson --- conf/defaults.ini | 2 +- conf/sample.ini | 2 +- docs/sources/setup-grafana/configure-grafana/_index.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/defaults.ini b/conf/defaults.ini index 397f49bed26..175dbbec8fa 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -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 ############################# diff --git a/conf/sample.ini b/conf/sample.ini index b5c2e2eae2f..bea2e245500 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -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 ######################### diff --git a/docs/sources/setup-grafana/configure-grafana/_index.md b/docs/sources/setup-grafana/configure-grafana/_index.md index dc425e2b6e6..1546b71ebfd 100644 --- a/docs/sources/setup-grafana/configure-grafana/_index.md +++ b/docs/sources/setup-grafana/configure-grafana/_index.md @@ -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