diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/calculate/CalculateAlarm.java b/alerter/src/main/java/org/apache/hertzbeat/alert/calculate/CalculateAlarm.java index fb60f50f855..66a42c537f5 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/calculate/CalculateAlarm.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/calculate/CalculateAlarm.java @@ -101,7 +101,7 @@ public CalculateAlarm(AlerterWorkerPool workerPool, CommonDataQueue dataQueue, this.triggeredAlertMap = new ConcurrentHashMap<>(16); this.notRecoveredAlertMap = new ConcurrentHashMap<>(16); // Initialize stateAlertMap - List monitors = monitorDao.findMonitorsByStatus(CommonConstants.UN_AVAILABLE_CODE); + List monitors = monitorDao.findMonitorsByStatus(CommonConstants.MONITOR_DOWN_CODE); if (monitors != null) { for (Monitor monitor : monitors) { HashMap tags = new HashMap<>(8); diff --git a/common/src/main/java/org/apache/hertzbeat/common/constants/CommonConstants.java b/common/src/main/java/org/apache/hertzbeat/common/constants/CommonConstants.java index 3a0f9220ef6..e9d3a75ef59 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/constants/CommonConstants.java +++ b/common/src/main/java/org/apache/hertzbeat/common/constants/CommonConstants.java @@ -56,27 +56,21 @@ public interface CommonConstants { * Response status code: Incorrect login account password */ byte MONITOR_LOGIN_FAILED_CODE = 0x05; - - /** - * Response status code: Registration failed exception - */ - byte MONITOR_REGISTER_FAILED_CODE = 0x06; - - + /** - * Monitoring Status Code: Unmonitored + * Monitoring status 0: Paused, 1: Up, 2: Down */ - byte UN_MANAGE_CODE = 0x00; + byte MONITOR_PAUSED_CODE = 0x00; /** - * Monitoring Status Code: Available + * Monitoring status 0: Paused, 1: Up, 2: Down */ - byte AVAILABLE_CODE = 0x01; + byte MONITOR_UP_CODE = 0x01; /** - * Monitoring Status Code: Not Available + * Monitoring status 0: Paused, 1: Up, 2: Down */ - byte UN_AVAILABLE_CODE = 0x02; + byte MONITOR_DOWN_CODE = 0x02; /** * Alarm status: 0 - normal alarm (to be processed) diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/Monitor.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/Monitor.java index dee27568aff..dd59207da41 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/Monitor.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/Monitor.java @@ -87,7 +87,6 @@ public class Monitor { /** * Type of monitoring: linux, mysql, jvm... - * 监控的类型:linux,mysql,jvm... */ @Schema(title = "Type of monitoring", example = "TanCloud", accessMode = READ_WRITE) @Size(max = 100) @@ -95,7 +94,6 @@ public class Monitor { /** * Monitored peer host: ipv4, ipv6, domain name - * 监控的对端host:ipv4,ipv6,域名 */ @Schema(title = "The host to monitor", example = "192.167.25.11", accessMode = READ_WRITE) @Size(max = 100) @@ -104,24 +102,21 @@ public class Monitor { /** * Monitoring collection interval time, in seconds - * 监控的采集间隔时间,单位秒 */ @Schema(title = "Monitoring of the acquisition interval time in seconds", example = "600", accessMode = READ_WRITE) @Min(10) private Integer intervals; /** - * Monitoring status 0: Unmonitored, 1: Available, 2: Unavailable - * 任务状态 0:未监控,1:可用,2:不可用 + * Monitoring status 0: Paused, 1: Up, 2: Down */ - @Schema(title = "Task status 0: not monitored,1: available,2: unavailable", accessMode = READ_WRITE) + @Schema(title = "Task status 0: Paused, 1: Up, 2: Down", accessMode = READ_WRITE) @Min(0) @Max(4) private byte status; /** * Monitoring note description - * 监控备注描述 */ @Schema(title = "Monitor note description", example = "Availability monitoring of the SAAS website TanCloud", accessMode = READ_WRITE) @Size(max = 255) diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImpl.java index 9e3dbc38d53..5f5ca405be8 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImpl.java @@ -58,17 +58,17 @@ public void store(Alert alert) { if (!tags.containsKey(CommonConstants.TAG_MONITOR_HOST)) { tags.put(CommonConstants.TAG_MONITOR_HOST, monitor.getHost()); } - if (monitor.getStatus() == CommonConstants.UN_MANAGE_CODE) { + if (monitor.getStatus() == CommonConstants.MONITOR_PAUSED_CODE) { // When monitoring is not monitored, ignore and silence its alarm messages return; } if (CommonConstants.AVAILABILITY.equals(alert.getTarget())) { - if (alert.getStatus() == CommonConstants.ALERT_STATUS_CODE_PENDING && monitor.getStatus() == CommonConstants.AVAILABLE_CODE) { + if (alert.getStatus() == CommonConstants.ALERT_STATUS_CODE_PENDING && monitor.getStatus() == CommonConstants.MONITOR_UP_CODE) { // Availability Alarm Need to change the monitoring status to unavailable - monitorService.updateMonitorStatus(monitor.getId(), CommonConstants.UN_AVAILABLE_CODE); - } else if (alert.getStatus() == CommonConstants.ALERT_STATUS_CODE_RESTORED && monitor.getStatus() == CommonConstants.UN_AVAILABLE_CODE) { + monitorService.updateMonitorStatus(monitor.getId(), CommonConstants.MONITOR_DOWN_CODE); + } else if (alert.getStatus() == CommonConstants.ALERT_STATUS_CODE_RESTORED && monitor.getStatus() == CommonConstants.MONITOR_DOWN_CODE) { // If the alarm is restored, the monitoring state needs to be restored - monitorService.updateMonitorStatus(monitorId, CommonConstants.AVAILABLE_CODE); + monitorService.updateMonitorStatus(monitorId, CommonConstants.MONITOR_UP_CODE); } } } else { diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/component/status/CalculateStatus.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/status/CalculateStatus.java index b2bd0f7e85d..828aa495c75 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/component/status/CalculateStatus.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/status/CalculateStatus.java @@ -128,10 +128,10 @@ private void startCalculate() { List monitorList = monitorDao.findAll(specification); state = CommonConstants.STATUS_PAGE_COMPONENT_STATE_UNKNOWN; for (Monitor monitor : monitorList) { - if (monitor.getStatus() == CommonConstants.UN_AVAILABLE_CODE) { + if (monitor.getStatus() == CommonConstants.MONITOR_DOWN_CODE) { state = CommonConstants.STATUS_PAGE_COMPONENT_STATE_ABNORMAL; break; - } else if (monitor.getStatus() == CommonConstants.AVAILABLE_CODE) { + } else if (monitor.getStatus() == CommonConstants.MONITOR_UP_CODE) { state = CommonConstants.STATUS_PAGE_COMPONENT_STATE_NORMAL; } } diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/CollectorJobScheduler.java b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/CollectorJobScheduler.java index dfb4fc4b080..ac882e89090 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/CollectorJobScheduler.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/CollectorJobScheduler.java @@ -133,7 +133,7 @@ public void collectorGoOnline(String identity, CollectorInfo collectorInfo) { continue; } Monitor monitor = monitorOptional.get(); - if (monitor.getStatus() == CommonConstants.UN_MANAGE_CODE) { + if (monitor.getStatus() == CommonConstants.MONITOR_PAUSED_CODE) { continue; } try { diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java index 5127397b756..2548f904c39 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java @@ -211,7 +211,7 @@ public void addMonitor(Monitor monitor, List params, String collector) th } monitor.setId(monitorId); monitor.setJobId(jobId); - monitor.setStatus(CommonConstants.AVAILABLE_CODE); + monitor.setStatus(CommonConstants.MONITOR_UP_CODE); monitorDao.save(monitor); paramDao.saveAll(params); } catch (Exception e) { @@ -258,7 +258,7 @@ public void addNewMonitorOptionalMetrics(List metrics, Monitor monitor, try { monitor.setId(monitorId); monitor.setJobId(jobId); - monitor.setStatus(CommonConstants.AVAILABLE_CODE); + monitor.setStatus(CommonConstants.MONITOR_UP_CODE); monitorDao.save(monitor); paramDao.saveAll(params); } catch (Exception e) { @@ -514,7 +514,7 @@ public void modifyMonitor(Monitor monitor, List params, String collector) tag.setTagValue(monitor.getName()); } } - if (preMonitor.getStatus() != CommonConstants.UN_MANAGE_CODE) { + if (preMonitor.getStatus() != CommonConstants.MONITOR_PAUSED_CODE) { // Construct the collection task Job entity Job appDefine = appService.getAppDefine(monitor.getApp()); if (CommonConstants.PROMETHEUS.equals(monitor.getApp())) { @@ -640,8 +640,8 @@ public void cancelManageMonitors(HashSet ids) { // The jobId is not deleted, and the jobId is reused again after the management is started. List managedMonitors = monitorDao.findMonitorsByIdIn(ids) .stream().filter(monitor -> - monitor.getStatus() != CommonConstants.UN_MANAGE_CODE) - .peek(monitor -> monitor.setStatus(CommonConstants.UN_MANAGE_CODE)) + monitor.getStatus() != CommonConstants.MONITOR_PAUSED_CODE) + .peek(monitor -> monitor.setStatus(CommonConstants.MONITOR_PAUSED_CODE)) .collect(Collectors.toList()); if (!managedMonitors.isEmpty()) { for (Monitor monitor : managedMonitors) { @@ -656,8 +656,8 @@ public void enableManageMonitors(HashSet ids) { // Update monitoring status Add corresponding monitoring periodic task List unManagedMonitors = monitorDao.findMonitorsByIdIn(ids) .stream().filter(monitor -> - monitor.getStatus() == CommonConstants.UN_MANAGE_CODE) - .peek(monitor -> monitor.setStatus(CommonConstants.AVAILABLE_CODE)) + monitor.getStatus() == CommonConstants.MONITOR_PAUSED_CODE) + .peek(monitor -> monitor.setStatus(CommonConstants.MONITOR_UP_CODE)) .collect(Collectors.toList()); if (!unManagedMonitors.isEmpty()) { for (Monitor monitor : unManagedMonitors) { @@ -708,9 +708,9 @@ public List getAllAppMonitorsCount() { AppCount appCount = appCountMap.getOrDefault(item.getApp(), new AppCount()); appCount.setApp(item.getApp()); switch (item.getStatus()) { - case CommonConstants.AVAILABLE_CODE -> appCount.setAvailableSize(appCount.getAvailableSize() + item.getSize()); - case CommonConstants.UN_AVAILABLE_CODE -> appCount.setUnAvailableSize(appCount.getUnAvailableSize() + item.getSize()); - case CommonConstants.UN_MANAGE_CODE -> appCount.setUnManageSize(appCount.getUnManageSize() + item.getSize()); + case CommonConstants.MONITOR_UP_CODE -> appCount.setAvailableSize(appCount.getAvailableSize() + item.getSize()); + case CommonConstants.MONITOR_DOWN_CODE -> appCount.setUnAvailableSize(appCount.getUnAvailableSize() + item.getSize()); + case CommonConstants.MONITOR_PAUSED_CODE -> appCount.setUnManageSize(appCount.getUnManageSize() + item.getSize()); default -> {} } appCountMap.put(item.getApp(), appCount); @@ -750,7 +750,7 @@ public void copyMonitors(List ids) { @Override public void updateAppCollectJob(Job job) { List monitors = monitorDao.findMonitorsByAppEquals(job.getApp()) - .stream().filter(monitor -> monitor.getStatus() != CommonConstants.UN_MANAGE_CODE) + .stream().filter(monitor -> monitor.getStatus() != CommonConstants.MONITOR_PAUSED_CODE) .toList(); if (monitors.isEmpty()) { return; diff --git a/manager/src/test/java/org/apache/hertzbeat/manager/service/MonitorServiceTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/service/MonitorServiceTest.java index 58fa67febd4..5956619773f 100644 --- a/manager/src/test/java/org/apache/hertzbeat/manager/service/MonitorServiceTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/service/MonitorServiceTest.java @@ -681,7 +681,7 @@ void enableManageMonitors() { List monitors = new ArrayList<>(); for (Long id : ids) { Monitor monitor = Monitor.builder().jobId(id).intervals(1).app("app").name("memory").host("host").id(id).build(); - monitor.setStatus(CommonConstants.UN_MANAGE_CODE); + monitor.setStatus(CommonConstants.MONITOR_PAUSED_CODE); monitors.add(monitor); } when(monitorDao.findMonitorsByIdIn(ids)).thenReturn(monitors); @@ -700,7 +700,7 @@ void getAllAppMonitorsCount() { List appCounts = new ArrayList<>(); AppCount appCount = new AppCount(); appCount.setApp("test"); - appCount.setStatus(CommonConstants.AVAILABLE_CODE); + appCount.setStatus(CommonConstants.MONITOR_UP_CODE); appCounts.add(appCount); when(monitorDao.findAppsStatusCount()).thenReturn(appCounts); @@ -721,7 +721,7 @@ void getMonitor() { @Test void updateMonitorStatus() { - assertDoesNotThrow(() -> monitorService.updateMonitorStatus(1L, CommonConstants.AVAILABLE_CODE)); + assertDoesNotThrow(() -> monitorService.updateMonitorStatus(1L, CommonConstants.MONITOR_UP_CODE)); } @Test diff --git a/web-app/src/app/pojo/Monitor.ts b/web-app/src/app/pojo/Monitor.ts index d5afa2b1230..c6e05a51e23 100644 --- a/web-app/src/app/pojo/Monitor.ts +++ b/web-app/src/app/pojo/Monitor.ts @@ -25,7 +25,7 @@ export class Monitor { app!: string; host!: string; intervals: number = 60; - // 任务状态 0:未监控,1:可用,2:不可用 + // Monitoring status 0: Paused, 1: Up, 2: Down status!: number; description!: string; creator!: string; diff --git a/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html b/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html index 18872aaf86c..929a732a4ec 100644 --- a/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html +++ b/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html @@ -418,7 +418,7 @@ - {{ 'monitor.status.unavailable' | i18n }} + {{ 'monitor.status.down' | i18n }} {{ 'monitor.status.unreachable' | i18n }} {{ 'alert.setting.trigger' | i18n }} diff --git a/web-app/src/app/routes/dashboard/dashboard.component.html b/web-app/src/app/routes/dashboard/dashboard.component.html index 9b63d617ecd..cb293ecf151 100644 --- a/web-app/src/app/routes/dashboard/dashboard.component.html +++ b/web-app/src/app/routes/dashboard/dashboard.component.html @@ -31,16 +31,13 @@
- {{ 'monitor.status.available' | i18n }} {{ appCountService.availableSize }} + {{ 'monitor.status.up' | i18n }} {{ appCountService.availableSize }} - {{ 'monitor.status.unavailable' | i18n }} {{ appCountService.unAvailableSize }} + {{ 'monitor.status.down' | i18n }} {{ appCountService.unAvailableSize }} - {{ 'monitor.status.unmonitored' | i18n }} {{ appCountService.unManageSize }} + {{ 'monitor.status.paused' | i18n }} {{ appCountService.unManageSize }}
@@ -58,16 +55,13 @@
- {{ 'monitor.status.available' | i18n }} {{ appCountProgram.availableSize }} + {{ 'monitor.status.up' | i18n }} {{ appCountProgram.availableSize }} - {{ 'monitor.status.unavailable' | i18n }} {{ appCountProgram.unAvailableSize }} + {{ 'monitor.status.down' | i18n }} {{ appCountProgram.unAvailableSize }} - {{ 'monitor.status.unmonitored' | i18n }} {{ appCountProgram.unManageSize }} + {{ 'monitor.status.paused' | i18n }} {{ appCountProgram.unManageSize }}
@@ -85,14 +79,13 @@
- {{ 'monitor.status.available' | i18n }} {{ appCountDb.availableSize }} + {{ 'monitor.status.up' | i18n }} {{ appCountDb.availableSize }} - {{ 'monitor.status.unavailable' | i18n }} {{ appCountDb.unAvailableSize }} + {{ 'monitor.status.down' | i18n }} {{ appCountDb.unAvailableSize }} - {{ 'monitor.status.unmonitored' | i18n }} {{ appCountDb.unManageSize }} + {{ 'monitor.status.paused' | i18n }} {{ appCountDb.unManageSize }}
@@ -110,16 +103,13 @@
- {{ 'monitor.status.available' | i18n }} {{ appCountCache.availableSize }} + {{ 'monitor.status.up' | i18n }} {{ appCountCache.availableSize }} - {{ 'monitor.status.unavailable' | i18n }} {{ appCountCache.unAvailableSize }} + {{ 'monitor.status.down' | i18n }} {{ appCountCache.unAvailableSize }} - {{ 'monitor.status.unmonitored' | i18n }} {{ appCountCache.unManageSize }} + {{ 'monitor.status.paused' | i18n }} {{ appCountCache.unManageSize }}
@@ -137,14 +127,13 @@
- {{ 'monitor.status.available' | i18n }} {{ appCountOs.availableSize }} + {{ 'monitor.status.up' | i18n }} {{ appCountOs.availableSize }} - {{ 'monitor.status.unavailable' | i18n }} {{ appCountOs.unAvailableSize }} + {{ 'monitor.status.down' | i18n }} {{ appCountOs.unAvailableSize }} - {{ 'monitor.status.unmonitored' | i18n }} {{ appCountOs.unManageSize }} + {{ 'monitor.status.paused' | i18n }} {{ appCountOs.unManageSize }}
@@ -162,14 +151,13 @@
- {{ 'monitor.status.available' | i18n }} {{ appCountMid.availableSize }} + {{ 'monitor.status.up' | i18n }} {{ appCountMid.availableSize }} - {{ 'monitor.status.unavailable' | i18n }} {{ appCountMid.unAvailableSize }} + {{ 'monitor.status.down' | i18n }} {{ appCountMid.unAvailableSize }} - {{ 'monitor.status.unmonitored' | i18n }} {{ appCountMid.unManageSize }} + {{ 'monitor.status.paused' | i18n }} {{ appCountMid.unManageSize }}
@@ -187,16 +175,13 @@
- {{ 'monitor.status.available' | i18n }} {{ appCountBigdata.availableSize }} + {{ 'monitor.status.up' | i18n }} {{ appCountBigdata.availableSize }} - {{ 'monitor.status.unavailable' | i18n }} {{ appCountBigdata.unAvailableSize }} + {{ 'monitor.status.down' | i18n }} {{ appCountBigdata.unAvailableSize }} - {{ 'monitor.status.unmonitored' | i18n }} {{ appCountBigdata.unManageSize }} + {{ 'monitor.status.paused' | i18n }} {{ appCountBigdata.unManageSize }}
@@ -214,15 +199,14 @@
- {{ 'monitor.status.available' | i18n }} {{ appCountWebserver.availableSize }} + {{ 'monitor.status.up' | i18n }} {{ appCountWebserver.availableSize }} - {{ 'monitor.status.unavailable' | i18n }} {{ 'monitor.status.down' | i18n }} {{ appCountWebserver.unAvailableSize }} - {{ 'monitor.status.unmonitored' | i18n }} {{ 'monitor.status.paused' | i18n }} {{ appCountWebserver.unManageSize }}
@@ -241,14 +225,13 @@
- {{ 'monitor.status.available' | i18n }} {{ appCountCn.availableSize }} + {{ 'monitor.status.up' | i18n }} {{ appCountCn.availableSize }} - {{ 'monitor.status.unavailable' | i18n }} {{ appCountCn.unAvailableSize }} + {{ 'monitor.status.down' | i18n }} {{ appCountCn.unAvailableSize }} - {{ 'monitor.status.unmonitored' | i18n }} {{ appCountCn.unManageSize }} + {{ 'monitor.status.paused' | i18n }} {{ appCountCn.unManageSize }}
@@ -266,16 +249,13 @@
- {{ 'monitor.status.available' | i18n }} {{ appCountNetwork.availableSize }} + {{ 'monitor.status.up' | i18n }} {{ appCountNetwork.availableSize }} - {{ 'monitor.status.unavailable' | i18n }} {{ appCountNetwork.unAvailableSize }} + {{ 'monitor.status.down' | i18n }} {{ appCountNetwork.unAvailableSize }} - {{ 'monitor.status.unmonitored' | i18n }} {{ appCountNetwork.unManageSize }} + {{ 'monitor.status.paused' | i18n }} {{ appCountNetwork.unManageSize }}
@@ -293,16 +273,13 @@
- {{ 'monitor.status.available' | i18n }} {{ appCountCustom.availableSize }} + {{ 'monitor.status.up' | i18n }} {{ appCountCustom.availableSize }} - {{ 'monitor.status.unavailable' | i18n }} {{ appCountCustom.unAvailableSize }} + {{ 'monitor.status.down' | i18n }} {{ appCountCustom.unAvailableSize }} - {{ 'monitor.status.unmonitored' | i18n }} {{ appCountCustom.unManageSize }} + {{ 'monitor.status.paused' | 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 b2da1c424a3..71e9ddfbef8 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 @@ -109,15 +109,15 @@
- {{ 'monitor.status.unmonitored' | i18n }} + {{ 'monitor.status.paused' | i18n }} - {{ 'monitor.status.available' | i18n }} + {{ 'monitor.status.up' | i18n }} - {{ 'monitor.status.unavailable' | i18n }} + {{ 'monitor.status.down' | 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 db27405c1be..15c36bc1461 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 @@ -47,25 +47,29 @@ {{ 'monitors.new-monitor' | i18n }} - - - -
    +
  • + +
    • +
  • + +
    • +
  • + +
  • - - - - + +
      +
    • + +
      • +
    • + +
      • +
    • + +
      • +
    • + +
      • +
    +     diff --git a/web-app/src/assets/i18n/en-US.json b/web-app/src/assets/i18n/en-US.json index 5f163c97768..a7e96341b36 100644 --- a/web-app/src/assets/i18n/en-US.json +++ b/web-app/src/assets/i18n/en-US.json @@ -105,10 +105,10 @@ "status": { "": "Task Status", "all": "All Status", - "available": "Available", - "unavailable": "Unavailable", + "up": "Up", + "down": "Down", "unreachable": "Unreachable", - "unmonitored": "Unmonitored" + "paused": "Paused" } }, "alert": { @@ -353,7 +353,7 @@ "monitor_icon.cache": "group", "monitor_icon.bigdata": "dot-chart", "monitor_icon.webserver": "database", - "monitors.center.help": "Monitoring Center is the monitoring resource management portal of HertzBeat. Displays the currently added monitors in the form of list, and supports tag grouping, query filtering, and access to view monitoring details.
    You can add, modify, delete, cancel monitoring, import/export, batch management, and other operations on the monitors.", + "monitors.center.help": "Monitoring Center is the monitoring resource management portal of HertzBeat. Displays the currently added monitors in the form of list, and supports tag grouping, query filtering, and access to view monitoring details.
    You can add, modify, delete, pause monitoring, import/export, batch management, and other operations on the monitors.", "monitors.center.help.link": "https://hertzbeat.apache.org/docs/", "monitors.center.search.placeholder": "Search monitor type to add: Linux, Redis", "monitors.list": "Monitor List", @@ -369,8 +369,8 @@ "monitors.delete": "Delete", "monitors.edit-monitor": "Edit Monitor", "monitors.delete-monitor": "Delete Monitor", - "monitors.enable": "Enable Monitor", - "monitors.cancel": "Cancel Monitor", + "monitors.enable": "Resume Monitor", + "monitors.cancel": "Pause Monitor", "monitors.export": "Export Monitor", "monitors.export.switch-type": "Please select the export file format!", "monitors.export.use-type": "Export monitors in {{type}} file format", diff --git a/web-app/src/assets/i18n/zh-CN.json b/web-app/src/assets/i18n/zh-CN.json index ca316a7094a..3497d5d2814 100644 --- a/web-app/src/assets/i18n/zh-CN.json +++ b/web-app/src/assets/i18n/zh-CN.json @@ -105,10 +105,10 @@ "status": { "": "任务状态", "all": "全部状态", - "available": "正常", - "unavailable": "不可用", + "up": "正常", + "down": "宕机", "unreachable": "不可达", - "unmonitored": "未监控" + "paused": "暂停" } }, "alert": { @@ -354,7 +354,7 @@ "monitor_icon.cache": "group", "monitor_icon.bigdata": "dot-chart", "monitor_icon.webserver": "database", - "monitors.center.help": "监控中心是HertzBeat的监控资源管理入口，以列表的形式展示当前已添加的监控，同时支持标签分组，查询过滤，查看监控详情入口等。
    您可以对监控资源进行新增，修改，删除，取消监控，导入导出，批量管理等操作。", + "monitors.center.help": "监控中心是HertzBeat的监控资源管理入口，以列表的形式展示当前已添加的监控，同时支持标签分组，查询过滤，查看监控详情入口等。
    您可以对监控资源进行新增，修改，删除，暂停监控，导入导出，批量管理等操作。", "monitors.center.help.link": "https://hertzbeat.apache.org/zh-cn/docs/#%E7%9B%91%E6%8E%A7%E4%B8%AD%E5%BF%83", "monitors.center.search.placeholder": "搜索待添加监控任务的类型: Linux, Redis", "monitors.list": "监控列表", @@ -370,8 +370,8 @@ "monitors.delete": "删除", "monitors.edit-monitor": "编辑监控", "monitors.delete-monitor": "删除监控", - "monitors.enable": "启用监控", - "monitors.cancel": "取消监控", + "monitors.enable": "恢复监控", + "monitors.cancel": "暂停监控", "monitors.export": "导出监控", "monitors.export.switch-type": "请选择导出文件格式!", "monitors.export.use-type": "以 {{type}} 文件格式导出监控", diff --git a/web-app/src/assets/i18n/zh-TW.json b/web-app/src/assets/i18n/zh-TW.json index 80661e48a5d..a0acbfec8aa 100644 --- a/web-app/src/assets/i18n/zh-TW.json +++ b/web-app/src/assets/i18n/zh-TW.json @@ -105,10 +105,10 @@ "status": { "": "任務狀態", "all": "全部狀態", - "available": "正常", - "unavailable": "不可用", + "up": "正常", + "down": "宕機", "unreachable": "不可達", - "unmonitored": "未監控" + "paused": "暫停" } }, "alert": { @@ -353,7 +353,7 @@ "monitor_icon.cache": "group", "monitor_icon.bigdata": "dot-chart", "monitor_icon.webserver": "database", - "monitors.center.help": "監控中心是HertzBeat的監控資源管理入口，以清單的形式展示當前已添加的監控，同時支持標籤分組，査詢過濾，查看監控詳情入口等。
    您可以對監控進行新增，修改，删除，取消監控，導入匯出，批量管理等操作。", + "monitors.center.help": "監控中心是HertzBeat的監控資源管理入口，以清單的形式展示當前已添加的監控，同時支持標籤分組，査詢過濾，查看監控詳情入口等。
    您可以對監控進行新增，修改，删除，暫停監控，導入匯出，批量管理等操作。", "monitors.center.help.link": "https://hertzbeat.apache.org/zh-cn/docs/#%E7%9B%91%E6%8E%A7%E4%B8%AD%E5%BF%83", "monitors.center.search.placeholder": "搜索待添加監控任務的類型: Linux, Redis", "monitors.list": "監控列表", @@ -369,8 +369,8 @@ "monitors.delete": "刪除", "monitors.edit-monitor": "編輯監控", "monitors.delete-monitor": "刪除監控", - "monitors.enable": "啓用監控", - "monitors.cancel": "取消監控", + "monitors.enable": "恢復監控", + "monitors.cancel": "暫停監控", "monitors.export": "導出監控", "monitors.export.switch-type": "請選擇導出文件格式!", "monitors.export.use-type": "以 {{type}} 文件格式導出監控",