new worlds

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

diff --git a/website/inc/template.inc b/website/inc/template.inc
index 04b8c6266db2d5cac5f9485568fdf62c044b5265..d6d2fbb3f32fbbf4980923aaff1d03838dbe297b 100644 (file)
--- a/website/inc/template.inc
+++ b/website/inc/template.inc
@@ -46,10 +46,6 @@
 <br/>
 <br/>
 <br/>
-<a href="http://conferences.oreillynet.com/cs/os2005/view/e_sess/6520"><img border="0" src="$(ROOT)/oscon-120x60.gif"/></a>
-<br/>
-<br/>
-<br/>
 <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
 <input type="hidden" name="cmd" value="_xclick"/>
 <input type="hidden" name="business" value="tobias@oetiker.ch"/>
@@ -70,11 +66,13 @@
 <div id="mirrors">
 <A HREF="http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/<where/>">Swiss Original</A>.&nbsp;Mirrors: 
 <A HREF="http://rrdtool.mirror.graemef.net/<where/>">UK</a><!--Graeme Fowler <graeme@graemef.net>-->
+
 #<A HREF="http://rrdtool.planetmirror.com/<where/>">AU</A><!--jason andrade <jason@dstc.edu.au>-->
 #<A HREF="http://rrdtool.cs.pu.edu.tw/<where/>">TW</A><!--Hsun-Chang Chang <hsunchang@gmail.com>-->
 #<A HREF="http://ftp.heanet.ie/mirrors/people.ee.ethz.ch/%257Eoetiker/webtools/rrdtool/<where/>">IE</A><!--Colm MacCárthaigh <colm.maccarthaigh@heanet.ie>-->
 #<A HREF="http://rrdtool.cyclone.se/<where/>">SE</A><!--Hans Engren <hans@cyclone.se>-->
-<A HREF="http://rrdtool.trexle.com/<where/>">US</A><!--Hossam Hossny <hossam@trexle.com>-->
+<A HREF="http://rrdtool.trexle.net/<where/>">US</A><!--Hossam Hossny <hossam@trexle.com>-->
+<A HREF="http://rrdtool.paracoda.com/<where/>">CA</A><!--Hossam Hossny <admin@paracoda.com>-->
 </div>
 <div id="logo">
 <div class="legacy">

diff --git a/website/rrdworld/collectd.xml b/website/rrdworld/collectd.xml
new file mode 100644 (file)
index 0000000..1d9c383
--- /dev/null
+++ b/website/rrdworld/collectd.xml
@@ -0,0 +1,15 @@
+<rrdworld type="application">
+       <name>collectd</name>
+       <author>Florian Forster</author>
+       <description>
+               collectd is a lightweight daemon that periodically collects
+               system information. Since it's kept in memory the intervals can
+               be very short without being hard on the system.
+               Currently Linux 2.4/2.6 and Solaris 5.9 have been tested to
+               work, other UNIXes may work through an external library.
+       </description>
+       <homepage>http://verplant.org/collectd/</homepage>
+       <year>2005</year><month>8</month>
+       <license>GPL</license>
+       <email>octo@verplant.org</email>
+</rrdworld>

diff --git a/website/rrdworld/index.wml b/website/rrdworld/index.wml
index 3cc43f74f215fb3a9071389eefdfd8464f2fe302..bcfd799f4e7466b325987dda99c82048ce9985ee 100644 (file)
--- a/website/rrdworld/index.wml
+++ b/website/rrdworld/index.wml
@@ -22,11 +22,14 @@ while we wait for new material to arrive.</p>
 
 #include "bigsis_rrdworld.xml"
 #include "cacti.xml"
+#include "collectd.xml"
 #include "mailgraph.xml"
+#include "monitorix.xml"
 #include "rrdcgi.xml"
 #include "rrdutil.xml"
 #include "sicm.xml"
 #include "snmpgraph.xml"
+#include "smokeping.xml"
 #include "serverstats.xml"
 #include "tinygraph.xml"
 #include "torrus.xml"

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

diff --git a/website/rrdworld/monitorix.xml b/website/rrdworld/monitorix.xml
new file mode 100644 (file)
index 0000000..36831c0
--- /dev/null
+++ b/website/rrdworld/monitorix.xml
@@ -0,0 +1,15 @@
+<rrdworld type="application"
+          icon="monitorix.png" > <!-- Size 100x66 -->
+ 
+       <name> Monitorix </name>
+     <author> Jordi Sanfeliu </author>
+<description> Monitorix is a free, open source system monitoring tool designed to monitorize as many services as it can. At this time it monitors from the CPU load and temperatures to the users using the system. Network devices activity and network services demand are too monitorized. </description>
+   <homepage> http://www.monitorix.org </homepage> 
+       <year> 2005 </year><month> 9 </month> <!-- Entry creation date -->
+    <license> GPL </license>
+
+   <!-- Optional -->   
+
+      <email> jordi@fibranet.com </email> <!-- Author contact -->
+
+</rrdworld>

diff --git a/website/rrdworld/sicm.xml b/website/rrdworld/sicm.xml
index ad8b8ed4fcf8223965484f82bd3f39296a66d77b..173a1f38123872c62a98a0a79061f7072d43c564 100644 (file)
--- a/website/rrdworld/sicm.xml
+++ b/website/rrdworld/sicm.xml
@@ -1,12 +1,15 @@
-<rrdworld type="application" icon="" > <!-- Size 100x66 -->
-
- <name> SICM - Simple Infrastructure Capacity Monitor </name>
-    <author> Thomas Price </author>
-<description> Written in Perl for Win32 &amp; Linux (easily ported to other O/S's). SICM provides a template based ping &amp; snmp
-front-end to RRDtool that is simple to implement &amp; support, is flexible and provides www, menu driven presentation of the
-output as well as e-mail alerting. </description>
-<homepage> http://sicm.sourceforge.net </homepage>
-  <year> 2003 </year><month> 10 </month> <!-- Entry creation date -->
-<license> GPL </license>
-
-</rrdworld>
+<rrdworld type="application"\r
+          icon="sicm_logo.png" > <!-- Size 100x66 -->\r
+ \r
+       <name> SICM - Simple Infrastructure Capacity Monitor </name>\r
+     <author> Thomas Price </author>\r
+<description> SICM is a tool to monitor, graph and alert the capacity of computing devices and applications. SICM runs on a Windows or Linux device on your network, 24 hours every day and constantly records the capacity parameters of any networked device using snmp, ping or custom modules. The recorded data is stored for later reference via a user friendly menu-driven web browser. E-mail alerts are raised if a user determined number of queries fail. </description>\r
+   <homepage> http://sicm.sourceforge.net </homepage> \r
+       <year> 2003 </year><month> 10 </month> <!-- Entry creation date -->\r
+    <license> GPL </license>\r
+\r
+   <!-- Optional -->   \r
+\r
+   <livesite> http://sicm.sourceforge.net/example.html </livesite> \r
+\r
+</rrdworld>
\ No newline at end of file

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

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

diff --git a/website/rrdworld/smokeping.xml b/website/rrdworld/smokeping.xml
new file mode 100644 (file)
index 0000000..2f9aa28
--- /dev/null
+++ b/website/rrdworld/smokeping.xml
@@ -0,0 +1,18 @@
+<rrdworld type="application"
+          icon="smokeping.png" > <!-- Size 100x66 -->
+ 
+       <name> SmokePing </name>
+     <author> Tobias Oetiker and Niko Tyni</author>
+<description> Latency monitor with built-in alerting system,
+       web interface and powerful plugin system for extensibility with new
+type of latency probes and alerts.
+</description>
+   <homepage> http://people.ee.ethz.ch/oetiker/webtools/smokeping </homepage> 
+       <year> 2005 </year><month> 9 </month> <!-- Entry creation date -->
+    <license> GPL </license>
+
+   <!-- Optional -->   
+
+      <email> tobi@oetiker.ch </email> <!-- Author contact -->
+
+</rrdworld>