Mirrors/Munin-Contrib
1
0
Fork 0
mirror of https://github.com/munin-monitoring/contrib.git synced 2025-07-21 18:41:03 +00:00
Code Issues Releases Wiki Activity

fix - add clean_fieldname to make field name safe

Browse source 
* lvm_: only add clean_fieldname
 * lvm_snap_used
  * add clean_fieldname
  * force y-axis scale to 0-100 %
This commit is contained in:
Ken-ichi Mito 2015-05-18 00:20:31 +09:00
parent d42751c908
commit 1e2bbe775e
2 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
plugins/disk/lvm_
View file

@ -44,6 +44,9 @@ munin-node.
EOF EOF
. $MUNIN_LIBDIR/plugins/plugin.sh
if [ "$1" = "autoconf" ]; then if [ "$1" = "autoconf" ]; then
if ! command -v lvs >/dev/null; then if ! command -v lvs >/dev/null; then
echo "no (lvs not found)" echo "no (lvs not found)"
@ -64,7 +67,7 @@ fi
vg=`echo $0 | awk '{ sub(".*lvm_","",\$1); print \$1; }'` vg=`echo $0 | awk '{ sub(".*lvm_","",\$1); print \$1; }'`
clean_name() { clean_name() {
echo $1 | sed 's/[\/.-]/_/g' echo "$(clean_fieldname "$1")"
} }

21
plugins/disk/lvm_snap_used
View file

@ -18,6 +18,9 @@
# 2012/01/27 - Sébastien Gross # 2012/01/27 - Sébastien Gross
# - Fix lvdisplay path # - Fix lvdisplay path
. $MUNIN_LIBDIR/plugins/plugin.sh
lvdisplay=$(which lvdisplay) lvdisplay=$(which lvdisplay)
if [ "$1" = "autoconf" ]; then if [ "$1" = "autoconf" ]; then
@ -35,10 +38,20 @@ if [ "$1" = "config" ]; then
echo 'graph_title Allocated space for snapshot' echo 'graph_title Allocated space for snapshot'
echo 'graph_vlabel %' echo 'graph_vlabel %'
echo 'graph_category disk' echo 'graph_category disk'
echo 'graph_args --base 100' echo 'graph_args -l 0 -u 100 -r'
${lvdisplay} -C | awk '$3 ~ /^s/{print $1".label "$1" snapshot of "$5} '
exit 0
fi fi
${lvdisplay} -C | awk '$3 ~ /^s/{print $1".value",int($6)} ' ${lvdisplay} -C | awk '$3 ~ /^s/{print}' | while read line; do
name="$(echo $line | awk '{print $1}')"
id="$(clean_fieldname "$name")"
origin="$(echo $line | awk '{print $5}')"
origin="$(clean_fieldname "$origin")"
percent="$(echo $line | awk '{print $6}')"
if [ "$1" = "config" ]; then
echo "$id.label $name snapshot of $origin"
else
echo "$id.value $percent"
fi
done