9382399728
chore: add an empty file emqx_license.conf to make ci happy
2022-11-30 12:52:26 +01:00
4135910b42
chore: merge master into dev/ee5.0
2022-09-26 09:52:33 +08:00
deff429579
chore: unify default license references in fn
2022-09-14 17:26:48 -03:00
741eb4ff51
docs: apply suggestions from code review
...
Co-authored-by: Zaiming (Stone) Shi <zmstone@gmail.com>
2022-09-14 17:08:45 -03:00
21f89fd83e
chore(license): delete default config and add info to i18n
2022-09-14 17:00:21 -03:00
8cefdb00b8
chore(license): add default key as default value in schema
2022-09-14 09:45:01 -03:00
d4416dc581
chore: drop support for license files (ee5.0)
...
Related issue: EMQX-7247
EMQX ee5.0 is to drop support for both the old license format (x509)
and for files containing the new format.
2022-09-14 09:44:59 -03:00
5a3fb4a011
Merge remote-tracking branch 'origin/master' into dev/ee5.0
2022-08-31 17:11:15 +02:00
2eb078ff3b
chore: bump changed app versions
2022-08-26 14:32:28 +02:00
7a31897f8e
docs: add manual newlines
2022-08-15 16:55:53 -03:00
34c1c61343
docs: apply suggestions from code review
...
Co-authored-by: Zaiming (Stone) Shi <zmstone@gmail.com>
2022-08-15 16:37:50 -03:00
900c6ec43e
docs: add missing descriptions for license schema fields
2022-08-15 14:20:39 -03:00
b3162fe5ff
fix: conflicts between master and ee5.0
2022-08-14 22:24:09 +08:00
e76682d368
test: apply review comments
2022-08-04 15:27:45 -03:00
68592373e3
test: add a couple more tests
2022-08-04 14:01:27 -03:00
7e6b94fc12
test: avoid stopping cover and using meck
2022-08-04 10:23:49 -03:00
69ec76f586
chore(license): treat license file API as an upload (5.0)
...
Improving the HTTP API for license after PR feedback.
2022-08-02 17:25:33 -03:00
889829e47d
docs: use better translation
2022-08-02 09:31:59 -03:00
1a66e53c49
chore(license): change api responses after review
2022-08-02 09:31:59 -03:00
b19e8fb3cd
feat(license): add HTTP API for license
2022-08-02 09:31:59 -03:00
10b19acd35
chore: module and fun call rename
2022-08-02 16:59:56 +08:00
7c34011c12
chore: bump app vsns
2022-07-28 17:45:44 -03:00
f8a1bd0715
feat(license): copy license file to cluster when updating it
2022-07-28 17:29:59 -03:00
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
48f685a0dd
fix: remove the APIs for emqx_hooks:put/2 and emqx_hooks:add/2
2022-06-16 00:43:50 +08:00
c355c40ea8
refactor: call emqx_alarm:ensure_deactivated everywhere
2022-05-13 16:02:55 +02:00
c32fc33c1a
style: cosmetic fix for code style
2022-04-23 09:48:58 +02:00
1c74c83f5e
fix(license): print warning at start
2022-04-22 17:44:18 +02:00
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
d12229700a
feat(license): port 4.4 parser to 5.0
2022-04-11 09:25:06 -03:00
43aa2ea481
docs(schema): Add documentation for license application
2022-04-05 10:32:24 +02:00
4e3fd9febd
style(license): reformat emqx_license application
2022-03-31 17:41:43 +08:00
793add0219
style: use a macro for 'catch'
2022-03-25 08:21:50 +01:00
7923f017be
style(elvis): avoid using if
2022-03-25 07:25:02 +01:00
4f396cceb8
style(emqx_license): erlfmt refomrat apps/emqx_license
2022-03-25 07:13:08 +01:00
4e64010a3b
build: more structured build info
2022-03-02 21:22:03 +01:00
d029a73b99
refactor: make release edition static info at compile time
2022-02-28 16:37:47 +01:00
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
c88504f918
Merge pull request #7023 from zhongwencool/license-alarm-support
...
License alarm support
2022-02-17 22:09:51 +08:00
001b209811
fix(license): don't do not lose watermark fields.
2022-02-17 15:49:41 +08:00
7853eb75df
fix(license): fix crash update license.watermark.
2022-02-17 15:05:22 +08:00
64db085163
chore: EMQ X -> EMQX in source code
2022-02-16 22:08:12 +01:00
0528262705
chore(app.src): EMQ X -> EMQX in .app.src files
2022-02-16 17:51:45 +01:00
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
fa9300e875
feat(emqx_license): allow comma in integer numbers in license body
2022-02-16 15:37:24 +01:00
d900418ce2
fix(license): fix maps:get/2 crash
2022-02-16 18:15:47 +08:00
98b2cd683b
fix: dialyzer warning
2022-02-16 17:41:51 +08:00
34fe5082c4
fix(schema): schema global validations not working
2022-02-16 14:20:15 +08:00
ea558b2bc5
feat(license): license expriy early alarm.
2022-02-16 12:31:25 +08:00
2e94880bb6
docs: More EMQ X -> EMQX rename in descriptive strings
2022-02-15 22:39:11 +01:00
Zaiming (Stone) Shi