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
2023-07-04 23:53:30 -05:00
parent 792646e7df
commit b9bbad8e7b
2 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
defaults.inc
View File

@@ -5,6 +5,15 @@ VERS=2.2.15-07042023
DS_FOLDER=/opt/idssys/dsmon DS_FOLDER=/opt/idssys/dsmon
DS_CRONTAB_FOLDER=/opt/idssys/nodemgmt/crontabs DS_CRONTAB_FOLDER=/opt/idssys/nodemgmt/crontabs
if [ "$(CHECK_HOST 10.10.10.50)" != "false" ]; then
nmip=10.10.10.50
mysqlip=10.10.1.50
elif [ "$(CHECK_HOST 100.100.55.1)" != "false" ]; then
nmip=100.100.55.1
mysqlip=100.100.5.2
else
nmip=
fi
SENDNOTICE(){ SENDNOTICE(){
[ "${PUSHOVER_APP_TOKEN}" != "" ] && PUSH_TO_MOBILE "${2} [ "${PUSHOVER_APP_TOKEN}" != "" ] && PUSH_TO_MOBILE "${2}

24
dsmon.sh
View File

@@ -48,7 +48,7 @@ RUN(){
done done
QRY="USE servermonitor; INSERT INTO sysinfo (\`host\`, \`entry\`, \`value\`) VALUES ('${SERVERMON_ID}','hdd','${DRIVE_INFO[@]}');" QRY="USE servermonitor; INSERT INTO sysinfo (\`host\`, \`entry\`, \`value\`) VALUES ('${SERVERMON_ID}','hdd','${DRIVE_INFO[@]}');"
MYSQL_PWD="sysmoninsert" mysql -h mysqldb.scity.us -P 6033 -u sysmoninsert -e "${QRY}" MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 6033 -u sysmoninsert -e "${QRY}"
elif [ "${1}" = "sys" ]; then elif [ "${1}" = "sys" ]; then
@@ -56,7 +56,7 @@ RUN(){
CPU=$(top -bn1 | grep load | awk '{printf "%.2f\t\t\n", $(NF-2)}') 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}');" QRY="USE servermonitor; INSERT INTO sysinfo (\`host\`, \`entry\`, \`value\`) VALUES ('${SERVERMON_ID}','sys','${CPU// /};${MEMORY}');"
MYSQL_PWD="sysmoninsert" mysql -h mysqldb.scity.us -P 3306 -u sysmoninsert -e "${QRY}" MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 3306 -u sysmoninsert -e "${QRY}"
fi fi
SERVERHOSTNAME=(`hostname`) SERVERHOSTNAME=(`hostname`)
@@ -78,7 +78,7 @@ RUN(){
done done
QRY="USE servermonitor; UPDATE hosts SET ip='${SERVERIPS// /}',hostname='${SERVERHOSTNAME}',limits='${thresholdlog[@]}' WHERE id='${SERVERMON_ID}';" QRY="USE servermonitor; UPDATE hosts SET ip='${SERVERIPS// /}',hostname='${SERVERHOSTNAME}',limits='${thresholdlog[@]}' WHERE id='${SERVERMON_ID}';"
MYSQL_PWD="sysmoninsert" mysql -h mysqldb.scity.us -P 3306 -u sysmoninsert -e "${QRY}" MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 3306 -u sysmoninsert -e "${QRY}"
fi fi
@@ -103,7 +103,7 @@ CHECK(){
host_ids[$hostname]=$hostid host_ids[$hostname]=$hostid
hostnames_sort+=("$hostname") hostnames_sort+=("$hostname")
fi fi
done <<< $(MYSQL_PWD="sysmoninsert" mysql -h mysqldb.scity.us -P 3306 -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0") done <<< $(MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 3306 -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0")
IFS=$'\n' hostnames_sort=($(sort <<<"${hostnames_sort[*]}")); unset IFS IFS=$'\n' hostnames_sort=($(sort <<<"${hostnames_sort[*]}")); unset IFS
@@ -255,7 +255,7 @@ SETUPSSH(){
host_ip[${hostid}]=$(echo $hostip | cut -d ";" -f1) host_ip[${hostid}]=$(echo $hostip | cut -d ";" -f1)
host_name[${hostid}]=$hostname host_name[${hostid}]=$hostname
fi fi
done <<< $(MYSQL_PWD="sysmoninsert" mysql -h mysqldb.scity.us -P 3306 -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0") done <<< $(MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 3306 -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0")
for hostid in "${!host_ip[@]}"; do for hostid in "${!host_ip[@]}"; do
checkhost=$(CHECK_HOST ${host_ip[$hostid]}) checkhost=$(CHECK_HOST ${host_ip[$hostid]})
@@ -277,7 +277,7 @@ RUNCMD(){
host_ip[${hostid}]=$(echo $hostip | cut -d ";" -f1) host_ip[${hostid}]=$(echo $hostip | cut -d ";" -f1)
host_name[${hostid}]=$hostname host_name[${hostid}]=$hostname
fi fi
done <<< $(MYSQL_PWD="sysmoninsert" mysql -h mysqldb.scity.us -P 3306 -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 3306 -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 ORDER BY host ASC")
for hostid in "${!host_ip[@]}"; do for hostid in "${!host_ip[@]}"; do
checkhost=$(CHECK_HOST ${host_ip[$hostid]}) checkhost=$(CHECK_HOST ${host_ip[$hostid]})
@@ -309,7 +309,7 @@ GETCRONTABS(){
host_ip[${hostid}]=$(echo $hostip | cut -d ";" -f1) host_ip[${hostid}]=$(echo $hostip | cut -d ";" -f1)
host_name[${hostid}]=$hostname host_name[${hostid}]=$hostname
fi fi
done <<< $(MYSQL_PWD="sysmoninsert" mysql -h mysqldb.scity.us -P 3306 -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 3306 -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 ORDER BY host ASC")
if [ "${1}" == "" ]; then if [ "${1}" == "" ]; then
read -p "Enter the password for the 'nm_crontab_user' account on MySQL-Manager: " rtpsswd read -p "Enter the password for the 'nm_crontab_user' account on MySQL-Manager: " rtpsswd
@@ -340,16 +340,6 @@ GETCRONTAB(){
if ! command -v sshpass > /dev/null; then if ! command -v sshpass > /dev/null; then
apt install -y sshpass > /dev/null 2>&1 apt install -y sshpass > /dev/null 2>&1
fi fi
if [ "$(CHECK_HOST 10.10.10.50)" != "false" ]; then
nmip=10.10.10.50
mysqlip=10.10.1.50
elif [ "$(CHECK_HOST 100.100.55.1)" != "false" ]; then
nmip=100.100.55.1
mysqlip=100.100.5.2
else
nmip=
fi
if [ "${nmip}" != "" ]; then if [ "${nmip}" != "" ]; then
while read host hostname; do while read host hostname; do