diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/controller/AccountController.java b/manager/src/main/java/org/dromara/hertzbeat/manager/controller/AccountController.java index f0562fc8cfa..c2a3bee452e 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/controller/AccountController.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/controller/AccountController.java @@ -29,6 +29,7 @@ import lombok.extern.slf4j.Slf4j; import org.dromara.hertzbeat.common.constants.CommonConstants; import org.dromara.hertzbeat.common.entity.dto.Message; +import org.dromara.hertzbeat.common.util.JsonUtil; import org.dromara.hertzbeat.manager.pojo.dto.LoginDto; import org.dromara.hertzbeat.manager.pojo.dto.RefreshTokenResponse; import org.springframework.http.ResponseEntity; @@ -98,6 +99,7 @@ public ResponseEntity>> authGetToken(@Valid @Request Map resp = new HashMap<>(2); resp.put("token", issueToken); resp.put("refreshToken", issueRefresh); + resp.put("role", JsonUtil.toJson(roles)); return ResponseEntity.ok(new Message<>(resp)); } diff --git a/manager/src/main/resources/define/app-a_example.yml b/manager/src/main/resources/define/app-a_example.yml index 66db720276b..480095598c2 100644 --- a/manager/src/main/resources/define/app-a_example.yml +++ b/manager/src/main/resources/define/app-a_example.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: HertzBeat 支持自定义监控，您只需配置监控模版 YML 就能适配一款自定义的监控类型。
定义流程如下：HertzBeat 页面 -> 监控模版菜单 -> 新增监控类型 -> 配置自定义监控模版YML -> 点击保存应用 -> 使用新监控类型添加监控。 - en-US: "HertzBeat supports c ustom monitoring, and you only need to configure the monitoring template YML to adapt to a custom monitoring type.
Definition process as follow: HertzBeat Pages -> Main Menu -> Monitor Template -> edit and save -> apply this template." + en-US: "HertzBeat supports custom monitoring, and you only need to configure the monitoring template YML to adapt to a custom monitoring type.
Definition process as follow: HertzBeat Pages -> Main Menu -> Monitor Template -> edit and save -> apply this template." zh-TW: HertzBeat支持自定義監控，您只需配寘監控模版YML就能適配一款自定義的監控類型。
定義流程如下：HertzBeat頁面->監控模版選單->新增監控類型->配寘自定義監控模版YML ->點擊保存應用->使用新監控類型添加監控。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/advanced/extend-point/ diff --git a/manager/src/main/resources/define/app-activemq.yml b/manager/src/main/resources/define/app-activemq.yml index 8ba44d88976..63a541cd379 100644 --- a/manager/src/main/resources/define/app-activemq.yml +++ b/manager/src/main/resources/define/app-activemq.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: HertzBeat 使用 JMX 协议对 Apache ActiveMQ 消息中间件的运行状态，节点，Topic等相关指标（broker、topic、memory pool、class loading、thread）进行监测。
⚠️注意：您需要在 ActiveMQ 开启 JMX 服务。点击查看开启步骤。 - en-US: "HertzBeat uses JMX protocol to monitor the running status, nodes, topics, and other indicators of Apache ActiveMQ message-oriented middleware.
⚠️Note: You should enable the JMX service in ActiveMQ. Click here to view the specific steps." + en-US: "HertzBeat uses JMX protocol to monitor the running status, nodes, topics, and other metrics of Apache ActiveMQ message-oriented middleware.
⚠️Note: You should enable the JMX service in ActiveMQ. Click here to view the specific steps." zh-TW: HertzBeat使用 JMX 協定對 Apache ActiveMQ 消息中介軟體的運行狀態，節點，Topic 等相關名額（broker、topic、memory pool、class loading、thread）進行監測。
⚠️注意：您需要在 ActiveMQ 開啟 JMX 服務。點擊查看開啟步驟。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/activemq diff --git a/manager/src/main/resources/define/app-airflow.yml b/manager/src/main/resources/define/app-airflow.yml index 3aa4f610d6a..aedf3e1b7e4 100644 --- a/manager/src/main/resources/define/app-airflow.yml +++ b/manager/src/main/resources/define/app-airflow.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: Hertzbeat 对 Apache Airflow 通用性能指标（airflow health、airflow version）进行采集监控。
您可以点击“新建 Apache Airflow ”并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: HertzBeat monitors Apache Airflow through general performance indicators such as airflow health and airflow version. You could click the "New Apache Airflow" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: HertzBeat monitors Apache Airflow through general performance metrics such as airflow health and airflow version. You could click the "New Apache Airflow" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: Hertzbeat對Apache Airflow通用性能指標（airflow health、airflow version）進行採集監控。
您可以點擊“新建 Apache Airflow”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/airflow/ diff --git a/manager/src/main/resources/define/app-almalinux.yml b/manager/src/main/resources/define/app-almalinux.yml index 52d44321647..f3add14a638 100644 --- a/manager/src/main/resources/define/app-almalinux.yml +++ b/manager/src/main/resources/define/app-almalinux.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: Hertzbeat 对 AlmaLinux 通用性能指标进行采集监控。
您可以点击“新建 AlmaLinux ”并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: HertzBeat monitors AlmaLinux through general performance indicators such as airflow health and airflow version. You could click the "New AlmaLinux" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: HertzBeat monitors AlmaLinux through general performance metrics such as airflow health and airflow version. You could click the "New AlmaLinux" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: Hertzbeat對AlmaLinux通用性能指標進行採集監控。
您可以點擊“新建AlmaLinux”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/almalinux diff --git a/manager/src/main/resources/define/app-centos.yml b/manager/src/main/resources/define/app-centos.yml index 1e7c6167cbd..de52c8a29ad 100644 --- a/manager/src/main/resources/define/app-centos.yml +++ b/manager/src/main/resources/define/app-centos.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: HertzBeat 对 CentOS 操作系统的通用性能指标(basic、cpu、memory、disk、interface、disk_free)进行采集监控。
您可以点击“新建 CentOS 操作系统”并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: HertzBeat monitors CentOS operating system through general performance indicators such as cpu and memory. You could click the "New CentOS" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: HertzBeat monitors CentOS operating system through general performance metrics such as cpu and memory. You could click the "New CentOS" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: HertzBeat對CentOS作業系統的通用性能指標（basic、cpu、memory、disk、interface、disk_free）進行採集監控。
您可以點擊“新建CentOS作業系統”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/centos/ diff --git a/manager/src/main/resources/define/app-coreos.yml b/manager/src/main/resources/define/app-coreos.yml index 38e42d5379d..6098488080c 100644 --- a/manager/src/main/resources/define/app-coreos.yml +++ b/manager/src/main/resources/define/app-coreos.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: Hertzbeat 对 Fedora CoreOS 数据库通用指标进行测量监控。
您可以点击 “新建 Fedora CoreOS” 并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: Hertzbeat monitors Fedora CoreOS through general performance indicator. You could click the "New Fedora CoreOS" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: Hertzbeat monitors Fedora CoreOS through general performance metric. You could click the "New Fedora CoreOS" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: Hertzbeat對Fedora CoreOS資料庫通用名額進行量測監控。
您可以點擊“新建Fedora CoreOS”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/coreos diff --git a/manager/src/main/resources/define/app-debian.yml b/manager/src/main/resources/define/app-debian.yml index 2dea38e8820..672f7d503d5 100644 --- a/manager/src/main/resources/define/app-debian.yml +++ b/manager/src/main/resources/define/app-debian.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: Hertzbeat 对 Debian 操作系统的通用指标进行测量监控。
您可以点击 “新建 Debian 操作系统监控” 并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: Hertzbeat monitors Debian operating system through general performance indicator. You could click the "New Debian Linux Monitor" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: Hertzbeat monitors Debian operating system through general performance metric. You could click the "New Debian Linux Monitor" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: Hertzbeat對Debian作業系統的通用名額進行量測監控。
您可以點擊“新建Debian作業系統監控”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/debian diff --git a/manager/src/main/resources/define/app-dm.yml b/manager/src/main/resources/define/app-dm.yml index 7238b43ddf3..a880969542a 100644 --- a/manager/src/main/resources/define/app-dm.yml +++ b/manager/src/main/resources/define/app-dm.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: HertzBeat 对 DM 达梦数据库的通用性能指标(basic、status、thread)进行采集监控，支持版本为 DM8+。
您可以点击“新建 达梦数据库”并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: HertzBeat monitors DM database through basic performance indicators such as status and thread, the version we support is DM8+. You could click the "New DM" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: HertzBeat monitors DM database through basic performance metrics such as status and thread, the version we support is DM8+. You could click the "New DM" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: HertzBeat對DM達夢資料庫的通用性能指標（basic、status、thread）進行採集監控，支持版本為DM8+。
您可以點擊“新建達夢資料庫”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/dm diff --git a/manager/src/main/resources/define/app-docker.yml b/manager/src/main/resources/define/app-docker.yml index b1c23ba06b3..1c4b4970e88 100644 --- a/manager/src/main/resources/define/app-docker.yml +++ b/manager/src/main/resources/define/app-docker.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: HertzBeat 对 Docker 容器的通用性能指标（system、containers、stats）进行采集监控
⚠️注意：为了监控 Docker 中的容器信息，您需要打开端口，让采集请求获取到对应的信息, 点击查看开启步骤。 - en-US: "HertzBeat monitors Docker through general performance indicators such as containers, status,
⚠️Note: In order to monitor container information of Docker, you need to enable the port so that the collection request can obtain the corresponding information.Click here to view the specific steps." + en-US: "HertzBeat monitors Docker through general performance metrics such as containers, status,
⚠️Note: In order to monitor container information of Docker, you need to enable the port so that the collection request can obtain the corresponding information.Click here to view the specific steps." zh-TW: HertzBeat對Docker容器的通用性能指標（system、containers、stats）進行採集監控
⚠️ 注意：為了監控Docker中的容器資訊，您需要打開埠，讓採集請求獲取到對應的資訊，點擊查看開啟步驟。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/docker/ @@ -75,10 +75,10 @@ metrics: # 指标组调度优先级(0-127)越小优先级越高,优先级低的指标组会等优先级高的指标组采集完成后才会被调度,相同优先级的指标组会并行调度采集 # 优先级为0的指标组为可用性指标组,即它会被首先调度,采集成功才会继续调度其它指标组,采集失败则中断调度 priority: 0 - # specific monitoring indicators in the indicator group + # specific monitoring metrics in the metric group # 指标组中的具体监控指标 fields: - # Indicator information includes field name type field type: 0-number, 1-string whether instance is the primary key of the instance unit: indicator unit + # metric information includes field name type field type: 0-number, 1-string whether instance is the primary key of the instance unit: metric unit # 指标信息 包括 field名称 type字段类型:0-number数字,1-string字符串 instance是否为实例主键 unit:指标单位 - field: name type: 1 @@ -154,7 +154,7 @@ metrics: # Whether to enable ssl/tls, that is, http or https, the default is false # 是否启用ssl/tls,即是http还是https,默认false ssl: ^_^ssl^_^ - # response data analysis method: default-system rules, jsonPath-jsonPath script, website-api usability indicator monitoring + # response data analysis method: default-system rules, jsonPath-jsonPath script, website-api usability metric monitoring # 响应数据解析方式: default-系统规则,jsonPath-jsonPath脚本,website-api可用性指标监控 parseType: default @@ -164,10 +164,10 @@ metrics: # 指标组调度优先级(0-127)越小优先级越高,优先级低的指标组会等优先级高的指标组采集完成后才会被调度,相同优先级的指标组会并行调度采集 # 优先级为0的指标组为可用性指标组,即它会被首先调度,采集成功才会继续调度其它指标组,采集失败则中断调度 priority: 1 - # specific monitoring indicators in the indicator group + # specific monitoring metrics in the metric group # 指标组中的具体监控指标 fields: - # Indicator information includes field name type field type: 0-number, 1-string whether instance is the primary key of the instance unit: indicator unit + # metric information includes field name type field type: 0-number, 1-string whether instance is the primary key of the instance unit: metric unit # 指标信息 包括 field名称 type字段类型:0-number数字,1-string字符串 instance是否为实例主键 unit:指标单位 - field: id type: 1 @@ -216,7 +216,7 @@ metrics: # Whether to enable ssl/tls, that is, http or https, the default is false # 是否启用ssl/tls,即是http还是https,默认false ssl: ^_^ssl^_^ - # Response data analysis method: default-system rules, jsonPath-jsonPath script, website-api usability indicator monitoring + # Response data analysis method: default-system rules, jsonPath-jsonPath script, website-api usability metric monitoring # 响应数据解析方式: default-系统规则,jsonPath-jsonPath脚本,website-api可用性指标监控 parseType: jsonPath parseScript: '$.*' @@ -281,7 +281,7 @@ metrics: ssl: ^_^ssl^_^ params: stream: false - # Response data analysis method: default-system rules, jsonPath-jsonPath script, website-api usability indicator monitoring + # Response data analysis method: default-system rules, jsonPath-jsonPath script, website-api usability metric monitoring # 响应数据解析方式: default-系统规则,jsonPath-jsonPath脚本,website-api可用性指标监控 parseType: jsonPath parseScript: '$' diff --git a/manager/src/main/resources/define/app-doris_be.yml b/manager/src/main/resources/define/app-doris_be.yml index c4b39a2f1ad..1231c7297d4 100644 --- a/manager/src/main/resources/define/app-doris_be.yml +++ b/manager/src/main/resources/define/app-doris_be.yml @@ -26,7 +26,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: Hertzbeat 对 DORIS 数据库FE的通用性能指标（load channel count、memtable flush total、process thread num、light work max threads等）进行采集监控，支持版本为DORIS2.0.0。
您可以点击 “新建 Doris DatabaseBE” 并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: Hertzbeat monitors Doris DatabaseBE through general performance indicator such as load channel count, memtable flush total, process thread num and light work max threads. The version we support is DORIS2.0.0. You could click the "New Doris DatabaseBE Monitor" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: Hertzbeat monitors Doris DatabaseBE through general performance metric such as load channel count, memtable flush total, process thread num and light work max threads. The version we support is DORIS2.0.0. You could click the "New Doris DatabaseBE Monitor" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: Hertzbeat對DORIS資料庫FE的通用性能指標（load channel count、memtable flush total、process thread num、light work max threads等）進行採集監控，支持版本為DORIS2.0.0。
您可以點擊“新建Doris DatabaseBE”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/doris_be/ @@ -419,4 +419,4 @@ metrics: url: '/metrics' timeout: ^_^timeout^_^ method: GET - parseType: prometheus \ No newline at end of file + parseType: prometheus diff --git a/manager/src/main/resources/define/app-doris_fe.yml b/manager/src/main/resources/define/app-doris_fe.yml index 502ee1b103d..907c8bb59dd 100644 --- a/manager/src/main/resources/define/app-doris_fe.yml +++ b/manager/src/main/resources/define/app-doris_fe.yml @@ -26,7 +26,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: Hertzbeat 对 Doris 数据库FE的通用指标（doris_fe connection total、doris_fe edit log clean、doris_fe image、doris_fe rps等）进行测量监控，支持版本为DORIS2.0.0。
您可以点击 “新建 Doris DatabaseFE” 并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: Hertzbeat monitors Doris DatabaseFE through general performance indicator such as doris_fe connection total, doris_fe edit log clean, doris_fe image and doris_fe rps. The version we support is DORIS2.0.0. You could click the "New Doris DatabaseFE Monitor" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: Hertzbeat monitors Doris DatabaseFE through general performance metric such as doris_fe connection total, doris_fe edit log clean, doris_fe image and doris_fe rps. The version we support is DORIS2.0.0. You could click the "New Doris DatabaseFE Monitor" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: Hertzbeat對Doris資料庫FE的通用名額（doris_fe connection total、doris_fe edit log clean、doris_fe image、doris_fe rps等）進行量測監控，支持版本為DORIS2.0.0。
您可以點擊“新建Doris DatabaseFE”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/doris_fe/ diff --git a/manager/src/main/resources/define/app-elasticsearch.yml b/manager/src/main/resources/define/app-elasticsearch.yml index 8415f6a9ccc..f0ceabfd272 100644 --- a/manager/src/main/resources/define/app-elasticsearch.yml +++ b/manager/src/main/resources/define/app-elasticsearch.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: Hertzbeat 对 ElasticSearch 数据库监控通用指标进行测量监控。
您可以点击 “新建 ElasticSearch” 并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: Hertzbeat monitors ElasticSearch through general performance indicator. You could click the "New ElasticSearch" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: Hertzbeat monitors ElasticSearch through general performance metric. You could click the "New ElasticSearch" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: Hertzbeat對ElasticSearch資料庫監控通用名額進行量測監控。
您可以點擊“新建ElasticSearch”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/elasticsearch diff --git a/manager/src/main/resources/define/app-euleros.yml b/manager/src/main/resources/define/app-euleros.yml index 59fca653d9d..d1eb0bd601c 100644 --- a/manager/src/main/resources/define/app-euleros.yml +++ b/manager/src/main/resources/define/app-euleros.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: Hertzbeat 对 EulerOS 操作系统通用指标进行测量监控。
您可以点击 “新建 EulerOS” 并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: Hertzbeat monitors EulerOS operating system through general performance indicator. You could click the "New EulerOS" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: Hertzbeat monitors EulerOS operating system through general performance metric. You could click the "New EulerOS" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: Hertzbeat對EulerOS作業系統通用名額進行量測監控。
您可以點擊“新建EulerOS”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/euleros diff --git a/manager/src/main/resources/define/app-flink.yml b/manager/src/main/resources/define/app-flink.yml index 7dedd1aa912..03926bfcee2 100644 --- a/manager/src/main/resources/define/app-flink.yml +++ b/manager/src/main/resources/define/app-flink.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: Hertzbeat 对 Flink流引擎的通用指标进行测量监控。
您可以点击 “新建 Flink流引擎” 并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: Hertzbeat monitors Flink Stream through general performance indicator. You could click the "New Flink Stream" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: Hertzbeat monitors Flink Stream through general performance metric. You could click the "New Flink Stream" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: Hertzbeat對Flink流引擎的通用名額進行量測監控。
您可以點擊“新建Flink流引擎”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/flink diff --git a/manager/src/main/resources/define/app-freebsd.yml b/manager/src/main/resources/define/app-freebsd.yml index 49eead1a475..0f7ab8d0277 100644 --- a/manager/src/main/resources/define/app-freebsd.yml +++ b/manager/src/main/resources/define/app-freebsd.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: Hertzbeat 对 FreeBSD 操作系统通用指标进行测量监控。
您可以点击 “新建 EulerOS” 并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: Hertzbeat monitors FreeBSD operating system through general performance indicator. You could click the "New FreeBSD" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: Hertzbeat monitors FreeBSD operating system through general performance metric. You could click the "New FreeBSD" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: Hertzbeat對FreeBSD作業系統通用名額進行量測監控。
您可以點擊“新建EulerOS”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn//docs/help/freebsd diff --git a/manager/src/main/resources/define/app-ftp.yml b/manager/src/main/resources/define/app-ftp.yml index c39835d41da..ae7f33f3a20 100644 --- a/manager/src/main/resources/define/app-ftp.yml +++ b/manager/src/main/resources/define/app-ftp.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: Hertzbeat 对 FTP 服务器的通用指标进行测量监控。
您可以点击 “新建 FTP服务器” 并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: Hertzbeat monitors FTP server through general performance indicator. You could click the "New FTP server" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: Hertzbeat monitors FTP server through general performance metric. You could click the "New FTP server" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: Hertzbeat對FTP伺服器的通用名額進行量測監控。
您可以點擊“新建FTP伺服器”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/ftp diff --git a/manager/src/main/resources/define/app-h3c_switch.yml b/manager/src/main/resources/define/app-h3c_switch.yml index 3b79d6933cc..0178e228a1d 100644 --- a/manager/src/main/resources/define/app-h3c_switch.yml +++ b/manager/src/main/resources/define/app-h3c_switch.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: Hertzbeat 对 华三通用交换机的通用指标进行测量监控。
您可以点击 “新建 华三通用交换机” 并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: Hertzbeat monitors H3C Switch through general performance indicator. You could click the "New H3C Switch" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: Hertzbeat monitors H3C Switch through general performance metric. You could click the "New H3C Switch" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: Hertzbeat對華三通用交換機的通用名額進行量測監控。
您可以點擊“新建華三通用交換機”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/h3c_switch diff --git a/manager/src/main/resources/define/app-hadoop.yml b/manager/src/main/resources/define/app-hadoop.yml index c6cdbd0e4a3..6d90c8b142d 100644 --- a/manager/src/main/resources/define/app-hadoop.yml +++ b/manager/src/main/resources/define/app-hadoop.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: HertzBeat 使用 JMX 协议对 Hadoop 的 JVM 虚拟机的通用性能指标（memory pool，限JDK8及以下的code cache、class loading、thread）进行采集监控。
⚠️注意：您需要在 Hadoop 应用开启 JMX 服务, 点击查看开启步骤。 - en-US: "HertzBeat monitors general performance indicators(memory pool, class loading, thread) of Hadoop VMware through JMX protocol.
⚠️Note: You should enable the JMX service in Hadoop application, and the indicator of code cache is only available to JDK8 and below.Click here to view the specific steps." + en-US: "HertzBeat monitors general performance metrics(memory pool, class loading, thread) of Hadoop VMware through JMX protocol.
⚠️Note: You should enable the JMX service in Hadoop application, and the metric of code cache is only available to JDK8 and below.Click here to view the specific steps." zh-TW: HertzBeat使用 JMX協定對Hadoop的JVM虛擬機器的通用性能指標（memory pool，限JDK8及以下的code cache、class loading、thread）進行採集監控。
⚠️ ️注意：您需要在Hadoop應用開啟JMX服務，點擊查看開啟步驟。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/hadoop/ diff --git a/manager/src/main/resources/define/app-hertzbeat.yml b/manager/src/main/resources/define/app-hertzbeat.yml index 7d7eef7e596..d9355238516 100644 --- a/manager/src/main/resources/define/app-hertzbeat.yml +++ b/manager/src/main/resources/define/app-hertzbeat.yml @@ -26,7 +26,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: Hertzbeat 对 Hertzbeat 监控系统的通用指标进行测量监控。
您可以点击 “新建 HertzBeat监控系统” 并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: Hertzbeat monitors HertzBeat Monitor through general performance indicator. You could click the "New HertzBeat Monitor" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: Hertzbeat monitors HertzBeat Monitor through general performance metric. You could click the "New HertzBeat Monitor" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: Hertzbeat對Hertzbeat監控系統的通用名額進行量測監控。
您可以點擊“新建HertzBeat監控系統”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/hertzbeat diff --git a/manager/src/main/resources/define/app-hpe_switch.yml b/manager/src/main/resources/define/app-hpe_switch.yml index 4abc206120d..107c3ce3f85 100644 --- a/manager/src/main/resources/define/app-hpe_switch.yml +++ b/manager/src/main/resources/define/app-hpe_switch.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: Hertzbeat 对 HPE 通用交换机的通用指标进行测量监控。
您可以点击 “新建 HPE通用交换机” 并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: Hertzbeat monitors HPE Switch through general performance indicator. You could click the "New HPE Switch" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: Hertzbeat monitors HPE Switch through general performance metric. You could click the "New HPE Switch" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: Hertzbeat對HPE通用交換機的通用名額進行量測監控。
您可以點擊“新建HPE通用交換機”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/hpe_switch diff --git a/manager/src/main/resources/define/app-huawei_switch.yml b/manager/src/main/resources/define/app-huawei_switch.yml index cb4c33934bc..e0400929d73 100644 --- a/manager/src/main/resources/define/app-huawei_switch.yml +++ b/manager/src/main/resources/define/app-huawei_switch.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: Hertzbeat 对 Huawei 通用交换机的通用指标进行测量监控。
您可以点击 “新建 Huawei通用交换机” 并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: Hertzbeat monitors Huawei Switch through general performance indicator. You could click the "New Huawei Switch" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: Hertzbeat monitors Huawei Switch through general performance metric. You could click the "New Huawei Switch" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: Hertzbeat對Huawei通用交換機的通用名額進行量測監控。
您可以點擊“新建Huawei通用交換機”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/huawei_switch diff --git a/manager/src/main/resources/define/app-influxdb_promql.yml b/manager/src/main/resources/define/app-influxdb_promql.yml index fa53719020a..912b7f9019a 100644 --- a/manager/src/main/resources/define/app-influxdb_promql.yml +++ b/manager/src/main/resources/define/app-influxdb_promql.yml @@ -11,7 +11,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: Hertzbeat 对 InfluxDB-PromQL 的通用指标进行测量监控。
您可以点击 “新建 InfluxDB-PromQL” 并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: Hertzbeat monitors InfluxDB-PromQL through general performance indicator. You could click the "New InfluxDB-PromQL" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: Hertzbeat monitors InfluxDB-PromQL through general performance metric. You could click the "New InfluxDB-PromQL" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: Hertzbeat對InfluxDB-PromQL的通用名額進行量測監控。
您可以點擊“新建InfluxDB-PromQL”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/influxdb_promql @@ -131,7 +131,7 @@ metrics: # 指标组调度优先级(0-127)越小优先级越高,优先级低的指标组会等优先级高的指标组采集完成后才会被调度,相同优先级的指标组会并行调度采集 # 优先级为0的指标组为可用性指标组,即它会被首先调度,采集成功才会继续调度其它指标组,采集失败则中断调度 priority: 0 - # Specific monitoring indicators in the indicator group. + # Specific monitoring metrics in the metric group. # 指标组中的具体监控指标 fields: # Metric information includes the following: Field name, Type: 0-number, 1-string, instance: indicates whether the metric is the primary key, unit: the unit of the metric @@ -195,7 +195,7 @@ metrics: # 指标组调度优先级(0-127)越小优先级越高,优先级低的指标组会等优先级高的指标组采集完成后才会被调度,相同优先级的指标组会并行调度采集 # 优先级为0的指标组为可用性指标组,即它会被首先调度,采集成功才会继续调度其它指标组,采集失败则中断调度 priority: 1 - # Specific monitoring indicators in the indicator group. + # Specific monitoring metrics in the metric group. # 指标组中的具体监控指标 fields: # Metric information includes the following: Field name, Type: 0-number, 1-string, instance: indicates whether the metric is the primary key, unit: the unit of the metric @@ -263,7 +263,7 @@ metrics: # 指标组调度优先级(0-127)越小优先级越高,优先级低的指标组会等优先级高的指标组采集完成后才会被调度,相同优先级的指标组会并行调度采集 # 优先级为0的指标组为可用性指标组,即它会被首先调度,采集成功才会继续调度其它指标组,采集失败则中断调度 priority: 1 - # Specific monitoring indicators in the indicator group. + # Specific monitoring metrics in the metric group. # 指标组中的具体监控指标 fields: # Metric information includes the following: Field name, Type: 0-number, 1-string, instance: indicates whether the metric is the primary key, unit: the unit of the metric @@ -327,7 +327,7 @@ metrics: # 指标组调度优先级(0-127)越小优先级越高,优先级低的指标组会等优先级高的指标组采集完成后才会被调度,相同优先级的指标组会并行调度采集 # 优先级为0的指标组为可用性指标组,即它会被首先调度,采集成功才会继续调度其它指标组,采集失败则中断调度 priority: 1 - # Specific monitoring indicators in the indicator group. + # Specific monitoring metrics in the metric group. # 指标组中的具体监控指标 fields: # Metric information includes the following: Field name, Type: 0-number, 1-string, instance: indicates whether the metric is the primary key, unit: the unit of the metric diff --git a/manager/src/main/resources/define/app-iotdb.yml b/manager/src/main/resources/define/app-iotdb.yml index 4b5993f47a6..35a83b65d29 100644 --- a/manager/src/main/resources/define/app-iotdb.yml +++ b/manager/src/main/resources/define/app-iotdb.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: HertzBeat 对 Apache IoTDB JVM相关的物联网时序数据库的运行状态，内存任务集群等相关指标(cluster node status、jvm memory committed bytes、jvm memory used bytes、jvm threads states threads、quantity、cache hit、queue、hrift connections)进行监测。
⚠️注意：您需要在 IoTDB 开启 metrics 功能，其将提供 prometheus metrics 形式的接口数据，点击查看开启步骤。 - en-US: "HertzBeat monitors the indicators such as operational status and memory task clusters of loT Series databases related to the Apache IoTDB JVM.
⚠️Note：You should enable the 'metrics' function in IoTDB, which will provide interface data in the form of prometheus metrics.Click here to view the specific steps." + en-US: "HertzBeat monitors the metrics such as operational status and memory task clusters of loT Series databases related to the Apache IoTDB JVM.
⚠️Note：You should enable the 'metrics' function in IoTDB, which will provide interface data in the form of prometheus metrics.Click here to view the specific steps." zh-TW: HertzBeat對Apache IoTDB JVM相關的物聯網時序資料庫的運行狀態，記憶體任務集羣等相關名額（cluster node status、jvm memory committed bytes、jvm memory used bytes、jvm threads states threads、quantity、cache hit、queue、hrift connections）進行監測。
⚠️ 注意：您需要在IoTDB開啟metrics功能，其將提供prometheus metrics形式的介面數據，點擊查看開啟步驟。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/iotdb/ diff --git a/manager/src/main/resources/define/app-jetty.yml b/manager/src/main/resources/define/app-jetty.yml index c9c73616ab6..e6b0f280e40 100644 --- a/manager/src/main/resources/define/app-jetty.yml +++ b/manager/src/main/resources/define/app-jetty.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: HertzBeat 使用 JMX 协议对 Jetty 应用服务器的通用性能指标（memory pool、class loading、thread）进行采集监控。
⚠️注意：您需要在 Jetty 应用开启 JMX 服务, 点击查看开启步骤。 - en-US: "HertzBeat monitors general performance indicators(memory pool, class loading, thread) of Jetty application server through JMX protocol.
⚠️Note: You should enable the JMX service in Jetty application. Click here to view the specific steps." + en-US: "HertzBeat monitors general performance metrics(memory pool, class loading, thread) of Jetty application server through JMX protocol.
⚠️Note: You should enable the JMX service in Jetty application. Click here to view the specific steps." zh-TW: HertzBeat使用 JMX協定對Jetty應用伺服器的通用性能指標（memory pool、class loading、thread）進行採集監控。
⚠️ 注意：您需要在Jetty應用開啟JMX服務，點擊查看開啟步驟。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/jetty/ diff --git a/manager/src/main/resources/define/app-jvm.yml b/manager/src/main/resources/define/app-jvm.yml index 21866720b65..28f96653904 100644 --- a/manager/src/main/resources/define/app-jvm.yml +++ b/manager/src/main/resources/define/app-jvm.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: HertzBeat 使用 JMX 协议对 JVM 虚拟机的通用性能指标进行采集监控。⚠️注意：您需要在 JVM 应用中开启 JMX 服务，应用启动时添加 JVM 参数, 可自定义暴露端口,对外IP。点击查看开启步骤。 - en-US: "HertzBeat using JMX protocol to monitor and collect general performance indicator of virtual machine. ⚠️Note: You need to enable JVM services in JVM application, and add the JVM parameters when the application start. You can also customize external IP address and exposed port.Click here to view the activation steps." + en-US: "HertzBeat using JMX protocol to monitor and collect general performance metric of virtual machine. ⚠️Note: You need to enable JVM services in JVM application, and add the JVM parameters when the application start. You can also customize external IP address and exposed port.Click here to view the activation steps." zh-TW: HertzBeat使用JMX協定對JVM虛擬機器的通用性能指標進行採集監控。 ⚠️ 注意：您需要在JVM應用中開啟JMX服務，應用啟動時添加JVM參數，可自定義暴露埠，對外IP。點擊查看開啟步驟。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/jvm/ diff --git a/manager/src/main/resources/define/app-kafka.yml b/manager/src/main/resources/define/app-kafka.yml index c6a39df16a3..72eeaffcc14 100644 --- a/manager/src/main/resources/define/app-kafka.yml +++ b/manager/src/main/resources/define/app-kafka.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: HertzBeat 对 Kafka 的通用性能指标(server info、code cache、active controller count、broker partition count、broker leader count、broker handler avg percent)进行采集监控。
⚠️注意：由于系统使用 JMX 协议对 Kafka 进行指标采集，您需要在 Kafka 开启 JMX 服务, 点击查看开启步骤。 - en-US: "HertzBeat monitors kafka through general performance indicators such as code cache, active controller count, broker partition count.
⚠️Note：Due to the system using JMX protocol for collect indicator data in Kafka, you need to enable JMX service in Kafka. Click here to view the specific steps." + en-US: "HertzBeat monitors kafka through general performance metrics such as code cache, active controller count, broker partition count.
⚠️Note：Due to the system using JMX protocol for collect metric data in Kafka, you need to enable JMX service in Kafka. Click here to view the specific steps." zh-TW: HertzBeat對Kafka的通用性能指標（server info、code cache、active controller count、broker partition count、broker leader count、broker handler avg percent）進行採集監控。
⚠️ 注意：由於系統使用JMX協定對Kafka進行名額採集，您需要在Kafka開啟JMX服務，點擊查看開啟步驟。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/kafka diff --git a/manager/src/main/resources/define/app-kafka_promql.yml b/manager/src/main/resources/define/app-kafka_promql.yml index 1f22d7da374..6850897f8a7 100644 --- a/manager/src/main/resources/define/app-kafka_promql.yml +++ b/manager/src/main/resources/define/app-kafka_promql.yml @@ -9,7 +9,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: Hertzbeat 对 Kafka-PromQL的通用指标进行测量监控。
您可以点击 “新建 Kafka-PromQL” 并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: Hertzbeat monitors Kafka-PromQL through general performance indicator. You could click the "New Kafka-PromQL" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: Hertzbeat monitors Kafka-PromQL through general performance metric. You could click the "New Kafka-PromQL" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: Hertzbeat對Kafka-PromQL的通用名額進行量測監控。
您可以點擊“新建Kafka-PromQL”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/kafka_promql diff --git a/manager/src/main/resources/define/app-kubernetes.yml b/manager/src/main/resources/define/app-kubernetes.yml index 851035d855f..12c04faaa53 100644 --- a/manager/src/main/resources/define/app-kubernetes.yml +++ b/manager/src/main/resources/define/app-kubernetes.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: HertzBeat 对 kubernetes 的通用性能指标（nodes、namespaces、pods、services）进行采集监控。
⚠️注意：为了监控 Kubernetes 中的信息，则需要获取到可访问 Api Server 的授权 TOKEN，让采集请求获取到对应的信息，点击查看获取步骤。 - en-US: "HertzBeat monitors kubernetes through general performance indicators such as nodes, namespaces and pods.
⚠️Note: In order to monitor the information of Kubernetes, Hertzbeat need to obtain the authorized TOKEN that can access Api Server. Click here to view the specific steps." + en-US: "HertzBeat monitors kubernetes through general performance metrics such as nodes, namespaces and pods.
⚠️Note: In order to monitor the information of Kubernetes, Hertzbeat need to obtain the authorized TOKEN that can access Api Server. Click here to view the specific steps." zh-TW: HertzBeat對kubernetes的通用性能指標（nodes、namespaces、pods、services）進行採集監控。
⚠️ 注意：為了監控Kubernetes中的資訊，則需要獲取到可訪問Api Server的授權TOKEN，讓採集請求獲取到對應的資訊，點擊查看獲取步驟。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/kubernetes diff --git a/manager/src/main/resources/define/app-linux.yml b/manager/src/main/resources/define/app-linux.yml index 90b354ca254..3f2ec9df98b 100644 --- a/manager/src/main/resources/define/app-linux.yml +++ b/manager/src/main/resources/define/app-linux.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: HertzBeat 对您的 Linux 操作系统通用性能指标(basic、cpu、memory、disk、interface、disk free)进行采集监控。
您可以点击“新建 Linux 操作系统”并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: HertzBeat monitors your Linux operating system through general performance indicators such as cpu, disk, interface. You could click the "New Linux" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: HertzBeat monitors your Linux operating system through general performance metrics such as cpu, disk, interface. You could click the "New Linux" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: HertzBeat對您的Linux作業系統通用性能指標（basic、cpu、memory、disk、interface、disk free）進行採集監控。
您可以點擊“新建Linux作業系統”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/linux diff --git a/manager/src/main/resources/define/app-mariadb.yml b/manager/src/main/resources/define/app-mariadb.yml index d2ef0b08ab5..3db9a521d93 100644 --- a/manager/src/main/resources/define/app-mariadb.yml +++ b/manager/src/main/resources/define/app-mariadb.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: HertzBeat 对 MariaDB 数据库的通用性能指标(basic、status、innodb)进行采集监控，支持版本为 MariaDB5+。
您可以点击“新建 MariaDB 数据库”并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: HertzBeat monitors MariaDB database through general performance indicators such as status and innodb, the version we support is MariaDB5+. You could click the "New MariaDB" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: HertzBeat monitors MariaDB database through general performance metrics such as status and innodb, the version we support is MariaDB5+. You could click the "New MariaDB" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: HertzBeat對MariaDB資料庫的通用性能指標（basic、status、innodb）進行採集監控，支持版本為MariaDB5+。
您可以點擊“新建MariaDB資料庫”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/mariadb diff --git a/manager/src/main/resources/define/app-mongodb.yml b/manager/src/main/resources/define/app-mongodb.yml index fface26b4f5..48d018a0e8a 100644 --- a/manager/src/main/resources/define/app-mongodb.yml +++ b/manager/src/main/resources/define/app-mongodb.yml @@ -29,7 +29,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: Hertzbeat 对 MongoDB 数据库的通用指标进行测量监控。
您可以点击 “新建 MongoDB 数据库” 并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: Hertzbeat monitors MongoDB through general performance indicator. You could click the "New MongoDB" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: Hertzbeat monitors MongoDB through general performance metric. You could click the "New MongoDB" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: Hertzbeat對MongoDB資料庫的通用名額進行量測監控。
您可以點擊“新建MongoDB資料庫”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/mongodb diff --git a/manager/src/main/resources/define/app-mysql.yml b/manager/src/main/resources/define/app-mysql.yml index 2c47ede366b..8811ef30f18 100644 --- a/manager/src/main/resources/define/app-mysql.yml +++ b/manager/src/main/resources/define/app-mysql.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: HertzBeat 对 MYSQL 数据库的通用性能指标(basic、status、innodb)进行采集监控，支持版本为 MYSQL5+。
您可以点击“新建 MYSQL 数据库”并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: HertzBeat monitors MYSQL database through general performance indicators such as status and innodb, the version we support is MYSQL5+. You could click the "New SQL" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: HertzBeat monitors MYSQL database through general performance metrics such as status and innodb, the version we support is MYSQL5+. You could click the "New SQL" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: HertzBeat對MYSQL資料庫的通用性能指標（basic、status、innodb）進行採集監控，支持版本為MYSQL5+。
您可以點擊“新建MYSQL資料庫”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/mysql @@ -284,7 +284,7 @@ metrics: - cache_inserts=Qcache_inserts - cache_free_blocks=Qcache_free_blocks - cache_free_memory=Qcache_free_memory - # Convert the initial unit of the indicator to the final unit + # Convert the initial unit of the metric to the final unit # 将指标的初始单位转化为最终的单位 units: - cache_free_memory=B->KB diff --git a/manager/src/main/resources/define/app-nacos.yml b/manager/src/main/resources/define/app-nacos.yml index 2c8d30b7071..a60a89e5ce2 100644 --- a/manager/src/main/resources/define/app-nacos.yml +++ b/manager/src/main/resources/define/app-nacos.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: Hertzbeat 对 Nacos 注册配置中心的通用指标进行测量监控。
您可以点击 “新建 Nacos注册配置中心” 并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: Hertzbeat monitors Nacos Server through general performance indicator. You could click the "New Nacos Server" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: Hertzbeat monitors Nacos Server through general performance metric. You could click the "New Nacos Server" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: Hertzbeat對Nacos注册配寘中心的通用名額進行量測監控。
您可以點擊“新建Nacos注册配寘中心”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/nacos @@ -155,4 +155,4 @@ metrics: url: /nacos/actuator/prometheus timeout: ^_^timeout^_^ method: GET - parseType: prometheus \ No newline at end of file + parseType: prometheus diff --git a/manager/src/main/resources/define/app-opengauss.yml b/manager/src/main/resources/define/app-opengauss.yml index 3d9be1c5a5d..a6d915e4b1f 100644 --- a/manager/src/main/resources/define/app-opengauss.yml +++ b/manager/src/main/resources/define/app-opengauss.yml @@ -22,7 +22,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: HertzBeat 对 OpenGauss 数据库的通用性能指标(basic、state、activity)进行采集监控，支持版本为 PostgreSQL10+。
您可以点击“新建 OpenGauss 数据库”并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: HertzBeat monitors OpenGauss database through general performance indicators such as state and activity, the version we support is PostgreSQL10+. You could click the "New OpenGauss" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: HertzBeat monitors OpenGauss database through general performance metrics such as state and activity, the version we support is PostgreSQL10+. You could click the "New OpenGauss" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: HertzBeat對OpenGauss資料庫的通用性能指標（basic、state、activity）進行採集監控，支持版本為PostgreSQL10+。
您可以點擊“新建OpenGauss資料庫”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/opengauss diff --git a/manager/src/main/resources/define/app-opensuse.yml b/manager/src/main/resources/define/app-opensuse.yml index c91f75ddee2..d878dc0f0a7 100644 --- a/manager/src/main/resources/define/app-opensuse.yml +++ b/manager/src/main/resources/define/app-opensuse.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: Hertzbeat 对 OpenSUSE 的通用指标进行测量监控。
您可以点击 “新建 OpenSUSE” 并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: Hertzbeat monitors OpenSUSE through general performance indicator. You could click the "New OpenSUSE" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: Hertzbeat monitors OpenSUSE through general performance metric. You could click the "New OpenSUSE" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: Hertzbeat對OpenSUSE的通用名額進行量測監控。
您可以點擊“新建OpenSUSE”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/opensuse diff --git a/manager/src/main/resources/define/app-oracle.yml b/manager/src/main/resources/define/app-oracle.yml index babeac72dee..48078b5af91 100644 --- a/manager/src/main/resources/define/app-oracle.yml +++ b/manager/src/main/resources/define/app-oracle.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: Hertzbeat 对 Oracle 数据库的通用指标（tablespace、user connect、performance）进行测量监控。
您可以点击 “新建 Oracle数据库” 并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: Hertzbeat monitors Oracle database through general performance indicator. You could click the "New Oracle DB" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: Hertzbeat monitors Oracle database through general performance metric. You could click the "New Oracle DB" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: Hertzbeat對Oracle資料庫的通用名額（tablespace、user connect、performance）進行量測監控。
您可以點擊“新建Oracle資料庫”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/oracle/ diff --git a/manager/src/main/resources/define/app-ping.yml b/manager/src/main/resources/define/app-ping.yml index 065719b6280..6d3934fd446 100644 --- a/manager/src/main/resources/define/app-ping.yml +++ b/manager/src/main/resources/define/app-ping.yml @@ -31,7 +31,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: HertzBeat 以 ms 为指标单位，对端 HOST 地址进行 PING 操作，判断其连通性。您可以点击“新建 PING 连通性”并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: HertzBeat uses 'ms' as the indicator unit to PING the end HOST address and determines the connectivity. You could click the "Add API " button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: HertzBeat uses 'ms' as the metric unit to PING the end HOST address and determines the connectivity. You could click the "Add API " button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: HertzBeat以ms為名額組織，對端HOST地址進行PING操作，判斷其連通性。 您可以點擊“新建PING連通性”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/ping @@ -76,9 +76,9 @@ params: # collect metrics config list # 采集指标组配置列表 metrics: - # First monitoring indicator group "cpu" + # First monitoring metric group "cpu" # 第一个监控指标组 cpu - # Note: The built-in monitoring indicators include (responseTime - response time) + # Note: The built-in monitoring metrics include (responseTime - response time) # 注意：内置监控指标有 (responseTime - 响应时间) - name: summary i18n: diff --git a/manager/src/main/resources/define/app-port.yml b/manager/src/main/resources/define/app-port.yml index 3f83f7dc17e..2c6957780fb 100644 --- a/manager/src/main/resources/define/app-port.yml +++ b/manager/src/main/resources/define/app-port.yml @@ -27,7 +27,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: HertzBeat 通过判断对端服务中暴露的端口是否可用，进而判断对端服务是否可用。同时以ms为指标，对响应时间等指标进行监测。您可以点击“新建 端口可用性”并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: HertzBeat determines whether the exposed ports in the peer service are available, thereby determining whether the peer service is available. Simultaneously monitoring response time and other indicators using ms as indicator unit. You could click the "New port" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: HertzBeat determines whether the exposed ports in the peer service are available, thereby determining whether the peer service is available. Simultaneously monitoring response time and other metrics using ms as metric unit. You could click the "New port" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: HertzBeat通過判斷對端服務中暴露的埠是否可用，進而判斷對端服務是否可用。 同時以ms為名額，對回應時間等名額進行監測。 您可以點擊“新建埠可用性”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/port diff --git a/manager/src/main/resources/define/app-postgresql.yml b/manager/src/main/resources/define/app-postgresql.yml index eea3f828d78..72713e29961 100644 --- a/manager/src/main/resources/define/app-postgresql.yml +++ b/manager/src/main/resources/define/app-postgresql.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: HertzBeat 对 PostgreSQL 数据库的通用性能指标(basic、state、activity)进行采集监控，支持版本为 PostgreSQL 10+。
您可以点击“新建 PostgreSQL 数据库”并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: HertzBeat monitors PostgreSQL database through basic performance indicators such as state and activity, the version we support is PostgreSQL 10+.
You could click the "New MariPostgreSQLaDB" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: HertzBeat monitors PostgreSQL database through basic performance metrics such as state and activity, the version we support is PostgreSQL 10+.
You could click the "New MariPostgreSQLaDB" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: HertzBeat對PostgreSQL資料庫的通用性能指標（basic、state、activity）進行採集監控，支持版本為PostgreSQL 10+。
您可以點擊“新建PostgreSQL資料庫”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/postgresql diff --git a/manager/src/main/resources/define/app-rabbitmq.yml b/manager/src/main/resources/define/app-rabbitmq.yml index 036e8f744be..58e26e50276 100644 --- a/manager/src/main/resources/define/app-rabbitmq.yml +++ b/manager/src/main/resources/define/app-rabbitmq.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: HertzBeat 对 RabbitMQ 消息中间件的运行状态，节点，队列等相关指标（overview、object_totals、nodes、queues）进行监测。
⚠️注意：HertzBeat 使用 RabbitMQ Management 的 Rest Api 对 RabbitMQ 进行指标数据采集，因此您的 RabbitMQ 环境需要开启 Management 插件，点击查看开启步骤。 - en-US: "HertzBeat monitors RabbitMQ through the runtime status, nodes, queues and other indicators of message-oriented middleware.
⚠️Note：HertzBeat uses the Rest Api of RabbitMQ Management to collect indicator data for RabbitMQ, so you need to enable Management plug-in component, Click here to view the specific steps." + en-US: "HertzBeat monitors RabbitMQ through the runtime status, nodes, queues and other metrics of message-oriented middleware.
⚠️Note：HertzBeat uses the Rest Api of RabbitMQ Management to collect metric data for RabbitMQ, so you need to enable Management plug-in component, Click here to view the specific steps." zh-TW: HertzBeat對RabbitMQ消息中介軟體的運行狀態，節點，隊列等相關名額（overview、object_totals、nodes、queues）進行監測。
⚠️ 注意：HertzBeat使用RabbitMQ Management的Rest Api對RabbitMQ進行名額資料獲取，囙此您的RabbitMQ環境需要開啟Management挿件，點擊查看開啟步驟。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/rabbitmq @@ -133,7 +133,7 @@ params: required: true metrics: - # Note: The built-in monitoring indicators include (responseTime - response time) + # Note: The built-in monitoring metrics include (responseTime - response time) # 注意：内置监控指标有 (responseTime - 响应时间) - name: overview # metrics group scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel diff --git a/manager/src/main/resources/define/app-redhat.yml b/manager/src/main/resources/define/app-redhat.yml index 861ada2c4a8..38fac58f69e 100644 --- a/manager/src/main/resources/define/app-redhat.yml +++ b/manager/src/main/resources/define/app-redhat.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: Hertzbeat 对 Red Hat 的通用指标进行测量监控。
您可以点击 “新建 Red Hat” 并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: Hertzbeat monitors Red Hat through general performance indicator. You could click the "New Red Hat" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: Hertzbeat monitors Red Hat through general performance metric. You could click the "New Red Hat" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: Hertzbeat對Red Hat的通用名額進行量測監控。
您可以點擊“新建Red Hat”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/redhat diff --git a/manager/src/main/resources/define/app-redis.yml b/manager/src/main/resources/define/app-redis.yml index 748dc24f328..ddb03f318f0 100644 --- a/manager/src/main/resources/define/app-redis.yml +++ b/manager/src/main/resources/define/app-redis.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: HertzBeat 对 REDIS 数据库的通用性能指标进行采集监控(server、clients、memory、persistence、stats、replication、cpu、errorstats、cluster、commandstats)，支持版本为 REDIS1.0+。
您可以点击“新建 REDIS 数据库”并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: HertzBeat monitors REDIS database through general performance indicator such as memory, persistence, replication and so on. The versions we support is REDIS1.0+.
You could click the "New REDIS" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: HertzBeat monitors REDIS database through general performance metric such as memory, persistence, replication and so on. The versions we support is REDIS1.0+.
You could click the "New REDIS" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: HertzBeat對REDIS資料庫的通用性能指標進行採集監控（server、clients、memory、persistence、stats、replication、cpu、errorstats、cluster、commandstats），支持版本為REDIS1.0+。
您可以點擊“新建REDIS資料庫”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/redis diff --git a/manager/src/main/resources/define/app-redis_cluster.yml b/manager/src/main/resources/define/app-redis_cluster.yml index ed5e21bd016..6f23d825897 100644 --- a/manager/src/main/resources/define/app-redis_cluster.yml +++ b/manager/src/main/resources/define/app-redis_cluster.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: Hertzbeat 对 Redis Cluster 的通用指标进行测量监控。
您可以点击 “新建 Redis Cluster” 并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: Hertzbeat monitors Redis database Cluster through general performance indicator. You could click the "New Redis Cluster" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: Hertzbeat monitors Redis database Cluster through general performance metric. You could click the "New Redis Cluster" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: Hertzbeat對Redis Cluster的通用名額進行量測監控。
您可以點擊“新建Redis Cluster”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/redis_cluster diff --git a/manager/src/main/resources/define/app-redis_sentinel.yml b/manager/src/main/resources/define/app-redis_sentinel.yml index 51718daf396..d457406b7e5 100644 --- a/manager/src/main/resources/define/app-redis_sentinel.yml +++ b/manager/src/main/resources/define/app-redis_sentinel.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: Hertzbeat 对 Redis Sentinel 数据库的通用指标进行测量监控。
您可以点击 “新建 Redis Sentinel数据库” 并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: Hertzbeat monitors Redis Sentinel database through general performance indicator. You could click the "New Redis Sentinel" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: Hertzbeat monitors Redis Sentinel database through general performance metric. You could click the "New Redis Sentinel" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: Hertzbeat對Redis Sentinel資料庫的通用名額進行量測監控。
您可以點擊“新建Redis Sentinel資料庫”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/influxdb_promql diff --git a/manager/src/main/resources/define/app-rocketmq.yml b/manager/src/main/resources/define/app-rocketmq.yml index d9bb5f10fc2..e15bd21274c 100644 --- a/manager/src/main/resources/define/app-rocketmq.yml +++ b/manager/src/main/resources/define/app-rocketmq.yml @@ -22,7 +22,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: Hertzbeat 对 RocketMQ 的通用指标进行测量监控。
您可以点击 “新建 RocketMQ” 并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: Hertzbeat monitors RocketMQ through general performance indicator. You could click the "New RocketMQ" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: Hertzbeat monitors RocketMQ through general performance metric. You could click the "New RocketMQ" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: Hertzbeat對RocketMQ的通用名額進行量測監控。
您可以點擊“新建RocketMQ”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/rocketmq @@ -150,4 +150,4 @@ metrics: rocketmq: namesrvHost: ^_^host^_^ namesrvPort: ^_^port^_^ - parseScript: $.consumerInfoList.* \ No newline at end of file + parseScript: $.consumerInfoList.* diff --git a/manager/src/main/resources/define/app-rockylinux.yml b/manager/src/main/resources/define/app-rockylinux.yml index 13f2d4a70ea..e34db16ee32 100644 --- a/manager/src/main/resources/define/app-rockylinux.yml +++ b/manager/src/main/resources/define/app-rockylinux.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: Hertzbeat 对 Rocky Linux 操作系统的通用指标进行测量监控。
您可以点击 “新建 Rocky Linux” 并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: Hertzbeat monitors Rocky Linux operating system through general performance indicator. You could click the "New Rocky Linux" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: Hertzbeat monitors Rocky Linux operating system through general performance metric. You could click the "New Rocky Linux" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: Hertzbeat對Rocky Linux作業系統的通用名額進行量測監控。
您可以點擊“新建Rocky Linux”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/rockylinux diff --git a/manager/src/main/resources/define/app-spark.yml b/manager/src/main/resources/define/app-spark.yml index 95cf2c328a7..904e7dd746e 100644 --- a/manager/src/main/resources/define/app-spark.yml +++ b/manager/src/main/resources/define/app-spark.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: HertzBeat 使用 JMX 协议对 Apache Spark 的通用性能指标进行采集监控。⚠️注意：为了开启 JVM 服务，您需要在系统IP启动 server 时添加 Spark 的 VM options 选项。Master和 Worker 的监控在 spark 集群运行时即可监控，Driver 和 Excutor 的监控需要针对某一个 app 来进行监控。 如果都要监控，请点击查看配置步骤。 - en-US: "HertzBeat using JMX protocol to monitor general performance indicator of Apache Spark. ⚠️Note: You should add Spark VM options When Start Server with customIP to enable the JVM services, You need to add Spark's VM options option when the system IP starts the server.
The monitoring of Master and Worker can be done then the Spark cluster is running, while the monitoring of Driver and Exciter needs to be targeted at a specific app. If you would like to monitor all of then, please click here to view the configuration steps" + en-US: "HertzBeat using JMX protocol to monitor general performance metric of Apache Spark. ⚠️Note: You should add Spark VM options When Start Server with customIP to enable the JVM services, You need to add Spark's VM options option when the system IP starts the server.
The monitoring of Master and Worker can be done then the Spark cluster is running, while the monitoring of Driver and Exciter needs to be targeted at a specific app. If you would like to monitor all of then, please click here to view the configuration steps" zh-TW: HertzBeat使用JMX協定對Apache Spark的通用性能指標進行採集監控。 ⚠️ 注意：為了開啟JVM服務，您需要在系統IP啟動server時添加Spark的VM options選項。 Master和Worker的監控在spark集羣運行時即可監控，Driver和Excutor的監控需要針對某一個app來進行監控。 如果都要監控，請點擊查看配寘步驟。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/spark diff --git a/manager/src/main/resources/define/app-springboot2.yml b/manager/src/main/resources/define/app-springboot2.yml index 329f56beb5b..aff20ab95a7 100644 --- a/manager/src/main/resources/define/app-springboot2.yml +++ b/manager/src/main/resources/define/app-springboot2.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: HertzBeat对 SpringBoot2.0 Actuator 暴露的通用性能指标(health、environment、threads、memory_used)进行采集监控。⚠️注意：如果要监控 SpringBoot 中的信息，需要您的 SpringBoot 应用集成并开启 SpringBoot Actuator, 点击查看具体步骤。 - en-US: "HertzBeat collects and monitors SpringBoot through general performance indicator(health, environment, threads, memory_used) that exposed by the SpringBoot2.0 Actuator.
⚠️Note: You should make sure that your SpringBoot application have already integrated and enabled the SpringBoot Actuator, click here to see the specific steps." + en-US: "HertzBeat collects and monitors SpringBoot through general performance metric(health, environment, threads, memory_used) that exposed by the SpringBoot2.0 Actuator.
⚠️Note: You should make sure that your SpringBoot application have already integrated and enabled the SpringBoot Actuator, click here to see the specific steps." zh-TW: HertzBeat對 SpringBoot2.0 Actuator 暴露的通用性能指標（health、environment、threads、memory_used）進行採集監控。< span class='help_module_span'> ⚠️ 注意：如果要監控SpringBoot中的資訊，需要您的SpringBoot應用集成並開啟SpringBoot Actuator，點擊查看具體步驟。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/springboot2 @@ -151,7 +151,7 @@ metrics: # 监控指标组 - environment - name: environment priority: 1 - # The specific monitoring indicators in the metric group. + # The specific monitoring metrics in the metric group. # 指标组中的具体监控指标 fields: # The metric information, including field name, type of the field (0-number, 1-string), whether it is an instance primary key, and the unit of the metric. @@ -168,7 +168,7 @@ metrics: type: 1 - field: jvm_version type: 1 - # Indicator alias list, used to identify indicators in query results + # metric alias list, used to identify metrics in query results # 指标别名列表，用于在查询结果中识别指标 aliasFields: - $.activeProfiles[0] @@ -219,7 +219,7 @@ metrics: # Whether to display the metric group in the query result, the default is true # 是否在查询结果中显示指标组,默认为true visible: false - # The specific monitoring indicators in the metric group. + # The specific monitoring metrics in the metric group. # 指标组中的具体监控指标 priority: 2 fields: diff --git a/manager/src/main/resources/define/app-springboot3.yml b/manager/src/main/resources/define/app-springboot3.yml index 5fa3c74fd3d..cd95933d652 100644 --- a/manager/src/main/resources/define/app-springboot3.yml +++ b/manager/src/main/resources/define/app-springboot3.yml @@ -29,7 +29,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: HertzBeat对 SpringBoot3.0 Actuator 暴露的通用性能指标(health、environment、threads、memory_used)进行采集监控。⚠️注意：如果要监控 SpringBoot 中的信息，需要您的 SpringBoot 应用集成并开启 SpringBoot Actuator, 点击查看具体步骤。 - en-US: "HertzBeat collect and monitors SpringBoot through general performance indicator that exposed by the SpringBoot3.0 Actuator.

⚠️Note: You should make sure that your SpringBoot application have already integrated and enabled the SpringBoot Actuator, click here to see the specific steps." + en-US: "HertzBeat collect and monitors SpringBoot through general performance metric that exposed by the SpringBoot3.0 Actuator.

⚠️Note: You should make sure that your SpringBoot application have already integrated and enabled the SpringBoot Actuator, click here to see the specific steps." zh-TW: HertzBeat對 SpringBoot3.0 Actuator 暴露的通用性能指標（health、environment、threads、memory_used）進行採集監控。< span class='help_module_span'> ⚠️ 注意：如果要監控SpringBoot中的資訊，需要您的SpringBoot應用集成並開啟SpringBoot Actuator，點擊查看具體步驟。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/springboot3 diff --git a/manager/src/main/resources/define/app-sqlserver.yml b/manager/src/main/resources/define/app-sqlserver.yml index 9a2e151e658..be51c90cf1e 100644 --- a/manager/src/main/resources/define/app-sqlserver.yml +++ b/manager/src/main/resources/define/app-sqlserver.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: HertzBeat 对 SqlServer 数据库的通用性能指标(basic、performance counters、connection)进行采集监控，支持版本为 SqlServer 2017+。
⚠️注意点击查看可能遇见的 ssh 问题。 - en-US: "HertzBeat monitors SqlServer database through basic performance indicators such as performance counters and connection, the version we support is SqlServer 2017+.
⚠️Note: Click here to see the possible SSH problems." + en-US: "HertzBeat monitors SqlServer database through basic performance metrics such as performance counters and connection, the version we support is SqlServer 2017+.
⚠️Note: Click here to see the possible SSH problems." zh-TW: HertzBeat對SqlServer資料庫的通用性能指標（basic、performance counters、connection）進行採集監控，支持版本為SqlServer 2017+。
⚠️ 注意點擊查看可能遇見的ssh問題。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/sqlserver diff --git a/manager/src/main/resources/define/app-ssl_cert.yml b/manager/src/main/resources/define/app-ssl_cert.yml index 6f19a7eeddb..01639b158ce 100644 --- a/manager/src/main/resources/define/app-ssl_cert.yml +++ b/manager/src/main/resources/define/app-ssl_cert.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: HertzBeat 通过证书名称、是否过期、有效期开始时间、有效期开始时间戳(ms)、过期时间、过期时间戳(ms)等指标对网站的 SSL 证书进行监测。您可以点击“新建 SSL 证书”并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: HertzBeat monitors website's SSL certificates through indicators such as certificate name, expiration date, validity start time, validity start timestamp (ms), expiration time, and expiration timestamp (ms).
You could click the "New SSL" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: HertzBeat monitors website's SSL certificates through metrics such as certificate name, expiration date, validity start time, validity start timestamp (ms), expiration time, and expiration timestamp (ms).
You could click the "New SSL" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: HertzBeat通過證書名稱、是否過期、有效期開始時間、有效期開始時間戳（ms）、過期時間、過期時間戳（ms）等名額對網站的SSL證書進行監測。 您可以點擊“新建SSL證書”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/ssl_cert diff --git a/manager/src/main/resources/define/app-tidb.yml b/manager/src/main/resources/define/app-tidb.yml index fbb3adfff37..8137bf1cbde 100644 --- a/manager/src/main/resources/define/app-tidb.yml +++ b/manager/src/main/resources/define/app-tidb.yml @@ -1,29 +1,80 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# The monitoring type category：service-application service monitoring db-database monitoring custom-custom monitoring os-operating system monitoring +# 监控类型所属类别：service-应用服务监控 db-数据库监控 custom-自定义监控 os-操作系统监控 cn-云原生cloud native network-网络监控 category: db +# The monitoring type eg: linux windows tomcat mysql aws... +# 监控类型 eg: linux windows tomcat mysql aws... app: tidb +# The monitoring i18n name +# 监控类型国际化名称 name: zh-CN: TiDB数据库 en-US: TiDB +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: HertzBeat 使用 HTTP 和 JDBC 协议对 TiDB 的通用性能指标进行采集监控，点击查看开启步骤。
您可以点击“新建 TiDB 数据库”并进行配置，或者选择“更多操作”，导入已有配置。 + en-US: HertzBeat monitors general performance metrics of TiDB through HTTP adn JMX protocol.
You could click the "New TiDB" button and proceed with the configuration or import an existing setup through the "More Actions". + zh-TW: HertzBeat 使用 HTTP 和 JDBC 協議對 TiDB 的通用性能指標進行採集監控，點擊查看開啟步驟。
您可以點擊“新建 TiDB 數據庫”並進行配置，或者選擇“更多操作”，導入已有配置。 +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/tidb + en-US: https://hertzbeat.com/docs/help/tidb +# 监控所需输入参数定义(根据定义渲染页面UI) +# Input params define for monitoring(render web ui by the definition) params: + # field-param field key + # field-变量字段标识符 - field: host + # name-param field display i18n name + # name-参数字段显示名称 name: zh-CN: 主机Host en-US: Host + # type-param field type(most mapping the html input type) + # type-字段类型,样式(大部分映射input标签type属性) type: host + # required-true or false + # required-是否是必输项 true-必填 false-可选 required: true - + # field-param field key + # field-变量字段标识符 - field: port + # name-param field display i18n name + # name-参数字段显示名称 name: - zh-CN: jdbc端口 - en-US: jdbc Port + zh-CN: JDBC 端口 + en-US: JDBC Port + # type-param field type(most mapping the html input type) + # type-字段类型,样式(大部分映射input标签type属性) type: number + # when type is number, range is required + # 当type为number时,用range表示范围 range: '[0,65535]' - required: true + # required-true or false + # required-是否是必输项 true-必填 false-可选 + required: false defaultValue: 4000 - + # hide param-true or false + # 是否隐藏字段 true or false + hide: true - field: service-port name: - zh-CN: service-端口 - en-US: service-port + zh-CN: Service 端口 + en-US: Service Port type: number range: '[0,65535]' required: true @@ -31,11 +82,11 @@ params: - field: pd-port name: - zh-CN: pd-端口 - en-US: pd-port + zh-CN: PD 端口 + en-US: PD Port type: number range: '[0,65535]' - required: true + required: false defaultValue: 2379 - field: timeout @@ -44,7 +95,6 @@ params: en-US: Query Timeout(ms) type: number required: false - hide: true defaultValue: 6000 - field: database @@ -53,6 +103,7 @@ params: en-US: Database Name type: text required: false + hide: true - field: username name: @@ -61,6 +112,7 @@ params: type: text limit: 20 required: false + hide: true - field: password name: @@ -68,63 +120,57 @@ params: en-US: Password type: password required: false + hide: true - field: url name: - zh-CN: URL - en-US: URL + zh-CN: JDBC URL + en-US: JDBC URL type: text required: false -# 指标组列表 + hide: true +# collect metrics config list +# 采集指标组配置列表 metrics: - - name: basic - # 指标组调度优先级(0-127)越小优先级越高,优先级低的指标组会等优先级高的指标组采集完成后才会被调度,相同优先级的指标组会并行调度采集 + # metrics - status + # 监控指标组 - status + - name: status + # metrics group scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel + # priority 0's metrics group is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue + # 指标组调度优先级(0->127)->(优先级高->低) 优先级低的指标组会等优先级高的指标组采集完成后才会被调度, 相同优先级的指标组会并行调度采集 # 优先级为0的指标组为可用性指标组,即它会被首先调度,采集成功才会继续调度其它指标组,采集失败则中断调度 priority: 0 - # 指标组中的具体监控指标 + # collect metrics content + # 具体监控指标列表 fields: - # 指标信息 包括 field名称 type字段类型:0-number数字,1-string字符串 instance是否为实例主键 unit:指标单位 + # field-metric name, type-metric type(0-number,1-string), unit-metric unit('%','ms','MB'), instance-if is metrics group unique identifier + # field-指标名称, type-指标类型(0-number数字,1-string字符串), unit-指标单位('%','ms','MB'), instance-是否是指标集合唯一标识符字段 + - field: connections + type: 0 - field: version type: 1 - instance: true - - field: port - type: 1 - - field: datadir + - field: git_hash type: 1 - - field: max_connections - type: 0 - # (非必须)监控指标别名，与上面的指标名映射。用于采集接口数据字段不直接是最终指标名称,需要此别名做映射转换 - aliasFields: - - version - - port - - datadir - - max_connections -# (非必须)指标计算表达式,与上面的别名一起作用,计算出最终需要的指标值 -# eg: cores=core1+core2, usage=usage, waitTime=allTime-runningTime - calculates: - - port=port - - datadir=datadir - - max_connections=max_connections - - version=version+"_"+version_compile_os+"_"+version_compile_machine - protocol: jdbc - jdbc: - # 主机host: ipv4 ipv6 域名 + # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk + # 用于监控的协议, eg: sql, ssh, http, telnet, wmi, snmp, sdk + protocol: http + http: + # http host: ipv4 ipv6 domain host: ^_^host^_^ - # 端口 - port: ^_^port^_^ - platform: mysql - username: ^_^username^_^ - password: ^_^password^_^ - database: ^_^database^_^ + # http port + port: ^_^service-port^_^ + # http url + url: '/status' timeout: ^_^timeout^_^ - # SQL查询方式： oneRow, multiRow, columns - queryType: columns - # sql - sql: show global variables where Variable_name like 'version%' or Variable_name = 'max_connections' or Variable_name = 'datadir' or Variable_name = 'port'; - url: ^_^url^_^ - + # http method: GET POST PUT DELETE PATCH + method: GET + # http response data parse type: default-hertzbeat rule, jsonpath-jsonpath script, website-for website monitoring, prometheus-prometheus exporter rule + # http 响应数据解析方式: default-系统规则, jsonPath-jsonPath脚本, website-网站可用性指标监控, prometheus-Prometheus数据规则 + parseType: jsonPath + parseScript: '$' + - name: stores - priority: 0 + priority: 1 fields: - field: address type: 1 @@ -136,7 +182,6 @@ metrics: type: 1 - field: state_name type: 1 - - field: capacity type: 1 - field: available @@ -173,44 +218,74 @@ metrics: - start_ts=$.status.start_ts - last_heartbeat_ts=$.status.last_heartbeat_ts - uptime=$.status.uptime - # 监控采集使用协议 eg: sql, ssh, http, telnet, wmi, snmp, sdk protocol: http - # 当protocol为http协议时具体的采集配置 http: - # 主机host: ipv4 ipv6 域名 - host: ^_^url^_^ - # 端口 + host: ^_^host^_^ port: ^_^pd-port^_^ - # url请求接口路径 url: '/pd/api/v1/stores' timeout: ^_^timeout^_^ method: GET parseType: jsonPath parseScript: '$.stores.*' - - name: status - priority: 0 + - name: basic + # metrics group scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel + # priority 0's metrics group is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue + # 指标组调度优先级(0->127)->(优先级高->低) 优先级低的指标组会等优先级高的指标组采集完成后才会被调度, 相同优先级的指标组会并行调度采集 + # 优先级为0的指标组为可用性指标组,即它会被首先调度,采集成功才会继续调度其它指标组,采集失败则中断调度 + priority: 2 + # collect metrics content + # 具体监控指标列表 fields: - - field: connections - type: 0 + # field-metric name, type-metric type(0-number,1-string), unit-metric unit('%','ms','MB'), instance-if is metrics group unique identifier + # field-指标名称, type-指标类型(0-number数字,1-string字符串), unit-指标单位('%','ms','MB'), instance-是否是指标集合唯一标识符字段 - field: version type: 1 - - field: git_hash + instance: true + - field: port type: 1 - # aliasFields: - # calculates: - # 监控采集使用协议 eg: sql, ssh, http, telnet, wmi, snmp, sdk - protocol: http - # 当protocol为http协议时具体的采集配置 - http: + - field: datadir + type: 1 + - field: max_connections + type: 0 + # (optional)metrics field alias name, it is used as an alias field to map and convert the collected data and metrics field + # (非必须)监控指标别名，与上面的指标名映射。用于采集接口数据字段不直接是最终指标名称,需要此别名做映射转换 + aliasFields: + - version + - port + - datadir + - max_connections + # (optional)mapping and conversion expressions, use these and aliasField above to calculate metrics value + # (非必须)指标计算表达式,与上面的别名一起作用,计算出最终需要的指标值 + # eg: cores=core1+core2, usage=usage, waitTime=allTime-runningTime + calculates: + - port=port + - datadir=datadir + - max_connections=max_connections + - version=version+"_"+version_compile_os+"_"+version_compile_machine + # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk + # 用于监控的协议, eg: sql, ssh, http, telnet, wmi, snmp, sdk + protocol: jdbc + # the config content when protocol is jdbc + # 协议为jdbc时的配置内容 + jdbc: + # host: ipv4 ipv6 host # 主机host: ipv4 ipv6 域名 - host: ^_^url^_^ + host: ^_^host^_^ # 端口 - port: ^_^service-port^_^ - # url请求接口路径 - url: '/status' + port: ^_^port^_^ + # database platform name + # 数据库平台名称 + platform: mysql + username: ^_^username^_^ + password: ^_^password^_^ + database: ^_^database^_^ timeout: ^_^timeout^_^ - method: GET - parseType: jsonPath - parseScript: '$' + # SQL Query Method：oneRow, multiRow, columns + # SQL查询方式： oneRow, multiRow, columns + queryType: columns + # sql + sql: show global variables where Variable_name like 'version%' or Variable_name = 'max_connections' or Variable_name = 'datadir' or Variable_name = 'port'; + # JDBC url + url: ^_^url^_^ diff --git a/manager/src/main/resources/define/app-tomcat.yml b/manager/src/main/resources/define/app-tomcat.yml index 95b107e1729..71d1e3d672a 100644 --- a/manager/src/main/resources/define/app-tomcat.yml +++ b/manager/src/main/resources/define/app-tomcat.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: HertzBeat 使用 JMX 协议对 Tomcat 的通用性能指标(memory_pool、code_cache、class_loading、thread)进行采集监控，点击查看开启步骤。
您可以点击“新建 Tomcat 应用服务器”并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: HertzBeat monitors general performance indicators of Tomcat through JMX protocol. Click here to view the specific steps. You could click the "New Tomcat" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: HertzBeat monitors general performance metrics of Tomcat through JMX protocol. Click here to view the specific steps. You could click the "New Tomcat" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: HertzBeat使用 JMX協定對Tomcat的通用性能指標（memory_pool、code_cache、class_loading、thread）進行採集監控，點擊查看開啟步驟。
您可以點擊“新建Tomcat應用伺服器”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/tomcat diff --git a/manager/src/main/resources/define/app-tplink_switch.yml b/manager/src/main/resources/define/app-tplink_switch.yml index e404bbc5e66..7639bc439b6 100644 --- a/manager/src/main/resources/define/app-tplink_switch.yml +++ b/manager/src/main/resources/define/app-tplink_switch.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: Hertzbeat 对 TP-LINK 通用交换机的通用指标进行测量监控。
您可以点击 “新建 TP-LINK通用交换机” 并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: Hertzbeat monitors TP-LINK Switch through general performance indicator. You could click the "New TP-LINK Switch" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: Hertzbeat monitors TP-LINK Switch through general performance metric. You could click the "New TP-LINK Switch" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: Hertzbeat對TP-LINK通用交換機的通用名額進行量測監控。
您可以點擊“新建TP-LINK通用交換機”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/tplink_switch diff --git a/manager/src/main/resources/define/app-ubuntu.yml b/manager/src/main/resources/define/app-ubuntu.yml index e59cfb16c1f..faff0ea74da 100644 --- a/manager/src/main/resources/define/app-ubuntu.yml +++ b/manager/src/main/resources/define/app-ubuntu.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: HertzBeat 对 Ubuntu 操作系统的通用性能指标(basic、cpu、memory、disk、interface、disk free)进行采集监控。
您可以点击“新建 Ubuntu 操作系统”并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: HertzBeat monitors Ubuntu operating system through general performance indicators such as cpu and memory. You could click the "New Ubuntu" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: HertzBeat monitors Ubuntu operating system through general performance metrics such as cpu and memory. You could click the "New Ubuntu" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: HertzBeat對Ubuntu作業系統的通用性能指標（basic、cpu、memory、disk、interface、disk free）進行採集監控。
您可以點擊“新建Ubuntu作業系統”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/ubuntu diff --git a/manager/src/main/resources/define/app-website.yml b/manager/src/main/resources/define/app-website.yml index 22e169cd471..1fbc9be3a82 100644 --- a/manager/src/main/resources/define/app-website.yml +++ b/manager/src/main/resources/define/app-website.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: Hertzbeat 对网站是否可用，响应时间等指标进行监测。
您可以点击 “新建 网站监测” 并进行配置，或者选择“更多操作”，导入已有配置。 - en-US: Hertzbeat monitors whether the website is available, response time and other indicators. You could click the "New WEBSITE" button and proceed with the configuration or import an existing setup through the "More Actions" menu. + en-US: Hertzbeat monitors whether the website is available, response time and other metrics. You could click the "New WEBSITE" button and proceed with the configuration or import an existing setup through the "More Actions" menu. zh-TW: Hertzbeat對網站是否可用，回應時間等名額進行監測。
您可以點擊“新建網站監測”並進行配寘，或者選擇“更多操作”，導入已有配寘。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/website diff --git a/manager/src/main/resources/define/app-windows.yml b/manager/src/main/resources/define/app-windows.yml index 4a2e559c6af..53b03631a5d 100644 --- a/manager/src/main/resources/define/app-windows.yml +++ b/manager/src/main/resources/define/app-windows.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: HertzBeat 通过 SNMP 协议对 Windows 操作系统的通用性能指标（用户数、进程数量、响应时间等）进行采集监控。
⚠️注意：Windows 服务器需要开启 SNMP 服务，点击查看开启步骤。 - en-US: HertzBeat monitors general performance indicators such as number of users, number of processes, response time of Windows operating system through the SNMP protocol.
⚠️Note：Windows server need enable the SNMP services Click here to view the specific steps. + en-US: HertzBeat monitors general performance metrics such as number of users, number of processes, response time of Windows operating system through the SNMP protocol.
⚠️Note：Windows server need enable the SNMP services Click here to view the specific steps. zh-TW: HertzBeat通過 SNMP協定對Windows作業系統的通用性能指標（用戶數、行程數量、回應時間等）進行採集監控。
⚠️ ️注意：Windows服務器需要開啟SNMP服務，點擊查看開啟步驟。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/windows diff --git a/manager/src/main/resources/define/app-zookeeper.yml b/manager/src/main/resources/define/app-zookeeper.yml index 6d40537babb..3d1916e11f0 100644 --- a/manager/src/main/resources/define/app-zookeeper.yml +++ b/manager/src/main/resources/define/app-zookeeper.yml @@ -28,7 +28,7 @@ name: # 监控类型的帮助描述信息 help: zh-CN: HertzBeat 对 Zookeeper 的通用性能指标(conf、stats)进行采集监控。
⚠️注意：由于需要 zookeeper 提供的四字命令 + netcat 来收集指标数据，您需要将 zookeeper 的四字命令加入白名单，点击查看具体步骤。 - en-US: "HertzBeat monitors Zookeeper through general performance indicators such as status and configuration.
⚠️Note: Due to the need for four-letter-word provided by zookeeper to collect indicator data, you should add the four-letter-word to the whitelist.Click here to view the specific steps." + en-US: "HertzBeat monitors Zookeeper through general performance metrics such as status and configuration.
⚠️Note: Due to the need for four-letter-word provided by zookeeper to collect metric data, you should add the four-letter-word to the whitelist.Click here to view the specific steps." zh-TW: HertzBeat對Zookeeper的通用性能指標（conf、stats）進行採集監控。
⚠️ 注意：由於需要zookeeper提供的四字命令+ netcat來收集名額數據，您需要將zookeeper的四字命令加入白名單，點擊查看具體步驟。 helpLink: zh-CN: https://hertzbeat.com/zh-cn/docs/help/zookeeper @@ -193,4 +193,4 @@ metrics: host: ^_^host^_^ port: ^_^port^_^ timeout: ^_^timeout^_^ - cmd: mntr \ No newline at end of file + cmd: mntr diff --git a/manager/src/main/resources/sureness.yml b/manager/src/main/resources/sureness.yml index f4da6b7aec2..6f653fe4dfb 100644 --- a/manager/src/main/resources/sureness.yml +++ b/manager/src/main/resources/sureness.yml @@ -94,7 +94,7 @@ excludedResource: account: - appId: admin credential: hertzbeat - role: [admin,user] + role: [admin] - appId: tom credential: hertzbeat role: [user] diff --git a/script/docker-compose/hertzbeat-mysql-iotdb/conf/sureness.yml b/script/docker-compose/hertzbeat-mysql-iotdb/conf/sureness.yml index cdce22f8798..4ab0ff2df7e 100644 --- a/script/docker-compose/hertzbeat-mysql-iotdb/conf/sureness.yml +++ b/script/docker-compose/hertzbeat-mysql-iotdb/conf/sureness.yml @@ -92,7 +92,7 @@ excludedResource: account: - appId: admin credential: hertzbeat - role: [admin,user] + role: [admin] - appId: tom credential: hertzbeat role: [user] diff --git a/script/docker-compose/hertzbeat-mysql-tdengine/conf/sureness.yml b/script/docker-compose/hertzbeat-mysql-tdengine/conf/sureness.yml index cdce22f8798..4ab0ff2df7e 100644 --- a/script/docker-compose/hertzbeat-mysql-tdengine/conf/sureness.yml +++ b/script/docker-compose/hertzbeat-mysql-tdengine/conf/sureness.yml @@ -92,7 +92,7 @@ excludedResource: account: - appId: admin credential: hertzbeat - role: [admin,user] + role: [admin] - appId: tom credential: hertzbeat role: [user] diff --git a/script/docker-compose/hertzbeat-postgresql-iotdb/conf/sureness.yml b/script/docker-compose/hertzbeat-postgresql-iotdb/conf/sureness.yml index cdce22f8798..4ab0ff2df7e 100644 --- a/script/docker-compose/hertzbeat-postgresql-iotdb/conf/sureness.yml +++ b/script/docker-compose/hertzbeat-postgresql-iotdb/conf/sureness.yml @@ -92,7 +92,7 @@ excludedResource: account: - appId: admin credential: hertzbeat - role: [admin,user] + role: [admin] - appId: tom credential: hertzbeat role: [user] diff --git a/script/helm/hertzbeat/templates/manager/configmap.yaml b/script/helm/hertzbeat/templates/manager/configmap.yaml index 6dccb5ef65e..ac207e2754e 100644 --- a/script/helm/hertzbeat/templates/manager/configmap.yaml +++ b/script/helm/hertzbeat/templates/manager/configmap.yaml @@ -230,7 +230,7 @@ data: account: - appId: {{ .Values.manager.account.username }} credential: {{ .Values.manager.account.password }} - role: [admin,user] + role: [admin] - appId: tom credential: hertzbeat role: [user] diff --git a/script/sureness.yml b/script/sureness.yml index cdce22f8798..4ab0ff2df7e 100644 --- a/script/sureness.yml +++ b/script/sureness.yml @@ -92,7 +92,7 @@ excludedResource: account: - appId: admin credential: hertzbeat - role: [admin,user] + role: [admin] - appId: tom credential: hertzbeat role: [user] diff --git a/web-app/src/app/core/startup/startup.service.ts b/web-app/src/app/core/startup/startup.service.ts index 3d9e4288d15..e016f1d76a0 100644 --- a/web-app/src/app/core/startup/startup.service.ts +++ b/web-app/src/app/core/startup/startup.service.ts @@ -11,6 +11,7 @@ import { catchError, map } from 'rxjs/operators'; import { ICONS } from '../../../style-icons'; import { ICONS_AUTO } from '../../../style-icons-auto'; +import { MemoryStorageService } from '../../service/memory-storage.service'; import { I18NService } from '../i18n/i18n.service'; /** * Used for application startup @@ -29,7 +30,8 @@ export class StartupService { private titleService: TitleService, @Inject(DA_SERVICE_TOKEN) private tokenService: ITokenService, private httpClient: HttpClient, - private router: Router + private router: Router, + private storageService: MemoryStorageService ) { iconSrv.addIcon(...ICONS_AUTO, ...ICONS); iconSrv.fetchFromIconfont({ @@ -75,6 +77,7 @@ export class StartupService { }); } }); + this.storageService.putData('hierarchy', menuData.data); // flush menu this.menuService.resume(); // Can be set page suffix title, https://ng-alain.com/theme/title diff --git a/web-app/src/app/layout/basic/basic.component.ts b/web-app/src/app/layout/basic/basic.component.ts index 244ef62239e..44eabaa04f1 100644 --- a/web-app/src/app/layout/basic/basic.component.ts +++ b/web-app/src/app/layout/basic/basic.component.ts @@ -1,5 +1,6 @@ -import { Component } from '@angular/core'; -import { SettingsService, User } from '@delon/theme'; +import { Component, Inject } from '@angular/core'; +import { I18NService } from '@core'; +import { ALAIN_I18N_TOKEN, SettingsService, User } from '@delon/theme'; import { LayoutDefaultOptions } from '@delon/theme/layout-default'; import { environment } from '@env/environment'; import { CONSTS } from 'src/app/shared/consts'; @@ -65,7 +66,7 @@ import { CONSTS } from 'src/app/shared/consts'; @@ -109,5 +110,15 @@ export class LayoutBasicComponent { return this.settings.user; } - constructor(private settings: SettingsService) {} + get role(): string { + let userTmp = this.settings.user; + if (userTmp == undefined || userTmp.role == undefined) { + return this.i18nSvc.fanyi('app.role.admin'); + } else { + let roles: string[] = JSON.parse(userTmp.role); + return roles.length > 0 ? roles[0] : ''; + } + } + + constructor(private settings: SettingsService, @Inject(ALAIN_I18N_TOKEN) private i18nSvc: I18NService) {} } 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 7e21841163d..651d8106f18 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 @@ -2,7 +2,7 @@ *ngIf="app != undefined" [help_massage_content]="'monitor.app.' + app + '.help' | i18n" [guild_link]="'monitor.app.' + app + '.helpLink' | i18n" - [icon_name]="'monitor_icon.' + app | i18n" + [icon_name]="getAppIconName(app)" > { + return item.value == app; + }); + if (find == undefined) { + return this.i18nSvc.fanyi('monitor_icon.center'); + } + let icon = this.i18nSvc.fanyi(`monitor_icon.${find.category}`); + if (icon == `monitor_icon.${find.category}`) { + return this.i18nSvc.fanyi('monitor_icon.center'); + } + return icon; + } + loadMonitorTable(sortField?: string | null, sortOrder?: string | null) { this.tableLoading = true; let monitorInit$ = this.monitorSvc.getMonitors(this.app, this.tag, this.pageIndex - 1, this.pageSize, sortField, sortOrder).subscribe( diff --git a/web-app/src/app/routes/passport/login/login.component.ts b/web-app/src/app/routes/passport/login/login.component.ts index 27e471e77c4..bc2c112698b 100644 --- a/web-app/src/app/routes/passport/login/login.component.ts +++ b/web-app/src/app/routes/passport/login/login.component.ts @@ -125,7 +125,8 @@ export class UserLoginComponent implements OnDestroy { let user: User = { name: this.userName.value, avatar: './assets/img/avatar.svg', - email: 'administrator' + email: 'administrator', + role: message.data.role }; this.settingsService.setUser(user); // 重新获取 StartupService 内容，我们始终认为应用信息一般都会受当前用户授权范围而影响 diff --git a/web-app/src/app/service/memory-storage.service.spec.ts b/web-app/src/app/service/memory-storage.service.spec.ts new file mode 100644 index 00000000000..553f9021b77 --- /dev/null +++ b/web-app/src/app/service/memory-storage.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { MemoryStorageService } from './memory-storage.service'; + +describe('MemoryStorageService', () => { + let service: MemoryStorageService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(MemoryStorageService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/web-app/src/app/service/memory-storage.service.ts b/web-app/src/app/service/memory-storage.service.ts new file mode 100644 index 00000000000..2e60dc2ac60 --- /dev/null +++ b/web-app/src/app/service/memory-storage.service.ts @@ -0,0 +1,23 @@ +import { Injectable } from '@angular/core'; + +@Injectable({ + providedIn: 'root' +}) +export class MemoryStorageService { + data: Record; + constructor() { + this.data = {}; + } + + public putData(key: string, value: any) { + this.data[key] = value; + } + + public getData(key: string): any | undefined { + return this.data[key]; + } + + public clear() { + this.data = {}; + } +} diff --git a/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.ts b/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.ts index 35b054a61c4..0cd7fea5c5b 100644 --- a/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.ts +++ b/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.ts @@ -58,7 +58,7 @@ export class HelpMassageShowComponent implements OnInit { checkedMonitorIds = new Set(); ngOnInit(): void { - this.isCollapsed = localStorage.getItem('collapse_status') === 'true' ? true : false; + this.isCollapsed = localStorage.getItem('collapse_status') === 'true'; this.el.nativeElement.querySelector('.help_massage_div').style.height = `${localStorage.getItem('collapse_height')}px`; this.collapse_expand = this.isCollapsed ? 'expand' : 'collapse'; this.route.queryParamMap.subscribe(paramMap => { diff --git a/web-app/src/assets/i18n/en-US.json b/web-app/src/assets/i18n/en-US.json index c74785e612e..dd1a7d7c082 100644 --- a/web-app/src/assets/i18n/en-US.json +++ b/web-app/src/assets/i18n/en-US.json @@ -305,70 +305,13 @@ "menu.link.question": "FAQ", "menu.link.guild": "User Guide", "monitor_icon.center": "laptop", - "monitor_icon.api": "appstore", - "monitor_icon.jvm": "appstore", - "monitor_icon.fullsite": "appstore", - "monitor_icon.port": "appstore", - "monitor_icon.ssl_cert": "appstore", - "monitor_icon.ping": "appstore", - "monitor_icon.website": "appstore", - "monitor_icon.ftp": "appstore", - "monitor_icon.springboot3": "appstore", - "monitor_icon.springboot2": "appstore", - "monitor_icon.dm": "console-sql", - "monitor_icon.redis": "console-sql", - "monitor_icon.elasticsearch": "console-sql", - "monitor_icon.mysql": "console-sql", - "monitor_icon.redis_cluster": "console-sql", - "monitor_icon.oracle": "console-sql", - "monitor_icon.redis_sentinel": "console-sql", - "monitor_icon.clickhouse": "console-sql", - "monitor_icon.doris_fe": "console-sql", - "monitor_icon.postgresql": "console-sql", - "monitor_icon.sqlserver": "console-sql", - "monitor_icon.mongodb": "console-sql", - "monitor_icon.doris_be": "console-sql", - "monitor_icon.opengauss": "console-sql", - "monitor_icon.mariadb": "console-sql", - "monitor_icon.iotdb": "console-sql", - "monitor_icon.coreos": "windows", - "monitor_icon.opensuse": "windows", - "monitor_icon.rockylinux": "windows", - "monitor_icon.euleros": "windows", - "monitor_icon.ubuntu": "windows", - "monitor_icon.redhat": "windows", - "monitor_icon.centos": "windows", - "monitor_icon.freebsd": "windows", - "monitor_icon.almalinux": "windows", - "monitor_icon.debian": "windows", - "monitor_icon.linux": "windows", - "monitor_icon.windows": "windows", - "monitor_icon.dynamic_tp": "cluster", - "monitor_icon.tomcat": "cluster", - "monitor_icon.zookeeper": "cluster", - "monitor_icon.airflow": "cluster", - "monitor_icon.flink": "cluster", - "monitor_icon.kafka": "cluster", - "monitor_icon.nacos": "cluster", - "monitor_icon.spark": "cluster", - "monitor_icon.hadoop": "cluster", - "monitor_icon.jetty": "cluster", - "monitor_icon.activemq": "cluster", - "monitor_icon.rocketmq": "cluster", - "monitor_icon.rabbitmq": "cluster", - "monitor_icon.shenyu": "cluster", - "monitor_icon.kubernetes": "cloud-server", - "monitor_icon.docker": "cloud-server", - "monitor_icon.h3c_switch": "global", - "monitor_icon.cisco_switch": "global", - "monitor_icon.tplink_switch": "global", - "monitor_icon.hpe_switch": "global", - "monitor_icon.huawei_switch": "global", - "monitor_icon.hertzbeat": "robot", - "monitor_icon.kafka_promql": "robot", - "monitor_icon.hertzbeat_token": "robot", - "monitor_icon.a_example": "robot", - "monitor_icon.api_code": "robot", + "monitor_icon.service": "appstore", + "monitor_icon.db": "console-sql", + "monitor_icon.os": "windows", + "monitor_icon.mid": "cluster", + "monitor_icon.cn": "cloud-server", + "monitor_icon.network": "global", + "monitor_icon.custom": "robot", "monitor_icon.alert_setting": "calculator", "monitor_icon.alert_converge": "filter", "monitor_icon.alert_silence": "audio-muted", diff --git a/web-app/src/assets/i18n/zh-CN.json b/web-app/src/assets/i18n/zh-CN.json index 64d2003f07b..d78c074e15e 100644 --- a/web-app/src/assets/i18n/zh-CN.json +++ b/web-app/src/assets/i18n/zh-CN.json @@ -305,70 +305,13 @@ "menu.link.question": "常见问题", "menu.link.guild": "使用指南", "monitor_icon.center": "laptop", - "monitor_icon.api": "appstore", - "monitor_icon.jvm": "appstore", - "monitor_icon.fullsite": "appstore", - "monitor_icon.port": "appstore", - "monitor_icon.ssl_cert": "appstore", - "monitor_icon.ping": "appstore", - "monitor_icon.website": "appstore", - "monitor_icon.ftp": "appstore", - "monitor_icon.springboot3": "appstore", - "monitor_icon.springboot2": "appstore", - "monitor_icon.dm": "console-sql", - "monitor_icon.redis": "console-sql", - "monitor_icon.elasticsearch": "console-sql", - "monitor_icon.mysql": "console-sql", - "monitor_icon.redis_cluster": "console-sql", - "monitor_icon.oracle": "console-sql", - "monitor_icon.redis_sentinel": "console-sql", - "monitor_icon.clickhouse": "console-sql", - "monitor_icon.doris_fe": "console-sql", - "monitor_icon.postgresql": "console-sql", - "monitor_icon.sqlserver": "console-sql", - "monitor_icon.mongodb": "console-sql", - "monitor_icon.doris_be": "console-sql", - "monitor_icon.opengauss": "console-sql", - "monitor_icon.mariadb": "console-sql", - "monitor_icon.iotdb": "console-sql", - "monitor_icon.coreos": "windows", - "monitor_icon.opensuse": "windows", - "monitor_icon.rockylinux": "windows", - "monitor_icon.euleros": "windows", - "monitor_icon.ubuntu": "windows", - "monitor_icon.redhat": "windows", - "monitor_icon.centos": "windows", - "monitor_icon.freebsd": "windows", - "monitor_icon.almalinux": "windows", - "monitor_icon.debian": "windows", - "monitor_icon.linux": "windows", - "monitor_icon.windows": "windows", - "monitor_icon.dynamic_tp": "cluster", - "monitor_icon.tomcat": "cluster", - "monitor_icon.zookeeper": "cluster", - "monitor_icon.airflow": "cluster", - "monitor_icon.flink": "cluster", - "monitor_icon.kafka": "cluster", - "monitor_icon.nacos": "cluster", - "monitor_icon.spark": "cluster", - "monitor_icon.hadoop": "cluster", - "monitor_icon.jetty": "cluster", - "monitor_icon.activemq": "cluster", - "monitor_icon.rocketmq": "cluster", - "monitor_icon.rabbitmq": "cluster", - "monitor_icon.shenyu": "cluster", - "monitor_icon.kubernetes": "cloud-server", - "monitor_icon.docker": "cloud-server", - "monitor_icon.h3c_switch": "global", - "monitor_icon.cisco_switch": "global", - "monitor_icon.tplink_switch": "global", - "monitor_icon.hpe_switch": "global", - "monitor_icon.huawei_switch": "global", - "monitor_icon.hertzbeat": "robot", - "monitor_icon.kafka_promql": "robot", - "monitor_icon.hertzbeat_token": "robot", - "monitor_icon.a_example": "robot", - "monitor_icon.api_code": "robot", + "monitor_icon.service": "appstore", + "monitor_icon.db": "console-sql", + "monitor_icon.os": "windows", + "monitor_icon.mid": "cluster", + "monitor_icon.cn": "cloud-server", + "monitor_icon.network": "global", + "monitor_icon.custom": "robot", "monitor_icon.alert_setting": "calculator", "monitor_icon.alert_converge": "filter", "monitor_icon.alert_silence": "audio-muted", diff --git a/web-app/src/assets/i18n/zh-TW.json b/web-app/src/assets/i18n/zh-TW.json index ce27f6d2620..8d8b0301fe2 100644 --- a/web-app/src/assets/i18n/zh-TW.json +++ b/web-app/src/assets/i18n/zh-TW.json @@ -304,70 +304,13 @@ "menu.link.question": "常見問題", "menu.link.guild": "使用指南", "monitor_icon.center": "laptop", - "monitor_icon.api": "appstore", - "monitor_icon.jvm": "appstore", - "monitor_icon.fullsite": "appstore", - "monitor_icon.port": "appstore", - "monitor_icon.ssl_cert": "appstore", - "monitor_icon.ping": "appstore", - "monitor_icon.website": "appstore", - "monitor_icon.ftp": "appstore", - "monitor_icon.springboot3": "appstore", - "monitor_icon.springboot2": "appstore", - "monitor_icon.dm": "console-sql", - "monitor_icon.redis": "console-sql", - "monitor_icon.elasticsearch": "console-sql", - "monitor_icon.mysql": "console-sql", - "monitor_icon.redis_cluster": "console-sql", - "monitor_icon.oracle": "console-sql", - "monitor_icon.redis_sentinel": "console-sql", - "monitor_icon.clickhouse": "console-sql", - "monitor_icon.doris_fe": "console-sql", - "monitor_icon.postgresql": "console-sql", - "monitor_icon.sqlserver": "console-sql", - "monitor_icon.mongodb": "console-sql", - "monitor_icon.doris_be": "console-sql", - "monitor_icon.opengauss": "console-sql", - "monitor_icon.mariadb": "console-sql", - "monitor_icon.iotdb": "console-sql", - "monitor_icon.coreos": "windows", - "monitor_icon.opensuse": "windows", - "monitor_icon.rockylinux": "windows", - "monitor_icon.euleros": "windows", - "monitor_icon.ubuntu": "windows", - "monitor_icon.redhat": "windows", - "monitor_icon.centos": "windows", - "monitor_icon.freebsd": "windows", - "monitor_icon.almalinux": "windows", - "monitor_icon.debian": "windows", - "monitor_icon.linux": "windows", - "monitor_icon.windows": "windows", - "monitor_icon.dynamic_tp": "cluster", - "monitor_icon.tomcat": "cluster", - "monitor_icon.zookeeper": "cluster", - "monitor_icon.airflow": "cluster", - "monitor_icon.flink": "cluster", - "monitor_icon.kafka": "cluster", - "monitor_icon.nacos": "cluster", - "monitor_icon.spark": "cluster", - "monitor_icon.hadoop": "cluster", - "monitor_icon.jetty": "cluster", - "monitor_icon.activemq": "cluster", - "monitor_icon.rocketmq": "cluster", - "monitor_icon.rabbitmq": "cluster", - "monitor_icon.shenyu": "cluster", - "monitor_icon.kubernetes": "cloud-server", - "monitor_icon.docker": "cloud-server", - "monitor_icon.h3c_switch": "global", - "monitor_icon.cisco_switch": "global", - "monitor_icon.tplink_switch": "global", - "monitor_icon.hpe_switch": "global", - "monitor_icon.huawei_switch": "global", - "monitor_icon.hertzbeat": "robot", - "monitor_icon.kafka_promql": "robot", - "monitor_icon.hertzbeat_token": "robot", - "monitor_icon.a_example": "robot", - "monitor_icon.api_code": "robot", + "monitor_icon.service": "appstore", + "monitor_icon.db": "console-sql", + "monitor_icon.os": "windows", + "monitor_icon.mid": "cluster", + "monitor_icon.cn": "cloud-server", + "monitor_icon.network": "global", + "monitor_icon.custom": "robot", "monitor_icon.alert_setting": "calculator", "monitor_icon.alert_converge": "filter", "monitor_icon.alert_silence": "audio-muted",