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

1813 Commits

Author SHA1 Message Date
zhongwencool
e5129ead6d fix(CI): Error detected: 'Invalid reference to group api in emqx_rule_engine_SUITE:all/0' 2021-08-26 17:17:47 +08:00
zhongwencool
53e386ad4e feat(emqx_cluster_call): ensure the consistency of resources 
When EMQX updates the cluster resources via HTTP API, it first updates the local node resources, and then updates all other nodes via RPC Multi Call to ensure the consistency of resources (configuration) in the cluster.
 2021-08-26 17:17:47 +08:00
DDDHuang
bcd15e9388
fix: delayed message api doc (#5569) 
* fix: delayed message api doc & add delayed message internal & remaning params
 2021-08-26 15:11:41 +08:00
DDDHuang
6d7d94c452 fix: topic rewrite api method 2021-08-26 10:08:01 +08:00
Shawn
005332d45d fix(config): do not allow default values for configs in zones 2021-08-26 09:11:30 +08:00
Shawn
7b63f7f18b refactor(emqx_mangement): update emqx_mangement for new listener,zone configs 2021-08-26 09:11:30 +08:00
Shawn
4ea451e207 fix(emqx): update the type spec for listener 2021-08-26 09:11:30 +08:00
Shawn
cc56c74964 refactor(emqx): update the tests for the new zone,listener config 2021-08-26 09:11:30 +08:00
Shawn
c5f0091b5d refactor(config): rework - config struct for zones and listeners 
```
listeners.tcp.default {
  bind = "0.0.0.0:1883"
  acceptors = 16
  max_connections = 1024000
  access_rules = [
    "allow all"
  ]
  proxy_protocol = false
  proxy_protocol_timeout = 3s
  mountpoint = ""
  tcp.backlog = 1024
  tcp.buffer = 4KB
}
listeners.ssl.default {
  bind = "0.0.0.0:8883"
  acceptors = 16
  max_connections = 512000
  access_rules = [
    "allow all"
  ]
  proxy_protocol = false
  proxy_protocol_timeout = 3s
  mountpoint = ""
  ssl.versions = ["tlsv1.3", "tlsv1.2", "tlsv1.1", "tlsv1"]
  ssl.keyfile = "etc/certs/key.pem"
  ssl.certfile = "etc/certs/cert.pem"
  ssl.cacertfile = "etc/certs/cacert.pem"
  tcp.backlog = 1024
  tcp.buffer = 4KB
}
listeners.quic.default {
  bind = "0.0.0.0:14567"
  acceptors = 16
  max_connections = 1024000
  keyfile = "etc/certs/key.pem"
  certfile = "etc/certs/cert.pem"
  mountpoint = ""
}
listeners.ws.default {
  bind = "0.0.0.0:8083"
  acceptors = 16
  max_connections = 1024000
  access_rules = [
    "allow all"
  ]
  proxy_protocol = false
  proxy_protocol_timeout = 3s
  mountpoint = ""
  tcp.backlog = 1024
  tcp.buffer = 4KB
  websocket.idle_timeout = 86400s
}
listeners.wss.default {
  bind = "0.0.0.0:8084"
  acceptors = 16
  max_connections = 512000
  access_rules = [
    "allow all"
  ]
  proxy_protocol = false
  proxy_protocol_timeout = 3s
  mountpoint = ""
  ssl.keyfile = "etc/certs/key.pem"
  ssl.certfile = "etc/certs/cert.pem"
  ssl.cacertfile = "etc/certs/cacert.pem"
  tcp.backlog = 1024
  tcp.buffer = 4KB
  websocket.idle_timeout = 86400s
}
```

```
zones.default {

}
```
 2021-08-26 09:11:30 +08:00
DDDHuang
4be58ae759 fix: event message api method 2021-08-25 17:38:08 +08:00
Turtle
e4f5e9332e feat: support array bridge_mqtt conf 2021-08-25 13:34:00 +08:00
DDDHuang
78cf115a90 fix: swagger doc 2021-08-25 11:58:28 +08:00
DDDHuang
f184cd3d0e fix: node parameters 2021-08-25 11:57:51 +08:00
DDDHuang
bafe5bae1c fix: placeholder & topic schema no default 2021-08-25 11:57:37 +08:00
DDDHuang
b13ae50bed fix: start sup 2021-08-25 11:57:37 +08:00
DDDHuang
aa6f1ac88d feat: auto subscribe, todo: test SUITE 2021-08-25 11:57:37 +08:00
Rory Z
7e8dde7e26 chore: fix dialyzer error 
Signed-off-by: zhanghongtong <rory-z@outlook.com>
 2021-08-25 10:15:00 +08:00
zhanghongtong
a2bafd1a18 feat(authz): support authorization config file part 2 2021-08-25 10:15:00 +08:00
zhanghongtong
a7fac1a7a3 feat(authz): support authorization config file part 1. 2021-08-25 10:15:00 +08:00
Rory Z
1886aa8bff chore: fix dialyzer error 2021-08-25 10:15:00 +08:00
zhanghongtong
bfb363bc61 chore(emqx_authz): rename authorization to authorization_rules in emqx_authz.conf 2021-08-25 10:15:00 +08:00
zhanghongtong
5652917af6 chore(authorization): moves authorization configuration items from zone to root 2021-08-25 10:15:00 +08:00
Turtle
87881621bb fix: fix typo 2021-08-25 10:13:21 +08:00
Turtle
675d23111c chore(swagger-schema): Delete the schema that is not reused 2021-08-24 23:01:51 +08:00
DDDHuang
bf67fa1be1 fix: generate topic metrics api & delayed message api path 2021-08-24 22:47:27 +08:00
Turtle
a1ae4457df feat(prometheus): add get prometheus_format stats api 2021-08-24 21:01:21 +08:00
Turtle
bc325e55fc fix(authn-authz-api): fix authn/authz test cases fail 2021-08-24 18:19:21 +08:00
Turtle
e0c05242a7 refactor(minirest-callback): refactor minirest callback function 2021-08-24 18:19:21 +08:00
Turtle
0cb5c3e6ec refactor(topic-metrics): refactor topic_metrics api 2021-08-24 11:15:25 +08:00
Turtle
ffc9846744 Merge branch 'refactor-mgmt-schema-util' of https://github.com/turtleDeng/emqx into refactor-mgmt-schema-util 2021-08-24 11:10:34 +08:00
turtleDeng
1eee85c2bf
Merge pull request #1 from DDDHuang/deng_mgmt_pr 
fix: alarms api page & limit parameters
 2021-08-24 11:10:26 +08:00
DDDHuang
f1ba482ed6 fix: alarms api page & limit parameters 2021-08-24 11:04:39 +08:00
Turtle
5a87d941f6 refactor(retainer): refactor emqx_retainer test case 2021-08-24 10:53:06 +08:00
Turtle
47378e0e96 refactor(schema-utils): refactor mgmt swagger schema utils 2021-08-24 10:53:06 +08:00
DDDHuang
8125ec7d08
feat: topic metrics api (#5520) 2021-08-24 10:52:18 +08:00
DDDHuang
32a84b3aba fix: clients api node params 2021-08-24 10:51:01 +08:00
Turtle
55c3ea6064 refactor(retainer): refactor emqx_retainer test case 2021-08-24 10:47:42 +08:00
DDDHuang
e88823fd36
Merge pull request #5540 from DDDHuang/fix_clients_api 
fix: clients subscribe api
 2021-08-24 09:57:17 +08:00
Turtle
5c93c35559 refactor(schema-utils): refactor mgmt swagger schema utils 2021-08-24 00:32:51 +08:00
k32
397a04ec7c
Merge pull request #5509 from k32/rlog-fixes 
Minor fixes to improve compatibility with RLOG feature
 2021-08-23 16:10:33 +02:00
k32
2b976af9ea chore(ekka): Bump version to 0.10.8 2021-08-23 14:10:26 +02:00
Shawn
de92cd411b feat(log): get the least severe level of handlers as the primary level 2021-08-23 18:25:45 +08:00
Shawn
8ac8b9785b refactor(config): update the conf struct for logger 2021-08-23 18:25:45 +08:00
Shawn
985dce786c refactor(config): update the conf struct for logger 2021-08-23 18:25:45 +08:00
DDDHuang
25bae9e397 fix: clients subscribe api 2021-08-23 10:31:24 +08:00
Turtle
31f588671d refactor(statsd): refactor statsd swagger schema 2021-08-23 09:42:25 +08:00
Turtle
d4d4ba9ea4 refactor(prometheus): refactor prometheus swagger schema 2021-08-23 09:41:46 +08:00
k32
ecd7964a5d fix(authn): Use local content shard for the chain table 2021-08-21 17:49:00 +02:00
k32
9c74fa42a5 chore(rlog): Use the new method of creating shards 2021-08-21 17:47:53 +02:00
k32
53a0c8b8a8 chore(ekka): Bump version to 0.10.7 2021-08-21 17:47:34 +02:00
k32
ca0fb214a7 feat(emqx-sn): Add tables to the SN shard 2021-08-21 17:47:34 +02:00
k32
af902df040 fix(emqx_machine): Fix application startup order 
Ekka application should be started first
 2021-08-21 17:47:34 +02:00
Shawn
91f787533d fix(log): text formatter crash 
```
(emqx@127.0.0.1)1> logger:error("abc").
ok
2021-08-20T18:10:01.180622+08:00 error: FORMATTER CRASH: {string,"abc"}
```
 2021-08-21 15:36:36 +08:00
Shawn
f3efc89192
refactor(config): replace all ':' with '=' in the *.conf (#5531) 2021-08-19 19:57:42 +08:00
DDDHuang
65563e9f8c
Merge pull request #5511 from DDDHuang/delayed_api 
feat: add delayed api
 2021-08-19 17:59:29 +08:00
DDDHuang
c07fadc336
Merge pull request #5526 from DDDHuang/fix_node_stats_api 
fix: node stats api
 2021-08-19 17:59:05 +08:00
DDDHuang
11ea506af6
Merge branch 'master' into delayed_api 2021-08-19 17:24:16 +08:00
DDDHuang
cc1b8eca6c fix: params & config generate; api base64 encode payload 2021-08-19 17:23:11 +08:00
DDDHuang
2088fe17cf fix: node stats api 2021-08-19 16:45:38 +08:00
zhouzb
f0ba6af660 chore(authn): fix dialyzer 2021-08-19 16:01:55 +08:00
zhouzb
e6c01cb6e6 fix(undefined function): fix undefined function 2021-08-19 16:01:55 +08:00
zhouzb
87051c0e53 test(authn): fix test case 2021-08-19 16:01:55 +08:00
zhouzb
178d1006e1 chore(match): reduce the risk of crash 2021-08-19 16:01:55 +08:00
zhouzb
e5892d16e5 feat(auth): support hot config 2021-08-19 16:01:38 +08:00
zhouzb
e6f9767066 feat(authn): support superuser 2021-08-19 15:59:26 +08:00
zhouzb
429def6b95 fix(authn): fix http api spec 2021-08-19 15:59:26 +08:00
zhouzb
3f2ca5282c chore(authn): remove implied schema 2021-08-19 15:59:26 +08:00
zhouzb
b7bc8b8cac feat(authn): improve apis of moving authenticators 2021-08-19 15:59:26 +08:00
zhouzb
60f0e8e5a5 refactor(authn): replace mnesia with ets table 2021-08-19 15:59:26 +08:00
zhouzb
61da3a4fd7 feat(authn hot config): initial support for hot config 2021-08-19 15:59:26 +08:00
Shawn
ef59309ed0 fix(config): check config failed when updating 2021-08-19 15:53:45 +08:00
Shawn
e17612b237 fix(config): return only updated confs for emqx:update_config/2,3 2021-08-19 15:53:45 +08:00
lafirest
d321cdbd47
Merge pull request #5515 from lafirest/refactor/emqx_retainer_api 
refactor(emqx_retainer): emqx_retainer_api use openapi model
 2021-08-19 10:56:58 +08:00
DDDHuang
5520326ce3 feat: add delayed api 2021-08-19 10:48:12 +08:00
lafirest
adc6226eae refactor(emqx_retainer): emqx_retainer_api use openapi model 2021-08-19 10:12:08 +08:00
DDDHuang
9c76247cde fix: alarms api timestamp millisecond 2021-08-19 09:56:32 +08:00
Shawn
213b7c2501 fix(config_api): improve the schema for config update APIs 2021-08-19 09:38:33 +08:00
turtleDeng
f01b77e4fe
refactor(event-message): refactor event_message 
* refactor(event-message): refactor event_message configuration

* feat(event-message): add event_message REST API
 2021-08-18 16:26:15 +08:00
Shawn
e8e95d39ef
refactor(config): move emqx_config:get/get_raw to emqx:get_config/get_raw_config (#5517) 2021-08-18 14:52:57 +08:00
Shawn
5f6bcd1ebb fix(config_api): remove config APIs that already been provided by apps 2021-08-18 11:30:20 +08:00
Shawn
a1da519d55 fix(rewrite): use emqx:update_config/2 instead of emqx_config:update/2 2021-08-18 09:42:06 +08:00
Shawn
bf6251e20f refactor(config): update the return values of config handlers 2021-08-18 09:42:06 +08:00
Shawn
e5c3199d6e fix(config): emqx:update_config/2,3 doesn't work on binary conf paths 2021-08-18 09:42:06 +08:00
Shawn
24207b80cb refactor(config): improve the return value of emqx:update_config/2,3 2021-08-18 09:42:06 +08:00
Shawn
bd8263e324 refactor(config): move APIs for config update,remove,reset to emqx 
Move the emqx_config:update,remove,reset APIs to emqx, to remove
the circular dependency between the modules emqx_config and
emqx_config_handler.

After this change the dependency among these modules will be:

```
emqx ---> emqx_config
   |          ^
   |          |
   + ---> emqx_conifg_handler
```
 2021-08-18 09:42:06 +08:00
Shawn
a2067c3bf3 refactor(spec): move some type specs from emqx_config_handler to emqx_config 2021-08-18 09:42:06 +08:00
JianBo He
9190f1f6f9 chore(gw): reformat config options 2021-08-18 09:26:48 +08:00
JianBo He
b8cb31c0ff fix(gw): fix the bad return value for initiating chain 2021-08-18 09:26:48 +08:00
JianBo He
430f20adc1 fix(gw): fix conn_state 2021-08-18 09:26:48 +08:00
JianBo He
c5a4e05418 refactor(gw): rename gateway type to name 2021-08-18 09:26:48 +08:00
JianBo He
9072a60652 chore(gw): refine the cli command 2021-08-18 09:26:48 +08:00
JianBo He
630e0fb8cb test(gw): fix bad test cases 2021-08-18 09:26:48 +08:00
JianBo He
cac0ea4b19 chore(gw): fix dialyzer warnigns 2021-08-18 09:26:48 +08:00
JianBo He
be4d2495f0 refactor(gw): single instance support only 2021-08-18 09:26:48 +08:00
DDDHuang
50ee840220
feat: add rewrite api (#5502) 2021-08-17 17:49:37 +08:00
Turtle
7fcd925eff feat(delayed): add delayed REST HTTP API 2021-08-17 09:21:19 +08:00
turtleDeng
4dc5772103
chore(rule-metrics): remove hot upgrade code change 2021-08-17 09:15:27 +08:00
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