added new tools

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2@980 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/website/license.wml b/website/license.wml
index ac45ae76514f432cea73104bfcff9792269b4223..9daa837a25680b4ade99953aca2ad56c3297758f 100644 (file)
--- a/website/license.wml
+++ b/website/license.wml
@@ -14,7 +14,7 @@ of it) under a license other than the GNU GPL.</P>
 <p>If you want to use RRDtool with an opensouce tool that has a GPL
 incompatible license, you may be able to get around the problem thanks to
 the <a
-href="http://people.ee.ethz.ch/~oetiker/webtools/rrdtool-trac/browser/branches/1.2/program/COPYRIGHT">FLOSS
+href="http://oss.oetiker.ch/rrdtool-trac/browser/branches/1.2/program/COPYRIGHT">FLOSS
 License Exception</a> in the RRDtool license.</p>
 
 <H2>Give Credit</H2>

diff --git a/website/rrdworld/index.wml b/website/rrdworld/index.wml
index 1429adb1b21418b8e5f18f40c7d86ce87bda7e58..177bdd21044716974d3ab05022b89c17ab3522ed 100644 (file)
--- a/website/rrdworld/index.wml
+++ b/website/rrdworld/index.wml
@@ -7,10 +7,6 @@
 <p>A whole ecosystem of tools have sprung up around rrdtool. From tiny
 add-ons to big applications or even replacements for rrdtool itself.</p>
 
-<p>You can checkout the <a
-href="http://people.ee.ethz.ch/oetiker/webtools/rrdtool-1.0.x/rrdworld/">old-site</a>
-while we wait for new material to arrive.</p>
-
 <h2>RRDtool Companions</h2>
 
 #include "drraw.xml"
@@ -53,11 +49,13 @@ while we wait for new material to arrive.</p>
 #include "smokeping.xml"
 #include "serverstats.xml"
 #include "systemgraph.xml"
+#include "thermometer.xml"
 #include "tinygraph.xml"
 #include "toolsmith.xml"
 #include "torrus.xml"
 #include "tstat.xml"
 #include "webminstats.xml"
+#include "unnoc.xml"
 #include "zenoss.xml"
 
 <h2>Commercial Applications</h2>

diff --git a/website/rrdworld/thermometer.png b/website/rrdworld/thermometer.png
new file mode 100644 (file)
index 0000000..43d8964
Binary files /dev/null and b/website/rrdworld/thermometer.png differ

diff --git a/website/rrdworld/thermometer.xml b/website/rrdworld/thermometer.xml
new file mode 100644 (file)
index 0000000..afef5fc
--- /dev/null
+++ b/website/rrdworld/thermometer.xml
@@ -0,0 +1,16 @@
+ <rrdworld type="companion"
+            icon="thermometer.png" > <!-- Size 100x66 -->
+ 
+         <name> temperatures </name>
+       <author> Gürkan Sengün </author>
+ <description> CPU and Disk temperature monitoring </description>
+     <homepage> https://inventory.phys.ethz.ch/stats/ </homepage>
+         <year> 2006 </year><month> 12 </month> <!-- Entry creation date -->
+      <license> GNU GPL </license>
+ 
+     <!-- Optional -->
+ 
+     <livesite> https://inventory.phys.ethz.ch/stats/ </livesite>
+        <email> sengun@phys.ethz.ch </email> <!-- Author contact -->
+ 
+</rrdworld>

diff --git a/website/rrdworld/unnoc-100x66.png b/website/rrdworld/unnoc-100x66.png
new file mode 100644 (file)
index 0000000..5d2d1a5
Binary files /dev/null and b/website/rrdworld/unnoc-100x66.png differ

diff --git a/website/rrdworld/unnoc.xml b/website/rrdworld/unnoc.xml
new file mode 100644 (file)
index 0000000..ded905b
--- /dev/null
+++ b/website/rrdworld/unnoc.xml
@@ -0,0 +1,17 @@
+<rrdworld type="application"
+       icon="unnoc-100x66.png" > <!-- Size 100x66 -->
+
+       <name> Unnoc </name>
+       <author> Jason Schoonover</author>
+       <description>Unnoc is an application that integrates RRDTool graphs with device monitoring.  It will monitor and graph: CPU use, Memory, Load Average, Processes, Disk Usage, Network traffic and other misc items. Email alerts. Many supported devices (anything SNMP), including Cisco Aironets, APC and VMWare VI3.</description>
+       <homepage> http://unnoc.org </homepage> 
+       <year> 2007 </year><month> 1 </month> <!-- Entry creation date -->
+       <license> GPL </license>
+
+       <!-- Optional -->   
+
+       <livesite> http://unnoc.org/demo </livesite> 
+       <email> jason_jks@yahoo.com </email> <!-- Author contact -->
+
+</rrdworld>
+

diff --git a/website/support.wml b/website/support.wml
index f1767e46fec7e4ac9989aabfb9a0526991a0158a..34c3d57b1b78ec4beb5bbc47d9301ee1bae714f3 100644 (file)
--- a/website/support.wml
+++ b/website/support.wml
@@ -9,40 +9,43 @@
 
 <P>If you want to keep uptodate with the progress of RRDtool, subscribe to
 this LOW VOLUME list by sending a message with the subject 'subscribe' to <A
-HREF="mailto:rrd-announce-request@list.ee.ethz.ch?subject=subscribe">rrd-announce-request@list.ee.ethz.ch</A>.</P>
+HREF="mailto:rrd-announce-request@lists.oetiker.ch?subject=subscribe">rrd-announce-request@lists.oetiker.ch</A>.
+Or on the <a href="http://lists.oetiker.ch">web interface</a>.</p>
 
-<P>There is also an <A
-HREF="http://lists.ee.ethz.ch/rrd-announce/">archive</A> of past Traffic on
-this List</P>
 
 <P>Note, that posts to this list will be crossposted to the rrd-users and
 rrd-developers mailinglists.</P>
 
-<h2>RRDtool Trac</h2>
-
-<p>Bug Tracking, user maintained documentation and SVN access live in the <a href="http://oss.oetiker.ch/rrdtool-trac/">RRDtrac</a> site. Check it out.</p>
-
 <H2>rrd-users mailing list</H2>
 
 <P>If you are using RRDtool in your applications, subscribe to
 this list by sending a message with the subject 'subscribe' to <A
-HREF="mailto:rrd-users-request@list.ee.ethz.ch?subject=subscribe">rrd-users-request@list.ee.ethz.ch</A>.</P>
-
-<P>There is an <A HREF="http://lists.ee.ethz.ch/rrd-users/">archive</A> of
-past Traffic on this List</P>
+HREF="mailto:rrd-users-request@lists.oetiker.ch?subject=subscribe">rrd-users-request@lists.oetiker.ch</A>.
+Or on the <a href="http://lists.oetiker.ch">web interface</a>.</p>
 
 <H2>rrd-developers mailing list</H2>
 
 <P>If you are interested in working on the RRDtool code itself, subscribe to
 this list by sending a message with the subject 'subscribe' to <A
-HREF="mailto:rrd-developers-request@list.ee.ethz.ch?subject=subscribe">rrd-developers-request@list.ee.ethz.ch</A>.</P>
+HREF="mailto:rrd-developers-request@lists.oetiker.ch?subject=subscribe">rrd-developers-request@lists.oetiker.ch</A>.
+Or on the <a href="http://lists.oetiker.ch">web interface</a>.</p>
+
+<h2>list archive</h2>
+
+<P>There is an archive of past list traffic on <A
+HREF="http://gmane.org/find.php?list=rrd/">Gmane</A> and the <a
+HREF="http://www.mail-archive.com/index.php?hunt=rrd">"The Mail
+Archive"</A>.</P>
+
+<h2>RRDtool Trac</h2>
 
-<P>There is an <A
-HREF="http://lists.ee.ethz.ch/rrd-developers/">archive</A> of past Traffic on this List</P>
+<p>Bug Tracking, user maintained documentation and SVN access live in the <a
+href="http://oss.oetiker.ch/rrdtool-trac/">RRDtrac</a> site. Check it
+out.</p>
 
 <h2>the #rrdtool channel on IRCnet</h2>
 
 <p>On IRCnet there is an #rrdtool channel where you can meet fellow rrdtool
 users online. It has it's own <a
-href="http://krogloth.de/rrd/channel/">homepage</a> with instructions about how
+href="http://www.krogloth.de/rrd/">homepage</a> with instructions about how
 to connect.</p>