Hi,
I've uploaded munin 1.2.6-5 to unstable today, closing 6 normal bugs and 2
documentation issues.
It doesn't close any RC bugs, but the package is priority optional and the
fixed bugs are all very simple. Matthias is the upstream maintainer of the
stable munin 1.2.x branch and I reviewed the complete diff (more than once).
It would be very nice to have this version in Lenny, but I'd understand if you
want to start enforcing the release guidelines more strictly... ;-) As these
bugfixes where done by Matthias anyway, it felt just stupid not to try to get
them included in our next release :-)
munin (1.2.6-5) unstable; urgency=low
[ Matthias Schmitz ]
* The plugin nfsd will not longer try to read values from a not longer
existent /proc/net/rpc/nfsd. (Closes: #490882, #473854)
* munin-run will now print its usage if its called without a plugin
parameter. (Closes: #416478)
* node.d/postfix_mailqueue: redirect the 'which' output to /dev/null to
avoid an unnecessary error message. (Closes: #495004)
* node.d/exim_mailstats: cut out the pid from the logfile lines if
log_selector=+pid is used (Closes: #440622)
* munin-node: Add an entry to /etc/munin/plugin-conf.d/munin-node to let the plugin
fw_forwarded_local run as root. (Closes: #411869)
* node.d.linux/fw_conntrack: Add 'graph_args -l 0' to plugin so that the
graph scale always starts from zero and completely shows the area of the
established connections. (Closes: #490093)
[ Holger Levsen ]
* Fix typos in node/Plugin.pm, thanks to Joey Schulze. (Closes: #495003)
$ debdiff munin_1.2.6-4.dsc munin_1.2.6-5.dsc|diffstat
debian/patches/340-nfsd-fix.patch | 70 ++++++++++++++++++++
debian/patches/350-munin-run-usage-fix.patch | 16 ++++
debian/patches/360-fw_conntrack-graph_args.patch | 12 +++
debian/patches/370-plugin-doc-typos.patch | 40 +++++++++++
munin-1.2.6/debian/changelog | 22 ++++++
munin-1.2.6/debian/patches/231-exim_mailstats.patch | 15 +++-
munin-1.2.6/debian/patches/290-postfix_spooldir | 6 -
munin-1.2.6/debian/patches/series | 4 +
munin-1.2.6/debian/plugins.conf | 3
9 files changed, 182 insertions(+), 6 deletions(-)
(The changes in debian/patches/340-nfsd-fix.patch are mostly comments and
intendation. The fix itself is straightforward and easy to understand.)
regards,
Holger
diff -u munin-1.2.6/debian/plugins.conf munin-1.2.6/debian/plugins.conf
--- munin-1.2.6/debian/plugins.conf
+++ munin-1.2.6/debian/plugins.conf
@@ -36,6 +36,9 @@
[fw_conntrack]
user root
+[fw_forwarded_local]
+user root
+
[hddtemp_smartctl]
user root
diff -u munin-1.2.6/debian/changelog munin-1.2.6/debian/changelog
--- munin-1.2.6/debian/changelog
+++ munin-1.2.6/debian/changelog
@@ -1,3 +1,25 @@
+munin (1.2.6-5) unstable; urgency=low
+
+ [ Matthias Schmitz ]
+ * The plugin nfsd will not longer try to read values from a not longer
+ existent /proc/net/rpc/nfsd. (Closes: #490882, #473854)
+ * munin-run will now print its usage if its called without a plugin
+ parameter. (Closes: #416478)
+ * node.d/postfix_mailqueue: redirect the 'which' output to /dev/null to
+ avoid an unnecessary error message. (Closes: #495004)
+ * node.d/exim_mailstats: cut out the pid from the logfile lines if
+ log_selector=+pid is used (Closes: #440622)
+ * munin-node: Add an entry to /etc/munin/plugin-conf.d/munin-node to let the plugin
+ fw_forwarded_local run as root. (Closes: #411869)
+ * node.d.linux/fw_conntrack: Add 'graph_args -l 0' to plugin so that the
+ graph scale always starts from zero and completely shows the area of the
+ established connections. (Closes: #490093)
+
+ [ Holger Levsen ]
+ * Fix typos in node/Plugin.pm, thanks to Joey Schulze. (Closes: #495003)
+
+ -- Holger Levsen <holger@debian.org> Sun, 24 Aug 2008 17:35:34 +0000
+
munin (1.2.6-4) unstable; urgency=medium
* Install munin-node gracefully (ie. inside a chroot, where port 4949 is
diff -u munin-1.2.6/debian/patches/290-postfix_spooldir munin-1.2.6/debian/patches/290-postfix_spooldir
--- munin-1.2.6/debian/patches/290-postfix_spooldir
+++ munin-1.2.6/debian/patches/290-postfix_spooldir
@@ -1,7 +1,7 @@
Index: munin-1.2.6/node/node.d/postfix_mailqueue.in
===================================================================
---- munin-1.2.6.orig/node/node.d/postfix_mailqueue.in 2008-07-20 22:15:33.000000000 +0200
-+++ munin-1.2.6/node/node.d/postfix_mailqueue.in 2008-07-20 22:22:20.000000000 +0200
+--- munin-1.2.6.orig/node/node.d/postfix_mailqueue.in 2005-03-29 22:32:59.000000000 +0200
++++ munin-1.2.6/node/node.d/postfix_mailqueue.in 2008-08-14 05:27:46.000000000 +0200
@@ -30,8 +30,13 @@
#%# family=auto
#%# capabilities=autoconf
@@ -10,7 +10,7 @@
-SPOOLDIR=${spooldir:-/var/spool/postfix}
+# Can be set via environment, but default is fetched by postconf (if available,
+# else /var/spool/postfix)
-+if which postconf ; then
++if which postconf > /dev/null ; then
+ SPOOLDIR=${spooldir:-`postconf -h queue_directory`}
+else
+ SPOOLDIR=${spooldir:-/var/spool/postfix}
diff -u munin-1.2.6/debian/patches/series munin-1.2.6/debian/patches/series
--- munin-1.2.6/debian/patches/series
+++ munin-1.2.6/debian/patches/series
@@ -1,3 +1,6 @@
+360-fw_conntrack-graph_args.patch
+350-munin-run-usage-fix.patch
+340-nfsd-fix.patch
320-sensors_fix
330-courier-typo
310-node-configure_bugfix
@@ -26,0 +30 @@
+370-plugin-doc-typos.patch
diff -u munin-1.2.6/debian/patches/231-exim_mailstats.patch munin-1.2.6/debian/patches/231-exim_mailstats.patch
--- munin-1.2.6/debian/patches/231-exim_mailstats.patch
+++ munin-1.2.6/debian/patches/231-exim_mailstats.patch
@@ -1,8 +1,17 @@
Index: munin-1.2.6/node/node.d/exim_mailstats.in
===================================================================
---- munin-1.2.6.orig/node/node.d/exim_mailstats.in 2008-06-22 22:02:49.000000000 +0200
-+++ munin-1.2.6/node/node.d/exim_mailstats.in 2008-06-22 22:03:24.000000000 +0200
-@@ -220,7 +220,7 @@
+--- munin-1.2.6.orig/node/node.d/exim_mailstats.in 2008-08-14 06:06:50.000000000 +0200
++++ munin-1.2.6/node/node.d/exim_mailstats.in 2008-08-14 06:11:21.000000000 +0200
+@@ -211,6 +211,8 @@
+
+ while ($line = <$LOGFILE>) {
+ chomp ($line);
++ # delete the pid out if there is one (Debian #440622)
++ $line =~ s/^(.{19} )\[\d+\] /$1/;
+
+ if (substr ($line, 37,2 ) eq '<=') {
+ $received++;
+@@ -220,7 +222,7 @@
$rejected++;
}
}
only in patch2:
unchanged:
--- munin-1.2.6.orig/debian/patches/340-nfsd-fix.patch
+++ munin-1.2.6/debian/patches/340-nfsd-fix.patch
@@ -0,0 +1,70 @@
+Index: munin-1.2.6/node/node.d.linux/nfsd.in
+===================================================================
+--- munin-1.2.6.orig/node/node.d.linux/nfsd.in 2008-08-12 16:11:27.000000000 +0200
++++ munin-1.2.6/node/node.d.linux/nfsd.in 2008-08-12 15:29:19.000000000 +0200
+@@ -1,39 +1,7 @@
+ #!/bin/sh
+ #
+ # Plugin created by Alexandre Dupouy, with the assistance of Mike Fedyk
+-#
+-# $Log$
+-# Revision 1.9.2.1 2005/03/16 13:45:45 ilmari
+-# Fix autoconf for linux/{nfsd,nfs_client}.
+-#
+-# Revision 1.9 2004/12/10 10:47:49 jimmyo
+-# Change name from ${scale} to ${graph_period}, to be more consistent.
+-#
+-# Revision 1.8 2004/12/09 22:12:56 jimmyo
+-# Added "graph_period" option, to make "graph_sums" usable.
+-#
+-# Revision 1.7 2004/11/21 00:17:12 jimmyo
+-# Changed a lot of plugins so they use DERIVE instead of COUNTER.
+-#
+-# Revision 1.6 2004/10/01 12:32:09 ilmari
+-# complete "rpc" removal
+-#
+-# Revision 1.5 2004/10/01 08:40:50 ilmari
+-# Remove useless 'rpc' field, add total field
+-#
+-# Revision 1.4 2004/05/20 19:02:37 jimmyo
+-# Set categories on a bunch of plugins
+-#
+-# Revision 1.3 2004/05/15 21:33:29 jimmyo
+-# "Upped" som plugins from contrib/manual to manual or auto.
+-#
+-# Revision 1.2 2004/05/06 21:55:18 jimmyo
+-# Added patch to contrib-plugin linux/nfsd, to graph rpc count (Alexandre Dupouy).
+-#
+-# Revision 1.1 2004/02/18 18:41:54 jimmyo
+-# Plugin created by Alexandre Dupouy, with the assistance of Mike Fedyk
+-#
+-#
++# $Id: nfsd.in 1696 2008-08-12 13:29:18Z matthias $
+ #%# family=auto
+ #%# capabilities=autoconf
+
+@@ -64,10 +32,17 @@
+
+ i=4;
+
+-for a in $proc; do
+- echo -n "$a.value "
+- grep proc3 $NFSD \
+- | cut -f $i -d ' ' \
+- | awk '{print $1}'
+- i=$(expr $i + 1)
+-done
++if [ -r $NFSD ];
++then
++ for a in $proc; do
++ echo -n "$a.value "
++ grep proc3 $NFSD \
++ | cut -f $i -d ' ' \
++ | awk '{print $1}'
++ i=$(expr $i + 1)
++ done
++else
++ echo "Cannot read $NFSD" >&2
++ exit -1
++fi
++
only in patch2:
unchanged:
--- munin-1.2.6.orig/debian/patches/370-plugin-doc-typos.patch
+++ munin-1.2.6/debian/patches/370-plugin-doc-typos.patch
@@ -0,0 +1,40 @@
+Index: munin-1.2.6/node/Plugin.pm.in
+===================================================================
+--- munin-1.2.6.orig/node/Plugin.pm.in 2008-08-24 17:31:37.000000000 +0000
++++ munin-1.2.6/node/Plugin.pm.in 2008-08-24 17:32:41.000000000 +0000
+@@ -29,7 +29,7 @@
+ use Munin::Plugin;
+
+ If your Munin installation predates the MUNIN_* environment variables
+-(introduced in 1.3.3) you can put this in your plugin configutation:
++(introduced in 1.3.3) you can put this in your plugin configuration:
+
+ [*]
+ env.MUNIN_PLUGSTATE /lib/munin/plugin-state
+@@ -79,7 +79,7 @@
+ But there is also a function to change the state file name so the
+ state file support functions can be used for several state files.
+
+-If it's value cannot be determined the plugin will be aborted at once
++If its value cannot be determined the plugin will be aborted at once
+ with an explanatory message. The most likely causes are
+
+ =over 8
+@@ -243,7 +243,7 @@
+ program in the interest of error-obviousness.
+
+ The state file name is determined automatically based on the
+-name of the process we're running as. Se L<$Munin::Plugin::me>,
++name of the process we're running as. See L<$Munin::Plugin::me>,
+ L<$Munin::Plugin::statefile> and L<set_state_name> above about the
+ file name.
+
+@@ -315,7 +315,7 @@
+ rotated a warning is printed (this can be found in the munin-node log
+ or seen in the terminal when using munin-run).
+
+-At this point the plugin can read from the file with <$file_hanle> in
++At this point the plugin can read from the file with <$file_handle> in
+ loop as usual until EOF is encountered.
+
+ If the file cannot be stat'ed C<(undef,undef)> is returned. If the
only in patch2:
unchanged:
--- munin-1.2.6.orig/debian/patches/350-munin-run-usage-fix.patch
+++ munin-1.2.6/debian/patches/350-munin-run-usage-fix.patch
@@ -0,0 +1,16 @@
+Index: munin-1.2.6/node/munin-run.in
+===================================================================
+--- munin-1.2.6.orig/node/munin-run.in 2008-08-13 01:16:17.000000000 +0200
++++ munin-1.2.6/node/munin-run.in 2008-08-13 01:17:21.000000000 +0200
+@@ -97,9 +97,9 @@
+ "paranoia!" => \$paranoia,
+ "help" => \$do_usage );
+
+-if ($do_usage)
++if ($do_usage or ! defined($ARGV[0]))
+ {
+- print "Usage: $0 [options]
++ print "Usage: $0 [options] <plugin>
+
+ Options:
+ --help View this message.
only in patch2:
unchanged:
--- munin-1.2.6.orig/debian/patches/360-fw_conntrack-graph_args.patch
+++ munin-1.2.6/debian/patches/360-fw_conntrack-graph_args.patch
@@ -0,0 +1,12 @@
+Index: munin-1.2.6/node/node.d.linux/fw_conntrack.in
+===================================================================
+--- munin-1.2.6.orig/node/node.d.linux/fw_conntrack.in 2008-08-15 07:36:32.000000000 +0200
++++ munin-1.2.6/node/node.d.linux/fw_conntrack.in 2008-08-15 07:36:51.000000000 +0200
+@@ -51,6 +51,7 @@
+ graph_title Connections through firewall
+ graph_vlabel Connections
+ graph_category network
++graph_args -l 0
+ established.label Established
+ established.type GAUGE
+ established.draw AREA
Attachment:
pgpKpQOnAsl3A.pgp
Description: PGP signature