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

19630 Commits

Author SHA1 Message Date
Zaiming (Stone) Shi 3d20e566d8 docs: add namespace to authn and authz schema 2023-11-10 08:45:20 +01:00
Zaiming (Stone) Shi 5aeb1feada
Merge pull request #11916 from zmstone/1109-dump-json-file-for-i18n 
1109 dump json file for i18n
 2023-11-10 08:41:47 +01:00
firest 0299e9033a chore(gbt32960): add EN documentation of the data exchange guide 2023-11-10 15:22:28 +08:00
Zaiming (Stone) Shi 9c1a1c7de8
Merge pull request #11919 from thalesmg/action-api-swagger-nits-r53-20231109 
fix(actions_api): change bridge v2 occurrences to action
 2023-11-10 07:35:35 +01:00
lafirest 1c04499370
Merge pull request #11902 from lafirest/feat/sys_v2 
feat(sysk): integrated Nari Syskeeper 2000 as a new bridge backend
 2023-11-10 12:55:51 +08:00
firest 447c933ff8 fix(syskeeper): homogenize the Syskeeper bridge and update license data 2023-11-10 10:42:53 +08:00
ieQu1 38d004e06e
Merge pull request #11913 from ieQu1/dev/fix-hooks-comment 
chore(hooks): Fix comment
 2023-11-10 03:15:54 +01:00
firest 548e39e799 refactor(sysk): refactor the syskeeper to v2 style 2023-11-10 09:52:38 +08:00
firest abc7233a77 test(sysk): add test suite for syskeeper 2023-11-10 09:52:38 +08:00
firest e93216fa62 chore(sysk): fix spellchecks & update change & more logs 2023-11-10 09:52:32 +08:00
firest ce83079c6b feat(sysk): integrated Nari Syskeeper 2000 as a new bridge backend 2023-11-10 09:51:43 +08:00
JianBo He 6500d21d98
Merge pull request #11885 from HJianBo/ocpp-gw 
feat: Port OCPP gateway from v4
 2023-11-10 09:32:40 +08:00
ieQu1 ced7be61f0
Merge pull request #11917 from ieQu1/dev/fix-packet-id-to-seqno-trans 
fix(ds): Fix packet id -> sequence number translation
 2023-11-09 22:57:16 +01:00
Thales Macedo Garitezi 7a237f6a3a Merge branch 'master' into sync-m-to-r54-20231109 2023-11-09 18:49:52 -03:00
Thales Macedo Garitezi ae3dc9bcd9
Merge pull request #11922 from thalesmg/sync-r53-to-m-20231109 
chore: sync `release-53` to `master`
 2023-11-09 18:46:53 -03:00
Thales Macedo Garitezi 371a49304d Merge branch 'release-53' into sync-r53-to-m-20231109 2023-11-09 17:19:23 -03:00
ieQu1 5aa9d026df fix(ds): Apply review remarks 
Co-authored-by: Thales Macedo Garitezi <thalesmg@gmail.com>
 2023-11-09 21:16:59 +01:00
Thales Macedo Garitezi 63adcf12b8
Merge pull request #11920 from thalesmg/test-flaky-cm-test-m-20231109 
test: fix flaky test
 2023-11-09 17:14:39 -03:00
ieQu1 b812db1e3c fix(ds): Fix packet id -> sequence number translation 2023-11-09 20:12:39 +01:00
Thales Macedo Garitezi 2d539463cd test: fix flaky test 
```
 Testing lib.emqx.emqx_cm_SUITE: *** FAILED test case 24 of 31 ***
%%% emqx_cm_SUITE ==> t_stepdown_session_takeover_begin_timeout: FAILED
%%% emqx_cm_SUITE ==>
Failure/Error: ?assertEqual([<0.6635.8>,<0.6520.8>], lists : sort ( emqx_cm : lookup_channels ( ClientId ) ))
  expected: [<0.6635.8>,<0.6520.8>]
       got: [<0.6520.8>,<0.6635.8>]
      line: 309
```
 2023-11-09 15:32:52 -03:00
Thales Macedo Garitezi 8df6ce812b
Merge pull request #11918 from thalesmg/add-action-types-api-r53-20231109 
feat(actions_api): add `/action_types` API
 2023-11-09 14:55:54 -03:00
Thales Macedo Garitezi ee87f90b0d
Merge pull request #11906 from thalesmg/ds-avoid-records-m-20231108 
chore(ds): avoid using records in persistence / rpc
 2023-11-09 14:25:27 -03:00
Thales Macedo Garitezi 7977ae95c0 fix(actions_api): change bridge v2 occurrences to action 
Fixes https://emqx.atlassian.net/browse/EMQX-11338
 2023-11-09 14:20:08 -03:00
Zaiming (Stone) Shi fd205f599c build: do not generate desc.en.hocon if jq command is not found 2023-11-09 18:14:56 +01:00
Thales Macedo Garitezi eabd09051a feat(actions_api): add `/action_types` API 2023-11-09 13:54:57 -03:00
Zaiming (Stone) Shi 5990f9835f build: generate desc.en.hocon file for i18n 2023-11-09 16:58:51 +01:00
Zaiming (Stone) Shi aa4a2d9331 build: start versioning i18n files 2023-11-09 16:48:42 +01:00
Ivan Dyachkov 053c03f79f
Merge pull request #11915 from id/1109-ci-fix-on-push-branch-pattern 
ci: explicitly specify branch names for push entrypoint
 2023-11-09 16:46:49 +01:00
Ivan Dyachkov e15553f9bd ci: fix pattern for on push branch 2023-11-09 16:45:08 +01:00
ieQu1 42a9f0eb6b
Merge pull request #11914 from ieQu1/dev/speed-up-poll 
fix(ds): Speed up polling for the new messages
 2023-11-09 16:40:06 +01:00
Thales Macedo Garitezi 42536bb5f7 chore(ds): avoid using records in persistence / rpc 
Fixes https://emqx.atlassian.net/browse/EMQX-11279
 2023-11-09 12:00:25 -03:00
Ivan Dyachkov 6fc2b7799f
Merge pull request #11910 from id/1109-sync-master-to-r54 
sync master to r54
 2023-11-09 15:14:29 +01:00
ieQu1 cf4a46a78b fix(ds): Speed up polling for the new messages 
Poll immediately if the previous poll returned non-empty result
 2023-11-09 14:22:32 +01:00
ieQu1 3350bda446 chore(hooks): Fix comment 2023-11-09 14:05:13 +01:00
lafirest 92e978e50e
Merge pull request #11911 from lafirest/fix/limiter_doc 
fix(limiter): simplify the descriptions for fields of the limiter
 2023-11-09 21:03:27 +08:00
Kinple a828eea613
Merge pull request #11908 from Kinplemelon/kinple/for-upgrade-dashboard 
chore: upgrade dashboard to e1.3.1 for ee and v1.5.1 for ce
 2023-11-09 18:31:06 +08:00
firest 2b97800c8b fix(limiter): simplify the descriptions for fields of the limiter 2023-11-09 18:00:09 +08:00
William Yang f7a2359329 test(quic): fix flaky 2023-11-09 10:56:16 +01:00
JianBo He d55f1e0813 chore: fix mix compiling failures 2023-11-09 16:54:41 +08:00
Shawn e0f4a2014d fix: emqx failed to start if plugin dir is removed by the user 2023-11-09 16:01:20 +08:00
Ivan Dyachkov 0bf5deaed9 chore: merge master into release-54 2023-11-09 08:32:26 +01:00
JianBo He d6104b37cf test: fix flaky tests 2023-11-09 15:01:12 +08:00
JianBo He 4b18631d49 chore: fix gateway failed test cases 2023-11-09 13:44:20 +08:00
Kinplemelon 5d25daee88 chore: upgrade dashboard to e1.3.1 for ee and v1.5.1 for ce 2023-11-09 10:17:58 +08:00
JianBo He 2d958beae9 chore: try to fix spellcheck 2023-11-09 09:51:08 +08:00
Zaiming (Stone) Shi 42fa1289a1
Merge pull request #11905 from thalesmg/tag-e531-alpha5-r53-20231108 
chore: prepare to tag `e5.3.1-alpha.5`
 2023-11-08 23:39:33 +01:00
Zaiming (Stone) Shi f95058a3e7
Merge pull request #11897 from zmstone/1107-fix-cluster-conf-sync-wait-loop 
1107 fix cluster conf sync wait loop
 2023-11-08 23:37:09 +01:00
Zaiming (Stone) Shi 1e3500ffd2
fix(emqx_conf_app): ensure log data fields 
Co-authored-by: Thales Macedo Garitezi <thalesmg@gmail.com>
 2023-11-08 21:19:22 +01:00
Thales Macedo Garitezi 8540566eba chore: prepare to tag `e5.3.1-alpha.5` 2023-11-08 13:02:19 -03:00
Thales Macedo Garitezi df2e6520c0
Merge pull request #11904 from thalesmg/fix-bridge-status-v2-r53-20231108 
fix(bridge_v2_api): take status and error from bridge, not the connector
 2023-11-08 12:53:54 -03:00