Merge ef72d164c2 into 2fb0fce0b1

perf: The new metrics of getTransferredTps for rocketmq5.x and the old metrics of getTransferedTps for rocketmq4.x (#197 )
Co-authored-by: jinwei2 <jinwei2@enmonster.com>
2026-06-08 22:03:21 +08:00 · 2024-05-09 16:34:37 +08:00 · 2024-03-26 17:02:16 +08:00 · 2023-06-14 22:32:22 +00:00
5 changed files with 17558 additions and 12600 deletions
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -9,7 +9,7 @@
    "react": "^17.0.2",
    "react-dom": "^17.0.2",
    "react-json-view": "^1.21.3",
-    "react-scripts": "5.0.1",
+    "react-scripts": "4.0.3",
    "web-vitals": "^1.0.1"
  },
  "proxy": "http://localhost:8080",
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,7 @@
        <maven.compiler.source>1.8</maven.compiler.source>
        <maven.compiler.target>1.8</maven.compiler.target>

-        <guava.version>29.0-jre</guava.version>
+        <guava.version>32.0.0-jre</guava.version>
        <commons-digester.version>2.1</commons-digester.version>
        <commons-lang.version>2.6</commons-lang.version>
        <commons-io.version>2.4</commons-io.version>
--- a/src/main/resources/static/view/pages/cluster.html
+++ b/src/main/resources/static/view/pages/cluster.html
@@ -50,7 +50,14 @@
                <td class="text-center">{{instance.address}}</td>
                <td class="text-center">{{instance.brokerVersionDesc}}</td>
                <td class="text-center">{{instance.putTps.split(' ')[0]| number:2}}</td>
-                <td class="text-center">{{instance.getTransferedTps.split(' ')[0]| number:2}}</td>
+                <td class="text-center">
+                    <span ng-if="!instance.getTransferedTps || !instance.getTransferedTps.trim()">
+                        {{instance.getTransferredTps.split(' ')[0] | number:2}}
+                    </span>
+                    <span ng-if="instance.getTransferedTps && instance.getTransferedTps.trim()">
+                        {{instance.getTransferedTps.split(' ')[0] | number:2}}
+                    </span>
+                </td>
                <td class="text-center">{{instance.msgPutTotalTodayMorning -
                    instance.msgPutTotalYesterdayMorning}}
                </td>