Nagios update

Merged Chris Hines requested to merge nagios_update into master

Merge request reports