Merge branch 'master' of cloud21.cvtt.vpn:/opt/store/git/cvtt2/ops

docker/market_data/_DEPRECATED_/recorder/md_recorder.sh

@@ -0,0 +1,66 @@
+#!/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; one of (${ValidJobs[@]})> [image_tag]"
+  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  ! is_valid "${job}"; then
+    usage
+fi
+
+ImageTag=${2}
+if [ "${ImageTag}" == "" ] ; then
+    ImageTag="1.6.9"
+fi
+
+DockerImage=cloud21.cvtt.vpn:5500/md_recorder:${ImageTag}
+ContainerName="md_recorder.${job}"
+
+if is_container_running "$ContainerName"; then
+    echo "Container ${ContainerName} is already running. Aborted."
+    exit
+fi
+
+
+Cmd="docker run"
+Cmd+=" -d"
+Cmd+=" --rm"
+Cmd+=" --network=host"
+# Cmd+=" --pull=always"
+Cmd+=" --name=${ContainerName}"
+Cmd+=" -v /home/cvtt/.creds:/.creds"
+Cmd+=" -v /home/cvtt/prod/data:/app/data"
+Cmd+=" -v /home/cvtt/prod/logs:/logs"
+Cmd+=" -e CONFIG_SERVICE=cloud16.cvtt.vpn:6789"
+Cmd+=" ${DockerImage}"
+Cmd+=" ${job}"
+
+echo ${Cmd}
+eval ${Cmd}

docker/market_data/_DEPRECATED_/recorder/md_recorder_monitor.sh

@@ -0,0 +1,60 @@
+#!/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+=" -d"
+Cmd+=" --rm"
+Cmd+=" --network=host"
+Cmd+=" --pull=always"
+Cmd+=" --name=${ContainerName}"
+Cmd+=" -v /home/cvtt/.creds:/.creds"
+Cmd+=" -v /home/cvtt/prod/logs:/logs"
+Cmd+=" -e CONFIG_SERVICE=cloud16.cvtt.vpn:6789"
+Cmd+=" cloud21.cvtt.vpn:5500/md_recorder_monitor:latest"
+Cmd+=" ${Instance} ${AdminPort}"
+
+echo ${Cmd}
+eval ${Cmd}

research/load_crypto_md.sh

@@ -3,7 +3,7 @@
 usage() {
   echo -n "Usage: $0 [-h <host (hs01*/cloud21)>]"
   echo -n " [-d <YYYYMMDD> (yesterday*)]"
-  echo -n " [-s <source> (cvttdata/cloud21*)>]"
+  echo -n " [-s <source> (cloud28/cloud21*)>]"
   echo " [-t <target_dir> (/opt/jupyter_gpu/data/crypto_md)]"
   exit 1
 }
@@ -67,7 +67,7 @@ if ! is_valid "${host}"  "${valid_hosts[@]}" ; then
     usage
 fi
 
-valid_sources=('cloud21' 'cvttdata')
+valid_sources=('cloud21' 'cloud28')
 if ! is_valid ${source} ${valid_sources[@]} ; then
     echo "Source '${source}' is not valid"
     usage

utils/archive_logs.sh

@@ -11,9 +11,10 @@ function usage {
 
 echo Starting $0 $*
 
-LogDir=${1}
+# ---- D e f a u l t s
 LogArchiveDir=/works/archive/logs
 DateCriteria="2 days ago"
+# ---- D e f a u l t s
 
 
 # ---------------- cmdline

utils/move_archives.sh

@@ -1,40 +1,57 @@
 #!/bin/bash
-
-# FOR cloud hosts with limited disk space - move to storage server
+# FOR hosts with limited disk space - move to storage server
 
 function usage {
-    echo "Usage: ${0} <host> <from_dir> <days>"
+    echo -n "Usage: ${0}"
+    echo -n " -H <host_label>"
+    echo -n " [ -A <archive_dir> (default /works/archive)]"
+    echo -n " [-D <older than time criteria> (default: '2 days ago')]"
+    echo
     exit 1
 }
 
 echo Starting $0 $*
 
-
+# ---- D e f a u l t s
+ArchiveDir=/works/archive
+DateCriteria="2 days ago"
 FromHost=$(hostname -s)
+# ---- D e f a u l t s
+
+# ---------------- cmdline
+while getopts "A:H:D:" opt; do
+  case ${opt} in
+    A )
+      ArchiveDir=$OPTARG
+      ;;
+    H )
+      FromHost=$OPTARG
+      ;;
+    D )
+      DateCriteria=$OPTARG
+      ;;
+    \? )
+      echo "Invalid option: -$OPTARG" >&2
+      usage
+      ;;
+    : )
+      echo "Option -$OPTARG requires an argument." >&2
+      usage
+      ;;
+  esac
+done
+# ---------------- cmdline
+
+
 if [ "${FromHost}" == "" ]
 then
     usage
 fi
 
-ArchiveDir=${2}
-if [ "${ArchiveDir}" == "" ]
-then
-    usage
-fi
-
-Days=${3}
-if [ "${Days}" == "" ]
-then
-    Days=2
-fi
-
-DateCriteria="${Days} days ago"
-
 TargetHost=cloud21.cvtt.vpn
 TargetRootDir=/opt/store/cvtt/archive
 
-Oldest=$(date -d "${DateCriteria}" '+%Y-%m-%d')
-Now=$(date '+%Y%m%d_%H%M%S')
+Oldest=$(date -d "${DateCriteria}" '+%Y-%m-%d %H:%M:%S')
 
 echo "Looking for log files older than ${DateCriteria} in ${ArchiveDir}"
 Cmd="find ${ArchiveDir}/"
@@ -45,7 +62,7 @@ Cmd="${Cmd} -o -name '*.logs.*'"
 Cmd="${Cmd} -o -name '*.tgz'"
 Cmd="${Cmd} ')'"
 Cmd="${Cmd} -type f"
-Cmd="${Cmd} -not -newermt ${Oldest}"
+Cmd="${Cmd} -not -newermt \"${Oldest}\""
 
 echo ${Cmd}
 files=$(eval ${Cmd})