initial

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

diff --git a/website/.htaccess b/website/.htaccess
index 641cfb07791e57732ca39ccfa53b800657b4cd78..64aff2c024d16ce6206f7207d57fcd9bad3f9d2c 100644 (file)
--- a/website/.htaccess
+++ b/website/.htaccess
@@ -1 +1 @@
-ErrorDocument 404 /~oetiker/webtools/rrdtool/404.en.html
+ErrorDocument 404 http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/404.var

diff --git a/website/404.wml b/website/404.wml
index 3e749f1797f3f8fb5e976330b451cd634f8a1619..f1161d9f4140e10bb51a65021764514df51cc87e 100644 (file)
--- a/website/404.wml
+++ b/website/404.wml
@@ -5,5 +5,5 @@
 <H1>Sorry this page does not exist</H1>
 
 <p>For the release of RRDtool 1.2 the RRDtool website has been restructured.
-Most things are still around but probably under a new address</p>
+Most things are still around, but probably under a new address.</p>
 

diff --git a/website/gallery/entry.txt b/website/gallery/entry.txt
index 80a9865708faf7052d203e2090968242ec4e3a35..cde881e4f0e9a1683f16df074969688b901a5953 100644 (file)
--- a/website/gallery/entry.txt
+++ b/website/gallery/entry.txt
@@ -1,4 +1,4 @@
-<gallery image="graph.png" >
+<gallery image="graph.png" > <!-- no wider than 600 pixle -->
 
       <title> Virus Graph </title>
      <author> Max Beispiel </author> 

diff --git a/website/gallery/flux.png b/website/gallery/flux.png
new file mode 100644 (file)
index 0000000..a0006ee
Binary files /dev/null and b/website/gallery/flux.png differ

diff --git a/website/gallery/flux.xml b/website/gallery/flux.xml
new file mode 100644 (file)
index 0000000..9cb8975
--- /dev/null
+++ b/website/gallery/flux.xml
@@ -0,0 +1,20 @@
+<gallery image="flux.png" >
+
+      <title> Fluxoscope Graph </title>
+     <author> Simon Leinen </author> 
+<description>  Fluxoscope is a system used by SWITCH for measurements of
+    our external network traffic. One of its products are graphs which
+    represent, for each external connection, the protocol distribution
+    of traffic over time. The example graph shows the traffic
+    distribution on one of our "upstream" or transit ISPs over a
+    period of a few hours. The "positive" part of the graph shows
+    incoming traffic (what we receive from the ISP), the "negative"
+    part corresponds to outgoing traffic (what we send them). </description>
+
+       <year> 2005 </year><month> 5 </month>
+      
+   <!-- Optional -->   
+
+      <email> simon@switch.ch </email>
+
+</gallery>

diff --git a/website/gallery/gate.spamd.day.600.png b/website/gallery/gate.spamd.day.600.png
new file mode 100644 (file)
index 0000000..fd75e42
Binary files /dev/null and b/website/gallery/gate.spamd.day.600.png differ

diff --git a/website/gallery/gate.spamd.week.600.png b/website/gallery/gate.spamd.week.600.png
new file mode 100644 (file)
index 0000000..3faa6ad
Binary files /dev/null and b/website/gallery/gate.spamd.week.600.png differ

diff --git a/website/gallery/index.wml b/website/gallery/index.wml
index 89c9d84814321a8df1e6728851aedef8d7ee2ad8..6dcbe0056d5f2e51104d6d081a0828ccb9c28752 100644 (file)
--- a/website/gallery/index.wml
+++ b/website/gallery/index.wml
@@ -4,12 +4,9 @@
 
 <H1>RRDtool Gallery</H1>
 
-<p>Graphs can be informative or beautiful, or both. This page is for
-specimens of the last two categories. </p>
-
-<p>Waiting for the first entry. You can checkout the <a
-href="http://people.ee.ethz.ch/~oetiker/webtools/rrdtool-1.0.x/gallery/">old-site</a>
-in the mean time.</p>
+#include "flux.xml"
+#include "spamd_rrdgraph.xml"
+#include "uw-hep-condor.xml"
 
 <h2>Add your own graphs to this list</h2>
 

diff --git a/website/gallery/spamd_rrdgraph.xml b/website/gallery/spamd_rrdgraph.xml
new file mode 100644 (file)
index 0000000..ba06bd4
--- /dev/null
+++ b/website/gallery/spamd_rrdgraph.xml
@@ -0,0 +1,14 @@
+<gallery image="gate.spamd.week.600.png" >
+
+      <title> spamd connections </title>
+     <author> Christopher Kruslicky </author> 
+<description> 
+<a href='http://www.openbsd.org/cgi-bin/man.cgi?query=spamd'>OpenBSD's 
+spam deferral daemon</a> connection graph shows simultaneous connections in green, and connection times in blue.  The dark blue line shows the average connection time, with lighter blue used to show the range from minimum to maximum as a blurring effect.  The data is taken from a spamd logfile every time a line is added, or at 10 second intervals if no new data arrives in which case the most recent values are duplicated.  The RRD is created with a 30 second heartbeat - so some fractional number of connections is possible.  For those unfamiliar with spamd, it is an SMTP tarpit for blacklisted senders.  The logfile includes the number of concurrent connections each time a new host connects, and the time a connection has lasted when a host disconnects.  The number of connections should be fairly accurate in the graphs, while the connection times are not so in the short-term, depending more on the timing of the disconnects.  Connections and times are tracked separately in perl, except that disconnects cause a decrement in the connection count as well.
+</description>
+
+       <year> 2005 </year><month> 4 </month>
+      
+      <email> chris-rrdgallery@kruslicky.net </email>
+
+</gallery>

diff --git a/website/gallery/uw-condor-use.png b/website/gallery/uw-condor-use.png
new file mode 100644 (file)
index 0000000..d4df7e5
Binary files /dev/null and b/website/gallery/uw-condor-use.png differ

diff --git a/website/gallery/uw-condor.png b/website/gallery/uw-condor.png
new file mode 100644 (file)
index 0000000..0cebe28
Binary files /dev/null and b/website/gallery/uw-condor.png differ

diff --git a/website/gallery/uw-hep-condor.xml b/website/gallery/uw-hep-condor.xml
new file mode 100644 (file)
index 0000000..3a4e182
--- /dev/null
+++ b/website/gallery/uw-hep-condor.xml
@@ -0,0 +1,37 @@
+
+<gallery image="uw-condor.png" >
+
+<title> UW-HEP Grid Computing Resources Graph </title>
+<author> Steve Rader </author> 
+<description> 
+This graph shows that the Linux Intel computing resources available
+for particle physics research at the University of Wisconsin
+provides 4.7 CPU <b>years</b> of computing power every day.  It's a
+combination of Condor pools managed by High Energy Physics, the
+Computer Science Department and the Grid Laboratory of Wisconsin.
+</description>
+
+<year> 2005 </year> <month> 5 </month>
+<livesite> http://nrg.hep.wisc.edu </livesite> 
+
+<email> rader@hep.wisc.edu </email>
+
+</gallery>
+
+
+<gallery image="uw-condor-use.png" >
+<title> UW-HEP Grid CPU Utilization Graph </title>
+<author> Steve Rader </author> 
+<description> 
+
+This graph shows the utilization of Linux Intel CPUs by particle
+physics researchers and other members of the Grid Laboratory of
+Wisconsin.
+
+</description>
+<year> 2005 </year> <month> 5 </month>
+<livesite> http://nrg.hep.wisc.edu </livesite> 
+<email> rader@hep.wisc.edu </email>
+
+</gallery>
+

diff --git a/website/rrdworld/cacti.xml b/website/rrdworld/cacti.xml
new file mode 100644 (file)
index 0000000..504c4a4
--- /dev/null
+++ b/website/rrdworld/cacti.xml
@@ -0,0 +1,15 @@
+<rrdworld type="application">
+<name>Cacti</name>
+<author>Ian Berry</author>
+<description>Cacti is a complete network graphing solution designed to harness the power of RRDTool's data storage and graphing functionality. Cacti provides a fast poller, advanced graph templating, multiple data acquisition methods, and user management features out of the box. All of this is wrapped in an intuitive, easy to use interface that makes sense for LAN-sized installations up to complex networks with hundreds of devices.
+
+Cacti's goal is to remain true to RRDTool's feature set, allowing users to create virtually any possible RRDTool graph through Cacti's interface. Most of RRDTool's functionality including graphs, data sources, RRA's, and CDEF's are fully supported. Coupled with Cacti's templating features, all of this advanced functionality can be supported with minimal overhead to the user. Creating graphs for a device is as simple as creating the device, selecting a device template, and selecting which graphs to create for that particular device type.
+
+In addition to creating graphs, Cacti provides numerous features to aid in displaying graphs. Some of these features include multiple display modes, a real time timespan selector, and the ability to organize graphs on a tree. The user management functionality allows for users who should only have access to view certain graphs. This is beneficial for hosting/ISP orientated users that wish to give customers access to their graphs.
+</description>
+<homepage>http://www.cacti.net</homepage> 
+<year>2005</year><month>4</month>
+<license>GPL</license>
+<livesite>http://www.bigspring.k12.pa.us/cacti/graph_view.php</livesite> 
+<email>iberry@raxnet.net</email>
+</rrdworld>
\ No newline at end of file

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

diff --git a/website/rrdworld/drraw.xml b/website/rrdworld/drraw.xml
new file mode 100644 (file)
index 0000000..688f2ef
--- /dev/null
+++ b/website/rrdworld/drraw.xml
@@ -0,0 +1,11 @@
+<rrdworld type="application" icon="drraw.png" > <!-- Size 100x66 -->
+       <name> drraw </name>
+     <author> Christophe Kalt </author>
+<description> drraw is a simple web based presentation front-end for RRDtool that allows you to interactively build graphs of your own design. A
+graph definition can be turned into a template which may be applied to many Round Robin Database files. drraw specializes in providing an easy mean
+of displaying data stored with RRDtool and does not care about how the data is collected, making it a great complement to other RRDtool front-ends.
+</description>
+   <homepage> http://web.taranis.org/drraw/ </homepage> 
+       <year> 2002 </year><month> 11 </month>
+    <license> BSD </license>
+</rrdworld>

diff --git a/website/rrdworld/entry.txt b/website/rrdworld/entry.txt
index 99b978f58684ea8814e2b9726ccb616a19fd8228..f5837665c70c6252fb840f057cf03a830bb942b0 100644 (file)
--- a/website/rrdworld/entry.txt
+++ b/website/rrdworld/entry.txt
@@ -1,6 +1,6 @@
-<rrdworld type="extension|application"
-       icon="rumble.png" > <!-- Size 100x66 -->
-
+<rrdworld type="companion|application|?????"
+          icon="rumble.png" > <!-- Size 100x66 -->
+ 
        <name> RRRRumble </name>
      <author> Peter Example </author>
 <description> Makes rrdtool rumble when new data is added </description>

diff --git a/website/rrdworld/index.wml b/website/rrdworld/index.wml
index 31f185841872c3e4562544e5c441175c996d6548..01f3e328e2b5cd3e4a0d2be5367d1906f924ab44 100644 (file)
--- a/website/rrdworld/index.wml
+++ b/website/rrdworld/index.wml
@@ -11,17 +11,15 @@ add-ons to big applications or even replacements for rrdtool itself.</p>
 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>Applications</h2>
-
-<p>none yet</p>
+<h2>RRDtool Companions</h2>
 
-<h2>Add-Ons</h2>
+#include "drraw.xml"
+#include "rrd_merger.xml"
+#include "weathermap4rrd.xml"  
 
-<p>none yet</p>
-
-<h2>Replacements</h2>
+<h2>Applications</h2>
 
-<p>none yet</p>
+#include "cacti.xml"
 
 <h2>Add your own tool to this list</h2>
 

diff --git a/website/rrdworld/rrd_merger.xml b/website/rrdworld/rrd_merger.xml
new file mode 100644 (file)
index 0000000..f388b5a
--- /dev/null
+++ b/website/rrdworld/rrd_merger.xml
@@ -0,0 +1,14 @@
+<rrdworld type="application" > <!-- Size 100x66 -->\r
+\r
+       <name> RRD Merger </name>\r
+     <author> Ivan Pintori </author>\r
+<description> RRD Merger is a perl script that merges 2 RRDs into a new one. </description>\r
+   <homepage> http://www.pintori.it/rrd-merger </homepage>\r
+       <year> 2005 </year><month> 5 </month>\r
+    <license> GPL </license>\r
+\r
+   <!-- Optional -->\r
+\r
+      <email> ivan@pintori.it </email>\r
+\r
+</rrdworld>\r

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

diff --git a/website/rrdworld/weathermap4rrd.xml b/website/rrdworld/weathermap4rrd.xml
new file mode 100644 (file)
index 0000000..6f04eae
--- /dev/null
+++ b/website/rrdworld/weathermap4rrd.xml
@@ -0,0 +1,15 @@
+<rrdworld type="application"
+       icon="weathermap4rrd.png" > <!-- Size 100x66 -->
+
+       <name> WeatherMap4RRD </name>
+     <author> Alexandre Fontelle </author>
+<description> Network Weathermap based on data from RRD files </description>
+   <homepage> http://weathermap4rrd.tropicalex.net/ </homepage> 
+       <year> 2005 </year><month> 1 </month>
+    <license> GPL </license>
+
+   <!-- Optional -->   
+
+       <email> afontelle@free.fr </email>
+
+</rrdworld>
\ No newline at end of file