d651764ff4
docs: add changelog for pull request 11734
2023-10-10 10:05:14 +02:00
ed5b456d62
Merge remote-tracking branch 'origin/release-53' into 0928-sync-release-53
2023-09-29 18:24:44 +02:00
f69702b82e
docs: delete typo-named changelog file
2023-09-29 14:03:30 +02:00
1a13b2ac56
Merge remote-tracking branch 'origin/release-53' into 0928-sync-release-53
2023-09-28 13:53:03 +02:00
b77e5e880a
Merge pull request #11697 from ieQu1/dev/gen-rpc-3.1.1
...
chore(gen_rpc): Bump version to 3.1.1
2023-09-28 10:03:36 +02:00
0aa3ccdd65
feat(gen_rpc): Add schema for the TLS versions and cipher suites
2023-09-28 00:36:59 +02:00
3c37f19105
chore(gen_rpc): Bump version to 3.1.1
2023-09-27 21:09:00 +02:00
ffd9a35d69
chore: Add missing changelog
2023-09-26 23:33:47 +08:00
aae59f1efd
Merge pull request #11682 from thalesmg/fix-file-logger-type-r53-20230925
...
fix(file_logger): change file logger type depending on rotation size
2023-09-26 10:22:36 -03:00
fdcd73e20c
fix(file_logger): change file logger type depending on rotation size
...
Fixes https://emqx.atlassian.net/browse/EMQX-11036
From `logger_disk_log_h:open_disk_log`:
```erlang
open_disk_log(Name,File,Type,MaxNoBytes,MaxNoFiles) ->
case filelib:ensure_dir(File) of
ok ->
Size =
if Type==halt -> MaxNoBytes;
Type==wrap -> {MaxNoBytes,MaxNoFiles} %% <-------
end,
Opts = [{name, Name},
{file, File},
{size, Size},
{type, Type},
{linkto, self()},
{repair, false},
{format, external},
{notify, true},
{quiet, true},
{mode, read_write}],
case disk_log:open(Opts) of
```
Affects all file loggers (audit included):
```
% emqx_config_logger:update_log_handler/1 -> ok
iex(emqx@127.0.0.1)14> Config override: log.file.emqx_audit is updated, but failed to add handler: {handler_not_added,
{badarg,
[{size,
{infinity,
10}},
{type,
wrap},
{linkto,
<0.1952.0>},
{repair,
false},
{format,
external},
{notify,
true},
{quiet,
true},
{mode,
read_write}]}}
```
2023-09-26 09:04:44 -03:00
a9df99746a
docs: add changelog for PR 11661
2023-09-25 16:55:22 +02:00
ddf6cdc0a2
chore: add changelog
2023-09-25 14:57:42 +03:00
d6935b6a67
feat: add port scan diagnostics to mria waiting for tables checks
...
Fixes https://emqx.atlassian.net/browse/EMQX-10944
Also updates ekka -> 0.15.15, mria -> 0.6.4
How to test
===========
1. Start 2 or more EMQX nodes and merge them in a cluster.
2. Stop them in order.
3. Start only the first node that was stopped in the previous step.
4. Wait until the log is printed.
Or, more easily:
1. Start 2 or more EMQX nodes and merge them in a cluster.
2. Stop all but one.
3. Run `mria_mnesia:diagnosis([]).` on that node.
Example output
==============
```
Check check_open_ports should get ok but got #{msg =>
"some ports are unreachable",
results =>
#{'emqx@172.100.239.4' =>
#{open_ports =>
#{4370 => false,
5370 =>
false},
ports_to_check =>
[4370,5370],
resolved_ips =>
[{172,100,239,
4}],
status =>
bad_ports},
'emqx@172.100.239.5' =>
#{open_ports =>
#{4370 => false,
5370 =>
false},
ports_to_check =>
[4370,5370],
resolved_ips =>
[{172,100,239,
5}],
status =>
bad_ports}}}
```
After one node is back:
```
Check check_open_ports should get ok but got #{msg =>
"some ports are unreachable",
results =>
#{'emqx@172.100.239.4' =>
#{ports_to_check =>
[4370,5370],
resolved_ips =>
[{172,100,239,
4}],
status => ok},
'emqx@172.100.239.5' =>
#{open_ports =>
#{4370 => false,
5370 =>
false},
ports_to_check =>
[4370,5370],
resolved_ips =>
[{172,100,239,
5}],
status =>
bad_ports}}}
```
2023-09-21 14:29:01 -03:00
0a61d08a0f
Merge pull request #11651 from id/0921-sync-r52-to-master
...
sync r52 to master
2023-09-21 12:31:24 +02:00
3a5227198e
Merge pull request #11642 from qzhuyan/dev/william/quicer-0.0.200
...
quicer 0.0.200
2023-09-21 12:20:14 +02:00
105bebc250
chore: merge release-52 into master
2023-09-21 10:22:47 +02:00
9521e11d39
Merge pull request #11584 from zhongwencool/telemetry-error-on-windows
...
fix: telemetry report error on windows
2023-09-21 09:08:55 +08:00
da626f6d29
feat(quic): bump to quicer 0.0.200 and emqtt 1.9.0
2023-09-20 16:43:15 +02:00
65818740f3
Merge pull request #11622 from zmstone/0917-upgrade-gen_rpc-to-3.1.0
...
chore(gen_rpc): upgrade from 2.8.1 to 3.1.0
2023-09-19 10:22:53 +02:00
abbee4bc47
fix(esockd): upgrade esockd from 5.9.6 to 5.9.7
2023-09-17 19:44:04 +02:00
1960dbd970
docs: add changelogs for pr 11622
2023-09-17 19:13:22 +02:00
a9682c2989
Merge pull request #11605 from zmstone/0913-lower-severity-level-for-CMD-override-warnings
...
0913 lower severity level for cmd override warnings
2023-09-16 11:32:07 +02:00
062854eff7
docs: add changelog
2023-09-15 16:07:23 +02:00
2bf583087b
docs: add changelog for pr 11605
2023-09-13 20:55:42 +02:00
cf334d5542
Merge pull request #11567 from SergeTupchiy/EMQX-10835-increase-graceful-stop-timeout
...
fix(nodetool): increase graceful stop timeout
2023-09-13 13:22:39 +03:00
a336300ab5
chore: add changelog
2023-09-13 10:54:50 +03:00
9b3f88aeeb
feat(nodetool): print shutdown status messages while EMQX is stopping
2023-09-12 19:55:16 +03:00
9de9631d6b
fix(nodetool): increase graceful stop timeout, handle and report `{badrpc, timeout}` error
2023-09-12 19:55:16 +03:00
223d47a6ac
Merge branch 'master' into sync-m-r52-20230911
2023-09-11 16:04:28 -03:00
887a74a6cb
fix: telemetry report error on windows
2023-09-11 16:48:30 +08:00
abda3b130a
chore: delete releaed change logs
2023-09-08 16:39:17 +02:00
e089fda260
Merge pull request #11568 from thalesmg/republish-props-m-20230905
...
feat(republish): allow templating mqtt properties
2023-09-07 16:43:00 -03:00
78c5a779d7
feat(republish): allow templating mqtt properties
...
Fixes https://emqx.atlassian.net/browse/EMQX-10912
2023-09-06 09:54:02 -03:00
e794143ae1
Merge remote-tracking branch 'origin/release-52' into 0906-sync-release-52-to-master
2023-09-06 09:08:22 +02:00
d887ba5e8d
docs: add change log entry for jq upgrade
2023-09-05 13:36:26 +02:00
01a128878f
chore(mria): Bump mria to 0.6.1
2023-09-05 11:08:32 +02:00
52546ac50f
Merge pull request #11522 from kjellwinblad/kjell/fix/EMQX-10778
...
fix: bad error message when rule engine schema name is too long
2023-09-04 11:05:55 +02:00
240afecd69
Merge pull request #11487 from savonarola/0821-optimize-bcrypt
...
feat: reduce bcrypt rounds to a usable value
2023-09-04 10:12:40 +03:00
90156befb5
feat: improve bcrypt usability
...
* limit salt rounds to usable values
* update bcrypt library to enable concurrent bcrypt hash calculation
2023-09-01 17:36:11 +03:00
4dfbc859f9
fix(plugins): update plugin order on whole cluster
...
Fixes https://emqx.atlassian.net/browse/EMQX-10879
2023-08-30 16:39:52 -03:00
1cab687153
Merge pull request #11540 from thalesmg/fix-cert-path-utf8-r52-20230829
...
fix(bridge): validate bridge name before attempting to convert certificates
2023-08-30 09:45:55 -03:00
8b3a9072f9
Merge pull request #11532 from lafirest/fix/frame_parse
...
fix(frame): improve some error reasons when parsing invalid packet
2023-08-30 19:10:45 +08:00
804443ba40
chore: fix typos
2023-08-30 11:22:09 +08:00
0f297ffef4
fix(bridge): validate bridge name before attempting to convert certificates
...
Fixes https://emqx.atlassian.net/browse/EMQX-10865
2023-08-29 16:32:01 -03:00
6722722522
fix(frame): improve some error reasons when parsing invalid packet
2023-08-29 10:53:20 +08:00
2967b709ae
chore: add changelog for PR(11531)
2023-08-29 08:20:48 +08:00
cc3ba18734
fix: increment dropped message counter when bridge is unhealthy
...
Fixes https://emqx.atlassian.net/browse/EMQX-10767
2023-08-28 19:47:11 -03:00
0072749143
fix(emqx_trace): don't download empty trace log file
...
Closes: EMQX-10274
2023-08-28 19:25:55 +03:00
fe37842b11
chore: update 11523 changelog
2023-08-28 11:27:32 +08:00
00b2712f29
docs: changelog entry for improved too long schema name fix
2023-08-25 11:09:44 +02:00
fc1738188e
fix: packets_connack_sent is not incremented if the ack_flag field in the CONNACK packet is non-zero
2023-08-25 15:18:34 +08:00
aad9b1c27d
Merge pull request #11493 from kjellwinblad/kjell/fix/11488
...
fix: HTTP API /api/v5/publish schema
2023-08-24 17:46:29 +02:00
2322b27542
Merge pull request #11497 from zhongwencool/prometheus-metrics
...
Prometheus metrics
2023-08-24 12:06:32 +08:00
8d2be27ade
chore: add changlog for 11466
2023-08-24 06:46:50 +08:00
bac0f7107c
chore: bump OTP to 25.3.2-2 and EMQX builder to 5.1-4
2023-08-23 19:35:36 +03:00
d287b736ec
chore: add changelog for 11497
2023-08-23 17:02:30 +08:00
ae10415fc3
feat: disabled the Erlang VM Prometheus exporter by default to improve performance and security
2023-08-23 09:03:22 +08:00
19acd82436
docs: fix change log entry according to @thalesmg's suggestion
...
Co-authored-by: Thales Macedo Garitezi <thalesmg@gmail.com>
2023-08-22 16:41:11 +02:00
88f7c2b4d8
docs: changelog entry for HTTP publish bad request schema
2023-08-22 15:48:27 +02:00
e20b804e6b
chore: update changes && test cases
2023-08-22 17:41:08 +08:00
4e4c93a758
Merge pull request #11469 from paulozulato/feat-redis-auth-username
...
Add support for AUTH with username on Redis
2023-08-21 16:44:21 -03:00
2c458b62f5
feat(redis): add support for `username` on AUTH command
...
Fixes https://emqx.atlassian.net/browse/EMQX-9911
2023-08-18 14:50:06 -03:00
66dec69d09
fix(rule_engine): capture function_clause errors
...
Fixes https://emqx.atlassian.net/browse/EMQX-10798
2023-08-18 13:51:19 -03:00
75ed6aa8e7
Merge pull request #11396 from keynslug/ft/EMQX-10712/ruleeng-topic-index-vol-2
...
perf(ruleeng): employ `emqx_topic_index` to speed up topic matching
2023-08-17 20:43:09 +04:00
5e448f5a02
Merge pull request #11446 from lafirest/refactor/calendar
...
refactor(calendar): refactor datetime-related code and remove redundant
2023-08-17 07:40:44 +08:00
e6f0dead9e
Merge pull request #11445 from zhongwencool/remove-os-mon-from-windows
...
fix: remove os_mon application in Windows release
2023-08-16 23:30:24 +08:00
e406cd7868
Merge pull request #11456 from zhongwencool/allow-empty-cacertfile-pem
...
fix: allow empty cacertfile pem
2023-08-16 21:10:52 +08:00
82f27eaf78
Merge pull request #11429 from thalesmg/mongodb-legacy-opt-20230810
...
feat(mongodb): add configurable option to override legacy protocol usage
2023-08-16 09:54:53 -03:00
b817e03c08
fix: start os_mon application temporary
2023-08-16 20:49:27 +08:00
960944f90c
chore: add 11456 changelog
2023-08-16 20:19:55 +08:00
e2681f46f6
chore: add changelog for 11454
2023-08-16 15:45:36 +08:00
0965387e46
chore: update changes
2023-08-16 11:13:16 +08:00
d93e1bbf08
feat(mongodb): add configurable option to override legacy protocol usage
...
Fixes https://emqx.atlassian.net/browse/EMQX-10750
Fixes https://github.com/emqx/emqx/discussions/11428
See https://github.com/emqx/mongodb-erlang/pull/39
2023-08-14 13:19:50 -03:00
1bda8020f5
Merge pull request #11436 from lafirest/feat/banned_clear
...
feat(banned): add a new API used to clear all banned data
2023-08-14 20:48:43 +08:00
d302aaae4c
chore: add changelog entry
2023-08-14 15:36:58 +04:00
e10f9e5e9b
feat: change mqtt.max_packet_size type from string to bytesize
2023-08-14 10:10:46 +08:00
749c2d075f
chore: update changes && bump app version
2023-08-11 17:57:27 +08:00
81d200023d
chore: update changes
2023-08-11 17:37:45 +08:00
6ead09b28d
chore: merge 'upstream/master'
2023-08-10 12:56:00 +02:00
d1dc37af4c
Merge pull request #11279 from zhongwencool/trace-log
...
fix: don't be kill when send large payload when log is debug
2023-08-10 11:58:31 +08:00
b2394cf92d
Merge pull request #11399 from lafirest/fix/ph_utf8
...
fix(placeholder): porting fix to support utf8 key in placeholder
2023-08-10 09:41:39 +08:00
5a4dd3a5e5
fix: truncate large payload
2023-08-10 09:35:12 +08:00
cce0d144f9
Merge branch 'master' into release-v515-patch1-20230809
2023-08-09 13:08:43 -03:00
bef8eddad3
Merge pull request #11405 from lafirest/fix/kal_kialo
...
fix(calendar): make date parse error reason more sense
2023-08-09 14:42:08 +08:00
3e9155fdb1
chore: bump emqx_utils version && changes
2023-08-09 10:54:56 +08:00
fdfdb105f0
docs: Generate changelog for v5.1.5
2023-08-08 10:33:34 -03:00
65a6e36df1
chore: update changes
2023-08-08 14:33:49 +08:00
aea51b4328
docs: add changelog entry for #10697
2023-08-07 17:36:56 +02:00
665695a977
Merge pull request #11388 from SergeTupchiy/EMQX-10703-fix-replicant-crash-when-core-terminates-abnormally
...
fix: increase emqx_router_sup restart intensity
2023-08-06 14:40:32 +08:00
2044326734
Merge pull request #11390 from SergeTupchiy/EMQX-10661-improve-perf-high-latency-cluster-network
...
EMQX-10661 improve performance on high latency cluster network
2023-08-04 16:41:08 +03:00
f276ea9e91
fix: increase emqx_router_sup restart intensity
...
The goal is to tolerate occasional crashes that can happen under relatively normal conditions
and don't seem critical to shutdown the whole app (emqx).
For example, mria write/delete call delegated from a replicant to a core node may fail,
if the core node is being stopped / restarted / not ready.
Fixes: EMQX-10703, #11310
2023-08-04 10:49:59 +03:00
466fe7e009
perf: add broker_pool_size, generic_pool_size and channel_cleanup_batch_size config options
...
Tuning these options can improve performance if cluster interconnect network latency is high.
Fixes: EMQX-10661
2023-08-03 19:44:00 +03:00
1dd402ec69
chore: add changelog entry
2023-08-03 19:58:49 +04:00
7687770821
fix(tls): remove `cacerts` config for now
...
Fixes https://github.com/emqx/emqx/issues/11370
Related: https://github.com/emqx/emqx/pull/11371
2023-07-31 10:44:05 -03:00
2ee1aa6d60
Merge pull request #11347 from thalesmg/fix-ocsp-path-encoding-20230725
...
fix(ocsp): URL encode request path
2023-07-28 09:01:39 -03:00
cbfca8c043
chore: merge master into release-51
2023-07-27 15:19:57 +02:00
951a96457b
Revert "feat(index): add topic index facility "
2023-07-27 13:42:43 +08:00
4704268727
chore: update changes
2023-07-26 16:10:28 +08:00
d0deaca00d
fix(ocsp): URL encode request path
...
Fixes https://emqx.atlassian.net/browse/EMQX-10624
2023-07-25 17:39:38 -03:00
77184c00ff
chore(ekka): Bump version to 0.15.9
2023-07-25 19:29:18 +03:00
8ec14bb07e
fix(topic_rewrite): handle error when target contains wildcards
...
Fixes https://emqx.atlassian.net/browse/EMQX-10565
2023-07-25 09:43:14 -03:00
4e4b1ac115
refactor: module move to app emqx_rule_engine
...
- Rename to emqx_rule_index.erl
- Remove test funcs from src -> test dir
2023-07-24 09:33:28 +08:00
2531c3e7d1
Merge pull request #11306 from thalesmg/rule-actions-reply-dropped-r51-20230719
...
fix(rule_metrics): notify rule metrics of late replies and expired requests
2023-07-21 16:51:14 -03:00
485e495b98
chore(ekka): Bump version to 0.15.8 (mria 0.5.10)
2023-07-21 18:31:02 +02:00
243b8f5b67
chore: merge 'upstream/master' into v5.1.2
2023-07-21 13:25:46 +02:00
04bd7c7eed
Merge pull request #11322 from SergeTupchiy/EMQX-10590-data-import-fix-missing-config-rel51
...
EMQX-10590 data import fix missing config relealse 51
2023-07-21 12:36:21 +03:00
c73bbd1d8f
chore(changelog): Add changelog for 11309
2023-07-21 10:53:18 +02:00
b37920d2e5
feat: add `topic_metrics` and `slow_subs` configuration to data import/export
...
Fixes: EMQX-10590
2023-07-21 10:41:22 +03:00
8480a26b66
Merge pull request #11065 from SergeTupchiy/EMQX-9992-fix-async-cleanup-error-logs
...
fix: avoid logging unnecessary errors in async cleanup functions
2023-07-20 12:20:57 +03:00
eb41b77de4
fix(rule_metrics): notify rule metrics of late replies and expired requests
...
Fixes https://emqx.atlassian.net/browse/EMQX-10600
2023-07-19 11:39:28 -03:00
57e39f42c5
Merge pull request #11294 from ieQu1/mria-fixes
...
Mria fixes
2023-07-19 15:10:42 +02:00
b7f0f7b32d
chore: merge master into release-51
2023-07-19 09:28:05 +02:00
3a5112829c
fix(mgmt_cli): Don't print cluster status on the replicant
2023-07-18 21:45:00 +02:00
0aa5f28438
Merge pull request #11296 from SergeTupchiy/EMQX-10590-data-import-fix-missing-config
...
data import fix missing config
2023-07-18 22:41:12 +03:00
2954ff7300
feat: add `topic_metrics` and `slow_subs` configuration to data import/export
...
Fixes: EMQX-10590
2023-07-18 20:53:10 +03:00
73c4bcbc36
chore: add changelog
2023-07-18 17:12:20 +02:00
ca51732d8e
Merge pull request #11292 from emqx/update-rocksdb
2023-07-18 16:14:50 +02:00
a2cfb95780
chore: add changelog entry
2023-07-18 14:11:39 +02:00
4a889c0994
chore: bump ekka -> 0.15.6
...
https://github.com/emqx/erlang-rocksdb/releases/tag/1.8.0-emqx-1
2023-07-18 09:00:29 -03:00
1fdcfba629
fix(shared_sub): restore support for `$queue/` shared subscription
...
Partially addresses: https://emqx.atlassian.net/browse/EMQX-4589
There's still a problem with the handling of shared groups that is
_not particular to the `$queue/` syntax_ and preexistent that the same
client cannot subscribe to _different groups_ that have the same
_topic filter_.
2023-07-17 16:41:24 -03:00
f853f3d3bd
Merge pull request #11271 from zhongwencool/fix-precent-check
...
fix: keep percentage type's range is 0%~100%
2023-07-14 22:07:41 +08:00
950d5edc41
fix: avoid logging unnecessary errors in async cleanup functions
...
Cleanup functions that access ETS tables may fail with `badarg` error during EMQX shutdown.
They are called asynchronously by `emqx_pool` workers and accessed ETS tables
may be already destroyed as their owners are shut down.
This fix catches ETS `badarg` errors before they can be caught and logged by `emqx_pool`.
Fixes: EMQX-9992
2023-07-14 14:22:43 +03:00
0be39bf546
chore: update changes
2023-07-14 17:29:38 +08:00
169a20a435
chore: add 11271 changelog
2023-07-14 17:00:40 +08:00
06010f7ca9
Merge remote-tracking branch 'origin/release-51' into sync-r51-20230712
2023-07-12 16:47:45 -03:00
8ebe099653
Merge pull request #11253 from id/kjell/refactor/http_bridge/EMQX-9568
...
refactor: HTTP bridge into the emqx_bridge_http application
2023-07-12 15:58:02 +02:00
ab81d844b3
docs: update PR reference in change log
2023-07-12 14:47:34 +02:00
41e9e55ecb
docs: add changelog entry for HTTP bridge refactoring
2023-07-12 14:47:09 +02:00
5b0695ca19
Merge pull request #11249 from zhongwencool/license-setting-api
...
feat: add license setting get/put api
2023-07-12 18:34:23 +08:00
43866b8e55
test(license): test setting HTTP API
2023-07-12 14:21:51 +08:00
fce3060634
Merge pull request #11251 from SergeTupchiy/EMQX-10392-cluster-topology-api
...
Add cluster topology HTTP API endpoint
2023-07-11 17:45:00 +03:00
19de10be7c
feat(emqx_management): add /cluster/topology HTTP API endpoint
...
The endpoint shows Mria RLOG cluster topology info:
connections between core and replicant nodes.
Closes: EMQX-10392
2023-07-11 16:25:36 +03:00
903d81b532
Merge pull request #11250 from lafirest/fix/ws_order
...
fix(ws): fix MQTT packets may be reversed in the WS
2023-07-11 20:09:55 +08:00
74f2b3e137
chore: update changes
2023-07-11 18:50:12 +08:00
964e3cc7e4
chore: update changes
2023-07-11 10:41:10 +08:00
90455c2548
Merge pull request #11124 from id/0622-amazonlinux-2023-packages
...
ci: release Amazon Linux 2023 packages
2023-07-10 20:42:22 +02:00
93a9772743
Merge pull request #11211 from sstrigler/EMQX-9963-refactor-all-http-ap-is-to-respond-404-on-the-deletion-of-the-resource-is-non-exist
...
consistently return 404 if resource not found
2023-07-10 16:25:31 +02:00
4e9c39aed2
chore: add changelog
2023-07-10 16:21:57 +02:00
f9e54ed8b1
Merge pull request #11237 from zhongwencool/prometheus-api-schema
...
fix: bad prometheus schema for headers
2023-07-10 18:13:42 +08:00
dc32822f6f
chore: add changelog for 11237
2023-07-10 16:51:31 +08:00
c0ee47dc08
chore: add changelog for 11226 pr
2023-07-10 10:34:36 +08:00
da052e0a5e
chore: add changelog
2023-07-08 14:43:43 +02:00
6337f52cf9
fix(plugins): start/stop plugins when loading config from CLI
...
Fixes https://emqx.atlassian.net/browse/EMQX-10288
2023-07-07 13:37:51 -03:00
7039dca51c
chore: add 11192 changelog
2023-07-07 16:39:26 +08:00
352d818e3b
chore: update hocon to 0.39.13
2023-07-07 16:39:26 +08:00
2f33fd9bac
Merge pull request #11208 from HJianBo/update-lwm2m-stats
...
fix(lwm2m): update the stats correctly and timely
2023-07-07 15:32:50 +08:00
daa6cf14fe
Merge pull request #11206 from HJianBo/coap-bugs
...
Fix(coap): Make the username and password params to optional
2023-07-07 15:32:00 +08:00
9f57ba510e
chore: add 11214 changelog
2023-07-07 12:25:34 +08:00
b28909deb6
chore: update changes
2023-07-07 12:24:31 +08:00
bc1efdc4a7
chore: update changes
2023-07-07 12:23:57 +08:00
b11fa5f3bf
Merge pull request #11195 from HJianBo/stomp-topic-id-unique
...
Fix(stomp): avoid to create duplicated subscription by HTTP or Client
2023-07-07 11:18:30 +08:00
9bcabe0a9e
Merge pull request #11184 from sstrigler/EMQX-10270-e-5-1-0-missing-value-range-validation-for-the-max-packet-size-of-mqtt-settings
...
fix: limit mqtt max_packet_size to 256MB
2023-07-06 10:20:24 +02:00
9fed5233bd
chore: update changes
2023-07-05 15:26:25 +08:00
bf5167a8bf
Merge pull request #11172 from lafirest/fix/dup_payload
...
fix(ruleengine): fix duplicate `payload` problems
2023-07-05 14:20:26 +08:00
263890be47
fix: limit mqtt max_packet_size to 256MB
2023-07-04 16:03:11 +02:00
0bd0a16693
Merge pull request #11039 from savonarola/0613-fix-redis-db-schema
...
fix(redis): validate database number
2023-07-04 15:32:02 +03:00
f2c5f4932c
Merge pull request #11148 from lafirest/fix/mcall_error_report
...
fix(emqx_conf): don't sync the MFA to a leaved node
2023-07-04 19:56:52 +08:00
d509c47344
feat: add conf load api
2023-07-04 14:17:11 +08:00
9701c3f7a1
fix(redis): validate database number
2023-07-03 22:44:54 +03:00
2cc0ba1217
Merge pull request #11174 from thalesmg/make-rule-server-a-binary
...
fix(mqtt_bridge): ensure `server` key is a binary
2023-07-03 10:38:39 -03:00
094b8e43b7
chore: update changes
2023-07-03 18:22:57 +08:00
07cf250093
Merge pull request #11126 from sstrigler/EMQX-8842-fix-rule-metrics
...
fix(emqx_rule_engine): set inc_action_metrics as async_reply_fun
2023-06-30 20:07:23 +02:00
425eba8b13
fix(mqtt_bridge): ensure `server` key is a binary
...
Fixes https://emqx.atlassian.net/browse/EMQX-10461
So that it can be JSON encoded correctly.
```
2023-06-30T02:00:41.160110+00:00 [debug] msg: publish_to, mfa: emqx_trace:publish/1, line: 73, topic: b/$, payload: {"topic":"t/1","server":[49,48,46,52,50,46,51,46,49,56,48,58,49,56,56,51],"retain":false,"qos":1,"pub_props":{},"payload":"{\"msg\": \"hello\"}","message_received_at":1688090441159,"id":"0005FF4F2F181488103417000C2E0000","dup":false}, tag: PUBLISH
```
2023-06-30 13:46:24 -03:00
6fe6aa7997
Merge pull request #11162 from thalesmg/treat-404-as-failure-master
...
fix(webhook): treat 404 and other error replies as errors in async requests
2023-06-30 13:13:18 -03:00
0201481c70
Merge pull request #11164 from thalesmg/fix-placeholder-sql-nested
...
fix(placeholder): add back support for nested keys inside binary encoded json
2023-06-30 13:12:51 -03:00
631f4ceac9
fix(placeholder): add back support for nested keys inside binary encoded json
...
Fixes https://emqx.atlassian.net/browse/EMQX-10459
2023-06-30 10:05:49 -03:00
1ea92d4009
Merge pull request #11166 from lafirest/feat/porti_uuid_el_v4
...
feat(ruleengine): port random && uuid_v4 functions from v4
2023-06-30 18:36:45 +08:00
c8d1bd3bd5
Merge pull request #11138 from zhongwencool/cluster-conf-k8s-default
...
fix: update cluster.conf's k8s default api_server value
2023-06-30 17:01:52 +08:00
ae3ebfead7
chore: update changes
2023-06-30 14:38:36 +08:00
bb1ae808b4
Merge pull request #11165 from zhongwencool/hide-global-limiter-from-swagger-api
...
chore: hide /configs/limiter from swagger api doc
2023-06-30 11:54:01 +08:00
546b082acd
chore: update 11165 changelog
2023-06-30 11:03:29 +08:00
8b679cf358
Merge pull request #11137 from zhongwencool/dashboard-https-ssl-options
...
feat: refactor dashboard https ssl_options
2023-06-30 09:57:07 +08:00
9719735c9c
chore: udpate 11138 changelog
2023-06-30 09:55:36 +08:00
59b109eb5c
fix(webhook): treat 404 and other error replies as errors in async requests
...
Fixes https://emqx.atlassian.net/browse/EMQX-10405
The problem here was that, for async requests, ehttpc responses of the form `{ok, 4__, _,
_}` and similar were being treated as successes.
2023-06-29 15:45:23 -03:00
3d91098e9b
chore: add changelog
2023-06-29 16:09:45 +02:00
9708a02680
Merge pull request #11134 from lafirest/fix/auth_header_sensitive
...
fix: mask the value of the authorization header whatever its case
2023-06-29 21:43:16 +08:00
85a870a498
chore: update changes
2023-06-29 03:33:35 +00:00
82ea9e5a04
test: dashbaord api ct failed
2023-06-29 10:49:39 +08:00
77bcb73919
chore: update changes
2023-06-29 01:45:47 +00:00
f9ea924cd0
Merge pull request #11151 from kjellwinblad/kjell/refactor/mysql_bridge/EMQX-9533
...
refactor: MySQL bridge and connector to separate applications
2023-06-28 15:15:55 +02:00
8e877caf47
fix(emqx_psk): wait for Mria table on app start
...
This ensures emqx_psk table is synced to a replicant even if it doesn't have init psk file.
2023-06-27 20:22:40 +03:00
515a7d0c80
docs: add changelog entries for MySQL refactoring
2023-06-27 17:23:04 +02:00
d3a0b3e183
Merge pull request #11139 from kjellwinblad/kjell/refactor/redis/EMQX-9534
...
refactor: redis bridge to its own application
2023-06-27 14:55:55 +02:00
116675e86f
chore: bump ekka to 0.15.4
2023-06-27 13:24:49 +03:00
0a95749f86
docs: add changelog entries for Redis refactoring
2023-06-27 10:24:44 +02:00
f9107e9dc9
docs: add changelog
2023-06-26 14:32:59 +02:00
f2e3446e29
Merge pull request #11135 from lafirest/pref/calendar_timeoffset
...
perf(rule_engine): improve the time offset parser
2023-06-26 18:54:00 +08:00
c5c9131e12
chore: update changes
2023-06-24 13:12:07 +00:00
1e140f77a7
chore: update changes
2023-06-24 09:30:39 +00:00
60a1f5a38d
chore: update app version && changes
2023-06-23 17:01:22 +00:00
c58a98954b
Merge remote-tracking branch 'origin/master' into 0621-merge-release-51-to-master
2023-06-22 11:05:51 +02:00
62b832be45
Merge pull request #11118 from fix/EMQX-9964/bump-hocon
...
chore: bump hocon to 0.39.10
2023-06-21 23:13:35 +02:00
01db56c761
chore: add changelog
2023-06-21 21:37:07 +02:00
decfd6df2b
feat(buffer_worker): log expired message count
...
Fixes https://emqx.atlassian.net/browse/EMQX-10165
```
iex(emqx@127.0.0.1)38> 2023-06-21T11:09:35.569404-03:00 [info] msg: buffer_worker_dropped_expired_messages, mfa: emqx_resource_buffer_worker:log_expired_messge_count/1, line: 982, expired_count: 900, resource_id: <<"bridge:webhook:webhook">>, worker_index: 3
```
2023-06-21 14:38:51 -03:00
5fa87091c4
Merge remote-tracking branch 'origin/master' into 0621-merge-release-51-to-master
2023-06-21 16:08:41 +02:00
7382c6e6e1
Merge pull request #11103 from savonarola/0620-update-erlcloud
...
chore(deps): update erlcloud and remove unnecessary overrides
2023-06-21 15:07:45 +03:00
1d791d7a8c
fix(resource): validate maximum worker pool size
...
Fixes https://emqx.atlassian.net/browse/EMQX-10297
2023-06-20 14:26:42 -03:00
54d96488a0
chore(deps): update erlcloud and remove unnecessary overrides
2023-06-20 16:46:23 +03:00
fe77a04581
chore: Add changelog
2023-06-20 10:30:43 +02:00
13746c2cdf
fix(resource): check status when (re)starting a resource
...
Fixes https://emqx.atlassian.net/browse/EMQX-10290
2023-06-19 18:01:02 -03:00
803cd6c812
Merge pull request #11082 from emqx/release-51
...
sync release-51 to master
2023-06-19 15:12:37 +08:00
30ac6c4e48
Merge pull request #11074 from JimMoen/fix-share-sub-nl-protocol-error
...
fix: shared-sub with nl sub-option should cause protocol error
2023-06-19 10:39:08 +08:00
59ed8798c3
Merge pull request #11026 from kjellwinblad/kjell/fix/rule_engine/div_mod_strange/EMQX-10216
...
fix: rule engine different behavior for div and mod
2023-06-17 07:20:37 +02:00
4d24fd13a6
chore: update changes/ce/fix-11074.en.md
...
Co-authored-by: Thales Macedo Garitezi <thalesmg@gmail.com>
2023-06-17 07:06:42 +08:00
8801ae9e5a
Merge pull request #11004 from paulozulato/fix-rewrite-wildcard
...
fix(rewrite): avoid wildcards on destination topic on publish
2023-06-16 09:57:46 -03:00
178711f742
fix: shared-sub with nl sub-option should cause protocol error
2023-06-16 18:19:23 +08:00
5f7e938b20
Merge pull request #11070 from JimMoen/use-mria-autoclean
...
fix: use mria.cluster_autoclean
2023-06-16 14:56:52 +08:00
c4e7129cb6
fix: use mria.cluster_autoclean and mria.cluster_autoheal
2023-06-16 14:04:24 +08:00
b49b80d36c
fix(emqx_schema): use non negative integer type for 'depth' SSL option
...
Closes: EMQX-10276
2023-06-16 10:59:39 +08:00
9b56f116f4
Merge pull request #11062 from zhongwencool/log-file-rename
2023-06-15 20:51:52 +08:00
e6c2da8d19
feat: rename log.file.to to log.file.path
2023-06-15 18:24:21 +08:00
9d9f0db516
chore: update 11056 changelog
2023-06-15 17:19:11 +08:00
64bbe21209
fix(emqx_schema): use non negative integer type for 'depth' SSL option
...
Closes: EMQX-10276
2023-06-15 11:22:58 +03:00
e42cc58694
Merge pull request #11050 from emqx/release-51
...
chore: sync release-51 back to master
2023-06-15 09:45:31 +08:00
8c7c0877fd
fix(rewrite): avoid wildcards on destination topic on publish
...
Fixes https://emqx.atlassian.net/browse/EMQX-9247
2023-06-14 20:02:03 -03:00
4425942030
fix(emqx_schema): move tls version gap validation to emqx_schema
2023-06-14 17:29:56 +03:00
267053cc35
Merge pull request #11045 from zhongwencool/hide-zones-authn-in-listeners
...
feat: hide zone/authn in listeners and remove listeners's authn api
2023-06-14 20:32:27 +08:00
748e54d507
chore: add changelog
2023-06-14 10:13:29 +02:00
fa1519ad11
chore: update 11045's changelog
2023-06-14 15:24:18 +08:00
86d3b702d7
Merge pull request #11042 from zhongwencool/max-connections-string
...
fix: api_listener crash when setting max_connnections as string
2023-06-14 12:46:40 +08:00
feb08b1181
chore: update 11042 changelog
2023-06-14 11:40:20 +08:00
26ad06b9ca
chore: update changes
2023-06-14 10:49:17 +08:00
50041fdddf
feat: hide broker rootkey and move broker.shared_subscription_strategy to mqtt.shared_subscription_strategy
2023-06-13 19:35:52 +08:00
7afd9d2b06
chore: update changes
2023-06-13 16:38:23 +08:00
5ef7102cba
fix(listener_mgmt_api): use union member selector fn for better error messages (r5.1)
...
Fixes https://emqx.atlassian.net/browse/EMQX-10247
2023-06-12 16:48:13 -03:00
256adeb580
docs: add changelog entry
2023-06-12 17:33:54 +02:00
661893cae5
chore: update changes
2023-06-12 18:01:08 +08:00
eff98ceed8
chore: update changes
2023-06-12 16:42:46 +08:00
70ea1a6ae7
chore: update changes
2023-06-11 18:12:34 +08:00
61bbe19eba
Merge pull request #10961 from HJianBo/support-infinity-max-conns-in-gateway
...
Adds support for unlimited max connections for gateway listeners
2023-06-11 09:09:34 +08:00
97850de524
Merge remote-tracking branch 'origin/release-51' into 0610-merge-release-51-to-master
2023-06-10 12:23:55 +02:00
aea3ae4024
Merge pull request #11005 from HJianBo/fix-tracing-logs-typos
...
fix(authn): fix the hardcode method in trace logs
2023-06-10 18:08:28 +08:00
3901ed3255
Merge pull request #10996 from sstrigler/EMQX-9435-request-the-non-existent-api-v-4-nodes-endpoint-in-emqx-e-5-0-1-returns-http-code-200
...
Return 404 for everything we don't know
2023-06-10 11:20:25 +02:00
56cd97e48b
chore: update changes
2023-06-10 13:12:32 +08:00
57d72ed23e
fix(emqx_utils): redact proxy-authorization headers
2023-06-09 17:13:53 +02:00
8c1334c421
fix(emqx_dashboard): return 404 for everything we don't know
2023-06-09 17:13:18 +02:00
e61b2100a3
Merge pull request #10676 from SergeTupchiy/EMQX-9203-config-backup
...
feat: implement configuration and user data export/import
2023-06-09 14:18:39 +03:00
e4d09d4ad4
feat: implement configuration and user data export/import CLI
...
Closes: EMQX-9203
2023-06-09 14:11:47 +03:00
dbb8742e0e
test: cover max_connection in infinity value
2023-06-09 15:48:23 +08:00
c450a1784a
Merge pull request #10950 from HJianBo/mqttsn-qos3
...
fix(mqttsn): checking enable_qos3 option
2023-06-09 15:46:55 +08:00
ee697831f6
Merge pull request #10926 from zmstone/0602-add-enable-as-an-alias-for-enabled
...
0602 add enable as an alias for enabled
2023-06-09 08:44:20 +02:00
af5c6720de
Merge remote-tracking branch 'origin/master' into release-51
2023-06-09 08:37:29 +02:00
601db2b1d3
Merge pull request #10988 from lafirest/fix/konservi_sentema
...
fix(resource): improve log security when resource creation fails
2023-06-09 13:46:12 +08:00
7e3c0c0168
chore: update changes
2023-06-09 12:05:24 +08:00
daa5450218
Merge pull request #10985 from zmstone/0608-rename-cluster-call-cmd
...
0608 rename cluster call cmd
2023-06-09 10:56:18 +08:00
c733ddb166
Merge pull request #10977 from HJianBo/fix-stomp-bugs
...
Fix stomp gateway subscription_cnt is not updated timely and max_headers option is not working
2023-06-09 09:47:26 +08:00
83c36a3c9f
refactor(emqx_conf_cli): do not print hidden roots in 'conf show' cmd
2023-06-09 09:31:32 +08:00
273dedf7a6
Merge pull request #10911 from kjellwinblad/kjell/bridge/atom_length_too_long/EMQX-9609
...
fix: friendly error message when creating bridges with too long names
2023-06-08 15:46:42 +02:00
0e0d7c10a5
chore: add changelog
2023-06-08 15:17:02 +02:00
c48b128de7
chore: update changes
2023-06-08 17:08:56 +08:00
88aab507ff
chore: update changes/ce/perf-10941.en.md
...
Co-authored-by: Zaiming (Stone) Shi <zmstone@gmail.com>
2023-06-08 14:29:54 +08:00
cdd8645215
chore: update changes
2023-06-08 14:29:54 +08:00
4483a6857e
chore: update changes
2023-06-08 11:24:07 +08:00
0b95bc1c1b
Merge pull request #10907 from HJianBo/refactor-on-stop-simple
...
feat: refactored some bridges to avoid leaking resources part.2
2023-06-08 09:37:31 +08:00
aecea50564
Merge pull request #10902 from zmstone/0529-donot-copy-cluster-conf-from-newer-version
...
0529 donot copy cluster conf from newer version
2023-06-07 20:32:11 +02:00
abdbf3409d
feat: add changelog for #10926
2023-06-07 20:29:22 +02:00
a4407764f3
feat(connection): configurable TCP keepalive
...
Fixes https://emqx.atlassian.net/browse/EMQX-9852
2023-06-07 10:23:38 -03:00
cb3e787cb1
Merge remote-tracking branch 'origin/master' into 0529-donot-copy-cluster-conf-from-newer-version
2023-06-07 09:14:04 +02:00
ce4e49cd9e
Merge pull request #10943 from zmstone/0605-hide-mcast-cluster-discovery
...
chore: start deprecating mcast cluster discovery
2023-06-07 08:32:33 +02:00
81387800b5
Merge branch 'master' into mqttsn-qos3
2023-06-07 09:49:29 +08:00
21b451a4c2
Merge pull request #10951 from HJianBo/mqttsn-mountpoint-pub
...
fix(mqttsn): make mountpoint works for publish
2023-06-07 09:39:46 +08:00
1968589f81
fix(emqx_schema): don't allow enabling `fail_if_no_peer_cert` if `verify_none` is set
...
Setting `fail_if_no_peer_cert = true` and `verify = verify_none` causes connection errors.
Closes: EMQX-9586
2023-06-06 17:20:22 +03:00
f26b372e51
chore: update changes
2023-06-06 18:47:41 +08:00
32125bed6d
chore: update changes
2023-06-06 18:26:28 +08:00
bb1cf9beaa
Merge remote-tracking branch 'origin/master' into 0529-donot-copy-cluster-conf-from-newer-version
2023-06-05 22:56:58 +02:00
75df622426
Merge pull request #10930 from thalesmg/max-int-timeout-v50
...
check maximum timeout values in schema (5.1)
2023-06-05 12:51:36 -03:00
46393343e2
chore: use `timeout_duration` types for timer fields
...
Fixes https://emqx.atlassian.net/browse/EMQX-10020
2023-06-05 11:46:38 -03:00
1dd2109b1f
docs: add changelog for 10943
2023-06-05 15:03:21 +02:00
dbc0cdce67
chore: dont allocate resource for simple connectiors
2023-06-05 10:59:00 +08:00
e717ddafd7
chore: update changes
2023-06-05 10:19:46 +08:00
e07c86b6a8
Merge pull request #10909 from HJianBo/remove-deprecated-gateways
...
feat: remove the deprecated '/gateway/*' HTTP APIs
2023-06-05 09:59:50 +08:00
f469b31fee
Merge remote-tracking branch 'origin/master' into 0529-donot-copy-cluster-conf-from-newer-version
2023-06-03 11:21:22 +02:00
0b87ea4cdc
Merge pull request #10929 from zmstone/0602-ci-pin-otp-25.3.2-1-elixir-1.14.5
...
ci: upgrade to otp 25.3.2-1 and elixir 1.14.5
2023-06-02 21:46:08 +02:00
aa46c0a484
Merge pull request #10928 from zmstone/0602-sync-release-51-to-master
...
0602 sync release 51 to master
2023-06-02 21:45:21 +02:00
33aa879ad4
Merge pull request #10910 from thalesmg/unify-restart-interval-v50
...
feat(resource): deprecate `auto_restart_interval` in favor of `health_check_interval`
2023-06-02 16:20:36 -03:00
3cfa13b343
docs: add changelog for #10929
2023-06-02 18:01:09 +02:00
1ba07e1040
Merge remote-tracking branch 'origin/release-51' into 0529-donot-copy-cluster-conf-from-newer-version
2023-06-02 16:30:58 +02:00
28c564d15b
Merge remote-tracking branch 'origin/master' into release-51
2023-06-02 16:25:48 +02:00
940353cc52
docs: add changelog
2023-06-02 09:13:47 -03:00
c75e9bbe0d
fix(emqx_cm): fix channel data registration race-condition
...
when clustered, there are chances the a mqtt client process
get killed (e.g. holding the channel registeration lock for too long),
if the channel data inserts happen before casting out the message
for channel process monitoring, there is a chance for the
stale message left in the ets tables indefinitely.
this commit changes the order of the non-atomic operations:
it casts out the monitor request message before inserting
channel data.
2023-06-02 11:43:35 +02:00
17f8868495
chore: update changes
2023-06-02 13:30:03 +08:00
c2c87d276f
docs: add changelog entry for too long bridge name improvement
2023-06-01 15:38:54 +02:00
eea0336045
docs: add changelog
2023-06-01 14:54:44 +02:00
bcc5e30f22
Merge pull request #10895 from lafirest/fix/refactor_on_stop
...
feat: refactored some bridges to avoid leaking resources during crashes at creation
2023-06-01 15:17:37 +08:00
be2d25515a
docs: add changelog for #10902
2023-05-31 20:44:00 +02:00
a3a6480f00
Merge pull request #10880 from HJianBo/batch-kickout-clients
...
feat: support kickout clients in batch
2023-05-31 22:36:35 +08:00
8ce0132569
Merge pull request #10871 from HJianBo/fix-coap-bugs
...
fix(coap): to better handle coap requests in connection mode
2023-05-31 22:36:15 +08:00
c67135dd4b
Merge pull request #10598 from HJianBo/refactor_exproto_stream
...
refactor(exproto): support unary handler
2023-05-31 22:36:01 +08:00
ce32526c96
chore: bump version && update changes
2023-05-31 17:31:56 +08:00
d0a9dca10b
chore: update changes
2023-05-31 13:44:51 +08:00
a258ef32e5
chore: update retainer app version && changes
2023-05-31 09:44:25 +08:00
a7f4f81c38
Merge pull request #10887 from thalesmg/fix-async-worker-down-buffer-worker-20230530-v50
...
fix: block buffer workers so they may retry requests
2023-05-30 17:39:18 -03:00
a2688325e5
Merge pull request #10754 from fix/EMQX-10056/mqtt
...
feat(mqttconn): employ ecpool instead of single worker
2023-05-30 23:28:10 +03:00
42a4c0200d
chore: add changelog entry
2023-05-30 22:21:52 +03:00
6be8ff378e
fix(buffer_worker): make buffer worker enter `blocked` state when async worker dies
...
Fixes https://emqx.atlassian.net/browse/EMQX-10074
Otherwise, requests from those async workers, now retriable, might not
be retried until the buffer worker blocks for other reasons, which
might take a long time.
2023-05-30 15:34:22 -03:00
57aacb471c
fix(rule_engine_api): don't crash when formatting empty metrics
...
Fixes https://emqx.atlassian.net/browse/EMQX-10073
Fixes https://github.com/emqx/emqx/issues/10714#issuecomment-1567987664
Similar issue to https://github.com/emqx/emqx/pull/10743 , but on the
rule engine API.
2023-05-30 11:54:27 -03:00
9fc5af9253
chore: update changes
2023-05-30 21:48:58 +08:00
e5534610e0
chore: update changes
2023-05-30 20:03:45 +08:00
5cfe04956d
Merge pull request #10858 from kjellwinblad/kjell/rule_engine_funcs/add_timezone_to_second/EMQX-10058
...
feat: add timezone_to_second/1 function to rule engine
2023-05-30 12:29:40 +02:00
b87e0a2cdd
docs: add changelog entry
2023-05-29 14:45:37 +02:00
6551eb21f2
Merge pull request #10851 from JimMoen/fix-bad-api-logging
...
fix: redact api request to hide auth token
2023-05-29 17:40:44 +08:00
e287cf9a09
Merge pull request #10820 from JimMoen/fix-license-checker-update
...
fix: reboot `emqx_license` app for join cluster
2023-05-29 17:40:29 +08:00
2b6d3bb748
Merge pull request #10833 from zhongwencool/telemtry-report
...
fix: only report enable authn/authz in telemetry
2023-05-29 15:14:36 +08:00
25319c3151
Merge pull request #10839 from zmstone/0526-merge-release-50-to-master
...
0526 merge release 50 to master
2023-05-29 08:56:20 +02:00
8c814bc861
fix: only report enable authn/authz in telemetry
2023-05-29 14:17:46 +08:00
cb05406a00
fix: reboot `emqx_license` app for join cluster
2023-05-29 13:47:46 +08:00
dcfe985ee9
fix: redact api request to hide auth token
2023-05-29 11:02:02 +08:00
cc5b4d3748
Merge remote-tracking branch 'origin/release-50' into 0526-ci-delete-otp-24-from-standalone-app-test
2023-05-26 15:58:16 +02:00
72da3af08f
docs: add changelog
2023-05-26 15:17:42 +02:00
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
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
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
de7f1c8aec
test: add tests for auto_restart_interval
2023-05-25 17:15:19 +08:00
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
3d3dacfcf6
chore(ekka): Bump version to 0.15.2
2023-05-24 15:43:49 +02:00
28015597ee
Merge remote-tracking branch 'emqx/release-50' into merge-release-50
2023-05-24 19:34:12 +08:00
e38645aa28
fix: lookup topic without force percent decode
...
* the minirest handler would do it
2023-05-24 17:28:32 +08:00
5fe58c5051
docs: add changelog for 10785
2023-05-23 14:13:18 +02:00
732a7be187
Merge remote-tracking branch 'origin/release-50'
2023-05-22 17:46:54 +02:00
a35c510c03
Merge pull request #10769 from zhongwencool/fix-bad-changelog
...
chore: bad change log file
2023-05-22 22:16:39 +08:00
88e4078885
Merge pull request #10747 from lafirest/fix/rule_funs_time_offset
...
fix: port the `emqx_calendar` from v4.4
2023-05-22 20:52:21 +08:00
42f9c9aa9a
Merge pull request #10746 from lafirest/fix/events_api
...
fix: supports test the `$events/delivery_dropped` event by API
2023-05-22 20:50:03 +08:00
d7bd2227db
chore: bad change log file
2023-05-22 17:35:46 +08:00
e824e1db39
Merge pull request #10698 from qzhuyan/perf/william/force-atom-conf-path
...
perf(config): enforcing atom key path in hotcode path
2023-05-22 09:38:09 +02:00
da7d351cc6
chore: update changes
2023-05-22 15:25:29 +08:00
27fca0ef3c
fix: check authz's file rule before save to file
2023-05-22 14:22:20 +08:00
c65e3a46b1
Merge pull request #10742 from zhongwencool/fix-authz-file-rule-check
...
fix: check authz's file source rules in pre_config_update
2023-05-22 14:15:18 +08:00
d3e38bd7f9
chore: update changes
2023-05-22 10:06:29 +08:00
cd753622e3
chore: add change for fix bad default SSL certificate
2023-05-21 07:42:59 +08:00
cb76e5a241
docs: add changelog for 10755
2023-05-19 20:41:26 +02:00
264404e180
Merge pull request #10511 from lafirest/fix/resource_safe_log
...
fix(resource): make some logging of the resource manager more secure
2023-05-19 20:42:21 +08:00
8cfcc8fbaf
Merge pull request #10743 from thalesmg/fix-bridge-metric-aggregation-r50
...
fix(bridge_api): don't crash when formatting empty/unknown bridge metrics
2023-05-19 09:07:22 -03:00
28dda39e39
Merge pull request #10724 from kjellwinblad/kjell/docs/missing_http_api_endpoint_descriptions/EMQX-9767
...
docs: make sure there is a summary for all API endpoints
2023-05-19 12:05:41 +02:00
baeb96a6e4
chore: update changes
2023-05-19 15:36:18 +08:00
48ceb14755
Merge pull request #10737 from HJianBo/fix-mqtt-sn-bugs
...
Avoid urldecode clientid twice
2023-05-19 09:19:12 +08:00
09ea2e2224
fix(bridge_api): don't crash when formatting empty/unknown bridge metrics
...
Fixes https://emqx.atlassian.net/browse/EMQX-9872
2023-05-18 14:25:13 -03:00
52e2caa671
fix: check authz's file rule before save to file
2023-05-18 22:33:12 +08:00
5d289ade56
fix: validate range for some bridge options
...
Fixes https://emqx.atlassian.net/browse/EMQX-9864
Setting a very large interval can cause `erlang:start_timer` to crash.
Also, setting auto_restart_interval or health_check_interval to "0s"
causes the state machine to be in loop as time 0 is handled separately:
| state_timeout() = timeout() | integer()
| (...)
| If Time is relative and 0 no timer is actually started, instead the the
| time-out event is enqueued to ensure that it gets processed before any
| not yet received external event.
from "https://www.erlang.org/doc/man/gen_statem.html#type-state_timeout "
Therefore, both fields are now validated against the range [1ms, 1h],
which doesn't cause above issues.
2023-05-18 10:10:58 -03:00
f42cab9c56
chore: update changes
2023-05-18 16:24:37 +08:00
ba43a0e30f
Merge pull request #10734 from thalesmg/merge-r50-into-v50-a
...
merge `release-50` into `master`
2023-05-18 14:24:53 +08:00
bf5ee41009
Merge pull request #10702 from zhongwencool/keepalive-backoff-rename
...
feat: deprecated keepalive_backoff, introduce keepalive_multiplier
2023-05-18 10:00:17 +08:00
447b76464b
Merge branch 'release-50' into merge-r50-into-v50-a
2023-05-17 14:50:18 -03:00
10f6edd6ea
Merge pull request #10717 from thalesmg/fix-bw-flush-timer-full-infl-r50
...
fix(buffer_worker): avoid setting flush timer when inflight is full
2023-05-17 14:49:27 -03:00
b2afe4e90c
Merge pull request #10690 from thalesmg/perf-webhook-retry-async-reply-v50
...
perf(webhook): add async retries and evaluate reply callback in fresh process
2023-05-17 11:06:48 -03:00
e26ce5816e
feat: hide keepalive_backoff, introduce keepalive_multiplier
2023-05-17 21:25:10 +08:00
ea8ac877b0
Merge pull request #10713 from zhongwencool/put-webhook-request-timeout-into-resource-opts
...
feat: update wehbook's request_timeout into resource_opts
2023-05-17 21:20:42 +08:00
ea4fbb8b6e
chore: add changelog
2023-05-17 14:46:07 +02:00
a7b41e1cdf
perf(webhook): add retry attempts for async
...
This is a performance improvement for webhook bridge.
Since this bridge is called using `async` callback mode, and `ehttpc`
frequently returns errors of the form `normal` and `{shutdown,
normal}` that are retried "for free" by `ehttpc`, we add this behavior
to async requests as well. Other errors are retried too, but they are
not "free": 3 attempts are made at a maximum.
This is important because, when using buffer workers, we should avoid
making them enter the `blocked` state, since that halts all progress
and makes throughput plummet.
2023-05-17 09:20:50 -03:00
ab8b8ccaad
docs: make sure there is a summary for all API endpoints
...
Many HTTP API endpoints did not have a summary when looking at the API
docs at "http://emqx_host_name:18083/api-docs ". This has been fixed by
making sure there is a summary corresponding to all endpoints.
Fixes:
https://emqx.atlassian.net/browse/EMQX-9767
2023-05-17 09:58:56 +02:00
2b99a9b988
feat: hide resource_opts's request_timeout
2023-05-17 13:41:11 +08:00
1f7ede90a4
chore: update app version && changes
2023-05-17 11:01:31 +08:00
b2ecbef0f1
Merge pull request #10715 from fix/EMQX-9897/preserve-peercert-until-connected
...
fix(chan): postpone trimming conninfo after `connected` hook run
2023-05-16 22:56:41 +03:00
74c04b847c
chore: add changelog entry
...
Co-authored-by: Zaiming (Stone) Shi <zmstone@gmail.com>
2023-05-16 19:35:56 +03:00
77cf19c96c
chore: update 10340's changelog
2023-05-16 22:59:08 +08:00
657df05ad9
fix(buffer_worker): avoid setting flush timer when inflight is full
...
Fixes https://emqx.atlassian.net/browse/EMQX-9902
When the buffer worker inflight window is full, we don’t need to set a
timer to flush the messages again because there’s no more room, and
one of the inflight windows will flush the buffer worker by calling
`flush_worker`.
Currently, we do set the timer on such situation, and this fact
combined with the default batch time of 0 yields a busy loop situation
where the CPU spins a lot while inflight messages do not return.
2023-05-16 11:28:58 -03:00
c113a8ac6a
Merge pull request #10677 from savonarola/0511-fix-rule-api
...
fix(api): respond 404 on the deletion of nonexistent rule
2023-05-16 16:50:30 +03:00
a2aa6b4666
chore: make ci happy again
2023-05-16 21:29:52 +08:00
b1a4f6ea05
docs: add changelog entry
2023-05-15 16:37:54 +02:00
bde086f549
Merge pull request #10701 from id/0510-bump-builder-version
...
ci: emqx-builder 5.0-35
2023-05-15 14:48:56 +02:00
34b09e071f
fix(limiter): fix a format error in the changelog
2023-05-15 18:08:33 +08:00
8d8cf23fad
chore: add changelog
2023-05-15 08:17:30 +02:00
67ada52808
Merge pull request #10682 from lafirest/fix/will_msg_timestamp
...
fix: update the will message timestamp when it is ready to publish
2023-05-12 22:25:32 +08:00
a953b951fe
Merge branch 'master' into sync-release-50-to-master
2023-05-12 18:01:58 +08:00
1141499b1b
chore: add changelog for 10659
2023-05-12 14:42:33 +08:00
2404d167c8
chore: update changes
2023-05-12 14:39:18 +08:00
64dc9ed46a
perf(metrics): avoid increasing counters by 0
...
Some performance tests indicate that calling `telemetry` is costly in
hot paths. Since increasing a counter by 0 is a no-op, we should
avoid calling `telemetry` if the amount to increase is 0.
2023-05-11 15:13:37 -03:00
49e9ace1c1
fix(api): respond 404 on the deletion of nonexistent rule
2023-05-11 23:12:59 +05:00
0617a9b11c
Merge pull request #10653 from SergeTupchiy/convert-gateway-authn-certs
...
fix(emqx_gateway): convert and clear authentication certificates
2023-05-11 11:35:55 +03:00
b3e35dac1c
Merge pull request #10584 from paulozulato/debug-ssl-handshake
...
feat: add log level configuration to ssl communication
2023-05-11 08:59:13 +02:00
898826f15f
chore: add changelog for 10659
2023-05-10 14:56:56 +08:00
b98a7168c4
fix(emqx_gateway): convert and clear authentication certificates
2023-05-09 17:32:44 +03:00
328add3a02
Merge pull request #10563 from qzhuyan/fix/william/no_local_filter_all
...
fix(mqtt): drop all local messages in session deliver
2023-05-09 15:29:12 +02:00
b94290db58
Merge pull request #10625 from lafirest/refactor/limiter_cfg
...
refactor(limiter): simplify limiter configuration
2023-05-09 11:40:05 +08:00
77176787ca
feat: add log level configuration to ssl communication
...
Fixes https://emqx.atlassian.net/browse/EMQX-9781
2023-05-08 15:11:49 -03:00
83c4b2f2d4
Merge pull request #10568 from paulozulato/feat-shutdown-count
...
feat: add shutdown count
2023-05-08 15:07:51 -03:00
f6c5644448
Merge pull request #10623 from zhongwencool/rename-max-message-queue-len
...
feat: rename max_message_queue_len to max_mailbox_size
2023-05-08 23:08:06 +08:00
74d0436fbf
Merge pull request #10636 from kjellwinblad/kjell/fix/mongo/max_overflow/EMQX-9714
...
fix: non_neg_integer() translated to minimum = 1 in bridge-api-en.json
2023-05-08 20:45:57 +08:00
fc46b81fb1
docs: change log for #10563
2023-05-08 14:40:40 +02:00
eaa129d0d7
feat: rename max_message_queue_len to max_mailbox_size
2023-05-08 20:27:52 +08:00
83257617cd
Merge pull request #10630 from zhongwencool/sync-release-50-to-master
...
Sync release 50 to master
2023-05-08 14:02:27 +02:00
62570d076b
docs: add change log entry
2023-05-08 12:50:31 +02:00
b639353cf4
fix(emqx_connector_http): wrap and unwrap auth headers
...
This so we don't have sensitive information in a process' state
2023-05-08 09:56:43 +02:00
b6c7e55348
Merge pull request #10528 from qzhuyan/perf/william/force-config-atom-path
...
perf(config): ensure root keys of 'conf' config is atom
2023-05-08 09:37:18 +02:00
4f396a36a9
Merge remote-tracking branch 'upstream/master' into release-50
2023-05-08 14:58:03 +08:00
197ebccf95
chore: update changes
2023-05-08 11:45:55 +08:00
335d948bce
Merge pull request #10591 from lafirest/fix/simplify_limiter_client_cfg
...
perf(limiter): simplify the memory represent of limiter configuration
2023-05-05 16:59:04 +08:00
7a96a9772d
fix(limiter): update change && fix deprecated version
2023-05-05 16:26:06 +08:00
e4f501417b
Merge pull request #10525 from qzhuyan/perf/william/avoid-new-map-when-get-mqtt-caps
...
perf(config): avoid build new map in emqx_mgmt_caps:get_caps
2023-05-05 10:22:08 +02:00
1b066fc0b6
chore: update changes
2023-05-05 16:21:21 +08:00
e42e73e104
chore: add changelog for trace timestrap
2023-05-04 14:44:56 +08:00
f965fa7b9a
feat: add shutdown count
...
Fixes https://emqx.atlassian.net/browse/EMQX-9008
Fixes https://emqx.atlassian.net/browse/EMQX-9219
2023-05-03 20:00:38 -03:00
c38cec77a7
Merge pull request #10417 from qzhuyan/perf/william/no-make-ref-in-get-config
...
perf(config): eliminate make_ref() calls in config get calls
2023-05-03 16:56:44 +02:00
421efd561a
docs: Update changes/ce/perf-10417.en.md
...
Co-authored-by: Zaiming (Stone) Shi <zmstone@gmail.com>
2023-05-03 13:50:48 +02:00
0428766a6e
docs: changelog for forcing atom conf path
2023-05-03 09:59:18 +02:00
66112fceed
Merge pull request #10572 from zmstone/0502-merge-release-50-back-to-master
...
0502 merge release 50 back to master
2023-05-03 09:01:35 +02:00
8aa7c014e7
perf(buffer_worker): avoid calling `ets:info/2`
...
(Almost?) fixes https://emqx.atlassian.net/browse/EMQX-9637
During the course of performance tests comparing the performance of
e5.0.3 and e4.4.16 regarding the webhook bridge in sync mode, we
observed that the throughput in e5.0.3 (sync) was much lower than in
e4.4.16: ~ 9 k msgs / s vs. ~ 50 k msgs / s, respectively.
Analyzing `observer_cli` output, we noticed that a lot of the time
both buffer workers and ehttpc processes was spent in `ets:info/2`.
That function was called to check the size of the inflight table when
updating metrics and checking if the inflight table was full. Other
uses of `ets:info/2` were contained inside the arguments to some
`?tp/2` macro usages (https://github.com/kafka4beam/snabbkaffe/pull/60 ).
By using a specific record to track the size of the table, we managed
to improve the bridge performance to ~ 45 k msgs / s in sync mode.
2023-05-02 17:05:32 -03:00
3d7201502b
perf(config): avoid build new map in emqx_mqtt_caps:get_caps
2023-05-02 21:50:36 +02:00
d5f5f35787
Merge remote-tracking branch 'origin/release-50' into 0502-merge-release-50-back-to-master
2023-05-02 18:08:04 +02:00
791010a65c
chore(topic_metrics): do not complain on nonexisting ets while topic metrics stop
2023-05-02 15:59:50 +03:00
77f5e461a3
chore: bump ehttpc -> 0.4.8
...
Fixes https://emqx.atlassian.net/browse/EMQX-9656
See also https://github.com/emqx/ehttpc/pull/45
This fixes a race condition where the remote server would close the
connection before or during requests, and, depending on timing, an
`{error, normal}` response would be returned. In those cases, we
should just retry the request without using up "retry credits".
2023-04-27 14:10:37 -03:00
c53741a08c
fix(buffer_worker): avoid sending late reply messages to callers
...
Fixes https://emqx.atlassian.net/browse/EMQX-9635
During a sync call from process `A` to a buffer worker `B`, its call
to the underlying resource `C` can be very slow. In those cases, `A`
will receive a timeout response and expect no more messages from `B`
nor `C`. However, prior to this fix, if `B` is stuck in a long sync
call to `C` and then gets its response after `A` timed out, `B` would
still send the late response to `A`, polluting its mailbox.
2023-04-26 13:18:28 -03:00
5ed3c3a92c
perf(config): eliminate make_ref() calls in config get calls
2023-04-26 10:58:08 +02:00
d398276852
Merge pull request #10518 from SergeTupchiy/upgrade-ekka-to-0.15.1-mria-0.5.2
...
chore: bump ekka to 0.15.1
2023-04-26 11:03:23 +03:00
341024f0bc
Merge pull request #10497 from HJianBo/improve-chages-sentence
...
chore: improve changes
2023-04-26 14:56:29 +08:00
19b5ebff81
chore: bump ekka to 0.15.1
...
ekka 0.15.1 uses mria 0.5.2, which includes the following changes:
- fix(mria_membership): call `mria_rlog:role/1` safely
- feat: add extra field to ?rlog_sync table (for future use)
2023-04-25 23:21:07 +03:00
308056f0fc
feat: improved the storage format of Unicode characters in data files
2023-04-25 18:08:34 +08:00
79a235f8b5
Merge pull request #10491 from zhongwencool/rename-etcd-ssl-to-ssl_options
...
feat: rename etcd.ssl to etcd.ssl_options
2023-04-25 10:49:09 +08:00
09b17000c8
chore: update changes/ce/feat-10457.en.md
...
Co-authored-by: Zaiming (Stone) Shi <zmstone@gmail.com>
2023-04-25 09:56:40 +08:00
29d3afd692
Merge pull request #10487 from lafirest/fix/limiter_instance
...
fix(limiter): optimize the instance of limiter
2023-04-25 09:43:04 +08:00
99e892b5c4
chore: bump ekka to 0.15.0
...
ekka 0.15.0 uses mria 0.5.0, which adds several fixes, enhancements and features:
- protect `mria:join/1,2` with a global lock
- implement new function `mria:sync_transaction/4,3,2`, which waits for
a transaction replication to be ready on the local node
(if the local node is a replicant)
- optimize `mria:running_nodes/0`
- optimize `mria:ro_transaction/2` when called on a replicant node.
Fixes: EMQX-9588 (#10380 ), EMQX-9102, EMQX-9152, EMQX-9213
2023-04-24 20:52:20 +03:00
2845469c48
Merge pull request #10490 from lafirest/fix/rmv_def_conn_limit
...
fix(limiter): remove the default limit of connect rate
2023-04-24 22:04:29 +08:00
4aad5c7454
chore: improve changes
2023-04-24 21:44:21 +08:00
6110aad23f
chore: bump version && update changes
2023-04-24 18:17:23 +08:00
22d6a2eaee
Merge pull request #10484 from zhongwencool/fix-copy-conf
...
fix: copy cluster-override.conf from old version
2023-04-24 17:06:07 +08:00
366aa53c80
Merge pull request #10462 from zmstone/0430-EMQX-8434-shared-dispatch-ack-deprecated
...
chore: Hide config shared_dispatch_ack_enabled
2023-04-24 09:42:09 +02:00
dacf92c4ab
chore: rename etcd.ssl changelog
2023-04-24 14:46:06 +08:00
24cecae1f8
chore: update changes
2023-04-24 14:15:45 +08:00
2f2f32ac7b
chore: update changes
2023-04-24 10:52:30 +08:00
38cebf2fdc
chore: add changelog for 10484
2023-04-23 15:53:17 +08:00
81340edbca
docs: add changelog
2023-04-22 09:08:07 +02:00
f831a0b827
chore: update changes/ce/fix-10449.en.md
...
Co-authored-by: JianBo He <heeejianbo@163.com>
2023-04-21 15:30:27 +08:00
397e28f5a4
chore: add changlog for authn_http validation
2023-04-21 15:30:05 +08:00
ad6090a778
chore: update changes/ce/fix-10449.en.md
...
Co-authored-by: JianBo He <heeejianbo@163.com>
2023-04-21 11:54:45 +08:00
2aef9ca215
chore: add changlog for authn_http validation
2023-04-21 11:54:45 +08:00
0b105dcb8d
Merge pull request #10463 from SergeTupchiy/EMQX-9310-webhook-port-validation
...
fix(emqx_bridge): validate Webhook bad URL
2023-04-20 20:48:12 +03:00
8c4b32580e
Merge pull request #10420 from savonarola/0417-authn-authz-fix-path-quoting
...
Fix path joining and quoting in authn/authz
2023-04-20 18:03:04 +03:00
45254d7d85
fix(emqx_bridge): validate Webhook bad URL and return 'BAD_REQUEST' if it's invalid
...
Fixes: EMQX-9310
2023-04-20 17:21:43 +03:00
423a30fbb3
fix(emqx_alarm): add safe call API to activate/deactivate alarms and use it in resource_manager
...
Don't let 'emqx_resource_manager' crash because of emqx_alarm timeouts.
Fixes: EMQX-9529/#10357
2023-04-20 17:15:13 +03:00
3f18c5e2e3
Merge pull request #10455 from thalesmg/fix-late-gen-server-replies-buf-worker-v50
...
fix(buffer_worker): avoid sending late reply messages to callers
2023-04-20 10:19:06 -03:00
bcc8f4313b
chore: make plugins config to low level
2023-04-20 18:00:19 +08:00
794ddd8d73
chore: update changes
2023-04-20 14:23:55 +08:00
cb995e2033
fix(buffer_worker): avoid sending late reply messages to callers
...
Fixes https://emqx.atlassian.net/browse/EMQX-9635
During a sync call from process `A` to a buffer worker `B`, its call
to the underlying resource `C` can be very slow. In those cases, `A`
will receive a timeout response and expect no more messages from `B`
nor `C`. However, prior to this fix, if `B` is stuck in a long sync
call to `C` and then gets its response after `A` timed out, `B` would
still send the late response to `A`, polluting its mailbox.
2023-04-19 18:27:10 -03:00
8219af2fd4
chore: improve changelog
2023-04-19 16:45:53 +08:00
4f0c891aa6
chore: bump version && update changes
2023-04-19 15:45:31 +08:00
6a1ef5e68a
Merge pull request #10422 from thalesmg/fix-plugin-sync-single-node-v50
...
fix(plugins): attempt to extract plugin from current node on startup
2023-04-18 14:39:02 -03:00
3e72d6c4a3
docs: sync changelogs
2023-04-18 19:17:03 +02:00
89cd6cfede
fix(plugins): attempt to extract plugin from current node on startup
...
Fixes https://emqx.atlassian.net/browse/EMQX-9605
Fixes https://github.com/emqx/emqx-elixir-plugin/issues/25
If an user happens to configure a plugin in a lone-node cluster via
environment variables, it would fail to start up as there are no other
nodes to copy the plugin from. Here, we attempt to check if the
package is present in the current node but not yet extracted.
2023-04-18 11:10:23 -03:00
fbadfc06e4
feat: change exhook, rule_engine, bridge to low importance level instead of hidden
2023-04-18 20:15:19 +08:00
e3a84e0010
chore: improve the changes for configuration
2023-04-18 20:13:44 +08:00
22a1d05d7b
feat: hide ssl_options.user_lookup_fun
2023-04-18 20:13:44 +08:00
e3d6fa1f21
chore: update config's changelog and emqx_conf.template
2023-04-18 20:13:44 +08:00
c0d8e9c402
Merge pull request #10369 from ieQu1/fix-stats-api
...
fix(emqx_management): Ignore results from the nodes that are down
2023-04-18 12:36:55 +02:00
61f3e62ba8
chore: update changes
2023-04-18 15:49:34 +08:00
282bfee8ff
feat(emqx): Add an API that returns the list of running nodes
2023-04-18 09:22:58 +02:00
a947df1ea3
fix(emqx_management): Ignore results from the nodes that are down
2023-04-18 09:22:56 +02:00
77d300482c
chore: update changes/ce/feat-10389.en.md
2023-04-18 10:49:51 +08:00
acb30c7957
chore: update changes/ce/feat-10389.en.md
...
Co-authored-by: JianBo He <heeejianbo@163.com>
2023-04-18 10:47:07 +08:00
ad3e529994
chore: update changes/ce/feat-10389.en.md
...
Co-authored-by: Thales Macedo Garitezi <thalesmg@gmail.com>
2023-04-18 09:34:01 +08:00
1ef74f1ada
chore: upgrade hocon to 0.39.1
2023-04-18 09:28:36 +08:00
88ca94b417
fix(auth): fix uri path handling
...
Fix uri path handling `emqx_connector_http`,
HTTP authentication and authorization backends.
2023-04-17 23:57:56 +03:00
Zaiming (Stone) Shi