diff --git a/release_version.txt b/release_version.txt index 73ee011..3025b46 100644 --- a/release_version.txt +++ b/release_version.txt @@ -1 +1 @@ -1.7.7.fx1,services avalability check +1.7.8,case insensitive to_check parameter host and services avalability check diff --git a/scripts/healthcheck/hosts_check.sh b/scripts/healthcheck/hosts_check.sh index 3010dd3..2b3f44c 100755 --- a/scripts/healthcheck/hosts_check.sh +++ b/scripts/healthcheck/hosts_check.sh @@ -55,11 +55,9 @@ done for Host in ${Hosts[@]} ; do host=$(echo $Host | cut -d'.' -f1) Domain=$(echo $Host | cut -d'.' -f2-) - # 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 + 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"'') diff --git a/scripts/healthcheck/services_check.sh b/scripts/healthcheck/services_check.sh index 0620f1b..4fd75fc 100755 --- a/scripts/healthcheck/services_check.sh +++ b/scripts/healthcheck/services_check.sh @@ -40,7 +40,7 @@ mapfile -t SvcNames < <(echo ${SERVICES_CONFIG} | jq -r '. | keys[]') DEFAULT_TO_CHECK=Yes for SvcName in "${SvcNames[@]}" ; do ToCheck=$(echo "$SERVICES_CONFIG" | jq -r --arg svcname "$SvcName" '.[$svcname].to_check // "Yes"') - if [ "${ToCheck}" == "No" ]; then + if [ "${ToCheck^^}" == "NO" ]; then continue fi Host=$(echo "$SERVICES_CONFIG" | jq -r --arg svcname "$SvcName" '.[$svcname].host ')