Refactored pd-nagios