This is an automated email from the ASF dual-hosted git repository.

gongchao pushed a commit to branch integte-extern-alarm
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git

commit 85e1bd7e28d6e8f115b92650a6981f3f7d139bfd
Merge: a05e653ca1 db23c94882
Author: tomsun28 <tomsu...@outlook.com>
AuthorDate: Sat Jan 11 14:02:33 2025 +0800

    Merge branch 'master' into integte-extern-alarm

 .../warehouse/store/realtime/memory/MemoryDataStorage.java        | 8 +++++++-
 .../routes/alert/alert-group/alert-group-converge.component.html  | 2 +-
 .../routes/alert/alert-group/alert-group-converge.component.ts    | 4 ++++
 .../app/routes/alert/alert-inhibit/alert-inhibit.component.html   | 2 +-
 .../src/app/routes/alert/alert-inhibit/alert-inhibit.component.ts | 4 ++++
 .../app/routes/alert/alert-setting/alert-setting.component.html   | 2 +-
 .../src/app/routes/alert/alert-setting/alert-setting.component.ts | 4 ++++
 .../app/routes/alert/alert-silence/alert-silence.component.html   | 2 +-
 .../src/app/routes/alert/alert-silence/alert-silence.component.ts | 4 ++++
 .../src/app/routes/monitor/monitor-list/monitor-list.component.ts | 1 +
 10 files changed, 28 insertions(+), 5 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org
For additional commands, e-mail: notifications-h...@hertzbeat.apache.org

Reply via email to