yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: final EMQ X -> EMQX

This commit is contained in:
Shawn 2023-03-09 01:58:40 +08:00
parent 27a1128e22
commit 753f70bab8
37 changed files with 70 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.ci/fvt_tests/relup.lux
View File

@ -29,7 +29,7 @@
!export EMQX_LOG__LEVEL=debug !export EMQX_LOG__LEVEL=debug
!./bin/emqx start !./bin/emqx start
?EMQ X .* is started successfully! ?EMQX .* is started successfully!
?SH-PROMPT ?SH-PROMPT
[shell emqx2] [shell emqx2]
@ -43,7 +43,7 @@
!export EMQX_LOG__LEVEL=debug !export EMQX_LOG__LEVEL=debug
!./bin/emqx start !./bin/emqx start
?EMQ X .* is started successfully! ?EMQX .* is started successfully!
?SH-PROMPT ?SH-PROMPT
!./bin/emqx_ctl cluster join emqx@127.0.0.1 !./bin/emqx_ctl cluster join emqx@127.0.0.1

6
CHANGES-4.4.md
View File

@ -235,8 +235,8 @@ This patch release is only to fix windows build which failed on v4.4.0.
### Important changes ### Important changes
- **For Debian/Ubuntu users**, Debian/Ubuntu package (deb) installed EMQ X is now started from systemd. - **For Debian/Ubuntu users**, Debian/Ubuntu package (deb) installed EMQX is now started from systemd.
This is to use systemd's supervision functionality to ensure that EMQ X service restarts after a crash. This is to use systemd's supervision functionality to ensure that EMQX service restarts after a crash.
The package installation service upgrade from init.d to systemd has been verified, The package installation service upgrade from init.d to systemd has been verified,
it is still recommended that you verify and confirm again before deploying to the production environment, it is still recommended that you verify and confirm again before deploying to the production environment,
at least to ensure that systemd is available in your system at least to ensure that systemd is available in your system
@ -280,7 +280,7 @@ This patch release is only to fix windows build which failed on v4.4.0.
- Improve the error log content when the Proxy Protocol message is received without `proxy_protocol` configured. - Improve the error log content when the Proxy Protocol message is received without `proxy_protocol` configured.
- Add additional message attributes to the message reported by the gateway. - Add additional message attributes to the message reported by the gateway.
Messages from gateways such as CoAP, LwM2M, Stomp, ExProto, etc., when converted to EMQ X messages, Messages from gateways such as CoAP, LwM2M, Stomp, ExProto, etc., when converted to EMQX messages,
add fields such as protocol name, protocol version, user name, client IP, etc., add fields such as protocol name, protocol version, user name, client IP, etc.,
which can be used for multi-language hook extension (ExHook) which can be used for multi-language hook extension (ExHook)

4
apps/emqx_auth_http/src/emqx_auth_http.app.src
View File

@ -1,5 +1,5 @@
{application, emqx_auth_http, {application, emqx_auth_http,
[{description, "EMQ X Authentication/ACL with HTTP API"}, [{description, "EMQX Authentication/ACL with HTTP API"},
{vsn, "4.3.11"}, % strict semver, bump manually! {vsn, "4.3.11"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_auth_http_sup]}, {registered, [emqx_auth_http_sup]},
@ -7,7 +7,7 @@
{mod, {emqx_auth_http_app, []}}, {mod, {emqx_auth_http_app, []}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]}, {maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"}, {links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-auth-http"} {"Github", "https://github.com/emqx/emqx-auth-http"}
]} ]}

2
apps/emqx_auth_jwt/src/emqx_auth_jwt.app.src
View File

@ -1,5 +1,5 @@
{application, emqx_auth_jwt, {application, emqx_auth_jwt,
[{description, "EMQ X Authentication with JWT"}, [{description, "EMQX Authentication with JWT"},
{vsn, "4.4.9"}, % strict semver, bump manually! {vsn, "4.4.9"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_auth_jwt_sup]}, {registered, [emqx_auth_jwt_sup]},

4
apps/emqx_auth_ldap/src/emqx_auth_ldap.app.src
View File

@ -1,5 +1,5 @@
{application, emqx_auth_ldap, {application, emqx_auth_ldap,
[{description, "EMQ X Authentication/ACL with LDAP"}, [{description, "EMQX Authentication/ACL with LDAP"},
{vsn, "4.3.7"}, % strict semver, bump manually! {vsn, "4.3.7"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_auth_ldap_sup]}, {registered, [emqx_auth_ldap_sup]},
@ -7,7 +7,7 @@
{mod, {emqx_auth_ldap_app,[]}}, {mod, {emqx_auth_ldap_app,[]}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]}, {maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"}, {links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-auth-ldap"} {"Github", "https://github.com/emqx/emqx-auth-ldap"}
]} ]}

4
apps/emqx_auth_mnesia/src/emqx_auth_mnesia.app.src
View File

@ -1,5 +1,5 @@
{application, emqx_auth_mnesia, {application, emqx_auth_mnesia,
[{description, "EMQ X Authentication with Mnesia"}, [{description, "EMQX Authentication with Mnesia"},
{vsn, "4.3.11"}, % strict semver, bump manually {vsn, "4.3.11"}, % strict semver, bump manually
{modules, []}, {modules, []},
{registered, []}, {registered, []},
@ -7,7 +7,7 @@
{mod, {emqx_auth_mnesia_app,[]}}, {mod, {emqx_auth_mnesia_app,[]}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]}, {maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"}, {links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-auth-mnesia"} {"Github", "https://github.com/emqx/emqx-auth-mnesia"}
]} ]}

4
apps/emqx_auth_mongo/src/emqx_auth_mongo.app.src
View File

@ -1,5 +1,5 @@
{application, emqx_auth_mongo, {application, emqx_auth_mongo,
[{description, "EMQ X Authentication/ACL with MongoDB"}, [{description, "EMQX Authentication/ACL with MongoDB"},
{vsn, "4.4.6"}, % strict semver, bump manually! {vsn, "4.4.6"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_auth_mongo_sup]}, {registered, [emqx_auth_mongo_sup]},
@ -7,7 +7,7 @@
{mod, {emqx_auth_mongo_app,[]}}, {mod, {emqx_auth_mongo_app,[]}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]}, {maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"}, {links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-auth-mongo"} {"Github", "https://github.com/emqx/emqx-auth-mongo"}
]} ]}

4
apps/emqx_auth_mysql/src/emqx_auth_mysql.app.src
View File

@ -1,5 +1,5 @@
{application, emqx_auth_mysql, {application, emqx_auth_mysql,
[{description, "EMQ X Authentication/ACL with MySQL"}, [{description, "EMQX Authentication/ACL with MySQL"},
{vsn, "4.3.5"}, % strict semver, bump manually! {vsn, "4.3.5"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_auth_mysql_sup]}, {registered, [emqx_auth_mysql_sup]},
@ -7,7 +7,7 @@
{mod, {emqx_auth_mysql_app,[]}}, {mod, {emqx_auth_mysql_app,[]}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]}, {maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"}, {links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-auth-mysql"} {"Github", "https://github.com/emqx/emqx-auth-mysql"}
]} ]}

4
apps/emqx_auth_pgsql/src/emqx_auth_pgsql.app.src
View File

@ -1,5 +1,5 @@
{application, emqx_auth_pgsql, {application, emqx_auth_pgsql,
[{description, "EMQ X Authentication/ACL with PostgreSQL"}, [{description, "EMQX Authentication/ACL with PostgreSQL"},
{vsn, "4.4.5"}, % strict semver, bump manually! {vsn, "4.4.5"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_auth_pgsql_sup]}, {registered, [emqx_auth_pgsql_sup]},
@ -7,7 +7,7 @@
{mod, {emqx_auth_pgsql_app,[]}}, {mod, {emqx_auth_pgsql_app,[]}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]}, {maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"}, {links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-auth-pgsql"} {"Github", "https://github.com/emqx/emqx-auth-pgsql"}
]} ]}

4
apps/emqx_auth_redis/src/emqx_auth_redis.app.src
View File

@ -1,5 +1,5 @@
{application, emqx_auth_redis, {application, emqx_auth_redis,
[{description, "EMQ X Authentication/ACL with Redis"}, [{description, "EMQX Authentication/ACL with Redis"},
{vsn, "4.3.5"}, % strict semver, bump manually! {vsn, "4.3.5"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_auth_redis_sup]}, {registered, [emqx_auth_redis_sup]},
@ -7,7 +7,7 @@
{mod, {emqx_auth_redis_app, []}}, {mod, {emqx_auth_redis_app, []}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]}, {maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"}, {links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-auth-redis"} {"Github", "https://github.com/emqx/emqx-auth-redis"}
]} ]}

4
apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.app.src
View File

@ -1,5 +1,5 @@
{application, emqx_bridge_mqtt, {application, emqx_bridge_mqtt,
[{description, "EMQ X Bridge to MQTT Broker"}, [{description, "EMQX Bridge to MQTT Broker"},
{vsn, "4.3.8"}, % strict semver, bump manually! {vsn, "4.3.8"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, []}, {registered, []},
@ -7,7 +7,7 @@
{mod, {emqx_bridge_mqtt_app, []}}, {mod, {emqx_bridge_mqtt_app, []}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]}, {maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"}, {links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-bridge-mqtt"} {"Github", "https://github.com/emqx/emqx-bridge-mqtt"}
]} ]}

4
apps/emqx_coap/src/emqx_coap.app.src
View File

@ -1,5 +1,5 @@
{application, emqx_coap, {application, emqx_coap,
[{description, "EMQ X CoAP Gateway"}, [{description, "EMQX CoAP Gateway"},
{vsn, "4.3.3"}, % strict semver, bump manually! {vsn, "4.3.3"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, []}, {registered, []},
@ -7,7 +7,7 @@
{mod, {emqx_coap_app, []}}, {mod, {emqx_coap_app, []}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]}, {maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"}, {links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-coap"} {"Github", "https://github.com/emqx/emqx-coap"}
]} ]}

4
apps/emqx_exhook/src/emqx_exhook.app.src
View File

@ -1,6 +1,6 @@
%% -*- mode: erlang -*- %% -*- mode: erlang -*-
{application, emqx_exhook, {application, emqx_exhook,
[{description, "EMQ X Extension for Hook"}, [{description, "EMQX Extension for Hook"},
{vsn, "4.4.6"}, {vsn, "4.4.6"},
{modules, []}, {modules, []},
{registered, []}, {registered, []},
@ -8,6 +8,6 @@
{applications, [kernel,stdlib,grpc]}, {applications, [kernel,stdlib,grpc]},
{env,[]}, {env,[]},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]}, {maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"}]} {links, [{"Homepage", "https://emqx.io/"}]}
]}. ]}.

4
apps/emqx_exproto/src/emqx_exproto.app.src
View File

@ -1,5 +1,5 @@
{application, emqx_exproto, {application, emqx_exproto,
[{description, "EMQ X Extension for Protocol"}, [{description, "EMQX Extension for Protocol"},
{vsn, "4.3.15"}, %% 4.3.3 is used by ee {vsn, "4.3.15"}, %% 4.3.3 is used by ee
{modules, []}, {modules, []},
{registered, []}, {registered, []},
@ -7,6 +7,6 @@
{applications, [kernel,stdlib,grpc]}, {applications, [kernel,stdlib,grpc]},
{env,[]}, {env,[]},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]}, {maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"}]} {links, [{"Homepage", "https://emqx.io/"}]}
]}. ]}.

4
apps/emqx_lua_hook/src/emqx_lua_hook.app.src
View File

@ -1,5 +1,5 @@
{application, emqx_lua_hook, {application, emqx_lua_hook,
[{description, "EMQ X Lua Hooks"}, [{description, "EMQX Lua Hooks"},
{vsn, "4.3.2"}, % strict semver, bump manually! {vsn, "4.3.2"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, []}, {registered, []},
@ -7,7 +7,7 @@
{mod, {emqx_lua_hook_app,[]}}, {mod, {emqx_lua_hook_app,[]}},
{env,[]}, {env,[]},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]}, {maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"}, {links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-lua-hook"} {"Github", "https://github.com/emqx/emqx-lua-hook"}
]} ]}

2
apps/emqx_lwm2m/src/emqx_lwm2m.app.src
View File

@ -1,5 +1,5 @@
{application,emqx_lwm2m, {application,emqx_lwm2m,
[{description,"EMQ X LwM2M Gateway"}, [{description,"EMQX LwM2M Gateway"},
{vsn, "4.3.8"}, % strict semver, bump manually! {vsn, "4.3.8"}, % strict semver, bump manually!
{modules,[]}, {modules,[]},
{registered,[emqx_lwm2m_sup]}, {registered,[emqx_lwm2m_sup]},

4
apps/emqx_management/src/emqx_management.app.src
View File

@ -1,5 +1,5 @@
{application, emqx_management, {application, emqx_management,
[{description, "EMQ X Management API and CLI"}, [{description, "EMQX Management API and CLI"},
{vsn, "4.4.13"}, % strict semver, bump manually! {vsn, "4.4.13"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_management_sup]}, {registered, [emqx_management_sup]},
@ -7,7 +7,7 @@
{mod, {emqx_mgmt_app,[]}}, {mod, {emqx_mgmt_app,[]}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]}, {maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"}, {links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-management"} {"Github", "https://github.com/emqx/emqx-management"}
]} ]}

2
apps/emqx_plugin_libs/src/emqx_plugin_libs.app.src
View File

@ -1,5 +1,5 @@
{application, emqx_plugin_libs, {application, emqx_plugin_libs,
[{description, "EMQ X Plugin utility libs"}, [{description, "EMQX Plugin utility libs"},
{vsn, "4.4.7"}, {vsn, "4.4.7"},
{modules, []}, {modules, []},
{applications, [kernel,stdlib]}, {applications, [kernel,stdlib]},

4
apps/emqx_prometheus/src/emqx_prometheus.app.src
View File

@ -1,5 +1,5 @@
{application, emqx_prometheus, {application, emqx_prometheus,
[{description, "Prometheus for EMQ X"}, [{description, "Prometheus for EMQX"},
{vsn, "4.3.2"}, % strict semver, bump manually! {vsn, "4.3.2"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_prometheus_sup]}, {registered, [emqx_prometheus_sup]},
@ -7,7 +7,7 @@
{mod, {emqx_prometheus_app,[]}}, {mod, {emqx_prometheus_app,[]}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]}, {maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"}, {links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-prometheus"} {"Github", "https://github.com/emqx/emqx-prometheus"}
]} ]}

2
apps/emqx_psk_file/src/emqx_psk_file.app.src
View File

@ -7,7 +7,7 @@
{mod,{emqx_psk_file_app,[]}}, {mod,{emqx_psk_file_app,[]}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]}, {maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"}, {links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-psk-file"} {"Github", "https://github.com/emqx/emqx-psk-file"}
]} ]}

4
apps/emqx_recon/src/emqx_recon.app.src
View File

@ -1,5 +1,5 @@
{application, emqx_recon, {application, emqx_recon,
[{description, "EMQ X Recon Plugin"}, [{description, "EMQX Recon Plugin"},
{vsn, "4.3.0"}, % strict semver, bump manually! {vsn, "4.3.0"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, []}, {registered, []},
@ -7,7 +7,7 @@
{mod, {emqx_recon,[]}}, {mod, {emqx_recon,[]}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]}, {maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"}, {links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-recon"} {"Github", "https://github.com/emqx/emqx-recon"}
]} ]}

4
apps/emqx_retainer/src/emqx_retainer.app.src
View File

@ -1,5 +1,5 @@
{application, emqx_retainer, {application, emqx_retainer,
[{description, "EMQ X Retainer"}, [{description, "EMQX Retainer"},
{vsn, "4.4.4"}, % strict semver, bump manually! {vsn, "4.4.4"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_retainer_sup]}, {registered, [emqx_retainer_sup]},
@ -7,7 +7,7 @@
{mod, {emqx_retainer_app,[]}}, {mod, {emqx_retainer_app,[]}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]}, {maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"}, {links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-retainer"} {"Github", "https://github.com/emqx/emqx-retainer"}
]} ]}

4
apps/emqx_rule_engine/src/emqx_rule_engine.app.src
View File

@ -1,5 +1,5 @@
{application, emqx_rule_engine, {application, emqx_rule_engine,
[{description, "EMQ X Rule Engine"}, [{description, "EMQX Rule Engine"},
{vsn, "4.4.15"}, % strict semver, bump manually! {vsn, "4.4.15"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_rule_engine_sup, emqx_rule_registry, emqx_rule_engine_jwt_sup]}, {registered, [emqx_rule_engine_sup, emqx_rule_registry, emqx_rule_engine_jwt_sup]},
@ -7,7 +7,7 @@
{mod, {emqx_rule_engine_app, []}}, {mod, {emqx_rule_engine_app, []}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]}, {maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"}, {links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-rule-engine"} {"Github", "https://github.com/emqx/emqx-rule-engine"}
]} ]}

4
apps/emqx_sasl/src/emqx_sasl.app.src
View File

@ -1,5 +1,5 @@
{application, emqx_sasl, {application, emqx_sasl,
[{description, "EMQ X SASL"}, [{description, "EMQX SASL"},
{vsn, "4.3.0"}, % strict semver, bump manually! {vsn, "4.3.0"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_sasl_sup]}, {registered, [emqx_sasl_sup]},
@ -7,7 +7,7 @@
{mod, {emqx_sasl_app,[]}}, {mod, {emqx_sasl_app,[]}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]}, {maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"}, {links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-sasl"} {"Github", "https://github.com/emqx/emqx-sasl"}
]} ]}

4
apps/emqx_sn/src/emqx_sn.app.src
View File

@ -1,5 +1,5 @@
{application, emqx_sn, {application, emqx_sn,
[{description, "EMQ X MQTT-SN Plugin"}, [{description, "EMQX MQTT-SN Plugin"},
{vsn, "4.3.8"}, % strict semver, bump manually! {vsn, "4.3.8"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, []}, {registered, []},
@ -7,7 +7,7 @@
{mod, {emqx_sn_app,[]}}, {mod, {emqx_sn_app,[]}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]}, {maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"}, {links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-sn"} {"Github", "https://github.com/emqx/emqx-sn"}
]} ]}

4
apps/emqx_stomp/src/emqx_stomp.app.src
View File

@ -1,5 +1,5 @@
{application, emqx_stomp, {application, emqx_stomp,
[{description, "EMQ X Stomp Protocol Plugin"}, [{description, "EMQX Stomp Protocol Plugin"},
{vsn, "4.3.7"}, % strict semver, bump manually! {vsn, "4.3.7"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_stomp_sup]}, {registered, [emqx_stomp_sup]},
@ -7,7 +7,7 @@
{mod, {emqx_stomp,[]}}, {mod, {emqx_stomp,[]}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]}, {maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"}, {links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-stomp"} {"Github", "https://github.com/emqx/emqx-stomp"}
]} ]}

4
apps/emqx_web_hook/src/emqx_web_hook.app.src
View File

@ -1,5 +1,5 @@
{application, emqx_web_hook, {application, emqx_web_hook,
[{description, "EMQ X WebHook Plugin"}, [{description, "EMQX WebHook Plugin"},
{vsn, "4.3.17"}, % strict semver, bump manually! {vsn, "4.3.17"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_web_hook_sup]}, {registered, [emqx_web_hook_sup]},
@ -7,7 +7,7 @@
{mod, {emqx_web_hook_app,[]}}, {mod, {emqx_web_hook_app,[]}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]}, {maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"}, {links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-web-hook"} {"Github", "https://github.com/emqx/emqx-web-hook"}
]} ]}

2
build
View File

@ -304,7 +304,7 @@ make_docker() {
## This function accepts any base docker image, ## This function accepts any base docker image,
## a emqx zip-image, and a image tag (for the image to be built), ## a emqx zip-image, and a image tag (for the image to be built),
## to build a docker image which runs EMQ X ## to build a docker image which runs EMQX
## ##
## Export below variables to quickly build an image ## Export below variables to quickly build an image
## ##

2
lib-ce/emqx_dashboard/src/emqx_dashboard.app.src
View File

@ -7,7 +7,7 @@
{mod, {emqx_dashboard_app,[]}}, {mod, {emqx_dashboard_app,[]}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]}, {maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"}, {links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-dashboard"} {"Github", "https://github.com/emqx/emqx-dashboard"}
]} ]}

2
lib-ce/emqx_modules/src/emqx_modules.app.src
View File

@ -1,5 +1,5 @@
{application, emqx_modules, {application, emqx_modules,
[{description, "EMQ X Module Management"}, [{description, "EMQX Module Management"},
{vsn, "4.4.9"}, {vsn, "4.4.9"},
{modules, []}, {modules, []},
{applications, [kernel,stdlib]}, {applications, [kernel,stdlib]},

4
lib-ce/emqx_telemetry/src/emqx_telemetry.app.src
View File

@ -1,5 +1,5 @@
{application, emqx_telemetry, {application, emqx_telemetry,
[{description, "EMQ X Telemetry"}, [{description, "EMQX Telemetry"},
{vsn, "4.3.5"}, % strict semver, bump manually! {vsn, "4.3.5"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_telemetry_sup]}, {registered, [emqx_telemetry_sup]},
@ -7,7 +7,7 @@
{mod, {emqx_telemetry_app,[]}}, {mod, {emqx_telemetry_app,[]}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]}, {maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"}, {links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-telemetry"} {"Github", "https://github.com/emqx/emqx-telemetry"}
]} ]}

6
rebar.config.erl
View File

@ -186,9 +186,9 @@ distro() ->
_ -> false _ -> false
end. end.
emqx_description(cloud, true) -> "EMQ X Enterprise"; emqx_description(cloud, true) -> "EMQX Enterprise";
emqx_description(cloud, false) -> "EMQ X Broker"; emqx_description(cloud, false) -> "EMQX Broker";
emqx_description(edge, _) -> "EMQ X Edge". emqx_description(edge, _) -> "EMQX Edge".
overlay_vars(_RelType, PkgType, true) -> overlay_vars(_RelType, PkgType, true) ->
ee_overlay_vars(PkgType); ee_overlay_vars(PkgType);

6
scripts/buildx.sh
View File

@ -15,10 +15,10 @@ set -euo pipefail
help() { help() {
echo echo
echo "-h|--help: To display this usage information" echo "-h|--help: To display this usage information"
echo "--profile <PROFILE>: EMQ X profile to build, e.g. emqx, emqx-edge" echo "--profile <PROFILE>: EMQX profile to build, e.g. emqx, emqx-edge"
echo "--pkgtype zip|pkg: Specify which package to build, zip for .zip and pkg for .rpm or .deb" echo "--pkgtype zip|pkg: Specify which package to build, zip for .zip and pkg for .rpm or .deb"
echo "--arch amd64|arm64: Target arch to build the EMQ X package for" echo "--arch amd64|arm64: Target arch to build the EMQX package for"
echo "--src_dir <SRC_DIR>: EMQ X source ode in this dir, default to PWD" echo "--src_dir <SRC_DIR>: EMQX source ode in this dir, default to PWD"
echo "--builder <BUILDER>: Builder image to pull" echo "--builder <BUILDER>: Builder image to pull"
echo " E.g. ghcr.io/emqx/emqx-builder/4.4-20:24.3.4.2-1-debian11" echo " E.g. ghcr.io/emqx/emqx-builder/4.4-20:24.3.4.2-1-debian11"
echo "--ssh: Pass ssh agent to the builder." echo "--ssh: Pass ssh agent to the builder."

4
src/emqx.app.src
View File

@ -1,6 +1,6 @@
{application, emqx, {application, emqx,
[{id, "emqx"}, [{id, "emqx"},
{description, "EMQ X"}, {description, "EMQX"},
%% Note: this version is not the same as the release version! This %% Note: this version is not the same as the release version! This
%% is simply the emqx `application' version, which is separate from %% is simply the emqx `application' version, which is separate from
%% the emqx `release' version, which in turn is comprised of several %% the emqx `release' version, which in turn is comprised of several
@ -21,7 +21,7 @@
{mod, {emqx_app,[]}}, {mod, {emqx_app,[]}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]}, {maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"}, {links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx"} {"Github", "https://github.com/emqx/emqx"}
]} ]}

6
src/emqx.appup.src
View File

@ -2,7 +2,8 @@
%% Unless you know what you are doing, DO NOT edit manually!! %% Unless you know what you are doing, DO NOT edit manually!!
{VSN, {VSN,
[{"4.4.15", [{"4.4.15",
[{load_module,emqx_packet,brutal_purge,soft_purge,[]}, [{load_module,emqx,brutal_purge,soft_purge,[]},
{load_module,emqx_packet,brutal_purge,soft_purge,[]},
{load_module,emqx_relup,brutal_purge,soft_purge,[]}, {load_module,emqx_relup,brutal_purge,soft_purge,[]},
{load_module,emqx_app,brutal_purge,soft_purge,[]}]}, {load_module,emqx_app,brutal_purge,soft_purge,[]}]},
{"4.4.14", {"4.4.14",
@ -499,7 +500,8 @@
[gen_rpc,insecure_auth_fallback_allowed,true]}}]}, [gen_rpc,insecure_auth_fallback_allowed,true]}}]},
{<<".*">>,[]}], {<<".*">>,[]}],
[{"4.4.15", [{"4.4.15",
[{load_module,emqx_packet,brutal_purge,soft_purge,[]}, [{load_module,emqx,brutal_purge,soft_purge,[]},
{load_module,emqx_packet,brutal_purge,soft_purge,[]},
{load_module,emqx_relup,brutal_purge,soft_purge,[]}, {load_module,emqx_relup,brutal_purge,soft_purge,[]},
{load_module,emqx_app,brutal_purge,soft_purge,[]}]}, {load_module,emqx_app,brutal_purge,soft_purge,[]}]},
{"4.4.14", {"4.4.14",

2
src/emqx.erl
View File

@ -20,7 +20,7 @@
-include("logger.hrl"). -include("logger.hrl").
-include("types.hrl"). -include("types.hrl").
-logger_header("[EMQ X]"). -logger_header("[EMQX]").
%% Start/Stop the application %% Start/Stop the application
-export([ start/0 -export([ start/0

2
test/emqx_plugins_SUITE_data/emqx_mini_plugin/src/emqx_mini_plugin.app.src
View File

@ -1,5 +1,5 @@
{application, emqx_mini_plugin, {application, emqx_mini_plugin,
[{description, "An EMQ X plugin for testcase"}, [{description, "An EMQX plugin for testcase"},
{vsn, "0.1"}, {vsn, "0.1"},
{modules, []}, {modules, []},
{registered, []}, {registered, []},