This is an automated email from the ASF dual-hosted git repository.
gongchao 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 584b70a72 [improve] delete deprecate field (#2537)
584b70a72 is described below
commit 584b70a72665af4a61888470e6788852fcd4b053
Author: Jast <[email protected]>
AuthorDate: Sat Aug 17 00:18:22 2024 +0800
[improve] delete deprecate field (#2537)
Co-authored-by: YuLuo <[email protected]>
Co-authored-by: tomsun28 <[email protected]>
---
.../main/java/org/apache/hertzbeat/common/entity/job/Metrics.java | 4 ----
.../docusaurus-plugin-content-docs/current/advanced/extend-jmx.md | 2 +-
.../current/advanced/extend-point.md | 2 +-
.../current/advanced/extend-snmp.md | 2 +-
manager/src/main/resources/define/app-spring_gateway.yml | 8 ++++----
5 files changed, 7 insertions(+), 11 deletions(-)
diff --git
a/common/src/main/java/org/apache/hertzbeat/common/entity/job/Metrics.java
b/common/src/main/java/org/apache/hertzbeat/common/entity/job/Metrics.java
index 31be723c3..99d25fa6a 100644
--- a/common/src/main/java/org/apache/hertzbeat/common/entity/job/Metrics.java
+++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/Metrics.java
@@ -322,10 +322,6 @@ public class Metrics {
* Metric type 0-number: number 1-string: string
*/
private byte type = 1;
- /**
- * Whether this field is the instance
- */
- private boolean instance = false;
/**
* Whether this field is the label
*/
diff --git
a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-jmx.md
b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-jmx.md
index 71bb06ba2..07acbbeee 100644
---
a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-jmx.md
+++
b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-jmx.md
@@ -155,7 +155,7 @@ metrics:
# 具体监控指标列表
fields:
# field-metric name, type-metric type(0-number,1-string), unit-metric
unit('%','ms','MB'), label-if is metrics label
- # field-指标名称, type-指标类型(0-number数字,1-string字符串),
unit-指标单位('%','ms','MB'), instance-是否是指标集合唯一标识符字段
+ # field-指标名称, type-指标类型(0-number数字,1-string字符串),
unit-指标单位('%','ms','MB'), label-是否是指标集合唯一标识符字段
- field: VmName
type: 1
- field: VmVendor
diff --git
a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-point.md
b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-point.md
index 6de319a1c..5f3905172 100644
---
a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-point.md
+++
b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-point.md
@@ -150,7 +150,7 @@ metrics:
# 具体监控指标列表
fields:
# field-metric name, type-metric type(0-number,1-string), unit-metric
unit('%','ms','MB'), label-if is metrics label
- # field-指标名称, type-指标类型(0-number数字,1-string字符串),
unit-指标单位('%','ms','MB'), instance-是否是指标集合唯一标识符字段
+ # field-指标名称, type-指标类型(0-number数字,1-string字符串),
unit-指标单位('%','ms','MB'), label-是否是指标集合唯一标识符字段
- field: responseTime
type: 0
unit: ms
diff --git
a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-snmp.md
b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-snmp.md
index 387d67c59..6e61ec3fa 100644
---
a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-snmp.md
+++
b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-snmp.md
@@ -162,7 +162,7 @@ metrics:
# 具体监控指标列表
fields:
# field-metric name, type-metric type(0-number,1-string), unit-metric
unit('%','ms','MB'), label-if is metrics label
- # field-指标名称, type-指标类型(0-number数字,1-string字符串),
unit-指标单位('%','ms','MB'), instance-是否是指标集合唯一标识符字段
+ # field-指标名称, type-指标类型(0-number数字,1-string字符串),
unit-指标单位('%','ms','MB'), label-是否是指标集合唯一标识符字段
- field: name
type: 1
- field: descr
diff --git a/manager/src/main/resources/define/app-spring_gateway.yml
b/manager/src/main/resources/define/app-spring_gateway.yml
index d7333237c..4d3688ac4 100644
--- a/manager/src/main/resources/define/app-spring_gateway.yml
+++ b/manager/src/main/resources/define/app-spring_gateway.yml
@@ -117,7 +117,7 @@ metrics:
priority: 0
# collect metrics content
fields:
- # field-metric name, type-metric type(0-number,1-string), instance-is
instance primary key, unit-metric unit
+ # field-metric name, type-metric type(0-number,1-string), label-is label
primary key, unit-metric unit
- field: responseTime
type: 0
unit: ms
@@ -262,7 +262,7 @@ metrics:
i18n:
zh-CN: 状态
en-US: State
- instance: true
+ label: true
- field: size
type: 0
i18n:
@@ -324,7 +324,7 @@ metrics:
i18n:
zh-CN: 空间
en-US: Space
- instance: true
+ label: true
- field: mem_used
type: 0
i18n:
@@ -413,7 +413,7 @@ metrics:
i18n:
zh-CN: 路由 ID
en-US: Route ID
- instance: true
+ label: true
- field: predicate
type: 1
i18n:
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
