This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 8bacba5 Synchronize the English and Chinese version of "Grafana" doc
(#1901)
8bacba5 is described below
commit 8bacba50b787e6e11049cb4588270b65f1284606
Author: ZHOU JESSE <[email protected]>
AuthorDate: Thu Oct 29 16:33:04 2020 +0800
Synchronize the English and Chinese version of "Grafana" doc (#1901)
* a minor grammar mistake, just a test
* correct several grammar mistakes
* Update docs/UserGuide/Comparison/TSDB-Comparison.md
Co-authored-by: Haonan <[email protected]>
* update the english version of "Grafana" doc and correct a few words in
"Architecture" doc.
* English and the Chinese version of "Grafana" doc are synchronized as much
as I can
* Update docs/UserGuide/Architecture/Files.md
Co-authored-by: Haonan <[email protected]>
Co-authored-by: Haonan <[email protected]>
---
docs/UserGuide/Architecture/Files.md | 6 +++---
docs/UserGuide/Ecosystem Integration/Grafana.md | 7 ++++---
docs/zh/UserGuide/Ecosystem Integration/Grafana.md | 3 ++-
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/docs/UserGuide/Architecture/Files.md
b/docs/UserGuide/Architecture/Files.md
index b011c81..f390843 100644
--- a/docs/UserGuide/Architecture/Files.md
+++ b/docs/UserGuide/Architecture/Files.md
@@ -21,7 +21,7 @@
# Files
-In IoTDB, there are many kinds of data needed to be storage. In this section,
we will introduce IoTDB's data storage strategy in order to give you an
intuitive understanding of IoTDB's data management.
+In IoTDB, there are many kinds of data needed to be stored. In this section,
we will introduce IoTDB's data storage strategy in order to give you an
explicit understanding of IoTDB's data management.
The data that IoTDB stores is divided into three categories, namely data
files, system files, and pre-write log files.
@@ -29,7 +29,7 @@ The data that IoTDB stores is divided into three categories,
namely data files,
Data files store all the data that the user wrote to IoTDB, which contains
TsFile and other files. TsFile storage directory can be configured with the
`data_dirs` configuration item (see [file layer](../Server/Config%20Manual.md)
for details). Other files can be configured through
[data_dirs](../Server/Config%20Manual.md) configuration item (see [Engine
Layer](../Server/Config%20Manual.md) for details).
-In order to better support users' storage requirements such as disk space
expansion, IoTDB supports multiple file directories storage methods for TsFile
storage configuration. Users can set multiple storage paths as data storage
locations( see [data_dirs](../Server/Config%20Manual.md) configuration item),
and you can specify or customize the directory selection policy (see
[multi_dir_strategy](../Server/Config%20Manual.md) configuration item for
details).
+In order to support users' storage requirements such as disk space expansion
better, IoTDB supports multiple file directories storage methods for TsFile
storage configuration. Users can set multiple storage paths as data storage
locations( see [data_dirs](../Server/Config%20Manual.md) configuration item),
and you can specify or customize the directory selection strategy (see
[multi_dir_strategy](../Server/Config%20Manual.md) configuration item for
details).
## System files
@@ -57,4 +57,4 @@ After setting the configuration, the system will:
* Save all system files in $IOTDB_HOME/data
* Save TsFile in /data1/data, /data2/data, /data3/data. And the choosing
strategy is `MaxDiskUsableSpaceFirstStrategy`, that is every time data writes
to the disk, the system will automatically select a directory with the largest
remaining disk space to write data.
-* Save WAL data in $IOTDB_HOME/data/wal
\ No newline at end of file
+* Save WAL data in $IOTDB_HOME/data/wal
diff --git a/docs/UserGuide/Ecosystem Integration/Grafana.md
b/docs/UserGuide/Ecosystem Integration/Grafana.md
index e6885ca..4b402b7 100644
--- a/docs/UserGuide/Ecosystem Integration/Grafana.md
+++ b/docs/UserGuide/Ecosystem Integration/Grafana.md
@@ -37,7 +37,7 @@
<!-- /TOC -->
# IoTDB-Grafana
-This project provides a connector which reads data from IoTDB and sends to
Grafana(https://grafana.com/). Before you use this tool, make sure Grafana and
IoTDB are correctly installed and started.
+Grafana is an open source volume metrics monitoring and visualization tool,
which can be used to display time series data and application runtime analysis.
Grafana supports Graphite, InfluxDB and other major time series databases as
data sources. We have developed IoTDB-Grafana, a connector to show time series
data in IoTDB by reading data from IoTDB and sends to
Grafana(https://grafana.com/). Before you use this tool, make sure Grafana and
IoTDB are correctly installed and started.
## Grafana installation
@@ -118,13 +118,14 @@ If you need to configure properties, move the
`grafana/src/main/resources/applic
## Explore in Grafana
-The default port of Grafana is 3000, see http://localhost:3000
+The default port of Grafana is 3000, see http://localhost:3000/
Username and password are both "admin" by default.
### Add data source
-Select `Data Sources` and then `Add data source`, select `SimpleJson` in
`Type` and `URL` is http://localhost:8888
+Select `Data Sources` and then `Add data source`, select `SimpleJson` in
`Type` and `URL` is http://localhost:8888.
+After that, make sure IoTDB has been started, click "Save & Test", and "Data
Source is working" will be shown to indicate successful configuration.
<img style="width:100%; max-width:800px; max-height:600px; margin-left:auto;
margin-right:auto; display:block;"
src="https://user-images.githubusercontent.com/13203019/51664777-2766ae00-1ff5-11e9-9d2f-7489f8ccbfc2.png";>
<img style="width:100%; max-width:800px; max-height:600px; margin-left:auto;
margin-right:auto; display:block;"
src="https://user-images.githubusercontent.com/13203019/51664842-554bf280-1ff5-11e9-97d2-54eebe0b2ca1.png";>
diff --git a/docs/zh/UserGuide/Ecosystem Integration/Grafana.md
b/docs/zh/UserGuide/Ecosystem Integration/Grafana.md
index 8e4e85b..c8dbfde 100644
--- a/docs/zh/UserGuide/Ecosystem Integration/Grafana.md
+++ b/docs/zh/UserGuide/Ecosystem Integration/Grafana.md
@@ -37,7 +37,7 @@
<!-- /TOC -->
-Grafana是开源的指标量监测和可视化工具，可用于展示时序数据和应用程序运行分析。Grafana支持Graphite，InfluxDB等国际主流时序时序数据库作为数据源。在IoTDB项目中，我们开发了Grafana展现IoTDB中时序数据的连接器IoTDB-Grafana，为您提供使用Grafana展示IoTDB数据库中的时序数据的可视化方法。
+Grafana是开源的指标量监测和可视化工具，可用于展示时序数据和应用程序运行分析。Grafana支持Graphite，InfluxDB等国际主流时序数据库作为数据源。在IoTDB项目中，我们开发了Grafana展现IoTDB中时序数据的连接器IoTDB-Grafana，为您提供使用Grafana展示IoTDB数据库中的时序数据的可视化方法。
## Grafana的安装与部署
@@ -74,6 +74,7 @@ Shell > sudo service grafana-server start
```
Shell > grafana-server --config=/usr/local/etc/grafana/grafana.ini --homepath
/usr/local/share/grafana cfg:default.paths.logs=/usr/local/var/log/grafana
cfg:default.paths.data=/usr/local/var/lib/grafana
cfg:default.paths.plugins=/usr/local/var/lib/grafana/plugins
```
+更多安装详情，请点[这里](https://grafana.com/docs/grafana/latest/installation/)
## IoTDB安装
![https://user-images.githubusercontent.com/13203019/51664777-2766ae00-1ff5-11e9-9d2f-7489f8ccbfc2.png"](https://user-images.githubusercontent.com/13203019/51664777-2766ae00-1ff5-11e9-9d2f-7489f8ccbfc2.png"){kind=link}
![https://user-images.githubusercontent.com/13203019/51664842-554bf280-1ff5-11e9-97d2-54eebe0b2ca1.png"](https://user-images.githubusercontent.com/13203019/51664842-554bf280-1ff5-11e9-97d2-54eebe0b2ca1.png"){kind=link}