Index: /tools/gformat.py
===================================================================
--- /tools/gformat.py	(revision 12785)
+++ /tools/gformat.py	(revision 12787)
@@ -1663,7 +1663,7 @@
 
       params = {
-        'check_interval' : 5 if heavy_load else 60,
-        'retry_interval' : 1  if heavy_load else 5,
-        'max_check_attempts' : 10 if heavy_load else 3,
+        'check_interval' : 5 if heavy_load else 120,
+        'retry_interval' : 1  if heavy_load else 10,
+        'max_check_attempts' : 10 if heavy_load else 6,
       }  
 
@@ -1708,4 +1708,20 @@
 }
 
+define command{
+        command_name          check_disk_snmp
+        command_line          /usr/local/libexec/nagios/check_disk_snmp.pl -H $HOSTADDRESS$ -d $ARG1$
+}
+
+define command{
+       command_name           check_by_ssh
+       command_line           $USER1$/check_by_ssh -H $HOSTADDRESS$ -p $ARG1$ -C "$ARG2$ $ARG3$ $ARG4$ $ARG5$ $ARG6$"
+}
+
+define command{
+        command_name          check_dns_wl
+        command_line          $USER1$/v2/check_dns_wl $HOSTADDRESS$ $ARG1$
+}
+
+
 # TDB: dhcp leases
 # /usr/local/libexec/nagios/check_netsnmp -H 192.168.178.47 --oid 1 exec
@@ -1740,19 +1756,18 @@
 }
 
-# Little bit broken from standard install
-#define service {
-#        use                   wleiden-service
-#        hostgroup_name        srv_hybrid
-#        service_description   DNS
-#        check_command         check_dns
-#}
-
-# TDB: Can only test this if we have the proxy listening to all addresses. 
-# define service {
-#         use                   wleiden-service
-#         hostgroup_name        srv_hybrid
-#         service_description   PROXY
-#         check_command         check_tcp!3128
-# }
+define service {
+        use                   wleiden-service
+        hostgroup_name        srv_hybrid
+        service_description   DNS
+        check_command         check_dns_wl!"www.wirelessleiden.nl"
+}
+
+
+define service {
+        use                   wleiden-service
+        hostgroup_name        srv_hybrid
+        service_description   VAR space
+        check_command         check_disk_snmp!/var
+}
 '''