From 1910249058b28a173e7607722601fc9ce7fefe79 Mon Sep 17 00:00:00 2001 From: JimMoen Date: Wed, 6 Apr 2022 10:52:29 +0800 Subject: [PATCH] chore: update CHANGES-4.3.md and appup --- CHANGES-4.3.md | 4 +++- apps/emqx_exhook/src/emqx_exhook.app.src | 1 + apps/emqx_exhook/src/emqx_exhook.appup.src | 14 ++++++++++---- src/emqx.appup.src | 2 ++ 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/CHANGES-4.3.md b/CHANGES-4.3.md index 5618dc571..231f0e70e 100644 --- a/CHANGES-4.3.md +++ b/CHANGES-4.3.md @@ -14,8 +14,10 @@ File format: ### Enhancements +* ExHook add a new field named `meta` to provide emqx `cluster_name`. + The grpc server can handle calls separately for different clusters. [#7524] * In order to fix the execution order of exhook, e.g. before/after other plugins/modules, - ExHook now supports user customizing emqx_hook execute priority. + ExHook now supports user customizing emqx_hook execute priority. [#7408] * add api: PUT /rules/{id}/reset_metrics. This api reset the metrics of the rule engine of a rule, and reset the metrics of the action related to this rule. [#7474] * Enhanced rule engine error handling when json parsing error. diff --git a/apps/emqx_exhook/src/emqx_exhook.app.src b/apps/emqx_exhook/src/emqx_exhook.app.src index b386bcaca..6075d50db 100644 --- a/apps/emqx_exhook/src/emqx_exhook.app.src +++ b/apps/emqx_exhook/src/emqx_exhook.app.src @@ -1,3 +1,4 @@ +%% -*- mode: erlang -*- {application, emqx_exhook, [{description, "EMQ X Extension for Hook"}, {vsn, "4.3.5"}, diff --git a/apps/emqx_exhook/src/emqx_exhook.appup.src b/apps/emqx_exhook/src/emqx_exhook.appup.src index dee9aed5f..8245576ec 100644 --- a/apps/emqx_exhook/src/emqx_exhook.appup.src +++ b/apps/emqx_exhook/src/emqx_exhook.appup.src @@ -2,8 +2,11 @@ {VSN, [ {"4.3.4", [ - {load_module, emqx_exhook_sup, brutal_purge,soft_purge,[]}, - {load_module, emqx_exhook_server, brutal_purge,soft_purge,[]}, + {load_module, emqx_exhook_sup, brutal_purge, soft_purge, []}, + {load_module, emqx_exhook_server, brutal_purge, soft_purge, []}, + {load_module, emqx_exhook_handler, brutal_purge, soft_purge, []}, + {load_module, emqx_exhook_pb, brutal_purge, soft_purge, []}, + {load_module, emqx_exhook, brutal_purge, soft_purge, []}, {update, emqx_exhook_mngr, {advanced, ["4.3.4"]}} ]}, {<<"4\\.3\\.[0-3]">>, [ @@ -13,8 +16,11 @@ ], [ {"4.3.4", [ - {load_module, emqx_exhook_sup, brutal_purge,soft_purge,[]}, - {load_module, emqx_exhook_server, brutal_purge,soft_purge,[]}, + {load_module, emqx_exhook_sup, brutal_purge, soft_purge, []}, + {load_module, emqx_exhook_server, brutal_purge, soft_purge, []}, + {load_module, emqx_exhook_handler, brutal_purge, soft_purge, []}, + {load_module, emqx_exhook_pb, brutal_purge, soft_purge, []}, + {load_module, emqx_exhook, brutal_purge, soft_purge, []}, {update, emqx_exhook_mngr, {advanced, ["4.3.4"]}} ]}, {<<"4\\.3\\.[0-3]">>, [ diff --git a/src/emqx.appup.src b/src/emqx.appup.src index 3951c417c..eed1ca911 100644 --- a/src/emqx.appup.src +++ b/src/emqx.appup.src @@ -3,6 +3,7 @@ {VSN, [{"4.3.14", [{load_module,emqx,brutal_purge,soft_purge,[]}, + {load_module,emqx_sys,brutal_purge,soft_purge,[]}, {load_module,emqx_plugins,brutal_purge,soft_purge,[]}, {load_module,emqx_frame,brutal_purge,soft_purge,[]}, {load_module,emqx_hooks,brutal_purge,soft_purge,[]}]}, @@ -433,6 +434,7 @@ {<<".*">>,[]}], [{"4.3.14", [{load_module,emqx,brutal_purge,soft_purge,[]}, + {load_module,emqx_sys,brutal_purge,soft_purge,[]}, {load_module,emqx_plugins,brutal_purge,soft_purge,[]}, {load_module,emqx_frame,brutal_purge,soft_purge,[]}, {load_module,emqx_hooks,brutal_purge,soft_purge,[]}]},