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

5122 Commits

Author SHA1 Message Date
JianBo He 14920743ca
Merge pull request #8513 from lafirest/fix/limiter_interface 
refactor(limiter): refactor the user interface
 2022-08-01 11:02:15 +08:00
Thales Macedo Garitezi a9b176b8bd
Merge pull request #8598 from thalesmg/license-fixes-50 
license fixes (5.0)
 2022-07-29 13:13:51 -03:00
JianBo He be679f8128
Merge pull request #8589 from emqx/release-v5.0.4 
Merge v5.0.4 into master branch
 2022-07-29 08:49:10 +08:00
Thales Macedo Garitezi 8e08f045aa chore(bpapi): add new vsn 2022-07-28 17:59:54 -03:00
Thales Macedo Garitezi f8a1bd0715 feat(license): copy license file to cluster when updating it 2022-07-28 17:29:59 -03:00
JianBo He 5835120d8e chore: relealse v5.0.4 2022-07-28 13:47:41 +08:00
Xinyu Liu 527289090d
Merge pull request #8580 from terry-xiaoyu/webhook_max_retries 
fix(webhook): the 'max_retries' opt means request retry times
 2022-07-27 17:42:33 +08:00
Shawn 23eeb21b13 fix(webhook): the 'max_retries' opt means request retry times 2022-07-27 17:06:14 +08:00
zhouzb 9323878442 chore: bump vsn 2022-07-27 16:23:54 +08:00
Thales Macedo Garitezi b4be9b6fae chore: bump ekka -> 0.13.3 
Mainly: https://github.com/emqx/erlang-rocksdb/pull/7
 2022-07-26 09:50:14 -03:00
JianBo He 257e310931 chore: ensure the `bind` output style 
e.g:
- Configured as `1883`, printed as `:1883`
- Configured as `0.0.0.0:1883`, printed as `:1883`
- Configured as `127.0.0.1:1883`, printed as `127.0.0.1:1883`
- Configured as `::1:1883`, printed as `[::1]:1883`
- Configured as `[::1]:1883`, printed as `[::1]:1883`
 2022-07-26 19:02:04 +08:00
firest bc716884e0 fix(limiter): fix spellcheck error 2022-07-26 15:16:53 +08:00
firest bcc78950a9 fix(limiter): fix schema error 2022-07-26 14:33:04 +08:00
JianBo He 38b5882dc8 test(gw): using ip_port in listener tests 2022-07-26 11:40:52 +08:00
JianBo He 53fda85c93 fix: conflicts resolving legacy 2022-07-26 11:10:40 +08:00
JianBo He bad82b29ce feat(gw): change the listeners api fields 2022-07-26 11:05:04 +08:00
JianBo He 2c71d27a89 feat(listeners): change the `GET /listeners` api fields 2022-07-26 11:04:33 +08:00
zhouzb 79d6613a18
Merge pull request #8531 from HJianBo/fix-authn-cndn 
fix(authn): fix cert_subject and cert_common_name placeholder
 2022-07-26 09:09:34 +08:00
Chris Hicks bc93d5f525
Merge pull request #8567 from emqx/EMQX-6018-v-5-0-4-cli-command-to-verify-config-syntax-against-schema 
feat: Added emqx command to check configs
 2022-07-25 17:14:42 +02:00
Ilya Averyanov 2f470b8878
Merge pull request #8554 from savonarola/authn-logging 
Add more tracing for authentication
 2022-07-25 17:43:00 +03:00
Ilya Averyanov 1a236db91b chore(log): add authentication tracing 2022-07-25 17:14:19 +03:00
zhongwencool 80831a7593
Merge pull request #8563 from zhongwencool/titlecase-swagger-tags 
chore: make sure swagger's tags always titlecase
 2022-07-25 17:45:54 +08:00
zhongwencool 2466881460
chore: Update apps/emqx_authn/src/emqx_authn_user_import_api.erl 
Co-authored-by: zhouzb <zhouzb@emqx.io>
 2022-07-25 17:45:38 +08:00
zhongwencool 7261fbaa6b
chore: Update apps/emqx_authn/src/emqx_authn_user_import_api.erl 
Co-authored-by: zhouzb <zhouzb@emqx.io>
 2022-07-25 17:45:28 +08:00
JianBo He 9ecb7563b4
Merge branch 'master' into fix-authn-cndn 2022-07-25 17:34:44 +08:00
Chris 24f88679ae feat: Added emqx command to check configs 2022-07-25 11:01:08 +02:00
Zhongwen Deng 02c0755867 fix: dashboard failed test 2022-07-25 16:55:38 +08:00
Zhongwen Deng a3296078c3 chore: make sure swagger's tags always titlecase 2 2022-07-25 16:55:38 +08:00
zhongwencool cc63479e69 chore: update apps/emqx_management/src/emqx_mgmt_api_publish.erl 
Co-authored-by: zhouzb <zhouzb@emqx.io>
 2022-07-25 16:55:33 +08:00
zhongwencool 087a098d64 chore: update apps/emqx_management/src/emqx_mgmt_api_publish.erl 
Co-authored-by: zhouzb <zhouzb@emqx.io>
 2022-07-25 16:55:25 +08:00
Zhongwen Deng 99340e424e chore: bump app.src version 2022-07-25 16:14:03 +08:00
Zhongwen Deng dd59c850e0 chore: make sure swagger's tags always titlecase 2022-07-25 16:09:17 +08:00
JianBo He 04da2d080a
Merge branch 'master' into support-listen-ipv6 2022-07-25 14:27:42 +08:00
JianBo He 1c8defeeda chore: make elvis happy 2022-07-25 13:17:54 +08:00
Zhongwen Deng 56417a3130 feat: list rules support for pagination and fuzzy filtering 2022-07-25 09:36:08 +08:00
JianBo He 74c5fd411b chore(schema): trim space in ip_port 2022-07-25 09:33:47 +08:00
JianBo He e0b33dc258 fix(listener): support listen on ipv6 address 2022-07-25 09:31:16 +08:00
JianBo He ba1347513e test(authn): test cert_subject/cert_common_name placeholder 2022-07-25 09:28:28 +08:00
JianBo He f8f4ad3e5b fix(authn): fix cert_subject and cert_common_name placeholder 2022-07-25 09:28:28 +08:00
Thales Macedo Garitezi 343a78b08a feat(persistent_sessions): don't use rocksdb when unavailable 2022-07-22 10:59:41 -03:00
Thales Macedo Garitezi 2e75c35995
Merge pull request #8546 from thalesmg/fix-dashboard-cluster-rate 
fix: dashboard monitor crash after badrpc
 2022-07-22 09:10:41 -03:00
firest ce46cb9216 fix(limiter): fix test case error 2022-07-22 18:59:02 +08:00
firest 15c8110af2 fix(limiter): lift the level of the `client` field 2022-07-22 17:14:24 +08:00
zhongwencool f0f26b2408 Merge branch 'master' into fix-logger-json-format-config-not-working 2022-07-22 14:59:19 +08:00
JianBo He b9cd9e51ef
Merge pull request #8530 from HJianBo/fix-exhook-dispatch-seq 
fix(exhook): ensuring that exhook dispatches the client events are sequential
 2022-07-22 10:43:00 +08:00
Zhongwen Deng 4d5dfe265b fix: logger json formatter's config not working 2022-07-22 09:48:11 +08:00
Thales Macedo Garitezi be9efcae2e fix: dashboard monitor crash after badrpc 
Accumulator becomes unusable after a `badrpc` error.

```
2022-07-21T15:22:17.825688-03:00 [warning] exception: error, line: 116, mfa: minirest_handler:apply_callback/3, path: /monitor_current, reason: {badmap,{badrpc,{'emqx@emqx-17.int.thales',{'emqx@emqx-17.int.thales',timeout}}}}, stacktrace: [{maps,get,[connections,{badrpc,{'emqx@emqx-17.int.thales',{'emqx@emqx-17.int.thales',timeout}}},0],[{file,"maps.erl"},{line,517},{error_info,#{module => erl_stdlib_errors}}]},{emqx_dashboard_monitor,'-merge_cluster_rate/2-fun-0-',3,[{file,"/emqx/apps/emqx_dashboard/src/emqx_dashboard_monitor.erl"},{line,259}]},{maps,fold_1,3,[{file,"maps.erl"},{line,410}]},{lists,foldl,3,[{file,"lists.erl"},{line,1267}]},{emqx_dashboard_monitor,current_rate,0,[{file,"/emqx/apps/emqx_dashboard/src/emqx_dashboard_monitor.erl"},{line,126}]},{emqx_dashboard_monitor_api,monitor_current,2,[{file,"/emqx/apps/emqx_dashboard/src/emqx_dashboard_monitor_api.erl"},{line,135}]},{minirest_handler,apply_callback,3,[{file,"/emqx/deps/minirest/src/minirest_handler.erl"},{line,111}]},{minirest_handler,handle,2,[{file,"/emqx/deps/minirest/src/minirest_handler.erl"},{line,44}]},{minirest_handler,init,2,[{file,"/emqx/deps/minirest/src/minirest_handler.erl"},{line,27}]},{cowboy_handler,execute,2,[{file,"/emqx/deps/cowboy/src/cowboy_handler.erl"},{line,41}]},{cowboy_stream_h,execute,3,[{file,"/emqx/deps/cowboy/src/cowboy_stream_h.erl"},{line,318}]},{cowboy_stream_h,request_process,3,[{file,"/emqx/deps/cowboy/src/cowboy_stream_h.erl"},{line,302}]},{proc_lib,init_p_do_apply,3,[{file,"proc_lib.erl"},{line,226}]}]
```
 2022-07-21 15:40:29 -03:00
JianBo He dbeb28520b chore: bump exhook app vsn 2022-07-21 20:09:23 +08:00
Zhongwen Deng f080715ce9 fix: ensure /listeners API return all node's status 2022-07-21 15:47:11 +08:00
Zhongwen Deng 116c664df1 feat: add sysmon config handler to reload conf 2022-07-21 12:33:56 +08:00
JianBo He 2566f50c4e fix(exhook): ensuring that exhook dispatches the client events are sequential 
porting by: https://github.com/emqx/emqx/pull/8311
 2022-07-21 11:01:18 +08:00
Zhongwen Deng a468f4ee9d chore: bump emqx_gateway to 0.1.2 2022-07-20 17:03:04 +08:00
Zhongwen Deng a12478225a fix: fix bad swagger format 2022-07-20 16:56:07 +08:00
firest dbab1bc96a fix(limiter): fix elvis && dialyzer error 2022-07-20 15:00:12 +08:00
firest d3f965dfe7 refactor(limiter): refactor the user interface 2022-07-20 13:57:31 +08:00
Zaiming (Stone) Shi 53f9b59805
Merge pull request #8408 from zmstone/0704-docs-fix-enable_pipelining-docs 
fix: enable_pipelining should not be allowed to be zero
 2022-07-19 21:13:29 +01:00
zhongwencool b1c259191c
Merge pull request #8502 from ieQu1/wait-cluster-rpc-shard 
Wait cluster rpc shard
 2022-07-19 11:29:02 +08:00
Zhongwen Deng a05b7bf555 fix: dialyzer warning 2022-07-19 10:07:01 +08:00
ieQu1 f5d63c1555 fix(conf): Wait for the cluster RPC shard 2022-07-18 15:58:32 +02:00
ieQu1 6f00f51457 chore(ekka): Bump version 2022-07-18 15:13:40 +02:00
William Yang 4481ae6ff8 feat(quicer): bump to 0.0.16 2022-07-18 12:08:22 +02:00
Zhongwen Deng 15ebef4468 chore: improve metrics interval desc 2022-07-15 15:23:31 +08:00
Zhongwen Deng 26820ed0c4 chore: remove /configs/listeners, we should use /listeners/ API 2022-07-14 15:23:39 +08:00
lafirest 0f5f3985a5
Merge pull request #8481 from lafirest/fix/retainer_flow_control 
fix(retainer): set default value of flow control
 2022-07-14 15:20:23 +08:00
firest be6f63d927 chore(retainer): update app version 2022-07-14 14:03:25 +08:00
firest 9afad90b91 fix(retainer): set default value of flow control 2022-07-14 10:40:03 +08:00
Zhongwen Deng 421251f4c8 chore: improve the dashboard listener startup log 2022-07-14 09:49:54 +08:00
DDDHuang 941440800b fix(cli): subscriptions with sub options, qos rh rap nl; admins response 
data format
 2022-07-13 15:55:07 +08:00
DDDHuang 88ca8ff503
Merge pull request #8470 from DDDHuang/tpm_check 
fix(api): topic metrics check exist before create
 2022-07-13 15:26:47 +08:00
DDDHuang 8f18bdff15 fix(api): topic metrics check exist before create 2022-07-13 13:50:30 +08:00
JimMoen f42c8ffcfa test(connector): redis sentinel include name 2022-07-13 10:37:16 +08:00
JimMoen 994a76510d fix(authn): jwt ssl opts use emqx_schema:ssl_clients_opts 2022-07-13 10:37:16 +08:00
JimMoen 59c301243c fix(connector): redis sentinel field required 2022-07-13 10:37:16 +08:00
firest bcc16230cc fix(stats): fix topic name error 2022-07-12 13:55:36 +08:00
Zaiming (Stone) Shi 49d008371f chore: bump version to 5.0.4 2022-07-08 22:35:16 +02:00
Zaiming (Stone) Shi e49686a276 fix(authz): should apply no rule on superuser 2022-07-08 22:35:15 +02:00
Shawn b55048f705 chore: update app versions 2022-07-08 16:29:07 +08:00
Shawn 9ca5927b88 fix: issue in test cases 2022-07-08 14:07:28 +08:00
Shawn 4da106882c fix(rule): create_at lost when save to config files 2022-07-08 09:17:23 +08:00
Shawn 841f816e39 refactor: improve the health_check for webhook bridges 2022-07-08 09:17:23 +08:00
Shawn 71f642518a fix: the file cluster-override.conf is emptied if hocon_pp:do/2 failed 2022-07-08 09:17:23 +08:00
Zaiming (Stone) Shi 179adeac57
Merge pull request #8425 from emqx/EMQX-6360-5-0-do-not-force-exp-field-in-jwt 
fix: allow for exp field to optional to keep backwards compat with 4.X
 2022-07-07 12:21:50 +01:00
Chris dbe806d950 fix: allow for exp field to optional to keep backwards compat with 4.X 2022-07-07 10:18:52 +02:00
Zhongwen Deng 0b1117df47 chore: upgrade hocon to 0.28.3 to speed up schema cache 2022-07-07 15:00:41 +08:00
Zaiming (Stone) Shi 07783249bb chore: move emqx API version (in generated doc) to emqx_release.hrl 
So we have one place to bump all versions
 2022-07-06 14:01:35 +02:00
Zaiming (Stone) Shi fa89b633d8 chore: bump version to 5.0.3 2022-07-04 23:23:20 +02:00
Zaiming (Stone) Shi a7e948b0f4 fix(ws): websocket header get expects bin-string 2022-07-04 23:20:22 +02:00
ieQu1 f1d87944a9
Merge pull request #8407 from ieQu1/doc-cluster-singleton 
docs(emqx_connector): Remove mentions of cluster_singleton
 2022-07-04 15:08:34 +02:00
Zaiming (Stone) Shi bb854a9667 fix: enable_pipelining should not be allowed to be zero 2022-07-04 12:18:01 +02:00
ieQu1 b18097375c docs(emqx_connector): Remove mentions of cluster_singleton 
Fixes: 8339
 2022-07-04 11:33:01 +02:00
Zaiming (Stone) Shi 4b383a42f3
Merge pull request #8399 from zmstone/0702-no-relup-for-opensource-edition 
0702 no relup for opensource edition
 2022-07-02 11:57:36 +01:00
Zaiming (Stone) Shi 999eac5376 chore: bump emqx app version to 5.0.2 2022-07-02 11:44:19 +02:00
Zaiming (Stone) Shi c602ef708f chore: bump version to 5.0.2 2022-07-02 11:44:19 +02:00
Zhongwen Deng 3675ba0c9f fix: restricted_shell not working 2022-07-02 16:58:52 +08:00
zhouzb 0cce1df2b6 chore: bump release vsn 2022-07-01 22:03:47 +08:00
zhouzb 1b211434d0
Merge pull request #8381 from HJianBo/fix-content-type 
chore: treat 200 and no body as ACL nomatch
 2022-07-01 21:56:40 +08:00
JianBo He 2d8231c638 chore: fix gateway authz cases 2022-07-01 21:08:58 +08:00
JimMoen 2ad99fca7a chore: update appup.src 2022-07-01 21:07:33 +08:00
JimMoen 7b825fe4bd test(authn): authn `is_superuser` default value false. 2022-07-01 21:07:26 +08:00
JimMoen f0c783b260 test(authn): emqx_authn and gateway_athn http `content-type` 2022-07-01 20:55:39 +08:00