Merge branch 'pgrest-additions' of github.com:cardano-community/guild…

…-operators into pgrest-additions
cardano-community · Jun 10, 2021 · 7434938 · 7434938
2 parents b74fac8 + b6055ef
commit 7434938
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/scripts/cnode-helper-scripts/env b/scripts/cnode-helper-scripts/env
@@ -654,10 +654,10 @@ getNodeMetrics() {
     tx_processed=${node_metrics_arr[5]}; mempool_tx=${node_metrics_arr[6]}; mempool_bytes=${node_metrics_arr[7]}
     kesperiod=${node_metrics_arr[8]}; remaining_kes_periods=${node_metrics_arr[9]}
     isleader=${node_metrics_arr[10]}; adopted=${node_metrics_arr[11]}; didntadopt=${node_metrics_arr[12]}; about_to_lead=${node_metrics_arr[13]}
-    uptimes=$(( $(date +%s) - node_metrics_arr[14] ))
+    nodeStartTime=${node_metrics_arr[14]};uptimes=$(( $(date +%s) - node_metrics_arr[14] ))
   else
     node_metrics=$(curl -s -m ${EKG_TIMEOUT} "http://${PROM_HOST}:${PROM_PORT}/metrics" 2>/dev/null)
-    [[ ${node_metrics} =~ cardano_node_metrics_nodeStartTime_int[[:space:]]([^[:space:]]*) ]] && uptimes=$(( $(date +%s) - BASH_REMATCH[1] )) || uptimes=0
+    [[ ${node_metrics} =~ cardano_node_metrics_nodeStartTime_int[[:space:]]([^[:space:]]*) ]] && { nodeStartTime=${BASH_REMATCH[1]} && uptimes=$(( $(date +%s) - BASH_REMATCH[1] )); } || uptimes=0
     [[ ${node_metrics} =~ cardano_node_metrics_blockNum_int[[:space:]]([^[:space:]]*) ]] && blocknum=${BASH_REMATCH[1]} || blocknum=0
     [[ ${node_metrics} =~ cardano_node_metrics_epoch_int[[:space:]]([^[:space:]]*) ]] && epochnum=${BASH_REMATCH[1]} || epochnum=0
     [[ ${node_metrics} =~ cardano_node_metrics_slotInEpoch_int[[:space:]]([^[:space:]]*) ]] && slot_in_epoch=${BASH_REMATCH[1]} || slot_in_epoch=0

diff --git a/scripts/cnode-helper-scripts/gLiveView.sh b/scripts/cnode-helper-scripts/gLiveView.sh
@@ -54,7 +54,7 @@ setTheme() {
 # Do NOT modify code below           #
 ######################################
 
-GLV_VERSION=v1.20.7
+GLV_VERSION=v1.20.8
 
 PARENT="$(dirname $0)"
 [[ -f "${PARENT}"/.env_branch ]] && BRANCH="$(cat ${PARENT}/.env_branch)" || BRANCH="master"
@@ -516,7 +516,7 @@ while true; do
   # Gather some data
   getNodeMetrics
   [[ ${fail_count} -eq ${RETRIES} ]] && myExit 1 "${style_status_3}COULD NOT CONNECT TO A RUNNING INSTANCE, ${RETRIES} FAILED ATTEMPTS IN A ROW!${NC}"
-  if [[ ${uptimes} -le 0 ]]; then
+  if [[ ${nodeStartTime} -le 0 ]]; then
     ((fail_count++))
     clear && tput cup 1 1
     printf "${style_status_3}Connection to node lost, retrying (${fail_count}/${RETRIES})!${NC}"

diff --git a/scripts/cnode-helper-scripts/sLiveView.sh b/scripts/cnode-helper-scripts/sLiveView.sh
@@ -49,7 +49,8 @@ do
   epochnum=$(jq '.cardano.node.metrics.epoch.int.val //0' <<< "${data}")
   slotnum=$(jq '.cardano.node.metrics.slotInEpoch.int.val //0' <<< "${data}")
   density=$(jq -r '.cardano.node.metrics.density.real.val //0' <<< "${data}")
-  uptimes=$(( $(date +%s) - $(jq '.cardano.node.metrics.nodeStartTime.int.val //0' <<< "${data}") ))
+  nodeStartTime=$(jq '.cardano.node.metrics.nodeStartTime.int.val //0' <<< "${data}")
+  uptimes=$(( $(date +%s) - nodeStartTime ))
   transactions=$(jq '.cardano.node.metrics.txsProcessedNum.int.val //0' <<< "${data}")
   kesperiod=$(jq '.cardano.node.metrics.currentKESPeriod.int.val //0' <<< "${data}")
   kesremain=$(jq '.cardano.node.metrics.remainingKESPeriods.int.val //0' <<< "${data}")
@@ -64,7 +65,7 @@ do
     name=$(printf "%s - Relay\n" "${nodename}")
   fi
 
-  if ((uptimes<=0)); then
+  if ((nodeStartTime<=0)); then
     echo -e "${REKT}COULD NOT CONNECT TO A RUNNING INSTANCE! PLEASE CHECK THE PROMETHEUS PORT AND TRY AGAIN!${NC}"
     exit
   fi