X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Ftemplates%2Finc-debian.org.erb;h=13d10eaf9ca91569f71937bcdc890525dcdf1bee;hb=ee19b979ffcb50366b5854ed3e61d055ea919d49;hp=0f8952ab8c3cf2e5f63f39ef6d71a732b3e79721;hpb=251eaef2ab7b45a4089b5a6211040f7be30c7f1e;p=mirror%2Fdsa-puppet.git diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb index 0f8952ab8..13d10eaf9 100644 --- a/modules/nagios/templates/inc-debian.org.erb +++ b/modules/nagios/templates/inc-debian.org.erb @@ -5,18 +5,20 @@ <%= nagii = [] -localinfo.keys.sort.each do |node| - if localinfo[node]['nagiosmaster'] - nagii << keyinfo[node][0]['ipHostNumber'] - end +roles = scope.lookupvar('site::roles') +roles['nagiosmaster'].each do |nag| + nagii << scope.lookupvar('site::allnodeinfo')[nag]['ipHostNumber'] +end +roles['extranrpeclient'].each do |nag| + nagii << scope.lookupvar('site::allnodeinfo')[nag]['ipHostNumber'] end case fqdn when - 'mundy.debian.org', 'penalosa.debian.org', 'caballero.debian.org', 'peri.debian.org' then + 'mundy.debian.org', 'caballero.debian.org' then nagii << '192.34.35.49' end -out = "allowed_hosts=" + nagii.join(',') +out = "allowed_hosts=" + nagii.flatten.sort.uniq.join(',') out %> @@ -26,3 +28,6 @@ out # 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 +command[restart-ekey]=sudo /usr/sbin/service ekeyd-egd-linux restart +command[restart-samhain]=sudo /usr/sbin/service samhain restart +command[restart-ekey]=sudo /usr/sbin/service ekeyd-egd-linux restart