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

dicos/70_prometheus.xml

@@ -78,6 +78,9 @@
             <variable name='scrpScheme' type='string' description="Protocole à utiliser pour l'interrogation de la sonde">
                 <value>http</value>
             </variable>
+           <variable name='scrpMetricPath' type='string' description="Chemin d'accès de la ressource">
+                <value>/metrics</value>
+            </variable>
 
             <variable name='addPrOpenTarg' type='oui/non' description="Ajouter des cibles statiques pour les jobs personnalisé">
                 <value>non</value>
@@ -105,6 +108,7 @@
                     <variable name='grafana_auth_anonymous' type='string' description="Activer l'accès aux utilisateurs non enregistrés">
                         <value>false</value>
                     </variable>
+					<variable name='grafanaRootURL' type='string' description='Url publique de grafana (avec http:// ou https://)' mode='expert'/>
                 </family>
 
         <family name="alertes prometheus">
@@ -168,6 +172,7 @@
             <slave>scrpTimeout</slave>
             <slave>honorLabels</slave>
 	    <slave>scrpScheme</slave>
+            <slave>scrpMetricPath</slave>
         </group>
 
         <group master='alRoute'>

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 }}.

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
+%if %%getVar('activer_exim_relay_smtp','non') == 'oui'
-;host = localhost:25
+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
+skip_verify = true
-;from_address = admin@grafana.localhost
+from_address = %%system_mail_from
-;from_name = Grafana
+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

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