possibilité d'ajouter des clients avec un nom de domaine

Makefile

@@ -1,9 +1,9 @@
 ################################
-# Makefile pour eole-prometheus
+# Makefile pour XXX-XXX
 ################################
 
 SOURCE=eole-prometheus
-VERSION=0.0.1
+VERSION=0.1
 EOLE_VERSION=2.6
 EOLE_RELEASE=2.6.2
 PKGAPPS=non

debian/compat

@@ -1 +0,0 @@
-7

debian/control

@@ -1,11 +0,0 @@
-Source: eole-prometheus
-Section: web
-Priority: optional
-Maintainer: Cadoles <contact@cadoles.com>
-Build-Depends: debhelper (>= 9)
-Standards-Version: 3.9.3
-
-Package: eole-prometheus
-Architecture: amd64
-Depends: ${misc:Depends}, prometheus, grafana, eole-node-exporter, prometheus-alertmanager, curl
-Description: Eolisation de Prometheus

debian/copyright

@@ -1,44 +0,0 @@
-Format: http://dep.debian.net/deps/dep5
-Upstream-Name: {PROJECT}
-Source: {URL}
-
-Files: *
-Copyright: YEAR {UPSTREAM} {AUTHOR} <{MAIL}>
-License: {UPSTREAM LICENSE}
-
-Files: debian/*
-Copyright: 2012 Équipe EOLE <eole@ac-dijon.fr>
-License: CeCILL-2
-
-License: {UPSTREAM LICENSE}
- {TEXT OF THE LICENSE}
-
-License: CeCILL-2
- This software is governed by the CeCILL-2 license under French law and
- abiding by the rules of distribution of free software.  You can  use,
- modify and or redistribute the software under the terms of the CeCILL-2
- license as circulated by CEA, CNRS and INRIA at the following URL
- "http://www.cecill.info";.
- .
- As a counterpart to the access to the source code and  rights to copy,
- modify and redistribute granted by the license, users are provided only
- with a limited warranty  and the software's author,  the holder of the
- economic rights,  and the successive licensors  have only  limited
- liability.
- .
- In this respect, the user's attention is drawn to the risks associated
- with loading,  using,  modifying and/or developing or reproducing the
- software by the user in light of its specific status of free software,
- that may mean  that it is complicated to manipulate,  and  that  also
- therefore means  that it is reserved for developers  and  experienced
- professionals having in-depth computer knowledge. Users are therefore
- encouraged to load and test the software's suitability as regards their
- requirements in conditions enabling the security of their systems and/or
- data to be ensured and,  more generally, to use and operate it in the
- same conditions as regards security.
- .
- The fact that you are presently reading this means that you have had
- knowledge of the CeCILL-2 license and that you accept its terms.
- .
- On Eole systems, the complete text of the CeCILL-2 License can be found
- in '/usr/share/common-licenses/CeCILL-2-en'.

debian/rules

@@ -1,8 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
-# export DH_VERBOSE=1
-
-%:
-	dh $@

debian/source/format

@@ -1 +0,0 @@
-3.0 (quilt)

diagnose/70-grafana

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-if [ $(CreoleGet activer_grafana) = "oui" ];then
+if [[ $(CreoleGet activer_grafana) == "oui" ]]
+then
     . /usr/lib/eole/diagnose.sh
 
     EchoGras "*** Accès au serveur grafana"

diagnose/70-prometheus

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-if [ $(CreoleGet activer_prometheus) = "oui" ];then
+if [[ $(CreoleGet activer_prometheus) == "oui" ]]
+then
     . /usr/lib/eole/diagnose.sh
 
     EchoGras "*** Accès au serveur Prometheus"

dicos/70_prometheus.xml

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <creole>
     <files>
-        <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='grafana'      name='/etc/grafana/grafana.ini'         mkdir='True' rm='True'/>
+      <file filelist='prometheus'   name='/etc/default/prometheus' source='prometheus.defaults'  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/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'/>
 
         <service>prometheus</service>
         <service>alertmanager</service>
@@ -29,6 +32,9 @@
             <variable name='activerAlertmanager' type='oui/non' description="Activer le service d'alertes">
                 <value>oui</value>
             </variable>
+			<variable name='promStorageRetention' type='number' description='Durée de rétention des métriques (en heures)'>
+				<value>24</value>
+			</variable>
             <variable name='prometheusJobName' type='string' description="Nom du job ajouté au label">
                 <value>prometheus</value>
             </variable>
@@ -53,7 +59,7 @@
 
             <!-- Job standard  -->
             <variable name='prTarg' type='string' description='Nom de la cible prometheus' multi='True'/>
-            <variable name='prTargIP' type='ip' description="Adresse IP de la cible prometheus"/>
+            <variable name='prTargIP' type='string' description="Adresse IP ou nom de domaine de la cible prometheus"/>
             <variable name='prTargSonde' type='string' description="Sonde a utiliser pour ce client">
                 <value>Node Exporter</value>
             </variable>
@@ -72,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>
@@ -79,7 +88,7 @@
             <!-- Job libre  -->
             <variable name='prOpenTarg' type='string' description='Nom de la cible personnalisé prometheus' multi='True'/>
             <variable name='prOpenTargJob' type='string' description='Nom du job de rattachement de la cible'/>
-            <variable name='prOpenTargIP' type='ip' description="Adresse IP de la cible"/>
+            <variable name='prOpenTargIP' type='string' description="Adresse IP ou nom de domaine de la cible"/>
             <variable name='prOpenTargPort' type='number' description="Port d'écoute de la sonde"/>
         </family>
 
@@ -99,9 +108,13 @@
                     <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">
+			<variable name='alSMTPUseSys' type='oui/non' description="Utiliser la passerelle SMTP du système ?">
+				<value>non</value>
+			</variable>
             <variable name='alSMTPHost' type='string' description="Adresse du serveur SMTP pour l'envois des alertes"/>
             <variable name='alSMTPPort' type='string' description="Port d'écoute du serveur SMTP pour l'envois des alertes"/>
             <variable name='alFrom' type='string' description="Adresse d'origine des emails d'alerte"/>
@@ -139,7 +152,7 @@
     <separators>
         <separator name='activer_grafana'>Services complèmentairse</separator>
         <separator name='prometheusJobName'>Configuration du serveur Prometheus</separator>
-		<separator name='job_name_node'>Configuration des jobs standards</separator>
+        <separator name='job_name_node'>Configuration des jobs standards</separator>
         <separator name='alSMTPHost'>Configuration SMTP pour l'envois des alertes</separator>
         <separator name='alReceiver'>Destinatires</separator>
         <separator name='alRoute'>Rêgles de distribution simples</separator>
@@ -158,7 +171,8 @@
             <slave>scrpInterval</slave>
             <slave>scrpTimeout</slave>
             <slave>honorLabels</slave>
-			<slave>scrpScheme</slave>
+	    <slave>scrpScheme</slave>
+            <slave>scrpMetricPath</slave>
         </group>
 
         <group master='alRoute'>
@@ -210,6 +224,16 @@
             <param>['','service','severity']</param>
         </check>
 
+        <condition name='disabled_if_in' source='alSMTPUseSys'>
+            <param>oui</param>
+            <target type='variable'>alSMTPUser</target>
+            <target type='variable'>alSMTPPass</target>
+            <target type='variable'>alSMTPPort</target>
+            <target type='variable'>alSMTPTLS</target>
+			<target type='variable'>alSMTPHost</target>
+			<target type='variable'>alSMTPAuth</target>
+        </condition>
+
         <condition name='disabled_if_in' source='alSMTPAuth'>
             <param>non</param>
             <target type='variable'>alSMTPUser</target>

tmpl/alert-rules.yml

@@ -0,0 +1,41 @@
+#
+# Alert Rules
+#
+groups:
+- name: EoleRules
+  rules:
+  # Instance is Down
+  - alert: JobInstanceDown
+    expr: up == 0
+    for: 1m
+    annotations:
+      DESCRIPTION: Job {{ $labels.job }} instance {{ $labels.instance }} is down.
+      SUMMARY: Job instance is down
+
+  # Heavy CPU usage
+  - alert: cpu_threshold_exceeded
+    expr: (100 * (1 - avg by(instance) (irate(node_cpu{job="%%{job_name_node}",mode="idle"}[5m]))))
+      > 80
+    annotations:
+      description: This device's cpu usage has exceeded the threshold with a value
+        of {{ $value }}.
+      summary: Instance {{ $labels.instance }} CPU usage is dangerously high
+
+  # Heavy Memory usage
+  - alert: mem_threshold_exceeded
+    expr: (node_memory_MemFree{job="%%{job_name_node}"} + node_memory_Cached{job="%%{job_name_node}"} + node_memory_Buffers{job="%%{job_name_node}"})
+      / 1e+06 < 80
+    annotations:
+      description: This device's memory usage has exceeded the threshold with a value
+        of {{ $value }}.
+      summary: Instance {{ $labels.instance }} memory usage is dangerously high
+
+  # Heavy "/" use
+  - alert: filesystem_threshold_exceeded
+    expr: node_filesystem_avail{job="%%{job_name_node}",mountpoint="/"} / node_filesystem_size{job="%%{job_name_node}"}
+      * 100 < 20
+    annotations:
+      description: This device's filesystem usage has exceeded the threshold with
+        a value of {{ $value }}.
+      summary: Instance {{ $labels.instance }} filesystem usage is dangerously high
+

tmpl/alertmanager.yml

@@ -1,16 +1,29 @@
 global:
   # The smarthost and SMTP sender used for mail notifications.
+%if %%alSMTPUseSys ==  'oui'
+  %if %%tls_smtp == "non"
+  smtp_smarthost: '%%exim_relay_smtp:25'
+  %elif %%tls_smtp == "port 25"
+    smtp_smarthost: '%%exim_relay_smtp:25'
+    smtp_require_tls: true
+    %else
+    smtp_smarthost: '%%exim_relay_smtp:465'
+    smtp_require_tls: true
+  %end if
+  smtp_from: '%%system_mail_from'
+%else
   smtp_smarthost: '%%alSMTPHost:%%alSMTPPort'
   smtp_from: '%%alFrom'
-%if %%getVar('alSMTPAuth','non') == 'oui'
+  %if %%getVar('alSMTPAuth','non') == 'oui'
   smtp_auth_username: '%%alSMTPUser'
   smtp_auth_password: 'alSMTPPass'
-%end if
+  %end if
 
-%if %%getVar('alSMTPTLS','non') == 'oui'
+  %if %%getVar('alSMTPTLS','non') == 'oui'
   smtp_require_tls: true
-%else
+  %else
   smtp_require_tls: false
+  %end if
 %end if
 
   # The auth token for Hipchat.
@@ -19,8 +32,8 @@ global:
   #hipchat_api_url: 'https://hipchat.foobar.org/'
 
 # The directory from which notification templates are read.
-templates: 
-- '/etc/alertmanager/template/*.tmpl'
+templates:
+  - '/etc/alertmanager/template/*.tmpl'
 
 # The root route on which each incoming alert enters.
 route:
@@ -42,12 +55,12 @@ route:
 
   # If an alert has successfully been sent, wait 'repeat_interval' to
   # resend them.
-  repeat_interval: 3h 
+  repeat_interval: 3h
 
   # A default receiver
   receiver: %%alDefaultReceiver
 
-  # All the above attributes are inherited by all child routes and can 
+  # All the above attributes are inherited by all child routes and can
   # overwritten on each.
 
   # The child route trees.
@@ -107,7 +120,7 @@ route:
 
 # Inhibition rules allow to mute a set of alerts given that another alert is
 # firing.
-# We use this to mute any warning-level notifications if the same alert is 
+# We use this to mute any warning-level notifications if the same alert is
 # already critical.
 inhibit_rules:
 - source_match:

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

tmpl/predict-rules.yml

@@ -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

tmpl/prometheus.defaults

@@ -0,0 +1 @@
+PROMETHEUS_OPTS='--config.file=/etc/prometheus/prometheus.yml --storage.tsdb.path=/var/lib/prometheus/data'

tmpl/prometheus.yml

@@ -5,7 +5,7 @@ global:
   scrape_timeout: %%prometheusScrapeTimeout
 
 rule_files:
-- "/etc/prometheus/rules.d/*.yml"
+  - "/etc/prometheus/rules.d/*.yml"
 
 scrape_configs:
   - job_name: %%prometheusJobName
@@ -22,7 +22,7 @@ scrape_configs:
 
   - job_name: '%%job_name_node'
     file_sd_configs:
-      - files: [ "%%job_file_config/*.yml" ]
+#      - files: [ "%%job_file_config/*.yml" ]
 %if %%getVar('addTargetPrometheus','non') == 'oui'
     static_configs:
         - targets: [ "%%adresse_ip_eth0:9100"%slurp
@@ -44,12 +44,21 @@ scrape_configs:
     scrape_interval: %%{job.scrpInterval}s
     scrape_timeout: %%{job.scrpTimeout}s
     scheme: %%job.scrpScheme
-  %for %%target in %%getVar('prOpenTarg',[])
+    metrics_path: %%job.scrpMetricPath
+  %set first = True
     static_configs:
+      - targets: [ %slurp
+  %for %%target in %%getVar('prOpenTarg',[])
     %if %%target.prOpenTargJob == %%job
-      - targets: [ "%%target.prOpenTargIP:%%target.prOpenTargPort" ]
+       %if %%first
+"%%target.prOpenTargIP:%%target.prOpenTargPort"%slurp
+          %set first = False
+       %else
+, "%%target.prOpenTargIP:%%target.prOpenTargPort"%slurp
+       %end if
     %end if
   %end for
+ ]
 %end for
 
 %if %%getVar('activerAlertmanager','non') == 'oui'