diff --git a/defaults.inc b/defaults.inc index 152e01b..cb3f6d4 100755 --- a/defaults.inc +++ b/defaults.inc @@ -5,7 +5,7 @@ VERS=2.3.10-01062024 DS_FOLDER=/opt/idssys/dsmon DS_CRONTAB_FOLDER=/opt/idssys/nodemgmt/crontabs -noheader=" gettsip-node get-crontab update " +noheader=" gettsip-node get-crontab update report " if [ "${NM_NODEMANAGER}" != "" ]; then diff --git a/dsmon.sh b/dsmon.sh index 507eef0..6dbc15f 100755 --- a/dsmon.sh +++ b/dsmon.sh @@ -113,9 +113,11 @@ CHECK(){ idsST=('') fi - MSG="Determining hosts and preparing" - c=0; cw=${C_CW}; spc=''; spc1=$(expr ${cw} - ${#MSG}); until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done - echo -en "${idsCL[LightCyan]}${MSG}${spc}: " + if [ "${1}" != "report" ]; then + MSG="Determining hosts and preparing" + c=0; cw=${C_CW}; spc=''; spc1=$(expr ${cw} - ${#MSG}); until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done + echo -en "${idsCL[LightCyan]}${MSG}${spc}: " + fi while read hostid hostname hostip hostlimits; do if [ "$hostid" != "id" ]; then hostip=$(echo $hostip | cut -d ";" -f1) @@ -131,9 +133,11 @@ CHECK(){ IFS=$'\n' hostnames_sort=($(sort <<<"${hostnames_sort[*]}")); unset IFS echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}" - MSG="Starting jobs to collect host info" - c=0; cw=${C_CW}; spc=''; spc1=$(expr ${cw} - ${#MSG}); until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done - echo -en "${idsCL[LightCyan]}${MSG}${spc}: " + if [ "${1}" != "report" ]; then + MSG="Starting jobs to collect host info" + c=0; cw=${C_CW}; spc=''; spc1=$(expr ${cw} - ${#MSG}); until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done + echo -en "${idsCL[LightCyan]}${MSG}${spc}: " + fi #for hostid in "${!host_ip[@]}"; do for hostname in "${hostnames_sort[@]}"; do until [ $(ls /tmp/dscheck.*.running 2>/dev/null | wc -l) -lt 6 ]; do tmp=tmp; done