Skip to content

Commit

Permalink
fix grafana dashboard config path and an error doc link
Browse files Browse the repository at this point in the history
  • Loading branch information
aspirer authored and YunhuiChen committed Feb 17, 2022
1 parent 05ecfe5 commit 731b85c
Show file tree
Hide file tree
Showing 9 changed files with 17,979 additions and 6 deletions.
2 changes: 1 addition & 1 deletion docs/cn/monitor.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ CURVE 集群监控使用 Prometheus 采集数据,并使用 Grafana 作为前

2. ```docker compose``` 用于编排docker组件的配置,包括 Promethues、Grafana、Repoter

3. ```python``` 脚本有多个。[target_json.py ](../../monitor/target_json.py)用于生成 prometheus 服务发现依赖的监控目标配置,生成的文件为 json 格式;该脚本依赖 [target.ini](../../monitor/target.ini.example) 中的配置,从配置中获取 mds、etcd 的信息。[grafana-report.py](../../monitor/grafana-report.py) 用于从 Grafana 导出 daily reporter中所需要的数据信息。
3. ```python``` 脚本有多个。[target_json.py ](../../monitor/target_json.py)用于生成 prometheus 服务发现依赖的监控目标配置,生成的文件为 json 格式;该脚本依赖 [target.ini](../../monitor/target.ini) 中的配置,从配置中获取 mds、etcd 的信息。[grafana-report.py](../../monitor/grafana-report.py) 用于从 Grafana 导出 daily reporter中所需要的数据信息。


## 效果图展示
Expand Down
2 changes: 1 addition & 1 deletion docs/en/monitor_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ The configuration of the monitoring target uses the prometheus file-based servic

2. ```docker compose``` is used to orchestrate the configuration of docker components, including Promethues, Grafana and Repoter.

3. ```python``` scripts. [target_json.py](../../monitor/target_json.py) is used to generate the monitoring target configuration that prometheus service discovery depends on. The generated file is in json format and the script depends on [target.ini](../. ./monitor/target.ini.example) to obtain mds, etcd information from the configuration. [grafana-report.py](../../monitor/grafana-report.py) is used to export the data information required by the daily reporter from Grafana.
3. ```python``` scripts. [target_json.py](../../monitor/target_json.py) is used to generate the monitoring target configuration that prometheus service discovery depends on. The generated file is in json format and the script depends on [target.ini](../../monitor/target.ini) to obtain mds, etcd information from the configuration. [grafana-report.py](../../monitor/grafana-report.py) is used to export the data information required by the daily reporter from Grafana.

## Renderings Show

Expand Down
8 changes: 4 additions & 4 deletions monitor/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

curve集群监控的控制脚本,用于启动、停止、重启监控功能。

##### docker-compose.yml.example:
##### docker-compose.yml:

编排监控系统相关容器的配置文件,包括prometheus容器、grafana容器。

Expand All @@ -18,15 +18,15 @@ curve集群监控的控制脚本,用于启动、停止、重启监控功能。

用于生成prometheus监控对象的python脚本,每隔一段时间用curve_ops_tool拉取监控目标并更新。

##### target.ini.example
##### target.ini

target_json.py脚本依赖的一些配置

##### grafana:

grafana相关目录

##### grafana/grafana.ini.example:
##### grafana/grafana.ini:

grafana的启动配置文件,将映射到容器的 `/etc/grafana/grafana.ini`

Expand All @@ -49,7 +49,7 @@ grafana的datasources的json文件存放目录,grafana将从该目录加载文

prometheus相关目录

##### prometheus/prometheus.yml.example:
##### prometheus/prometheus.yml:

prometheus的配置文件

Expand Down
Loading

0 comments on commit 731b85c

Please sign in to comment.