X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Ftemplates%2Finc-debian.org.erb;h=0f8952ab8c3cf2e5f63f39ef6d71a732b3e79721;hb=bf58c83a780a5f5c829398c043c5f0eb97363536;hp=88b4dcbc8c9de7b4d858008fe227783f61ad202d;hpb=c7c04448723b39228f2cf19b0c15c6158dfae8d7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb
index 88b4dcbc8..0f8952ab8 100644
--- a/modules/nagios/templates/inc-debian.org.erb
+++ b/modules/nagios/templates/inc-debian.org.erb
@@ -4,7 +4,12 @@
 ##
 
 <%=
-nagii = [ '192.25.206.33', '82.195.75.106' ]
+nagii = []
+localinfo.keys.sort.each do |node|
+  if localinfo[node]['nagiosmaster']
+    nagii << keyinfo[node][0]['ipHostNumber']
+  end
+end
 
 case fqdn when
   'mundy.debian.org', 'penalosa.debian.org', 'caballero.debian.org', 'peri.debian.org' then
@@ -14,3 +19,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