X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fnagios%2Ftemplates%2Finc-debian.org.erb;h=bf6c2f95dfc779229451542d61d01b26cb02a36c;hb=91ac27a415220c7ea47f08fd26c95a37479287ce;hp=ce431372f6cd4e4417e7a9a6d4fa18478b656912;hpb=b917b8c84b95b0a0d78a78334738cc9a3a95784d;p=dsa-puppet.git

diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb
index ce431372..bf6c2f95 100644
--- a/modules/nagios/templates/inc-debian.org.erb
+++ b/modules/nagios/templates/inc-debian.org.erb
@@ -4,12 +4,25 @@
 ##
 
 <%=
-nagii = [ '192.25.206.33', '82.195.75.106' ]
+nagii = []
+localinfo.keys.sort.each do |node|
+  if localinfo[node]['nagiosmaster'] or localinfo[node]['extranrpeclient']
+    nagii << keyinfo[node]['ipHostNumber']
+  end
+end
 
 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