You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2021/08/11 02:21:37 UTC
[iotdb] branch master updated: Fix grafana user guide (#3715)
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 c5bf93a Fix grafana user guide (#3715)
c5bf93a is described below
commit c5bf93a9ee773ad9711bc1d08ea44b043f974b55
Author: ZhangHongYin <46...@users.noreply.github.com>
AuthorDate: Wed Aug 11 10:21:01 2021 +0800
Fix grafana user guide (#3715)
---
docs/UserGuide/Ecosystem Integration/Grafana.md | 17 ++++++++++++
docs/zh/UserGuide/Ecosystem Integration/Grafana.md | 32 +++++++++++++++++++---
grafana/readme.md | 17 ++++++++++++
grafana/readme_zh.md | 23 ++++++++++++++++
4 files changed, 85 insertions(+), 4 deletions(-)
diff --git a/docs/UserGuide/Ecosystem Integration/Grafana.md b/docs/UserGuide/Ecosystem Integration/Grafana.md
index b18ee0c..ff415c2 100644
--- a/docs/UserGuide/Ecosystem Integration/Grafana.md
+++ b/docs/UserGuide/Ecosystem Integration/Grafana.md
@@ -48,6 +48,23 @@ Alternatively, manually download the .zip file and unpack it into grafana plugin
* `/var/lib/grafana/plugins` (Linux)
* `/usr/local/var/lib/grafana/plugins`(Mac)
+Then you need to restart grafana server, then you can use browser to visit grafana.
+
+If you see "SimpleJson" in "Type" of "Add data source" pages, then it is install successfully.
+
+Or, if you meet following errors:
+
+```
+Unsigned plugins were found during plugin initialization. Grafana Labs cannot guarantee the integrity of these plugins. We recommend only using signed plugins.
+The following plugins are disabled and not shown in the list below:
+```
+
+Please try to find config file of grafana(eg. customer.ini in windows, and /etc/grafana/grafana.ini in linux), then add following configuration:
+
+```
+allow_loading_unsigned_plugins = "grafana-simple-json-datasource"
+```
+
#### Start Grafana
If Unix is used, Grafana will start automatically after installing, or you can run `sudo service grafana-server start` command. See more information [here](http://docs.grafana.org/installation/debian/).
diff --git a/docs/zh/UserGuide/Ecosystem Integration/Grafana.md b/docs/zh/UserGuide/Ecosystem Integration/Grafana.md
index e8d7a44..b473f18 100644
--- a/docs/zh/UserGuide/Ecosystem Integration/Grafana.md
+++ b/docs/zh/UserGuide/Ecosystem Integration/Grafana.md
@@ -34,17 +34,41 @@ Grafana 是开源的指标量监测和可视化工具，可用于展示时序数
#### simple-json-datasource 数据源插件安装
-* 插件名称：simple-json-datasource
-* 下载地址：https://github.com/grafana/simple-json-datasource
-具体下载方法是：到 Grafana 的插件目录中：`{Grafana 文件目录}\data\plugins\`（Windows 系统，启动 Grafana 后会自动创建`data\plugins`目录）或`/var/lib/grafana/plugins` （Linux 系统，plugins 目录需要手动创建）或`/usr/local/var/lib/grafana/plugins`（MacOS 系统，具体位置参看使用`brew install`安装 Grafana 后命令行给出的位置提示。
+* 插件名称: simple-json-datasource
+* 下载地址: https://github.com/grafana/simple-json-datasource
+
+##### windows系统
+具体下载方法是：到Grafana的插件目录中：`{Grafana文件目录}\data\plugins\`（Windows系统，启动Grafana后会自动创建`data\plugins`目录）或`/var/lib/grafana/plugins` （Linux系统，plugins目录需要手动创建）或`/usr/local/var/lib/grafana/plugins`（MacOS系统，具体位置参看使用`brew install`安装Grafana后命令行给出的位置提示。
执行下面的命令：
```
Shell > git clone https://github.com/grafana/simple-json-datasource.git
```
-然后重启 Grafana 服务器，在浏览器中登录 Grafana，在“Add data source”页面中“Type”选项出现“SimpleJson”即为安装成功。
+
+##### linux系统
+建议使用grafana-cli安装该插件，具体安装命令如下
+
+```
+sudo grafana-cli plugins install grafana-simple-json-datasource
+sudo service grafana-server restart
+```
+
+##### 后续操作
+然后重启Grafana服务器，在浏览器中登录Grafana，在“Add data source”页面中“Type”选项出现“SimpleJson”即为安装成功。
+
+如果出现如下报错
+```
+Unsigned plugins were found during plugin initialization. Grafana Labs cannot guarantee the integrity of these plugins. We recommend only using signed plugins.
+The following plugins are disabled and not shown in the list below:
+```
+
+请找到相关的grafana的配置文件（例如windows下的customer.ini，linux下rpm安装后为/etc/grafana/grafana.ini），并进行如下的配置
+
+```
+allow_loading_unsigned_plugins = "grafana-simple-json-datasource"
+```
#### 启动 Grafana
diff --git a/grafana/readme.md b/grafana/readme.md
index d7afd6e..5d25b3e 100644
--- a/grafana/readme.md
+++ b/grafana/readme.md
@@ -63,6 +63,23 @@ Alternatively, you can manually download the .zip file and unpack it into your g
* `/var/lib/grafana/plugins` (Linux)
* `/usr/local/var/lib/grafana/plugins`(Mac)
+Then you need to restart grafana server, then you can use browser to visit grafana.
+
+If you see "SimpleJson" in "Type" of "Add data source" pages, then it is install successfully.
+
+Or, if you meet following errors:
+
+```
+Unsigned plugins were found during plugin initialization. Grafana Labs cannot guarantee the integrity of these plugins. We recommend only using signed plugins.
+The following plugins are disabled and not shown in the list below:
+```
+
+Please try to find config file of grafana(eg. customer.ini in windows, and /etc/grafana/grafana.ini in linux), then add following configuration:
+
+```
+allow_loading_unsigned_plugins = "grafana-simple-json-datasource"
+```
+
### Start Grafana
If you use Unix, Grafana will auto start after installing, or you can run `sudo service grafana-server start` command. See more information [here](http://docs.grafana.org/installation/debian/).
diff --git a/grafana/readme_zh.md b/grafana/readme_zh.md
index d1d32dd..f5511df 100644
--- a/grafana/readme_zh.md
+++ b/grafana/readme_zh.md
@@ -51,6 +51,7 @@ Grafana是开源的指标量监测和可视化工具，可用于展示时序数
* 插件名称: simple-json-datasource
* 下载地址: https://github.com/grafana/simple-json-datasource
+#### windows系统
具体下载方法是：到Grafana的插件目录中：`{Grafana文件目录}\data\plugins\`（Windows系统，启动Grafana后会自动创建`data\plugins`目录）或`/var/lib/grafana/plugins` （Linux系统，plugins目录需要手动创建）或`/usr/local/var/lib/grafana/plugins`（MacOS系统，具体位置参看使用`brew install`安装Grafana后命令行给出的位置提示。
执行下面的命令：
@@ -58,8 +59,30 @@ Grafana是开源的指标量监测和可视化工具，可用于展示时序数
```
Shell > git clone https://github.com/grafana/simple-json-datasource.git
```
+
+#### linux系统
+建议使用grafana-cli安装该插件，具体安装命令如下
+
+```
+sudo grafana-cli plugins install grafana-simple-json-datasource
+sudo service grafana-server restart
+```
+
+#### 后续操作
然后重启Grafana服务器，在浏览器中登录Grafana，在“Add data source”页面中“Type”选项出现“SimpleJson”即为安装成功。
+如果出现如下报错
+```
+Unsigned plugins were found during plugin initialization. Grafana Labs cannot guarantee the integrity of these plugins. We recommend only using signed plugins.
+The following plugins are disabled and not shown in the list below:
+```
+
+请找到相关的grafana的配置文件（例如windows下的customer.ini，linux下rpm安装后为/etc/grafana/grafana.ini），并进行如下的配置
+
+```
+allow_loading_unsigned_plugins = "grafana-simple-json-datasource"
+```
+
### 启动Grafana
进入Grafana的安装目录，使用以下命令启动Grafana：
* Windows系统：