Merge branch 'master' of https://github.com/munin-monitoring/contrib

README.md

@@ -1,5 +1,35 @@
-This is the repository for all user contributed stuff
+# This is the repository for all user contributed stuff
 
-* contrib/tools/ is for 3rd-party tools. It usually serves as an incubator of trunk/contrib.
-* contrib/plugins/ is for 3rd-party plugins. It will serve as the backend of exchange.munin-monitoring.org when it is operational again.
-* contrib/templates/ is for 3rd-party templates. Feel free to update templates, or even to create new ones. Bonus points for mobile-friendly ones :)
+## contrib/plugins/ - 3rd-party plugins
+
+**This is usually where you want to begin your journey.**
+
+Here you'll find all the plugins coming from http://exchange.munin-monitoring.org/. 
+That web site is for the time being disabled, new updates are done here.
+
+If a dedicated website comes back alive, its plugin backend will be this git repo.
+
+## contrib/templates/ -  3rd-party templates
+
+Feel free to update templates here, or even to create new ones.
+
+Bonus points for mobile-friendly ones :)
+
+Note that the one named `official` is a loose-synced copy of the one in SVN trunk. 
+It should serves as a base for small editions that can be resynced in SVN trunk, so for that : 
+
+* don't copy the whole template
+* directly edit files in this directory
+
+## contrib/tools/ - 3rd-party tools
+
+Here, you can put just any kind of tool. Please use this directory instead of a random place on the internet. 
+It makes things way more easy to search for others.
+
+And, it serves as an incubator of SVN `trunk/contrib` :-)
+
+## Notes to contributors
+
+We like to have ''elementary'' commits (a good rationale is : one per Changelog entry), as it is much easier to manage for reviewing. Debugging is also usually easier that way.
+
+So please **don't** be afraid to make as many commits as needed.

plugins/disk/lvm_snap_used

@@ -14,17 +14,19 @@
 #%# capabilities=autoconf
 # 
 # 2011/05/20 - pmoranga - initial version
+#
+# 2012/01/27 - Sébastien Gross
+#            - Fix lvdisplay path
+
+lvdisplay=$(which lvdisplay)
 
 if [ "$1" = "autoconf" ]; then
-        /usr/sbin/lvdisplay 2>/dev/null >/dev/null
-        if [ $? -eq 0 ]
-        then
-          echo yes
-          exit 0
-        else
-                echo "no lvdisplay found"
-        fi
-        exit 1
+    if test -n "${lvdisplay}"; then
+        echo yes
+        exit 0
+    fi
+    echo "no lvdisplay found"
+    exit 1
 fi
 
 
@@ -34,9 +36,9 @@ if [ "$1" = "config" ]; then
 	echo 'graph_vlabel %'
 	echo 'graph_category disk'
 	echo 'graph_args --base 100'
-        /usr/sbin/lvdisplay -C | awk '$3 ~ /^s/{print $1".label "$1" snapshot of "$5} '
+         ${lvdisplay} -C | awk '$3 ~ /^s/{print $1".label "$1" snapshot of "$5} '
 	exit 0
 fi
 
 
-/usr/sbin/lvdisplay -C | awk '$3 ~ /^s/{print $1".value",int($6)} '
+${lvdisplay} -C | awk '$3 ~ /^s/{print $1".value",int($6)} '

plugins/ejabberd/ejabberd_

@@ -43,7 +43,6 @@ shopt -s extglob
 
 EJCTL=$(which ejabberdctl)
 EJVER=$($EJCTL status | awk '/^ejabberd / {print $2}')
-MUNIN_DEBUG=${MUNIN_DEBUG:-0}
 
 if [ "$1" == "autoconf" ]; then
         if [ -x $EJCTL > /dev/null ]; then