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

This commit is contained in:
wpetit 2019-03-08 14:49:27 +01:00
commit d0e4c0b794
3 changed files with 12 additions and 1 deletions

View File

@ -7,6 +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'/>
<service>prometheus</service> <service>prometheus</service>
<service>prometheus-alertmanager</service> <service>prometheus-alertmanager</service>

View File

@ -0,0 +1,10 @@
# # config file version
apiVersion: 1
providers:
- name: 'eole'
orgId: 1
folder: ''
type: file
options:
path: /var/lib/grafana/dashboards

View File

@ -21,7 +21,7 @@
;plugins = /var/lib/grafana/plugins ;plugins = /var/lib/grafana/plugins
# folder that contains provisioning config files that grafana will apply on startup and while running. # folder that contains provisioning config files that grafana will apply on startup and while running.
; provisioning = conf/provisioning provisioning = conf/provisioning
#################################### Server #################################### #################################### Server ####################################
[server] [server]