Pyoungmeister has submitted this change and it was merged.
Change subject: removing unused enwikijobqueue check
......................................................................
removing unused enwikijobqueue check
the check jobqueue check covers enwiki, making this uneeded.
Change-Id: Ib0158e3a7f66b42621ef068e1af103eae09fea1c
---
M manifests/misc/icinga.pp
M manifests/site.pp
2 files changed, 0 insertions(+), 25 deletions(-)
Approvals:
Pyoungmeister: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index 4ded1a4..dd473fa 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -870,30 +870,6 @@
}
}
-# Used to be called nagios::ganglia::monitor::enwiki
-class misc::monitoring::enwikijobqueue {
-
- include passwords::nagios::mysql
- require mysql_wmf::client
- $ganglia_mysql_enwiki_pass =
$passwords::nagios::mysql::mysql_enwiki_pass
- $ganglia_mysql_enwiki_user =
$passwords::nagios::mysql::mysql_enwiki_user
- # Password is actually the same for all clusters and wikis, not en.wiki
only
- cron {
- enwiki_jobqueue_length:
- command => "/usr/bin/gmetric --name='enwiki JobQueue
length' --type=int32 --conf=/etc/ganglia/gmond.conf --value=$(mysql --batch
--skip-column-names -u $ganglia_mysql_enwiki_user -p$ganglia_mysql_enwiki_pass
-h db36.pmtpa.wmnet enwiki -e 'select count(*) from job') > /dev/null 2>&1",
- user => root,
- ensure => present;
- }
- # duplicating the above job to experiment with gmetric's host spoofing
so as to
- # gather these metrics in a fake host called "en.wikipedia.org"
- cron {
- enwiki_jobqueue_length_spoofed:
- command => "/usr/bin/gmetric --name='enwiki JobQueue
length' --type=int32 --conf=/etc/ganglia/gmond.conf --spoof
'en.wikipedia.org:en.wikipedia.org' --value=$(mysql --batch --skip-column-names
-u $ganglia_mysql_enwiki_user -p$ganglia_mysql_enwiki_pass -h db36.pmtpa.wmnet
enwiki -e 'select count(*) from job') > /dev/null 2>&1",
- user => root,
- ensure => present;
- }
-}
-
# global monitoring groups - formerly misc/nagios.pp
@monitor_group { 'misc_eqiad': description => 'eqiad misc servers' }
diff --git a/manifests/site.pp b/manifests/site.pp
index b0b1c3e..becf342 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1173,7 +1173,6 @@
nfs::netapp::home,
nfs::upload,
misc::deployment::scap_scripts,
-# misc::monitoring::enwikijobqueue,
misc::monitoring::jobqueue,
admins::roots,
admins::mortals,
--
To view, visit https://gerrit.wikimedia.org/r/75797
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0158e3a7f66b42621ef068e1af103eae09fea1c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Pyoungmeister <p...@wikimedia.org>
Gerrit-Reviewer: Pyoungmeister <p...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
