Skip to content

Commit

Permalink
Merge pull request #259 from taosdata/feat/TD-26958-2
Browse files Browse the repository at this point in the history
mod version
  • Loading branch information
sheyanjie-qq authored Mar 6, 2024
2 parents 36bc817 + 995227e commit a3e39a5
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 13 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

All notable changes to this project will be documented in this file.

## [4.0.0] - 2024-03-05
## [3.5.0] - 2024-03-05

### Bug Fixes

Expand Down
2 changes: 1 addition & 1 deletion INSTALLATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ data sources.
## Compatiable with TDengine version
| TDengine grafana plugin version | major changes | TDengine version |
| :-----------------------------: | :-------------------: | :--------------: |
| 4.0.0 | new taosd and taosX dashboard | 3.2.3.0 or later |
| 3.5.0 | new taosd and taosX dashboard | 3.2.3.0 or later |
| 3.4.0 | new adapter dashboard | 3.2.0.1 or later |
| 3.2.7 | support TDengine 3.0 | 3.0.0.0 or later |

Expand Down
6 changes: 3 additions & 3 deletions dashboards/TDinsightV3-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ TDinsight v3.x 是使用 [TDengine 3.x] 监控数据库和 [Grafana] 对 TDengin
TDinsight v3.x 和 TDengine 的版本对应关系如下:
| TDinsight v3.x 版本 | TDengine 版本 |
| :---------------------: | :--------------: |
| 3.x | 3.0.1.0 至 3.2.2.0 |
| 4.x | 3.2.3.0 及以上 |

| 3.5.0 | 3.2.3.0 及以上 |
| 3.4.0 | 3.2.0.1 及以上 |
| 3.2.7 | 3.0.0.0 及以上 |

TDengine 通过 [taosKeeper](https://github.com/taosdata/taoskeeper) 将服务器的 CPU、内存、硬盘空间、带宽、请求数、磁盘读写速度、
慢查询等信息定时写入指定数据库,并对重要的系统操作(比如登录、创建、删除数据库等)以及各种错误报警信息进行记录。通过 [Grafana]
Expand Down
2 changes: 1 addition & 1 deletion dashboards/TDinsightV3.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"type": "datasource",
"id": "tdengine-datasource",
"name": "TDengine Datasource",
"version": "4.0.0"
"version": "3.5.0"
},
{
"type": "panel",
Expand Down
12 changes: 7 additions & 5 deletions dashboards/TDinsightV3.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ Languages: _English_ _[简体中文](https://www.taosdata.com/cn/documentation/t

TDinsight v3.x is a solution for monitoring TDengine using the builtin native monitoring database and Grafana.

The correspondence between TDinsight v3.x and TDengine versions is as follows:
| TDinsight v3.x Version | TDengine Version |
| :---------------------: | :--------------: |
| 3.x | from 3.0.1.0 to 3.2.2.0 |
| 4.x | from 3.2.3.0 |
## Compatiable with TDengine version
| TDengine grafana plugin version | TDengine version |
| :-----------------------------: | :--------------: |
| 3.5.0 | 3.2.3.0 or later |
| 3.4.0 | 3.2.0.1 or later |
| 3.2.7 | 3.0.0.0 or later |


TDengine writes monitoring data into a special database through [taosKeeper](https://github.com/taosdata/taoskeeper).
The metrics may include the server's CPU, memory, hard disk space, network bandwidth, number of requests, disk
Expand Down
2 changes: 1 addition & 1 deletion dashboards/taosX.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"type": "datasource",
"id": "tdengine-datasource",
"name": "TDengine Datasource",
"version": "4.0.0"
"version": "3.5.0"
},
{
"type": "panel",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tdengine-datasource",
"version": "4.0.0",
"version": "3.5.0",
"description": "Grafana datasource plugin for TDengine",
"scripts": {
"build": "webpack -c ./.config/webpack/webpack.config.ts --env development",
Expand Down

0 comments on commit a3e39a5

Please sign in to comment.