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

This commit is contained in:
wpetit 2019-03-08 14:56:28 +01:00
commit 5ba7738ee8

View File

@ -7,7 +7,7 @@
<file filelist='prometheus-alertmanager' name='/etc/prometheus/rules.d/alert-rules.yml' mkdir='True' rm='True'/> <file filelist='prometheus-alertmanager' name='/etc/prometheus/rules.d/alert-rules.yml' mkdir='True' rm='True'/>
<file filelist='prometheus-alertmanager' name='/etc/prometheus/rules.d/predict-rules.yml' mkdir='True' rm='True'/> <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/grafana.ini' mkdir='True' rm='True'/>
<file filelist='grafana' name='/etc/grafana/grafana-dashboards.yml' mkdir='True' rm='True'/> <file filelist='grafana' name='/etc/grafana/provisioning/dashboards/eole.yml' mkdir='True' rm='True'/>
<service>prometheus</service> <service>prometheus</service>
<service>prometheus-alertmanager</service> <service>prometheus-alertmanager</service>