fix

cronjobs/cvtt/cloud16.cron

@@ -1,10 +0,0 @@
-0 6 * * * /usr/bin/supervisorctl -c /home/cvtt/prod/config/supervisor/supervisord.conf restart config_service 2>&1 | /usr/bin/ts '[\%Y-\%m-\%d \%H:\%M:\%S]'  > /home/cvtt/prod/logs/$(date +\%Y\%m\%d_\%H\%M\%S).config_service.restart.log
-#
-#
-#---------------------- Utils
-0 5 * * * /home/cvtt/prod/utils/config_svc_backup.sh 2>&1 | /usr/bin/ts '[\%Y-\%m-\%d \%H:\%M:\%S]'  > /home/cvtt/prod/logs/$(date +\%Y\%m\%d_\%H\%M\%S).config_svc_backup.log
-0 6 * * * /home/cvtt/prod/utils/archive_logs.sh /home/cvtt/prod/logs 2>&1 | /usr/bin/ts '[\%Y-\%m-\%d \%H:\%M:\%S]'  > /home/cvtt/prod/logs/$(date +\%Y\%m\%d_\%H\%M\%S).archive_logs.log
-10 1 * * * /home/cvtt/prod/utils/move_archives.sh  2>&1 | /usr/bin/ts '[\%Y-\%m-\%d \%H:\%M:\%S]'  > /home/cvtt/prod/logs/$(date +\%Y\%m\%d_\%H\%M\%S).move_archives.log
-
-#
-#---------------------- T E S T

cronjobs/cvtt/cloud17.cron

@@ -1,11 +0,0 @@
-0 6 * * * /usr/bin/supervisorctl -c /home/cvtt/prod/config/supervisor/supervisord.conf restart all 2>&1 | /usr/bin/ts '[\%Y-\%m-\%d \%H:\%M:\%S]'  > /home/cvtt/prod/logs/$(date +\%Y\%m\%d_\%H\%M\%S).bnbspot_md_recorder.restart.log
-#
-#10 6 * * * /usr/bin/supervisorctl -c /home/cvtt/prod/config/supervisor/supervisord.conf restart executor 2>&1 | /usr/bin/ts '[\%Y-\%m-\%d \%H:\%M:\%S]'  > /home/cvtt/prod/logs/$(date +\%Y\%m\%d_\%H\%M\%S).executor_app.restart.log
-#
-#---------------------- Utils
-0 6 * * * /home/cvtt/prod/utils/archive_logs.sh /home/cvtt/prod/logs 2>&1 | /usr/bin/ts '[\%Y-\%m-\%d \%H:\%M:\%S]'  > /home/cvtt/prod/logs/$(date +\%Y\%m\%d_\%H\%M\%S).cronjob_log_archive.log
-10 1 * * * /home/cvtt/prod/utils/move_archives.sh cloud17 2>&1 | /usr/bin/ts '[\%Y-\%m-\%d \%H:\%M:\%S]'  > /home/cvtt/prod/logs/$(date +\%Y\%m\%d_\%H\%M\%S).move_archives.log
-#
-# ----------------- #  TEST
-#
-# ----------------- #  TEST

cronjobs/cvtt/cloudstore.cron

@@ -1,8 +0,0 @@
-20 5 * * SAT /home/cvtt/prod/run/load_histdata.sh 2>&1 | /usr/bin/ts '[\%Y-\%m-\%d \%H:\%M:\%S]'  >> /home/cvtt/prod/logs/$(date +\
-20 6 * * SAT /home/cvtt/prod/run/prune_eqt_histdata.sh 2>&1 | /usr/bin/ts '[\%Y-\%m-\%d \%H:\%M:\%S]'  >> /home/cvtt/prod/logs/$(da
-#
-0 6 * * SUN /home/cvtt/prod/run/archive_logs.sh /home/cvtt/prod/logs 2>&1 | /usr/bin/ts '[\%Y-\%m-\%d \%H:\%M:\%S]'  > /home/cvtt/p
-#
-# T E S T
-#----------------------------------------------------------------------
-#----------------------------------------------------------------------

cronjobs/cvtt/cryptoval3.cron

@@ -1,11 +0,0 @@
-#
-#---------------------- Market Data
-0 6 * * * /home/cvtt/prod/run/archive_yesterday_md.sh  coinbase,bnbspot,bnbfut 2>&1  > /home/cvtt/prod/logs/$(date +\%Y\%m\%d_\%H\%M\%S).archive_yestd_md.log
-#---------------------- Utils
-0 7 * * * /home/cvtt/prod/utils/backup_md_archive.sh  2>&1 | /usr/bin/ts '[\%Y-\%m-\%d \%H:\%M:\%S]'  > /home/cvtt/prod/logs/$(date +\%Y\%m\%d_\%H\%M\%S).backup_md_archive.log
-#
-30 7 * * * /home/cvtt/prod/utils/archive_logs.sh /home/cvtt/prod/logs 2>&1 | /usr/bin/ts '[\%Y-\%m-\%d \%H:\%M:\%S]'  > /home/cvtt/prod/logs/$(date +\%Y\%m\%d_\%H\%M\%S).cronjob_log_archive.log
-#
-# ----------------- #  TEST
-#
-# ----------------- #  TEST

cronjobs/save_cronjobs.sh

@@ -0,0 +1,70 @@
+#!/bin/bash
+
+usage() {
+    echo "Usage: ${0} <local_root_dir>"
+    exit 1
+}
+
+get_user_hosts() {
+    local User=${1}
+    local Domain=${2}
+
+    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'"
+    # echo $Cmd  ### - FOR DEBUG ONLY
+    eval ${Cmd}
+}
+
+Domain=cvtt.vpn
+echo "Started ${0} ${*} ..."
+
+RootDir=${1}
+
+if [ ! -d "${RootDir}" ]; then
+    usage
+fi
+
+cd ${RootDir}
+Cmd="git pull"
+echo ${Cmd} && eval ${Cmd}
+
+for User in cvtt oleg
+do
+    echo "User=$User"
+    Cmd="mkdir -p ${RootDir}/${User}"
+    echo ${Cmd} && eval ${Cmd}
+
+    hosts=$(get_user_hosts ${User} ${Domain})
+    echo ${hosts}
+
+    for host in ${hosts}
+    do
+        echo "===================="
+        echo "${host}:${User}"
+        Cmd="ssh ${User}@${host}.${Domain} 'crontab -l' | tee ${RootDir}/${User}/${host}.cron"
+        echo ${Cmd} && eval ${Cmd}
+    done
+done
+
+cd ${RootDir}
+
+Cmd="find -type f -empty -delete -print"
+echo ${Cmd} && eval ${Cmd}
+
+Cmd="find -type d -empty -delete -print"
+echo ${Cmd} && eval ${Cmd}
+
+Cmd="git add ."
+echo ${Cmd} && eval ${Cmd}
+
+Cmd="git commit -a -m '$(date)'"
+echo ${Cmd} && eval ${Cmd}
+
+Cmd="git pushall"
+echo ${Cmd} && eval ${Cmd}
+
+echo "Done ${0} ${*}"

docker/md_recorder.sh

@@ -1,27 +1,58 @@
 #!/bin/bash
 
+ValidJobs=('BNBFUT_CLD21' 'BNBSPOT_CLD21' 'COINBASE_CLD21' 'BNBFUT_CVTTDATA' 'BNBSPOT_CVTTDATA' 'COINBASE_CVTTDATA')
 # runs on host to start container
 usage() {
-  echo "Usage: $0 <job_name> (BNBFUT_CLD21, BNBSPOT_CLD21, BNBSPOT_CVTTDATA, COINBASE_CLD21)"
+  echo "Usage: $0 <job_name; one of (${ValidJobs[@]})>"
   exit 1
 }
 
+is_valid() {
+  local job=$1
+  for valid_job in "${ValidJobs[@]}";
+  do
+    # echo "job=$job valid_job=$valid_job"
+    if [[ "${job}" == "${valid_job}" ]]; then
+      return 0
+    fi
+  done
+  return 1
+}
+
+is_container_running() {
+    local container_name=$1
+
+    if [ "$(docker ps --filter "name=^/${container_name}$" --filter "status=running" -q)" ]; then
+        return 0  # true
+    else
+        return 1  # false
+    fi
+}
+
 
 job=${1}
-if [ "${job}" == "" ] ; then
+if  ! is_valid "${job}"; then
     usage
 fi
 
+ContainerName="md_recorder.${job}"
+
+if is_container_running "$ContainerName"; then
+    echo "Container ${ContainerName} is already running. Aborted."
+    exit
+fi
+
+
 Cmd="docker run"
 Cmd="${Cmd} -d"
 Cmd="${Cmd} --rm"
 Cmd="${Cmd} --network=host"
 Cmd="${Cmd} --pull=always"
-Cmd="${Cmd} --name=md_recorder.${job}"
+Cmd="${Cmd} --name=${ContainerName}"
 Cmd="${Cmd} -v /home/cvtt/prod/data:/app/data"
 Cmd="${Cmd} -v /home/cvtt/prod/logs:/logs"
 Cmd="${Cmd} cloud21.cvtt.vpn:5500/md_recorder:latest"
-Cmd="${Cmd} ${1}"
+Cmd="${Cmd} ${job}"
 
 echo ${Cmd}
 eval ${Cmd}

docker/md_recorder_monitor.sh

@@ -0,0 +1,61 @@
+#!/bin/bash
+
+usage() {
+  echo "Usage: $0 <instance (CLD21,CVTTDATA)> [<admin_port (def. 7225)>]"
+  exit 1
+}
+
+ValidInstances=('CLD21' 'CVTTDATA')
+is_valid() {
+  local inst=$1
+  for valid_inst in "${ValidInstances[@]}";
+  do
+    if [[ "$inst" == "$valid_inst" ]]; then
+      return 0
+    fi
+  done
+  return 1
+}
+
+is_container_running() {
+    local container_name=$1
+
+    if [ "$(docker ps --filter "name=^/${container_name}$" --filter "status=running" -q)" ]; then
+        return 0  # true
+    else
+        return 1  # false
+    fi
+}
+
+
+
+
+Instance=${1}
+if ! is_valid "${Instance}"; then
+    usage
+fi
+
+AdminPort=7225
+if [ "${2}" != "" ]; then
+    AdminPort=${2}
+fi
+
+ContainerName="md_recorder_monitor.${Instance}"
+
+if is_container_running "$ContainerName"; then
+    echo "Container ${ContainerName} is already running. Aborted."
+    exit
+fi
+
+Cmd="docker run"
+Cmd="${Cmd} -d"
+Cmd="${Cmd} --rm"
+Cmd="${Cmd} --network=host"
+Cmd="${Cmd} --pull=always"
+Cmd="${Cmd} --name=${ContainerName}"
+Cmd="${Cmd} -v /home/cvtt/prod/logs:/logs"
+Cmd="${Cmd} cloud21.cvtt.vpn:5500/md_recorder_monitor:latest"
+Cmd="${Cmd} ${Instance} ${AdminPort}"
+
+echo ${Cmd}
+eval ${Cmd}

release_version.txt

@@ -1 +1 @@
-1.1.8
+1.3.6

research/load_crypto_md.sh

@@ -0,0 +1,126 @@
+#!/usr/bin/env bash
+
+usage() {
+  echo "Usage: $0 [-h <host (homestore*/cloud21)>] [-d <YYYYMMDD> (yesterday*)] [-s <source> (cvttdata/cloud21*)>]"
+  exit 1
+}
+
+is_valid() {
+  local inst=$1
+  local valid_instances=$2
+
+  for valid_inst in "${valid_instances[@]}";
+  do
+    if [[ "$inst" == "$valid_inst" ]]; then
+      return 0
+    fi
+  done
+  return 1
+}
+
+date=""
+host=homestore
+source=cloud21
+
+while getopts ":h:d:s:" opt; do
+  case ${opt} in
+    d )
+      date=$OPTARG
+      ;;
+    h )
+      host=$OPTARG
+      ;;
+    s )
+      source=$OPTARG
+      ;;
+    \? )
+      echo "Invalid option: -$OPTARG" >&2
+      usage
+      ;;
+    : )
+      echo "Option -$OPTARG requires an argument." >&2
+      usage
+      ;;
+  esac
+done
+
+if [ "${date}" == "" ] ; then
+    date="yesterday"
+fi
+
+echo "$date $host $source"
+
+valid_hosts=('homestore' 'cloud21')
+if ! is_valid "${host}"  "${valid_hosts[@]}" ; then
+    echo h
+    usage
+fi
+
+valid_sources=('cloud21' 'cvttdata')
+if ! is_valid ${source} ${valid_sources[@]} ; then
+    echo s
+    usage
+fi
+
+
+if [ "${host}" == "cloud21" ] ; then
+    SourceHost=cloud21.cvtt.vpn
+    SourceUser=cvtt
+    SourceRootDir="/opt/store/cvtt/md_archive/crypto/${source}"
+elif [ "${host}" == "homestore" ]; then
+    SourceHost=homestore.cvtt.vpn
+    SourceUser=oleg
+    SourceRootDir=/works/cvtt/md_archive/crypto/${source}
+else
+    usage
+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}")
+
+TargetDir="/opt/jupyter_gpu/data/crypto_md"
+TargetFile=$(date -d ${date} "+%Y%m%d.mktdata.ohlcv.db")
+TargetFilePath="${TargetDir}/${TargetFile}"
+
+echo ${SourceFile}
+tmp_dir=$(mktemp -d)
+
+function cleanup {
+    cd ${HOME}
+    rm -rf ${tmp_dir}
+}
+trap cleanup EXIT
+
+function download_file {
+
+    Cmd="rsync"
+    Cmd="${Cmd} -ahv"
+    if tty -s; then
+        Cmd="${Cmd} --progress=info2"
+    fi
+    Cmd="${Cmd} ${SourceUser}@${SourceHost}:${SourceFilePath} ${tmp_dir}/"
+    echo ${Cmd}
+    eval ${Cmd}
+    ls -lh ${tmp_dir}
+    Cmd="gunzip ${tmp_dir}/${SourceFileZip}"
+    echo ${Cmd} && eval ${Cmd}
+    ls -lh ${tmp_dir}
+
+    rm -f ${TargetFilePath}
+    touch ${TargetFilePath}
+
+    for table in bnbfut_ohlcv_1min bnbspot_ohlcv_1min coinbase_ohlcv_1min
+    do
+        Cmd="sqlite3 ${tmp_dir}/${SourceFile} \".dump ${table}\" | sqlite3 ${TargetFilePath}"
+        echo ${Cmd}
+        eval ${Cmd}
+    done
+    chmod 600 ${TargetFilePath}
+    ls -lh ${TargetFilePath}
+
+
+}
+download_file

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}