diff --git a/release_version.txt b/release_version.txt index c4d30e8..fcc0dc5 100644 --- a/release_version.txt +++ b/release_version.txt @@ -1 +1 @@ -1.8.8.F2,no boolean for jq, it considers "false" as missing (null) +1.8.8.F3,syntax fix diff --git a/scripts/healthcheck/hosts_check.sh b/scripts/healthcheck/hosts_check.sh index fbfc1c7..404fbe4 100755 --- a/scripts/healthcheck/hosts_check.sh +++ b/scripts/healthcheck/hosts_check.sh @@ -5,12 +5,12 @@ # "users": ["oleg"], # "type": "cloud", # "ssh_port": 7822, -# # "to_check": "false" +# "to_check": "false" # "timeout_sec": 5 # }, -RootDir="${HOME}/prod" -# RootDir=/home/oleg/develop/cvtt2 ###### D E B U G +# RootDir="${HOME}/prod" +RootDir=/home/oleg/develop/cvtt2 ###### D E B U G AlertChannel=Alerts-CVTT Sender=${RootDir}/ops/utils/send_mmost.sh @@ -65,11 +65,12 @@ for Host in ${Hosts[@]} ; do Timeout=$(echo "$HOSTS_CONFIG" | jq -r --arg domain "$Domain" --arg host "$host" '.[$domain][$host].timeout_sec // '"$DEFAULT_TIMEOUT"'') ToCheck=$(echo "$HOSTS_CONFIG" | jq -r --arg domain "$Domain" --arg host "$host" '.[$domain][$host].to_check // '"$DEFAULT_TO_CHECK"'') - to_check="${ToCheck}^^" - if [ "${to_check}" != "TRUE" && "${to_check}" != "YES" && "${to_check}" != "Y" && "${to_check}" != "T" ]; then + to_check="${ToCheck^^}" + if [ "${to_check}" == "TRUE" -o "${to_check}" == "YES" -o "${to_check}" == "Y" -o "${to_check}" == "T" ] ; then + echo "Checking host: $Host on port $PortSSH" + else continue fi - echo "Checking host: $Host on port $PortSSH" # Use nc to check if the specified port is open if ! nc -z -w ${Timeout} "$Host" "$PortSSH"; then