chore: More IRM deployment fixes

Co-authored-by: Phil Windle <[email protected]>
Co-authored-by: spypsy <[email protected]>

Author: PhilWindle

.github/workflows/deploy-fisherman-network.yaml

@@ -156,6 +156,20 @@ jobs:
           ./scripts/install_deps.sh
           ./scripts/network_deploy.sh ignition-fisherman
 
+      - name: Setup IRM
+        env:
+          MONITORING_NAMESPACE: ${{ env.NETWORK }}-irm
+          INFURA_SECRET_NAME: infura-${{ env.L1_NETWORK }}-url
+          DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+        run: |
+
+          echo "Setting up IRM for namespace: $NAMESPACE, monitoring namespace: $MONITORING_NAMESPACE"
+          echo "Network: $NETWORK"
+
+          echo "INFURA Secret Name: $INFURA_SECRET_NAME"
+
+          ./spartan/metrics/testnet-monitor/scripts/update-monitoring.sh $NAMESPACE ${{ env.MONITORING_NAMESPACE }} $NETWORK $INFURA_SECRET_NAME
+
       - name: Notify Slack on failure
         if: failure()
         env:

.github/workflows/deploy-network.yml

@@ -141,6 +141,7 @@ jobs:
         if: inputs.network == 'testnet' && !contains(inputs.semver, '-')
         env:
           MONITORING_NAMESPACE: testnet-block-height-monitor
+          DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
         run: |
           echo "Updating monitoring app for testnet deployment..."
           ./spartan/metrics/testnet-monitor/scripts/update-monitoring.sh testnet ${{ env.MONITORING_NAMESPACE }}

spartan/metrics/testnet-monitor/grafana/dashboards/alpha-testnet-monitor.json

@@ -55,6 +55,7 @@
               "type": "linear"
             },
             "showPoints": "auto",
+            "showValues": false,
             "spanNulls": false,
             "stacking": {
               "group": "A",
@@ -101,34 +102,36 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.1.0-89781",
+      "pluginVersion": "12.3.0-18356121373.patch4",
       "targets": [
         {
           "editorMode": "code",
-          "expr": "rollup_pending_block_number{network=\"$network\"}",
-          "legendFormat": "Pending block height ($network)",
+          "exemplar": false,
+          "expr": "max(rollup_pending_block_number) by (network)",
+          "instant": false,
+          "legendFormat": "Pending block height - {{network}}",
           "range": true,
-          "refId": "A"
+          "refId": "Pending Block Height"
         },
         {
           "datasource": {
             "type": "prometheus",
             "uid": "grafanacloud-prom"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "rollup_proven_block_number{network=\"$network\"}",
+          "editorMode": "code",
+          "expr": "max(rollup_proven_block_number) by (network)",
           "fullMetaSearch": false,
           "hide": false,
           "includeNullMetadata": true,
           "instant": false,
-          "legendFormat": "Proven block height",
+          "legendFormat": "Proven block height - {{network}}",
           "range": true,
           "refId": "B",
           "useBackend": false
         }
       ],
-      "title": "Pending Block Number",
+      "title": "Pending & Proven Block Number",
       "type": "timeseries"
     },
     {
@@ -165,6 +168,7 @@
               "type": "linear"
             },
             "showPoints": "auto",
+            "showValues": false,
             "spanNulls": false,
             "stacking": {
               "group": "A",
@@ -211,11 +215,13 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.1.0-89781",
+      "pluginVersion": "12.3.0-18356121373.patch4",
       "targets": [
         {
-          "expr": "rollup_pending_block_number{network=\"$network\"}",
+          "editorMode": "code",
+          "expr": "rollup_pending_block_number",
           "legendFormat": "{{network}}",
+          "range": true,
           "refId": "A"
         }
       ],
@@ -256,6 +262,7 @@
               "type": "linear"
             },
             "showPoints": "auto",
+            "showValues": false,
             "spanNulls": false,
             "stacking": {
               "group": "A",
@@ -302,11 +309,13 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.1.0-89781",
+      "pluginVersion": "12.3.0-18356121373.patch4",
       "targets": [
         {
-          "expr": "rollup_proven_block_number{network=\"$network\"}",
+          "editorMode": "code",
+          "expr": "rollup_proven_block_number",
           "legendFormat": "{{network}}",
+          "range": true,
           "refId": "A"
         }
       ],
@@ -316,18 +325,18 @@
   ],
   "preload": false,
   "refresh": "",
-  "schemaVersion": 41,
+  "schemaVersion": 42,
   "tags": [],
   "templating": {
     "list": []
   },
   "time": {
-    "from": "now-6h",
+    "from": "now-3h",
     "to": "now"
   },
   "timepicker": {},
   "timezone": "browser",
-  "title": "Alpha Testnet Block Height Monitor",
-  "uid": "testnet-monitor",
-  "version": 5
+  "title": "Aztec Testnet Block Height Monitor",
+  "uid": "alpha-testnet-monitor",
+  "version": 11
 }

spartan/metrics/testnet-monitor/index.ts

@@ -61,11 +61,13 @@ client.register.setDefaultLabels({ network: NETWORK as string });
 const provenBlockNumberGauge = new client.Gauge({
   name: "rollup_proven_block_number",
   help: "The latest proven block number of the rollup",
+  labelNames: ["network"],
 });
 
 const pendingBlockNumberGauge = new client.Gauge({
   name: "rollup_pending_block_number",
   help: "The latest pending block number of the rollup",
+  labelNames: ["network"],
 });
 
 async function updateBlockNumbers(): Promise<void> {