diff --git a/dicos/70_prometheus.xml b/dicos/70_prometheus.xml
index ca108d3..4a8ecd9 100644
--- a/dicos/70_prometheus.xml
+++ b/dicos/70_prometheus.xml
@@ -78,6 +78,9 @@
http
+
+ /metrics
+
non
@@ -105,6 +108,7 @@
false
+
@@ -167,7 +171,8 @@
scrpInterval
scrpTimeout
honorLabels
- scrpScheme
+ scrpScheme
+ scrpMetricPath
diff --git a/tmpl/alert-rules.yml b/tmpl/alert-rules.yml
index 2eb4b80..8c6a684 100644
--- a/tmpl/alert-rules.yml
+++ b/tmpl/alert-rules.yml
@@ -33,7 +33,7 @@ groups:
# Heavy "/" use
- alert: filesystem_threshold_exceeded
expr: node_filesystem_avail{job="%%{job_name_node}",mountpoint="/"} / node_filesystem_size{job="%%{job_name_node}"}
- * 100 < 90
+ * 100 < 20
annotations:
description: This device's filesystem usage has exceeded the threshold with
a value of {{ $value }}.
diff --git a/tmpl/grafana.ini b/tmpl/grafana.ini
index ba811af..341b329 100644
--- a/tmpl/grafana.ini
+++ b/tmpl/grafana.ini
@@ -40,11 +40,13 @@ domain = %%grafana_domain
# Redirect to correct domain if host header does not match domain
# Prevents DNS rebinding attacks
-;enforce_domain = false
+enforce_domain = true
# The full public facing url you use in browser, used for redirects and emails
# If you use reverse proxy and sub path specify full url (with sub path)
-;root_url = http://localhost:3000
+%if %%is_empty('grafanaRootURL')
+root_url = %%grafanaRootURL
+%end if
# Log web requests
;router_logging = false
@@ -299,18 +301,20 @@ enabled = %%grafana_auth_anonymous
#################################### SMTP / Emailing ##########################
[smtp]
-;enabled = false
-;host = localhost:25
+%if %%getVar('activer_exim_relay_smtp','non') == 'oui'
+enabled = true
+host = %%exim_relay_smtp:25
;user =
# If the password contains # or ; you have to wrap it with trippel quotes. Ex """#password;"""
;password =
;cert_file =
;key_file =
-;skip_verify = false
-;from_address = admin@grafana.localhost
-;from_name = Grafana
+skip_verify = true
+from_address = %%system_mail_from
+from_name = Grafana
# EHLO identity in SMTP dialog (defaults to instance_name)
;ehlo_identity = dashboard.example.com
+%end if
[emails]
;welcome_email_on_sign_up = false
diff --git a/tmpl/prometheus.yml b/tmpl/prometheus.yml
index f305d20..b725259 100644
--- a/tmpl/prometheus.yml
+++ b/tmpl/prometheus.yml
@@ -44,6 +44,7 @@ scrape_configs:
scrape_interval: %%{job.scrpInterval}s
scrape_timeout: %%{job.scrpTimeout}s
scheme: %%job.scrpScheme
+ metrics_path: %%job.scrpMetricPath
%set first = True
static_configs:
- targets: [ %slurp