archive/ops
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

case insensitive to_check parameter host and services avalability check

Browse Source
This commit is contained in:
Oleg Sheynin 2024-10-31 17:37:19 -04:00
parent 4774bd9005
commit b168030a93
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release_version.txt
View File

@ -1 +1 @@
1.7.7.fx1,services avalability check 1.7.8,case insensitive to_check parameter host and services avalability check

4
scripts/healthcheck/hosts_check.sh
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"'')

2
scripts/healthcheck/services_check.sh
View File

@ -40,7 +40,7 @@ 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
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 ')