From befc4845440c982bbd7de609001301fce571c75f Mon Sep 17 00:00:00 2001 From: zhongwencool Date: Wed, 18 Oct 2023 08:02:02 +0800 Subject: [PATCH] chore: add changelog entry and fix xref warning --- apps/emqx/src/config/emqx_config_logger.erl | 6 +- apps/emqx_audit/BSL.txt | 94 +++++++++++++++++++++ changes/ee/feat-11773.en.md | 1 + mix.exs | 1 + rebar.config | 1 + 5 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 apps/emqx_audit/BSL.txt create mode 100644 changes/ee/feat-11773.en.md diff --git a/apps/emqx/src/config/emqx_config_logger.erl b/apps/emqx/src/config/emqx_config_logger.erl index 89e439a2a..449d5207d 100644 --- a/apps/emqx/src/config/emqx_config_logger.erl +++ b/apps/emqx/src/config/emqx_config_logger.erl @@ -118,11 +118,15 @@ update_log_handler({Action, {handler, Id, Mod, Conf}}) -> end, ok. --dialyzer({nowarn_function, [audit/2]}). +-if(?EMQX_RELEASE_EDITION == ee). audit(Event, ?AUDIT_HANDLER) -> emqx_audit:log(alert, #{event => Event, from => event}); audit(_, _) -> ok. +-else. +audit(_, _) -> + ok. +-endif. id_for_log(console) -> "log.console"; id_for_log(Other) -> "log.file." ++ atom_to_list(Other). diff --git a/apps/emqx_audit/BSL.txt b/apps/emqx_audit/BSL.txt new file mode 100644 index 000000000..0acc0e696 --- /dev/null +++ b/apps/emqx_audit/BSL.txt @@ -0,0 +1,94 @@ +Business Source License 1.1 + +Licensor: Hangzhou EMQ Technologies Co., Ltd. +Licensed Work: EMQX Enterprise Edition + The Licensed Work is (c) 2023 + Hangzhou EMQ Technologies Co., Ltd. +Additional Use Grant: Students and educators are granted right to copy, + modify, and create derivative work for research + or education. +Change Date: 2027-02-01 +Change License: Apache License, Version 2.0 + +For information about alternative licensing arrangements for the Software, +please contact Licensor: https://www.emqx.com/en/contact + +Notice + +The Business Source License (this document, or the “License”) is not an Open +Source license. However, the Licensed Work will eventually be made available +under an Open Source License, as stated in this License. + +License text copyright (c) 2017 MariaDB Corporation Ab, All Rights Reserved. +“Business Source License” is a trademark of MariaDB Corporation Ab. + +----------------------------------------------------------------------------- + +Business Source License 1.1 + +Terms + +The Licensor hereby grants you the right to copy, modify, create derivative +works, redistribute, and make non-production use of the Licensed Work. The +Licensor may make an Additional Use Grant, above, permitting limited +production use. + +Effective on the Change Date, or the fourth anniversary of the first publicly +available distribution of a specific version of the Licensed Work under this +License, whichever comes first, the Licensor hereby grants you rights under +the terms of the Change License, and the rights granted in the paragraph +above terminate. + +If your use of the Licensed Work does not comply with the requirements +currently in effect as described in this License, you must purchase a +commercial license from the Licensor, its affiliated entities, or authorized +resellers, or you must refrain from using the Licensed Work. + +All copies of the original and modified Licensed Work, and derivative works +of the Licensed Work, are subject to this License. This License applies +separately for each version of the Licensed Work and the Change Date may vary +for each version of the Licensed Work released by Licensor. + +You must conspicuously display this License on each original or modified copy +of the Licensed Work. If you receive the Licensed Work in original or +modified form from a third party, the terms and conditions set forth in this +License apply to your use of that work. + +Any use of the Licensed Work in violation of this License will automatically +terminate your rights under this License for the current and all other +versions of the Licensed Work. + +This License does not grant you any right in any trademark or logo of +Licensor or its affiliates (provided that you may use a trademark or logo of +Licensor as expressly required by this License). + +TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON +AN “AS IS” BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS, +EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND +TITLE. + +MariaDB hereby grants you permission to use this License’s text to license +your works, and to refer to it using the trademark “Business Source License”, +as long as you comply with the Covenants of Licensor below. + +Covenants of Licensor + +In consideration of the right to use this License’s text and the “Business +Source License” name and trademark, Licensor covenants to MariaDB, and to all +other recipients of the licensed work to be provided by Licensor: + +1. To specify as the Change License the GPL Version 2.0 or any later version, + or a license that is compatible with GPL Version 2.0 or a later version, + where “compatible” means that software provided under the Change License can + be included in a program with software provided under GPL Version 2.0 or a + later version. Licensor may specify additional Change Licenses without + limitation. + +2. To either: (a) specify an additional grant of rights to use that does not + impose any additional restriction on the right granted in this License, as + the Additional Use Grant; or (b) insert the text “None”. + +3. To specify a Change Date. + +4. Not to modify this License in any other way. diff --git a/changes/ee/feat-11773.en.md b/changes/ee/feat-11773.en.md new file mode 100644 index 000000000..fcc96b1e6 --- /dev/null +++ b/changes/ee/feat-11773.en.md @@ -0,0 +1 @@ +Support audit log filter via dashboard (http api). diff --git a/mix.exs b/mix.exs index a088d89f7..a978c3ced 100644 --- a/mix.exs +++ b/mix.exs @@ -330,6 +330,7 @@ defmodule EMQXUmbrella.MixProject do :emqx_gateway_lwm2m, :emqx_gateway_exproto, :emqx_dashboard, + :emqx_dashboard_sso, :emqx_resource, :emqx_connector, :emqx_exhook, diff --git a/rebar.config b/rebar.config index 9f66553cc..75dc98556 100644 --- a/rebar.config +++ b/rebar.config @@ -102,6 +102,7 @@ {emqx_schema_parser,decode,3}, {emqx_schema_parser,encode,3}, {emqx_schema_registry,add_schema,1}, + {emqx_audit, log, 2}, emqx_exhook_pb, % generated code for protobuf emqx_exproto_pb % generated code for protobuf ]}.