fixup: Further refine metrics links

Author: maru-ava

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ concurrency:
 env:
   go_version: '~1.21.8'
   tmpnet_data_path: ~/.tmpnet
-  prometheus_url: https://grafana-experimental.avax-dev.network/d/kBQpRdWnk/avalanche-main-dashboard?orgId=1&refresh=10s&var-adhoc=gh_repo%7C%3D%7Cava-labs%2Favalanchego&var-adhoc=gh_run_id%7C%3D%7C${{ github.run_id }}&var-adhoc=gh_run_attempt%7C%3D%7C${{ github.run_attempt }}
+  prometheus_url: https://grafana-experimental.avax-dev.network/d/kBQpRdWnk/avalanche-main-dashboard?orgId=1&refresh=10s&var-filter=is_ephemeral_node%7C%3D%7Cfalse&var-filter=gh_repo%7C%3D%7Cava-labs%2Favalanchego&var-filter=gh_run_id%7C%3D%7C${{ github.run_id }}&var-filter=gh_run_attempt%7C%3D%7C${{ github.run_attempt }}
 
 jobs:
   Unit:
@@ -75,9 +75,8 @@ jobs:
           PROMETHEUS_ID: ${{ secrets.PROMETHEUS_ID }}
           PROMETHEUS_PASSWORD: ${{ secrets.PROMETHEUS_PASSWORD }}
       - name: Notify of metrics availability
-        run: |
-          msg="Metrics for this job: ${PROMETHEUS_URL}&var-adhoc=gh_job_id%7C%3D%7C${GH_JOB_ID}&from=$(date '+%s')000&to=now"
-          echo "::notice::${msg}"
+        shell: bash
+        run: .github/workflows/notify-metrics-availability.sh
         env:
           PROMETHEUS_URL: ${{ env.prometheus_url }}
           GH_JOB_ID: ${{ github.job }}
@@ -117,9 +116,8 @@ jobs:
           PROMETHEUS_ID: ${{ secrets.PROMETHEUS_ID }}
           PROMETHEUS_PASSWORD: ${{ secrets.PROMETHEUS_PASSWORD }}
       - name: Notify of metrics availability
-        run: |
-          msg="Metrics for this job: ${PROMETHEUS_URL}&var-gh_job_id=${GH_JOB_ID}"
-          echo "::notice::${msg}"
+        shell: bash
+        run: .github/workflows/notify-metrics-availability.sh
         env:
           PROMETHEUS_URL: ${{ env.prometheus_url }}
           GH_JOB_ID: ${{ github.job }}
@@ -158,9 +156,8 @@ jobs:
           PROMETHEUS_ID: ${{ secrets.PROMETHEUS_ID }}
           PROMETHEUS_PASSWORD: ${{ secrets.PROMETHEUS_PASSWORD }}
       - name: Notify of metrics availability
-        run: |
-          msg="Metrics for this job: ${PROMETHEUS_URL}&var-gh_job_id=${GH_JOB_ID}"
-          echo "::notice::${msg}"
+        shell: bash
+        run: .github/workflows/notify-metrics-availability.sh
         env:
           PROMETHEUS_URL: ${{ env.prometheus_url }}
           GH_JOB_ID: ${{ github.job }}

.github/workflows/notify-metrics-availability.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+# Timestamps are in seconds
+from_timestamp="$(date '+%s')"
+monitoring_period=1800
+to_timestamp="$((${from_timestamp} + ${monitoring_period}))"
+
+# Grafana expects microseconds, so just pad out with 3 zeros
+metrics_url="Metrics for this job: ${PROMETHEUS_URL}&var-filter=gh_job_id%7C%3D%7C${GH_JOB_ID}&from=${from_timestamp}000&to=${to_timestamp}000"
+
+echo "::notice links::metrics ${metrics_url}"

tests/fixture/tmpnet/network.go

@@ -302,6 +302,9 @@ func (n *Network) Start(ctx context.Context, w io.Writer) error {
 		return err
 	}
 
+	// Record the time before nodes are started to ensure visibility of subsequently collected metrics via the emitted link
+	startTime := time.Now()
+
 	// Configure the networking for each node and start
 	for _, node := range n.Nodes {
 		if err := n.StartNode(ctx, w, node); err != nil {
@@ -319,7 +322,7 @@ func (n *Network) Start(ctx context.Context, w io.Writer) error {
 		return err
 	}
 	// Provide a link the main dashboard filtered by the uuid and showing results for now till whenever the link is viewed
-	if _, err := fmt.Fprintf(w, "\nMetrics: https://grafana-experimental.avax-dev.network/d/kBQpRdWnk/avalanche-main-dashboard?&var-adhoc=network_uuid%%7C%%3D%%7C%s&from=%d&to=now\n", n.UUID, time.Now().UnixMilli()); err != nil {
+	if _, err := fmt.Fprintf(w, "\nMetrics: https://grafana-experimental.avax-dev.network/d/kBQpRdWnk/avalanche-main-dashboard?&var-filter=network_uuid%%7C%%3D%%7C%s&var-filter=is_ephemeral_node%%7C%%3D%%7Cfalse&from=%d&to=now\n", n.UUID, startTime.UnixMilli()); err != nil {
 		return err
 	}