Commit Graph

6608 Commits

Author SHA1 Message Date
Zaiming Shi 6a6a94f99e
Merge pull request #4057 from zmstone/fix-emqx_vm-allocator-info-otp-23-compatibility
fix emqx_vm allocator info otp 23 compatibility
2021-01-25 11:36:47 +01:00
JianBo He 86942ffa14 fix(webhook): fix bad https confs 2021-01-25 18:20:12 +08:00
JianBo He 670c3894fb chore(redis): upgrade eredis_cluster to 0.6.4 2021-01-25 17:29:56 +08:00
zhouzb b25dedccc9 refactor(inet parse): refactor inet parse 2021-01-25 15:59:23 +08:00
JianBo He 67e56658a7 fix(bridge-mqtt): fix bad time unit 2021-01-25 15:35:04 +08:00
JianBo He 3de8fea435 fix(bridge-mqtt): fix bad received metrics counting 2021-01-25 15:35:04 +08:00
wwhai f3420e8810 fix(rule-engine): fix update resource maybe remove resource 2021-01-25 10:56:58 +08:00
JianBo He 3322bb60c3 fix(exproto): fix the bad return type for auth 2021-01-25 09:24:03 +08:00
Zaiming Shi 20c37609af
Merge pull request #4062 from emqx/dev/v4.3.0
Auto-pull-request-on-2021-01-24
2021-01-24 22:29:09 +01:00
Zaiming Shi f96c4f36d2
Merge pull request #4060 from zmstone/refactor-coap-use-uri-string-module
refactor(emqx_coap): use url_string module to decode url encoded topic
2021-01-24 12:29:40 +01:00
Zaiming Shi 8a05380388 refactor(emqx_coap): use url_string module to decode url encoded topic 2021-01-24 10:28:37 +01:00
Zaiming Shi de972b3d84 fix(emqx_vm): Call recon_alloc:allocators/0 to get allocators 2021-01-23 11:42:28 +01:00
Zaiming Shi 17d70772a8 refactor(emqx_recon): Use latest version recon
Moved recon dependency from emqx_recon to root
2021-01-23 11:42:28 +01:00
Zaiming Shi c1b1ddbb6f
Merge pull request #4032 from zmstone/chore-sync-apps-resync-4.2.6
chore(sync-apps): resync plugin apps from their 4.2.6 tag
2021-01-23 11:15:46 +01:00
Zaiming Shi 23b2f4fa72
Merge pull request #4050 from zmstone/chore-delete-stale-code
chore(emqx_vm): delete stale code
2021-01-23 11:13:22 +01:00
JianBo He 7c3cd26589 chore(elvis): fix elvis wanrings 2021-01-23 18:07:58 +08:00
JianBo He f59377adf5 fix(logs): print the correct username and clientid 2021-01-23 18:07:58 +08:00
zhanghongtong 17ee5b0af5 build(helm): add loaded-plugins and loaded-modules to helm configmap
turn off telemetry in CI
2021-01-23 12:21:16 +08:00
Zaiming Shi 84e922205b
Merge pull request #4056 from emqx/dev/v4.3.0
Auto-pull-request-on-2021-01-22
2021-01-22 21:41:06 +01:00
Zaiming Shi 2c03bca6ae chore(auth_jwt): Upgrade to jose 1.11.1 prepare for OTP 23 2021-01-22 20:31:27 +01:00
Zaiming Shi bc29a1f9c4 chore(dev): Pin asdf erlang 23.2.2 2021-01-22 20:31:27 +01:00
zhanghongtong d7854a2f0c chore(CI): fix spelline errors 2021-01-22 16:26:48 +01:00
Zaiming Shi 8e94d75911
Merge pull request #4044 from zmstone/chore-merge-v430-to-v50
Chore merge v430 to v50
2021-01-22 16:26:19 +01:00
Zaiming Shi 51050f702a chore(config): Insert a space after config comment '#' and key 2021-01-22 15:07:35 +01:00
Zaiming Shi 7bb590f1c7 refactor(auth_redis): delete backward-compatible code in config schema 2021-01-22 14:20:47 +01:00
Zaiming Shi 5d45325cb8 fix(conf): quote config values 2021-01-22 14:20:47 +01:00
Zaiming Shi 33c35915ca refactor(emqx_vm): make elvis happy 2021-01-22 09:23:20 +01:00
Zaiming Shi 4680ba574c chore(emqx_vm): Delete get_ets_object, not used 2021-01-22 09:21:45 +01:00
Zaiming Shi 47df29ae49 chore(emqx_vm): delete stale code
The port binary format is no longer compatible in OTP 23
2021-01-22 07:50:00 +01:00
Zaiming Shi b9071394c4 Merge remote-tracking branch 'origin/dev/v4.3.0' into chore-merge-v430-to-v50 2021-01-21 23:53:12 +01:00
Zaiming Shi ed25c62fed chore(elvis): Add usage print 2021-01-21 21:05:56 +01:00
Zaiming Shi ca32ac310f chore(style): make elvis happy 2021-01-21 21:05:56 +01:00
Zaiming Shi 0087303b25 feat(shared_sub): Support hashing from source topic. 2021-01-21 21:05:56 +01:00
Zaiming Shi 5aa63ed203 fix(shared_sub): align default value and default config
Shared subscription default dispatch strategy is 'random' in config
but 'round_robin' in code. This commit is to make sure they are the
same: both are 'random'.
2021-01-21 21:05:56 +01:00
Yudai Kiyofuji c6785b1a34
test(coap): add test on acl and connection discarding (#4039) 2021-01-21 11:03:06 +09:00
Yudai Kiyofuji 455f210b4c
feat(cuttlefish): use hocon as a parsing function (#4008)
* chore(conf): add quotation for hocon

* chore(conf): fix paths incompatible with hocon

* chore(conf): use hocon as parsing function

* chore(docker): add quotation to some env variables for hocon
2021-01-19 19:52:17 +09:00
zhanghongtong e2389ab8e7 chore(CI): update erlang version 2021-01-19 09:08:01 +08:00
Zaiming Shi 4103a7292a Merge branch 'resync-apps-from-426' into chore-sync-apps-resync-4.2.6 2021-01-18 20:37:45 +01:00
Zaiming Shi be771f6cd9 fix(auth_pgsql): Make ssl_opts.versions backward compatible 2021-01-18 20:37:45 +01:00
Zaiming Shi 14ca914068 Merge branch 'resync-apps-from-426' into chore-sync-apps-resync-4.2.6 2021-01-18 20:37:26 +01:00
Zaiming Shi 86895ddc24 chore(sync-apps): sync emqx_auth_mnesia e4.2.3 2021-01-18 20:05:08 +01:00
Zaiming Shi a2b4e50a8d chore(sync-apps): re-sync apps from dev/v4.3.0 branch 2021-01-18 19:24:08 +01:00
Zaiming Shi fc0b912cde refactor(emqx_dashboard): www dir is to be downloaded at build time 2021-01-18 19:20:49 +01:00
Zaiming Shi 432b92d6af chore(sync-apps): Update script to exclude web_hook and auth_http
These two libs are permanently diverged, there is no way to auto
sync now and in the future.
2021-01-18 19:18:44 +01:00
Zaiming Shi 7f57a5548d chore(sync-apps): sync eqmx_auth_mnesia tag 4.2.3 2021-01-16 20:02:22 +01:00
tigercl fd2e9f147b
fix(auth http): using ehttpc (#4021)
* fix(auth http): using ehttpc

* chore(ehttpc): update tag of ehttpc

* fix(config): update comment
2021-01-16 23:10:53 +08:00
wwhai a6de90c3f9
fix(test): add two way ssl test (#4025) 2021-01-16 22:28:15 +08:00
turtleDeng 2751fa6a41 fix(scheme): update emqx_web_hook_actions.erl 2021-01-16 22:25:12 +08:00
zhouzb bf84686b76 chore(ehttpc): update tag of ehttpc 2021-01-16 22:25:12 +08:00
zhouzb 9f0dbeff29 fix(webhook): fix ipv6 in ip and hostname 2021-01-16 22:25:12 +08:00