Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/249109
Change subject: mediawiki: group general monitoring scripts in a single role
......................................................................
mediawiki: group general monitoring scripts in a single role
Change-Id: I013e19b1da9ce073405dd1da6389aa796e17f49f
---
M manifests/misc/monitoring.pp
M manifests/role/mediawiki.pp
M manifests/site.pp
3 files changed, 25 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/09/249109/1
diff --git a/manifests/misc/monitoring.pp b/manifests/misc/monitoring.pp
index 6857ac8..d5c3c6c 100644
--- a/manifests/misc/monitoring.pp
+++ b/manifests/misc/monitoring.pp
@@ -1,25 +1,5 @@
# misc/monitoring.pp
-# Copied from nagios::ganglia::monitor::enwiki
-# Will run on terbium to use the local MediaWiki install so that we can use
-# maintenance scripts recycling DB connections and taking a few secs, not mins
-class misc::monitoring::jobqueue {
-
- cron { 'all_jobqueue_length':
- ensure => present,
- command => "/usr/bin/gmetric --name='Global JobQueue length'
--type=int32 --conf=/etc/ganglia/gmond.conf --value=$(/usr/local/bin/mwscript
extensions/WikimediaMaintenance/getJobQueueLengths.php --totalonly | grep -oE
'[0-9]+') > /dev/null 2>&1",
- user => 'mwdeploy',
- }
-
- # duplicating the above job to experiment with gmetric's host spoofing so
- # as to gather these metrics in a fake host called "www.wikimedia.org"
- cron { 'all_jobqueue_length_spoofed':
- ensure => present,
- command => "/usr/bin/gmetric --name='Global JobQueue length'
--type=int32 --conf=/etc/ganglia/gmond.conf --spoof
'www.wikimedia.org:www.wikimedia.org' --value=$(/usr/local/bin/mwscript
extensions/WikimediaMaintenance/getJobQueueLengths.php --totalonly | grep -oE
'[0-9]+') > /dev/null 2>&1",
- user => 'mwdeploy',
- }
-}
-
# Ganglia views that should be
# avaliable on ganglia.wikimedia.org
class misc::monitoring::views {
diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index fb44e34..19997e0 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -178,15 +178,36 @@
include ::mediawiki::jobrunner
}
-# monitor the Apple dictionary bridge (T83147)
-class role::mediawiki::searchmonitor {
+class role::mediawiki::general_monitoring {
+ # Will use the local MediaWiki install so that we can use
+ # maintenance scripts recycling DB connections and taking a few secs,
+ # not mins
+
+ # monitor the Apple dictionary bridge (T83147)
#
https://search.wikimedia.org/?lang=en&site=wikipedia&search=Wikimedia_Foundation&limit=1
monitoring::service { 'mediawiki-dict-bridge':
description => 'Mediawiki Apple Dictionary Bridge',
check_command => 'check_https_dictbridge',
}
+ cron { 'all_jobqueue_length':
+ ensure => present,
+ command => "/usr/bin/gmetric --name='Global JobQueue length'
--type=int32 --conf=/etc/ganglia/gmond.conf --value=$(/usr/local/bin/mwscript
extensions/WikimediaMaintenance/getJobQueueLengths.php --totalonly | grep -oE
'[0-9]+') > /dev/null 2>&1",
+ user => 'mwdeploy',
+ }
+
+ # duplicating the above job to experiment with gmetric's host spoofing so
+ # as to gather these metrics in a fake host called "www.wikimedia.org"
+ cron { 'all_jobqueue_length_spoofed':
+ ensure => present,
+ command => "/usr/bin/gmetric --name='Global JobQueue length'
--type=int32 --conf=/etc/ganglia/gmond.conf --spoof
'www.wikimedia.org:www.wikimedia.org' --value=$(/usr/local/bin/mwscript
extensions/WikimediaMaintenance/getJobQueueLengths.php --totalonly | grep -oE
'[0-9]+') > /dev/null 2>&1",
+ user => 'mwdeploy',
+ }
+
+ include misc::monitoring::jobqueue
+
+
}
# Class for a subgroup of appservers where we can test experimental features
diff --git a/manifests/site.pp b/manifests/site.pp
index 1f3174e..d3a11f5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2403,8 +2403,8 @@
# https://wikitech.wikimedia.org/wiki/Terbium
node 'terbium.eqiad.wmnet' {
- role db::maintenance, peopleweb, noc, mediawiki::searchmonitor,
mediawiki::maintenance, backup::host
- include misc::monitoring::jobqueue
+ role db::maintenance, peopleweb, noc, mediawiki::generic_monitoring,
mediawiki::maintenance, backup::host
+
include scap::scripts
include ldap::role::client::labs
--
To view, visit https://gerrit.wikimedia.org/r/249109
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I013e19b1da9ce073405dd1da6389aa796e17f49f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
