diff --git a/release_version.txt b/release_version.txt index d0149fe..80e78df 100644 --- a/release_version.txt +++ b/release_version.txt @@ -1 +1 @@ -1.3.4 +1.3.5 diff --git a/scripts/healthcheck/storage_health_check.sh b/scripts/healthcheck/storage_health_check.sh index b7fd573..8c242d3 100755 --- a/scripts/healthcheck/storage_health_check.sh +++ b/scripts/healthcheck/storage_health_check.sh @@ -10,32 +10,24 @@ StatusChannel=Status-CVTT AlertChannel=Alerts-CVTT Sender=${RootDir}/ops/utils/send_mmost.sh +# ----- For DEBUGGING # Sender=cat # StatusChannel= -Hosts= -Hosts="${Hosts} cloud11.cvtt.vpn" -Hosts="${Hosts} cloud15.cvtt.vpn" -Hosts="${Hosts} cloud16.cvtt.vpn" -Hosts="${Hosts} cloud17.cvtt.vpn" -Hosts="${Hosts} cloud21.cvtt.vpn" -Hosts="${Hosts} cloud22.cryptovaltrading.com" +get_user_hosts() { + local User=${1} + local Domain=${2} -Hosts="${Hosts} cvttdata.cvtt.vpn" -Hosts="${Hosts} cryptoval2.cvtt.vpn" -Hosts="${Hosts} cryptoval3.cvtt.vpn" + Cmd="curl -s http://cloud23.cvtt.vpn:6789/admin/cvtt_hosts" + Cmd="${Cmd} | ${HOME}/bin/hjson -j" + Cmd="${Cmd} | jq -r" + Cmd="${Cmd} --arg domain \"${Domain}\"" + Cmd="${Cmd} --arg usr \"${User}\"" + Cmd="${Cmd} '.[\$domain] | to_entries[] | select(.value.users[] | contains(\$usr)) | .key'" -Hosts="${Hosts} homestore.cvtt.vpn" -Hosts="${Hosts} nsbackup.sheynin.home" -Hosts="${Hosts} dtvmhost.cvtt.vpn" -Hosts="${Hosts} ops-server.cvtt.vpn" - -Hosts="${Hosts} cvtt-prod-01.cvtt.vpn" -Hosts="${Hosts} cvtt-prod-02.cvtt.vpn" -Hosts="${Hosts} cvtt-prod-03.cvtt.vpn" - -Metrics=() -TempFiles= + Cmd="${Cmd} | sed 's/\$/.${Domain}/'" + eval ${Cmd} +} function cleanup { echo Cleaing up temporary files: ${TempFiles} @@ -61,12 +53,14 @@ function space_alert() { } function storage_check() { + local Hosts=("${@}") result_lines=() declare -a SingleMeas - for host in ${Hosts} + for host in ${Hosts[@]} do + echo "storage_check host=${host}" >&2 if [[ "${host}" == *"cryptovaltrading.com" ]]; then port=7822 else @@ -98,13 +92,22 @@ function storage_check() { done } +User=oleg +Metrics=() +TempFiles= + +Hosts=() +for Domain in cvtt.vpn cryptovaltrading.com ; do + Hosts=("${Hosts[@]}" "$(get_user_hosts ${User} ${Domain})") +done + tmpfile=$(mktemp) TempFiles="${TempFiles} ${tmpfile}" tmpfile2=$(mktemp) TempFiles="${TempFiles} ${tmpfile2}" -storage_check > ${tmpfile2} +storage_check "${Hosts[@]}" > ${tmpfile2} echo "## :card_file_box: STORAGE HEALTH CHECK" >> ${tmpfile} echo >> ${tmpfile}