From f94834a7a151a409c1172318abb24a075b035455 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20GRAMAIN?= <mael@enpls.org>
Date: Sat, 23 Oct 2021 14:39:07 -0400
Subject: [PATCH] New graphs

---
 graphs.html | 50 +++++++++++++++++++++++---------------------------
 index.html  |  4 ++--
 2 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/graphs.html b/graphs.html
index 3edb51b..b1829ee 100644
--- a/graphs.html
+++ b/graphs.html
@@ -41,7 +41,7 @@
                     <figcaption>Weathermap NA AS213253</figcaption>
                 </figure>
                 <figure>
-                    <img src="https://observium-graph-proxy.enpls.org/graph.php?type=multi-port_bits_separate&to=1627090604&id=88,96,6,79&height=200&width=600&from=1595554604" alt="wm2021">
+                    <img id="aggregtransit" src="https://observium-graph-proxy.enpls.org/graph.php?type=multi-port_bits_separate&id=694%2C88%2C96%2C6&height=400&width=600&legend=no&from=1621000000" alt="wm2021">
                     <figcaption>Aggreg Transit</figcaption>
                 </figure>
 	    </div>
@@ -55,26 +55,12 @@
                     <figcaption>hv01.gp dualstack</figcaption>
                 </figure>
                 <figure>
-                    <img src="https://observium-graph-proxy.enpls.org/graph.php?id=6&type=device_processor&height=200&width=600&legend=no" alt="hv01.gp cpu">
-                    <figcaption>hv01.gp cpu usage</figcaption>
-                </figure>
-            </div>
-        </div>
-
-        <div class="images">
-            <h2>Server HV02.GP, Guadeloupe <img src="assets/gp.gif" width="30"></h2>
-            <div class="flex">
-                <figure>
-                    <img src="https://observium-graph-proxy.enpls.org/graph.php?device=19&type=device_bits&height=200&width=600&legend=no" alt="hv02.gp dualstack">
-                    <figcaption>hv02.gp dualstack</figcaption>
-                </figure>
-                <figure>
-                    <img src="https://observium-graph-proxy.enpls.org/graph.php?id=19&type=device_temperature&height=200&width=600&legend=no" alt="hv02.gp temp">
-                    <figcaption>hv02.gp temperature</figcaption>
+                    <img src="https://observium-graph-proxy.enpls.org/graph.php?id=6&type=device_temperature&height=200&width=600&legend=no" alt="hv01.gp cpu">
+                    <figcaption>hv01.gp temperature</figcaption>
                 </figure>
                 <figure>
-                    <img src="https://observium-graph-proxy.enpls.org/graph.php?id=19&type=device_processor&height=200&width=600&legend=no" alt="hv02.gp cpu">
-                    <figcaption>hv02.gp cpu usage</figcaption>
+                    <img src="https://observium-graph-proxy.enpls.org/graph.php?id=6&type=device_ucd_ss_cpu&height=200&width=600&legend=no" alt="hv01.gp cpu">
+                    <figcaption>hv01.gp cpu usage</figcaption>
                 </figure>
             </div>
         </div>
@@ -90,6 +76,10 @@
                     <img src="https://observium-graph-proxy.enpls.org/graph.php?type=device_printersupplies_toner&device=2&height=200&width=600&legend=no" alt="printer">
                     <figcaption>Lexmark Printer toner capacity</figcaption>
                 </figure>
+                <figure>
+                    <img src="https://observium-graph-proxy.enpls.org/graph.php?id=26&type=sensor_graph&height=170&width=600" alt="printer">
+                    <figcaption>UPS-01.PBGP Runtime Remaining</figcaption>
+                </figure>
             </div>
         </div>
 
@@ -105,7 +95,7 @@
                     <figcaption>core.mtl load avg</figcaption>
                 </figure>
                 <figure>
-                    <img src="https://observium-graph-proxy.enpls.org/graph.php?device=9&type=device_processor&height=200&width=600&legend=no" alt="core.mtl cpu">
+                    <img src="https://observium-graph-proxy.enpls.org/graph.php?device=9&type=device_ucd_ss_cpu&height=200&width=600&legend=no" alt="core.mtl cpu">
                     <figcaption>core.mtl cpu usage</figcaption>
                 </figure>
             </div>
@@ -116,15 +106,15 @@
             <div class="flex">
                 <figure>
                     <img src="https://observium-graph-proxy.enpls.org/graph.php?device=18&type=device_bits&height=200&width=600&legend=no" alt="core.fra">
-                    <figcaption>core.fra dualstack</figcaption>
+                    <figcaption>core.pnj1 dualstack</figcaption>
                 </figure>
                 <figure>
                     <img src="https://observium-graph-proxy.enpls.org/graph.php?device=18&type=device_la&height=200&width=600&legend=no" alt="core.fra load avg">
-                    <figcaption>core.fra load avg</figcaption>
+                    <figcaption>core.pnj1 load avg</figcaption>
                 </figure>
                 <figure>
-                    <img src="https://observium-graph-proxy.enpls.org/graph.php?device=18&type=device_processor&height=200&width=600&legend=no" alt="core.fra cpu">
-                    <figcaption>core.fra cpu usage</figcaption>
+                    <img src="https://observium-graph-proxy.enpls.org/graph.php?device=18&type=device_ucd_ss_cpu&height=200&width=600&legend=no" alt="core.fra cpu">
+                    <figcaption>core.pnj1 cpu usage</figcaption>
                 </figure>
             </div>
         </div>
@@ -141,7 +131,7 @@
                     <figcaption>core.dro load avg</figcaption>
                 </figure>
                 <figure>
-                    <img src="https://observium-graph-proxy.enpls.org/graph.php?device=1&type=device_processor&height=200&width=600&legend=no" alt="core.dro cpu">
+                    <img src="https://observium-graph-proxy.enpls.org/graph.php?device=1&type=device_ucd_ss_cpu&height=200&width=600&legend=no" alt="core.dro cpu">
                     <figcaption>core.dro cpu usage</figcaption>
                 </figure>
             </div>
@@ -159,7 +149,7 @@
                     <figcaption>core.vel load avg</figcaption>
                 </figure>
                 <figure>
-                    <img src="https://observium-graph-proxy.enpls.org/graph.php?device=10&type=device_processor&height=200&width=600&legend=no" alt="core.vel cpu">
+                    <img src="https://observium-graph-proxy.enpls.org/graph.php?device=10&type=device_ucd_ss_cpu&height=200&width=600&legend=no" alt="core.vel cpu">
                     <figcaption>core.vel cpu usage</figcaption>
                 </figure>
             </div>
@@ -177,11 +167,17 @@
                     <figcaption>edge.fra load avg</figcaption>
                 </figure>
                 <figure>
-                    <img src="https://observium-graph-proxy.enpls.org/graph.php?device=12&type=device_processor&height=200&width=600&legend=no" alt="edge.fra">
+                    <img src="https://observium-graph-proxy.enpls.org/graph.php?device=12&type=device_ucd_ss_cpu&height=200&width=600&legend=no" alt="edge.fra">
                     <figcaption>edge.fra cpu usage</figcaption>
                 </figure>
             </div>
         </div>
 
+        <script type="text/javascript"> 
+            var d = new Date();
+            d.setMonth(d.getMonth() - 2);
+            document.getElementById("aggregtransit").src="https://observium-graph-proxy.enpls.org/graph.php?type=multi-port_bits_separate&id=694%2C88%2C96%2C6&height=400&width=600&legend=no&from=" + Date.parse(d)/1000;
+        </script> 
+
     </body>
 </html>
diff --git a/index.html b/index.html
index 241164f..b11c77d 100644
--- a/index.html
+++ b/index.html
@@ -29,8 +29,8 @@
         <div class="main">
             <h2>About me:</h2>
             <p><a href="#" onclick="window.open('me.html','popup','width=600,height=600'); return false;" title="Me in ASCII">I am</a> 
-                currently studying in Mathematics, Physics and Computer Science. I am currently living in <a href="https://desencyclopedie.org/wiki/Guadeloupe_(France)">Guadeloupe</a>, France and speak French <i>(L1)</i>, Creole <i>(L1)</i>, English <i>(C1)</i>, Spanish <i>(B2)</i> and German <i>(A2)</i>.</p>
-            <p>Actively involved in the Open Source and the associative sector, I <a href="https://git.gnous.eu/mael">write</a> Golang and Python applications, do network administration (@AS213253) and GNU/Linux system administration (<a href="https://gnous.eu">@GnousEU</a>).</p>
+                currently studying in Mathematics and Physics/Chemistry. I am currently living in <a href="https://desencyclopedie.org/wiki/Guadeloupe_(France)">Guadeloupe</a>, France and speak French, Creole, English, Spanish and a little bit of German.</p>
+            <p>Actively involved in the Open Source and the associative sector, I <a href="https://git.gnous.eu/mael">write</a> Golang and Python applications, do network administration (@AS213253) and GNU/Linux system administration (<a href="https://gnous.eu">@GnousEU</a> & <a href="https://milkywan.fr">@MilkyWan</a>).</p>
             <p>I'm currently writing <a href="https://github.com/outout14/sacrebleu-dns">my own AIO DNS server</a> in Golang. I also do <a href="https://unsplash.com/@outout">photography</a> and <a href="https://fr.wikipedia.org/wiki/Sp%C3%A9cial:Contributions/Outout14">contribute to fr.Wikipedia</a>.</p>
         </div>