diff --git a/inc/status.inc b/inc/status.inc index 906754a3..ff2a2590 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -2,7 +2,7 @@ STATUS(){ start=$(date +%s) log_start=$(date "+%Y-%m-%d %H:%M:%S") - SCAN_THREADS=8 + SCAN_THREADS=10 if [ "${1}" != "" ] && [ "${NM_NODETYPES[${1^^}]}" != "" ]; then ntss=${1^^} @@ -32,7 +32,6 @@ STATUS(){ ############################ ## REPLICATION CHECK SETUP ############################ - [ "${NM_DISABLE_REPL_CHECK}" != "true" ] && ([ ! -f ${NM_TMPFOLDER}/.replcheck ] || [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/.replcheck)) -ge 300 ]) && REPLRUN=1 || REPLRUN=0 [ ${REPLRUN} -eq 1 ] && touch ${NM_TMPFOLDER}/.replcheck # if [ "${STATUS_ACTION}" == "report" ] || [ "${STATUS_ACTION}" == "repl" ] || [ "${STATUS_ACTION}" == "check" ] || [ "${STATUS_ACTION}" == "" ]; then @@ -71,7 +70,13 @@ STATUS(){ done [ "${STATUS_ACTION}" != "check" ] && echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}" fi + + if [ "${STATUS_ACTION}" == "" ] || [ "${STATUS_ACTION}" == "report" ] || [ "${STATUS_ACTION}" == "services" ] || [ "${STATUS_ACTION}" == "dockers" ] || [ "${STATUS_ACTION}" == "check" ] || [ "${STATUS_ACTION}" == "all" ]; then + + ############################ + ## SERVICE/DOCKER CHECK SETUP + ############################ MSG="Starting processes to collect node service & docker info" c=0; cw=${LD_CW}; spc=''; spc1=${cw}-${#MSG}; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done [ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[LightCyan]}${MSG}${spc}: " @@ -84,7 +89,6 @@ STATUS(){ ######################## ## LOCALHOST CHECK ######################## - if [ ! -z ${LOCAL_SERVICES+x} ] && [ "${STATUS_ACTION}" != "dockers" ] && [ "${STATUS_ACTION}" != "services" ] && [ "${ntss}" == "" ]; 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') @@ -155,7 +159,6 @@ STATUS(){ ################################### ## NODE SERVICE AND DOCKER CHECK ################################### - nc_count=0; completed=false; scanstart=$(date +%s) until [ "${completed}" == "true" ]; do for nodestatus in ${STATUSRUN_TMPFOLDER}/status-check.*.done; do @@ -196,7 +199,6 @@ STATUS(){ ######################## ## REPLICATION CHECK ######################## - # if [ "${STATUS_ACTION}" == "report" ] || [ "${STATUS_ACTION}" == "repl" ] || [ "${STATUS_ACTION}" == "check" ] || [ "${STATUS_ACTION}" == "" ]; then if [ "${STATUS_ACTION}" == "repl" ] || [ "${STATUS_ACTION}" == "" ] || ([ "${STATUS_ACTION}" == "report" ] && [ ${REPLRUN} -eq 1 ]); then if [ "${STATUS_ACTION}" != "check" ]; then @@ -286,6 +288,7 @@ It was down for $(SHOW_TIME $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${ done fi done + ########################## # REMOVE REPL CHECK FILES ########################## @@ -377,54 +380,12 @@ It was down for $(SHOW_TIME $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${ [ "${STATUS_ACTION}" != "check" ] && echo -e "${idsCL[${fs_status_color}]}${fsdsp} ${idsCL[Default]}" fi done - - # for partition in "${partitions3[@]}"; do - # if [ "${partition}" != "udev" ] && [ "${partition}" != "/dev/sda1" ]; then - # pname=`echo "${partition}" | awk -F'/' ' { print $NF } '` >/dev/null 2>&1 - # pname=${pname#*vg-} - # if [ "${STATUS_ACTION}" != "check" ]; then - # c=0; cw=20; spc='' - # spc1=${cw}-${#pname} - # until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done - # echo -en " ${pname}$spc: " - # fi - # - # # [[ "${partition}" == *"root"* ]] && prt="/" || prt=${partition} - # # freespace=`${NCMD} df -hPBM ${prt} | awk '{print $4}' |tail -1|sed 's/M$//g'` >/dev/null 2>&1 - # - # if [ "${freespace}" -le "1000" ]; then - # fs_status='error' - # fs_status_color='Red' - # SENDNOTICE "Free Space Critical: '${NM_HOSTNAMES[${nip}]}[${nip}]'" "${partition} : ${freespace} MB free" 1 - # - # elif [ "${freespace}" -le "5000" ]; then - # fs_status='warn' - # fs_status_color='Yellow' - # SENDNOTICE "Free Space Warning: '${NM_HOSTNAMES[${nip}]}[${nip}]'" "${partition} : ${freespace} MB free" - # - # else - # fs_status='' - # fs_status_color='Green' - # - # fi - # if [ "${STATUS_ACTION}" != "check" ]; then - # if [[ ${freespace} -gt 1000 ]]; then - # fsgb=$(bc <<< "scale=2; ${freespace}/1000") - # fsdsp="${fsgb} GB" - # else - # fsdsp="${freespace} MB" - # fi - # echo -e "${idsCL[${fs_status_color}]}${fsdsp} ${idsCL[Default]}" - # - # fi - # fi - # done - echo done done fi ######################## + if [ "${STATUS_ACTION}" != "check" ]; then echo if [ -z ${NMG_ACTION} ] || [ "${NMG_ACTION}" == "gui" ]; then