From 1387893a141649edb64f21b93e139a71f00f5460 Mon Sep 17 00:00:00 2001 From: Oleg Sheynin Date: Thu, 31 Oct 2024 15:39:33 -0400 Subject: [PATCH] fix --- release_version.txt | 2 +- scripts/healthcheck/hosts_check.sh | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/release_version.txt b/release_version.txt index 9e2130f..bf981f9 100644 --- a/release_version.txt +++ b/release_version.txt @@ -1 +1 @@ -1.7.6,host avalability check +1.7.6.fx1,host avalability check diff --git a/scripts/healthcheck/hosts_check.sh b/scripts/healthcheck/hosts_check.sh index af1843f..10c32b2 100755 --- a/scripts/healthcheck/hosts_check.sh +++ b/scripts/healthcheck/hosts_check.sh @@ -1,18 +1,21 @@ #!/bin/bash -usage() { - echo -n "Usage: ${0}" - echo - exit 1 -} +# "cryptovaltrading.com": { +# "cloud18": { +# "users": ["oleg"], +# "type": "cloud", +# "ssh_port": 7822, +# # "to_check": "No" +# }, RootDir="${HOME}/prod" -RootDir="${HOME}/develop/cvtt2" +# RootDir=/home/oleg/develop/cvtt2 ###### D E B U G AlertChannel=Alerts-CVTT Sender=${RootDir}/ops/utils/send_mmost.sh +ConfigUrl=http://cloud23.cvtt.vpn:6789/admin/cvtt_hosts -HOSTS_CONFIG=$(curl -s http://cloud23.cvtt.vpn:6789/admin/cvtt_hosts | ${HOME}/bin/hjson -j) +HOSTS_CONFIG=$(curl -s ${ConfigUrl} | ${HOME}/bin/hjson -j) get_domains() { echo ${HOSTS_CONFIG} | jq -r '. | keys[]' @@ -40,7 +43,6 @@ function host_alert() { } - User=oleg Hosts=() DEFAULT_SSH_PORT=22 @@ -56,6 +58,10 @@ for Host in ${Hosts[@]} ; do # echo "Host=$Host host=$host Domain=$Domain" # Get SSH port for the host, or use default if not specified + ToCheck=$(echo "$HOSTS_CONFIG" | jq -r --arg domain "$Domain" --arg host "$host" '.[$domain][$host].to_check // "Yes"') + if [ "${ToCheck}" == "No" ]; then + continue + fi PortSSH=$(echo "$HOSTS_CONFIG" | jq -r --arg domain "$Domain" --arg host "$host" '.[$domain][$host].ssh_port // '"$DEFAULT_SSH_PORT"'') echo "Checking host: $Host on port $PortSSH"