Nagios check fixes

Change-Id: Ib63f4c7dab4f85f3187a467e19e6c2bd163f3668