From 9935b4c2ddd0fc73315f5e414170a2fa32f0bf63 Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Wed, 29 Jul 2015 19:24:13 +0200
Subject: [PATCH] Rajoute bato-1, montre la charge sur le lien dsi

---
 Python/etc/weathermap/weathermap.xml | 34 ++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/Python/etc/weathermap/weathermap.xml b/Python/etc/weathermap/weathermap.xml
index 57f8f71..bb68a77 100644
--- a/Python/etc/weathermap/weathermap.xml
+++ b/Python/etc/weathermap/weathermap.xml
@@ -137,13 +137,16 @@ out("""                <node name="node_bata">
                         <label>Batiment G (batg-0)</label>
                 </node>
                 <node name="node_bato">
-                        <position x="1000" y="100" />
-                        <size x="100" y="300" />
+                        <position x="1000" y="150" />
                         <label>Autocom (bato-1)</label>
                 </node>
                 <node name="node_batp">
-                        <position x="1000" y="250" />
+                        <position x="1000" y="300" />
                         <label>Pavillon des Jardins (batp-4)</label>
+                </node>
+                <node name="node_dsi">
+                        <position x="1000" y="50" />
+                        <label>Pioneer-DSI</label>
                 </node>""")
 # On recupere le nom du node dans l'annuaire
 bat_to_prise =  {v:k for k, v in annuaires_pg.uplink_prises['backbone'].items()}
@@ -227,6 +230,15 @@ out("""                <link name="link_batp" type="rrd">
                         <targetout href="/var/lib/munin/switchs.crans.org/bato-1.adm.crans.org-if_bytes-if_24-send-d.rrd" coef="1"/>
                         <bandwidth>1000000</bandwidth>
                 </link>
+                <link name="link_dsi" type="rrd">
+                        <members>
+                                <member>node_bato</member>
+                                <member>node_dsi</member>
+                        </members>
+                        <targetin href="/var/lib/munin/switchs.crans.org/bato-1.adm.crans.org-if_bytes-if_21-recv-d.rrd" coef="1"/>
+                        <targetout href="/var/lib/munin/switchs.crans.org/bato-1.adm.crans.org-if_bytes-if_21-send-d.rrd" coef="1"/>
+                        <bandwidth>1000000</bandwidth>
+                </link>
 	</links>
 	<objects>
 		<object name="obj_backbone">
@@ -241,10 +253,14 @@ out("""                <link name="link_batp" type="rrd">
 			<position x="320" y="380" />
 		</comment>
 	</comments>
-	<images>
-		<image name="img_nfrance" href="http://www.ens-cachan.fr/images/photos/0004/img_1322577636104.jpg" type="png">
-			<position x="550" y="150" />
-			<size x="400" y="150" />
-		</image>
-	</images>
+    <images>
+        <image name="img_crans" href="http://www.ens-cachan.fr/images/photos/0004/img_1322577636104.jpg" type="png">
+            <position x="550" y="175" />
+            <size x="400" y="150" />
+        </image>
+        <image name="img_renater" href="https://upload.wikimedia.org/wikipedia/fr/f/fe/Logo_Renater_2013.gif" type="gif">
+            <position x="1050" y="20" />
+            <size x="300" y="100" />
+        </image>
+    </images>
 </weathermap>""")