From 886fff64271395088205272078e361c5d5a2b836 Mon Sep 17 00:00:00 2001 From: tomsun28 Date: Thu, 4 Jan 2024 18:07:17 +0800 Subject: [PATCH] update switch monitoring metrics i18n (#1472) Signed-off-by: tomsun28 --- README.md | 2 +- home/blog/2023-12-11-hertzbeat-v1.4.3.md | 2 +- home/docs/introduce.md | 2 +- .../main/resources/define/app-activemq.yml | 66 +++ .../src/main/resources/define/app-centos.yml | 3 + .../resources/define/app-cisco_switch.yml | 72 ++- .../main/resources/define/app-fullsite.yml | 16 +- .../main/resources/define/app-h3c_switch.yml | 65 +++ .../src/main/resources/define/app-hadoop.yml | 87 +++- .../main/resources/define/app-hpe_switch.yml | 72 ++- .../resources/define/app-huawei_switch.yml | 72 ++- .../src/main/resources/define/app-jetty.yml | 84 ++++ manager/src/main/resources/define/app-jvm.yml | 8 +- .../src/main/resources/define/app-kafka.yml | 33 ++ .../src/main/resources/define/app-mariadb.yml | 416 ++++++++++++++---- .../main/resources/define/app-memcached.yml | 55 +-- .../src/main/resources/define/app-mysql.yml | 1 - .../src/main/resources/define/app-nacos.yml | 30 ++ .../src/main/resources/define/app-nginx.yml | 8 +- manager/src/main/resources/define/app-ntp.yml | 18 +- .../src/main/resources/define/app-pop3.yml | 4 +- .../src/main/resources/define/app-smtp.yml | 4 +- .../src/main/resources/define/app-spark.yml | 87 +++- .../src/main/resources/define/app-tomcat.yml | 148 ++++++- .../resources/define/app-tplink_switch.yml | 77 +++- .../main/resources/define/app-websocket.yml | 15 +- 26 files changed, 1258 insertions(+), 189 deletions(-) diff --git a/README.md b/README.md index 691cbeb79f7..87409e693b9 100644 --- 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 index b1d4838426b..c7d864f3775 100644 --- 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 index 4336a7a21a3..9802228a7e1 100644 --- 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 index 870481369cc..2a61dfef7fa 100644 --- 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 index e78c4212911..5281b2044f5 100644 --- 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 index c34e77031a1..60c0ca5bd1a 100644 --- 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 index 7c3696bc4b7..35f08a42ef4 100644 --- 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 diff --git a/manager/src/main/resources/define/app-h3c_switch.yml b/manager/src/main/resources/define/app-h3c_switch.yml index abbbd7e297d..a845965a48a 100644 --- a/manager/src/main/resources/define/app-h3c_switch.yml +++ b/manager/src/main/resources/define/app-h3c_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,82 @@ 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: 'MB/s' + i18n: + zh-CN: 接口速率 + en-US: Interface Speed - field: in_octets type: 0 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: '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: - ifIndex - ifDescr @@ -373,6 +435,9 @@ metrics: - ifOutErrors - ifAdminStatus - ifOperStatus + # mapping and conversion expressions, use these and aliasField above to calculate metrics value + # (可选)指标映射转换计算表达式,与上面的别名一起作用,计算出最终需要的指标值 + # eg: cores=core1+core2, usage=usage, waitTime=allTime-runningTime calculates: - index=ifIndex - descr=ifDescr diff --git a/manager/src/main/resources/define/app-hadoop.yml b/manager/src/main/resources/define/app-hadoop.yml index 0a1a7ef7342..51212a4ac90 100644 --- a/manager/src/main/resources/define/app-hadoop.yml +++ b/manager/src/main/resources/define/app-hadoop.yml @@ -133,6 +133,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)->(优先级高->低) 优先级低的指标会等优先级高的指标采集完成后才会被调度, 相同优先级的指标会并行调度采集 @@ -145,13 +148,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 # 用于监控的协议，例: sql, ssh, http, telnet, wmi, snmp, sdk protocol: jmx @@ -172,22 +187,40 @@ metrics: - name: memory_pool priority: 1 + i18n: + zh-CN: 内存池 + en-US: Memory Pool 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 @@ -224,16 +257,31 @@ metrics: url: ^_^url^_^ - name: code_cache - priority: 5 + priority: 2 + i18n: + zh-CN: 本地代码缓冲区 + en-US: Code Cache fields: - field: committed type: 0 + i18n: + zh-CN: 已分配内存 + en-US: Committed - field: init type: 0 + i18n: + zh-CN: 初始化内存 + en-US: Init - field: max type: 0 + i18n: + zh-CN: 最大内存 + en-US: Max - field: used type: 0 + i18n: + zh-CN: 已使用内存 + en-US: Used aliasFields: - Usage->committed - Usage->init @@ -258,7 +306,10 @@ metrics: url: ^_^url^_^ - name: class_loading - priority: 6 + priority: 3 + i18n: + zh-CN: 类加载信息 + en-US: Class Loading # collect metrics content # 具体监控指标列表 fields: @@ -266,10 +317,19 @@ metrics: # field-指标名称, type-指标类型(0-number数字,1-string字符串), unit-指标单位('%','ms','MB'), label-是否是指标标签字段 - 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^_^ @@ -280,7 +340,10 @@ metrics: url: ^_^url^_^ - name: thread - priority: 7 + priority: 4 + i18n: + zh-CN: 线程信息 + en-US: Thread # collect metrics content # 具体监控指标列表 fields: @@ -288,18 +351,36 @@ metrics: # field-指标名称, type-指标类型(0-number数字,1-string字符串), unit-指标单位('%','ms','MB'), label-是否是指标标签字段 - 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-hpe_switch.yml b/manager/src/main/resources/define/app-hpe_switch.yml index 441e211e4bb..fb4744dfea7 100644 --- a/manager/src/main/resources/define/app-hpe_switch.yml +++ b/manager/src/main/resources/define/app-hpe_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-huawei_switch.yml b/manager/src/main/resources/define/app-huawei_switch.yml index c053f3fda92..db9d6d81444 100644 --- a/manager/src/main/resources/define/app-huawei_switch.yml +++ b/manager/src/main/resources/define/app-huawei_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-jetty.yml b/manager/src/main/resources/define/app-jetty.yml index 397f906c354..2166b490ae6 100644 --- a/manager/src/main/resources/define/app-jetty.yml +++ b/manager/src/main/resources/define/app-jetty.yml @@ -133,6 +133,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)->(优先级高->低) 优先级低的指标会等优先级高的指标采集完成后才会被调度, 相同优先级的指标会并行调度采集 @@ -145,13 +148,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 # 用于监控的协议, 比如: sql, ssh, http, telnet, wmi, snmp, sdk protocol: jmx @@ -173,6 +188,9 @@ metrics: # metrics - server # 监控指标 - server - name: server + i18n: + zh-CN: Jetty Server + en-US: Jetty Server # 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)->(优先级高->低) 优先级低的指标会等优先级高的指标采集完成后才会被调度, 相同优先级的指标会并行调度采集 @@ -185,10 +203,19 @@ metrics: # field-指标名称, type-指标类型(0-number数字,1-string字符串), unit-指标单位('%','ms','MB'), label-是否是指标标签字段 - field: version type: 1 + i18n: + zh-CN: 版本 + en-US: Vm Version - field: state type: 1 + i18n: + zh-CN: 运行状态 + en-US: Run State - field: startupTime type: 0 + i18n: + zh-CN: 启动时间 + en-US: Startup Time # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk # 用于监控的协议, 比如: sql, ssh, http, telnet, wmi, snmp, sdk protocol: jmx @@ -207,6 +234,9 @@ metrics: # metrics - server # 监控指标 - server - name: memory_pool + i18n: + zh-CN: 内存池 + en-US: Memory Pool # 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)->(优先级高->低) 优先级低的指标会等优先级高的指标采集完成后才会被调度, 相同优先级的指标会并行调度采集 @@ -220,14 +250,29 @@ metrics: - field: name type: 1 label: true + i18n: + zh-CN: 指标名称 + en-US: Name - field: committed type: 0 + i18n: + zh-CN: 已分配内存 + en-US: Committed - field: init type: 0 + i18n: + zh-CN: 初始化内存 + en-US: Init - field: max type: 0 + i18n: + zh-CN: 最大内存 + en-US: Max - field: used type: 0 + i18n: + zh-CN: 已使用内存 + en-US: Used # (optional)metrics field alias name, it is used as an alias field to map and convert the collected data and metrics field # (可选)监控指标别名, 做为中间字段与采集数据字段和指标字段映射转换 aliasFields: @@ -295,6 +340,9 @@ metrics: # metrics - thread # 监控指标 - thread - name: thread + i18n: + zh-CN: 线程信息 + en-US: Thread # 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)->(优先级高->低) 优先级低的指标会等优先级高的指标采集完成后才会被调度, 相同优先级的指标会并行调度采集 @@ -307,18 +355,36 @@ metrics: # field-指标名称, type-指标类型(0-number数字,1-string字符串), unit-指标单位('%','ms','MB'), label-是否是指标标签字段 - 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 @@ -339,6 +405,9 @@ metrics: # metrics - webapp # 监控指标 - webapp - name: webapp + i18n: + zh-CN: Web应用 + en-US: Webapp # 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)->(优先级高->低) 优先级低的指标会等优先级高的指标采集完成后才会被调度, 相同优先级的指标会并行调度采集 @@ -352,14 +421,29 @@ metrics: - field: displayName type: 1 label: true + i18n: + zh-CN: 应用名称 + en-US: App Name - field: contextPath type: 1 + i18n: + zh-CN: 上下文路径 + en-US: Context Path - field: state type: 1 + i18n: + zh-CN: 状态 + en-US: State - field: resourceBase type: 1 + i18n: + zh-CN: 资源 + en-US: Resource Base - field: shutdown type : 1 + i18n: + zh-CN: 是否关闭 + en-US: Shutdown # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk # 用于监控的协议, 比如: sql, ssh, http, telnet, wmi, snmp, sdk protocol: jmx diff --git a/manager/src/main/resources/define/app-jvm.yml b/manager/src/main/resources/define/app-jvm.yml index 06d82c26ec1..53a69ac80ac 100644 --- a/manager/src/main/resources/define/app-jvm.yml +++ b/manager/src/main/resources/define/app-jvm.yml @@ -140,7 +140,7 @@ metrics: priority: 0 i18n: zh-CN: 虚拟机基础信息 - en-US: Basic + en-US: JVM Basic # collect metrics content # 具体监控指标列表 fields: @@ -257,7 +257,7 @@ metrics: url: ^_^url^_^ - name: code_cache - priority: 5 + priority: 2 i18n: zh-CN: 本地代码缓冲区 en-US: Code Cache @@ -306,7 +306,7 @@ metrics: url: ^_^url^_^ - name: class_loading - priority: 6 + priority: 3 i18n: zh-CN: 类加载信息 en-US: Class Loading @@ -340,7 +340,7 @@ metrics: url: ^_^url^_^ - name: thread - priority: 7 + priority: 4 i18n: zh-CN: 线程信息 en-US: Thread diff --git a/manager/src/main/resources/define/app-kafka.yml b/manager/src/main/resources/define/app-kafka.yml index fe7d1a00bf2..88d21585025 100644 --- a/manager/src/main/resources/define/app-kafka.yml +++ b/manager/src/main/resources/define/app-kafka.yml @@ -121,17 +121,32 @@ metrics: url: ^_^url^_^ - name: jvm_basic + i18n: + zh-CN: 虚拟机基础信息 + en-US: JVM Basic priority: 1 fields: - 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 protocol: jmx jmx: host: ^_^host^_^ @@ -144,19 +159,37 @@ metrics: url: ^_^url^_^ - name: jvm_memory_pool + i18n: + zh-CN: 内存池 + en-US: Memory Pool priority: 1 fields: - field: name type: 1 label: true + i18n: + zh-CN: 指标名称 + en-US: Name - field: committed type: 0 + i18n: + zh-CN: 已分配内存 + en-US: Committed - field: init type: 0 + i18n: + zh-CN: 初始化内存 + en-US: Init - field: max type: 0 + i18n: + zh-CN: 最大内存 + en-US: Max - field: used type: 0 + i18n: + zh-CN: 已使用内存 + en-US: Used aliasFields: - Name - Usage->committed diff --git a/manager/src/main/resources/define/app-mariadb.yml b/manager/src/main/resources/define/app-mariadb.yml index d121cd30e54..9996b91a8cd 100644 --- a/manager/src/main/resources/define/app-mariadb.yml +++ b/manager/src/main/resources/define/app-mariadb.yml @@ -118,6 +118,9 @@ metrics: # 指标采集调度优先级(0->127)->(优先级高->低) 优先级低的指标会等优先级高的指标采集完成后才会被调度, 相同优先级的指标会并行调度采集 # 优先级为0的指标为可用性指标,即它会被首先调度,采集成功才会继续调度其它指标,采集失败则中断调度 priority: 0 + i18n: + zh-CN: 基础 信息 + en-US: Basic Info # collect metrics content # 具体监控指标列表 fields: @@ -126,12 +129,35 @@ metrics: - field: version type: 1 label: true + i18n: + zh-CN: 版本 + en-US: Version - field: port type: 1 + i18n: + zh-CN: 端口 + en-US: Port - field: datadir type: 1 + i18n: + zh-CN: 存储目录 + en-US: DataDir - field: max_connections type: 0 + i18n: + zh-CN: 最大连接数 + en-US: Max Connections + - field: thread_cache_size + type: 0 + i18n: + zh-CN: 连接池大小 + en-US: Thread Cache Size + - field: innodb_buffer_pool_size + type: 0 + unit: KB + i18n: + zh-CN: InnoDB缓冲池的大小 + en-US: Innodb Buffer Pool Size # (optional)metrics field alias name, it is used as an alias field to map and convert the collected data and metrics field # (非必须)监控指标别名，与上面的指标名映射。用于采集接口数据字段不直接是最终指标名称,需要此别名做映射转换 aliasFields: @@ -141,7 +167,10 @@ metrics: - port - datadir - max_connections - # mapping and conversion expressions, use these and aliasField above to calculate metrics value + - thread_cache_size + - table_open_cache + - innodb_buffer_pool_size + # (optional)mapping and conversion expressions, use these and aliasField above to calculate metrics value # (非必须)指标计算表达式,与上面的别名一起作用,计算出最终需要的指标值 # eg: cores=core1+core2, usage=usage, waitTime=allTime-runningTime calculates: @@ -149,6 +178,10 @@ metrics: - datadir=datadir - max_connections=max_connections - version=version+"_"+version_compile_os+"_"+version_compile_machine + # Convert the initial unit of the metric to the final unit + # 将指标的初始单位转化为最终的单位 + units: + - innodb_buffer_pool_size=B->KB # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk # 用于监控的协议, eg: sql, ssh, http, telnet, wmi, snmp, sdk protocol: jdbc @@ -180,59 +213,121 @@ metrics: # 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'; + sql: show global variables where Variable_name like 'version%' or Variable_name = 'max_connections' or Variable_name = 'datadir' or Variable_name = 'port' or Variable_name = 'thread_cache_size' or Variable_name = 'table_open_cache' or Variable_name = 'innodb_buffer_pool_size'; # JDBC url url: ^_^url^_^ - name: cache + # 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)->(优先级高->低) 优先级低的指标会等优先级高的指标采集完成后才会被调度, 相同优先级的指标会并行调度采集 + # 优先级为0的指标为可用性指标,即它会被首先调度,采集成功才会继续调度其它指标,采集失败则中断调度 priority: 1 + # collect metrics content + # 具体监控指标列表 + i18n: + zh-CN: 缓存 信息 + en-US: Cache Info fields: + # field-metric name, type-metric type(0-number,1-string), unit-metric unit('%','ms','MB'), label-whether it is a metrics label field + # field-指标名称, type-指标类型(0-number数字,1-string字符串), unit-指标单位('%','ms','MB'), label-是否是指标标签字段 - field: query_cache_hit_rate type: 0 unit: '%' + i18n: + zh-CN: 缓存命中率 + en-US: Query Cache Hit Rate - field: cache_hits type: 0 + i18n: + zh-CN: 缓存命中数 + en-US: Cache Hits - field: cache_inserts type: 0 + i18n: + zh-CN: 缓存插入数 + en-US: Cache Inserts - field: cache_free_blocks type: 0 + i18n: + zh-CN: 缓存空闲块数量 + en-US: Cache Free Blocks - field: cache_free_memory type: 0 unit: KB + i18n: + zh-CN: 空闲缓存大小 + en-US: Cache Free Memory + # (optional)metrics field alias name, it is used as an alias field to map and convert the collected data and metrics field + # (可选)监控指标别名, 做为中间字段与采集数据字段和指标字段映射转换 aliasFields: - Qcache_hits - Qcache_inserts - Qcache_free_blocks - Qcache_free_memory + # mapping and conversion expressions, use these and aliasField above to calculate metrics value + # (可选)指标映射转换计算表达式,与上面的别名一起作用,计算出最终需要的指标值 + # eg: cores=core1+core2, usage=usage, waitTime=allTime-runningTime calculates: - query_cache_hit_rate= (Qcache_hits + 1) / (Qcache_hits + Qcache_inserts + 1) * 100 - cache_hits=Qcache_hits - cache_inserts=Qcache_inserts - cache_free_blocks=Qcache_free_blocks - cache_free_memory=Qcache_free_memory + # Convert the initial unit of the metric to the final unit + # 将指标的初始单位转化为最终的单位 units: - cache_free_memory=B->KB + # 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: + # jdbc host + # jdbchost host: ^_^host^_^ + # port + # 端口 port: ^_^port^_^ + # platform name + # 平台名称 platform: mariadb + # username + # 用户名 username: ^_^username^_^ + # password + # 密码 password: ^_^password^_^ + # database name + # 数据库名称 database: ^_^database^_^ + # timeout unit：ms + # 超时时间 单位：ms timeout: ^_^timeout^_^ + # SQL Query Method：oneRow, multiRow, columns + # SQL查询方式： oneRow, multiRow, columns queryType: columns + # sql sql: show global status like 'QCache%'; url: ^_^url^_^ - name: performance priority: 1 + i18n: + zh-CN: 性能 信息 + en-US: Performance Info fields: - field: questions type: 0 + i18n: + zh-CN: 查询总数 + en-US: Questions - field: qps type: 0 - unit: 't/s' + i18n: + zh-CN: 每秒处理查询数 + en-US: Queries Per Second aliasFields: - uptime - questions @@ -242,7 +337,7 @@ metrics: jdbc: host: ^_^host^_^ port: ^_^port^_^ - platform: mysql + platform: mariadb username: ^_^username^_^ password: ^_^password^_^ database: ^_^database^_^ @@ -252,26 +347,41 @@ metrics: url: ^_^url^_^ - name: innodb - priority: 2 + priority: 1 + i18n: + zh-CN: Innodb 信息 + en-US: Innodb Info fields: - field: innodb_data_reads type: 0 unit: Times + i18n: + zh-CN: 磁盘读取次数 + en-US: Innodb Data Reads - field: innodb_data_writes type: 0 unit: Times + i18n: + zh-CN: 磁盘写入次数 + en-US: Innodb Data Writes - field: innodb_data_read type: 0 unit: KB + i18n: + zh-CN: 磁盘读取数据量 + en-US: Innodb Data Read - field: innodb_data_written type: 0 unit: KB + i18n: + zh-CN: 磁盘写入数据量 + en-US: Innodb Data Written - field: innodb_buffer_hit_rate type: 0 unit: '%' - - field: innodb_buffer_pool_size - type: 0 - unit: KB + i18n: + zh-CN: Innodb 缓存命中数 + en-US: Innodb Buffer Hit Rate aliasFields: - Innodb_data_reads - Innodb_data_writes @@ -280,59 +390,95 @@ metrics: - Innodb_buffer_pool_read_requests - Innodb_buffer_pool_read_ahead - Innodb_buffer_pool_reads - - Innodb_buffer_pool_size calculates: - innodb_buffer_hit_rate= (Innodb_buffer_pool_read_requests + 1) / (Innodb_buffer_pool_read_requests + Innodb_buffer_pool_read_ahead + Innodb_buffer_pool_reads + 1) * 100 - innodb_data_reads=Innodb_data_reads - innodb_data_writes=Innodb_data_writes - innodb_data_read=Innodb_data_read - innodb_data_written=Innodb_data_written - - innodb_buffer_pool_size=Innodb_buffer_pool_size units: - innodb_data_read=B->KB - innodb_data_written=B->KB - - innodb_buffer_pool_size=B->KB protocol: jdbc jdbc: host: ^_^host^_^ port: ^_^port^_^ - platform: mysql + platform: mariadb username: ^_^username^_^ password: ^_^password^_^ database: ^_^database^_^ timeout: ^_^timeout^_^ queryType: columns - sql: select variable_name, variable_value from information_schema.global_status WHERE Variable_name like 'innodb%' UNION select variable_name, variable_value from information_schema.global_variables where Variable_name = 'innodb_buffer_pool_size'; + sql: show global status where Variable_name like 'innodb%'; url: ^_^url^_^ - name: status priority: 1 + i18n: + zh-CN: 状态 信息 + en-US: Status Info fields: - field: uptime type: 0 unit: s + i18n: + zh-CN: 运行时间 + en-US: Uptime - field: com_select type: 0 + i18n: + zh-CN: 查询次数 + en-US: Com Select - field: com_insert type: 0 + i18n: + zh-CN: 插入次数 + en-US: Com Insert - field: com_update type: 0 + i18n: + zh-CN: 更新次数 + en-US: Com Update - field: com_delete type: 0 + i18n: + zh-CN: 删除次数 + en-US: Com Delete - field: com_commit type: 0 + i18n: + zh-CN: 事务提交次数 + en-US: Com Commit - field: com_rollback type: 0 + i18n: + zh-CN: 事务回滚次数 + en-US: Com Rollback - field: threads_created type: 0 + i18n: + zh-CN: 线程创建数 + en-US: Threads Created - field: threads_connected type: 0 + i18n: + zh-CN: 连接线程数 + en-US: Threads Connected - field: threads_cached type: 0 + i18n: + zh-CN: 缓存线程数 + en-US: Threads Cached - field: threads_running type: 0 + i18n: + zh-CN: 活动线程数 + en-US: Threads Running - field: qps type: 0 + i18n: + zh-CN: 每秒处理查询数 + en-US: Com Insert aliasFields: - uptime - com_select @@ -363,36 +509,75 @@ metrics: - name: handler priority: 2 + i18n: + zh-CN: 处理器 信息 + en-US: Handler Info fields: - field: handler_commit type: 0 + i18n: + zh-CN: 处理的事务提交数 + en-US: Handler Commit - field: handler_delete type: 0 + i18n: + zh-CN: 处理的删除操作数 + en-US: Handler Delete - field: handler_write type: 0 + i18n: + zh-CN: 处理的写入操作数 + en-US: Handler Write - field: handler_update type: 0 + i18n: + zh-CN: 处理的更新操作数 + en-US: Handler Update - field: handler_discover type: 0 + i18n: + zh-CN: 处理的发现操作数 + en-US: Handler Discover - field: handler_prepare type: 0 + i18n: + zh-CN: 处理的准备操作数 + en-US: Handler Prepare - field: handler_read_first type: 0 + i18n: + zh-CN: 读取首行操作数 + en-US: Handler Read First - field: handler_read_rnd type: 0 + i18n: + zh-CN: 随机读取操作数 + en-US: Handler Read RND - field: handler_read_next type: 0 + i18n: + zh-CN: 读取下一行操作数 + en-US: Handler Read Next - field: handler_read_rnd_next type: 0 + i18n: + zh-CN: 随机读取下一行操作数 + en-US: Handler Read RND Next - field: handler_read_key type: 0 + i18n: + zh-CN: 按索引键读取操作数 + en-US: Handler Read Key - field: handler_external_lock type: 0 + i18n: + zh-CN: 外部锁定操作数 + en-US: Handler External Key protocol: jdbc jdbc: host: ^_^host^_^ port: ^_^port^_^ - platform: mysql + platform: mariadb username: ^_^username^_^ password: ^_^password^_^ database: ^_^database^_^ @@ -403,136 +588,108 @@ metrics: - name: connection priority: 2 + i18n: + zh-CN: 连接 信息 + en-US: Connection Info fields: - - field: max_connections - type: 0 - field: connections type: 0 + i18n: + zh-CN: 当前连接数 + en-US: Connections - field: max_used_connections type: 0 + i18n: + zh-CN: 历史最大连接数 + en-US: Max Used Connections - field: aborted_connects type: 0 + i18n: + zh-CN: 失败连接数 + en-US: Aborted Connects - field: aborted_clients type: 0 + i18n: + zh-CN: 客户端中断数 + en-US: Aborted Clients protocol: jdbc jdbc: host: ^_^host^_^ port: ^_^port^_^ - platform: mysql + platform: mariadb username: ^_^username^_^ password: ^_^password^_^ database: ^_^database^_^ timeout: ^_^timeout^_^ queryType: columns - sql: select variable_name, variable_value from information_schema.global_status WHERE Variable_name like '%connect%' or Variable_name = 'Aborted_clients' UNION select variable_name, variable_value from information_schema.global_variables where Variable_name like '%connect%'; + sql: show global status; url: ^_^url^_^ - name: thread priority: 2 + i18n: + zh-CN: 线程 信息 + en-US: Thread Info fields: - field: threads_created type: 0 + i18n: + zh-CN: 创建线程数 + en-US: Threads Created - field: threads_connected type: 0 + i18n: + zh-CN: 连接线程数 + en-US: Threads Connected - field: threads_cached type: 0 + i18n: + zh-CN: 缓存线程数 + en-US: CThreads Cached - field: threads_running type: 0 - - field: thread_cache_size - type: 0 - protocol: jdbc - jdbc: - host: ^_^host^_^ - port: ^_^port^_^ - platform: mysql - username: ^_^username^_^ - password: ^_^password^_^ - database: ^_^database^_^ - timeout: ^_^timeout^_^ - queryType: columns - sql: select variable_name, variable_value from information_schema.global_status WHERE Variable_name like 'thread%' UNION select variable_name, variable_value from information_schema.global_variables where Variable_name = 'thread_cache_size'; - url: ^_^url^_^ - - - name: table_cache - priority: 2 - fields: - - field: table_open_cache - type: 0 - - field: table_open_cache_miss_ratio - type: 0 - unit: '%' - aliasFields: - - table_open_cache - - table_open_cache_misses - - table_open_cache_hits - calculates: - - table_open_cache_miss_ratio= table_open_cache_misses / table_open_cache * 100 - - table_open_cache=table_open_cache + i18n: + zh-CN: 运行线程数 + en-US: Threads Running protocol: jdbc jdbc: host: ^_^host^_^ port: ^_^port^_^ - platform: mysql - username: ^_^username^_^ - password: ^_^password^_^ - database: ^_^database^_^ - timeout: ^_^timeout^_^ - queryType: columns - sql: select variable_name, variable_value from information_schema.global_status WHERE Variable_name like 'table_%' UNION select variable_name, variable_value from information_schema.global_variables where Variable_name = 'table_open_cache'; - url: ^_^url^_^ - - - name: command - priority: 2 - fields: - - field: com_select - type: 0 - - field: com_insert - type: 0 - - field: com_update - type: 0 - - field: com_delete - type: 0 - - field: com_commit - type: 0 - - field: com_rollback - type: 0 - - field: com_stmt_execute - type: 0 - - field: com_admin_commands - type: 0 - - field: com_show_status - type: 0 - - field: com_show_slave_status - type: 0 - - field: com_set_option - type: 0 - protocol: jdbc - jdbc: - host: ^_^host^_^ - port: ^_^port^_^ - platform: mysql + platform: mariadb username: ^_^username^_^ password: ^_^password^_^ database: ^_^database^_^ timeout: ^_^timeout^_^ queryType: columns - sql: show global status where Variable_name like 'com_%'; + sql: show global status like 'thread%'; url: ^_^url^_^ - name: tmp priority: 2 + i18n: + zh-CN: 临时表 信息 + en-US: TMP Info fields: - field: created_tmp_tables type: 0 + i18n: + zh-CN: 创建的临时表数量 + en-US: Created TMP Tables - field: created_tmp_disk_tables type: 0 + i18n: + zh-CN: 创建的临时磁盘表数量 + en-US: Created TMP Disk Tables - field: created_tmp_files type: 0 + i18n: + zh-CN: 创建的临时文件数量 + en-US: Created TMP Files protocol: jdbc jdbc: host: ^_^host^_^ port: ^_^port^_^ - platform: mysql + platform: mariadb username: ^_^username^_^ password: ^_^password^_^ database: ^_^database^_^ @@ -543,22 +700,40 @@ metrics: - name: select_type priority: 2 + i18n: + zh-CN: 查询类型 信息 + en-US: Select Type Info fields: - field: select_full_join type: 0 + i18n: + zh-CN: 全表连接数 + en-US: Select Full Join - field: select_full_range_join type: 0 + i18n: + zh-CN: 带范围的全表连接数 + en-US: Select Full Range Join - field: select_range type: 0 + i18n: + zh-CN: 索引范围查询数 + en-US: Select Range - field: select_range_check type: 0 + i18n: + zh-CN: 索引范围内二次检查数 + en-US: Select Range Check - field: select_scan type: 0 + i18n: + zh-CN: 全表扫描查询数 + en-US: Select Scan protocol: jdbc jdbc: host: ^_^host^_^ port: ^_^port^_^ - platform: mysql + platform: mariadb username: ^_^username^_^ password: ^_^password^_^ database: ^_^database^_^ @@ -569,20 +744,35 @@ metrics: - name: sort priority: 2 + i18n: + zh-CN: 排序 信息 + en-US: Sort Info fields: - field: sort_rows type: 0 + i18n: + zh-CN: 排序总行数 + en-US: Sort Rows - field: sort_range type: 0 + i18n: + zh-CN: 范围条件排序次数 + en-US: Sort Range - field: sort_merge_passes type: 0 + i18n: + zh-CN: 合并排序段次数 + en-US: Sort Merge Passes - field: sort_scan type: 0 + i18n: + zh-CN: 全表扫描排序次数 + en-US: Sort Scan protocol: jdbc jdbc: host: ^_^host^_^ port: ^_^port^_^ - platform: mysql + platform: mariadb username: ^_^username^_^ password: ^_^password^_^ database: ^_^database^_^ @@ -593,16 +783,25 @@ metrics: - name: table_lock priority: 2 + i18n: + zh-CN: 表级锁 信息 + en-US: Table Lock Info fields: - field: table_locks_immediate type: 0 + i18n: + zh-CN: 立即获得表锁次数 + en-US: Table Locks Immediate - field: table_locks_waited type: 0 + i18n: + zh-CN: 须等待获取表锁次数 + en-US: Table Locks Waited protocol: jdbc jdbc: host: ^_^host^_^ port: ^_^port^_^ - platform: mysql + platform: mariadb username: ^_^username^_^ password: ^_^password^_^ database: ^_^database^_^ @@ -613,39 +812,66 @@ metrics: - name: process_state priority: 2 + i18n: + zh-CN: 进程状态 信息 + en-US: Process State Info fields: - field: state type: 1 label: true + i18n: + zh-CN: 进程状态 + en-US: State - field: num type: 0 + i18n: + zh-CN: 该状态进程数量 + en-US: Num protocol: jdbc jdbc: host: ^_^host^_^ port: ^_^port^_^ - platform: mysql + platform: mariadb username: ^_^username^_^ password: ^_^password^_^ database: ^_^database^_^ timeout: ^_^timeout^_^ queryType: multiRow - sql: select if(command = 'Sleep', 'Sleep', state) as state, count(*) as num from information_schema.PROCESSLIST group by state; + sql: select state, count(*) as num from information_schema.PROCESSLIST where state != '' group by state; url: ^_^url^_^ - name: slow_sql priority: 2 + i18n: + zh-CN: 慢查询 信息 + en-US: Slow Sql Info fields: - field: id type: 1 label: true + i18n: + zh-CN: ID + en-US: ID - field: sql_text type: 1 + i18n: + zh-CN: SQL 文本 + en-US: SQL Text - field: start_time type: 1 + i18n: + zh-CN: 开始时间 + en-US: Start Time - field: db type: 1 + i18n: + zh-CN: 数据库 + en-US: Database - field: query_time type: 3 + i18n: + zh-CN: 查询时间 + en-US: Query Time aliasFields: - sql_text - start_time @@ -657,7 +883,7 @@ metrics: jdbc: host: ^_^host^_^ port: ^_^port^_^ - platform: mysql + platform: mariadb username: ^_^username^_^ password: ^_^password^_^ database: ^_^database^_^ diff --git a/manager/src/main/resources/define/app-memcached.yml b/manager/src/main/resources/define/app-memcached.yml index 1ecec48039e..a8295687cea 100644 --- a/manager/src/main/resources/define/app-memcached.yml +++ b/manager/src/main/resources/define/app-memcached.yml @@ -72,6 +72,9 @@ metrics: # metrics - summary # 监控指标 - summary - name: server_info + i18n: + zh-CN: 系统信息 + en-US: Server 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)->(优先级高->低) 优先级低的指标会等优先级高的指标采集完成后才会被调度, 相同优先级的指标会并行调度采集 @@ -90,86 +93,86 @@ metrics: - field: pid type: 1 i18n: - zh-CN: memcache服务器进程ID - en-US: pid + zh-CN: 服务器进程ID + en-US: Pid - field: uptime type: 0 unit: s i18n: - zh-CN: 服务器已运行秒数 - en-US: uptime + zh-CN: 已运行秒数 + en-US: Uptime - field: version type: 1 i18n: - zh-CN: memcache版本 - en-US: version + zh-CN: 版本 + en-US: Version - field: curr_connections type: 0 i18n: zh-CN: 当前连接数量 - en-US: curr_connections + en-US: Curr Connections - field: auth_errors type: 0 i18n: zh-CN: 认证失败数目 - en-US: auth_errors + en-US: Auth Errors - field: threads type: 0 i18n: zh-CN: 当前线程数 - en-US: threads + en-US: Threads - field: item_size type: 0 unit: byte i18n: - zh-CN: item的大小 - en-US: item_size + zh-CN: Item 大小 + en-US: Item Size - field: item_count type: 0 i18n: - zh-CN: item的数量 - en-US: item_count + zh-CN: Item 数量 + en-US: Item Count - field: curr_items type: 0 i18n: zh-CN: 当前存储的数据总数 - en-US: curr_items + en-US: Curr Items - field: total_items type: 0 i18n: zh-CN: 启动以来存储的数据总数 - en-US: total_items + en-US: Total Items - field: bytes type: 0 unit: byte i18n: zh-CN: 当前存储占用的字节数 - en-US: bytes + en-US: Bytes - field: cmd_get type: 0 i18n: - zh-CN: get命令请求次数 - en-US: cmd_get + zh-CN: Get命令请求次数 + en-US: Cmd Get - field: cmd_set type: 0 i18n: - zh-CN: set命令请求次数 - en-US: cmd_set + zh-CN: Set命令请求次数 + en-US: Cmd Set - field: cmd_flush type: 0 i18n: - zh-CN: flush命令请求次数 - en-US: cmd_flush + zh-CN: Flush命令请求次数 + en-US: Cmd Flush - field: get_misses type: 0 i18n: - zh-CN: get命令未命中次数 - en-US: get_misses + zh-CN: Get命令未命中次数 + en-US: Get Misses - field: delete_misses type: 0 i18n: - zh-CN: delete命令未命中次数 - en-US: delete_misses + zh-CN: Delete命令未命中次数 + en-US: Delete Misses # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk # 采集协议, 目前支持sql, ssh, http, telnet, wmi, snmp, sdk protocol: memcached diff --git a/manager/src/main/resources/define/app-mysql.yml b/manager/src/main/resources/define/app-mysql.yml index d8fd575d4e9..5c896f11b21 100644 --- a/manager/src/main/resources/define/app-mysql.yml +++ b/manager/src/main/resources/define/app-mysql.yml @@ -261,7 +261,6 @@ metrics: # SQL查询方式： oneRow, multiRow, columns queryType: columns # sql - # sql sql: show global variables where Variable_name like 'version%' or Variable_name = 'max_connections' or Variable_name = 'datadir' or Variable_name = 'port' or Variable_name = 'thread_cache_size' or Variable_name = 'table_open_cache' or Variable_name = 'innodb_buffer_pool_size'; # JDBC url url: ^_^url^_^ diff --git a/manager/src/main/resources/define/app-nacos.yml b/manager/src/main/resources/define/app-nacos.yml index e0813b68afb..567fbd098c3 100644 --- a/manager/src/main/resources/define/app-nacos.yml +++ b/manager/src/main/resources/define/app-nacos.yml @@ -75,6 +75,9 @@ params: # 采集指标配置列表 metrics: - name: system_cpu_usage + i18n: + zh-CN: CPU 使用率 + en-US: CPU Usage # 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)->(优先级高->低) 优先级低的指标会等优先级高的指标采集完成后才会被调度, 相同优先级的指标会并行调度采集 @@ -84,6 +87,9 @@ metrics: - field: usage type: 0 unit: '%' + i18n: + zh-CN: 使用率 + en-US: Usage aliasFields: - value calculates: @@ -108,16 +114,28 @@ metrics: parseType: prometheus - name: jvm_memory_used_bytes + i18n: + zh-CN: JVM 内存使用 + en-US: JVM Memory Used priority: 1 fields: - field: area type: 1 + i18n: + zh-CN: 区域 + en-US: Area - field: id type: 1 label: true + i18n: + zh-CN: ID + en-US: ID - field: value type: 0 unit: MB + i18n: + zh-CN: 大小 + en-US: Size units: - value=B->MB # 监控采集使用协议 eg: sql, ssh, http, telnet, wmi, snmp, sdk @@ -135,14 +153,26 @@ metrics: parseType: prometheus - name: nacos_monitor + i18n: + zh-CN: Nacos 详情 + en-US: Nacos Monitor priority: 1 fields: - field: module type: 1 + i18n: + zh-CN: 模块 + en-US: Module - field: name type: 1 + i18n: + zh-CN: 指标名称 + en-US: Metric Name - field: value type: 0 + i18n: + zh-CN: 大小 + en-US: Value # 监控采集使用协议 eg: sql, ssh, http, telnet, wmi, snmp, sdk protocol: http # 当protocol为http协议时具体的采集配置 diff --git a/manager/src/main/resources/define/app-nginx.yml b/manager/src/main/resources/define/app-nginx.yml index c27b5b4e38b..ad625f8dd02 100644 --- a/manager/src/main/resources/define/app-nginx.yml +++ b/manager/src/main/resources/define/app-nginx.yml @@ -94,6 +94,9 @@ metrics: # metrics - available # 监控指标 - available - name: available + i18n: + zh-CN: 可用性 + en-US: Available # 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)->(优先级高->低) 优先级低的指标会等优先级高的指标采集完成后才会被调度, 相同优先级的指标会并行调度采集 @@ -107,6 +110,9 @@ metrics: - 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 # 采集协议,目前支持sql,ssh,http,telnet,wmi,snmp,sdk protocol: nginx @@ -125,7 +131,7 @@ metrics: - name: nginx_status i18n: - zh-CN: nginx 状态信息 + zh-CN: Nginx 状态信息 en-US: Nginx Status # 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 diff --git a/manager/src/main/resources/define/app-ntp.yml b/manager/src/main/resources/define/app-ntp.yml index e9e111d2ad6..2cf686e4096 100644 --- a/manager/src/main/resources/define/app-ntp.yml +++ b/manager/src/main/resources/define/app-ntp.yml @@ -95,49 +95,49 @@ metrics: unit: ms i18n: zh-CN: 时间戳 - en-US: time + en-US: Timestamp - field: date type: 1 i18n: zh-CN: 时间 - en-US: date + en-US: Date - field: offset type: 0 unit: ms i18n: zh-CN: 偏移量 - en-US: offset + en-US: Offset - field: delay type: 0 unit: ms i18n: zh-CN: 延迟 - en-US: delay + en-US: Delay - field: version type: 0 i18n: zh-CN: 版本号 - en-US: version + en-US: Version - field: mode type: 0 i18n: zh-CN: 模式 - en-US: mode + en-US: Mode - field: stratum type: 0 i18n: zh-CN: 层级 - en-US: stratum + en-US: Stratum - field: referenceId type: 1 i18n: zh-CN: 参考ID - en-US: referenceId + en-US: ReferenceId - field: precision type: 0 i18n: zh-CN: 精度 - en-US: precision + en-US: Precision # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk # 采集协议, 目前支持sql, ssh, http, telnet, wmi, snmp, sdk diff --git a/manager/src/main/resources/define/app-pop3.yml b/manager/src/main/resources/define/app-pop3.yml index 37e4935929a..c12289b7395 100644 --- a/manager/src/main/resources/define/app-pop3.yml +++ b/manager/src/main/resources/define/app-pop3.yml @@ -135,7 +135,7 @@ metrics: # 监控指标 - available - name: available i18n: - zh-CN: 通用指标 + zh-CN: 可用性 en-US: Available # 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 @@ -180,7 +180,7 @@ metrics: - name: email_status i18n: - zh-CN: 邮箱 状态信息 + zh-CN: 邮箱状态信息 en-US: Email Status # 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 diff --git a/manager/src/main/resources/define/app-smtp.yml b/manager/src/main/resources/define/app-smtp.yml index 0303a479c06..4f4df3409df 100644 --- a/manager/src/main/resources/define/app-smtp.yml +++ b/manager/src/main/resources/define/app-smtp.yml @@ -128,8 +128,8 @@ metrics: - field: smtpBanner type: 1 i18n: - zh-CN: SMTP的Banner - en-US: SMTPBanner + zh-CN: SMTP Banner + en-US: SMTP Banner - field: heloInfo type: 1 i18n: diff --git a/manager/src/main/resources/define/app-spark.yml b/manager/src/main/resources/define/app-spark.yml index 4b88e15eb3d..b7a987a862e 100644 --- a/manager/src/main/resources/define/app-spark.yml +++ b/manager/src/main/resources/define/app-spark.yml @@ -133,6 +133,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)->(优先级高->低) 优先级低的指标会等优先级高的指标采集完成后才会被调度, 相同优先级的指标会并行调度采集 @@ -145,13 +148,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 # 用于监控的协议，例: sql, ssh, http, telnet, wmi, snmp, sdk protocol: jmx @@ -172,22 +187,40 @@ metrics: - name: memory_pool priority: 1 + i18n: + zh-CN: 内存池 + en-US: Memory Pool 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 @@ -224,16 +257,31 @@ metrics: url: ^_^url^_^ - name: code_cache - priority: 5 + priority: 2 + i18n: + zh-CN: 本地代码缓冲区 + en-US: Code Cache fields: - field: committed type: 0 + i18n: + zh-CN: 已分配内存 + en-US: Committed - field: init type: 0 + i18n: + zh-CN: 初始化内存 + en-US: Init - field: max type: 0 + i18n: + zh-CN: 最大内存 + en-US: Max - field: used type: 0 + i18n: + zh-CN: 已使用内存 + en-US: Used aliasFields: - Usage->committed - Usage->init @@ -258,7 +306,10 @@ metrics: url: ^_^url^_^ - name: class_loading - priority: 6 + priority: 3 + i18n: + zh-CN: 类加载信息 + en-US: Class Loading # collect metrics content # 具体监控指标列表 fields: @@ -266,10 +317,19 @@ metrics: # field-指标名称, type-指标类型(0-number数字,1-string字符串), unit-指标单位('%','ms','MB'), label-是否是指标标签字段 - 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^_^ @@ -280,7 +340,10 @@ metrics: url: ^_^url^_^ - name: thread - priority: 7 + priority: 4 + i18n: + zh-CN: 线程信息 + en-US: Thread # collect metrics content # 具体监控指标列表 fields: @@ -288,18 +351,36 @@ metrics: # field-指标名称, type-指标类型(0-number数字,1-string字符串), unit-指标单位('%','ms','MB'), label-是否是指标标签字段 - 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-tomcat.yml b/manager/src/main/resources/define/app-tomcat.yml index 61e0294f46b..40fd417ba0f 100644 --- a/manager/src/main/resources/define/app-tomcat.yml +++ b/manager/src/main/resources/define/app-tomcat.yml @@ -133,6 +133,9 @@ metrics: # metrics - server # 监控指标 - server - name: server + i18n: + zh-CN: Tomcat 信息 + en-US: Tomcat Server # 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)->(优先级高->低) 优先级低的指标会等优先级高的指标采集完成后才会被调度, 相同优先级的指标会并行调度采集 @@ -145,14 +148,29 @@ metrics: # field-指标名称, type-指标类型(0-number数字,1-string字符串), unit-指标单位('%','ms','MB'), label-是否是指标标签字段 - field: serverInfo type: 1 + i18n: + zh-CN: 服务信息 + en-US: Server Info - field: serverNumber type: 1 + i18n: + zh-CN: 服务版本 + en-US: Server Number - field: serverBuilt type: 1 + i18n: + zh-CN: Server Built + en-US: Server Built - field: port type: 1 + i18n: + zh-CN: 端口 + en-US: Port - field: address type: 1 + i18n: + zh-CN: 地址 + en-US: Address # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk protocol: jmx # the config content when protocol is http @@ -172,22 +190,45 @@ metrics: - name: memory_pool priority: 1 + i18n: + zh-CN: 内存池 + en-US: Memory Pool 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 + - max=B->MB + - used=B->MB # (optional)metrics field alias name, it is used as an alias field to map and convert the collected data and metrics field # (可选)监控指标别名, 做为中间字段与采集数据字段和指标字段映射转换 aliasFields: @@ -196,11 +237,6 @@ metrics: - Usage->init - Usage->max - Usage->used - units: - - committed=B->MB - - init=B->MB - - max=B->MB - - used=B->MB # mapping and conversion expressions, use these and aliasField above to calculate metrics value # (可选)指标映射转换计算表达式,与上面的别名一起作用,计算出最终需要的指标值 # eg: cores=core1+core2, usage=usage, waitTime=allTime-runningTime @@ -212,7 +248,11 @@ metrics: - used=Usage->used protocol: jmx jmx: + # host: ipv4 ipv6 domain + # 主机host: ipv4 ipv6 域名 host: ^_^host^_^ + # port + # 端口 port: ^_^port^_^ username: ^_^username^_^ password: ^_^password^_^ @@ -220,14 +260,30 @@ metrics: url: ^_^url^_^ - name: class_loading - priority: 1 + priority: 2 + i18n: + zh-CN: 类加载信息 + en-US: Class Loading + # collect metrics content + # 具体监控指标列表 fields: + # field-metric name, type-metric type(0-number,1-string), unit-metric unit('%','ms','MB'), label-whether it is a metrics label field + # field-指标名称, type-指标类型(0-number数字,1-string字符串), unit-指标单位('%','ms','MB'), label-是否是指标标签字段 - 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^_^ @@ -238,22 +294,47 @@ metrics: url: ^_^url^_^ - name: thread - priority: 1 + priority: 3 + i18n: + zh-CN: 线程信息 + en-US: Thread + # collect metrics content + # 具体监控指标列表 fields: + # field-metric name, type-metric type(0-number,1-string), unit-metric unit('%','ms','MB'), label-whether it is a metrics label field + # field-指标名称, type-指标类型(0-number数字,1-string字符串), unit-指标单位('%','ms','MB'), label-是否是指标标签字段 - 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 @@ -267,43 +348,94 @@ metrics: url: ^_^url^_^ - name: application - priority: 1 + i18n: + zh-CN: 应用信息 + en-US: Application + priority: 4 fields: - field: name type: 1 label: true + i18n: + zh-CN: 名称 + en-US: Name - field: acceptCount type: 0 + i18n: + zh-CN: 接收请求数 + en-US: Accept Count - field: acceptorThreadCount type: 0 + i18n: + zh-CN: 接收处理线程数 + en-US: Acceptor Thread Count - field: acceptorThreadPriority type : 0 + i18n: + zh-CN: 接收线程级别 + en-US: Acceptor Thread Priority - field: connectionTimeout type: 0 unit: ms + i18n: + zh-CN: 链接超时时间 + en-US: Connection Timeout - field: currentThreadCount type: 0 + i18n: + zh-CN: 当前线程数 + en-US: Current Thread Count - field: currentThreadsBusy type: 0 + i18n: + zh-CN: 繁忙线程数 + en-US: Current Threads Busy - field: keepAliveCount type: 0 + i18n: + zh-CN: 心跳保持链接数量 + en-US: Keep Alive Count - field: keepAliveTimeout type: 0 unit: ms + i18n: + zh-CN: 心跳超时时间 + en-US: Keep Alive Timeout - field: maxConnections type: 0 + i18n: + zh-CN: 最大链接数 + en-US: Max Connections - field: maxKeepAliveRequests type: 0 + i18n: + zh-CN: 最大链接保持请求 + en-US: Max KeepAlive Requests - field: maxThreads type: 0 + i18n: + zh-CN: 最大线程数 + en-US: Max Threads - field: minSpareThreads type: 0 + i18n: + zh-CN: 最小备用线程数 + en-US: Min Spare Threads - field: pollerThreadCount type: 0 + i18n: + zh-CN: 轮询线程数 + en-US: Poller Thread Count - field: pollerThreadPriority type: 0 + i18n: + zh-CN: 轮询线程级别 + en-US: Poller Thread Priority - field: running type: 1 + i18n: + zh-CN: 运行中 + en-US: Running protocol: jmx jmx: host: ^_^host^_^ diff --git a/manager/src/main/resources/define/app-tplink_switch.yml b/manager/src/main/resources/define/app-tplink_switch.yml index 1fdb71888f9..30e0bc0ff6a 100644 --- a/manager/src/main/resources/define/app-tplink_switch.yml +++ b/manager/src/main/resources/define/app-tplink_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 @@ -295,10 +316,15 @@ metrics: host: ^_^host^_^ # server port port: ^_^port^_^ + # snmp username username: ^_^username^_^ + # snmp authPassphrase authPassphrase: ^_^authPassphrase^_^ + # snmp privPassphrase privPassphrase: ^_^privPassphrase^_^ + # snmp privPasswordEncryption privPasswordEncryption: ^_^privPasswordEncryption^_^ + # snmp authPasswordEncryption authPasswordEncryption: ^_^authPasswordEncryption^_^ # contextName contextName: ^_^contextName^_^ @@ -320,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: @@ -377,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-websocket.yml b/manager/src/main/resources/define/app-websocket.yml index 396c89c745d..4a3e3b9f830 100644 --- a/manager/src/main/resources/define/app-websocket.yml +++ b/manager/src/main/resources/define/app-websocket.yml @@ -90,28 +90,29 @@ metrics: - field: httpVersion type: 1 i18n: - zh-CN: http版本 - en-US: httpVersion + zh-CN: Http 版本 + en-US: Http Version - field: responseCode type: 1 i18n: zh-CN: 响应状态码 - en-US: responseCode + en-US: Response Code - field: statusMessage type: 1 i18n: zh-CN: 状态消息 - en-US: statusMessage + en-US: Status Message - field: connection type: 1 i18n: - zh-CN: 是否支持升级(不存在表示是普通http请求,存在表示支持升级) - en-US: connection + # 是否支持升级(不存在表示是普通http请求,存在表示支持升级) + zh-CN: 是否升级 + en-US: Connection - field: upgrade type: 1 i18n: zh-CN: 升级(协议) - en-US: upgrade + en-US: Upgrade # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk # 采集协议, 目前支持sql, ssh, http, telnet, wmi, snmp, sdk