Final changes from the meeting.
[www/www.git] / stats.html
index f5f19c4..9e675ec 100644 (file)
@@ -1,12 +1,19 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
 <head>
   <title>Network Statistics</title>
   <style type="text/css">
-    td {
-      padding: 2px 2px 8px 2px;
+    body {
+    }
+    td.stats1 {
+      padding: 6px 2px 6px 2px;
+    }
+    td.stats1, td.stats2 {
       text-align: center;
+      font-size: 16px;
+    }
+    table {
+      margin-left: auto; margin-right: auto;
     }
   </style>
 </head>
 
 <table>
   <tr>
-    <td colspan="2">IST:
-      <a href="http://noc.uwaterloo.ca/cn/Stats/intextday">Yesterday's External Stats</a> |
-      <a href="http://noc.uwaterloo.ca/cn/Stats/intextm2d">Month-to-Date External Stats</a> |
-      <a href="http://ist.uwaterloo.ca/cn/Stats/extvol.html">External Volume</a>|
-      <a href="http://noc.uwaterloo.ca/netstats/">More Graphs</a> |
-      <a href="http://noc.uwaterloo.ca/lg">Looking Glass</a>
+    <td colspan="2" class="stats2">IST:
+      <a href="http://istns.uwaterloo.ca/ipstats/yesterday.txt">Yesterday's External Stats</a> |
+      <a href="https://strobe.uwaterloo.ca/~twiki/bin/view/ISTNS/ExternalNetworkStats">Interface Graphs</a>|
+      <a href="https://istns.uwaterloo.ca/netstats/">Router Graphs</a> |
+      <a href="http://ist.uwaterloo.ca/ns/mgmt">IST Network Services</a>
     </td>
   </tr>
   <tr>
-    <td colspan="2">CSClub:
-      <a href="http://cacti.csclub.uwaterloo.ca/graph_view.php">More Graphs</a> |
-      <a href="http://bittorrent.csclub.uwaterloo.ca/">BitTorrent Tracker</a>
-    </td>
-  </tr>
-  <tr>
-    <td colspan="2">ORION:
-      <a href="http://tech.orion.on.ca/orionmap/south.html">"South" Network Map</a> |
-      <a href="http://tech.orion.on.ca/orionmap/north.html">"North" Network Map</a> |
-      <a href="http://tech.orion.on.ca/orionmap/tera.html">"Toronto" Network Map</a> |
-      <a href="http://tech.orion.on.ca/mrtg/DIST1-WTLO.html">Waterloo Graphs</a> |
+    <td colspan="2" class="stats2">
+      ORION:
+      <a href="http://www.orion.on.ca/trafficmap.html">Network Map</a> |
       <a href="http://tech.orion.on.ca/cgi/lg.cgi">Looking Glass</a>
     </td>
   </tr>
+  <tr><td>&nbsp;</td></tr>
   <tr>
-    <td>
-      <b>Cogent Interface (500 Mbps)</b><br/>
-      <img src="http://noc.uwaterloo.ca/cgi-bin/14all.cgi?log=cn-rtext_gi1_1&amp;cfg=cn-rtext.cfg&amp;png=daily" alt="Cogent Interface (500 Mbps)"/>
-    </td>
-    <td>
-      <b>ORION Interface (1 Gbps)</b><br/>
-      <img src="http://noc.uwaterloo.ca/cgi-bin/14all.cgi?log=cn-rtext_gi1_2&amp;cfg=cn-rtext.cfg&amp;png=daily" alt="ORION Interface (1 Gbps)" />
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <b>Campus Interface (1 Gbps)</b><br/>
-      <img src="http://noc.uwaterloo.ca/cgi-bin/14all.cgi?log=cn-rtext_gi3_1&amp;cfg=cn-rtext.cfg&amp;png=daily" alt="Campus Interface (1 Gbps)" />
-    </td>
-    <td>
-      <b>External Router Utilization</b><br/>
-      <img src="http://noc.uwaterloo.ca/cgi-bin/14all.cgi?log=cn-rtext_cpu&amp;cfg=cn-rtext.cfg&amp;png=daily" alt="External Router Utilization" />
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <b>ORION: Waterloo &lt;-&gt; London</b><br/>
-      <img src="http://tech.orion.on.ca/mrtg/DIST1-LOND/10.10.2.1_24-day.png" alt="ORION: Waterloo &lt;-&gt; London" />
-    </td>
-    <td>
-      <b>ORION: Waterloo &lt;-&gt; Guelph</b><br/>
-      <img src="http://tech.orion.on.ca/mrtg/DIST1-WTLO/10.10.3.1_54-day.png" alt="ORION: Waterloo &lt;-&gt; Guelph"/>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=533&amp;rra_id=1&amp;graph_height=120&amp;graph_width=440" alt="natural-flavours - Traffic - eth0" />
-    </td>
-    <td>
-      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?local_graph_id=662&amp;rra_id=1&amp;graph_height=120&amp;graph_width=440" alt="ginseng - Traffic - e100g0" />
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=480&amp;rra_id=1&amp;graph_height=120&amp;graph_width=440" alt="citric-acid - Traffic - eth0" />
-    </td>
-    <td>
-      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=542&amp;rra_id=1&amp;graph_height=120&amp;graph_width=440" alt="taurine - Traffic - eth0" />
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=538&amp;rra_id=1&amp;graph_height=120&amp;graph_width=440" alt="artificial-flavours - Traffic - eth0" />
-    </td>
-    <td>
-      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=482&amp;rra_id=0&amp;graph_height=120&amp;graph_width=440" alt="glucose-fructose - Traffic - eth0" />
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=537&amp;rra_id=0&amp;graph_height=120&amp;graph_width=440" alt="staples.cmclub - Traffic - eth0" />
+    <td class="stats1">
+      <b>Cogent Interface (1 Gbps)</b><br/>
+      <img src="https://istns.uwaterloo.ca/cgi-bin/14all.cgi?log=ext-rt-mc_gi1_1&amp;cfg=ext-rt-mc.cfg&amp;png=daily" alt="Cogent Interface (1 Gbps)"/>
     </td>
-    <td>
-      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=579&amp;rra_id=0&amp;graph_height=120&amp;graph_width=440" alt="caffeine - Traffic - eth0" />
+    <td class="stats1">
+      <b>ORION Interface (2x1 Gbps)</b><br/>
+      <img src="https://istns.uwaterloo.ca/cgi-bin/14all.cgi?log=ext-rt-mc_gi1_2&amp;cfg=ext-rt-mc.cfg&amp;png=daily" alt="ORION Interface (1 Gbps)" />
+      <img src="https://istns.uwaterloo.ca/cgi-bin/14all.cgi?log=ext-rt-phy_gi1_1&amp;cfg=ext-rt-phy.cfg&amp;png=daily" alt="ORION Interface (1 Gbps)" />
     </td>
-  </tr>
-  <tr>
     <td>
-      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=532&amp;rra_id=0&amp;graph_height=120&amp;graph_width=440" alt="CSC &lt;-&gt; CS Backbone" />
-    </td>
-    <td>
-      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=541&amp;rra_id=0&amp;graph_height=120&amp;graph_width=440" alt="CS &lt;-&gt; IST Backbone" />
+  <strong>Internet interface (1Gbps, Hydro One Telecommunications)</strong>
+  <IMG _moz_resizing="true" alt="Internet (Hydro One Telecommunications)" src="https://istns.uwaterloo.ca/cgi-bin/14all.cgi?log=ext-rt-phy_gi1_2&amp;cfg=ext-rt-phy.cfg&amp;png=weekly"></IMG>
     </td>
   </tr>
   <tr>
-    <td>
-      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=583&amp;rra_id=0&amp;graph_height=120&amp;graph_width=440" alt="csclub.uwaterloo.ca - Requests" />
+    <td class="stats1">
+      <b>Campus Interface [MC]</b><br/>
+      <img src="https://istns.uwaterloo.ca/cgi-bin/14all.cgi?log=ext-rt-mc_cn-rt-mc&png=daily.s&small=0&cfg=mrtg.cfg" alt="Campus Interface [MC]" />
     </td>
-    <td>
-      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=596&amp;rra_id=0&amp;graph_height=120&amp;graph_width=440" alt="mirror.csclub.uwaterloo.ca - Requests" />
+    <td class="stats1">
+      <b>Campus Interface [PHY]</b><br/>
+      <img src="https://istns.uwaterloo.ca/cgi-bin/14all.cgi?log=ext-rt-mc_cn-rt-phy&png=daily.s&small=0&cfg=mrtg.cfg" alt="Campus Interface [PHY]" />
     </td>
   </tr>
-</table>
 
+</table>
 </body>
 </html>