130 lines
5.0 KiB
Diff
130 lines
5.0 KiB
Diff
Author: Alexander Wirt <formorer@debian.org>
|
|
Description: Fixes paths for all contributed eventhandlers
|
|
Index: nagios4/contrib/eventhandlers/disable_active_service_checks
|
|
===================================================================
|
|
--- nagios4.orig/contrib/eventhandlers/disable_active_service_checks
|
|
+++ nagios4/contrib/eventhandlers/disable_active_service_checks
|
|
@@ -16,7 +16,7 @@
|
|
|
|
printfcmd="/usr/bin/printf"
|
|
|
|
-CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
|
|
+CommandFile="/var/lib/nagios4/rw/nagios.cmd"
|
|
|
|
# get the current date/time in seconds since UNIX epoch
|
|
datetime=`date +%s`
|
|
Index: nagios4/contrib/eventhandlers/disable_notifications
|
|
===================================================================
|
|
--- nagios4.orig/contrib/eventhandlers/disable_notifications
|
|
+++ nagios4/contrib/eventhandlers/disable_notifications
|
|
@@ -14,7 +14,7 @@
|
|
|
|
printfcmd="/usr/bin/printf"
|
|
|
|
-CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
|
|
+CommandFile="/var/lib/nagios4/rw/nagios.cmd"
|
|
|
|
# get the current date/time in seconds since UNIX epoch
|
|
datetime=`date +%s`
|
|
Index: nagios4/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler
|
|
===================================================================
|
|
--- nagios4.orig/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler
|
|
+++ nagios4/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler
|
|
@@ -21,7 +21,7 @@
|
|
#
|
|
|
|
# Location of the submit_check_result_via_nsca script
|
|
-SubmitCmd="/usr/local/nagios/libexec/eventhandlers/submit_check_result_via_nsca"
|
|
+SubmitCmd="/usr/share/nagios4/plugins/eventhandlers/distributed-monitoring/submit_check_result_via_nsca"
|
|
|
|
# Convert the state string to the corresponding return code
|
|
return_code=-1
|
|
Index: nagios4/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca
|
|
===================================================================
|
|
--- nagios4.orig/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca
|
|
+++ nagios4/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca
|
|
@@ -28,8 +28,8 @@
|
|
|
|
printfcmd="/usr/bin/printf"
|
|
|
|
-NscaBin="/usr/local/nagios/libexec/send_nsca"
|
|
-NscaCfg="/usr/local/nagios/etc/send_nsca.cfg"
|
|
+NscaBin="/usr/sbin/send_nsca"
|
|
+NscaCfg="/etc/send_nsca.cfg"
|
|
NagiosHost="nagioshost"
|
|
|
|
# Fire the data off to the NSCA daemon using the send_nsca script
|
|
Index: nagios4/contrib/eventhandlers/enable_active_service_checks
|
|
===================================================================
|
|
--- nagios4.orig/contrib/eventhandlers/enable_active_service_checks
|
|
+++ nagios4/contrib/eventhandlers/enable_active_service_checks
|
|
@@ -16,7 +16,7 @@
|
|
|
|
printfcmd="/usr/bin/printf"
|
|
|
|
-CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
|
|
+CommandFile="/var/lib/nagios4/rw/nagios.cmd"
|
|
|
|
# get the current date/time in seconds since UNIX epoch
|
|
datetime=`date +%s`
|
|
Index: nagios4/contrib/eventhandlers/enable_notifications
|
|
===================================================================
|
|
--- nagios4.orig/contrib/eventhandlers/enable_notifications
|
|
+++ nagios4/contrib/eventhandlers/enable_notifications
|
|
@@ -14,7 +14,7 @@
|
|
|
|
printfcmd="/usr/bin/printf"
|
|
|
|
-CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
|
|
+CommandFile="/var/lib/nagios4/rw/nagios.cmd"
|
|
|
|
# get the current date/time in seconds since UNIX epoch
|
|
datetime=`date +%s`
|
|
Index: nagios4/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event
|
|
===================================================================
|
|
--- nagios4.orig/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event
|
|
+++ nagios4/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event
|
|
@@ -10,10 +10,10 @@
|
|
|
|
# Location of the echo and mail commands
|
|
echocmd="/bin/echo"
|
|
-mailcmd="/bin/mail"
|
|
+mailcmd="/usr/bin/mail"
|
|
|
|
# Location of the event handlers
|
|
-eventhandlerdir="/usr/local/nagios/libexec/eventhandlers"
|
|
+eventhandlerdir="/usr/share/nagios4/plugins/eventhandlers"
|
|
|
|
|
|
# Only take action on hard host states...
|
|
Index: nagios4/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event
|
|
===================================================================
|
|
--- nagios4.orig/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event
|
|
+++ nagios4/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event
|
|
@@ -10,10 +10,10 @@
|
|
|
|
# Location of the echo and mail commands
|
|
echocmd="/bin/echo"
|
|
-mailcmd="/bin/mail"
|
|
+mailcmd="/usr/bin/mail"
|
|
|
|
# Location of the event handlers
|
|
-eventhandlerdir="/usr/local/nagios/libexec/eventhandlers"
|
|
+eventhandlerdir="/usr/share/nagios4/plugins/eventhandlers"
|
|
|
|
|
|
# Only take action on hard service states...
|
|
Index: nagios4/contrib/eventhandlers/submit_check_result
|
|
===================================================================
|
|
--- nagios4.orig/contrib/eventhandlers/submit_check_result
|
|
+++ nagios4/contrib/eventhandlers/submit_check_result
|
|
@@ -24,7 +24,7 @@
|
|
|
|
echocmd="/bin/echo"
|
|
|
|
-CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
|
|
+CommandFile="/var/lib/nagios4/rw/nagios.cmd"
|
|
|
|
# get the current date/time in seconds since UNIX epoch
|
|
datetime=`date +%s`
|