diff --git a/.env b/.env index a256296..e748002 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -MD_RECORDER_VERSION=0.0.8 +MD_RECORDER_VERSION=0.0.9 CONFIG_SERVICE=cloud16.cvtt.vpn:6789 CONFIG_FILE=/config/md_rec_monitor.cfg @@ -7,8 +7,5 @@ CREDS_FILE=/config/.creds MDRM_CLOUD21_ADMPORT=27201 CLOUD21_ADD_ARGS=--compress_log -MDRM_CVTTDATA_ADMPORT=27203 -CVTTDATA_ADD_ARGS=--compress_log - MDRM_CLOUD28_ADMPORT=27202 CLOUD28_ADD_ARGS=--compress_log diff --git a/config/.creds b/config/.creds index ad55b2d..6b98955 100644 --- a/config/.creds +++ b/config/.creds @@ -12,11 +12,11 @@ , "database": "cvtt_md" , "password": "3Gkotqa0ZSmZLXSH3RkTUm" } - , "TSDB_MD_CVTTDATA_RO": { - "host": "cvttdata.cvtt.vpn" - , "port": 5432 + "TSDB_MD_CLOUD28_RO": { + "host": "cloud28.cvtt.vpn" + , "port": 55432 , "user": "cvtt_ro" , "database": "cvtt_md" - , "password": "3Gkotqa0ZSmZLXSH3RkTUm" - } + , "password": "c63eb05adc99b17a71fe4fc810fe1b98" + } } diff --git a/config/md_rec_monitor.cfg b/config/md_rec_monitor.cfg index bb33cac..838a84a 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": { - "CVTTDATA": { - "class": "cvttpy.tools.db.timescale.tsdb_client.TimescaleDbClient" - , "cred_key": "TSDB_MD_CVTTDATA_RO" - } "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" } } , "mmost": { diff --git a/docker-compose.yml b/docker-compose.yml index 706d013..c7a495a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,27 +17,9 @@ services: 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 - # 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: CLOUD28 - # MDR_ADD_ARGS: ${CLOUD28_ADD_ARGS} - # volumes: - # - ./config:/config - # - ./logs:/logs - # ports: - # - ${MDRM_CLOUD28_ADMPORT}:7200 - - md_rec_mon_cvttdata: + md_rec_mon_cloud28: image: cloud21.cvtt.vpn:5500/md_recorder_monitor:${MD_RECORDER_VERSION} - container_name: md_rec_mon.CVTTDATA + container_name: md_rec_mon.CLOUD28 user: ${CVTT_USER:-1001:1001} pull_policy: always restart: unless-stopped @@ -45,10 +27,11 @@ services: CONFIG_SERVICE: ${CONFIG_SERVICE:-cloud16.cvtt.vpn:6789} CONFIG_FILE: ${CONFIG_FILE:-/config/md_recorder.cfg} CREDS_FILE: ${CREDS_FILE} - MDR_INSTANCE: CVTTDATA - MDR_ADD_ARGS: ${CVTTDATA_ADD_ARGS} + MDR_INSTANCE: CLOUD28 + MDR_ADD_ARGS: ${CLOUD28_ADD_ARGS} volumes: - ./config:/config - ./logs:/logs ports: - - ${MDRM_CVTTDATA_ADMPORT}:7200 + - ${MDRM_CLOUD28_ADMPORT}:7200 +