new entries

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

diff --git a/website/gallery/index.wml b/website/gallery/index.wml
index 97c50e06adf5c699c2611313baee713ec7222083..a373dc71d1ba89d732415ff5dd8568a0c815bd13 100644 (file)
--- a/website/gallery/index.wml
+++ b/website/gallery/index.wml
@@ -4,6 +4,7 @@
 
 <H1>RRDtool Gallery</H1>
 
+#include "zug.xml"
 #include "pmacct.xml"
 #include "solar.xml"
 #include "mailstat-daily.xml"

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

diff --git a/website/gallery/zug.xml b/website/gallery/zug.xml
new file mode 100644 (file)
index 0000000..021aeb2
--- /dev/null
+++ b/website/gallery/zug.xml
@@ -0,0 +1,15 @@
+<gallery image="zug.png" > <!-- no wider than 600 pixle -->
+
+     <title> Weather monitoring </title>
+     <author> Kantonsschule Zug </author>
+<description> This graph shows the atmospheric pressure measured at our
+school's weather station. We use this data and graphs to
+demonstrate weather behavior with real life data. </description>
+       <year> 2005 </year><month> 11 </month> <!-- creation date -->
+
+   <!-- Optional -->
+
+   <livesite> http://weather.kanti-zug.ch </livesite>
+      <email> info@kanti-zug.ch </email>
+
+</gallery>

diff --git a/website/rrdworld/index.wml b/website/rrdworld/index.wml
index 59d2588a6e74a201ebba5fd21028fea3b06c78c1..519fe2ffd6fcb46a8b6909cbd86df982a7cbceb0 100644 (file)
--- a/website/rrdworld/index.wml
+++ b/website/rrdworld/index.wml
@@ -25,6 +25,7 @@ while we wait for new material to arrive.</p>
 #include "collectd.xml"
 #include "mailgraph.xml"
 #include "monitorix.xml"
+#include "munin.xml"
 #include "ow.xml"
 #include "rrdcgi.xml"
 #include "rrdutil.xml"

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

diff --git a/website/rrdworld/munin.xml b/website/rrdworld/munin.xml
new file mode 100644 (file)
index 0000000..9039fa9
--- /dev/null
+++ b/website/rrdworld/munin.xml
@@ -0,0 +1,22 @@
+<rrdworld type="application"
+          icon="munin.png" > <!-- Size 100x66 -->
+ 
+       <name> Munin </name>
+     <author> Ingvar Hagelund, Kjetil T. Homme, Patrick Domack, Mike
+Discenza, Alexandre Dupouy, Nicolai Langfeldt, Mike Fedyk
+</author>
+<description> Munin is a tool for collecting performance data and
+displaying it in a web interface. It has a master/node architecture. The
+master collects data from the nodes at regular intervals, storing the
+data in RRD, and updates the graphs. One of the main goals has been ease
+of creating plugins. </description>
+   <homepage> http://www.linpro.no/projects/munin/ </homepage> 
+       <year> 2005 </year><month> 11 </month> <!-- Entry creation date -->
+    <license> GPL v2 </license>
+
+   <!-- Optional -->   
+
+   <livesite> http://www.linpro.no/projects/munin/example/ </livesite> 
+      <email> munin-users@lists.sourceforge.net </email> <!-- Author contact -->
+
+</rrdworld>