diff --git a/apps/emqx_bridge_opents/src/emqx_bridge_opents.app.src b/apps/emqx_bridge_opents/src/emqx_bridge_opents.app.src index 5e3b2f585..2469acaa8 100644 --- a/apps/emqx_bridge_opents/src/emqx_bridge_opents.app.src +++ b/apps/emqx_bridge_opents/src/emqx_bridge_opents.app.src @@ -1,6 +1,6 @@ {application, emqx_bridge_opents, [ {description, "EMQX Enterprise OpenTSDB Bridge"}, - {vsn, "0.1.3"}, + {vsn, "0.1.4"}, {registered, []}, {applications, [ kernel, diff --git a/apps/emqx_bridge_opents/src/emqx_bridge_opents_connector.erl b/apps/emqx_bridge_opents/src/emqx_bridge_opents_connector.erl index 6af1e2f55..e3fe9d6b4 100644 --- a/apps/emqx_bridge_opents/src/emqx_bridge_opents_connector.erl +++ b/apps/emqx_bridge_opents/src/emqx_bridge_opents_connector.erl @@ -56,7 +56,10 @@ fields(config) -> fields("config_connector") -> emqx_connector_schema:common_fields() ++ - proplists_without([auto_reconnect], fields(config)); + proplists_without([auto_reconnect], fields(config)) ++ + emqx_connector_schema:resource_opts_ref(?MODULE, connector_resource_opts); +fields(connector_resource_opts) -> + emqx_connector_schema:resource_opts_fields(); fields("post") -> emqx_connector_schema:type_and_name_fields(enum([opents])) ++ fields("config_connector"); fields("put") -> @@ -66,6 +69,8 @@ fields("get") -> desc(config) -> ?DESC("desc_config"); +desc(connector_resource_opts) -> + ?DESC(emqx_resource_schema, "resource_opts"); desc("config_connector") -> ?DESC("desc_config"); desc(Method) when Method =:= "get"; Method =:= "put"; Method =:= "post" -> diff --git a/changes/ee/feat-12353.en.md b/changes/ee/feat-12353.en.md new file mode 100644 index 000000000..2d34e1211 --- /dev/null +++ b/changes/ee/feat-12353.en.md @@ -0,0 +1 @@ +The bridges for OpentsDB have been split so it is available via the connectors and actions APIs. They are still backwards compatible with the old bridge API. diff --git a/rel/i18n/emqx_bridge_opents.hocon b/rel/i18n/emqx_bridge_opents.hocon index 5f1c4b0af..f5d2ade85 100644 --- a/rel/i18n/emqx_bridge_opents.hocon +++ b/rel/i18n/emqx_bridge_opents.hocon @@ -24,6 +24,12 @@ emqx_bridge_opents { desc_name.label: "Bridge Name" +action_parameters.desc: +"""OpenTSDB action parameters""" + +action_parameters.label: +"""Parameters""" + action_parameters_data.desc: """OpenTSDB action parameter data""" @@ -36,10 +42,10 @@ config_parameters_timestamp.desc: config_parameters_timestamp.label: """Timestamp""" -config_parameters_metric.metric: +config_parameters_metric.desc: """Metric. Placeholders in format of ${var} is supported""" -config_parameters_metric.metric: +config_parameters_metric.label: """Metric""" config_parameters_tags.desc: