From d1552ab9017210f53e0480003edbdfec17781f72 Mon Sep 17 00:00:00 2001
From: Philippe Caseiro <pcaseiro@cadoles.com>
Date: Fri, 1 Jun 2018 10:51:39 +0200
Subject: [PATCH] Removing package tag, and manage grafana-server service

---
 dicos/70_prometheus.xml | 48 ++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/dicos/70_prometheus.xml b/dicos/70_prometheus.xml
index 7f36945..4c18aff 100644
--- a/dicos/70_prometheus.xml
+++ b/dicos/70_prometheus.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <creole>
     <files>
-	<package>prometheus</package>
         <file filelist='prometheus' name='/etc/prometheus/prometheus.yml' source='prometheus.yml' mkdir='True' rm='True'/>
         <file filelist='grafana' name='/etc/grafana/grafana.ini' source='grafana.ini' mkdir='True' rm='True'/>
         <service>prometheus</service>
+        <service>grafana-server</service>
         <service_access service='prometheus'>
-          <port service_accesslist="saLemon">80</port>
-          <port service_accesslist="saLemon">443</port>
-	  <port service_accesslist="prometheus">9090</port>
-	  <port service_accesslist="prometheus">9100</port>
+            <port service_accesslist="saLemon">80</port>
+            <port service_accesslist="saLemon">443</port>
+            <port service_accesslist="prometheus">9090</port>
+            <port service_accesslist="prometheus">9100</port>
         </service_access>
         <service_access service='grafana-server'>
-          <port service_accesslist="grafana">3000</port>
+            <port service_accesslist="grafana">3000</port>
         </service_access>
     </files>
     <variables>
         <family name='services'>
-	    <variable name='activer_prometheus' type='oui/non' description="Activer le service prometheus sur le serveur">
-		<value>oui</value>
+        <variable name='activer_prometheus' type='oui/non' description="Activer le service prometheus sur le serveur">
+        <value>oui</value>
             </variable>
-	</family>
+    </family>
         <family name='prometheus'>
-	    <variable name='activer_grafana' type='oui/non' description="Activer le service grafana sur le serveur">
-		<value>oui</value>
-	    </variable>
+        <variable name='activer_grafana' type='oui/non' description="Activer le service grafana sur le serveur">
+        <value>oui</value>
+        </variable>
             <variable name='prometheusJobName' type='string' description="Nom du job ajouté au label">
                 <value>prometheus</value>
-	    </variable>
+        </variable>
             <variable name='prometheusScrapeInterval' type='string' description="Intervalle de récupération des données sur les différents noeuds">
                 <value>15s</value>
             </variable>
@@ -43,17 +43,17 @@
             <variable name='nouveau_node_exporter' type='string' description="url/IP du nouveau node exporter" multi="True" mandatory='True'>
                 <value>client.prometheus.lan</value>
             </variable>
-	    <variable name='job_name_node' type='string' description="Nom du job pour les noeuds" mode='expert'>
-		<value>node</value>
-	    </variable>
-	    <variable name='job_file_config' type='string' description="Emplacement des fichiers de configuration des noeuds" auto_freeze='True' mode='expert' mandatory='True'>
+        <variable name='job_name_node' type='string' description="Nom du job pour les noeuds" mode='expert'>
+        <value>node</value>
+        </variable>
+        <variable name='job_file_config' type='string' description="Emplacement des fichiers de configuration des noeuds" auto_freeze='True' mode='expert' mandatory='True'>
                 <value>/etc/prometheus/nodes</value>
             </variable>
         </family>
-	<family name="grafana">
-	    <variable name='grafana_domain' type='string' description="Nom de Domaine ou IP pour accèder à l'interface Grafana" mandatory='True'>
-		<value>localhost</value>
-	    </variable>
+    <family name="grafana">
+        <variable name='grafana_domain' type='string' description="Nom de Domaine ou IP pour accèder à l'interface Grafana" mandatory='True'>
+        <value>localhost</value>
+        </variable>
             <variable name='grafana_session_max_lifetime' type='string' description="Durée avant déconnexion de l'interface Grafana (en seconde)">
                 <value>86400</value>
             </variable>
@@ -66,15 +66,15 @@
             <variable name='grafana_auth_anonymous' type='string' description="Activer l'accès aux utilisateurs non enregistrés">
                 <value>false</value>
             </variable>
-	</family>
+    </family>
     </variables>
     <constraints>
 
-	<condition name='disabled_if_in' source='activer_firewall'>
+    <condition name='disabled_if_in' source='activer_firewall'>
             <param>non</param>
             <target type='variable'>activer_prometheus</target>
         </condition>
-	<condition name='disabled_if_in' source='activer_firewall'>
+    <condition name='disabled_if_in' source='activer_firewall'>
             <param>non</param>
             <target type='variable'>activer_grafana</target>
         </condition>