update monitoring state un-manage to unmonitored, update pic (#1430)

Signed-off-by: tomsun28 <[email protected]>
apache · Dec 19, 2023 · 845bd48 · 845bd48
1 parent bdcf029
commit 845bd48
Show file tree

Hide file tree

Showing 38 changed files with 77 additions and 72 deletions.
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
@@ -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
@@ -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
@@ -63,6 +63,6 @@ keywords: [告警 Telegram 通知, 开源告警系统, 开源监控告警系统]
 
 > 请排查在告警中心是否已有触发的告警信息   
 > 请排查是否配置正确机器人Token, UserId，是否已配置告警策略关联   
-> UserId 应为消息接收人的UserId 
+> UserId 应为消息接收对象的UserId 
 
 其它问题可以通过交流群ISSUE反馈哦！  
diff --git a/...i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.3.x/help/alert_telegram.md b/...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
diff --git a/home/static/img/home/11.png b/home/static/img/home/11.png
diff --git a/home/static/img/home/12.png b/home/static/img/home/12.png
diff --git a/home/static/img/home/13.png b/home/static/img/home/13.png
diff --git a/home/static/img/home/14.png b/home/static/img/home/14.png
diff --git a/home/static/img/home/16.png b/home/static/img/home/16.png
diff --git a/home/static/img/home/17.png b/home/static/img/home/17.png
diff --git a/home/static/img/home/2.png b/home/static/img/home/2.png
diff --git a/home/static/img/home/3.png b/home/static/img/home/3.png
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
@@ -63,6 +63,6 @@ keywords: [告警 Telegram 通知, 开源告警系统, 开源监控告警系统]
 
 > 请排查在告警中心是否已有触发的告警信息   
 > 请排查是否配置正确机器人Token, UserId，是否已配置告警策略关联   
-> UserId 应为消息接收人的UserId 
+> UserId 应为消息接收对象的UserId 
 
 其它问题可以通过交流群ISSUE反馈哦！  
diff --git a/...in/java/org/dromara/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImpl.java b/...in/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -365,7 +365,7 @@
             [nzOptions]="receiversOption"
             id="receiver"
             name="receiver"
-            nzPlaceHolder="Select a person"
+            nzPlaceHolder="Select a receiver"
             nzShowSearch
             required
           >
@@ -477,7 +477,7 @@
     </form>
   </div>
 </nz-modal>
-<!-- 新增或修改消息接收人弹出框 -->
+<!-- 新增或修改通知媒介弹出框 -->
 <nz-modal
   (nzOnCancel)="onManageReceiverModalCancel()"
   (nzOnOk)="onManageReceiverModalOk()"

diff --git a/web-app/src/app/routes/alert/alert-notice/alert-notice.component.ts b/web-app/src/app/routes/alert/alert-notice/alert-notice.component.ts
@@ -28,7 +28,7 @@ export class AlertNoticeComponent implements OnInit {
   loading = false;
   code: string = '';
   originalCode: string = '';
-  // start 新增或修改通知接收人弹出框
+  // start 新增或修改通知接收对象弹出框
   isManageReceiverModalVisible: boolean = false;
   isManageReceiverModalAdd: boolean = true;
   isManageReceiverModalOkLoading: boolean = false;

diff --git a/web-app/src/app/routes/dashboard/dashboard.component.html b/web-app/src/app/routes/dashboard/dashboard.component.html
@@ -20,7 +20,7 @@
               ><span style="font-weight: bolder">{{ appCountService.unAvailableSize }}</span>
             </nz-tag>
             <nz-tag class="mb-xs">
-              <span>{{ 'monitor.status.un-manage' | i18n }} </span
+              <span>{{ 'monitor.status.unmonitored' | i18n }} </span
               ><span style="font-weight: bolder">{{ appCountService.unManageSize }}</span>
             </nz-tag>
           </div>
@@ -47,7 +47,7 @@
               ><span style="font-weight: bolder">{{ appCountProgram.unAvailableSize }}</span>
             </nz-tag>
             <nz-tag class="mb-xs">
-              <span>{{ 'monitor.status.un-manage' | i18n }} </span
+              <span>{{ 'monitor.status.unmonitored' | i18n }} </span
               ><span style="font-weight: bolder">{{ appCountProgram.unManageSize }}</span>
             </nz-tag>
           </div>
@@ -73,7 +73,7 @@
               ><span style="font-weight: bolder">{{ appCountDb.unAvailableSize }}</span>
             </nz-tag>
             <nz-tag class="mb-xs">
-              <span>{{ 'monitor.status.un-manage' | i18n }} </span><span style="font-weight: bolder">{{ appCountDb.unManageSize }}</span>
+              <span>{{ 'monitor.status.unmonitored' | i18n }} </span><span style="font-weight: bolder">{{ appCountDb.unManageSize }}</span>
             </nz-tag>
           </div>
         </div>
@@ -99,7 +99,8 @@
               ><span style="font-weight: bolder">{{ appCountCache.unAvailableSize }}</span>
             </nz-tag>
             <nz-tag class="mb-xs">
-              <span>{{ 'monitor.status.un-manage' | i18n }} </span><span style="font-weight: bolder">{{ appCountCache.unManageSize }}</span>
+              <span>{{ 'monitor.status.unmonitored' | i18n }} </span
+              ><span style="font-weight: bolder">{{ appCountCache.unManageSize }}</span>
             </nz-tag>
           </div>
         </div>
@@ -124,7 +125,7 @@
               ><span style="font-weight: bolder">{{ appCountOs.unAvailableSize }}</span>
             </nz-tag>
             <nz-tag class="mb-xs">
-              <span>{{ 'monitor.status.un-manage' | i18n }} </span><span style="font-weight: bolder">{{ appCountOs.unManageSize }}</span>
+              <span>{{ 'monitor.status.unmonitored' | i18n }} </span><span style="font-weight: bolder">{{ appCountOs.unManageSize }}</span>
             </nz-tag>
           </div>
         </div>
@@ -149,7 +150,7 @@
               ><span style="font-weight: bolder">{{ appCountMid.unAvailableSize }}</span>
             </nz-tag>
             <nz-tag class="mb-xs">
-              <span>{{ 'monitor.status.un-manage' | i18n }} </span><span style="font-weight: bolder">{{ appCountMid.unManageSize }}</span>
+              <span>{{ 'monitor.status.unmonitored' | i18n }} </span><span style="font-weight: bolder">{{ appCountMid.unManageSize }}</span>
             </nz-tag>
           </div>
         </div>
@@ -175,7 +176,7 @@
               ><span style="font-weight: bolder">{{ appCountBigdata.unAvailableSize }}</span>
             </nz-tag>
             <nz-tag class="mb-xs">
-              <span>{{ 'monitor.status.un-manage' | i18n }} </span
+              <span>{{ 'monitor.status.unmonitored' | i18n }} </span
               ><span style="font-weight: bolder">{{ appCountBigdata.unManageSize }}</span>
             </nz-tag>
           </div>
@@ -202,7 +203,7 @@
               ><span style="font-weight: bolder">{{ appCountWebserver.unAvailableSize }}</span>
             </nz-tag>
             <nz-tag class="mb-xs">
-              <span>{{ 'monitor.status.un-manage' | i18n }} </span
+              <span>{{ 'monitor.status.unmonitored' | i18n }} </span
               ><span style="font-weight: bolder">{{ appCountWebserver.unManageSize }}</span>
             </nz-tag>
           </div>
@@ -228,7 +229,7 @@
               ><span style="font-weight: bolder">{{ appCountCn.unAvailableSize }}</span>
             </nz-tag>
             <nz-tag class="mb-xs">
-              <span>{{ 'monitor.status.un-manage' | i18n }} </span><span style="font-weight: bolder">{{ appCountCn.unManageSize }}</span>
+              <span>{{ 'monitor.status.unmonitored' | i18n }} </span><span style="font-weight: bolder">{{ appCountCn.unManageSize }}</span>
             </nz-tag>
           </div>
         </div>
@@ -254,7 +255,7 @@
               ><span style="font-weight: bolder">{{ appCountNetwork.unAvailableSize }}</span>
             </nz-tag>
             <nz-tag class="mb-xs">
-              <span>{{ 'monitor.status.un-manage' | i18n }} </span
+              <span>{{ 'monitor.status.unmonitored' | i18n }} </span
               ><span style="font-weight: bolder">{{ appCountNetwork.unManageSize }}</span>
             </nz-tag>
           </div>
@@ -281,7 +282,7 @@
               ><span style="font-weight: bolder">{{ appCountCustom.unAvailableSize }}</span>
             </nz-tag>
             <nz-tag class="mb-xs">
-              <span>{{ 'monitor.status.un-manage' | i18n }} </span
+              <span>{{ 'monitor.status.unmonitored' | i18n }} </span
               ><span style="font-weight: bolder">{{ appCountCustom.unManageSize }}</span>
             </nz-tag>
           </div>

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
@@ -90,7 +90,7 @@
                   <div nz-col nzSpan="16">
                     <nz-tag *ngIf="monitor.status == 0" nzColor="default">
                       <i nz-icon nzType="meh" nzTheme="outline"></i>
-                      <span>{{ 'monitor.status.un-manage' | i18n }}</span>
+                      <span>{{ 'monitor.status.unmonitored' | i18n }}</span>
                     </nz-tag>
                     <nz-tag *ngIf="monitor.status == 1" nzColor="success">
                       <i nz-icon nzType="smile" nzTheme="outline"></i>

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
@@ -358,6 +358,7 @@
             id="intervals"
           >
           </nz-input-number>
+          <nz-tag style="margin-left: 6px">{{ 'common.time.unit.second' | i18n }}</nz-tag>
         </nz-form-control>
       </nz-form-item>
 

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
@@ -91,7 +91,7 @@
     <nz-option [nzLabel]="'monitor.status.all' | i18n" nzValue="9"></nz-option>
     <nz-option [nzLabel]="'monitor.status.available' | i18n" nzValue="1"></nz-option>
     <nz-option [nzLabel]="'monitor.status.unavailable' | i18n" nzValue="2"></nz-option>
-    <nz-option [nzLabel]="'monitor.status.un-manage' | i18n" nzValue="0"></nz-option>
+    <nz-option [nzLabel]="'monitor.status.unmonitored' | i18n" nzValue="0"></nz-option>
   </nz-select>
 </div>
 
@@ -132,15 +132,15 @@
         </button>
       </td>
       <td nzAlign="center">
-        <nz-tag *ngIf="data.status == 0" nzColor="default">
+        <nz-tag *ngIf="data.status == 0" [nzColor]="'#b2b2b2'">
           <i nz-icon nzType="meh" nzTheme="outline"></i>
-          <span>{{ 'monitor.status.un-manage' | i18n }}</span>
+          <span>{{ 'monitor.status.unmonitored' | i18n }}</span>
         </nz-tag>
-        <nz-tag *ngIf="data.status == 1" nzColor="success">
+        <nz-tag *ngIf="data.status == 1" [nzColor]="'#09b919'">
           <i nz-icon nzType="smile" nzTheme="outline"></i>
           <span>{{ 'monitor.status.available' | i18n }}</span>
         </nz-tag>
-        <nz-tag *ngIf="data.status == 2" nzColor="error">
+        <nz-tag *ngIf="data.status == 2" [nzColor]="'#fd4357'">
           <i nz-icon nzType="frown" nzTheme="outline"></i>
           <span>{{ 'monitor.status.unavailable' | i18n }}</span>
         </nz-tag>

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
@@ -367,6 +367,7 @@
             id="intervals"
           >
           </nz-input-number>
+          <nz-tag style="margin-left: 6px">{{ 'common.time.unit.second' | i18n }}</nz-tag>
         </nz-form-control>
       </nz-form-item>