Merge pull request #7034 from zmstone/chore-rename-emqx-no-space

chore: rename EMQ X to EMQX (conf and app.src)

apps/emqx/etc/emqx.conf

@@ -53,7 +53,7 @@ listeners.tcp.default {
     "allow all"
   ]
 
-  ## Enable the Proxy Protocol V1/2 if the EMQ X cluster is deployed
+  ## Enable the Proxy Protocol V1/2 if the EMQX cluster is deployed
   ## behind HAProxy or Nginx.
   ##
   ## See: https://www.haproxy.com/blog/haproxy/proxy-protocol/
@@ -63,7 +63,7 @@ listeners.tcp.default {
   ## Default: false
   proxy_protocol = false
 
-  ## Sets the timeout for proxy protocol. EMQ X will close the TCP connection
+  ## Sets the timeout for proxy protocol. EMQX will close the TCP connection
   ## if no proxy protocol packet received within the timeout.
   ##
   ## @doc listeners.tcp.<name>.proxy_protocol_timeout
@@ -152,7 +152,7 @@ listeners.ssl.default {
     "allow all"
   ]
 
-  ## Enable the Proxy Protocol V1/2 if the EMQ X cluster is deployed
+  ## Enable the Proxy Protocol V1/2 if the EMQX cluster is deployed
   ## behind HAProxy or Nginx.
   ##
   ## See: https://www.haproxy.com/blog/haproxy/proxy-protocol/
@@ -162,7 +162,7 @@ listeners.ssl.default {
   ## Default: true
   proxy_protocol = false
 
-  ## Sets the timeout for proxy protocol. EMQ X will close the TCP connection
+  ## Sets the timeout for proxy protocol. EMQX will close the TCP connection
   ## if no proxy protocol packet received within the timeout.
   ##
   ## @doc listeners.ssl.<name>.proxy_protocol_timeout
@@ -339,7 +339,7 @@ listeners.ws.default {
     "allow all"
   ]
 
-  ## Enable the Proxy Protocol V1/2 if the EMQ X cluster is deployed
+  ## Enable the Proxy Protocol V1/2 if the EMQX cluster is deployed
   ## behind HAProxy or Nginx.
   ##
   ## See: https://www.haproxy.com/blog/haproxy/proxy-protocol/
@@ -349,7 +349,7 @@ listeners.ws.default {
   ## Default: true
   proxy_protocol = false
 
-  ## Sets the timeout for proxy protocol. EMQ X will close the TCP connection
+  ## Sets the timeout for proxy protocol. EMQX will close the TCP connection
   ## if no proxy protocol packet received within the timeout.
   ##
   ## @doc listeners.ws.<name>.proxy_protocol_timeout
@@ -442,7 +442,7 @@ listeners.wss.default {
     "allow all"
   ]
 
-  ## Enable the Proxy Protocol V1/2 if the EMQ X cluster is deployed
+  ## Enable the Proxy Protocol V1/2 if the EMQX cluster is deployed
   ## behind HAProxy or Nginx.
   ##
   ## See: https://www.haproxy.com/blog/haproxy/proxy-protocol/
@@ -452,7 +452,7 @@ listeners.wss.default {
   ## Default: true
   proxy_protocol = false
 
-  ## Sets the timeout for proxy protocol. EMQ X will close the TCP connection
+  ## Sets the timeout for proxy protocol. EMQX will close the TCP connection
   ## if no proxy protocol packet received within the timeout.
   ##
   ## @doc listeners.wss.<name>.proxy_protocol_timeout
@@ -1567,7 +1567,7 @@ example_common_websocket_options {
   ## Default: ""
   websocket.check_origins = "http://localhost:18083, http://127.0.0.1:18083"
 
-  ## Specify which HTTP header for real source IP if the EMQ X cluster is
+  ## Specify which HTTP header for real source IP if the EMQX cluster is
   ## deployed behind NGINX or HAProxy.
   ##
   ## @doc listeners.<name>.websocket.proxy_address_header
@@ -1575,7 +1575,7 @@ example_common_websocket_options {
   ## Default: X-Forwarded-For
   websocket.proxy_address_header = X-Forwarded-For
 
-  ## Specify which HTTP header for real source port if the EMQ X cluster is
+  ## Specify which HTTP header for real source port if the EMQX cluster is
   ## deployed behind NGINX or HAProxy.
   ##
   ## @doc listeners.<name>.websocket.proxy_port_header

apps/emqx/src/emqx.app.src

@@ -1,7 +1,7 @@
 %% -*- mode: erlang -*-
 {application, emqx,
  [{id, "emqx"},
-  {description, "EMQ X Core"},
+  {description, "EMQX Core"},
   {vsn, "5.0.0"}, % strict semver, bump manually!
   {modules, []},
   {registered, []},
@@ -21,7 +21,7 @@
   {mod, {emqx_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"}
           ]}

apps/emqx/src/emqx_limiter/src/emqx_limiter.app.src

@@ -1,6 +1,6 @@
 %% -*- mode: erlang -*-
 {application, emqx_limiter,
- [{description, "EMQ X Hierarchical Limiter"},
+ [{description, "EMQX Hierarchical Limiter"},
   {vsn, "1.0.0"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_limiter_sup]},
@@ -8,6 +8,6 @@
   {mod, {emqx_limiter_app,[]}},
   {env, []},
   {licenses, ["Apache-2.0"]},
-  {maintainers, ["EMQ X Team <contact@emqx.io>"]},
+  {maintainers, ["EMQX Team <contact@emqx.io>"]},
   {links, []}
  ]}.

apps/emqx_authn/src/emqx_authn.app.src

@@ -1,6 +1,6 @@
 %% -*- mode: erlang -*-
 {application, emqx_authn,
- [{description, "EMQ X Authentication"},
+ [{description, "EMQX Authentication"},
   {vsn, "0.1.0"},
   {modules, []},
   {registered, [emqx_authn_sup, emqx_authn_registry]},
@@ -8,6 +8,6 @@
   {mod, {emqx_authn_app,[]}},
   {env, []},
   {licenses, ["Apache-2.0"]},
-  {maintainers, ["EMQ X Team <contact@emqx.io>"]},
+  {maintainers, ["EMQX Team <contact@emqx.io>"]},
   {links, [{"Homepage", "https://emqx.io/"}]}
  ]}.

apps/emqx_bridge/etc/emqx_bridge.conf

@@ -1,5 +1,5 @@
 ##--------------------------------------------------------------------
-## EMQ X Bridge
+## EMQX Bridge
 ##--------------------------------------------------------------------
 
 ## MQTT bridges to/from another MQTT broker

apps/emqx_conf/etc/emqx_conf.conf

@@ -5,7 +5,7 @@
 ## 3. File {{ platform_data_dir }}/configs/local-override.conf
 ##
 ## The *-override.conf files are overwritten at runtime when changes
-## are made from EMQ X dashboard UI, management HTTP API, or CLI.
+## are made from EMQX dashboard UI, management HTTP API, or CLI.
 
 ##==================================================================
 ## Node

apps/emqx_dashboard/etc/emqx_dashboard.conf

@@ -1,5 +1,5 @@
 ##--------------------------------------------------------------------
-## EMQ X Dashboard
+## EMQX Dashboard
 ##--------------------------------------------------------------------
 
 dashboard {

apps/emqx_dashboard/src/emqx_dashboard.app.src

@@ -1,6 +1,6 @@
 %% -*- mode: erlang -*-
 {application, emqx_dashboard,
- [{description, "EMQ X Web Dashboard"},
+ [{description, "EMQX Web Dashboard"},
   {vsn, "5.0.0"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_dashboard_sup]},
@@ -8,7 +8,7 @@
   {mod, {emqx_dashboard_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-dashboard"}
           ]}

apps/emqx_exhook/etc/emqx_exhook.conf

@@ -1,5 +1,5 @@
 ##====================================================================
-## EMQ X Hooks
+## EMQX Hooks
 ##====================================================================
 
 exhook {

apps/emqx_exhook/src/emqx_exhook.app.src

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

apps/emqx_gateway/etc/emqx_gateway.conf

@@ -1,5 +1,5 @@
 ##--------------------------------------------------------------------
-## EMQ X Gateway configurations
+## EMQX Gateway configurations
 ##--------------------------------------------------------------------
 
 ## No gateway by default.

apps/emqx_machine/src/emqx_machine.app.src

@@ -1,7 +1,7 @@
 %% -*- mode: erlang -*-
 {application, emqx_machine,
  [{id, "emqx_machine"},
-  {description, "The EMQ X Machine"},
+  {description, "The EMQX Machine"},
   {vsn, "0.1.0"}, % strict semver, bump manually!
   {modules, []},
   {registered, []},
@@ -9,7 +9,7 @@
   {mod, {emqx_machine_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"}
           ]}

apps/emqx_management/src/emqx_management.app.src

@@ -1,6 +1,6 @@
 %% -*- mode: erlang -*-
 {application, emqx_management,
- [{description, "EMQ X Management API and CLI"},
+ [{description, "EMQX Management API and CLI"},
   {vsn, "5.0.0"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_management_sup]},
@@ -8,7 +8,7 @@
   {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"}
           ]}

apps/emqx_modules/src/emqx_modules.app.src

@@ -1,6 +1,6 @@
 %% -*- mode: erlang -*-
 {application, emqx_modules,
- [{description, "EMQ X Modules"},
+ [{description, "EMQX Modules"},
   {vsn, "5.0.0"},
   {modules, []},
   {applications, [kernel,stdlib,emqx]},

apps/emqx_plugin_libs/src/emqx_plugin_libs.app.src

@@ -1,6 +1,6 @@
 %% -*- mode: erlang -*-
 {application, emqx_plugin_libs,
- [{description, "EMQ X Plugin utility libs"},
+ [{description, "EMQX Plugin utility libs"},
   {vsn, "4.3.1"},
   {modules, []},
   {applications, [kernel,stdlib]},

apps/emqx_plugins/src/emqx_plugins.app.src

@@ -1,6 +1,6 @@
 %% -*- mode: erlang -*-
 {application, emqx_plugins,
- [{description, "EMQ X Plugin Management"},
+ [{description, "EMQX Plugin Management"},
   {vsn, "0.1.0"},
   {modules, []},
   {mod, {emqx_plugins_app,[]}},

apps/emqx_prometheus/etc/emqx_prometheus.conf

@@ -1,5 +1,5 @@
 ##--------------------------------------------------------------------
-## emqx_prometheus for EMQ X
+## emqx_prometheus for EMQX
 ##--------------------------------------------------------------------
 prometheus {
     push_gateway_server = "http://127.0.0.1:9091"

apps/emqx_prometheus/src/emqx_prometheus.app.src

@@ -1,6 +1,6 @@
 %% -*- mode: erlang -*-
 {application, emqx_prometheus,
- [{description, "Prometheus for EMQ X"},
+ [{description, "Prometheus for EMQX"},
   {vsn, "5.0.0"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_prometheus_sup]},
@@ -8,7 +8,7 @@
   {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"}
           ]}

apps/emqx_psk/etc/emqx_psk.conf

@@ -1,5 +1,5 @@
 ##--------------------------------------------------------------------
-## EMQ X PSK
+## EMQX PSK
 ##--------------------------------------------------------------------
 
 psk_authentication {

apps/emqx_psk/src/emqx_psk.app.src

@@ -1,6 +1,6 @@
 %% -*- mode: erlang -*-
 {application, emqx_psk,
- [{description, "EMQ X PSK"},
+ [{description, "EMQX PSK"},
   {vsn, "5.0.0"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_psk_sup]},
@@ -8,7 +8,7 @@
   {mod, {emqx_psk_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"}
           ]}

apps/emqx_retainer/etc/emqx_retainer.conf

@@ -1,5 +1,5 @@
 ##--------------------------------------------------------------------
-## EMQ X Retainer
+## EMQX Retainer
 ##--------------------------------------------------------------------
 
 ## Where to store the retained messages.

apps/emqx_retainer/src/emqx_retainer.app.src

@@ -1,6 +1,6 @@
 %% -*- mode: erlang -*-
 {application, emqx_retainer,
- [{description, "EMQ X Retainer"},
+ [{description, "EMQX Retainer"},
   {vsn, "5.0.0"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_retainer_sup]},
@@ -8,7 +8,7 @@
   {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"}
           ]}

apps/emqx_rule_engine/etc/emqx_rule_engine.conf

@@ -1,5 +1,5 @@
 ##====================================================================
-## Rule Engine for EMQ X R5.0
+## Rule Engine for EMQX R5.0
 ##====================================================================
 rule_engine {
     ignore_sys_message = true

apps/emqx_rule_engine/src/emqx_rule_engine.app.src

@@ -1,6 +1,6 @@
 %% -*- mode: erlang -*-
 {application, emqx_rule_engine,
- [{description, "EMQ X Rule Engine"},
+ [{description, "EMQX Rule Engine"},
   {vsn, "5.0.0"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_rule_engine_sup, emqx_rule_engine]},
@@ -8,7 +8,7 @@
   {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"}
           ]}

apps/emqx_slow_subs/etc/emqx_slow_subs.conf

@@ -1,5 +1,5 @@
 ##--------------------------------------------------------------------
-## EMQ X Slow Subscribers Statistics
+## EMQX Slow Subscribers Statistics
 ##--------------------------------------------------------------------
 
 slow_subs {

apps/emqx_slow_subs/src/emqx_slow_subs.app.src

@@ -1,5 +1,5 @@
 {application, emqx_slow_subs,
- [{description, "EMQ X Slow Subscribers Statistics"},
+ [{description, "EMQX Slow Subscribers Statistics"},
   {vsn, "1.0.0"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_slow_subs_sup]},
@@ -7,6 +7,6 @@
   {mod, {emqx_slow_subs_app,[]}},
   {env, []},
   {licenses, ["Apache-2.0"]},
-  {maintainers, ["EMQ X Team <contact@emqx.io>"]},
+  {maintainers, ["EMQX Team <contact@emqx.io>"]},
   {links, []}
  ]}.

apps/emqx_statsd/etc/emqx_statsd.conf

@@ -1,5 +1,5 @@
 ##--------------------------------------------------------------------
-## Statsd for EMQ X
+## Statsd for EMQX
 ##--------------------------------------------------------------------
 
 statsd {

lib-ee/emqx_enterprise_conf/src/emqx_enterprise_conf.app.src

@@ -1,5 +1,5 @@
 {application, emqx_enterprise_conf,
- [{description, "EMQ X Enterprise configuration schema"},
+ [{description, "EMQX Enterprise configuration schema"},
   {vsn, "0.1.0"},
   {registered, []},
   {applications,

lib-ee/emqx_license/src/emqx_license.app.src

@@ -1,5 +1,5 @@
 {application,emqx_license,
-             [{description,"EMQ X License"},
+             [{description,"EMQX License"},
               {vsn,"5.0.0"},
               {modules,[]},
               {registered,[emqx_license_sup]},

rebar.config.erl

@@ -218,9 +218,9 @@ relx(Vsn, RelType, PkgType, Edition) ->
                      | overlay_vars(RelType, PkgType, Edition)]}
     ].
 
-emqx_description(cloud, ee) -> "EMQ X Enterprise Edition";
-emqx_description(cloud, ce) -> "EMQ X Community Edition";
-emqx_description(edge, ce)  -> "EMQ X Edge Edition".
+emqx_description(cloud, ee) -> "EMQX Enterprise Edition";
+emqx_description(cloud, ce) -> "EMQX Community Edition";
+emqx_description(edge, ce)  -> "EMQX Edge Edition".
 
 overlay_vars(RelType, PkgType, Edition) ->
     overlay_vars_rel(RelType)