Robot/contrib-munin
2
0
Fork 0
mirror of https://github.com/munin-monitoring/contrib.git synced 2018-11-08 00:59:34 +01:00
Code Issues Releases Wiki Activity

Revert "Added a L2ARC efficiency function, also some label consistency changes"

Browse Source 
This reverts commit 55ba113d2f.
This commit is contained in:
David Bjornsson 2012-02-24 14:42:21 +00:00
parent 55ba113d2f
commit 1617487802
1 changed files with 4 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
plugins/zfs/zfs_stats_
View File

@ -18,8 +18,6 @@
# cachehitdtype - Cache hit by data type # cachehitdtype - Cache hit by data type
# dmuprefetch - DMU prefetch # dmuprefetch - DMU prefetch
# utilization - ARC size breakdown # utilization - ARC size breakdown
# l2utilization - L2ARC size breakdown
# l2efficiency - L2ARC efficiency
# #
#%# family=auto #%# family=auto
@ -63,12 +61,6 @@ TARGET_SIZE=`$SYS kstat.zfs.misc.arcstats.c`
L2_SIZE=`$SYS kstat.zfs.misc.arcstats.l2_size` L2_SIZE=`$SYS kstat.zfs.misc.arcstats.l2_size`
L2_HDR_SIZE=`$SYS kstat.zfs.misc.arcstats.l2_hdr_size` L2_HDR_SIZE=`$SYS kstat.zfs.misc.arcstats.l2_hdr_size`
<<<<<<< HEAD
L2_HITS=`$SYS kstat.zfs.misc.arcstats.l2_hits`
L2_MISSES=`$SYS kstat.zfs.misc.arcstats.l2_misses`
=======
>>>>>>> 20cc0e049134bf8869a57163bd54672ea279b99f
# #
# Calculation macros # Calculation macros
@ -111,9 +103,6 @@ else
MFU_SIZE=`echo "$TARGET_SIZE-$MRU_SIZE" | $BC` MFU_SIZE=`echo "$TARGET_SIZE-$MRU_SIZE" | $BC`
fi fi
L2_ACCESSES_TOTAL=`echo "$L2_HITS+$L2_MISSES" | $BC`
L2_HIT_RATIO_PERC=`echo "scale=2 ; (100*$L2_HITS/$L2_ACCESSES_TOTAL)" | $BC`
L2_MISS_RATIO_PERC=`echo "scale=2 ; (100*$L2_MISSES/$L2_ACCESSES_TOTAL)" | $BC`
efficiency() { efficiency() {
if [ "$1" = "config" ]; then if [ "$1" = "config" ]; then
@ -122,8 +111,8 @@ efficiency() {
echo 'graph_vlabel %' echo 'graph_vlabel %'
echo 'graph_info This graph shows the ARC Efficiency' echo 'graph_info This graph shows the ARC Efficiency'
echo 'hits.label Hit Ratio' echo 'hits.label Cache Hit Ratio'
echo 'misses.label Miss Ratio' echo 'misses.label Cache Miss Ratio'
echo 'actual_hits.label Actual Hit Ratio' echo 'actual_hits.label Actual Hit Ratio'
echo 'data_demand_efficiency.label Data Demand Efficiency' echo 'data_demand_efficiency.label Data Demand Efficiency'
echo 'data_prefetch_efficiency.label Data Prefetch Efficiency' echo 'data_prefetch_efficiency.label Data Prefetch Efficiency'
@ -197,8 +186,8 @@ dmuprefetch() {
echo 'graph_vlabel %' echo 'graph_vlabel %'
echo 'graph_info This graph shows the DMU prefetch stats' echo 'graph_info This graph shows the DMU prefetch stats'
echo 'hits.label Hit Ratio' echo 'hits.label Hit percentage'
echo 'misses.label Miss Ratio' echo 'misses.label Miss percentage'
exit 0 exit 0
else else
@ -257,25 +246,6 @@ l2utilization() {
fi fi
} }
<<<<<<< HEAD
l2efficiency() {
if [ "$1" = "config" ]; then
echo 'graph_title ZFS L2ARC Efficiency'
echo 'graph_args -u 100'
echo 'graph_vlabel %'
echo 'graph_info This graph shows the L2ARC Efficiency'
echo 'l2_hits.label Hit Ratio'
echo 'l2_misses.label Miss Ratio'
else
echo 'l2_hits.value ' $L2_HIT_RATIO_PERC
echo 'l2_misses.value ' $L2_MISS_RATIO_PERC
fi
}
=======
>>>>>>> 20cc0e049134bf8869a57163bd54672ea279b99f
[ "$1" = "config" ] && echo "graph_category zfs" [ "$1" = "config" ] && echo "graph_category zfs"
case "$FUNCTION" in case "$FUNCTION" in
@ -297,10 +267,4 @@ case "$FUNCTION" in
l2utilization) l2utilization)
l2utilization $1 l2utilization $1
;; ;;
<<<<<<< HEAD
l2efficiency)
l2efficiency $1
;;
=======
>>>>>>> 20cc0e049134bf8869a57163bd54672ea279b99f
esac esac