Hello community, here is the log from the commit of package icinga for openSUSE:Factory checked in at 2013-09-03 22:07:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icinga (Old) and /work/SRC/openSUSE:Factory/.icinga.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icinga" Changes: -------- --- /work/SRC/openSUSE:Factory/icinga/icinga.changes 2013-03-18 07:05:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes 2013-09-03 22:07:48.000000000 +0200 @@ -1,0 +2,74 @@ +Tue Aug 27 14:42:37 UTC 2013 - [email protected] + +- updated fix for bnc#834828 to use the default password if none provided + +------------------------------------------------------------------- +Tue Aug 27 12:23:50 UTC 2013 - [email protected] + +- fixed bnc#834828 by asking for the password and changing the log permissions + +------------------------------------------------------------------- +Mon Jul 8 13:31:53 UTC 2013 - [email protected] + +- imported upstream version 1.9.3 + * core: fix init script status exit codes on not running daemon and present pid file #4243 - MF + * idoutils: fix workaround on libdbi fetch_next_row() bug applied for postgresql too, causing faulty queries #4367 - MF + +------------------------------------------------------------------- +Fri Jul 5 10:04:57 UTC 2013 - [email protected] + +- moved convertcfg, mini_epn and new_mini_epn to the sub package + icinga-monitoring-tools so that it could be also used by Nagios + +------------------------------------------------------------------- +Sun Jun 30 20:02:58 UTC 2013 - [email protected] + +- update to 1.9.2: + * core: fix bug with non-ASCII (> 127) illegal macro output + characters on char-to-int cast (Jason Young) #4211 - MF + * core: bail early if main config file cannot be read - MF + * classic ui: fixed searching hostgroup results in wrong 'all' + view filter urls #4206 - RB + * classic ui: fix URL construction issue in icinga_reload_scroll_position() + javascript (Karsten Sühring) #4233 - MF + * idoutils: fix mysql: output/perfdata limits cut escaped string + leaving '\' at the end (Yannik Charton) #4196 - MF + * idoutils: bugfixes for socket queue, transactions and libdbi + handling #4049 - GB + * idoutils: fix ido2db gradually consumes more and more CPU time + with time #4210 - CF + * idoutils: fix wrong clob freeing in eventhandlers #4357 - TD + +------------------------------------------------------------------- +Wed May 22 09:07:13 UTC 2013 - [email protected] + +- imported upstream version 1.9.1 + * core: fix objects.cache does not get updated on (re)start, but config verify (Christian Ruppert) #4155 - MF + * classic ui: fixed UNICODE characters in JSON output from getting discarded #4193 - RB + * idoutils: fix segfaults on reload with multiple neb modules of the same binary #4033 - MF + +------------------------------------------------------------------- +Tue May 7 15:30:46 UTC 2013 - [email protected] + +- imported upstream version 1.9.0 (check the official changelog for further details) + * idoutils uses a socket queue and transactions for large object dumps! #3527 #3533 + * ido2db.cfg enable_sla is now deprecated! #3450 + * icinga.cfg event_profiling_enabled is now deprecated! #4054 + * core: increase performance with hash comparing hosts/services on config read #3722 - GB + * core: introduce warning level -vv on config verification #3510 - MF + * core: refuse to start if neb modules fail to load (Andreas Ericsson, op5 Team) #3812 - MF + * core: keep logfile open, reducing open/close performance decreases (Andreas Ericsson, op5 Team) #3390 - MF + * core: enhance illegal macro character processing performance (Andreas Ericsson, op5 Team) #3389 - MF + * core: add the notification type by string to debug logs; set CUSTOM=8, STALKING=9 (Andreas Ericsson, op5 Team) #3818 - MF + * core: skip writing status.dat if explicitely set to /dev/null (e.g. when using alternate data retrieval methods like IDOUtils) (Andreas Ericsson, op5 Team) #3819 - MF + * core: avoid writing objects.cache if set to /dev/null (Andreas Ericsson, op5 Team) #3819 - MF + * core: increase performance on host->service relation counter (config reading, flapping) #3820 - MF + * core: fix unable to exclude hostgroups when using nested hostgroups (Alexander Sulfrian) #2619 - MF + * classic ui: increase performance with hash comparing hosts/services to show/filter #3722 - GB + * classic ui: Add "set_expire_ack_by_default" to cgi configuration #3476 - CF + * classic ui: Add "send_ack_notifications" to cgi configuration (TheCry) #3467 - CF + * classic ui: Changed field size for hours to 4 when setting flexible downtime #3484 - RB + * ... + + +------------------------------------------------------------------- Old: ---- icinga-1.8.4.tar.gz New: ---- icinga-1.9.3.tar.gz icinga-fix-create-mysql-script.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icinga.spec ++++++ --- /var/tmp/diff_new_pack.rQkglJ/_old 2013-09-03 22:07:50.000000000 +0200 +++ /var/tmp/diff_new_pack.rQkglJ/_new 2013-09-03 22:07:50.000000000 +0200 @@ -17,7 +17,7 @@ Name: icinga -Version: 1.8.4 +Version: 1.9.3 Release: 0 Summary: Host/service/network monitoring program @@ -42,9 +42,11 @@ Source15: mini_epn.8 # PATCH-FIX-OPENSUSE icinga-add-ifdefine-to-apache.patch Patch0: icinga-add-ifdefine-to-apache.patch +# PATCH-FIX-OPENSUSE icinga-fix-create-mysql-script.patch +Patch1: icinga-fix-create-mysql-script.patch Provides: monitoring_daemon BuildRequires: apache2-devel -BuildRequires: nagios-rpm-macros >= 0.05 +BuildRequires: nagios-rpm-macros >= 0.06-22 %if 0%{?suse_version} >= 1110 BuildRequires: fdupes %endif @@ -77,6 +79,7 @@ %{perl_requires} %endif Requires: mailx +Recommends: %{name}-monitoring-tools Recommends: %{name}-plugins-eventhandlers Recommends: %{name}-www Recommends: cron @@ -143,6 +146,20 @@ This package provides include files that Icinga-related applications may compile against. +%package monitoring-tools +Summary: Provides convertcfg and mini_epn for Icinga and Nagios +Group: System/Monitoring +Requires: monitoring_daemon +%if 0%{?suse_version} < 1140 +Requires: perl = %{perl_version} +%else +%{perl_requires} +%endif + +%description monitoring-tools +This package provides the programs convertcfg, mini_epn and new_mini_epn +for Icinga and Nagios. + %package idoutils Summary: Provides the IDOUtils functionality for Icinga Group: System/Monitoring @@ -231,6 +248,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 # remove GPLv3+ source files which are not needed for this package rm "t-tap/"*.c @@ -501,21 +519,14 @@ %defattr(-,root,root) %doc README LICENSE Changelog UPGRADING LEGAL sample-config/ README.SUSE examples %{_mandir}/man8/icinga*.8* -%{_mandir}/man8/mini_epn_icinga.8* -%{_mandir}/man8/convertcfg.8* -%{_mandir}/man8/new_mini_epn.8* -%{_mandir}/man8/mini_epn.8* %{_initrddir}/%{name} %{_sbindir}/%{name} %attr(0754,root,%{icinga_group}) %{_sbindir}/icingastats -%{_sbindir}/mini_epn -%{_sbindir}/new_mini_epn %{_sbindir}/rc%{name} %{icinga_datadir}/p1.pl %{_localstatedir}/adm/fillup-templates/sysconfig.%{name} %attr(0755,root,root) %config %{_sysconfdir}/cron.weekly/%{name} %dir %{icinga_libdir} -%{_sbindir}/convertcfg %dir %{icinga_sysconfdir} %dir %{icinga_sysconfdir}/modules %config(noreplace) %{icinga_sysconfdir}/icinga.cfg @@ -540,6 +551,16 @@ %dir %{icinga_spooldir}/checkresults %ghost %{icinga_cmd_filedir} +%files monitoring-tools +%defattr(-,root,root) +%{_sbindir}/convertcfg +%{_sbindir}/mini_epn +%{_sbindir}/new_mini_epn +%{_mandir}/man8/convertcfg.8* +%{_mandir}/man8/mini_epn.8* +%{_mandir}/man8/new_mini_epn.8* +%{_mandir}/man8/mini_epn_icinga.8* + %files www %defattr(-,root,root) %config(noreplace) %{apacheconfdir}/%{name}.conf @@ -574,6 +595,7 @@ %{icinga_datadir}/ssi %{icinga_datadir}/stylesheets %{icinga_datadir}/jquery-ui +%{icinga_datadir}/jquery-ui-addon %attr(0775,%{icinga_command_user},%{icinga_command_group}) %dir %{icinga_cgi_logdir} %files idoutils ++++++ icinga-1.8.4.tar.gz -> icinga-1.9.3.tar.gz ++++++ /work/SRC/openSUSE:Factory/icinga/icinga-1.8.4.tar.gz /work/SRC/openSUSE:Factory/.icinga.new/icinga-1.9.3.tar.gz differ: char 5, line 1 ++++++ icinga-fix-create-mysql-script.patch ++++++ diff -rupN icinga-1.9.3.orig/module/idoutils/db/scripts/create_mysqldb.sh icinga-1.9.3/module/idoutils/db/scripts/create_mysqldb.sh --- icinga-1.9.3.orig/module/idoutils/db/scripts/create_mysqldb.sh 2013-07-07 17:50:50.000000000 +0200 +++ icinga-1.9.3/module/idoutils/db/scripts/create_mysqldb.sh 2013-08-27 16:40:49.958328000 +0200 @@ -5,7 +5,7 @@ #-- #-- Copyright (c) 2009-2013 Icinga Development Team (http://www.icinga.org) #-- -#-- current version: 2011-05-03 Thomas Dressler +#-- current version: 2013-08-18 Thomas Dressler #-- -- -------------------------------------------------------- @@ -17,10 +17,16 @@ DBUSER=icinga DBPASS=icinga DBHOST=localhost DBADMIN=root - WD=`dirname $0` cd $WD WD=`pwd` + +#logfile privacy #4565 +LOG=$WD/create_mysqldb.log +rm -f $LOG +UMASK=`umask` +umask 0077 + cd ../mysql echo "Enter password for mysql user '$DBADMIN' or <enter> if none" @@ -28,6 +34,14 @@ read ROOTPASS if [ -n "$ROOTPASS" ];then P=-p$ROOTPASS fi +echo -n "Enter the new password for the new database user $DBUSER (press enter to use the default) : " +read TEMPPASS +if [ -z "$TEMPPASS" ]; then + echo "Using the default password $DBPASS" +else + DBPASS=$TEMPPASS + echo "You can find the password (again) in the logfile generated at the end." +fi echo "drop existing DB $DB and user $DBUSER..." mysql -u $DBADMIN -h $DBHOST $P mysql <<EOS1 DROP DATABASE IF EXISTS $DB; @@ -37,7 +51,7 @@ mysql -u $DBADMIN -h $DBHOST $P mysql < EOS1 echo "create new DB $DB, user $DBUSER and objects..." -mysql -u $DBADMIN -h $DBHOST $P --verbose >$WD/create_mysqldb.log mysql <<EOS2 +mysql -u $DBADMIN -h $DBHOST $P --verbose >$LOG mysql <<EOS2 CREATE DATABASE $DB; CREATE USER '$DBUSER'@'$DBHOST' IDENTIFIED BY '$DBPASS'; GRANT USAGE ON $DB.* TO '$DBUSER'@'$DBHOST' WITH MAX_QUERIES_PER_HOUR 0 MAX_CONNECTIONS_PER_HOUR 0 MAX_UPDATES_PER_HOUR 0; @@ -51,7 +65,7 @@ select "END Schema Script"; select now(); \q EOS2 - +umask $UMASK if [ $? == 0 ]; then echo "Check icinga schema version with DB User $DBUSER..." mysql $DB -u $DBUSER -p$DBPASS -h $DBHOST -s <<EOS3 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
