diff --git a/apps/emqx_rule_engine/src/emqx_rule_runtime.erl b/apps/emqx_rule_engine/src/emqx_rule_runtime.erl index 3729d9096..2c2bfad4f 100644 --- a/apps/emqx_rule_engine/src/emqx_rule_runtime.erl +++ b/apps/emqx_rule_engine/src/emqx_rule_runtime.erl @@ -509,10 +509,10 @@ inc_action_metrics(ok, RuleId) -> inc_action_metrics({ok, _}, RuleId) -> emqx_metrics_worker:inc(rule_metrics, RuleId, 'actions.success'); inc_action_metrics({resource_down, _}, RuleId) -> - emqx_metrics_worker:inc(rule_metrics, RuleId, 'actions.out_of_service'), + emqx_metrics_worker:inc(rule_metrics, RuleId, 'actions.failed.out_of_service'), emqx_metrics_worker:inc(rule_metrics, RuleId, 'actions.failed.unknown'); inc_action_metrics(?RESOURCE_ERROR_M(R, _), RuleId) when ?IS_RES_DOWN(R) -> - emqx_metrics_worker:inc(rule_metrics, RuleId, 'actions.out_of_service'), + emqx_metrics_worker:inc(rule_metrics, RuleId, 'actions.failed.out_of_service'), emqx_metrics_worker:inc(rule_metrics, RuleId, 'actions.failed.unknown'); inc_action_metrics(_, RuleId) -> emqx_metrics_worker:inc(rule_metrics, RuleId, 'actions.failed'), diff --git a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_mysql.erl b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_mysql.erl index cb7390760..e78d77fdb 100644 --- a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_mysql.erl +++ b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_mysql.erl @@ -60,6 +60,7 @@ values(post) -> enable_batch => false, batch_size => ?DEFAULT_BATCH_SIZE, batch_time => ?DEFAULT_BATCH_TIME, + query_mode => sync, enable_queue => false, max_queue_bytes => ?DEFAULT_QUEUE_SIZE } @@ -120,7 +121,7 @@ desc(_) -> %% internal is_hidden_opts(Field) -> lists:member(Field, [ - query_mode, async_inflight_window + async_inflight_window ]). type_field() ->