Hello community, here is the log from the commit of package icinga for openSUSE:Factory checked in at 2012-09-17 16:57:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icinga (Old) and /work/SRC/openSUSE:Factory/.icinga.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icinga", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/icinga/icinga.changes 2012-07-23 10:15:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes 2012-09-17 16:57:51.000000000 +0200 @@ -1,0 +2,49 @@ +Mon Aug 27 15:20:48 UTC 2012 - [email protected] + +- imported upstream version 1.7.2 + * core: fix duplicated events on check scheduling logic for new events (Andreas Ericsson) #2676 #2993 - MF + * core: avoid duplicate events when scheduling forced host|service check (Imri Zvik) #2993 - MF + * core: get rid of the instame macro usage while logging alerts and states (Andreas Ericsson) #2665 - MF + * core: revamp the detection of embedded perl usage directive "# icinga: +epn" (Andreas Ericsson) #2197 - MF + * core: fix whitespaces are not stripped using multiple templates ("use abc, def, ghi") #2701 - MF + * core: add hint on icinga.cfg package location, and tip to read Changelog CHANGES on upgrades #2879 - MF + * core: bail out early with config error if resource.cfg macros contain NULL values #2879 - MF + * core: fix logical bug on icinga.cfg detection on config read #2879 - MF + * core: fsync() files before fclose() (Andreas Ericsson) #2948 - MF + * core: remove weird switch() statement when scanning checkresult queue (Andreas Ericsson) #2950 - MF + * core: fix deleting too old check result files (Andreas Ericsson) #2951 - MF + + * idoutils: fix icinga mysql db creation script grants access to all dbs #2917 - MF + * idoutils: fix ignoring mysql password in create_mysqldb.sh #2994 - MF + + * icinga.spec: forced update on icinga.cfg change package locations #2923 -MF + * icinga.spec: fix permissions on ido2db.cfg potentially world readable (Aaron Russo) #2897 - MF +- removed obsolete create_mysqldb script paches + +------------------------------------------------------------------- +Mon Aug 20 07:54:40 UTC 2012 - [email protected] + +- fixed create_mysqldb script - provided mysql password wasn't passed on + +------------------------------------------------------------------- +Thu Aug 16 13:36:20 UTC 2012 - [email protected] + +- cleaned up init files + +------------------------------------------------------------------- +Mon Aug 6 10:37:24 UTC 2012 - [email protected] + +- reverted icinga home directory change + +------------------------------------------------------------------- +Sat Aug 4 12:59:42 UTC 2012 - [email protected] + +- added missing dependency to the new recurring downtimes plugin + +------------------------------------------------------------------- +Fri Aug 3 14:49:23 UTC 2012 - [email protected] + +- added a new package which provides the recurring downtimes scripts from contrib http://docs.icinga.org/latest/en/recurring_downtimes.html +- updated the icinga user home directory - /var/lib/icinga is not needed anymore + +------------------------------------------------------------------- Old: ---- icinga-1.7.1.tar.gz icinga-fix-create_mysqldb.patch New: ---- icinga-1.7.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icinga.spec ++++++ --- /var/tmp/diff_new_pack.Jgf0w8/_old 2012-09-17 16:57:53.000000000 +0200 +++ /var/tmp/diff_new_pack.Jgf0w8/_new 2012-09-17 16:57:53.000000000 +0200 @@ -22,7 +22,7 @@ %define logmsg logger -t %{name}/rpm Name: icinga -Version: 1.7.1 +Version: 1.7.2 Release: 0 Summary: Host/service/network monitoring program @@ -45,8 +45,6 @@ # PATCH-FIX-OPENSUSE icinga-add-ifdefine-to-apache.patch Patch0: icinga-add-ifdefine-to-apache.patch # PATCH-FIX -Patch1: icinga-fix-create_mysqldb.patch -# PATCH-FIX Patch2: icinga-fix-fsf-address.patch BuildRequires: apache2-devel BuildRequires: nagios-rpm-macros >= 0.05 @@ -218,10 +216,19 @@ monitoring, redundancy and disabling and enabling service checks and notifications. +%package plugins-downtimes +Summary: Recurring Downtimes Management for %{name} +Group: System/Monitoring +Requires: %{name} = %{version} +Requires: perl-Date-Calc + +%description plugins-downtimes +Provides scripts to manage recurring downtimes for %{name}. +http://docs.icinga.org/latest/en/recurring_downtimes.html + %prep %setup -q %patch0 -p1 -%patch1 -p1 %patch2 -p1 # remove GPLv3+ source files which are not needed for this package @@ -271,22 +278,21 @@ --with-idomod-tmpfile="%{icinga_idomod_tmpfile}" \ --with-state-dir="%{icinga_spooldir}" -# -# make daemonchk.cgi and event handlers -# make %{?_smp_mflags} all -make %{?_smp_mflags} -C contrib -pushd contrib/eventhandlers 1>/dev/null + +# make daemonchk.cgi and event handlers +pushd contrib 1>/dev/null for f in `find . -type f` ; do - sed -i "s=NscaBin\=\"/usr/local/%{name}/libexec/send_nsca\"=NscaBin\=/usr/bin/send_nsca=; \ - s=/usr/local/%{name}/libexec/eventhandlers/=%{icinga_eventhandlerdir}/=; \ + sed -i "s=/usr/local/icinga/var/status.dat=%{icinga_spooldir}/status.dat=; \ + s=/usr/local/icinga/var/icinga.lock=%{icinga_ido2db_lockfile}=; \ + s=NscaBin\=\"/usr/local/icinga/libexec/send_nsca\"=NscaBin\=/usr/bin/send_nsca=; \ + s=/usr/local/icinga/libexec/eventhandlers/=%{icinga_eventhandlerdir}/=; \ s=/usr/local/nagios/libexec/eventhandlers/=%{icinga_eventhandlerdir}/=; \ - s=/usr/local/%{name}/etc/=%{icinga_sysconfdir}/=" ${f} + s=\$icinga/etc/=%{icinga_sysconfdir}/=; \ + s=/usr/local/icinga/etc/=%{icinga_sysconfdir}/=" ${f} done popd 1>/dev/null -# make daemonchk.cgi and event handlers -cd contrib -make +make %{?_smp_mflags} -C contrib %install make \ @@ -351,9 +357,15 @@ # install sample htpasswd file install -D -m 0644 icinga.htpasswd %{buildroot}%{icinga_http_authfile} +# create icinga localstatedir +install -d -m 0755 %{buildroot}%{icinga_localstatedir} + # install eventhandlers cp -r contrib/eventhandlers/* "%{buildroot}%{icinga_eventhandlerdir}" +# install downtimes +cp -r contrib/downtimes "%{buildroot}%{icinga_libdir}/" + # install headers for development package install -d -m0755 "%{buildroot}%{_includedir}/%{name}/" install -m0644 include/{config,snprintf,cgiutils,locations}.h "%{buildroot}%{_includedir}/%{name}" @@ -489,8 +501,6 @@ %{_localstatedir}/adm/fillup-templates/sysconfig.%{name} %attr(0755,root,root) %config %{_sysconfdir}/cron.weekly/%{name} %dir %{icinga_libdir} -%exclude %{icinga_cgidir} -%exclude %{icinga_libdir}/idomod.so %{_sbindir}/convertcfg %dir %{icinga_sysconfdir} %dir %{icinga_sysconfdir}/modules @@ -511,6 +521,7 @@ %defattr(-,%{icinga_user},%{icinga_group}) %dir %{icinga_logdir} %dir %{icinga_logdir}/archives +%dir %{icinga_localstatedir} %dir %{icinga_spooldir} %dir %{icinga_spooldir}/checkresults %ghost %{icinga_cmd_filedir} @@ -539,6 +550,7 @@ %{icinga_cgidir}/tac.cgi %{icinga_cgidir}/trends.cgi %{icinga_cgidir}/daemonchk.cgi +%{icinga_cgidir}/traceroute.cgi %dir %{icinga_datadir} %{icinga_datadir}/contexthelp %{icinga_datadir}/images @@ -591,4 +603,8 @@ %defattr(0755,root,root) %{icinga_eventhandlerdir} +%files plugins-downtimes +%defattr(0755,root,root) +%{icinga_libdir}/downtimes + %changelog ++++++ icinga-1.7.1.tar.gz -> icinga-1.7.2.tar.gz ++++++ /work/SRC/openSUSE:Factory/icinga/icinga-1.7.1.tar.gz /work/SRC/openSUSE:Factory/.icinga.new/icinga-1.7.2.tar.gz differ: char 5, line 1 ++++++ icinga-fix-fsf-address.patch ++++++ --- /var/tmp/diff_new_pack.Jgf0w8/_old 2012-09-17 16:57:53.000000000 +0200 +++ /var/tmp/diff_new_pack.Jgf0w8/_new 2012-09-17 16:57:53.000000000 +0200 @@ -1,6 +1,30 @@ -diff -rupN icinga-1.7.0.orig/include/cgiutils.h icinga-1.7.0/include/cgiutils.h ---- icinga-1.7.0.orig/include/cgiutils.h 2012-05-15 15:00:56.000000000 +0200 -+++ icinga-1.7.0/include/cgiutils.h 2012-06-19 17:44:37.860755350 +0200 +diff -rupN icinga-1.7.1.orig/contrib/downtimes/sched_conv.pl icinga-1.7.1/contrib/downtimes/sched_conv.pl +--- icinga-1.7.1.orig/contrib/downtimes/sched_conv.pl 2012-06-15 19:26:09.000000000 +0200 ++++ icinga-1.7.1/contrib/downtimes/sched_conv.pl 2012-08-03 19:09:47.986117344 +0200 +@@ -19,7 +19,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software +-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + # + #****************************************************************************/ + # +diff -rupN icinga-1.7.1.orig/contrib/downtimes/sched_down.pl icinga-1.7.1/contrib/downtimes/sched_down.pl +--- icinga-1.7.1.orig/contrib/downtimes/sched_down.pl 2012-06-15 19:26:09.000000000 +0200 ++++ icinga-1.7.1/contrib/downtimes/sched_down.pl 2012-08-03 19:09:59.834033277 +0200 +@@ -19,7 +19,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software +-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + # + #****************************************************************************/ + # +diff -rupN icinga-1.7.1.orig/include/cgiutils.h icinga-1.7.1/include/cgiutils.h +--- icinga-1.7.1.orig/include/cgiutils.h 2012-06-15 19:26:09.000000000 +0200 ++++ icinga-1.7.1/include/cgiutils.h 2012-08-03 19:08:39.640602304 +0200 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License @@ -10,9 +34,9 @@ ************************************************************************/ #ifndef _CGIUTILS_H -diff -rupN icinga-1.7.0.orig/include/config.h.in icinga-1.7.0/include/config.h.in ---- icinga-1.7.0.orig/include/config.h.in 2012-05-15 15:00:56.000000000 +0200 -+++ icinga-1.7.0/include/config.h.in 2012-06-19 17:44:58.473517691 +0200 +diff -rupN icinga-1.7.1.orig/include/config.h.in icinga-1.7.1/include/config.h.in +--- icinga-1.7.1.orig/include/config.h.in 2012-06-15 19:26:09.000000000 +0200 ++++ icinga-1.7.1/include/config.h.in 2012-08-03 19:08:39.641602297 +0200 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License @@ -22,9 +46,9 @@ ************************************************************************/ -diff -rupN icinga-1.7.0.orig/include/locations.h.in icinga-1.7.0/include/locations.h.in ---- icinga-1.7.0.orig/include/locations.h.in 2012-05-15 15:00:56.000000000 +0200 -+++ icinga-1.7.0/include/locations.h.in 2012-06-19 17:44:15.783009899 +0200 +diff -rupN icinga-1.7.1.orig/include/locations.h.in icinga-1.7.1/include/locations.h.in +--- icinga-1.7.1.orig/include/locations.h.in 2012-06-15 19:26:09.000000000 +0200 ++++ icinga-1.7.1/include/locations.h.in 2012-08-03 19:08:39.641602297 +0200 @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public License @@ -34,9 +58,9 @@ ************************************************************************/ #define DEFAULT_TEMP_FILE "@STATEDIR@/tempfile" -diff -rupN icinga-1.7.0.orig/LICENSE icinga-1.7.0/LICENSE ---- icinga-1.7.0.orig/LICENSE 2012-05-15 15:00:56.000000000 +0200 -+++ icinga-1.7.0/LICENSE 2010-03-24 00:34:05.000000000 +0100 +diff -rupN icinga-1.7.1.orig/LICENSE icinga-1.7.1/LICENSE +--- icinga-1.7.1.orig/LICENSE 2012-06-15 19:26:09.000000000 +0200 ++++ icinga-1.7.1/LICENSE 2012-08-03 19:08:39.641602297 +0200 @@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 ++++++ rcicinga ++++++ --- /var/tmp/diff_new_pack.Jgf0w8/_old 2012-09-17 16:57:53.000000000 +0200 +++ /var/tmp/diff_new_pack.Jgf0w8/_new 2012-09-17 16:57:53.000000000 +0200 @@ -28,14 +28,14 @@ # used to provide network services status for hosts, # services and networks. ### END INIT INFO - + . /etc/rc.status - + ICINGA_BIN="/usr/sbin/icinga" ICINGA_CFG="/etc/icinga/icinga.cfg" ICINGA_SYSCONFIG="/etc/sysconfig/icinga" ICINGA_CFG_ERR_LOG="/var/log/icinga/config.err" - + # Read config and log errors in logfile function config_check () { case "$1" in @@ -47,7 +47,7 @@ return 1 fi ;; - *) + *) $ICINGA_BIN -v "$ICINGA_CFG" >/dev/null 2>&1 if [ $? -eq 0 ]; then return 0 @@ -58,7 +58,7 @@ ;; esac } - + # grab a config option function get_var() { if [ -n "$2" ]; then @@ -69,15 +69,15 @@ shift # remove first ARG => search-string echo $* } - + # check some default files and directories function check_files() { - # remove some perhaps left over files + # remove some perhaps left over files for file in "$command_file" "$lock_file" "$status_file" "$temp_file"; do test -f "$file" && rm -f "$file" done } - + function check_lock_file() { PIDDIR=$(dirname $lock_file) case "$PIDDIR" in @@ -97,13 +97,13 @@ install -d -m755 -o$icinga_user -g$icinga_group $(dirname "$lock_file") esac } - + # Check for missing binaries (stale symlinks should not happen) # Note: Special treatment of stop for LSB conformance test -x "$ICINGA_BIN" || { echo "$ICINGA_BIN not installed or not executable."; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } - + # Check for existence of needed config file test -r "$ICINGA_CFG" || { echo "$ICINGA_CFG not existing or readable."; if [ "$1" = "stop" ]; then exit 0; @@ -111,8 +111,8 @@ # Check for existence of sysconfig file and read it test -r "$ICINGA_SYSCONFIG" || { echo "$ICINGA_SYSCONFIG not existing or readable."; - if [ "$1" = "stop" ]; then exit 0; - else exit 6; fi; } + if [ "$1" = "stop" ]; then exit 0; + else exit 6; fi; } . "$ICINGA_SYSCONFIG" @@ -125,7 +125,7 @@ if [ -z "$ICINGA_TIMEOUT" ]; then ICINGA_TIMEOUT=10 fi - + # # get variables from config file # @@ -140,7 +140,7 @@ resource_file="$(get_var resource_file)" check_result_path="$(get_var check_result_path)" check_external_commands="$(get_var check_external_commands)" - + # # use default values if above check doesn't work # @@ -158,10 +158,10 @@ : ${command_file:=/var/run/icinga/icinga.cmd} : ${lock_file:=/var/run/icinga/icinga.pid} : ${temp_file:=/tmp/icinga.tmp} - + # Reset status of this service rc_reset - + case "$1" in start) echo -n "Starting Icinga " @@ -179,9 +179,9 @@ ICINGAPID=$(pidof "$ICINGA_BIN") if [ -z "$ICINGAPID" ]; then check_files - check_lock_file - fi - + check_lock_file + fi + startproc $NICELEVEL -p "$lock_file" "$ICINGA_BIN" -d "$ICINGA_CFG" if [ "$check_external_commands" != 0 ]; then while [ ! -e "$command_file" ] && [ $ICINGA_TIMEOUT -gt 0 ]; do @@ -203,7 +203,7 @@ # happen, and then the exiting icinga will remove the # new Lockfile, allowing multiple icinga daemons # to (sooner or later) run - John Sellens - + if checkproc "$ICINGA_BIN" ; then killproc -p "$lock_file" -TERM "$ICINGA_BIN" sleep 1 @@ -239,7 +239,7 @@ rc_status ;; restart) - $0 check + $0 check $0 stop $0 start rc_status @@ -248,12 +248,12 @@ echo -n "Reload service Icinga " config_check if [ $? -eq 0 ]; then - echo -n "Passed configuration check - reloading..." - killproc -HUP -p "$lock_file" "$ICINGA_BIN" + echo -n "Passed configuration check - reloading..." + killproc -HUP -p "$lock_file" "$ICINGA_BIN" else - echo "- Error in configuration files" - echo -n "- aborting reload - please read $ICINGA_CFG_ERR_LOG" - rc_failed + echo "- Error in configuration files" + echo -n "- aborting reload - please read $ICINGA_CFG_ERR_LOG" + rc_failed fi rc_status -v ;; ++++++ rcido2db ++++++ --- /var/tmp/diff_new_pack.Jgf0w8/_old 2012-09-17 16:57:53.000000000 +0200 +++ /var/tmp/diff_new_pack.Jgf0w8/_new 2012-09-17 16:57:53.000000000 +0200 @@ -19,14 +19,14 @@ # IDOUtils is an Icinga addon allowing you to store Icinga data (current status # information, state history, notification history, etc.) in a MySQL database. ### END INIT INFO - + # Note on runlevels: # 0 - halt/poweroff 6 - reboot # 1 - single user 2 - multiuser without network exported # 3 - multiuser w/ network (text mode) 5 - multiuser w/ network and X11 (xdm) . /etc/rc.status - + IDO2DB_BIN="/usr/sbin/ido2db" IDO2DB_CFG="/etc/icinga/ido2db.cfg" ICINGA_SYSCONFIG="/etc/sysconfig/icinga" @@ -44,7 +44,7 @@ # check some default files and directories function check_files() { - # remove some perhaps left over files + # remove some perhaps left over files for file in "$lock_file" "$socket_name"; do test -e "$file" && rm -f "$file" done @@ -57,7 +57,7 @@ test -x $IDO2DB_BIN || { echo "$IDO2DB_BIN not installed"; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } - + test -r $IDO2DB_CFG || { echo "$IDO2DB_CFG not existing"; if [ "$1" = "stop" ]; then exit 0; @@ -65,8 +65,8 @@ # Check for existence of sysconfig file and read it test -r "$ICINGA_SYSCONFIG" || { echo "$ICINGA_SYSCONFIG not existing or readable."; - if [ "$1" = "stop" ]; then exit 0; - else exit 6; fi; } + if [ "$1" = "stop" ]; then exit 0; + else exit 6; fi; } . "$ICINGA_SYSCONFIG" @@ -92,28 +92,28 @@ # use default values if above check doesn't work # : ${lock_file:=/var/run/icinga/ido2db.pid} -: ${socket_name:=/var/spool/icinga/ido2db.sock} +: ${socket_name:=/var/run/icinga/ido2db.sock} : ${ido2db_user:=icinga} : ${ido2db_group:=icinga} - + # Reset status of this service -rc_reset - +rc_reset + case "$1" in start) - echo -n "Starting Ido2db " - IDO2DBPID=$(pidof "$IDO2DB_BIN") - if [ -z "$IDO2DBPID" ]; then - check_files - fi - startproc $NICELEVEL -p "$lock_file" "$IDO2DB_BIN" -c "$IDO2DB_CFG" - - # Remember status and be verbose - rc_status -v + echo -n "Starting Ido2db " + IDO2DBPID=$(pidof "$IDO2DB_BIN") + if [ -z "$IDO2DBPID" ]; then + check_files + fi + startproc $NICELEVEL -p "$lock_file" "$IDO2DB_BIN" -c "$IDO2DB_CFG" + + # Remember status and be verbose + rc_status -v ;; stop) - echo -n "Shutting down Ido2db " - + echo -n "Shutting down Ido2db " + if checkproc "$IDO2DB_BIN" ; then killproc -p "$lock_file" -TERM "$IDO2DB_BIN" sleep 1 @@ -136,9 +136,9 @@ fi check_files rc_reset - - # Remember status and be verbose - rc_status -v + + # Remember status and be verbose + rc_status -v ;; try-restart) ## Do a restart only if the service was active before. @@ -159,12 +159,12 @@ echo -n "Reload service Ido2db " config_check if [ $? -eq 0 ]; then - echo -n "Passed configuration check - reloading..." - killproc -HUP -p "$lock_file" "$IDO2DB_BIN" + echo -n "Passed configuration check - reloading..." + killproc -HUP -p "$lock_file" "$IDO2DB_BIN" else - echo "- Error in configuration files" - echo -n "- aborting reload - please read $IDO2DB_CFG_ERR_LOG" - rc_failed + echo "- Error in configuration files" + echo -n "- aborting reload - please read $IDO2DB_CFG_ERR_LOG" + rc_failed fi rc_status -v ;; ++++++ update_icinga_paths.sh ++++++ --- /var/tmp/diff_new_pack.Jgf0w8/_old 2012-09-17 16:57:53.000000000 +0200 +++ /var/tmp/diff_new_pack.Jgf0w8/_new 2012-09-17 16:57:53.000000000 +0200 @@ -85,12 +85,6 @@ test -e "/var/spool/icinga/icinga.cmd" && rm "/var/spool/icinga/icinga.cmd" test -f "/var/lib/icinga/status.dat" && rm "/var/lib/icinga/status.dat" test -f "/var/lib/icinga/objects.cache" && rm "/var/lib/icinga/objects.cache" - - # remove /var/lib if empty - if [ -d "/var/lib/icinga" ] && [ -z $(ls "/var/lib/icinga") ] - then - rmdir "/var/lib/icinga" - fi # cleanup remaining unneeded files ############################################# -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
