Merge branch 'develop' into dist/eole/2.7.0/develop

这个提交包含在:
wpetit 2019-03-08 15:21:47 +01:00
当前提交 ddd8ea9521
共有 2 个文件被更改,包括 12 次插入0 次删除

查看文件

@ -8,6 +8,7 @@
<file filelist='prometheus-alertmanager' name='/etc/prometheus/rules.d/predict-rules.yml' mkdir='True' rm='True'/>
<file filelist='grafana' name='/etc/grafana/grafana.ini' mkdir='True' rm='True'/>
<file filelist='grafana' name='/etc/grafana/provisioning/dashboards/eole.yml' source='grafana-dashboards.yml' mkdir='True' rm='True'/>
<file filelist='grafana' name='/etc/grafana/provisioning/datasources/eole.yml' source='grafana-datasources.yml' mkdir='True' rm='True'/>
<service>prometheus</service>
<service>prometheus-alertmanager</service>

查看文件

@ -0,0 +1,11 @@
apiVersion: 1
datasources:
- name: Prometheus
type: prometheus
access: direct
orgId: 1
url: http://%%adresse_ip_eth0:9090
isDefault: true
version: 1
editable: false