diff --git a/common/src/main/java/org/dromara/hertzbeat/common/constants/CommonConstants.java b/common/src/main/java/org/dromara/hertzbeat/common/constants/CommonConstants.java index 82a9f9d23c6..00e6420fadd 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/constants/CommonConstants.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/constants/CommonConstants.java @@ -73,8 +73,8 @@ public interface CommonConstants { /** - * Monitoring Status Code: Unmanaged - * 任务状态码: 未管理 + * Monitoring Status Code: Unmonitored + * 任务状态码: 未监控 */ byte UN_MANAGE_CODE = 0x00; diff --git a/e2e/Dockerfile b/e2e/Dockerfile index 4e0ea4f2458..7b47d27c32e 100644 --- a/e2e/Dockerfile +++ b/e2e/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxsuren/api-testing:master +FROM ghcr.io/linuxsuren/api-testing:v0.0.15 WORKDIR /workspace COPY . . diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/alert_telegram.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/alert_telegram.md index 2c0d788d9e4..6730aa19dcb 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/alert_telegram.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/alert_telegram.md @@ -63,6 +63,6 @@ keywords: [告警 Telegram 通知, 开源告警系统, 开源监控告警系统] > 请排查在告警中心是否已有触发的告警信息 > 请排查是否配置正确机器人Token, UserId，是否已配置告警策略关联 -> UserId 应为消息接收人的UserId +> UserId 应为消息接收对象的UserId 其它问题可以通过交流群ISSUE反馈哦！ diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.3.x/help/alert_telegram.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.3.x/help/alert_telegram.md index 2c0d788d9e4..6730aa19dcb 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.3.x/help/alert_telegram.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.3.x/help/alert_telegram.md @@ -63,6 +63,6 @@ keywords: [告警 Telegram 通知, 开源告警系统, 开源监控告警系统] > 请排查在告警中心是否已有触发的告警信息 > 请排查是否配置正确机器人Token, UserId，是否已配置告警策略关联 -> UserId 应为消息接收人的UserId +> UserId 应为消息接收对象的UserId 其它问题可以通过交流群ISSUE反馈哦！ diff --git a/home/static/img/home/10.png b/home/static/img/home/10.png index e8ee5967825..4fef54a6b5c 100644 Binary files a/home/static/img/home/10.png and b/home/static/img/home/10.png differ diff --git a/home/static/img/home/11.png b/home/static/img/home/11.png index ca1e0ec3e95..13e40fce5a3 100644 Binary files a/home/static/img/home/11.png and b/home/static/img/home/11.png differ diff --git a/home/static/img/home/12.png b/home/static/img/home/12.png index 0aa9f09fec6..d6dcdb0abbe 100644 Binary files a/home/static/img/home/12.png and b/home/static/img/home/12.png differ diff --git a/home/static/img/home/13.png b/home/static/img/home/13.png index e3e3fb9ccbd..5cf3f4f90c8 100644 Binary files a/home/static/img/home/13.png and b/home/static/img/home/13.png differ diff --git a/home/static/img/home/14.png b/home/static/img/home/14.png index 93856090dfc..c61b25f7469 100644 Binary files a/home/static/img/home/14.png and b/home/static/img/home/14.png differ diff --git a/home/static/img/home/16.png b/home/static/img/home/16.png index 2545a5e007b..72907f8f208 100644 Binary files a/home/static/img/home/16.png and b/home/static/img/home/16.png differ diff --git a/home/static/img/home/17.png b/home/static/img/home/17.png index cf7372a7882..5b8ee5b5c71 100644 Binary files a/home/static/img/home/17.png and b/home/static/img/home/17.png differ diff --git a/home/static/img/home/2.png b/home/static/img/home/2.png index a552aa4fa09..85b63702a9e 100644 Binary files a/home/static/img/home/2.png and b/home/static/img/home/2.png differ diff --git a/home/static/img/home/3.png b/home/static/img/home/3.png index bfc41c3eebf..7079efcc3be 100644 Binary files a/home/static/img/home/3.png and b/home/static/img/home/3.png differ diff --git a/home/versioned_docs/version-v1.1.x/help/alert_telegram.md b/home/versioned_docs/version-v1.1.x/help/alert_telegram.md index 2c0d788d9e4..6730aa19dcb 100644 --- a/home/versioned_docs/version-v1.1.x/help/alert_telegram.md +++ b/home/versioned_docs/version-v1.1.x/help/alert_telegram.md @@ -63,6 +63,6 @@ keywords: [告警 Telegram 通知, 开源告警系统, 开源监控告警系统] > 请排查在告警中心是否已有触发的告警信息 > 请排查是否配置正确机器人Token, UserId，是否已配置告警策略关联 -> UserId 应为消息接收人的UserId +> UserId 应为消息接收对象的UserId 其它问题可以通过交流群ISSUE反馈哦！ diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImpl.java b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImpl.java index c15dccba9d7..19d698cc7ce 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImpl.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImpl.java @@ -60,8 +60,7 @@ public void store(Alert alert) { tags.put(CommonConstants.TAG_MONITOR_NAME, monitor.getName()); } if (monitor.getStatus() == CommonConstants.UN_MANAGE_CODE) { - // When monitoring is not managed, ignore and silence its alarm messages - // 当监控未管理时 忽略静默其告警信息 + // When monitoring is not monitored, ignore and silence its alarm messages return; } if (CommonConstants.AVAILABILITY.equals(alert.getTarget())) { diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/AppCount.java b/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/AppCount.java index 8f3a3914f6f..a79b2625e1d 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/AppCount.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/AppCount.java @@ -57,7 +57,7 @@ public AppCount(String app, byte status, Long size) { */ private long availableSize; /** - * 任务状态未管理的数量 + * 任务状态未监控的数量 */ private long unManageSize; /** diff --git a/manager/src/main/resources/define/app-api.yml b/manager/src/main/resources/define/app-api.yml index f6160c54a2d..7a50acedfec 100644 --- a/manager/src/main/resources/define/app-api.yml +++ b/manager/src/main/resources/define/app-api.yml @@ -349,7 +349,7 @@ metrics: unit: ms i18n: zh-CN: 响应时间 - en-US: ResponseTime + en-US: Response Time - field: keyword type: 0 i18n: diff --git a/manager/src/main/resources/define/app-api_code.yml b/manager/src/main/resources/define/app-api_code.yml index b5cd3dd257e..00ac7105eb0 100644 --- a/manager/src/main/resources/define/app-api_code.yml +++ b/manager/src/main/resources/define/app-api_code.yml @@ -370,7 +370,7 @@ metrics: unit: ms i18n: zh-CN: 响应时间 - en-US: ResponseTime + en-US: Response Time - field: code type: 1 i18n: diff --git a/manager/src/main/resources/define/app-ftp.yml b/manager/src/main/resources/define/app-ftp.yml index d359a4ad769..2aa486be50b 100644 --- a/manager/src/main/resources/define/app-ftp.yml +++ b/manager/src/main/resources/define/app-ftp.yml @@ -133,7 +133,7 @@ metrics: unit: ms i18n: zh-CN: 响应时间 - en-US: ResponseTime + en-US: Response Time # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk protocol: ftp # the config content when protocol is ftp diff --git a/manager/src/main/resources/define/app-memcached.yml b/manager/src/main/resources/define/app-memcached.yml index 5c65f4117e8..1ecec48039e 100644 --- a/manager/src/main/resources/define/app-memcached.yml +++ b/manager/src/main/resources/define/app-memcached.yml @@ -86,7 +86,7 @@ metrics: unit: ms i18n: zh-CN: 响应时间 - en-US: ResponseTime + en-US: Response Time - field: pid type: 1 i18n: diff --git a/manager/src/main/resources/define/app-ntp.yml b/manager/src/main/resources/define/app-ntp.yml index 36e27e86f97..fd5b5ab62c8 100644 --- a/manager/src/main/resources/define/app-ntp.yml +++ b/manager/src/main/resources/define/app-ntp.yml @@ -89,7 +89,7 @@ metrics: unit: ms i18n: zh-CN: 响应时间 - en-US: ResponseTime + en-US: Response Time - field: time type: 0 unit: ms diff --git a/manager/src/main/resources/define/app-ping.yml b/manager/src/main/resources/define/app-ping.yml index 43f1500c24a..8943a22f0f3 100644 --- a/manager/src/main/resources/define/app-ping.yml +++ b/manager/src/main/resources/define/app-ping.yml @@ -96,7 +96,7 @@ metrics: unit: ms i18n: zh-CN: 响应时间 - en-US: ResponseTime + en-US: Response Time # Monitoring and collection protocols eg: sql, ssh, http, telnet, wmi, snmp, sdk # 监控采集使用协议 eg: sql, ssh, http, telnet, wmi, snmp, sdk protocol: icmp diff --git a/manager/src/main/resources/define/app-port.yml b/manager/src/main/resources/define/app-port.yml index ba96c185f78..fc98dd3a950 100644 --- a/manager/src/main/resources/define/app-port.yml +++ b/manager/src/main/resources/define/app-port.yml @@ -112,7 +112,7 @@ metrics: unit: ms i18n: zh-CN: 响应时间 - en-US: ResponseTime + en-US: Response Time # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk # 采集协议, 目前支持sql, ssh, http, telnet, wmi, snmp, sdk protocol: telnet diff --git a/manager/src/main/resources/define/app-smtp.yml b/manager/src/main/resources/define/app-smtp.yml index 19732ef92c4..6546251bea4 100644 --- a/manager/src/main/resources/define/app-smtp.yml +++ b/manager/src/main/resources/define/app-smtp.yml @@ -119,7 +119,7 @@ metrics: unit: ms i18n: zh-CN: 响应时间 - en-US: ResponseTime + en-US: Response Time - field: response type: 1 i18n: diff --git a/manager/src/main/resources/define/app-udp_port.yml b/manager/src/main/resources/define/app-udp_port.yml index 7f2c45460dd..32d1f598891 100644 --- a/manager/src/main/resources/define/app-udp_port.yml +++ b/manager/src/main/resources/define/app-udp_port.yml @@ -121,7 +121,7 @@ metrics: unit: ms i18n: zh-CN: 响应时间 - en-US: ResponseTime + en-US: Response Time # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk # 采集协议, 目前支持sql, ssh, http, telnet, wmi, snmp, sdk protocol: udp diff --git a/manager/src/main/resources/define/app-website.yml b/manager/src/main/resources/define/app-website.yml index b10d1024134..d64862c17bd 100644 --- a/manager/src/main/resources/define/app-website.yml +++ b/manager/src/main/resources/define/app-website.yml @@ -225,7 +225,7 @@ metrics: unit: ms i18n: zh-CN: 响应时间 - en-US: ResponseTime + en-US: Response Time - field: keyword type: 0 i18n: diff --git a/manager/src/main/resources/define/app-websocket.yml b/manager/src/main/resources/define/app-websocket.yml index b6391fa511e..37e3c3c8134 100644 --- a/manager/src/main/resources/define/app-websocket.yml +++ b/manager/src/main/resources/define/app-websocket.yml @@ -86,7 +86,7 @@ metrics: unit: ms i18n: zh-CN: 响应时间 - en-US: ResponseTime + en-US: Response Time - field: httpVersion type: 1 i18n: diff --git a/script/sql/schema.sql b/script/sql/schema.sql index 7dd811ea10e..0822b0ad8eb 100644 --- a/script/sql/schema.sql +++ b/script/sql/schema.sql @@ -234,8 +234,8 @@ CREATE TABLE hzb_notice_rule ( id bigint not null auto_increment comment '通知策略主键索引ID', name varchar(100) not null comment '策略名称', - receiver_id bigint not null comment '消息接收人ID', - receiver_name varchar(100) not null comment '消息接收人标识', + receiver_id bigint not null comment '消息接收对象ID', + receiver_name varchar(100) not null comment '消息接收对象标识', template_id bigint comment '消息模版ID', template_name varchar(100) comment '消息模版标识', enable boolean not null default true comment '是否启用此策略', @@ -276,8 +276,8 @@ CREATE TABLE hzb_notice_template DROP TABLE IF EXISTS hzb_notice_receiver ; CREATE TABLE hzb_notice_receiver ( - id bigint not null auto_increment comment '消息接收人ID', - name varchar(100) not null comment '消息接收人姓名', + id bigint not null auto_increment comment '消息接收对象ID', + name varchar(100) not null comment '消息接收对象姓名', type tinyint not null comment '通知信息方式: 0-手机短信 1-邮箱 2-webhook 3-微信公众号 4-企业微信机器人 5-钉钉机器人', phone varchar(100) comment '手机号, 通知方式为手机短信时有效', email varchar(100) comment '邮箱账号, 通知方式为邮箱时有效', diff --git a/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html b/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html index 7ad6a3dfd50..88dc3a1761e 100644 --- a/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html +++ b/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html @@ -365,7 +365,7 @@ [nzOptions]="receiversOption" id="receiver" name="receiver" - nzPlaceHolder="Select a person" + nzPlaceHolder="Select a receiver" nzShowSearch required > @@ -477,7 +477,7 @@ - + {{ appCountService.unAvailableSize }} - {{ 'monitor.status.un-manage' | i18n }} {{ 'monitor.status.unmonitored' | i18n }} {{ appCountService.unManageSize }} @@ -47,7 +47,7 @@ >{{ appCountProgram.unAvailableSize }} - {{ 'monitor.status.un-manage' | i18n }} {{ 'monitor.status.unmonitored' | i18n }} {{ appCountProgram.unManageSize }} @@ -73,7 +73,7 @@ >{{ appCountDb.unAvailableSize }} - {{ 'monitor.status.un-manage' | i18n }} {{ appCountDb.unManageSize }} + {{ 'monitor.status.unmonitored' | i18n }} {{ appCountDb.unManageSize }} @@ -99,7 +99,8 @@ >{{ appCountCache.unAvailableSize }} - {{ 'monitor.status.un-manage' | i18n }} {{ appCountCache.unManageSize }} + {{ 'monitor.status.unmonitored' | i18n }} {{ appCountCache.unManageSize }} @@ -124,7 +125,7 @@ >{{ appCountOs.unAvailableSize }} - {{ 'monitor.status.un-manage' | i18n }} {{ appCountOs.unManageSize }} + {{ 'monitor.status.unmonitored' | i18n }} {{ appCountOs.unManageSize }} @@ -149,7 +150,7 @@ >{{ appCountMid.unAvailableSize }} - {{ 'monitor.status.un-manage' | i18n }} {{ appCountMid.unManageSize }} + {{ 'monitor.status.unmonitored' | i18n }} {{ appCountMid.unManageSize }} @@ -175,7 +176,7 @@ >{{ appCountBigdata.unAvailableSize }} - {{ 'monitor.status.un-manage' | i18n }} {{ 'monitor.status.unmonitored' | i18n }} {{ appCountBigdata.unManageSize }} @@ -202,7 +203,7 @@ >{{ appCountWebserver.unAvailableSize }} - {{ 'monitor.status.un-manage' | i18n }} {{ 'monitor.status.unmonitored' | i18n }} {{ appCountWebserver.unManageSize }} @@ -228,7 +229,7 @@ >{{ appCountCn.unAvailableSize }} - {{ 'monitor.status.un-manage' | i18n }} {{ appCountCn.unManageSize }} + {{ 'monitor.status.unmonitored' | i18n }} {{ appCountCn.unManageSize }} @@ -254,7 +255,7 @@ >{{ appCountNetwork.unAvailableSize }} - {{ 'monitor.status.un-manage' | i18n }} {{ 'monitor.status.unmonitored' | i18n }} {{ appCountNetwork.unManageSize }} @@ -281,7 +282,7 @@ >{{ appCountCustom.unAvailableSize }} - {{ 'monitor.status.un-manage' | i18n }} {{ 'monitor.status.unmonitored' | i18n }} {{ appCountCustom.unManageSize }} diff --git a/web-app/src/app/routes/monitor/monitor-detail/monitor-detail.component.html b/web-app/src/app/routes/monitor/monitor-detail/monitor-detail.component.html index 3f62e19f004..cbceb0e10d9 100644 --- a/web-app/src/app/routes/monitor/monitor-detail/monitor-detail.component.html +++ b/web-app/src/app/routes/monitor/monitor-detail/monitor-detail.component.html @@ -90,7 +90,7 @@
- {{ 'monitor.status.un-manage' | i18n }} + {{ 'monitor.status.unmonitored' | i18n }} diff --git a/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.html b/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.html index cf475394a08..f25656206b5 100644 --- a/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.html +++ b/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.html @@ -358,6 +358,7 @@ id="intervals" > + {{ 'common.time.unit.second' | i18n }} diff --git a/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html b/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html index 7a069645d38..6f202ad1744 100644 --- a/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html +++ b/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html @@ -91,7 +91,7 @@ - +
@@ -132,15 +132,15 @@ - + - {{ 'monitor.status.un-manage' | i18n }} + {{ 'monitor.status.unmonitored' | i18n }} - + {{ 'monitor.status.available' | i18n }} - + {{ 'monitor.status.unavailable' | i18n }} diff --git a/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.html b/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.html index 45b2a457ef0..362568c66e1 100644 --- a/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.html +++ b/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.html @@ -367,6 +367,7 @@ id="intervals" > + {{ 'common.time.unit.second' | i18n }} diff --git a/web-app/src/assets/i18n/en-US.json b/web-app/src/assets/i18n/en-US.json index 4769bb7ca08..4b580091289 100644 --- a/web-app/src/assets/i18n/en-US.json +++ b/web-app/src/assets/i18n/en-US.json @@ -62,7 +62,7 @@ "host.tip": "The monitored peer IP or domain name", "description": "Description", "description.tip": "Description and remarks", - "intervals": "Intervals(s)", + "intervals": "Intervals", "intervals.tip": "Monitor the interval time of periodic collection of data, unit second", "collector": "Collector", "collector.tip": "Choose which collector to dispatch this monitoring", @@ -99,9 +99,9 @@ "": "Task Status", "all": "All Status", "available": "Available", - "unavailable": "UnAvailable", - "unreachable": "UnReachable", - "un-manage": "UnManaged" + "unavailable": "Unavailable", + "unreachable": "Unreachable", + "unmonitored": "Unmonitored" } }, "alert": { @@ -224,7 +224,7 @@ "alert.center.confirm.mark-done": "Please confirm whether to mark processed!", "alert.center.confirm.mark-no-batch": "Please confirm whether to mark Pending in batch!", "alert.center.confirm.mark-no": "Please confirm whether to mark Pending!", - "alert.help.notice": "Notification is used to config the receiver of alarm message and receiving method. The alarm message will be sent to the receiver by specified way(support email, discord, webhook etc). Click here to see configuration steps.
Note⚠\uFE0F: After configuring the “Receiver”, you also need to config the“Notice Policy”to specify which massages are sent to which receivers. Click here to see potential issues
“Notice Template” is message content structure template. The built-in template is used by default or you can customize the template to customize the message notification structure.", + "alert.help.notice": "Notification is used to config the receiver of alarm message and receiving method. The alarm message will be sent to the receiver by specified way(support email, discord, webhook etc). Click here to see configuration steps..
“Notice Template” is message content structure template. The built-in template is used by default or you can customize the template to customize the message notification structure.
Note⚠\uFE0F: After configuring the “Receiver”, you also need to config the“Notice Policy”to specify which massages are sent to which receivers. Click here to see potential issues.", "alert.help.notice.link":"https://hertzbeat.com/docs/help/alert_email", "alert.help.converge": "Alarm Converge supports deduplication and convergence of repeated alarm messages within a specified time period.
Click \"New Converge Strategy\" and configure the time period to avoiding a large number of repetitive alarms that may numb the receiver's alarm.", "alert.help.converge.link":"https://hertzbeat.com", @@ -245,7 +245,7 @@ "alert.notice.template.preset.true": "System Preset", "alert.notice.template.preset.false": "User Custom", "alert.notice.template.content": "Template Content", - "alert.notice.receiver": "Message Receiver", + "alert.notice.receiver": "Notice Receiver", "alert.notice.receiver.new": "New Receiver", "alert.notice.receiver.edit": "Edit Receiver", "alert.notice.receiver.delete": "Delete Receiver", @@ -464,6 +464,7 @@ "common.week.4": "Thursday", "common.week.5": "Friday", "common.week.6": "Saturday", + "common.time.unit.second": "Seconds", "validation.email.invalid": "Invalid email！", "validation.phone.invalid": "Invalid phone number！", "validation.verification-code.invalid": "Invalid verification code, should be 6 digits！", diff --git a/web-app/src/assets/i18n/zh-CN.json b/web-app/src/assets/i18n/zh-CN.json index 7e378d242a0..fa97878d399 100644 --- a/web-app/src/assets/i18n/zh-CN.json +++ b/web-app/src/assets/i18n/zh-CN.json @@ -62,8 +62,8 @@ "host.tip": "被监控的对端IP或域名", "description": "描述备注", "description.tip": "更多标识和描述此监控的备注信息", - "intervals": "采集间隔(秒)", - "intervals.tip": "监控周期性采集数据间隔时间,单位秒", + "intervals": "监控周期", + "intervals.tip": "周期性采集数据的时间间隔,单位秒", "collector": "采集器", "collector.tip": "配置此监控使用哪台采集器调度采集", "collector.system.default": "默认系统调度", @@ -98,10 +98,10 @@ "status": { "": "任务状态", "all": "全部状态", - "available": "正常监控", + "available": "正常", "unavailable": "不可用", "unreachable": "不可达", - "un-manage": "未管理" + "unmonitored": "未监控" } }, "alert": { @@ -224,7 +224,7 @@ "alert.center.confirm.mark-done": "请确认是否标记已处理!", "alert.center.confirm.mark-no-batch": "请确认是否批量标记未处理!", "alert.center.confirm.mark-no": "请确认是否标记未处理!", - "alert.help.notice": "消息通知用于配置告警通知的接收人以及接收方式，使被阈值触发的告警信息，通过指定方式通知到接收人（支持邮箱、钉钉、微信，Webhook等），点击查看具体配置步骤。
注意⚠\uFE0F：配置“消息接收人后”，您还需要配置“通知策略”来指定哪些消息发给哪些接收人，点击查看可能遇见的问题。
通知模版是不同通知方式对应的消息内容结构模版，默认使用内置模版或者您可以自定义模版来自定义消息通知结构。", + "alert.help.notice": "消息通知用于配置告警通知的接收对象以及接收方式，使被阈值触发的告警信息，通过指定方式通知到接收对象（支持邮箱、钉钉、微信，Webhook等），点击查看具体配置步骤。
通知模版是不同通知方式对应的消息内容结构模版，默认使用内置模版或者您可以自定义模版来自定义消息通知结构。
注意⚠\uFE0F：配置“通知媒介后”，您还需要配置“通知策略”来指定哪些消息发给哪些接收对象，点击查看可能遇见的问题。", "alert.help.notice.link": "https://hertzbeat.com/zh-cn/docs/help/alert_email", "alert.help.converge": "告警收敛支持对指定时间段内的相同重复告警消息进行去重收敛。您可以点击”新增收敛策略“，并进行配置。
当阈值规则触发告警后，会进入到告警收敛，告警收敛会根据收敛规则对重复告警收敛，以避免大量重复告警消息导致接收风暴。", "alert.help.converge.link": "https://hertzbeat.com/zh-cn/docs/#%E5%91%8A%E8%AD%A6%E6%94%B6%E6%95%9B", @@ -245,12 +245,12 @@ "alert.notice.template.preset.true": "系统内置模版", "alert.notice.template.preset.false": "用户自定义模版", "alert.notice.template.content": "模板内容", - "alert.notice.receiver": "消息接收人", - "alert.notice.receiver.new": "新增接收人", - "alert.notice.receiver.edit": "编辑接收人", - "alert.notice.receiver.delete": "删除接收人", - "alert.notice.receiver.people": "接收人", - "alert.notice.receiver.people.name": "接收人名称", + "alert.notice.receiver": "通知媒介", + "alert.notice.receiver.new": "新增接收对象", + "alert.notice.receiver.edit": "编辑接收对象", + "alert.notice.receiver.delete": "删除接收对象", + "alert.notice.receiver.people": "接收对象", + "alert.notice.receiver.people.name": "接收对象名称", "alert.notice.receiver.type": "通知方式", "alert.notice.receiver.setting": "配置", "alert.notice.receiver.next": "下一步请配置您的[告警通知策略]！", @@ -465,6 +465,7 @@ "common.week.4": "星期四", "common.week.5": "星期五", "common.week.6": "星期六", + "common.time.unit.second": "秒", "app.theme.default": "浅色主题", "app.theme.dark": "深色主题", "app.theme.compact": "紧凑主题", diff --git a/web-app/src/assets/i18n/zh-TW.json b/web-app/src/assets/i18n/zh-TW.json index 8aa77387ed5..395e31e1b69 100644 --- a/web-app/src/assets/i18n/zh-TW.json +++ b/web-app/src/assets/i18n/zh-TW.json @@ -62,8 +62,8 @@ "host.tip": "被監控的對端IP或域名", "description": "描述備注", "description.tip": "更多標識和描述此監控的備注信息", - "intervals": "采集間隔(秒)", - "intervals.tip": "監控周期性采集數據間隔時間,單位秒", + "intervals": "監控周期", + "intervals.tip": "周期性采集數據的時間間隔,單位秒", "collector": "採集器", "collector.tip": "配置此監控使用哪台採集器調度採集", "collector.system.default": "默認系統調度", @@ -98,10 +98,10 @@ "status": { "": "任務狀態", "all": "全部狀態", - "available": "正常監控", + "available": "正常", "unavailable": "不可用", "unreachable": "不可達", - "un-manage": "未管理" + "unmonitored": "未監控" } }, "alert": { @@ -223,7 +223,7 @@ "alert.center.confirm.mark-done": "請確認是否標記已處理!", "alert.center.confirm.mark-no-batch": "請確認是否批量標記未處理!", "alert.center.confirm.mark-no": "請確認是否標記未處理!", - "alert.help.notice": "消息通知用于配置告警通知的接收人以及接收方式，使被阈值觸發的告警信息，通過指定方式通知到接收人（支持郵箱、釘釘、微信，Webhook等），點擊查看具體配置步驟。
注意⚠\uFE0F：配置“消息接收人後”，您還需要配置“通知策略”來指定哪些消息發給哪些接收人，點擊查看可能遇見的問題。
通知模版是不同通知方式對應的消息內容結構模版，默認使用內置模版或者您可以自定義模版來自定義消息通知結構。", + "alert.help.notice": "消息通知用于配置告警通知的接收对象以及接收方式，使被阈值觸發的告警信息，通過指定方式通知到接收对象（支持郵箱、釘釘、微信，Webhook等），點擊查看具體配置步驟。
通知模版是不同通知方式對應的消息內容結構模版，默認使用內置模版或者您可以自定義模版來自定義消息通知結構。
注意⚠\uFE0F：配置“通知媒介後”，您還需要配置“通知策略”來指定哪些消息發給哪些接收对象，點擊查看可能遇見的問題。", "alert.help.notice.link":"https://hertzbeat.com/zh-cn/docs/help/alert_email", "alert.help.converge": "告警收斂支持對指定時間段內的相同重複告警消息進行去重收斂。您可以點擊”新增收斂策略“，並進行配置。
當阈值規則觸發告警後，會進入到告警收斂，告警收斂會根據收斂規則對重複告警收斂，以避免大量重複告警消息導致接收風暴。", "alert.help.converge.link":"https://hertzbeat.com/zh-cn/docs/#%E5%91%8A%E8%AD%A6%E6%94%B6%E6%95%9B", @@ -244,12 +244,12 @@ "alert.notice.template.preset.true": "系統內建模版", "alert.notice.template.preset.false": "用戶自定義模版", "alert.notice.template.content": "模板内容", - "alert.notice.receiver": "消息接收人", - "alert.notice.receiver.new": "新增接收人", - "alert.notice.receiver.edit": "編輯接收人", - "alert.notice.receiver.delete": "刪除接收人", - "alert.notice.receiver.people": "接收人", - "alert.notice.receiver.people.name": "接收人名稱", + "alert.notice.receiver": "通知媒介", + "alert.notice.receiver.new": "新增接收对象", + "alert.notice.receiver.edit": "編輯接收对象", + "alert.notice.receiver.delete": "刪除接收对象", + "alert.notice.receiver.people": "接收对象", + "alert.notice.receiver.people.name": "接收对象名稱", "alert.notice.receiver.type": "通知方式", "alert.notice.receiver.setting": "配置", "alert.notice.receiver.next": "下一步請配置您的[告警通知策略]！", @@ -464,6 +464,7 @@ "common.button.setting": "配置", "common.button.delete": "刪除", "common.button.operation.more": "更多操作", + "common.time.unit.second": "秒", "app.theme.default": "淺色主題", "app.theme.dark": "深色主題", "app.theme.compact": "緊湊主題",