Hello community, here is the log from the commit of package munin for openSUSE:Factory checked in at 2015-01-08 23:02:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/munin (Old) and /work/SRC/openSUSE:Factory/.munin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "munin" Changes: -------- --- /work/SRC/openSUSE:Factory/munin/munin.changes 2014-11-04 17:29:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.munin.new/munin.changes 2015-01-08 23:02:33.000000000 +0100 @@ -1,0 +2,15 @@ +Wed Jan 7 08:07:48 UTC 2015 - [email protected] + +- update to version 2.0.25 + Bugfix release. + Closes: GH:304, D:769415, D:770745, D:770746, D:770826 + * p/irqstats: Improve generated labels + * ip/iostat_ios: also support /dev/xvdX devices + * p/iostat_ios: also support /dev/vdX devices + * plugins/df_abs: fix the naming for regular devices + * p/pgsql: Detect "rc" postgresql versions + * p/ping_: honor ping env variable +- cleanup sysvinit scriptlets to fix the issue which always + disabled the service on update + +------------------------------------------------------------------- Old: ---- munin-2.0.24.tar.gz New: ---- munin-2.0.25.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ munin.spec ++++++ --- /var/tmp/diff_new_pack.F65GYX/_old 2015-01-08 23:02:34.000000000 +0100 +++ /var/tmp/diff_new_pack.F65GYX/_new 2015-01-08 23:02:34.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package munin # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ %define active_by_default 0 Name: munin -Version: 2.0.24 +Version: 2.0.25 Release: 0 Summary: Network-wide graphing framework (grapher/gatherer) License: GPL-2.0 @@ -61,6 +61,7 @@ BuildRequires: systemd %else BuildRequires: sysvinit +Requires(pre): %insserv_prereq %endif Requires: perl-Date-Manip Requires: perl-FastCGI @@ -112,6 +113,11 @@ Requires: ps Requires: pwdutils Requires: sysstat +%if 0%{?suse_version} >= 1220 +%{?systemd_requires} +%else +Requires(pre): %insserv_prereq +%endif Recommends: logrotate BuildArch: noarch @@ -238,11 +244,11 @@ %post node if [ $1 = 1 ]; then -%if 0%{?suse_version} < 1220 - /sbin/chkconfig --add munin-node -%endif /usr/sbin/munin-node-configure --shell | sh fi +%if 0%{?suse_version} < 1220 +%fillup_and_insserv -f -y munin-node +%endif chown -R munin:munin %{dbdir} chmod 755 %{dbdir} touch %{logdir}/munin-node.log @@ -259,13 +265,6 @@ %endif %preun node -if [ $1 = 1 ] ; then -%if 0%{?suse_version} < 1220 - /sbin/service munin-node stop >/dev/null 2>&1 - /sbin/chkconfig --del munin-node -%endif -rmdir %{logdir} 2>/dev/null || true -fi %if 0%{?suse_version} >= 1220 %service_del_preun munin-node.service %else ++++++ munin-2.0.24.tar.gz -> munin-2.0.25.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/munin-2.0.24/ChangeLog new/munin-2.0.25/ChangeLog --- old/munin-2.0.24/ChangeLog 2014-10-26 15:12:24.000000000 +0100 +++ new/munin-2.0.25/ChangeLog 2014-11-24 22:46:24.000000000 +0100 @@ -1,5 +1,39 @@ -*- text -*- +munin-2.0.25, 2014-11-24 + +------- +Summary +------- + +Bugfix release. + +Closes: GH:304, D:769415, D:770745, D:770746, D:770826 + +------------------ +Detailed Changelog +------------------ + +Christoph Biedl (1): + p/irqstats: Improve generated labels + +Daniel Black (1): + ip/iostat_ios: also support /dev/xvdX devices + +Holger Levsen (1): + p/iostat_ios: also support /dev/vdX devices + +Picnic Pete (1): + Issue warning if no data + +Steve Schnepp (5): + m/Node: add [INFO] in a log + m/limits: remove warning about uninitialized + plugins/df_abs: fix the naming for regular devices + p/pgsql: Detect "rc" postgresql versions. + p/ping_: honor ping env variable + + munin-2.0.24, 2014-10-26 ------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/munin-2.0.24/RELEASE new/munin-2.0.25/RELEASE --- old/munin-2.0.24/RELEASE 2014-10-26 15:12:50.000000000 +0100 +++ new/munin-2.0.25/RELEASE 2014-11-24 22:47:38.000000000 +0100 @@ -1 +1 @@ -2.0.24 +2.0.25 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/munin-2.0.24/master/lib/Munin/Master/LimitsOld.pm new/munin-2.0.25/master/lib/Munin/Master/LimitsOld.pm --- old/munin-2.0.24/master/lib/Munin/Master/LimitsOld.pm 2014-10-26 15:12:24.000000000 +0100 +++ new/munin-2.0.25/master/lib/Munin/Master/LimitsOld.pm 2014-11-24 22:46:24.000000000 +0100 @@ -839,7 +839,7 @@ sub validate_severities { my $severities_ref = shift; - my @severities = @{$severities_ref}; + my @severities = grep { defined $_ } @{$severities_ref}; my @allowed_severities = qw{ok warning critical unknown}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/munin-2.0.24/master/lib/Munin/Master/Node.pm new/munin-2.0.25/master/lib/Munin/Master/Node.pm --- old/munin-2.0.24/master/lib/Munin/Master/Node.pm 2014-10-26 15:12:24.000000000 +0100 +++ new/munin-2.0.25/master/lib/Munin/Master/Node.pm 2014-11-24 22:46:24.000000000 +0100 @@ -146,7 +146,7 @@ } }; - INFO "node $self->{host} advertised itself as $self->{node_name} instead." if $self->{node_name} && $self->{node_name} ne $self->{host}; + INFO "[INFO] node $self->{host} advertised itself as $self->{node_name} instead." if $self->{node_name} && $self->{node_name} ne $self->{host}; return 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/munin-2.0.24/master/lib/Munin/Master/Update.pm new/munin-2.0.25/master/lib/Munin/Master/Update.pm --- old/munin-2.0.24/master/lib/Munin/Master/Update.pm 2014-10-26 15:12:24.000000000 +0100 +++ new/munin-2.0.25/master/lib/Munin/Master/Update.pm 2014-11-24 22:46:24.000000000 +0100 @@ -359,8 +359,12 @@ next if ($datum eq 'group') or ($datum eq 'host_name'); - printf $handle "%s:%s %s\n", $worker, $datum, $workerdata->{$datum}; - munin_set_var_path($datafile_hash, $worker . ":". $datum, $workerdata->{$datum}); + if (defined $workerdata->{$datum}) { + printf $handle "%s:%s %s\n", $worker, $datum, $workerdata->{$datum}; + munin_set_var_path($datafile_hash, $worker . ":". $datum, $workerdata->{$datum}); + } else { + WARN "[Warning] no data $worker -> $datum"; + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/munin-2.0.24/plugins/lib/Munin/Plugin/Pgsql.pm new/munin-2.0.25/plugins/lib/Munin/Plugin/Pgsql.pm --- old/munin-2.0.24/plugins/lib/Munin/Plugin/Pgsql.pm 2014-10-26 15:12:24.000000000 +0100 +++ new/munin-2.0.25/plugins/lib/Munin/Plugin/Pgsql.pm 2014-11-24 22:46:24.000000000 +0100 @@ -478,7 +478,7 @@ my $r = $self->runquery("SELECT version()"); my $v = $r->[0]->[0]; die "Unable to detect PostgreSQL version\n" - unless ($v =~ /^PostgreSQL (\d+)\.(\d+)(\.\d+|devel|beta\d+)\b/); + unless ($v =~ /^PostgreSQL (\d+)\.(\d+)(\.\d+|devel|beta\d+|rc\d+)\b/); $self->{detected_version} = "$1.$2"; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/munin-2.0.24/plugins/node.d/ping_.in new/munin-2.0.25/plugins/node.d/ping_.in --- old/munin-2.0.24/plugins/node.d/ping_.in 2014-10-26 15:12:24.000000000 +0100 +++ new/munin-2.0.25/plugins/node.d/ping_.in 2014-11-24 22:46:24.000000000 +0100 @@ -89,4 +89,4 @@ fi -${PING:-ping} ${ping_args:-'-c 2'} ${host} ${ping_args2} | perl -n -e 'print "ping.value ", $1 / 1000, "\n" if m@min/avg/max.*\s\d+(?:\.\d+)?/(\d+(?:\.\d+)?)/\d+(?:\.\d+)?@; print "packetloss.value $1\n" if /(\d+)% packet loss/;' +${ping:-$PING} ${ping_args:-'-c 2'} ${host} ${ping_args2} | perl -n -e 'print "ping.value ", $1 / 1000, "\n" if m@min/avg/max.*\s\d+(?:\.\d+)?/(\d+(?:\.\d+)?)/\d+(?:\.\d+)?@; print "packetloss.value $1\n" if /(\d+)% packet loss/;' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/munin-2.0.24/plugins/node.d.linux/df_abs.in new/munin-2.0.25/plugins/node.d.linux/df_abs.in --- old/munin-2.0.24/plugins/node.d.linux/df_abs.in 2014-10-26 15:12:24.000000000 +0100 +++ new/munin-2.0.25/plugins/node.d.linux/df_abs.in 2014-11-24 22:46:24.000000000 +0100 @@ -59,7 +59,7 @@ dev="$1" mnt="$2" case "$dev" in - "/*" ) + /* ) clean_fieldname $dev ;; * ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/munin-2.0.24/plugins/node.d.linux/iostat_ios.in new/munin-2.0.25/plugins/node.d.linux/iostat_ios.in --- old/munin-2.0.24/plugins/node.d.linux/iostat_ios.in 2014-10-26 15:12:24.000000000 +0100 +++ new/munin-2.0.25/plugins/node.d.linux/iostat_ios.in 2014-11-24 22:46:24.000000000 +0100 @@ -105,7 +105,7 @@ } if(defined($tmpnam)) { return 0 if ($tmpnam =~ /part\d+$/); - return 0 if ($tmpnam =~ /^\s*(?:sd|hd)[a-z]\d+\s*$/); + return 0 if ($tmpnam =~ /^\s*(?:sd|hd|x?vd)[a-z]\d+\s*$/); } return 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/munin-2.0.24/plugins/node.d.linux/irqstats.in new/munin-2.0.25/plugins/node.d.linux/irqstats.in --- old/munin-2.0.24/plugins/node.d.linux/irqstats.in 2014-10-26 15:12:24.000000000 +0100 +++ new/munin-2.0.25/plugins/node.d.linux/irqstats.in 2014-11-24 22:46:24.000000000 +0100 @@ -112,6 +112,16 @@ # For numbered interrupts the format is set $label = pop @data; $type = pop @data; + # work around "MPIC \d" on powerpc + if ($type =~ "MPIC" && $label =~ s/^([12])\s+//) { + $type .= " $1";; + } + # handle hwirq + if ($label =~ /^(\d+)\s+(.+)/) { + $label = $1 eq $irq ? $2 : "$2 [$1]"; + } + # handle level/edge + $label =~ s/^(Level|Edge)\s+//; } else { # For named interrupts it's more confusing, slice and dice # to divorce data from commentary diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/munin-2.0.24/plugins/plugins.history.in new/munin-2.0.25/plugins/plugins.history.in --- old/munin-2.0.24/plugins/plugins.history.in 2014-10-26 15:12:24.000000000 +0100 +++ new/munin-2.0.25/plugins/plugins.history.in 2014-11-24 22:46:24.000000000 +0100 @@ -369,3 +369,4 @@ [2.0.22] [2.0.23] [2.0.24] +[2.0.25] -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
