Initial nagios support

diff --git a/manifests/init.pp b/manifests/init.pp
index c9e5329df5bc7db5607411b9d74e39c30efdc704..157b4db3c3d433127f439164b5b0bc823917c764 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -38,6 +38,7 @@ import "postfix"
 import "reprepro"
 import "ssl"
 import "autossh"
+import "nagios"
 
 # Import subsystems
 import "subsystems/firewall.pp"

diff --git a/manifests/master.pp b/manifests/master.pp
index e6d7722b719f3cff8c76fac1fc85d7f52322cd5e..5e1c04976244381848da283e439ab516f7174794 100644 (file)
--- a/manifests/master.pp
+++ b/manifests/master.pp
@@ -7,6 +7,7 @@ class nodo::master {
   if $main_master == true {
     include puppetmasterd
     include munin::host
+    include nagios
 
     # The main master has a host entry pointing to itself, other
     # masters still retrieve catalogs from the main master.

diff --git a/manifests/physical.pp b/manifests/physical.pp
index 51fd155d2e0e95669cc4ba6a15f4938b9aa4ca1d..4b16d4e8aaa3de371f6548f339bbbac3f4a30681 100644 (file)
--- a/manifests/physical.pp
+++ b/manifests/physical.pp
@@ -9,6 +9,7 @@ class nodo::physical inherits nodo {
   include ups
   include utils::physical
   include smartmontools
+  include nagios::target
 
   # Time configuration
   case $ntpdate {