Index: tools/gformat.py
===================================================================
--- tools/gformat.py	(revision 13263)
+++ tools/gformat.py	(revision 13264)
@@ -1707,24 +1707,25 @@
 
 # Please make sure to install:
-# make -C /usr/ports/net-mgmt/nagios-check_netsnmp install clean
+#   make -C /usr/ports/net-mgmt/nagios-check_netsnmp install clean
+# 
+# Recompile net-mgmt/nagios-plugins to support check_snmp
+#   make -C /usr/ports/net-mgmt/nagios-plugins
+#
+# Install net/bind-tools to allow v2/check_dns_wl to work:
+#   pkg install bind-tools
 #
 define command{
-        command_name          check_netsnmp_disk
-        command_line          $USER1$/check_netsnmp -H $HOSTADDRESS$ -o disk
+        command_name          check_snmp_disk
+        command_line          $USER1$/check_snmp_disk -H $HOSTADDRESS$ -C public
 }
 
 define command{
         command_name          check_netsnmp_load
-        command_line          $USER1$/check_netsnmp -H $HOSTADDRESS$ -o load
+        command_line          $USER1$/check_snmp_load.pl -H $HOSTADDRESS$ -C public -w 80 -c 90
 }
 
 define command{
         command_name          check_netsnmp_proc
-        command_line          $USER1$/check_netsnmp -H $HOSTADDRESS$ -o proc
-}
-
-define command{
-        command_name          check_disk_snmp
-        command_line          /usr/local/libexec/nagios/check_disk_snmp.pl -H $HOSTADDRESS$ -d $ARG1$
+        command_line          $USER1$/check_snmp_proc -H $HOSTADDRESS$ -C public
 }
 
@@ -1737,4 +1738,9 @@
         command_name          check_dns_wl
         command_line          $USER1$/v2/check_dns_wl $HOSTADDRESS$ $ARG1$
+}
+
+define command{
+	command_name		check_snmp_uptime
+	command_line		$USER1$/check_snmp -H $HOSTADDRESS$ -C public -o .1.3.6.1.2.1.1.3.0
 }
 
@@ -1778,12 +1784,4 @@
         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
-}
 '''
 
@@ -1793,6 +1791,6 @@
         use                   wleiden-service
         hostgroup_name        srv_hybrid
-        service_description   SNMP
-        check_command         check_snmp
+        service_description   UPTIME
+        check_command         check_snmp_uptime
 }
 
@@ -1822,5 +1820,5 @@
         hostgroup_name        srv_hybrid
         service_description   DISK
-        check_command         check_netsnmp_disk
+        check_command         check_snmp_disk
 }
 '''