apollo_dashboard: fix batcher failed txs panel

Author: Itay-Tsabary-Starkware

crates/apollo_dashboard/resources/dev_grafana.json

@@ -383,12 +383,12 @@
           }
         },
         {
-          "title": "Rejected / Reverted TXs Ratio",
-          "description": "Ratio of rejected / reverted transactions out of all processed txs (10m window)",
+          "title": "Rate of Rejected and Reverted TXs Ratio",
+          "description": "Rates of the rejected and reverted transactions ratios of all processed txs (10m window)",
           "type": "timeseries",
           "exprs": [
-            "increase(batcher_rejected_transactions{cluster=~\"$cluster\", namespace=~\"$namespace\"}[10m]) / (increase(batcher_rejected_transactions{cluster=~\"$cluster\", namespace=~\"$namespace\"}[10m]) + increase(batcher_reverted_transactions{cluster=~\"$cluster\", namespace=~\"$namespace\"}[10m]) + increase(batcher_batched_transactions{cluster=~\"$cluster\", namespace=~\"$namespace\"}[10m]))",
-            "increase(batcher_reverted_transactions{cluster=~\"$cluster\", namespace=~\"$namespace\"}[10m]) / (increase(batcher_rejected_transactions{cluster=~\"$cluster\", namespace=~\"$namespace\"}[10m]) + increase(batcher_reverted_transactions{cluster=~\"$cluster\", namespace=~\"$namespace\"}[10m]) + increase(batcher_batched_transactions{cluster=~\"$cluster\", namespace=~\"$namespace\"}[10m]))"
+            "increase(batcher_rejected_transactions{cluster=~\"$cluster\", namespace=~\"$namespace\"} / (batcher_rejected_transactions{cluster=~\"$cluster\", namespace=~\"$namespace\"} + batcher_reverted_transactions{cluster=~\"$cluster\", namespace=~\"$namespace\"} + batcher_batched_transactions{cluster=~\"$cluster\", namespace=~\"$namespace\"})[10m])",
+            "increase(batcher_reverted_transactions{cluster=~\"$cluster\", namespace=~\"$namespace\"} / (batcher_rejected_transactions{cluster=~\"$cluster\", namespace=~\"$namespace\"} + batcher_reverted_transactions{cluster=~\"$cluster\", namespace=~\"$namespace\"} + batcher_batched_transactions{cluster=~\"$cluster\", namespace=~\"$namespace\"})[10m])"
           ],
           "extra_params": {
             "unit": "percentunit",

crates/apollo_dashboard/src/panels/batcher.rs

@@ -65,24 +65,21 @@ fn get_panel_storage_height() -> Panel {
 }
 
 fn get_panel_rejection_reverted_ratio() -> Panel {
-    let rejected_txs_expr = increase(&REJECTED_TRANSACTIONS, DEFAULT_DURATION);
-    let reverted_txs_expr = increase(&REVERTED_TRANSACTIONS, DEFAULT_DURATION);
+    let rejected_txs_expr = &REJECTED_TRANSACTIONS.get_name_with_filter();
+    let reverted_txs_expr = &REVERTED_TRANSACTIONS.get_name_with_filter();
+    let batched_txs_expr = &BATCHED_TRANSACTIONS.get_name_with_filter();
 
-    let denominator_expr = format!(
-        "({} + {} + {})",
-        rejected_txs_expr,
-        reverted_txs_expr,
-        increase(&BATCHED_TRANSACTIONS, DEFAULT_DURATION),
-    );
+    let denominator_expr =
+        format!("({} + {} + {})", rejected_txs_expr, reverted_txs_expr, batched_txs_expr,);
     Panel::new(
-        "Rejected / Reverted TXs Ratio",
+        "Rate of Rejected and Reverted TXs Ratio",
         format!(
-            "Ratio of rejected / reverted transactions out of all processed txs \
+            "Rates of the rejected and reverted transactions ratios of all processed txs \
              ({DEFAULT_DURATION} window)"
         ),
         vec![
-            format!("{rejected_txs_expr} / {denominator_expr}"),
-            format!("{reverted_txs_expr} / {denominator_expr}"),
+            format!("increase({rejected_txs_expr} / {denominator_expr}[{DEFAULT_DURATION}])"),
+            format!("increase({reverted_txs_expr} / {denominator_expr}[{DEFAULT_DURATION}])"),
         ],
         PanelType::TimeSeries,
     )