Przeglądaj źródła

fix: spellcheck and update checker repo version

JimMoen 3 lat temu
rodzic
commit
d51ca2672a

+ 1 - 1
.github/workflows/build_slim_packages.yaml

@@ -205,7 +205,7 @@ jobs:
         - emqx
         - emqx-enterprise
     runs-on: aws-amd64
-    container: "ghcr.io/emqx/emqx-schema-validate:0.3.3"
+    container: "ghcr.io/emqx/emqx-schema-validate:0.3.5"
     steps:
     - uses: actions/download-artifact@v2
       name: Download schema dump

lib-ee/emqx_ee_bridge/i18n/emqx_ee_bridge_hstream.conf → lib-ee/emqx_ee_bridge/i18n/emqx_ee_bridge_hstreamdb.conf


+ 2 - 1
lib-ee/emqx_ee_bridge/i18n/emqx_ee_bridge_influxdb.conf

@@ -21,7 +21,7 @@ will be forwarded.
     write_syntax {
         desc {
             en: """
-Conf of InfluxDB line protocol to write data points. It is a text-based format that provides the measurement, tag set, field set, and timestamp of a data point, and placeHolder supported.
+Conf of InfluxDB line protocol to write data points. It is a text-based format that provides the measurement, tag set, field set, and timestamp of a data point, and placeholder supported.
 See also [InfluxDB 2.3 Line Protocol](https://docs.influxdata.com/influxdb/v2.3/reference/syntax/line-protocol/) and
 [InfluxDB 1.8 Line Protocol](https://docs.influxdata.com/influxdb/v1.8/write_protocols/line_protocol_tutorial/) </br>
 TLDR:
@@ -97,6 +97,7 @@ TLDR:
             zh: "桥接名字"
         }
     }
+
     desc_connector {
         desc {
                 en: """Generic configuration for the connector."""

+ 7 - 1
lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_influxdb.erl

@@ -131,7 +131,13 @@ type_name_field(Type) ->
 desc("config") ->
     ?DESC("desc_config");
 desc(Method) when Method =:= "get"; Method =:= "put"; Method =:= "post" ->
-    ["Configuration for HStream using `", string:to_upper(Method), "` method."];
+    ["Configuration for InfluxDB using `", string:to_upper(Method), "` method."];
+desc(influxdb_udp) ->
+    ?DESC(emqx_ee_connector_influxdb, "influxdb_udp");
+desc(influxdb_api_v1) ->
+    ?DESC(emqx_ee_connector_influxdb, "influxdb_api_v1");
+desc(influxdb_api_v2) ->
+    ?DESC(emqx_ee_connector_influxdb, "influxdb_api_v2");
 desc(_) ->
     undefined.
 

+ 11 - 1
lib-ee/emqx_ee_connector/i18n/emqx_ee_connector_hstream.conf

@@ -1,5 +1,15 @@
-
 emqx_ee_connector_hstreamdb {
+    config {
+        desc {
+                en: "HStreamDB connection config"
+                zh: "HStreamDB 连接配置。"
+        }
+        label: {
+                en: "Connection config"
+                zh: "连接配置"
+            }
+    }
+
     type {
         desc {
                 en: "The Connector Type."

+ 8 - 9
lib-ee/emqx_ee_connector/i18n/emqx_ee_connector_influxdb.conf

@@ -1,4 +1,3 @@
-
 emqx_ee_connector_influxdb {
     type {
         desc {
@@ -43,7 +42,7 @@ emqx_ee_connector_influxdb {
     }
     protocol {
         desc {
-                en: """InfluxDB protocol. UDP or HTTP API or HTTP API V2"""
+                en: """InfluxDB's protocol. UDP or HTTP API or HTTP API V2"""
                 zh: """InfluxDB 协议。UDP 或 HTTP API 或 HTTP API V2"""
         }
         label: {
@@ -51,9 +50,9 @@ emqx_ee_connector_influxdb {
                 zh: """协议"""
             }
     }
-    protocol_udp {
+    influxdb_udp {
         desc {
-                en: """InfluxDB protocol."""
+                en: """InfluxDB's UDP protocol."""
                 zh: """InfluxDB UDP 协议"""
         }
         label: {
@@ -61,9 +60,9 @@ emqx_ee_connector_influxdb {
                 zh: """UDP 协议"""
             }
     }
-    protocol_api_v1 {
+    influxdb_api_v1 {
         desc {
-                en: """InfluxDB protocol. Support InfluxDB v1.8 and before."""
+                en: """InfluxDB's protocol. Support InfluxDB v1.8 and before."""
                 zh: """InfluxDB HTTP API 协议。支持 Influxdb v1.8 以及之前的版本"""
         }
         label: {
@@ -71,9 +70,9 @@ emqx_ee_connector_influxdb {
                 zh: """HTTP API 协议"""
             }
     }
-    protocol_api_v2 {
+    influxdb_api_v2 {
         desc {
-                en: """InfluxDB protocol. Support InfluxDB v2.0 and after."""
+                en: """InfluxDB's protocol. Support InfluxDB v2.0 and after."""
                 zh: """InfluxDB HTTP API V2 协议。支持 Influxdb v2.0 以及之后的版本"""
         }
         label: {
@@ -123,7 +122,7 @@ emqx_ee_connector_influxdb {
     }
     org {
         desc {
-                en: """InfluxDB organization name."""
+                en: """Organization name of InfluxDB."""
                 zh: """InfluxDB 组织名称。"""
         }
         label: {

+ 4 - 0
lib-ee/emqx_ee_connector/src/emqx_ee_connector_hstreamdb.erl

@@ -27,6 +27,7 @@
     namespace/0,
     roots/0,
     fields/1,
+    desc/1,
     connector_examples/1
 ]).
 
@@ -123,6 +124,9 @@ values(put) ->
 values(_) ->
     #{}.
 
+desc(config) ->
+    ?DESC("config").
+
 %% -------------------------------------------------------------------------------------------------
 %% internal functions
 start_client(InstId, Config) ->

+ 9 - 0
lib-ee/emqx_ee_connector/src/emqx_ee_connector_influxdb.erl

@@ -22,6 +22,7 @@
 -export([
     namespace/0,
     fields/1,
+    desc/1,
     connector_examples/1
 ]).
 
@@ -161,6 +162,14 @@ values(api_v2, put) ->
         token => <<"my_token">>,
         ssl => #{enable => false}
     }.
+
+desc(influxdb_udp) ->
+    ?DESC("influxdb_udp");
+desc(influxdb_api_v1) ->
+    ?DESC("influxdb_api_v1");
+desc(influxdb_api_v2) ->
+    ?DESC("influxdb_api_v2").
+
 %% -------------------------------------------------------------------------------------------------
 %% internal functions
 

+ 1 - 1
scripts/spellcheck

@@ -7,7 +7,7 @@ else
     SCHEMA="$1"
 fi
 
-docker run -d --name langtool "ghcr.io/emqx/emqx-schema-validate:0.3.3"
+docker run -d --name langtool "ghcr.io/emqx/emqx-schema-validate:0.3.5"
 
 docker exec -i langtool ./emqx_schema_validate - < "${SCHEMA}"
 success="$?"