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

229 Commits

Author SHA1 Message Date
Xinyu Liu 2a89443377
Merge branch 'main-v4.4' into copy-of_main-v4.3 2022-06-29 22:27:49 +08:00
JianBo He e3bf11fe39 chore: stop http listener to load latest http hanlders 2022-06-29 20:52:11 +08: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 c4f1c83003 chore: return system total and used memory in node_info 2022-06-26 21:16:55 +02:00
Xinyu Liu 565b6b0eb3
Merge branch 'main-v4.4' into copy-of_main-v4.3 2022-06-23 22:44:53 +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 a55d583de6 chore: bump more app versions 2022-06-15 14:14:34 -03: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 38b7e5fa11 chore: bump app vsn for emqx_dashboard 2022-06-13 15:00:03 +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 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
Xinyu Liu 211fee3035
Merge branch 'main-v4.4' into copy-of_main-v4.3 2022-05-23 23:19:19 +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 c93626e97f chore: update changes and appup.src for emqx_management 2022-05-23 18:05:41 +08:00
Shawn ca842aa869 fix: merge main-v4.3 to main-v4.4 2022-05-23 11:23:27 +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
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
zhongwencool 3df5c15819 feat: client apisupport mqueue_len/mqueue_dropped filter 2022-05-18 23:05:02 +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 73faf08059 feat: mnesia auth/acl support multiple condition queries 2022-05-17 11:19:29 +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
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
zhongwencool 10bca7f6b5 fix: topic filter with qos/clientid/share 2022-04-22 14:42:12 +08: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
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
JimMoen 6168745f90 chore: update copyright 2022-04-14 11:23:25 +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
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
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 7e01a52457 fix: typo in function name 2022-03-23 15:56:51 +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 929ca787f4 test: fix data import test failure 2022-03-23 13:12:57 +01:00
zhongwencool 99dfd8504c fix: bad authorization format crash with 500 2022-03-23 15:34:23 +08: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
zhongwencool 2be97a24dd fix: subscribe api crash with bad qos. 2022-03-21 09:19:28 +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