Skip to content

Commit

Permalink
Add metrics endpoint vars to forger evmapp container and Zend v5.0.4 (#…
Browse files Browse the repository at this point in the history
…28)

* Add metrics endpoint vars to evmapp container

* metrics endpoint port default value added to env template files

* WEB3-917 - zend version updated to v5.0.4

* WEB3-917 - release version changed to 1.4.0+1
  • Loading branch information
davehorizen authored Aug 26, 2024
1 parent 4b0d468 commit 1c246db
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 5 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

**1.4.0+1**
* ZEND version: 5.0.4
* Environment variables to enable sidechain node metrics

**1.4.0**
* EON version: 1.4.0
* SDK version: 0.12.0 (see [SDK changelog](https://github.com/HorizenOfficial/Sidechains-SDK/blob/0.12.0-RC1/CHANGELOG.md))
Expand Down
4 changes: 4 additions & 0 deletions compose_files/docker-compose-forger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ services:
expose:
- "${SCNODE_REST_PORT}"
- "${SCNODE_WS_SERVER_PORT}"
- "${SCNODE_METRICS_PORT}"
ports:
- "${SCNODE_NET_P2P_PORT}:${SCNODE_NET_P2P_PORT}"
volumes:
Expand Down Expand Up @@ -123,6 +124,9 @@ services:
- SCNODE_WS_SERVER_ENABLED
- SCNODE_LOG_FILE_LEVEL
- SCNODE_LOG_CONSOLE_LEVEL
- SCNODE_METRICS_PORT
- SCNODE_METRICS_ENABLED
- SCNODE_METRICS_REST_PASSWORD
logging:
driver: "json-file"
options:
Expand Down
7 changes: 5 additions & 2 deletions env/.env.forger.eon.template
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
COMPOSE_PROJECT_NAME=evmapp-mainnet-eon
COMPOSE_PROJECT_DATA_DIR=""
INTERNAL_NETWORK_SUBNET='10.10.50.0/24'
ZEND_TAG=v5.0.2
ZEND_TAG=v5.0.4
ZEND_CONTAINER_NAME=zend
ZEND_IP_ADDRESS='10.10.50.10'
EVMAPP_TAG=1.4.0
Expand All @@ -17,7 +17,7 @@ ZEN_RPC_PORT=8231
ZEN_WS_PORT=8888
ZEN_RPC_ALLOWIP_PRESET=SUBNET
ZEN_EXTERNAL_IP=DETECT
ZEN_OPTS="-websocket=1 -wsaddress=0.0.0.0 -wsport=8888 -disablewallet=1 -logips=1 -logtimestamps=1 -disabledeprecation=5.0.2 -debug=ws"
ZEN_OPTS="-websocket=1 -wsaddress=0.0.0.0 -wsport=8888 -disablewallet=1 -logips=1 -logtimestamps=1 -disabledeprecation=5.0.4 -debug=ws"
ZEN_CUSTOM_SCRIPT=/usr/local/bin/seed.sh
ZEN_SEED_TAR_GZ_URL="https://downloads.horizen.io/file/InfraPublic/mainchain_mainnet_seed_noindex_2023-06-27.tgz"
ZEN_FORCE_RESEED=false
Expand Down Expand Up @@ -57,6 +57,9 @@ SCNODE_NET_NODENAME=
SCNODE_NET_P2P_PORT=9084
SCNODE_REST_PORT=9545
SCNODE_REST_PASSWORD=
SCNODE_METRICS_ENABLED=false
SCNODE_METRICS_PORT=9088
SCNODE_METRICS_REST_PASSWORD=

SCNODE_NET_MAX_IN_CONNECTIONS=100
SCNODE_NET_MAX_OUT_CONNECTIONS=25
Expand Down
8 changes: 5 additions & 3 deletions env/.env.forger.gobi.template
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@
COMPOSE_PROJECT_NAME=evmapp-testnet-gobi
COMPOSE_PROJECT_DATA_DIR=""
INTERNAL_NETWORK_SUBNET='10.10.51.0/24'
ZEND_TAG=v5.0.2
ZEND_TAG=v5.0.4
ZEND_CONTAINER_NAME=zend-testnet
ZEND_IP_ADDRESS='10.10.51.10'
EVMAPP_TAG=1.4.0
EVMAPP_CONTAINER_NAME=evmapp-gobi
EVMAPP_IP_ADDRESS='10.10.51.3'


# Zend config
ZEN_PORT=19033
ZEN_RPC_USER=zenuser
Expand All @@ -18,7 +17,7 @@ ZEN_RPC_PORT=18231
ZEN_WS_PORT=18888
ZEN_RPC_ALLOWIP_PRESET=SUBNET
ZEN_EXTERNAL_IP=DETECT
ZEN_OPTS="-websocket=1 -wsaddress=0.0.0.0 -wsport=18888 -disablewallet=1 -logips=1 -logtimestamps=1 -testnet=1 -disabledeprecation=5.0.2 -debug=ws"
ZEN_OPTS="-websocket=1 -wsaddress=0.0.0.0 -wsport=18888 -disablewallet=1 -logips=1 -logtimestamps=1 -testnet=1 -disabledeprecation=5.0.4 -debug=ws"
ZEN_CUSTOM_SCRIPT=/usr/local/bin/seed.sh
ZEN_SEED_TAR_GZ_URL="https://downloads.horizen.io/file/InfraPublic/mainchain_testnet_seed_noindex_2023-06-27.tgz"
ZEN_FORCE_RESEED=false
Expand Down Expand Up @@ -58,6 +57,9 @@ SCNODE_NET_NODENAME=
SCNODE_NET_P2P_PORT=19084
SCNODE_REST_PORT=19545
SCNODE_REST_PASSWORD=
SCNODE_METRICS_ENABLED=false
SCNODE_METRICS_PORT=9088
SCNODE_METRICS_REST_PASSWORD=

SCNODE_NET_MAX_IN_CONNECTIONS=100
SCNODE_NET_MAX_OUT_CONNECTIONS=25
Expand Down

0 comments on commit 1c246db

Please sign in to comment.