yuanbiao/emqx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,704 Commits 393 Branches 669 Tags 74 MiB
64d582770d
Commit Graph

7669 Commits

Author SHA1 Message Date
Zaiming (Stone) Shi
6e2cde8224 refactor: delete emqx_statsd all together 2023-05-26 15:17:42 +02:00
Andrew Mayorov
45b128946a
Merge pull request #10825 from fix/EMQX-9991/bugs 
fix(ft): avoid leaking secrets
 2023-05-26 16:08:14 +03:00
Zaiming (Stone) Shi
7eb22e27c4 chore: bump release version to e5.0.4 2023-05-26 14:34:01 +02:00
Zhongwen Deng
9b6da3ff10 chore: bump hocon to 0.39.7 2023-05-26 19:00:58 +08:00
Zhongwen Deng
df4a0afdf5 fix: zones api default value 2023-05-26 18:59:38 +08:00
Zaiming (Stone) Shi
2d986140df chore: bump version to e5.0.4-rc.2 2023-05-26 12:01:10 +02:00
Andrew Mayorov
48858dee33
fix(s3): wrap S3 secrets during config load 2023-05-26 12:59:21 +03:00
Andrew Mayorov
3d428a2e0e
fix(ft-s3): rely on asynchronous upload abort 
So that upload aborts would not block assemblers. This should not
affect the expected behavior since S3 API usually allows having
concurrent uploads, plus we couldn't really guarantee successful aborts
anyway.
 2023-05-26 12:59:20 +03:00
Andrew Mayorov
cc3275b389
fix(ft): use conservative timeouts for S3 uploader calls 2023-05-26 12:59:20 +03:00
Andrew Mayorov
d36c2c2928
fix(ft-gc): ensure GC of already complete transfers 2023-05-26 12:59:20 +03:00
Andrew Mayorov
75cf562c90
fix(ft): tune some logging levels 2023-05-26 12:59:20 +03:00
Andrew Mayorov
3278158c66
fix(ft): disable ipv6_probe by default for S3 clients 
It's often demonstrates degraded performance on common setups, e.g.
containers with virtualized network interfaces.
 2023-05-26 12:59:20 +03:00
Zaiming (Stone) Shi
17f6c58f7b fix(telemetry): no default value for telemetry.enable in schema 
the default value is computed from version string
 2023-05-26 11:58:58 +02:00
Zaiming (Stone) Shi
dfc11e57d3 chore: delete telemetry.enable from enterprise.conf 
telemetry is now not included in enterprise edition
 2023-05-26 11:58:58 +02:00
Zaiming (Stone) Shi
ee122155f1 docs: fix spellcheck for telemetry app 2023-05-26 08:44:19 +02:00
Zaiming (Stone) Shi
772a4575ca
Merge pull request #10821 from thalesmg/fix-webhook-bridge-req-timeout-r50 
fix(webhook): keep `resource_opts.request_timeout` for webhook bridge (r5.0)
 2023-05-26 08:39:00 +02:00
JimMoen
a3b77563ba
fix: make static check happy 2023-05-26 10:34:15 +08:00
JimMoen
1ba65539c6
chore: refine traces command usage 2023-05-26 09:48:56 +08:00
JimMoen
0788f2f197
fix: emqx_ctl traces ... command args 
* use second time as trace `start_at` and `end_at`
* default trace time duration 30min to same as api created
* prevent format line broken
 2023-05-26 09:48:56 +08:00
Zaiming (Stone) Shi
407cab220b
Merge pull request #10760 from paulozulato/fix-failure-joining 
fix: avoid error 500 when node is re-joining cluster
 2023-05-26 03:08:17 +02:00
Thales Macedo Garitezi
32e6213ce3 fix(resource_manager_sup): use one_for_one instead of simple_one_for_one 
Using `simple_one_for_one` has a potential race condition issue where
we read the PID of the resource manager before trying to remove a
resource, and then that PID changes because it was either dead at
first, or it crashed and changed, and later we use this stale PID to
try to remove it from the supervisor.  Under such circumstances, the
restarting child might linger in the supervisor, leaking resources.

By using the resource ID itself as a child ID (and using `one_for_one`
restart strategy), we ensure the child is truly removed.
 2023-05-25 18:07:43 -03:00
Thales Macedo Garitezi
e43517188f fix(bridge): remove bridge if exception happens during creation 2023-05-25 16:38:09 -03:00
Thales Macedo Garitezi
cb34bc5c46 test(kafka_consumer): attempt to stabilize cluster tests 
Example failure:
https://github.com/emqx/emqx/actions/runs/5070096710/jobs/9105822319#step:7:515

The attempt here is to setup the spy as early as possible, before the
bridge starts, so we avoid missing rebalancing events.
 2023-05-25 16:38:09 -03:00
Thales Macedo Garitezi
0ca3f51503 fix(kafka): improve shutdown and health check logs during shutdown 2023-05-25 16:38:09 -03:00
Thales Macedo Garitezi
5df7314255 feat(kafka): ensure allocated resources are removed on failures 2023-05-25 16:38:09 -03:00
Thales Macedo Garitezi
42b37690c7 refactor(pulsar): use macros for allocatable resources 2023-05-25 16:38:09 -03:00
Paulo Zulato
ea86f4442b fix: avoid error 500 when node is re-joining cluster 
Fixes https://emqx.atlassian.net/browse/EMQX-9899
 2023-05-25 13:32:28 -03:00
Thales Macedo Garitezi
194faefc8a fix(webhook): keep resource_opts.request_timeout for webhook bridge (r5.0) 
Fixes https://emqx.atlassian.net/browse/EMQX-10001

Recently, we unified request_timeout in a single field located at the
webhook connector schema.  However, the correct fix would be to use
the resource_opts.request_timeout one, as that’s the only one that
allows infinity timeout.
 2023-05-25 13:19:27 -03:00
Zaiming (Stone) Shi
e8a4df96bc Merge remote-tracking branch 'origin/master' into 0503-no-telemetry-app-for-ee 2023-05-25 16:43:20 +02:00
Thales Macedo Garitezi
18d57ba3eb
Merge pull request #10812 from thalesmg/test-flakiness-20230524 
test: attempts to reduce flakiness (pgsql, cassandra)
 2023-05-25 09:29:13 -03:00
JianBo He
933357483f
Merge pull request #10817 from HJianBo/fix-restart-timer-interval 
fix: fix auto_restart_interval checker
 2023-05-25 20:23:53 +08:00
JianBo He
6b5ff24952 test: assert the block_until result 2023-05-25 18:12:38 +08:00
JianBo He
fdec86e29c
Merge pull request #10802 from Kinplemelon/kinple/set-base-url-required 
fix: set the base_url in IoTDB bridge as a required field
 2023-05-25 18:12:05 +08:00
JianBo He
de7f1c8aec test: add tests for auto_restart_interval 2023-05-25 17:15:19 +08:00
Zaiming (Stone) Shi
ba41c23b7c
Merge pull request #10794 from paulozulato/fix-oracle-database-field 
Fix oracle database field
 2023-05-25 08:14:13 +02:00
JianBo He
71b636e321 fix: fix auto_restart_interval checker 2023-05-25 12:04:23 +08:00
Paulo Zulato
1f36726cab
Merge pull request #10780 from paulozulato/fix-large-health-check-interval 
Add user-friendly message when interval is out of range
 2023-05-24 18:41:42 -03:00
Thales Macedo Garitezi
658160f09a test(cassandra): attempt to reduce flakiness 2023-05-24 16:57:51 -03:00
Thales Macedo Garitezi
37061b484a
Merge pull request #10778 from thalesmg/refactor-pulsar-on-stop-v50 
feat(pulsar): ensure allocated resources are removed on failures (v5.0)
 2023-05-24 16:00:50 -03:00
Thales Macedo Garitezi
cc8cebe950
Merge pull request #10811 from thalesmg/fix-flaky-kconsumer-balance-test-r50 
test(kafka_consumer): attempt to stabilize cluster tests
 2023-05-24 15:56:28 -03:00
Thales Macedo Garitezi
3cb12d7603
Merge pull request #10810 from thalesmg/merge-r50-into-v50-20230524 
Merge `release-50` into `master`
 2023-05-24 15:55:09 -03:00
Paulo Zulato
122ebcac24 fix: add user-friendly message when interval is out of range 2023-05-24 15:46:00 -03:00
Thales Macedo Garitezi
7f88521836 test(pgsql): reduce flakiness 
Depending on timing, `t_write_timeout` was getting stuck while
checking the resource health, and the previous request timeout options
were making a response to never be sent if that process took too long.
 2023-05-24 15:41:25 -03:00
Paulo Zulato
8d3d3e523b fix(oracle): replace 'database' field by 'service name' 
Fixes https://emqx.atlassian.net/browse/EMQX-9980
 2023-05-24 15:40:56 -03:00
Paulo Zulato
50ff6c4aa4
Merge pull request #10741 from paulozulato/fix-oracle-passwd-leaking 
fix(oracle): hide password on stacktrace
 2023-05-24 15:31:00 -03:00
Kjell Winblad
0e873731a1
Merge pull request #10804 from kjellwinblad/kjell/fix/iotdb_rest_api_v1/EMQX-9920 
fix: REST API version 2 not available in IoTDB 0.13 and 1.0
 2023-05-24 18:34:45 +02:00
Thales Macedo Garitezi
7374e00a02 test(kafka_consumer): attempt to stabilize cluster tests 
Example failure:
https://github.com/emqx/emqx/actions/runs/5070096710/jobs/9105822319#step:7:515

The attempt here is to setup the spy as early as possible, before the
bridge starts, so we avoid missing rebalancing events.
 2023-05-24 13:13:54 -03:00
ieQu1
2b79196a03
Merge pull request #10809 from ieQu1/ekka-0.15.2 
chore(ekka): Bump version to 0.15.2
 2023-05-24 18:13:04 +02:00
Thales Macedo Garitezi
324459990f Merge branch 'release-50' into merge-r50-into-v50-20230524 2023-05-24 12:54:15 -03:00
Thales Macedo Garitezi
ad93af2853
Merge pull request #10808 from thalesmg/fix-ehttpc-infinity-timeout-r50 
fix: handle `infinity` timeout option in `ehttpc` (r5.0)
 2023-05-24 12:53:05 -03:00
Thales Macedo Garitezi
fd2940cd77 feat(pulsar): ensure allocated resources are removed on failures (v5.0) 
Fixes https://emqx.atlassian.net/browse/EMQX-9937
 2023-05-24 12:29:00 -03:00
zhongwencool
14a6b36899
Merge pull request #10803 from JimMoen/merge-release-50 
Merge release-50 into master
 2023-05-24 23:08:46 +08:00
zhongwencool
96e4b5914a
Merge pull request #10797 from zhongwencool/bump-minirest 
chore: upgrade minirest to 1.3.10 for more clear error msg
 2023-05-24 22:41:42 +08:00
Thales Macedo Garitezi
a172a6bc33
Merge pull request #10795 from thalesmg/fix-schema-registry-rule-iolist-r50 
fix(schema_registry): ensure `schema_encode` output in rule engine is a binary (r5.0)
 2023-05-24 11:02:05 -03:00
ieQu1
3d3dacfcf6 chore(ekka): Bump version to 0.15.2 2023-05-24 15:43:49 +02:00
Thales Macedo Garitezi
4565acc600 fix: handle infinity timeout option in ehttpc (r5.0) 
Fixes https://emqx.atlassian.net/browse/EMQX-9987
 2023-05-24 10:33:54 -03:00
Andrew Mayorov
3fd2887921
Merge pull request #10793 from fix/EMQX-9965/bugs 
fix(ft): handle wider class of bad input in APIs
 2023-05-24 16:14:11 +03:00
某文
8816da41a6 test: log test failed 2023-05-24 21:06:15 +08:00
Thales Macedo Garitezi
6c414ab991 fix(schema_registry): ensure schema_encode output in rule engine is a binary (r5.0) 
Fixes https://emqx.atlassian.net/browse/EMQX-9981
 2023-05-24 09:13:38 -03:00
JimMoen
28015597ee
Merge remote-tracking branch 'emqx/release-50' into merge-release-50 2023-05-24 19:34:12 +08:00
Kjell Winblad
4f21bdb885 fix: REST API version 2 not available in IoTDB 0.13 and 1.0 
This commit makes sure that REST API version 1 is used when the
user has selected to use IoTDB 0.13 or 1.0

Fixes:
https://emqx.atlassian.net/browse/EMQX-9920
 2023-05-24 13:09:47 +02:00
JimMoen
cc2bb87b82
Merge pull request #10801 from JimMoen/fix-topic-lookup-percent-decode 
fix: lookup topic without force percent decode
 2023-05-24 18:51:16 +08:00
Kinplemelon
7cad1cb93a fix: set the base_url in IoTDB bridge 
as a required field
 2023-05-24 18:18:32 +08:00
JimMoen
1ac140312d
test: lookup topic with percent encoded topic name 2023-05-24 17:39:25 +08:00
JimMoen
e38645aa28
fix: lookup topic without force percent decode 
* the minirest handler would do it
 2023-05-24 17:28:32 +08:00
Zaiming (Stone) Shi
2fdf4b5dac
Merge pull request #10744 from savonarola/0518-fix-eviction 
fix(evacuation): handle expire interval correctly
 2023-05-24 09:20:53 +02:00
Zaiming (Stone) Shi
256cb73e43
Merge pull request #10792 from thalesmg/fix-webhook-bridge-health-check-clause-r50 
fix(webhook): fix empty ehttpc worker list clause on health check (r5.0)
 2023-05-24 08:46:59 +02:00
Zaiming (Stone) Shi
9363ca5846
Merge pull request #10791 from thalesmg/fix-bridge-infinity-timeout-r50 
fix(bridge): pass resource option `request_timeout = infinity` along to buffer workers (r5.0)
 2023-05-24 08:46:43 +02:00
某文
7da0860d6c chore: upgrade minirest to 1.3.10 for more clear error msg 2023-05-24 10:44:52 +08:00
JianBo He
0d3de36f4d
Merge pull request #10770 from kjellwinblad/kjell/fix/iotdb_need_to_parse_input_bug/EMQX-9854 
fix: IoTDB bridge incoming payload needs to be parsed as JSON
 2023-05-24 10:17:23 +08:00
Thales Macedo Garitezi
8e6da40a31 test: fix flaky ocsp test setup (v5.0) 2023-05-23 17:52:02 -03:00
Zaiming (Stone) Shi
2de2a979f5
Merge pull request #10779 from zmstone/0522-remove-log-file-paht-validator 
chore: allow special chars in log dir
 2023-05-23 22:42:12 +02:00
Zaiming (Stone) Shi
b8b1779627 Merge remote-tracking branch 'origin/master' into 0503-no-telemetry-app-for-ee 2023-05-23 21:42:07 +02:00
Zaiming (Stone) Shi
f450f51e2c
Merge pull request #10789 from kjellwinblad/kjell/bridge/rabbitmq_password_not_required_filed/EMQX-9974 
fix: RabbitMQ field not marked as required
 2023-05-23 20:59:49 +02:00
Thales Macedo Garitezi
44ed6a19ee fix(bridge): pass resource option request_timeout = infinity along to buffer workers (r5.0) 2023-05-23 14:50:43 -03:00
Thales Macedo Garitezi
b5f63f4151 test: fix wrong test listeners option 2023-05-23 14:50:43 -03:00
Andrew Mayorov
f4047d3946
test(ft): add testcase for nasty tranfer filenames 
* Emoji
* Chinese characters
 2023-05-23 20:46:47 +03:00
Thales Macedo Garitezi
25437adf02 fix(webhook): fix empty ehttpc worker list clause on health check (r5.0) 
Fixes https://emqx.atlassian.net/browse/EMQX-9970
 2023-05-23 14:06:40 -03:00
Andrew Mayorov
2dbf84479c
fix(ft): handle wider class of jiffy decode errors 
With malformed cursors in the File listing API.

Fixes EMQX-9965
 2023-05-23 20:00:00 +03:00
Andrew Mayorov
cb14a3e08b
fix(ft): handle empty filepath in fs exporter API 
Fixes EMQX-9973
 2023-05-23 19:58:05 +03:00
Kjell Winblad
63180c87be
style: simplify code for better readability 
Co-authored-by: Thales Macedo Garitezi <thalesmg@gmail.com>
 2023-05-23 18:53:14 +02:00
Zaiming (Stone) Shi
4ada938b82
Merge pull request #10757 from thalesmg/perf-pulsar-producer-status-check-r50 
feat(pulsar): improve authn error check time and add connect timeout
 2023-05-23 16:37:19 +02:00
Kjell Winblad
ea2fea77d7 fix: RabbitMQ field not marked as required 
This commit makes sure that the RabbitMQ password filed is marked as
required. This ensures that the user provides a password and that the
bridge does not throw a function clause exception if the password filed
is not set.

Fixes:
https://emqx.atlassian.net/browse/EMQX-9974
 2023-05-23 15:50:18 +02:00
Zaiming (Stone) Shi
47a3096776 test: add test case for file path validation 2023-05-23 14:22:50 +02:00
Zaiming (Stone) Shi
2fa5b511bf chore: hide stale config 2023-05-23 14:20:49 +02:00
Zaiming (Stone) Shi
91150e6d83 chore: allow special chars in log dir 
the current valdiator does not allow space and ':' in log file path
which is an unresonable restriction
 2023-05-23 14:20:49 +02:00
Zaiming (Stone) Shi
e78ffb2dd4 chore: bump apps version 2023-05-23 13:04:28 +02:00
Zaiming (Stone) Shi
3bb1f7ab2b Merge remote-tracking branch 'origin/master' into 0503-no-telemetry-app-for-ee 2023-05-23 13:03:55 +02:00
Kjell Winblad
89ea1646be fix: IoTDB name for version option 
The previous name for the version option was v1.0.x which is clearly
wrong since this option was tested against IoTDB version v1.1.0. This
commit fixes this by renaming the option to v1.x.

Fixes:
https://emqx.atlassian.net/browse/EMQX-9926
 2023-05-23 10:57:05 +02:00
Kjell Winblad
d19ddb1832 fix: IoTDB bridge incoming payload needs to be parsed as JSON 
There was an incorrect assumption that the data incoming to the IoTDB
bridge has already been parsed. This is fixed by parsing the payload as
JSON data if the payload is not already a map.

Fixes:
https://emqx.atlassian.net/browse/EMQX-9854
 2023-05-23 10:14:45 +02:00
zhongwencool
3b6295a085
Merge pull request #10781 from zhongwencool/fix-bridge-test-failed 
test: bridge test init dashboard listener failed
 2023-05-23 11:16:57 +08:00
某文
1deb3c50c8 test: bridge test init dashboard listener failed 2023-05-23 10:28:01 +08:00
某文
67a30ee976 test: bridge test init dashboard listener failed 2023-05-23 10:16:43 +08:00
某文
ed1268ed30 Merge branch 'release-50' into 0522-merge-release-50-to-master 2023-05-23 07:56:35 +08:00
zhongwencool
26e31137c7
Merge pull request #10764 from HJianBo/remove-unused-comments 
chore: remove unused conf comments
 2023-05-23 07:53:25 +08:00
Zaiming (Stone) Shi
68f4ae70b2 chore: bump ee release version to e5.0.4-alpha.2 2023-05-22 22:41:19 +02:00
Zaiming (Stone) Shi
732a7be187 Merge remote-tracking branch 'origin/release-50' 2023-05-22 17:46:54 +02:00
Zaiming (Stone) Shi
1f44dd4579
Merge pull request #10756 from zmstone/0519-refactor-move-lib-ee-emqx_ee_conf-to-apps-emqx_enterprise 
0519 refactor move lib ee emqx ee conf to apps emqx enterprise
 2023-05-22 16:56:51 +02:00
Thales Macedo Garitezi
1c4c7fad92
Merge pull request #10740 from thalesmg/perf-buffer-worker-periodic-metrics-v50 
perf(buffer_worker): update metrics periodically rather than immediately (v5.0)
 2023-05-22 11:41:41 -03:00
Thales Macedo Garitezi
0877e4296a fix(dashboard): add missing function clause 
Example error:
https://github.com/emqx/emqx/actions/runs/5045715277/jobs/9052482682#step:8:294

The previous change was not equivalent to the previous `maps:with/2`
behavior.
 2023-05-22 11:35:04 -03:00