yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11681 from zhongwencool/audit-log-fix-2 

fix: don't need to change audit log's level
This commit is contained in:
JianBo He 2023-09-26 23:12:28 +08:00 committed by GitHub
parent ac5eb5bc29 1a96a5990b
commit 6a9bb7c3ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/emqx_ctl/src/emqx_ctl.erl
View File

@ -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.
@ -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.

3
apps/emqx_dashboard/src/emqx_dashboard_audit.erl
View File

@ -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;

28
apps/emqx_enterprise/src/emqx_enterprise_schema.erl
View File

@ -28,7 +28,24 @@ 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",
hoconsc:mk(
emqx_conf_schema:log_level(),
#{
default => info,
desc => ?DESC(emqx_conf_schema, "audit_handler_level"),
importance => ?IMPORTANCE_HIDDEN
}
)},
{"path",
hoconsc:mk(
emqx_conf_schema:file(),
@ -62,16 +79,7 @@ fields("log_audit_handler") ->
importance => ?IMPORTANCE_MEDIUM
}
)}
] ++
%% Only support json
lists:keydelete(
"formatter",
1,
emqx_conf_schema:log_handler_common_confs(
file,
#{level => info, level_desc => "audit_handler_level"}
)
);
] ++ CommonConfs1;
fields(Name) ->
ee_delegate(fields, ?EE_SCHEMA_MODULES, Name).