diff --git a/servers/puppet/files/nagios3/commands.cfg b/servers/puppet/files/nagios3/commands.cfg
index 73435b9a18..668424095b 100644
--- a/servers/puppet/files/nagios3/commands.cfg
+++ b/servers/puppet/files/nagios3/commands.cfg
@@ -49,4 +49,12 @@ define command{
         command_line    /usr/bin/printf "%b" "$LASTSERVICECHECK$\t$HOSTNAME$\t$SERVICEDESC$\t$SERVICESTATE$\t$SERVICEATTEMPT$\t$SERVICESTATETYPE$\t$SERVICEEXECUTIONTIME$\t$SERVICELATENCY$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$\n" >> /var/lib/nagios3/service-perfdata.out
         }
 
+define command{
+        command_name    check_remote_disk
+        command_line    /usr/lib/nagios/plugins/check_by_ssh -p $ARG1$ -l nagios -t 30 -o StrictHostKeyChecking=no -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_disk -w $ARG2$ -c $ARG3$ -p $ARG4$'
+}
 
+define command{
+        command_name    check_remote_load
+        command_line    /usr/lib/nagios/plugins/check_by_ssh -p $ARG1$ -l nagios -t 30 -o StrictHostKeyChecking=no -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_load -w $ARG2$ -c $ARG3$'
+}
diff --git a/servers/puppet/files/nagios3/conf.d/services.cfg b/servers/puppet/files/nagios3/conf.d/services.cfg
index cc86c7837f..9d19c4af92 100644
--- a/servers/puppet/files/nagios3/conf.d/services.cfg
+++ b/servers/puppet/files/nagios3/conf.d/services.cfg
@@ -11,3 +11,17 @@ define service {
         service_description             SSH
         check_command                   check_ssh
 }
+
+define service {
+        use                             generic-service
+        hostgroup_name                  ssh_checks
+        service_description             remote disk
+        check_command                   check_remote_disk!22!20%!10%!/
+}
+
+define service {
+        use                             generic-service
+        hostgroup_name                  ssh_checks
+        service_description             remote load
+        check_command                   check_remote_load!22!5.0,4.0,3.0!10.0,6.0,4.0
+}