summaryrefslogtreecommitdiff
path: root/puppet/modules/site_nagios/manifests
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2015-06-11 12:10:09 -0400
committerMicah Anderson <micah@leap.se>2015-06-11 12:10:09 -0400
commitb429b30bda4dafc78cb02f6ece5d82f08e35de1f (patch)
tree37efc30a4fcb642dec583c3accea76f7a7de9c39 /puppet/modules/site_nagios/manifests
parent67b2bea2dfcfb06191bf5ed562309f264c6aed8c (diff)
parentd9146415db0e6b7dd0c945039c0a4ed4fd054a7d (diff)
Merge tag '0.7.0'
Releasing 0.7.0
Diffstat (limited to 'puppet/modules/site_nagios/manifests')
-rw-r--r--puppet/modules/site_nagios/manifests/server.pp13
1 files changed, 8 insertions, 5 deletions
diff --git a/puppet/modules/site_nagios/manifests/server.pp b/puppet/modules/site_nagios/manifests/server.pp
index 092ca503..cb6c8d95 100644
--- a/puppet/modules/site_nagios/manifests/server.pp
+++ b/puppet/modules/site_nagios/manifests/server.pp
@@ -1,3 +1,4 @@
+# configures nagios on monitoring node
class site_nagios::server inherits nagios::base {
# First, purge old nagios config (see #1467)
@@ -13,7 +14,8 @@ class site_nagios::server inherits nagios::base {
include nagios::defaults::commands
include nagios::defaults::templates
include nagios::defaults::timeperiods
- include nagios::defaults::plugins
+ include nagios::pnp4nagios
+ include nagios::pnp4nagios::popup
class { 'nagios':
# don't manage apache class from nagios, cause we already include
@@ -41,10 +43,11 @@ class site_nagios::server inherits nagios::base {
# deploy serverside plugins
file { '/usr/lib/nagios/plugins/check_openvpn_server.pl':
- source => 'puppet:///modules/nagios/plugins/check_openvpn_server.pl',
- mode => '0755',
- owner => 'nagios',
- group => 'nagios',
+ source => 'puppet:///modules/nagios/plugins/check_openvpn_server.pl',
+ mode => '0755',
+ owner => 'nagios',
+ group => 'nagios',
+ require => Package['nagios-plugins'];
}
create_resources ( site_nagios::add_host_services, $nagios_hosts )