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

609 Commits

Author SHA1 Message Date
Thales Macedo Garitezi f8a1bd0715 feat(license): copy license file to cluster when updating it 2022-07-28 17:29:59 -03:00
Thales Macedo Garitezi 80d35feb33 fix(license): change schema to allow updating license to different type 
Before this change, if a license in `emqx.conf` was of type
`key`/`file` and then changed to the opposite type, such change would
be saved to `{cluster,local}-overrides.conf`.  When the node restarts
after that, the configs are merged naively and becomes invalid, as it
contains both the `key` and `file` keys, and crashes.
 2022-07-28 17:29:59 -03:00
DDDHuang b7c245c5b0 fix: hstreamdb zh docs 2022-07-28 16:50:34 +08:00
DDDHuang a4992ef1b5 fix: hstreamdb connector conf & api 2022-07-28 16:47:30 +08:00
DDDHuang 9ae7c62656 fix: exs deps & bad suites 2022-07-27 16:24:13 +08:00
DDDHuang be6de4aad0 fix: ee bridge & connector remove app mod 2022-07-27 11:38:45 +08:00
DDDHuang fa4bc921ac fix: hstream db connector & bridge, TODO: SUITE 2022-07-27 11:38:45 +08:00
DDDHuang 98b36c4681 fix: hstream db connector , TODO: start apps 2022-07-27 11:38:45 +08:00
DDDHuang f00a7417bb feat: hstream bridge & connector 2022-07-27 11:38:45 +08:00
DDDHuang e4eba157c3 feat: add emqx enterprise app connector & bridge 2022-07-25 09:36:45 +08:00
Zhongwen Deng 92019e4d4c chore: don't copy i18n.conf 2022-07-01 09:33:35 +08:00
Shawn 48f685a0dd fix: remove the APIs for emqx_hooks:put/2 and emqx_hooks:add/2 2022-06-16 00:43:50 +08:00
Zaiming (Stone) Shi c355c40ea8 refactor: call emqx_alarm:ensure_deactivated everywhere 2022-05-13 16:02:55 +02:00
zhongwencool b4b9853cfc
Merge pull request #7732 from terry-xiaoyu/rule_bridges_api_docs2 
emqx_schema i18n docs
 2022-04-24 14:05:48 +08:00
Zhongwen Deng a77bb994e1 fix: add timeout for schema json gen test 2022-04-24 12:05:07 +08:00
Zaiming (Stone) Shi c32fc33c1a style: cosmetic fix for code style 2022-04-23 09:48:58 +02:00
Zaiming (Stone) Shi 1c74c83f5e fix(license): print warning at start 2022-04-22 17:44:18 +02:00
Zaiming (Stone) Shi 123e456287 feat: change default trial license 
* Changed number of connections limit from 10 to 1000
* Added a 'deployment' field, so we know which is which when
  a customer has multiple licenses
* Default expiration is 5 years
 2022-04-21 08:48:37 +02:00
Zhongwen Deng 164754b182 test: dashboard ct failed with lack i18n_lang 2022-04-15 12:04:01 +08:00
Thales Macedo Garitezi d12229700a
feat(license): port 4.4 parser to 5.0 2022-04-11 09:25:06 -03:00
ieQu1 43aa2ea481 docs(schema): Add documentation for license application 2022-04-05 10:32:24 +02:00
JianBo He 4e3fd9febd style(license): reformat emqx_license application 2022-03-31 17:41:43 +08:00
Zaiming (Stone) Shi 93cb86d3d2 chore: make Elvis happy 2022-03-25 20:06:11 +01:00
Zaiming (Stone) Shi 1aa8299261 style: erlfmt lib-ee/emqx_enterprise_conf 2022-03-25 16:54:23 +01:00
Zaiming (Stone) Shi 793add0219 style: use a macro for 'catch' 2022-03-25 08:21:50 +01:00
Zaiming (Stone) Shi 7923f017be style(elvis): avoid using if 2022-03-25 07:25:02 +01:00
Zaiming (Stone) Shi 4f396cceb8 style(emqx_license): erlfmt refomrat apps/emqx_license 2022-03-25 07:13:08 +01:00
Zaiming (Stone) Shi 4e64010a3b build: more structured build info 2022-03-02 21:22:03 +01:00
Zaiming (Stone) Shi d029a73b99 refactor: make release edition static info at compile time 2022-02-28 16:37:47 +01:00
Zaiming (Stone) Shi 4a336b6b4e test: add eunit test for schema dump 2022-02-28 10:47:10 +01:00
Zaiming (Stone) Shi 2a6d11c7f1
Merge pull request #7038 from zmstone/chore-rename-emqx-no-space-source-code 
chore: EMQ X -> EMQX in source code
 2022-02-17 21:13:43 +01:00
zhongwencool c88504f918
Merge pull request #7023 from zhongwencool/license-alarm-support 
License alarm support
 2022-02-17 22:09:51 +08:00
Zhongwen Deng 001b209811 fix(license): don't do not lose watermark fields. 2022-02-17 15:49:41 +08:00
Zhongwen Deng 7853eb75df fix(license): fix crash update license.watermark. 2022-02-17 15:05:22 +08:00
Zaiming (Stone) Shi 64db085163 chore: EMQ X -> EMQX in source code 2022-02-16 22:08:12 +01:00
Zaiming (Stone) Shi 0528262705 chore(app.src): EMQ X -> EMQX in .app.src files 2022-02-16 17:51:45 +01:00
Zaiming (Stone) Shi ea1bf58a2d
Merge pull request #7033 from zmstone/feat-emqx-license-allow-comma-in-numbers 
feat(emqx_license): allow comma in integer numbers in license body
 2022-02-16 17:31:34 +01:00
Zaiming (Stone) Shi fa9300e875 feat(emqx_license): allow comma in integer numbers in license body 2022-02-16 15:37:24 +01:00
zhongwencool d900418ce2 fix(license): fix maps:get/2 crash 2022-02-16 18:15:47 +08:00
zhongwencool 98b2cd683b fix: dialyzer warning 2022-02-16 17:41:51 +08:00
zhongwencool 34fe5082c4 fix(schema): schema global validations not working 2022-02-16 14:20:15 +08:00
zhongwencool ea558b2bc5 feat(license): license expriy early alarm. 2022-02-16 12:31:25 +08:00
Zaiming (Stone) Shi 2e94880bb6 docs: More EMQ X -> EMQX rename in descriptive strings 2022-02-15 22:39:11 +01:00
Zaiming (Stone) Shi 667d66eb1e docs(README): EMQ X -> EMQX 2022-02-15 16:19:26 +01:00
Zaiming (Stone) Shi bc67ede384 chore: update to use official pub key for 5.0 license 2022-02-15 14:22:14 +01:00
Zaiming (Stone) Shi 7494c47919 test: change to use ec keys for testing 2022-02-15 13:51:56 +01:00
Zaiming (Stone) Shi c8c7ad896e refactor(emqx_license): test with pem format input 
no need to perform der encode/decode for pub key
 2022-02-15 10:39:30 +01:00
Zaiming (Stone) Shi 0f09e7bbd2 test(emqx_license): no need to meck public key for tests 2022-02-15 00:39:10 +01:00
Ilya Averyanov b7aac96282
Merge pull request #6975 from savonarola/emqx-license-early-check 
feature(license): check license before node start
 2022-02-14 15:02:48 +03:00
Ilya Averyanov 64c59b5469 feat(license): check license before node start 2022-02-11 11:49:29 +03:00
Zaiming (Stone) Shi fc8eeb8819 fix(emqx_license): raise throw exception instead of error 2022-02-10 12:40:46 +01:00
Zaiming (Stone) Shi cd3565d357 refactor(emqx_license): simplify parser errors 
prior to this change, badmatch exception may cause the license key
to be dumped in logs
 2022-02-10 12:40:46 +01:00
Zaiming (Stone) Shi 4cee12614b fix: mark license key sensitive 
so it's not logged to console when environment variable is used
 2022-02-08 17:28:40 +01:00
Zaiming (Stone) Shi ae9c8098ba test: ensure coverage for the `no_license` case 2022-02-08 17:28:40 +01:00
Zaiming (Stone) Shi c936706a1f refactor(emqx_license): log a different msg when license is not loaded 2022-02-08 17:28:40 +01:00
Zaiming (Stone) Shi 319d08678e chore: update license year 2022-02-08 17:28:40 +01:00
Ilya Averyanov 17599432d1 feat(license): add license application 2022-02-07 19:05:47 +03:00
Zaiming (Stone) Shi 7f49934216 chore: add BSL.txt 2021-12-29 13:35:49 +01:00
Zaiming Shi 6edd862dd5 refactor: no more EMQX_ENTERPRISE compile flag 
The compile flag was introduced in EQM X 4.3 series
where CE and EE code was diverged large enough which made
non-practicle to determin edition at runtime.

such approach made testing quite challenging as we'll have to
build with different compile flags inorder to run per-edition
test cases

In this commit, we try to retrieve edition info from EMQX's
description text, (put to PT for fast access) at runtime
so we can test ALL editions from a super-set edition (EE).
 2021-11-20 20:41:06 +01:00