progress

cronjobs/save_cronjobs.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 usage() {
     echo "Usage: ${0} <local_root_dir>"

docker/crypto_md_day.sh

@@ -14,11 +14,12 @@ Cmd="docker run"
 Cmd="${Cmd} --pull=always"
 Cmd="${Cmd} --network=host"
 Cmd="${Cmd} --name=crypto_md_day.${host}.${date}"
-Cmd="${Cmd} --rm"
+# Cmd="${Cmd} --rm"
 Cmd="${Cmd} ${DockerImage}"
 Cmd="${Cmd} -h ${host}"
 Cmd="${Cmd} -d ${date}"
-Cmd="${Cmd} -s coinbase,bnbspot,bnbfut"
+# Cmd="${Cmd} -s coinbase,bnbspot,bnbfut"
+Cmd="${Cmd} -s coinbase,bnbspot"
 
 echo $Cmd
 eval $Cmd

docker/md_portal/__UNUSED__/.env

@@ -0,0 +1,2 @@
+ROOT_DIR=/home/cvtt/prod
+ADMIN_PORT=7220

docker/md_portal/__UNUSED__/docker-compose.yml

@@ -0,0 +1,20 @@
+version: '3.8'
+
+#==================================================
+# Relies on the file `.env` content for varables:
+#    ROOT_DIR
+#    JUPYTER_PORT
+#==================================================
+services:
+  md_portal:
+    image: cloud21.cvtt.vpn:5500/md_portal:latest
+    network_mode: host
+    container_name: md_portal
+    restart: unless-stopped
+    environment:
+      - JUPYTER_ENABLE_LAB=yes
+    volumes:
+      - ${ROOT_DIR}/logs:/logs
+    ports:
+      - "${ADMIN_PORT}:${ADMIN_PORT}"
+    shm_size: "8gb"

docker/md_portal/start_docker_md_portal.sh

@@ -0,0 +1,61 @@
+#!/bin/bash
+
+args=${*}
+
+ConfigServer=cloud23.cvtt.vpn:6789
+ActiveExchanges=ALPACA_SNDBX
+PortalName=MD_PORTAL_ALPACA
+AdminPort=7220
+
+
+while getopts ":c:e:a:n:" opt; do
+  case ${opt} in
+    c )
+      ConfigServer=$OPTARG
+      ;;
+    e )
+      ActiveExchanges=$OPTARG
+      ;;
+    a )
+      AdminPort=$OPTARG
+      ;;
+    n )
+      PortalName=$OPTARG
+      ;;
+    \? )
+      echo "Invalid option: -$OPTARG" >&2
+      usage
+      ;;
+    : )
+      echo "Option -$OPTARG requires an argument." >&2
+      usage
+      ;;
+  esac
+done
+
+echo "ConfigServer=${ConfigServer}"
+echo "ActiveExchanges=${ActiveExchanges}"
+echo "PortalName=${PortalName}"
+echo "AdminPort=${AdminPort}"
+
+
+ImageName=md_portal
+DockerRegistry=cloud21.cvtt.vpn:5500
+DockerImage=${DockerRegistry}/${ImageName}
+
+if [ -z ${date} ] ; then
+    date=$(date -d "yesterday" +%Y%m%d)
+fi
+
+Cmd="docker run"
+# Cmd="${Cmd} --rm"
+Cmd="${Cmd} --restart=unless-stopped"
+Cmd="${Cmd} --pull=always"
+Cmd="${Cmd} --network=host"
+Cmd="${Cmd} --name=${ImageName}.${PortalName}"
+Cmd="${Cmd} --volume /home/cvtt/prod/logs:/logs"
+Cmd="${Cmd} ${DockerImage}"
+Cmd="${Cmd} ${args}"
+
+echo $Cmd
+eval $Cmd

release_version.txt

@@ -1 +1 @@
-1.3.4
+1.4.4,start md_portal with command line validation

research/load_crypto_md.sh

@@ -7,7 +7,8 @@ usage() {
 
 is_valid() {
   local inst=$1
-  local valid_instances=$2
+  shift
+  local valid_instances=("$@")
 
   for valid_inst in "${valid_instances[@]}";
   do
@@ -52,17 +53,16 @@ echo "$date $host $source"
 
 valid_hosts=('homestore' 'cloud21')
 if ! is_valid "${host}"  "${valid_hosts[@]}" ; then
-    echo h
+    echo "Host '${host}' is not valid"
     usage
 fi
 
 valid_sources=('cloud21' 'cvttdata')
 if ! is_valid ${source} ${valid_sources[@]} ; then
-    echo s
+    echo "Source '${source}' is not valid"
     usage
 fi
 
-
 if [ "${host}" == "cloud21" ] ; then
     SourceHost=cloud21.cvtt.vpn
     SourceUser=cvtt
@@ -77,6 +77,7 @@ fi
 
 echo "${SourceHost} ${SourceUser} ${SourceRootDir}"
 
+
 SourceFile=$(date -d ${date} "+%Y%m%d.mktdata.db")
 SourceFileZip="${SourceFile}.gz"
 SourceFilePath=$(date -d ${date} "+${SourceRootDir}/%Y/%m/${SourceFileZip}")
@@ -85,6 +86,10 @@ TargetDir="/opt/jupyter_gpu/data/crypto_md"
 TargetFile=$(date -d ${date} "+%Y%m%d.mktdata.ohlcv.db")
 TargetFilePath="${TargetDir}/${TargetFile}"
 
+# Tables=(bnbfut_ohlcv_1min bnbspot_ohlcv_1min coinbase_ohlcv_1min)
+Tables=(bnbspot_ohlcv_1min coinbase_ohlcv_1min)
+
+
 echo ${SourceFile}
 tmp_dir=$(mktemp -d)
 
@@ -112,7 +117,7 @@ function download_file {
     rm -f ${TargetFilePath}
     touch ${TargetFilePath}
 
-    for table in bnbfut_ohlcv_1min bnbspot_ohlcv_1min coinbase_ohlcv_1min
+    for table in "${Tables[@]}"
     do
         Cmd="sqlite3 ${tmp_dir}/${SourceFile} \".dump ${table}\" | sqlite3 ${TargetFilePath}"
         echo ${Cmd}

scripts/build_release.sh

@@ -127,7 +127,8 @@ if [ "${?}" != "0" ]; then
 fi
 
 
-release_version=$(cat release_version.txt)
+release_version=$(cat release_version.txt | awk -F',' '{print $1}')
+whats_new=$(cat release_version.txt | awk -F',' '{print $2}')
 
 
 echo "--------------------------------"
@@ -136,7 +137,7 @@ echo "Release version: ${release_version}"
 confirm
 
 version_tag="v${release_version}"
-version_comment="${version_tag}_${project}_${branch}_$(date +%Y%m%d)"
+version_comment="'${version_tag} ${project} ${branch} $(date +%Y-%m-%d)\n${whats_new}'"
 
 cmd_arr=()
 Cmd="git tag -a ${version_tag} -m ${version_comment}"
@@ -178,4 +179,8 @@ do
     pwd && echo ${cmd} && eval ${cmd}
 done
 
+echo "PROJECT ${project} **** P U L L   N E W   T A G S  F R O M  o r i g i n ****"
+echo "----"
+echo "(cd ${project}; git pull --tags; git pushall)"
+echo "----"
 echo "$0 Done ${project} ${release_version}"

scripts/healthcheck/storage_health_check.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 echo $0 $* | /usr/bin/ts '[%Y-%m-%d %H:%M:%S]'
 
 RootDir="${HOME}/prod"
@@ -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}