Nemo bis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/58079
Change subject: Global jobqueue check: mwscript path fix
......................................................................
Global jobqueue check: mwscript path fix
Followup to I4b67f60a62a370ea327f7fa68eea9ca444baa3bc
Error spotted by paravoid, path and user fix as said by Reedy.
Change-Id: Iaca09cc53e547e850a667f4ddb07eef8ef4f3e90
---
M manifests/ganglia.pp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/79/58079/1
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index b96a61a..a0b4d51 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -626,7 +626,7 @@
cron {
all_jobqueue_length:
- command => "/usr/bin/gmetric --name='Global JobQueue
length' --type=int32 --conf=/etc/ganglia/gmond.conf --value=$(mwscript
extensions/WikimediaMaintenance/getJobQueueLengths.php --totalonly | grep -oE
'[0-9]+') > /dev/null 2>&1",
+ command => "/usr/bin/gmetric --name='Global JobQueue
length' --type=int32 --conf=/etc/ganglia/gmond.conf --value=$(sudo -u apache
php /usr/local/apache/common/multiversion/MWScript.php
extensions/WikimediaMaintenance/getJobQueueLengths.php --totalonly | grep -oE
'[0-9]+') > /dev/null 2>&1",
user => mwdeploy,
ensure => present;
}
@@ -634,7 +634,7 @@
# gather these metrics in a fake host called "www.wikimedia.org"
cron {
all_jobqueue_length_spoofed:
- 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",
+ command => "/usr/bin/gmetric --name='Global JobQueue
length' --type=int32 --conf=/etc/ganglia/gmond.conf --spoof
'www.wikimedia.org:www.wikimedia.org' --value=$(sudo -u apache php
/usr/local/apache/common/multiversion/MWScript.php
extensions/WikimediaMaintenance/getJobQueueLengths.php --totalonly | grep -oE
'[0-9]+') > /dev/null 2>&1",
user => mwdeploy,
ensure => present;
}
--
To view, visit https://gerrit.wikimedia.org/r/58079
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaca09cc53e547e850a667f4ddb07eef8ef4f3e90
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Nemo bis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
