Commit Graph

1838 Commits

Author SHA1 Message Date
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
DDDHuang d297e883c2 fix: appup 2022-03-29 17:37:00 +08:00
zhongwencool 4ee586a738 fix: appup.src 2022-03-29 17:12:35 +08:00
DDDHuang 46cfcf662e fix(rule): safe apply & test resource in cluster 2022-03-29 13:37:32 +08:00
JianBo He 22573ff294
Merge pull request #7408 from JimMoen/exhook-priority
Support exhook customize hook priority
2022-03-28 18:29:25 +08:00
JimMoen b17fd40091 chore(exhook): update appup.src, add field when updating module 2022-03-28 15:54:38 +08:00
JimMoen 1a57d0d2ca test(exhook): customized hooks priority 2022-03-28 15:54:38 +08:00
JimMoen b7f10b67a8 feat(exhook): support customize hook_priority 2022-03-28 15:54:38 +08:00
Yang Miao c0da7bcee0
Merge pull request #7407 from EMQ-YangM/add_client_check_acl_complete
feat: add rule events: 'client.connack', 'client.check_acl_complete'
2022-03-28 10:31:27 +08:00
Chris a1a37bcbee feat: Add mongo_date function to support saving timestamp as MongoDB Date object 2022-03-25 17:43:32 +01:00
EMQ-YangM 059fc6e3c7 feat(emqx_rule_events): add field 'is_cache' 2022-03-25 18:05:25 +08:00
EMQ-YangM 3eab6b436b fix(appup): load_module emqx_access_control 2022-03-25 11:27:28 +08:00
EMQ-YangM e0d142c625 feat: add client.check_acl_complete event 2022-03-25 11:08:30 +08:00
Zaiming (Stone) Shi 59b8fd6ff8
Merge pull request #7383 from zmstone/minor-fixes
Minor fixes 4.4
2022-03-24 11:26:05 +01:00
EMQ-YangM 326b01968b fix(appup): load_module emqx_rule_events 2022-03-24 16:52:01 +08:00
Zaiming (Stone) Shi a39cc47a45
Merge pull request #7380 from zmstone/test-fix-data-import-case-failure
test: fix data import test failure
2022-03-24 08:26:33 +01:00
EMQ-YangM 3410e20fbe feat(emqx_rule_engine_events): add client_connack event 2022-03-24 14:58:41 +08:00
DDDHuang c3237b6281 fix(rule): connection test when creating a resource 2022-03-24 10:39:54 +08:00
JianBo He 6e08ede0b0 chore: update appup.src files by update-appup.sh 2022-03-24 07:38:42 +08:00
JianBo He 94efb190c6 Merge remote-tracking branch 'ce/main-v4.3' into merge-main-v4.3-into-v4.4 2022-03-24 07:08:06 +08:00
Zaiming (Stone) Shi ada29de3d5 fix(appup): add changed modules 2022-03-23 15:58:07 +01:00
Zaiming (Stone) Shi 7e01a52457 fix: typo in function name 2022-03-23 15:56:51 +01:00
Zaiming (Stone) Shi b99627b866 chore(emqx_auth_mongo_sup): port changes from ee back to ce 2022-03-23 15:50:36 +01:00
Zaiming (Stone) Shi 1c448d6016 test: use try catch instaed of sopan a process 2022-03-23 13:51:13 +01:00
Zaiming (Stone) Shi 3868fb088c chore: bump emqx_web_hook to 4.3.10 2022-03-23 13:35:05 +01:00
Zaiming (Stone) Shi 929ca787f4 test: fix data import test failure 2022-03-23 13:12:57 +01:00
JianBo He b76372e621 chore: remove duplicated emqx_rule_funcs in appup.src 2022-03-23 19:29:58 +08:00
JianBo He 5492ab2cc9 chore(bridge-mqtt): use `VSN` placeholder instead of vsn number 2022-03-23 18:37:40 +08:00
JianBo He a4d2aa1dd4 chore: correct the app.src & appup.src 2022-03-23 18:37:40 +08:00
Xinyu Liu 0d55b9242d
Merge branch 'main-v4.3' into resource_get_status_timeout 2022-03-23 17:59:59 +08:00
Shawn e8c7388aa4 chore: update appup file for emqx_rule_engine 2022-03-23 16:21:27 +08:00
zhongwencool b993595c6d fix: add emqx_rule_funcs to appup.src 2022-03-23 15:42:53 +08:00
zhongwencool 99dfd8504c fix: bad authorization format crash with 500 2022-03-23 15:34:23 +08:00
Shawn 5275e6a30f fix(rule): get the cached status when calling emqx_rule_engine:get_resource_status/1 2022-03-23 15:33:50 +08:00
zhongwencool 5a042645e2 fix: make all traces stopped when disable emqx_trace_module 2022-03-23 10:31:01 +08:00
Zaiming (Stone) Shi 42d94b478f fix: update app vsn and update appup 2022-03-22 21:08:20 +01:00
Zaiming (Stone) Shi 692e2c79a2 chore: update appups after merge 2022-03-22 20:58:34 +01:00
Zaiming (Stone) Shi 6ea8d2f270 Merge remote-tracking branch 'origin/main-v4.3' into main-v4.4 2022-03-22 20:54:22 +01:00
EMQ-YangM 62eff94249 feat(emqx_rule_funcs): add functions gzip, gunzip, zip, unzip 2022-03-22 15:16:31 +08:00
zhongwencool 2be97a24dd fix: subscribe api crash with bad qos. 2022-03-21 09:19:28 +08:00
Shawn 5823751d7d chore: bump emqx_rule_engine to 4.3.9 2022-03-18 18:28:30 +08:00
Shawn 81ae2be760 fix(rules): enlarge precisions of floats to maximum 17 decimal places.
When printing floats to strings, we have to define a small decimal
limits to avoid print a too long and "inaccurate" float number:

```
2> float_to_binary(0.3).
<<"2.99999999999999988898e-01">>
```

This fix sets precision of floats to 17 digits after the decimal point.

This precision is larger than precision of most `double` data type used by
databases(14 digits for mysql and 15 digits for pgsql).
2022-03-18 15:42:01 +08:00
JianBo He 72e37dd144
Merge pull request #7300 from HJianBo/mqtt-sn-resume-subs
feat(mqttsn): introduce subs_resume option
2022-03-17 17:51:41 +08:00
zhongwencool 8cf97a93af fix: urldecode appid and username. 2022-03-16 16:33:03 +08:00
DDDHuang 0d7ad25804
Merge pull request #7281 from DDDHuang/backup_json
fix: check backup file type & legal json
2022-03-16 16:16:06 +08:00
zhongwencool bfadcebb9c chore: remind the user to delete bad appid/username. 2022-03-16 15:23:10 +08:00
zhongwencool b44512cdab fix: Add string legitimacy check. 2022-03-16 10:31:41 +08:00
DDDHuang 95cc5a19c8 fix: bad list & bad SUITE 2022-03-16 10:07:13 +08:00
DDDHuang 02e7f3bfe0 feat: backup data support old versions dir 2022-03-15 15:05:48 +08:00
zhongwencool dd86ece33e
Merge pull request #7308 from zhongwencool/set-keepalive-via-body
feat: Support set keepalive via queryString & Body HTTP API.
2022-03-15 14:30:42 +08:00
JianBo He a3d8981635 refactor(mqttsn): assign subs_resume to mqtt-sn client process state 2022-03-15 11:28:40 +08:00
JianBo He 3823ab8693 fix: typos in emqx_sn.appup.src 2022-03-15 10:51:30 +08:00
JianBo He f8b7b9415d chore(mqttsn): update appup.src 2022-03-15 10:51:30 +08:00
JianBo He d4c1b3acc6 test(mqttsn): more tests for topic register and subs_resume 2022-03-15 10:51:05 +08:00
JianBo He 3201d11212 feat(mqttsn): introduce subs_resume option
As the mqtt-sn v1.2 spec metioned, the gateway will be able to sync the
subscriptions topic-name registry to client when the client resume it's
session

port from: https://github.com/emqx/emqx-sn/pull/195
2022-03-15 10:51:05 +08:00
zhongwencool 4adc914372 feat: Support set keepalive via queryString & Body HTTP API. 2022-03-15 10:40:01 +08:00
Chris Hicks eb5d9fa501
Merge pull request #7298 from mononym/fix-mongodb-timeout-crash
fix: prevent crash when mongodb connection times out
2022-03-14 17:01:09 +01:00
Chris 440523138b fix: prevent crash when mongodb connection times out 2022-03-14 15:09:49 +01:00
DDDHuang 1ec0377a69 fix: api file path with filename:join(List) & app up 2022-03-14 16:11:07 +08:00
DDDHuang 2da3333879 fix: check backup file type & legal json 2022-03-14 14:16:34 +08:00
Chris ca5637b4a3 fix: update mongodb client to include deadloop fix 2022-03-09 10:57:29 +01:00
Zaiming (Stone) Shi 571456b3c4 Merge remote-tracking branch 'origin/main-v4.3' into main-v4.4 2022-03-08 18:59:38 +01:00
Zaiming (Stone) Shi d8e29f19cb refactor(appup): always generate appup from script 2022-03-08 13:24:54 +01:00
JianBo He dbacfb2bb4 test(mgmt): ensure application loaded 2022-03-03 22:02:27 +08:00
JianBo He f0be91b7fd Merge remote-tracking branch 'ce/main-v4.3' into merge-main-v4.3-into-v4.4 2022-03-03 11:13:45 +08:00
Zaiming (Stone) Shi 52ff180e55 chore: pin esockd 5.8.5 2022-03-01 17:02:29 +01:00
Zaiming (Stone) Shi cca9e52c9a chore(appup): add missing appup instructions 2022-03-01 11:41:52 +01:00
ieQu1 06db325b5f fix(auth_mnesia): Fix error message 2022-02-28 18:11:55 +01:00
Zaiming (Stone) Shi c157a16907 Merge remote-tracking branch 'origin/main-v4.3' into main-v4.4 2022-02-26 01:05:06 +01:00
gsychev 19fcd6a4f6
Merge branch 'main-v4.3' into bridge_config_topic_node_template_43 2022-02-25 10:05:36 +00:00
Thales Macedo Garitezi cf1cc7e9db
chore(appup): update appup files 2022-02-24 17:14:47 -03:00
JianBo He b2093409b6
Merge pull request #6970 from HJianBo/fix-no-register-msg-replaying
Fix the MQTT-SN message replay when the topic is not registered to the client
2022-02-24 16:14:27 +08:00
JianBo He d943cc2f1c chore(exproto): update appup.src 2022-02-24 11:51:00 +08:00
JianBo He 7236206373 fix(exproto): handle discard call 2022-02-24 11:51:00 +08:00
JianBo He 76d0835e4f chore(mqttsn): update appup.src 2022-02-24 11:30:12 +08:00
JianBo He e9031ea4c1 fix(mqttsn): cache and replay the invaild-topic-id delivery 2022-02-24 11:28:04 +08:00
JianBo He 96a86061c2 refactor(sn): pretty frame print formation 2022-02-24 11:28:04 +08:00
JianBo He ddf2022542
Merge pull request #6983 from HJianBo/fix-exproto-online-clients-v4.3
Improve ExProto client management
2022-02-23 10:59:19 +08:00
Zaiming (Stone) Shi 1fa27b28e4 fix: bump emqx_web_hook app version 2022-02-22 16:15:15 +01:00
lafirest 9ef760aff9
Merge pull request #7078 from lafirest/fix/api
fix(emqx_mgmt_http): add slow subs api into emqx_mgmt_http api list
2022-02-22 20:52:30 +08:00
Zaiming (Stone) Shi 43c900bb5a chore: rename more descriptive EQM X to EMQX 2022-02-22 11:16:38 +01:00
JianBo He 7adc5fb158
Merge branch 'main-v4.3' into fix-exproto-online-clients-v4.3 2022-02-22 15:46:27 +08:00
JianBo He 521bdd20b4 Merge remote-tracking branch 'ce/main-v4.3' into merge-main-v4.3-into-v4.4 2022-02-22 11:43:46 +08:00
JimMoen 3cc2f0e2d3 fix(stomp): `conn_props` should be map 2022-02-22 11:31:14 +08:00
JianBo He a2d8405f99 chore: update appup.src 2022-02-22 10:30:52 +08:00
JianBo He b802bcb6fc refactor(exproto): pre-register the anonymous client 2022-02-22 10:23:16 +08:00
lafirest 9abbe4eafc chore(emqx_management): bump app version 2022-02-21 14:56:15 +08:00
lafirest 62ced62aac fix(emqx_mgmt_http): add slow subs api into emqx_mgmt_http api list 2022-02-21 14:33:36 +08:00
Ilya Averyanov 557c52dd8a chore(codestyle): remove Elvis 2022-02-18 20:35:19 +03:00
lafirest 1a1415a996 fix(emqx_slow_subs): fix upgrade action error 2022-02-18 16:27:22 +08:00
lafirest 8a75b53052 fix(emqx_slow_subs): add upgrade/downgrade action 2022-02-18 14:32:45 +08:00
JianBo He b27ac84625
Merge pull request #7045 from HJianBo/not-stop-application
chore(webhook): refine appup.src
2022-02-18 09:21:07 +08:00
Georgy Sychev 0bd080c063 feat(emqx_bridge_mqtt): ${node} in topic config
Adds ${node} interpolation in topic option of configuration
Just like the clientid already works

Closes: #6431

feat(emqx_bridge_mqtt): bumped versions the right way

chore(appup): appups for mqtt bridge

feat(mqtt_bridge): test for bridge config

And also bumped one small version

chore(mqtt_bridge): updated CHANGES-4.3.md

fix(mqtt_bridge): conditional export

chore(mqtt_bridge): appup
2022-02-17 16:05:34 +03:00
EMQ-YangM af8bc8ee32 fix(emqx_rule_metrics): add a function for code hot upgrade 2022-02-17 18:15:19 +08:00
JianBo He fde634ac27 chore(webhook): refine appup.src 2022-02-17 17:48:58 +08:00
DDDHuang 42c70cd2a5 fix(doc): code spelling 2022-02-17 14:06:17 +08:00
Zaiming (Stone) Shi a5f6e94467 docs: EMQ X -> EMQX 2022-02-15 22:12:46 +01:00
Zaiming (Stone) Shi e09e5673eb docs(README): EMQ X -> EMQX 2022-02-15 16:15:25 +01:00
JianBo He 74aa209207 chore(lwm2m): update app.src & appup.src 2022-02-15 11:59:43 +08:00
JianBo He 425546864d fix(lwm2m): fix querying lwm2m client list on the another node 2022-02-15 11:23:44 +08:00
Zaiming (Stone) Shi 91180595d0 refactor(cli): simplify ACL cache CLI logging 2022-02-14 14:52:34 +01:00
Zaiming (Stone) Shi f6ca64c76d feat: add pem cache CLI 2022-02-14 14:52:34 +01:00
JianBo He a88dd4aaa5 Merge tag 'v4.3.12' into main-v4.4 2022-02-14 19:37:59 +08:00
Thales Macedo Garitezi fdef292ef7
fix(appup): rm redundant `load_module` instruction after `update` 2022-02-10 09:31:36 -03:00
Shawn 646ef25d96
Merge branch 'main-v4.3' into fix-ctl-print-43 2022-02-10 19:13:29 +08:00
Zaiming (Stone) Shi 1392fa0b1d Merge remote-tracking branch 'origin/main-v4.3' into merge-v4.3-to-v4.4 2022-02-10 11:25:17 +01:00
JianBo He cdfeb46951 test(mqttsn): remove unused vars 2022-02-10 15:30:10 +08:00
JianBo He 289904bbcf fix(stomp): fix unexpected_linefeed error if the packet truncated on headers 2022-02-10 14:48:45 +08:00
Thales Macedo Garitezi e053700441
style: please elvis checks 2022-02-09 11:02:05 -03:00
Thales Macedo Garitezi 5e223ac64f
chore(appup): update appup files 2022-02-09 09:54:39 -03:00
Thales Macedo Garitezi b968d4c416
fix(ctl): fix formatting when printing messages without arguments (4.3)
Without passing an empty argument list to `emqx_ctl:print`, formatting
instructions like `~n` are being printed literally.

```
Ignore.~nJoin the cluster successfully.~nCluster status: #{running_nodes =>
                      ['emqx@emqx-0.int.thalesmg','emqx@emqx-1.int.thalesmg',
                       'emqx@emqx-2.int.thalesmg','emqx@emqx-3.int.thalesmg',
                       'emqx@emqx-4.int.thalesmg'],
                  stopped_nodes => []}
```
2022-02-09 09:36:27 -03:00
lafirest 252514bfe0 fix(emqx_slow_subs): trap the exit message 2022-02-08 18:28:00 +08:00
Shawn 791b22f151
Merge branch 'main-v4.4' into copy_of_main-v4.3 2022-01-27 18:46:49 +08:00
zhongwencool e2dec09b0d fix(alarm): watermark replace >= =< with > < 2022-01-27 11:59:48 +08:00
JianBo He 4cdd529b5a
Merge pull request #6866 from HJianBo/remove_connected_at_feild
fix(webhook): remove the connected_at field for client.connect
2022-01-27 10:41:53 +08:00
JianBo He 18ed00e57e test(stomp): add testcase for sticky tcp strem 2022-01-26 15:49:51 +08:00
JianBo He fd88f484d2 fix(stomp): fix the sticky tcp stream parsing 2022-01-26 15:41:14 +08:00
JianBo He 85652aa373 fix(webhook): remove the connected_at field for client.connect 2022-01-26 15:01:36 +08:00
DDDHuang 43e528b2ba fix(cli): emqx_auth_mnesia_cli function spec 2022-01-25 17:11:22 +08:00
lafirest 1f718fbb94 fix(emqx_slow_subs): fix index update error 2022-01-24 18:16:29 +08:00
JianBo He ceeeaf37e1
Merge pull request #6819 from HJianBo/merge-main-v4.3-into-v4.4
[Conflicts Resolved] Sync main-v4.3 into main-v4.4
2022-01-24 17:04:04 +08:00
JianBo He e5fab4df25 Merge remote-tracking branch 'ce/main-v4.3' into merge-main-v4.3-into-v4.4 2022-01-24 15:25:01 +08:00
JianBo He 680339ff14
Merge pull request #6840 from zhongwencool/auth-default-user-warnring
fix(auth_mnesia): don't force update default user.
2022-01-24 15:24:13 +08:00
zhongwencool efa3e32ee5 fix(auth_mnesia): don't force update default user. 2022-01-24 13:58:37 +08:00
JianBo He 7c31de7c55
Merge pull request #6839 from JimMoen/chore-mgmt-app-vsn
chore(app_vsn): revert management app.src repetitive increased
2022-01-24 12:08:52 +08:00
JimMoen 287b48d49a chore(app_vsn): revert management app.src repetitive increased 2022-01-24 11:38:25 +08:00
EMQ-YangM 03d240c59e fix(emqx_rule_engine_metrics): fix code_change vsn value 2022-01-24 11:14:31 +08:00
JianBo He b635d56aec Merge branch 'main-v4.3' into merge-main-v4.3-into-v4.4 2022-01-21 16:27:56 +08:00
firest 5ec3b6aef7 fix(emqx_slow_subs): add default for stats_type 2022-01-21 16:25:06 +08:00
JianBo He 8f517cebf7
Merge branch 'main-v4.3' into more-fields-for-webhook 2022-01-21 15:01:38 +08:00
JianBo He c5f9bfc305
Merge pull request #6811 from HJianBo/acl-metrics-fixes
refactor(metrics): more clear for acl metrics
2022-01-21 15:00:56 +08:00
JianBo He f86c1316e7 chore(auth): bump version & update appup.src 2022-01-21 14:24:03 +08:00
JianBo He f0a3b7754e refactor: remove the acl metrics for all auth plugins 2022-01-21 14:24:03 +08:00
JianBo He 77609ebd96 chore: bump vsn and update appup.src 2022-01-21 13:52:07 +08:00
JianBo He ad996afe47 chore: ensure connected_at field for connect/connack/disconnected event 2022-01-21 13:52:05 +08:00
zhongwencool 140a1c0276 chore(api): add api_sub http api test 2022-01-21 10:56:41 +08:00
JianBo He 508e50af63 Merge branch 'main-v4.3' into merge-main-v4.3-into-v4.4 2022-01-21 10:44:38 +08:00
zhongwencool f36791bab9 fix(api): sub api return meta 2022-01-20 18:40:25 +08:00
JianBo He 461f856239 fix(plugin-lib): bump vsn to 4.4.1 2022-01-20 14:10:33 +08:00
Shawn 2d00373e49 fix(appup): update appup file for emqx_rule_engine_api 2022-01-19 19:51:25 +08:00
Shawn 70c6ac4e0d fix(rule): deny POST rules or resources with empty ids 2022-01-19 19:22:25 +08:00
lafirest 14636a745e fix(emqx_slow_subs_api): return error when the module is not enable 2022-01-19 16:11:11 +08:00
lafirest e82c73988b
Merge pull request #6790 from lafirest/fix/slow_subs
fix(emqx_slow_subs): add ClientInfo into the args of the delivery.com…
2022-01-19 15:54:44 +08:00
lafirest 46f86204c0 fix(emqx_slow_subs): add ClientInfo into the args of the delivery.completed hook 2022-01-19 14:02:30 +08:00
zhongwencool 50606a7eab fix(data_import): support v4.4 2022-01-19 11:55:39 +08:00
zhongwencool 24f8c353dc Merge branch 'main-v4.4' into sync-from-4.3-to-4.4 2022-01-19 11:24:57 +08:00
zhongwencool 506be21aa2 fix(auth_mnesia): bump up emqx_mgmt to 4.3.10 2022-01-19 10:36:12 +08:00
lafirest 696acbfc5c fix(emqx_slow_subs): change on_publish_completed to on_delivery_completed 2022-01-19 09:50:31 +08:00
lafirest 44fe882f14 refactor(emqx_slow_subs): refactor slow subs 2022-01-19 09:50:31 +08:00
zhongwencool 19fc143f41 fix(auth_mnesia): import auth acls data according to different data format 2022-01-19 00:12:30 +08:00
DDDHuang 5397d80680 feat(metrics): session metrics & api format 2022-01-17 15:15:00 +08:00
Shawn 2da30465de fix(merge): solve conflicts when merge 4.4 to 4.3 2022-01-14 15:45:33 +08:00
zhongwencool 51e62468ed
Merge pull request #6717 from zhongwencool/auth-mnesia-default-import
fix(auth): force update default mqtt_user when password or hash_type changed.
2022-01-14 15:35:10 +08:00
zhongwencool 4ba43d3aea fix(auth): move log outside of transaction 2022-01-14 11:38:28 +08:00
zhongwencool 729ab6f60d
Merge branch 'main-v4.3' into auth-mnesia-default-import 2022-01-14 11:29:41 +08:00
Shawn eec566fe40 fix(rule): restore the metrics for actions in cluster 2022-01-14 10:33:32 +08:00
zhongwencool e96c9ada52 chore(test): fix typo error 2022-01-14 00:43:27 +08:00
Shawn 4abcab8d52 fix(appup): update appup files for emqx,emqx_sn,rule_engine 2022-01-13 18:37:22 +08:00
JianBo He b3862fb283 chore: fix the app vsn and appup.src 2022-01-13 17:30:20 +08:00
JianBo He 0e118dd16d Merge remote-tracking branch 'ce/main-v4.3' into main-v4.4-merged-main-v4.3 2022-01-13 16:05:00 +08:00
zhongwencool 27f5e765b5 fix(export): emqx_auth_mnesia import failed after 4.3.x 2022-01-13 13:53:37 +08:00
Shawn 9f7f5070b2 fix(channel): update the calls to emqx_session APIs 2022-01-13 13:33:27 +08:00
Shawn 217acc0154 feat(rule): add new event 'delivery_dropped' 2022-01-12 20:11:08 +08:00
zhongwencool 85d568be60 chore(test): clean up auth_mnesia_SUITE:t_boot config 2022-01-12 19:03:44 +08:00
zhongwencool 88060c0f9b chore(auth): bump emqx_auth_mnesia version:4.3.5 2022-01-12 17:34:32 +08:00
zhongwencool 5521b7fa71 fix(auth): force update default mqtt_user when password or hashtype changed. 2022-01-12 17:26:27 +08:00
Shawn 449854fa11
Merge pull request #6647 from EMQ-YangM/main4.3
feat(rule_metrics): add more metrics to the rule engine
2022-01-12 14:52:46 +08:00
EMQ-YangM da8cd5d103 fix(rule_engine_metrics): fxi string:to_integer pattern match error 2022-01-11 22:09:38 -08:00
EMQ-YangM de58c8e7bc refactor(rule_engine_metrics): refactor code_change 2022-01-11 22:09:38 -08:00
EMQ-YangM 7605fa5e64 fix(rule_engine_metric): remove unused metrics 'overall_metrics' 2022-01-11 22:09:38 -08:00
JianBo He 492f4dceff Merge remote-tracking branch 'ce/main-v4.3' into main-v4.4-merged-main-v4.3 2022-01-12 13:59:07 +08:00
JianBo He c52db52cf8
Merge pull request #6709 from JimMoen/fix-mgmt-appup
chore(appup): app version updated after last tag
2022-01-12 11:18:20 +08:00
JianBo He ccd645b574
Merge pull request #6695 from HJianBo/fix-stomp-frame-tailed-byte
Fix stomp frame tailed byte
2022-01-12 11:17:00 +08:00
JimMoen 556a81a80e chore(appup): app version updated after last tag 2022-01-12 10:09:51 +08:00
JimMoen 47ba72729f chore(appup): update appup.src 2022-01-11 16:23:25 +08:00
JimMoen f2cfde7421 fix(mgmt): fix subscription info format 2022-01-11 15:54:37 +08:00
JianBo He 9efab7d5df chore(stomp): update appup & app.src 2022-01-11 14:49:40 +08:00
JianBo He 9aa178b51d fix(stomp): fix parsing rear frame split byte crash
fix: https://github.com/emqx/emqx/issues/6693
2022-01-11 14:49:20 +08:00
JianBo He 5424588a72 chore: remove unwanted appup commands that came with merge 2022-01-11 11:13:37 +08:00
JianBo He b297388c20 Merge branch 'main-v4.3' into merge-main-v4.3-into-v4.4 2022-01-11 10:03:28 +08:00
Shawn 82c6eaa3aa
Merge branch 'main-v4.3' into main4.3 2022-01-10 12:31:12 +08:00
EMQ-YangM 3956eaddd7 fix(rule_engine_metrics): add more rulge_engine version to emqx_rule_engine.appup.src 2022-01-09 19:27:49 -08:00
Shawn fbeba39f0d fix(rule): compare to null variables should return false 2022-01-06 20:36:01 +08:00
Shawn b7bcb37eab fix(rule): restore metrics for actions 2022-01-06 20:18:05 +08:00
EMQ-YangM be81c65eda feat(rule_engine_metics): add hot upgrade feat 2022-01-06 00:47:17 -08:00
EMQ-YangM 2074dd63f9 test(rule_engine_metrics): add more test 2022-01-05 21:11:52 -08:00
EMQ-YangM 1211c658fc fix(emqx_rule_engine): change vsn to 4.3.7 2022-01-05 19:18:16 -08:00
EMQ-YangM fae49ad228 fix(rule_engine_metrics): remove more space 2022-01-05 19:03:28 -08:00
EMQ-YangM d7a3ade200 fix(rule_engine_matrics): remove more space 2022-01-05 19:00:59 -08:00
EMQ-YangM 2608798826 fix(rule_engine_metrics): fix RuleID reference 2022-01-05 18:56:34 -08:00
EMQ-YangM c214af2ac0 fix(rule_engine_metics): centralized statistics exception 2022-01-05 18:51:28 -08:00
EMQ-YangM e5993c9f72 refactor(rule_engine_metrics): remove function 'message()' 2022-01-05 02:08:40 -08:00
EMQ-YangM c2870b3322 test(rule_engint_metrics): add test for 'FOREACH' 2022-01-05 01:57:18 -08:00
EMQ-YangM 88913a9144 test(rule_engine_metrics): add test 't_metrics' 2022-01-05 01:20:53 -08:00
JianBo He d6f56cbcbe fix(mgmt): convert timestamp to milliseconds 2022-01-05 16:38:27 +08:00
JianBo He 9cf03bb18a fix(mgmt): fix substring matching alg 2022-01-05 16:38:22 +08:00
EMQ-YangM a5a8aa3b6d feat(rule_metrics): add more metrics to the rule engine 2022-01-05 00:20:06 -08:00
JimMoen bec742b1be
Merge pull request #6505 from JimMoen/v4.x-fix-node-info-format
fix(mgmt): fix node info format for specific node
2021-12-31 13:39:43 +08:00
k32 5addf91873 fix(retainer): Fix topic printing
Fixes: #6559
2021-12-29 18:27:47 +01:00
Zaiming (Stone) Shi 967dc7d55e fix: portable shebang 2021-12-27 15:40:25 +01:00
JimMoen 7e9870cc3f chore(mgmt): update appup.src 2021-12-21 01:12:17 -05:00
JimMoen 0ee589ca61 fix(mgmt): fix node info format for specific node 2021-12-21 01:07:01 -05:00
Shawn 22814dc161 chore(coap): update gen_coap to v0.4.2 2021-12-20 15:07:29 +08:00
Zaiming (Stone) Shi c1cbf39552 fix(appup): add missing beams to emqx.appup.src
also re-formated emqx_sn.appup.src
2021-12-17 13:41:25 +01:00
Shawn a1a9d002e3 fix(rules): add SQL test examples for user properties 2021-12-16 17:13:34 +08:00
zhongwencool d362d10d30
Merge pull request #6437 from HJianBo/update_coap_lwm2m_deps
chore: upgrade coap&lwm2m tag for otp24
2021-12-13 22:32:13 +08:00
zhongwencool d50282dba6
Merge pull request #6434 from tigercl/chore/crypto
chore(otp): be compatibility with crypto in otp 24
2021-12-13 22:31:07 +08:00
Shawn e9b8fc8606 fix(OTP): OTP 24 warnings for ssl:ssh_accept/1,2 2021-12-13 20:10:02 +08:00
JimMoen d76159d543 Merge remote-tracking branch 'emqx/main-v4.3' into sync-from-v4.3 2021-12-13 18:46:23 +08:00
JianBo He 396d328a70 chore: upgrade coap&lwm2m tag for otp24 2021-12-13 18:29:12 +08:00
zhouzb 9d14604935 chore: bump versions of jwt and pgsql authn to 4.4.0 2021-12-13 16:23:09 +08:00
zhouzb a93c63f168 chore(otp): be compatibility with crypto in otp 24 2021-12-13 16:04:15 +08:00
zhongwencool 5eb4b6c173
Merge pull request #6423 from zhongwencool/fix-create-trace-failed
fix(trace): create trace validate type and filter more strictly
2021-12-11 16:36:25 +08:00
zhongwencool e59c5cc3f3 fix(trace): create trace validate type and filter more strictly 2021-12-11 15:26:15 +08:00
tigercl 832700b0ff
Merge pull request #6418 from tigercl/chore/webhook-appup
chore(webhook): update appup
2021-12-09 20:27:01 +08:00
zhongwencool f3fffb6156
Merge pull request #6417 from zhongwencool/fix-sn-appup-file
fix(emqx_sn): appup.src miss 4.3.2
2021-12-09 18:54:33 +08:00
tigercl 2ed5e01054
Merge branch 'main-v4.4' into sync-from-v4.3 2021-12-09 18:49:38 +08:00
zhouzb b6ffacc062 chore(appup): fix appup for webhook 2021-12-09 18:46:13 +08:00
zhouzb aa04df4d1b chore(webhook): update appup 2021-12-09 18:40:45 +08:00
zhongwencool 7477615324 fix(emqx_sn): appup.src miss 4.3.2 2021-12-09 17:26:57 +08:00
Zaiming (Stone) Shi c2cc3c78f1
Merge pull request #6395 from zhongwencool/sync-from-4.3
Sync from 4.3
2021-12-08 10:57:55 +01:00
lafirest e651becd99 fix(emqx_slow_subs): fix threshold related bugs
1. limit the interval between calling hooks
2. improve the code of update threshold
2021-12-08 15:05:39 +08:00
zhouzb 83981e7c87 fix(webhook): fix the issue that the path field does not support rule engine variables 2021-12-08 11:27:58 +08:00
zhongwencool 2c2145dfe6 Merge branch 'main-v4.3' into sync-from-4.3 2021-12-07 23:20:01 +08:00
zhongwencool be6160f5bd fix: trace handler start time not correct 2021-12-07 20:24:56 +08:00
JimMoen dc2c17826e chore(appup): update appup.src 2021-12-07 14:23:40 +08:00
JimMoen 14aa408b5e style: make elvis happy 2021-12-07 14:17:33 +08:00
JimMoen ceed9678e3 fix(mgmt): node memory usage info 2021-12-07 14:17:33 +08:00
zhongwencool d4dd4a124c fix: trace_name format [A-Za-z0-9-_];waiting status if create time to closed" 2021-12-06 20:51:42 +08:00
zhongwencool 28e76e498c fix: trace len > 1 return 500 2021-12-03 10:24:36 +08:00
zhongwencool f14a9d7da6 chore: bump emqx_sn to 4.3.4 2021-12-02 16:46:57 +08:00
zhongwencool 41a547d36d fix: e4.4.0 failed to join e4.3.0 cluster 2021-12-02 16:19:36 +08:00
JianBo He fdacb9040d
Merge pull request #6343 from HJianBo/drop-empty-retain-msg
[4.3][Retainer] Allow to stop publish clear message
2021-12-02 11:16:30 +08:00
Shawn 0d1b194906
Merge pull request #6286 from terry-xiaoyu/mqtt_bridge_hangs
MQTT bridge hangs with an unreachable IP
2021-12-01 18:33:42 +08:00
JianBo He 10ffe11ba0 chore(retainer): update appup.src 2021-12-01 17:11:40 +08:00
JianBo He e323b66285 test(retainer): testcase for stop_publish_clear_msg 2021-12-01 17:11:40 +08:00
JianBo He 8aaa2e8333 feat(retainer): add option to stop publish clear message 2021-12-01 17:11:38 +08:00
zhongwencool 0d218df14d fix: replace ct:sleep/1 by filesync/2 2021-11-29 23:08:56 +08:00
zhongwencool 1b14b79286 fix: create trace schema at runtime 2021-11-29 22:15:31 +08:00
tigercl 25215244be
Merge pull request #6192 from turtleDeng/publish-api-user-properties
feat(publish-api): Publish api support user-properties parameters
2021-11-29 15:00:04 +08:00
lafirest 8dd4d88d5b
fix(emx_slow_updates): fix the error of topk update (#6312) 2021-11-26 14:57:25 +08:00
lafirest fef3fc27cb
refactor(emqx_slow_subs): refactor use moving average (#6287)
* refactor(emqx_slow_subs): refactor use moving average

* fix(emqx_slow_subs): change elapsed to latency, and fix some error

* fix(emqx_slow_subs): fix emqx_mgmt_api.erl indent

* fix(emqx_slow_subs): change api name

* fix(emqx_slow_subs): fix and improve some code

* fix(emqx_slow_subs): move clienid filed from latency_stats to session
2021-11-26 10:42:15 +08:00
Thales Macedo Garitezi 5c693beadd
chore(appup): remove `load_module` instructions if `restart_application`
> the restart_application instruction will be translated into module
load instructions by otp release handler.
2021-11-25 12:08:02 -03:00
Thales Macedo Garitezi 64ce2eea1c
chore(appup): run ./scripts/update_appup.escript to bump vsns 2021-11-25 12:08:02 -03:00
Shawn f5ac6fb714 chore(appup): bump emqx_bridge_mqtt to 4.3.3 2021-11-25 09:46:06 +08:00
Shawn a54668e83b fix(mqtt_bridge): the mqtt bridge hangs with an unreachable IP 2021-11-24 17:11:04 +08:00
Zaiming (Stone) Shi 2514f474b0
Sync v4.3 to v4.4 (#6262)
* fix(http): fix duplicate http headers

* chore(appup): add appup.src

* fix(appup): fix multiply defined module in appup

* chore(appup): fix wrong version

* chore(ekka): Bump version to 0.8.1.5

* fix(update_appup): Fix warnings, add support for external repos

* build: use find command's -delete option

* ci: do not sync master branch

* build: ensure openssl11

* build: copy only libcrypto and libtinfo

* fix(trace): handler_id now always return atom

Co-authored-by: zhouzb <zhouzb@emqx.io>
Co-authored-by: k32 <10274441+k32@users.noreply.github.com>
2021-11-23 09:33:20 +08:00
Zaiming (Stone) Shi 1c64a9d95d
Merge pull request #6251 from zhongwencool/log-trace-api
feat: add support ip_address trace options
2021-11-22 16:19:53 +01:00
zhongwencool 30fb9dd7ae fix: name must be printable unicode and len < 256 2021-11-22 22:20:02 +08:00
zhongwencool a91f975dc2
fix: make sure keepalive only 0~65535 (#6232) 2021-11-22 18:08:48 +08:00
zhongwencool d76275d17d feat: add support ip_address trace options 2021-11-22 15:20:24 +08:00
Turtle 62dc72c859 feat(sql_rule): test rule add User-Property information 2021-11-22 11:04:21 +08:00
lafirest 4767b41eb7
fix(emqx_st_statistics): fix initial value error (#6224)
* fix(emqx_st_statistics): fix initial value error
2021-11-21 18:55:43 +08:00
lafirest 42333882c8
fix(emqx_st_statistics): fix unsafe rank range (#6207)
* fix(emqx_st_statistics): fix unsafe rank range
2021-11-18 14:41:59 +08:00
zhouzb b460172649 chore(appup): fix wrong version 2021-11-18 14:39:46 +08:00
zhouzb f948eb927d chore(appup): add appup.src 2021-11-17 14:31:37 +08:00
zhouzb 5e3fe6714e fix(http): fix duplicate http headers 2021-11-17 14:14:12 +08:00
Turtle ca1ece3db0 feat(publish-api): Publish api supports user-properties parameters 2021-11-17 11:17:10 +08:00
tigercl f335edaf6a
Merge pull request #6170 from tigercl/feat/mongo-migration
feat(migration): improve modules migration and add test cases
2021-11-17 09:42:09 +08:00
Zaiming Shi ca1458d4d7 chore(emqx_rule_engine): bump app vsn to 4.4.0 2021-11-15 15:34:48 +01:00
Zaiming Shi d05e2ff0b1 Merge remote-tracking branch 'origin/main-v4.3' into main-v4.4-alpha.1 2021-11-15 13:41:51 +01:00
zhouzb 2f279b3607 test(migration): fix code scope 2021-11-15 18:14:51 +08:00
zhouzb fce93c5a17 feat(migration): improve modules migration and add test cases 2021-11-15 17:44:23 +08:00
zhongwencool 23e2bd62c5
fix: there should not be multiple layers of directories when download trace zip file (#6165) 2021-11-15 15:53:49 +08:00
tigercl 276db400c2
Merge pull request #6150 from tigercl/feat/mongo-srv
feat(mongo srv): support srv for mongodb authentication
2021-11-15 11:25:17 +08:00
zhongwencool 6bd5fd218e
chore: limit/page to position/bytes (#6161) 2021-11-15 11:02:45 +08:00
lafirest 0357f7ad85
improve(emqx_st_statistics): optimize the parameters of on_publish_done (#6151)
* fix(emqx_st_statistics): optimize the parameters of on_publish_done
2021-11-15 11:00:04 +08:00
lafirest 87a2667e35
fix(emqx_retainer): fix timer message error (#6156)
* fix(emqx_retainer): fix timer message error
2021-11-15 10:57:59 +08:00
zhouzb cb18538957 fix(mong srv): fix wrong configuration 2021-11-15 10:27:56 +08:00
zhouzb 25f504c90a feat(mongo srv): support srv for mongodb authentication 2021-11-15 10:26:38 +08:00
JianBo He f7bdd6defe chore(lwm2m): fix bad appup.src 2021-11-15 09:50:32 +08:00
JianBo He 08cf0326b3 chore(exhook): bump version to 4.4.0 2021-11-15 09:50:32 +08:00
JianBo He 6b40048d29 chore: put the pool_size default value to avoid hot upgrade failure 2021-11-15 09:50:32 +08:00
JianBo He 2be33b33e3 chore: fix elvis warnings 2021-11-15 09:50:32 +08:00
JianBo He f194ae65d2 chore: update appup.src 2021-11-15 09:50:32 +08:00
JianBo He 8dfc8ed96b chore: fill message headers 2021-11-15 09:50:32 +08:00
JianBo He 7d06e48b4b chore: remove needless catch
Co-authored-by: Zaiming (Stone) Shi <zmstone@gmail.com>
2021-11-15 09:50:32 +08:00
JianBo He f2d99017a0 chore(exhook): update appup.src 2021-11-15 09:50:32 +08:00
JianBo He 641f36514f chore: fix elvis warnings 2021-11-15 09:50:32 +08:00
JianBo He 5922521e49 test(props): cover messages headers 2021-11-15 09:50:32 +08:00
JianBo He 44008b9a6d chore: fix compiling warnings 2021-11-15 09:50:32 +08:00
JianBo He c170d076e3 feat(exhook): expose process pool_size for grpc client 2021-11-15 09:50:32 +08:00
JianBo He b756e7d17a chore: upgrade grpc to 0.6.4 2021-11-15 09:50:32 +08:00
JianBo He 012c741592 chore(exhook): update appup.src 2021-11-15 09:50:32 +08:00
JianBo He ef2a5c1dc7 chore(exhook): fix diaylzer warnings 2021-11-15 09:50:32 +08:00
JianBo He 6fb3ff1f9f feat(exhook): expose headers for on_messages_publish hook 2021-11-15 09:50:32 +08:00
lafirest ad4d3fc652
chore(emqx_retainer): refresh the timestamp when dispatch retained message (#6155)
1. refresh the timestamp when dispatch retained message
2. fix some elvis style error
2021-11-12 21:26:44 +08:00
zhongwencool 8bf6668e4c
Set keepalive via http api (#6143)
* feat: set keepalive over http api

* chore: elvis warning

* fix: bump retainer to 4.4.0
2021-11-12 20:11:59 +08:00
firest e9ce8e7586 fix(emqx_retainer): revert the "refresh the timestamp when dispatch retained message"
This reverts commit 66d0c44e36.
2021-11-12 18:36:26 +08:00
zhongwencool f3de1bdb77
fix: make sure enable boolean() (#6147) 2021-11-12 15:48:30 +08:00
JianBo He d8f37be210 chore(lwm2m): fix bad appup.src 2021-11-12 15:38:49 +08:00
lafirest 66d0c44e36
fix(emqx_retainer): refresh the timestamp when dispatch retained message (#6148) 2021-11-12 14:51:02 +08:00
lafirest a4a7cac647
fix(eqmx_st_statistics): add ignore_before_create in config (#6140)
1. allows not to process the message before the session is created
to solve the problem caused by clean session = false
2. fix some elvis errors
2021-11-12 14:00:48 +08:00
JianBo He 8e4c2c88c3 chore: use PROTO_VER marco 2021-11-12 10:45:26 +08:00
JianBo He 439fb3a403 chore: fix elvis warnings 2021-11-12 10:43:21 +08:00
JianBo He 0c5cb1b9ac chore: update appup.src 2021-11-12 10:43:21 +08:00
JianBo He 4c29c3a5e5 chore: fill message headers 2021-11-12 10:43:21 +08:00
zhongwencool 7193cd4275
feat(trace): move common trace module to plugin_libs (#6127)
* feat(trace): move common mod to plugin_libs

* fix: elvis warning
2021-11-12 07:33:36 +08:00
lafirest 9d4f2916c2
refactor(emqx_st_statistics): optimize the code directory structure (#6128) 2021-11-11 23:49:54 +08:00
zhongwencool 835ad52498
feat(trace): http api for trace (#6052)
* feat(trace): add http trace API

* feat: sub/unsub trace topic

* chore(trace): stream log use _page and _limit

* fix: elvis warning

* fix: mod_trace test failed

* fix: http api meta rename _page/_limit to _page/_limit

* fix: clientid string not working

* fix: add emqx_mod_trace to module

* fix(trace): fixed by review suggestions
2021-11-11 14:54:40 +08:00
lafirest 1dd18aa07a
fix(emqx_st_statistics): change emqx_st_statistics implementation fro… (#6115)
* fix(emqx_st_statistics): change emqx_st_statistics implementation from plugin to module
2021-11-11 10:16:06 +08:00