X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Ftemplates%2Finc-debian.org.erb;h=c53e7389f084e8d6091d9c8069422c5f4aef4f84;hb=117fa1ae0757bdc7867aaa0cdc98549109c22ce3;hp=817026e48854d9d330180ae1716d7df2a5115ec7;hpb=ad3f2c0f8d506aa80836ea34593019ffa79d16cb;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb
index 817026e48..c53e7389f 100644
--- a/modules/nagios/templates/inc-debian.org.erb
+++ b/modules/nagios/templates/inc-debian.org.erb
@@ -3,13 +3,21 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-<%-
-nagii = [ '192.25.206.33', '82.195.75.106' ]
+<%=
+nagii = [ '206.12.19.118', '192.25.206.33', '82.195.75.106' ]
 
 case fqdn when
   'mundy.debian.org', 'penalosa.debian.org', 'caballero.debian.org', 'peri.debian.org' then
     nagii << '192.34.35.49'
 end
 
-print "allowed_hosts=" + nagii.join(',') 
+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