From bbf166885c82155674e48d3e491bba8649887419 Mon Sep 17 00:00:00 2001
From: zhuoshangyi <zhuoshangyi@hntradesp.com>
Date: Sun, 8 Oct 2023 10:53:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96app-tomcat=20memory=5Fpoo?=
 =?UTF-8?q?l=20=E8=AF=A5=E7=94=A8MB=E4=BD=9C=E4=B8=BA=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/define/app-tomcat.yml    | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/manager/src/main/resources/define/app-tomcat.yml b/manager/src/main/resources/define/app-tomcat.yml
index 71d1e3d672a..5aad845168e 100644
--- a/manager/src/main/resources/define/app-tomcat.yml
+++ b/manager/src/main/resources/define/app-tomcat.yml
@@ -178,20 +178,21 @@ metrics:
         instance: true
       - field: committed
         type: 0
+        unit: MB
       - field: init
         type: 0
+        unit: MB
       - field: max
         type: 0
+        unit: MB
       - field: used
         type: 0
-    # (optional)metrics field alias name, it is used as an alias field to map and convert the collected data and metrics field
-    # (可选)监控指标别名, 做为中间字段与采集数据字段和指标字段映射转换
-    aliasFields:
-      - Name
-      - Usage->committed
-      - Usage->init
-      - Usage->max
-      - Usage->used
+        unit: MB
+    units:
+      - committed=B->MB
+      - init=B->MB
+      - max=B->MB
+      - used=B->MB
     # mapping and conversion expressions, use these and aliasField above to calculate metrics value
     # (可选)指标映射转换计算表达式,与上面的别名一起作用,计算出最终需要的指标值
     # eg: cores=core1+core2, usage=usage, waitTime=allTime-runningTime

From 8ab617ea916a25342a8e3a25c477a6bce1a0c508 Mon Sep 17 00:00:00 2001
From: zhuoshangyi <zhuoshangyi@hntradesp.com>
Date: Sun, 8 Oct 2023 13:52:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96app-tomcat=20memory=5Fpoo?=
 =?UTF-8?q?l=20=E8=AF=A5=E7=94=A8MB=E4=BD=9C=E4=B8=BA=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/main/resources/define/app-tomcat.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/manager/src/main/resources/define/app-tomcat.yml b/manager/src/main/resources/define/app-tomcat.yml
index 5aad845168e..fed04885965 100644
--- a/manager/src/main/resources/define/app-tomcat.yml
+++ b/manager/src/main/resources/define/app-tomcat.yml
@@ -188,6 +188,14 @@ metrics:
       - field: used
         type: 0
         unit: MB
+    # (optional)metrics field alias name, it is used as an alias field to map and convert the collected data and metrics field
+    # (可选)监控指标别名, 做为中间字段与采集数据字段和指标字段映射转换
+    aliasFields:
+      - Name
+      - Usage->committed
+      - Usage->init
+      - Usage->max
+      - Usage->used
     units:
       - committed=B->MB
       - init=B->MB