From afc4a45b0f8be23836a5249cf68963eed225d4ed Mon Sep 17 00:00:00 2001
From: Oleg Sheynin <osheynin@gmail.com>
Date: Tue, 30 Jul 2024 12:11:54 -0400
Subject: [PATCH] progress

---
 market_data/md_recorder/run_md_recorder.sh         |  7 +------
 market_data/md_recorder_monitor/.creds             | 14 +++++++-------
 market_data/md_recorder_monitor/run_mdr_monitor.sh |  9 +++++----
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/market_data/md_recorder/run_md_recorder.sh b/market_data/md_recorder/run_md_recorder.sh
index 82d04f2..4dc4980 100755
--- a/market_data/md_recorder/run_md_recorder.sh
+++ b/market_data/md_recorder/run_md_recorder.sh
@@ -32,45 +32,40 @@ ConfigServer=cloud23.cvtt.vpn:6789
 Cmd="python3.10"
 Cmd="${Cmd} cvttpy/apps/md/md_recorder.py"
 Cmd="${Cmd} --config=http://${ConfigServer}/apps/md_recorder"
+Cmd="${Cmd} --credentials_file=/.creds"
 if [ "${job}" == "BNBFUT_CLD21" ] ; then
     Cmd="${Cmd} --active_exchanges=BNBFUT"
     Cmd="${Cmd} --instruments=BNBFUT:PERP-BTC-USDT,BNBFUT:PERP-ETH-USDT"
-    Cmd="${Cmd} --credentials_file=/.creds"
     Cmd="${Cmd} --db_credentials_key=TSDB_MD_CLD21"
     Cmd="${Cmd} --admin_port=7201"
     Cmd="${Cmd} --log_file=/logs/%T.MD_REC.BNBFUT.CLD21.log"
 elif [ "${job}" == "COINBASE_CLD21" ] ; then
     Cmd="${Cmd} --active_exchanges=COINBASE_AT"
     Cmd="${Cmd} --instruments=COINBASE:PAIR-BTC-USD,COINBASE:PAIR-ETH-USD,COINBASE:PAIR-LTC-USD,COINBASE:PAIR-XRP-USD"
-    Cmd="${Cmd} --credentials_file=/.creds"
     Cmd="${Cmd} --db_credentials_key=TSDB_MD_CLD21"
     Cmd="${Cmd} --admin_port=7202"
     Cmd="${Cmd} --log_file=/logs/%T.MD_REC.COINBASE.CLD21.log"
 elif [ "${job}" == "BNBSPOT_CLD21" ] ; then
     Cmd="${Cmd} --active_exchanges=BNBSPOT"
     Cmd="${Cmd} --instruments=BNBSPOT:PAIR-BTC-USDT,BNBSPOT:PAIR-ETH-USDT,BNBSPOT:PAIR-LTC-USDT,BNBSPOT:PAIR-XRP-USDT,BNBSPOT:PAIR-USDC-USDT"
-    Cmd="${Cmd} --credentials_file=/.creds"
     Cmd="${Cmd} --db_credentials_key=TSDB_MD_CLD21"
     Cmd="${Cmd} --admin_port=7203"
     Cmd="${Cmd} --log_file=/logs/%T.MD_REC.BNBSPOT.CLD21.log"
 elif [ "${job}" == "BNBSPOT_CVTTDATA" ] ; then
     Cmd="${Cmd} --active_exchanges=BNBSPOT"
     Cmd="${Cmd} --instruments=BNBSPOT:PAIR-BTC-USDT,BNBSPOT:PAIR-ETH-USDT,BNBSPOT:PAIR-LTC-USDT,BNBSPOT:PAIR-XRP-USDT,BNBSPOT:PAIR-USDC-USDT"
-    Cmd="${Cmd} --credentials_file=/.creds"
     Cmd="${Cmd} --db_credentials_key=TSDB_MD_CVTTDATA"
     Cmd="${Cmd} --admin_port=7204"
     Cmd="${Cmd} --log_file=/logs/%T.MD_REC.BNBSPOT.CVTTDATA.log"
 elif [ "${job}" == "BNBFUT_CVTTDATA" ] ; then
     Cmd="${Cmd} --active_exchanges=BNBFUT"
     Cmd="${Cmd} --instruments=BNBFUT:PERP-BTC-USDT,BNBFUT:PERP-ETH-USDT"
-    Cmd="${Cmd} --credentials_file=/.creds"
     Cmd="${Cmd} --db_credentials_key=TSDB_MD_CVTTDATA"
     Cmd="${Cmd} --admin_port=7205"
     Cmd="${Cmd} --log_file=/logs/%T.MD_REC.BNBFUT.CVTTDATA.log"
 elif [ "${job}" == "COINBASE_CVTTDATA" ] ; then
     Cmd="${Cmd} --active_exchanges=COINBASE_AT"
     Cmd="${Cmd} --instruments=COINBASE:PAIR-BTC-USD,COINBASE:PAIR-ETH-USD,COINBASE:PAIR-LTC-USD,COINBASE:PAIR-XRP-USD"
-    Cmd="${Cmd} --credentials_file=/.creds"
     Cmd="${Cmd} --db_credentials_key=TSDB_MD_CVTTDATA"
     Cmd="${Cmd} --admin_port=7206"
     Cmd="${Cmd} --log_file=/logs/%T.MD_REC.COINBASE.CVTTDATA.log"
diff --git a/market_data/md_recorder_monitor/.creds b/market_data/md_recorder_monitor/.creds
index 345503a..ad55b2d 100644
--- a/market_data/md_recorder_monitor/.creds
+++ b/market_data/md_recorder_monitor/.creds
@@ -1,22 +1,22 @@
 {
-    "__dummy__": null
+    "__dummy": null
     , "MATTERMOST": {
         "url": "https://mattermost.cryptovaltrading.com"
         , "team": "CVTT"
         , "bearer": "5ysaaxjeijrwjbmhuzcuos9ano"
     }
-    , "TSDB_MD_CLD21": {
+    , "TSDB_MD_CLD21_RO": {
         "host": "cloud21.cvtt.vpn"
         , "port": 5432
-        , "user": "cvtt"
+        , "user": "cvtt_ro"
         , "database": "cvtt_md"
-        , "password": "ICdIh0JnMM7vM7Pf"
+        , "password": "3Gkotqa0ZSmZLXSH3RkTUm"
     }
-    , "TSDB_MD_CVTTDATA": {
+    , "TSDB_MD_CVTTDATA_RO": {
         "host": "cvttdata.cvtt.vpn"
         , "port": 5432
-        , "user": "cvtt"
+        , "user": "cvtt_ro"
         , "database": "cvtt_md"
-        , "password": "ICdIh0JnMM7vM7Pf"
+        , "password": "3Gkotqa0ZSmZLXSH3RkTUm"
     }
 }
diff --git a/market_data/md_recorder_monitor/run_mdr_monitor.sh b/market_data/md_recorder_monitor/run_mdr_monitor.sh
index d4c9c13..fbc2afa 100755
--- a/market_data/md_recorder_monitor/run_mdr_monitor.sh
+++ b/market_data/md_recorder_monitor/run_mdr_monitor.sh
@@ -2,12 +2,13 @@
 
 # runs in container
 
+ValidInstances=('CLD21' 'CVTTDATA')
+
 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[@]}";
@@ -31,16 +32,16 @@ if [ "${2}" != "" ]; then
 fi
 
 
-
 # ConfigServer=cloud16.cvtt.vpn
 ConfigServer=cloud23.cvtt.vpn:6789
 
 Cmd="python3.10"
 Cmd="${Cmd} cvttpy/apps/md/md_rec_monitor.py"
-Cmd="${Cmd} --config=http://c${ConfigServer}/apps/md_rec_monitor"
+Cmd="${Cmd} --config=http://${ConfigServer}/apps/md_rec_monitor"
 Cmd="${Cmd} --db=${Instance}"
+Cmd="${Cmd} --credentials_file=/.creds"
 Cmd="${Cmd} --admin_port=${AdminPort}"
-Cmd="${Cmd} --log_file=/logs/%%T.MD_REC.MONITOR.${Instance}.log
+Cmd="${Cmd} --log_file=/logs/%T.MD_REC.MONITOR.${Instance}.log"
 
 
 echo ${Cmd}