QChris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/156202
Change subject: Configure wikimetrics' replication lag checking
......................................................................
Configure wikimetrics' replication lag checking
Change-Id: I3204cfb6cceed18b0f554800b67a46bdccc36149
---
M manifests/role/wikimetrics.pp
M modules/wikimetrics
2 files changed, 38 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/02/156202/1
diff --git a/manifests/role/wikimetrics.pp b/manifests/role/wikimetrics.pp
index 822844f..67759b3 100644
--- a/manifests/role/wikimetrics.pp
+++ b/manifests/role/wikimetrics.pp
@@ -145,46 +145,56 @@
}
}
class { '::wikimetrics':
- path => $wikimetrics_path,
- group => $wikimetrics_group,
+ path => $wikimetrics_path,
+ group => $wikimetrics_group,
# clone wikimetrics as root user so it can write to /srv
- repository_owner => 'root',
+ repository_owner => 'root',
- debug => $debug,
+ debug => $debug,
- server_name => $server_name,
- server_aliases => $server_aliases,
- server_port => $server_port,
- ssl_redirect => $ssl_redirect,
- celery_concurrency => $celery_concurrency,
+ server_name => $server_name,
+ server_aliases => $server_aliases,
+ server_port => $server_port,
+ ssl_redirect => $ssl_redirect,
+ celery_concurrency => $celery_concurrency,
- flask_secret_key => $flask_secret_key,
- google_client_id => $google_client_id,
- google_client_email => $google_client_email,
- google_client_secret => $google_client_secret,
- meta_mw_consumer_key => $meta_mw_consumer_key,
- meta_mw_client_secret => $meta_mw_client_secret,
+ flask_secret_key => $flask_secret_key,
+ google_client_id => $google_client_id,
+ google_client_email => $google_client_email,
+ google_client_secret => $google_client_secret,
+ meta_mw_consumer_key => $meta_mw_consumer_key,
+ meta_mw_client_secret => $meta_mw_client_secret,
- db_user_wikimetrics => $db_user_wikimetrics,
- db_pass_wikimetrics => $db_pass_wikimetrics,
- db_host_wikimetrics => $db_host_wikimetrics,
- db_name_wikimetrics => $db_name_wikimetrics,
- db_pool_wikimetrics => $db_pool_wikimetrics,
+ db_user_wikimetrics => $db_user_wikimetrics,
+ db_pass_wikimetrics => $db_pass_wikimetrics,
+ db_host_wikimetrics => $db_host_wikimetrics,
+ db_name_wikimetrics => $db_name_wikimetrics,
+ db_pool_wikimetrics => $db_pool_wikimetrics,
- db_user_mediawiki => $db_user_mediawiki,
- db_pass_mediawiki => $db_pass_mediawiki,
- db_host_mediawiki => $db_host_mediawiki,
- db_name_mediawiki => $db_name_mediawiki,
- db_pool_mediawiki => $db_pool_mediawiki,
+ db_user_mediawiki => $db_user_mediawiki,
+ db_pass_mediawiki => $db_pass_mediawiki,
+ db_host_mediawiki => $db_host_mediawiki,
+ db_name_mediawiki => $db_name_mediawiki,
+ db_pool_mediawiki => $db_pool_mediawiki,
+ db_replication_lag_dbs => [
+ 'enwiki', # s1
+ 'eowiki', # s2
+ 'elwiki', # s3
+ 'commonswiki', # s4
+ 'dewiki', # s5
+ 'frwiki', # s6
+ 'eswiki', # s7
+ ],
+ db_replication_lag_threshold => 3,
# wikimetrics runs on the LabsDB usually,
# where this table is called 'revision_userindex'.
# The mediawiki database usually calls this 'revision'.
- revision_tablename => 'revision_userindex',
+ revision_tablename => 'revision_userindex',
- var_directory => $var_directory,
- public_subdirectory => $public_subdirectory,
+ var_directory => $var_directory,
+ public_subdirectory => $public_subdirectory,
}
# Run the wikimetrics/scripts/install script
diff --git a/modules/wikimetrics b/modules/wikimetrics
index 30ebca7..3f58391 160000
--- a/modules/wikimetrics
+++ b/modules/wikimetrics
-Subproject commit 30ebca775a7391da8cfbd04a1fd45155cd0a1df4
+Subproject commit 3f583918531a25e3a716a1b1ba48371c22aa9b2a
--
To view, visit https://gerrit.wikimedia.org/r/156202
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3204cfb6cceed18b0f554800b67a46bdccc36149
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: QChris <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
