From fa663be02988713dbad98732194512a7623f7b72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C8=98tefan=20Talpalaru?= Date: Wed, 6 May 2020 00:02:39 +0200 Subject: [PATCH] launch_local_testnet.sh: get the metrics out with "--grafana" --- scripts/launch_local_testnet.sh | 41 ++++++++++++++++++++++++++++++++- tests/simulation/start.sh | 4 +--- 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/scripts/launch_local_testnet.sh b/scripts/launch_local_testnet.sh index 636725c46..362e575b1 100755 --- a/scripts/launch_local_testnet.sh +++ b/scripts/launch_local_testnet.sh @@ -24,7 +24,7 @@ if [ ${PIPESTATUS[0]} != 4 ]; then fi OPTS="ht:n:d:" -LONGOPTS="help,testnet:,nodes:,data-dir:,disable-htop,log-level:" +LONGOPTS="help,testnet:,nodes:,data-dir:,disable-htop,log-level:,grafana" # default values TESTNET="1" @@ -32,6 +32,7 @@ NUM_NODES="10" DATA_DIR="local_testnet_data" USE_HTOP="1" LOG_LEVEL="DEBUG" +ENABLE_GRAFANA="0" print_help() { cat < "${DATA_DIR}/prometheus.yml" <> "${DATA_DIR}/prometheus.yml" < "${DATA_DIR}/log${NUM_NODE}.txt" 2>&1 & diff --git a/tests/simulation/start.sh b/tests/simulation/start.sh index 5b81fb739..2a7239584 100755 --- a/tests/simulation/start.sh +++ b/tests/simulation/start.sh @@ -26,10 +26,8 @@ LAST_VALIDATOR="$VALIDATORS_DIR/v$(printf '%07d' $LAST_VALIDATOR_NUM).deposit.js # Windows detection if uname | grep -qiE "mingw|msys"; then MAKE="mingw32-make" - EXE_SUFFIX=".exe" else MAKE="make" - EXE_SUFFIX="" fi # to allow overriding the program names @@ -176,7 +174,7 @@ if [ -f "${MASTER_NODE_ADDRESS_FILE}" ]; then rm "${MASTER_NODE_ADDRESS_FILE}" fi -PROCESS_DASHBOARD_BIN="build/process_dashboard${EXE_SUFFIX}" +PROCESS_DASHBOARD_BIN="build/process_dashboard" if [[ ! -f "$PROCESS_DASHBOARD_BIN" ]]; then $MAKE NIMFLAGS="$CUSTOM_NIMFLAGS" process_dashboard