This is an automated email from the ASF dual-hosted git repository.
likang pushed a change to branch jackson-prop
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
from d5d95307ba Merge branch 'master' into jackson-prop
add 740e3f8385 [feature] Support export all allmonitors (#3509)
add 40d3f1243b feat: Add LogUtil wrapper and optimize logging comments
(#3489)
add 553bdbaf9f [refactor] `AlarmCacheManager` refactoring processing logic
(#3525)
add 28f5410555 Merge branch 'master' into jackson-prop
No new revisions were added by this update.
Summary of changes:
.../alert/calculate/AlarmCacheManager.java | 67 ++++++---
.../alert/calculate/PeriodicAlertCalculator.java | 51 ++++---
.../alert/calculate/RealTimeAlertCalculator.java | 31 ++--
.../AlertDefineAbstractImExportServiceImpl.java | 6 +
.../alert/service/impl/AlibabaSmsClientImpl.java | 7 +-
.../alert/calculate/AlarmCacheManagerTest.java | 135 +++++++++++++++++
.../calculate/PeriodicAlertCalculatorTest.java | 9 +-
.../RealTimeAlertCalculatorMatchTest.java | 15 +-
.../collector/collect/jmx/JmxCollectImpl.java | 17 ++-
.../common/constants/CommonConstants.java | 5 +
.../org/apache/hertzbeat/common/util/LogUtil.java | 167 +++++++++++++++++++++
.../apache/hertzbeat/common/util/LogUtilTest.java | 117 +++++++++++++++
.../manager/controller/MonitorsController.java | 8 +
.../hertzbeat/manager/service/MonitorService.java | 9 ++
.../manager/service/impl/MonitorServiceImpl.java | 12 ++
.../manager/controller/MonitorsControllerTest.java | 14 ++
.../manager/service/MonitorServiceTest.java | 27 ++++
.../monitor-list/monitor-list.component.html | 48 +++++-
.../monitor/monitor-list/monitor-list.component.ts | 44 ++++++
web-app/src/app/service/monitor.service.ts | 11 ++
web-app/src/assets/i18n/en-US.json | 17 ++-
web-app/src/assets/i18n/zh-CN.json | 9 +-
22 files changed, 740 insertions(+), 86 deletions(-)
create mode 100644
hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/calculate/AlarmCacheManagerTest.java
create mode 100644
hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/LogUtil.java
create mode 100644
hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/LogUtilTest.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
