yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,112 Commits 393 Branches 684 Tags 74 MiB
Commit Graph

1883 Commits

Author SHA1 Message Date
JianBo He b9e9540120 chore(auth): support printing unicode string 2022-10-21 11:59:01 +08:00
JianBo He 38e87579c0 chore(jwt-acl): avoid the disruptions caused by rule formatting errors 2022-10-21 11:47:19 +08:00
JianBo He fa4203effa chore: apply suggestions from code review 
Co-authored-by: Zaiming (Stone) Shi <zmstone@gmail.com>
 2022-10-21 11:47:19 +08:00
JianBo He 7b0acf2c4d chore: update changes and appup.src 2022-10-21 11:47:07 +08:00
JianBo He 1857fe643a fix(acl): support all rules in JWT ACL 2022-10-21 11:44:48 +08:00
Shawn bfe238fa1c fix: set precision of counter 'max_speed' to 2 digits 2022-10-21 09:05:25 +08:00
JianBo He 8e199b3a77 chore: update appup.src 2022-10-20 15:52:17 +08:00
JianBo He 317ef65c7e chore: remove the duplicated clientid print in log 2022-10-20 15:50:04 +08:00
JianBo He 4cf3d181d8 chore(auth-http): more infos for auth/acl checking failure 2022-10-20 15:48:58 +08:00
JimMoen 8a644bac99 chore: bump app.src and appup.src 2022-10-18 11:28:54 +08:00
JimMoen bac7b61cfd Merge branch 'release-v44' into 1018-sync-release-v44-back-to-main 2022-10-18 10:44:27 +08:00
Zaiming (Stone) Shi 5bc822cc78 chore: delete duplicated module from appup 2022-10-17 12:55:22 +02:00
Zaiming (Stone) Shi 11026b7644 chore: re-generate appup for v4.3.22 2022-10-16 08:43:45 +02:00
Zaiming (Stone) Shi 20e0d14026 chore: bump app versions 2022-10-15 15:01:57 +02:00
Zaiming (Stone) Shi 1ba2c01f25 Merge remote-tracking branch 'origin/release-v43' into main-v4.3 2022-10-15 14:58:22 +02:00
Zaiming (Stone) Shi 62878e7851 Merge remote-tracking branch 'origin/release-v43' into release-v44 2022-10-14 12:10:22 +02:00
Xinyu Liu 265fab8ccf
Merge pull request #9150 from terry-xiaoyu/port_rule_metrics_fix_to_release_v43 
fix: reset rule metrics crashed under certain conditions
 2022-10-14 16:05:23 +08:00
Shawn 381c56d52f fix: reset rule metrics crashed under certain conditions 2022-10-14 10:50:39 +08:00
Ilya Averyanov 53bc2d9d58 fix(jwt): restore legacy emqx_auth_jwt hook interface 2022-10-13 11:37:50 +03:00
Ivan Dyachkov 73d72eacce fix: demote rate limit log level to notice 2022-10-11 13:05:21 +02:00
JimMoen 7f92c29ada chore: bump appup.src for `emqx_rule_funcs.erl` 2022-10-11 13:45:11 +08:00
JimMoen 3e8c070b59 Revert "fix: rm unused module" 
This reverts commit 267946c379.

Revert it temporary, we need fix `scripts/update-appup.sh` later.
It only compares the current release with its predecessor.
 2022-10-11 13:44:34 +08:00
JimMoen 5047211950 test: rulesql select fields and select from event message 2022-10-11 13:44:34 +08:00
JimMoen 27e19da066 test(rulesql): num funcs type cases 2022-10-11 13:44:34 +08:00
JimMoen 32376c7cf9 fix(rule_func): refine num funcs error info type unsupported 2022-10-11 11:23:25 +08:00
JimMoen 0a5a0867e4 fix(rule_func): refine `+` error info when type implicit conversion 2022-10-11 11:23:25 +08:00
JimMoen d8a022fb45 fix(test): unstopped test client 2022-10-11 11:23:25 +08:00
JimMoen 267946c379 fix: rm unused module 
`emqx_rule_date` was added before [v4.3.15-rc1]
PR: emqx#7894
commit: 8558a62ee2

The change was released in [v4.3.15-rc1] [v4.3.15-rc2]

And unused at [v4.3.15-rc3]
PR: emqx#8044
commit: 4fc5cb2817

We just keep the module from [v4.3.15-rc1] to [v4.3.20] and remove this module in newer version
 2022-10-11 11:23:25 +08:00
JimMoen fd7230353c refactor(test): move rule_engine sql test cases into a separate file 2022-10-11 11:23:25 +08:00
JianBo He 85aa120b06 Merge branch 'release-v43' into release-v44 2022-10-11 10:24:22 +08:00
Shawn 6d52f908d1 chore: update emqx_rule_engine.appup.src 2022-10-10 17:24:27 +08:00
Shawn 338b11ab95 fix: cannot reset metrics for fallback actions 2022-10-10 17:13:39 +08:00
JianBo He bc68f60bb5 chore: update appup.src 2022-10-09 17:52:59 +08:00
JianBo He 68dd29420d chore: fix duplicated variable name 2022-10-09 17:43:30 +08:00
JianBo He e5a673376f refactor: support the retry option 2022-10-09 17:27:38 +08:00
Xinyu Liu 505507139e
Merge pull request #9079 from terry-xiaoyu/some_issues_in_rule_engine 
Some issues in rule engine
 2022-10-09 14:32:39 +08:00
JianBo He 92d5caf908
Merge branch 'main-v4.3' into test/mqtt_sn 2022-10-08 14:28:01 +08:00
Shawn 1bb7c23db1 fix: discard the 'id' field when testing a resource 2022-10-08 10:50:42 +08:00
Zaiming (Stone) Shi f24728ee7b chore: sync diverged modules modules from ee back to ce 2022-10-05 14:59:18 -03:00
Ivan Dyachkov c9ff67a637 chore: add timetrap of 2 mins for pgsql test cases 2022-10-05 15:53:55 +02:00
Zaiming (Stone) Shi fef42b0d17 Merge remote-tracking branch 'origin/main-v4.3' into 1005-sync-v44-upstreams 2022-10-05 13:40:35 +02:00
Zaiming (Stone) Shi 28b1a4e6f1 Merge remote-tracking branch 'origin/release-v44' into 1005-sync-v44-upstreams 2022-10-05 13:02:00 +02:00
Shawn ab3ec9c176 chore: update the appup.src 2022-09-30 16:32:52 +08:00
Zaiming (Stone) Shi 07f0f0a5f8 Merge remote-tracking branch 'origin/release-v43' into 0921-build-merge-release-br-back-to-main-asap 2022-09-29 10:56:45 +02:00
Shawn 7d2dd3d37d fix: deny POST an existing resource 2022-09-29 13:41:02 +08:00
Shawn 29c76d16d7 fix: reset rule metrics crash if it has not initialized 2022-09-29 13:40:01 +08:00
Thales Macedo Garitezi 954e276124 Merge remote-tracking branch 'origin/release-v43' into merge-rv43-into-rv44-a 2022-09-28 09:46:03 -03:00
Thales Macedo Garitezi 2e0eae54f8 fix(acl): check ACL before publishing last will testament (lwt) message (4.3) 2022-09-26 15:22:29 -03:00
Ivan Dyachkov 77a45f86cc Merge remote-tracking branch 'origin/main-v4.3' into main-v4.4 2022-09-26 20:19:23 +02:00
Thales Macedo Garitezi a61c97ed9b test: attempt to reduce inter-testcase flakiness in CI 
Ex:

```
=== ERROR! init_per_testcase crashed!
	Location: [{emqx_auth_mongo_SUITE,'-init_mongo_data/0-fun-0-',207},
              {emqx_auth_mongo_SUITE,init_mongo_data,207},
              {emqx_auth_mongo_SUITE,init_per_testcase,177},
              {test_server,do_init_per_testcase,1554},
              {test_server,run_test_case_eval1,1255},
              {test_server,run_test_case_eval,1225}]
	Reason: {{assertMatch,[{module,emqx_auth_mongo_SUITE},
               {line,207},
               {expression,"mongo_api : insert ( Connection , ? MONGO_CL_USER , ? INIT_AUTH )"},
               {pattern,"{ { true , _ } , _ }"},
               {value,{error,timeout}}]},
 [{emqx_auth_mongo_SUITE,'-init_mongo_data/0-fun-0-',1,
                         [{file,"/emqx/apps/emqx_auth_mongo/test/emqx_auth_mongo_SUITE.erl"},
                          {line,207}]},
  {emqx_auth_mongo_SUITE,init_mongo_data,0,
                         [{file,"/emqx/apps/emqx_auth_mongo/test/emqx_auth_mongo_SUITE.erl"},
                          {line,207}]},
  {emqx_auth_mongo_SUITE,init_per_testcase,2,
                         [{file,"/emqx/apps/emqx_auth_mongo/test/emqx_auth_mongo_SUITE.erl"},
                          {line,177}]},
  {test_server,do_init_per_testcase,2,[{file,"test_server.erl"},{line,1554}]},
  {test_server,run_test_case_eval1,6,[{file,"test_server.erl"},{line,1255}]},
  {test_server,run_test_case_eval,9,[{file,"test_server.erl"},{line,1225}]}]}
```
 2022-09-26 09:13:07 -03:00
Thales Macedo Garitezi 7c4842e6e5 test: attempt to fix inter-suite flakiness 
Ex:
https://github.com/emqx/emqx-enterprise/actions/runs/3124750818/jobs/5068407612#step:7:769

```
%%% undefined ==> end_per_suite: FAILED
%%% undefined ==> {{badmatch,{error,enoent}},
 [{emqx_auth_mongo_SUITE,end_per_suite,1,
                         [{file,"/emqx/apps/emqx_auth_mongo/test/emqx_auth_mongo_SUITE.erl"},
                          {line,62}]},
  {test_server,ts_tc,3,[{file,"test_server.erl"},{line,1784}]},
  {test_server,run_test_case_eval1,6,[{file,"test_server.erl"},{line,1381}]},
  {test_server,run_test_case_eval,9,[{file,"test_server.erl"},{line,1225}]}]}
Testing lib.emqx_auth_mongo: TEST COMPLETE, 3 ok, 0 failed of 3 test cases
```
 2022-09-26 08:57:53 -03:00
firest 1e00345777 chore(emqx_sn): bump version && update appup 2022-09-26 18:00:04 +08:00
firest 0a3c8d035c fix(mqtt_sn): after receiving publish in `idle mode` the gateway may panic 
the `emqx_sn_gateway` will return `{keep_state, Timeout}` when received publish in `idle mode`, this is an incorrect format of `gen_statem` state return result, this return will replace the `state data` by the `Timeout`, the fix is to change it to `{keep_state_and_data, Timeout}`
 2022-09-26 17:59:35 +08:00
firest 5b14d7f709 test(mqtt_sn): improve test coverage of `emqx_sn_gateway` 2022-09-26 16:37:33 +08:00
JianBo He c05ce82933 refactor(psk): create the ets table in supervisor process 2022-09-23 11:16:31 +08:00
Thales Macedo Garitezi f94c5ee40a feat(auth_mongo): use `with_timeout` for `query` 2022-09-22 11:28:59 -03:00
Ilya Averyanov 7a26aae27b chore(retainer): sync retainer from release-e43 2022-09-22 12:42:21 +03:00
firest 502f3e8d5c test(mqtt_sn): improve test coverage to 90% 2022-09-22 17:31:08 +08:00
Thales Macedo Garitezi 90995069c6 chore(auth_mongo): bump appup 2022-09-21 14:46:17 -03:00
Thales Macedo Garitezi a60763dfcf test(mongo): attempt to improve test stability 2022-09-21 14:03:44 -03:00
Thales Macedo Garitezi ea8f444bda test(mongo): add more acl tests 
With this commit, we reach 100 % coverage over `emqx_acl_mongo`.
 2022-09-21 14:03:44 -03:00
Thales Macedo Garitezi 69659caaf8 test(mongo): add more coverage tests 
reaching 100% coverage of `emqx_auth_mongo` with this.
 2022-09-21 14:03:44 -03:00
Thales Macedo Garitezi 3f02c6b574 feat(mongo): add timeouts and more tests 2022-09-21 14:03:44 -03:00
Thales Macedo Garitezi fe0ba87fd0 fix: handle interpolation of unavailable info 2022-09-20 14:15:32 -03:00
Thales Macedo Garitezi d3304d49b5 test: increase mongo integration test coverage (4.3) 2022-09-20 14:15:32 -03:00
Zaiming (Stone) Shi e7acd54645 chore: upgrade lib jose to tag emqx-1.11.3 2022-09-19 20:07:24 +02:00
Zaiming (Stone) Shi 548de20c0b chore: re-generate appup after version bump 2022-09-19 15:33:55 +02:00
Zaiming (Stone) Shi 816b4749db chore: update app versions 2022-09-19 15:14:22 +02:00
Zaiming (Stone) Shi 51e70df440 Merge remote-tracking branch 'origin/main-v4.3' into 0919-sync-v44 2022-09-19 09:54:00 +02:00
Zaiming (Stone) Shi 130e02a7af Merge remote-tracking branch 'thales/merge-v43-into-v44-h' into 0919-sync-v44 2022-09-19 09:50:45 +02:00
Zaiming (Stone) Shi e6603548d7 chore: generate appups after bumped new version 2022-09-17 18:50:28 +02:00
Zaiming (Stone) Shi 40a0703bf5 Merge tag 'v4.3.20' into dev/v4.4.9 2022-09-16 13:11:46 +02:00
Zaiming (Stone) Shi bfb53b7f24 chore: bump app versions after merged tag v4.3.20 2022-09-16 12:56:51 +02:00
Zaiming (Stone) Shi 3c852098d7 Merge tag 'v4.3.20' into main-v4.3 2022-09-16 12:54:00 +02:00
JianBo He 89ed4a350f chore: avoid generating crash logs for hook execution 2022-09-16 17:53:49 +08:00
zhongwencool e4c2715842 fix: add ip to dashboard listener_on 2022-09-16 15:36:17 +08:00
Thales Macedo Garitezi 6204481d71 test: avoid inter-suite flakiness 
This test runs most of the time fine in CI.  But, if run alone
locally, will fail consistently because the default `acl.conf` has a
catch-all `{allow, all}` clause.  Probably another suite that runs
before this in CI unloads that and everything seems fine.
 2022-09-15 18:08:20 -03:00
Thales Macedo Garitezi 59d178d3b5 chore: update appups 2022-09-15 10:51:26 -03:00
Thales Macedo Garitezi d3c291c4d0 Merge remote-tracking branch 'origin/main-v4.3' into merge-v43-into-v44-h 2022-09-15 10:13:47 -03:00
Thales Macedo Garitezi 0599393741
Merge pull request #8942 from thalesmg/fix-ignore-dialyzer-pt1-43 
chore: fix ignored dialyzer warnings (part 1) (4.3)
 2022-09-14 14:56:59 -03:00
Thales Macedo Garitezi 6fc7df9c54
Merge pull request #8894 from thalesmg/bugfix-will-msg-authn-43 
test: add test case for not publishing will msg when not authorized
 2022-09-13 09:46:14 -03:00
JianBo He 5592b1503d
Merge pull request #8908 from HJianBo/using-erlang-system-time 
fix(time): replace os:system_time with erlang:system_time
 2022-09-13 09:09:54 +08:00
Thales Macedo Garitezi fa6c22b366 chore: update appups 2022-09-12 10:56:35 -03:00
Thales Macedo Garitezi d72ca84af0 chore: fix ignored dialyzer warnings (part 1) (4.3) 2022-09-12 10:56:35 -03:00
Thales Macedo Garitezi 1f5103b390 test: add test case for not publishing will msg when not authorized 2022-09-12 09:04:54 -03:00
Zaiming (Stone) Shi 4aa0f4980d chore: re-generate appup updates 2022-09-12 09:45:37 +02:00
Zaiming (Stone) Shi 1013f221e0 Merge remote-tracking branch 'origin/dev/v4.3.20' into dev/v4.4.9 2022-09-12 09:25:07 +02:00
Zaiming (Stone) Shi 4597344881
Merge pull request #8941 from thalesmg/fix-appup-check-contains-re 
ci(fix): fix check for appup coverage
 2022-09-11 17:27:38 +02:00
Thales Macedo Garitezi 94afb633f8 chore: update missing appup instructions 2022-09-09 13:37:00 -03:00
Zaiming (Stone) Shi 2c54190479 fix: revert 'accepted' state of exproto plugin 2022-09-09 12:27:02 +02:00
Shawn b9d75181e5 chore: update emqx_rule_engine.appup.src 2022-09-08 16:38:34 +08:00
Shawn f0cc75d144 fix(sql): topic matching to null values should return false 2022-09-08 16:37:38 +08:00
JianBo He 0d5c32a706 fix(time): use erlang:system_time/0-1 consistently 
Avoid the problem of inaccurate timers caused by mixing
erlang:system_time/0-1 and os:system_time/0-1
 2022-09-08 15:46:44 +08:00
firest d5494897c7 fix(jwt): make jwt support float timestamp claims 2022-09-06 11:51:39 +08:00
Thales Macedo Garitezi 9c77dbf168 chore: bump vsns and appups 2022-09-01 16:01:49 -03:00
Thales Macedo Garitezi 87cc57096f Merge remote-tracking branch 'origin/main-v4.3' into merge-v43-into-v44-f 2022-09-01 15:44:08 -03:00
firest 884ec15567 fix(jwt): make binary_to_number function support list type 2022-09-01 17:05:39 +08:00
firest a6cf74ea6f chore: fix emqx_auth_jwt appup 2022-09-01 16:52:41 +08:00
firest ddc25fc5c2 fix(jwt): simplify binary_to_number function 2022-09-01 16:27:15 +08:00
firest c999b43144 chore: bump emqx_auth_jwt version && update appup 2022-09-01 15:48:14 +08:00
firest 15c84ba152 fix(jwt): support non-integer timestamp claims 2022-09-01 15:43:32 +08:00
Thales Macedo Garitezi d1ac851bd9 chore: fix dialyzer errors (v4.4) 2022-08-31 16:24:34 -03:00
Zaiming (Stone) Shi 51412e25c8 fix(emqx_rule_engine): fix rule update function 
Prior to this change, the update of a rule will always try to
initialise the action because the 'enabled' flag is by default 'true'
 2022-08-31 15:13:38 +02:00
Zaiming (Stone) Shi 6f28e0eb83 chore: update appup files 2022-08-31 08:07:42 +02:00
Thales Macedo Garitezi b4cb256612 chore: bump app vsns and update appups 2022-08-30 18:02:31 -03:00
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
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
Georgy Sychev f3b596eb7e fix(webhook): removed User-Property field from message 2022-06-15 20:29:41 +04:00
Thales Macedo Garitezi b93a0743ac Merge branch 'main-v4.3' into 'main-v4.4' 2022-06-15 10:48:02 -03:00
Zaiming (Stone) Shi 83e9876e68
Merge pull request #8188 from zmstone/0612-build-exclude-sub-build-dirs 
build: ignore _build sub-dir in release dir
 2022-06-13 15:53:02 +01:00
Zaiming (Stone) Shi 38b7e5fa11 chore: bump app vsn for emqx_dashboard 2022-06-13 15:00:03 +02:00
DDDHuang fbd179b5f5
Merge pull request #8166 from DDDHuang/republish 
feat: republish support  qos & retain placeholder
 2022-06-13 16:46:30 +08:00
DDDHuang 1e02656035 fix(rule): better func name for emqx_rule_utils 2022-06-13 16:27:41 +08:00
DDDHuang c5f754c3b8 fix(suite): add republish qos & retain test case 2022-06-10 17:21:45 +08:00
DDDHuang e1e2fd50fd fix(republish): action input editable_select 2022-06-10 16:22:35 +08:00
DDDHuang 7d848950c7 fix(republish): to_qos & to_retain, add new util funcs 2022-06-10 16:10:30 +08:00
DDDHuang ac700b8e6f fix(rule): replubish SUIT 2022-06-09 17:35:55 +08:00
DDDHuang 6b1da3bcc8 feat: republish support qos & retain placeholder 2022-06-09 14:55:07 +08:00
Thales Macedo Garitezi d91c5806e0
Merge pull request #8129 from thalesmg/key-pass-dash-mgmt-43 
feat(tls): add configs for private key password in dashboard/mgmt
 2022-06-07 09:14:50 -03:00
Zaiming (Stone) Shi 1acbe4f721 chore(emqx_rule_engine): bump app vsn and update appup 2022-06-06 23:19:39 +02:00
Thales Macedo Garitezi 50ff2edf13
feat(tls): add configs for private key password in dashboard/mgmt 2022-06-03 11:21:12 -03:00
JianBo He 6c765b3e02 Merge tag 'v4.3.15-rc.3' into merge-main-v4.3-into-v4.4 2022-05-27 18:13:38 +08:00
JianBo He bfa54523c6 chore: revert the needless appup.src changes by #8061 2022-05-27 16:15:00 +08:00
JianBo He 7ee5f90516 Merge tag 'v4.3.15-rc.3' into merge-main-v4.3-into-v4.4 2022-05-27 11:09:11 +08:00