Commit Graph

9121 Commits

Author SHA1 Message Date
Rory Z fe26c6fa40 fix(helm): fix helm value explain error
Fixed EMQX Helm Chart can not set JSON type value for EMQX configuration items
2022-12-12 15:41:54 +08:00
Rory e0d4792a53
Merge pull request #9508 from Rory-Z/chore/fix-helm-secret
fix(helm): chart using incorrect secret values with custom credentials
2022-12-12 15:34:59 +08:00
Rory Z 193f2ab7bd fix(helm): chart using incorrect secret values with custom credentials 2022-12-12 14:13:31 +08:00
Zaiming (Stone) Shi 6cb23c7cbc
Merge pull request #9521 from zmstone/1209-sync-changes-from-ee-back-to-c
chore: sync changes from ee to ce
2022-12-09 15:34:58 +01:00
Zaiming (Stone) Shi c5bbac0a23 chore: restore apps/emqx_retainer/src/emqx_retainer_sup.erl
this file, ce should be copied to ee, not the other way around
2022-12-09 14:44:53 +01:00
Zaiming (Stone) Shi f818a78d29 chore: update appup 2022-12-09 14:41:30 +01:00
Zaiming (Stone) Shi 0c3de088cb chore: sync changes from ee to ce 2022-12-09 13:58:07 +01:00
lafirest e3ed682e8d
Merge pull request #9493 from lafirest/fix/psk_v4.4
fix(psk): add more PSK ciphers support
2022-12-09 16:10:51 +08:00
firest a01301a985 test(psk): add new ciphers into test case 2022-12-09 15:21:40 +08:00
firest 04e544a01d chore: update changes 2022-12-09 15:21:34 +08:00
firest 6d8dd430fd fix(psk): add more PSK ciphers support 2022-12-09 15:20:50 +08:00
zhongwencool 925787bc59
Merge pull request #9475 from zhongwencool/dashboard-password-validate
fix: add dashboard password validation
2022-12-09 11:17:35 +08:00
zhongwencool 7806a1d7d3 fix: missing emqx_misc in emqx appup 4.4.11 2022-12-09 10:24:34 +08:00
zhongwencool be9870787c fix: add dashboard password validation 2022-12-09 10:15:09 +08:00
Thales Macedo Garitezi 623283c077
Merge pull request #9499 from thalesmg/fix-flaky-test-v44
test(flaky): fix flaky test
2022-12-07 13:12:55 -03:00
Thales Macedo Garitezi 8d20c5a00c test(flaky): fix flaky test
```
%%% emqx_crl_cache_SUITE ==> t_empty_cache: FAILED
%%% emqx_crl_cache_SUITE ==> {{badmatch,{error,econnrefused}},
 [{emqx_crl_cache_SUITE,t_empty_cache,1,
                        [{file,"/home/thales/dev/emqx/emqx2/test/emqx_crl_cache_SUITE.erl"},
                         {line,450}]},
  {test_server,ts_tc,3,[{file,"test_server.erl"},{line,1783}]},
  {test_server,run_test_case_eval1,6,[{file,"test_server.erl"},{line,1292}]},
  {test_server,run_test_case_eval,9,[{file,"test_server.erl"},{line,1224}]}]}
```
2022-12-07 11:32:54 -03:00
Xinyu Liu a54f88a1ad
Merge pull request #9486 from JimMoen/fix-message-dropped-event-v44
Fix message dropped event v44
2022-12-07 18:00:29 +08:00
JimMoen 97bfe359d1
chore: fix typo 2022-12-07 16:01:33 +08:00
JimMoen fe0f2bc4e7
test(session): ensure 'message.dropped' hook ran with named reason 2022-12-07 16:01:33 +08:00
JimMoen 458101958b
fix: run `message.dropped` hook, inc `messages.dropped` metrics
- when awaiting_rel full
- packet identifier in use (QoS2 packet resend)
2022-12-07 12:46:32 +08:00
Zaiming (Stone) Shi c021443f6e
Merge pull request #9483 from JimMoen/fix-pic-link-v44
chore: fix README.md(s) picture link
2022-12-06 18:51:25 +01:00
JimMoen eb3726f307
chore: fix README.md(s) picture link 2022-12-07 01:48:46 +08:00
Thales Macedo Garitezi 8ad9e7a008
Merge pull request #9471 from thalesmg/check-unpack-target-v44
fix(install_upgrade): check target version when unpacking (v4.4)
2022-12-06 13:09:34 -03:00
zhongwencool 78ce1ff1b9
Merge pull request #9474 from zhongwencool/bootstrap-apps
fix: load bootstrap file when no bootstrap user
2022-12-06 09:45:10 +08:00
zhongwencool c20b597e12 chore: replace match_object with select/4 2022-12-05 17:00:38 +08:00
zhongwencool a7079b8c0e test: fix rule_engine SUITE failed 2022-12-05 09:40:36 +08:00
zhongwencool 9f129a300a fix: load bootstrap file when no bootstrap user 2022-12-04 16:55:48 +08:00
Thales Macedo Garitezi bf40ee577b fix(install_upgrade): check target version when unpacking (v4.4)
We already have a check to avoid upgrading between minor versions,
such as 4.3 <-> 4.4 (and 4.4 <-> 4.5):

```
  Cannot upgrade/downgrade to 4.4.11-rc.3 from 4.3.17
  We only support relup between patch versions
  escript: exception error: {relup_not_allowed,unsupported_target_version}
    in function  install_upgrade_escript__escript__1670__7364__537878__24:validate_target_version/2 (/usr/lib/emqx/bin/install_upgrade.escript, line 444)
    in call from install_upgrade_escript__escript__1670__7364__537878__24:install/2 (/usr/lib/emqx/bin/install_upgrade.escript, line 58)
    in call from escript:run/2 (escript.erl, line 758)
    in call from escript:start/1 (escript.erl, line 277)
    in call from init:start_em/1
    in call from init:do_boot/3
```

But such check is missing for `unpack`, which may result in an
unusable node after just unpacking:

```
emqx@d70cfe0e8e62:~$ emqx ctl status
ERROR: node_is_not_running!
```

The issue apparently arises from `nodetool` trying to use the
`compiler` lib from the newer version rather than the old one:

```
  + ERL_FLAGS=' -start_epmd false -epmd_module ekka_epmd -proto_dist ekka'
  + /usr/lib/emqx/erts-11.2.2.8/bin/escript /usr/lib/emqx/bin/nodetool -name emqx@127.0.0.1 -setcookie emqxsecretcookie ping
  + die 'node_is_not_running!' 1
  + set +x
  ERROR: node_is_not_running!

  emqx@d70cfe0e8e62:~$ /usr/lib/emqx/erts-11.2.2.8/bin/escript /usr/lib/emqx/bin/nodetool -name emqx@127.0.0.1 -setcookie emqxsecretcookie ping
  escript: Internal error: undef
  =ERROR REPORT==== 2-Dec-2022::19:02:39.150274 ===
  Loading of /usr/lib/emqx/lib/compiler-8.1.1/ebin/compile.beam failed: badfile

  =ERROR REPORT==== 2-Dec-2022::19:02:39.150271 ===
  beam/beam_load.c(1879): Error loading module compile:
    This BEAM file was compiled for a later version of the run-time system than 23.
    To fix this, please recompile this module with an 23 compiler.
    (Use of opcode 176; this emulator supports only up to 170.)
```
2022-12-02 16:36:06 -03:00
Zaiming (Stone) Shi aecf5d12ed
Merge pull request #9456 from zmstone/1130-EMQX-8367-upgrade-ehttpc
EMQX-8367 [4.4] upgrade ehttpc from 0.2.1 to 0.4.2
2022-12-02 13:43:21 +01:00
Zaiming (Stone) Shi f54cf5466f fix(ehttpc): Upgrade ehttpc to 0.4.2 2022-12-02 09:51:15 +01:00
Zaiming (Stone) Shi 5b3bcf54ed
Merge pull request #9446 from zmstone/1129-emqx-7958-add-cover
1129 emqx 7958 add cover
2022-11-29 15:48:14 +01:00
Zaiming (Stone) Shi 55485f25b2 feat: add emqx_cover 2022-11-29 14:53:37 +01:00
Zaiming (Stone) Shi 01f594f4de
Merge pull request #9245 from ieQu1/main-v4.4
chore(gen_rpc): Bump version to 3.0.0
2022-11-29 13:54:08 +01:00
Zaiming (Stone) Shi 93a93aee05 chore: add tools app to release package 2022-11-29 13:50:00 +01:00
Zaiming (Stone) Shi 76b2e698ec Merge remote-tracking branch 'origin/main-v4.3' into main-v4.4 2022-11-28 21:50:04 +01:00
Zaiming (Stone) Shi b1f72f4c36
Merge pull request #9438 from zmstone/1123-stop-releasing-v43
build: detach 4.3 branches from 4.4 branches
2022-11-28 19:19:47 +01:00
ieQu1 e8542b7cd7 chore(gen_rpc): Bump version to 3.0.0 2022-11-28 15:23:53 +01:00
Zaiming (Stone) Shi a44ecc421e
Merge pull request #9435 from zmstone/1128-sync-main-v4.3-to-4.4
1128 sync main v4.3 to 4.4
2022-11-28 15:19:27 +01:00
Zaiming (Stone) Shi eda6df7a19 build: detach 4.3 branches from 4.4 branches
Starting from this commit, there will be no more merges from 4.3 to 4.4.
That is: fixes affecting both 4.3 and 4.4 will have to be sent
in separate pull requests.

This change is due to two reasons:
1. The ever increasing divergence from 4.4 is making the merges
   to cause more and more conflicts which are also harder to resolve
2. Opensource edition 4.3 has come to the 18-month EOL by November 2022
2022-11-28 14:36:42 +01:00
Zaiming (Stone) Shi 2331c9bd5e chore: add emqx_cm to appup 2022-11-28 14:32:05 +01:00
Zaiming (Stone) Shi 1b717ee349 ci: delete otp version suffix from intermediate artifact name 2022-11-28 13:13:22 +01:00
Zaiming (Stone) Shi d244c298dc chore: update app vsn and appup 2022-11-28 12:49:35 +01:00
Zaiming (Stone) Shi 8998fcc166 chore: update relup paths db 2022-11-28 11:04:18 +01:00
Zaiming (Stone) Shi 89ad7ed7ef chore: bump app versions 2022-11-28 11:03:28 +01:00
Zaiming (Stone) Shi 5f10b04971 chore: bump chart versions 2022-11-28 11:02:10 +01:00
Zaiming (Stone) Shi cc342e7a09 chore: bump version to v4.4.12-alpha.1 2022-11-28 11:01:39 +01:00
Zaiming (Stone) Shi 71299a2bcf Merge remote-tracking branch 'origin/main-v4.3' into main-v4.4 2022-11-28 10:02:29 +01:00
Zaiming (Stone) Shi 772ea4988b Merge remote-tracking branch 'origin/release-v44' into main-v4.4 2022-11-28 09:48:01 +01:00
Zaiming (Stone) Shi d166d217ca
Merge pull request #9425 from zmstone/1126-chore-merge-release-v43-back-to-main
1126 chore merge release v43 back to main
2022-11-28 09:43:04 +01:00
Xinyu Liu ed4a975a80
Merge pull request #9388 from Gala-R/fix-helm-chart-bug
fix: helm chart headless service name error
2022-11-28 14:44:53 +08:00