Index: noc/nagios/checkcommands.cfg
===================================================================
--- noc/nagios/checkcommands.cfg	(revision 1105)
+++ noc/nagios/checkcommands.cfg	(revision 1106)
@@ -110,75 +110,75 @@
 define command {
 	command_name	check_remote_users
-	command_line	$USER1$/check_nrpe -H $HOSTADDRESS$ -c check_users -a $ARG1$ $ARG2$
+	command_line	$USER1$/check_nrpe -H $HOSTADDRESS$ -u -c check_users -a $ARG1$ $ARG2$
 }
 
 define command {
 	command_name	check_remote_load
-	command_line	$USER1$/check_nrpe -H $HOSTADDRESS$ -c check_load -a $ARG1$ $ARG2$
+	command_line	$USER1$/check_nrpe -H $HOSTADDRESS$ -u -c check_load -a $ARG1$ $ARG2$
 }
 
 define command {
 	command_name	check_remote_disk
-	command_line	$USER1$/check_nrpe -H $HOSTADDRESS$ -c check_disk -a $ARG1$ $ARG2$
+	command_line	$USER1$/check_nrpe -H $HOSTADDRESS$ -u -c check_disk -a $ARG1$ $ARG2$
 }
 
 define command {
 	command_name	check_remote_disk_p
-	command_line	$USER1$/check_nrpe -H $HOSTADDRESS$ -c check_disk_p -a $ARG1$ $ARG2$ $ARG3$
+	command_line	$USER1$/check_nrpe -H $HOSTADDRESS$ -u -c check_disk_p -a $ARG1$ $ARG2$ $ARG3$
 }
 
 define command {
 	command_name	check_remote_procs
-	command_line	$USER1$/check_nrpe -H $HOSTADDRESS$ -c check_procs -a $ARG1$ $ARG2$
+	command_line	$USER1$/check_nrpe -H $HOSTADDRESS$ -u -c check_procs -a $ARG1$ $ARG2$
 }
 
 define command {
 	command_name	check_remote_procs_C
-	command_line	$USER1$/check_nrpe -H $HOSTADDRESS$ -c check_procs_C -a $ARG1$ $ARG2$ $ARG3$
+	command_line	$USER1$/check_nrpe -H $HOSTADDRESS$ -u -c check_procs_C -a $ARG1$ $ARG2$ $ARG3$
 }
 
 define command {
 	command_name	check_remote_procs_P
-	command_line	$USER1$/check_nrpe -H $HOSTADDRESS$ -c check_procs_P -a $ARG1$ $ARG2$ $ARG3$
+	command_line	$USER1$/check_nrpe -H $HOSTADDRESS$ -u -c check_procs_P -a $ARG1$ $ARG2$ $ARG3$
 }
 
 define command {
 	command_name	check_remote_procs_m
-	command_line	$USER1$/check_nrpe -H $HOSTADDRESS$ -c check_procs_m -a $ARG1$ $ARG2$ $ARG3$
+	command_line	$USER1$/check_nrpe -H $HOSTADDRESS$ -u -c check_procs_m -a $ARG1$ $ARG2$ $ARG3$
 }
 
 define command {
 	command_name	check_remote_procs_s
-	command_line	$USER1$/check_nrpe -H $HOSTADDRESS$ -c check_procs_s -a $ARG1$ $ARG2$ $ARG3$
+	command_line	$USER1$/check_nrpe -H $HOSTADDRESS$ -u -c check_procs_s -a $ARG1$ $ARG2$ $ARG3$
 }
 
 define command {
 	command_name	check_remote_procs_u
-	command_line	$USER1$/check_nrpe -H $HOSTADDRESS$ -c check_procs_u -a $ARG1$ $ARG2$ $ARG3$
+	command_line	$USER1$/check_nrpe -H $HOSTADDRESS$ -u -c check_procs_u -a $ARG1$ $ARG2$ $ARG3$
 }
 
 define command {
 	command_name	check_remote_procs_z
-	command_line	$USER1$/check_nrpe -H $HOSTADDRESS$ -c check_procs_z -a $ARG1$ $ARG2$ $ARG3$
+	command_line	$USER1$/check_nrpe -H $HOSTADDRESS$ -u -c check_procs_z -a $ARG1$ $ARG2$ $ARG3$
 }
 
 define command {
 	command_name	check_remote_mysql
-	command_line	$USER1$/check_nrpe -H $HOSTADDRESS$ -c check_mysql -a $USER3$ $USER4$
+	command_line	$USER1$/check_nrpe -H $HOSTADDRESS$ -u -c check_mysql -a $USER3$ $USER4$
 }
 
 define command {
 	command_name	check_remote_mysql_slave
-	command_line	$USER1$/check_nrpe -H $HOSTADDRESS$ -c check_mysql_S -a $USER3$ $USER4$
+	command_line	$USER1$/check_nrpe -H $HOSTADDRESS$ -u -c check_mysql_S -a $USER3$ $USER4$
 }
 
 define command {
 	command_name	check_remote_afs
-	command_line	$USER1$/check_nrpe -H $HOSTADDRESS$ -c check_afs
+	command_line	$USER1$/check_nrpe -H $HOSTADDRESS$ -u -c check_afs
 }
 
 define command {
 	command_name	check_remote_cron_working
-	command_line	$USER1$/check_nrpe -H $HOSTADDRESS$ -c check_cron_working
+	command_line	$USER1$/check_nrpe -H $HOSTADDRESS$ -u -c check_cron_working
 }
 
Index: noc/nagios/services.cfg
===================================================================
--- noc/nagios/services.cfg	(revision 1105)
+++ noc/nagios/services.cfg	(revision 1106)
@@ -13,4 +13,11 @@
 
 define service {
+	name	scripts-nrpe-service
+	use	scripts-service
+	notification_options	w,c,r
+	register 0
+}
+
+define service {
         use                             scripts-service
         hostgroup_name			scripts-all
@@ -99,5 +106,5 @@
 
 define service {
-	use	scripts-service
+	use	scripts-nrpe-service
 	hostgroup_name	scripts-mail
 	service_description	POSTFIX
@@ -105,12 +112,4 @@
 }
 
-define servicedependency {
-	hostgroup_name	scripts-mail
-	service_description	NRPE
-	dependent_service_description	POSTFIX
-	execution_failure_criteria	n
-	notification_failure_criteria	w,u,c
-}
-
 define service {
 	use	scripts-service
@@ -132,5 +131,5 @@
 
 define service {
-	use	scripts-service
+	use	scripts-nrpe-service
 	hostgroup_name	scripts-user
 	service_description	NSCD
@@ -139,5 +138,5 @@
 
 define service {
-	use scripts-service
+	use scripts-nrpe-service
 	hostgroup_name scripts-user
 	service_description	AFS
@@ -146,5 +145,5 @@
 
 define service {
-	use scripts-service
+	use scripts-nrpe-service
 	hostgroup_name scripts-user
 	service_description	CRON-WORKING
@@ -154,16 +153,8 @@
 
 define service {
-	use	scripts-service
+	use	scripts-nrpe-service
 	hostgroup_name	scripts-user
 	service_description	USERS
 	check_command	check_remote_users!50!25
-}
-
-define servicedependency {
-	hostgroup_name	scripts-user
-	service_description	NRPE
-	dependent_service_description	NSCD,AFS,USERS,CRON-WORKING
-	execution_failure_criteria	n
-	notification_failure_criteria	w,u,c
 }
 
@@ -191,5 +182,5 @@
 
 define service {
-	use	scripts-service
+	use	scripts-nrpe-service
 	hostgroup_name	scripts-cron
 	service_description	CRON
@@ -197,12 +188,4 @@
 }
 
-define servicedependency {
-	hostgroup_name	scripts-cron
-	service_description	NRPE
-	dependent_service_description	CRON
-	execution_failure_criteria	n
-	notification_failure_criteria	w,u,c
-}
-
 define service {
 	use	scripts-service
@@ -213,5 +196,5 @@
 
 define service {
-	use	scripts-service
+	use	scripts-nrpe-service
 	hostgroup_name	scripts-real
 	service_description	DISK
@@ -219,29 +202,13 @@
 }
 
-define servicedependency {
-	hostgroup_name	scripts-real
-	service_description	NRPE
-	dependent_service_description	DISK
-	execution_failure_criteria	n
-	notification_failure_criteria	w,u,c
-}
-
-define service {
-	use	scripts-service
-	host_name	b-m,o-f
+define service {
+	use	scripts-nrpe-service
+	hostgroup_name	scripts-user
 	service_description	LOAD
 	check_command	check_remote_load!50:50:50!100:50:50
 }
 
-define servicedependency {
-	host_name	b-m,o-f
-	service_description	NRPE
-	dependent_service_description	LOAD
-	execution_failure_criteria	n
-	notification_failure_criteria	w,u,c
-}
-
-define service {
-	use	scripts-service
+define service {
+	use	scripts-nrpe-service
 	hostgroup_name	mysql-masters,mysql-slaves
 	service_description	LOAD
@@ -268,5 +235,5 @@
 
 define service {
-	use	scripts-service
+	use	scripts-nrpe-service
 	hostgroup_name	mysql-masters
 	service_description	MYSQL-M
@@ -276,5 +243,5 @@
 
 define service {
-	use	scripts-service
+	use	scripts-nrpe-service
 	hostgroup_name	mysql-slaves
 	service_description	MYSQL-S
@@ -284,15 +251,8 @@
 
 define service {
-	use	scripts-service
-	host_name	b-m,o-f,b-k
+	use	scripts-nrpe-service
+	hostgroup_name	scripts-user
 	service_description	CPU
 	notifications_enabled	0
 	check_command	check_remote_procs_P!4!6!50
 }
-define servicedependency {
-	hostgroup_name	scripts-user
-	service_description	NRPE
-	dependent_service_description	CPU
-	execution_failure_criteria	n
-	notification_failure_criteria	w,u,c
-}