Merge remote-tracking branch 'origin/develop' into szhou/hotfix/td-12164

Jenkinsfile

@@ -450,7 +450,7 @@ pipeline {
         stage('test_b1_s2') {
           agent{label " slave2 || slave12 "}
           steps {
-            timeout(time: 55, unit: 'MINUTES'){
+            timeout(time: 105, unit: 'MINUTES'){
               pre_test()
               sh '''
                 rm -rf /var/lib/taos/*

documentation20/cn/09.connections/docs.md

@@ -14,7 +14,7 @@ TDengine 能够与开源数据可视化系统 [Grafana](https://www.grafana.com/
 TDengine 的 Grafana 插件请从 <https://github.com/taosdata/grafanaplugin/releases/latest> 下载。
 
 ```bash
-GF_VERSION=3.1.1
+GF_VERSION=3.1.3
 wget https://github.com/taosdata/grafanaplugin/releases/download/v$GF_VERSION/tdengine-datasource-$GF_VERSION.zip
 ```
 
@@ -75,15 +75,7 @@ allow_loading_unsigned_plugins = tdengine-datasource
 
 #### 导入 Dashboard
 
-我们提供一个 TDengine Dashboard 可以作为 TDengine 集群的监控可视化工具使用，见 [Grafana Dashboard 15146](https://grafana.com/grafana/dashboards/15146)。
-
-点击左侧 `Import` 按钮，选择 **Grafana.com Dashboard**,j将id `15146` 填入并加载：
-
-![img](../images/connections/import_dashboard1.jpg)
-
-导入完成之后可看到如下效果：
-
-![img](../images/connections/dashboard-15146.png)
+在 2.3.3.0 及以上版本，您可以导入 TDinsight Dashboard (Grafana Dashboard ID： [15167](https://grafana.com/grafana/dashboards/15167)) 作为 TDengine 集群的监控可视化工具。安装和使用说明请见 [TDinsight 用户手册](https://www.taosdata.com/cn/documentation/tools/insight)。
 
 ## <a class="anchor" id="matlab"></a>MATLAB
 

documentation20/en/09.connections/docs.md

@@ -15,7 +15,7 @@ https://grafana.com/grafana/download.
 Download grafana plugin from <https://github.com/taosdata/grafanaplugin/releases/latest> .
 
 ```bash
-GF_VERSION=3.1.1
+GF_VERSION=3.1.3
 wget https://github.com/taosdata/grafanaplugin/releases/download/v$GF_VERSION/tdengine-datasource-$GF_VERSION.zip
 ```
 
@@ -69,15 +69,7 @@ According to the default prompt, query the average system memory usage at the sp
 
 #### Import Dashboard
 
-We provide an example dashboard [Grafana Dashboard 15146](https://grafana.com/grafana/dashboards/15146)。
-
-Click the `Import` button on the left panel and load the grafana id:
-
-![img](../images/connections/import_dashboard1.jpg)
-
-You can see as follows after Dashboard imported.
-
-![img](../images/connections/dashboard-15146.png)
+We provide a TDinsight dashboard (via Grafana dashboard id: [15167](https://grafana.com/grafana/dashboards/15167)) for TDengine cluster monitoring since TDengine 2.3.3.x . Please refer to [TDinsight User Manual](https://www.taosdata.com/en/documentation/tools/insight) for the details.
 
 ## <a class="anchor" id="matlab"></a> MATLAB
 

taos-tools @ beca4813

-Subproject commit dca4059d87c3f5c678a5e946978d40daec204e27
+Subproject commit beca4813316f254624d8dbecf54d45a5a232c61d

tests/pytest/fulltest-connector.sh

@@ -7,4 +7,7 @@ ulimit -c unlimited
 # python3 test.py -f restful/restful_bind_db2.py
 python3 ./test.py -f client/nettest.py
 
+python3 ./test.py -f ../system-test/4-taosAdapter/taosAdapter_query.py
+python3 ./test.py -f ../system-test/4-taosAdapter/taosAdapter_insert.py
+
 #======================p1-end===============

tests/pytest/fulltest.sh

@@ -167,6 +167,7 @@ python3 ./test.py -f update/merge_commit_data.py
 # tools
 python3 test.py -f tools/taosdumpTest.py
 python3 test.py -f tools/taosdumpTest2.py
+python3 test.py -f tools/taosdumpTest3.py
 
 python3 test.py -f tools/taosdemoTest.py
 python3 test.py -f tools/taosdemoTestWithoutMetric.py

tests/system-test/4-taosAdapter/rest_insert_config.json

+{"base_url": "127.0.0.1", "precision": "ms", "clear_data": true, "database_name": "db", "tbnum": 10, "data_row": 100, "case_file": "data_insert.csv", "basetime": 1639969683873, "all_case": false, "all_err": false, "all_current": true, "err_case": {"port_err": true, "api_err": true, "header_err": true, "db_tb_err": true, "data_err": true}, "current_case": {"port_current": true, "api_current": true, "header_current": true, "db_tb_current": true, "data_current": true}}
\ No newline at end of file

tests/system-test/4-taosAdapter/rest_query_config.json

+{"base_url": "127.0.0.1", "precision": "ms", "clear_data": true, "database_name": "db", "tbnum": 10, "data_row": 100, "basetime": 1639969706198, "all_case": false, "all_err": false, "all_current": true, "err_case": {"port_err": true, "api_err": true, "header_err": true, "sql_err": true}, "current_case": {"port_current": true, "api_current": true, "header_current": true, "sql_current": true}}
\ No newline at end of file

tests/system-test/fulltest.sh

 python3 test.py -f 0-management/1-stable/create_col_tag.py 
+python3 test.py -f 4-taosAdapter/taosAdapter_query.py
+python3 test.py -f 4-taosAdapter/taosAdapter_insert.py
 
 #python3 test.py -f 2-query/9-others/TD-11389.py # this case will run when this bug fix  TD-11389