[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, debian/master, updated. 810edbdd3feedbfe37f4a65bee50b57b2f60fa2a

[Naparuba]

The following commit has been merged in the debian/master branch:
commit f5cbef29222d41058ba7f7a0219179612c4a1dd7
Author: Naparuba <naparuba at gmail.com>
Date:   Tue Jan 10 11:25:42 2012 +0100

    Add : linux template is now with Manubulon SNMP.

diff --git a/etc/packs/os/linux/commands.cfg b/etc/packs/os/linux/commands.cfg
index fdcf809..4c920db 100644
--- a/etc/packs/os/linux/commands.cfg
+++ b/etc/packs/os/linux/commands.cfg
@@ -7,10 +7,28 @@
 # 
 define command {
        command_name     check_linux_load
-       command_line	$PLUGINSDIR$/check_by_ssh -H $HOSTADDRESS$ -C "$PLUGINSDIR$/check_load -w 3,3,3 -c 5,5,5"
+       command_line	$PLUGINSDIR$/check_snmp_load.pl -H $HOSTADDRESS$ -C $_HOSTSNMPCOMMUNITY$ -f -w 2,2,2 -c 3,3,3 -T netsl
 }
 
 define command {
        command_name     check_linux_disks
-       command_line	$PLUGINSDIR$/check_by_ssh -H $HOSTADDRESS$ -C "$PLUGINSDIR$/check_disk -w 10% -c 5% -x /dev/shm -e -l"
+       command_line	$PLUGINSDIR$/check_snmp_storage.pl -H $HOSTADDRESS$ -C $_HOSTSNMPCOMMUNITY$ -m / -f -w 90 -c 95 -S0,1
+}
+
+
+define command {
+       command_name     check_linux_cpu
+       command_line     $PLUGINSDIR$/check_snmp_load.pl -H $HOSTADDRESS$ -C $_HOSTSNMPCOMMUNITY$ -f -w 80 -c 90
+}
+
+
+define command {
+       command_name     check_linux_network_usage
+       command_line     $PLUGINSDIR$/check_snmp_int.pl -H $HOSTADDRESS$ -C $_HOSTSNMPCOMMUNITY$ -f -n eth -k -M -y -e -w 0,0 -c 0,0
+}
+
+
+define command {
+       command_name     check_linux_memory
+       command_line     $PLUGINSDIR$/check_snmp_mem.pl -H $HOSTADDRESS$ -C $_HOSTSNMPCOMMUNITY$ -f -w 90,20 -c 95,50
 }
diff --git a/etc/packs/os/linux/cpu.cfg b/etc/packs/os/linux/cpu.cfg
new file mode 100644
index 0000000..19b6ce4
--- /dev/null
+++ b/etc/packs/os/linux/cpu.cfg
@@ -0,0 +1,7 @@
+define service{
+   service_description    Cpu
+   use            	  generic-service
+   register       	  0
+   host_name	  	  linux
+   check_command  	  check_linux_cpu
+}
diff --git a/etc/packs/os/linux/memory.cfg b/etc/packs/os/linux/memory.cfg
new file mode 100644
index 0000000..20e2bbb
--- /dev/null
+++ b/etc/packs/os/linux/memory.cfg
@@ -0,0 +1,7 @@
+define service{
+   service_description    Memory
+   use            	  generic-service
+   register       	  0
+   host_name	  	  linux
+   check_command  	  check_linux_memory
+}
diff --git a/etc/packs/os/linux/network_usage.cfg b/etc/packs/os/linux/network_usage.cfg
new file mode 100644
index 0000000..42b909c
--- /dev/null
+++ b/etc/packs/os/linux/network_usage.cfg
@@ -0,0 +1,7 @@
+define service{
+   service_description    NetworkUsage
+   use            	  generic-service
+   register       	  0
+   host_name	  	  linux
+   check_command  	  check_linux_network_usage
+}
diff --git a/etc/packs/os/linux/templates.cfg b/etc/packs/os/linux/templates.cfg
index 3d616b2..dee6388 100644
--- a/etc/packs/os/linux/templates.cfg
+++ b/etc/packs/os/linux/templates.cfg
@@ -2,6 +2,8 @@
 define host{
    name				linux
    use				generic-host
-   check_command           	check_ssh
-   register			0		
+   check_command           	check_ping
+   register			0
+
+   _SNMPCOMMUNITY		$SNMPCOMMUNITYREAD$	
 }
diff --git a/etc/packs/microsoft/windows/big_processes.cfg b/etc/packs/os/windows/big_processes.cfg
similarity index 100%
rename from etc/packs/microsoft/windows/big_processes.cfg
rename to etc/packs/os/windows/big_processes.cfg
diff --git a/etc/packs/microsoft/windows/commands.cfg b/etc/packs/os/windows/commands.cfg
similarity index 100%
rename from etc/packs/microsoft/windows/commands.cfg
rename to etc/packs/os/windows/commands.cfg
diff --git a/etc/packs/microsoft/windows/cpu.cfg b/etc/packs/os/windows/cpu.cfg
similarity index 100%
rename from etc/packs/microsoft/windows/cpu.cfg
rename to etc/packs/os/windows/cpu.cfg
diff --git a/etc/packs/microsoft/windows/discovery.cfg b/etc/packs/os/windows/discovery.cfg
similarity index 100%
rename from etc/packs/microsoft/windows/discovery.cfg
rename to etc/packs/os/windows/discovery.cfg
diff --git a/etc/packs/microsoft/windows/disks.cfg b/etc/packs/os/windows/disks.cfg
similarity index 100%
rename from etc/packs/microsoft/windows/disks.cfg
rename to etc/packs/os/windows/disks.cfg
diff --git a/etc/packs/microsoft/windows/disks_io.cfg b/etc/packs/os/windows/disks_io.cfg
similarity index 100%
rename from etc/packs/microsoft/windows/disks_io.cfg
rename to etc/packs/os/windows/disks_io.cfg
diff --git a/etc/packs/microsoft/windows/each_cpu.cfg b/etc/packs/os/windows/each_cpu.cfg
similarity index 100%
rename from etc/packs/microsoft/windows/each_cpu.cfg
rename to etc/packs/os/windows/each_cpu.cfg
diff --git a/etc/packs/microsoft/windows/eventlogs_applications.cfg b/etc/packs/os/windows/eventlogs_applications.cfg
similarity index 100%
rename from etc/packs/microsoft/windows/eventlogs_applications.cfg
rename to etc/packs/os/windows/eventlogs_applications.cfg
diff --git a/etc/packs/microsoft/windows/eventlogs_system.cfg b/etc/packs/os/windows/eventlogs_system.cfg
similarity index 100%
rename from etc/packs/microsoft/windows/eventlogs_system.cfg
rename to etc/packs/os/windows/eventlogs_system.cfg
diff --git a/etc/packs/microsoft/windows/inactive_sessions.cfg b/etc/packs/os/windows/inactive_sessions.cfg
similarity index 100%
rename from etc/packs/microsoft/windows/inactive_sessions.cfg
rename to etc/packs/os/windows/inactive_sessions.cfg
diff --git a/etc/packs/microsoft/windows/load_average.cfg b/etc/packs/os/windows/load_average.cfg
similarity index 100%
rename from etc/packs/microsoft/windows/load_average.cfg
rename to etc/packs/os/windows/load_average.cfg
diff --git a/etc/packs/microsoft/windows/physical_memory.cfg b/etc/packs/os/windows/physical_memory.cfg
similarity index 100%
rename from etc/packs/microsoft/windows/physical_memory.cfg
rename to etc/packs/os/windows/physical_memory.cfg
diff --git a/etc/packs/microsoft/windows/reboot.cfg b/etc/packs/os/windows/reboot.cfg
similarity index 100%
rename from etc/packs/microsoft/windows/reboot.cfg
rename to etc/packs/os/windows/reboot.cfg
diff --git a/etc/packs/microsoft/windows/services.cfg b/etc/packs/os/windows/services.cfg
similarity index 100%
rename from etc/packs/microsoft/windows/services.cfg
rename to etc/packs/os/windows/services.cfg
diff --git a/etc/packs/microsoft/windows/swap.cfg b/etc/packs/os/windows/swap.cfg
similarity index 100%
rename from etc/packs/microsoft/windows/swap.cfg
rename to etc/packs/os/windows/swap.cfg
diff --git a/etc/packs/microsoft/windows/templates.cfg b/etc/packs/os/windows/templates.cfg
similarity index 100%
rename from etc/packs/microsoft/windows/templates.cfg
rename to etc/packs/os/windows/templates.cfg

-- 
UNNAMED PROJECT