Commit Graph

1628 Commits

Author SHA1 Message Date
Thales Macedo Garitezi e05605bef0 Merge remote-tracking branch 'origin/main-v4.3' into merge-v43-into-v44-e 2022-08-30 16:38:14 -03:00
zhouzb 440f7ce007
Merge branch 'main-v4.4' into sync-v4.3.19 2022-08-30 23:36:41 +08:00
zhongwencool e903038521 chore: update mnesia_acl appup.src 2022-08-30 23:20:03 +08:00
zhongwencool 0803c74999 chore: add emqx_ctl acl list to show all acls 2022-08-30 23:19:37 +08:00
zhongwencool e4992b8f59 chore: update mnesia_acl appup.src 2022-08-30 15:41:23 +08:00
zhongwencool 78ec03f23b chore: add emqx_ctl acl list to show all acls 2022-08-30 15:03:21 +08:00
Thales Macedo Garitezi 66a2423b8f
Merge pull request #8820 from thalesmg/fix-dialyzer-a
chore: fix dialyzer errors
2022-08-29 10:05:26 -03:00
Thales Macedo Garitezi 977ac04d24 chore: fix dialyzer errors 2022-08-26 16:09:39 -03:00
JimMoen bb16eb4ec5 Merge remote-tracking branch 'emqx/main-v4.3' into merge-main-v4.3 2022-08-26 14:30:34 +08:00
JimMoen 820e848909 test(exhook): more case for topic filter wildcards/level and different qos 2022-08-26 11:13:44 +08:00
JimMoen 2657b78c44 test(exhook): ExHook message hooks with topic filters 2022-08-26 03:35:00 +08:00
JimMoen b083a1cd2d chore: appup.src and CHANGES.md 2022-08-26 03:35:00 +08:00
JimMoen d0f88b1af9 fix(exhook): ignore hook exection for `no_matched` topic
For message hooks, if the topics do not match, the hook should continue to be executed.
2022-08-26 03:35:00 +08:00
zhongwencool 7a72e85555 Merge branch 'main-v4.4' into copy-of-main-v4.3 2022-08-19 23:09:31 +08:00
JianBo He efdde6e107 test(exproto): fix timeout cases 2022-08-19 18:13:59 +08:00
JianBo He f4ad7acd06 chore: update appup.src 2022-08-19 16:03:15 +08:00
JianBo He 5e505fa41c chore: update appup.src 2022-08-19 16:03:15 +08:00
JianBo He 8186e9e47a chore: close keepalive timeout channel 2022-08-19 16:03:15 +08:00
JianBo He 7d3ea85ef3 fix(exproto): produce disconnected event if kicked 2022-08-19 16:03:15 +08:00
JianBo He 515fd014d3 fix(exproto): fix undefined clientid in client.connect hook 2022-08-19 16:03:15 +08:00
JianBo He 58db1eb5a9 fix(exhook): avoid emqx_exhook_mgnr to force killed due to exceed
supervior shutdown timeout
2022-08-19 16:03:15 +08:00
zhongwencool 940ceb570d Merge branch 'main-v4.4' into copy-of-main-v4.3 2022-08-19 10:53:48 +08:00
Xinyu Liu 70b8f427d8
Merge pull request #8743 from terry-xiaoyu/fix_sql_compare
Fix sql compare to undefined values
2022-08-18 17:33:38 +08:00
Zaiming (Stone) Shi 0dbc07e73f
Merge pull request #8751 from zmstone/0817-ci-fix-slim-build
ci: update OTP version
2022-08-18 07:07:49 +01:00
Zaiming (Stone) Shi b4ea2aefa6 test: export ct callbacks 2022-08-18 08:07:25 +02:00
JianBo He 1eadd4f750
Merge pull request #8736 from lafirest/fix/init_jwt
fix(jwt): change `request_jwks` to be called after initialization
2022-08-18 10:19:30 +08:00
Shawn 413612a69d fix: duplicate appup instructions 2022-08-18 09:18:41 +08:00
zhongwencool a583c221f0 fix: list_listener crash with invaild json 2022-08-17 23:12:51 +08:00
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