From edb31de8aafd43556b48109d3ffc80f5dc5c7abe Mon Sep 17 00:00:00 2001
From: vincent <vfebvre@cadoles.com>
Date: Fri, 25 May 2018 16:00:44 +0200
Subject: [PATCH] correction dicos et systemd

---
 dicos/70_prometheus.xml    | 13 +++++++++----
 systemd/prometheus.service |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/dicos/70_prometheus.xml b/dicos/70_prometheus.xml
index d78fb7e..109d6d5 100644
--- a/dicos/70_prometheus.xml
+++ b/dicos/70_prometheus.xml
@@ -7,18 +7,23 @@
           <port service_accesslist="saLemon">80</port>
           <port service_accesslist="saLemon">443</port>
 	  <port>9090</port>
+	  <port>9100</port>
         </service_access>
     </files>
     <variables>
-        <family name='prometheus'>
+        <family name='services'>
 	    <variable name='activer_prometheus' type='oui/non' description="Activer le service prometheus sur le serveur">
-            <variable name='prometheusJobName' type='string' description='Nom du job ajouté au label'>
+		<value>oui</value>
+            </variable>
+	</family>
+        <family name='prometheus'>
+            <variable name='prometheusJobName' type='string' description="Nom du job ajouté au label">
                 <value>prometheus</value>
 	    </variable>
-            <variable name='prometheusScrapeInterval' type='string' description='Intervalle de récupération des données sur les différents noeuds'>
+            <variable name='prometheusScrapeInterval' type='string' description="Intervalle de récupération des données sur les différents noeuds">
                 <value>15s</value>
             </variable>
-            <variable name='prometheusEvaluationInterval' type='string' description='Intervalle entre deux évaluations de règles'>
+            <variable name='prometheusEvaluationInterval' type='string' description="Intervalle entre deux évaluations de règles">
                 <value>30s</value>
             </variable>
             <variable name='prometheusScrapeTimeout' type='string' description="Temps d'attente avant que la récupération de données échoue">
diff --git a/systemd/prometheus.service b/systemd/prometheus.service
index 38352c0..b7f3eee 100644
--- a/systemd/prometheus.service
+++ b/systemd/prometheus.service
@@ -6,7 +6,7 @@ After=network-online.target
 [Service]
 User=root
 Restart=on-failure
-ExecStart=/usr/local/bin/prometheus/prometheus --config.file=/etc/prometheus/prometheus.yml
+ExecStart=/usr/bin/prometheus --config.file=/etc/prometheus/prometheus.yml
 
 [Install]
 WantedBy=multi-user.target