Mirror
/
muninlite
mirror of https://github.com/munin-monitoring/muninlite.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify arithemtic shell expressions 

Variable names within arithmetic expressions are evaluated even without
the '$' prefix.
This commit is contained in:
Lars Kruse 2020-02-08 03:43:51 +01:00
parent dc242d3631
commit 5190244c92
3 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/cpu
View File

@ -5,11 +5,11 @@ config_cpu() {
fi fi
# shellcheck disable=SC2126 # shellcheck disable=SC2126
NCPU=$(grep '^cpu[0-9]\+ ' /proc/stat | wc -l) NCPU=$(grep '^cpu[0-9]\+ ' /proc/stat | wc -l)
PERCENT=$(($NCPU * 100)) PERCENT=$((NCPU * 100))
graphlimit=$PERCENT graphlimit=$PERCENT
SYSWARNING=$(($PERCENT * 30 / 100)) SYSWARNING=$((PERCENT * 30 / 100))
SYSCRITICAL=$(($PERCENT * 50 / 100)) SYSCRITICAL=$((PERCENT * 50 / 100))
USRWARNING=$(($PERCENT * 80 / 100)) USRWARNING=$((PERCENT * 80 / 100))
echo "graph_title CPU usage" echo "graph_title CPU usage"
echo "graph_order system user nice idle $extinfo" | sed 's/ $//' echo "graph_order system user nice idle $extinfo" | sed 's/ $//'
echo "graph_args --base 1000 -r --lower-limit 0 --upper-limit $graphlimit" echo "graph_args --base 1000 -r --lower-limit 0 --upper-limit $graphlimit"

6
plugins/irqstats
View File

@ -8,7 +8,7 @@ graph_category system"
for ID in $(echo "$IINFO" | cut -d: -f1) for ID in $(echo "$IINFO" | cut -d: -f1)
do do
IDL=$(echo "$IINFO" | grep "^$ID:") IDL=$(echo "$IINFO" | grep "^$ID:")
INFO=$(eval "echo \"$IDL\" | cut -d\ -f$((3+$CPUS))-") INFO=$(eval "echo \"$IDL\" | cut -d ' ' -f '$((3 + CPUS))-'")
if [ "$INFO" = "" ]; then if [ "$INFO" = "" ]; then
echo "i$ID.label $ID" echo "i$ID.label $ID"
else else
@ -25,11 +25,11 @@ fetch_irqstats() {
for ID in $(echo "$IINFO" | cut -d: -f1) for ID in $(echo "$IINFO" | cut -d: -f1)
do do
IDL=$(echo "$IINFO" | grep "^$ID:") IDL=$(echo "$IINFO" | grep "^$ID:")
VALS=$(eval "echo \"$IDL\" | cut -d\ -f2-$((1+$CPUS))") VALS=$(eval "echo \"$IDL\" | cut -d ' ' -f '2-$((1 + CPUS))'")
VALUE=0 VALUE=0
for VAL in $VALS; for VAL in $VALS;
do do
VALUE=$(($VALUE + $VAL)) VALUE=$((VALUE + VAL))
done done
echo "i$ID.value $VALUE" echo "i$ID.value $VALUE"
done done

50
plugins/memory
View File

@ -67,7 +67,7 @@ config_memory() {
if [ "$COMMITTEDAS" != "" ]; then if [ "$COMMITTEDAS" != "" ]; then
echo "committed.label committed" echo "committed.label committed"
echo "committed.draw LINE2" echo "committed.draw LINE2"
echo "committed.warn" $(($SWAPTOTAL + $MEMTOTAL)) echo "committed.warn" $((SWAPTOTAL + MEMTOTAL))
echo "committed.info The amount of memory that would be used if all the memory that's been allocated were to be used." echo "committed.info The amount of memory that would be used if all the memory that's been allocated were to be used."
fi fi
if [ "$MAPPED" != "" ]; then if [ "$MAPPED" != "" ]; then
@ -131,55 +131,55 @@ fetch_memory() {
INACTDIRTY=$(echo "$MINFO" | grep "^Inact_dirty:" | cut -d\ -f2) INACTDIRTY=$(echo "$MINFO" | grep "^Inact_dirty:" | cut -d\ -f2)
INACTLAUNDRY=$(echo "$MINFO" | grep "^Inact_laundry:" | cut -d\ -f2) INACTLAUNDRY=$(echo "$MINFO" | grep "^Inact_laundry:" | cut -d\ -f2)
INACTCLEAN=$(echo "$MINFO" | grep "^Inact_clean:" | cut -d\ -f2) INACTCLEAN=$(echo "$MINFO" | grep "^Inact_clean:" | cut -d\ -f2)
APPS=$(($MEMTOTAL - $MEMFREE - $BUFFERS - $CACHED)) APPS=$((MEMTOTAL - MEMFREE - BUFFERS - CACHED))
SWAP=$(($SWAP_TOTAL - $SWAP_FREE)) SWAP=$((SWAP_TOTAL - SWAP_FREE))
echo "buffers.value" $(($BUFFERS * 1024)) echo "buffers.value" $((BUFFERS * 1024))
echo "swap.value" $(($SWAP * 1024)) echo "swap.value" $((SWAP * 1024))
echo "cached.value" $(($CACHED * 1024)) echo "cached.value" $((CACHED * 1024))
echo "free.value" $(($MEMFREE * 1024)) echo "free.value" $((MEMFREE * 1024))
if [ "$SLAB" != "" ]; then if [ "$SLAB" != "" ]; then
echo "slab.value" $(($SLAB * 1024)) echo "slab.value" $((SLAB * 1024))
APPS=$(($APPS - $SLAB)) APPS=$((APPS - SLAB))
fi fi
if [ "$SWAPCACHED" != "" ]; then if [ "$SWAPCACHED" != "" ]; then
echo "swap_cache.value" $(($SWAPCACHED * 1024)) echo "swap_cache.value" $((SWAPCACHED * 1024))
APPS=$(($APPS - $SWAPCACHED)) APPS=$((APPS - SWAPCACHED))
fi fi
if [ "$PAGETABLES" != "" ]; then if [ "$PAGETABLES" != "" ]; then
echo "page_tables.value" $(($PAGETABLES * 1024)) echo "page_tables.value" $((PAGETABLES * 1024))
APPS=$(($APPS - $PAGETABLES)) APPS=$((APPS - PAGETABLES))
fi fi
if [ "$VMALLOCUSED" != "" ]; then if [ "$VMALLOCUSED" != "" ]; then
echo "vmalloc_used.value" $(($VMALLOCUSED * 1024)) echo "vmalloc_used.value" $((VMALLOCUSED * 1024))
APPS=$(($APPS - $VMALLOCUSED)) APPS=$((APPS - VMALLOCUSED))
fi fi
if [ "$COMMITTEDAS" != "" ]; then if [ "$COMMITTEDAS" != "" ]; then
echo "committed.value" $(($COMMITTEDAS * 1024)) echo "committed.value" $((COMMITTEDAS * 1024))
fi fi
if [ "$MAPPED" != "" ]; then if [ "$MAPPED" != "" ]; then
echo "mapped.value" $(($MAPPED * 1024)) echo "mapped.value" $((MAPPED * 1024))
fi fi
if [ "$ACTIVE" != "" ]; then if [ "$ACTIVE" != "" ]; then
echo "active.value" $(($ACTIVE * 1024)) echo "active.value" $((ACTIVE * 1024))
fi fi
if [ "$ACTIVEANON" != "" ]; then if [ "$ACTIVEANON" != "" ]; then
echo "active_anon.value" $(($ACTIVEANON * 1024)) echo "active_anon.value" $((ACTIVEANON * 1024))
fi fi
if [ "$ACTIVECACHE" != "" ]; then if [ "$ACTIVECACHE" != "" ]; then
echo "active_cache.value" $(($ACTIVECACHE * 1024)) echo "active_cache.value" $((ACTIVECACHE * 1024))
fi fi
if [ "$INACTIVE" != "" ]; then if [ "$INACTIVE" != "" ]; then
echo "inactive.value" $(($INACTIVE * 1024)) echo "inactive.value" $((INACTIVE * 1024))
fi fi
if [ "$INACTDIRTY" != "" ]; then if [ "$INACTDIRTY" != "" ]; then
echo "inact_dirty.value" $(($INACTDIRTY * 1024)) echo "inact_dirty.value" $((INACTDIRTY * 1024))
fi fi
if [ "$INACTLAUNDRY" != "" ]; then if [ "$INACTLAUNDRY" != "" ]; then
echo "inact_laundry.value" $(($INACTLAUNDRY * 1024)) echo "inact_laundry.value" $((INACTLAUNDRY * 1024))
fi fi
if [ "$INACTCLEAN" != "" ]; then if [ "$INACTCLEAN" != "" ]; then
echo "inact_clean.value" $(($INACTCLEAN * 1024)) echo "inact_clean.value" $((INACTCLEAN * 1024))
fi fi
echo "apps.value" $(($APPS * 1024)) echo "apps.value" $((APPS * 1024))
} }