Commit Graph

1548 Commits

Author SHA1 Message Date
zhouzb 3984f8cd2f chore(log): update log content 2021-05-14 19:27:04 +08:00
zhouzb c6771a57b6 chore(update dep): update dep of ehttpc 2021-05-14 19:27:04 +08:00
Turtle 35c38e7d21 fix(lwm2m): fix check emqx-lwm2m version 2021-05-14 05:41:00 +09:00
Turtle 3e3819905d fix(import): fix import bridge mqtt test cases 2021-05-14 05:41:00 +09:00
JianBo He 7dd107a7cd chore(prom): update grafana templates 2021-05-14 05:41:00 +09:00
JianBo He 13257be6b6 chore(appup): supply the appup instructions 2021-05-14 05:41:00 +09:00
JianBo He 02d9740d14 feat(lwm2m): observe specified object lists 2021-05-14 05:41:00 +09:00
JianBo He 793c813d02 feat(delayed): record the delayed table size by emqx_stats
There are three indictors about delayed module:
- 'messages.delayed': shows the number of delayed msg received
- 'emqx_delayed_count': shows the delayed table size now
- 'emqx_delayed_max': shows the maximum size that the delayed table has reached
2021-05-14 05:41:00 +09:00
JianBo He d317d57f3f fix(metric): incr the messages.retained counter 2021-05-14 05:41:00 +09:00
wwhai 72e9453293 fix(mgmt): fix diylazer warning for function return (#4786) 2021-05-14 05:41:00 +09:00
Zaiming Shi 4577f6653c fix(emqx_rule_engine): add appup 2021-05-14 05:41:00 +09:00
Turtle a58357cfe3 feat(rule_engine): rule sql add null function 2021-05-14 05:41:00 +09:00
Turtle cc6f43aea7 fix(import): fix import bridge mqtt test cases 2021-05-14 05:41:00 +09:00
Turtle 6ba1a525e0 fix(lwm2m): fix check emqx-lwm2m version 2021-05-13 11:20:23 +08:00
Turtle 85937e0007 fix(import): fix import bridge mqtt test cases 2021-05-12 22:46:48 +08:00
JianBo He e0068f6ebe chore(prom): update grafana templates 2021-05-12 22:24:37 +08:00
JianBo He fcf046eec1 chore(appup): supply the appup instructions 2021-05-12 22:23:21 +08:00
JianBo He 36c7258337 feat(lwm2m): observe specified object lists 2021-05-12 22:23:21 +08:00
JianBo He 82330ffa00 feat(delayed): record the delayed table size by emqx_stats
There are three indictors about delayed module:
- 'messages.delayed': shows the number of delayed msg received
- 'emqx_delayed_count': shows the delayed table size now
- 'emqx_delayed_max': shows the maximum size that the delayed table has reached
2021-05-12 22:16:14 +08:00
JianBo He e7252eee81 fix(metric): incr the messages.retained counter 2021-05-12 22:16:14 +08:00
wwhai 09fb1461b7
fix(mgmt): fix diylazer warning for function return (#4786) 2021-05-12 22:13:26 +08:00
Zaiming Shi ded494f544 fix(emqx_rule_engine): add appup 2021-05-11 14:25:46 +02:00
Turtle 80ef076cee feat(rule_engine): rule sql add null function 2021-05-08 17:15:07 +08:00
Turtle c5aeeb3b40 fix(import): fix import bridge mqtt test cases 2021-05-08 15:28:26 +08:00
Zaiming (Stone) Shi 0d9a9fc966
Merge branch 'dev/v5.0' into resolve-conflict-master-to-v5.0 2021-05-07 08:43:26 +02:00
Zaiming Shi f68a89c9ba fix(auth-http): support content-type header env variable override 2021-05-07 10:14:19 +08:00
k32 7cd31028cb fix(dialyzer): Omit `value is unmatched` warning 2021-05-06 23:28:12 +08:00
Turtle 9dc1e162fa fix(sn): fix clean_session=false willmsgs not sent 2021-05-06 19:15:49 +08:00
Zaiming Shi b8e271a588 chore: add more info in test log 2021-05-06 11:03:02 +02:00
Zaiming Shi d904a1048b Merge remote-tracking branch 'origin/master' into merge-master-to-dev/v5.0 2021-04-30 15:09:31 +02:00
wwhai a9b674c587 fix(deps): fix ee430 problem when remove resources 2021-04-30 06:41:37 -05:00
Zaiming Shi 171933301a fix(dashboard): display full Erlang/OTP version 2021-04-30 12:26:59 +02:00
JianBo He 01696ce595 chore(coap): use ~0p to print peername 2021-04-30 15:32:04 +08:00
Shawn cb31d66bf2
Cache publishes before receiving the REGACK (#4695)
* refactor(emqx_sn): return new state from send_message

* fix(emqx_sn): send publish only after regack received
2021-04-30 15:31:34 +08:00
wwhai 54dc75ed79 fix(deps): fix function clause at apply_new_config 2021-04-28 20:39:16 +08:00
Zaiming Shi fbe15859f5 fix(emqx_rule_utils): http connectivity check ipv6 support 2021-04-28 10:43:36 +02:00
Zaiming Shi 078ca67268 test(emqx_auth_http): test ipv6 + hostname resolution 2021-04-28 10:43:36 +02:00
Zaiming Shi a37f47887a fix(ipv6): add ipv6_probe socket option only when supported
ipv6_probe is a socket option supported in EMQ's otp.git fork.
If the target hostname has a ipv6 DNS resolution, gen_tcp
tries to establish a connection on ipv6.
If it fails, then a fallback to default gen_tcp:connection
2021-04-28 10:43:36 +02:00
zhouzb d9c7c72612 feat(ipv6 probe): automatically probe whether it is IPv6 2021-04-28 10:43:36 +02:00
JianBo He 7ae06590de test(auth-mnesia): test the password_hash option 2021-04-27 21:10:33 +08:00
JianBo He d5abfd0caa fix(auth-mnesia): fix env name typos 2021-04-27 21:10:33 +08:00
wwhai 773b8eef2f fix(deps): increase time sleep 2021-04-27 21:04:24 +08:00
Shawn bea28d887c fix(rule_engine): refresh rules and then re-enable it 2021-04-27 15:45:25 +08:00
Shawn 6557b132a2 fix(rule_engine): only refresh enabled rules at bootup 2021-04-27 11:17:12 +08:00
Shawn 7198c018e2 fix(rule_engine): change the rule state when force enabled/disabled 2021-04-27 11:17:12 +08:00
Shawn 18688da0c1 fix(rule_engine): only auto re-enable the rule when it was force disabled 2021-04-27 11:17:12 +08:00
Shawn da81ab7988 fix(rule_engine): remove sleep before refresh rules 2021-04-27 11:17:12 +08:00
Shawn e3501acc02 fix(rule_engine): delete resource crashes when dependent rule exists 2021-04-27 11:17:12 +08:00
Shawn 3646e76a7a fix(rule_engine): re-enable rules after resource started 2021-04-27 11:17:12 +08:00
Shawn 9fd43ef882 fix(rule_engine): reformat some code for dependent rules discovery 2021-04-27 11:17:12 +08:00
Ertan Deniz 07d5c0f9df feat(exhook): add ssl cert info to ClientInfo 2021-04-27 09:20:38 +08:00
JianBo He 910449e67b fix(exhook): allow certificate options absent 2021-04-26 20:27:17 +08:00
Zaiming Shi b97b36d077 test(emqx_coap): publish to non-wildcard topic 2021-04-26 14:18:40 +02:00
DDDHuang 29592fe1b4
Fix rule engine build fail (#4673)
* fix: add rule engine resources time
2021-04-26 15:32:54 +08:00
Shawn dc95c1476a fix(emqx_sn): willmsgs not sent 2021-04-25 09:45:16 +08:00
Zaiming Shi d61b100cc9 chore: more copyright updates 2021-04-23 20:43:00 +02:00
Zaiming Shi 6354e75626 chore: update copyrights 2021-04-23 20:43:00 +02:00
DDDHuang 4178e1a023 fix: disable rule if build fail 2021-04-22 14:46:28 +08:00
Shawn 19a9bab3a4 feat(rule_engine): add rule sql functions for datetime rfc3339 2021-04-22 10:32:44 +08:00
wwhai 73e563c883 test(mgmt): remove macro switch 2021-04-21 09:35:04 +08:00
Zaiming Shi 2ffa71abde test(emqx_bridge_mqtt): fix race condition 2021-04-20 23:17:39 +02:00
Zaiming Shi 186dfd04a7 test(webhook): ignore messages from other clients 2021-04-20 18:29:50 +02:00
Zaiming Shi e59eacb891 test(webhook): test ipv6 for real 2021-04-20 08:13:23 +02:00
zhanghongtong daa3d70ec3 chore(tests): delete enterprise json file 2021-04-19 19:07:49 +08:00
Zaiming Shi 97f2e5d544 test(auth_http): test unset acl_req app env 2021-04-19 08:39:26 +02:00
Zaiming Shi 8eed34c939 chore(auth_http): fix typo 2021-04-19 08:39:26 +02:00
Zaiming Shi e02eb5f939 docs(auth_http): Update config doc 2021-04-19 08:39:26 +02:00
zhanghongtong 8ef4df4592 chore(web hook): fix tests error 2021-04-16 23:27:20 +08:00
zhouzb 3ae8bae9f3 feat(uri): update urldecode/1 2021-04-16 20:19:45 +08:00
Turtle 5009ec0c34 fix(tests): fix ee import auth mnesia fail 2021-04-16 19:47:49 +08:00
Shawn 5896e90235 fix(export): Mod:call/3 not exported 2021-04-16 18:44:28 +08:00
Karol Kaczmarek 7b5422dbae feat: cluster info available in metrics 2021-04-16 11:28:35 +02:00
tigercl 1a630a308a
fix(backup): support minimum version number when import (#4582) 2021-04-16 15:51:36 +08:00
Shawn a09434acd2 fix(emqx_sn): dialyzer problems 2021-04-16 14:04:34 +08:00
Shawn 98edbc39af fix(emqx_sn): race_condition when discarding 2021-04-16 12:38:13 +08:00
zhanghongtong 53992ba138 chore(tests): fix tests error for web hook 2021-04-15 23:07:00 +08:00
zhanghongtong 0090295a17 chore(tests): fix import and export test cases for auth mnesia 2021-04-15 23:05:12 +08:00
wwhai b48c437f97 test(mgmt): add data im/export tests for EE 2021-04-15 21:59:37 +08:00
JianBo He 50f6ff4151 test(proper): avoid to generate any term 2021-04-15 21:49:25 +08:00
JianBo He 36663b9cb1 test(exhook): add tests for exhook cli 2021-04-15 21:48:32 +08:00
JianBo He 6710a508df fix(exhook): correct the exhook server anme 2021-04-15 21:48:32 +08:00
JianBo He 373532f9e4 fix(exhook): fix the match pattern 2021-04-15 21:48:32 +08:00
zhouzb 9bedd1bb4f chore(ehttpc): update tag of ehttpc 2021-04-15 21:47:20 +08:00
Shawn 45626bf96d fix(emqx_coap): return unauthorized when username/password error 2021-04-15 21:47:00 +08:00
JianBo He 9f088bcb7f test(proper): test message hooks 2021-04-15 11:07:55 +08:00
JianBo He b7a8884d4a chore(exhook): add a comment to bool type 2021-04-15 11:07:55 +08:00
zhanghongtong eda783efd0 chore: delete needless ct print 2021-04-14 23:06:34 +08:00
JianBo He c413af5c35 test(proper): track to the lastest code
- use limited atom type
- keep webhook confs testing to lastest schema
2021-04-14 19:38:56 +08:00
JianBo He 1d241bc39c fix(webhook): convert atom to binary to avoid jiffy encoding failure 2021-04-14 19:38:56 +08:00
k32 9ead5c8cfd chore(test): fix shutting down of applications in web hooks suite 2021-04-14 19:18:35 +08:00
k32 8304a96e1d fix(emqx_management): Don't fix broken emqx_auth_mnesia data 2021-04-14 19:18:35 +08:00
Zaiming (Stone) Shi 24fdd7aef5
Merge pull request #4526 from zmstone/fix-mqtt-bridge-retry
fix(emqx_bridge_mqtt): fix retry_inflight
2021-04-13 12:04:14 +02:00
zhanghongtong be36e51f6e feat(redis): redis sentinel support ssl connect 2021-04-13 14:42:08 +08:00
JianBo He 658ed81cfa fix(exhook): fix bad variable name 2021-04-13 10:28:07 +08:00
JianBo He da80343108 fix(exhook): fix module name to emqx_exhook_handler 2021-04-13 10:28:07 +08:00
wwhai 8a6f26d170 test(mgmt): remove unused ct log 2021-04-13 09:54:49 +08:00
z8674558 b0c3c713b5 Merge branch 'master' of github.com:emqx/emqx into merge-master-to-v5 2021-04-13 00:09:17 +09:00
JianBo He 16c999ed9b
Start emqx-modules application by default (#4518)
* fix(modules): start emqx_modules by default

* chore(test): eliminate some compile warnings
2021-04-12 09:45:31 +08:00
Shawn b5edba7729 fix(rule_engine): load hooks to all the nodes in cluster 2021-04-12 09:41:28 +08:00
Shawn f8fbd3e3db fix(lwm2m): decode/encode data as signed integer 2021-04-12 09:34:49 +08:00
wwhai 765d84ef48
test(mgmt): add data import tests (#4481) 2021-04-12 09:06:22 +08:00
zhouzb a712606121 fix(http api): fix badarg caused by acl cache api 2021-04-12 09:05:49 +08:00
Zaiming Shi d8e410e770 fix(emqx_rule_engine): missing calls
some calls are for enterprise only
2021-04-11 22:55:39 +02:00
Zaiming Shi d66f67d411 fix(emqx_bridge_mqtt): fix retry_inflight
The Inflight list should not be used to update State.inflight
2021-04-10 14:16:08 +02:00
Shawn 327b0c0995 fix(mqtt_sn): send pingresp until all pubacks received 2021-04-10 09:36:56 +08:00
Zaiming Shi e4242814f6 fix(emqx_bridge_worker_SUITE): ensure snabbkaffe start stop 2021-04-09 10:18:25 +02:00
Zaiming Shi ae9278a409 fix(bridge_mqtt): push to max-inflight limit
the old pop_and_send implementation may leave inflight queue starving
2021-04-09 10:18:25 +02:00
Zaiming Shi ae688e2c90 fix(bridge_mqtt): fix inflight reference booking
Prior to this change, the inflight batches are referenced
by the last packet ID for non-QoS-0 messages, other packet
IDs sent back from downstream causes an error log:
"Can't be found from the inflight"

Even worse, the batch is appended back to the queue for retry.
2021-04-09 10:18:25 +02:00
Shawn 2b8c1efd1d fix(mqtt_sn): refactor the log using logger.hrl 2021-04-09 16:02:29 +08:00
Shawn 6c57da31cb fix(mqtt_sn): update the testcase for disconn in awake state 2021-04-09 16:02:29 +08:00
Shawn e63b47bd7a fix(mqtt_sn): remove the shutdown/2,3 2021-04-09 16:02:29 +08:00
Shawn b8cb930c89 fix(mqtt_sn): handle disconnect msg in asleep state 2021-04-09 16:02:29 +08:00
Shawn a925395814 fix(mqtt_sn): reformat some code 2021-04-09 16:02:29 +08:00
k32 df3565e23d fix(emqx_management): Import ACLs from the enterprise version 2021-04-08 18:15:43 +08:00
k32 664b9c79fc fix(emqx_management): Add clientid data to the migration suite 2021-04-08 18:15:43 +08:00
Zaiming Shi b3b821e8c4 fix(flase): false 2021-04-08 00:34:43 +02:00
Zaiming Shi a914b191b6 chore(build): Pin poolboy 1.5.2
mongodb-erlang uses a special fork:
https://github.com/comtihon/poolboy.git
(which has overflow_ttl feature added).
However, it references `{branch, "master}`
should be `{ref, "9c06a9a"}` (2021-04-07).
By accident, We have always been using the upstream fork due to
eredis_cluster's dependency getting resolved earlier.
Here we pin 1.5.2 to avoid surprises in the future.
2021-04-08 00:02:27 +02:00
z8674558 490e6198ba fix(apps): typos on schema 2021-04-07 20:51:30 +09:00
z8674558 971e6ca90e Merge branch 'master' of github.com:emqx/emqx into merge-master-to-v5 2021-04-07 20:29:08 +09:00
zhanghongtong d1284cdcbb chore(mgmt import cases): import cases support enterprise 2021-04-07 18:40:42 +08:00
JianBo He 61c677423e test(coap): take a nap for cast operation 2021-04-07 10:48:05 +08:00
zhanghongtong ada36f5d23 chore(mgmt export): use new create time in export data 2021-04-07 10:35:08 +08:00
k32 d54643e9e1
Merge pull request #4453 from k32/fix-auth-mnesia
fix(emqx_auth_mnesia): add missing combinations of permissions
2021-04-06 21:37:50 +02:00
zhanghongtong 15627643e2 chore(mgmt): delete assert in emqx_mgmt_cli 2021-04-06 16:35:44 +08:00
zhanghongtong 0015520a6a chore(mgmt): fix test case failure caused by slow kick 2021-04-06 15:41:59 +08:00
JianBo He cff21ba16e fix(mgmt): exclude telemetry related lines from enterprise 2021-04-06 13:22:23 +08:00
JianBo He bb2033be13 refactor(exhook): remove hook registray 2021-04-06 11:22:30 +08:00
k32 017a07617d fix(emqx_auth_mnesia): Add tests for migrating pubsub access 2021-04-01 18:01:34 +02:00
zhanghongtong ffbc11aeef chore(lua_hook): fix test error for lua_hook 2021-04-01 22:56:21 +08:00
k32 61ad5d718f fix(emqx_acl_mnesia): split pubsub into two different capabilities 2021-04-01 15:08:10 +02:00
zhanghongtong 5e0dfe250d chore: move emqx_telemetry from apps to lib-ce 2021-04-01 14:05:03 +02:00
k32 2c029c0607 fix(emqx_management): Allow to specify credential type during import 2021-03-31 14:45:11 +02:00
k32 830cdffe16 fix(emqx_auth_mnesia): add missing combinations of permissions
Allow to define different access for pub and sub actions
2021-03-31 10:30:08 +02:00
Shawn d19eb05234 fix(emqx_coap): dialyzer failures 2021-03-31 11:23:03 +08:00
Shawn 83b0d444de fix(emqx_coap): return error code forbidden on ACL denied #4456 2021-03-31 11:23:03 +08:00
Shawn 7bf6ee0f4b
fix(mqtt-sn): sleep mode not working #4434 (#4435) 2021-03-29 17:51:49 +08:00
Shawn 583382b8ce refactor(emqx_coap): rename ps to pubsub 2021-03-29 17:43:56 +08:00
wwhai abf26f01d8 fix(mgmt): expose 2 functions to ce 2021-03-25 18:53:17 +08:00
JianBo He 496e5381fb chore(rule-engine): compatible with the lower case hash string 2021-03-25 09:10:05 +08:00
wwhai 3ea8039d90 fix(import): fix import error 2021-03-23 21:57:39 +08:00
wwhai 83b99c09a4 fix(import): add bridge_mqtt compatible <4.2.x 2021-03-23 20:22:22 +08:00
JianBo He f08ddec296
Add server_name_indication and verify option (#4349)
Add server_name_indication and verify option
2021-03-23 19:48:04 +08:00
JianBo He 277cab86d3 refactor: improve the speed of hexstr and binary conversions 2021-03-23 18:25:19 +08:00
Zaiming Shi dcfde3861f feat(ssl): Export a lib function to save key/cert file 2021-03-22 21:15:34 +01:00
Zaiming Shi 5b126d60ad style(elvis): force spaces around | and || 2021-03-22 21:15:16 +01:00
Zaiming Shi 71559dd001 refactor(ssl): Move data dir for ssl certs upload down to lib module 2021-03-22 16:41:01 +01:00
Zaiming Shi 8a41a4ee00 fix(ssl): Fix dir name for uploaded certificates
The dir is "rules" not "rule" in the original code
ref: f1eba1c648/src/emqx_rule_actions_utils.erl
2021-03-22 16:41:01 +01:00
Shawn 817abd7e93 fix(lwm2m): export functions for starting and stopping listeners 2021-03-22 21:13:56 +08:00
Karol Kaczmarek 844a1ba0af feat(acl): cache drain cr fixes 2021-03-20 15:21:31 +01:00
Karol Kaczmarek 87ce9d666f feat(acl): working cache drain cli/rest handlers 2021-03-20 15:21:31 +01:00
Karol Kaczmarek 71a0901c92 feat(acl): CLI and REST handlers for removing acl cache 2021-03-20 15:21:31 +01:00
zhanghongtong 99843e7b4b chore(auth plugins): remove emqx_modules in test case 2021-03-20 09:33:15 +08:00
zhanghongtong beac1f5f59 fix(test cases): fix test case error
ensure emqx_modues loaded before emqx_management in test cases
2021-03-19 17:02:06 +01:00
wwhai 3f2204fb5c fix(backup): add compatible for more lower version 2021-03-19 16:24:13 +08:00
wwhai 109b2f4e90 fix(backup): fix data import/export problem 2021-03-19 16:24:13 +08:00
Karol Kaczmarek 796c071af5 style(api): proplists imports removed 2021-03-19 09:20:25 +08:00
Karol Kaczmarek ea384ec6b5 style(api): minirest imports removed 2021-03-19 09:20:25 +08:00
wwhai 0d75ea874b fix(rule-engine): add 'undefined' type for create time 2021-03-19 08:57:19 +08:00
Zaiming Shi a5f0ed0356 fix(test): Ensure emqx_modules loaded for emqx_management test 2021-03-17 11:46:45 +01:00
zhanghongtong 7a1993f13b chore(auth-mnesia): update cli 2021-03-17 16:29:44 +08:00
Zaiming Shi a1f78b5083 refactor(cli): Print node name version and app name version
So not to confuse application version with node release version
2021-03-16 11:26:17 +01:00
zhanghongtong 98c62df2e4 fix(log): fix web hook print error 2021-03-16 10:22:07 +01:00
Zaiming Shi 3438a0ebca fix(telemetry): get release version, not emqx app version 2021-03-15 16:10:56 +08:00
wwhai f7b34cb098 feat(rule-engine): list rule support order by timestrap 2021-03-12 17:35:13 +08:00
Zaiming Shi 6c106207ff
Merge pull request #4293 from emqx/master
Auto-pull-request-on-2021-03-05
2021-03-10 20:57:45 +01:00
wwhai 1ddb300a56
feat(mgmt): add http listener restart support (#4301) 2021-03-10 17:29:37 +01:00
JianBo He 6bf15c6a2f chore(exhook): deinit registray after application stopped 2021-03-09 11:37:30 +08:00
JianBo He ebffdafe86 fix(exproto): ignore undefined clientid 2021-03-09 11:37:30 +08:00
JianBo He f9d5d3523d chore(exhook): add more option for protobuff 2021-03-09 11:37:30 +08:00
JianBo He 0d8c137cb5 refactor(exhook): load only the necessary hooks 2021-03-09 11:37:30 +08:00
JianBo He 4585306774 chore(exhook): upgrade to 0.6.2 2021-03-09 11:37:30 +08:00
Zaiming Shi c752f3bec5
Refactor http lib add uri parse (#4292)
* feat(http_lib): Add uri parse to emqx_http_lib

* fix(webhook): call emqx_http_lib to parse uri

* fix(auth-http): Call emqx_http_lib to parse uri

* fix(rule-engine): call emqx_http_lib to parse uri
2021-03-06 13:35:02 +08:00
z8674558 efd4ef8091 Merge branch 'dev/v5.0' of private:emqx/emqx into fix-merge-conflict-master-to-5.0 2021-03-04 22:12:09 +09:00
Zaiming Shi 63c001a7aa refactor(http-lib): Add emqx_http_lib
So far only uri_encode and uri_decode APIs
2021-03-03 21:38:10 +01:00
Zaiming Shi eb03c343bc fix(mgmt): Wrong ifdef EMQX_ENTERPRISE compile scope 2021-03-03 19:06:12 +01:00
Zaiming Shi a368453768 fix(mgmt): typo in ifdef macro 2021-03-03 15:15:33 +01:00
z8674558 119bbc4881 chore(emqx_bridge_msg): add empty props 2021-03-03 20:06:31 +09:00
z8674558 71ca1e4d78 chore(emqx_lwm2m_coap_resource): ignore coap_discover/2 from dialyzer 2021-03-03 20:06:31 +09:00
z8674558 117c0cf252 chore(emqx_lwm2m_message): pass integer from list 2021-03-03 20:06:31 +09:00
z8674558 7edd66e9d6 chore(emqx_lwm2m_message): comment out unused clause 2021-03-03 20:06:31 +09:00
z8674558 467569d5ac chore(emqx_lwm2m_protocol): rm unused clause 2021-03-03 20:06:31 +09:00
z8674558 43fc842057 chore(emqx_lwm2m_protocol): default username, password is null -> undefined 2021-03-03 20:06:31 +09:00
z8674558 1f238f4c26 chore(emqx_retainer): avoid race condition 2021-03-03 20:06:31 +09:00
z8674558 70625b1942 chore(emqx_sn_gateway): rm unused clauses 2021-03-03 20:06:31 +09:00
z8674558 1504164933 chore(src): fix dialyzer warnings (match values) 2021-03-03 20:06:31 +09:00
Zaiming Shi 2c5f2a8cdc
Merge pull request #4269 from zmstone/chore-replayq-upgrade-to-0.3.2
chore(deps): upgrade replayq to version 0.3.2
2021-03-03 06:19:52 +01:00
Zaiming Shi 8316f8cc34 fix(rule-engin-api): transform input config for update requests 2021-03-03 09:19:07 +08:00
Zaiming Shi e3407b9556 chore(build): fix rebar dependency and add a script to ensure integrity 2021-03-02 20:30:55 +01:00
JianBo He 2fb5dbd546 revert(bridge-mqtt): remove the mqtt_sub resource
We have several reasons to remove this feature:

1. The design does not make sense. A rule engine resource should
not have an impact on the system's messages directly after it is created.
This mqtt_sub actually conflicts with any design concept of the rules engine.

2. The implementation is incorrect. mqtt_sub uses a client pool to establish
a subscription relationship to an MQTT Broker. This causes a message to be
sent repeatedly to EMQ X. Unless a shared subscription is used,
or a Pool Size of 1 is configured.

3. The emqx-bridge-mqtt supports all the features of mqtt_sub.

This feature introduced by https://github.com/emqx/emqx-bridge-mqtt/pull/78.
And it released to v4.2.0 (NOT WORK), v4.2.1-v4.2.7 (FIXED)
2021-03-02 18:56:21 +08:00
zhanghongtong db92f79713 chore(emqx_modules): add emqx_modules api path 2021-03-02 18:47:09 +08:00
JianBo He 8477780e2b fix(mgmt): remove the useless match
Currently, the `{topic, Topic}` pattern is not used for management.
Moreover it will casue a `function_caluse` while the previous caluse not
matched
2021-03-02 17:06:34 +08:00
JianBo He 9076af1c06 chore(coap): upgrade gen_coap to v0.3.2
The 0.3.2 fixes some redundant log printing in a DTLS
connection
2021-03-02 16:31:18 +08:00
z8674558 2e199126dc fix(emqx_bridge_mqtt_actions): string -> file 2021-03-02 15:00:42 +09:00
z8674558 829a39eade fix(emqx_bridge_mqtt_actions): string -> password 2021-03-02 15:00:42 +09:00
zhanghongtong f548888af9 chore(emqx_management): judge the version for import and export acl mnesia and auth mnesia 2021-03-02 09:35:47 +08:00
zhanghongtong b53bdd1450 chore(emqx_management): remove emqx_modules dependency on emqx_management 2021-03-02 09:35:47 +08:00
zhanghongtong 28653bb457 chore(emqx_management): format code 2021-03-02 09:35:47 +08:00
zhanghongtong baa9fd8255 chore(emqx_management): move emqx management to apps 2021-03-02 09:35:47 +08:00
Zaiming Shi dd06d70bce refactor(build): Move parse_transform module to root app
So we do not have to workaround the compile order issue
2021-03-02 08:40:19 +08:00
Zaiming Shi 5edef84332
Merge branch 'dev/v5.0' into fix-merge-conflict-master-to-5.0 2021-03-01 19:58:16 +01:00
Shawn 990b7bd494 fix(bridge_mqtt): typos 2021-03-01 21:00:17 +08:00
Zaiming Shi 16c27663cd refactor(webhook): transport options refine 2021-03-01 21:00:17 +08:00
Turtle 801b3d6daf style: remove spaces at the end of lines 2021-03-01 21:00:17 +08:00
Turtle db13f18cbe fix(webhook): transport options 2021-03-01 21:00:17 +08:00
Zaiming Shi 026e1494fb fix(webhook): fix config entry web.hook.api.url -> web.hook.url 2021-03-01 21:00:17 +08:00
JianBo He 319d44d1bf chore(webhook): remove needless files 2021-03-01 21:00:17 +08:00
Zaiming Shi 4aca2c294f fix(webhook): transport options 2021-03-01 21:00:17 +08:00
Zaiming Shi 675603fd73 fix(bridge-mqtt): no ssl-option at all (empty list) when ssl is disabled 2021-03-01 21:00:17 +08:00
Zaiming Shi 0a51bd4c2f fix(webhook): Call common lib for ssl options 2021-03-01 21:00:17 +08:00
Zaiming Shi 700fa71754 refactor(tls): abstract lib for tls options parsing 2021-03-01 21:00:17 +08:00
Zaiming Shi 812c57dee9 refactor(plubin_libs): Add emqx_plugin_libs app 2021-03-01 21:00:17 +08:00
Zaiming Shi da6f1104dc chore(bridge-mqtt): sync enterprise code 2021-03-01 21:00:17 +08:00
Zaiming Shi 219eeed6d7 fix(webhook): Explicit default tls version and cipher 2021-03-01 21:00:17 +08:00
Zaiming Shi fcfcbf139d chore(webhook): merge enterprise to opensource 2021-03-01 21:00:17 +08:00
Shawn 6081d45d81
fix(rule): reformat some code
* fix(rule): reformat some code for rule-engine

* fix(lwm2m): change publish_update_when to publish_update_msg_when

Change the option name publish_update_when -> publish_update_msg_when.

Also change the object_list_changed to contains_object_list, as the
the later describes the default behavior correctly.

* fix(lwm2m): publish_update_msg_when -> update_msg_publish_condition
2021-03-01 20:15:12 +08:00
Zaiming Shi d8ad7a0edb chore(emqx_exhook): Ensure semver app vsn 2021-02-26 20:58:38 +01:00
z8674558 3e9abbe95a chore(emqx_exproto): tell dialyzer exit functions do not return 2021-02-24 21:32:48 +09:00
z8674558 a6b5e0707d chore(emqx_exproto): match emqx_misc:tune_heap_size 2021-02-24 21:32:48 +09:00
z8674558 02a755fbea chore(emqx_exproto): fix dialyzer warinings on default_conninfo 2021-02-24 21:32:48 +09:00
z8674558 fb8133b998 chore(emqx_auth_http): match emqx:hook with ok 2021-02-24 21:32:48 +09:00
Zaiming Shi 23269c13bc
Merge pull request #4229 from emqx/master
Auto-pull-request-on-2021-02-23
2021-02-24 09:57:51 +01:00
Shawn 6d83bc3e9b
fix(rule): destroy the actions when disabling the rule (#4232)
Merge the following PR from enterprise version:
https://github.com/emqx/emqx-rule-engine/pull/231
2021-02-24 13:24:23 +08:00
Zaiming Shi 13e8093583 Merge remote-tracking branch 'origin/dev/v4.3.0' into merge-dev-v4.3.0 2021-02-22 21:08:08 +01:00
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 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
Shawn e201484163 fix(rule): incorrect merge for map_get/2,3 and map_put/3 2021-02-22 18:16:24 +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 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
zhouzb 353ceafbb6 fix(telemtry): report only in official version 2021-02-09 10:46:48 +08: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
JianBo He d98d26942c fix(bridge-mqtt): add max_inflight_size option back
For compatibility with versions below 4.2, we still
use the `max_inflight_size` option, but generate it
as the `max_inflight`

Previous PR: https://github.com/emqx/emqx/pull/3938
2021-01-28 16:24:42 +08:00
Zaiming Shi e96d03dc1b
Merge pull request #4087 from zmstone/fix-auth-ldap
fix(auth_ldap): do not load plugin when no params configured
2021-01-28 08:51:08 +01:00
Zaiming Shi c422b200be
Merge pull request #4088 from emqx/dev/v4.3.0
Auto-pull-request-on-2021-01-27
2021-01-27 22:02:52 +01:00
Zaiming Shi d38b626579 fix(emqx_coap_ps_resource): Copy uri decode code from OTP-22 2021-01-27 19:19:38 +01:00
zhouzb e6235d3bc9 fix(scheme): fix default scheme 2021-01-27 19:11:41 +01:00
zhouzb 92d307b1b3 fix(scheme): update test case 2021-01-27 19:11:41 +01:00
zhouzb 45aafc75dd fix(scheme): using uri_string:normalize/1 2021-01-27 19:11:41 +01:00
zhouzb 311df2f8a6 fix(scheme): fix scheme parsing 2021-01-27 19:11:41 +01:00
zhouzb a631a2d64f fix(ssl): fix ssl option 2021-01-27 19:11:41 +01:00
Zaiming Shi f42e52e84e fix(auth_pgsql): Add back econnrefused error clause 2021-01-27 19:10:47 +01:00
wwhai b5c435e211 fix(rule-engine): add format space 2021-01-27 19:01:11 +01:00
Zaiming Shi fc71285c3f fix(auth_ldap): do not load plugin when no params configured 2021-01-27 12:56:13 +01:00
zhanghongtong 689b530b4f chore(auth-http): remove needless test case 2021-01-27 19:55:21 +08:00
JianBo He b77ac247eb chore(auth-http): remove needless lines 2021-01-27 19:55:21 +08:00
zhanghongtong eaa7394554 chore(ldap): delete uesless dir 2021-01-27 18:58:35 +08:00
JianBo He 02cb8d0211 chore(style): set warnings_as_errors compile option 2021-01-27 18:02:12 +08:00
wwhai 001a89a396
Merge pull request #4070 from wwhai/fix-update-problem
feat(rule-engine): change init resource to test resource
2021-01-27 17:09:37 +08:00
wwhai e7153c4266 fix(rule-engine): add cluster init callback 2021-01-27 15:06:12 +08:00
JianBo He 7919f08e03
Merge pull request #4067 from HJianBo/fix/webhook_certs
fix(webhook): fix bad https confs
2021-01-27 10:44:28 +08:00
Zaiming Shi fa7d96dd4a Merge remote-tracking branch 'origin/dev/v4.3.0' into dev/v5.0 2021-01-26 19:32:55 +01:00
Zaiming Shi 937390fe0f
Merge pull request #4072 from emqx/dev/v4.3.0
Auto-pull-request-on-2021-01-25
2021-01-25 22:05:03 +01:00
Zaiming Shi 5477457c7e fix(emqx_recon): fix badarg for remote module load 2021-01-25 19:09:41 +01:00
wwhai 81da182e1b feat(rule-engine): change init resource to test resource 2021-01-25 19:44:32 +08:00
JianBo He 8d56371465
Merge branch 'dev/v4.3.0' into fix/webhook_certs 2021-01-25 19:22:14 +08:00
Zaiming Shi 6a6a94f99e
Merge pull request #4057 from zmstone/fix-emqx_vm-allocator-info-otp-23-compatibility
fix emqx_vm allocator info otp 23 compatibility
2021-01-25 11:36:47 +01:00
JianBo He 86942ffa14 fix(webhook): fix bad https confs 2021-01-25 18:20:12 +08:00
JianBo He 670c3894fb chore(redis): upgrade eredis_cluster to 0.6.4 2021-01-25 17:29:56 +08:00
zhouzb b25dedccc9 refactor(inet parse): refactor inet parse 2021-01-25 15:59:23 +08:00
JianBo He 67e56658a7 fix(bridge-mqtt): fix bad time unit 2021-01-25 15:35:04 +08:00
JianBo He 3de8fea435 fix(bridge-mqtt): fix bad received metrics counting 2021-01-25 15:35:04 +08:00
wwhai f3420e8810 fix(rule-engine): fix update resource maybe remove resource 2021-01-25 10:56:58 +08:00
JianBo He 3322bb60c3 fix(exproto): fix the bad return type for auth 2021-01-25 09:24:03 +08:00
Zaiming Shi 20c37609af
Merge pull request #4062 from emqx/dev/v4.3.0
Auto-pull-request-on-2021-01-24
2021-01-24 22:29:09 +01:00
Zaiming Shi 8a05380388 refactor(emqx_coap): use url_string module to decode url encoded topic 2021-01-24 10:28:37 +01:00
Zaiming Shi 17d70772a8 refactor(emqx_recon): Use latest version recon
Moved recon dependency from emqx_recon to root
2021-01-23 11:42:28 +01:00
Zaiming Shi c1b1ddbb6f
Merge pull request #4032 from zmstone/chore-sync-apps-resync-4.2.6
chore(sync-apps): resync plugin apps from their 4.2.6 tag
2021-01-23 11:15:46 +01:00
Zaiming Shi 84e922205b
Merge pull request #4056 from emqx/dev/v4.3.0
Auto-pull-request-on-2021-01-22
2021-01-22 21:41:06 +01:00
Zaiming Shi 2c03bca6ae chore(auth_jwt): Upgrade to jose 1.11.1 prepare for OTP 23 2021-01-22 20:31:27 +01:00
Zaiming Shi 51050f702a chore(config): Insert a space after config comment '#' and key 2021-01-22 15:07:35 +01:00
Zaiming Shi 7bb590f1c7 refactor(auth_redis): delete backward-compatible code in config schema 2021-01-22 14:20:47 +01:00
Zaiming Shi 5d45325cb8 fix(conf): quote config values 2021-01-22 14:20:47 +01:00
Zaiming Shi b9071394c4 Merge remote-tracking branch 'origin/dev/v4.3.0' into chore-merge-v430-to-v50 2021-01-21 23:53:12 +01:00
Yudai Kiyofuji c6785b1a34
test(coap): add test on acl and connection discarding (#4039) 2021-01-21 11:03:06 +09:00
Yudai Kiyofuji 455f210b4c
feat(cuttlefish): use hocon as a parsing function (#4008)
* chore(conf): add quotation for hocon

* chore(conf): fix paths incompatible with hocon

* chore(conf): use hocon as parsing function

* chore(docker): add quotation to some env variables for hocon
2021-01-19 19:52:17 +09:00
Zaiming Shi 4103a7292a Merge branch 'resync-apps-from-426' into chore-sync-apps-resync-4.2.6 2021-01-18 20:37:45 +01:00
Zaiming Shi be771f6cd9 fix(auth_pgsql): Make ssl_opts.versions backward compatible 2021-01-18 20:37:45 +01:00
Zaiming Shi 14ca914068 Merge branch 'resync-apps-from-426' into chore-sync-apps-resync-4.2.6 2021-01-18 20:37:26 +01:00
Zaiming Shi 86895ddc24 chore(sync-apps): sync emqx_auth_mnesia e4.2.3 2021-01-18 20:05:08 +01:00
Zaiming Shi a2b4e50a8d chore(sync-apps): re-sync apps from dev/v4.3.0 branch 2021-01-18 19:24:08 +01:00
Zaiming Shi fc0b912cde refactor(emqx_dashboard): www dir is to be downloaded at build time 2021-01-18 19:20:49 +01:00
tigercl fd2e9f147b
fix(auth http): using ehttpc (#4021)
* fix(auth http): using ehttpc

* chore(ehttpc): update tag of ehttpc

* fix(config): update comment
2021-01-16 23:10:53 +08:00
wwhai a6de90c3f9
fix(test): add two way ssl test (#4025) 2021-01-16 22:28:15 +08:00
turtleDeng 2751fa6a41 fix(scheme): update emqx_web_hook_actions.erl 2021-01-16 22:25:12 +08:00
zhouzb bf84686b76 chore(ehttpc): update tag of ehttpc 2021-01-16 22:25:12 +08:00
zhouzb 9f0dbeff29 fix(webhook): fix ipv6 in ip and hostname 2021-01-16 22:25:12 +08:00
zhouzb 114bf8e048 fix(webhook): only POST and PUT requests carry Content-Type header and using the original URL as host header 2021-01-16 22:25:12 +08:00
zhanghongtong 9e03d6fea1 chore(auth): configuration format of unified authentication plug-in 2021-01-15 20:25:09 +08:00
bignullnull 981482d707
fix(test): fix test cases (#4012)
* fix(test): fix test cases
2021-01-15 09:48:57 +08:00
JianBo He aed801d6fd test(exproto): refine test cases 2021-01-15 09:47:56 +08:00
JianBo He d360e7ead1 feat(exproto): use client streaming APIs for handler
- Use the gRPC client streaming APIs to improve the
  ConnectionHandler server performance.
- Change the 'conn' field type to term binary
2021-01-15 09:47:56 +08:00
zhouzb 42f95bba09 fix(alarms): add duration field for alarms 2021-01-15 09:27:15 +08:00
bignullnull 67bfb4f10a
fix(rule_engine): resource update problem and add cli (#3991) 2021-01-15 09:12:24 +08:00
JianBo He 32b23b9181 Revert "feat(auth_http): support for getting websocket cookies"
This reverts commit 5427057c2c.
2021-01-14 15:10:48 +01:00
JianBo He f2190dd5b5 chore(mnesia): explicitly specify the copy type for table 2021-01-14 15:46:16 +08:00
JianBo He 2a029b71c9 perf(mnesia): unify the copy types of all nodes 2021-01-14 15:46:16 +08:00
tigercl 372687d79d
improve(http): replace httpc with gun, improve performance and fix httpc unresponsiveness (#3940) 2021-01-13 13:47:23 +08:00
JianBo He 5427057c2c feat(auth_http): support for getting websocket cookies
see: https://github.com/emqx/emqx-auth-http/pull/225
2021-01-11 09:21:16 +08:00
Ayodele 2b481dabe7
Fix some dialyzer warnings (#3988) 2021-01-05 20:49:50 +01:00
zhanghongtong ca1e78677e chore(dashboard): delete static files
delete static files of dashboard and download them during build
2021-01-05 17:22:19 +08:00
Zaiming Shi b9661cddfa
fix(emqx_lwm2m_message): Path is built from binary format (#3987) 2021-01-04 17:31:21 +01:00
ayodele.akingbule 9b6b762f1c fix(emqx_retainer): fix dialyzer warnings 2021-01-04 14:14:55 +01:00
ayodele.akingbule 30588ac666 fix(emqx_mgmt): fix dialyzer warnings 2021-01-04 14:14:55 +01:00
ayodele.akingbule 990be9c198 fix(emqx_rule_engine_api): fix dialyzer warnings 2021-01-04 14:14:55 +01:00
Shawn e518828d8f
fix(rule_engine): mechanism of restarting resources (#3980) 2021-01-04 11:52:57 +08:00
Ayodele 26021b37b3
Umbrella fix build (#3969)
* fix(dialyzer): dialyzer warning.
2021-01-04 09:10:22 +08:00
Shawn d86b5ef210 fix(rule_engine): compile warnings on the macro RAISE 2020-12-31 17:03:39 +08:00
Shawn a747cf16bd
fix(resource_cli): update the CLIs for resources (#3978) 2020-12-31 13:41:33 +08:00
bignullnull 37974f7376
fix(rule_engine): add resource reconnect check (#3974)
* fix(rule_engine): add resource reconnect check
* fix(rule_engine): add reason for RAISE macro
2020-12-31 12:51:01 +08:00
wwhai 903ce29ce0 fix(rule_engine): fix resource update maybe failure 2020-12-31 11:43:03 +08:00
zhanghongtong 41afcde964 chore(ssl conf): update the ssl configuration format for mongo, pgsql, and redis plug-ins 2020-12-29 00:03:12 +08:00
zhanghongtong 6989c7a83d test(CI): add cts 2020-12-29 00:03:12 +08:00
bignullnull efb32e9903
test(rule_engine): add update resource unit test case (#3964)
* test(rule_engine): add update resource unit test case

* feat(rule_engine): add update resource support

Co-authored-by: wwhai <cnwwhai@gmail.com>
2020-12-28 14:59:28 +08:00
Yudai Kiyofuji 56920b6ca6
fix(bridge_mqtt): max_inflight_size -> max_inflight; this enables emqtt.erl to use the value (#3938)
* fix(bridge_mqtt): max_inflight_size -> max_inflight; this enables emqtt.erl to use the value

* chore(bridge_mqtt): fix elvis

* fix(worker): max_inflight_batches -> max_inflight
2020-12-28 13:43:13 +08:00
JianBo He 739e49218f
fix(cm): fix the problem of registering a channel twice (#3831) 2020-12-28 11:03:29 +08:00
JianBo He 9e22f492c7 refactor(rule-engine): add proc_sql_param_str/2 to handle sql params 2020-12-28 10:51:13 +08:00
JianBo He d628c49f16 fix(management): make client format function durable 2020-12-28 10:51:13 +08:00
ayodele.akingbule b68a0b3730 fix(emqx_lua_hook): fix dialyzer warnings. 2020-12-25 07:42:01 +08:00
ayodele.akingbule 2126129aee fix(emqx_prometheus): fix Dialyzer warnings 2020-12-25 07:42:01 +08:00
ayodele.akingbule 80cca940c2 fix(emqx_http_client): fix Dialyzer warnings 2020-12-25 07:42:01 +08:00
Shawn 02245aeb7a chore(test): provisionally delete the testcase for SASL
The SASL feature in emqtt is not ready, delete the testcases for now.
2020-12-23 16:42:49 +08:00
Shawn 865c63d82e fix(emqx_mgmt): data export failed on generating the exported filename 2020-12-23 16:41:18 +08:00
Shawn 6b5878cdd0 fix(test): solve verification issue when verify the resource numbers 2020-12-23 16:39:40 +08:00
Shawn ec8cfecdc0 fix(test): typos in emqx_mgmt_api_SUITE 2020-12-23 13:47:22 +08:00
Shawn 60f1b64ad9 fix(test): delete extra emqx_lua_hook:stop() 2020-12-22 22:05:24 +08:00
Shawn 9e3b6da9ca fix(test): delete extra verfication for 'max_age' 2020-12-22 18:22:17 +08:00
Shawn 54ff20ec0e fix(build): remove the extra cowlib deps from emqx_auth_http 2020-12-22 17:50:10 +08:00
zhanghongtong a364758e2a test(emqx_recon): stop emqx correctly in the test case 2020-12-22 13:39:49 +08:00
zhanghongtong 3ef08f9ce3 test(meck): add meck unload after meck load 2020-12-22 13:39:49 +08:00
zhanghongtong 26758d48d1 test(auth mnesia): the initial environment is restored at the end of the test case 2020-12-22 13:39:49 +08:00
Shawn 443ff737ed fix(rule_engine): use rpc in emqx_rule_engine_api 2020-12-22 11:18:16 +08:00
Shawn e15c0c325e fix(rule_engine): nested_get value from binary was supported in 4.1 2020-12-22 11:18:16 +08:00
Shawn 86d20b060c fix(metrics): counters not created before incr 'rule.matched' 2020-12-22 11:18:16 +08:00
Shawn c3159420bb feat(funcs): add bitsize/1 and subbits/2,3,6 functions 2020-12-22 11:18:16 +08:00
Yudai Kiyofuji 8a50c70ca3
Merge pull request #3929 from z8674558/feat/coap-acl
feat(coap): use emqx_access_control:check_acl before pub/sub
2020-12-21 16:38:49 +09:00
zhanghongtong 0ef84d2722 fix(auth mnesia): remove the duplicate cli command
style(auth mnesia): fix elvis check failurex

style(auth mnesia): remove the extra symbol
2020-12-19 15:20:46 +08:00
Shawn e72cbd22c4 fix(rule_validator): fill default values when validating the params 2020-12-18 11:08:17 +08:00
z8674558 a564670863 fix(coap): fix the issue the connection with same clientid is not discarded 2020-12-17 15:57:38 +09:00
zhanghongtong fd6cc1a848 test(CI): update actions
add fvt tests

update test cases
2020-12-17 14:23:33 +08:00
Shawn 0a44270932
* fix(dialyzer): remove the dialyzer errors 2020-12-17 10:04:49 +08:00
z8674558 f06ec6baaa chore(lint): fix elvis 2020-12-17 10:55:57 +09:00
z8674558 c89dad559e feat(coap): use emqx_access_control:check_acl before pub/sub 2020-12-17 10:36:51 +09:00
Zaiming Shi d4e7a87807 fix(emqx_stomp): Fix emqx_stomp_protocol xref 2020-12-16 18:39:18 +08:00
Zaiming Shi ab57c19e7a
Merge pull request #3917
Fix dialyzer warnings
2020-12-15 13:50:31 +01:00
ayodele.akingbule 893301db6a fix(emqx_stomp_protocol): fix Dialyzer warnings 2020-12-15 12:45:47 +01:00
ayodele.akingbule ec79523ea5 fix(emqx_rule_actions): fix Dialyzer warnings 2020-12-15 11:39:52 +01:00
ayodele.akingbule 51c62dfe65 fix(emqx_auth_mnesia_api): fix Dialyzer warnings 2020-12-15 11:31:55 +01:00
ayodele.akingbule 8ee98e3f20 fix(emqx_rule_utils): fix Dialyzer warnings 2020-12-15 11:31:55 +01:00
z8674558 66ebcfa301 test(emqx_auth_redis): add test cases for sentinel 2020-12-15 10:35:13 +08:00
JianBo He bddacf5284 test(management): refine the tests 2020-12-14 11:35:05 +08:00
JianBo He 5d98944c94 feat(management): implement the auth-mnesia import/export
All codes picks from emqx-management:dev/e4.2.3
2020-12-14 11:35:05 +08:00
JianBo He 1b016b16f4
Merge branch 'dev/v4.3.0' into refact/avoid_anonymous_funcs 2020-12-14 11:23:13 +08:00
JianBo He 1be1757bbd fix(mongo): avoid function_caluse while query returned other types 2020-12-14 11:13:36 +08:00
JianBo He 27d6b73c37 refactor(mqttsn): avoid saving anonymous functions 2020-12-14 11:13:04 +08:00
Zaiming Shi d60212787b chore(build): remove emqx from app's applications list 2020-12-12 23:02:26 +01:00
Shawn 10dbb5bc96
Fix testcases warns (#3906) 2020-12-11 18:54:48 +08:00
Zaiming Shi 7bdd093ef5 Merge remote-tracking branch 'origin/dev/v4.3.0' into umbrella-fix-build 2020-12-11 08:55:57 +01:00
Zaiming Shi d75b89eadb chore(proj): sync .ci directories 2020-12-11 08:37:14 +01:00
Zaiming Shi 0237abd3d2 chore(emqx_lwm2m): Ensure xml dir copied to build dir 2020-12-11 08:29:45 +01:00
Zaiming Shi 3a91ff8a7b chore(proj): resync apps 2020-12-11 08:19:26 +01:00
ayodele.akingbule b2efcef4b4 fix(emqx_rule_runtime): Dialyzer warnings 2020-12-10 23:34:36 +01:00
ayodele.akingbule 6ffb20e1d4 fix(emqx_auth_mnesia_api): Dialyzer warnings 2020-12-10 23:34:36 +01:00
ayodele.akingbule 7998ea1703 fix(emqx_auth_mnesia): Dialyzer warnings 2020-12-10 23:34:36 +01:00
ayodele.akingbule 5644fdc1f0 fix(emqx_acl_mnesia): Dialyzer warnings 2020-12-10 23:34:36 +01:00
ayodele.akingbule b08d9d5d9b fix(emqx_auth_jwt_svr): Dialyzer warnings 2020-12-10 23:34:36 +01:00
Shawn ed510936fe fix(test): revert the code committed by mistake 2020-12-10 21:37:29 +08:00
Ayodele 56d7b3deb1 Umbrella fix build (#8) 2020-12-10 11:25:25 +01:00
Zaiming Shi fb5ad0559f fix(emqx_exproto_conn): dialyzer warning 2020-12-10 11:22:38 +01:00
Zaiming Shi d3fda0f944 refactor(emqx_coap): pin gen_coap 0.3.1 for dialyzer warning fix 2020-12-10 11:22:38 +01:00
Zaiming Shi 19edda4136 fix(emqx_lwm2m): bump to lwm2m_coap 1.1.2 2020-12-10 11:22:38 +01:00
Ayodele ff99bc10ad Umbrella fix build (#7)
* fix(emqx_auth_mongo): Dialyzer warnings

* fix(emqx_auth_mnesia_api): Dialyzer warnings

* fix(emqx_exhook): Dialyzer warnings
2020-12-10 11:22:38 +01:00
Ayodele 0cb9cbce71 Umbrella fix build (#6)
* fix(emqx_bridge_rpc): Dialyzer warnings

* fix(emqx_coap_app): Dialyzer warnings

* fix(emqx_coap_mqtt_adapter): Dialyzer warnings

* fix(emqx_lwm2m_json): Dialyzer warnings

* fix(emqx_lwm2m_message): Dialyzer warnings

* fix(emqx_mgmt): Dialyzer warnings

* fix(emqx_mgmt_cli): Dialyzer warnings

* fix(emqx_mgmt): Dialyzer warnings

* fix(emqx_bridge_rpc): Dialyzer warnings

* fix(emqx_mgmt): Dialyzer warnings

* fix(emqx_exproto_gcli): Dialyzer warnings
2020-12-10 11:22:38 +01:00
Ayodele 13b67c0d19 Umbrella fix build (#5)
* fix(emqx_auth_jwt): Dialyzer warnings

* fix(emqx_auth_mnesia_cli): Dialyzer warnings

* fix(emqx_bridge_mqtt_cli): Dialyzer warnings

* fix(emqx_bridge_mqtt_cli): Dialyzer warnings

* fix(emqx_auth_redis_sup): Dialyzer warnings

* fix(emqx_bridge_mqtt): Dialyzer warnings

* fix(emqx_auth_pgsql_cli): Dialyzer warnings

* fix(emqx_bridge_mqtt_cli): Dialyzer warnings

* fix(emqx_auth_mnesia_cli): Dialyzer warnings
2020-12-10 11:22:38 +01:00
ayodele.akingbule 18ddde0174 fix(emqx_lwm2m_app): Dialyzer warnings 2020-12-10 11:22:38 +01:00
ayodele.akingbule a03d7045cf fix(emqx_lwm2m_protocol): Dialyzer warnings 2020-12-10 11:22:38 +01:00
ayodele.akingbule 80f56654e2 fix(emqx_psk_file): Dialyzer warnings 2020-12-10 11:22:38 +01:00
ayodele.akingbule 01fe9d3ee7 fix(emqx_psk_file_app): Dialyzer warnings 2020-12-10 11:22:38 +01:00
ayodele.akingbule 7116a22fa5 fix(emqx_psk_file): Dialyzer warnings 2020-12-10 11:22:38 +01:00
ayodele.akingbule 1a8baa9d8a fix(emqx_management): Dialyzer warnings 2020-12-10 11:22:38 +01:00
ayodele.akingbule 37e3b11263 fix(emqx_mgmt_api_alarms): Dialyzer warnings 2020-12-10 11:22:38 +01:00
ayodele.akingbule 8ed5dc0b78 fix(emqx_lwm2m_timer): Dialyzer warnings 2020-12-10 11:22:38 +01:00
ayodele.akingbule a94b70a95e fix(emqx_lua_hook): Dialyzer warnings 2020-12-10 11:22:38 +01:00
ayodele.akingbule 31c6292008 fix(emqx_exproto_conn): Dialyzer warnings 2020-12-10 11:22:38 +01:00
ayodele.akingbule b0ea0e2ddb fix(emqx_exhook_app): Dialyzer warnings 2020-12-10 11:22:38 +01:00
ayodele.akingbule cb4892b8c4 fix(emqx_dashboard_admin): Dialyzer warnings 2020-12-10 11:22:38 +01:00
ayodele.akingbule d54a5300fc fix(emqx_coap_registry): Dialyzer warnings 2020-12-10 11:22:38 +01:00
ayodele.akingbule 950430d5da fix(emqx_coap_ps_topics): Dialyzer warnings 2020-12-10 11:22:38 +01:00
ayodele.akingbule 822460377c fix(emqx_auth_redis_cli): Dialyzer warnings 2020-12-10 11:22:38 +01:00
ayodele.akingbule b5e0386c98 fix(emqx_auth_redis_app): Dialyzer warnings 2020-12-10 11:22:38 +01:00
ayodele.akingbule 0e24e59366 fix(emqx_auth_mysql_app): Dialyzer warnings 2020-12-10 11:22:38 +01:00
ayodele.akingbule 7ba5c1787b fix(emqx_auth_mnesia_cli): Dialyzer warnings 2020-12-10 11:22:38 +01:00
ayodele.akingbule 4905b98c26 fix(emqx_auth_ldap_app): Dialyzer warnings 2020-12-10 11:22:38 +01:00
ayodele.akingbule dc27900260 fix(emqx_auth_jwt_app): Dialyzer warnings 2020-12-10 11:22:38 +01:00
ayodele.akingbule d8c9547a5e fix(emqx_auth_http): Dialyzer warnings 2020-12-10 11:22:38 +01:00
Zaiming Shi c8b866dc63 fix(emqx_rule_engine): Dialyzer warnings 2020-12-10 11:22:38 +01:00
Zaiming Shi 5bb1da5896 fix(emqx_rule_engine_sup): discard ets:new return value 2020-12-10 11:22:38 +01:00
ayodele.akingbule 9db6b3b430 fix(emqx_auth_mnesia_app): Dialyzer warnings 2020-12-10 11:22:38 +01:00
ayodele.akingbule db25660497 fix(emqx_auth_http_app): Dialyzer warnings 2020-12-10 11:22:38 +01:00
Zaiming Shi 39883bdab1 fix(emqx_retainer): Dialyzer warnings 2020-12-10 11:22:38 +01:00
Zaiming Shi 8bb8dc5363 fix(emqx_rule_engine): Dialyzer warnings 2020-12-10 11:22:38 +01:00
Zaiming Shi 692f59afaf fix(emqx_rule_events): Dialyzer warnings 2020-12-10 11:22:38 +01:00
Zaiming Shi 3dc11bc9e1 fix(emqx_rule_funcs): Fix strng:pad calls 2020-12-10 11:22:38 +01:00
Zaiming Shi 526d6f74bb fix(emqx_rule_metrics): Fix type specs 2020-12-10 11:22:38 +01:00
Zaiming Shi a504539097 fix(emqx_rule_registry): Dialyzer warning 2020-12-10 11:22:38 +01:00
Zaiming Shi e58abd916c fix(rule_engine.hrl): Type spec, args map is keyed by binary 2020-12-10 11:22:38 +01:00
Zaiming Shi a59218d008 fix(emqx_plugin_template): Dialyzer wanrings 2020-12-10 11:22:38 +01:00
Zaiming Shi bdfcc2da0e fix(emqx_rule_engine_api): Dialyzer warnings for no_match 2020-12-10 11:22:38 +01:00
Zaiming Shi ff55b0ff45 fix(emqx_rule_runtime): Dialyzer warnings 2020-12-10 11:22:38 +01:00
Zaiming Shi 42ed274ec3 fix(emqx_rule_runtime): Dialyzer warnings 2020-12-10 11:22:38 +01:00
Zaiming Shi 764d5977c1 fix(emqx_rule_engine): Dialyzer warning related to generated code 2020-12-10 11:22:38 +01:00
Zaiming Shi 6a1aae52eb fix(emqx_rule_validator): Dialyzer warning 2020-12-10 11:22:38 +01:00
Zaiming Shi 4cfe4e9940 fix(eqmx_sasl): Dialyzer warning 2020-12-10 11:22:38 +01:00
Shawn 02afda2f3b chore(test): testing the github action 2020-12-10 16:49:32 +08:00
Zaiming Shi baaa4e847d fix(emqx_sn_gateway): Dialyzer warnings 2020-12-10 09:49:24 +01:00
Zaiming Shi 8d853a3445 fix(dialyzer/emqx_sn): Fix unmatched return value warning 2020-12-10 09:37:23 +01:00
Zaiming Shi 2e5a0b799d fix(sn): Fix dialyzer warnings 2020-12-10 09:35:35 +01:00
Zaiming Shi 760ef9210a fix(stomp): Fix dialyzer warnings 2020-12-10 09:35:35 +01:00
Zaiming Shi bcae92ae6d fix(telemetry): Fix dialyzer warning about mnesia dirty op race 2020-12-10 09:35:35 +01:00
Zaiming Shi 996b205299 fix(telemetry): Fix dialyzer warning in emqx_telemetry_api 2020-12-10 09:35:35 +01:00
Shawn 12e0028b77 fix(mgmt): remove schema_registry calls from opensource code 2020-12-10 16:30:48 +08:00
Zaiming Shi ecf69b3464 chore(emqx_lwm2m): Add TEST compiler condition for test code 2020-12-10 09:29:46 +01:00
JianBo He 2b1429fe03 test(stomp): cover the emqx_stom_heartbeat:interval/2 2020-12-10 13:08:03 +08:00
JianBo He 713b4c7804 refactor(stomp): remove transaction module 2020-12-10 12:33:55 +08:00
JianBo He 1263a05bbc refactor(stomp): improve code form naming 2020-12-10 12:33:55 +08:00
JianBo He 9e47d31f79 refactor(stomp): avoid anonymous functions 2020-12-10 12:33:52 +08:00
Shawn 15d048d8ec feat(funcs): add bitsize/1 and subbits/2,3,6 functions
Given following Rule SQL:

```
select
  subbits(payload, 1, 8) as firstByte,
  case
    when firstByte = 123 then 't/{'
    when firstByte = 125 then 't/}'
    else 't/' + str(firstByte)
  end as tp
from "t/#"
```

Input Payload: `{x}`
Output: `{"tp": "t/{", "firstByte": 123}`

Input Payload: `}x`
Output: `{"tp": "t/}", "firstByte": 125}`

Input Payload: `a`
Output: `{"tp": "t/97", "firstByte": 97}`
2020-12-10 11:26:07 +08:00
Shawn 573a4b2df8 chore(rule_engine): sync the code from rule-engine/dev/v4.3.0 2020-12-09 17:58:26 +08:00
JianBo He 49d15d974a build(make): add xref, dialyzer command 2020-12-09 14:21:54 +08:00
Zaiming Shi aac3d79b7d fix(build): pre-compile parse_transform modules 2020-12-09 00:28:39 +01:00
Zaiming Shi 80e1d6cc9d chore(apps): delete LICENSE files for apps 2020-12-08 22:28:46 +01:00
Zaiming Shi 6d1cd6b7ea refactor(emqx_password): move the module to emqx application
Future plugins will require emqx as a dependency.
This commit also brings back bcrypt to the system which was temporary
removed when converting to umbrella project
2020-12-08 22:09:59 +01:00
Zaiming Shi 7fdbfba06a Merge branch 'umbrella-for-430-auto-sync' into umbrella-for-430 2020-12-08 22:09:59 +01:00
Zaiming Shi 2fda0a1565 chore(apps): Sync again all apps 2020-12-07 21:30:21 +01:00
Zaiming Shi 036eda27f6 chore(rebar): Delete profiles from apps' rebar.config
otherwise rebar3 crashes
2020-12-05 13:36:56 +01:00
Zaiming Shi 9dc68bc18d chore(emqx_exhook): Delete old app.src file 2020-12-05 03:04:33 +01:00
Zaiming Shi db792ec577 chore(apps): Sync again with 4.3.0 2020-12-05 03:02:35 +01:00
Zaiming Shi 8a12018863 Add more cleanups 2020-12-05 02:45:01 +01:00
Zaiming Shi 0fb5fb31a5 refactor(proj) sync 4.3.0 plugins with tracked files 2020-12-05 02:43:04 +01:00
Zaiming Shi 686c006d6e refactor(proj): Add apps 2020-12-04 22:11:53 +01:00
Zaiming Shi 73d02beace refactor(apps): Merge emqx_libs back to emqx
And move emqx app back to root level

After realising the challenges of developing plugins in standalone
rebar projects. it is perhaps more smooth to keep using emqx as
a rebar dependency
2020-12-04 19:58:58 +01:00
Zaiming Shi 2cbd2bc800 chore(app.src): use semver 4.3.0 for apps version base 2020-12-03 19:59:41 +01:00
Zaiming Shi 9382bed9f5 refactor(proj): Move etc and data dir to apps/emqx/ 2020-12-03 12:53:02 +01:00
Zaiming Shi e236196fa6 refactor(emqx_auth_mnesia): use tag e4.2.2
Removed emqx_auth_clientid and emqx_auth_username
because the new version emqx_auth_mnesia has all the features included
2020-12-03 12:52:59 +01:00
Zaiming Shi 5f0f91bb15 Merge branch 'dev/v5.0' into umbrella-for-430 2020-12-02 17:37:34 +01:00
Zaiming Shi 5bb0cccb53 refactor(build): Clean up app version management
Starting from 5.0.0, all apps in apps dir should follow semver
strictly. Do not use the umbrella project's release tags.

The universal tags made sense when we have applications scattered
in different repos. Now since this is an umbrella project, it is
enough to have a single package level version number corelated with
git tag.
2020-12-01 23:22:33 +01:00
Zaiming Shi 2dce1883d5 refactor(build): Deterministic code generation
The rebar plugin grpcbox_plugin always re-generates modules with a
timestamp, which makes the stamping script to always result in a
new stamp after each build.

Issue has been sent
https://github.com/tsloughter/grpcbox_plugin/issues/12
2020-11-26 21:13:30 +01:00
ayodele.akingbule 4eef9f691e refactor(metrics): Add short, medium and long windowsize and expose stats 2020-11-12 12:43:31 +01:00
Zaiming Shi abb74056bd refactor(metrics): Use modified moving average for topic metrics speed 2020-11-12 12:40:36 +01:00
terry-xiaoyu e586119752 fix(project): point the hrl files to emqx_lib 2020-10-31 12:34:52 +08:00
terry-xiaoyu 0cd1c57a54 Migrate plugins from tag 4.2.2 2020-10-31 12:10:19 +08:00
terry-xiaoyu 4108662ba1 feature(project): add util app emqx_libs 2020-10-31 12:06:44 +08:00
terry-xiaoyu 7bea9920b5 feature(project): point header to emqx_libs 2020-10-31 11:00:12 +08:00
JianBo He 485bffadd6 refactor(exhook): improve the exhook implementation 2020-10-31 10:24:28 +08:00
JianBo He d1a87d38ba refactor(exproto): improve the exproto implementation 2020-10-31 10:21:53 +08:00
terry-xiaoyu 18d6647b03 feature(project): move test to apps/emqx/test 2020-10-31 10:17:47 +08:00
terry-xiaoyu 496a805aef feature(project): move priv to apps/emqx/priv 2020-10-31 10:15:25 +08:00
terry-xiaoyu d90c0dacb1 feature(project): move hrl files and emqx_logger.erl to apps/emqx_libs 2020-10-31 09:33:50 +08:00
terry-xiaoyu 5a8efd9d20 feature(project): move src to apps/emqx/src 2020-10-31 09:19:28 +08:00
Feng Lee 8702ab838c 0.9 project structure 2015-06-22 16:18:33 +08:00
Feng Lee 986bf5d911 0.9.0 project structure 2015-06-22 16:03:05 +08:00
Feng f37de3a4a7 willmsg 2015-06-17 13:30:34 +08:00
Feng Lee 02c773bb3f drop 2015-06-17 11:32:12 +08:00
Feng Lee 38e0ba08d2 session, finally count down 2015-06-17 01:25:08 +08:00
Feng Lee 08a64ee97b session 2015-06-16 02:41:03 +08:00
Feng Lee 470ac34a6d merge emqtt to emqttd app 2015-06-15 22:28:34 +08:00
Feng Lee d255a98c09 0.9 2015-06-15 19:55:59 +08:00
Feng Lee c487348c2a merge master, send willmsg when normal terminate 2015-06-15 00:08:27 +08:00
Feng Lee afa0c1819b fix issue #175 2015-06-14 23:56:19 +08:00
Feng Lee 7bfc673c28 publish willmsg when normal exit 2015-06-14 23:51:07 +08:00
Feng Lee a0f90b3ac6 upgrade session 2015-06-14 19:24:03 +08:00
Feng Lee 985fbde26f fix issue #174 - add 'from' field to mqtt_message record 2015-06-14 08:24:17 +08:00
Feng a1d778b081 sync 2015-06-14 07:13:08 +08:00
Feng Lee 9c666cef70 merge session 2015-06-13 12:09:08 +08:00
Feng 30ff3b3f4e SESSION_TAB 2015-06-12 22:47:16 +08:00
Feng 5e0bf3d831 sync with imac 2015-06-12 21:59:37 +08:00
Feng Lee c293ccab13 sync 2015-06-12 18:38:26 +08:00
Feng ddf831f361 session 2015-06-12 17:24:08 +08:00
Feng Lee 882fbb83ca out 2015-06-12 10:37:30 +08:00
Feng Lee 04c2772859 seperate session api and process 2015-06-11 23:40:57 +08:00
Feng Lee 517c7eb7b6 session upgrade 2015-06-11 23:34:53 +08:00
Feng 4313ed0cf3 comment 2015-06-11 13:57:00 +08:00
Feng f857f1ec19 new session 2015-06-11 12:15:20 +08:00
Feng f69b6270fb zenmq 2015-06-11 12:08:18 +08:00
Feng 4c906b19ae new session 2015-06-11 12:07:44 +08:00
Feng Lee 53099f2536 0.9.0 2015-06-11 10:23:13 +08:00
Feng Lee 63933d891a Merge branch 'master' into dev 2015-06-11 00:06:01 +08:00
Feng Lee 051b8604e8 g/2, g/3 2015-06-11 00:05:44 +08:00
Feng Lee c4027dfc16 new queue 2015-06-11 00:05:20 +08:00
Feng Lee db2cc7ba0b git 2015-06-11 00:03:03 +08:00
Feng Lee 5559cd7f58 add alarm 2015-06-11 00:01:25 +08:00
Feng 553fb394f3 vsn 'git' 2015-06-09 11:57:44 +08:00
Feng 2954094619 fix issue #53 - client will receive duplicate messages when overlapping subscription 2015-06-09 11:50:53 +08:00
Feng Lee f0583a1c29 0.8.4 2015-06-08 23:34:09 +08:00
Feng Lee 9d5223dd1a contributors 2015-06-08 23:31:20 +08:00
Feng 789e482a30 inflight, queued 2015-06-06 19:04:02 +08:00
Feng 0407d902d6 Merge branch 'master' into dev 2015-06-05 18:35:10 +08:00
Feng Lee b544bdc10b queue:in new message after old one dropped 2015-06-04 23:13:59 +08:00
Feng Lee 7bbd7bb524 fix doc 2015-06-04 21:18:44 +08:00
Feng Lee ead7b23330 0.8.3 2015-06-03 23:50:31 +08:00
Feng Lee 053ddf6113 fix issue #155 2015-06-03 23:50:02 +08:00
Feng Lee ebad80d690 Merge branch 'master' into dev 2015-06-02 12:56:13 +08:00
Feng Lee 5a75e59dd1 fix mysql auth error 2015-06-02 12:52:40 +08:00
Feng Lee f3dbb7ba54 0.8.2 2015-06-01 17:45:45 +08:00
Feng Lee 391dacee19 Merge branch 'master' of github.com:emqtt/emqtt 2015-06-01 16:42:21 +08:00
Feng Lee 8aa2b8fbed fix the issue that websocket client cannot subscribe '/queue/#' 2015-06-01 16:41:59 +08:00
Feng Lee 5c376b8511 Merge branch 'master' of github.com:emqtt/emqtt 2015-06-01 12:38:11 +08:00
Feng Lee 253717d5a1 ordered_set 2015-05-31 11:40:07 +08:00
Feng Lee 73cb2389d9 add 'sys' flag for mqtt_message 2015-05-31 11:38:26 +08:00
Feng Lee d1ae443650 0.8.1 2015-05-29 16:05:17 +08:00
Feng Lee 5a2dfd2a10 presence and misc fix 2015-05-29 09:54:51 +08:00
Feng Lee 230a348f51 0.9.0 2015-05-29 00:53:47 +08:00
Feng Lee e0bbc72f91 client manager 2015-05-29 00:52:05 +08:00
Feng Lee 0476b6874a Merge branch 'dev' of github.com:emqtt/emqtt into dev 2015-05-28 21:55:48 +08:00
Feng Lee d3616a2701 client presence management 2015-05-28 21:55:20 +08:00
huangdan 2ee3010319 vm ports 2015-05-28 21:04:22 +08:00
Feng Lee 5b36d1b677 Merge branch 'master' into dev 2015-05-28 10:07:18 +08:00
Feng Lee 3ed65b419c fix websocket url 2015-05-28 09:45:37 +08:00
Feng Lee 500b9cb4f8 rm plguins/emqttd_auth_plugins 2015-05-28 01:11:36 +08:00
Feng Lee 750fb939b1 mod presence 2015-05-27 15:32:04 +08:00
Feng Lee 954d46cab3 timestamp/0 2015-05-27 13:14:26 +08:00
Feng Lee aa3f882edf protect from empty clientid 2015-05-26 15:39:02 +08:00
Feng Lee b524cf7806 fix issue #138 2015-05-26 14:50:45 +08:00
Feng Lee 07b9cfa722 shutdown... 2015-05-26 13:21:55 +08:00
Feng Lee 5b16368408 Merge branch 'dev-hd' into dev 2015-05-25 11:41:26 +08:00
Feng Lee 73dbc98068 rewrite 2015-05-25 11:16:06 +08:00
huangdan 379426fa82 Merge branch 'dev' into dev-hd 2015-05-25 10:40:20 +08:00
Feng Lee 46545be9d0 rewrite 2015-05-24 21:54:57 +08:00
Feng Lee c2d4a60dec is_mod_enabled 2015-05-24 21:54:36 +08:00
Feng Lee d19805b68c mod rewrite 2015-05-24 18:33:53 +08:00
Feng Lee 74024acd01 broker hooks 2015-05-24 15:28:56 +08:00
Feng Lee 01bfb830f5 forced subscriptions 2015-05-23 00:20:58 +08:00
Feng Lee f75c807aaf fix pool, table 2015-05-22 18:39:35 +08:00
huangdan bd0c49329b access test 2015-05-20 12:48:34 +08:00
huangdan e674d00330 access get_env 2015-05-20 10:59:57 +08:00
huangdan 54d29160f6 access_control test 2015-05-20 10:43:34 +08:00
Feng Lee e911025811 emqttd_sm_sup 2015-05-19 00:14:20 +08:00
Feng Lee aa703dea36 id 2015-05-19 00:14:10 +08:00
Feng Lee eea6d220d5 0.8.0 2015-05-06 11:59:05 +08:00
Feng Lee 1a883faef2 trace to print payload 2015-05-06 10:23:06 +08:00
Feng Lee dd053a4336 Merge branch 'issue#111' into dev 2015-05-06 02:13:53 +08:00
Feng Lee 955d9c4ef8 fixe issue #111 - forced subscriptions 2015-05-06 01:58:17 +08:00
Feng Lee 0dd046840d add feed_var/3, join/1 2015-05-06 01:00:07 +08:00
Feng Lee 201b7c414a queue support... 2015-05-05 16:41:45 +08:00
Feng Lee 38051426fa user 2015-05-05 12:15:06 +08:00
Feng Lee aae3258beb 0.7.1 2015-05-04 23:31:39 +08:00
Feng Lee 71751960aa fix errors found by dialyzer 2015-05-04 23:27:41 +08:00
Feng Lee a7344248e4 fix issue #121, unload plugins, stop/start gproc app when clustering... 2015-05-04 20:05:16 +08:00
Feng Lee 14421dae5b prep_stop to close listeners 2015-05-04 20:02:51 +08:00
Feng Lee f0b544369b fix issue #123 2015-05-04 19:58:54 +08:00
Feng Lee ac3a17e0e7 env 2015-05-02 00:04:58 +08:00
Feng Lee 2d600711c9 add env/1, merge_sockopts 2015-05-02 00:01:36 +08:00
Feng Lee 27f0b43e90 fix edoc 2015-04-30 12:37:56 +08:00
Feng Lee 914fa668b7 fix issues #118 - protect from empty sub/unsub topic list 2015-04-29 17:11:42 +08:00
Feng Lee 5a43afd07f start_tick, stop_tick 2015-04-29 16:23:26 +08:00
Feng Lee 69611b234d websocket support 2015-04-29 02:19:46 +08:00
Feng Lee 46a273b161 websocket support 2015-04-29 00:43:59 +08:00
Feng Lee 5afe4a62b4 sync with air 2015-04-28 12:25:11 +08:00
Feng Lee 1b96f93ab7 websocket test 2015-04-28 00:14:21 +08:00
Feng Lee 9343a7c419 websocket 2015-04-27 22:37:00 +08:00
Feng Lee 153f8c2dba rm tick 2015-04-27 21:13:29 +08:00
Feng Lee 547f192cae fix stats bug 2015-04-27 12:39:43 +08:00
Feng Lee d99dac81a4 start stats before broker 2015-04-27 12:12:49 +08:00
Feng Lee b4298f2b05 fix options, stats 2015-04-27 12:02:44 +08:00
Feng Lee e88875d2af tick 2015-04-27 10:03:46 +08:00
Feng Lee eb84783d4a sync with imac 2015-04-27 09:14:04 +08:00
Feng Lee 7e63e179da stats 2015-04-25 23:57:38 +08:00
Feng Lee ada53f8b68 merge master 2015-04-25 23:26:56 +08:00
Feng Lee 9f59d86b23 add emqttd_stats 2015-04-25 23:04:12 +08:00
Feng Lee e86f9ac6aa fix duplicated session 2015-04-24 00:55:56 +08:00
Feng Lee 77a26ded12 lookup_session 2015-04-23 23:36:31 +08:00
Feng Lee 70a20591bf 0.6.2 2015-04-23 23:23:08 +08:00
Feng Lee f1632ef2df fix issues #54 2015-04-23 23:20:19 +08:00
Feng Lee cec8ab6b4a rm emqttd_plugin_manager, emqttd.erl to support plugins management 2015-04-23 00:49:53 +08:00
Feng Lee bb2940cfb6 simple plugin mechanism 2015-04-22 16:57:47 +08:00
Feng Lee 504fe99570 code review 2015-04-22 01:31:42 +08:00
Feng Lee f7d44f88f1 close listeners 2015-04-22 00:14:52 +08:00
Feng Lee a9e4414d3c fix issues#93, support trace. 2015-04-21 18:10:02 +08:00
Feng Lee 6907d4feed misc fix 2015-04-21 14:38:18 +08:00
Ery Lee aab6dcf8d1 fix issues#101 - access_control for PUBLISH packet should be optimized 2015-04-21 12:14:27 +08:00
Ery Lee c4c0be44f3 align 2015-04-20 04:47:56 +08:00
Ery Lee fb8833bb86 TAB 2015-04-20 04:31:52 +08:00
Ery Lee eff6bed994 disc copies 2015-04-20 04:31:19 +08:00
Ery Lee 50e033c71d TAB 2015-04-20 04:29:56 +08:00
Ery Lee 02614e8ae4 fix issue#95 - Topic filters in ACL rule should support 'eq' tag 2015-04-20 04:26:01 +08:00
Ery Lee cf0068c2b3 ignore_lib_apps(Apps) 2015-04-20 04:23:54 +08:00
Ery Lee 229bcb6873 retain message when publish 2015-04-20 03:26:09 +08:00
Ery Lee ab84b6ff09 integrate gproc 2015-04-19 19:35:09 +08:00
Feng Lee fd8024821b gproc pool 2015-04-19 12:49:13 +08:00
Ery Lee 8694a825d3 route 2015-04-18 18:36:57 +08:00
Ery Lee 189a16d55e Merge branch 'dev' of github.com:emqtt/emqtt into dev 2015-04-17 01:47:37 +08:00
Ery Lee 843a0be61c comment log 2015-04-17 01:47:24 +08:00
Feng Lee 7956b6d309 acl_mod behaviour 2015-04-17 01:08:32 +08:00
Feng Lee 4bda2c5a43 fix issue #85 2015-04-17 00:48:57 +08:00
Feng Lee 94dd3b042d fix check_acl 2015-04-16 23:51:37 +08:00
Feng Lee 2ed2426a33 access_control 2015-04-16 23:24:07 +08:00
Feng Lee ec48b186c6 access_control to replace acl, auth 2015-04-16 23:08:32 +08:00
Feng Lee f21da05992 Merge branch 'dev' of github.com:emqtt/emqtt into dev 2015-04-16 19:44:57 +08:00
Feng Lee 67c5b08064 misc 2015-04-16 19:44:48 +08:00
Ery Lee 889675e710 acl, auth 2015-04-16 15:50:23 +08:00
Feng Lee 50f2162968 login 2015-04-16 11:43:59 +08:00
Feng Lee 6fedab1e12 fix emqttd_parser, emqttd_serialiser 2015-04-16 11:16:45 +08:00
Feng Lee 684c562cc7 emqttd_utils 2015-04-16 11:07:10 +08:00
Ery Lee a899dada12 msg store 2015-04-16 09:29:53 +08:00
Feng Lee b7a2b66db0 route with clientid 2015-04-15 22:20:19 +08:00
Feng Lee 2d05d1044a mqtt_clientid() 2015-04-15 21:17:25 +08:00
Feng Lee 4fe72445fd route with From 2015-04-15 21:15:09 +08:00
Ery Lee 95652c77d0 trace 2015-04-15 20:47:28 +08:00
Ery Lee 9325c31be6 dump to format 2015-04-15 20:27:46 +08:00
Ery Lee d50507475a emqtt/include/emqtt.hrl 2015-04-15 17:25:34 +08:00
Ery Lee 99633fb815 emqtt.hrl 2015-04-15 17:21:02 +08:00
Ery Lee 8c28bbcc7a refactor records 2015-04-15 12:37:44 +08:00
Feng Lee c54fb8c0ba emqtt app 2015-04-15 01:12:06 +08:00
Ery Lee 2ce7683da0 fix tests 2015-04-14 15:53:44 +08:00
Ery Lee 47f99c5cca fix pubsub 2015-04-14 15:35:41 +08:00
Ery Lee d311a058cc rewrite pubsub 2015-04-14 13:31:25 +08:00
Ery Lee e47e3c1fa8 topic, subscriber 2015-04-13 22:57:09 +08:00
Ery Lee 9b6cb812df rm emqttd_topic.hrl 2015-04-13 21:52:12 +08:00
Ery Lee 6c9fc41c3b rewrite emqttd_pubsub 2015-04-13 21:46:47 +08:00
Ery Lee f2b0449117 upstats 2015-04-13 01:47:04 +08:00
Ery Lee 5d4704acc2 monitor -> sysmon 2015-04-12 23:23:53 +08:00
Ery Lee de7ffc6bca will handle cluster later 2015-04-12 22:55:59 +08:00
Ery Lee 761a3b2a2c redesign retained message store and deliver 2015-04-12 22:52:29 +08:00
Ery Lee 4fb90d1e19 cluster 2015-04-12 21:04:17 +08:00
Ery Lee 16bff40b72 cluster, and fix broker stats 2015-04-12 20:36:07 +08:00
Ery Lee 37fcb85bd4 single bottleneck? 2015-04-11 21:11:32 +08:00
Ery Lee cb6967cd46 TAB -> TABLE 2015-04-10 20:26:40 +08:00
Ery Lee 1a81a4cc68 read_concurrency 2015-04-10 20:24:26 +08:00
Ery Lee c0a42b4288 copy topic_subscriber 2015-04-09 11:40:05 +08:00
Ery Lee 7a979e2c57 cluster 2015-04-08 19:40:22 +08:00
Ery Lee 03806557ef retained messages 2015-04-08 16:02:55 +08:00
Ery Lee 826ca7afca integrate with acl 2015-04-08 02:36:16 +08:00
Feng Lee fa24100514 redesign acl 2015-04-08 00:45:46 +08:00
Ery Lee 8ee3433315 syn with imac 2015-04-07 23:05:27 +08:00
Ery Lee 33be1a87e6 fix issue #75 2015-04-07 17:19:51 +08:00
Ery Lee 174226c0b0 authentication with clientid 2015-04-07 17:12:12 +08:00
Feng Lee 920547b9c5 fix authmod 2015-04-07 13:39:41 +08:00
Feng Lee c864944051 auth 2015-04-07 13:33:05 +08:00
Ery Lee 925b45bb47 auth modules 2015-04-06 22:50:19 +08:00
Ery Lee c49ac06322 acl tests 2015-04-06 14:11:33 +08:00
Ery Lee 088aa5c804 start acl 2015-04-06 12:00:26 +08:00
Ery Lee 18f18fc1a1 acl 2015-04-06 11:52:35 +08:00
Feng Lee 1148451a46 sync with air 2015-04-06 10:15:54 +08:00
Ery Lee 139a58112e tmp 2015-04-06 08:56:27 +08:00
Ery Lee e742d73f70 support acl mods 2015-04-05 23:17:46 +08:00
Ery Lee e4e33c2d5d acl... 2015-03-31 21:33:19 +08:00