Faidon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/49370
Change subject: Add all applicationserver packages to nagios boxes
......................................................................
Add all applicationserver packages to nagios boxes
check_jobqueue wants more than just php5-cli/php5-mysql, actually
include the authoritative list of appserver packages.
Change-Id: Ie96db0aa61f69713d0c12f07d0ac82aae0499100
---
M manifests/misc/icinga.pp
M manifests/nagios.pp
2 files changed, 3 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/70/49370/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index 88114ca..1b5ce23 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -624,8 +624,8 @@
}
class icinga::monitor::jobqueue {
-
- require icinga::monitor::packages
+ include icinga::monitor::packages
+ include applicationserver::packages
file {"/usr/lib/nagios/plugins/check_job_queue":
source => "puppet:///files/nagios/check_job_queue",
@@ -727,13 +727,7 @@
}
# Stomp Perl module to monitor erzurumi (RT #703)
-
package { "libnet-stomp-perl":
- ensure => latest;
- }
-
- # PHP CLI needed for check scripts
- package { [ "php5-cli", "php5-mysql" ]:
ensure => latest;
}
}
diff --git a/manifests/nagios.pp b/manifests/nagios.pp
index b5361ba..1af664a 100644
--- a/manifests/nagios.pp
+++ b/manifests/nagios.pp
@@ -304,11 +304,6 @@
ensure => latest;
}
- # PHP CLI needed for check scripts
- package { [ "php5-cli", "php5-mysql" ]:
- ensure => latest;
- }
-
# install the nagios Apache site
file { "/etc/apache2/sites-available/nagios":
ensure => present,
@@ -528,6 +523,7 @@
class nagios::monitor::jobqueue {
+ include applicationserver::packages
file {"/usr/local/nagios/libexec/check_job_queue":
source => "puppet:///files/nagios/check_job_queue",
--
To view, visit https://gerrit.wikimedia.org/r/49370
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie96db0aa61f69713d0c12f07d0ac82aae0499100
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
