Code

sync with reality
authoroetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Wed, 8 Nov 2006 09:23:59 +0000 (09:23 +0000)
committeroetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Wed, 8 Nov 2006 09:23:59 +0000 (09:23 +0000)
git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2@921 a5681a0c-68f1-0310-ab6d-d61299d08faa

15 files changed:
website/gallery/index.wml
website/gallery/termonit.png [new file with mode: 0644]
website/gallery/termonit.xml [new file with mode: 0644]
website/inc/button.png [new file with mode: 0644]
website/inc/navbar-def.inc
website/inc/pub_contrib_header.html [new file with mode: 0644]
website/inc/pub_footer.html [new file with mode: 0644]
website/inc/pub_header.html [new file with mode: 0644]
website/inc/rrdtool-3dlogo.png [new file with mode: 0644]
website/navbar.inc
website/rrdworld/dsreport.xml [new file with mode: 0644]
website/rrdworld/eluna_graph_system.xml [new file with mode: 0644]
website/rrdworld/index.wml
website/rrdworld/n2rrd.xml [new file with mode: 0644]
website/rrdworld/webminstats.xml [new file with mode: 0644]

index 8432961822b42c697b837d07a3597b8a68b63ea5..b1057fa14774fb0b21207f39ba792211a70d2647 100644 (file)
@@ -5,6 +5,7 @@
 <H1>RRDtool Gallery</H1>
 
 #include "load.xml"
+#include "termonit.xml"
 #include "mmh11.xml"
 #include "meteo-igf.xml"
 #include "btdmd8.xml"
diff --git a/website/gallery/termonit.png b/website/gallery/termonit.png
new file mode 100644 (file)
index 0000000..f1ba777
Binary files /dev/null and b/website/gallery/termonit.png differ
diff --git a/website/gallery/termonit.xml b/website/gallery/termonit.xml
new file mode 100644 (file)
index 0000000..6c3c83e
--- /dev/null
@@ -0,0 +1,11 @@
+<gallery image="termonit.png" >
+
+      <title> Server room temperature monitoring </title>
+     <author> Evgueni V. Gavrilov </author> 
+<description> There are 8 thermal sensors across my server room. This graph shows thermal condition of various parts of the server room. </description>
+       <year> 2006 </year>
+      <month> 10 </month>
+      <email> aquatique@rusunix.org </email>
+
+</gallery>
+
diff --git a/website/inc/button.png b/website/inc/button.png
new file mode 100644 (file)
index 0000000..d8a7a0e
Binary files /dev/null and b/website/inc/button.png differ
index 17a3ff8f9309d786e1bca548a312fcf7736312f5..c0b5ac99dcf5f99101dd455ececfa28b8d97d36d 100644 (file)
@@ -61,7 +61,7 @@
 </define-tag>
 
 <define-tag nav:but>
-   <if <match "%2" "http://|html$|\?" />
+   <if <match "%2" "http://|html$|\?|/$|^$" />
    <navbar:button id="%0" 
                     url="%2" 
                     txt="%1"
diff --git a/website/inc/pub_contrib_header.html b/website/inc/pub_contrib_header.html
new file mode 100644 (file)
index 0000000..2b67792
--- /dev/null
@@ -0,0 +1,120 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<meta name="generator" content="HTML Tidy for Linux/x86 (vers 1st December 2004), see www.w3.org" />
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+<link rel="icon" href="../../inc/favicon.ico" type="image/ico" />
+<title>RRDtool - RRDtool Crontrib Area</title>
+<!--[if lt IE 7]><script src="../../inc/IE7/ie7-standard-p.js" type="text/javascript"></script><![endif]-->
+
+<style type="text/css">
+<!--/* <![CDATA[ */
+/* ie5 for mac thinks this comment does not end here because of the backslash \*/
+@import url('../../inc/design.css');
+/* ]]> */-->
+</style>
+</head>
+<body>
+<table id="frame" summary="">
+<tr>
+<td valign="top" id="menucell"><!-- ############################# -->
+<!-- # MENU -->
+<!-- ############################# -->
+<div id="menu">
+<h2 class="legacy">Menu</h2>
+<ul>
+<li>
+<div><a href="../../index.en.html">Welcome</a></div>
+</li>
+<li>
+<div class="selected_head"><a href="../../download.en.html">Download</a></div>
+<ul>
+<li>
+<div><a href="../../pub/">/pub</a></div>
+</li>
+<li>
+<div class="selected">/contrib</div>
+</li>
+</ul>
+</li>
+<li>
+<div><a href="../../license.en.html">License</a></div>
+</li>
+<li>
+<div><a href="../../doc/index.en.html">Documentation</a></div>
+</li>
+<li>
+<div><a href="../../tut/index.en.html">Tutorials</a></div>
+</li>
+<li>
+<div><a href="../../support.en.html">Support</a></div>
+</li>
+<li>
+<div><a href="../../sponsor.en.html">Sponsorship</a></div>
+</li>
+<li>
+<div><a href="../../gallery/index.en.html">Gallery</a></div>
+</li>
+<li>
+<div><a href="../../rrdworld/index.en.html">RRDworld</a></div>
+</li>
+<li>
+<div><a href="../../prog/index.en.html">Programming</a></div>
+</li>
+<li>
+<div><a href="http://oss.oetiker.ch/rrdtool-trac/">RRDtrac</a></div>
+</li>
+<li>
+<div><a href="../../iana/index.en.html">RRD MIB</a></div>
+</li>
+<li>
+<div><a href="../../cast.en.html">Cast</a></div>
+</li>
+</ul>
+<br />
+<br />
+<br />
+<a href="http://tobi.oetiker.ch/wish"><img border="0" src="../../inc/button.png" alt="" width="99" height="79" /></a><br />
+<br />
+<br />
+<div><iframe width="120" height="50" name="bandwidth" frameborder="0" src="../../hoster.html" id="bandwidth"></iframe></div>
+<br />
+<br /></div>
+</td>
+<!-- ############################# -->
+<!-- # Logo and Body -->
+<!-- ############################# -->
+<td id="bodycell">
+<div id="mirrors"><a href="http://oss.oetiker.ch/rrdtool/pub/contrib/index.en.html">Swiss Original</a>.&nbsp;Mirrors: <a href="http://rrdtool.mirror.graemef.net/pub/contrib/index.en.html">UK</a><!--Graeme Fowler <graeme@graemef.net>-->
+<a href="http://rrdtool.cs.pu.edu.tw/pub/contrib/index.en.html">TW</a><!--Hsun-Chang Chang <hsunchang@gmail.com>-->
+<a href="http://rrdtool.trexle.net/pub/contrib/index.en.html">US</a><!--Hossam Hossny <hossam@trexle.com>-->
+<a href="http://rrdtool.paracoda.com/pub/contrib/index.en.html">CA</a><!--Hossam Hossny <admin@paracoda.com>-->
+<a href="http://rrdtool.PlaySystems.ro/pub/contrib/index.en.html">RO</a><!--dan.draghici@ulbsibiu.ro--></div>
+<div id="logo">
+<div class="legacy">RRDtool
+<hr /></div>
+</div>
+<!-- ############################# -->
+<!-- # BODY -->
+<!-- ############################# -->
+<div id="body"><!-- google_ad_section_start -->
+<h1>RRDtool Crontrib Area</h1>
+<div><script type="text/javascript">
+//<![CDATA[
+<!--
+google_ad_client = "pub-8135238818549668";
+google_ad_width = 728;
+google_ad_height = 90;
+google_ad_format = "728x90_as";
+google_ad_type = "text_image";
+google_ad_channel ="9544599248";
+google_color_border = "e6e6e6";
+google_color_bg = "f8f8f8";
+google_color_link = "0017C1";
+google_color_url = "270B83";
+google_color_text = "000000";
+//-->
+//]]>
+</script> <script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+</script></div>
diff --git a/website/inc/pub_footer.html b/website/inc/pub_footer.html
new file mode 100644 (file)
index 0000000..f0c95ed
--- /dev/null
@@ -0,0 +1,23 @@
+<!-- google_ad_section_end --></div>
+</td>
+</tr>
+<tr>
+<td id="leftcornercell"></td>
+<td id="footcell"><!-- ############################# -->
+<!-- # FOOTER -->
+<!-- ############################# -->
+<div id="address"><small>10/25/06 | <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>
+<hr class="legacy" />
+<p class="legacy" style="border-width: 1px; border-color: red; padding: 5px;"><b>NOTE:</b> The content of this website is accessible with any browser. The graphical design though relies completely on CSS2 styles. If you see this text, this means that your browser does not support CSS2. Consider upgrading to a standard conformant browser like Mozilla <a href="http://www.getfirefox.com">Firefox</a> or <a href="http://www.opera.com">Opera</a> but also Apple's <a href="http://www.apple.com/safari/">Safari</a> or KDE's <a href="http://www.konqueror.org">Konqueror</a> for example. It may also be that you are looking at a mirror page which did not copy <a href="../inc/design.css">the CSS</a> for this page. Or if some pictu res are missing, then the mirror may not have picked up the contents of the <a href="../inc/">inc</a> directory.</p>
+<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+</script><script type="text/javascript">
+//<![CDATA[
+_uacct = "UA-374525-1";
+urchinTracker();
+//]]>
+</script>
+</body>
+</html>
diff --git a/website/inc/pub_header.html b/website/inc/pub_header.html
new file mode 100644 (file)
index 0000000..5eac666
--- /dev/null
@@ -0,0 +1,121 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<meta name="generator" content="HTML Tidy for Linux/x86 (vers 1st December 2004), see www.w3.org" />
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+<link rel="icon" href="../inc/favicon.ico" type="image/ico" />
+<title>RRDtool - RRDtool Download Area</title>
+<!--[if lt IE 7]><script src="../inc/IE7/ie7-standard-p.js" type="text/javascript"></script><![endif]-->
+
+<style type="text/css">
+<!--/* <![CDATA[ */
+/* ie5 for mac thinks this comment does not end here because of the backslash \*/
+@import url('../inc/design.css');
+/* ]]> */-->
+</style>
+</head>
+<body>
+<table id="frame" summary="">
+<tr>
+<td valign="top" id="menucell"><!-- ############################# -->
+<!-- # MENU -->
+<!-- ############################# -->
+<div id="menu">
+<h2 class="legacy">Menu</h2>
+<ul>
+<li>
+<div><a href="../index.en.html">Welcome</a></div>
+</li>
+<li>
+<div class="selected_head"><a href="../download.en.html">Download</a></div>
+<ul>
+<li>
+<div class="selected">/pub</div>
+</li>
+<li>
+<div><a href="../pub/contrib/">/contrib</a></div>
+</li>
+</ul>
+</li>
+<li>
+<div><a href="../license.en.html">License</a></div>
+</li>
+<li>
+<div><a href="../doc/index.en.html">Documentation</a></div>
+</li>
+<li>
+<div><a href="../tut/index.en.html">Tutorials</a></div>
+</li>
+<li>
+<div><a href="../support.en.html">Support</a></div>
+</li>
+<li>
+<div><a href="../sponsor.en.html">Sponsorship</a></div>
+</li>
+<li>
+<div><a href="../gallery/index.en.html">Gallery</a></div>
+</li>
+<li>
+<div><a href="../rrdworld/index.en.html">RRDworld</a></div>
+</li>
+<li>
+<div><a href="../prog/index.en.html">Programming</a></div>
+</li>
+<li>
+<div><a href="http://oss.oetiker.ch/rrdtool-trac/">RRDtrac</a></div>
+</li>
+<li>
+<div><a href="../iana/index.en.html">RRD MIB</a></div>
+</li>
+<li>
+<div><a href="../cast.en.html">Cast</a></div>
+</li>
+</ul>
+<br />
+<br />
+<br />
+<a href="http://tobi.oetiker.ch/wish"><img border="0" src="../inc/button.png" alt="" width="99" height="79" /></a><br />
+<br />
+<br />
+<div><iframe width="120" height="50" name="bandwidth" frameborder="0" src="../hoster.html" id="bandwidth"></iframe></div>
+<br />
+<br /></div>
+</td>
+<!-- ############################# -->
+<!-- # Logo and Body -->
+<!-- ############################# -->
+<td id="bodycell">
+<div id="mirrors"><a href="http://oss.oetiker.ch/rrdtool/pub/index.en.html">Swiss Original</a>.&nbsp;Mirrors: <a href="http://rrdtool.mirror.graemef.net/pub/index.en.html">UK</a><!--Graeme Fowler <graeme@graemef.net>-->
+<a href="http://rrdtool.cs.pu.edu.tw/pub/index.en.html">TW</a><!--Hsun-Chang Chang <hsunchang@gmail.com>-->
+<a href="http://rrdtool.trexle.net/pub/index.en.html">US</a><!--Hossam Hossny <hossam@trexle.com>-->
+<a href="http://rrdtool.paracoda.com/pub/index.en.html">CA</a><!--Hossam Hossny <admin@paracoda.com>-->
+<a href="http://rrdtool.PlaySystems.ro/pub/index.en.html">RO</a><!--dan.draghici@ulbsibiu.ro--></div>
+<div id="logo">
+<div class="legacy">RRDtool
+<hr /></div>
+</div>
+<!-- ############################# -->
+<!-- # BODY -->
+<!-- ############################# -->
+<div id="body"><!-- google_ad_section_start -->
+<h1>RRDtool Download Area</h1>
+<div><script type="text/javascript">
+//<![CDATA[
+<!--
+google_ad_client = "pub-8135238818549668";
+google_ad_width = 728;
+google_ad_height = 90;
+google_ad_format = "728x90_as";
+google_ad_type = "text_image";
+google_ad_channel ="9544599248";
+google_color_border = "e6e6e6";
+google_color_bg = "f8f8f8";
+google_color_link = "0017C1";
+google_color_url = "270B83";
+google_color_text = "000000";
+//-->
+//]]>
+</script> <script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+</script></div>
+
diff --git a/website/inc/rrdtool-3dlogo.png b/website/inc/rrdtool-3dlogo.png
new file mode 100644 (file)
index 0000000..d4e48a0
Binary files /dev/null and b/website/inc/rrdtool-3dlogo.png differ
index 2b0092b087c442c9341a659702ac8e4f164b42b6..38906bd08e99fe3dbe626950e6c06c788ae5fcf7 100644 (file)
@@ -1,6 +1,6 @@
 <nav:bar 0     main "">
  <nav:but welcome        "Welcome"                 index                         />
- <nav:but down           "Download"                download                      />
+ <nav:but down           "Download"                download            pub       />
  <nav:but license        "License"                 license                       />
  <nav:but doc            "Documentation"           doc/index          doc       />
  <nav:but tut            "Tutorials"               tut/index           tut       />
 #include "doc/navbar.inc"
 </nav:bar>
 
+<nav:bar 1 pub           "pub/">
+<nav:but down_pub        "/pub"                "./" />
+<nav:but down_contrib    "/contrib"       contrib/ />
+</nav:bar>
+
 <nav:bar 1 tut           "tut/">
 #include "tut/navbar.inc"
 </nav:bar>
diff --git a/website/rrdworld/dsreport.xml b/website/rrdworld/dsreport.xml
new file mode 100644 (file)
index 0000000..a1a8865
--- /dev/null
@@ -0,0 +1,17 @@
+<rrdworld type="companion">
+       <name> DSreport </name>
+     <author> Steve Rader </author>
+
+<description> 
+
+DSreport pretty prints DS values from an RRDtool database in
+tabular format.  It supports flexable reporting time frames,
+autoscaling DS values, and conversion factors. 
+
+</description>
+
+   <homepage> http://noc.hep.wisc.edu/dsreport.txt </homepage> 
+       <year> 2000 </year>
+      <month> 3 </month>
+    <license> GPL </license>
+</rrdworld>
diff --git a/website/rrdworld/eluna_graph_system.xml b/website/rrdworld/eluna_graph_system.xml
new file mode 100644 (file)
index 0000000..795efff
--- /dev/null
@@ -0,0 +1,12 @@
+<rrdworld type="application">
+
+       <name> eLuna Graph System </name>
+     <author> Stephane Dupont </author>
+<description> A (French) tool written in Perl and based on RRDTool to simply monitore a linux machine.</description>
+   <homepage> http://steph.eluna.org/eluna_graph_system.html </homepage>
+       <year> 2006 </year><month> 4 </month>
+    <license> GPL </license>
+   <livesite> http://graphs.eluna.org </livesite>
+      <email> steph@eluna.org </email>
+
+</rrdworld>
\ No newline at end of file
index 68822b8d1165b25e0d27df988784c1b17ab4d140..510f3cdb333ecb7f5423b02a4a526602722fd4ae 100644 (file)
@@ -34,6 +34,7 @@ while we wait for new material to arrive.</p>
 #include "monitorix.xml"
 #include "munin.xml"
 #include "mpltd.xml"
+#include "n2rrd.xml"
 #include "netmrg.xml"
 #include "nmis-rrdtool.xml"
 #include "oreon.xml"
@@ -54,6 +55,7 @@ while we wait for new material to arrive.</p>
 #include "tinygraph.xml"
 #include "torrus.xml"
 #include "tstat.xml"
+#include "webminstats.xml"
 #include "zenoss.xml"
 
 <h2>Commercial Applications</h2>
diff --git a/website/rrdworld/n2rrd.xml b/website/rrdworld/n2rrd.xml
new file mode 100644 (file)
index 0000000..2385987
--- /dev/null
@@ -0,0 +1,17 @@
+<rrdworld type="companion" > <!-- Size 100x66 -->
+
+       <name> N2RRD Nagios Add-On</name>
+     <author> Badri Prasad Pillai </author>
+<description> Nagios to RRD (n2rrd) is a small perl script, which transforms performance data into
+RRA (Round Robin Archives). The resulting archives can later be viewed by any RRD graph display tool.
+ </description>
+   <homepage> http://n2rrd.diglinks.com </homepage>
+       <year> 2006 </year><month> 10 </month> <!-- Entry creation date -->
+    <license> GPL </license>
+
+   <!-- Optional -->
+
+   <livesite> http://mon.diglinks.com/cgi-bin/rrd2graph.cgi?hostname=demo&service=icmp </livesite>
+      <email> badri@diglinks.com </email> <!-- Author contact -->
+
+</rrdworld>
diff --git a/website/rrdworld/webminstats.xml b/website/rrdworld/webminstats.xml
new file mode 100644 (file)
index 0000000..3d85718
--- /dev/null
@@ -0,0 +1,17 @@
+<rrdworld type="application">
+       <name>webminstats</name>
+     <author>Eric Gerbier</author>
+<description> Webminstats is a Webmin module designed to store system information in an rrdtool database and to display historic (hourly,
+daily, weekly, monthly, and custom) graphs. It is modular in design, so as to be able to log everything from CPU usage to email box
+size.</description>
+   <homepage> http://webminstats.sourceforge.net</homepage> 
+       <year> 2001 </year><month> 8 </month> <!-- Entry creation date -->
+    <license> GPL </license>
+
+   <!-- Optional -->   
+
+      <email> gerbier@users.sourceforge.net </email> <!-- Author contact -->
+
+</rrdworld>
+