Update Nagios/Icinga checks.

Added checks for the following:

 - clark-kent.pl file lock checking
 - memcache port and process checking
 - OpenSRF diagnostic check

Still to be done:

 - I added a sudoers file for the OpenSRF check,
   but we need to put it into place

diff --git a/templates/check_osrf.sudoers b/templates/check_osrf.sudoers
new file mode 100644 (file)
index 0000000..4fcd354
--- /dev/null
+++ b/templates/check_osrf.sudoers
@@ -0,0 +1 @@
+nagios ALL=(root) NOPASSWD:/usr/lib/nagios/plugins/check_osrf

diff --git a/templates/monitor/nrpe_local.cfg b/templates/monitor/nrpe_local.cfg
index 642cc0c..234da2c 100755 (executable)
--- a/templates/monitor/nrpe_local.cfg
+++ b/templates/monitor/nrpe_local.cfg
@@ -14,17 +14,25 @@ command[check_storage_disk]=/usr/lib/nagios/plugins/check_disk -u GB -w $ARG1$ -
 ### Check Processes
 command[check_proc]=/usr/lib/nagios/plugins/check_procs -w $ARG2$ -c $ARG3$ -C $ARG1$
 
+## OpenSRF
+command[check_osrf]=sudo /usr/lib/nagios/plugins/check_osrf
+
 ### Clark
 command[check_clark]=/usr/lib/nagios/plugins/check_procs -w1:5 -c1:5 -C Clark
 
 ### Lock File Check
 command[check_holdlock]=/usr/lib/nagios/plugins/check_lock /tmp/hold_targeter-LOCK hold_targeter.pl
 command[check_finelock]=/usr/lib/nagios/plugins/check_lock /tmp/generate_fines-LOCK fine_generator.pl
+command[check_clarklock]=/usr/lib/nagios/plugins/check_lock /tmp/reporter-LOCK clark-kent.pl
 
 ### Lock File Age Check
 command[hold_lock_age]=/usr/lib/nagios/plugins/check_file_age -w 10800 -c 14400 -i /tmp/hold_targeter-LOCK
 command[fines_lock_age]=/usr/lib/nagios/plugins/check_file_age -w 10800 -c 14400 -i /tmp/generate_fines-LOCK
 
+# Check Memcache
+command[check_memcache_port]=/usr/lib/nagios/plugins/check_tcp -H localhost -p 11211
+command[check_memcache_proc]=/usr/lib/nagios/plugins/check_procs -C memcached -c 0:2
+
 # CPU I/O
 command[check_cpu_io]=/usr/lib/nagios/plugins/check_cpu.sh -iw 30 -ic 50
 

diff --git a/templates/monitor/services.cfg b/templates/monitor/services.cfg
index 026c572..dbc6830 100755 (executable)
--- a/templates/monitor/services.cfg
+++ b/templates/monitor/services.cfg
@@ -53,7 +53,7 @@ define service {
         service_description             Jabber processes
         use                             generic-service
         notification_interval           240
-        check_command                   CHECK_NRPE!check_proc!beam!1:2!1:2 
+        check_command                   CHECK_NRPE!check_proc!beam.smp!1:2!1:2 
 }
 
 define service {