diff --git a/.env b/.env index 12140cf..c097b0f 100644 --- a/.env +++ b/.env @@ -5,49 +5,49 @@ CONFIG_FILE=/config/md_recorder.cfg CREDS_FILE=/config/.creds # coinbase-cvttdata -CB24_DEBUG=N -CB24_DEBUG_WAIT=Y -CB24_DEBUG_PORT=45678 +CB29_DEBUG=N +CB29_DEBUG_WAIT=Y +CB29_DEBUG_PORT=45678 -CB24_CONTAINER_NAME=md_recorder.COINBASE_CLOUD24 -CB24_INSTRUMENT_GROUP=COINBASE_CLOUD24 -CB24_EXCHANGE_ACCT_NAME=COINBASE_AT -CB24_DB_CRED_KEY=TSDB_MD_CLOUD24 +CB29_CONTAINER_NAME=md_recorder.COINBASE_CLOUD29 +CB29_INSTRUMENT_GROUP=COINBASE_CLOUD29 +CB29_EXCHANGE_ACCT_NAME=COINBASE_AT +CB29_DB_CRED_KEY=TSDB_MD_CLOUD29 -CB24_LOG_FILE=/logs/%T.MD_REC.${CB24_INSTRUMENT_GROUP}.log -CB24_ADD_ARGS=--compress_log +CB29_LOG_FILE=/logs/%T.MD_REC.${CB29_INSTRUMENT_GROUP}.log +CB29_ADD_ARGS=--compress_log -CB24_ADMIN_PORT=8201 +CB29_ADMIN_PORT=8201 # bnspot-cvttdata -BS24_DEBUG=N -BS24_DEBUG_WAIT=Y -BS24_DEBUG_PORT=45679 +BS29_DEBUG=N +BS29_DEBUG_WAIT=Y +BS29_DEBUG_PORT=45679 -BS24_CONTAINER_NAME=md_recorder.BNBSPOT_CLOUD24 -BS24_INSTRUMENT_GROUP=BNBSPOT_CLOUD24 -BS24_EXCHANGE_ACCT_NAME=BNBSPOT -BS24_DB_CRED_KEY=TSDB_MD_CLOUD24 +BS29_CONTAINER_NAME=md_recorder.BNBSPOT_CLOUD29 +BS29_INSTRUMENT_GROUP=BNBSPOT_CLOUD29 +BS29_EXCHANGE_ACCT_NAME=BNBSPOT +BS29_DB_CRED_KEY=TSDB_MD_CLOUD29 -BS24_LOG_FILE=/logs/%T.MD_REC.${BS24_INSTRUMENT_GROUP}.log -BS24_ADD_ARGS=--compress_log +BS29_LOG_FILE=/logs/%T.MD_REC.${BS29_INSTRUMENT_GROUP}.log +BS29_ADD_ARGS=--compress_log -BS24_ADMIN_PORT=8202 +BS29_ADMIN_PORT=8202 # bnbfut-cvttdata -BF24_DEBUG=N -BF24_DEBUG_WAIT=Y -BF24_DEBUG_PORT=45680 +BF29_DEBUG=N +BF29_DEBUG_WAIT=Y +BF29_DEBUG_PORT=45680 -BF24_CONTAINER_NAME=md_recorder.BNBFUT_CLOUD24 -BF24_INSTRUMENT_GROUP=BNBFUT_CLOUD24 -BF24_EXCHANGE_ACCT_NAME=BNBFUT -BF24_DB_CRED_KEY=TSDB_MD_CLOUD24 +BF29_CONTAINER_NAME=md_recorder.BNBFUT_CLOUD29 +BF29_INSTRUMENT_GROUP=BNBFUT_CLOUD29 +BF29_EXCHANGE_ACCT_NAME=BNBFUT +BF29_DB_CRED_KEY=TSDB_MD_CLOUD29 -BF24_LOG_FILE=/logs/%T.MD_REC.${BF24_INSTRUMENT_GROUP}.log -BF24_ADD_ARGS=--compress_log +BF29_LOG_FILE=/logs/%T.MD_REC.${BF29_INSTRUMENT_GROUP}.log +BF29_ADD_ARGS=--compress_log -BF24_ADMIN_PORT=8203 +BF29_ADMIN_PORT=8203 diff --git a/config/.creds b/config/.creds index 6bef24e..70a43ad 100644 --- a/config/.creds +++ b/config/.creds @@ -1,12 +1,4 @@ { - "__dummy__": null - , "TSDB_MD_CLD21": { - "host": "cloud21.cvtt.vpn" - , "port": 5432 - , "user": "cvtt" - , "database": "cvtt_md" - , "password": "ICdIh0JnMM7vM7Pf" - }, "TSDB_MD_CLOUD28": { "host": "cloud28.cvtt.vpn" , "port": 55432 @@ -14,11 +6,11 @@ , "database": "cvtt_md" , "password": "320ea18a54b5bed71371256bd9b68d31" }, - "TSDB_MD_CLOUD24": { - "host": "cloud24.cvtt.vpn" + "TSDB_MD_CLOUD29": { + "host": "cloud29.cvtt.vpn" , "port": 55432 , "user": "cvtt" , "database": "cvtt_md" - , "password": "23a8c597a800d44906d01483e8940e77" + , "password": "e7442456805486c1c2b9d7b3449234f7" } } diff --git a/config/md_recorder.cfg b/config/md_recorder.cfg index bd133de..461fb64 100644 --- a/config/md_recorder.cfg +++ b/config/md_recorder.cfg @@ -71,7 +71,7 @@ , "md_recorder": { "instrument_groups": { - "BNBFUT_CLOUD24": [ + "BNBFUT_CLOUD29": [ "BNBFUT:PERP-BTC-USDT" , "BNBFUT:PERP-ETH-USDT" ], @@ -79,7 +79,7 @@ "BNBFUT:PERP-BTC-USDT" , "BNBFUT:PERP-ETH-USDT" ], - "BNBSPOT_CLOUD24": [ + "BNBSPOT_CLOUD29": [ "BNBSPOT:PAIR-ADA-USDT" , "BNBSPOT:PAIR-BCH-USDT" , "BNBSPOT:PAIR-BTC-USDT" @@ -101,7 +101,7 @@ , "BNBSPOT:PAIR-USDC-USDT" , "BNBSPOT:PAIR-XRP-USDT" ], - "COINBASE_CLOUD24": [ + "COINBASE_CLOUD29": [ "COINBASE:PAIR-ADA-USD" , "COINBASE:PAIR-BCH-USD" , "COINBASE:PAIR-BTC-USD" diff --git a/docker-compose.yml b/docker-compose.yml index 8bc2f3b..2a0a656 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ services: - cbspot24_md_recorder: + cbspot29_md_recorder: image: cloud21.cvtt.vpn:5500/md_recorder:${MD_RECORDER_VERSION} - container_name: ${CB24_CONTAINER_NAME} + container_name: ${CB29_CONTAINER_NAME} user: ${CVTT_USER:-1001:1001} pull_policy: always restart: unless-stopped @@ -9,25 +9,25 @@ services: CONFIG_SERVICE: ${CONFIG_SERVICE:-cloud16.cvtt.vpn:6789} CONFIG_FILE: ${CONFIG_FILE:-/config/md_recorder.cfg} CREDS_FILE: ${CREDS_FILE} - EXCHANGE_ACCT_NAME: ${CB24_EXCHANGE_ACCT_NAME} - INSTRUMENT_GROUP: ${CB24_INSTRUMENT_GROUP} - DB_CRED_KEY: ${CB24_DB_CRED_KEY} - LOG_FILE: ${CB24_LOG_FILE} - ADD_ARGS: ${CB24_ADD_ARGS:-} - MDREC_DEBUG: ${CB24_DEBUG:-N} - MDREC_DEBUG_WAIT: ${CB24_DEBUG_WAIT:-N} + EXCHANGE_ACCT_NAME: ${CB29_EXCHANGE_ACCT_NAME} + INSTRUMENT_GROUP: ${CB29_INSTRUMENT_GROUP} + DB_CRED_KEY: ${CB29_DB_CRED_KEY} + LOG_FILE: ${CB29_LOG_FILE} + ADD_ARGS: ${CB29_ADD_ARGS:-} + MDREC_DEBUG: ${CB29_DEBUG:-N} + MDREC_DEBUG_WAIT: ${CB29_DEBUG_WAIT:-N} volumes: - ./config:/config - ./logs:/logs ports: - - ${CB24_ADMIN_PORT}:7200 - - ${CB24_DEBUG_PORT}:5678 + - ${CB29_ADMIN_PORT}:7200 + - ${CB29_DEBUG_PORT}:5678 depends_on: - timescaledb - bnbspot24_md_recorder: + bnbspot29_md_recorder: image: cloud21.cvtt.vpn:5500/md_recorder:${MD_RECORDER_VERSION} - container_name: ${BS24_CONTAINER_NAME} + container_name: ${BS29_CONTAINER_NAME} user: ${CVTT_USER:-1001:1001} pull_policy: always restart: unless-stopped @@ -35,27 +35,27 @@ services: CONFIG_SERVICE: ${CONFIG_SERVICE:-cloud16.cvtt.vpn:6789} CONFIG_FILE: ${CONFIG_FILE:-/config/md_recorder.cfg} CREDS_FILE: ${CREDS_FILE} - EXCHANGE_ACCT_NAME: ${BS24_EXCHANGE_ACCT_NAME} - INSTRUMENT_GROUP: ${BS24_INSTRUMENT_GROUP} - DB_CRED_KEY: ${BS24_DB_CRED_KEY} - LOG_FILE: ${BS24_LOG_FILE} - ADD_ARGS: ${BS24_ADD_ARGS:-} - MDREC_DEBUG: ${BS24_DEBUG:-N} - MDREC_DEBUG_WAIT: ${BS24_DEBUG_WAIT:-N} + EXCHANGE_ACCT_NAME: ${BS29_EXCHANGE_ACCT_NAME} + INSTRUMENT_GROUP: ${BS29_INSTRUMENT_GROUP} + DB_CRED_KEY: ${BS29_DB_CRED_KEY} + LOG_FILE: ${BS29_LOG_FILE} + ADD_ARGS: ${BS29_ADD_ARGS:-} + MDREC_DEBUG: ${BS29_DEBUG:-N} + MDREC_DEBUG_WAIT: ${BS29_DEBUG_WAIT:-N} volumes: - ./config:/config - ./logs:/logs ports: - - ${BS24_ADMIN_PORT}:7200 - - ${BS24_DEBUG_PORT}:5678 + - ${BS29_ADMIN_PORT}:7200 + - ${BS29_DEBUG_PORT}:5678 depends_on: - timescaledb - bnbfut24_md_recorder: - profiles: - - manual + bnbfut29_md_recorder: + # profiles: + # - manual image: cloud21.cvtt.vpn:5500/md_recorder:${MD_RECORDER_VERSION} - container_name: ${BF24_CONTAINER_NAME} + container_name: ${BF29_CONTAINER_NAME} user: ${CVTT_USER:-1001:1001} pull_policy: always restart: unless-stopped @@ -63,19 +63,19 @@ services: CONFIG_SERVICE: ${CONFIG_SERVICE:-cloud16.cvtt.vpn:6789} CONFIG_FILE: ${CONFIG_FILE:-/config/md_recorder.cfg} CREDS_FILE: ${CREDS_FILE} - EXCHANGE_ACCT_NAME: ${BF24_EXCHANGE_ACCT_NAME} - INSTRUMENT_GROUP: ${BF24_INSTRUMENT_GROUP} - DB_CRED_KEY: ${BF24_DB_CRED_KEY} - LOG_FILE: ${BF24_LOG_FILE} - ADD_ARGS: ${BF24_ADD_ARGS:-} - MDREC_DEBUG: ${BF24_DEBUG:-N} - MDREC_DEBUG_WAIT: ${BF24_DEBUG_WAIT:-N} + EXCHANGE_ACCT_NAME: ${BF29_EXCHANGE_ACCT_NAME} + INSTRUMENT_GROUP: ${BF29_INSTRUMENT_GROUP} + DB_CRED_KEY: ${BF29_DB_CRED_KEY} + LOG_FILE: ${BF29_LOG_FILE} + ADD_ARGS: ${BF29_ADD_ARGS:-} + MDREC_DEBUG: ${BF29_DEBUG:-N} + MDREC_DEBUG_WAIT: ${BF29_DEBUG_WAIT:-N} volumes: - ./config:/config - ./logs:/logs ports: - - ${BF24_ADMIN_PORT}:7200 - - ${BF24_DEBUG_PORT}:5678 + - ${BF29_ADMIN_PORT}:7200 + - ${BF29_DEBUG_PORT}:5678 depends_on: - timescaledb