From 95060302fd3d6f07dc4f0e48fd2072b37937f87a Mon Sep 17 00:00:00 2001 From: zhongwencool Date: Tue, 26 Sep 2023 00:28:47 +0800 Subject: [PATCH 1/3] fix: don't need to change audit log's level --- apps/emqx_conf/src/emqx_conf_schema.erl | 18 ++++++++++++++---- apps/emqx_ctl/src/emqx_ctl.erl | 2 -- .../src/emqx_dashboard_audit.erl | 3 +-- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/apps/emqx_conf/src/emqx_conf_schema.erl b/apps/emqx_conf/src/emqx_conf_schema.erl index f1bfc3d31..d1fc6c546 100644 --- a/apps/emqx_conf/src/emqx_conf_schema.erl +++ b/apps/emqx_conf/src/emqx_conf_schema.erl @@ -1014,6 +1014,15 @@ fields("log_file_handler") -> ] ++ log_handler_common_confs(file, #{}); fields("log_audit_handler") -> [ + {"level", + sc( + log_level(), + #{ + default => info, + desc => ?DESC("audit_handler_level"), + importance => ?IMPORTANCE_HIDDEN + } + )}, {"path", sc( file(), @@ -1048,11 +1057,12 @@ fields("log_audit_handler") -> ] ++ %% Only support json lists:keydelete( - "formatter", + "level", 1, - log_handler_common_confs( - file, - #{level => info, level_desc => "audit_handler_level"} + lists:keydelete( + "formatter", + 1, + log_handler_common_confs(file, #{}) ) ); fields("log_overload_kill") -> diff --git a/apps/emqx_ctl/src/emqx_ctl.erl b/apps/emqx_ctl/src/emqx_ctl.erl index 4947a9715..4c077c56d 100644 --- a/apps/emqx_ctl/src/emqx_ctl.erl +++ b/apps/emqx_ctl/src/emqx_ctl.erl @@ -350,8 +350,6 @@ audit_log(Level, From, Log) -> -define(TOO_SLOW, 3000). -audit_level(ok, Duration) when Duration >= ?TOO_SLOW -> warning; -audit_level({ok, _}, Duration) when Duration >= ?TOO_SLOW -> warning; audit_level(ok, _Duration) -> info; audit_level({ok, _}, _Duration) -> info; audit_level(_, _) -> error. diff --git a/apps/emqx_dashboard/src/emqx_dashboard_audit.erl b/apps/emqx_dashboard/src/emqx_dashboard_audit.erl index e9c119512..5fdc68f70 100644 --- a/apps/emqx_dashboard/src/emqx_dashboard_audit.erl +++ b/apps/emqx_dashboard/src/emqx_dashboard_audit.erl @@ -43,8 +43,7 @@ from(jwt_token) -> "dashboard"; from(api_key) -> "aip_key"; from(_) -> "unauthorized". -level(_, _Code, Duration) when Duration > 3000 -> warning; -level(get, Code, _) when Code >= 200 andalso Code < 300 -> debug; +level(get, _Code, _) -> debug; level(_, Code, _) when Code >= 200 andalso Code < 300 -> info; level(_, Code, _) when Code >= 300 andalso Code < 400 -> warning; level(_, Code, _) when Code >= 400 andalso Code < 500 -> error; From 5e6397b843cd0f5ae75f507f3f16cac7a8f469c6 Mon Sep 17 00:00:00 2001 From: JianBo He Date: Tue, 26 Sep 2023 19:24:35 +0800 Subject: [PATCH 2/3] chore: remove result field for CLI audit logs --- apps/emqx_ctl/src/emqx_ctl.erl | 2 +- .../src/emqx_enterprise_schema.erl | 21 ++++++++----------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/apps/emqx_ctl/src/emqx_ctl.erl b/apps/emqx_ctl/src/emqx_ctl.erl index 4c077c56d..8b3eb8058 100644 --- a/apps/emqx_ctl/src/emqx_ctl.erl +++ b/apps/emqx_ctl/src/emqx_ctl.erl @@ -146,7 +146,7 @@ run_command(Cmd, Args) when is_atom(Cmd) -> audit_log( audit_level(Result, Duration), "from_cli", - #{duration_ms => Duration, result => Result, cmd => Cmd, args => Args, node => node()} + #{duration_ms => Duration, cmd => Cmd, args => Args, node => node()} ), Result. diff --git a/apps/emqx_enterprise/src/emqx_enterprise_schema.erl b/apps/emqx_enterprise/src/emqx_enterprise_schema.erl index 3f2ea3397..9a5d0abec 100644 --- a/apps/emqx_enterprise/src/emqx_enterprise_schema.erl +++ b/apps/emqx_enterprise/src/emqx_enterprise_schema.erl @@ -28,9 +28,16 @@ fields("node") -> fields("log") -> redefine_log(emqx_conf_schema:fields("log")); fields("log_audit_handler") -> + CommonConfs = emqx_conf_schema:log_handler_common_confs(file, #{}), + CommonConfs1 = lists:filter( + fun({Key, _}) -> + not lists:member(Key, ["level", "formatter"]) + end, + CommonConfs + ), [ {"level", - sc( + hoconsc:mk( emqx_conf_schema:log_level(), #{ default => info, @@ -72,17 +79,7 @@ fields("log_audit_handler") -> importance => ?IMPORTANCE_MEDIUM } )} - ] ++ - %% Only support json - lists:keydelete( - "level", - 1, - lists:keydelete( - "formatter", - 1, - log_handler_common_confs(file, #{}) - ) - ); + ] ++ CommonConfs1; fields(Name) -> ee_delegate(fields, ?EE_SCHEMA_MODULES, Name). From 1a96a5990b64b182307065ada632337dd0a115f3 Mon Sep 17 00:00:00 2001 From: JianBo He Date: Tue, 26 Sep 2023 21:44:40 +0800 Subject: [PATCH 3/3] chore: Update apps/emqx_enterprise/src/emqx_enterprise_schema.erl Co-authored-by: Thales Macedo Garitezi --- apps/emqx_enterprise/src/emqx_enterprise_schema.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/emqx_enterprise/src/emqx_enterprise_schema.erl b/apps/emqx_enterprise/src/emqx_enterprise_schema.erl index 9a5d0abec..248c47e99 100644 --- a/apps/emqx_enterprise/src/emqx_enterprise_schema.erl +++ b/apps/emqx_enterprise/src/emqx_enterprise_schema.erl @@ -41,7 +41,7 @@ fields("log_audit_handler") -> emqx_conf_schema:log_level(), #{ default => info, - desc => ?DESC("audit_handler_level"), + desc => ?DESC(emqx_conf_schema, "audit_handler_level"), importance => ?IMPORTANCE_HIDDEN } )},