update switch monitoring metrics i18n (#1472)

Signed-off-by: tomsun28 <[email protected]>
apache · Jan 4, 2024 · 886fff6 · 886fff6
1 parent 2e01c1c
commit 886fff6
Show file tree

Hide file tree

Showing 26 changed files with 1,258 additions and 189 deletions.
diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@
 ### Features
 
 * Combines **monitoring, alarm, and notification** features into one platform, and supports monitoring for web service, program, database, cache, os, webserver, middleware, bigdata, cloud-native, network, custom and more.
-* Easy to use and agentless, offering full gui operations for monitoring and alerting with just a few clicks, all at zero learning cost.
+* Easy to use and agentless, web-based and with one-click monitoring and alerting, zero learning curve.
 * Makes protocols such as `Http, Jmx, Ssh, Snmp, Jdbc, Prometheus` configurable, allowing you to collect any metrics by simply configuring the template `YML` file online. Imagine being able to quickly adapt to a new monitoring type like K8s or Docker simply by configuring online with HertzBeat.
 * Compatible with the `Prometheus` ecosystem and more, can monitoring what `Prometheus` can monitoring with few clicks on gui.
 * High performance, supports horizontal expansion of multi-collector clusters, multi-isolated network monitoring and cloud-edge collaboration.

diff --git a/home/blog/2023-12-11-hertzbeat-v1.4.3.md b/home/blog/2023-12-11-hertzbeat-v1.4.3.md
@@ -15,7 +15,7 @@ keywords: [open source monitoring system, alerting system]
 ### Features
 
 * Combines **monitoring, alarm, and notification** features into one platform, and supports monitoring for web service, program, database, cache, os, webserver, middleware, bigdata, cloud-native, network, custom and more.
-* Easy to use and agentless, offering full gui operations for monitoring and alerting with just a few clicks, all at zero learning cost.
+* Easy to use and agentless, web-based and with one-click monitoring and alerting, zero learning curve.
 * Makes protocols such as `Http, Jmx, Ssh, Snmp, Jdbc, Prometheus` configurable, allowing you to collect any metrics by simply configuring the template `YML` file online. Imagine being able to quickly adapt to a new monitoring type like K8s or Docker simply by configuring online with HertzBeat.
 * Compatible with the `Prometheus` ecosystem and more, can monitoring what `Prometheus` can monitoring with few clicks on gui.
 * High performance, supports horizontal expansion of multi-collector clusters, multi-isolated network monitoring and cloud-edge collaboration.

diff --git a/home/docs/introduce.md b/home/docs/introduce.md
@@ -30,7 +30,7 @@ slug: /
 ### Features
 
 * Combines **monitoring, alarm, and notification** features into one platform, and supports monitoring for web service, program, database, cache, os, webserver, middleware, bigdata, cloud-native, network, custom and more.
-* Easy to use and agentless, offering full gui operations for monitoring and alerting with just a few clicks, all at zero learning cost.
+* Easy to use and agentless, web-based and with one-click monitoring and alerting, zero learning curve.
 * Makes protocols such as `Http, Jmx, Ssh, Snmp, Jdbc, Prometheus` configurable, allowing you to collect any metrics by simply configuring the template `YML` file online. Imagine being able to quickly adapt to a new monitoring type like K8s or Docker simply by configuring online with HertzBeat.
 * Compatible with the `Prometheus` ecosystem and more, can monitoring what `Prometheus` can monitoring with few clicks on gui.
 * High performance, supports horizontal expansion of multi-collector clusters, multi-isolated network monitoring and cloud-edge collaboration.

diff --git a/manager/src/main/resources/define/app-activemq.yml b/manager/src/main/resources/define/app-activemq.yml
@@ -134,6 +134,9 @@ metrics:
   # metrics - basic
   # 监控指标 - basic
   - name: basic
+    i18n:
+      zh-CN: 虚拟机基础信息
+      en-US: JVM Basic
     # metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
     # priority 0's metrics is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue
     # 指标采集调度优先级(0->127)->(优先级高->低) 优先级低的指标会等优先级高的指标采集完成后才会被调度, 相同优先级的指标会并行调度采集
@@ -146,13 +149,25 @@ metrics:
       # field-指标名称, type-指标类型(0-number数字,1-string字符串), unit-指标单位('%','ms','MB'), label-是否是指标标签字段
       - field: VmName
         type: 1
+        i18n:
+          zh-CN: 名称
+          en-US: Vm Name
       - field: VmVendor
         type: 1
+        i18n:
+          zh-CN: 厂商
+          en-US: Vm Vendor
       - field: VmVersion
         type: 1
+        i18n:
+          zh-CN: 版本
+          en-US: Vm Version
       - field: Uptime
         type: 0
         unit: ms
+        i18n:
+          zh-CN: 运行时长
+          en-US: Up time
     # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
     protocol: jmx
     # the config content when protocol is jmx
@@ -289,23 +304,41 @@ metrics:
       url: ^_^url^_^
 
   - name: memory_pool
+    i18n:
+      zh-CN: 内存池
+      en-US: Memory Pool
     priority: 2
     fields:
       - field: name
         type: 1
         label: true
+        i18n:
+          zh-CN: 指标名称
+          en-US: Name
       - field: committed
         type: 0
         unit: MB
+        i18n:
+          zh-CN: 已分配内存
+          en-US: Committed
       - field: init
         type: 0
         unit: MB
+        i18n:
+          zh-CN: 初始化内存
+          en-US: Init
       - field: max
         type: 0
         unit: MB
+        i18n:
+          zh-CN: 最大内存
+          en-US: Max
       - field: used
         type: 0
         unit: MB
+        i18n:
+          zh-CN: 已使用内存
+          en-US: Used
     units:
       - committed=B->MB
       - init=B->MB
@@ -333,14 +366,26 @@ metrics:
       url: ^_^url^_^
 
   - name: class_loading
+    i18n:
+      zh-CN: 类加载信息
+      en-US: Class Loading
     priority: 2
     fields:
       - field: LoadedClassCount
         type: 0
+        i18n:
+          zh-CN: 当前已加载类数量
+          en-US: Loaded Class Count
       - field: TotalLoadedClassCount
         type: 0
+        i18n:
+          zh-CN: 已加载类总数量
+          en-US: Total Loaded Class Count
       - field: UnloadedClassCount
         type: 0
+        i18n:
+          zh-CN: 未加载类总数量
+          en-US: Unloaded Class Count
     protocol: jmx
     jmx:
       host: ^_^host^_^
@@ -351,22 +396,43 @@ metrics:
       url: ^_^url^_^
 
   - name: thread
+    i18n:
+      zh-CN: 线程信息
+      en-US: Thread
     priority: 2
     fields:
       - field: TotalStartedThreadCount
         type: 0
+        i18n:
+          zh-CN: 已启动线程总数
+          en-US: Total Started Thread Count
       - field: ThreadCount
         type: 0
+        i18n:
+          zh-CN: 活跃线程数
+          en-US: Thread Count
       - field: PeakThreadCount
         type: 0
+        i18n:
+          zh-CN: 最大峰值线程数
+          en-US: Peak Thread Count
       - field: DaemonThreadCount
         type: 0
+        i18n:
+          zh-CN: 活跃守护线程数
+          en-US: Daemon Thread Count
       - field: CurrentThreadUserTime
         type: 0
         unit: s
+        i18n:
+          zh-CN: 线程占用的CPU时间(用户态)
+          en-US: Current Thread User Time
       - field: CurrentThreadCpuTime
         type: 0
         unit: s
+        i18n:
+          zh-CN: 线程占用的CPU时间
+          en-US: Current Thread CPU Time
     units:
       - CurrentThreadUserTime=NS->S
       - CurrentThreadCpuTime=NS->S

diff --git a/manager/src/main/resources/define/app-centos.yml b/manager/src/main/resources/define/app-centos.yml
@@ -160,6 +160,9 @@ metrics:
   # metrics - basic, inner monitoring metrics (responseTime - response time)
   # 监控指标 - basic, 内置监控指标有 (responseTime - 响应时间)
   - name: basic
+    i18n:
+      zh-CN: 系统基本信息
+      en-US: Basic Info
     # metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
     # priority 0's metrics is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue
     # 指标采集调度优先级(0->127)->(优先级高->低) 优先级低的指标会等优先级高的指标采集完成后才会被调度, 相同优先级的指标会并行调度采集

diff --git a/manager/src/main/resources/define/app-cisco_switch.yml b/manager/src/main/resources/define/app-cisco_switch.yml
@@ -264,6 +264,9 @@ metrics:
   # metrics - system
   # 监控指标 - system
   - name: system
+    i18n:
+      zh-CN: 系统信息
+      en-US: System Info
     # metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
     # priority 0's metrics is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue
     # 指标采集调度优先级(0->127)->(优先级高->低) 优先级低的指标会等优先级高的指标采集完成后才会被调度, 相同优先级的指标会并行调度采集
@@ -276,17 +279,35 @@ metrics:
       # field-指标名称, type-指标类型(0-number数字,1-string字符串), unit-指标单位('%','ms','MB'), label-是否是指标标签字段
       - field: name
         type: 1
+        i18n:
+          zh-CN: 主机名称
+          en-US: Host Name
       - field: descr
         type: 1
+        i18n:
+          zh-CN: 描述信息
+          en-US: Description
       - field: uptime
         type: 1
+        i18n:
+          zh-CN: 运行时长
+          en-US: Uptime
       - field: location
         type: 1
+        i18n:
+          zh-CN: 位置
+          en-US: Location
       - field: contact
         type: 1
+        i18n:
+          zh-CN: 联系人
+          en-US: Contact
       - field: responseTime
         type: 0
         unit: ms
+        i18n:
+          zh-CN: 响应时间
+          en-US: Response Time
     # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
     protocol: snmp
     # the config content when protocol is snmp
@@ -325,41 +346,80 @@ metrics:
         contact: 1.3.6.1.2.1.1.4.0
 
   - name: interfaces
+    i18n:
+      zh-CN: 接口详情
+      en-US: Interfaces Detail
     priority: 1
     fields:
       - field: index
         type: 1
+        i18n:
+          zh-CN: 编号
+          en-US: Index
       - field: descr
         type: 1
         label: true
+        i18n:
+          zh-CN: 接口名称
+          en-US: Interface Name
       - field: mtu
         type: 0
         unit: 'byte'
+        i18n:
+          zh-CN: MTU
+          en-US: MTU
       - field: speed
         type: 0
-        unit: 'KB/s'
+        unit: 'MB/s'
+        i18n:
+          zh-CN: 接口速率
+          en-US: Interface Speed
       - field: in_octets
         type: 0
-        unit: 'byte'
+        unit: 'MByte'
+        i18n:
+          zh-CN: 入流量
+          en-US: In Octets
       - field: in_discards
         type: 0
         unit: 'package'
+        i18n:
+          zh-CN: 入丢包数
+          en-US: In Discards
       - field: in_errors
         type: 0
         unit: 'package'
+        i18n:
+          zh-CN: 入错包数
+          en-US: In Errors
       - field: out_octets
         type: 0
-        unit: 'byte'
+        unit: 'MByte'
+        i18n:
+          zh-CN: 出流量
+          en-US: Out Octets
       - field: out_discards
         type: 0
         unit: 'package'
+        i18n:
+          zh-CN: 出丢包数
+          en-US: Out Discards
       - field: out_errors
         type: 0
         unit: 'package'
+        i18n:
+          zh-CN: 出错包数
+          en-US: Out Errors
       - field: admin_status
         type: 1
+        i18n:
+          zh-CN: 配置状态
+          en-US: Config Status        
       - field: oper_status
         type: 1
+        i18n:
+          zh-CN: 当前状态
+          en-US: Current Status
     # (optional)metrics field alias name, it is used as an alias field to map and convert the collected data and metrics field
     # (可选)监控指标别名, 做为中间字段与采集数据字段和指标字段映射转换
     aliasFields:
@@ -382,11 +442,11 @@ metrics:
       - index=ifIndex
       - descr=ifDescr
       - mtu=ifMtu
-      - speed=ifSpeed / 1024
-      - in_octets=ifInOctets
+      - speed=ifSpeed / 1024 / 1024
+      - in_octets=ifInOctets / 1024 / 1024
       - in_discards=ifInDiscards
       - in_errors=ifInErrors
-      - out_octets=ifOutOctets
+      - out_octets=ifOutOctets / 1024 / 1024
       - out_discards=ifOutDiscards
       - out_errors=ifOutErrors
       - admin_status=ifAdminStatus

diff --git a/manager/src/main/resources/define/app-fullsite.yml b/manager/src/main/resources/define/app-fullsite.yml
@@ -91,6 +91,9 @@ metrics:
   # metrics - summary
   # 监控指标 - summary
   - name: summary
+    i18n:
+      zh-CN: 概要信息
+      en-US: Summary
     # metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
     # priority 0's metrics is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue
     # 指标采集调度优先级(0->127)->(优先级高->低) 优先级低的指标会等优先级高的指标采集完成后才会被调度, 相同优先级的指标会并行调度采集
@@ -104,14 +107,25 @@ metrics:
       - field: url
         type: 1
         label: true
+        i18n:
+          zh-CN: URL
+          en-US: URL
       - field: statusCode
         type: 1
+        i18n:
+          zh-CN: 响应状态码
+          en-US: Status Code
       - field: responseTime
         type: 0
         unit: ms
+        i18n:
+          zh-CN: 响应时间
+          en-US: Response Time
       - field: errorMsg
         type: 1
-
+        i18n:
+          zh-CN: 错误信息
+          en-US: Error Msg
     # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
     protocol: http
     # the config content when protocol is http