diff --git a/emqttb-dashboard.json b/emqttb-dashboard.json
index 9ee2c15..cd3a370 100644
--- a/emqttb-dashboard.json
+++ b/emqttb-dashboard.json
@@ -22,23 +22,21 @@
   },
   "editable": true,
   "fiscalYearStartMonth": 0,
+  "gnetId": null,
   "graphTooltip": 0,
-  "id": 5,
+  "id": 7,
+  "iteration": 1702000316244,
   "links": [],
   "liveNow": false,
   "panels": [
     {
-      "datasource": {
-        "uid": "${Prometheus}"
-      },
+      "datasource": "${Prometheus}",
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -95,19 +93,14 @@
         "legend": {
           "calcs": [],
           "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
+          "placement": "bottom"
         },
         "tooltip": {
-          "mode": "single",
-          "sort": "none"
+          "mode": "single"
         }
       },
       "targets": [
         {
-          "datasource": {
-            "uid": "${Prometheus}"
-          },
           "exemplar": true,
           "expr": "emqttb_group_n_workers{}",
           "interval": "",
@@ -119,18 +112,13 @@
       "type": "timeseries"
     },
     {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Prometheus}"
-      },
+      "datasource": "${Prometheus}",
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -187,25 +175,18 @@
         "legend": {
           "calcs": [],
           "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
+          "placement": "bottom"
         },
         "tooltip": {
-          "mode": "single",
-          "sort": "none"
+          "mode": "single"
         }
       },
       "targets": [
         {
-          "datasource": {
-            "uid": "${Prometheus}"
-          },
-          "editorMode": "code",
           "exemplar": true,
-          "expr": "rate(emqttb_group_n_workers{}[$__rate_interval])",
+          "expr": "rate(emqttb_group_n_workers{}[5s])",
           "interval": "",
           "legendFormat": "{{group}}",
-          "range": true,
           "refId": "A"
         }
       ],
@@ -213,18 +194,13 @@
       "type": "timeseries"
     },
     {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Prometheus}"
-      },
+      "datasource": "${Prometheus}",
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -281,25 +257,18 @@
         "legend": {
           "calcs": [],
           "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
+          "placement": "bottom"
         },
         "tooltip": {
-          "mode": "single",
-          "sort": "none"
+          "mode": "single"
         }
       },
       "targets": [
         {
-          "datasource": {
-            "uid": "${Prometheus}"
-          },
-          "editorMode": "code",
           "exemplar": true,
-          "expr": "rate(emqttb_published_messages{}[$__rate_interval])",
+          "expr": "rate(emqttb_published_messages{}[5s])",
           "interval": "",
           "legendFormat": "{{group}}",
-          "range": true,
           "refId": "A"
         }
       ],
@@ -307,18 +276,13 @@
       "type": "timeseries"
     },
     {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Prometheus}"
-      },
+      "datasource": "${Prometheus}",
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -375,25 +339,18 @@
         "legend": {
           "calcs": [],
           "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
+          "placement": "bottom"
         },
         "tooltip": {
-          "mode": "single",
-          "sort": "none"
+          "mode": "single"
         }
       },
       "targets": [
         {
-          "datasource": {
-            "uid": "${Prometheus}"
-          },
-          "editorMode": "code",
           "exemplar": true,
-          "expr": "rate(emqttb_received_messages{}[$__rate_interval])",
+          "expr": "rate(emqttb_received_messages{}[5s])",
           "interval": "",
           "legendFormat": "{{group}}",
-          "range": true,
           "refId": "A"
         }
       ],
@@ -401,17 +358,13 @@
       "type": "timeseries"
     },
     {
-      "datasource": {
-        "uid": "${Prometheus}"
-      },
+      "datasource": "${Prometheus}",
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -452,9 +405,35 @@
                 "value": 80
               }
             ]
-          }
+          },
+          "unit": "none"
         },
-        "overrides": []
+        "overrides": [
+          {
+            "__systemRef": "hideSeriesFrom",
+            "matcher": {
+              "id": "byNames",
+              "options": {
+                "mode": "exclude",
+                "names": [
+                  "pub/pubinterval"
+                ],
+                "prefix": "All except:",
+                "readOnly": true
+              }
+            },
+            "properties": [
+              {
+                "id": "custom.hideFrom",
+                "value": {
+                  "legend": false,
+                  "tooltip": false,
+                  "viz": true
+                }
+              }
+            ]
+          }
+        ]
       },
       "gridPos": {
         "h": 8,
@@ -462,47 +441,38 @@
         "x": 0,
         "y": 17
       },
-      "id": 7,
+      "id": 8,
       "interval": "1s",
       "options": {
         "legend": {
           "calcs": [],
           "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
+          "placement": "bottom"
         },
         "tooltip": {
-          "mode": "single",
-          "sort": "none"
+          "mode": "single"
         }
       },
       "targets": [
         {
-          "datasource": {
-            "uid": "${Prometheus}"
-          },
           "exemplar": true,
-          "expr": "emqttb_group_n_pending",
+          "expr": "emqttb_autorate_rate",
           "interval": "",
-          "legendFormat": "{{group}}/{{operation}}",
+          "legendFormat": "{{id}}",
           "refId": "A"
         }
       ],
-      "title": "Number of pending operations",
+      "title": "Autorate",
       "type": "timeseries"
     },
     {
-      "datasource": {
-        "uid": "${Prometheus}"
-      },
+      "datasource": "${Prometheus}",
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -546,7 +516,32 @@
           },
           "unit": "µs"
         },
-        "overrides": []
+        "overrides": [
+          {
+            "__systemRef": "hideSeriesFrom",
+            "matcher": {
+              "id": "byNames",
+              "options": {
+                "mode": "exclude",
+                "names": [
+                  "sub/sub"
+                ],
+                "prefix": "All except:",
+                "readOnly": true
+              }
+            },
+            "properties": [
+              {
+                "id": "custom.hideFrom",
+                "value": {
+                  "legend": false,
+                  "tooltip": false,
+                  "viz": true
+                }
+              }
+            ]
+          }
+        ]
       },
       "gridPos": {
         "h": 8,
@@ -554,47 +549,38 @@
         "x": 12,
         "y": 17
       },
-      "id": 9,
+      "id": 12,
       "interval": "1s",
       "options": {
         "legend": {
           "calcs": [],
           "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
+          "placement": "bottom"
         },
         "tooltip": {
-          "mode": "single",
-          "sort": "none"
+          "mode": "single"
         }
       },
       "targets": [
         {
-          "datasource": {
-            "uid": "${Prometheus}"
-          },
           "exemplar": true,
-          "expr": "emqttb_group_op_time",
+          "expr": "emqttb_e2e_latency",
           "interval": "",
-          "legendFormat": "{{group}}/{{operation}}",
+          "legendFormat": "{{group}}",
           "refId": "A"
         }
       ],
-      "title": "Average latency",
+      "title": "End-to-end latency",
       "type": "timeseries"
     },
     {
-      "datasource": {
-        "uid": "${Prometheus}"
-      },
+      "datasource": "${Prometheus}",
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -635,8 +621,7 @@
                 "value": 80
               }
             ]
-          },
-          "unit": "none"
+          }
         },
         "overrides": []
       },
@@ -646,47 +631,38 @@
         "x": 0,
         "y": 25
       },
-      "id": 8,
+      "id": 7,
       "interval": "1s",
       "options": {
         "legend": {
           "calcs": [],
           "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
+          "placement": "bottom"
         },
         "tooltip": {
-          "mode": "single",
-          "sort": "none"
+          "mode": "single"
         }
       },
       "targets": [
         {
-          "datasource": {
-            "uid": "${Prometheus}"
-          },
           "exemplar": true,
-          "expr": "emqttb_autorate_rate",
+          "expr": "emqttb_group_n_pending",
           "interval": "",
-          "legendFormat": "{{id}}",
+          "legendFormat": "{{group}}/{{operation}}",
           "refId": "A"
         }
       ],
-      "title": "Autorate",
+      "title": "Number of pending operations",
       "type": "timeseries"
     },
     {
-      "datasource": {
-        "uid": "${Prometheus}"
-      },
+      "datasource": "${Prometheus}",
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -728,7 +704,7 @@
               }
             ]
           },
-          "unit": "none"
+          "unit": "µs"
         },
         "overrides": []
       },
@@ -738,47 +714,38 @@
         "x": 12,
         "y": 25
       },
-      "id": 10,
+      "id": 9,
       "interval": "1s",
       "options": {
         "legend": {
           "calcs": [],
           "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
+          "placement": "bottom"
         },
         "tooltip": {
-          "mode": "single",
-          "sort": "none"
+          "mode": "single"
         }
       },
       "targets": [
         {
-          "datasource": {
-            "uid": "${Prometheus}"
-          },
           "exemplar": true,
-          "expr": "emqttb_autorate_control",
+          "expr": "emqttb_group_op_time",
           "interval": "",
-          "legendFormat": "{{id}}/{{term}}",
+          "legendFormat": "{{group}}/{{operation}}",
           "refId": "A"
         }
       ],
-      "title": "Autorate control",
+      "title": "Average latency",
       "type": "timeseries"
     },
     {
-      "datasource": {
-        "uid": "${Prometheus}"
-      },
+      "datasource": "${Prometheus}",
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -836,19 +803,14 @@
         "legend": {
           "calcs": [],
           "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
+          "placement": "bottom"
         },
         "tooltip": {
-          "mode": "single",
-          "sort": "none"
+          "mode": "single"
         }
       },
       "targets": [
         {
-          "datasource": {
-            "uid": "${Prometheus}"
-          },
           "exemplar": true,
           "expr": "emqttb_pers_sess_pub_throughput_sum{}",
           "interval": "",
@@ -858,28 +820,112 @@
       ],
       "title": "Persistent session throughput",
       "type": "timeseries"
+    },
+    {
+      "datasource": "${Prometheus}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "none"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 33
+      },
+      "id": 10,
+      "interval": "1s",
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "targets": [
+        {
+          "exemplar": true,
+          "expr": "emqttb_autorate_control",
+          "interval": "",
+          "legendFormat": "{{id}}/{{term}}",
+          "refId": "A"
+        }
+      ],
+      "title": "Autorate control",
+      "type": "timeseries"
     }
   ],
-  "refresh": "5s",
-  "revision": 1,
-  "schemaVersion": 38,
+  "refresh": "1s",
+  "schemaVersion": 32,
   "style": "dark",
   "tags": [],
   "templating": {
     "list": [
       {
         "current": {
-          "selected": true,
+          "selected": false,
           "text": "Prometheus",
           "value": "Prometheus"
         },
+        "description": null,
+        "error": null,
         "hide": 0,
         "includeAll": false,
+        "label": null,
         "multi": false,
         "name": "Prometheus",
         "options": [],
         "query": "prometheus",
-        "queryValue": "",
         "refresh": 1,
         "regex": "",
         "skipUrlSync": false,
@@ -888,7 +934,7 @@
     ]
   },
   "time": {
-    "from": "now-1h",
+    "from": "now-5m",
     "to": "now"
   },
   "timepicker": {
@@ -908,7 +954,6 @@
   },
   "timezone": "",
   "title": "emqttb",
-  "uid": "6ALcrDC7l",
-  "version": 3,
-  "weekStart": ""
-}
+  "uid": "6ALcrDC7k",
+  "version": 2
+}
\ No newline at end of file