Tunnel SOLANA_DEFAULT_METRICS_RATE into Snap nodes

ci/testnet-deploy.sh

@@ -5,7 +5,6 @@
 # This script must be run by a user/machine that has successfully authenticated
 # with GCP and has sufficient permission.
 #
-
 cd "$(dirname "$0")/.."
 
 if [[ -z $SOLANA_METRICS_CONFIG ]]; then
@@ -26,7 +25,7 @@ edge)
   ;;
 beta)
   publicUrl=testnet.solana.com
-  publicIp=#  # Use default value
+  publicIp="" # Use default value
   ;;
 *)
   echo Error: Unknown SOLANA_SNAP_CHANNEL=$SOLANA_SNAP_CHANNEL
@@ -76,13 +75,18 @@ for info in "${vmlist[@]}"; do
   (
     SECONDS=0
     echo "--- $vmName in zone $vmZone $nodePosition"
+    commonNodeConfig="\
+      rust-log=$RUST_LOG \
+      default-metrics-rate=$SOLANA_DEFAULT_METRICS_RATE \
+      metrics-config=$SOLANA_METRICS_CONFIG \
+    "
     if $leader; then
-      nodeConfig="mode=leader+drone metrics-config=$SOLANA_METRICS_CONFIG"
+      nodeConfig="mode=leader+drone $commonNodeConfig"
       if [[ -n $SOLANA_CUDA ]]; then
         nodeConfig="$nodeConfig enable-cuda=1"
       fi
     else
-      nodeConfig="mode=validator metrics-config=$SOLANA_METRICS_CONFIG leader-address=$publicIp"
+      nodeConfig="mode=validator leader-address=$publicIp $commonNodeConfig"
     fi
 
     set -x

multinode-demo/common.sh

@@ -35,6 +35,7 @@ if [[ -d "$SNAP" ]]; then # Running inside a Linux Snap?
   mkdir -p "$SNAP_DATA"/{drone,leader,validator}
 
   SOLANA_METRICS_CONFIG="$(snapctl get metrics-config)"
+  SOLANA_DEFAULT_METRICS_RATE="$(snapctl get default-metrics-rate)"
   SOLANA_CUDA="$(snapctl get enable-cuda)"
   RUST_LOG="$(snapctl get rust-log)"