(hertzbeat) 01/01: Merge branch 'master' into random-secret
This is an automated email from the ASF dual-hosted git repository. zhaoqingran pushed a commit to branch random-secret in repository https://gitbox.apache.org/repos/asf/hertzbeat.git commit acb2419876e6e95c5cf159b7960ae2866902f720 Merge: f0777bc91 8d684e964 Author: Logic AuthorDate: Wed May 1 13:59:41 2024 +0800 Merge branch 'master' into random-secret .../warehouse/store/HistoryTdEngineDataStorage.java| 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) - To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
[I] [BUG] [hertzbeat]
tomsun28 opened a new issue, #1899:
URL: https://github.com/apache/hertzbeat/issues/1899
### Is there an existing issue for this?
- [X] I have searched the existing issues
### Current Behavior
I think this is due the EclipseLink orm replace of hibernate orm process
casue
```
Apply Failed!
Exception [EclipseLink-4002] (Eclipse Persistence Services -
4.0.2.v202306161219): org.eclipse.persistence.exceptions.DatabaseException
Internal Exception: org.h2.jdbc.JdbcSQLSyntaxErrorException: Syntax error in
SQL statement "SELECT id, collector, creator, gmt_create, gmt_update, modifier,
monitor_id FROM hzb_collector_monitor_bind WHERE (monitor_id IN [*]?)";
expected "("; SQL statement: SELECT id, collector, creator, gmt_create,
gmt_update, modifier, monitor_id FROM hzb_collector_monitor_bind WHERE
(monitor_id IN ?) [42001-224] Error Code: 42001 Call: SELECT id, collector,
creator, gmt_create, gmt_update, modifier, monitor_id FROM
hzb_collector_monitor_bind WHERE (monitor_id IN ?) bind => [1 parameter bound]
Query: ReadAllQuery(referenceClass=CollectorMonitorBind sql="SELECT id,
collector, creator, gmt_create, gmt_update, modifier, monitor_id FROM
hzb_collector_monitor_bind WHERE (monitor_id IN ?)")
```
### Expected Behavior
update success.
### Steps To Reproduce
1. update the websocket monitoring template in webui
2. error happen
### Environment
```markdown
HertzBeat version(s): master code
```
### Debug logs
_No response_
### Anything else?
_No response_
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail:
notifications-unsubscr...@hertzbeat.apache.org.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org
For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
[I] [BUG] [hertzbeat]
tomsun28 opened a new issue, #1898: URL: https://github.com/apache/hertzbeat/issues/1898 ### Is there an existing issue for this? - [X] I have searched the existing issues ### Current Behavior After modifying the monitoring template, the previously customized menu becomes invalid. https://github.com/apache/hertzbeat/assets/24788200/2851c107-5507-4c6f-9dee-822b7e55efcf;> https://github.com/apache/hertzbeat/assets/24788200/083059e3-d53d-4b84-b43e-dc736b8b9079;> ### Expected Behavior customized menu not invalid ### Steps To Reproduce _No response_ ### Environment ```markdown HertzBeat version(s): master code ``` ### Debug logs _No response_ ### Anything else? _No response_ -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
[PR] [feature] support random jwt secret when not custom [hertzbeat]
tomsun28 opened a new pull request, #1897: URL: https://github.com/apache/hertzbeat/pull/1897 ## What's changed? support random jwt secret when not custom ## Checklist - [ ] I have read the [Contributing Guide](https://hertzbeat.apache.org/docs/community/code_style_and_quality_guide) - [ ] I have written the necessary doc or comment. - [ ] I have added the necessary unit tests and all cases have passed. ## Add or update API - [ ] I have added the necessary [e2e tests](https://github.com/apache/hertzbeat/tree/master/e2e) and all cases have passed. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
(hertzbeat) 01/03: support random jwt secret when not custom
This is an automated email from the ASF dual-hosted git repository.
gongchao pushed a commit to branch random-secret
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
commit 36159b47b62d4d9b0e434350baa12f5f1ebafec2
Author: tomsun28
AuthorDate: Wed May 1 13:12:35 2024 +0800
support random jwt secret when not custom
Signed-off-by: tomsun28
---
.../collector/dispatch/timer/HashedWheelTimer.java | 2 +
.../collector/dispatch/timer/Timeout.java | 2 +
.../hertzbeat/collector/dispatch/timer/Timer.java | 2 +
.../collector/dispatch/timer/TimerTask.java| 2 +
.../manager/config/CommonCommandLineRunner.java| 43 +++-
.../hertzbeat/manager/pojo/dto/SystemSecret.java | 31 +---
.../service/impl/SystemSecretServiceImpl.java | 59 ++
remoting/README.md | 8 ---
.../apache/hertzbeat/remoting/RemotingClient.java | 3 +-
.../apache/hertzbeat/remoting/RemotingServer.java | 3 +-
.../apache/hertzbeat/remoting/RemotingService.java | 1 +
.../remoting/netty/NettyRemotingAbstract.java | 1 +
.../remoting/netty/NettyRemotingClient.java| 1 +
.../remoting/netty/NettyRemotingProcessor.java | 1 +
.../remoting/netty/NettyRemotingServer.java| 1 +
15 files changed, 130 insertions(+), 30 deletions(-)
diff --git
a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/HashedWheelTimer.java
b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/HashedWheelTimer.java
index d03809b3a..e68fc5434 100644
---
a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/HashedWheelTimer.java
+++
b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/HashedWheelTimer.java
@@ -37,6 +37,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
+ * Derived from Apache Dubbo org.apache.dubbo.common.timer.HashedWheelTimer
+ * https://github.com/apache/dubbo/blob/3.2/dubbo-common/src/main/java/org/apache/dubbo/common/timer/HashedWheelTimer.java;>HashedWheelTimer.java
* A {@link Timer} optimized for approximated I/O timeout scheduling.
*
* Tick Duration
diff --git
a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/Timeout.java
b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/Timeout.java
index 0098c63c3..2e22a1da8 100644
---
a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/Timeout.java
+++
b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/Timeout.java
@@ -18,6 +18,8 @@
package org.apache.hertzbeat.collector.dispatch.timer;
/**
+ * Derived from Apache Dubbo org.apache.dubbo.common.timer.Timeout
+ * https://github.com/apache/dubbo/blob/3.2/dubbo-common/src/main/java/org/apache/dubbo/common/timer/Timeout.java;>Timeout.java
* A handle associated with a {@link TimerTask} that is returned by a
* {@link Timer}.
*/
diff --git
a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/Timer.java
b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/Timer.java
index cfc5842b0..6007d0a79 100644
---
a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/Timer.java
+++
b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/Timer.java
@@ -21,6 +21,8 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
/**
+ * Derived from Apache Dubbo org.apache.dubbo.common.timer.Timer
+ * https://github.com/apache/dubbo/blob/3.2/dubbo-common/src/main/java/org/apache/dubbo/common/timer/Timer.java;>Timer.java
* Schedules {@link TimerTask}s for one-time future execution in a background
* thread.
*/
diff --git
a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/TimerTask.java
b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/TimerTask.java
index a6d27fac7..77b953d50 100644
---
a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/TimerTask.java
+++
b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/TimerTask.java
@@ -20,6 +20,8 @@ package org.apache.hertzbeat.collector.dispatch.timer;
import java.util.concurrent.TimeUnit;
/**
+ * Derived from Apache Dubbo org.apache.dubbo.common.timer.TimerTask
+ * https://github.com/apache/dubbo/blob/3.2/dubbo-common/src/main/java/org/apache/dubbo/common/timer/TimerTask.java;>TimerTask.java
* A task which is executed after the delay specified with
* {@link Timer#newTimeout(TimerTask, long, TimeUnit)} (TimerTask, long,
TimeUnit)}.
*/
diff --git
a/manager/src/main/java/org/apache/hertzbeat/manager/config/CommonCommandLineRunner.java
b/manager/src/main/java/org/apache/hertzbeat/manager/config/CommonCommandLineRunner.java
index c483cab68..371718878 100644
---
a/manager/src/main/java/org/apache/hertzbeat/manager/config/CommonCommandLineRunner.java
+++
(hertzbeat) branch random-secret created (now f0777bc91)
This is an automated email from the ASF dual-hosted git repository. gongchao pushed a change to branch random-secret in repository https://gitbox.apache.org/repos/asf/hertzbeat.git at f0777bc91 support random jwt secret when not custom This branch includes the following new commits: new 36159b47b support random jwt secret when not custom new 7cde942d3 Add @HeartLinked as a contributor new f0777bc91 support random jwt secret when not custom The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
(hertzbeat) 03/03: support random jwt secret when not custom
This is an automated email from the ASF dual-hosted git repository.
gongchao pushed a commit to branch random-secret
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
commit f0777bc91f36418138d5f0540a044acbeebd5f3d
Author: tomsun28
AuthorDate: Wed May 1 13:14:23 2024 +0800
support random jwt secret when not custom
Signed-off-by: tomsun28
---
home/src/pages/team/index.jsx | 5 +
1 file changed, 5 insertions(+)
diff --git a/home/src/pages/team/index.jsx b/home/src/pages/team/index.jsx
index be74f7356..be3b45731 100644
--- a/home/src/pages/team/index.jsx
+++ b/home/src/pages/team/index.jsx
@@ -1018,6 +1018,11 @@ export default function () {
https://github.com/LLP2333;>https://avatars.githubusercontent.com/u/61670545?v=4?s=100; width="100px;"
alt="llp2333"/>llp2333https://github.com/apache/hertzbeat/commits?author=LLP2333;
title="Code">
+ https://github.com/HeartLinked;>https://avatars.githubusercontent.com/u/78212101?v=4?s=100; width="100px;"
+alt="feiyang li"/>feiyang
lihttps://github.com/apache/hertzbeat/commits?author=HeartLinked;
title="Documentation">
+
-
To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org
For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
(hertzbeat) 02/03: Add @HeartLinked as a contributor
This is an automated email from the ASF dual-hosted git repository.
gongchao pushed a commit to branch random-secret
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
commit 7cde942d3991a678d9b48953a4ae5a01239a6135
Author: tomsun28
AuthorDate: Wed May 1 13:13:08 2024 +0800
Add @HeartLinked as a contributor
---
.all-contributorsrc | 9 +
README.md | 1 +
README_CN.md| 1 +
3 files changed, 11 insertions(+)
diff --git a/.all-contributorsrc b/.all-contributorsrc
index 07ec7cbe8..2a5fd2cc2 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -1790,6 +1790,15 @@
"contributions": [
"code"
]
+},
+{
+ "login": "HeartLinked",
+ "name": "feiyang li",
+ "avatar_url": "https://avatars.githubusercontent.com/u/78212101?v=4;,
+ "profile": "https://github.com/HeartLinked;,
+ "contributions": [
+"doc"
+ ]
}
],
"contributorsPerLine": 7,
diff --git a/README.md b/README.md
index dbf8bd817..d90973490 100644
--- a/README.md
+++ b/README.md
@@ -438,6 +438,7 @@ Thanks to these wonderful people, welcome to join us:
https://github.com/LLP2333;>https://avatars.githubusercontent.com/u/61670545?v=4?s=100; width="100px;"
alt="llp2333"/>llp2333https://github.com/apache/hertzbeat/commits?author=LLP2333;
title="Code">
+ https://github.com/HeartLinked;>https://avatars.githubusercontent.com/u/78212101?v=4?s=100; width="100px;"
alt="feiyang li"/>feiyang lihttps://github.com/apache/hertzbeat/commits?author=HeartLinked;
title="Documentation">
diff --git a/README_CN.md b/README_CN.md
index 9e8f0d216..7b0daed3e 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -437,6 +437,7 @@ Thanks these wonderful people, welcome to join us:
https://github.com/LLP2333;>https://avatars.githubusercontent.com/u/61670545?v=4?s=100; width="100px;"
alt="llp2333"/>llp2333https://github.com/apache/hertzbeat/commits?author=LLP2333;
title="Code">
+ https://github.com/HeartLinked;>https://avatars.githubusercontent.com/u/78212101?v=4?s=100; width="100px;"
alt="feiyang li"/>feiyang lihttps://github.com/apache/hertzbeat/commits?author=HeartLinked;
title="Documentation">
-
To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org
For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
[GH] (hertzbeat): Workflow run "Backend CI" is working again!
The GitHub Actions job "Backend CI" on hertzbeat.git has succeeded. Run started by GitHub user tomsun28 (triggered by tomsun28). Head commit for run: 8d684e964db5657224847246f6b36bbaa491b9e0 / Clownsw [improve] support Time Type to Tengine Data Storage (#1890) Signed-off-by: Clownsw Co-authored-by: tomsun28 Report URL: https://github.com/apache/hertzbeat/actions/runs/8904700342 With regards, GitHub Actions via GitBox - To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
(hertzbeat) branch master updated: [improve] support Time Type to Tengine Data Storage (#1890)
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 8d684e964 [improve] support Time Type to Tengine Data Storage (#1890)
8d684e964 is described below
commit 8d684e964db5657224847246f6b36bbaa491b9e0
Author: Clownsw
AuthorDate: Wed May 1 10:57:34 2024 +0800
[improve] support Time Type to Tengine Data Storage (#1890)
Signed-off-by: Clownsw
Co-authored-by: tomsun28
---
.../warehouse/store/HistoryTdEngineDataStorage.java| 14 +-
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git
a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryTdEngineDataStorage.java
b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryTdEngineDataStorage.java
index d760f3a17..18643b5d9 100644
---
a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryTdEngineDataStorage.java
+++
b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryTdEngineDataStorage.java
@@ -134,7 +134,9 @@ public class HistoryTdEngineDataStorage extends
AbstractHistoryDataStorage {
for (int index = 0; index < fields.size(); index++) {
CollectRep.Field field = fields.get(index);
String value = valueRow.getColumns(index);
-if (field.getType() == CommonConstants.TYPE_NUMBER) {
+final int fieldType;
+
+if ((fieldType = field.getType()) ==
CommonConstants.TYPE_NUMBER || fieldType == CommonConstants.TYPE_TIME) {
// number data
if (CommonConstants.NULL_VALUE.equals(value)) {
sqlRowBuffer.append("NULL");
@@ -183,7 +185,9 @@ public class HistoryTdEngineDataStorage extends
AbstractHistoryDataStorage {
for (int index = 0; index < fields.size(); index++) {
CollectRep.Field field = fields.get(index);
String fieldName = field.getName();
-if (field.getType() == CommonConstants.TYPE_NUMBER) {
+final int fieldType;
+
+if ((fieldType = field.getType()) ==
CommonConstants.TYPE_NUMBER || fieldType == CommonConstants.TYPE_TIME) {
fieldSqlBuilder.append("`").append(fieldName).append("` ").append("DOUBLE");
} else {
fieldSqlBuilder.append("`").append(fieldName).append("` ").append("NCHAR(")
@@ -216,7 +220,7 @@ public class HistoryTdEngineDataStorage extends
AbstractHistoryDataStorage {
}
}
-private String formatStringValue(String value){
+private String formatStringValue(String value) {
String formatValue =
SQL_SPECIAL_STRING_PATTERN.matcher(value).replaceAll("$0");
// bugfix Argument list too long
if (formatValue != null && formatValue.length() >
tableStrColumnDefineMaxLength) {
@@ -235,7 +239,7 @@ public class HistoryTdEngineDataStorage extends
AbstractHistoryDataStorage {
@Override
public Map> getHistoryMetricData(Long monitorId,
String app, String metrics, String metric, String label, String history) {
String table = app + "_" + metrics + "_" + monitorId;
-String selectSql = label == null ? String.format(QUERY_HISTORY_SQL,
metric, table, history) :
+String selectSql = label == null ? String.format(QUERY_HISTORY_SQL,
metric, table, history) :
String.format(QUERY_HISTORY_WITH_INSTANCE_SQL, metric, table,
label, history);
log.debug(selectSql);
Map> instanceValuesMap = new HashMap<>(8);
@@ -322,7 +326,7 @@ public class HistoryTdEngineDataStorage extends
AbstractHistoryDataStorage {
instanceValue = "";
}
String selectSql =
String.format(QUERY_HISTORY_INTERVAL_WITH_INSTANCE_SQL,
-metric, metric, metric, metric, table,
instanceValue, history);
+metric, metric, metric, metric, table, instanceValue,
history);
log.debug(selectSql);
List values =
instanceValuesMap.computeIfAbsent(instanceValue, k -> new LinkedList<>());
Connection connection = null;
-
To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org
For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
Re: [PR] feat(*): Support Time Type to Tengine Data Storage [hertzbeat]
tomsun28 merged PR #1890: URL: https://github.com/apache/hertzbeat/pull/1890 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
[GH] (hertzbeat): Workflow run "Backend CI" failed!
The GitHub Actions job "Backend CI" on hertzbeat.git has failed. Run started by GitHub user Ceilzcx (triggered by Ceilzcx). Head commit for run: 0bd8516342369ea391da9628cd68596de1992d19 / Ceilzcx <1758619...@qq.com> fix when manager restart, collect register error Report URL: https://github.com/apache/hertzbeat/actions/runs/8904675718 With regards, GitHub Actions via GitBox - To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
[PR] fix when manager restart, collect register error [hertzbeat]
Ceilzcx opened a new pull request, #1896: URL: https://github.com/apache/hertzbeat/pull/1896 ## What's changed? #1709 ## Checklist - [ ] I have read the [Contributing Guide](https://hertzbeat.apache.org/docs/community/code_style_and_quality_guide) - [ ] I have written the necessary doc or comment. - [ ] I have added the necessary unit tests and all cases have passed. ## Add or update API - [ ] I have added the necessary [e2e tests](https://github.com/apache/hertzbeat/tree/master/e2e) and all cases have passed. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
[GH] (hertzbeat): Workflow run "Backend CI" is working again!
The GitHub Actions job "Backend CI" on hertzbeat.git has succeeded. Run started by GitHub user tomsun28 (triggered by tomsun28). Head commit for run: 3046cc86463034269165e6c675427c14be0a99e4 / Jast <745925...@qq.com> [bugfix] fixed some metrics of Jexlespression not matching in Elasticsearch (#1894) Co-authored-by: zhangshenghang Co-authored-by: zhangshenghang Co-authored-by: tomsun28 Report URL: https://github.com/apache/hertzbeat/actions/runs/8896762350 With regards, GitHub Actions via GitBox - To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
(hertzbeat) branch master updated: [bugfix] fixed some metrics of Jexlespression not matching in Elasticsearch (#1894)
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 Co-authored-by: zhangshenghang Co-authored-by: tomsun28 --- 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
Re: [PR] [bugfix] Fixed some metrics of Jexlespression not matching in Elasticsearch [hertzbeat]
tomsun28 merged PR #1894: URL: https://github.com/apache/hertzbeat/pull/1894 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
[GH] (hertzbeat): Workflow run "Backend CI" failed!
The GitHub Actions job "Backend CI" on hertzbeat.git has failed. Run started by GitHub user Clownsw (triggered by tomsun28). Head commit for run: 289fdf72ffcfa36ccc6075f7ee52d35d921653f1 / Clownsw Merge branch 'master' into feature/support-time-to-tdengine Report URL: https://github.com/apache/hertzbeat/actions/runs/8896454374 With regards, GitHub Actions via GitBox - To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
Re: [I] [Question] Does the storage support hostpath when installing with helm? [hertzbeat]
tomsun28 commented on issue #1886: URL: https://github.com/apache/hertzbeat/issues/1886#issuecomment-2085456306 hi the pod maybe migrate to other hosts, it is not recommended to use hostpath. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
Re: [PR] [improve] Missing a generic [hertzbeat]
tomsun28 merged PR #1889: URL: https://github.com/apache/hertzbeat/pull/1889 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
(hertzbeat) branch master updated: [improve] missing a generic (#1889)
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 95905c8dc [improve] missing a generic (#1889)
95905c8dc is described below
commit 95905c8dcb2e2728bc6be309d56aab38b37621f8
Author: crossoverJie
AuthorDate: Tue Apr 30 21:50:30 2024 +0800
[improve] missing a generic (#1889)
Co-authored-by: tomsun28
---
.../collect/common/cache/ConnectionCommonCache.java | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git
a/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/ConnectionCommonCache.java
b/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/ConnectionCommonCache.java
index 2601d28b3..6b2f0b9da 100644
---
a/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/ConnectionCommonCache.java
+++
b/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/ConnectionCommonCache.java
@@ -217,13 +217,11 @@ public class ConnectionCommonCache> {
*/
public void removeCache(T key) {
timeoutMap.remove(key);
-Object value = cacheMap.remove(key);
-if (value instanceof AutoCloseable closeable) {
-try {
-closeable.close();
-} catch (Exception e) {
-log.error("connection close error: {}.", e.getMessage(), e);
-}
+C value = cacheMap.remove(key);
+try {
+value.close();
+} catch (Exception e) {
+log.error("connection close error: {}.", e.getMessage(), e);
}
}
-
To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org
For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
[GH] (hertzbeat): Workflow run "Backend CI" is working again!
The GitHub Actions job "Backend CI" on hertzbeat.git has succeeded. Run started by GitHub user zhangshenghang (triggered by tomsun28). Head commit for run: 18a4577284b20f3448c8c1543b29f9bc116efb1a / zhangshenghang [bugfix]Jexl expression Elasticsearch adaptation Report URL: https://github.com/apache/hertzbeat/actions/runs/8892479527 With regards, GitHub Actions via GitBox - To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
Re: [I] [Task] Write help documents [hertzbeat]
TJxiaobao commented on issue #1795: URL: https://github.com/apache/hertzbeat/issues/1795#issuecomment-2085205029 > Hi,Almalinux can be assigned to me -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
[GH] (hertzbeat): Workflow run "Backend CI" failed!
The GitHub Actions job "Backend CI" on hertzbeat.git has failed. Run started by GitHub user Clownsw (triggered by tomsun28). Head commit for run: 70a07bfc1a9410b334847e9fda0abde064696c57 / Clownsw fix(*): fix TdEngine Init not found Database Signed-off-by: Clownsw Report URL: https://github.com/apache/hertzbeat/actions/runs/8890514244 With regards, GitHub Actions via GitBox - To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
[GH] (hertzbeat): Workflow run "Backend CI" failed!
The GitHub Actions job "Backend CI" on hertzbeat.git has failed. Run started by GitHub user Clownsw (triggered by tomsun28). Head commit for run: 5ad3104fb5e94ed8306643403e50cc50a9e8fc9b / Clownsw feat(*): Support Time Type to Tengine Data Storage Signed-off-by: Clownsw Report URL: https://github.com/apache/hertzbeat/actions/runs/8889671360 With regards, GitHub Actions via GitBox - To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
[I] [BUG] HTTP API did not fill in non mandatory fields, but prompted an error [hertzbeat]
zhangshenghang opened a new issue, #1895: URL: https://github.com/apache/hertzbeat/issues/1895 ### Is there an existing issue for this? - [X] I have searched the existing issues ### Current Behavior In the HTTP API, not filling in the relative path will prompt an error. But relative path is not a mandatory field  ### Expected Behavior _No response_ ### Steps To Reproduce _No response_ ### Environment ```markdown HertzBeat version(s): current master ``` ### Debug logs _No response_ ### Anything else? _No response_ -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
[PR] [bugfix] Fixed some metrics of Jexlespression not matching in Elasticsearch [hertzbeat]
zhangshenghang opened a new pull request, #1894: URL: https://github.com/apache/hertzbeat/pull/1894 ## What's changed? In ElasticSearch statistical metrics, the failures in obtaining `cpu_load_average` and `cpu_percent` are due to expression matching failures. This issue might have been introduced by issue #1859 , which I have already fixed. Before the fix: - `cpu_load_average` and `cpu_percent` could not be obtained due to expression matching errors. https://github.com/apache/hertzbeat/assets/29418975/049a9873-37da-4a10-9970-2f654423ac85;> After the fix: - The issue with `cpu_load_average` and `cpu_percent` has been resolved, allowing for successful retrieval of these statistical metrics. https://github.com/apache/hertzbeat/assets/29418975/6b7536a9-a1e9-47b9-982e-2d2956b30c39;> ## Checklist - [x] I have read the [Contributing Guide](https://hertzbeat.apache.org/docs/community/code_style_and_quality_guide) - [x] I have written the necessary doc or comment. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
(hertzbeat) branch master updated: [doc] add almalinux documentation (#1892)
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 a0ac402e8 [doc] add almalinux documentation (#1892) a0ac402e8 is described below commit a0ac402e8dff6e31f805ab5af3b0cff2be826864 Author: Jast <745925...@qq.com> AuthorDate: Tue Apr 30 16:07:07 2024 +0800 [doc] add almalinux documentation (#1892) Co-authored-by: zhangshenghang Co-authored-by: zhangshenghang Co-authored-by: Logic --- home/docs/help/almalinux.md| 117 + .../current/help/almalinux.md | 117 + home/sidebars.json | 3 +- 3 files changed, 236 insertions(+), 1 deletion(-) diff --git a/home/docs/help/almalinux.md b/home/docs/help/almalinux.md new file mode 100644 index 0..380e1439a --- /dev/null +++ b/home/docs/help/almalinux.md @@ -0,0 +1,117 @@ +--- +id: almalinux +title: Monitoring AlmaLinux Operating System Monitoring +sidebar_label: AlmaLinux Operating System +keywords: [open-source monitoring system, open-source operating system monitoring, AlmaLinux operating system monitoring] +--- +> Collect and monitor common performance metrics of the AlmaLinux operating system. + +### Configuration Parameters + + +| Parameter Name| Parameter Help Description | +| - | - | +| Monitoring Host | The monitored peer's IPv4, IPv6, or domain name. Note ⚠️ No protocol header (e.g., https://, http://). | +| Task Name | A unique name to identify this monitoring task. | +| Port | The port provided by Linux SSH, default is 22. | +| Timeout | Set the connection timeout in milliseconds, default is 6000 ms. | +| Connection Reuse | Set whether to reuse SSH connections, default is false. If false, a new connection will be created for each retrieval of information. | +| Username | SSH connection username, optional. | +| Password | SSH connection password, optional. | +| Collector | Configure which collector to use for scheduling data collection for this monitoring. | +| Monitoring Period | The interval time for periodic data collection, in seconds, with a minimum interval of 30 seconds. | +| Binding Tags | Used for classifying and managing monitoring resources. | +| Description Note | Additional notes to identify and describe this monitoring, where users can make notes. | +| Key | The key required to connect to the server. | + +### Data Collection Metrics + + Metric Set: Basic System Information + + +| Metric Name| Metric Unit | Metric Help Description | +| -- | --- | | +| Host Name | None| Host name| +| System Version | None| Operating system version | +| Uptime | None| Uptime | + + Metric Set: CPU Information + + +| Metric Name| Metric Unit | Metric Help Description | +| -- | --- | - | +| info | None| CPU model | +| cores | Cores | Number of CPU cores | +| interrupt | Count | Number of CPU interrupts | +| load | None| Average CPU load (1/5/15 minutes) | +| context_switch | Count | Number of context switches| +| usage | % | CPU usage | + + Metric Set: Memory Information + + +| Metric Name | Metric Unit | Metric Help Description | +| --- | --- | --- | +| total | Mb | Total memory capacity | +| used| Mb | Memory used by user programs| +|
Re: [PR] [doc] add help doc for flink monitoring [hertzbeat]
zqr10159 merged PR #1893: URL: https://github.com/apache/hertzbeat/pull/1893 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
Re: [PR] [doc] add almalinux documentation [hertzbeat]
zqr10159 merged PR #1892: URL: https://github.com/apache/hertzbeat/pull/1892 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
(hertzbeat) branch master updated: [doc] add help doc for flink monitoring (#1893)
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 841220675 [doc] add help doc for flink monitoring (#1893) 841220675 is described below commit 841220675acd9789820ca7ae1ece804876d8cb5d Author: feiyang li <3200105...@zju.edu.cn> AuthorDate: Tue Apr 30 16:04:41 2024 +0800 [doc] add help doc for flink monitoring (#1893) --- home/docs/help/flink.md| 39 ++ home/docs/help/guide.md| 1 + .../current/help/flink.md | 38 + .../current/help/guide.md | 1 + home/sidebars.json | 1 + 5 files changed, 80 insertions(+) diff --git a/home/docs/help/flink.md b/home/docs/help/flink.md new file mode 100644 index 0..2115a1f0b --- /dev/null +++ b/home/docs/help/flink.md @@ -0,0 +1,39 @@ +--- +id: flink +title: Monitoring Flink +sidebar_label: Flink +keywords: [open source monitoring tool, open source flink monitoring tool] +--- + +> Collect and monitor the general performance Metrics of Flink. + + +### Configuration parameter + +| Parameter Name | Parameter Help Description | +|-|-| +| Monitor Host| The monitored peer IPV4, IPV6, or domain name. Note: Do not include protocol headers (e.g., https://, http://). | +| Task Name | Identifier for this monitoring task, name must be unique. | +| Port| Monitoring port. | +| Query Timeout | Sets the timeout for JVM connection in milliseconds, default is 3000 milliseconds. | +| SSL | Whether to enable SSL (default is off). | +| Username| Connection username. | +| Password| Connection password. | +| Collection Interval | Interval for periodic data collection during monitoring, in seconds. The minimum settable interval is 30 seconds. | +| Whether to detect | Whether to perform a probe check for monitoring availability before adding a new monitor; operations proceed if successful. | +| Description Remarks | Additional identifiers and descriptions for this monitoring, where users can note information. | + +### Collection Metrics + + Metrics Set：Overview + +| Metric Name | Metric Unit | Metric Help Description | +|---|-|-| +| slots_total | Units | Total number of slots. | +| slots_used| Units | Number of slots used. | +| task_total| Units | Total number of tasks. | +| jobs_running | Units | Number of jobs running. | +| jobs_failed | Units | Number of jobs failed. | + + + diff --git a/home/docs/help/guide.md b/home/docs/help/guide.md index 4ec711a79..ae78ec39a 100644 --- a/home/docs/help/guide.md +++ b/home/docs/help/guide.md @@ -67,6 +67,7 @@ sidebar_label: Help Center [Clickhouse](clickhouse) [ElasticSearch](elasticsearch) +[Flink](flink) ### Network monitoring diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/flink.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/flink.md new file mode 100644 index 0..ef260f4dc --- /dev/null +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/flink.md @@ -0,0 +1,38 @@ +--- +id: flink +title: 监控：Flink +sidebar_label: Flink Monitor +keywords: [开源监控系统, 开源 Flink 监控] +--- + +> 对 Flink 流引擎的通用指标进行测量监控。 + +### 配置参数 + +| 参数名称 | 参数帮助描述 | +||--| +| 监控Host | 被监控的对端IPV4，IPV6或域名。注意⚠️不带协议头(eg: https://, http://)。 | +| 任务名称 | 标识此监控的名称，名称需要保证唯一性。 | +| 端口 | 监控的端口| +| 查询超时时间 | 设置JVM连接的超时时间，单位ms毫秒，默认3000毫秒。| +| SSL| 是否开启SSL（默认关闭）| +| 用户名| 连接用户名| +| 密码 | 连接密码
[PR] [doc] add help doc for flink monitoring [hertzbeat]
HeartLinked opened a new pull request, #1893: URL: https://github.com/apache/hertzbeat/pull/1893 ## What's changed? Add help documentation(https://github.com/apache/hertzbeat/issues/1795) for flink monitoring ## Checklist - [x] I have read the [Contributing Guide](https://hertzbeat.apache.org/docs/community/code_style_and_quality_guide) - [x] I have written the necessary doc or comment. - [ ] I have added the necessary unit tests and all cases have passed. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
[PR] [doc] add almalinux documentation [hertzbeat]
zhangshenghang opened a new pull request, #1892: URL: https://github.com/apache/hertzbeat/pull/1892 ## What's changed? #1795 - Add AlmaLinux Chinese and English documentation - Modify sidebars.json configuration ## Checklist - [x] I have read the [Contributing Guide](https://hertzbeat.apache.org/docs/community/code_style_and_quality_guide) - [x] I have written the necessary doc or comment. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
[PR] fix(*): fix TdEngine Init not found Database [hertzbeat]
Clownsw opened a new pull request, #1891: URL: https://github.com/apache/hertzbeat/pull/1891 ## What's changed? ## Checklist - [ ] I have read the [Contributing Guide](https://hertzbeat.apache.org/docs/community/code_style_and_quality_guide) - [ ] I have written the necessary doc or comment. - [ ] I have added the necessary unit tests and all cases have passed. ## Add or update API - [ ] I have added the necessary [e2e tests](https://github.com/apache/hertzbeat/tree/master/e2e) and all cases have passed. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
Re: [I] [Task] Write help documents [hertzbeat]
zhangshenghang commented on issue #1795: URL: https://github.com/apache/hertzbeat/issues/1795#issuecomment-2084488732 Hi,Almalinux can be assigned to me -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
