fix

build/build_release.sh

@@ -3,11 +3,11 @@
 # ---------------- Settings
 declare -A git_repo_arr
 
-git_repo_arr[cvttpy]=git@cloud21.cvtt.vpn:/opt/store/git/cvttpy.git
-git_repo_arr[ops]=git@cloud21.cvtt.vpn:/opt/store/git/ops.git
-git_repo_arr[research]=git@cloud21.cvtt.vpn:/opt/store/git/research.git
+git_repo_arr[cvttpy]=git@cloud21.cvtt.vpn:/opt/store/git/cvtt2/cvttpy.git
+git_repo_arr[ops]=git@cloud21.cvtt.vpn:/opt/store/git/cvtt2/ops.git
+git_repo_arr[research]=git@cloud21.cvtt.vpn:/opt/store/git/cvtt2/research.git
 git_repo_arr[cvtt-rust]=git@cloud21.cvtt.vpn:/opt/store/git/cvtt2/cvtt-rust.git
-git_repo_arr[docker_dev]=git@cloud21.cvtt.vpn:/opt/store/git/docker_dev.git
+git_repo_arr[docker_dev]=git@cloud21.cvtt.vpn:/opt/store/git/cvtt2/docker_dev.git
 
 dist_root=/home/cvttdist/software/cvtt2
 dist_user=cvttdist

release_version.txt

@@ -1 +1 @@
-1.8.7,prepare equity simulation data
+1.8.8.F3,syntax fix

scripts/healthcheck/hosts_check.sh

@@ -5,11 +5,11 @@
 #         "users": ["oleg"],
 #         "type": "cloud",
 #         "ssh_port": 7822,
-#         # "to_check": "No"
+#         "to_check": "false"
+#         "timeout_sec": 5
 #     },
 
 RootDir="${HOME}/prod"
-# RootDir=/home/oleg/develop/cvtt2  ###### D E B U G
 
 AlertChannel=Alerts-CVTT
 Sender=${RootDir}/ops/utils/send_mmost.sh
@@ -46,6 +46,8 @@ function host_alert() {
 User=oleg
 Hosts=()
 DEFAULT_SSH_PORT=22
+DEFAULT_TIMEOUT=5
+DEFAULT_TO_CHECK="true"
 Domains=("${Domains[@]}" "$(get_domains)")
 
 for Domain in ${Domains[@]} ; do
@@ -56,16 +58,21 @@ for Host in ${Hosts[@]} ; do
     host=$(echo $Host | cut -d'.' -f1)
     Domain=$(echo $Host | cut -d'.' -f2-)
 
-    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"
+    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" -o "${to_check}" == "YES" -o "${to_check}" == "Y" -o "${to_check}" == "T" ] ; then
+        echo "Checking host: $Host on port $PortSSH"
+    else
+        continue
+    fi
 
     # Use nc to check if the specified port is open
-    if ! nc -z -w5 "$Host" "$PortSSH"; then
+    if ! nc -z -w ${Timeout} "$Host" "$PortSSH"; then
         echo "Host $Host is not available on port $PortSSH"
         host_alert "Host $Host is not available on port $PortSSH"
     fi