From 3a37c5e96a5084b334879fd48d8caeff9069ee67 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 6 Jan 2024 18:05:34 -0600 Subject: [PATCH] Update dsmon.sh --- dsmon.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dsmon.sh b/dsmon.sh index 2c49480..e9d2b5a 100755 --- a/dsmon.sh +++ b/dsmon.sh @@ -396,13 +396,13 @@ GETCRONTABS(){ for hostid in "${!host_ip[@]}"; do # echo -e "${idsST[Bold]}${idsCL[LightCyan]} ${host_name[$hostid]} - ${host_ip[$hostid]}${idsCL[Default]}${idsST[Reset]}" - # checkhost=$(CHECK_HOST ${host_ip[$hostid]}) - # if [ "${checkhost}" != "false" ]; then - echo -e "${idsST[Bold]}${idsCL[LightCyan]} ${host_name[$hostid]} - Gathering Crontabs ... ${idsCL[Default]}${idsST[Reset]}" + checkhost=$(CHECK_HOST ${host_ip[$hostid]}) + if [ "${checkhost}" != "false" ]; then + echo -en "${idsST[Bold]}${idsCL[LightCyan]} ${host_name[$hostid]} - Gathering Crontabs ... ${idsCL[Default]}${idsST[Reset]}" ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 -t root@${host_ip[$hostid]} dsmon get-crontab ${rtpsswd} & - # else - # echo -e "${idsST[Bold]}${idsCL[Red]} ${host_name[$hostid]} - Timeout${idsCL[Default]}${idsST[Reset]}" - # fi + else + echo -e "${idsST[Bold]}${idsCL[Red]} ${host_name[$hostid]} - Timeout${idsCL[Default]}${idsST[Reset]}" + fi done echo @@ -422,15 +422,15 @@ GETCRONTAB(){ while read host hostname; do if [ "${host}" != "host" ]; then crontab -l | sshpass -p${1} ssh -o 'StrictHostKeyChecking no' nm_crontab_user@${nmip} "cat > ${DS_CRONTAB_FOLDER}/${host}.crontab" - # echo -e "${idsCL[Green]} done${idsCL[Default]}" + echo -e "${idsCL[Green]} done${idsCL[Default]}" fi done <<< $(MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -u sysmoninsert -e "SELECT host,hostname FROM servermonitor.hosts WHERE id=${SERVERMON_ID}") fi # [ "${nmip}" != "" ] && crontab -l | sshpass -p${1} ssh -o 'StrictHostKeyChecking no' nm_crontab_user@${nmip} "cat > ${DS_CRONTAB_FOLDER}/${hostname}.crontab" - # else - # echo "No user password specified" + else + echo "No user password specified" fi } FIXCRONTAB(){