This is an automated email from the ASF dual-hosted git repository.

zhaoqingran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git


The following commit(s) were added to refs/heads/master by this push:
     new dc0eb6a7a [fixbug] Fix the problem of no data for springboot3 
monitoring (#1961)
dc0eb6a7a is described below

commit dc0eb6a7a05396cfb1ef2e13b7255cada8ad788a
Author: Jast <[email protected]>
AuthorDate: Sat May 11 19:03:45 2024 +0800

    [fixbug] Fix the problem of no data for springboot3 monitoring (#1961)
    
    Co-authored-by: zhangshenghang <[email protected]>
    Co-authored-by: zhangshenghang <[email protected]>
    Co-authored-by: crossoverJie <[email protected]>
    Co-authored-by: yqxxgh <[email protected]>
    Co-authored-by: Ceilzcx <[email protected]>
    Co-authored-by: aias00 <[email protected]>
    Co-authored-by: tomsun28 <[email protected]>
---
 manager/src/main/resources/define/app-springboot2.yml | 18 +++++++++---------
 manager/src/main/resources/define/app-springboot3.yml |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/manager/src/main/resources/define/app-springboot2.yml 
b/manager/src/main/resources/define/app-springboot2.yml
index cd67ff6f2..01f4e2236 100644
--- a/manager/src/main/resources/define/app-springboot2.yml
+++ b/manager/src/main/resources/define/app-springboot2.yml
@@ -128,7 +128,7 @@ metrics:
         type: 1
     # metric alias list, used to identify metrics in query results
     aliasFields:
-      - $.activeProfiles[0]
+      - $.activeProfiles
       - $.propertySources[?(@.name=='server.ports')].properties.*.value
       - 
$.propertySources[?(@.name=='systemProperties')].properties['os.name'].value
       - 
$.propertySources[?(@.name=='systemProperties')].properties['jdk.vendor.version'].value
@@ -136,12 +136,12 @@ metrics:
       - 
$.propertySources[?(@.name=='systemProperties')].properties['os.arch'].value
     # A list of calculation scripts for metric values.
     calculates:
-      - profile=#`$.activeProfiles[0]`
-      - port=#`$.propertySources[?(@.name=='server.ports')].properties.*.value`
-      - 
os=#`$.propertySources[?(@.name=='systemProperties')].properties['os.name'].value`
-      - 
jdk_vendor=#`$.propertySources[?(@.name=='systemProperties')].properties['jdk.vendor.version'].value`
-      - 
jvm_version=#`$.propertySources[?(@.name=='systemProperties')].properties['java.runtime.version'].value`
-      - 
os_arch=#`$.propertySources[?(@.name=='systemProperties')].properties['os.arch'].value`
+      - profile=$.activeProfiles
+      - port=$.propertySources[?(@.name=='server.ports')].properties.*.value
+      - 
os=$.propertySources[?(@.name=='systemProperties')].properties['os.name'].value
+      - 
jdk_vendor=$.propertySources[?(@.name=='systemProperties')].properties['jdk.vendor.version'].value
+      - 
jvm_version=$.propertySources[?(@.name=='systemProperties')].properties['java.runtime.version'].value
+      - 
os_arch=$.propertySources[?(@.name=='systemProperties')].properties['os.arch'].value
     # The protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, 
sdk
     protocol: http
     # Specific collection configuration when protocol is http protocol
@@ -197,7 +197,7 @@ metrics:
       - $.measurements[?(@.statistic == "VALUE")].value
     calculates:
       - state='^o^state^o^'
-      - size=#`$.measurements[?(@.statistic == "VALUE")].value`
+      - size=$.measurements[?(@.statistic == "VALUE")].value
     protocol: http
     http:
       host: ^_^host^_^
@@ -237,7 +237,7 @@ metrics:
       - $.measurements[?(@.statistic == "VALUE")].value
     calculates:
       - space="^o^id^o^"
-      - mem_used=#`$.measurements[?(@.statistic == "VALUE")].value`
+      - mem_used=$.measurements[?(@.statistic == "VALUE")].value
     units:
       - mem_used=B->MB
     protocol: http
diff --git a/manager/src/main/resources/define/app-springboot3.yml 
b/manager/src/main/resources/define/app-springboot3.yml
index 3d77e6a39..8948912d7 100644
--- a/manager/src/main/resources/define/app-springboot3.yml
+++ b/manager/src/main/resources/define/app-springboot3.yml
@@ -157,7 +157,7 @@ metrics:
       - $.measurements[?(@.statistic == "VALUE")].value
     calculates:
       - state='^o^state^o^'
-      - size=#`$.measurements[?(@.statistic == "VALUE")].value`
+      - size=$.measurements[?(@.statistic == "VALUE")].value
     protocol: http
     http:
       host: ^_^host^_^
@@ -212,7 +212,7 @@ metrics:
       - $.measurements[?(@.statistic == "VALUE")].value
     calculates:
       - space="^o^id^o^"
-      - mem_used=#`$.measurements[?(@.statistic == "VALUE")].value`
+      - mem_used=$.measurements[?(@.statistic == "VALUE")].value
     units:
       - mem_used=B->MB
     protocol: http


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to