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

1455 Commits

Author SHA1 Message Date
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