[dw-ops] Sync outstanding Nagios and Puppet changes

[mark]

[commit: http://hg.dwscoalition.org/dw-ops/rev/969c631efb1a]

Sync outstanding Nagios and Puppet changes

Patch by mark.

Files modified:

• nagios/conf.d/config/commands.cfg
• nagios/conf.d/config/hostgroups.cfg
• nagios/conf.d/hosts/sb-admin01-auto.cfg
• nagios/conf.d/hosts/sb-db01-auto.cfg
• nagios/conf.d/hosts/sb-db02-auto.cfg
• nagios/conf.d/hosts/sb-jobs01-auto.cfg
• nagios/conf.d/hosts/sb-jobs02-auto.cfg
• nagios/conf.d/hosts/sb-lb01-auto.cfg
• nagios/conf.d/hosts/sb-lb02-auto.cfg
• nagios/conf.d/hosts/sb-search01-auto.cfg
• nagios/conf.d/hosts/sb-web01-auto.cfg
• nagios/conf.d/hosts/sb-web02-auto.cfg
• nagios/conf.d/hosts/sb-web03-auto.cfg
• nagios/conf.d/services/disks-web.cfg
• nagios/custom/check_smart.pl
• puppet/manifests/site.pp
• puppet/modules/iptables/templates/spamhaus-drop.erb

( Diff: 17 files changed. )