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

update

Browse Source
This commit is contained in:
David Schroeder
2025-06-01 20:03:05 -05:00
parent 75d9dd28fa
commit e8fc8212b4
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
defaults.inc
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash
VERS=2.4.1-06012025
VERS=2.4.3-06012025
DS_FOLDER=/opt/idssys/dsmon
DS_CRONTAB_FOLDER=/opt/idssys/nodemgmt/crontabs
@@ -10,14 +10,14 @@ noheader=" gettsip-node get-crontabs get-crontab update report updatenodes runcm
[ "$(ip route | awk '/default/ { print $5 }')" == "link" ] && RNIP=$(ip addr show $(ip route | awk '/1 dev eth0/ { print $5; exit }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) ||
RNIP=$(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1)
mysqlcmd=mariadb
mysqlcmd="mariadb --skip-ssl"
if [ "${TAILSCALE}" == "true" ]; then
nmip=${NM_NODEMANAGER_TS}
mysql_conn="-h 100.100.5.6 -P 3307"
elif [ "${NM_NODEMANAGER}" != "" ]; then
nmip=${NM_NODEMANAGER}
if [[ "${RNIP}" == "10.6.1"* ]]; then
mysqlcmd=mysql
mysqlcmd="mysql"
mysql_conn="-h ${NM_SINGLESRVR_IP['MYSQL']}"
else
mysql_conn="-h ${NM_SINGLESRVR_IP['MYSQL']} -P 3307"

24
dsmon.sh
View File

@@ -50,7 +50,7 @@ RUN(){
QRY="USE servermonitor; INSERT INTO sysinfo (\`host\`, \`entry\`, \`value\`) VALUES ('${SERVERMON_ID}','hdd','${DRIVE_INFO[@]}');"
# echo $QRY
MYSQL_PWD="sysmoninsert" ${mysqlcmd} --skip-ssl ${mysql_conn} -u sysmoninsert -e "${QRY}"
MYSQL_PWD="sysmoninsert" ${mysqlcmd} ${mysql_conn} -u sysmoninsert -e "${QRY}"
elif [ "${1}" = "sys" ]; then
@@ -58,7 +58,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" ${mysqlcmd} --skip-ssl ${mysql_conn} -u sysmoninsert -e "${QRY}"
MYSQL_PWD="sysmoninsert" ${mysqlcmd} ${mysql_conn} -u sysmoninsert -e "${QRY}"
fi
SERVERHOSTNAME=(`hostname`)
@@ -80,7 +80,7 @@ RUN(){
done
QRY="USE servermonitor; UPDATE hosts SET ip='${SERVERIPS// /}',hostname='${SERVERHOSTNAME}',limits='${thresholdlog[@]}' WHERE id='${SERVERMON_ID}';"
MYSQL_PWD="sysmoninsert" ${mysqlcmd} --skip-ssl ${mysql_conn} -u sysmoninsert -e "${QRY}"
MYSQL_PWD="sysmoninsert" ${mysqlcmd} ${mysql_conn} -u sysmoninsert -e "${QRY}"
fi
@@ -120,8 +120,8 @@ CHECK(){
host_ids[$hostname]=$hostid
hostnames_sort+=("$hostname")
fi
done <<< $(MYSQL_PWD="sysmoninsert" ${mysqlcmd} --skip-ssl ${mysql_conn} -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0")
# done <<< $(MYSQL_PWD="sysmoninsert" ${mysqlcmd} --skip-ssl ${mysql_conn} -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 AND host LIKE '%WAN%'")
done <<< $(MYSQL_PWD="sysmoninsert" ${mysqlcmd} ${mysql_conn} -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0")
# done <<< $(MYSQL_PWD="sysmoninsert" ${mysqlcmd} ${mysql_conn} -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]}"
@@ -323,7 +323,7 @@ SETUPSSH(){
host_ip[${hostid}]=$(echo $hostip | cut -d ";" -f1)
host_name[${hostid}]=$hostname
fi
done <<< $(MYSQL_PWD="sysmoninsert" ${mysqlcmd} --skip-ssl ${mysql_conn} -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0")
done <<< $(MYSQL_PWD="sysmoninsert" ${mysqlcmd} ${mysql_conn} -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]})
@@ -351,7 +351,7 @@ RUNCMD(){
# if [ "${hostname}" != "host" ]; then
# ssh -tq -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${hostip} ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ${11} ${12} ${13} ${14} ${15} ${16} ${17} ${18} ${19} ${20} ${21} ${22}
# fi
# done <<< $(MYSQL_PWD="sysmoninsert" ${mysqlcmd} --skip-ssl ${mysql_conn} -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 ORDER BY host ASC")
# done <<< $(MYSQL_PWD="sysmoninsert" ${mysqlcmd} ${mysql_conn} -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 ORDER BY host ASC")
while read hostid hostname hostip hostlimits; do
@@ -359,7 +359,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" ${mysqlcmd} --skip-ssl ${mysql_conn} -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 ORDER BY host ASC")
done <<< $(MYSQL_PWD="sysmoninsert" ${mysqlcmd} ${mysql_conn} -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
@@ -424,7 +424,7 @@ RUNCMDSLOW(){
ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@$(echo ${hostip} | cut -d ";" -f1) ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ${11} ${12} ${13} ${14} ${15} ${16} ${17} ${18} ${19} ${20} ${21} ${22} </dev/null
echo
fi
done <<< $(MYSQL_PWD="sysmoninsert" ${mysqlcmd} --skip-ssl ${mysql_conn} -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 ORDER BY host ASC")
done <<< $(MYSQL_PWD="sysmoninsert" ${mysqlcmd} ${mysql_conn} -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 ORDER BY host ASC")
echo -e "${idsCL[LightGreen]}Complete, the command was ran on all nodes\n"
@@ -447,7 +447,7 @@ UPDATENODES(){
ssh -tq -o ConnectTimeout=3 -o ConnectionAttempts=1 root@$(echo $hostip | cut -d ";" -f1) "dsmon update" </dev/null
echo
fi
done <<< $(MYSQL_PWD="sysmoninsert" ${mysqlcmd} --skip-ssl ${mysql_conn} -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 ORDER BY host ASC")
done <<< $(MYSQL_PWD="sysmoninsert" ${mysqlcmd} ${mysql_conn} -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 ORDER BY host ASC")
echo
end=`date +%s`
@@ -487,7 +487,7 @@ GETCRONTABS(){
host_ip[${hostid}]=$(echo $hostip | cut -d ";" -f1)
host_name[${hostid}]=$hostname
fi
done <<< $(MYSQL_PWD="sysmoninsert" ${mysqlcmd} --skip-ssl ${mysql_conn} -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 ORDER BY host ASC")
done <<< $(MYSQL_PWD="sysmoninsert" ${mysqlcmd} ${mysql_conn} -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 ORDER BY host ASC")
if [ "${rtpsswd}" == "" ]; then
read -p "Enter the password for the 'nm_crontab_user' account on MySQL-Manager: " rtpsswd
@@ -523,7 +523,7 @@ GETCRONTAB(){
# echo -e "${SERVERMON_ID}) ${host} : ${hostname}\nmysqlip=${mysqlip}\n"
crontab -l | sshpass -p${1} ssh -tq -o ConnectTimeout=3 -o ConnectionAttempts=1 -o 'StrictHostKeyChecking no' nm_crontab_user@${nmip} "cat > ${DS_CRONTAB_FOLDER}/${host}.crontab"
fi
done <<< $(MYSQL_PWD="sysmoninsert" ${mysqlcmd} --skip-ssl ${mysql_conn} -u sysmoninsert -e "SELECT host,hostname FROM servermonitor.hosts WHERE id=${SERVERMON_ID}")
done <<< $(MYSQL_PWD="sysmoninsert" ${mysqlcmd} ${mysql_conn} -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"