|
[-]
[+]
|
Changed |
munin.changes
|
|
|
|
[-]
[+]
|
Changed |
munin.spec
^
|
|
|
|
[-]
[+]
|
Changed |
munin-2.0.12.tar.bz2/ChangeLog
^
|
| @@ -1,5 +1,43 @@
-*- text -*-
+munin-2.0.12, 2013-03-21
+
+-------
+Summary
+-------
+
+Bugfix-only release.
+
+- Fixed TLS/SSL transport
+- Fixed extra logging
+
+Closes: #1251, #1258, D:699803, D:689291, D:687912
+
+------------------
+Detailed Changelog
+------------------
+
+Bjørn Ruberg:
+ plugins/bonding_err_: adjust for newer kernels
+
+Steve Schnepp:
+ node: don't ignore timeout config option
+ plugins/apt: fix plugin statedir for cron
+ html: fix bug introduced by 1aec747c10
+ graph: remove all extra INFO messages
+ plugins/proc: fix bug in selecting via uid
+ dev_scripts: remove warnings
+ graph: remote superfluous -T in cmdline
+ master: fix TLS enabled updates
+
+
+munin-2.0.11.1, 2013-02-09
+
+Ironically, asyncd is broken in .11, as a typo makes it uncompilable.
+This is a patched release, and I'll remove any .11 tgz as it's not-working.
+
+Sorry.
+
munin-2.0.11, 2013-02-01
-------
|
|
[-]
[+]
|
Changed |
munin-2.0.12.tar.bz2/RELEASE
^
|
| @@ -1 +1 @@
-2.0.11
+2.0.12
|
|
[-]
[+]
|
Changed |
munin-2.0.12.tar.bz2/dev_scripts/run
^
|
| @@ -12,7 +12,7 @@
}
-if [ "$1" == "" ]; then
+if [ -z "$1" ]; then
usage
fi
@@ -20,8 +20,8 @@
RUN=$(find $DESTDIR -name $1)
shift
-if [ "$RUN" == "" ]; then
+if [ -z "$RUN" ]; then
usage
fi
-env PERL5LIB=$DESTDIR/$PERLSITELIB $RUN "$@"
+env PERL5LIB=$DESTDIR$PERLSITELIB $RUN "$@"
|
|
[-]
[+]
|
Changed |
munin-2.0.12.tar.bz2/master/_bin/munin-graph.in
^
|
| @@ -1,4 +1,4 @@
-#!@@PERL@@ -T
+#!@@PERL@@
# -*- cperl -*-
=encoding utf8
|
|
[-]
[+]
|
Changed |
munin-2.0.12.tar.bz2/master/lib/Munin/Master/GraphOld.pm
^
|
| @@ -405,16 +405,10 @@
autoflush $STATS 1;
}
- INFO "Starting munin-graph";
-
process_work(@limit_hosts);
$graph_time = sprintf("%.2f", (Time::HiRes::time - $graph_time));
- INFO "Munin-graph finished ($graph_time sec)";
-
- print $STATS "GT|total|$graph_time\n" unless $skip_stats;
-
rename(
"$config->{dbdir}/munin-graph.stats.tmp",
"$config->{dbdir}/munin-graph.stats"
@@ -1453,7 +1447,7 @@
if (munin_get_bool($service, "graph_sums", 0)) {
foreach my $time (keys %sumtimes) {
my $picfilename = get_picture_filename($service, $time, 1);
- INFO "Looking into drawing $picfilename";
+ DEBUG "Looking into drawing $picfilename";
(my $picdirname = $picfilename) =~ s/\/[^\/]+$//;
next unless ($draw{"sum" . $time});
my @rrd_sum;
@@ -1558,7 +1552,7 @@
} # if graph_sums
$service_time = sprintf("%.2f", (Time::HiRes::time - $service_time));
- INFO "[INFO] Graphed service $skeypath ($service_time sec for $nb_graphs_drawn graphs)";
+ DEBUG "[DEBUG] Graphed service $skeypath ($service_time sec for $nb_graphs_drawn graphs)";
print $STATS "GS|$service_time\n" unless $skip_stats;
foreach (@added) {
|
|
[-]
[+]
|
Changed |
munin-2.0.12.tar.bz2/master/lib/Munin/Master/HTMLConfig.pm
^
|
| @@ -481,7 +481,7 @@
}
my $imgpath = $root_path;
- if ( $config->{graph_strategy} eq 'cgi' ) {
+ if ( munin_get($config, "graph_strategy", "cron") eq "cgi" ) {
$imgpath = $config->{'cgiurl_graph'};
}
@@ -505,7 +505,8 @@
}
for my $scale (@times) {
- if (my ($w, $h) = get_png_size(munin_get_picture_filename($service, $scale))) {
+ my ($w, $h) = get_png_size(munin_get_picture_filename($service, $scale));
+ if ($w && $h) {
$srv{"img" . $scale . "width"} = $w;
$srv{"img" . $scale . "height"} = $h;
}
@@ -516,10 +517,11 @@
$srv{imgyearsum} = "$srv{node}-year-sum.png";
for my $scale (["week", "year"]) {
- if (my ($w, $h) = get_png_size(munin_get_picture_filename($service, $scale, 1))) {
- $srv{"img" . $scale . "sumwidth"} = $w;
- $srv{"img" . $scale . "sumheight"} = $h;
- }
+ my ($w, $h) = get_png_size(munin_get_picture_filename($service, $scale, 1));
+ if ($w && $h) {
+ $srv{"img" . $scale . "sumwidth"} = $w;
+ $srv{"img" . $scale . "sumheight"} = $h;
+ }
}
}
@@ -719,7 +721,7 @@
my $width = undef;
my $height = undef;
- return (undef, undef) if $config->{graph_strategy} eq "cgi";
+ return (undef, undef) if (munin_get($config, "graph_strategy", "cron") eq "cgi") ;
if (open(my $PNG, '<', $filename)) {
my $incoming;
|
|
[-]
[+]
|
Changed |
munin-2.0.12.tar.bz2/master/lib/Munin/Master/Node.pm
^
|
| @@ -624,6 +624,10 @@
sub _node_read_fast {
my ($self) = @_;
+ # We cannot bypass the IO if using TLS
+ # so just reverting to normal mode.
+ return _node_read(@_) if $self->{tls};
+
# Disable Buffering here, to be able to use sysread()
local $| = 1;
|
|
[-]
[+]
|
Changed |
munin-2.0.12.tar.bz2/node/_bin/munin-asyncd.in
^
|
| @@ -136,11 +136,11 @@
MAIN: while(1) {
my $when = time;
- (
+ {
# XXX - quickfix a bug that when sleeping too little, would
# then sleep a whole $timeout
$timeout = 1;
- )
+ }
my $when_next = $when + $timeout; # wake up at least every $timeout sec
my $sock;
|
|
[-]
[+]
|
Changed |
munin-2.0.12.tar.bz2/node/sbin/munin-node
^
|
| @@ -66,6 +66,7 @@
defuser => $config->{defuser},
defgroup => $config->{defgroup},
pidebug => $PIDEBUG,
+ timeout => $config->{timeout},
);
$config->reinitialize({
|
|
[-]
[+]
|
Changed |
munin-2.0.12.tar.bz2/plugins/node.d.linux/apt.in
^
|
| @@ -75,7 +75,7 @@
$ENV{'LANG'}="C";
$ENV{'LC_ALL'}="C";
-my $statefile = "$ENV{MUNIN_PLUGSTATE}/plugin-apt.state";
+my $statefile = ($ENV{MUNIN_PLUGSTATE} || '@@PLUGSTATE@@/root/') . "/plugin-apt.state";
sub update_state() {
if(-l $statefile) {
|
|
[-]
[+]
|
Changed |
munin-2.0.12.tar.bz2/plugins/node.d.linux/bonding_err_.in
^
|
| @@ -96,7 +96,7 @@
grep "^Slave Interface:" ${PROCDIR}/${BONDINGIF} | while read a b if; do
fieldname=$(clean_fieldname "$if")
echo -n "if_${fieldname}.value "
- grep -A 2 "^Slave Interface: ${if}" ${PROCDIR}/${BONDINGIF} | grep "Link Failure Count:" | cut -d " " -f 4
+ grep -A 4 "^Slave Interface: ${if}" ${PROCDIR}/${BONDINGIF} | grep "Link Failure Count:" | cut -d " " -f 4
done
|
|
[-]
[+]
|
Changed |
munin-2.0.12.tar.bz2/plugins/node.d.linux/proc.in
^
|
| @@ -329,7 +329,7 @@
if ( $cmdline !~ /.*$procargs[$i].*/ ) {
next STATLINE;
}
- if ( length($procuser[$i] > 0 ) ) {
+ if ( length($procuser[$i]) > 0 ) {
if ( $cmduid ne $useruid{$procuser[$i]} ) {
next STATLINE;
}
|
|
[-]
[+]
|
Changed |
munin-2.0.12.tar.bz2/plugins/plugins.history.in
^
|
| @@ -355,3 +355,5 @@
[2.0.9]
[2.0.10]
[2.0.11]
+[2.0.11.1]
+[2.0.12]
|
