integrate latest changes

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

diff --git a/website/gallery/index.en.html b/website/gallery/index.en.html
index 0ec3b24465175ad9ec2958717b25dac543ac72e8..41bdf3cea0af535400acd16bdee1257784462635 100644 (file)
--- a/website/gallery/index.en.html
+++ b/website/gallery/index.en.html
@@ -174,7 +174,8 @@ graphs present average property prices. Image is not unique but object of monito
 <div class="image"><img src="charles.png" alt="" width="597" height="213" /></div>
 <div class="caption"> HTTP cache traffic from servers and to clients -- Charles Glass &lt;charlesequal@<span class="legacy">XYZ-</span>gmail.com&gt;, 2008/10 </div>
 </div>
- <!-- no wider than 600 pixle -->
+ <!-- no wider than 600 pixle
+-->
         <!-- creation date -->
 <div class="gallery">
 <p>
@@ -195,6 +196,16 @@ google_color_text = "000000";
   src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
 </script>
 </p>
+<h2> Peering/Upstream Ratio </h2>
+<div class="image"><img src="upstream-traffic-day.png" alt="" width="500" height="682" /></div>
+<div class="caption"> This graph shows Peering- and Upstream-Traffic and
+summarizes total amount of traffic from our Autonoumous System to the
+World Wide Web. Several RRD-DBs are used to create the graph. MRTG is used
+for collecting values from Cisco and Juniper routers. -- Alex Detzen , 2009/9 </div>
+</div>
+ <!-- no wider than 600 pixle -->
+        <!-- creation date -->
+<div class="gallery">
 <h2> RTT of MPLS VPN endpoints </h2>
 <div class="image"><img src="pings.png" alt="" width="583" height="413" /></div>
 <div class="caption">Although MPLS VPN endpoints seem just one hop away from
@@ -575,7 +586,7 @@ than 600 pixels.</p>
 <!-- ############################# -->
 <div id="address">
 <small>
-01/25/09 | <a href="mailto:tobi@..delete..this..removethis.oetiker.ch">Tobias Oetiker</a> | <a href="http://it.oetiker.ch/monitoring/">OETIKER+PARTNER AG</a>
+09/06/09 | <a href="mailto:tobi@..delete..this..removethis.oetiker.ch">Tobias Oetiker</a> | <a href="http://it.oetiker.ch/monitoring/">OETIKER+PARTNER AG</a>
 </small>
 </div>
 </td></tr>

diff --git a/website/gallery/index.wml b/website/gallery/index.wml
index ddf071c18f9535eb82bb70bd7ee44d71178559c5..d19b6c1b1ecc07527f5937e1a4fd7cfec40e77e5 100644 (file)
--- a/website/gallery/index.wml
+++ b/website/gallery/index.wml
@@ -7,6 +7,7 @@
 #include "mmh11.xml"
 #include "miszek.xml"
 #include "charles.xml"
+#include "upstream-traffic-day.xml"
 #include "pings.xml"
 #include "systembelastung.xml"
 #include "filegroei.xml"

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

diff --git a/website/gallery/upstream-traffic-day.xml b/website/gallery/upstream-traffic-day.xml
new file mode 100644 (file)
index 0000000..aa8b88e
--- /dev/null
+++ b/website/gallery/upstream-traffic-day.xml
@@ -0,0 +1,10 @@
+<gallery image="upstream-traffic-day.png" > <!-- no wider than 600 pixle 
+-->
+      <title> Peering/Upstream Ratio </title>
+     <author> Alex Detzen </author> 
+<description> This graph shows Peering- and Upstream-Traffic and 
+summarizes total amount of traffic from our Autonoumous System to the 
+World Wide Web. Several RRD-DBs are used to create the graph. MRTG is used 
+for collecting values from Cisco and Juniper routers. </description>
+       <year> 2009 </year><month> 9 </month> <!-- creation date -->
+</gallery>

diff --git a/website/index.wml b/website/index.wml
index 8e282770696c69254bdf393ce6636140caf6ed05..b820d41b6ee38c77b30045ca0c0dd69a140584c8 100644 (file)
--- a/website/index.wml
+++ b/website/index.wml
@@ -13,6 +13,17 @@ logging and graphing system for time series data. Use it to write your
 custom monitoring shell scripts or create whole applications using its Perl,
 Python, Ruby, TCL or PHP bindings.</p>
 
+<h2>RRDtool Training at LISA'09</h2>
+
+<p>On Monday, November 2, 2009, Tobi Oetiker is teaching two half day
+RRDtool tutorials at the Large Installation System Administration Conference
+(LISA'09): <a
+href="http://www.usenix.org/events/lisa09/training/tutonefile.html#m6">RRDtool
+First Steps</a> and <a
+href="http://www.usenix.org/events/lisa09/training/tutonefile.html#m9">RRDtool
+Advanced Topics</a>. <a
+href="http://www.usenix.org/events/lisa09/">Registration is now open</a>.</p>
+
 <h2>Do you think RRDtool is cool?</h2>
 
 <p>Is RRDtool adding good value to your operations? Please consider <a
@@ -21,7 +32,7 @@ my OSS work</a> in 2009.</p>
 
 <h2>Version 1.4rc2 released, June 8th, 2009</h2>
 
-<p>RRDtool 1.4rc1 opens the last phase of the road to the 1.4 release. Get a
+<p>RRDtool 1.4rc2 opens the last phase of the road to the 1.4 release. Get a
 <a
 href="http://oss.oetiker.ch/rrdtool/pub/beta/rrdtool-1.4rc2.tar.gz">copy</a>,
 test it and report any problems you find.</p>

diff --git a/website/sponsor.wml b/website/sponsor.wml
index 2b11460ddd9f9282fb7e1bf50ad72810f1ddc165..c5f130caae05248021802f895275ce397469cff1 100644 (file)
--- a/website/sponsor.wml
+++ b/website/sponsor.wml
@@ -37,6 +37,8 @@ sponsor</a>!</p>
 <a href="http://www.contego.net"><img border="0" title="CONTEGO Solutions, LLC" src="$(ROOT)/logos/Contego_Logo_101x51.gif"/></a>&nbsp;
 # From: Maik Metzen <maik.metzen@hitflip.de> Mon, 17 Sep 2007 09:27:40 +0200
 <a href="http://www.hitmeister.de"><img border="0" title="Hitflip Media Trading GmbH" src="$(ROOT)/logos/hitmeister.gif"/></a>&nbsp;
+# From: Mark Burazin via RT <mark@chinavasion.com>
+<a href="http://www.chinavasion.com"><img border="0" title="Chinavasion Wholesale Ltd, China" src="$(ROOT)/logos/chinavasion.png"/></a>&nbsp;
 
 <a href="http://it.oetiker.ch/monitoring/sponsoring.var"><img border="0" alt="Silver Sponsor" src="$(ROOT)/inc/silver-logo.png"/></a>      
 </p>