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
DDDHuang
78e5aa30d7
fix: rule engine clear resource bad name & type
2022-05-27 11:00:03 +08:00
DDDHuang
64a455bf8e
fix: old date format style example & some code format
2022-05-26 16:06:04 +08:00
DDDHuang
e1ad8aab46
fix: date format funs & logger conf & appup & change log
2022-05-26 13:13:00 +08:00
DDDHuang
4fc5cb2817
fix: rule engine date format fun & date to timestamp
2022-05-26 12:57:53 +08:00
JianBo He
7862d75ee4
Merge remote-tracking branch 'ce/main-v4.3' into merge-main-v4.3-into-v4.4
2022-05-25 16:59:04 +08:00
Shawn
d9252dc672
fix(schema): init resources before restoring schema registry
2022-05-24 14:37:44 +08:00
JianBo He
355f859a9b
test: format data-export files
2022-05-24 14:37:44 +08:00
JianBo He
0eef297747
chore: fix dialyzer error
2022-05-24 14:37:44 +08:00
JianBo He
1531b34f8a
test: add cases for importing e427
2022-05-24 14:37:44 +08:00
JianBo He
8fe933e885
fix: ensure auth_mnesia started first
2022-05-24 14:37:44 +08:00
Shawn
6e7cbc1b9b
chore: move epgsql deps to the top-level rebar.config
2022-05-24 09:33:17 +08:00
Xinyu Liu
211fee3035
Merge branch 'main-v4.4' into copy-of_main-v4.3
2022-05-23 23:19:19 +08:00
Xinyu Liu
c2a64facd4
Merge pull request #8022 from HJianBo/enhance-auth-mongo-appup
...
chore: enhance emqx_auth_mongo appup.src
2022-05-23 22:02:06 +08:00
JianBo He
90aa301830
chore: enhance emqx_auth_mongo appup.src
2022-05-23 21:44:05 +08:00
Thales Macedo Garitezi
cfd009abe1
Merge pull request #7996 from thalesmg/fix-import-data-outside-bkp
...
fix(backup): accept files outside `data/dir` when importing
2022-05-23 10:36:07 -03:00
JianBo He
2b81839126
chore(pgsql): restart emqx_auth_pgsql due to the egpsql upgraded
...
We have to restart the emqx_auth_pgsql because epgsql has upgraded 4.4.0 to 4.6.0
see: #8001
2022-05-23 20:27:41 +08:00
JianBo He
c93626e97f
chore: update changes and appup.src for emqx_management
2022-05-23 18:05:41 +08:00
JianBo He
b97f7fa8fc
Merge pull request #8005 from thalesmg/fix-mgmt-listener-port
...
fix(mgmt): allow binding to specific interface
2022-05-23 18:01:45 +08:00
DDDHuang
e73cd57b5a
fix: epgsql use emqx fork
2022-05-23 14:35:23 +08:00
Shawn
ca842aa869
fix: merge main-v4.3 to main-v4.4
2022-05-23 11:23:27 +08:00
JimMoen
69abca17f2
chore(appup): bump app version & update appup
2022-05-22 22:06:02 +08:00
JimMoen
bd23dae523
refactor(auth): auth apps use counter in emqx_metrics
2022-05-22 22:06:02 +08:00
Thales Macedo Garitezi
e57e2f68d4
fix(mgmt): allow binding to specific interface
...
When one tries to define the management http listener as, for example,
`172.25.0.2:8081`, ranch is given `{port, {"172.25.0.2",8081}}` and
breaks.
```sh
env EMQX_MANAGEMENT__LISTENER__HTTP=172.25.0.2:8081 make quickrun
```
```
2022-05-20T13:14:19.451272-03:00 [error] Supervisor: {<0.2485.0>,ranch_listener_sup}. Context: start_error. Reason: badarg. Offender: id=ranch_acceptors_sup,pid=undefined.
2022-05-20T13:14:19.451400-03:00 [error] crasher: initial call: supervisor:ranch_acceptors_sup/1, pid: <0.2487.0>, registered_name: [], exit: {badarg,[{inet_tcp,listen,2,[{file,"inet_tcp.erl"},{line,166}]},{ranch_acceptors_sup,init,1,[{file,"ranch_acceptors_sup.erl"},{line,39}]},{supervisor,init,1,[{file,"supervisor.erl"},{line,330}]},{gen_server,init_it,2,[{file,"gen_server.erl"},{line,423}]},{gen_server,init_it,6,[{file,"gen_server.erl"},{line,390}]},{proc_lib,init_p_do_apply,3,[{file,"proc_lib.erl"},{line,226}]}]}, ancestors: [<0.2485.0>,ranch_sup,<0.2187.0>], message_queue_len: 0, messages: [], links: [<0.2485.0>], dictionary: [{logger,error_logger}], trap_exit: true, status: running, heap_size: 610, stack_size: 29, reductions: 612; neighbours:
2022-05-20T13:14:19.451754-03:00 [error] Minirest(Handler): Start http:management listener on {"172.25.0.2",8081} unsuccessfully:
```
So, it’s currently not possible to make the management listener bind
to a specific interface.
2022-05-20 16:50:36 -03:00
Thales Macedo Garitezi
78c5cb4aac
refactor: only import checks for external backup file
2022-05-20 10:21:47 -03:00
DDDHuang
e6a2a3d5d2
Merge pull request #7999 from terry-xiaoyu/ldap_flaky_tests
...
fix(test): flaky test cases of auth_ldap
2022-05-20 15:26:22 +08:00
Xinyu Liu
e68c100cb2
Merge pull request #8001 from DDDHuang/up_pgsql_v43
...
Update pgsql SDK for otp23 & otp24
2022-05-20 15:19:09 +08:00
Shawn
35d091aa1b
fix(test): flaky test cases of auth_ldap
2022-05-20 14:18:39 +08:00
DDDHuang
c10c75ce00
fix: appup for epgsql 4.4.0 -> 4.6.0
2022-05-20 14:15:52 +08:00
DDDHuang
ae71125271
fix: update pgsql sdk for otp23 & otp24
2022-05-20 14:04:53 +08:00
Thales Macedo Garitezi
67e3e2de96
fix(backup): accept files outside `data/dir` when importing
...
Fixes https://github.com/emqx/emqx/issues/7990
Currently, when importing a data backup using `emqx_ctl data import
/some/data.json`, it'll only search in the `data/backup` directory and
fail if the file is not inside that dir.
2022-05-19 11:24:57 -03:00
Xinyu Liu
5806d5107f
Merge pull request #7991 from EMQ-YangM/add_rule_engine_func
...
feat: add rule engine function float2str/2
2022-05-19 15:31:45 +08:00
EMQ-YangM
7b38c66538
feat: add rule engine function float2str/2
2022-05-19 14:18:22 +08:00
zhongwencool
3df5c15819
feat: client apisupport mqueue_len/mqueue_dropped filter
2022-05-18 23:05:02 +08:00
Xinyu Liu
03c1efa439
Merge pull request #7977 from EMQ-YangM/hexstr2bin_support_half_byte
...
fix: hexstr2bin support half byte
2022-05-18 17:47:23 +08:00
EMQ-YangM
de1d8909c3
fix: hexstr2bin support half byte
2022-05-18 17:45:26 +08:00
DDDHuang
f269260293
Merge pull request #7745 from DDDHuang/fetch_re_status
...
fix: test resource with fetch new status
2022-05-18 15:55:07 +08:00
DDDHuang
71a7d71f68
fix(rule_engine): bad status SUITE
2022-05-18 15:18:12 +08:00
DDDHuang
a67dff4568
fix(rule_engine): better function name for resource
2022-05-18 11:17:06 +08:00
DDDHuang
f3bef3c81c
fix(rule_engine): remove resource with clean alarms
2022-05-18 10:37:54 +08:00
DDDHuang
a5716318b6
fix: better code format
2022-05-18 09:59:35 +08:00
zhongwencool
84fa6bfaeb
Merge pull request #7969 from zhongwencool/auth-acl-fitler-support
...
feat: auth acl fitler support
2022-05-17 18:14:46 +08:00
JimMoen
77fb8bfc19
test(mgmt): use pub api with bad params
2022-05-17 15:53:13 +08:00
JimMoen
d655bea16a
fix(mgmt): pubsub api use bad params caused sub client crash
2022-05-17 15:53:13 +08:00
zhongwencool
56f73548cc
fix: regurar appup vsn is string
2022-05-17 14:18:32 +08:00
zhongwencool
8882778a43
fix: appup failed
2022-05-17 13:07:18 +08:00
zhongwencool
2db123bec6
chore: update auth/acl changelog
2022-05-17 11:34:55 +08:00
DDDHuang
eb5956316a
fix(emqx_rule_engine): export func for rpc
2022-05-17 11:27:55 +08:00
zhongwencool
73faf08059
feat: mnesia auth/acl support multiple condition queries
2022-05-17 11:19:29 +08:00
DDDHuang
86e8de4737
fix: merge main-4.3
2022-05-17 09:49:19 +08:00
Ilya Averyanov
8198e3496f
fix(jwt auth): fix claim validation
2022-05-16 21:40:14 +03:00
Zaiming (Stone) Shi
810ca65011
Merge pull request #7953 from zmstone/0513-deny-all-acl-for-expired-token
...
fix(acl): deny all ACl when token expired
2022-05-16 10:19:47 +01:00
JianBo He
7c82b84293
Merge pull request #7960 from HJianBo/fix-mqttsn-qos2
...
fix(mqttsn): fix mqtt-sn client disconnected due to re-send a duplicated qos2 message
2022-05-16 16:46:21 +08:00
JianBo He
442248f1a4
feat(rule-engine): add proto_name/proto_ver for $event/client_disconnected event
2022-05-16 14:30:41 +08:00
JianBo He
7357ee5918
fix(mqttsn): fix mqtt-sn client disconnected due to re-send a duplicated qos2 message
2022-05-16 13:54:38 +08:00
Zaiming (Stone) Shi
655c2987f3
fix(acl): deny all ACl when token expired
2022-05-15 09:24:02 +02:00
EMQ-YangM
be16dfa758
fix: update emqx_rule_engine.appup.src
2022-05-07 17:53:13 +08:00
EMQ-YangM
8558a62ee2
feat: add some date format functions
2022-05-07 17:04:45 +08:00
Zaiming (Stone) Shi
787530459f
chore: bump emqx_management app version to 4.4.4
2022-04-29 20:22:21 +02:00
Zaiming (Stone) Shi
ea7f845d9f
Merge remote-tracking branch 'origin/main-v4.3' into main-v4.4
2022-04-29 20:21:44 +02:00
EMQ-YangM
e67b710fac
fix: update emqx_rule_engine.appup.src
2022-04-27 09:35:20 +08:00
EMQ-YangM
ffd51e1fe6
fix: remove error field
2022-04-26 19:07:00 +08:00
Zaiming (Stone) Shi
0dd48e30b6
fix(emqx_mgmt_auth): randomise all bytes in app secret
...
prior to this change, app secrets are uuids which is not
completely random.
2022-04-25 11:34:46 +02:00
zhongwencool
4789f1f97b
chore: bump management to 4.3.13
2022-04-24 17:37:37 +08:00
zhongwencool
9d4d918e2c
Merge branch 'main-v4.3' into fix-sub-search
2022-04-24 17:18:01 +08:00
zhongwencool
29e453383a
chore: update changelog
2022-04-24 16:48:12 +08:00
Zaiming (Stone) Shi
0bf55b99e3
chore: fix appup after merge from 4.3
2022-04-23 10:32:13 +02:00
Zaiming (Stone) Shi
723f294119
Merge remote-tracking branch 'origin/main-v4.3' into merge-v43-to-v44
2022-04-23 10:07:25 +02:00
Ilya Averyanov
41746e8d7a
feat(emqx_auth_jwt): use JWT for ACL checks
2022-04-22 12:22:58 +03:00
Ilya Averyanov
36c1ecd9b7
chore(emqx_auth_jwt): do not use gen_server call for jwt verification
2022-04-22 12:16:32 +03:00
zhongwencool
10bca7f6b5
fix: topic filter with qos/clientid/share
2022-04-22 14:42:12 +08:00
Zaiming (Stone) Shi
1de3ed8783
Merge remote-tracking branch 'origin/main-v4.3' into dev/v4.3.15
2022-04-22 07:45:00 +02:00
Zaiming (Stone) Shi
31b4be79f0
chore(emqx_rule_engine): update appup
2022-04-20 09:29:14 +02:00
JianBo He
89c65b6535
Merge tag 'v4.3.14-rc.4' into merge-main-v4.3-into-v4.4
2022-04-16 11:28:07 +08:00
JianBo He
ffdf7fb7b6
Merge pull request #7629 from DDDHuang/backup_file_43
...
fix: backup data filename, uri decode
2022-04-16 10:36:43 +08:00
Xinyu Liu
ade2716616
Merge pull request #7635 from terry-xiaoyu/test_resource_failed
...
fix(rule): test resource failed from all nodes
2022-04-16 02:18:44 +08:00
Shawn
898dc00f58
fix(rule): test resource failed from all nodes
2022-04-16 01:49:01 +08:00
DDDHuang
b28c751856
fix: backup data filename, uri decode
2022-04-15 17:12:04 +08:00
DDDHuang
12874aa688
fix: backup data filename, uri decode
2022-04-15 16:12:40 +08:00
JianBo He
c8c52dfc39
Merge remote-tracking branch 'ce/main-v4.3' into merge-main-v4.3-into-v4.4
2022-04-14 11:56:35 +08:00
JimMoen
6168745f90
chore: update copyright
2022-04-14 11:23:25 +08:00
Xinyu Liu
97dd625c38
Merge pull request #7616 from emqx/revert-7596-jwt-acl-nocache
...
Revert "Add support for JWT authorization"
2022-04-14 11:14:40 +08:00
JianBo He
47a5bc3f09
Revert "Add support for JWT authorization"
2022-04-14 10:44:06 +08:00
Shawn
ae8f03a188
fix(rules): deny POST /rules with an existing Id
2022-04-13 23:16:29 +08:00
Ilya Averyanov
d8db671abb
feat(emqx_auth_jwt): use JWT for ACL checks
2022-04-13 13:17:27 +03:00
Ilya Averyanov
f763775588
chore(emqx_auth_jwt): do not use gen_server call for jwt verification
2022-04-13 13:16:53 +03:00
Xinyu Liu
4e515a3f83
Merge pull request #7603 from EMQ-YangM/fix_zip_compress
...
fix: add zip_compress functions
2022-04-13 15:37:02 +08:00
EMQ-YangM
0dc26ba483
fix: create new version
2022-04-13 15:01:47 +08:00
EMQ-YangM
6600de710a
fix: fix behavior of rule-engine when selection field does not exist
...
when the selection field does not exist, it should output field => undefined
2022-04-13 14:55:43 +08:00
EMQ-YangM
1886893fa1
fix: add zip_compress functions
2022-04-13 14:19:32 +08:00
JianBo He
fab71ddcfe
Merge tag 'v4.3.14-rc.2' into merge-main-v4.3-into-v4.4
2022-04-13 09:13:52 +08:00
JianBo He
9ab533b206
Merge pull request #7592 from DDDHuang/bridge_mqtt_subqos
...
fix: bridge mqtt config schema, subscriptions with default QoS 0
2022-04-12 18:43:42 +08:00
DDDHuang
5b9452979d
fix: bridge mqtt config schema, subscriptions with default QoS 0
2022-04-12 16:47:39 +08:00
JianBo He
f8080ed71b
Merge tag 'v4.3.14-rc.2' into merge-main-v4.3-into-v4.4
2022-04-12 13:47:11 +08:00
DDDHuang
73ac4c1ff8
fix: random id ensure do not delete resource
2022-04-11 18:33:20 +08:00
DDDHuang
a483f5ffa4
fix: bad appup
2022-04-10 12:57:50 +08:00
DDDHuang
4a692f0c2e
fix: config schema sni disable
2022-04-10 12:57:50 +08:00
DDDHuang
af4250dcf4
fix: mqtt bridge config schema sni disable spelling
2022-04-10 12:57:50 +08:00
DDDHuang
3e9b91e53a
fix: disable server_name_indication suport
2022-04-10 12:57:50 +08:00
JianBo He
e0c3071a49
chore: fix appup.src for exhook
2022-04-08 19:59:24 +08:00
JianBo He
7461484b9e
Merge tag 'v4.3.14-rc.1' into merge-main-v4.3-into-v4.4
...
Version v4.3.14-rc.1
2022-04-08 19:29:30 +08:00
Xinyu Liu
82657017f9
Merge pull request #7549 from HJianBo/typos-fixes
...
chore: eliminate some compiling warnings and improve change logs
2022-04-08 14:13:21 +08:00
EMQ-YangM
8530ecec4d
fix: delete a resource before updating it
2022-04-08 11:46:10 +08:00
Yang Miao
70e29b08e6
Merge pull request #7550 from EMQ-YangM/add_try_catch
...
fix: discard rpc call failed data
2022-04-08 11:28:01 +08:00
JianBo He
bf1a3fe1eb
chore: eliminate some compiling warnings and improve change logs
2022-04-08 11:16:37 +08:00
EMQ-YangM
adf7d53ca5
fix: use concat replace flatten
2022-04-08 10:27:28 +08:00
EMQ-YangM
7606f55673
fix: update emqx_rule_engine.appup.src
2022-04-08 10:17:18 +08:00
EMQ-YangM
96b26bf4ce
fix: discard rpc call failed data
2022-04-08 10:12:40 +08:00
DDDHuang
f80a2e345c
Merge pull request #7545 from DDDHuang/start_mongo_auth
...
fix: start auth & acl mongo with availability check
2022-04-08 09:42:53 +08:00
DDDHuang
3c34cb3b6a
fix: start auth & acl mongo with availability check
2022-04-07 18:27:04 +08:00
Xinyu Liu
8f4e390891
Merge branch 'main-v4.4' into cp-of_main-v4.3
2022-04-07 17:53:40 +08:00
JimMoen
1910249058
chore: update CHANGES-4.3.md and appup
2022-04-07 17:26:59 +08:00
JimMoen
bdea05f022
test(exhook): other cluster_name only handle 'cilent.*' hooks
2022-04-07 17:26:59 +08:00
JimMoen
e7f5372fae
feat(exhook): add field `meta` for grpc proto
2022-04-07 17:26:59 +08:00
Yang Miao
16dc0d6555
Merge pull request #7536 from EMQ-YangM/reset_cluster_metrics
...
feat: impl reset cluster metrics
2022-04-07 11:31:49 +08:00
Yang Miao
75486efb11
Merge pull request #7534 from EMQ-YangM/dev/v4.3.14
...
fix: change rule_speed record type
2022-04-07 10:37:27 +08:00
EMQ-YangM
1c32b08b21
feat: impl reset cluster metrics
2022-04-07 10:32:58 +08:00
EMQ-YangM
0e02e8df9d
fix: change rule_speed record type
2022-04-07 09:50:31 +08:00
JianBo He
dfea07fd0f
Merge remote-tracking branch 'ce/main-v4.3' into merge-v43-to-v44
2022-04-07 09:37:47 +08:00
Zaiming (Stone) Shi
d1e773d83c
test: fix float point number compare
2022-04-06 21:09:10 +02:00
JianBo He
243a30dacb
chore: update appup.src for v4.4
2022-04-06 17:03:44 +02:00
Thales Macedo Garitezi
a1705f5653
fix: flaky test
2022-04-06 09:11:09 -03:00
Zaiming (Stone) Shi
bad227c45d
chore: re-generate appup files
2022-04-06 13:33:33 +02:00
Zaiming (Stone) Shi
f3a7c75871
Merge remote-tracking branch 'origin/main-v4.3' into dev/v4.4.3
2022-04-06 13:24:37 +02:00
JianBo He
c603b2c7e3
chore: update appup.src files
2022-04-06 10:44:08 +08:00
JianBo He
024c7c59b7
chore: unify all psk cipher suites
2022-04-06 10:43:27 +08:00
JianBo He
f1ff80fc16
test(psk): test psk file reading and handshake
2022-04-06 10:43:27 +08:00
Georgy Sychev
1a715c8708
feat(emqx_dashboard): subsciption to update password
...
emqx_dashboard restarted in ekka hook
Closes #3155
2022-04-05 10:40:09 +02:00
Zaiming (Stone) Shi
4b42da53e7
Merge pull request #7498 from zmstone/0401-4.3-docs-fix-cli-example-type-add-forward-not-forwards
...
docs: fix typos in CLI doc, add-froard not add-forwards
2022-04-04 20:09:35 +01:00
Zaiming (Stone) Shi
5b58eaa203
refactor(emqx_rule_engine): return not raise error for known reasons
2022-04-04 19:10:52 +02:00
Zaiming (Stone) Shi
65e2c1390e
fix(ssl): try to guess cert file paths
...
The GUI has "etc/certx/..." hard coded as defaults.
However this relative path only works when it's a zip package
or when running in docker.
The other two possible abs paths are:
1. the upload dir
2. "/etc"
2022-04-04 19:10:52 +02:00
Xinyu Liu
7b4d3ecb3a
Merge pull request #7504 from EMQ-YangM/update_mongodb_driver
...
fix: update mongodb driver to fix potential process leak
2022-04-03 11:59:09 +08:00
Zaiming (Stone) Shi
67ce53b5fc
fix(appup): re-generated emqx_rule_engine.appup.src
2022-04-02 23:25:36 +02:00
Zaiming (Stone) Shi
a54813dd69
fix(appup): re-generate appup from 4.3.13
2022-04-02 23:00:41 +02:00
EMQ-YangM
9d25c58bb1
fix: move mongodb-erlang to top level rebar.config
2022-04-02 16:54:48 +08:00
EMQ-YangM
299c369d80
feat: enhanced rule engine error handling when json parsing error
2022-04-02 16:24:07 +08:00
EMQ-YangM
c84a4b2b6b
fix: update mongodb driver to fix potential process leak
2022-04-02 10:27:44 +08:00
Zaiming (Stone) Shi
25dc4ab14f
docs: fix typos in CLI doc, add-froard not add-forwards
2022-04-01 18:28:25 +02:00
Xinyu Liu
b84ef11935
Merge branch 'dev/v4.3.14' into dev/v4.3.14
2022-04-01 09:32:42 +08:00
Xinyu Liu
3cc0bb8284
Merge branch 'dev/v4.3.14' into fix_patter_match_v4.3
2022-04-01 09:14:34 +08:00
EMQ-YangM
326634c287
feat: impl api PUT /rules/{id}/reset_metrics
2022-03-31 18:00:57 +08:00
zhongwencool
fe6af95f88
chore: remove useless stacktrace from catch.
2022-03-31 16:01:20 +08:00
EMQ-YangM
510e4d31e4
fix: load_module emqx_rule_events
2022-03-31 13:48:12 +08:00
EMQ-YangM
cead8c9056
fix: use masp:get/3 to avoid crash after match failure
2022-03-30 09:44:06 +08:00
DDDHuang
6ab0934674
fix(rule): connection test when creating a resource
2022-03-30 09:23:51 +08:00
DDDHuang
47e807b2ac
Revert "fix(rule): connection test when creating a resource"
2022-03-29 19:16:06 +08:00