Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: final EMQ X -> EMQX #10099

Merged
merged 4 commits into from
Mar 9, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .ci/fvt_tests/relup.lux
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
!export EMQX_LOG__LEVEL=debug

!./bin/emqx start
?EMQ X .* is started successfully!
?EMQX .* is started successfully!
?SH-PROMPT

[shell emqx2]
Expand All @@ -43,7 +43,7 @@
!export EMQX_LOG__LEVEL=debug

!./bin/emqx start
?EMQ X .* is started successfully!
?EMQX .* is started successfully!
?SH-PROMPT

!./bin/emqx_ctl cluster join emqx@127.0.0.1
Expand Down
6 changes: 3 additions & 3 deletions CHANGES-4.4.md
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,8 @@ This patch release is only to fix windows build which failed on v4.4.0.

### Important changes

- **For Debian/Ubuntu users**, Debian/Ubuntu package (deb) installed EMQ X is now started from systemd.
This is to use systemd's supervision functionality to ensure that EMQ X service restarts after a crash.
- **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 EMQX service restarts after a crash.
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,
at least to ensure that systemd is available in your system
Expand Down Expand Up @@ -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.

- 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.,
which can be used for multi-language hook extension (ExHook)

Expand Down
4 changes: 2 additions & 2 deletions apps/emqx_auth_http/src/emqx_auth_http.app.src
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{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!
{modules, []},
{registered, [emqx_auth_http_sup]},
{applications, [kernel,stdlib,ehttpc]},
{mod, {emqx_auth_http_app, []}},
{env, []},
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]},
{maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-auth-http"}
]}
Expand Down
2 changes: 1 addition & 1 deletion apps/emqx_auth_jwt/src/emqx_auth_jwt.app.src
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{application, emqx_auth_jwt,
[{description, "EMQ X Authentication with JWT"},
[{description, "EMQX Authentication with JWT"},
{vsn, "4.4.9"}, % strict semver, bump manually!
{modules, []},
{registered, [emqx_auth_jwt_sup]},
Expand Down
4 changes: 2 additions & 2 deletions apps/emqx_auth_ldap/src/emqx_auth_ldap.app.src
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{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!
{modules, []},
{registered, [emqx_auth_ldap_sup]},
{applications, [kernel,stdlib,eldap2,ecpool]},
{mod, {emqx_auth_ldap_app,[]}},
{env, []},
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]},
{maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-auth-ldap"}
]}
Expand Down
4 changes: 2 additions & 2 deletions apps/emqx_auth_mnesia/src/emqx_auth_mnesia.app.src
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{application, emqx_auth_mnesia,
[{description, "EMQ X Authentication with Mnesia"},
[{description, "EMQX Authentication with Mnesia"},
{vsn, "4.3.11"}, % strict semver, bump manually
{modules, []},
{registered, []},
{applications, [kernel,stdlib,mnesia]},
{mod, {emqx_auth_mnesia_app,[]}},
{env, []},
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]},
{maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-auth-mnesia"}
]}
Expand Down
4 changes: 2 additions & 2 deletions apps/emqx_auth_mongo/src/emqx_auth_mongo.app.src
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{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!
{modules, []},
{registered, [emqx_auth_mongo_sup]},
{applications, [kernel,stdlib,mongodb,ecpool]},
{mod, {emqx_auth_mongo_app,[]}},
{env, []},
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]},
{maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-auth-mongo"}
]}
Expand Down
4 changes: 2 additions & 2 deletions apps/emqx_auth_mysql/src/emqx_auth_mysql.app.src
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{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!
{modules, []},
{registered, [emqx_auth_mysql_sup]},
{applications, [kernel,stdlib,mysql,ecpool]},
{mod, {emqx_auth_mysql_app,[]}},
{env, []},
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]},
{maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-auth-mysql"}
]}
Expand Down
4 changes: 2 additions & 2 deletions apps/emqx_auth_pgsql/src/emqx_auth_pgsql.app.src
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{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!
{modules, []},
{registered, [emqx_auth_pgsql_sup]},
{applications, [kernel,stdlib,epgsql,ecpool]},
{mod, {emqx_auth_pgsql_app,[]}},
{env, []},
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]},
{maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-auth-pgsql"}
]}
Expand Down
4 changes: 2 additions & 2 deletions apps/emqx_auth_redis/src/emqx_auth_redis.app.src
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{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!
{modules, []},
{registered, [emqx_auth_redis_sup]},
{applications, [kernel,stdlib,eredis,eredis_cluster,ecpool]},
{mod, {emqx_auth_redis_app, []}},
{env, []},
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]},
{maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-auth-redis"}
]}
Expand Down
4 changes: 2 additions & 2 deletions apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.app.src
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{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!
{modules, []},
{registered, []},
{applications, [kernel,stdlib,replayq,emqtt]},
{mod, {emqx_bridge_mqtt_app, []}},
{env, []},
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]},
{maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-bridge-mqtt"}
]}
Expand Down
4 changes: 2 additions & 2 deletions apps/emqx_coap/src/emqx_coap.app.src
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{application, emqx_coap,
[{description, "EMQ X CoAP Gateway"},
[{description, "EMQX CoAP Gateway"},
{vsn, "4.3.3"}, % strict semver, bump manually!
{modules, []},
{registered, []},
{applications, [kernel,stdlib,gen_coap]},
{mod, {emqx_coap_app, []}},
{env, []},
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]},
{maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-coap"}
]}
Expand Down
4 changes: 2 additions & 2 deletions apps/emqx_exhook/src/emqx_exhook.app.src
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
%% -*- mode: erlang -*-
{application, emqx_exhook,
[{description, "EMQ X Extension for Hook"},
[{description, "EMQX Extension for Hook"},
{vsn, "4.4.6"},
{modules, []},
{registered, []},
{mod, {emqx_exhook_app, []}},
{applications, [kernel,stdlib,grpc]},
{env,[]},
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]},
{maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"}]}
]}.
4 changes: 2 additions & 2 deletions apps/emqx_exproto/src/emqx_exproto.app.src
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{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
{modules, []},
{registered, []},
{mod, {emqx_exproto_app, []}},
{applications, [kernel,stdlib,grpc]},
{env,[]},
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]},
{maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"}]}
]}.
4 changes: 2 additions & 2 deletions apps/emqx_lua_hook/src/emqx_lua_hook.app.src
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{application, emqx_lua_hook,
[{description, "EMQ X Lua Hooks"},
[{description, "EMQX Lua Hooks"},
{vsn, "4.3.2"}, % strict semver, bump manually!
{modules, []},
{registered, []},
{applications, [kernel,stdlib]},
{mod, {emqx_lua_hook_app,[]}},
{env,[]},
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]},
{maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-lua-hook"}
]}
Expand Down
2 changes: 1 addition & 1 deletion apps/emqx_lwm2m/src/emqx_lwm2m.app.src
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{application,emqx_lwm2m,
[{description,"EMQ X LwM2M Gateway"},
[{description,"EMQX LwM2M Gateway"},
{vsn, "4.3.8"}, % strict semver, bump manually!
{modules,[]},
{registered,[emqx_lwm2m_sup]},
Expand Down
4 changes: 2 additions & 2 deletions apps/emqx_management/src/emqx_management.app.src
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{application, emqx_management,
[{description, "EMQ X Management API and CLI"},
[{description, "EMQX Management API and CLI"},
{vsn, "4.4.13"}, % strict semver, bump manually!
{modules, []},
{registered, [emqx_management_sup]},
{applications, [kernel,stdlib,emqx_plugin_libs,minirest]},
{mod, {emqx_mgmt_app,[]}},
{env, []},
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]},
{maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-management"}
]}
Expand Down
2 changes: 1 addition & 1 deletion apps/emqx_plugin_libs/src/emqx_plugin_libs.app.src
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{application, emqx_plugin_libs,
[{description, "EMQ X Plugin utility libs"},
[{description, "EMQX Plugin utility libs"},
{vsn, "4.4.7"},
{modules, []},
{applications, [kernel,stdlib]},
Expand Down
4 changes: 2 additions & 2 deletions apps/emqx_prometheus/src/emqx_prometheus.app.src
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{application, emqx_prometheus,
[{description, "Prometheus for EMQ X"},
[{description, "Prometheus for EMQX"},
{vsn, "4.3.2"}, % strict semver, bump manually!
{modules, []},
{registered, [emqx_prometheus_sup]},
{applications, [kernel,stdlib,prometheus]},
{mod, {emqx_prometheus_app,[]}},
{env, []},
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]},
{maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-prometheus"}
]}
Expand Down
2 changes: 1 addition & 1 deletion apps/emqx_psk_file/src/emqx_psk_file.app.src
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{mod,{emqx_psk_file_app,[]}},
{env, []},
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]},
{maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-psk-file"}
]}
Expand Down
4 changes: 2 additions & 2 deletions apps/emqx_recon/src/emqx_recon.app.src
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{application, emqx_recon,
[{description, "EMQ X Recon Plugin"},
[{description, "EMQX Recon Plugin"},
{vsn, "4.3.0"}, % strict semver, bump manually!
{modules, []},
{registered, []},
{applications, [kernel,stdlib,recon]},
{mod, {emqx_recon,[]}},
{env, []},
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]},
{maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-recon"}
]}
Expand Down
4 changes: 2 additions & 2 deletions apps/emqx_retainer/src/emqx_retainer.app.src
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{application, emqx_retainer,
[{description, "EMQ X Retainer"},
[{description, "EMQX Retainer"},
{vsn, "4.4.4"}, % strict semver, bump manually!
{modules, []},
{registered, [emqx_retainer_sup]},
{applications, [kernel,stdlib]},
{mod, {emqx_retainer_app,[]}},
{env, []},
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]},
{maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-retainer"}
]}
Expand Down
4 changes: 2 additions & 2 deletions apps/emqx_rule_engine/src/emqx_rule_engine.app.src
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{application, emqx_rule_engine,
[{description, "EMQ X Rule Engine"},
[{description, "EMQX Rule Engine"},
{vsn, "4.4.15"}, % strict semver, bump manually!
{modules, []},
{registered, [emqx_rule_engine_sup, emqx_rule_registry, emqx_rule_engine_jwt_sup]},
{applications, [kernel,stdlib,rulesql,getopt,jose]},
{mod, {emqx_rule_engine_app, []}},
{env, []},
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]},
{maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-rule-engine"}
]}
Expand Down
4 changes: 2 additions & 2 deletions apps/emqx_sasl/src/emqx_sasl.app.src
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{application, emqx_sasl,
[{description, "EMQ X SASL"},
[{description, "EMQX SASL"},
{vsn, "4.3.0"}, % strict semver, bump manually!
{modules, []},
{registered, [emqx_sasl_sup]},
{applications, [kernel,stdlib,pbkdf2]},
{mod, {emqx_sasl_app,[]}},
{env, []},
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]},
{maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-sasl"}
]}
Expand Down
4 changes: 2 additions & 2 deletions apps/emqx_sn/src/emqx_sn.app.src
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{application, emqx_sn,
[{description, "EMQ X MQTT-SN Plugin"},
[{description, "EMQX MQTT-SN Plugin"},
{vsn, "4.3.8"}, % strict semver, bump manually!
{modules, []},
{registered, []},
{applications, [kernel,stdlib,esockd]},
{mod, {emqx_sn_app,[]}},
{env, []},
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]},
{maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-sn"}
]}
Expand Down
4 changes: 2 additions & 2 deletions apps/emqx_stomp/src/emqx_stomp.app.src
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{application, emqx_stomp,
[{description, "EMQ X Stomp Protocol Plugin"},
[{description, "EMQX Stomp Protocol Plugin"},
{vsn, "4.3.7"}, % strict semver, bump manually!
{modules, []},
{registered, [emqx_stomp_sup]},
{applications, [kernel,stdlib]},
{mod, {emqx_stomp,[]}},
{env, []},
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]},
{maintainers, ["EMQX Team <contact@emqx.io>"]},
{links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://github.com/emqx/emqx-stomp"}
]}
Expand Down