fix taosd requests bug

Author: sheyanjie-qq

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [3.6.3] - 2024-11-05
+
+### Bug Fixes
+
+- fix TDinsight Request data issue.
+
 ## [3.6.2] - 2024-10-29
 
 ### Features

dashboards/TDinsightV3-CN.md

@@ -7,6 +7,7 @@ TDinsight v3.x 是使用 [TDengine 3.x] 监控数据库和 [Grafana] 对 TDengin
 TDinsight v3.x 和 TDengine 的版本对应关系如下：
 | TDinsight v3.x 版本 | TDengine 版本  |
 | :-----------------: | :------------: |
+|        3.6.3        | 3.3.0.0 及以上 |
 |        3.6.2        | 3.3.0.0 及以上 |
 |        3.6.1        | 3.3.0.0 及以上 |
 |        3.6.0        | 3.3.0.0 及以上 |

dashboards/TDinsightV3.json

@@ -1664,7 +1664,7 @@
               "formatType": "Time series",
               "queryType": "SQL",
               "refId": "A",
-              "sql": "select _wstart as ts,  sum(`count`) as `select_count`  from $database.taos_sql_req where sql_type = 'select' and ('$username' = '' OR username in (${username:sqlstring})) and  ('$sql_result' = '' OR result in (${sql_result:sqlstring}))  and _ts > $from and _ts <= $to interval($interval) fill(null)"
+              "sql": "select _wstart as ts,  sum(`count`)/($interval/1s) as `select_count`  from $database.taos_sql_req where sql_type = 'select' and ('$username' = '' OR username in (${username:sqlstring})) and  ('$sql_result' = '' OR result in (${sql_result:sqlstring}))  and _ts > $from and _ts <= $to interval($interval) fill(null)"
             }
           ],
           "timeFrom": null,
@@ -1740,7 +1740,7 @@
               "formatType": "Time series",
               "queryType": "SQL",
               "refId": "A",
-              "sql": "select _wstart as ts, sum(`count`) as `delete_count`  from $database.taos_sql_req where sql_type = 'delete' and ('$username' = '' OR username in (${username:sqlstring})) and  ('$sql_result' = '' OR result in (${sql_result:sqlstring}))  and _ts > $from and _ts <= $to interval($interval) fill(null)"
+              "sql": "select _wstart as ts, sum(`count`)/($interval/1s) as `delete_count`  from $database.taos_sql_req where sql_type = 'delete' and ('$username' = '' OR username in (${username:sqlstring})) and  ('$sql_result' = '' OR result in (${sql_result:sqlstring}))  and _ts > $from and _ts <= $to interval($interval) fill(null)"
             }
           ],
           "timeFrom": null,
@@ -1817,7 +1817,7 @@
               "hide": false,
               "queryType": "SQL",
               "refId": "A",
-              "sql": "select _wstart as ts,  sum(`count`) as `insert_count`  from $database.taos_sql_req where sql_type = 'insert' and ('$username' = '' OR username in (${username:sqlstring})) and  ('$sql_result' = '' OR result in (${sql_result:sqlstring}))  and _ts > $from and _ts <= $to interval($interval) fill(null)"
+              "sql": "select _wstart as ts,  sum(`count`)/($interval/1s) as `insert_count`  from $database.taos_sql_req where sql_type = 'insert' and ('$username' = '' OR username in (${username:sqlstring})) and  ('$sql_result' = '' OR result in (${sql_result:sqlstring}))  and _ts > $from and _ts <= $to interval($interval) fill(null)"
             }
           ],
           "timeFrom": null,
@@ -1892,7 +1892,7 @@
               "hide": false,
               "queryType": "SQL",
               "refId": "A",
-              "sql": "select _wstart as ts, sum(`count`) as `inserted_rows`  from $database.taosd_sql_req where sql_type = 'inserted_rows' and   ('$fqdn' = '' or  dnode_ep in (${fqdn:sqlstring})) and ('$username' = '' OR username in (${username:sqlstring})) and  ('$sql_result' = '' OR result in (${sql_result:sqlstring}))  and _ts > $from and _ts <= $to interval($interval) fill(null)"
+              "sql": "select _wstart as ts, sum(`count`)/($interval/1s) as `inserted_rows`  from $database.taosd_sql_req where sql_type = 'inserted_rows' and   ('$fqdn' = '' or  dnode_ep in (${fqdn:sqlstring})) and ('$username' = '' OR username in (${username:sqlstring})) and  ('$sql_result' = '' OR result in (${sql_result:sqlstring}))  and _ts > $from and _ts <= $to interval($interval) fill(null)"
             }
           ],
           "timeFrom": null,
@@ -1968,7 +1968,7 @@
               "formatType": "Time series",
               "queryType": "SQL",
               "refId": "A",
-              "sql": "select _wstart as ts, sum(`count`) as `count`  from $database.taos_slow_sql where ('$username' = '' OR username in (${username:sqlstring})) and  ('$sql_result' = '' OR result in (${sql_result:sqlstring})) and  ('$duration' = '' OR `duration` in (${duration:sqlstring})) and _ts > $from and _ts <= $to interval($interval) fill(VALUE, 0)"
+              "sql": "select _wstart as ts, sum(`count`)/($interval/1s) as `count`  from $database.taos_slow_sql where ('$username' = '' OR username in (${username:sqlstring})) and  ('$sql_result' = '' OR result in (${sql_result:sqlstring})) and  ('$duration' = '' OR `duration` in (${duration:sqlstring})) and _ts > $from and _ts <= $to interval($interval) fill(VALUE, 0)"
             }
           ],
           "timeFrom": null,

dashboards/TDinsightV3.md

@@ -7,6 +7,7 @@ TDinsight v3.x is a solution for monitoring TDengine using the builtin native mo
 ## Compatiable with TDengine version
 | TDengine grafana plugin version | TDengine version |
 | :-----------------------------: | :--------------: |
+|              3.6.3              | 3.3.0.0 or later |
 |              3.6.2              | 3.3.0.0 or later |
 |              3.6.1              | 3.3.0.0 or later |
 |              3.6.0              | 3.3.0.0 or later |

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tdengine-datasource",
-  "version": "3.6.2",
+  "version": "3.6.3",
   "description": "Grafana datasource plugin for TDengine",
   "scripts": {
     "build": "webpack -c ./.config/webpack/webpack.config.ts --env development",

src/plugin.json

@@ -95,7 +95,7 @@
         "path": "img/howto-add-datasource.jpg"
       }
     ],
-    "version": "3.6.2",
+    "version": "3.6.3",
     "updated": "2024-10-29"
   },
   "dependencies": {