Merge branch 'master' into staging

[mirror/dsa-puppet.git] / modules / nagios / templates / inc-debian.org.erb

diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb
index 88b4dcb..3391745 100644 (file)
--- a/modules/nagios/templates/inc-debian.org.erb
+++ b/modules/nagios/templates/inc-debian.org.erb
@@ -14,3 +14,10 @@ end
 out = "allowed_hosts=" + nagii.join(',')
 out
 %>
+
+
+# the string "system-in-shutdown" is used by the remote side to tell
+# if a system is running shutdown.  We do not use check_nrpe's
+# exit code as that does not reliably tell us if the check could
+# not connect to the nrpe server or if the remote check returned not-null.
+command[dsa2_shutdown]=if /usr/lib/nagios/plugins/check_procs -w 1: -u root -C shutdown > /dev/null; then echo 'system-in-shutdown'; else echo 'no shutdown running' ; fi