diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/controller/MonitorsController.java b/manager/src/main/java/org/dromara/hertzbeat/manager/controller/MonitorsController.java index f9357534b81..469582be21f 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/controller/MonitorsController.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/controller/MonitorsController.java @@ -59,6 +59,8 @@ public class MonitorsController { private static final byte ALL_MONITOR_STATUS = 9; + private static final int TAG_LENGTH = 2; + @Autowired private MonitorService monitorService; @@ -101,7 +103,7 @@ public ResponseEntity>> getMonitors( ListJoin tagJoin = root .join(root.getModel() .getList("tags", org.dromara.hertzbeat.common.entity.manager.Tag.class), JoinType.LEFT); - if (tagArr.length == 2) { + if (tagArr.length == TAG_LENGTH) { andList.add(criteriaBuilder.equal(tagJoin.get("name"), tagName)); andList.add(criteriaBuilder.equal(tagJoin.get("value"), tagValue)); } else { diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/Hierarchy.java b/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/Hierarchy.java index 94f9358a0db..975cdff7936 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/Hierarchy.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/Hierarchy.java @@ -64,6 +64,21 @@ public class Hierarchy { */ @Schema(description = "是否是叶子节点", example = "true", accessMode = READ_WRITE) Boolean isLeaf = false; + + /** + * For leaf metric + * metric type 0-number: number 1-string: string + * 指标类型 0-number:数字 1-string:字符串 + */ + @Schema(description = "metric type 0-number: number 1-string: string") + private Byte type; + + /** + * metric unit + * 指标单位 + */ + @Schema(description = "metric unit") + private String unit; /** * Next level of association diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/AppServiceImpl.java b/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/AppServiceImpl.java index b339c32ecc1..073d0a5c903 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/AppServiceImpl.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/AppServiceImpl.java @@ -178,6 +178,9 @@ public List getAllAppHierarchy(String lang) { hierarchyField.setValue(field.getField()); hierarchyField.setLabel(field.getField()); hierarchyField.setIsLeaf(true); + // for metric + hierarchyField.setType(field.getType()); + hierarchyField.setUnit(field.getUnit()); hierarchyFieldList.add(hierarchyField); } hierarchyMetric.setChildren(hierarchyFieldList); 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 bbbde377abe..6a279a9e25b 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 @@ -139,14 +139,14 @@ (nzOnCancel)="onManageModalCancel()" (nzOnOk)="onManageModalOk()" nzMaskClosable="false" - nzWidth="60%" + nzWidth="70%" [nzOkLoading]="isManageModalOkLoading" >
{{ 'alert.setting.target' | i18n }} - + - + + + + + + - - {{ cascadeValues[2] }} : {{ 'alert.setting.target.tip' | i18n }} - - - {{ item }} : {{ 'alert.setting.target.other' | i18n }} + + + {{ item.value }} : {{ i == 0 ? ('alert.setting.target.tip' | i18n) : ('alert.setting.target.other' | i18n) }} + + + {{ item.type === 0 ? ('alert.setting.number' | i18n) : ('alert.setting.string' | i18n) }} + - + instance : {{ 'alert.setting.target.instance' | i18n }} @@ -179,11 +189,11 @@ - + - {{ 'alert.setting.expr' | i18n }} + {{ 'alert.setting.rule' | i18n }} - +