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

662 Commits

Author SHA1 Message Date
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
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
3353a2f402
Merge pull request #4206 from z8674558/fix-dialyzer 
fix dialyzer warnings
 2021-02-19 09:57:14 +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
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
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
9b82112b7c Merge remote-tracking branch 'origin/dev/e4.3.0' into merge-e4.2.4-to-dev-4.3.0 2021-02-13 11:10:08 +01:00
Zaiming Shi
3863b7f116 fix(config): Quote config string values 2021-02-12 11:16:45 +01:00
Zaiming Shi
d11487268e Merge remote-tracking branch 'origin/dev/v4.3.0' into resolve-conflict-v4.3.0-to-v5.0 2021-02-12 10:36:16 +01:00
Zaiming Shi
8f477e8411 refactor(proj): Move opensource apps to lib-opensource 
One step closer for better code abstraction for opensorce vs enterprise
So far this relocation is to make opensource to enterprise merges
conflict free.
 2021-02-11 16:45:05 +01:00
Zaiming Shi
507759b9f1 Revert "refactor(emqx_modules): Move modules config to app dir" 
This reverts commit 9cae8784c0.
Because the reverted change broke compatibility with 4.2.x
configuration.
 2021-02-11 16:44:12 +01:00
JianBo He
2b4906b47d
Merge branch 'dev/v4.3.0' into unify_pgsql_conf 2021-02-11 15:50:43 +08:00
Zaiming Shi
514c2c0af5
Merge pull request #4169 from zmstone/refactor-move-modules-config-to-emqx-modules-app 
refactor(emqx_modules): Move modules config to app dir
 2021-02-10 09:03:04 +01:00
Zaiming Shi
9cae8784c0 refactor(emqx_modules): Move modules config to app dir 2021-02-10 00:02:52 +01:00
Zaiming Shi
f000b6583c fix(tls): Ensure tls config integrity 
For default tsl version and ciphers, we try to use otp release number
to determin if we want to use tlsv1.3

For default configs, we try to porivde both tlsv1.3 and
ciphers in config (even for commented out configs)
 2021-02-09 22:56:28 +01:00
Zaiming Shi
2fa1d9d10b
Merge pull request #4168 from emqx/dev/v4.3.0 
Auto-pull-request-on-2021-02-09
 2021-02-09 21:28:09 +01:00
Zaiming Shi
4756eb7e5f
Merge branch 'dev/v5.0' into v4.3.0-to-v5.0-resolve-tls-config-conflicts 2021-02-09 09:37:19 +01:00
Zaiming Shi
e4d3702f15 feat(apps): Ensure emqx_modules started before dependent apps 
emqx_management and emqx_telemetry calls emqx_modules APIs
 2021-02-08 22:07:13 +01:00
Zaiming Shi
7aff861f9b refactor(emqx_modules): Move emqx_modules to lib-opensource 
emqx_moduels for enterprise is refactored as a lib/plugin
in order to avoid merge conflicts, we make sure they can
co-exist in the same branch, because lib-opensource is compiled
in opensource project and lib-enterprise (to be added) is
compiled in enterprise project
 2021-02-08 21:35:44 +01:00
Zaiming Shi
7c94a02bdd
Merge pull request #4134 from jovdipp/tlsv1.3-as-default 
Tlsv1.3 as default
 2021-02-05 21:33:03 +01:00
Shawn
70a490114d fix(rulesql): proc cassandra cql with apostrophes failed 2021-02-05 15:30:16 +08:00
Jóvan S. Dippenaar
90c02f1116 test(emqx_exporto): refactored ssl ciphers call for ct_helpers update 2021-02-05 16:21:28 +13:00
Jóvan S. Dippenaar
5e15e3add8 fix(default-config-tls-ciphers): TLS1.3 exclusive ciphers prepended to TLS1.1+TLS1.2 ciphers 2021-02-05 16:21:28 +13:00
Shawn
a2fa84255f
fix(rulesql): proc_sql_param_str incorrect with apostrophes #4135 (#4137) 2021-02-05 10:41:54 +08:00
Zaiming Shi
55253f914c
Merge pull request #4149 from emqx/dev/v4.3.0 
Auto-pull-request-on-2021-02-04
 2021-02-04 23:17:10 +01:00
wwhai
c30666ee26
fix(rule-engine): remove plugin_template (#4146) 
chore(build): remove template plugin

The template plugin is intended to work as a standalone plugin
development template repo. Should not be in the umbrella
project.
 2021-02-04 10:01:37 +01:00
JianBo He
c3642c5c83 refactor(pgsql): set the default ssl version to tlsv1.3,tlsv1.2,tlsv1.1 2021-02-04 15:32:08 +08:00
JianBo He
045bc02ec9 test(ci): add proptests chekcing to the makefile 2021-02-04 14:22:17 +08:00
Zaiming Shi
3e1b6394f2
Merge pull request #4131 from emqx/dev/v4.3.0 
Auto-pull-request-on-2021-02-01
 2021-02-02 20:05:43 +01:00
wwhai
6eff70a646
fix(rule-engine): reply 500 when update resource failed (#4120) 2021-02-01 09:47:08 +08:00
Jóvan Dippenaar
c3c28f4b72 feat(tls.13): tls1.3 ciphers set in .conf's 2021-01-31 18:38:34 +13:00
Jóvan Dippenaar
94e8a69a48 docs(typos): vefify -> verify 2021-01-31 17:27:08 +13:00
Zaiming Shi
4e19e99ec4 Merge tag 'v4.3-alpha.1' into merge-4.3-alpha.1-to-5.0 2021-01-29 15:12:37 +01:00
wwhai
a3206f5e0b fix(rule-engine): reformat code style 2021-01-29 19:32:05 +08:00
JianBo He
38eb849ef0 fix(mysql): upgrade mysql to 1.7.1 for TLS supporting 2021-01-29 19:31:02 +08:00
JianBo He
1aefee01c2 chore(mgmt): remove needless lines 2021-01-29 18:50:29 +08:00
z8674558
a6e532779b chore(mongo): quote example 2021-01-29 18:21:34 +09:00
z8674558
fd1a53b45e fix(cts): fix config file path in sed 2021-01-29 18:21:29 +09:00
wwhai
3973c93534 fix(rule-engine): remove unused code 2021-01-29 17:16:00 +08:00
z8674558
e8729fb00e Merge branch 'dev/v5.0' of private:emqx/emqx into merge430 2021-01-29 17:11:12 +09:00
wwhai
7072355bc1 fix(rule-engine): fix test failure 2021-01-29 15:24:07 +08:00
wwhai
73655369af fix(rule-engine): reformat some code 2021-01-29 11:52:32 +08:00
tigercl
730d09f874
fix(http): upgrade ehttpc to 0.1.2 (#4093) 
For fix the connection closed by keepalive
 2021-01-29 09:35:08 +08:00
wwhai
f0993c6b0f
chore(style): improve the codes style 2021-01-28 20:01:59 +08:00
zhanghongtong
6a83cf3f35 chore(format): format some code 2021-01-28 19:18:18 +08:00
JianBo He
456e3e5faa chore(bridge-mqtt): fix styles 2021-01-28 16:24:42 +08:00