Compare commits

..

2 Commits

Author SHA1 Message Date
oleg 84a8c1cb31 case insensitive to_check parameter host and services avalability check 2024-10-31 17:37:19 -04:00
oleg 4774bd9005 fix 2024-10-31 17:28:25 -04:00
3 changed files with 3 additions and 6 deletions
+1 -1
View File
@@ -1 +1 @@
1.7.7,services avalability check 1.7.8,case insensitive to_check parameter host and services avalability check
+1 -3
View File
@@ -55,11 +55,9 @@ done
for Host in ${Hosts[@]} ; do for Host in ${Hosts[@]} ; do
host=$(echo $Host | cut -d'.' -f1) host=$(echo $Host | cut -d'.' -f1)
Domain=$(echo $Host | cut -d'.' -f2-) 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"') 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 continue
fi fi
PortSSH=$(echo "$HOSTS_CONFIG" | jq -r --arg domain "$Domain" --arg host "$host" '.[$domain][$host].ssh_port // '"$DEFAULT_SSH_PORT"'') PortSSH=$(echo "$HOSTS_CONFIG" | jq -r --arg domain "$Domain" --arg host "$host" '.[$domain][$host].ssh_port // '"$DEFAULT_SSH_PORT"'')
+1 -2
View File
@@ -39,9 +39,8 @@ mapfile -t SvcNames < <(echo ${SERVICES_CONFIG} | jq -r '. | keys[]')
DEFAULT_TO_CHECK=Yes DEFAULT_TO_CHECK=Yes
for SvcName in "${SvcNames[@]}" ; do for SvcName in "${SvcNames[@]}" ; do
echo "SvcName=$SvcName"
ToCheck=$(echo "$SERVICES_CONFIG" | jq -r --arg svcname "$SvcName" '.[$svcname].to_check // "Yes"') ToCheck=$(echo "$SERVICES_CONFIG" | jq -r --arg svcname "$SvcName" '.[$svcname].to_check // "Yes"')
if [ "${ToCheck}" == "No" ]; then if [ "${ToCheck^^}" == "NO" ]; then
continue continue
fi fi
Host=$(echo "$SERVICES_CONFIG" | jq -r --arg svcname "$SvcName" '.[$svcname].host ') Host=$(echo "$SERVICES_CONFIG" | jq -r --arg svcname "$SvcName" '.[$svcname].host ')