Merge pull request #10458 from zhongwencool/hide-plugins-conf

feat: hide plugins configuration
This commit is contained in:
zhongwencool 2023-04-20 18:44:19 +08:00 committed by GitHub
commit 0101a7b80f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 16 deletions

View File

@ -29,7 +29,7 @@
namespace() -> "plugin". namespace() -> "plugin".
roots() -> [?CONF_ROOT]. roots() -> [{?CONF_ROOT, ?HOCON(?R_REF(?CONF_ROOT), #{importance => ?IMPORTANCE_LOW})}].
fields(?CONF_ROOT) -> fields(?CONF_ROOT) ->
#{ #{
@ -73,16 +73,19 @@ states(type) -> ?ARRAY(?R_REF(state));
states(required) -> false; states(required) -> false;
states(default) -> []; states(default) -> [];
states(desc) -> ?DESC(states); states(desc) -> ?DESC(states);
states(importance) -> ?IMPORTANCE_HIGH;
states(_) -> undefined. states(_) -> undefined.
install_dir(type) -> string(); install_dir(type) -> string();
install_dir(required) -> false; install_dir(required) -> false;
%% runner's root dir %% runner's root dir todo move to data dir in 5.1
install_dir(default) -> <<"plugins">>; install_dir(default) -> <<"plugins">>;
install_dir(T) when T =/= desc -> undefined; install_dir(desc) -> ?DESC(install_dir);
install_dir(desc) -> ?DESC(install_dir). install_dir(importance) -> ?IMPORTANCE_LOW;
install_dir(_) -> undefined.
check_interval(type) -> emqx_schema:duration(); check_interval(type) -> emqx_schema:duration();
check_interval(default) -> <<"5s">>; check_interval(default) -> <<"5s">>;
check_interval(T) when T =/= desc -> undefined; check_interval(desc) -> ?DESC(check_interval);
check_interval(desc) -> ?DESC(check_interval). check_interval(deprecated) -> {since, "5.0.24"};
check_interval(_) -> undefined.

View File

@ -2,7 +2,7 @@
{application, emqx_prometheus, [ {application, emqx_prometheus, [
{description, "Prometheus for EMQX"}, {description, "Prometheus for EMQX"},
% strict semver, bump manually! % strict semver, bump manually!
{vsn, "5.0.9"}, {vsn, "5.0.10"},
{modules, []}, {modules, []},
{registered, [emqx_prometheus_sup]}, {registered, [emqx_prometheus_sup]},
{applications, [kernel, stdlib, prometheus, emqx, emqx_management]}, {applications, [kernel, stdlib, prometheus, emqx, emqx_management]},

View File

@ -122,13 +122,7 @@ prometheus_config_example() ->
interval => "15s", interval => "15s",
push_gateway_server => <<"http://127.0.0.1:9091">>, push_gateway_server => <<"http://127.0.0.1:9091">>,
headers => #{'header-name' => 'header-value'}, headers => #{'header-name' => 'header-value'},
job_name => <<"${name}/instance/${name}~${host}">>, job_name => <<"${name}/instance/${name}~${host}">>
vm_dist_collector => enabled,
mnesia_collector => enabled,
vm_statistics_collector => enabled,
vm_system_info_collector => enabled,
vm_memory_collector => enabled,
vm_msacc_collector => enabled
}. }.
prometheus_data_schema() -> prometheus_data_schema() ->

View File

@ -2,7 +2,7 @@
{application, emqx_rule_engine, [ {application, emqx_rule_engine, [
{description, "EMQX Rule Engine"}, {description, "EMQX Rule Engine"},
% strict semver, bump manually! % strict semver, bump manually!
{vsn, "5.0.14"}, {vsn, "5.0.15"},
{modules, []}, {modules, []},
{registered, [emqx_rule_engine_sup, emqx_rule_engine]}, {registered, [emqx_rule_engine_sup, emqx_rule_engine]},
{applications, [kernel, stdlib, rulesql, getopt, emqx_ctl]}, {applications, [kernel, stdlib, rulesql, getopt, emqx_ctl]},

View File

@ -0,0 +1,3 @@
Set the level of plugin configuration options to low level,
in most cases, users only need to manage plugins on the dashboard
without the need for manual modification, so we lowered the level.

View File

@ -1,6 +1,6 @@
{application, emqx_ee_connector, [ {application, emqx_ee_connector, [
{description, "EMQX Enterprise connectors"}, {description, "EMQX Enterprise connectors"},
{vsn, "0.1.10"}, {vsn, "0.1.11"},
{registered, []}, {registered, []},
{applications, [ {applications, [
kernel, kernel,