From bb9e5071dfccac46ec4874174598f4472a37cf2e Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Mon, 4 Dec 2023 20:02:02 -0600 Subject: [PATCH] Update status.inc --- inc/status.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/inc/status.inc b/inc/status.inc index 82aca99f..1447ba44 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -54,6 +54,8 @@ STATUS(){ ######################## if [ "${ST_ACTION}" = "" ] || [ "${ST_ACTION}" = "report" ] || [ "${ST_ACTION}" = "services" ] || [ "${ST_ACTION}" = "dockers" ] || [ "${ST_ACTION}" = "check" ]; then + cpu_usage=$(awk '{u=$2+$4; t=$2+$4+$5; if (NR==1){u1=u; t1=t;} else print ($2+$4-u1) * 100 / (t-t1) "%"; }' <(grep 'cpu ' /proc/stat) <(sleep 1;grep 'cpu ' /proc/stat) | sed -e 's/%//g') + if [ ! -z ${LOCAL_SERVICES+x} ] && [ "${ST_ACTION}" != "dockers" ]; then if [ "${ST_ACTION}" != "check" ]; then lip=${RUN_NODE_IP} @@ -62,7 +64,7 @@ STATUS(){ echo -en " ${idsST[Bold]}${idsCL[LightCyan]}${NODE_HOSTNAME} (${lip})${idsST[Reset]}" if ([ "${ST_ACTION}" == "report" ] && [ "${2}" == "email" ]) || [ "${ST_ACTION}" != "report" ]; then uptime=`uptime -p` - echo -e "${idsCL[LightCyan]} - ${uptime} ${idsCL[LightYellow]}- localhost${idsCL[Default]}" + echo -e "${idsCL[LightCyan]} - ${uptime} - ${idsCL[Yellow]}CPU: `IDS_NUMBER_FORMAT ${cpu_usage} 1`'%${idsCL[Default]}"${idsCL[Default]}" else echo -e "${idsCL[Default]}" fi @@ -194,7 +196,7 @@ STATUS(){ else uptime=$(${NCMD} uptime -p) fi - [ "${ST_ACTION}" != "check" ] && echo -e "\r\033[K ${idsST[Bold]}${idsCL[LightCyan]}${NM_HOSTNAMES[${nip}]} [${nip}]${idsST[Reset]}${idsCL[White]} - ${uptime} - ${idsCL[Yellow]}CPU: `IDS_NUMBER_FORMAT ${cpu_usage} 1`'% ${idsCL[LightYellow]}${LH}${idsCL[Default]}" + [ "${ST_ACTION}" != "check" ] && echo -e "\r\033[K ${idsST[Bold]}${idsCL[LightCyan]}${NM_HOSTNAMES[${nip}]} [${nip}]${idsST[Reset]}${idsCL[White]} - ${uptime} - ${idsCL[Yellow]}CPU: `IDS_NUMBER_FORMAT ${cpu_usage} 1`'%${idsCL[Default]}" else echo -e "${idsCL[Default]}" fi