Lots of Nagios updates