diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 98146421..9d9cee3d 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -78,9 +78,13 @@ STATUS(){ fi for srvc in "${LOCAL_SERVICES[@]}"; do if [ "${ST_ACTION}" != "check" ]; then - c=0; cw=30; spc='' - spc1=${cw}-${#NM_SERVICES[${srvc}]} - until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done + if [ "${ST_ACTION}" != "report" ]; then + c=0; cw=30; spc='' + spc1=${cw}-${#NM_SERVICES[${srvc}]} + until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done + else + spc=' ' + fi echo -en " ${NM_SERVICES[${srvc}]}$spc: " fi @@ -167,9 +171,13 @@ STATUS(){ fi if [ ${NOGOCHK} = true ]; then if [ "${ST_ACTION}" != "check" ]; then - c=0; cw=30; spc='' - spc1=${cw}-${#NM_SERVICES[${srvc}]} - until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done + if [ "${ST_ACTION}" != "report" ]; then + c=0; cw=30; spc='' + spc1=${cw}-${#NM_SERVICES[${srvc}]} + until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done + else + spc=' ' + fi echo -en " ${NM_SERVICES[${srvc}]}$spc: " fi @@ -289,8 +297,14 @@ STATUS(){ # timeout=`date --date='20 seconds' +%s` for rcheck in "${!var2}"; do if [ "${ST_ACTION}" != "check" ]; then - c=0; cw=30; spc='' - spc1=${cw}-${#REPL_DESC[${rcheck}]} + + if [ "${ST_ACTION}" != "report" ]; then + c=0; cw=30; spc='' + spc1=${cw}-${#REPL_DESC[${rcheck}]} + until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done + else + spc=' ' + fi # echo "CHECK: ${NTYPE} - ${!PH} - ${REPL_CHECKS[${rcheck}]}" @@ -299,7 +313,7 @@ STATUS(){ # else timeout=`date --date='20 seconds' +%s` # fi - until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done + echo -en " ${REPL_DESC[${rcheck}]}${spc}: " else # if [ "${rcheck}" = "nextcloud-data" ] OR [ "${rcheck}" = "nextcloud-www" ]; then @@ -1847,7 +1861,7 @@ DOWNLIST(){ echo -e "${idsCL[LightGreen]}Current List of Items Down...${idsCL[Default]}" DIVIDER false yellow - echo -e "Down_Item Host Down_Since" + echo -e "Service/Host Host Down_Time" DIVIDER false yellow cw=30; cw2=48