Skip to content

Commit 0076f4f

Browse files
committed
Merge branch 'main' into enh/TS-6672169603-main
2 parents fcdb0f8 + ca19d3d commit 0076f4f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+3412
-2117
lines changed

docs/en/03-intro.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
---
22
sidebar_label: Introduction
3-
title: Introduction to TDengine
3+
title: Introduction to TDengine TSDB
44
slug: /introduction
55
---
66

7-
TDengine TSDB is a time-series database designed to help traditional industries overcome the challenges of Industry 4.0 and Industrial IoT. It enables real-time ingestion, storage, analysis, and distribution of petabytes of data per day, generated by billions of sensors and data collectors. By making big data accessible and affordable, TDengine helps everyone — from independent developers and startups to industry stalwarts and multinationals — unlock the true value of their data.
7+
TDengine TSDB is a time-series database designed to help traditional industries overcome the challenges of Industry 4.0 and Industrial IoT. TDengine TSDB securely ingests, stores, analyzes, and distributes petabytes of data per day, generated by billions of sensors and devices. With a built-in AI agent for time-series forecasting and anomaly detection, TDengine TSDB delivers real-time business insights.
88

99
## TDengine TSDB Offerings
1010

1111
- [TDengine TSDB-OSS](https://tdengine.com/oss/) is an open-source, cloud-native time-series database. Its source code is licensed under the AGPL and publicly available on GitHub. TDengine TSDB-OSS serves as the code base for our paid offerings and provides the same core functionality. Unlike some open-core products, TDengine TSDB-OSS is a full-featured solution that includes the necessary components for production use, including clustering.
12-
- [TDengine TSDB-Enterprise](https://tdengine.com/enterprise/) is a high-performance big data platform designed for Industry 4.0 and the Industrial IoT. Built on the open-source TDengine TSDB-OSS, it delivers an enterprise-grade feature set tailored to the needs of traditional industries.
12+
- [TDengine TSDB-Enterprise](https://tdengine.com/enterprise/) is a high-performance, scalable time-series database designed for Industry 4.0 and the Industrial IoT. Built on the open-source TDengine TSDB-OSS, it delivers an enterprise-grade feature set tailored to the needs of traditional industries.
1313
- [TDengine Cloud](https://cloud.tdengine.com) delivers all features of TDengine TSDB-Enterprise as a fully managed service that can run on Amazon Web Services (AWS), Microsoft Azure, and Google Cloud Platform (GCP).
1414

1515
## What Makes TDengine TSDB Different

docs/en/04-get-started/_get_started.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ Grafana is a popular open-source platform for data visualization and monitoring.
118118

119119
#### Prerequisites
120120

121-
- Install and start Grafana (version 7.5 or above is supported).
121+
- Install and start Grafana (version 8.0 or above is supported).
122122
- Insert test data using the following command, which creates a supertable meters in the test database with 100 subtables, each containing 1,000 records starting from one hour ago:
123123

124124
```bash

docs/en/08-operation/30-activate.md

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
title: Activate TDengine TSDB-Enterprise
33
---
44

5+
import Tabs from "@theme/Tabs";
6+
import TabItem from "@theme/TabItem";
7+
import Enterprise from '../assets/resources/_enterprise.mdx';
8+
9+
<Enterprise/>
10+
511
This document describes how to activate a TDengine TSDB-Enterprise license.
612

713
## Prerequisites
@@ -11,6 +17,14 @@ This document describes how to activate a TDengine TSDB-Enterprise license.
1117

1218
## Procedure
1319

20+
### Obtain Your Activation Code
21+
22+
1. Open the TDengine CLI as the `root` user:
23+
24+
```shell
25+
taos
26+
```
27+
1428
1. Run the following SQL statement to obtain required information for your deployment:
1529

1630
```sql
@@ -34,10 +48,43 @@ This document describes how to activate a TDengine TSDB-Enterprise license.
3448

3549
Your account representative or reseller will send you an activation code that you use to activate your TDengine TSDB-Enterprise deployment.
3650

37-
1. Once you receive your activation code, log in to TDengine TSDB Explorer. The default URL is `http://127.0.0.1:6060`.
51+
### Activate Your Deployment
52+
53+
<Tabs>
54+
<TabItem value="TDengine CLI">
55+
56+
1. Once you receive your activation code, open the TDengine CLI as the `root` user.
57+
58+
```shell
59+
taos
60+
```
61+
62+
1. Apply the activation code to your cluster:
63+
64+
```sql
65+
ALTER CLUSTER 'activeCode' '<your-activation-code>';
66+
```
67+
68+
Your TDengine TSDB-Enterprise deployment is now licensed. You can run the following SQL statement to view the details of your license, including expiration date:
69+
70+
```sql
71+
SHOW GRANTS\G;
72+
```
73+
74+
</TabItem>
75+
<TabItem value="TDengine TSDB Explorer">
76+
77+
1. Once you receive your activation code, log in to TDengine TSDB Explorer as the `root` user. The default URL is `http://127.0.0.1:6060`.
3878

3979
1. From the main menu on the left, select **Management**. Open the **License** tab and click **Activate License**.
4080

4181
1. Enter your activation code and click **Confirm**.
4282

83+
:::important
84+
Ensure that the activation code is not enclosed in single quotes.
85+
:::
86+
4387
Your TDengine TSDB-Enterprise deployment is now licensed. You can view the details of your license, including expiration date, on the **License** tab.
88+
89+
</TabItem>
90+
</Tabs>

docs/en/10-third-party/03-visual/01-grafana.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ This document describes how to integrate the TDengine data source with the open-
1414

1515
To add the TDengine data source to Grafana normally, the following preparations are needed.
1616

17-
- Grafana service has been deployed and is running normally. TDengine currently supports Grafana version 7.5 and above. It is recommended to use the latest version.
17+
- Grafana service has been deployed and is running normally. TDengine currently supports Grafana version 8.0 and above. It is recommended to use the latest version.
1818
**Note**: Ensure that the account starting Grafana has write permissions to its installation directory, otherwise you may not be able to install plugins later.
1919
- TDengine cluster has been deployed and is running normally.
2020
- taosAdapter has been installed and is running normally. For details, please refer to the [taosAdapter user manual](../../../tdengine-reference/components/taosadapter/)
@@ -29,7 +29,7 @@ Record the following information:
2929
<Tabs defaultValue="script">
3030
<TabItem value="script" label="Installation Script">
3131

32-
For users using Grafana version 7.x or configuring with [Grafana Provisioning](https://grafana.com/docs/grafana/latest/administration/provisioning/), you can use the installation script on the Grafana server to automatically install the plugin and add the data source Provisioning configuration file.
32+
For users using Grafana version 8.x or later or configuring with [Grafana Provisioning](https://grafana.com/docs/grafana/latest/administration/provisioning/), you can use the installation script on the Grafana server to automatically install the plugin and add the data source Provisioning configuration file.
3333

3434
```shell
3535
bash -c "$(curl -fsSL \

0 commit comments

Comments
 (0)