This is an automated email from the ASF dual-hosted git repository.
gongchao pushed a change to branch new-alarm
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
from 2a3a61c08 Merge branch 'master' into new-alarm
add 7178c444f [feature](web-app)Add Alarm Voice Alerts (#2906)
add bf8d5b79b [bugfix] Fix the bug where canceling an edit on a record
still updates the page values. (#2911)
add 917c11f29 [bugfix] Fix docker container name unable to display problem
(#2914)
add 6f9ee2f4e [improve] Optimize CacheService and add relevant unit test
(#2912)
add 3562e870d [improve] Add required field indicators and form validation
prompts for convergence strategies and silent strategies in the form. (#2913)
add 51bdb5659 [Feture]Add docker e2e test (#2916)
add 022bbcb43 Merge branch 'master' into new-alarm
add 45dcb3d08 [improve] update alarm
No new revisions were added by this update.
Summary of changes:
.../alert/controller/NoticeConfigController.java | 35 +++++
.../controller/NoticeConfigControllerTest.java | 58 ++++++++
.../collector/dispatch/MetricsCollect.java | 4 +
.../common/cache/CaffeineCacheServiceImpl.java | 7 +-
.../hertzbeat/common/cache/CommonCacheService.java | 9 +-
.../common/constants/GeneralConfigTypeEnum.java | 7 +-
.../hertzbeat/common/cache/CaffeineCacheTest.java | 6 +
.../collect/basic/http/DockerMonitorE2eTest.java | 160 +++++++++++++++++++++
.../resources/http/docker/containers_result.txt | 1 +
.../test/resources/http/docker/system_result.txt | 1 +
.../manager/config/ConfigInitializer.java | 12 ++
.../hertzbeat/manager/pojo/dto/MuteConfig.java | 39 +++++
.../service/impl/MuteGeneralConfigServiceImpl.java | 84 +++++++++++
web-app/angular.json | 7 +-
web-app/package.json | 1 +
.../app/layout/basic/widgets/notify.component.ts | 109 ++++++++++----
.../src/app/pojo/Mute.ts | 4 +
.../alert-group-converge.component.html | 8 +-
.../alert/alert-notice/alert-notice.component.ts | 121 ++++++++++------
.../alert-silence/alert-silence.component.html | 8 +-
...y-storage.service.ts => alert-sound.service.ts} | 28 ++--
web-app/src/app/service/notice-receiver.service.ts | 4 +
web-app/src/app/service/notice-rule.service.ts | 4 +
web-app/src/app/service/notice-template.service.ts | 5 +
web-app/src/assets/audio/default-alert-CN.mp3 | Bin 0 -> 12096 bytes
web-app/src/assets/audio/default-alert-EN.mp3 | Bin 0 -> 11664 bytes
web-app/src/assets/i18n/en-US.json | 1 +
web-app/src/assets/i18n/zh-CN.json | 1 +
web-app/src/assets/i18n/zh-TW.json | 1 +
web-app/yarn.lock | 10 +-
30 files changed, 640 insertions(+), 95 deletions(-)
create mode 100644
hertzbeat-e2e/hertzbeat-collector-basic-e2e/src/test/java/org/apache/hertzbeat/collector/collect/basic/http/DockerMonitorE2eTest.java
create mode 100644
hertzbeat-e2e/hertzbeat-collector-basic-e2e/src/test/resources/http/docker/containers_result.txt
create mode 100644
hertzbeat-e2e/hertzbeat-collector-basic-e2e/src/test/resources/http/docker/system_result.txt
create mode 100644
hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/MuteConfig.java
create mode 100644
hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MuteGeneralConfigServiceImpl.java
copy
template-marketplace/hertzbeat-template-hub-web-app/src/app/routes/user-center/user-assets/user-assets.component.less
=> web-app/src/app/pojo/Mute.ts (95%)
copy web-app/src/app/service/{memory-storage.service.ts =>
alert-sound.service.ts} (63%)
create mode 100644 web-app/src/assets/audio/default-alert-CN.mp3
create mode 100644 web-app/src/assets/audio/default-alert-EN.mp3
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
