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

6037 Commits

Author SHA1 Message Date
Zaiming Shi 1b0b742919
Merge pull request #4163 from tigercl/fix/telemetry 
fix(telemtry): report only in official version
 2021-02-22 21:01:32 +01:00
Zaiming Shi db72b6ae26
Merge pull request #4221 from zmstone/chore-build-move-emqx-telemetry-back-to-apps 
chore(build): move emqx-telemetry back to apps
 2021-02-22 20:59:48 +01:00
Zaiming Shi 61c5069766 chore(build): Move emqx_telemetry back to apps 2021-02-22 20:29:27 +01:00
Zaiming Shi d7540dc794
Merge pull request #4216 from terry-xiaoyu/enterprise-dev/e4.3.0 
chore(rule): migrate rule-engine from enterprise version
 2021-02-22 20:27:28 +01:00
Zaiming Shi 4293d15cf9
Merge pull request #4214 from emqx/resolve-dev/v4.3.0-to-dev/v5.0-conflict 
Auto-pull-request-on-2021-02-20
 2021-02-22 20:14:46 +01:00
Zaiming Shi 505ae24ded
Merge branch 'dev/v5.0' into resolve-dev/v4.3.0-to-dev/v5.0-conflict 2021-02-22 15:20:34 +01:00
Zaiming Shi e2910eaeb1
Merge pull request #4219 from Rory-Z/chore/format-contributing 
docs: format contributing
 2021-02-22 15:13:39 +01:00
Shawn e201484163 fix(rule): incorrect merge for map_get/2,3 and map_put/3 2021-02-22 18:16:24 +08:00
zhanghongtong ca47dae699 docs: format contributing 2021-02-22 15:32:14 +08:00
JianBo He 2c9ea3c29e chore(jwt): clearer explanation for verify_claims 2021-02-22 13:58:16 +08:00
Shawn 196fef0255 chore(rule): migrate rule-engine from enterprise version 2021-02-22 13:53:51 +08:00
Shawn 7778cd8623
Add hooks only when creating the rules (#4160) 
* refactor(rules): add hook only when creating rules

* fix(rule): update hooks after application restarted

* fix(rule): remove the extra guard
 2021-02-22 11:16:47 +08:00
Shawn 1be62b7cbb
feat(lwm2m): always publish update message (#4201) 
* feat(lwm2m): always publish update message

* fix(lwm2m): change the publish_update_when to enum
 2021-02-20 17:14:14 +08:00
Shawn 1e047e84c2
feat(resource): keep restart disconnected resources after emqx bootup (#4125) 
* feat(resource): keep restart disconnected resources after emqx bootup

* feat(resource): improve the restart monitor

* fix(test): improve emqx_rule_monitor_SUITE

* fix(resource): refresh resource should be only applied on local node

* fix(test): improve the test case for restart_resource

* fix(resource): rename some functions
 2021-02-20 17:10:50 +08:00
Shawn c2e1bc039b
feat(rule): add more sql functions #4143 (#4144) 2021-02-20 17:10:10 +08:00
Zaiming Shi c2cd2fd231 Merge remote-tracking branch 'origin/dev/v4.3.0' into dev/v5.0 2021-02-19 21:13:33 +01:00
Zaiming Shi 0414cb6c86
Merge pull request #4210 from zmstone/chore-relocate-some-apps 
chore(apps): relocate some apps
 2021-02-19 12:43:37 +01:00
Zaiming Shi aed58a14ee chore(build): rename lib-opensource to lib-ce for shorter name 2021-02-19 11:54:45 +01:00
Zaiming Shi 4a877a3a69 chore(apps): relocate some apps 
emqx_telemetry is for opensource onlyh
emqx_rule_engiune is common
 2021-02-19 11:24:41 +01:00
Zaiming Shi 3dfa9f45c4
Merge pull request #4183 from zmstone/merge-e4.2.4-to-dev-4.3.0 
Merge e4.2.4 to dev 4.3.0
 2021-02-19 10:26:47 +01:00
Zaiming Shi 71d02e8011 chore(emqx_connection): delete stale code 2021-02-19 10:20:16 +01:00
Zaiming Shi 0b513c6e3d
Merge pull request #4188 from bgrosse-midokura/mgmt_restart_listeners 
feature(mgmt) restart a listener
 2021-02-19 10:01:06 +01:00
Zaiming Shi 3353a2f402
Merge pull request #4206 from z8674558/fix-dialyzer 
fix dialyzer warnings
 2021-02-19 09:57:14 +01:00
Benjamin Große ca1d24a98d feature(mgmt): restart a listener 
example:

```
emqx_ctl listener restart mqtt:ssl:external
```

or

```
PUT /api/v4/listeners/mqtt:ssl:external/restart
```

thank you @zmstone for providing the listener-identifier apis :)
 2021-02-19 09:22:47 +01:00
z8674558 5a960fdabc chore(emqx_auth_mnesia): fix dialyzer warnings (match returned values) 2021-02-19 16:52:38 +09:00
z8674558 91d00b2586 chore(emqx_auth_mnesia): fix dialyzer warnings (return error tuple to minirest) 2021-02-19 16:52:38 +09:00
z8674558 e341387837 chore(emqx_auth_mnesia): fix dialyzer warnings (do_update_user only receives Login and NewPassword)' 2021-02-19 16:52:31 +09:00
z8674558 706e272410 chore(emqx_auth_http): fix dialyzer warnings (match returned values) 2021-02-19 16:23:18 +09:00
Zaiming Shi 98b319a0c0
Merge pull request #4190 from zmstone/refactor-assing-names-to-listeners 
feat(listeners): Add identifier to listeners
 2021-02-19 07:50:27 +01:00
Zaiming Shi 64cfaf4385 improve(print): io:format error message without indentation 
Avoid squeezing lines to the right.
 2021-02-19 07:45:37 +01:00
Zaiming Shi 692d08b630
Merge pull request #4205 from z8674558/dev/v4.3.0 
merge dev/v4.3.0 to dev/v5.0
 2021-02-19 07:28:31 +01:00
z8674558 469c7ad43a chore(config): rm redundant quotes because they are now processed in cuttlefish 2021-02-19 13:15:11 +09:00
z8674558 f251609ace Merge remote-tracking branch 'upstream/dev/v5.0' into dev/v4.3.0 2021-02-19 12:47:07 +09:00
Benjamin Große 28f9b4d519 feat(peer_cert_as_clientid): peer_cert_as_clientid = cn | dn | crt | pem | md5 
pem is base64 encoded instead of binary crt

peer_cert_as_username=crt breaks exhook proto utf8 parsing of username

crt cannot be used in a topic name due to being invalid utf8
pem cannot be used in a topic name due to having slashes

peer_cert_as_clientid = md5 allows to e.g. subscribe to "t/%c" with ACL

existing peer_cert_as_username combinations are unaffected.
 2021-02-19 10:53:11 +08:00
Zaiming Shi dfcc2dd566
Merge pull request #4195 from z8674558/env-override 
feat(bin): let cuttlefish read env var
 2021-02-18 22:54:00 +01:00
z8674558 2b9a702b70 test(ci): give parameters thru env variable, not sed 2021-02-19 01:09:20 +09:00
z8674558 74b7ea34d9 feat(bin): let cuttlefish read env var 2021-02-19 01:09:06 +09:00
Zaiming Shi d2bd9b4078
Merge pull request #4197 from zmstone/improve-shared-sup-random-start-point-for-roundrobin 
improve(shared-sub): Randomise the startpoint for round-robin
 2021-02-18 13:26:01 +01:00
JianBo He 54d82584bc
Merge pull request #4196 from emqx/dev/v4.3.0 
Auto-pull-request-on-2021-02-16
 2021-02-18 11:03:08 +08:00
Zaiming Shi db461179c5 improve(shared-sub): Randomise the startpoint for round-robin 2021-02-17 19:10:37 +01:00
Shawn eec64e440d
fix(tracer): create short handler-id if clientid is too long (#4164) 
* fix(tracer): create short handler-id if clientid is too long

No need to support lists and atoms for when tracing clients/topics.
 2021-02-16 14:45:33 +08:00
Zaiming Shi 65f3a2b685 fix(cli): Stop http listener without port number 2021-02-15 10:42:17 +01:00
Zaiming Shi a93d62ace6 refactor(cli): Print listener ID as table head 2021-02-15 10:34:47 +01:00
Zaiming Shi 2fc758c49a fix(test): Pin emqx-ct-helper 1.3.6 2021-02-14 23:17:03 +01:00
Zaiming Shi f9465dda16 Merge branch 'dev/v4.3.0' into merge-e4.2.4-to-dev-4.3.0 2021-02-14 21:41:23 +01:00
Zaiming Shi 877f1750a4
Merge pull request #4191 from emqx/dev/v4.3.0 
Auto-pull-request-on-2021-02-14
 2021-02-14 21:34:52 +01:00
Zaiming Shi c5a02c729a feat(listeners): Add an api to ensure all listeners are started 2021-02-14 21:30:50 +01:00
Zaiming Shi dfa9bbc0c2 refactor(listeners): use emqx_ctl to print cli messages 
It's better to keep cli print behaviour consistent.

It also makes tests easier as they can meck emqx_ctl:print to
validate the output.
 2021-02-14 20:40:01 +01:00
Zaiming Shi 2d79c870c1 fix(mgmt_cli): Do not doulbe print listener stop results 2021-02-14 20:16:42 +01:00
Zaiming Shi 153977609e feat(listeners): Add identifier to listeners 
Listeners are internally identifiered by the listen-on tuple
which is not UI friendly when we have to find a listener by this
'signature'.

The listeners are actually named in configs, but the names are
discarded in the parsing functions.

This commit is to keep the name and provide an API to find
listener by name (identifier).
 2021-02-14 18:12:40 +01:00