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 for pullreq #867

Browse source
This commit is contained in:
K.Cima 2017-08-14 12:04:00 +09:00
parent 3f0af3802a
commit b2acd0514d
1 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

30
plugins/zfs/zpool_capacity
View file

@ -68,7 +68,7 @@ zfs_cmd=/sbin/zfs
# Functions # Functions
preconfig() { preconfig() {
local func=$1 local func="$1"
local p c local p c
# data_attr format: field type draw label # data_attr format: field type draw label
@ -131,7 +131,7 @@ preconfig() {
} }
do_config() { do_config() {
local func=$1 local func="$1"
local label_max_length=45 local label_max_length=45
local field type draw label local field type draw label
@ -162,16 +162,16 @@ do_config() {
} }
get_stats() { get_stats() {
local func=$1 local func="$1"
case $func in case $func in
capacity) capacity)
$zpool_cmd list -H -o name,capacity | sed 's/%$//' "$zpool_cmd" list -H -o name,capacity | sed 's/%$//'
;; ;;
allocated) allocated)
( $zpool_cmd list -H -o name,allocated \ ( "$zpool_cmd" list -H -o name,allocated \
| awk '{ print $1"_allocated", $2 }' | awk '{ print $1"_allocated", $2 }'
$zpool_cmd list -H -o name,size \ "$zpool_cmd" list -H -o name,size \
| awk '{ print $1"_size", $2 }' | awk '{ print $1"_size", $2 }'
) \ ) \
| perl -ane ' | perl -ane '
@ -185,19 +185,27 @@ get_stats() {
# Note: ZFS supports up to 16EB. # Note: ZFS supports up to 16EB.
;; ;;
dedup) dedup)
$zpool_cmd list -H -o name,dedup \ "$zpool_cmd" list -H -o name,dedup \
| sed 's/x$//' \ | sed 's/x$//' \
| awk '{ print $1"_dedup", $2 }' | awk '{ print $1"_dedup", $2 }'
$zpool_cmd list -H -o name \ # example output:
| xargs $zfs_cmd get -H -o name,value compressratio \ # $ zpool list -H -o name,dedup
# rpool 1.00x
# ...
"$zpool_cmd" list -H -o name \
| xargs "$zfs_cmd" get -H -o name,value compressratio \
| sed 's/x$//' \ | sed 's/x$//' \
| awk '{ print $1"_compress", $2 }' | awk '{ print $1"_compress", $2 }'
# example output:
# $ zfs get -H -o name,value compressratio rpool
# rpool 1.00x
;; ;;
esac esac
} }
do_fetch() { do_fetch() {
local func=$1 local func="$1"
local zpool_stats field value local zpool_stats field value
# zpool_stats contains 'key value\n' # zpool_stats contains 'key value\n'
@ -225,7 +233,7 @@ autoconf() {
config() { config() {
local func local func
pool_list=$( $zpool_cmd list -H -o name ) pool_list=$( "$zpool_cmd" list -H -o name )
for func in $functions for func in $functions
do do