diff --git a/data/admin/cvtt_hosts.cfg b/data/admin/cvtt_hosts.cfg index a8a22f2..a6096ba 100644 --- a/data/admin/cvtt_hosts.cfg +++ b/data/admin/cvtt_hosts.cfg @@ -37,28 +37,23 @@ "users": ["oleg", "cvtt"], "docker": "true", }, - "cloud24": { + "cloud28": { "type": "cloud", "users": ["oleg", "cvtt"], "docker": "true", }, - "cloud27": { + "cloud29": { + "type": "cloud", + "users": ["oleg", "cvtt"], + "docker": "true", + }, + "cloud30": { "type": "cloud", "users": ["oleg", "cvtt"], "docker": "true", }, // ----------- B a r e M e t a l - # "homestore": { - # "type": "metal", - # "users": ["oleg"], - # "docker": "true", - # }, - # "nsbackup": { - # "type": "metal", - # "users": ["oleg"], - # "docker": "false", - # }, "hs01": { "type": "metal", "users": ["oleg", "cvtt", "cvttdist", "git"], @@ -69,34 +64,23 @@ "users": ["oleg"], "docker": "false", }, - "cryptoval2": { - "type": "metal", - "users": ["oleg"], - "docker": "false", - "desktop": "true", - }, - "cryptoval3": { + "cv05": { "type": "metal", "users": ["oleg", "cvtt"], "docker": "true", "desktop": "true", }, - "cryptoval4": { - "type": "metal", - "users": ["oleg", "cvtt"], - "docker": "true", - "desktop": "true", - }, - "dtvmhost": { + "cv06": { "type": "metal", "users": ["oleg"], "docker": "false", "desktop": "true", }, - "gpushnik": { + "office-oleg-02": { "type": "metal", - "users": ["oleg", "cvtt", "yasha"], - "docker": "true", + "users": ["oleg"], + "docker": "false", + "desktop": "true", }, // ----------- V i r t u a l M a c h i n e s @@ -106,86 +90,49 @@ "users": ["oleg"], "docker": "true", "gui": "true", - }, - "cvtt-dev": { - "type": "vm", - "users": ["oleg"], - "docker": "true", - "gui": "true", - }, - "cvtt-edu": { - "type": "vm", - "users": ["oleg"], - "docker": "false", - "gui": "true", - }, - # "cvtt-research": { - # "type": "vm", - # "users": ["oleg"], - # "docker": "true", - # "gui": "true", - # }, - "research-02": { - "type": "vm", - "users": ["oleg"], - "docker": "true", - "gui": "true", "to_check": "No", }, - "cvtt-write": { - "type": "vm", - "users": ["oleg"], - "docker": "true", - "gui": "true", - }, + # Complete the list of GUI/Desktop VMs "desktop": { "type": "vm", "users": ["oleg"], "docker": "false", "gui": "true", + "to_check": "No", }, "home-fin": { "type": "vm", "users": ["oleg"], "docker": "false", "gui": "true", + "to_check": "No", }, // -- Headless - "cvtt-build": { - "type": "vm", - "users": ["oleg"], - "docker": "true", - }, + # "cvtt-build": { + # "type": "vm", + # "users": ["oleg"], + # "docker": "true", + # "to_check": "No", + # }, "cvtt-md": { "type": "vm", "users": ["oleg", "cvtt"], "docker": "true", }, - "cvtt-prod-eqty-01": { - "type": "vm", - "users": ["oleg", "cvtt"], - "docker": "true", - "to_check": "No", - }, - "cvttdata": { - "type": "vm", - "users": ["oleg", "cvtt"], - "docker": "true", - }, - "cvtt-testserver": { - "type": "vm", - "users": ["oleg", "cvtt"], - "docker": "true", - "to_check": "No", - }, - "cvtt-testdb": { - "type": "vm", - "users": ["oleg", "cvtt"], - "docker": "true", - "to_check": "false", - "timeout_sec": 11, - }, + # "cvtt-testserver": { + # "type": "vm", + # "users": ["oleg", "cvtt"], + # "docker": "true", + # "to_check": "No", + # }, + # "cvtt-testdb": { + # "type": "vm", + # "users": ["oleg", "cvtt"], + # "docker": "true", + # "to_check": "false", + # "timeout_sec": 11, + # }, "ops-server": { "type": "vm", "users": ["oleg", "cvtt"], @@ -197,6 +144,12 @@ "docker": "true", "to_check": "Yes", }, + "dev-server-02": { + "type": "vm", + "users": ["oleg", "cvtt"], + "docker": "true", + "to_check": "Yes", + }, }, "cryptovaltrading.com": { diff --git a/data/admin/cvtt_services.cfg b/data/admin/cvtt_services.cfg index fa3c3df..239d318 100644 --- a/data/admin/cvtt_services.cfg +++ b/data/admin/cvtt_services.cfg @@ -8,8 +8,10 @@ "Gitea": { "to_check": "Yes", "protocol": "http", - "host": "cloud27.cvtt.vpn", - "port": 3000 + "host": "gitea.cvtt.net", + "port": 443 + # "host": "cloud30.cvtt.net", + # "port": 3000 }, "Docker Registry": { "to_check": "Yes", @@ -47,27 +49,27 @@ "host": "cloud23.cvtt.vpn", "port": 5678 }, - "PyTorch (Jupyter)": { - "to_check": "No", - "protocol": "http", - "host": "gpushnik.cvtt.vpn", - "port": 8888 - }, - "TensorFlow (Jupyter)": { - "to_check": "No", - "protocol": "http", - "host": "gpushnik.cvtt.vpn", - "port": 9999 - }, + # "PyTorch (Jupyter)": { + # "to_check": "No", + # "protocol": "http", + # "host": "gpushnik.cvtt.vpn", + # "port": 8888 + # }, + # "TensorFlow (Jupyter)": { + # "to_check": "No", + # "protocol": "http", + # "host": "gpushnik.cvtt.vpn", + # "port": 9999 + # }, - "FastAI (Jupyter)": { - "to_check": "No", - "protocol": "http", - "host": "gpushnik.cvtt.vpn", - "port": 7777 - }, + # "FastAI (Jupyter)": { + # "to_check": "No", + # "protocol": "http", + # "host": "gpushnik.cvtt.vpn", + # "port": 7777 + # }, "Jenkins": { - "to_check": "Yes", + "to_check": "No", "protocol": "http", "host": "cvtt-build.cvtt.vpn", "port": 8080 diff --git a/data/apps/common/comm.cfg b/data/apps/common/comm.cfg index 444ae5d..97fa7b8 100644 --- a/data/apps/common/comm.cfg +++ b/data/apps/common/comm.cfg @@ -20,8 +20,8 @@ , "read_timeout" : 0.01 , "ping_timeout_secs": 2.0 } - , "cvtt-prod-01": { - "url": "redis://cvtt-prod-01.cvtt.vpn:16379" + , "cloud29": { + "url": "redis://cloud29.cvtt.vpn:6379" , "type": "redis" , "read_timeout" : 0.01 , "ping_timeout_secs": 2.0 diff --git a/data/apps/cvtt_musvc.cfg b/data/apps/cvtt_musvc.cfg index e971a3f..7733e8d 100644 --- a/data/apps/cvtt_musvc.cfg +++ b/data/apps/cvtt_musvc.cfg @@ -1,5 +1,8 @@ @var COORDINATOR_REST_PORT=23456 -@var COORDINATOR_WS_PORT=12345 +# @var COORDINATOR_WS_PORT=12345 + +@var PRICER_REST_PORT=23457 +@var PRICER_WS_PORT=12346 @var GLOBAL_CHANNEL_PREFIX=CVTT_MU @@ -19,9 +22,9 @@ "port": ${COORDINATOR_REST_PORT}, "base_url": ["POST", "http://localhost:${COORDINATOR_REST_PORT}"] } - , "WS": { - "url": "ws://localhost:${COORDINATOR_WS_PORT}/ws" - } + # , "WS": { + # "url": "ws://localhost:${COORDINATOR_WS_PORT}/ws" + # } } } , "market_data_gateway": { @@ -47,10 +50,10 @@ "COINBASE_AT" , "BNBSPOT" , "BNBFUT" - , "KRAKEN" - , "BITSTAMP" - , "OKX" - , "GEMINI" + # , "KRAKEN" + # , "BITSTAMP" + # , "OKX" + # , "GEMINI" , "ALPACA_SNDBX" ] } @@ -150,5 +153,14 @@ , "pricer": { "channel_prefix": "${GLOBAL_CHANNEL_PREFIX}.PXER" , "app_status_channel": "${GLOBAL_CHANNEL_PREFIX}.PXER_MUSVC_STATUS" + , "api": { + "REST": { + "port": ${PRICER_REST_PORT}, + "base_url": ["POST", "http://localhost:${PRICER_REST_PORT}"] + } + , "WS": { + "url": "ws://localhost:${PRICER_WS_PORT}/ws" + } + } } } \ No newline at end of file diff --git a/data/config_service.code-workspace b/data/config_service.code-workspace index bab1b7f..a78ed47 100644 --- a/data/config_service.code-workspace +++ b/data/config_service.code-workspace @@ -4,5 +4,7 @@ "path": ".." } ], - "settings": {} + "settings": { + "workbench.colorTheme": "Tomorrow Night Blue" + } } \ No newline at end of file diff --git a/data/refdata/exchanges.cfg b/data/refdata/exchanges.cfg index 0773cbd..5fd4c31 100644 --- a/data/refdata/exchanges.cfg +++ b/data/refdata/exchanges.cfg @@ -296,12 +296,12 @@ "class": "cvttpy.exchanges.coinbase.spot.oe_client.CoinbaseSpotOEClient" # D E P R E C A T E D - , "ws_url": ["WSS", "wss://advanced-trade-ws.coinbase.com"] - , "REST": { - "open_orders_url": ["GET", "https://api.coinbase.com/api/v3/brokerage/orders/historical/batch"] - , "submit_order_url": ["POST", "https://api.coinbase.com/api/v3/brokerage/orders"] - , "cancel_order_url": ["POST", "https://api.coinbase.com/api/v3/brokerage/orders/batch_cancel"] - } + # , "ws_url": ["WSS", "wss://advanced-trade-ws.coinbase.com"] + # , "REST": { + # "open_orders_url": ["GET", "https://api.coinbase.com/api/v3/brokerage/orders/historical/batch"] + # , "submit_order_url": ["POST", "https://api.coinbase.com/api/v3/brokerage/orders"] + # , "cancel_order_url": ["POST", "https://api.coinbase.com/api/v3/brokerage/orders/batch_cancel"] + # } # D E P R E C A T E D , "api": { @@ -320,11 +320,11 @@ "class": "cvttpy.exchanges.coinbase.spot.account.CoinbaseSpotAccounting" # D E P R E C A T E D - , "REST": { - "balances_url": ["GET", "https://api.coinbase.com/api/v3/brokerage/accounts"] - , "get_trades_url": ["GET", "https://api.coinbase.com/api/v3/brokerage/orders/historical/fills"] - , "get_transactions_url": ["GET", "https://api.coinbase.com/api/v3/brokerage/transaction_summary"] - } + # , "REST": { + # "balances_url": ["GET", "https://api.coinbase.com/api/v3/brokerage/accounts"] + # , "get_trades_url": ["GET", "https://api.coinbase.com/api/v3/brokerage/orders/historical/fills"] + # , "get_transactions_url": ["GET", "https://api.coinbase.com/api/v3/brokerage/transaction_summary"] + # } # D E P R E C A T E D , "api": { @@ -344,10 +344,13 @@ , "price_throttle": true # D E P R E C A T E D - , "ws_url": ["WSS", "wss://ws-feed.exchange.coinbase.com"] + # , "ws_url": ["WSS", "wss://ws-feed.exchange.coinbase.com"] # D E P R E C A T E D , "api": { + "REST": { + "products_url": "https://api.exchange.coinbase.com/products" + }, "web_socket": { "url": "wss://ws-feed.exchange.coinbase.com" }