Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[improve] delete deprecate field #2537

Merged
merged 9 commits into from
Aug 16, 2024
Merged

[improve] delete deprecate field #2537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2473326
Merge remote-tracking branch 'upstream/master'
zhangshenghang May 28, 2024
b302866
Merge branch 'apache:master' into master
zhangshenghang Jun 11, 2024
1316113
Merge remote-tracking branch 'upstream/master' into HEAD
zhangshenghang Aug 16, 2024
356431d
[improve]delete deprecate field
zhangshenghang Aug 16, 2024
e20cced
[improve]delete deprecate field
zhangshenghang Aug 16, 2024
b4329dd
[improve]delete deprecate field
zhangshenghang Aug 16, 2024
edcb8fa
Merge branch 'master' into improve-delete-deprecate-field
zhangshenghang Aug 16, 2024
cbc842a
Merge branch 'master' into improve-delete-deprecate-field
yuluo-yx Aug 16, 2024
b1a6625
Merge branch 'master' into improve-delete-deprecate-field
tomsun28 Aug 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions common/src/main/java/org/apache/hertzbeat/common/entity/job/Metrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,10 +322,6 @@ public static class Field {
* 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
*/
Expand Down
2 changes: 1 addition & 1 deletion home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-jmx.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-point.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-snmp.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions manager/src/main/resources/define/app-spring_gateway.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -262,7 +262,7 @@ metrics:
i18n:
zh-CN: 状态
en-US: State
instance: true
label: true
- field: size
type: 0
i18n:
Expand Down Expand Up @@ -324,7 +324,7 @@ metrics:
i18n:
zh-CN: 空间
en-US: Space
instance: true
label: true
- field: mem_used
type: 0
i18n:
Expand Down Expand Up @@ -413,7 +413,7 @@ metrics:
i18n:
zh-CN: 路由 ID
en-US: Route ID
instance: true
label: true
- field: predicate
type: 1
i18n:
Expand Down
Loading