Your message dated Thu, 24 Dec 2009 09:52:16 +0000
with message-id <[email protected]>
and subject line Bug#561682: fixed in munin 1.4.2-2
has caused the Debian Bug report #561682,
regarding munin-plugins-extra: vserver plugins should support autoconf/suggest
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
561682: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=561682
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: munin-plugins-extra
Version: 1.4.2-1
Severity: wishlist
Hi,
Please review the attached debdiff that add support for autoconf/suggest
in vserver_* plugins.
- vserver_cpu_: autoconf/suggest
- vserver_loadavg: autoconf
- vserver_resources: autoconf
It also escape commandlines in the plugins documentation to prevent the
following errors:
No code specified for -e.
plugins/node.d.linux/vserver_cpu_.in: line 5: print
POSIX::sysconf(_SC_PAGESIZE), "\n";: command not found
Test cases could be run using the following commands to ensure patched
plugins works as expected:
$ hg clone http://bitbucket.org/proppy/munin-plugins
$ cd munin-plugins/
$ make check
./test-vserver_cpu_
SUCCEED
./test-vserver_loadavg
SUCCEED
./test-vserver_resources
SUCCEED
Works as been sponsored by ISVTEC.
--
Johan Euphrosine <[email protected]>
diff -u munin-1.4.2/debian/changelog munin-1.4.2/debian/changelog
--- munin-1.4.2/debian/changelog
+++ munin-1.4.2/debian/changelog
@@ -1,3 +1,10 @@
+munin (1.4.2-2) unstable; urgency=low
+
+ * Add patches/301-vserver-autoconf-suggest.patch to add support
+ for autoconf and suggest in vserver plugins.
+
+ -- Johan Euphrosine (proppy) <[email protected]> Sat, 19 Dec 2009 16:35:59 +0100
+
munin (1.4.2-1) unstable; urgency=low
[ Tom Feiner ]
diff -u munin-1.4.2/debian/patches/series munin-1.4.2/debian/patches/series
--- munin-1.4.2/debian/patches/series
+++ munin-1.4.2/debian/patches/series
@@ -3,0 +4 @@
+301-vserver-autoconf-suggest.patch
only in patch2:
unchanged:
--- munin-1.4.2.orig/debian/patches/301-vserver-autoconf-suggest.patch
+++ munin-1.4.2/debian/patches/301-vserver-autoconf-suggest.patch
@@ -0,0 +1,150 @@
+Description: Add support for autoconf/suggest in vserver plugins.
+ Escape command lines in TODO items.
+
+Origin: other
+Bug-Debian: none
+Forwarded: no
+Author: Johan Euphrosine (proppy) <[email protected]>
+Last-Update: 2009-12-19
+Index: munin-1.4.2/plugins/node.d.linux/vserver_cpu_.in
+===================================================================
+--- munin-1.4.2.orig/plugins/node.d.linux/vserver_cpu_.in 2009-12-19 16:25:25.000000000 +0100
++++ munin-1.4.2/plugins/node.d.linux/vserver_cpu_.in 2009-12-19 16:27:47.000000000 +0100
+@@ -1,5 +1,7 @@
+ #!@@BASH@@
+ # -*- sh -*-
++#%# family=auto
++#%# capabilities=autoconf suggest
+
+ : <<EOF
+
+@@ -80,8 +82,8 @@
+ =item Less use of /proc
+
+ use /proc less often (100 times more overhead than talking to the
+-kernel directly) i.e. use something like pagesize=`perl -MPOSIX -e
+-'print POSIX::sysconf(_SC_PAGESIZE), "\n";'`
++kernel directly) i.e. use something like pagesize=\`perl -MPOSIX -e
++'print POSIX::sysconf(_SC_PAGESIZE), "\n";'\`
+
+ =back
+
+@@ -93,6 +95,25 @@
+
+ EOF
+
++if [ "$1" = "autoconf" ]; then
++ if [ -r ${PROC_PATH}/virtual/info ]; then
++ echo yes
++ exit 0
++ else
++ echo "no (${PROC_PATH}/virtual/info not found)"
++ exit 1
++ fi
++fi
++
++if [ "$1" = "suggest" ]; then
++ if [ ! -r ${PROC_PATH}/virtual/info ]; then
++ exit 1
++ fi
++ #
++ # 'else' clause is after XIDS definition
++ #
++fi
++
+ VSERVERS="$vservers"
+
+ INFO=(`sed 's/.*:\t//' /proc/virtual/info 2>/dev/null || echo '<none>'`)
+@@ -124,6 +145,16 @@
+ done
+ fi
+
++if [ "$1" = "suggest" ]; then
++ if [ -r ${PROC_PATH}/virtual/info ]; then
++ for i in $XIDS ; do
++ LABEL=`cat ${PROC_PATH}/virtual/$i/$NAMELOC |grep NodeName |cut -f2`
++ echo $LABEL
++ done
++ exit 0
++ fi
++fi
++
+ BASEPARAM=`basename $0 | sed 's/^vserver_//'`
+ MODE=`echo $BASEPARAM | sed 's/^hold.*//'`
+
+Index: munin-1.4.2/plugins/node.d.linux/vserver_loadavg.in
+===================================================================
+--- munin-1.4.2.orig/plugins/node.d.linux/vserver_loadavg.in 2009-12-19 16:25:29.000000000 +0100
++++ munin-1.4.2/plugins/node.d.linux/vserver_loadavg.in 2009-12-19 16:26:57.000000000 +0100
+@@ -1,5 +1,7 @@
+ #!@@BASH@@
+ # -*- sh -*-
++#%# family=auto
++#%# capabilities=autoconf
+
+ : <<EOF
+
+@@ -65,15 +67,18 @@
+
+ # If run with the "autoconf"-parameter, give our opinion on whether we
+ # should be run on this system or not. This is optional, and only used by
+-# munin-config. In the case of this plugin, we should most probably
+-# always be included whwn there is a vserver kernel.
++# munin-config.
+
+ if [ "$1" = "autoconf" ]; then
+- echo yes
+- exit 0
++ if [ -r ${PROC_PATH}/virtual/info ]; then
++ echo yes
++ exit 0
++ else
++ echo "no (${PROC_PATH}/virtual/info not found)"
++ exit 1
++ fi
+ fi
+
+-
+ # if vservers are specified, use them; the default is to use all.
+ VSERVERS="$vservers"
+
+Index: munin-1.4.2/plugins/node.d.linux/vserver_resources.in
+===================================================================
+--- munin-1.4.2.orig/plugins/node.d.linux/vserver_resources.in 2009-12-19 16:25:31.000000000 +0100
++++ munin-1.4.2/plugins/node.d.linux/vserver_resources.in 2009-12-19 16:26:57.000000000 +0100
+@@ -1,5 +1,7 @@
+ #!@@BASH@@
+ # -*- sh -*-
++#%# family=auto
++#%# capabilities=autoconf
+
+ : <<EOF
+
+@@ -151,8 +153,8 @@
+ =item Use /proc less often
+
+ use /proc less often (100 times more overhead than talking to the
+-kernel directly) i.e. use something like pagesize=`perl -MPOSIX -e
+-'print POSIX::sysconf(_SC_PAGESIZE), "\n";'`
++kernel directly) i.e. use something like pagesize=\`perl -MPOSIX -e
++'print POSIX::sysconf(_SC_PAGESIZE), "\n";'\`
+
+ =back
+
+@@ -168,6 +170,16 @@
+
+ EOF
+
++if [ "$1" = "autoconf" ]; then
++ if [ -r ${PROC_PATH}/virtual/info ]; then
++ echo yes
++ exit 0
++ else
++ echo "no (${PROC_PATH}/virtual/info not found)"
++ exit 1
++ fi
++fi
++
+ VSERVERS="$vservers"
+ LIMITS="$limits"
+ RESOURCE="$resource"
signature.asc
Description: This is a digitally signed message part
--- End Message ---
--- Begin Message ---
Source: munin
Source-Version: 1.4.2-2
We believe that the bug you reported is fixed in the latest version of
munin, which is due to be installed in the Debian FTP archive:
munin-common_1.4.2-2_all.deb
to main/m/munin/munin-common_1.4.2-2_all.deb
munin-java-plugins_1.4.2-2_all.deb
to main/m/munin/munin-java-plugins_1.4.2-2_all.deb
munin-node_1.4.2-2_all.deb
to main/m/munin/munin-node_1.4.2-2_all.deb
munin-plugins-extra_1.4.2-2_all.deb
to main/m/munin/munin-plugins-extra_1.4.2-2_all.deb
munin_1.4.2-2.diff.gz
to main/m/munin/munin_1.4.2-2.diff.gz
munin_1.4.2-2.dsc
to main/m/munin/munin_1.4.2-2.dsc
munin_1.4.2-2_all.deb
to main/m/munin/munin_1.4.2-2_all.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Tom Feiner <[email protected]> (supplier of updated munin package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Thu, 24 Dec 2009 08:50:58 +0200
Source: munin
Binary: munin-node munin-plugins-extra munin-java-plugins munin munin-common
Architecture: source all
Version: 1.4.2-2
Distribution: unstable
Urgency: low
Maintainer: Munin Debian Maintainers <[email protected]>
Changed-By: Tom Feiner <[email protected]>
Description:
munin - network-wide graphing framework (grapher/gatherer)
munin-common - network-wide graphing framework (common)
munin-java-plugins - network-wide graphing framework (java plugins for node)
munin-node - network-wide graphing framework (node)
munin-plugins-extra - network-wide graphing framework (user contributed
plugins for nod
Closes: 561682 561984 562097
Changes:
munin (1.4.2-2) unstable; urgency=low
.
* Fix lintian warnings regarding DejaVuSans.ttf.
* /etc/munin/apache.conf uses <IfModule mod_expires>,
should use <IfModule mod_expires.c>. (Closes: #561984)
* Add vserver plugins autoconf/suggest support. (Closes: #561682)
* Fix group for exim_mailqueue plugin. Closes: #562097).
Checksums-Sha1:
7a335e08d8f5ec38db26602e0cd9412813aa45c8 1498 munin_1.4.2-2.dsc
602ee0b92c988a6ad755179541db244c0a5dba3e 34239 munin_1.4.2-2.diff.gz
ad05d350f31229e336e70f2b61c7cf62cc6e9c97 83532 munin-common_1.4.2-2_all.deb
744507b6c6c4e9d6da56d0f965720bd4d23cb2e7 204068 munin_1.4.2-2_all.deb
c58720e44dac463401b3cda7da2e8324bc9e819b 360328 munin-node_1.4.2-2_all.deb
313756e2f43dee112de9a9a5fa306a311edabb5d 111192
munin-plugins-extra_1.4.2-2_all.deb
7e261159143ca255ebca88cce2187f7b9dc01985 119986
munin-java-plugins_1.4.2-2_all.deb
Checksums-Sha256:
47ee6c119e5a18cc0863845365363e251ddfd00b262d21e252b8c1972b66806f 1498
munin_1.4.2-2.dsc
b2aa5fa77d2553bab054382296bfb47653466a9852f41ad2a295c0faa0329092 34239
munin_1.4.2-2.diff.gz
4306a5afb60625229e357bf12fd2599ffa0cfa2a391c4d5ca397b8bf10023a8c 83532
munin-common_1.4.2-2_all.deb
e1b98a07b80ba59a3af00d4c1751c9ff3995b866cd149303e644a233d57fd7c9 204068
munin_1.4.2-2_all.deb
deaafd01fd397739ed89cb221cdad627ee0c8e522d88ab17da0c1b48fca55a89 360328
munin-node_1.4.2-2_all.deb
0c6e80bfcc2cf7685c0f5a619f26c558f5f4ab5142a46d63b8a92ab3dd9e5f49 111192
munin-plugins-extra_1.4.2-2_all.deb
dfeb839a27c229e1ebe0d12aefa99c89712d9ae5f82281751ca563796ca52170 119986
munin-java-plugins_1.4.2-2_all.deb
Files:
3101769bb7158fdca9285e77a0e0a58b 1498 net optional munin_1.4.2-2.dsc
36773e64fba55258795694043ebf602a 34239 net optional munin_1.4.2-2.diff.gz
2ff18d5cee029ebc3b29c01e47c9fe55 83532 net optional
munin-common_1.4.2-2_all.deb
0758e2fea1494dcf95f70af3a3d600f0 204068 net optional munin_1.4.2-2_all.deb
fd2d576ac3b8265018da1d27290b1f2d 360328 net optional munin-node_1.4.2-2_all.deb
02460572eddecf5d1357ce3b33c281b6 111192 net optional
munin-plugins-extra_1.4.2-2_all.deb
48adcd223710f9cfee8887547a478dcd 119986 net optional
munin-java-plugins_1.4.2-2_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iD8DBQFLMysVUHLQNqxYNSARAvkcAKCgDsNco7sBmp+QcCKTGnqdVuV6eQCgugnp
Zk6cfm6pDu3RK0M+4tY5Z8A=
=yiQ/
-----END PGP SIGNATURE-----
--- End Message ---
