chore: final EMQ X -> EMQX
This commit is contained in:
parent
27a1128e22
commit
753f70bab8
|
@ -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]
|
||||
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
@ -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)
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{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]},
|
||||
|
@ -7,7 +7,7 @@
|
|||
{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"}
|
||||
]}
|
||||
|
|
|
@ -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]},
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{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]},
|
||||
|
@ -7,7 +7,7 @@
|
|||
{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"}
|
||||
]}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{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, []},
|
||||
|
@ -7,7 +7,7 @@
|
|||
{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"}
|
||||
]}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{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]},
|
||||
|
@ -7,7 +7,7 @@
|
|||
{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"}
|
||||
]}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{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]},
|
||||
|
@ -7,7 +7,7 @@
|
|||
{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"}
|
||||
]}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{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]},
|
||||
|
@ -7,7 +7,7 @@
|
|||
{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"}
|
||||
]}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{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]},
|
||||
|
@ -7,7 +7,7 @@
|
|||
{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"}
|
||||
]}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{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, []},
|
||||
|
@ -7,7 +7,7 @@
|
|||
{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"}
|
||||
]}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{application, emqx_coap,
|
||||
[{description, "EMQ X CoAP Gateway"},
|
||||
[{description, "EMQX CoAP Gateway"},
|
||||
{vsn, "4.3.3"}, % strict semver, bump manually!
|
||||
{modules, []},
|
||||
{registered, []},
|
||||
|
@ -7,7 +7,7 @@
|
|||
{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"}
|
||||
]}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
%% -*- mode: erlang -*-
|
||||
{application, emqx_exhook,
|
||||
[{description, "EMQ X Extension for Hook"},
|
||||
[{description, "EMQX Extension for Hook"},
|
||||
{vsn, "4.4.6"},
|
||||
{modules, []},
|
||||
{registered, []},
|
||||
|
@ -8,6 +8,6 @@
|
|||
{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/"}]}
|
||||
]}.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{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, []},
|
||||
|
@ -7,6 +7,6 @@
|
|||
{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/"}]}
|
||||
]}.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{application, emqx_lua_hook,
|
||||
[{description, "EMQ X Lua Hooks"},
|
||||
[{description, "EMQX Lua Hooks"},
|
||||
{vsn, "4.3.2"}, % strict semver, bump manually!
|
||||
{modules, []},
|
||||
{registered, []},
|
||||
|
@ -7,7 +7,7 @@
|
|||
{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"}
|
||||
]}
|
||||
|
|
|
@ -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]},
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{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]},
|
||||
|
@ -7,7 +7,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"}
|
||||
]}
|
||||
|
|
|
@ -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]},
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{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]},
|
||||
|
@ -7,7 +7,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"}
|
||||
]}
|
||||
|
|
|
@ -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"}
|
||||
]}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{application, emqx_recon,
|
||||
[{description, "EMQ X Recon Plugin"},
|
||||
[{description, "EMQX Recon Plugin"},
|
||||
{vsn, "4.3.0"}, % strict semver, bump manually!
|
||||
{modules, []},
|
||||
{registered, []},
|
||||
|
@ -7,7 +7,7 @@
|
|||
{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"}
|
||||
]}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{application, emqx_retainer,
|
||||
[{description, "EMQ X Retainer"},
|
||||
[{description, "EMQX Retainer"},
|
||||
{vsn, "4.4.4"}, % strict semver, bump manually!
|
||||
{modules, []},
|
||||
{registered, [emqx_retainer_sup]},
|
||||
|
@ -7,7 +7,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"}
|
||||
]}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{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]},
|
||||
|
@ -7,7 +7,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"}
|
||||
]}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{application, emqx_sasl,
|
||||
[{description, "EMQ X SASL"},
|
||||
[{description, "EMQX SASL"},
|
||||
{vsn, "4.3.0"}, % strict semver, bump manually!
|
||||
{modules, []},
|
||||
{registered, [emqx_sasl_sup]},
|
||||
|
@ -7,7 +7,7 @@
|
|||
{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"}
|
||||
]}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{application, emqx_sn,
|
||||
[{description, "EMQ X MQTT-SN Plugin"},
|
||||
[{description, "EMQX MQTT-SN Plugin"},
|
||||
{vsn, "4.3.8"}, % strict semver, bump manually!
|
||||
{modules, []},
|
||||
{registered, []},
|
||||
|
@ -7,7 +7,7 @@
|
|||
{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"}
|
||||
]}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{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]},
|
||||
|
@ -7,7 +7,7 @@
|
|||
{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"}
|
||||
]}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{application, emqx_web_hook,
|
||||
[{description, "EMQ X WebHook Plugin"},
|
||||
[{description, "EMQX WebHook Plugin"},
|
||||
{vsn, "4.3.17"}, % strict semver, bump manually!
|
||||
{modules, []},
|
||||
{registered, [emqx_web_hook_sup]},
|
||||
|
@ -7,7 +7,7 @@
|
|||
{mod, {emqx_web_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-web-hook"}
|
||||
]}
|
||||
|
|
2
build
2
build
|
@ -304,7 +304,7 @@ make_docker() {
|
|||
|
||||
## This function accepts any base docker image,
|
||||
## 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
|
||||
##
|
||||
|
|
|
@ -7,7 +7,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"}
|
||||
]}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{application, emqx_modules,
|
||||
[{description, "EMQ X Module Management"},
|
||||
[{description, "EMQX Module Management"},
|
||||
{vsn, "4.4.9"},
|
||||
{modules, []},
|
||||
{applications, [kernel,stdlib]},
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{application, emqx_telemetry,
|
||||
[{description, "EMQ X Telemetry"},
|
||||
[{description, "EMQX Telemetry"},
|
||||
{vsn, "4.3.5"}, % strict semver, bump manually!
|
||||
{modules, []},
|
||||
{registered, [emqx_telemetry_sup]},
|
||||
|
@ -7,7 +7,7 @@
|
|||
{mod, {emqx_telemetry_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-telemetry"}
|
||||
]}
|
||||
|
|
|
@ -186,9 +186,9 @@ distro() ->
|
|||
_ -> false
|
||||
end.
|
||||
|
||||
emqx_description(cloud, true) -> "EMQ X Enterprise";
|
||||
emqx_description(cloud, false) -> "EMQ X Broker";
|
||||
emqx_description(edge, _) -> "EMQ X Edge".
|
||||
emqx_description(cloud, true) -> "EMQX Enterprise";
|
||||
emqx_description(cloud, false) -> "EMQX Broker";
|
||||
emqx_description(edge, _) -> "EMQX Edge".
|
||||
|
||||
overlay_vars(_RelType, PkgType, true) ->
|
||||
ee_overlay_vars(PkgType);
|
||||
|
|
|
@ -15,10 +15,10 @@ set -euo pipefail
|
|||
help() {
|
||||
echo
|
||||
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 "--arch amd64|arm64: Target arch to build the EMQ X package for"
|
||||
echo "--src_dir <SRC_DIR>: EMQ X source ode in this dir, default to PWD"
|
||||
echo "--arch amd64|arm64: Target arch to build the EMQX package for"
|
||||
echo "--src_dir <SRC_DIR>: EMQX source ode in this dir, default to PWD"
|
||||
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 "--ssh: Pass ssh agent to the builder."
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{application, emqx,
|
||||
[{id, "emqx"},
|
||||
{description, "EMQ X"},
|
||||
{description, "EMQX"},
|
||||
%% Note: this version is not the same as the release version! This
|
||||
%% is simply the emqx `application' version, which is separate from
|
||||
%% the emqx `release' version, which in turn is comprised of several
|
||||
|
@ -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"}
|
||||
]}
|
||||
|
|
|
@ -2,7 +2,8 @@
|
|||
%% Unless you know what you are doing, DO NOT edit manually!!
|
||||
{VSN,
|
||||
[{"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_app,brutal_purge,soft_purge,[]}]},
|
||||
{"4.4.14",
|
||||
|
@ -499,7 +500,8 @@
|
|||
[gen_rpc,insecure_auth_fallback_allowed,true]}}]},
|
||||
{<<".*">>,[]}],
|
||||
[{"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_app,brutal_purge,soft_purge,[]}]},
|
||||
{"4.4.14",
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
-include("logger.hrl").
|
||||
-include("types.hrl").
|
||||
|
||||
-logger_header("[EMQ X]").
|
||||
-logger_header("[EMQX]").
|
||||
|
||||
%% Start/Stop the application
|
||||
-export([ start/0
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{application, emqx_mini_plugin,
|
||||
[{description, "An EMQ X plugin for testcase"},
|
||||
[{description, "An EMQX plugin for testcase"},
|
||||
{vsn, "0.1"},
|
||||
{modules, []},
|
||||
{registered, []},
|
||||
|
|
Loading…
Reference in New Issue