added jabber nagios tests

diff --git a/manifests/init.pp b/manifests/init.pp
index cc168b4f9dc8241d21a8c206acec4ec9cca16d65..62f3e2224cd422ca9771f4803714041ee257f3a9 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -6,6 +6,13 @@ class ejabberd {
     case $operatingsystem {
         default: { include ejabberd::base }
     }
+    if $use_nagios {
+        include ejabberd::nagios
+    }
+
+    if $use_munin {
+        include ejabberd::munin
+    }
 }
 
 class ejabberd::base {
@@ -28,8 +35,4 @@ class ejabberd::base {
         hasstatus => true, #fixme!
         require => Package[ejabberd],
     }
-
-    if $use_munin {
-        include ejabberd::munin
-    }
 }

diff --git a/manifests/nagios.pp b/manifests/nagios.pp
new file mode 100644 (file)
index 0000000..c01a2d7
--- /dev/null
+++ b/manifests/nagios.pp
@@ -0,0 +1,19 @@
+# manifests/nagios.pp
+
+class jabber::nagios {
+    case $jabber_nagios_domain {
+        '': { $jabber_nagios_domain = $fqdn }
+    }
+    nagios::service{ "jabber_${fqdn}": check_command => "check_jabber!${jabber_nagios_domain}" }
+
+    case $jabber_nagios_user {
+        '': { $jabber_nagios_user = 'nagios' }
+    } 
+
+    case $jabber_nagios_pwd {
+        '': { info("no \$jabber_nagios_pwd supplied for ${fqdn}! Can't test jabber login") }
+        default: { 
+            nagios::service{ "jabber_${fqdn}": check_command => "check_jabber_login!${jabber_nagios_user}@${jabber_nagios_domain}!${jabber_nagios_pwd}" }
+        }
+    }
+}