This is an automated email from the ASF dual-hosted git repository.
gongchao 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 f1a9e8334 [fixbug] expression rule adaptation (#1963)
f1a9e8334 is described below
commit f1a9e833441c7c31fc2633376bded5c4c0293c81
Author: Jast <[email protected]>
AuthorDate: Sat May 11 22:22:22 2024 +0800
[fixbug] expression rule adaptation (#1963)
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]>
Co-authored-by: Logic <[email protected]>
---
manager/src/main/resources/define/app-docker.yml | 2 +-
manager/src/main/resources/define/app-flink.yml | 10 +++---
.../resources/define/app-hbase_regionserver.yml | 6 ++--
.../src/main/resources/define/app-hertzbeat.yml | 4 +--
.../main/resources/define/app-hertzbeat_token.yml | 4 +--
manager/src/main/resources/define/app-hive.yml | 36 +++++++++++-----------
.../main/resources/define/app-spring_gateway.yml | 22 ++++++-------
7 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/manager/src/main/resources/define/app-docker.yml
b/manager/src/main/resources/define/app-docker.yml
index 7f8096b60..ebe2837f5 100644
--- a/manager/src/main/resources/define/app-docker.yml
+++ b/manager/src/main/resources/define/app-docker.yml
@@ -224,7 +224,7 @@ metrics:
- Status
calculates:
- id = Id
- - name=#`$.Names[0]`
+ - name=$.Names[0]
- image = Image
- command = Command
- state = State
diff --git a/manager/src/main/resources/define/app-flink.yml
b/manager/src/main/resources/define/app-flink.yml
index fc96a994c..1f1e639a1 100644
--- a/manager/src/main/resources/define/app-flink.yml
+++ b/manager/src/main/resources/define/app-flink.yml
@@ -171,11 +171,11 @@ metrics:
- jobs-cancelled
- jobs-failed
calculates:
- - slots_total=#`slots-total`
- - slots_used=#`slots-total`-#`slots-available`
- -
task_total=#`jobs-running`+#`jobs-finished`+#`jobs-cancelled`+#`jobs-failed`
- - jobs_running=#`jobs-running`
- - jobs_failed=#`jobs-failed`
+ - slots_total=slots-total
+ - slots_used=slots-total-slots-available
+ - task_total=jobs-running+jobs-finished+jobs-cancelled+jobs-failed
+ - jobs_running=jobs-running
+ - jobs_failed=jobs-failed
protocol: http
http:
host: ^_^host^_^
diff --git a/manager/src/main/resources/define/app-hbase_regionserver.yml
b/manager/src/main/resources/define/app-hbase_regionserver.yml
index 9a1eb770c..82476c56e 100644
--- a/manager/src/main/resources/define/app-hbase_regionserver.yml
+++ b/manager/src/main/resources/define/app-hbase_regionserver.yml
@@ -476,9 +476,9 @@ metrics:
- $.['exceptions.RegionTooBusyException']
calculates:
- numActiveHandler=$.numActiveHandler
- -
NotServingRegionException=#`$.['exceptions.NotServingRegionException']`
- - RegionMovedException=#`$.['exceptions.RegionMovedException']`
- - RegionTooBusyException=#`$.['exceptions.RegionTooBusyException']`
+ - NotServingRegionException=$.['exceptions.NotServingRegionException']
+ - RegionMovedException=$.['exceptions.RegionMovedException']
+ - RegionTooBusyException=$.['exceptions.RegionTooBusyException']
protocol: http
http:
host: ^_^host^_^
diff --git a/manager/src/main/resources/define/app-hertzbeat.yml
b/manager/src/main/resources/define/app-hertzbeat.yml
index 4d8c615c8..7e060dc3e 100644
--- a/manager/src/main/resources/define/app-hertzbeat.yml
+++ b/manager/src/main/resources/define/app-hertzbeat.yml
@@ -195,7 +195,7 @@ metrics:
- $.measurements[?(@.statistic == "VALUE")].value
calculates:
- state='^o^state^o^'
- - number=#`$.measurements[?(@.statistic == "VALUE")].value`
+ - number=$.measurements[?(@.statistic == "VALUE")].value
protocol: http
http:
host: ^_^host^_^
@@ -246,7 +246,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-hertzbeat_token.yml
b/manager/src/main/resources/define/app-hertzbeat_token.yml
index 8ae61575d..1bbbf7882 100644
--- a/manager/src/main/resources/define/app-hertzbeat_token.yml
+++ b/manager/src/main/resources/define/app-hertzbeat_token.yml
@@ -203,7 +203,7 @@ metrics:
- $.measurements[?(@.statistic == "VALUE")].value
calculates:
- state='^o^state^o^'
- - number=#`$.measurements[?(@.statistic == "VALUE")].value`
+ - number=$.measurements[?(@.statistic == "VALUE")].value
protocol: http
http:
host: ^_^host^_^
@@ -250,7 +250,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-hive.yml
b/manager/src/main/resources/define/app-hive.yml
index 3626d277e..840b0784a 100644
--- a/manager/src/main/resources/define/app-hive.yml
+++ b/manager/src/main/resources/define/app-hive.yml
@@ -127,10 +127,10 @@ metrics:
- $.beans[?(@.name == 'java.lang:type=Runtime')].VmVersion
- $.beans[?(@.name == 'java.lang:type=Runtime')].Uptime
calculates:
- - vm_name=#`$.beans[?(@.name == 'java.lang:type=Runtime')].VmName`
- - vm_vendor=#`$.beans[?(@.name == 'java.lang:type=Runtime')].VmVendor`
- - vm_version=#`$.beans[?(@.name == 'java.lang:type=Runtime')].VmVersion`
- - up_time=#`$.beans[?(@.name == 'java.lang:type=Runtime')].Uptime`
+ - vm_name=$.beans[?(@.name == 'java.lang:type=Runtime')].VmName
+ - vm_vendor=$.beans[?(@.name == 'java.lang:type=Runtime')].VmVendor
+ - vm_version=$.beans[?(@.name == 'java.lang:type=Runtime')].VmVersion
+ - up_time=$.beans[?(@.name == 'java.lang:type=Runtime')].Uptime
protocol: http
http:
host: ^_^host^_^
@@ -169,12 +169,12 @@ metrics:
- $.beans[?(@.name ==
'java.lang:type=Runtime')].SystemProperties[?(@.key == 'https.proxyPort')].value
# A list of calculation scripts for metric values.
calculates:
- - https_proxyPort=#`$.beans[?(@.name ==
'java.lang:type=Runtime')].SystemProperties[?(@.key ==
'https.proxyPort')].value`
- - os_name=#`$.beans[?(@.name ==
'java.lang:type=Runtime')].SystemProperties[?(@.key == 'os.name')].value`
- - os_version=#`$.beans[?(@.name ==
'java.lang:type=Runtime')].SystemProperties[?(@.key == 'os.version')].value`
- - os_arch=#`$.beans[?(@.name ==
'java.lang:type=Runtime')].SystemProperties[?(@.key == 'os.arch')].value`
- - java_runtime_name=#`$.beans[?(@.name ==
'java.lang:type=Runtime')].SystemProperties[?(@.key ==
'java.runtime.name')].value`
- - java_runtime_version=#`$.beans[?(@.name ==
'java.lang:type=Runtime')].SystemProperties[?(@.key ==
'java.runtime.version')].value`
+ - https_proxyPort=$.beans[?(@.name ==
'java.lang:type=Runtime')].SystemProperties[?(@.key == 'https.proxyPort')].value
+ - os_name=$.beans[?(@.name ==
'java.lang:type=Runtime')].SystemProperties[?(@.key == 'os.name')].value
+ - os_version=$.beans[?(@.name ==
'java.lang:type=Runtime')].SystemProperties[?(@.key == 'os.version')].value
+ - os_arch=$.beans[?(@.name ==
'java.lang:type=Runtime')].SystemProperties[?(@.key == 'os.arch')].value
+ - java_runtime_name=$.beans[?(@.name ==
'java.lang:type=Runtime')].SystemProperties[?(@.key ==
'java.runtime.name')].value
+ - java_runtime_version=$.beans[?(@.name ==
'java.lang:type=Runtime')].SystemProperties[?(@.key ==
'java.runtime.version')].value
# The protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp,
sdk
protocol: http
# Specific collection configuration when protocol is http protocol
@@ -211,10 +211,10 @@ metrics:
- $.beans[?(@.name == 'java.lang:type=Threading')].PeakThreadCount
- $.beans[?(@.name == 'java.lang:type=Threading')].DaemonThreadCount
calculates:
- - thread_count=#`$.beans[?(@.name ==
'java.lang:type=Threading')].ThreadCount`
- - total_started_thread=#`$.beans[?(@.name ==
'java.lang:type=Threading')].TotalStartedThreadCount`
- - peak_thread_count=#`$.beans[?(@.name ==
'java.lang:type=Threading')].PeakThreadCount`
- - daemon_thread_count=#`$.beans[?(@.name ==
'java.lang:type=Threading')].DaemonThreadCount`
+ - thread_count=$.beans[?(@.name ==
'java.lang:type=Threading')].ThreadCount
+ - total_started_thread=$.beans[?(@.name ==
'java.lang:type=Threading')].TotalStartedThreadCount
+ - peak_thread_count=$.beans[?(@.name ==
'java.lang:type=Threading')].PeakThreadCount
+ - daemon_thread_count=$.beans[?(@.name ==
'java.lang:type=Threading')].DaemonThreadCount
protocol: http
http:
host: ^_^host^_^
@@ -246,10 +246,10 @@ metrics:
- $.beans[?(@.Name == 'Code Cache')].Usage.max
- $.beans[?(@.Name == 'Code Cache')].Usage.used
calculates:
- - committed=#`$.beans[?(@.Name == 'Code Cache')].Usage.committed`
- - init=#`$.beans[?(@.Name == 'Code Cache')].Usage.init`
- - max=#`$.beans[?(@.Name == 'Code Cache')].Usage.max`
- - used=#`$.beans[?(@.Name == 'Code Cache')].Usage.used`
+ - committed=$.beans[?(@.Name == 'Code Cache')].Usage.committed
+ - init=$.beans[?(@.Name == 'Code Cache')].Usage.init
+ - max=$.beans[?(@.Name == 'Code Cache')].Usage.max
+ - used=$.beans[?(@.Name == 'Code Cache')].Usage.used
units:
- committed=B->MB
- init=B->MB
diff --git a/manager/src/main/resources/define/app-spring_gateway.yml
b/manager/src/main/resources/define/app-spring_gateway.yml
index dde00c4aa..9e38a3625 100644
--- a/manager/src/main/resources/define/app-spring_gateway.yml
+++ b/manager/src/main/resources/define/app-spring_gateway.yml
@@ -135,12 +135,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[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
# The protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp,
sdk
protocol: http
# Specific collection configuration when protocol is http protocol
@@ -188,7 +188,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^_^
@@ -228,7 +228,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
@@ -289,9 +289,9 @@ metrics:
- $.order
calculates:
- route_id="^o^name^o^"
- - predicate=#`$.predicate`
- - uri=#`$.uri`
- - order=#`$.order`
+ - predicate=$.predicate
+ - uri=$.uri
+ - order=$.order
protocol: http
http:
host: ^_^host^_^
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
