chore: fix dashboard panels with outdated metric queries (#5502)

ChainSafe · May 17, 2023 · c780a1d · c780a1d
1 parent 2d7356b
commit c780a1d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 59 deletions.
diff --git a/dashboards/lodestar_summary.json b/dashboards/lodestar_summary.json
@@ -1497,23 +1497,11 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "exemplar": false,
-          "expr": "avg(\n  delta(validator_monitor_prev_epoch_on_chain_balance_total[32m])\n)",
+          "expr": "avg(\n  delta(validator_monitor_prev_epoch_on_chain_balance[32m])\n)",
           "hide": false,
           "interval": "",
           "legendFormat": "balance_delta",
           "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
-          },
-          "exemplar": false,
-          "expr": "avg(\n  delta(validator_monitor_prev_epoch_on_chain_balance[32m])\n)",
-          "hide": false,
-          "interval": "",
-          "legendFormat": "balance_delta_new",
-          "refId": "B"
         }
       ],
       "title": "balance delta prev epoch",
@@ -2693,7 +2681,7 @@
                 "type": "prometheus",
                 "uid": "${DS_PROMETHEUS}"
               },
-              "expr": "(time() - lodestar_genesis_time) / 12 - lodestar_clock_slot",
+              "expr": "(time() - lodestar_genesis_time) / 12 - beacon_clock_slot",
               "hide": false,
               "interval": "",
               "legendFormat": "clock drift",
@@ -2908,7 +2896,7 @@
                 "uid": "${DS_PROMETHEUS}"
               },
               "exemplar": false,
-              "expr": "lodestar_clock_slot - beacon_head_slot",
+              "expr": "beacon_clock_slot - beacon_head_slot",
               "hide": false,
               "interval": "",
               "legendFormat": "clock drift",

diff --git a/dashboards/lodestar_validator_monitor.json b/dashboards/lodestar_validator_monitor.json
@@ -287,23 +287,11 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "exemplar": false,
-          "expr": "avg(\n  delta(validator_monitor_prev_epoch_on_chain_balance_total[32m])\n)",
+          "expr": "avg(\n  delta(validator_monitor_prev_epoch_on_chain_balance[32m])\n)",
           "hide": false,
           "interval": "",
           "legendFormat": "balance_delta",
           "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
-          },
-          "exemplar": false,
-          "expr": "avg(\n  delta(validator_monitor_prev_epoch_on_chain_balance[32m])\n)",
-          "hide": false,
-          "interval": "",
-          "legendFormat": "balance_delta_new",
-          "refId": "B"
         }
       ],
       "title": "balance delta prev epoch",
@@ -1172,7 +1160,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "exemplar": false,
-          "expr": "sum(validator_monitor_prev_epoch_attestations_total)/sum(validator_monitor_validators)",
+          "expr": "validator_monitor_prev_epoch_attestations_count / validator_monitor_validators",
           "interval": "",
           "legendFormat": "attestations_sent",
           "refId": "A"
@@ -1183,7 +1171,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "exemplar": false,
-          "expr": "sum(validator_monitor_prev_epoch_aggregates_total)/sum(validator_monitor_validators)",
+          "expr": "validator_monitor_prev_epoch_aggregates_count / validator_monitor_validators",
           "hide": false,
           "interval": "",
           "legendFormat": "aggregates_sent",
@@ -1578,30 +1566,6 @@
       },
       "pluginVersion": "8.4.0-beta1",
       "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
-          },
-          "exemplar": false,
-          "expr": "avg(validator_monitor_prev_epoch_attestation_block_inclusions_total)",
-          "hide": false,
-          "interval": "",
-          "legendFormat": "block_inclusions",
-          "refId": "B"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
-          },
-          "exemplar": false,
-          "expr": "avg(validator_monitor_prev_epoch_attestation_aggregate_inclusions_total)",
-          "hide": false,
-          "interval": "",
-          "legendFormat": "aggregate_inclusions",
-          "refId": "C"
-        },
         {
           "datasource": {
             "type": "prometheus",
@@ -1611,7 +1575,7 @@
           "expr": "validator_monitor_prev_epoch_attestation_block_inclusions_sum\n/\nvalidator_monitor_prev_epoch_attestation_block_inclusions_count",
           "hide": false,
           "interval": "",
-          "legendFormat": "block_inclusions new",
+          "legendFormat": "block_inclusions",
           "refId": "A"
         },
         {
@@ -1623,8 +1587,8 @@
           "expr": "validator_monitor_prev_epoch_attestation_aggregate_inclusions_sum\n/\nvalidator_monitor_prev_epoch_attestation_aggregate_inclusions_count",
           "hide": false,
           "interval": "",
-          "legendFormat": "aggregate_inclusions new",
-          "refId": "D"
+          "legendFormat": "aggregate_inclusions",
+          "refId": "B"
         }
       ],
       "title": "Attestation inclusions epoch per validator",

diff --git a/dashboards/lodestar_vm_host.json b/dashboards/lodestar_vm_host.json
@@ -1199,7 +1199,7 @@
                 "type": "prometheus",
                 "uid": "${DS_PROMETHEUS}"
               },
-              "expr": "(time() - lodestar_genesis_time) / 12 - lodestar_clock_slot",
+              "expr": "(time() - lodestar_genesis_time) / 12 - beacon_clock_slot",
               "hide": false,
               "interval": "",
               "legendFormat": "clock drift",
@@ -1414,7 +1414,7 @@
                 "uid": "${DS_PROMETHEUS}"
               },
               "exemplar": false,
-              "expr": "lodestar_clock_slot - beacon_head_slot",
+              "expr": "beacon_clock_slot - beacon_head_slot",
               "hide": false,
               "interval": "",
               "legendFormat": "clock drift",