Use dtbartle's stats.html
authorDavid Bartley <dtbartle@csclub.uwaterloo.ca>
Wed, 5 Dec 2007 03:54:37 +0000 (22:54 -0500)
committerDavid Bartley <dtbartle@csclub.uwaterloo.ca>
Wed, 5 Dec 2007 03:54:37 +0000 (22:54 -0500)
Makefile
about/Makefile
about/directory.xml
common.mk.in
default.css
directory.xml
stats.html [new file with mode: 0644]

index 81f40a4..db4d072 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 SHELL = umask 002; exec /bin/sh
 
-FILES = events.ics events.atom news.atom index.html \
+FILES = events.ics events.atom news.atom index.html stats.html \
        favicon.ico default.css robots.txt csclub.der csclub.pem
 SUBDIRS = about events office news services media buttons logos flash
 
index b8decbe..bc64dfa 100644 (file)
@@ -1,5 +1,5 @@
 FILES = index.html exec.html members.html constitution.html donations.html \
-       positions.html stats.html constitution-change-20020920.html \
+       positions.html constitution-change-20020920.html \
        constitution-change-20040205.html
 RELDIR = about/
 include ../common.mk
index 4956310..baffe01 100644 (file)
@@ -7,5 +7,4 @@
  <diritem title="Positions" href="positions.html" />
  <diritem title="Membership List" href="members.html" />
  <diritem title="Donations" href="donations.html" />
- <diritem title="Stats" href="stats.html" />
 </directory>
index 5fd354a..53ee214 100644 (file)
@@ -35,6 +35,8 @@ $(OUTDIR)%.atom: %.xml xsl/atom.xsl
 $(OUTDIR)%.ics: %.xml
        perl scripts/xml2ics.pl $< > $@
 
+$(OUTDIR)%.html: %.html
+       cp -f $< $@
 $(OUTDIR)%.ico: %.ico
        cp -f $< $@
 $(OUTDIR)%.css: %.css
index 5a0f948..7e246fe 100644 (file)
@@ -185,20 +185,6 @@ div.webtitle div {
     background-color: #215498;
 }
 
-div.graph {
-    text-align: center;
-    float: left;
-    padding: 0px 4px 4px 4px;
-}
-p.graphtitle {
-    font-size: 14px;
-    font-weight: bold;
-    margin: 0;
-}
-div.graphclear {
-    clear: both;
-}
-
 div.dirheader {
     padding-top: 5px;
 }
index f3c0d02..b7547de 100644 (file)
@@ -11,4 +11,5 @@
  <diritem title="Wiki" href="http://wiki.csclub.uwaterloo.ca/" />
  <diritem title="Webmail" href="https://mail.csclub.uwaterloo.ca/" />
  <diritem title="Gallery" href="/gallery2/" />
+ <diritem title="Stats" href="stats.html" />
 </directory>
diff --git a/stats.html b/stats.html
new file mode 100644 (file)
index 0000000..b5e32a7
--- /dev/null
@@ -0,0 +1,131 @@
+<html>
+
+<head>
+  <title>Network Statistics</title>
+  <style>
+    td {
+      padding: 2px 2px 8px 2px;
+      text-align: center;
+    }
+  </style>
+</head>
+
+<body>
+
+<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/cgi-bin/14all.cgi?cfg=mrtg.conf">More Graphs</a> |
+      <a href="http://noc.uwaterloo.ca/lg">Looking Glass</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> |
+      <a href="http://csclub.uwaterloo.ca/webalizer">caffeine Webalizer Stats</a> |
+      <a href="http://mirror.csclub.uwaterloo.ca/webalizer">mirror.csclub Webalizer Stats</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> |
+      <a href="http://tech.orion.on.ca/cgi/lg.cgi">Looking Glass</a>
+  <tr>
+    <td>
+      <b>Cogent Interface (500Mbps)</b><br/>
+      <img src="http://noc.uwaterloo.ca/cgi-bin/14all.cgi?log=cn-rtext_gi1&cfg=cn-rtext.cfg&png=daily" />
+    </td>
+    <td>
+      <b>ORION interface (1Gbps)</b><br/>
+      <img src="http://noc.uwaterloo.ca/cgi-bin/14all.cgi?log=cn-rtext_gi2&cfg=cn-rtext.cfg&png=daily" />
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <b>Campus Interface (1Gbps)</b><br/>
+      <img src="http://noc.uwaterloo.ca/cgi-bin/14all.cgi?log=cn-rtext_gi0&cfg=cn-rtext.cfg&png=daily"/>
+    </td>
+    <td>
+      <b>External Router Utilization</b><br/>
+      <img src="http://noc.uwaterloo.ca/cgi-bin/14all.cgi?log=cn-rtext_cpu&cfg=cn-rtext.cfg&png=daily"/>
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <b>ORION: Waterloo <-> London</b><br/>
+      <img src="http://tech.orion.on.ca/mrtg/DIST1-LOND/10.10.2.1_24-day.png"/>
+    </td>
+    <td>
+      <b>ORION: Waterloo <-> Guelph</b><br/>
+      <img src="http://tech.orion.on.ca/mrtg/DIST1-WTLO/10.10.3.1_54-day.png"/>
+    </td>
+  <tr>
+    <td>
+      <!-- natural-flavours - traffic -->
+      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&local_graph_id=533&rra_id=1&graph_height=120&graph_width=440" />
+    </td>
+    <td>
+      <!-- artificial-flavours - traffic -->
+      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?local_graph_id=538&rra_id=1&graph_height=120&graph_width=440" />
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <!-- citric-acid - traffic -->
+      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&local_graph_id=480&rra_id=1&graph_height=120&graph_width=440" />
+    </td>
+    <td>
+      <!-- taurine - traffic -->
+      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&local_graph_id=542&rra_id=1&graph_height=120&graph_width=440" />
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <!-- perpugilliam - traffic -->
+      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&local_graph_id=534&rra_id=1&graph_height=120&graph_width=440" />
+    </td>
+    <td>
+      <!-- potassium-citrate - traffic -->
+      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&local_graph_id=553&rra_id=0&graph_height=120&graph_width=440" />
+    </td>
+  <tr>
+  <tr>
+    <td>
+      <!-- staples.cmclub - traffic -->
+      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&local_graph_id=537&rra_id=0&graph_height=120&graph_width=440" />
+    </td>
+    <td>
+      <!-- caffeine - traffic -->
+      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&local_graph_id=579&rra_id=0&graph_height=120&graph_width=440" />
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <!-- csc <-> cs backbone -->
+      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&local_graph_id=532&rra_id=0&graph_height=120&graph_width=440" />
+    </td>
+    <td>
+      <!-- cs <-> ist backbone -->
+      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&local_graph_id=541&rra_id=0&graph_height=120&graph_width=440" />
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <!-- csclub - requests -->
+      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&local_graph_id=583&rra_id=0&graph_height=120&graph_width=440" />
+    </td>
+    <td>
+      <!-- mirror.csclub - requests -->
+      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&local_graph_id=596&rra_id=0&graph_height=120&graph_width=440" />
+    </td>
+  </tr>
+</table>
+
+</body></html>