Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Hi,
this is a pre-approval unblock request for munin 2.0.25-1, which is a bugfix
only upstream release. Upstream changelog is:
+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
$ git diff 2.0.24..2.0.25 |diffstat
ChangeLog | 34
++++++++++++++++++++++++++++++++++
master/lib/Munin/Master/LimitsOld.pm | 2 +-
master/lib/Munin/Master/Node.pm | 2 +-
master/lib/Munin/Master/Update.pm | 8 ++++++--
plugins/lib/Munin/Plugin/Pgsql.pm | 2 +-
plugins/node.d.linux/df_abs.in | 2 +-
plugins/node.d.linux/iostat_ios.in | 2 +-
plugins/node.d.linux/irqstats.in | 10 ++++++++++
plugins/node.d/ping_.in | 2 +-
plugins/plugins.history.in | 1 +
10 files changed, 57 insertions(+), 8 deletions(-)
$ git log -p 2.0.24..2.0.25 > ~/munin.git.diff
$ git diff 2.0.24..2.0.25 > ~/munin.diff
both attached.
Except for these changes the only other change planned is
* munin.README.Debian: Replace link to
http://munin-monitoring.org/wiki/Documentation with one to the new
http://guide.munin-monitoring.org/ which is better structured and also
translated
Thanks for your work on jessie!
cheers,
Holger
diff --git a/ChangeLog b/ChangeLog
index 96e31cd..6ed5bef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 --git a/master/lib/Munin/Master/LimitsOld.pm b/master/lib/Munin/Master/LimitsOld.pm
index a3d948f..3303125 100644
--- a/master/lib/Munin/Master/LimitsOld.pm
+++ b/master/lib/Munin/Master/LimitsOld.pm
@@ -839,7 +839,7 @@ will return a reference to an empty array.
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 --git a/master/lib/Munin/Master/Node.pm b/master/lib/Munin/Master/Node.pm
index 089f6ee..88944a7 100644
--- a/master/lib/Munin/Master/Node.pm
+++ b/master/lib/Munin/Master/Node.pm
@@ -146,7 +146,7 @@ sub _do_connect {
}
};
- 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 --git a/master/lib/Munin/Master/Update.pm b/master/lib/Munin/Master/Update.pm
index be450ff..e5921b1 100644
--- a/master/lib/Munin/Master/Update.pm
+++ b/master/lib/Munin/Master/Update.pm
@@ -359,8 +359,12 @@ sub _print_old_service_configs_for_failed_workers {
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 --git a/plugins/lib/Munin/Plugin/Pgsql.pm b/plugins/lib/Munin/Plugin/Pgsql.pm
index 93fbc53..1153f19 100644
--- a/plugins/lib/Munin/Plugin/Pgsql.pm
+++ b/plugins/lib/Munin/Plugin/Pgsql.pm
@@ -478,7 +478,7 @@ sub get_version {
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 --git a/plugins/node.d.linux/df_abs.in b/plugins/node.d.linux/df_abs.in
index 9f691b8..97a8496 100644
--- a/plugins/node.d.linux/df_abs.in
+++ b/plugins/node.d.linux/df_abs.in
@@ -59,7 +59,7 @@ get_fieldname() {
dev="$1"
mnt="$2"
case "$dev" in
- "/*" )
+ /* )
clean_fieldname $dev
;;
* )
diff --git a/plugins/node.d.linux/iostat_ios.in b/plugins/node.d.linux/iostat_ios.in
index cb9d775..a6cd721 100644
--- a/plugins/node.d.linux/iostat_ios.in
+++ b/plugins/node.d.linux/iostat_ios.in
@@ -105,7 +105,7 @@ sub filter {
}
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 --git a/plugins/node.d.linux/irqstats.in b/plugins/node.d.linux/irqstats.in
index 9245db9..bb108cc 100644
--- a/plugins/node.d.linux/irqstats.in
+++ b/plugins/node.d.linux/irqstats.in
@@ -112,6 +112,16 @@ while (my $line = <$in>) {
# 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 --git a/plugins/node.d/ping_.in b/plugins/node.d/ping_.in
index 7100a89..cad63ec 100644
--- a/plugins/node.d/ping_.in
+++ b/plugins/node.d/ping_.in
@@ -89,4 +89,4 @@ if [ "$1" = "config" ]; then
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 --git a/plugins/plugins.history.in b/plugins/plugins.history.in
index 461d464..c63014a 100644
--- a/plugins/plugins.history.in
+++ b/plugins/plugins.history.in
@@ -369,3 +369,4 @@ postgres_prepared_xacts_
[2.0.22]
[2.0.23]
[2.0.24]
+[2.0.25]
commit 2540951682584f0c6f738002e9154c4378181c94
Author: Steve Schnepp <steve.schn...@pwkf.org>
Date: Mon Nov 24 22:46:24 2014 +0100
Adding 2.0.25
diff --git a/ChangeLog b/ChangeLog
index 96e31cd..6ed5bef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 --git a/plugins/plugins.history.in b/plugins/plugins.history.in
index 461d464..c63014a 100644
--- a/plugins/plugins.history.in
+++ b/plugins/plugins.history.in
@@ -369,3 +369,4 @@ postgres_prepared_xacts_
[2.0.22]
[2.0.23]
[2.0.24]
+[2.0.25]
commit b99c2ae04f6e004e46d39ae07b78ff6e57fc1b7f
Merge: c700f67 a66d40d
Author: Steve Schnepp <steve.schn...@pwkf.org>
Date: Mon Nov 24 22:36:05 2014 +0100
Merge branch 'bts/769415-ping_-plugin-does-not-honor-ping-env-variable' into stable-2.0
Conflicts:
plugins/node.d/ping_.in
commit a66d40dd5d1b3d1175d8db7e30c7d15a7106599f
Author: Steve Schnepp <steve.schn...@pwkf.org>
Date: Mon Nov 24 22:28:48 2014 +0100
p/ping_: honor ping env variable
As stated by Andreas Schamanek,
The following environment variables are used by this plugin
ping - Ping program to use
However, ping_ doesn't use that environment var, as it finally runs :
${PING:-ping} ...
This commit fixes the typo in that last line
Closes: D#769415
diff --git a/plugins/node.d/ping_.in b/plugins/node.d/ping_.in
index 86ee656..4b52983 100755
--- a/plugins/node.d/ping_.in
+++ b/plugins/node.d/ping_.in
@@ -90,5 +90,5 @@ if [ "$1" = "config" ]; then
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/;'
commit c700f67ba0eb455b529e455ec09f2f69ea89f8f3
Merge: fa1a77c ccd7d1d
Author: Steve Schnepp <steve.schn...@pwkf.org>
Date: Mon Nov 24 22:13:50 2014 +0100
Merge branch 'bts/770826-postgresql-plugin-fails-to-find-rc-version' into stable-2.0
commit ccd7d1d7bb309f2487dd2aea17c8318ad0e8d912
Author: Steve Schnepp <steve.schn...@pwkf.org>
Date: Sat Sep 27 00:21:55 2014 +0200
p/pgsql: Detect "rc" postgresql versions.
- Also accept versions ending in "rc\d+"
- Thanks to Vincas Dargis for bringing it to our attention via the Debian BTS.
Closes: D#770826
diff --git a/plugins/lib/Munin/Plugin/Pgsql.pm b/plugins/lib/Munin/Plugin/Pgsql.pm
index 93fbc53..1153f19 100644
--- a/plugins/lib/Munin/Plugin/Pgsql.pm
+++ b/plugins/lib/Munin/Plugin/Pgsql.pm
@@ -478,7 +478,7 @@ sub get_version {
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";
}
commit fa1a77c6113808216882345556871d5ef388b876
Merge: f7679f7 8ef172b
Author: Steve Schnepp <steve.schn...@pwkf.org>
Date: Mon Nov 24 22:05:57 2014 +0100
Merge branch 'bts/770745-fix-unintended-breakage-in-rrd-file-names' into stable-2.0
commit 8ef172b8a61b1fc9329c3aaf5d866eac168243ae
Author: Steve Schnepp <steve.schn...@pwkf.org>
Date: Wed Jun 19 17:06:06 2013 +0200
plugins/df_abs: fix the naming for regular devices
As stated by Christoph Biedl:
Commit a4eb420 was created in the intention to append the mountpoint to
non-device mounts like tmpfs in order to make them unique.
However, the quoting in
+ "/*" )
disabled globbing so this clause will never be hit¹. As a result, the
mountpoint is appended to *all* devices like in
| _dev_vda1__boot.value 19868
| _dev_vda5__.value 165710
This field name change will also break the historic data as the rrd file name
on the master changes accordingly.
It might be an idea to stay that way (I consider that a bad one) but at the
moment the plugin's behaviour matches neither the documention nor the one of
the other df* plugins.
¹ Unless somebody naughty creates a device with literally that name.
Closes: D#770745
diff --git a/plugins/node.d.linux/df_abs.in b/plugins/node.d.linux/df_abs.in
index 9f691b8..97a8496 100644
--- a/plugins/node.d.linux/df_abs.in
+++ b/plugins/node.d.linux/df_abs.in
@@ -59,7 +59,7 @@ get_fieldname() {
dev="$1"
mnt="$2"
case "$dev" in
- "/*" )
+ /* )
clean_fieldname $dev
;;
* )
commit f7679f772b453bfee781c09db6140cfe209a125d
Merge: dab2ff5 5aab99f
Author: Steve Schnepp <steve.schn...@pwkf.org>
Date: Mon Nov 24 08:38:34 2014 +0100
Merge branch 'bts/770746-improving-the-label-generated-by-the-irqstats-plugin' into stable-2.0
commit 5aab99f6c12d8e464e554534dd22f1bf03c05722
Author: Christoph Biedl <debian.a...@manchmal.in-ulm.de>
Date: Mon Nov 24 08:32:49 2014 +0100
p/irqstats: Improve generated labels
Three cosmetical issues with the labels generated by the irqstats
plugin:
1.
The concept of "interrupt domains" is somewhat unknown in the Intel
world. It seems to be quite common on other archs like ARM-based and
powerpc though.
Somewhat guessing from reading the Linux kernel sources, the basic
idea is the interrupt number as seen bei the interrupt controller
("hwirq") do not necessarily match the number the kernel uses
internally and is visible in the first column of /proc/interrupts.
In that case, an additional column contains that hwirq IRQ number¹.
The irqstats plugin is not aware of that and generates a label from
both that number and the actual name, like in
(...)
| CPU0
(...)
| 25: 492375413 main-interrupt-ctrl 11 eth0
| 33: 949 main-interrupt-ctrl 33 serial
| 74: 15147181 main-interrupt-ctrl 46 f1072004.mdio-bus
(...)
[ /proc/interrupts ]
(...)
| i25.label 11 eth0
| i25.info Interrupt 25, for device(s): 11 eth0
| i25.type DERIVE
| i25.min 0
| i33.label 33 serial
| i33.info Interrupt 33, for device(s): 33 serial
| i33.type DERIVE
| i33.min 0
| i74.label 46 f1072004.mdio-bus
| i74.info Interrupt 74, for device(s): 46 f1072004.mdio-bus
| i74.type DERIVE
| i74.min 0
(...)
[ $(munin-run irqstats config) ]
2.
On kernels with CONFIG_GENERIC_IRQ_SHOW_LEVEL² enabled (powerpc), an
additional column containing "Level" or "Edge" is printed
| CPU0
(...)
| 19: 745 MPIC 1 19 Level pata-macio
| 25: 0 MPIC 1 25 Level VIA-PMU
| 26: 0 MPIC 1 26 Level keywest i2c
(...)
[ /proc/interrupts ]
3.
In the expample above, the space in the PIC name "MPIC 1"³ causes
additional trouble, "config" suggests the labels as follows
| irqstats.i19.label 1 19 Level pata-macio
| irqstats.i25.label 1 25 Level VIA-PMU
| irqstats.i26.label 1 26 Level keywest i2c
These labels just eat space and are somewhat confusing.
The patch below catches these situations by
1. Dropping that number, unless it's different from the logical
one. In that case, it is appended to the label.
2. Stripping these strings if present.
3. Wild-guessing. The $type variable is not used by the way but the
patch creates a value in the intended idea.
It might be an idea to fix that extra space in the kernel.
Regards,
Christoph
¹ kernel-git:
commit v3.10-rc5-20-gc12d2f4
² kernel-git:
commit v2.6.38-7061-gab7798f
commit v2.6.39-rc5-148-g94b2c36
³ kernel-git:
commit v2.6.15-1517-g1beb6a7
Closes: D#770746
Signed-off-by: Steve Schnepp <steve.schn...@pwkf.org>
diff --git a/plugins/node.d.linux/irqstats.in b/plugins/node.d.linux/irqstats.in
index 9245db9..bb108cc 100644
--- a/plugins/node.d.linux/irqstats.in
+++ b/plugins/node.d.linux/irqstats.in
@@ -112,6 +112,16 @@ while (my $line = <$in>) {
# 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
commit dab2ff58defaba55583ab092aa044cdddb721a9a
Merge: 005ce87 658a89d
Author: Steve Schnepp <steve.schn...@pwkf.org>
Date: Thu Nov 13 06:19:52 2014 +0000
Merge pull request #306 from steveschnepp/fix/g-304-use-of-uninitialized-value-severities
m/limits: remove warning about uninitialized
commit 658a89d9fcb25fc2d3af7edeba81645ac2a412d1
Author: Steve Schnepp <steve.schn...@pwkf.org>
Date: Wed Nov 12 23:35:53 2014 +0100
m/limits: remove warning about uninitialized
undef severities should just be silenced
Closes: munin-monitoring/munin#304
diff --git a/master/lib/Munin/Master/LimitsOld.pm b/master/lib/Munin/Master/LimitsOld.pm
index a3d948f..3303125 100644
--- a/master/lib/Munin/Master/LimitsOld.pm
+++ b/master/lib/Munin/Master/LimitsOld.pm
@@ -839,7 +839,7 @@ will return a reference to an empty array.
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};
commit 005ce870e304afef9db6ca0f666ec460674be158
Merge: 72f9d4b f039326
Author: Steve Schnepp <steve.schn...@pwkf.org>
Date: Wed Oct 29 11:58:16 2014 +0100
Merge pull request #281 from openquery/nodata-upstream-pr-270
Issue warning if no data
commit f039326e344eb897f8771fdbce56ea3685807bec
Author: Picnic Pete <peter.l...@openquery.com.au>
Date: Tue Oct 28 08:50:24 2014 +0000
Issue warning if no data
diff --git a/master/lib/Munin/Master/Update.pm b/master/lib/Munin/Master/Update.pm
index be450ff..e5921b1 100644
--- a/master/lib/Munin/Master/Update.pm
+++ b/master/lib/Munin/Master/Update.pm
@@ -359,8 +359,12 @@ sub _print_old_service_configs_for_failed_workers {
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";
+ }
}
}
commit 72f9d4b201f60a0f918f3d89fa68b8df9e9f7d9b
Merge: b778543 1b00400
Author: Steve Schnepp <steve.schn...@pwkf.org>
Date: Tue Oct 28 09:30:33 2014 +0100
Merge pull request #282 from openquery/xvda
ip/iostat_ios: also support /dev/xvdX devices
commit 1b0040056d2f2faf99cb7601ad4b0e28e57ac35b
Author: Daniel Black <daniel.bl...@openquery.com>
Date: Tue Oct 28 04:38:13 2014 +0000
ip/iostat_ios: also support /dev/xvdX devices
Xen kernels use xvdX:
brw-rw---T 1 root disk 202, 32 Jun 27 00:27 /dev/xvdc
diff --git a/plugins/node.d.linux/iostat_ios.in b/plugins/node.d.linux/iostat_ios.in
index 2baf133..a6cd721 100644
--- a/plugins/node.d.linux/iostat_ios.in
+++ b/plugins/node.d.linux/iostat_ios.in
@@ -105,7 +105,7 @@ sub filter {
}
if(defined($tmpnam)) {
return 0 if ($tmpnam =~ /part\d+$/);
- return 0 if ($tmpnam =~ /^\s*(?:sd|hd|vd)[a-z]\d+\s*$/);
+ return 0 if ($tmpnam =~ /^\s*(?:sd|hd|x?vd)[a-z]\d+\s*$/);
}
return 1;
commit b778543b2ef99f3c9b02d11894f6fde4e752669e
Author: Holger Levsen <hol...@layer-acht.org>
Date: Mon Oct 27 18:24:17 2014 +0100
p/iostat_ios: also support /dev/vdX devices
diff --git a/plugins/node.d.linux/iostat_ios.in b/plugins/node.d.linux/iostat_ios.in
index cb9d775..2baf133 100644
--- a/plugins/node.d.linux/iostat_ios.in
+++ b/plugins/node.d.linux/iostat_ios.in
@@ -105,7 +105,7 @@ sub filter {
}
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|vd)[a-z]\d+\s*$/);
}
return 1;
commit b1b2f9f1c961a079154d3ff8d51293e691a4f390
Author: Steve Schnepp <steve.schn...@pwkf.org>
Date: Mon Oct 27 19:21:18 2014 +0100
m/Node: add [INFO] in a log
It isn't used in 2.1 anymore, but it is still mandatory for 2.0.
diff --git a/master/lib/Munin/Master/Node.pm b/master/lib/Munin/Master/Node.pm
index 089f6ee..88944a7 100644
--- a/master/lib/Munin/Master/Node.pm
+++ b/master/lib/Munin/Master/Node.pm
@@ -146,7 +146,7 @@ sub _do_connect {
}
};
- 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;
}
signature.asc
Description: This is a digitally signed message part.
