Commit Graph

1600 Commits

Author SHA1 Message Date
Xinyu Liu 88cf427ecc
Merge branch 'main-v4.3' into fix_sql_compare 2022-08-17 18:24:03 +08:00
firest b9d26506a6 chore(jwt): bump version && update appup 2022-08-17 17:55:00 +08:00
firest 719f6cfb2c fix(jwt): change `request_jwks` to be called after initialization
If called in `init/1`, the module-enabled API may have inconsistent state due to timeout
2022-08-17 17:55:00 +08:00
Xinyu Liu f944e74440
Merge pull request #8745 from JimMoen/fix-mqtt-bridge-status
fix(bridge): mqtt bridge worker status idle
2022-08-17 17:27:31 +08:00
JimMoen 768ab4eacd fix(bridge): mqtt bridge worker status idle 2022-08-17 16:24:39 +08:00
JimMoen 0502be6055 chore(typo): fix typo 2022-08-17 15:36:04 +08:00
JimMoen 4a89dfe362 chore: update CHANGES.md and appup.src
This reverts commit 7af25a82e70845a631be0c8b83ba7f1838d68389.
2022-08-17 11:48:59 +08:00
JimMoen 67ec6e0e66 fix: log RuleId for take action failed 2022-08-17 11:09:58 +08:00
Shawn 582ead1d77 fix: update appup for rule engine 2022-08-16 21:38:57 +08:00
Shawn 4055b20259 fix: sql compare to undefined values 2022-08-16 21:32:24 +08:00
Zaiming (Stone) Shi bffff65df5
Merge pull request #8734 from zmstone/0816-update-retainer-sup
chore: make a no-op change in emqx_retainer_sup
2022-08-16 11:23:45 +01:00
Zaiming (Stone) Shi 0287d6c755
docs: fix comment typo in emqx_retainer_sup.erl
Co-authored-by: ieQu1 <99872536+ieQu1@users.noreply.github.com>
2022-08-16 10:30:05 +02:00
Zaiming (Stone) Shi 303249e2e8 chore: move rebalance and eviction code to ee 2022-08-16 07:40:16 +02:00
Zaiming (Stone) Shi 93a97e0df2 chore: make a no-op change in emqx_retainer_sup
Just to keep the appup in sync with enterprise edition
2022-08-16 00:56:50 +02:00
zhongwencool e6a98524b5 chore: improve retainer ct init between ce and ee 2022-08-15 09:42:21 +08:00
Ilya Averyanov a19fbe214f feat(node_rebalance): implement node evacuation and rebalancing 2022-08-13 11:32:14 +03:00
Thales Macedo Garitezi fc9e802b26 chore: bump release version, app vsns, appups 2022-08-12 13:41:52 -03:00
Thales Macedo Garitezi 98da31e8b2 feat: enable importing backup json for 4.5 2022-08-12 11:15:58 -03:00
JianBo He 3e0f9b3881
Merge pull request #8628 from HJianBo/start-idle-checking-timer
Fix(exproto): start idle timer to avoid client leaking
2022-08-10 17:03:18 +08:00
zhongwencool 0a98071068 Merge branch 'add-trace-detail-api' of https://github.com/zhongwencool/emqx into add-trace-detail-api 2022-08-10 15:29:08 +08:00
zhongwencool e59f542afd test: add more debug info for t_trace_file_detail ct 2022-08-10 11:45:02 +08:00
zhongwencool e239d1a303
Merge branch 'main-v4.4' into add-trace-detail-api 2022-08-09 17:08:25 +08:00
Zaiming (Stone) Shi 56a0a19807
Merge pull request #8654 from zmstone/0804-chore-improve-lwm2m-object-id-error
fix(lwm2m): improve error logging for bad lwm2m requests
2022-08-09 10:05:12 +01:00
zhongwencool 4e362d2d0a feat: add GET /trace/:name/detail HTTP API 2022-08-09 16:09:58 +08:00
zhongwencool 19792bc2d0
Merge pull request #8660 from zhongwencool/enabled-default-modules
fix: enable emqx_mod_module if default_plugins
2022-08-09 14:17:31 +08:00
zhongwencool 25228ed248 test: fix compile warning 2022-08-09 09:37:05 +08:00
zhongwencool 2443c06810
Merge pull request #8659 from zhongwencool/fix-trace-disable-return-enoent
fix: check if trace is enabled when the file is not found
2022-08-09 09:13:31 +08:00
Zaiming (Stone) Shi eca211373f Merge remote-tracking branch 'origin/dev/v4.3.18' into dev/v4.4.7 2022-08-08 16:39:09 +02:00
zhongwencool 9b10aefd80 chore: update changelog and appup.src 2022-08-08 14:24:04 +08:00
zhongwencool 2740c80b20 fix: check if trace is enabled when the file is not found 2022-08-08 11:59:26 +08:00
zhongwencool 4869c94e97 chore: replace / with _ in match_spec 2022-08-08 10:25:01 +08:00
zhongwencool 43e1087e13 test: add auth_mnesia count test 2022-08-05 11:34:04 +08:00
zhongwencool f97820f913 test: add auth_mnesia count test 2022-08-05 11:07:16 +08:00
zhongwencool 1d9ee25c92 fix: support custom count function 2022-08-05 10:33:57 +08:00
Zaiming (Stone) Shi 616a2235f2 fix(lwm2m): improve error logging for bad lwm2m requests 2022-08-04 19:14:53 +02:00
Thales Macedo Garitezi 5e9462afc8 feat: add option to gc after TLS/SSL handshake (4.3)
Port of https://github.com/emqx/emqx/pull/8637
2022-08-04 08:51:50 -03:00
Zaiming (Stone) Shi db979f7b48 chore: update release version and appups prepare for new version 4.4.7 2022-08-03 13:41:11 +02:00
JianBo He ec5c0816f7 chore: update app.src & appup.src 2022-08-03 14:01:01 +08:00
JianBo He 9e2987034b chore(exproto): start idle timer for udp clients 2022-08-03 13:58:48 +08:00
Zaiming (Stone) Shi 744af708f1 chore: update appup files for 4.3.18 2022-08-02 15:58:04 +02:00
zhongwencool 938607baca
Merge pull request #8587 from emqx/main-v4.3
chore: sync v4.3 to v4.4
2022-07-28 08:30:28 +08:00
JianBo He 448ae41a64 chore: update changes 2022-07-27 09:58:27 +08:00
JianBo He a5bf1a3b2d chore(exproto): update app.src & appup.src 2022-07-27 09:38:46 +08:00
JianBo He c188eeb1d9 fix(exproto): refine keepalive timer checking 2022-07-27 09:36:18 +08:00
JianBo He db26956f3e feat(exproto): keeping client information up to date 2022-07-27 09:36:18 +08:00
zhongwencool 0e8888716d Merge branch 'main-v4.3' into copy-of-main-v4.4 2022-07-26 15:48:06 +08:00
zhongwencool 91a7022e83 fix: duplicate rule when query by page 2022-07-26 11:13:29 +08:00
zhongwencool 56eedf0c9d Merge branch 'main-v4.3' into copy-of-main-4.3 2022-07-25 08:47:25 +08:00
Ilya Averyanov afbb3f295b fix(lua_hooks): fix on_message_publish lua hook 2022-07-21 13:52:52 +03:00
Xinyu Liu 84c2aceba9
Merge branch 'main-v4.4' into copy-of_main-v4.3 2022-07-20 21:29:49 +08:00
Shawn 691407f9fd fix: add type binary_file to emqx_rule_validator 2022-07-20 11:16:44 +08:00
zhongwencool b6b4ad9b70 chore: update appup.src 2022-07-19 18:44:04 +08:00
zhongwencool 28e5539645 chore: revert emqx.appup.src 2022-07-19 17:45:25 +08:00
zhongwencool 368fe40c34 fix: merge appup.src 2022-07-19 11:50:08 +08:00
zhongwencool 3248cb92e8 Merge branch 'main-v4.3' into sync-4.3-to-4.4 2022-07-19 11:02:11 +08:00
zhongwencool 5a25c8b682
Merge pull request #8428 from zhongwencool/fix-subid-undefined
fix: get subscriptions crash when subid is undefined
2022-07-13 17:08:55 +08:00
zhongwencool c5dc86a060
Merge pull request #8450 from zhongwencool/list-rules-with-filter
feat: list rules support for pagination and fuzzy filtering
2022-07-13 14:21:40 +08:00
zhongwencool 9b433eb002 fix: list_rules support enable_paging 2022-07-13 10:06:18 +08:00
DDDHuang 790f97c853 fix: better zh param name 2022-07-12 14:53:25 +08:00
zhongwencool d1254faf6f feat: list rules support for pagination and fuzzy filtering 2022-07-08 16:54:35 +08:00
firest e1346148ec chore: bump version && update appup 2022-07-06 18:28:08 +08:00
firest 5c2797e1ca chore: Add compatibility note 2022-07-06 18:13:26 +08:00
firest 6cd79f92e0 fix(emqx_auth_http): make configure backward compatible 2022-07-06 18:06:06 +08:00
firest 85b0ce3843 fix: change the type of enable_pipelining from bool to integer 2022-07-06 18:05:56 +08:00
zhongwencool 5a9638b09b fix: get subscriptions crash when subid is undefined 2022-07-06 17:12:11 +08:00
JianBo He ad7c2456e6
Merge pull request #8386 from HJianBo/port-new-4316
Fix fail to join old version cluster crash
2022-07-05 09:38:27 +08:00
Thales Macedo Garitezi 1a6cf38c00 fix: fix list difference precedence
```erlang
1> [a, b, c] ++ [d] -- [a].
[a,b,c,d]
2> ([a, b, c] ++ [d]) -- [a].
[b,c,d]
```
2022-07-04 16:38:49 -03:00
JianBo He c1b3cc756c chore: bump mgmt/dashboard vsn 2022-07-04 13:57:00 +08:00
JianBo He 6eadacd5a2 chore: bump rule-engine app vsn 2022-07-04 11:32:05 +08:00
Thales Macedo Garitezi fcb2d3dc51 fix(mgmt): use correct arity fn 2022-07-01 15:54:02 -03:00
Thales Macedo Garitezi b10f8b8928 test(mgmt): run all tests in suite 2022-06-30 08:45:19 -03:00
Xinyu Liu 2a89443377
Merge branch 'main-v4.4' into copy-of_main-v4.3 2022-06-29 22:27:49 +08:00
Thales Macedo Garitezi 5c89998049 fix(hooks): return error on hook-removed subscription rather than deleting it
Following https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901178
2022-06-29 11:08:22 -03:00
JianBo He e3bf11fe39 chore: stop http listener to load latest http hanlders 2022-06-29 20:52:11 +08:00
Xinyu Liu c6573c708f
Merge branch 'main-v4.4' into copy-of_main-v4.3 2022-06-29 15:40:14 +08:00
Ilya Averyanov 4447948c5e fix: handle claim verification errors correctly 2022-06-28 19:36:46 +03:00
Ilya Averyanov f238e8f83d fix: update JWKS renewal timer correctly 2022-06-28 09:54:12 +03:00
Ilya Averyanov ddc06e8bcd fix: remove unnecessary error messages generated by JWT auth 2022-06-27 18:42:44 +03:00
Xinyu Liu c812975ca6
Merge branch 'main-v4.4' into copy-of-main-v4.3 2022-06-27 21:34:11 +08:00
Zaiming (Stone) Shi 9af4cb75ef
Merge pull request #8324 from zmstone/0626-fix-mem-stats
chore: return system total and used memory in node_info
2022-06-27 07:04:45 +01:00
JianBo He 9bb3533d11 fix(exhook): guarantee sequential dispatch of client's events from the same node
fix: https://github.com/emqx/emqx/issues/7569
2022-06-27 11:27:44 +08:00
JianBo He 08976c6946
Merge pull request #8314 from lafirest/feat/exhook_tcp_opts
Feat/exhook tcp opts
2022-06-27 11:26:02 +08:00
Zaiming (Stone) Shi c4f1c83003 chore: return system total and used memory in node_info 2022-06-26 21:16:55 +02:00
firest 9ad1e5c08e chore(exhook): bump version && update appup 2022-06-24 17:52:29 +08:00
firest abe2a9cb45 feat(exhook): expose tcp some options for grpc client 2022-06-24 17:50:05 +08:00
Shawn 0a99e835e7 fix: fallback action not triggered when send to webhook failed 2022-06-24 14:34:40 +08:00
Xinyu Liu 565b6b0eb3
Merge branch 'main-v4.4' into copy-of_main-v4.3 2022-06-23 22:44:53 +08:00
Xinyu Liu 14a37bbc89
Merge pull request #8288 from thalesmg/fix-client-sub-hook
fix(hooks): use hook response to stop subscriptions
2022-06-23 11:42:42 +08:00
zhongwencool d345590206 fix: CT failed 2022-06-22 17:35:57 +08:00
zhongwencool 040e964956 fix: appup failed 2022-06-22 16:36:30 +08:00
zhongwencool 773c464572 fix: clean trace zip file after download 2022-06-22 16:35:41 +08:00
DDDHuang 5b62334e89
Merge pull request #8291 from DDDHuang/kafka_import
fix(kafka): data backup, support old strategy style
2022-06-22 11:49:48 +08:00
DDDHuang 6cf583a301 fix(kafka): data backup, support old strategy style 2022-06-22 11:03:34 +08:00
zhongwencool fd11e02639 feat: mqtt/publish support to publish with properties and user_properties 2022-06-22 10:00:25 +08:00
Thales Macedo Garitezi 4bda62b195 fix(hooks): use hook response to stop subscriptions
Fixes https://github.com/emqx/emqx-lua-hook/issues/118

1) If the Lua hook returns an empty list, it should replace the final
topic filter list.
2) The subscribed topics after running the 'client.subscribe' hook
should not contain topics filtered out by the hooks.
2022-06-21 17:06:39 -03:00
Xinyu Liu dc777c68a1
Merge branch 'main-v4.4' into copy-of_main-v4.3 2022-06-20 11:22:58 +08:00
Zaiming (Stone) Shi b4cdfcb709
Merge pull request #8160 from gsychev/webhook_json_fix
fix(web_hook): proper json encoding
2022-06-16 20:11:28 +01:00
DDDHuang fcdb6217db fix: update grpc deps & deps in root rebar.config 2022-06-16 10:49:53 +08:00
Thales Macedo Garitezi a55d583de6 chore: bump more app versions 2022-06-15 14:14:34 -03:00
Thales Macedo Garitezi 13f575bc84 chore(relup): bump release and app vsns, update appups 2022-06-15 13:45:05 -03:00