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

480 Commits

Author SHA1 Message Date
Thales Macedo Garitezi
a239f0523a
docs: improve descriptions 
Co-authored-by: Zaiming (Stone) Shi <zmstone@gmail.com>
 2023-03-24 09:23:06 -03:00
Thales Macedo Garitezi
ca820dfefc
docs: improve descriptions 
Co-authored-by: Zaiming (Stone) Shi <zmstone@gmail.com>
 2023-03-24 09:21:08 -03:00
Thales Macedo Garitezi
5bdc71af6f docs(kafka_consumer): make specific labels for key/value encoding modes 
https://emqx.atlassian.net/browse/EMQX-9312
 2023-03-24 09:08:27 -03:00
JimMoen
d0f0a93888
fix: ecpool worker exec dynamo health check fun 2023-03-24 11:15:52 +08:00
Thales Macedo Garitezi
f8d5d53908 feat(buffer_worker): decouple query mode from underlying connector call mode 
Fixes https://emqx.atlassian.net/browse/EMQX-9129

Currently, if an user configures a bridge with query mode sync, then
all calls to the underlying driver/connector ("inner calls") will
always be synchronous, regardless of its support for async calls.

Since buffer workers always support async queries ("outer calls"), we
should decouple those two call modes (inner and outer), and avoid
exposing the inner call configuration to user to avoid complexity.

There are two situations when we want to force synchronous calls to
the underlying connector even if it supports async:

1) When using `simple_sync_query`, since we are bypassing the buffer
workers;
2) When retrying the inflight window, to avoid overwhelming the
driver.
 2023-03-23 13:40:31 -03:00
Kinplemelon
28544e62df docs: correct the chinese label for the socket_nodelay field 2023-03-23 16:27:09 +08:00
Kinplemelon
1cb975a811
Merge pull request #10148 from Kinplemelon/kinple/kafka-nodelay-label 
docs: correct the chinese label for the `socket_nodelay` field
 2023-03-23 16:24:24 +08:00
JianBo He
1a466fda0b chore: use binary type InstanceId as PoolName 2023-03-23 16:06:51 +08:00
JianBo He
9b63bdc1e0 chore: apply review suggestions 
- Rename sql to cql
- Add tests for `bridges_probe` API
 2023-03-23 15:27:34 +08:00
JianBo He
ac41c7e653 chore: format codes 2023-03-23 11:53:26 +08:00
JianBo He
8cbbc9f271 Merge remote-tracking branch 'upstream/master' into cassa 2023-03-23 11:53:17 +08:00
Thales Macedo Garitezi
ddffba0355
Merge pull request #10154 from thalesmg/fix-buffer-worker-default-req-timeout 
fix(buffer_worker): calculate default `resume_interval` based on `request_timeout` and `health_check_interval`
 2023-03-22 20:21:04 -03:00
Thales Macedo Garitezi
1ca6a51425
Merge pull request #10198 from thalesmg/fix-flaky-kconsumer-test-v50 
test: attempt to fix flaky kafka consumer test
 2023-03-22 17:19:50 -03:00
Thales Macedo Garitezi
127a075b66 test(dynamo): attempt to fix dynamo tests 
Those tests in the `flaky` test are really flaky and require lots of
CI retries.

Apparently, the flakiness comes from race conditions from restarting
bridges with the same name too fast between test cases.  Previously,
all test cases were sharing the same bridge name (the module name).
 2023-03-22 14:34:37 -03:00
Thales Macedo Garitezi
61cb03b45a fix(buffer_worker): change the default resume_interval value and expose it as hidden config 
Also removes the previously added alarm for request timeout.

There are situations where having a short request timeout and a long
health check interval make sense, so we don't want to alarm the user
for those situations.  Instead, we automatically attempt to set a
reasonable `resume_interval` value.
 2023-03-22 11:47:36 -03:00
Thales Macedo Garitezi
208813330a fix: remove metrics from rocketmq example 2023-03-22 10:59:20 -03:00
lafirest
84def357a9
Merge pull request #10143 from lafirest/feat/rocketmq 
feat(bridges): integrate RocketMQ into data bridges
 2023-03-22 20:43:22 +08:00
firest
4ad3579966 test(bridges): add test suite for RocketMQ 2023-03-22 10:36:58 +08:00
firest
9853d00cad feat(bridges): integrate RocketMQ into data bridges 2023-03-22 10:36:52 +08:00
JianBo He
65c2da7ef5 Merge remote-tracking branch 'ce/master' into cassa 2023-03-22 09:30:50 +08:00
Zaiming (Stone) Shi
e6091db351 Merge remote-tracking branch 'origin/release-50' into 0321-merge-release-50-to-master 2023-03-21 22:03:31 +01:00
Thales Macedo Garitezi
7e6f52e8fe test: attempt to fix flaky kafka consumer test 
It might need some time for the metrics to be set.
 2023-03-21 17:45:58 -03:00
Kjell Winblad
27b8445337 fix: add inflight window setting to the clickhouse bridge 
This commit makes sure the inflight window setting is present for the
clickhouse bridge. It also changes emqx_resource_schema that previously
removed the inflight window setting from resources with query mode
`always_sync`. We don't need to do that because all bridges that uses
the buffer worker queue will get async call handling even if the bridge
don't support the async callback.

Co-authored-by: Zaiming (Stone) Shi <zmstone@gmail.com>
 2023-03-21 17:14:03 +01:00
JianBo He
539ec2f774 chore(bridge): cover username/password auth for cassandra bridges 2023-03-21 13:55:53 +08:00
JianBo He
ae5c24445b chore: make shellcheck happy 2023-03-21 11:18:15 +08:00
Serge Tupchii
3a46681dde feat: handle escaped characters in InfluxDB data bridge write_syntax 
Closes: EMQX-7834
 2023-03-20 16:42:23 +02:00
JianBo He
d1689f6957 chore: correct api examples 
follow https://github.com/emqx/emqx/pull/10114
 2023-03-20 17:03:05 +08:00
Erik Timan
2d75c7d6d9 fix(emqx_bridge): remove metrics from non-dedicated bridge API endpoints 
Metrics should only be exposed via the /bridges/:id/metrics endpoint,
and not in other operations such as getting the list of all bridges, or
in the response when a bridge has been created. This commit removes all
traces of metrics for the non-dedicated API endpoints.
 2023-03-20 09:43:11 +01:00
JianBo He
12942b676d Merge remote-tracking branch 'upstream/master' into cassa 2023-03-20 09:50:27 +08:00
JianBo He
c2c9abd568 chore: add running ct 2023-03-20 09:47:58 +08:00
JianBo He
d8e6e2a1be test: refine CASSANDRA_HOST name 2023-03-17 18:52:52 +08:00
JianBo He
678cc937c0 test(bridge): cover ssl testing for cassandra bridge 2023-03-17 18:25:05 +08:00
JianBo He
5f0828a2ea ci: add certs for cassandra tls 2023-03-17 16:39:10 +08:00
JianBo He
a20c39c83a test: correct CASSANDRA_HOST 2023-03-17 13:55:26 +08:00
JianBo He
75c1592e7c chore: make static_checks happy 2023-03-17 11:34:52 +08:00
JianBo He
c0a216a740 feat(bridge): support cassandra bridge 2023-03-17 11:34:48 +08:00
Thales Macedo Garitezi
966276127e test: trying to make tests more stable 2023-03-16 13:43:01 -03:00
Thales Macedo Garitezi
0587e0d3f3 refactor(kafka_consumer): change the generated consumer group id 
Co-authored-by: Zaiming (Stone) Shi <zmstone@gmail.com>
 2023-03-16 13:43:01 -03:00
Thales Macedo Garitezi
41b8d47696 test(kafka_consumer): add more clusterized tests 2023-03-16 13:43:01 -03:00
Thales Macedo Garitezi
19f9c35662 docs: improve descriptions 
Co-authored-by: Zaiming (Stone) Shi <zmstone@gmail.com>
 2023-03-16 13:43:01 -03:00
Thales Macedo Garitezi
fc5dfa108a fix(kafka_consumer): rename force_utf8 to none 
We actually enforce the key/value to be a valid UTF-8 string when
using `emqx_json:encode`, if we do encode using that, which is
template-dependent.
 2023-03-16 13:43:01 -03:00
Thales Macedo Garitezi
37a35b22df docs(kafka): improve kafka consumer/producer API examples 2023-03-16 13:43:01 -03:00
Thales Macedo Garitezi
53979b6261 feat(kafka_consumer): support multiple topic mappings, payload 
templates and key/value encodings

Added after feedback from the product team.
 2023-03-16 13:43:01 -03:00
Thales Macedo Garitezi
f31f15e44e chore(kafka_producer): make schema changes more backwards compatible 
This will still require fixes to the frontend.
 2023-03-16 13:43:01 -03:00
Thales Macedo Garitezi
c182a4053e fix(kafka_consumer): avoid leaking atoms in bridge probe API 2023-03-16 13:43:01 -03:00
Thales Macedo Garitezi
27dfd98f46 fix(kafka): fix api methods schemas and bridge type enum 2023-03-16 13:43:01 -03:00
Thales Macedo Garitezi
fecc08bb8f refactor(kafka_consumer): apply review suggestions 2023-03-16 13:43:01 -03:00
Thales Macedo Garitezi
2a3aef92bb refactor(kafka_consumer): redact error info 2023-03-16 13:43:01 -03:00
Thales Macedo Garitezi
9037314aea docs: improve descriptions 
Co-authored-by: Zaiming (Stone) Shi <zmstone@gmail.com>
 2023-03-16 13:43:01 -03:00
Thales Macedo Garitezi
1b78f22d92 docs: improve descriptions 
Co-authored-by: Zaiming (Stone) Shi <zmstone@gmail.com>
 2023-03-16 13:43:01 -03:00
Thales Macedo Garitezi
e1fdd041b3 feat(kafka_consumer): add offset_commit_interval_seconds kafka parameter 2023-03-16 13:43:01 -03:00
Thales Macedo Garitezi
1d5fe14a30 test: remove sleeps 2023-03-16 13:43:01 -03:00
Thales Macedo Garitezi
65c15b3fae refactor(kafka_consumer): move subscriber startup logic to separate fn 2023-03-16 13:43:01 -03:00
Thales Macedo Garitezi
969fa03ecc feat: implement kafka consumer 2023-03-16 13:43:01 -03:00
Thales Macedo Garitezi
5ab5236ad3 test: fix flaky test 2023-03-16 13:42:38 -03:00
Kinplemelon
651f72eabc docs: correct the chinese label for the socket_nodelay field 2023-03-16 11:39:29 +08:00
Andrew Mayorov
a530ccbe3d
Merge pull request #10095 from fix/EEC-782/mysql-prepstmt-exhaustion 
fix(mysql): be explicit that batch queries are parameterless
 2023-03-14 10:21:45 +03:00
ieQu1
e3595f2e79 chore(mria): Bump version to 0.4.0 2023-03-11 00:37:25 +01:00
Andrew Mayorov
f7c0d29478
test(tde): add testcase for a nasty string in SQL query 
Similar to what we have in mysql and pgqsl testsuites.
 2023-03-10 18:43:30 +03:00
Andrew Mayorov
0a7f6c7d03
fix(mysql): ensure proper escaping in batch inserts 
Also hexencode non-utf8 binaries. This is essentially an heuristic.
We don't know column types in runtime, and there's no simple way
to find them out. Since we're already doing full binary scan during
escaping it should be cheap to bail out on non-utf8 strings and
hexencode them instead.

Also introduce separate function to highlight that this escaping
is MySQL-specific.
 2023-03-10 18:42:04 +03:00
Andrew Mayorov
fc37d9b3cd
fix(mysql): be explicit that batch queries are parameterless 
So that mysql client won't attempt to prepare them automatically, thus
trashing the server's prepared statements table and making interaction
overall heavier.
 2023-03-10 18:42:04 +03:00
Andrew Mayorov
a86d06f043
chore: bump app versions following last merge-back 2023-03-10 16:44:15 +03:00
Zaiming (Stone) Shi
fe27604010 Merge remote-tracking branch 'origin/release-50' into 0308-merge-release-50-back-to-master 2023-03-08 16:46:45 +01:00
Serge Tupchii
97e71c54d4 fix: use default template if timestamp is empty (undefined) in InfluxDB bridge 
Closes EMQX-8926
 2023-03-08 11:58:23 +01:00
firest
984dd3446d test(bridges): add test suite for DynamoDB 2023-03-08 11:13:51 +08:00
firest
bfc2920a55 feat(bridges): introduce DynamoDB definition files from v4 2023-03-08 11:13:51 +08:00
firest
b8b1a78025 feat(bridges): integrate the DynamoDB into data bridges 2023-03-08 11:13:38 +08:00
Thales Macedo Garitezi
18ab7ed197 chore: bump app vsns 2023-03-06 15:31:28 -03:00
Thales Macedo Garitezi
e9d3fc511f chore(buffer_worker): change default batch_time to 0 and improve docs 2023-03-06 15:31:28 -03:00
Thales Macedo Garitezi
9825998207 chore(gcp_pubsub): just deprecate request_timeout instead of removing 2023-03-06 10:12:38 -03:00
Thales Macedo Garitezi
9b087a21f5 fix(gcp_pubsub): remove conflicting request_timeout option 
Since the buffer worker schema already contains that configuration,
having it two places can lead to quite confusing behavior.
 2023-03-06 10:12:38 -03:00
Ivan Dyachkov
c01f62a1c1 chore: bump apps versions 2023-03-03 13:58:32 +01:00
Kjell Winblad
c24a84e370 docs: fix spelling 2023-03-03 12:06:18 +01:00
Kjell Winblad
67acdf0888 feat: add clickhouse database bridge 
This commit adds a Clickhouse bridge to EMQX 5. The bridge is similar to
the Clickhouse bridge in the 4.4, but adds the possibility to use
different formats (such as JSON) for values to be inserted.
 2023-03-02 12:22:11 +01:00
Zaiming (Stone) Shi
083330ad80 Merge remote-tracking branch 'origin/master' into 0301-merge-release-50-to-master 2023-03-01 08:53:03 +01:00
Zaiming (Stone) Shi
41cb7263ca docs(influxdb): add a node to the write_syntax config 2023-02-28 21:53:32 +01:00
Zaiming (Stone) Shi
24f476e35f test: add README to influxdb test script 2023-02-28 19:38:43 +01:00
Ivan Dyachkov
6ce5029d79
Merge pull request #9881 from olcai/log-influxdb-is-alive-reason 
fix(emqx_ee_connector): log reason for failure when starting influxdb connector
 2023-02-28 09:49:08 +00:00
Zaiming (Stone) Shi
79bf77c2f1
Merge pull request #10020 from zmstone/0222-fix-bridge-async-mode-counters 
fix(bridge): fix dropped counter and inflight gauge
 2023-02-24 19:51:24 +01:00
Andrew Mayorov
9cbe64a132
fix(test): make strings json-friendly in kafka testsuite 2023-02-24 15:05:20 +03:00
Erik Timan
44c0aae16b fix(emqx_ee_connector): improve log message on influxdb start failures 2023-02-24 11:31:57 +01:00
Erik Timan
da42c91fb2 test(emqx_ee_bridge): check influxdb:is_alive/2 return 2023-02-24 09:03:34 +01:00
Erik Timan
8314c07147 chore: update influxdb-client-erl dep 2023-02-24 09:03:34 +01:00
Erik Timan
603532dacd fix(emqx_ee_connector): log reason for failure when starting influxdb connector 2023-02-24 09:03:34 +01:00
Zaiming (Stone) Shi
ada68e12e6 fix(kafka): change default value for memory_overload_protection to false 2023-02-22 13:46:51 +01:00
Zaiming (Stone) Shi
9316690c29 fix(schema): binary string for default values 
A lot of the string value fields had default value defined in
schema as list-string rather than binary-string.
This caused the generated schema dump (in JSON format)
to have raw_default field as an integer array.
 2023-02-21 09:09:51 +01:00
Zaiming (Stone) Shi
53ecfb98d0 chore: fix stale code comments 2023-02-21 09:09:51 +01:00
Ivan Dyachkov
c869eff6e8 test(kafka): disable overload protection in 2 more places 2023-02-20 21:38:14 +01:00
Ivan Dyachkov
9d30a52910 test: disable replayq memory overload protection 2023-02-20 19:29:26 +01:00
Erik Timan
291755f81f
Merge pull request #9895 from olcai/add-test-for-influxdb-ssl-opts 
test(emqx_ee_connector): add basic tests for influxdb incl. SSL opts
 2023-02-20 10:05:47 +01:00
Erik Timan
ca28be4387 test(emqx_ee_connector): review fixes of influxdb tests 2023-02-17 15:28:49 +01:00
Erik Timan
caacc08ff9 chore: bump app VSN 2023-02-17 15:28:27 +01:00
Erik Timan
843ed464d5 fix: remove all mentions of UDP support for InfluxDB EE bridge 
The InfluxDB EE bridge doesn't support the UDP protocol, but it is
defined in the schema. This commit removes all such traces in the
schema.
 2023-02-17 10:47:57 +01:00
ieQu1
d9554c36ac chore: Bump umbrealla app versions 2023-02-17 09:50:50 +01:00
ieQu1
794bedef9f fix(emqx_ctl): Start CLI before ekka 2023-02-17 09:50:50 +01:00
firest
81adb02402 chore: bump apps version 2023-02-14 22:04:29 +08:00
firest
0420e9acb5 test(bridges): add test cases for TDEngine 2023-02-14 22:04:29 +08:00
firest
530b21268a feat(bridges): add TDengine 2023-02-14 22:04:23 +08:00
Zaiming (Stone) Shi
42dfaf3ef2
Merge pull request #9910 from sstrigler/EMQX-8861-improve-bridge-restart-button-behaviour 
EMQX 8861 improve bridge restart button behaviour
 2023-02-09 18:00:48 +01:00
Erik Timan
4eb4430fe2 chore: bump VSN 2023-02-09 17:22:19 +01:00