Merge pull request #970 from Sephtex/Sephtex/969/zfs_list_plugin_wot_…

…working_with_dash

Add support for dash in zfs_list

plugins/zfs/zfs_list

@@ -16,6 +16,8 @@
 #
 #%# family=auto
 
+. "$MUNIN_LIBDIR/plugins/plugin.sh"
+
 need_multigraph()
 
 if [ "$1" = "autoconf" ]; then
@@ -31,7 +33,7 @@ fi
 if [ "$1" = "config" ]; then
 	for i in `zfs list -Hp | awk '{print $1}'`; do
 		values=( $(zfs get -p usedbydataset,usedbychildren,usedbysnapshots,usedbyrefreservation,available,quota $i | awk 'BEGIN {total=0;} { if( NR==1 ) next; } !/quota/ {total=total+$3;} {print $3} END{print total;}') )
-		fsname=`echo $i | sed 's/\//__/g'`
+		fsname=$(clean_fieldname $(echo "$i" | sed 's/\//__/g'))
 
 		echo <<EOF "multigraph zfs_list_$fsname
 graph_title $fsname usage
@@ -75,9 +77,9 @@ fi
 
 for i in `zfs list -Hp | awk '{print $1}'`; do
 	values=( $(zfs get -p usedbydataset,usedbychildren,usedbysnapshots,usedbyrefreservation,available,quota $i | awk 'BEGIN {total=0;} { if( NR==1 ) next; } !/quota/ {total=total+$3;} {print $3} END{print total;}') )
-	fsname=`echo $i | sed 's/\//__/g'`
+	fsname=$(clean_fieldname $(echo "$i" | sed 's/\//__/g'))
 
-echo <<EOF "multigraph zfs_list_$fsname
+	echo <<EOF "multigraph zfs_list_$fsname
 usedbydataset.value ${values[0]}
 usedbysnapshots.value ${values[2]}
 usedbychildren.value ${values[1]}