Pyoungmeister has submitted this change and it was merged.
Change subject: move jobqueue check from neon to hume/terbium
......................................................................
move jobqueue check from neon to hume/terbium
it's currently broken. requires a full mediawiki install. these
hosts seem like a reasonable place to put the check.
RT1128
Change-Id: Iad8fc7876662e0ad5e81b31accac6366fb31d813
---
M manifests/misc/icinga.pp
M manifests/role/applicationserver.pp
2 files changed, 3 insertions(+), 2 deletions(-)
Approvals:
Pyoungmeister: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index b79ad17..3605180 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -33,7 +33,6 @@
icinga::monitor::snmp,
icinga::monitor::checkpaging,
icinga::monitor::service,
- icinga::monitor::jobqueue,
icinga::monitor::snmp,
icinga::monitor::naggen,
icinga::monitor::nsca::daemon,
@@ -652,7 +651,6 @@
}
class icinga::monitor::jobqueue {
- include icinga::monitor::packages
include applicationserver::packages
file {'/usr/lib/nagios/plugins/check_job_queue':
diff --git a/manifests/role/applicationserver.pp
b/manifests/role/applicationserver.pp
index 888e11e..03f7400 100644
--- a/manifests/role/applicationserver.pp
+++ b/manifests/role/applicationserver.pp
@@ -239,6 +239,9 @@
applicationserver::cron,
applicationserver::sudo,
role::applicationserver::configuration::php
+
+ # Also include jobqueue monitoring check
+ include icinga::monitor::jobqueue
}
}
--
To view, visit https://gerrit.wikimedia.org/r/75667
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iad8fc7876662e0ad5e81b31accac6366fb31d813
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Pyoungmeister <[email protected]>
Gerrit-Reviewer: Pyoungmeister <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
