Skip to content

Commit b58734b

Browse files
authored
Merge pull request #3174 from emqx/release-5.9
Sync r5.9 into r510
2 parents f415a65 + 2a45d7a commit b58734b

File tree

3 files changed

+32
-44
lines changed

3 files changed

+32
-44
lines changed

dir.yaml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -440,25 +440,25 @@
440440
- data-integration/rule-sql-builtin-functions
441441
- data-integration/rule-sql-jq
442442
# - data-integration/rule-sql-user-defined-function
443-
- title_en: Smart Data Hub
444-
title_cn: 数据智能中心
445-
title_ja: スマートデータハブ
446-
path: data-integration/smart-data-hub
443+
444+
- title_en: Smart Data Hub
445+
title_cn: 数据智能中心
446+
title_ja: スマートデータハブ
447+
path: data-integration/smart-data-hub
448+
collapsed: true
449+
children:
450+
- title_en: Schema Registry
451+
title_cn: Schema Registry
452+
title_ja: スキーマレジストリ
453+
path: data-integration/schema-registry
447454
collapsed: true
448455
children:
449-
- title_en: Schema Registry
450-
title_cn: Schema Registry
451-
title_ja: スキーマレジストリ
452-
path: data-integration/schema-registry
453-
collapsed: true
454-
children:
455-
- data-integration/schema-registry-example-avro
456-
- data-integration/schema-registry-example-protobuf
457-
- data-integration/schema-registry-example-external-http
458-
- data-integration/sparkplug
459-
- data-integration/schema-validation
460-
- data-integration/message-transformation
461-
456+
- data-integration/schema-registry-example-avro
457+
- data-integration/schema-registry-example-protobuf
458+
- data-integration/schema-registry-example-external-http
459+
- data-integration/sparkplug
460+
- data-integration/schema-validation
461+
- data-integration/message-transformation
462462
- title_en: Flow Designer
463463
title_cn: Flow 设计器
464464
title_ja: Flow デザイナー

en_US/observability/alarms.md

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,19 @@ The levels are defined from development perspectives and are only for recommenda
2222

2323
:::
2424

25-
| **Alarm** | Level | Description | **Details** | **Threshold** |
26-
| :------------------------ | -------- | :----------------------------------------------------------- | :------------------------------------------- | :----------------------------------------------------------- |
27-
| high_system_memory_usage | Warning | System memory usage is too high | "System memory usage is higher than ~p%" | `os_mon.sysmem_high_watermark = 70%` |
28-
| high_process_memory_usage | Warning | Single Erlang process memory usage is too high (percentage of system memory usage) | Process memory usage is higher than ~p% | `os_mon.procmem_high_watermark = 5%` |
29-
| high_cpu_usage | Warning | CPU usage is too high | ~p% cpu usage | `os_mon.cpu_high_watermark = 80%` `os_mon.cpu_low_watermark = 60%` |
30-
| too_many_processes | Warning | Too many processes | ~p% process usage | `vm_mon.process_high_watermark = 80%` `vm_mon.process_low_watermark = 60%` |
31-
| license_quota | Warning | License exceeds quota | License: the number of connections exceeds % | `license.connection_high_watermark_alarm = 80%` `license.connection_low_watermark_alarm = 75%` |
32-
| license_expiry | Critical | License expired | License will be expired at % | - |
33-
| partition | Critical | Partition occurs at node | Partition occurs at node ~s | - |
34-
| resource | Critical | Resource is disconnected | Resource ~s(~s) is down | - |
35-
| conn_congestion | Critical | Connection process congestion | Connection congested | - |
25+
| **Alarm** | Level | Description | **Details** | **Threshold** |
26+
| :---------------------------------- | -------- | :----------------------------------------------------------- | :------------------------------------------- | :----------------------------------------------------------- |
27+
| high_system_memory_usage | Warning | System memory usage is too high | "System memory usage is higher than ~p%" | `os_mon.sysmem_high_watermark = 70%` |
28+
| high_process_memory_usage | Warning | Single Erlang process memory usage is too high (percentage of system memory usage) | Process memory usage is higher than ~p% | `os_mon.procmem_high_watermark = 5%` |
29+
| high_cpu_usage | Warning | CPU usage is too high | ~p% cpu usage | `os_mon.cpu_high_watermark = 80%` `os_mon.cpu_low_watermark = 60%` |
30+
| too_many_processes | Warning | Too many processes | ~p% process usage | `vm_mon.process_high_watermark = 80%` `vm_mon.process_low_watermark = 60%` |
31+
| license_quota | Warning | License exceeds quota | License: the number of connections exceeds % | `license.connection_high_watermark_alarm = 80%` `license.connection_low_watermark_alarm = 75%` |
32+
| license_expiry | Critical | License expired | License will be expired at % | - |
33+
| mnesia_transaction_manager_overload | Warning | mnesia overloaded; mailbox size: N | mailbox size = N | `sysmon.mnesia_tm_mailbox_threshold = 500` |
34+
| broker_pool_overload | Warning | broker pool overloaded; mailbox size: N | mailbox size = N | `sysmon.broker_pool_mailbox_threshold = 500` |
35+
| partition | Critical | Partition occurs at node | Partition occurs at node ~s | - |
36+
| resource | Critical | Resource is disconnected | Resource ~s(~s) is down | - |
37+
| conn_congestion | Critical | Connection process congestion | Connection congested | - |
3638

3739
## Get Alarms
3840

zh_CN/observability/alarms.md

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,34 +20,20 @@ EMQX 提供内置的监控和告警功能,用于监视内部状态变化,如
2020

2121
:::
2222

23-
**EMQX 开源版告警列表:**
24-
2523
| **告警** | 级别 | 描述 | **详情** | **阈值** |
2624
| ----------------------------------- | ---- | -------------------------------------------------- | ----------------------- | ------------------------------------------------------------ |
2725
| high_system_memory_usage | 警告 | 系统内存使用过高 | "系统内存使用高于 ~p%" | `os_mon.sysmem_high_watermark = 70%` |
2826
| high_process_memory_usage | 警告 | 单个 Erlang 进程内存使用过高(占系统内存的百分比) | 进程内存使用高于 ~p% | `os_mon.procmem_high_watermark = 5%` |
2927
| high_cpu_usage | 警告 | CPU 使用率过高 | ~p% CPU 使用率 | `os_mon.cpu_high_watermark = 80%` `os_mon.cpu_low_watermark = 60%` |
3028
| too_many_processes | 警告 | 进程过多 | ~p% 进程使用率 | `vm_mon.process_high_watermark = 80%` `vm_mon.process_low_watermark = 60%` |
29+
| license_quota | 警告 | License 超过配额 | License:连接数超过 % | `license.connection_high_watermark_alarm = 80%` `license.connection_low_watermark_alarm = 75%` |
30+
| license_expiry | 严重 | License 过期 | License 将于 % 过期 | - |
3131
| mnesia_transaction_manager_overload | 警告 | mnesia 事务管理器过载;邮箱消息数量:N | mailbox size = N | `sysmon.mnesia_tm_mailbox_threshold = 500` |
3232
| broker_pool_overload | 警告 | broker 消息处理池过载;邮箱消息数量:N | mailbox size = N | `sysmon.broker_pool_mailbox_threshold = 500` |
3333
| partition | 严重 | 节点发生分区 | 节点发生分区 ~s | - |
3434
| resource | 严重 | 资源断开连接 | 资源 ~s(~s)已断开连接 | - |
3535
| conn_congestion | 严重 | 连接过程拥塞 | 连接拥塞 | - |
3636

37-
**EMQX 企业版告警列表:**
38-
39-
| **告警** | 级别 | 描述 | **详情** | **阈值** |
40-
| ------------------------- | ---- | -------------------------------------------------- | ----------------------- | ------------------------------------------------------------ |
41-
| high_system_memory_usage | 警告 | 系统内存使用过高 | "系统内存使用高于 ~p%" | `os_mon.sysmem_high_watermark = 70%` |
42-
| high_process_memory_usage | 警告 | 单个 Erlang 进程内存使用过高(占系统内存的百分比) | 进程内存使用高于 ~p% | `os_mon.procmem_high_watermark = 5%` |
43-
| high_cpu_usage | 警告 | CPU 使用率过高 | ~p% CPU 使用率 | `os_mon.cpu_high_watermark = 80%` `os_mon.cpu_low_watermark = 60%` |
44-
| too_many_processes | 警告 | 进程过多 | ~p% 进程使用率 | `vm_mon.process_high_watermark = 80%` `vm_mon.process_low_watermark = 60%` |
45-
| license_quota | 警告 | License 超过配额 | License:连接数超过 % | `license.connection_high_watermark_alarm = 80%` `license.connection_low_watermark_alarm = 75%` |
46-
| license_expiry | 严重 | License 过期 | License 将于 % 过期 | - |
47-
| partition | 严重 | 节点发生分区 | 节点发生分区 ~s | - |
48-
| resource | 严重 | 资源断开连接 | 资源 ~s(~s)已断开连接 | - |
49-
| conn_congestion | 严重 | 连接过程拥塞 | 连接拥塞 | - |
50-
5137
## 获取告警信息
5238

5339
EMQX 提供多种方式获取告警并查看详细信息。其中一种方式是通过 EMQX Dashboard 查看告警,您可以在此查看已触发的活动或历史告警列表,然而 Dashboard 仅作为一个便于查看告警概览信息的中心。

0 commit comments

Comments
 (0)