voltron/dsmon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update dsmon.sh

Browse Source
This commit is contained in:
David Schroeder
2024-02-19 22:09:03 -06:00
parent a01ba341fe
commit 213ca59683
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dsmon.sh
View File

@@ -58,7 +58,7 @@ RUN(){
QRY="USE servermonitor; INSERT INTO sysinfo (\`host\`, \`entry\`, \`value\`) VALUES ('${SERVERMON_ID}','hdd','${DRIVE_INFO[@]}');"
# echo $QRY
MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -u sysmoninsert -e "${QRY}"
MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 6033 -u sysmoninsert -e "${QRY}"
elif [ "${1}" = "sysXXX" ]; then
@@ -66,7 +66,7 @@ RUN(){
CPU=$(top -bn1 | grep load | awk '{printf "%.2f\t\t\n", $(NF-2)}')
QRY="USE servermonitor; INSERT INTO sysinfo (\`host\`, \`entry\`, \`value\`) VALUES ('${SERVERMON_ID}','sys','${CPU// /};${MEMORY}');"
MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -u sysmoninsert -e "${QRY}"
MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 6033 -u sysmoninsert -e "${QRY}"
fi
SERVERHOSTNAME=(`hostname`)
@@ -88,7 +88,7 @@ RUN(){
done
QRY="USE servermonitor; UPDATE hosts SET ip='${SERVERIPS// /}',hostname='${SERVERHOSTNAME}',limits='${thresholdlog[@]}' WHERE id='${SERVERMON_ID}';"
MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -u sysmoninsert -e "${QRY}"
MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 6033 -u sysmoninsert -e "${QRY}"
fi
@@ -128,8 +128,8 @@ CHECK(){
host_ids[$hostname]=$hostid
hostnames_sort+=("$hostname")
fi
done <<< $(MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0")
# done <<< $(MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 AND host LIKE '%WAN%'")
done <<< $(MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 6033 -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0")
# done <<< $(MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 6033 -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 AND host LIKE '%WAN%'")
IFS=$'\n' hostnames_sort=($(sort <<<"${hostnames_sort[*]}")); unset IFS
[ "${1}" != "report" ] && echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}"
@@ -325,7 +325,7 @@ SETUPSSH(){
host_ip[${hostid}]=$(echo $hostip | cut -d ";" -f1)
host_name[${hostid}]=$hostname
fi
done <<< $(MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0")
done <<< $(MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 6033 -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0")
for hostid in "${!host_ip[@]}"; do
checkhost=$(CHECK_HOST ${host_ip[$hostid]})
@@ -353,7 +353,7 @@ RUNCMD(){
RUNCMD_SUB $(echo ${hostip} | cut -d ";" -f1) ${hostname} ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ${11} ${12} ${13} ${14} ${15} ${16} ${17} ${18} ${19} ${20} &
((ncount++))
fi
done <<< $(MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 ORDER BY host ASC")
done <<< $(MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 6033 -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 ORDER BY host ASC")
nc_count=0; lcount=0; completed=false
until [ "${completed}" == "true" ]; do
@@ -416,7 +416,7 @@ UPDATENODES(){
ssh -tq -o ConnectTimeout=3 -o ConnectionAttempts=1 root@$(echo $hostip | cut -d ";" -f1) "dsmon update"
echo
fi
done <<< $(MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 ORDER BY host ASC")
done <<< $(MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 6033 -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 ORDER BY host ASC")
echo
end=`date +%s`
@@ -467,9 +467,8 @@ GETCRONTABS(){
# 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]}"
# echo -e "${idsST[Bold]}${idsCL[LightCyan]} ${host_name[$hostid]} - Gathering Crontabs ... ${idsCL[Default]}${idsST[Reset]}"
ssh -tq -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${host_ip[$hostid]} dsmon get-crontab ${rtpsswd}
echo -e "done\n\n"
# else
# echo -e "${idsST[Bold]}${idsCL[Red]} ${host_name[$hostid]} - Timeout${idsCL[Default]}${idsST[Reset]}"
# fi
@@ -487,7 +486,6 @@ GETCRONTAB(){
if ! command -v sshpass > /dev/null; then
apt install -y sshpass > /dev/null 2>&1
fi
echo -e "${SERVERMON_ID}) ${host} : ${hostname}\nmysqlip=${mysqlip}\n"
if [ "${nmip}" != "" ]; then
while read host hostname; do
if [ "${host}" != "host" ] && [ "${host}" != "" ]; then