Merge branch 'master' into dist/eole/2.6.2/master

This commit is contained in:
wpetit 2018-06-25 11:08:09 +02:00
commit eb7b7e48df
3 changed files with 16 additions and 8 deletions

View File

@ -5,6 +5,7 @@
<file filelist='prometheus' name='/etc/prometheus/prometheus.yml' mkdir='True' rm='True'/> <file filelist='prometheus' name='/etc/prometheus/prometheus.yml' mkdir='True' rm='True'/>
<file filelist='alertmanager' name='/etc/prometheus/alertmanager.yml' mkdir='True' rm='True'/> <file filelist='alertmanager' name='/etc/prometheus/alertmanager.yml' mkdir='True' rm='True'/>
<file filelist='alertmanager' name='/etc/prometheus/rules.d/alert-rules.yml' mkdir='True' rm='True'/> <file filelist='alertmanager' name='/etc/prometheus/rules.d/alert-rules.yml' mkdir='True' rm='True'/>
<file filelist='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'/>
<service>prometheus</service> <service>prometheus</service>

View File

@ -10,6 +10,7 @@ global:
smtp_smarthost: '%%exim_relay_smtp:465' smtp_smarthost: '%%exim_relay_smtp:465'
smtp_require_tls: true smtp_require_tls: true
%end if %end if
smtp_from: '%%system_mail_from'
%else %else
smtp_smarthost: '%%alSMTPHost:%%alSMTPPort' smtp_smarthost: '%%alSMTPHost:%%alSMTPPort'
smtp_from: '%%alFrom' smtp_from: '%%alFrom'

6
tmpl/predict-rules.yml Normal file
View File

@ -0,0 +1,6 @@
groups:
- name: PredictRules
rules:
- alert: disk_full_within_6_hours
expr: predict_linear(node_filesystem_free{job="%%{job_name_node}",mountpoint="/"}[1h], 6 * 3600) < 0
for: 5m