updated

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

diff --git a/website/gallery/ga-usa.xml b/website/gallery/ga-usa.xml
index 87cda882a9e2434850b8e310660ba905be041085..84c6d1c2c27596788767e1a7260b60ec97b1fba6 100644 (file)
--- a/website/gallery/ga-usa.xml
+++ b/website/gallery/ga-usa.xml
@@ -1,5 +1,5 @@
 
-<gallery image="600px-ga-usa-rrd-half-gradient-attic-temps-Zone-X.png" > <!-- no wider than 600 pixle -->
+<gallery image="ga-usa.png" > <!-- no wider than 600 pixle -->
 
       <title> Sensor Network Temperature Gradients </title>
      <author> Dale Reagan </author> 

diff --git a/website/gallery/index.en.html b/website/gallery/index.en.html
index be7ddd3ffd9195f88d8c3123c743b4676536d882..de33043369407bdf9c00d687072acf459147d259 100644 (file)
--- a/website/gallery/index.en.html
+++ b/website/gallery/index.en.html
@@ -138,6 +138,14 @@ src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
 actual volume of transactions for MMS submitions, from 3 differents devices,
 such
 as, Phone, VAS and MM4 (others operator). -- Alex Rivoltella &lt;alessio.r-delme-@<span class="legacy">XYZ-</span>tiscalinet.it&gt;, 2006/3 </div>
+</div>
+ <!-- no wider than 600 pixle -->
+        <!-- creation date -->
+   <!-- Optional -->
+<div class="gallery">
+<h2> GOES-13 Solar Particle Flux </h2>
+<div class="image"><img src="ace-part.png" alt="" /></div>
+<div class="caption"> High energy solar wind particles measured by GOES-13 satellite -- Stefan Wernli &lt;hb9tmc@<span class="legacy">XYZ-</span>bigfoot.com&gt;, 2012/12 <a href="http://crna.zapto.org/rrd/swpc/">[demo]</a></div>
 </div>
 <div class="gallery">
 <h2>Outside temperature in Södermalm, Sundsvall, Sweden</h2>
@@ -149,7 +157,7 @@ as, Phone, VAS and MM4 (others operator). -- Alex Rivoltella &lt;alessio.r-delme
    <!-- Optional -->
 <div class="gallery">
 <h2> Sensor Network Temperature Gradients </h2>
-<div class="image"><img src="600px-ga-usa-rrd-half-gradient-attic-temps-Zone-X.png" alt="" /></div>
+<div class="image"><img src="ga-usa.png" alt="" width="600" height="296" /></div>
 <div class="caption">
 Created as part of a 1-Wire temperature network project with related
 implementation/technical posts at <a href="http://web-tech.ga-usa.com/?s=sensor+network">ga-usa</a>.
@@ -166,14 +174,6 @@ and <a href="http://web-tech.ga-usa.com/2012/05/creating-color-gradients-with-rr
         <!-- creation date -->
    <!-- Optional -->
 <div class="gallery">
-<h2> PS Network Traffic </h2>
-<div class="image"><img src="PS_Network_traffic.png" alt="" width="597" height="363" /></div>
-<div class="caption"> This graph shows the PS network traffic generated from the users of a telecommunication operator using USB modems, smartphones.. for 24 hours. Interesting the period from 8:00AM to 8:00PM, where there are peaks of traffic every 15 minutes. These are generated by Smartphones sincro. -- Enrique Gómez &lt;egomezm@<span class="legacy">XYZ-</span>gmail.com&gt;, 2011/8 <a href="">[demo]</a></div>
-</div>
- <!-- no wider than 600 pixle -->
-        <!-- creation date -->
-   <!-- Optional -->
-<div class="gallery">
 <p>
 <script type="text/javascript"><!--
 google_ad_client = "pub-8135238818549668";
@@ -192,6 +192,14 @@ google_color_text = "000000";
   src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
 </script>
 </p>
+<h2> PS Network Traffic </h2>
+<div class="image"><img src="PS_Network_traffic.png" alt="" width="597" height="363" /></div>
+<div class="caption"> This graph shows the PS network traffic generated from the users of a telecommunication operator using USB modems, smartphones.. for 24 hours. Interesting the period from 8:00AM to 8:00PM, where there are peaks of traffic every 15 minutes. These are generated by Smartphones sincro. -- Enrique Gómez &lt;egomezm@<span class="legacy">XYZ-</span>gmail.com&gt;, 2011/8 <a href="">[demo]</a></div>
+</div>
+ <!-- no wider than 600 pixle -->
+        <!-- creation date -->
+   <!-- Optional -->
+<div class="gallery">
 <h2> Network Based Application Recognition </h2>
 <div class="image"><img src="nbar_optical_com_pe.png" alt="" width="600" height="518" /></div>
 <div class="caption"> This graph shows a Internet connection and the classification of up to eight classes of protocols using Cisco Network Based Application Recognition (NBAR), also includes the total bandwidth and transfer volume for each protocol class. -- Erick Del Castillo &lt;edelcastillo@<span class="legacy">XYZ-</span>optical.com.pe&gt;, 2011/3 <a href="http://monitor.optical.com.pe">[demo]</a></div>
@@ -696,7 +704,7 @@ than 600 pixels.</p>
 <!-- ############################# -->
 <div id="address">
 <small>
-08/13/12 | <a href="mailto:tobi@..delete..this..removethis.oetiker.ch">Tobias Oetiker</a> | <a href="http://it.oetiker.ch/monitoring/">OETIKER+PARTNER AG</a>
+12/26/12 | <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 5dcd99e73c2b9c7d2a55a429c0a5851c55017552..4dd22516560109c43d94e124ef72b6ade3574132 100644 (file)
--- a/website/gallery/index.wml
+++ b/website/gallery/index.wml
@@ -5,6 +5,8 @@
 <H1>RRDtool Gallery</H1>
 
 #include "mmh11.xml"
+#include "sahi_end2end.xml"
+#include "ace_part.xml"
 #include "mgroth.xml"
 #include "ga-usa.xml"
 #include "powerusage-2wk.xml"

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

diff --git a/website/gallery/sahi_end2end.xml b/website/gallery/sahi_end2end.xml
new file mode 100644 (file)
index 0000000..d2a5966
--- /dev/null
+++ b/website/gallery/sahi_end2end.xml
@@ -0,0 +1,14 @@
+<gallery image="sahi_end2end.png" > <!-- no wider than 600 pixle -->
+
+      <title> Sahi end2end web test runtimes </title>
+     <author> Simon Meggle </author> 
+<description> This graph shows the results of a sahi end2end web test, which was executed by Nagios. The three AREAs from the bottom upwards describe the runtimes of each logical step within this test, the blue AREA on top is the test's overhead runtime. The orange TICKs on top are printed whenever one ore more steps exceeded the allowed runtime. The pnp4nagios/PHP config file for this graph is available on git. </description>
+       <year> 2012 </year><month> 12 </month> <!-- creation date -->
+      
+   <!-- Optional -->   
+
+   <livesite> https://github.com/simonmeggle/sahi2omd-db </livesite> 
+      <email> simon.meggle@consol.de </email>
+
+</gallery>
+