diff --git a/plugins/cpu b/plugins/cpu index 9aabd37..a81e9ec 100644 --- a/plugins/cpu +++ b/plugins/cpu @@ -5,11 +5,11 @@ config_cpu() { fi # shellcheck disable=SC2126 NCPU=$(grep '^cpu[0-9]\+ ' /proc/stat | wc -l) - PERCENT=$(($NCPU * 100)) + PERCENT=$((NCPU * 100)) graphlimit=$PERCENT - SYSWARNING=$(($PERCENT * 30 / 100)) - SYSCRITICAL=$(($PERCENT * 50 / 100)) - USRWARNING=$(($PERCENT * 80 / 100)) + SYSWARNING=$((PERCENT * 30 / 100)) + SYSCRITICAL=$((PERCENT * 50 / 100)) + USRWARNING=$((PERCENT * 80 / 100)) echo "graph_title CPU usage" echo "graph_order system user nice idle $extinfo" | sed 's/ $//' echo "graph_args --base 1000 -r --lower-limit 0 --upper-limit $graphlimit" diff --git a/plugins/irqstats b/plugins/irqstats index efac86b..5d285a4 100644 --- a/plugins/irqstats +++ b/plugins/irqstats @@ -8,7 +8,7 @@ graph_category system" for ID in $(echo "$IINFO" | cut -d: -f1) do 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 echo "i$ID.label $ID" else @@ -25,11 +25,11 @@ fetch_irqstats() { for ID in $(echo "$IINFO" | cut -d: -f1) do 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 for VAL in $VALS; do - VALUE=$(($VALUE + $VAL)) + VALUE=$((VALUE + VAL)) done echo "i$ID.value $VALUE" done diff --git a/plugins/memory b/plugins/memory index e24b040..bb40b27 100644 --- a/plugins/memory +++ b/plugins/memory @@ -67,7 +67,7 @@ config_memory() { if [ "$COMMITTEDAS" != "" ]; then echo "committed.label committed" 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." fi if [ "$MAPPED" != "" ]; then @@ -131,55 +131,55 @@ fetch_memory() { INACTDIRTY=$(echo "$MINFO" | grep "^Inact_dirty:" | cut -d\ -f2) INACTLAUNDRY=$(echo "$MINFO" | grep "^Inact_laundry:" | cut -d\ -f2) INACTCLEAN=$(echo "$MINFO" | grep "^Inact_clean:" | cut -d\ -f2) - APPS=$(($MEMTOTAL - $MEMFREE - $BUFFERS - $CACHED)) - SWAP=$(($SWAP_TOTAL - $SWAP_FREE)) - echo "buffers.value" $(($BUFFERS * 1024)) - echo "swap.value" $(($SWAP * 1024)) - echo "cached.value" $(($CACHED * 1024)) - echo "free.value" $(($MEMFREE * 1024)) + APPS=$((MEMTOTAL - MEMFREE - BUFFERS - CACHED)) + SWAP=$((SWAP_TOTAL - SWAP_FREE)) + echo "buffers.value" $((BUFFERS * 1024)) + echo "swap.value" $((SWAP * 1024)) + echo "cached.value" $((CACHED * 1024)) + echo "free.value" $((MEMFREE * 1024)) if [ "$SLAB" != "" ]; then - echo "slab.value" $(($SLAB * 1024)) - APPS=$(($APPS - $SLAB)) + echo "slab.value" $((SLAB * 1024)) + APPS=$((APPS - SLAB)) fi if [ "$SWAPCACHED" != "" ]; then - echo "swap_cache.value" $(($SWAPCACHED * 1024)) - APPS=$(($APPS - $SWAPCACHED)) + echo "swap_cache.value" $((SWAPCACHED * 1024)) + APPS=$((APPS - SWAPCACHED)) fi if [ "$PAGETABLES" != "" ]; then - echo "page_tables.value" $(($PAGETABLES * 1024)) - APPS=$(($APPS - $PAGETABLES)) + echo "page_tables.value" $((PAGETABLES * 1024)) + APPS=$((APPS - PAGETABLES)) fi if [ "$VMALLOCUSED" != "" ]; then - echo "vmalloc_used.value" $(($VMALLOCUSED * 1024)) - APPS=$(($APPS - $VMALLOCUSED)) + echo "vmalloc_used.value" $((VMALLOCUSED * 1024)) + APPS=$((APPS - VMALLOCUSED)) fi if [ "$COMMITTEDAS" != "" ]; then - echo "committed.value" $(($COMMITTEDAS * 1024)) + echo "committed.value" $((COMMITTEDAS * 1024)) fi if [ "$MAPPED" != "" ]; then - echo "mapped.value" $(($MAPPED * 1024)) + echo "mapped.value" $((MAPPED * 1024)) fi if [ "$ACTIVE" != "" ]; then - echo "active.value" $(($ACTIVE * 1024)) + echo "active.value" $((ACTIVE * 1024)) fi if [ "$ACTIVEANON" != "" ]; then - echo "active_anon.value" $(($ACTIVEANON * 1024)) + echo "active_anon.value" $((ACTIVEANON * 1024)) fi if [ "$ACTIVECACHE" != "" ]; then - echo "active_cache.value" $(($ACTIVECACHE * 1024)) + echo "active_cache.value" $((ACTIVECACHE * 1024)) fi if [ "$INACTIVE" != "" ]; then - echo "inactive.value" $(($INACTIVE * 1024)) + echo "inactive.value" $((INACTIVE * 1024)) fi if [ "$INACTDIRTY" != "" ]; then - echo "inact_dirty.value" $(($INACTDIRTY * 1024)) + echo "inact_dirty.value" $((INACTDIRTY * 1024)) fi if [ "$INACTLAUNDRY" != "" ]; then - echo "inact_laundry.value" $(($INACTLAUNDRY * 1024)) + echo "inact_laundry.value" $((INACTLAUNDRY * 1024)) fi if [ "$INACTCLEAN" != "" ]; then - echo "inact_clean.value" $(($INACTCLEAN * 1024)) + echo "inact_clean.value" $((INACTCLEAN * 1024)) fi - echo "apps.value" $(($APPS * 1024)) + echo "apps.value" $((APPS * 1024)) }