From 0c5e95e2d0affd3f7ccda11f2bd3256de984d0a6 Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Tue, 7 Mar 2023 10:37:59 +0800
Subject: [PATCH 1/2] chore: refine change log for few PRs

PR#10032, PR#10044, PR#10054, PR#10056
---
 changes/ce/fix-10032.en.md | 2 +-
 changes/ce/fix-10032.zh.md | 2 +-
 changes/ce/fix-10044.en.md | 2 +-
 changes/ce/fix-10044.zh.md | 2 +-
 changes/ce/fix-10054.en.md | 1 +
 changes/ce/fix-10054.zh.md | 1 +
 6 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 changes/ce/fix-10054.en.md
 create mode 100644 changes/ce/fix-10054.zh.md

diff --git a/changes/ce/fix-10032.en.md b/changes/ce/fix-10032.en.md
index 1db8f9836..bd730c96c 100644
--- a/changes/ce/fix-10032.en.md
+++ b/changes/ce/fix-10032.en.md
@@ -1 +1 @@
-When the resource manager is busy trying to establish a connection with the remote, the resource might yet lack any metrics information. Prior to this fix, the `bridges/` API handler crashed in such circumstances.
+When resources on some nodes in the cluster are still in the 'initializing/connecting' state, the `bridges/` API will crash due to missing Metrics information for those resources. This fix will ignore resources that do not have Metrics information.
diff --git a/changes/ce/fix-10032.zh.md b/changes/ce/fix-10032.zh.md
index f582066ac..fc1fb38b6 100644
--- a/changes/ce/fix-10032.zh.md
+++ b/changes/ce/fix-10032.zh.md
@@ -1 +1 @@
-当资源管理器忙于尝试与远程建立连接时，资源可能还缺少任何度量信息。 在此修复之前，`bridges/' API 处理程序在这种情况下崩溃。
+当集群中某些节点上的资源仍处于 '初始化/连接中' 状态时，`bridges/` API 将由于缺少这些资源的 Metrics 信息而崩溃。此修复后将忽略没有 Metrics 信息的资源。
diff --git a/changes/ce/fix-10044.en.md b/changes/ce/fix-10044.en.md
index 4837d8ecc..00668c5cb 100644
--- a/changes/ce/fix-10044.en.md
+++ b/changes/ce/fix-10044.en.md
@@ -1 +1 @@
-Fix node information formatter for stopped nodes in the cluster.
+Fix node information formatter for stopped nodes in the cluster. The bug was introduced by v5.0.18.
diff --git a/changes/ce/fix-10044.zh.md b/changes/ce/fix-10044.zh.md
index 9979e0fc7..72759d707 100644
--- a/changes/ce/fix-10044.zh.md
+++ b/changes/ce/fix-10044.zh.md
@@ -1 +1 @@
-修复 v5.0.18 引入的一个节点信息序列化时发生的错误。
+修复集群中已停止节点的信息序列化问题，该错误由 v5.0.18 引入。
diff --git a/changes/ce/fix-10054.en.md b/changes/ce/fix-10054.en.md
new file mode 100644
index 000000000..5efa73314
--- /dev/null
+++ b/changes/ce/fix-10054.en.md
@@ -0,0 +1 @@
+Fix the problem that the obfuscated password is used when using the `/bridges_probe` API to test the connection in Data-Bridge.
diff --git a/changes/ce/fix-10054.zh.md b/changes/ce/fix-10054.zh.md
new file mode 100644
index 000000000..45a80dc45
--- /dev/null
+++ b/changes/ce/fix-10054.zh.md
@@ -0,0 +1 @@
+修复数据桥接中使用 `/bridges_probe` API 进行测试连接时密码被混淆的问题。

From 842cb7fadcb596de7f7e451d87aca8f67e6b83f1 Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Thu, 9 Mar 2023 01:42:34 +0800
Subject: [PATCH 2/2] fix: debug log for rulesql parse failed

See also: PR#10059.
The other error logs will be printed in `emqx_rule_runtime:apply_rule/3`
---
 apps/emqx_rule_engine/src/emqx_rule_sqltester.erl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/emqx_rule_engine/src/emqx_rule_sqltester.erl b/apps/emqx_rule_engine/src/emqx_rule_sqltester.erl
index ff966b912..e97c45b35 100644
--- a/apps/emqx_rule_engine/src/emqx_rule_sqltester.erl
+++ b/apps/emqx_rule_engine/src/emqx_rule_sqltester.erl
@@ -40,6 +40,10 @@ test(#{sql := Sql, context := Context}) ->
                     test_rule(Sql, Select, Context, EventTopics)
             end;
         {error, Reason} ->
+            ?SLOG(debug, #{
+                msg => "rulesql_parse_error",
+                detail => Reason
+            }),
             {error, Reason}
     end.