mixed updates

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

diff --git a/website/download.wml b/website/download.wml
index b613b66d51cac4f897a8ecc6a1a6d3592888e0e6..31cf1dffee3eba22fb75bcb245f834c3edf1635f 100644 (file)
--- a/website/download.wml
+++ b/website/download.wml
@@ -58,9 +58,14 @@ the <b>configure</b> script is missing. You get this generated by running:
 <B>./MakeMakefile</B> ... note that you will need automake, autoconf and
 libtool installed for this to work.</p>
 
+
 <p>If you fix a bug, I would love to see the output of '<b>svn diff</b>'.</p>
 
-<p>To get the latest chenges from the current 1.2 branch use this:</p>
+<p>Starting with rrdtool 1.3rc1, make sure to run <code>./configure --enable-maintainer-mode</code> prior
+before 'makeing' modified source, to ensure that all bits get properly
+rebuilt.</p>
+
+<p>To get the latest changes from the current 1.2 branch use this:</p>
 <pre>
 svn checkout svn://svn.oetiker.ch/rrdtool/branches/1.2/program
 mv program rrdtool-1.2

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

diff --git a/website/gallery/cubemon.xml b/website/gallery/cubemon.xml
new file mode 100644 (file)
index 0000000..d4746a4
--- /dev/null
+++ b/website/gallery/cubemon.xml
@@ -0,0 +1,13 @@
+
+
+<gallery image="cubemon.png" > <!-- no wider than 600 pixle -->
+
+      <title>Cubemon</title>
+     <author>Hamish Marson</author> 
+<description>Cubemon - Real-Time openGL rotating .png images from RRDTool. Images generated by stats from monitored devices rotate in cubes. This example showing 26 devices at once</description>
+       <year> 2008 </year><month> 4 </month><!-- creation date -->
+      
+   <!-- Optional -->   
+      <email>hamish@travellingkiwi.com</email>
+
+</gallery>

diff --git a/website/gallery/index.en.html b/website/gallery/index.en.html
index f1b001b19662642bf597d6f722f7a255513468e9..ebaef518f520248eae1e002e78947bc272ddf20c 100644 (file)
--- a/website/gallery/index.en.html
+++ b/website/gallery/index.en.html
@@ -62,6 +62,25 @@
 </li>
 </ul>
 <br />
+<!-- SiteSearch Google -->
+<form method="get" action="http://oss.oetiker.ch/rrdtool/search.en.html" target="_top">
+<table border="0" summary="">
+<tr>
+<td nowrap="nowrap" valign="top" align="left" height="32"><input type="hidden" name="domains" value="oss.oetiker.ch" /> <label for="sbi" style="display: none">Enter your search terms</label> <input type="text" name="q" size="31" maxlength="255" value="" id="sbi" /></td>
+</tr>
+<tr>
+<td nowrap="nowrap">
+<table summary="">
+<tr>
+<td><input type="radio" name="sitesearch" value="" id="ss0" /> <label for="ss0" title="Search the Web"><font size="-1" color="#000000">Web</font></label></td>
+<td><input type="radio" name="sitesearch" value="oss.oetiker.ch" checked="checked" id="ss1" /> <label for="ss1" title="Search oss.oetiker.ch"><font size="-1" color="#000000">oss.oetiker.ch</font></label></td>
+</tr>
+</table>
+<label for="sbb" style="display: none">Submit search form</label> <input type="submit" name="sa" value="Google Search" id="sbb" /> <input type="hidden" name="client" value="pub-8135238818549668" /> <input type="hidden" name="forid" value="1" /> <input type="hidden" name="channel" value="6449489261" /> <input type="hidden" name="ie" value="ISO-8859-1" /> <input type="hidden" name="oe" value="ISO-8859-1" /> <input type="hidden" name="safe" value="active" /> <input type="hidden" name="cof" value="GALT:#0066CC;GL:1;DIV:#999999;VLC:336633;AH:center;BGC:FFFFFF;LBGC:FF9900;ALC:0066CC;LC:0066CC;T:000000;GFNT:666666;GIMP:666666;FORID:11" /> <input type="hidden" name="hl" value="en" /></td>
+</tr>
+</table>
+</form>
+<!-- SiteSearch Google -->
 <br />
 <br />
 <p><b>Gold Sponsors</b></p>
@@ -130,6 +149,14 @@ google_ad_height = 250;
 <div class="image"><img src="mmh11_er.png" alt="" width="267" height="321" /></div>
 <div class="caption">Simply parse of SNMPget from Vendor OID. The graph display the actual send a PAP push to the mobile, possibile errors due to get to HLR and retrieve for mobile. -- 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>Cubemon</h2>
+<div class="image"><img src="cubemon.png" alt="" width="594" height="410" /></div>
+<div class="caption">Cubemon - Real-Time openGL rotating .png images from RRDTool. Images generated by stats from monitored devices rotate in cubes. This example showing 26 devices at once -- Hamish Marson &lt;hamish@<span class="legacy">XYZ-</span>travellingkiwi.com&gt;, 2008/4</div>
+</div>
 <!-- no wider than 600
 pixle -->
 <!-- creation date -->
@@ -143,14 +170,6 @@ pixle -->
 <!-- creation date -->
 <!-- Optional -->
 <div class="gallery">
-<h2>Energy Mix</h2>
-<div class="image"><img src="energy_graph.png" alt="" width="581" height="303" /></div>
-<div class="caption">This graph shows indoor and outdoor temperature, heating temperatures, brightness, natural gas and electric power consumption. Values come from MessPC system and is created with sensorserver project -- Lutz Schulze &lt;lschulze@<span class="legacy">XYZ-</span>messpc.de&gt;, 2008/3 <a href="http://www.messpc.de/sensorserver.php">[demo]</a></div>
-</div>
-<!-- no wider than 600 pixle -->
-<!-- creation date -->
-<!-- Optional -->
-<div class="gallery">
 <p><script type="text/javascript">
 //<![CDATA[
 <!--
@@ -169,6 +188,14 @@ google_color_text = "000000";
 //]]>
 </script> <script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
 </script></p>
+<h2>Energy Mix</h2>
+<div class="image"><img src="energy_graph.png" alt="" width="581" height="303" /></div>
+<div class="caption">This graph shows indoor and outdoor temperature, heating temperatures, brightness, natural gas and electric power consumption. Values come from MessPC system and is created with sensorserver project -- Lutz Schulze &lt;lschulze@<span class="legacy">XYZ-</span>messpc.de&gt;, 2008/3 <a href="http://www.messpc.de/sensorserver.php">[demo]</a></div>
+</div>
+<!-- no wider than 600 pixle -->
+<!-- creation date -->
+<!-- Optional -->
+<div class="gallery">
 <h2>Network Appliance IOPs by protocol</h2>
 <div class="image"><img src="netapp-iops.png" alt="" width="600" height="321" /></div>
 <div class="caption">We use a combination of RRDtool, SNMP and Python to gather metrics and generate graphs for several of our critical systems. This graph shows a three hour window of the disk IO activity on one of our NetApp filers broken down by protocol (CIFS, NFS, FCP and iSCSI). -- Robert McDermott &lt;rmcdermo@<span class="legacy">XYZ-</span>gmail.com&gt;, 2007/12</div>
@@ -396,7 +423,7 @@ creation date -->
 <td id="footcell"><!-- ############################# -->
 <!-- # FOOTER -->
 <!-- ############################# -->
-<div id="address"><small>03/08/08 | <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>
+<div id="address"><small>04/28/08 | <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>
 </table>

diff --git a/website/gallery/index.wml b/website/gallery/index.wml
index 4008b9b512ec3d075bcb45b375c0e5c9b8a66675..69815ad6527accedc2462473e17a0bdcdefd2b12 100644 (file)
--- a/website/gallery/index.wml
+++ b/website/gallery/index.wml
@@ -5,6 +5,7 @@
 <H1>RRDtool Gallery</H1>
 
 #include "mmh11.xml"
+#include "cubemon.xml"
 #include "sintraf.xml"
 #include "energy_graph.xml"
 #include "netapp-iops.xml"

diff --git a/website/inc/template.inc b/website/inc/template.inc
index fa45000da460dca440d2f46149d1c2b1b825c642..1fdddf16fb4ea8abf50cf6358249c8e77d911cda 100644 (file)
--- a/website/inc/template.inc
+++ b/website/inc/template.inc
@@ -43,6 +43,39 @@
 <h2 class="legacy">Menu</h2>
 <navbar:render name=main menumode=inner nohints txtonly select=$(PAGE)/>
 <br/>
+<!-- SiteSearch Google -->
+<form method="get" action="http://oss.oetiker.ch/rrdtool/search.en.html" target="_top">
+<table border="0">
+<tr><td nowrap="nowrap" valign="top" align="left" height="32">
+<input type="hidden" name="domains" value="oss.oetiker.ch"></input>
+<label for="sbi" style="display: none">Enter your search terms</label>
+<input type="text" name="q" size="31" maxlength="255" value="" id="sbi"></input>
+</td></tr>
+<tr>
+<td nowrap="nowrap">
+<table>
+<tr>
+<td>
+<input type="radio" name="sitesearch" value="" id="ss0"></input>
+<label for="ss0" title="Search the Web"><font size="-1" color="#000000">Web</font></label></td>
+<td>
+<input type="radio" name="sitesearch" value="oss.oetiker.ch" checked id="ss1"></input>
+<label for="ss1" title="Search oss.oetiker.ch"><font size="-1" color="#000000">oss.oetiker.ch</font></label></td>
+</tr>
+</table>
+<label for="sbb" style="display: none">Submit search form</label>
+<input type="submit" name="sa" value="Google Search" id="sbb"></input>
+<input type="hidden" name="client" value="pub-8135238818549668"></input>
+<input type="hidden" name="forid" value="1"></input>
+<input type="hidden" name="channel" value="6449489261"></input>
+<input type="hidden" name="ie" value="ISO-8859-1"></input>
+<input type="hidden" name="oe" value="ISO-8859-1"></input>
+<input type="hidden" name="safe" value="active"></input>
+<input type="hidden" name="cof" value="GALT:#0066CC;GL:1;DIV:#999999;VLC:336633;AH:center;BGC:FFFFFF;LBGC:FF9900;ALC:0066CC;LC:0066CC;T:000000;GFNT:666666;GIMP:666666;FORID:11"></input>
+<input type="hidden" name="hl" value="en"></input>
+</td></tr></table>
+</form>
+<!-- SiteSearch Google -->
 <br/>
 <br/>
 <p><b>Gold Sponsors</b></p>

diff --git a/website/index.wml b/website/index.wml
index 9c2e5672b6e3a593d2c1293f7621dd5ad601fd1a..b3d0c7704328aa75ff9ec45fe975cec128d2050a 100644 (file)
--- a/website/index.wml
+++ b/website/index.wml
@@ -7,10 +7,13 @@
 #<div style="float:right"><a style="border-width: 0px" href="http://www.oetiker.ch/press"><img src="award-white.png" border="0"/></a></div>
 
 <H2>News</H2>
-RRDtool 1.3 Beta 4 is out. Read about the features on
+
+<p>RRDtool 1.3 Beta 4 is out. Read about the features on
 <a href="http://oss.oetiker.ch/rrdtool-trac/wiki/RRDtool13">the RRDtool Wiki</a>.
-Get your copy from the <a href="http://oss.oetiker.ch/rrdtool/pub/beta">beta download area</a>.
+Get your copy from the <a href="http://oss.oetiker.ch/rrdtool/pub/beta">beta download area</a>.</p>
 
+<p>June 3-4 2008: <a href="http://www.nordicnagiosmeet.wmr.se/">Nordic Nagios Meet</a>. Tobi Oetiker will be giving a talk on RRDtool!<br/>
+<a href="http://www.nordicnagiosmeet.wmr.se/"><img border=0 src="newbanner250x60.gif"/></a></p>
 
 <H2>What RRDtool does</H2>
 

diff --git a/website/newbanner250x60.gif b/website/newbanner250x60.gif
new file mode 100644 (file)
index 0000000..ef53cfe
Binary files /dev/null and b/website/newbanner250x60.gif differ

diff --git a/website/sponsor.wml b/website/sponsor.wml
index bef5f74f7a53cac72a01bc40104b0484522cb4fd..e6b38b2db2d3191e3d0f5a664e45c8d5ca0d91e5 100644 (file)
--- a/website/sponsor.wml
+++ b/website/sponsor.wml
@@ -36,8 +36,8 @@ sponsor</a>!</p>
 <a href="http://code.google.com/oss.html"><img border="0" title="Google Inc." src="$(ROOT)/logos/google.png"/></a>&nbsp;
 # From: Maik Metzen <maik.metzen@hitflip.de> Mon, 17 Sep 2007 09:27:40 +0200
 <a href="http://www.hitflip.de/dvds/"><img border="0" title="Hitflip Media Trading GmbH" src="$(ROOT)/logos/hitflip.jpg"/></a>&nbsp;
-# From: Yuki Ikemori ikemori@e-pocket.co.jp Tue, 16 Oct 2007 09:57:37 +0200
-<a href="http://www.netgame-rmt.jp/"><img border="0" title="Pocket Co." src="$(ROOT)/logos/pocket.png"/></a>&nbsp;
+## From: Yuki Ikemori ikemori@e-pocket.co.jp Tue, 16 Oct 2007 09:57:37 +0200
+## they did not pay <a href="http://www.netgame-rmt.jp/"><img border="0" title="Pocket Co." src="$(ROOT)/logos/pocket.png"/></a>&nbsp;
 # Johannes Dagemark <jd@op5.se> Wed, 13 Dec 2006 16:20:01 +0100
 <a href="http://www.op5.com"><img border="0" alt="Op5" src="$(ROOT)/logos/op5logoweb101x51.gif"/></a>&nbsp;
 # From: Alicia Beuke <abeuke@lancope.com> Tue, 18 Mar 2008 15:42:04 -0400