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 3046cc864 [bugfix] fixed some metrics of Jexlespression not matching
in Elasticsearch (#1894)
3046cc864 is described below
commit 3046cc86463034269165e6c675427c14be0a99e4
Author: Jast <745925...@qq.com>
AuthorDate: Tue Apr 30 22:41:06 2024 +0800
[bugfix] fixed some metrics of Jexlespression not matching in Elasticsearch
(#1894)
Co-authored-by: zhangshenghang <shenghang.zh...@avrisdigital.com>
Co-authored-by: zhangshenghang <ad...@hadoop.wiki>
Co-authored-by: tomsun28 <tomsu...@outlook.com>
---
manager/src/main/resources/define/app-elasticsearch.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/manager/src/main/resources/define/app-elasticsearch.yml
b/manager/src/main/resources/define/app-elasticsearch.yml
index cd0c4ac95..5f964dc5f 100644
--- a/manager/src/main/resources/define/app-elasticsearch.yml
+++ b/manager/src/main/resources/define/app-elasticsearch.yml
@@ -337,8 +337,8 @@ metrics:
calculates:
- node_name=$.name
- ip=$.ip
- - cpu_load_average=#`$.os.cpu.load_average.1m` | $.os.load_average
- - cpu_percent=$.os.cpu.percent | $.os.cpu_percent
+ -
cpu_load_average=$.os.cpu.load_average.1m!=null?$.os.cpu.load_average.1m:$.os.load_average
+ - cpu_percent=$.os.cpu.percent!=null?$.os.cpu.percent:$.os.cpu_percent
- heap_used=$.jvm.mem.heap_used_in_bytes
- heap_used_percent=$.jvm.mem.heap_used_percent
- heap_total=$.jvm.mem.heap_max_in_bytes
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org
For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
