From 5c9fff43a269f9b7773c5d724e327b6920383025 Mon Sep 17 00:00:00 2001
From: Vitaly Zhuravlev <v-zhuravlev@users.noreply.github.com>
Date: Tue, 22 Nov 2022 16:58:54 +0300
Subject: [PATCH] chore: add proper units for rates on the dashboard

---
 .../emqx_prometheus/grafana_template/EMQ.json | 29 ++++++++-----------
 .../grafana_template/EMQ_Dashboard.json       |  2 +-
 .../grafana_template/ErlangVM.json            |  2 +-
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/apps/emqx_prometheus/grafana_template/EMQ.json b/apps/emqx_prometheus/grafana_template/EMQ.json
index 28b005026..43af53a74 100644
--- a/apps/emqx_prometheus/grafana_template/EMQ.json
+++ b/apps/emqx_prometheus/grafana_template/EMQ.json
@@ -793,7 +793,6 @@
               "mode": "off"
             }
           },
-          "decimals": 0,
           "links": [],
           "mappings": [],
           "min": 0,
@@ -810,7 +809,7 @@
               }
             ]
           },
-          "unit": "short"
+          "unit": "mps"
         },
         "overrides": []
       },
@@ -841,11 +840,13 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
+          "editorMode": "code",
           "exemplar": true,
           "expr": "sum(rate(emqx_messages_received{job=~\"$job\", instance=\"$instance\"}[$__rate_interval]) or irate(emqx_messages_received{job=~\"$job\", instance=\"$instance\"}[$__rate_interval]))",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "Received",
+          "range": true,
           "refId": "A"
         },
         {
@@ -953,7 +954,6 @@
               "mode": "off"
             }
           },
-          "decimals": 0,
           "links": [],
           "mappings": [],
           "min": 0,
@@ -970,7 +970,7 @@
               }
             ]
           },
-          "unit": "short"
+          "unit": "mps"
         },
         "overrides": []
       },
@@ -1149,7 +1149,6 @@
               "mode": "off"
             }
           },
-          "decimals": 0,
           "links": [],
           "mappings": [],
           "min": 0,
@@ -1166,7 +1165,7 @@
               }
             ]
           },
-          "unit": "short"
+          "unit": "mps"
         },
         "overrides": []
       },
@@ -1434,7 +1433,7 @@
               }
             ]
           },
-          "unit": "decbytes"
+          "unit": "Bps"
         },
         "overrides": []
       },
@@ -1528,7 +1527,6 @@
               "mode": "off"
             }
           },
-          "decimals": 0,
           "links": [],
           "mappings": [],
           "min": 0,
@@ -1545,7 +1543,7 @@
               }
             ]
           },
-          "unit": "none"
+          "unit": "pps"
         },
         "overrides": []
       },
@@ -1704,7 +1702,6 @@
               "mode": "off"
             }
           },
-          "decimals": 0,
           "links": [],
           "mappings": [],
           "min": 0,
@@ -1721,7 +1718,7 @@
               }
             ]
           },
-          "unit": "none"
+          "unit": "pps"
         },
         "overrides": []
       },
@@ -1882,7 +1879,6 @@
               "mode": "off"
             }
           },
-          "decimals": 0,
           "links": [],
           "mappings": [],
           "min": 0,
@@ -1899,7 +1895,7 @@
               }
             ]
           },
-          "unit": "short"
+          "unit": "pps"
         },
         "overrides": []
       },
@@ -1995,7 +1991,6 @@
               "mode": "off"
             }
           },
-          "decimals": 0,
           "links": [],
           "mappings": [],
           "min": 0,
@@ -2012,7 +2007,7 @@
               }
             ]
           },
-          "unit": "short"
+          "unit": "pps"
         },
         "overrides": []
       },
@@ -2259,6 +2254,6 @@
   "timezone": "browser",
   "title": "EMQ details",
   "uid": "tjRlQw6Zk",
-  "version": 11,
+  "version": 12,
   "weekStart": ""
-}
\ No newline at end of file
+}
diff --git a/apps/emqx_prometheus/grafana_template/EMQ_Dashboard.json b/apps/emqx_prometheus/grafana_template/EMQ_Dashboard.json
index 319e539ce..324fbabd7 100644
--- a/apps/emqx_prometheus/grafana_template/EMQ_Dashboard.json
+++ b/apps/emqx_prometheus/grafana_template/EMQ_Dashboard.json
@@ -759,4 +759,4 @@
   "uid": "5sreUw6Wz",
   "version": 9,
   "weekStart": ""
-}
\ No newline at end of file
+}
diff --git a/apps/emqx_prometheus/grafana_template/ErlangVM.json b/apps/emqx_prometheus/grafana_template/ErlangVM.json
index ca4d37bc3..6e443d3fc 100644
--- a/apps/emqx_prometheus/grafana_template/ErlangVM.json
+++ b/apps/emqx_prometheus/grafana_template/ErlangVM.json
@@ -1602,4 +1602,4 @@
   "uid": "stprQQ6Zk",
   "version": 5,
   "weekStart": ""
-}
\ No newline at end of file
+}