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

1716 Commits

Author SHA1 Message Date
Shawn
988d620421 fix(test): mock emqx_resource:remove/1 in emqx_authz_http_SUITE 2021-08-16 17:41:53 +08:00
Shawn
7f03cd0e8b fix(config): update the calls to emqx_config:update/2,3 2021-08-16 17:41:53 +08:00
Shawn
b381b5d2b9 feat(emqx_config): return config maps when emqx_config:update/2,3 2021-08-16 17:41:53 +08:00
zhanghongtong
26c0754732 chore(release): update emqx release version 
Signed-off-by: zhanghongtong <rory-z@outlook.com>
 2021-08-13 17:55:56 +08:00
DDDHuang
4b3b4dd54c fix: dashboard 404 conflict 2021-08-13 16:57:10 +08:00
DDDHuang
3f1d3b9cf4
Merge pull request #5482 from DDDHuang/monitor_millseconds 
fix: monitor timestamp millsecond
 2021-08-13 15:27:48 +08:00
DDDHuang
1868414637
Merge pull request #5473 from DDDHuang/jwt 
feat: api support jwt
 2021-08-13 15:26:45 +08:00
DDDHuang
23a8e28f77 fix: monitor timestamp millsecond 2021-08-13 14:26:43 +08:00
DDDHuang
22dd6e1a86 fix: rename tab & params 2021-08-13 14:19:31 +08:00
tigercl
e73df538a7
Merge pull request #5476 from k32/fix-auth-init-order 
fix(rlog): Ensure the correct order of table initalization
 2021-08-13 13:49:06 +08:00
Turtle
96ee04bbd0 chore(modules): remove start emqx-ee load_modules 2021-08-13 13:44:00 +08:00
DDDHuang
93dbdaa84a feat: dashboard api support jwt 2021-08-13 11:23:13 +08:00
lafirest
e80d95bd76
Merge pull request #5470 from lafirest/fix/emqx_coap 
fix(emqx_gateway): fix some error in README and code
 2021-08-13 10:46:37 +08:00
k32
dfa6761e49 fix(rlog): Ensure the correct order of table initalization 2021-08-12 19:58:52 +02:00
zhanghongtong
618125b1da fix(connector): fix schema error for mongo 2021-08-12 21:52:06 +08:00
DDDHuang
3b52328244 fix: monitor response data format 2021-08-12 19:41:53 +08:00
lafirest
20f9cf19cd fix(emqx_gateway): fix some error in README and code 2021-08-12 19:01:28 +08:00
Shawn
4bf1e83449 fix(test): variable 'Id' shadowed in 'fun' 2021-08-12 17:20:05 +08:00
Shawn
cc1222ffea fix(emqx_config): correct some function sepcs and return values 2021-08-12 17:20:05 +08:00
Shawn
b652a64dbb fix(config): reset config failed due to rootname not found 2021-08-12 17:20:05 +08:00
Shawn
8dbb14b668 feat(config): improve the API for resetting configs 2021-08-12 17:20:05 +08:00
Shawn
1c86bd6199 feat(emqx_config): add emqx_config:fill_defaults/1 2021-08-12 17:20:05 +08:00
JianBo He
a4d29ec8de chore(exhook): fix diaylzer warnings 2021-08-12 16:34:10 +08:00
JianBo He
4921c00a19 chore(exhook): change the name to binary type 2021-08-12 16:34:10 +08:00
JianBo He
b3fac24c5e chore(schmea): include the emqx_exhook_schema 2021-08-12 16:34:10 +08:00
JianBo He
3cef377b33 feat(exhook): make request_failed_action working 2021-08-12 16:34:10 +08:00
JianBo He
6574fc4f14 fix(exhook): set trap_exit flag 2021-08-12 16:34:10 +08:00
JianBo He
f5acf5fd0b refactor(exhook): move all manager code into mngr module 2021-08-12 16:34:10 +08:00
JianBo He
7e5be6ed6c refactor(exhook): add mechanism to reload the failure server 2021-08-12 16:34:10 +08:00
DDDHuang
870b68c104
Merge pull request #5463 from DDDHuang/fix_moniyor 
fix: depart monitor api path & add parameter
 2021-08-12 14:35:37 +08:00
lafirest
18c2765a1e
Merge pull request #5441 from lafirest/refactor/emqx_coap 
refactor(emqx_gateway): refactor the emqx_coap
 2021-08-12 14:05:12 +08:00
x1001100011
9640132edc
Merge pull request #5452 from x1001100011/make-EMQX_DEP_APPS-static 
feat: make EMQX_DEPS_APPS static
 2021-08-11 21:50:57 -07:00
DDDHuang
e3415ae361 fix: depart api path & add parameter 2021-08-12 12:24:11 +08:00
DDDHuang
8efe854f63 fix: remove test code 2021-08-12 10:24:46 +08:00
DDDHuang
324a036aa8 fix: users api path & params name 2021-08-12 10:23:28 +08:00
k32
5abec37098 chore(build): Globally set snk_kind macro to msg 2021-08-11 14:03:41 +02:00
Zaiming (Stone) Shi
258191a5b4
Merge pull request #5453 from zmstone/fix-invalide-config-value-in-schema 
fix(config): infinity is not valid for log.max_depth
 2021-08-11 13:48:47 +02:00
lafirest
aafdf29cd8 refactor(emqx_gateway): refactor the emqx_coap 2021-08-11 19:03:02 +08:00
zhanghongtong
a94bfaf28b feat(authz api): support move rule position 
Signed-off-by: zhanghongtong <rory-z@outlook.com>
 2021-08-11 18:23:22 +08:00
DDDHuang
d62e7239c2
Merge pull request #5451 from DDDHuang/fix_monitor_params 
fix: merge counters each node
 2021-08-11 17:46:25 +08:00
Zaiming Shi
ac1763cd80 fix(config): infinity is not valid for log.max_depth 2021-08-11 10:14:59 +02:00
x1001100011
698c6c6ebc feat: make EMQX_DEPS_APPS static 2021-08-11 01:09:27 -07:00
DDDHuang
776aabda7d fix: merge counters each node 2021-08-11 15:00:30 +08:00
zhanghongtong
632cc895d5 chore(authz): formatting error returned 
Signed-off-by: zhanghongtong <rory-z@outlook.com>
 2021-08-11 11:06:58 +08:00
zhanghongtong
69a0fafd6b feat(authz api): get api support paging 
Signed-off-by: zhanghongtong <rory-z@outlook.com>
 2021-08-11 11:06:58 +08:00
zhanghongtong
c821528af9 feat(authz api): full CURD api 2021-08-11 11:06:58 +08:00
zhanghongtong
4bb1e9c964 feat(authz): more better update function 
Signed-off-by: zhanghongtong <rory-z@outlook.com>
 2021-08-11 11:06:58 +08:00
zhanghongtong
c26ec5c0dd feat(authz): support api 
Signed-off-by: zhanghongtong <rory-z@outlook.com>
 2021-08-11 11:06:58 +08:00
lafirest
69a202e4c0
Merge pull request #5446 from lafirest/chore/emqx_retainer 
chore(emqx_retainer): simplified the retainer config
 2021-08-11 09:46:21 +08:00
Zaiming (Stone) Shi
1239eb23b0
Merge pull request #5407 from zmstone/build-ci-on-otp-24 
Build ci on otp 24
 2021-08-10 12:20:48 +02:00
lafirest
6c73679b02 chore(emqx_retainer): simplified the retainer config 2021-08-10 17:47:30 +08:00
Shawn
566d6f8d74 refactor(config): create a dedicate API for config reset 2021-08-10 15:17:45 +08:00
Shawn
a4b773b66f refactor(config): create only one API for resetting configs 2021-08-10 15:17:45 +08:00
Shawn
74a849bfbb refactor(config): create APIs for each root-name 2021-08-10 15:17:45 +08:00
Shawn
bafcb7f34a fix(emqx_config): always return atom-key map for emqx_config:get/2 2021-08-10 15:17:45 +08:00
Shawn
eee98a5803 fix(API): return 400 if delete failed 2021-08-10 15:17:45 +08:00
Shawn
139712fc94 fix(API): return 200 for PUT method 2021-08-10 15:17:45 +08:00
Shawn
2738815af9 feat(API): add a general API to update configs 2021-08-10 15:17:45 +08:00
Shawn
990c383e01 feat(emqx_config): support fetching the entire config map 2021-08-10 15:17:45 +08:00
Shawn
c05e92a7cc fix(emqx_config): delete the emqx_config_handler:remove_config/2 2021-08-10 15:17:45 +08:00
Shawn
b8253ee94f feat(config): support config path mixed with atom() and binary() 2021-08-10 15:17:45 +08:00
Shawn
c745120453 fix(api): update config APIs for emqx core 2021-08-10 15:17:45 +08:00
Shawn
c9911a3b5f feat(api): add API /v5/configs for updating configs 2021-08-10 15:17:45 +08:00
DDDHuang
1064278db1 chore: add node param in subscription 2021-08-10 14:23:17 +08:00
DDDHuang
054406322a
Merge pull request #5440 from DDDHuang/api_desc 
chore: add some api params description
 2021-08-10 13:41:23 +08:00
DDDHuang
a87521358e chore: add some api params description 2021-08-10 11:42:58 +08:00
Zaiming Shi
0fb81c7e99 fix(coap): log error level only when it error 2021-08-09 21:46:07 +02:00
DDDHuang
dc2f6303d4
Merge pull request #5393 from DDDHuang/dashboard_metrics 
feat: add dashboard metrics; api username params
 2021-08-09 18:36:42 +08:00
x1001100011
0fe3083cd7 build: add erlang 24.0.1 for ci 2021-08-09 11:12:25 +02:00
Zaiming (Stone) Shi
672f94e118
Merge pull request #5430 from zmstone/refactor-simplify-ci-scripts 
refactor: simplify ci scripts
 2021-08-09 11:09:44 +02:00
Zaiming Shi
f1262e04bf feat: log error if timed out waiting after init:stop 2021-08-09 10:28:30 +02:00
Zaiming Shi
668ecbe97b fix: improve node stop wait loop 2021-08-09 10:28:04 +02:00
DDDHuang
b50afba5b9 feat: add dash board metrics 2021-08-09 16:20:02 +08:00
tigercl
40a9932167
Merge pull request #5427 from tigercl/feat/redis-authn 
feat(authn redis): support authn with redis
 2021-08-09 11:11:37 +08:00
JianBo He
ade69c1e18 fix(exhook): more safe type convertion 2021-08-07 08:48:34 +08:00
JianBo He
6dd33907f1 fix(exhook): fix the server name type 2021-08-07 08:48:34 +08:00
JianBo He
183a65d263 fix(exhook): fix the server config format 2021-08-07 08:48:34 +08:00
JianBo He
31d4f72d16 fix(exhook): correct the broker-info 2021-08-07 08:48:34 +08:00
Zaiming Shi
e698600903 refactor(emqx_machine): supervise terminator 2021-08-06 12:51:25 +02:00
Zaiming Shi
032a49114c fix(emqx_machine): start terminator in emqx_machine_app 2021-08-06 12:16:15 +02:00
Zaiming Shi
5063d3a2b3 fix(emqx_machine): ensure digraph is deleted after use 
also add tests
 2021-08-06 12:16:10 +02:00
Zaiming Shi
75f9741d75 fix(terminator): ensure erl_signal_server init:stop 
ensure init:stop can be triggered by kill signal even before the
terminator is ready
 2021-08-06 11:10:16 +02:00
Zaiming Shi
304b322a0c fix(emqx_machine): handle early shutdown 2021-08-06 10:20:42 +02:00
zhouzb
f43d3e9f66 feat(authn redis): add api spec for redis authentication 2021-08-06 15:22:49 +08:00
Zaiming Shi
81c9dcb6ae refactor(emqx_machine_terminator): future-proof try-catch 
Ensure exceptions in emqx_machine:stop_apps/0 is caught
and call init:stop/0 in the after clause
 2021-08-06 08:51:48 +02:00
Zaiming Shi
044e084698 feat(emqx_machine): ignore sighup, ensure sigterm 2021-08-06 08:46:07 +02:00
Zaiming Shi
85f8ba10ce fix(emqx_machine_signal_handler): ignore unknown info 2021-08-06 08:21:06 +02:00
zhouzb
3761db0525 feat(authn redis): support authn with redis 2021-08-06 14:05:31 +08:00
Zaiming Shi
bee8f01ee8 feat(emqx_machine): add a kill signal handler 
Now the signal from kill PID can also be handled gracefully
 2021-08-06 02:12:21 +02:00
Zaiming Shi
4025d31295 refactor(emqx_machine): move code from _app module to to emqx_machine 2021-08-05 14:30:59 +02:00
Zaiming Shi
bc23ff5e47 feat: add graceful shutdown 
prior to this cahnge emqx node shutdown is done by init:stop
which might have undesired stop order of the applications

in this change, emqx_machine_terminator is added to stop apps
in defined order and then terminate the node in infinite loop
 2021-08-05 14:11:58 +02:00
Zaiming Shi
d453005d8b fix(emqx): pin quicer 0.0.7 2021-08-05 13:43:22 +02:00
Zaiming Shi
d3038c0b71 fix(exhook): BrokerInfo uptime is now a duration integer 2021-08-05 12:58:03 +02:00
Zaiming Shi
6f8ca4ce07 feat: allow disable listener from environment variable 2021-08-05 12:58:03 +02:00
Zaiming Shi
ce24696329 refactor(emqx_app): start quic listener condition 
when the app is present, and when listners are configured
 2021-08-05 12:58:03 +02:00
Zaiming Shi
bdb871cb9a refactor(emqx_listeners): simplify listing logic 2021-08-05 12:07:10 +02:00
DDDHuang
e7cb9491c6
Merge pull request #5306 from DDDHuang/sys_info 
chore: sys uptime by millisecond
 2021-08-05 13:51:06 +08:00
zhanghongtong
dba37513a1 fix(emqx_ctl): fix an error when "~" in the print content 2021-08-05 10:45:40 +08:00
JianBo He
835eb84b5d chore(gw): remove needless files 2021-08-05 09:47:17 +08:00
JianBo He
94e33c3917 chore(gw): adapt to authn config format 2021-08-05 09:47:17 +08:00
JianBo He
1b2f732f13 chore(gw): fix zone name 2021-08-05 09:47:17 +08:00
JianBo He
f36c523ae8 chore(gw): integrate with emqx-authn 2021-08-05 09:47:17 +08:00
Zaiming (Stone) Shi
58446217a6
Merge pull request #5341 from zmstone/split-emqx-app 
Split emqx app
 2021-08-04 09:43:10 +02:00
DDDHuang
b3ea7f9cce
Merge pull request #5378 from DDDHuang/clients_api_fix 
fix: add cleints api query params doc & unsubscribe api
 2021-08-04 15:07:51 +08:00
Zaiming Shi
781de7f2a7 test(authz): ensure config cleaned up after test 2021-08-04 08:40:09 +02:00
Zaiming Shi
e6232665a3 refactor(emqx): ensure app shutdown and reboot order 
make use of application dependency to ensure start order.
also the same dependency top-sorted for shutdown and reboot order
 2021-08-04 08:40:03 +02:00
DDDHuang
b99ec04267
Merge pull request #5379 from DDDHuang/listeners_api_fix 
fix: listeners id param name
 2021-08-04 14:39:45 +08:00
DDDHuang
ac2084daeb
Merge pull request #5382 from DDDHuang/publish_api_fix 
fix: publish api params
 2021-08-04 14:39:05 +08:00
Zaiming Shi
3cda69fa3f fix(logging): text log formatter avoid binary literals 2021-08-04 08:36:10 +02:00
Zaiming Shi
58d0717b2f fix: add debug log for apps stop 2021-08-04 08:36:10 +02:00
Zaiming Shi
e6907478ba test: move emqx_global_gc_SUITE to emqx_machine app 2021-08-04 08:36:10 +02:00
Zaiming Shi
5b5006e8ab refactor(emqx_sup): move global gc to emqx_machine app 2021-08-04 08:36:10 +02:00
Zaiming Shi
522d8e0a4a refactor(config): split config and schema 2021-08-04 08:36:10 +02:00
Zaiming Shi
4bbd398550 refactor(emqx): create emqx_machine app 2021-08-04 08:36:10 +02:00
JianBo He
7e00805af3 chore(gw-lwm2m): remove needless files 2021-08-04 10:10:22 +08:00
JianBo He
b16cf44bf6 refactor(gw-lwm2m): refine lwm2m 2021-08-04 10:10:22 +08:00
DDDHuang
07a4d54a25 fix: unsubscribe api; query params 2021-08-03 17:08:40 +08:00
JianBo He
82321da7ad chore(exhook): bump version 2021-08-03 14:06:58 +08:00
JianBo He
d7322aff19 chore(exhook): empty appup.src 2021-08-03 14:06:58 +08:00
JianBo He
604e282978 chore(exhook): fix dialyzer warnings 2021-08-03 14:06:58 +08:00
JianBo He
922aa7aae5 test(exhook): refine property-tests 2021-08-03 14:06:58 +08:00
JianBo He
7c46c8712b docs(exhook): renanme CheckAcl to Authorize 2021-08-03 14:06:58 +08:00
JianBo He
aa019b34ad test(exhook): refine tests 2021-08-03 14:06:58 +08:00
JianBo He
879c191e41 refactor(exhook): adapt to the hocon schmea 2021-08-03 14:06:58 +08:00
tigercl
58b39361b3
Merge pull request #5388 from tigercl/feat/authn-api 
feat(authn api): support query authentication status
 2021-08-03 11:05:12 +08:00
zhouzb
05b72157e2 test(authn): add test cases 2021-08-03 10:40:08 +08:00
zhouzb
99534e7212 feat(authn api): support query authentication status 2021-08-03 10:25:04 +08:00
lafirest
149ef6d7cc style(emqx_gateway): improve some emqx_coap code 2021-08-03 09:48:08 +08:00
zhouzb
5e9ed72975 chore(authn rename): missing name change 2021-08-03 09:24:49 +08:00
zhouzb
fb716ae8b2 chore(authn rename): rename emqx_authn to authentication 2021-08-03 09:21:07 +08:00
DDDHuang
8e2b1aed32 fix: publish api params 2021-08-02 17:20:15 +08:00
DDDHuang
52ff6e1b3e fix: listeners id param name 2021-08-02 15:54:25 +08:00
DDDHuang
ca50dfe686 fix: add cleints api query params doc 2021-08-02 10:03:28 +08:00
Zaiming Shi
b10fb4e95d refactor: unify all io:format calls to use the same macro 2021-08-01 09:36:59 +02:00
Zaiming Shi
5f51f68cc9 fix(mqttsn): do not call emqx_logger:Level directly 2021-08-01 09:36:59 +02:00
Zaiming Shi
683974e1c8 refactor(log/textfmt): print mfa metadata in text formatter 2021-08-01 09:36:59 +02:00
Zaiming Shi
2998a87a8d fix(log/jsonfmt): log map() reports at top level JSON fields 2021-08-01 09:36:59 +02:00
Zaiming Shi
5d59ac1f02 refactor(logging): delete log headers from all modules 2021-08-01 09:36:59 +02:00
Zaiming Shi
e57f99168b refactor(logger): delete log header parse-transform 
because now we have MFA in log
 2021-08-01 09:36:59 +02:00
Zaiming Shi
0f5c5db841 refactor(logger): stop using anonymous fun for logging 2021-08-01 09:36:59 +02:00
Zaiming Shi
df69a9c031 chore: upgrade to hocon 0.11.0 2021-08-01 09:36:59 +02:00
lafirest
137294db8f refactor(eqmx_gateway): port emqx_coap into emqx_gateway framework 2021-07-31 15:50:09 +08:00
zhanghongtong
9a03138e53 feat(hooks): emqx hooks support put 2021-07-30 19:01:24 +08:00
zhanghongtong
1f4ce31010 chore(release): update emqx release version 2021-07-30 17:52:35 +08:00
Zaiming Shi
40faa31241 test(authz): no need to mock emqx_config 2021-07-30 16:53:21 +08:00
tigercl
305142f991
Merge pull request #5361 from turtleDeng/plugins/module-attr 
chore(plugins): delete emqx_plugins module attributes
 2021-07-30 15:54:20 +08:00
JianBo He
e6a2770e2f chore(gw): rename emqx_gateway to gateway 2021-07-30 15:42:03 +08:00
JianBo He
602f0ebb60 feat(gw-sn): call subscribe/unsubscribe hook 2021-07-30 15:42:03 +08:00
JianBo He
c986f89319 test(gw): use emqx_config:init_load/2 2021-07-30 15:42:03 +08:00
JianBo He
ec72513cf8 feat(gw-stomp): call unsubscribe hook 2021-07-30 15:42:03 +08:00