[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, 1.0.2, updated. 1.0.1-3-18-gcc11e23
Alexander Wirt
formorer at debian.org
Sat Jun 26 15:42:13 UTC 2010
The following commit has been merged in the 1.0.2 branch:
commit 0ab1b87d555bfde51db4471536964a50b0c383de
Author: Alexander Wirt <formorer at debian.org>
Date: Sat Jun 26 13:11:59 2010 +0200
Cleanup patch
diff --git a/debian/patches/70_fix_eventhandler_paths.dpatch b/debian/patches/70_fix_eventhandler_paths.dpatch
index d081675..db9cb1b 100755
--- a/debian/patches/70_fix_eventhandler_paths.dpatch
+++ b/debian/patches/70_fix_eventhandler_paths.dpatch
@@ -55,48 +55,6 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
IcingaHost="icingahost"
# Fire the data off to the NSCA daemon using the send_nsca script
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga-1.0.2~pre20100626~/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca.~1~ icinga-1.0.2~pre20100626/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca.~1~
---- icinga-1.0.2~pre20100626~/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca.~1~ 1970-01-01 01:00:00.000000000 +0100
-+++ icinga-1.0.2~pre20100626/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca.~1~ 2010-06-26 11:14:58.838427428 +0200
-@@ -0,0 +1,38 @@
-+#!/bin/sh
-+
-+# SUBMIT_CHECK_RESULT_VIA_NSCA
-+# Written by Ethan Galstad (egalstad at nagios.org)
-+#
-+# This script will send passive check results to the
-+# nsca daemon that runs on the central Icinga server.
-+# If you simply want to submit passive checks from the
-+# same machine that Icinga is running on, look at the
-+# submit_check_result script.
-+#
-+# Arguments:
-+# $1 = host_name (Short name of host that the service is
-+# associated with)
-+# $2 = svc_description (Description of the service)
-+# $3 = return_code (An integer that determines the state
-+# of the service check, 0=OK, 1=WARNING, 2=CRITICAL,
-+# 3=UNKNOWN).
-+# $4 = plugin_output (A text string that should be used
-+# as the plugin output for the service check)s
-+#
-+#
-+# Note:
-+# Modify the NagiosHost parameter to match the name or
-+# IP address of the central server that has the nsca
-+# daemon running.
-+
-+printfcmd="/usr/bin/printf"
-+
-+NscaBin="/usr/local/icinga/libexec/send_nsca"
-+NscaCfg="/usr/local/icinga/etc/send_nsca.cfg"
-+IcingaHost="icingahost"
-+
-+# Fire the data off to the NSCA daemon using the send_nsca script
-+$printfcmd "%s\t%s\t%s\t%s\n" "$1" "$2" "$3" "$4" | $NscaBin -H $IcingaHost -c $NscaCfg
-+
-+# EOF
-+
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga-1.0.2~pre20100626~/contrib/eventhandlers/enable_active_service_checks icinga-1.0.2~pre20100626/contrib/eventhandlers/enable_active_service_checks
--- icinga-1.0.2~pre20100626~/contrib/eventhandlers/enable_active_service_checks 2010-06-25 13:12:03.000000000 +0200
+++ icinga-1.0.2~pre20100626/contrib/eventhandlers/enable_active_service_checks 2010-06-26 11:14:58.838427428 +0200
@@ -137,77 +95,6 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
# Only take action on hard host states...
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga-1.0.2~pre20100626~/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event.~1~ icinga-1.0.2~pre20100626/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event.~1~
---- icinga-1.0.2~pre20100626~/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event.~1~ 1970-01-01 01:00:00.000000000 +0100
-+++ icinga-1.0.2~pre20100626/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event.~1~ 2010-06-26 11:14:58.838427428 +0200
-@@ -0,0 +1,67 @@
-+#!/bin/sh
-+
-+# REDUNDANCY EVENT HANDLER SCRIPT
-+# Written By: Ethan Galstad (egalstad at nagios.org)
-+#
-+# This is an example script for implementing redundancy.
-+# Read the HTML documentation on redundant monitoring for more
-+# information on what this does.
-+
-+# Location of the echo and mail commands
-+echocmd="/bin/echo"
-+mailcmd="/bin/mail"
-+
-+# Location of the event handlers
-+eventhandlerdir="/usr/local/icinga/libexec/eventhandlers"
-+
-+
-+# Only take action on hard host states...
-+case "$2" in
-+HARD)
-+
-+ case "$1" in
-+ DOWN)
-+ # The master host has gone down!
-+ # We should now become the master host and take
-+ # over the responsibilities of monitoring the
-+ # network, so enable notifications...
-+
-+ `$eventhandlerdir/enable_notifications`
-+
-+
-+ # Notify someone of what has happened with the original
-+ # master server and our taking over the monitoring
-+ # responsibilities. No one was notified of the master
-+ # host going down, since the notification would have
-+ # occurred while we were in standby mode, so this is a good idea...
-+
-+ #`$echocmd "Master Icinga host is down!" | /bin/mail -s "Master Icinga Host Is Down" root at localhost`
-+ #`$echocmd "Slave Icinga host has entered ACTIVE mode and taken over network monitoring responsibilities!" | $mailcmd -s "Slave Icinga Host Has Entered ACTIVE Mode" root at localhost`
-+
-+ ;;
-+
-+ UP)
-+ # The master host has recovered!
-+ # We should go back to being the slave host and
-+ # let the master host do the monitoring, so
-+ # disable notifications...
-+
-+ `$eventhandlerdir/disable_notifications`
-+
-+
-+ # Notify someone of what has happened. Users were
-+ # already notified of the master host recovery because we
-+ # were in active mode at the time the recovery happened.
-+ # However, we should let someone know that we're switching
-+ # back to standby mode...
-+
-+ #`$echocmd "The master Icinga host has recovered, so the slave Icinga host has returned to standby mode..." | $mailcmd -s "Slave Icinga Host Has Returned To STANDBY Mode" root at localhost`
-+
-+ ;;
-+
-+ esac
-+ ;;
-+
-+esac
-+exit 0
-+
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga-1.0.2~pre20100626~/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event icinga-1.0.2~pre20100626/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event
--- icinga-1.0.2~pre20100626~/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event 2010-06-25 13:12:03.000000000 +0200
+++ icinga-1.0.2~pre20100626/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event 2010-06-26 11:18:02.905966827 +0200
@@ -224,67 +111,6 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
# Only take action on hard service states...
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga-1.0.2~pre20100626~/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event.~1~ icinga-1.0.2~pre20100626/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event.~1~
---- icinga-1.0.2~pre20100626~/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event.~1~ 1970-01-01 01:00:00.000000000 +0100
-+++ icinga-1.0.2~pre20100626/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event.~1~ 2010-06-26 11:14:58.838427428 +0200
-@@ -0,0 +1,57 @@
-+#!/bin/sh
-+
-+# REDUNDANCY EVENT HANDLER SCRIPT
-+# Written By: Ethan Galstad (egalstad at nagios.org)
-+#
-+# This is an example script for implementing redundancy.
-+# Read the HTML documentation on redundant monitoring for more
-+# information on what this does.
-+
-+# Location of the echo and mail commands
-+echocmd="/bin/echo"
-+mailcmd="/bin/mail"
-+
-+# Location of the event handlers
-+eventhandlerdir="/usr/local/icinga/libexec/eventhandlers"
-+
-+
-+# Only take action on hard service states...
-+case "$2" in
-+HARD)
-+
-+ case "$1" in
-+ CRITICAL)
-+
-+ # The master Icinga process is not running!
-+ # We should now become the master host and
-+ # take over the responsibility of monitoring
-+ # the network, so enable active checks...
-+
-+ `$eventhandlerdir/enable_active_service_checks`
-+ ;;
-+
-+ WARNING|UNKNOWN)
-+
-+ # The master Icinga process may or may not
-+ # be running.. We won't do anything here, but
-+ # to be on the safe side you may decide you
-+ # want the slave host to become the master in
-+ # these situations...
-+ ;;
-+
-+ OK)
-+
-+ # The master Icinga process running again!
-+ # We should go back to being the slave host,
-+ # so disable active checks
-+
-+ `eventhandlerdir/disable_active_service_checks`
-+ ;;
-+
-+ esac
-+ ;;
-+
-+esac
-+exit 0
-+
-+
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga-1.0.2~pre20100626~/contrib/eventhandlers/submit_check_result icinga-1.0.2~pre20100626/contrib/eventhandlers/submit_check_result
--- icinga-1.0.2~pre20100626~/contrib/eventhandlers/submit_check_result 2010-06-25 13:12:03.000000000 +0200
+++ icinga-1.0.2~pre20100626/contrib/eventhandlers/submit_check_result 2010-06-26 11:14:58.838427428 +0200
@@ -297,42 +123,3 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
# get the current date/time in seconds since UNIX epoch
datetime=`date +%s`
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga-1.0.2~pre20100626~/contrib/eventhandlers/submit_check_result.~1~ icinga-1.0.2~pre20100626/contrib/eventhandlers/submit_check_result.~1~
---- icinga-1.0.2~pre20100626~/contrib/eventhandlers/submit_check_result.~1~ 1970-01-01 01:00:00.000000000 +0100
-+++ icinga-1.0.2~pre20100626/contrib/eventhandlers/submit_check_result.~1~ 2010-06-26 11:14:58.838427428 +0200
-@@ -0,0 +1,35 @@
-+#!/bin/sh
-+
-+# SUBMIT_CHECK_RESULT
-+# Written by Ethan Galstad (egalstad at nagios.org)
-+#
-+# This script will write a command to the Icinga command
-+# file to cause Icinga to process a passive service check
-+# result. Note: This script is intended to be run on the
-+# same host that is running Icinga. If you want to
-+# submit passive check results from a remote machine, look
-+# at using the nsca addon.
-+#
-+# Arguments:
-+# $1 = host_name (Short name of host that the service is
-+# associated with)
-+# $2 = svc_description (Description of the service)
-+# $3 = return_code (An integer that determines the state
-+# of the service check, 0=OK, 1=WARNING, 2=CRITICAL,
-+# 3=UNKNOWN).
-+# $4 = plugin_output (A text string that should be used
-+# as the plugin output for the service check)
-+#
-+
-+echocmd="/bin/echo"
-+
-+CommandFile="/usr/local/icinga/var/rw/icinga.cmd"
-+
-+# get the current date/time in seconds since UNIX epoch
-+datetime=`date +%s`
-+
-+# create the command line to add to the command file
-+cmdline="[$datetime] PROCESS_SERVICE_CHECK_RESULT;$1;$2;$3;$4"
-+
-+# append the command to the end of the command file
-+`$echocmd $cmdline >> $CommandFile`
--
debian packaging of icinga(-core)
More information about the Pkg-nagios-changes
mailing list