From 82aac507026dafce918794a7cde2146753065670 Mon Sep 17 00:00:00 2001 From: Cryptoval Trading Technologies Date: Thu, 14 Aug 2025 20:55:32 +0000 Subject: [PATCH] upgrade --- .env | 8 +++++--- config/.creds | 35 +++++++++++++++++++++-------------- config/md_rec_monitor.cfg | 12 ++++++------ docker-compose.yml | 15 ++++++++------- 4 files changed, 40 insertions(+), 30 deletions(-) diff --git a/.env b/.env index 8ed0731..5cbd618 100644 --- a/.env +++ b/.env @@ -1,4 +1,6 @@ -MD_RECORDER_VERSION=0.1.1 +CVTT_DOCKER_REGISTRY=cloud16.cvtt.vpn:5543 + +MD_RECORDER_VERSION=1.0.1 CONFIG_SERVICE=cloud16.cvtt.vpn:6789 CONFIG_FILE=/config/md_rec_monitor.cfg @@ -7,5 +9,5 @@ CREDS_FILE=/config/.creds MDRM_CLOUD28_ADMPORT=27202 CLOUD28_ADD_ARGS=--compress_log -MDRM_CLOUD24_ADMPORT=27203 -CLOUD24_ADD_ARGS=--compress_log +MDRM_CLOUD29_ADMPORT=27203 +CLOUD29_ADD_ARGS=--compress_log diff --git a/config/.creds b/config/.creds index ae50f66..fa12ad3 100644 --- a/config/.creds +++ b/config/.creds @@ -1,21 +1,28 @@ { + "INFISICAL": { + "url": "https://infisical.cvtt.net" + , "client_id": "e330a1c4-08dc-452f-ac02-5b37fff4ab3e" + , "client_secret": "190554828c3c342f63517320ac029f822b6358aa6187aec266465d0bde4d6b3c" + , "workspace_id": "6923c950-8473-4cec-818f-10df41d8b39c" + , "environment": "dev" + }, + // "TSDB_MD_CLOUD28_RO": { + // "host": "cloud28.cvtt.vpn" + // , "port": 55432 + // , "user": "cvtt_ro" + // , "database": "cvtt_md" + // , "password": "c63eb05adc99b17a71fe4fc810fe1b98" + // } , + // "TSDB_MD_CLOUD29_RO": { + // "host": "cloud29.cvtt.vpn" + // , "port": 55432 + // , "user": "cvtt_ro" + // , "database": "cvtt_md" + // , "password": "afa3151120e945a817d1d4ec0a1d5b81" + // }, "MATTERMOST": { "url": "https://mattermost.cryptovaltrading.com" , "team": "CVTT" , "bearer": "5ysaaxjeijrwjbmhuzcuos9ano" - }, - "TSDB_MD_CLOUD28_RO": { - "host": "cloud28.cvtt.vpn" - , "port": 55432 - , "user": "cvtt_ro" - , "database": "cvtt_md" - , "password": "c63eb05adc99b17a71fe4fc810fe1b98" - } , - "TSDB_MD_CLOUD24_RO": { - "host": "cloud24.cvtt.vpn" - , "port": 55432 - , "user": "cvtt_ro" - , "database": "cvtt_md" - , "password": "afa3151120e945a817d1d4ec0a1d5b81" } } diff --git a/config/md_rec_monitor.cfg b/config/md_rec_monitor.cfg index 395cb5b..9aa454e 100644 --- a/config/md_rec_monitor.cfg +++ b/config/md_rec_monitor.cfg @@ -4,12 +4,12 @@ , "after_alert_interval_sec": 120.0 # , "db": { "CLOUD28": { - "class": "cvttpy.tools.db.timescale.tsdb_client.TimescaleDbClient" + "class": "cvttpy_tools.db.timescale.tsdb_client.TimescaleDbClient" , "cred_key": "TSDB_MD_CLOUD28_RO" }, - "CLOUD24": { - "class": "cvttpy.tools.db.timescale.tsdb_client.TimescaleDbClient" - , "cred_key": "TSDB_MD_CLOUD24_RO" + "CLOUD29": { + "class": "cvttpy_tools.db.timescale.tsdb_client.TimescaleDbClient" + , "cred_key": "TSDB_MD_CLOUD29_RO" } } , "mmost": { @@ -34,13 +34,13 @@ "tables": ["bnbspot.md_booktops"] , "exchange_id": "BNBSPOT" , "instruments": ["PAIR-BTC-USDT"] - , "threshold_sec": 30.0 + , "threshold_sec": 60.0 } , "BNBSPOT-2": { "tables": ["bnbspot.md_trades"] , "exchange_id": "BNBSPOT" , "instruments": ["PAIR-BTC-USDT"] - , "threshold_sec": 30.0 + , "threshold_sec": 45.0 } , "COINBASE-1": { "tables": ["coinbase.md_booktops"] diff --git a/docker-compose.yml b/docker-compose.yml index fe5ff95..3fc5e96 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,7 @@ +# ---------------------------- Market Data Recorder Monitor docker compose services: md_rec_mon_cloud28: - image: cloud21.cvtt.vpn:5500/md_recorder_monitor:${MD_RECORDER_VERSION} + image: ${CVTT_DOCKER_REGISTRY}/md_recorder_monitor:${MD_RECORDER_VERSION} container_name: md_rec_mon.CLOUD28 user: ${CVTT_USER:-1001:1001} pull_policy: always @@ -17,9 +18,9 @@ services: ports: - ${MDRM_CLOUD28_ADMPORT}:7200 - md_rec_mon_cloud24: - image: cloud21.cvtt.vpn:5500/md_recorder_monitor:${MD_RECORDER_VERSION} - container_name: md_rec_mon.CLOUD24 + md_rec_mon_cloud29: + image: ${CVTT_DOCKER_REGISTRY}/md_recorder_monitor:${MD_RECORDER_VERSION} + container_name: md_rec_mon.CLOUD29 user: ${CVTT_USER:-1001:1001} pull_policy: always restart: unless-stopped @@ -27,11 +28,11 @@ services: CONFIG_SERVICE: ${CONFIG_SERVICE:-cloud16.cvtt.vpn:6789} CONFIG_FILE: ${CONFIG_FILE:-/config/md_recorder.cfg} CREDS_FILE: ${CREDS_FILE} - MDR_INSTANCE: CLOUD24 - MDR_ADD_ARGS: ${CLOUD24_ADD_ARGS} + MDR_INSTANCE: CLOUD29 + MDR_ADD_ARGS: ${CLOUD29_ADD_ARGS} volumes: - ./config:/config - ./logs:/logs ports: - - ${MDRM_CLOUD24_ADMPORT}:7200 + - ${MDRM_CLOUD29_ADMPORT}:7200