yuanbiao/emqx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,101 Commits 393 Branches 669 Tags 74 MiB
042ff2e0d7
Commit Graph

1215 Commits

Author SHA1 Message Date
k32
b88c71b481 feat(dashboard): Introduce dashboard RLOG shard 2021-06-28 11:43:48 +08:00
k32
198e3c03e0 feat(emqx_management): mqtt_app shard 2021-06-28 11:43:48 +08:00
turtleDeng
b4d9af0e85 feat(telemetry): Update the configuration file to hocon (#5064) 2021-06-28 11:43:48 +08:00
Rory Z
39e4d348f6 feat: add authz (#4852) 
* feat(authorization): add authorization api

* feat(authorization): add check function

* feat(authorization): use hocon config file

* feat(authz): add mysql connector

* feat(authz): support pgsql

* feat(connector): support redis

* chore(authz): use "publish/subscribe/all" instead of "pub/sub/pubsub"
 2021-06-28 11:43:48 +08:00
Zaiming Shi
871f23f047 build: do not allow user override PKG_VSN 
We have an assertion in code, allowing user to override
will compile but not run.
 2021-06-28 11:43:48 +08:00
Zaiming Shi
cd5431e71d chore(emqx_lwm2m): pin lwm2m-coap v2.0.0 
v2.0.0 has emqx_http_lib added as a rebar dependency
v1.* is for emqx v4.3.*
 2021-06-28 11:43:46 +08:00
DDDHuang
9bc3b4684a refactor(config): support hocon 2021-06-28 11:43:31 +08:00
DDDHuang
8356102450 chore: support statsd 2021-06-28 11:43:31 +08:00
Turtle
205e588b22 fix(plugins): fix load plugin generate hocon configs fail 2021-06-28 11:43:31 +08:00
Shawn
e2d96e46a0 change resource,connectors,data_bridges as normal apps (#5034) 2021-06-28 11:43:31 +08:00
Turtle
f004e36e28 feat(plugins): Support load plugins of hocon configuration format 2021-06-28 11:43:31 +08:00
Rory Z
87cc94ad28 chore(hooks): update type 2021-06-28 11:43:31 +08:00
Rory Z
0dd068135d chore(hooks): delete is_function() 2021-06-28 11:43:31 +08:00
Rory Z
b21959b0c3 test: fix tests error 2021-06-28 11:43:31 +08:00
Rory Z
227c8e626b chore(appup): update appup file 2021-06-28 11:43:31 +08:00
Rory Z
46fe77687c chore(dialyzer): fix dialyzer error 2021-06-28 11:43:31 +08:00
zhanghongtong
64a63ab892 chore(hooks): emqx_hooks no longer accept anonymous functions 2021-06-28 11:43:31 +08:00
zhanghongtong
f5c4863420 fix(connector): add nullable for sentinel_name in redis schema 2021-06-28 11:43:31 +08:00
Zaiming Shi
62df9f03ad fix(emqx_schema): add 'sensitive' flag for passowrd configs 2021-06-28 11:43:31 +08:00
Zaiming Shi
1fca3cd1b5 chore(rebar.config): use hocon 0.6.0 
hocon 0.6.0 added supports for sensitive config flagging
sub-struct type checking, and remote struct referencing
 2021-06-28 11:43:31 +08:00
DDDHuang
22b0fa0b92 chore: more node info 2021-06-28 11:43:31 +08:00
turtleDeng
271869b817 Revert "chore: mv emqx_connector to emqx_data_bridge" 
This reverts commit d640e2ccfa.
 2021-06-28 11:43:31 +08:00
zhanghongtong
786fd6fe3e feat(connector): mysql and pgsql query support params 2021-06-28 11:43:31 +08:00
Turtle
07ade268f9 chore: mv emqx_connector to emqx_data_bridge 2021-06-28 11:43:31 +08:00
Shawn
ff54fbd1d1 fix(shared_sub): discard all unexpected msgs 2021-06-28 11:43:14 +08:00
Shawn
95e7a4dd7b chore(appup): update the appup for 4.3.5 2021-06-28 11:43:13 +08:00
Shawn
8f15a41f54 fix(shared_sub): failed to clean the emqx_shared_subscription tab 
A trick that fixes the issue that we demonitored the shared subscriber
too early if it not unsubscribed all of the topics.
 2021-06-28 11:42:56 +08:00
Turtle
22f1e8d7ed chore(review): review 4.3.4 2021-06-28 11:42:39 +08:00
Turtle
bde9d052a5 feat(lwm2m): fix check dialyzer fail 2021-06-28 11:42:39 +08:00
Turtle
8c0c6974d9 fix: Ignore repeatedly receiving connection packet in the wait_will_msg/wait_will_topic/connected state 2021-06-28 11:42:39 +08:00
JianBo He
8da6d5cf16 fix(emqx_cm): catch noproc exception from rpc_call (#5048) 2021-06-28 11:42:39 +08:00
JianBo He
ab75901061 fix(coap): fix coap uri format (#5059) 2021-06-28 11:42:25 +08:00
Zaiming Shi
c7fe49c200 test(ci): add plugin list status check after relup new vsn install 2021-06-28 11:42:12 +08:00
JianBo He
f3617aa082 chore: upgrade lwm2m_coap to 1.1.4 2021-06-28 11:41:53 +08:00
Turtle
c7ebc12ce1 feat(lwm2m): add emqx_lwm2m http API 2021-06-28 11:41:53 +08:00
Shawn
8e08e83090 fix(appup): relup for emqx_rule_registry failed 2021-06-28 11:41:53 +08:00
Shawn
c1b2163362 feat(rules): remove stats update from rule_engine_registry (#5029) 2021-06-28 11:41:53 +08:00
Shawn
a610c3d1f3 fix(rule): delete resource failed when searching dependent rules (#4996) 2021-06-28 11:40:51 +08:00
Turtle
8a3ac7c878 chore(plugins): rm emqx-sasl plugin 2021-06-28 11:40:49 +08:00
tigercl
bcedd7fe9e fix(query string): support query string in path (#4981) 2021-06-28 11:40:44 +08:00
JianBo He
56ac459b7f fix(modules): fix start/stop exhook module failure 2021-06-28 11:40:44 +08:00
JianBo He
2bc586b930 fix(ws): avoid funcation_clause for un-inited websocket 2021-06-28 11:40:43 +08:00
k32
c1d2bae833 fix(auth_ldap): Handle missing attributes 
Fixes: #4953
 2021-06-28 11:40:42 +08:00
Zaiming Shi
0451f89c22 chore(conf): change default number of gen_rpc connections to 1 2021-06-28 11:40:24 +08:00
JianBo He
8352fa6f31 fix(mqttsn): fix proto_name to MQTT-SN instead of MQTT (#4961) 2021-06-28 11:40:22 +08:00
JianBo He
7af4b80ef4 fix(lwm2m): base64 decode for opaque value 2021-06-28 11:39:29 +08:00
Turtle
1063f2cae5 chore(plugins): rm emqx-lua-hook plugin 2021-06-28 09:44:17 +08:00
k32
6063fc72f7 chore(authentication): Migrate to RLOG 2021-06-25 16:58:50 +02:00
Rory Z
c79e478c42 chore: delete internal acl code 2021-06-25 18:45:34 +08:00
Rory Z
55613593f0 chore: delete import and export feature 2021-06-25 18:45:34 +08:00
Rory Z
ecc450e942 chore: delete import and export feature 2021-06-25 18:45:34 +08:00
zhanghongtong
09e995a1b2 build: delete needless auth plugins 2021-06-25 18:45:34 +08:00
zhanghongtong
c24f3688c4 build: delete needless auth plugins 2021-06-25 18:45:34 +08:00
Turtle
2d1008ceaf chore: move emqx_recon to emqx_modules plugin 2021-06-25 18:45:04 +08:00
turtleDeng
c9c6b69cc9
chore: reset plugin conf generate (#5094) 
* chore: reset plugin conf generate

* fix(plugin): check dialyzer fail

* chore: rm emqx_management_schema.erl file

* fix(plugin): check dialyzer fail

* fix(plugin): fix check ct fail

* fix(plugin): check dialyzer fail
 2021-06-25 17:06:30 +08:00
Turtle
2582fdcfe8 feat(prometheus): Update the configuration file to hocon 2021-06-25 16:31:18 +08:00
Shawn
d5eb37c537
Add some APIs for emqx_config (#5095) 2021-06-25 15:40:28 +08:00
Shawn
9977d836bc
Reference to foreign schema definitions in emqx_schema (#5090) 2021-06-25 12:46:57 +08:00
Rory Z
4157524910
feat(redis connector): redis connector support cluster (#5074) 2021-06-25 11:47:57 +08:00
Shawn
704af9f3b1
The config handler phase2 (#5052) 
* refator(config_handler): handle and validate the updates to raw_configs

* fix(hocon): update hocon to 0.8.0

* refactor(config_handler): check and apply envs only in top-level handler

* refactor(config_handler): update config from top level to bottom level

* refactor(emqx_data_bridge): move configs to emqx.conf

* fix(emqx_schema): remove the extra config path

* fix(config_handler): load the emqx.conf when starting emqx_config_handler

* fix(data_bridge): API not working

* feat(config_handler): save updated configs to emqx_override.conf

* fix(config_handler): cannot find the emqx.conf and emqx_override.conf

* fix(emqx_config): cannot find the correct path for etc dir

* fix(test): load load emqx_schema foreign refereced apps

* refactor(emqx_plugin): do not generate configs before load plugins

All configs (including the configs for plugins) now should go into
the `emqx.conf`.

* fix(tests): update the test cases for plugins

* fix(tests): don't include schema from apps when testing

* fix(tests): use emqx-ct-helper branch hocon
 2021-06-25 11:47:18 +08:00
DDDHuang
a42605b27b
fix: statsd hocon schema & add test suit (#5060) 2021-06-25 09:18:52 +08:00
k32
6cb81240d0
Merge pull request #5054 from k32/dev/dashboard-shard 
feat(dashboard): Introduce dashboard RLOG shard
 2021-06-23 19:55:02 +02:00
k32
a14ab5f90a
Merge pull request #5053 from k32/dev/mgmt-shard 
feat(emqx_management): mqtt_app shard
 2021-06-23 19:42:47 +02:00
turtleDeng
5a560a153c
feat(telemetry): Update the configuration file to hocon (#5064) 2021-06-23 17:12:24 +08:00
Rory Z
263aaff6d6
feat: add authz (#4852) 
* feat(authorization): add authorization api

* feat(authorization): add check function

* feat(authorization): use hocon config file

* feat(authz): add mysql connector

* feat(authz): support pgsql

* feat(connector): support redis

* chore(authz): use "publish/subscribe/all" instead of "pub/sub/pubsub"
 2021-06-23 10:55:38 +08:00
Zaiming Shi
d7ed66f234 build: do not allow user override PKG_VSN 
We have an assertion in code, allowing user to override
will compile but not run.
 2021-06-22 18:56:31 +08:00
k32
2d8ebc17cd feat(dashboard): Introduce dashboard RLOG shard 2021-06-21 18:03:51 +02:00
k32
239255f251 feat(emqx_management): mqtt_app shard 2021-06-21 18:02:11 +02:00
Zaiming Shi
291cea0727 chore(emqx_lwm2m): pin lwm2m-coap v2.0.0 
v2.0.0 has emqx_http_lib added as a rebar dependency
v1.* is for emqx v4.3.*
 2021-06-21 11:54:58 +02:00
DDDHuang
4011aee361 refactor(config): support hocon 2021-06-21 12:20:20 +08:00
DDDHuang
b62301c5f4 chore: support statsd 2021-06-21 12:20:20 +08:00
Turtle
bc71a1e2c6 fix(plugins): fix load plugin generate hocon configs fail 2021-06-19 16:47:09 +08:00
Shawn
8978464269
change resource,connectors,data_bridges as normal apps (#5034) 2021-06-19 16:27:21 +08:00
Turtle
ffcbcaed3c feat(plugins): Support load plugins of hocon configuration format 2021-06-19 13:42:21 +08:00
Rory Z
186094d2ab chore(hooks): update type 2021-06-18 18:59:52 +08:00
Rory Z
1fa55f5a4e chore(hooks): delete is_function() 2021-06-18 18:59:52 +08:00
Rory Z
1a09d636ae test: fix tests error 2021-06-18 18:59:52 +08:00
Rory Z
e5447cd6e4 chore(appup): update appup file 2021-06-18 18:59:52 +08:00
Rory Z
536c7256da chore(dialyzer): fix dialyzer error 2021-06-18 18:59:52 +08:00
zhanghongtong
bbf6b4e64e chore(hooks): emqx_hooks no longer accept anonymous functions 2021-06-18 18:59:52 +08:00
zhanghongtong
abca2938f4 fix(connector): add nullable for sentinel_name in redis schema 2021-06-18 16:11:51 +08:00
Zaiming Shi
36cd03cc98 fix(emqx_schema): add 'sensitive' flag for passowrd configs 2021-06-18 09:02:25 +08:00
Zaiming Shi
6865f36d90 chore(rebar.config): use hocon 0.6.0 
hocon 0.6.0 added supports for sensitive config flagging
sub-struct type checking, and remote struct referencing
 2021-06-18 09:02:25 +08:00
k32
5b84513e77
Merge pull request #5014 from k32/dev/route_shard 
feat(rlog): Introduce routing RLOG shard
 2021-06-17 17:00:14 +02:00
DDDHuang
1e0f6f4dea chore: more node info 2021-06-17 21:09:06 +08:00
turtleDeng
54dedc8343 Revert "chore: mv emqx_connector to emqx_data_bridge" 
This reverts commit d640e2ccfa.
 2021-06-17 19:11:10 +08:00
zhanghongtong
d9d5bc4fae feat(connector): mysql and pgsql query support params 2021-06-17 18:50:28 +08:00
Turtle
d640e2ccfa chore: mv emqx_connector to emqx_data_bridge 2021-06-17 16:42:41 +08:00
William Yang
d1978aaaf2 chore(quic): fix format 2021-06-17 09:03:10 +02:00
William Yang
b4a9d663ae feat(quic): quic conn idle_timeout default 1min 2021-06-17 09:03:10 +02:00
William Yang
4e2e2d5635 feat(quic): update emqx_schema for quic 2021-06-17 09:03:10 +02:00
William Yang
fd785240f5 feat(quic): bump quicer to 0.0.3 2021-06-17 09:03:10 +02:00
William Yang
e34470f9f2 feat(quic): remove unsupported configs. 2021-06-17 09:03:10 +02:00
William Yang
af2faed107 feat(quic): switch to deps on emqx quicer repo 2021-06-17 09:03:10 +02:00
k32
6505340cb8 feat(rlog): Introduce routing RLOG shard 2021-06-16 16:05:10 +02:00
Shawn
56c6cf560a fix(dialyzer): guard test can never succeed 2021-06-16 16:02:44 +08:00
Shawn
1e14a6086e fix(dialyzer): invalid type specs 2021-06-16 16:02:44 +08:00
Shawn
134970e7b7 fix(data_bridge): comment out all the connector-config 2021-06-16 16:02:44 +08:00
turtleDeng
0515ef6e45
feat(connector): add more connector (#4985) 2021-06-16 11:28:26 +08:00
Shawn
8b0a6d955b fix(test): ci failed due to existing subscriptions 2021-06-16 11:27:34 +08:00
Shawn
444c721f93 fix(config): change handler name to emqx_data_bridge_config_handler 2021-06-16 11:27:34 +08:00
Shawn
b11afc6997 fix(config): start the top level config handler at emqx bootup 2021-06-16 11:27:34 +08:00
Shawn
378a2b7b9e feat(config): update config to the sub config handler 2021-06-16 11:27:34 +08:00
Shawn
ccba714cd6 feat(config): add emqx_config_handler 2021-06-16 11:27:34 +08:00
zhanghongtong
4505607c51 chore(tests): update acl mysql test case 2021-06-16 09:42:07 +08:00
zhanghongtong
949e8348fc chore(connector): ensure alllication start in mysql connector 2021-06-16 09:41:52 +08:00
William Yang
68844cefd9 feat(quic): update emqx_schema for quic 2021-06-15 15:36:04 +02:00
William Yang
bb6459ba3a build: add quic dep in app/emqx/rebar.config 2021-06-15 15:36:04 +02:00
William Yang
14614fbe33 feat(quic): adapt to new quicer API. 2021-06-15 15:36:04 +02:00
William Yang
5356668eac feat(quic): adapt to hocon schema 2021-06-15 15:36:04 +02:00
William Yang
1ffd2cf245 chore(config): adapt to new config format 2021-06-15 15:36:04 +02:00
William Yang
f9a113477e feat(quic): use quicer:getstat instead. 2021-06-15 15:36:04 +02:00
William Yang
e062be2b0e feat(quic): reload quicer lib before start listener 2021-06-15 15:36:04 +02:00
William Yang
14057c033d feat(quic): support stop/start quic listeners. 2021-06-15 15:36:03 +02:00
William Yang
06f9674ce3 feat(quic): add quicer to application deps list. 2021-06-15 15:36:03 +02:00
William Yang
9570d01792 fix(quic): error handling for getstats. 
- return {error, closed} instead
- quicer demo/3 branch.
 2021-06-15 15:36:03 +02:00
William Yang
570e096b56 fix(quic): return empty list for dead 'Socket' 2021-06-15 15:36:03 +02:00
William Yang
087aa1dd53 feat(quic): handle stream close. 2021-06-15 15:36:03 +02:00
William Yang
70f22d2c1b feat(quic): reuse emqx_connection module for quic. 2021-06-15 15:36:03 +02:00
William Yang
899ba579fc feat(quic): compile and start quicer listener. 2021-06-15 15:36:03 +02:00
Zaiming Shi
c84af95190 chore: ensure new env override prefix variable 2021-06-15 12:35:08 +02:00
Zaiming Shi
9a78f812e1 fix(emqx_resource): fix schema schema definition 2021-06-15 12:35:08 +02:00
Zaiming Shi
bde5d11078 fix(hocon): call new schema definition functions 2021-06-15 12:35:07 +02:00
Zaiming Shi
909814a34d fix(hocon): pin hocon 0.5.1 2021-06-15 12:35:07 +02:00
zhanghongtong
8a368efb95 chore: move lib-ce to apps 
Signed-off-by: zhanghongtong <rory-z@outlook.com>
 2021-06-15 17:31:54 +08:00
k32
06dd83c171
Merge pull request #4991 from k32/dev/rlog0 
feat(rlog): Add RLOG to EMQX
 2021-06-15 10:46:45 +02:00
zhanghongtong
c94d4d9a28 chore(data bridge): comment example config 
Signed-off-by: zhanghongtong <rory-z@outlook.com>
 2021-06-15 16:45:41 +08:00
k32
13803f9159 feat(rlog): Add RLOG to EMQX 2021-06-14 15:05:36 +02:00
zhanghongtong
496d30be6a chore(appup): add appup for plugin libs 2021-06-11 11:33:57 +08:00
tigercl
55cf74f23a
Merge pull request #4844 from tigercl/feat/new-authentication 
feat(new authentication): implement new auth design
 2021-06-11 10:59:45 +08:00
zhouzb
cbc5c64a16 chore(dialyzer): make code pass dialyzer 2021-06-10 16:18:50 +08:00
zhouzb
bb62b44554 feat(auth): support bcrypt 2021-06-09 18:57:08 +08:00
zhouzb
ae8be5d66f feat(authentication): add a 16-byte salt in front of the password before hashing 2021-06-09 16:53:40 +08:00
zhouzb
d838206a56 chore(code): add type spec 2021-06-09 11:10:03 +08:00
zhouzb
2bfb7f74df fix(jwt): fix chain interruption 2021-06-09 10:36:06 +08:00
Shawn
1de2f5cb2f fix(emqx_data_bridge): update bridge failed 2021-06-08 21:46:52 +08:00
Shawn
fdd0233103 feat(emqx_resource): update the demo.md 2021-06-08 21:46:52 +08:00
Shawn
65dc2f2be8 feat(emqx_resource): remove the schema sugar from parse transformed code 2021-06-08 21:46:52 +08:00
zhouzb
0c237bf797 feat(jwt): support based encoded secret 2021-06-08 15:56:13 +08:00
zhouzb
f297c36929 feat(jwt auth): support JWT auth 2021-06-08 11:40:46 +08:00
Shawn
2f720f4a17 feat(emqx_data_bridge): add license headers 2021-06-07 22:15:23 +08:00
Shawn
bdf6374414 fix(emqx_resource): disable the debug print for parse-transformed code 2021-06-07 22:11:05 +08:00
Shawn
149a54cef4 fix(emqx_resource): dialyzer issues 2021-06-07 22:08:21 +08:00
Shawn
3c1c457697 fix(emqx_resource): call to undefined function hocon:richmap_to_map/1 2021-06-07 21:54:17 +08:00
Shawn
16c0a5b80a fix(emqx_resource): merge conflict 2021-06-07 21:25:19 +08:00
Shawn
a37b3957e3
Merge branch 'master' into emqx_connector 2021-06-07 21:12:00 +08:00
Shawn
dddab31326 fix(emqx_data_bridge): resource type to bridge type 2021-06-07 20:01:28 +08:00
Shawn
e9fe345ac8 fix(emqx_data_bridge): correct the format of HTTP responses 2021-06-07 19:52:08 +08:00
Shawn
4914b003ac feat(emqx_resource): update the unused APIs 2021-06-07 17:20:34 +08:00
Shawn
2ff92d2880 feat(emqx_data_bridge): add HTTP APIs for data bridge 2021-06-07 16:12:06 +08:00