diff --git a/.env b/.env index e748002..8ed0731 100644 --- a/.env +++ b/.env @@ -1,11 +1,11 @@ -MD_RECORDER_VERSION=0.0.9 +MD_RECORDER_VERSION=0.1.1 CONFIG_SERVICE=cloud16.cvtt.vpn:6789 CONFIG_FILE=/config/md_rec_monitor.cfg CREDS_FILE=/config/.creds -MDRM_CLOUD21_ADMPORT=27201 -CLOUD21_ADD_ARGS=--compress_log - MDRM_CLOUD28_ADMPORT=27202 CLOUD28_ADD_ARGS=--compress_log + +MDRM_CLOUD24_ADMPORT=27203 +CLOUD24_ADD_ARGS=--compress_log diff --git a/config/.creds b/config/.creds index 6b98955..ae50f66 100644 --- a/config/.creds +++ b/config/.creds @@ -1,22 +1,21 @@ { - "__dummy": null - , "MATTERMOST": { + "MATTERMOST": { "url": "https://mattermost.cryptovaltrading.com" , "team": "CVTT" , "bearer": "5ysaaxjeijrwjbmhuzcuos9ano" - } - , "TSDB_MD_CLD21_RO": { - "host": "cloud21.cvtt.vpn" - , "port": 5432 - , "user": "cvtt_ro" - , "database": "cvtt_md" - , "password": "3Gkotqa0ZSmZLXSH3RkTUm" - } + }, "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 838a84a..395cb5b 100644 --- a/config/md_rec_monitor.cfg +++ b/config/md_rec_monitor.cfg @@ -3,13 +3,13 @@ , "status_report_interval_sec": 3600.0 , "after_alert_interval_sec": 120.0 # , "db": { - "CLOUD21": { - "class": "cvttpy.tools.db.timescale.tsdb_client.TimescaleDbClient" - , "cred_key": "TSDB_MD_CLD21_RO" - }, "CLOUD28": { "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" } } , "mmost": { diff --git a/docker-compose.yml b/docker-compose.yml index c7a495a..fe5ff95 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,22 +1,4 @@ services: - md_rec_mon_cloud21: - image: cloud21.cvtt.vpn:5500/md_recorder_monitor:${MD_RECORDER_VERSION} - container_name: md_rec_mon.CLOUD21 - user: ${CVTT_USER:-1001:1001} - pull_policy: always - restart: unless-stopped - environment: - CONFIG_SERVICE: ${CONFIG_SERVICE:-cloud16.cvtt.vpn:6789} - CONFIG_FILE: ${CONFIG_FILE:-/config/md_recorder.cfg} - CREDS_FILE: ${CREDS_FILE} - MDR_INSTANCE: CLOUD21 - MDR_ADD_ARGS: ${CLOUD21_ADD_ARGS} - volumes: - - ./config:/config - - ./logs:/logs - ports: - - ${MDRM_CLOUD21_ADMPORT}:7200 - md_rec_mon_cloud28: image: cloud21.cvtt.vpn:5500/md_recorder_monitor:${MD_RECORDER_VERSION} container_name: md_rec_mon.CLOUD28 @@ -35,3 +17,21 @@ 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 + user: ${CVTT_USER:-1001:1001} + pull_policy: always + restart: unless-stopped + environment: + 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} + volumes: + - ./config:/config + - ./logs:/logs + ports: + - ${MDRM_CLOUD24_ADMPORT}:7200 +