From 5d9cd97de03163db3ff01ed4e7739bf496029026 Mon Sep 17 00:00:00 2001
From: Philippe Caseiro <pcaseiro@cadoles.com>
Date: Fri, 1 Jun 2018 11:27:07 +0200
Subject: [PATCH] Removing NodeExporter management, this moves to
 eole-node-exporter

---
 dicos/70_prometheus.xml | 5 +----
 tmpl/prometheus.yml     | 2 ++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dicos/70_prometheus.xml b/dicos/70_prometheus.xml
index 4c18aff..1a2a144 100644
--- a/dicos/70_prometheus.xml
+++ b/dicos/70_prometheus.xml
@@ -9,7 +9,6 @@
             <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>
@@ -40,9 +39,7 @@
             <variable name='ajout_client_prometheus' type='oui/non' description="Ajouter un nouveau client à Prometheus">
                 <value>non</value>
             </variable>
-            <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='nouveau_node_exporter' type='string' description="url/IP du nouveau node exporter" multi="True" mandatory='True'/>
         <variable name='job_name_node' type='string' description="Nom du job pour les noeuds" mode='expert'>
         <value>node</value>
         </variable>
diff --git a/tmpl/prometheus.yml b/tmpl/prometheus.yml
index cd5b077..a2034bc 100644
--- a/tmpl/prometheus.yml
+++ b/tmpl/prometheus.yml
@@ -13,7 +13,9 @@ scrape_configs:
 
     static_configs:
       - targets: ['%%nom_domaine_machine:9090']
+%if %%getVar('activerSndNodeExpoter','non') == 'oui'
       - targets: ['%%nom_domaine_machine:9100']
+%end if
 
   - job_name: '%%job_name_node'
     file_sd_configs: