ArielGlenn has submitted this change and it was merged.
Change subject: Revert "attempt to shut up gmetric job queue cronspam"
......................................................................
Revert "attempt to shut up gmetric job queue cronspam"
This reverts commit d8ed445b0a935c1715817ea007c848653a11dc4e
Change-Id: I29eab70159484552555e91adaf59f94ad21482b3
---
M manifests/ganglia.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index b93a34f..f3a5d3b 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -629,7 +629,7 @@
cron {
'all_jobqueue_length':
- 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",
+ 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,
ensure => present;
}
@@ -637,7 +637,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=(/usr/local/bin/mwscript
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/60372
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I29eab70159484552555e91adaf59f94ad21482b3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
