Implement more detailed bandwidth monitoring

manifests/monitoringserver.pp

 node 'server4' {
   include base, ssh, puppetmaster
 
   class {'nagios::client':
     server_address => 'monitoring.adblockplus.org'
   }
 
   class {'nagios::server':
     vhost => 'monitoring.adblockplus.org',
     htpasswd_source => 'puppet:///modules/private/nagios-htpasswd',
@@ skipping 26 matching lines @@
       host_notification_commands => 'notify-host-by-email',
       email => 'admins@adblockplus.org'
     }
 
     nagios_contactgroup {'admins':
       alias => 'Nagios Administrators',
       members => 'abp-admins'
     }
   }
 
+  nagios_command {'check_nrpe_timeout':
+    command_line => '/usr/lib/nagios/plugins/check_nrpe -H $HOSTADDRESS$ -c $ARG1$ -t $ARG2$'
+  }
+
   nagios_command {'check_easylist_http':
     command_line => '/usr/lib/nagios/plugins/check_http -S -I $HOSTADDRESS$ -H easylist-downloads.adblockplus.org -u /easylist.txt -k "Accept-Encoding: gzip,deflate" -e "HTTP/1.1 200 OK"'
   }
 
   nagios_command {'check_notification_http':
     command_line => '/usr/lib/nagios/plugins/check_http -S -I $HOSTADDRESS$ -H notification.adblockplus.org -u /notification.json -k "Accept-Encoding: gzip,deflate" -e "HTTP/1.1 200 OK"'
   }
 
   nagios_host {'server_4.adblockplus.org': use => 'generic-host'}
   nagios_host {'server_5.adblockplus.org': use => 'generic-host'}
@@ skipping 75 matching lines @@
     use => 'generic-service',
     hostgroup_name => 'notification-servers',
     service_description => 'HTTP',
     check_command => 'check_notification_http'
   }
 
   nagios_service {'bandwidth':
     use => 'generic-service',
     hostgroup_name => 'all',
     service_description => 'Bandwidth',
-    check_command => 'check_nrpe_1arg!check_bandwidth',
+    check_command => 'check_nrpe_timeout!check_bandwidth!20',
     first_notification_delay => '15'
   }
 
   nagios_service {'connections':
     use => 'generic-service',
     hostgroup_name => 'all',
     service_description => 'Connections',
     check_command => 'check_nrpe_1arg!check_connections',
   }
 
   nagios_service {'memory':
     use => 'generic-service',
     hostgroup_name => 'all',
     service_description => 'Memory',
     check_command => 'check_nrpe_1arg!check_memory',
   }
 }