This is an automated email from the ASF dual-hosted git repository.
gaoxingcun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
The following commit(s) were added to refs/heads/master by this push:
new a78f71d72 [improve] update monitor state desc (#2028)
a78f71d72 is described below
commit a78f71d72532e1c968b827fafc5f12c6594d5f79
Author: tomsun28 <[email protected]>
AuthorDate: Thu May 23 17:49:59 2024 +0800
[improve] update monitor state desc (#2028)
Signed-off-by: tomsun28 <[email protected]>
---
.../hertzbeat/alert/calculate/CalculateAlarm.java | 2 +-
.../common/constants/CommonConstants.java | 20 +--
.../hertzbeat/common/entity/manager/Monitor.java | 9 +-
.../alerter/impl/DbAlertStoreHandlerImpl.java | 10 +-
.../manager/component/status/CalculateStatus.java | 4 +-
.../manager/scheduler/CollectorJobScheduler.java | 2 +-
.../manager/service/impl/MonitorServiceImpl.java | 22 +--
.../manager/service/MonitorServiceTest.java | 6 +-
web-app/src/app/pojo/Monitor.ts | 2 +-
.../alert-setting/alert-setting.component.html | 2 +-
.../app/routes/dashboard/dashboard.component.html | 89 +++++-------
.../monitor-detail/monitor-detail.component.html | 6 +-
.../monitor-list/monitor-list.component.html | 150 ++++++++++++---------
web-app/src/assets/i18n/en-US.json | 12 +-
web-app/src/assets/i18n/zh-CN.json | 12 +-
web-app/src/assets/i18n/zh-TW.json | 12 +-
16 files changed, 172 insertions(+), 188 deletions(-)
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 fb60f50f8..66a42c537 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 class CalculateAlarm {
this.triggeredAlertMap = new ConcurrentHashMap<>(16);
this.notRecoveredAlertMap = new ConcurrentHashMap<>(16);
// Initialize stateAlertMap
- List<Monitor> monitors =
monitorDao.findMonitorsByStatus(CommonConstants.UN_AVAILABLE_CODE);
+ List<Monitor> monitors =
monitorDao.findMonitorsByStatus(CommonConstants.MONITOR_DOWN_CODE);
if (monitors != null) {
for (Monitor monitor : monitors) {
HashMap<String, String> 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 3a0f9220e..e9d3a75ef 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 dee27568a..dd59207da 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 9e3dbc38d..5f5ca405b 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 @@ final class DbAlertStoreHandlerImpl implements
AlertStoreHandler {
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 b2bd0f7e8..828aa495c 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 @@ public class CalculateStatus {
List<Monitor> 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 dfb4fc4b0..ac882e890 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 class CollectorJobScheduler implements
CollectorScheduling, CollectJobSch
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 5127397b7..2548f904c 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 class MonitorServiceImpl implements MonitorService {
}
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 class MonitorServiceImpl implements MonitorService {
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 class MonitorServiceImpl implements MonitorService {
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 class MonitorServiceImpl implements MonitorService {
// The jobId is not deleted, and the jobId is reused again after the
management is started.
List<Monitor> 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 class MonitorServiceImpl implements MonitorService {
// Update monitoring status Add corresponding monitoring periodic task
List<Monitor> 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 class MonitorServiceImpl implements MonitorService {
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 class MonitorServiceImpl implements MonitorService {
@Override
public void updateAppCollectJob(Job job) {
List<Monitor> 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 58fa67feb..595661977 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 @@ class MonitorServiceTest {
List<Monitor> 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 @@ class MonitorServiceTest {
List<AppCount> 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 @@ class MonitorServiceTest {
@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 d5afa2b12..c6e05a51e 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 18872aaf8..929a732a4 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 @@
</nz-form-label>
<nz-form-control [nzSpan]="10">
<span style="color: red">
- <nz-tag nzColor="error">{{ 'monitor.status.unavailable' | i18n
}}</nz-tag>
+ <nz-tag nzColor="error">{{ 'monitor.status.down' | i18n }}</nz-tag>
<nz-tag nzColor="error">{{ 'monitor.status.unreachable' | i18n
}}</nz-tag>
{{ 'alert.setting.trigger' | i18n }}
</span>
diff --git a/web-app/src/app/routes/dashboard/dashboard.component.html
b/web-app/src/app/routes/dashboard/dashboard.component.html
index 9b63d617e..cb293ecf1 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 @@
</div>
<div nz-col nzSpan="15">
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.available' | i18n }} </span
- ><span style="font-weight: bolder">{{
appCountService.availableSize }}</span>
+ <span>{{ 'monitor.status.up' | i18n }} </span><span
style="font-weight: bolder">{{ appCountService.availableSize }}</span>
</nz-tag>
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.unavailable' | i18n }} </span
- ><span style="font-weight: bolder">{{
appCountService.unAvailableSize }}</span>
+ <span>{{ 'monitor.status.down' | i18n }} </span><span
style="font-weight: bolder">{{ appCountService.unAvailableSize }}</span>
</nz-tag>
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.unmonitored' | i18n }} </span
- ><span style="font-weight: bolder">{{
appCountService.unManageSize }}</span>
+ <span>{{ 'monitor.status.paused' | i18n }} </span><span
style="font-weight: bolder">{{ appCountService.unManageSize }}</span>
</nz-tag>
</div>
</div>
@@ -58,16 +55,13 @@
</div>
<div nz-col nzSpan="15">
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.available' | i18n }} </span
- ><span style="font-weight: bolder">{{
appCountProgram.availableSize }}</span>
+ <span>{{ 'monitor.status.up' | i18n }} </span><span
style="font-weight: bolder">{{ appCountProgram.availableSize }}</span>
</nz-tag>
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.unavailable' | i18n }} </span
- ><span style="font-weight: bolder">{{
appCountProgram.unAvailableSize }}</span>
+ <span>{{ 'monitor.status.down' | i18n }} </span><span
style="font-weight: bolder">{{ appCountProgram.unAvailableSize }}</span>
</nz-tag>
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.unmonitored' | i18n }} </span
- ><span style="font-weight: bolder">{{
appCountProgram.unManageSize }}</span>
+ <span>{{ 'monitor.status.paused' | i18n }} </span><span
style="font-weight: bolder">{{ appCountProgram.unManageSize }}</span>
</nz-tag>
</div>
</div>
@@ -85,14 +79,13 @@
</div>
<div nz-col nzSpan="15">
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.available' | i18n }} </span><span
style="font-weight: bolder">{{ appCountDb.availableSize }}</span>
+ <span>{{ 'monitor.status.up' | i18n }} </span><span
style="font-weight: bolder">{{ appCountDb.availableSize }}</span>
</nz-tag>
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.unavailable' | i18n }} </span
- ><span style="font-weight: bolder">{{ appCountDb.unAvailableSize
}}</span>
+ <span>{{ 'monitor.status.down' | i18n }} </span><span
style="font-weight: bolder">{{ appCountDb.unAvailableSize }}</span>
</nz-tag>
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.unmonitored' | i18n }} </span><span
style="font-weight: bolder">{{ appCountDb.unManageSize }}</span>
+ <span>{{ 'monitor.status.paused' | i18n }} </span><span
style="font-weight: bolder">{{ appCountDb.unManageSize }}</span>
</nz-tag>
</div>
</div>
@@ -110,16 +103,13 @@
</div>
<div nz-col nzSpan="15">
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.available' | i18n }} </span
- ><span style="font-weight: bolder">{{
appCountCache.availableSize }}</span>
+ <span>{{ 'monitor.status.up' | i18n }} </span><span
style="font-weight: bolder">{{ appCountCache.availableSize }}</span>
</nz-tag>
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.unavailable' | i18n }} </span
- ><span style="font-weight: bolder">{{
appCountCache.unAvailableSize }}</span>
+ <span>{{ 'monitor.status.down' | i18n }} </span><span
style="font-weight: bolder">{{ appCountCache.unAvailableSize }}</span>
</nz-tag>
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.unmonitored' | i18n }} </span
- ><span style="font-weight: bolder">{{ appCountCache.unManageSize
}}</span>
+ <span>{{ 'monitor.status.paused' | i18n }} </span><span
style="font-weight: bolder">{{ appCountCache.unManageSize }}</span>
</nz-tag>
</div>
</div>
@@ -137,14 +127,13 @@
</div>
<div nz-col nzSpan="15">
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.available' | i18n }} </span><span
style="font-weight: bolder">{{ appCountOs.availableSize }}</span>
+ <span>{{ 'monitor.status.up' | i18n }} </span><span
style="font-weight: bolder">{{ appCountOs.availableSize }}</span>
</nz-tag>
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.unavailable' | i18n }} </span
- ><span style="font-weight: bolder">{{ appCountOs.unAvailableSize
}}</span>
+ <span>{{ 'monitor.status.down' | i18n }} </span><span
style="font-weight: bolder">{{ appCountOs.unAvailableSize }}</span>
</nz-tag>
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.unmonitored' | i18n }} </span><span
style="font-weight: bolder">{{ appCountOs.unManageSize }}</span>
+ <span>{{ 'monitor.status.paused' | i18n }} </span><span
style="font-weight: bolder">{{ appCountOs.unManageSize }}</span>
</nz-tag>
</div>
</div>
@@ -162,14 +151,13 @@
</div>
<div nz-col nzSpan="15">
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.available' | i18n }} </span><span
style="font-weight: bolder">{{ appCountMid.availableSize }}</span>
+ <span>{{ 'monitor.status.up' | i18n }} </span><span
style="font-weight: bolder">{{ appCountMid.availableSize }}</span>
</nz-tag>
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.unavailable' | i18n }} </span
- ><span style="font-weight: bolder">{{
appCountMid.unAvailableSize }}</span>
+ <span>{{ 'monitor.status.down' | i18n }} </span><span
style="font-weight: bolder">{{ appCountMid.unAvailableSize }}</span>
</nz-tag>
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.unmonitored' | i18n }} </span><span
style="font-weight: bolder">{{ appCountMid.unManageSize }}</span>
+ <span>{{ 'monitor.status.paused' | i18n }} </span><span
style="font-weight: bolder">{{ appCountMid.unManageSize }}</span>
</nz-tag>
</div>
</div>
@@ -187,16 +175,13 @@
</div>
<div nz-col nzSpan="15">
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.available' | i18n }} </span
- ><span style="font-weight: bolder">{{
appCountBigdata.availableSize }}</span>
+ <span>{{ 'monitor.status.up' | i18n }} </span><span
style="font-weight: bolder">{{ appCountBigdata.availableSize }}</span>
</nz-tag>
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.unavailable' | i18n }} </span
- ><span style="font-weight: bolder">{{
appCountBigdata.unAvailableSize }}</span>
+ <span>{{ 'monitor.status.down' | i18n }} </span><span
style="font-weight: bolder">{{ appCountBigdata.unAvailableSize }}</span>
</nz-tag>
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.unmonitored' | i18n }} </span
- ><span style="font-weight: bolder">{{
appCountBigdata.unManageSize }}</span>
+ <span>{{ 'monitor.status.paused' | i18n }} </span><span
style="font-weight: bolder">{{ appCountBigdata.unManageSize }}</span>
</nz-tag>
</div>
</div>
@@ -214,15 +199,14 @@
</div>
<div nz-col nzSpan="15">
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.available' | i18n }} </span
- ><span style="font-weight: bolder">{{
appCountWebserver.availableSize }}</span>
+ <span>{{ 'monitor.status.up' | i18n }} </span><span
style="font-weight: bolder">{{ appCountWebserver.availableSize }}</span>
</nz-tag>
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.unavailable' | i18n }} </span
+ <span>{{ 'monitor.status.down' | i18n }} </span
><span style="font-weight: bolder">{{
appCountWebserver.unAvailableSize }}</span>
</nz-tag>
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.unmonitored' | i18n }} </span
+ <span>{{ 'monitor.status.paused' | i18n }} </span
><span style="font-weight: bolder">{{
appCountWebserver.unManageSize }}</span>
</nz-tag>
</div>
@@ -241,14 +225,13 @@
</div>
<div nz-col nzSpan="15">
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.available' | i18n }} </span><span
style="font-weight: bolder">{{ appCountCn.availableSize }}</span>
+ <span>{{ 'monitor.status.up' | i18n }} </span><span
style="font-weight: bolder">{{ appCountCn.availableSize }}</span>
</nz-tag>
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.unavailable' | i18n }} </span
- ><span style="font-weight: bolder">{{ appCountCn.unAvailableSize
}}</span>
+ <span>{{ 'monitor.status.down' | i18n }} </span><span
style="font-weight: bolder">{{ appCountCn.unAvailableSize }}</span>
</nz-tag>
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.unmonitored' | i18n }} </span><span
style="font-weight: bolder">{{ appCountCn.unManageSize }}</span>
+ <span>{{ 'monitor.status.paused' | i18n }} </span><span
style="font-weight: bolder">{{ appCountCn.unManageSize }}</span>
</nz-tag>
</div>
</div>
@@ -266,16 +249,13 @@
</div>
<div nz-col nzSpan="15">
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.available' | i18n }} </span
- ><span style="font-weight: bolder">{{
appCountNetwork.availableSize }}</span>
+ <span>{{ 'monitor.status.up' | i18n }} </span><span
style="font-weight: bolder">{{ appCountNetwork.availableSize }}</span>
</nz-tag>
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.unavailable' | i18n }} </span
- ><span style="font-weight: bolder">{{
appCountNetwork.unAvailableSize }}</span>
+ <span>{{ 'monitor.status.down' | i18n }} </span><span
style="font-weight: bolder">{{ appCountNetwork.unAvailableSize }}</span>
</nz-tag>
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.unmonitored' | i18n }} </span
- ><span style="font-weight: bolder">{{
appCountNetwork.unManageSize }}</span>
+ <span>{{ 'monitor.status.paused' | i18n }} </span><span
style="font-weight: bolder">{{ appCountNetwork.unManageSize }}</span>
</nz-tag>
</div>
</div>
@@ -293,16 +273,13 @@
</div>
<div nz-col nzSpan="15">
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.available' | i18n }} </span
- ><span style="font-weight: bolder">{{
appCountCustom.availableSize }}</span>
+ <span>{{ 'monitor.status.up' | i18n }} </span><span
style="font-weight: bolder">{{ appCountCustom.availableSize }}</span>
</nz-tag>
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.unavailable' | i18n }} </span
- ><span style="font-weight: bolder">{{
appCountCustom.unAvailableSize }}</span>
+ <span>{{ 'monitor.status.down' | i18n }} </span><span
style="font-weight: bolder">{{ appCountCustom.unAvailableSize }}</span>
</nz-tag>
<nz-tag class="mb-xs">
- <span>{{ 'monitor.status.unmonitored' | i18n }} </span
- ><span style="font-weight: bolder">{{
appCountCustom.unManageSize }}</span>
+ <span>{{ 'monitor.status.paused' | i18n }} </span><span
style="font-weight: bolder">{{ appCountCustom.unManageSize }}</span>
</nz-tag>
</div>
</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
index b2da1c424..71e9ddfbe 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 @@
<div nz-col nzSpan="16">
<nz-tag *ngIf="monitor.status == 0" nzColor="default">
<i nz-icon nzType="meh" nzTheme="outline"></i>
- <span>{{ 'monitor.status.unmonitored' | i18n }}</span>
+ <span>{{ 'monitor.status.paused' | i18n }}</span>
</nz-tag>
<nz-tag *ngIf="monitor.status == 1" nzColor="success">
<i nz-icon nzType="smile" nzTheme="outline"></i>
- <span>{{ 'monitor.status.available' | i18n }}</span>
+ <span>{{ 'monitor.status.up' | i18n }}</span>
</nz-tag>
<nz-tag *ngIf="monitor.status == 2" nzColor="error">
<i nz-icon nzType="frown" nzTheme="outline"></i>
- <span>{{ 'monitor.status.unavailable' | i18n }}</span>
+ <span>{{ 'monitor.status.down' | i18n }}</span>
</nz-tag>
</div>
</div>
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 db27405c1..15c36bc14 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 @@
<i nz-icon nzType="appstore-add" nzTheme="outline"></i>
{{ 'monitors.new-monitor' | i18n }}
</button>
-
- <button nz-button nzType="primary" (click)="onEnableManageMonitors()"
class="mobile-hide">
- <i nz-icon nzType="up-circle" nzTheme="outline"></i>
- {{ 'monitors.enable' | i18n }}
- </button>
- <button nz-button nzType="primary" nzDanger
(click)="onCancelManageMonitors()" class="mobile-hide">
- <i nz-icon nzType="down-circle" nzTheme="outline"></i>
- {{ 'monitors.cancel' | i18n }}
- </button>
- <button nz-button nzType="primary" nzDanger (click)="onDeleteMonitors()">
- <i nz-icon nzType="delete" nzTheme="outline"></i>
- {{ 'monitors.delete-monitor' | i18n }}
- </button>
<button nz-button nz-dropdown [nzDropdownMenu]="more_menu">
- {{ 'common.button.operation.more' | i18n }}
- <span nz-icon nzType="down"></span>
+ <span nz-icon nzType="ellipsis"></span>
</button>
<nz-dropdown-menu #more_menu="nzDropdownMenu">
<ul nz-menu>
+ <li nz-menu-item>
+ <button nz-button nzType="primary" (click)="onEnableManageMonitors()"
class="mobile-hide">
+ <i nz-icon nzType="play-circle" nzTheme="outline"></i>
+ {{ 'monitors.enable' | i18n }}
+ </button>
+ </li>
+ <li nz-menu-item>
+ <button nz-button nzType="primary" nzDanger
(click)="onCancelManageMonitors()" class="mobile-hide">
+ <i nz-icon nzType="pause-circle" nzTheme="outline"></i>
+ {{ 'monitors.cancel' | i18n }}
+ </button>
+ </li>
+ <li nz-menu-item>
+ <button nz-button nzType="primary" nzDanger
(click)="onDeleteMonitors()">
+ <i nz-icon nzType="delete" nzTheme="outline"></i>
+ {{ 'monitors.delete-monitor' | i18n }}
+ </button>
+ </li>
<li nz-menu-item>
<button nz-button nzType="primary" (click)="onExportMonitors()">
<i nz-icon nzType="export" nzTheme="outline"></i>
@@ -113,9 +117,9 @@
[(ngModel)]="filterStatus"
>
<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.unmonitored' | i18n"
nzValue="0"></nz-option>
+ <nz-option [nzLabel]="'monitor.status.up' | i18n" nzValue="1"></nz-option>
+ <nz-option [nzLabel]="'monitor.status.down' | i18n"
nzValue="2"></nz-option>
+ <nz-option [nzLabel]="'monitor.status.paused' | i18n"
nzValue="0"></nz-option>
</nz-select>
</div>
@@ -137,13 +141,13 @@
<thead>
<tr>
<th nzAlign="center" nzLeft nzWidth="3%" [(nzChecked)]="checkedAll"
(nzCheckedChange)="onAllChecked($event)"></th>
- <th nzAlign="center" nzWidth="17%" nzColumnKey="name"
[nzSortFn]="true">{{ 'monitor.name' | i18n }}</th>
+ <th nzAlign="center" nzWidth="20%" nzColumnKey="name"
[nzSortFn]="true">{{ 'monitor.name' | i18n }}</th>
<th nzAlign="center" nzWidth="10%" nzColumnKey="status"
[nzSortFn]="true">{{ 'monitor.status' | i18n }}</th>
<th nzAlign="center" nzWidth="12%">{{ 'monitor.host' | i18n }}</th>
<th nzAlign="center" nzWidth="10%">{{ 'monitor.app' | i18n }}</th>
- <th nzAlign="center" nzWidth="16%">{{ 'tag' | i18n }}</th>
+ <th nzAlign="center" nzWidth="21%">{{ 'tag' | i18n }}</th>
<th nzAlign="center" nzWidth="14%" nzColumnKey="gmtUpdate"
[nzSortFn]="true">{{ 'common.edit-time' | i18n }}</th>
- <th nzAlign="center" nzWidth="18%">{{ 'common.edit' | i18n }}</th>
+ <th nzAlign="center" nzWidth="10%">{{ 'common.edit' | i18n }}</th>
</tr>
</thead>
<tbody>
@@ -158,15 +162,15 @@
<td nzAlign="center">
<nz-tag *ngIf="data.status == 0" [nzColor]="'#b2b2b2'">
<i nz-icon nzType="meh" nzTheme="outline"></i>
- <span>{{ 'monitor.status.unmonitored' | i18n }}</span>
+ <span>{{ 'monitor.status.paused' | i18n }}</span>
</nz-tag>
- <nz-tag *ngIf="data.status == 1" [nzColor]="'#09b919'">
+ <nz-tag *ngIf="data.status == 1" [nzColor]="'#498765'">
<i nz-icon nzType="smile" nzTheme="outline"></i>
- <span>{{ 'monitor.status.available' | i18n }}</span>
+ <span>{{ 'monitor.status.up' | i18n }}</span>
</nz-tag>
<nz-tag *ngIf="data.status == 2" [nzColor]="'#fd4357'">
<i nz-icon nzType="frown" nzTheme="outline"></i>
- <span>{{ 'monitor.status.unavailable' | i18n }}</span>
+ <span>{{ 'monitor.status.down' | i18n }}</span>
</nz-tag>
</td>
<td nzAlign="center">
@@ -200,50 +204,64 @@
</td>
<td nzAlign="center">{{ (data.gmtUpdate ? data.gmtUpdate :
data.gmtCreate) | date : 'YYYY-MM-dd HH:mm:ss' }}</td>
<td nzAlign="center">
- <button
- nz-button
- nzType="primary"
- [routerLink]="['/monitors/' + data.id]"
- nzDanger
- nz-tooltip
- [nzTooltipTitle]="'monitors.detail' | i18n"
- >
+ <button nz-button nzType="primary" [routerLink]="['/monitors/' +
data.id]" nz-tooltip [nzTooltipTitle]="'monitors.detail' | i18n">
<i nz-icon nzType="area-chart" nzTheme="outline"></i>
</button>
- <button nz-button nzType="primary" (click)="onEditOneMonitor(data.id)"
nz-tooltip [nzTooltipTitle]="'monitors.edit-monitor' | i18n">
- <i nz-icon nzType="edit" nzTheme="outline"></i>
- </button>
- <button
- *ngIf="data.status == 0"
- nz-button
- nzType="primary"
- (click)="onEnableManageOneMonitor(data.id)"
- nz-tooltip
- [nzTooltipTitle]="'monitors.enable' | i18n"
- >
- <i nz-icon nzType="up-circle" nzTheme="outline"></i>
- </button>
- <button
- *ngIf="data.status != 0"
- nz-button
- nzDanger
- nzType="primary"
- (click)="onCancelManageOneMonitor(data.id)"
- nz-tooltip
- [nzTooltipTitle]="'monitors.cancel' | i18n"
- >
- <i nz-icon nzType="down-circle" nzTheme="outline"></i>
- </button>
- <button
- nz-button
- nzDanger
- nzType="primary"
- (click)="onDeleteOneMonitor(data.id)"
- nz-tooltip
- [nzTooltipTitle]="'monitors.delete-monitor' | i18n"
- >
- <i nz-icon nzType="delete" nzTheme="outline"></i>
+ <button nz-button nz-dropdown [nzDropdownMenu]="more_menu">
+ <span nz-icon nzType="ellipsis"></span>
</button>
+ <nz-dropdown-menu #more_menu="nzDropdownMenu">
+ <ul nz-menu>
+ <li nz-menu-item>
+ <button
+ nz-button
+ nzType="primary"
+ (click)="onEditOneMonitor(data.id)"
+ nz-tooltip
+ [nzTooltipTitle]="'monitors.edit-monitor' | i18n"
+ >
+ <i nz-icon nzType="edit" nzTheme="outline"></i>
+ </button>
+ </li>
+ <li nz-menu-item>
+ <button
+ *ngIf="data.status == 0"
+ nz-button
+ nzType="primary"
+ (click)="onEnableManageOneMonitor(data.id)"
+ nz-tooltip
+ [nzTooltipTitle]="'monitors.enable' | i18n"
+ >
+ <i nz-icon nzType="play-circle" nzTheme="outline"></i>
+ </button>
+ </li>
+ <li nz-menu-item>
+ <button
+ *ngIf="data.status != 0"
+ nz-button
+ nzDanger
+ nzType="primary"
+ (click)="onCancelManageOneMonitor(data.id)"
+ nz-tooltip
+ [nzTooltipTitle]="'monitors.cancel' | i18n"
+ >
+ <i nz-icon nzType="pause-circle" nzTheme="outline"></i>
+ </button>
+ </li>
+ <li nz-menu-item>
+ <button
+ nz-button
+ nzType="primary"
+ nzDanger
+ (click)="onDeleteOneMonitor(data.id)"
+ nz-tooltip
+ [nzTooltipTitle]="'monitors.delete-monitor' | i18n"
+ >
+ <i nz-icon nzType="delete" nzTheme="outline"></i>
+ </button>
+ </li>
+ </ul>
+ </nz-dropdown-menu>
</td>
</tr>
</tbody>
diff --git a/web-app/src/assets/i18n/en-US.json
b/web-app/src/assets/i18n/en-US.json
index 5f163c977..a7e96341b 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. <br> 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. <br> 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 ca316a709..3497d5d28 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的监控资源管理入口，以列表的形式展示当前已添加的监控，同时支持标签分组，查询过滤，查看监控详情入口等。<br>您可以对监控资源进行新增，修改，删除，取消监控，导入导出，批量管理等操作。",
+ "monitors.center.help":
"监控中心是HertzBeat的监控资源管理入口，以列表的形式展示当前已添加的监控，同时支持标签分组，查询过滤，查看监控详情入口等。<br>您可以对监控资源进行新增，修改，删除，暂停监控，导入导出，批量管理等操作。",
"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 80661e48a..a0acbfec8 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的監控資源管理入口，以清單的形式展示當前已添加的監控，同時支持標籤分組，査詢過濾，查看監控詳情入口等。<br>您可以對監控進行新增，修改，删除，取消監控，導入匯出，批量管理等操作。",
+ "monitors.center.help":
"監控中心是HertzBeat的監控資源管理入口，以清單的形式展示當前已添加的監控，同時支持標籤分組，査詢過濾，查看監控詳情入口等。<br>您可以對監控進行新增，修改，删除，暫停監控，導入匯出，批量管理等操作。",
"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}} 文件格式導出監控",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
