sync with reality

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

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

diff --git a/website/gallery/airpres.xml b/website/gallery/airpres.xml
new file mode 100644 (file)
index 0000000..6f208bd
--- /dev/null
+++ b/website/gallery/airpres.xml
@@ -0,0 +1,10 @@
+<gallery image="airpres.png" > <!-- no wider than 600 pixle -->
+       <title>Air Pressure in Almaty</title>
+       <author>Boris Popov</author> 
+       <description>This site collects live data from air pressure sensor.</description>
+       <year>2010</year><month>11</month> <!-- creation date -->
+
+       <livesite>http://airpres.kz</livesite> 
+       <email>none</email>
+</gallery>
+

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

diff --git a/website/gallery/amz2.xml b/website/gallery/amz2.xml
new file mode 100644 (file)
index 0000000..7d54d67
--- /dev/null
+++ b/website/gallery/amz2.xml
@@ -0,0 +1,13 @@
+<gallery image="amz2.png" > <!-- no wider than 600 pixle -->
+
+      <title> CPU Statistics</title>
+     <author> Amzath Ali Rahumathullah</author> 
+<description> To view the trend history for CPU user, system, nice and idle statistics for last 24 hours. Y-Axis max values are dynamic, based on the number fo CPUs the server has. This is collected in runtime using shell script and rrdcgi, by parsing /proc/cpuinfo to know the number of processor the server, for setting the max Y-Axis value correspondingly. So, the whole graph area can be visualized as the capacity of the server in terms of CPU. More blanks space in the graph, more free the CPU is.  </description>
+
+       <year> 2010 </year><month> 10 </month> <!-- creation date -->
+      
+   <!-- Optional -->   
+
+      <email> amzatha@gmail.com</email>
+
+</gallery>

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

diff --git a/website/gallery/comp.xml b/website/gallery/comp.xml
new file mode 100644 (file)
index 0000000..82fd14c
--- /dev/null
+++ b/website/gallery/comp.xml
@@ -0,0 +1,11 @@
+<gallery image="comp.png" > <!-- no wider than 600 pixle -->
+
+      <title> Compare data with last week</title>
+     <author> Amzath Ali Rahumathullah</author> 
+<description> To view the comparision of data collected today with last week sameday statistics, for last 24 hours. This is acheived by the SHIFT parameter in RRD, by shifting the time to the required number of days backwards, in my case 7 days back. Also, i have used cgi to pass parameters in runtime to calculate this shift difference. For example, if i would like to compare today's data with yesterday, then i would pass 1 as the daydelta to the cgi, whcih would calculate the SHIFT values. Then, i have used rrdcgi to render the grpahs in runtime.</description>
+       <year> 2010 </year><month> 10 </month> <!-- creation date -->
+      
+   <!-- Optional -->   
+      <email> amzatha@gmail.com</email>
+
+</gallery>

diff --git a/website/gallery/index.en.html b/website/gallery/index.en.html
index a284347f344bc6554ffc2add7519e71af738f179..42f73ff5873e55e89c1dd4fefbd88edca2cdbf76 100644 (file)
--- a/website/gallery/index.en.html
+++ b/website/gallery/index.en.html
@@ -76,7 +76,7 @@
 <br />
 <br />
 <p><b>Gold Sponsors</b></p>
-<p><a href="http://it.oetiker.ch/monitoring/sponsoring.var"><img border="0" alt="Open Gold Sponsorship Slot" src="../inc/rrdtool-gold.png" width="200" height="100" /></a></p>
+<p><a href="http://www.zenoss.com/rrdtool?utm_source=rrdtool&amp;utm_medium=logolink&amp;utm_campaign=inbound"><img border="0" title="Zenoss Open Source IT Monitoring" alt="Zenoss Open Source IT Monitoring" src="../logos/zenoss.png" width="200" height="100" /></a></p>
 <p><a href="http://it.oetiker.ch/monitoring/sponsoring.var"><img border="0" alt="Open Gold Sponsorship Slot" src="../inc/rrdtool-gold.png" width="200" height="100" /></a></p>
 <p><a href="../sponsor.en.html">Silver Sponsors ...</a></p>
 <br />
@@ -140,45 +140,37 @@ 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 -->
+        <!-- creation date -->
+   <!-- Optional -->
 <div class="gallery">
-<h2> MMS Retrieve</h2>
-<div class="image"><img src="mmh11_po.png" alt="" width="267" height="321" /></div>
-<div class="caption"> Simply parse of SNMPget from Vendor OID. The graph display the
-actual volume of transactions for MMS retrieve for mobile phone and sent to
-other Operators (OLO). -- Alex Rivoltella &lt;alessio.r-delme-@<span class="legacy">XYZ-</span>tiscalinet.it&gt;, 2006/3 </div>
+<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>
 </div>
  <!-- no wider than 600 pixle -->
- <!-- creation date -->
+        <!-- creation date -->
+   <!-- Optional -->
 <div class="gallery">
-<h2> MMS Errors</h2>
-<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>
+<h2> CPU Statistics</h2>
+<div class="image"><img src="amz2.png" alt="" width="600" height="363" /></div>
+<div class="caption"> To view the trend history for CPU user, system, nice and idle statistics for last 24 hours. Y-Axis max values are dynamic, based on the number fo CPUs the server has. This is collected in runtime using shell script and rrdcgi, by parsing /proc/cpuinfo to know the number of processor the server, for setting the max Y-Axis value correspondingly. So, the whole graph area can be visualized as the capacity of the server in terms of CPU. More blanks space in the graph, more free the CPU is. -- Amzath Ali Rahumathullah &lt;amzatha@<span class="legacy">XYZ-</span>gmail.com&gt;, 2010/10 </div>
 </div>
  <!-- no wider than 600 pixle -->
-        <!-- creation date -->
+        <!-- creation date -->
+   <!-- Optional -->
 <div class="gallery">
-<h2>Air Pressure in Almaty</h2>
-<div class="image"><img src="airpres.png" alt="" width="601" height="293" /></div>
-<div class="caption">This site collects live data from air pressure sensor. -- Boris Popov &lt;none&gt;, 2010/11 <a href="http://airpres.kz">[demo]</a></div>
+<h2> Compare data with last week</h2>
+<div class="image"><img src="comp.png" alt="" width="600" height="327" /></div>
+<div class="caption"> To view the comparision of data collected today with last week sameday statistics, for last 24 hours. This is acheived by the SHIFT parameter in RRD, by shifting the time to the required number of days backwards, in my case 7 days back. Also, i have used cgi to pass parameters in runtime to calculate this shift difference. For example, if i would like to compare today's data with yesterday, then i would pass 1 as the daydelta to the cgi, whcih would calculate the SHIFT values. Then, i have used rrdcgi to render the grpahs in runtime. -- Amzath Ali Rahumathullah &lt;amzatha@<span class="legacy">XYZ-</span>gmail.com&gt;, 2010/10 </div>
 </div>
- <!-- no wider than 600 pixle -->
-        <!-- creation date -->
    <!-- Optional -->
 <div class="gallery">
-<h2> Bandwidth Actual and Utilization </h2>
-<div class="image"><img src="newbwgraph.png" alt="" width="675" height="400" /></div>
-<div class="caption"> The graph represents bandwidth as both a hard value and
-as % utilization. I have had customers ask for one or the other and
-decided to combine them into an effective and informative visual
-smorgasbord. Code is for OpenNMS and looks a little different (see
-link). -- Ken Eshelby &lt;eshelbyk@<span class="legacy">XYZ-</span>gmail.com&gt;, 2010/7 <a href="http://opennms.org/wiki/Graph_Gallery">[demo]</a></div>
+<h2> Mikrotik Wireless Registration Graph </h2>
+<div class="image"><img src="mikrotik_wireless.png" alt="" width="597" height="357" /></div>
+<div class="caption"> This graph shows some important values of wireless connection. -- Tornike Zedginidze &lt;tz@<span class="legacy">XYZ-</span>orient-logic.com&gt;, 2010/4 </div>
 </div>
  <!-- no wider than 600 pixle -->
-        <!-- creation date -->
-   <!-- Optional -->
+        <!-- creation date -->
 <div class="gallery">
 <p>
 <script type="text/javascript"><!--
@@ -198,6 +190,26 @@ google_color_text = "000000";
   src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
 </script>
 </p>
+<h2>Air Pressure in Almaty</h2>
+<div class="image"><img src="airpres.png" alt="" width="601" height="293" /></div>
+<div class="caption">This site collects live data from air pressure sensor. -- Boris Popov &lt;none&gt;, 2010/11 <a href="http://airpres.kz">[demo]</a></div>
+</div>
+ <!-- no wider than 600 pixle -->
+        <!-- creation date -->
+   <!-- Optional -->
+<div class="gallery">
+<h2> Bandwidth Actual and Utilization </h2>
+<div class="image"><img src="newbwgraph.png" alt="" width="675" height="400" /></div>
+<div class="caption"> The graph represents bandwidth as both a hard value and
+as % utilization. I have had customers ask for one or the other and
+decided to combine them into an effective and informative visual
+smorgasbord. Code is for OpenNMS and looks a little different (see
+link). -- Ken Eshelby &lt;eshelbyk@<span class="legacy">XYZ-</span>gmail.com&gt;, 2010/7 <a href="http://opennms.org/wiki/Graph_Gallery">[demo]</a></div>
+</div>
+ <!-- no wider than 600 pixle -->
+        <!-- creation date -->
+   <!-- Optional -->
+<div class="gallery">
 <h2> MFC License usage </h2>
 <div class="image"><img src="mfc_lic_cnt24h.png" alt="" width="481" height="324" /></div>
 <div class="caption"> Manitoba Bluecross has bought 200 licenses for using Cobol, this graph shows how many licenses are currently used -- Stephan Huber &lt;stephan.huber.ca@<span class="legacy">XYZ-</span>gmail.com&gt;, 2010/7 <a href="">[demo]</a></div>
@@ -603,6 +615,24 @@ This graph shows the utilization of Linux Intel CPUs by particle
 physics researchers and other members of the Grid Laboratory of
 Wisconsin.
  -- Steve Rader &lt;rader@<span class="legacy">XYZ-</span>hep.wisc.edu&gt;, 2005/5 <a href="http://nrg.hep.wisc.edu">[demo]</a></div>
+</div>
+ <!-- no wider than 600 pixle -->
+ <!-- creation date -->
+<div class="gallery">
+<h2> MMS Retrieve</h2>
+<div class="image"><img src="mmh11_po.png" alt="" width="267" height="321" /></div>
+<div class="caption"> Simply parse of SNMPget from Vendor OID. The graph display the
+actual volume of transactions for MMS retrieve for mobile phone and sent to
+other Operators (OLO). -- 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 -->
+<div class="gallery">
+<h2> MMS Errors</h2>
+<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>
 <h2>Add your own graphs to this list</h2>
 <p>If you have created a graph you like, and you think I would like it too,
@@ -635,7 +665,7 @@ than 600 pixels.</p>
 <!-- ############################# -->
 <div id="address">
 <small>
-12/14/10 | <a href="mailto:tobi@..delete..this..removethis.oetiker.ch">Tobias Oetiker</a> | <a href="http://it.oetiker.ch/monitoring/">OETIKER+PARTNER AG</a>
+03/10/11 | <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 c3d7d79c2d2c9fc63f5bb4ec20389b0e7e8eba93..94004da0a9ea0e89ba67b2c27a372cbc603fa112 100644 (file)
--- a/website/gallery/index.wml
+++ b/website/gallery/index.wml
@@ -5,6 +5,10 @@
 <H1>RRDtool Gallery</H1>
 
 #include "mmh11.xml"
+#include "nbar_optical_com_pe.xml"
+#include "amz2.xml"
+#include "comp.xml"
+#include "mikrotik_wireless.xml"
 #include "airpres.xml"
 #include "newbwgraph.xml"
 #include "mfc_usage.xml"
@@ -52,6 +56,7 @@
 #include "flux.xml"
 #include "spamd_rrdgraph.xml"
 #include "uw-hep-condor.xml"
+#include "mmh11b.xml"
 
 
 <h2>Add your own graphs to this list</h2>

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

diff --git a/website/gallery/mikrotik_wireless.xml b/website/gallery/mikrotik_wireless.xml
new file mode 100644 (file)
index 0000000..18b760b
--- /dev/null
+++ b/website/gallery/mikrotik_wireless.xml
@@ -0,0 +1,10 @@
+<gallery image="mikrotik_wireless.png" >
+
+      <title> Mikrotik Wireless Registration Graph </title>
+     <author> Tornike Zedginidze </author> 
+<description> This graph shows some important values of wireless connection. </description>
+       <year> 2010 </year><month> 4 </month>
+      
+   <!-- Optional -->   
+      <email> tz@orient-logic.com </email>
+</gallery>

diff --git a/website/gallery/mmh11.xml b/website/gallery/mmh11.xml
index 5aeb636993edb476a3a321f2808d71f448ccaf28..07131520fd82ebac61fc2ff0de7ebe1e250e91f6 100644 (file)
--- a/website/gallery/mmh11.xml
+++ b/website/gallery/mmh11.xml
@@ -10,27 +10,3 @@ as, Phone, VAS and MM4 (others operator). </description>
 <email> alessio.r-delme-@tiscalinet.it </email>
 
 </gallery>
-
-<gallery image="mmh11_po.png" > <!-- no wider than 600 pixle -->
-
-<title> MMS Retrieve</title>
-<author> Alex Rivoltella </author>
-<description> Simply parse of SNMPget from Vendor OID. The graph display the
-actual volume of transactions for MMS retrieve for mobile phone and sent to
-other Operators (OLO). </description>
-<year> 2006 </year><month> 3 </month> <!-- creation date -->
-<email> alessio.r-delme-@tiscalinet.it </email>
-
-</gallery>
-
-<gallery image="mmh11_er.png" > <!-- no wider than 600 pixle -->
-
-<title> MMS Errors</title>
-<author> Alex Rivoltella </author>
-<description> 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.</description>
-<year> 2006 </year><month> 3 </month> <!-- creation date -->
-<email> alessio.r-delme-@tiscalinet.it </email>
-
-</gallery>

diff --git a/website/gallery/mmh11b.xml b/website/gallery/mmh11b.xml
new file mode 100644 (file)
index 0000000..be515fc
--- /dev/null
+++ b/website/gallery/mmh11b.xml
@@ -0,0 +1,24 @@
+
+<gallery image="mmh11_po.png" > <!-- no wider than 600 pixle -->
+
+<title> MMS Retrieve</title>
+<author> Alex Rivoltella </author>
+<description> Simply parse of SNMPget from Vendor OID. The graph display the
+actual volume of transactions for MMS retrieve for mobile phone and sent to
+other Operators (OLO). </description>
+<year> 2006 </year><month> 3 </month> <!-- creation date -->
+<email> alessio.r-delme-@tiscalinet.it </email>
+
+</gallery>
+
+<gallery image="mmh11_er.png" > <!-- no wider than 600 pixle -->
+
+<title> MMS Errors</title>
+<author> Alex Rivoltella </author>
+<description> 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.</description>
+<year> 2006 </year><month> 3 </month> <!-- creation date -->
+<email> alessio.r-delme-@tiscalinet.it </email>
+
+</gallery>

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

diff --git a/website/gallery/nbar_optical_com_pe.xml b/website/gallery/nbar_optical_com_pe.xml
new file mode 100644 (file)
index 0000000..6dd6795
--- /dev/null
+++ b/website/gallery/nbar_optical_com_pe.xml
@@ -0,0 +1,13 @@
+<gallery image="nbar_optical_com_pe.png" > <!-- no wider than 600 pixle -->
+
+      <title> Network Based Application Recognition </title>
+     <author> Erick Del Castillo </author> 
+<description> 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. </description>
+       <year> 2011 </year><month> 3 </month> <!-- creation date -->
+      
+   <!-- Optional -->   
+
+   <livesite> http://monitor.optical.com.pe </livesite> 
+      <email> edelcastillo@optical.com.pe </email>
+
+</gallery>

diff --git a/website/rrdworld/eluna_graph_system.xml b/website/rrdworld/eluna_graph_system.xml
index 3b39bf262e03206333731bc8364abaa06a6a5d51..6bbf907c7ebcf6af4dbb50caad97ca6f95f12e94 100644 (file)
--- a/website/rrdworld/eluna_graph_system.xml
+++ b/website/rrdworld/eluna_graph_system.xml
@@ -1,14 +1,13 @@
 <rrdworld type="application"
           icon="eluna_graph_system.png" >
- 
+
        <name> eLuna Graph System </name>
      <author> Stephane Dupont </author>
 <description> eLuna Graph System is an application written in Perl based on RRDTool and distributed under GNU General Public License. Its aim is collection, and then presentation in graphic form, of data, to aid in monitoring of a Linux machine. </description>
-   <homepage> http://steph.eluna.org/eluna_graph_system.html </homepage> 
+   <homepage> http://www.eluna.org/eluna_graph_system.html </homepage>
        <year> 2006 </year><month> 4 </month>
     <license> GPL </license>
-   <livesite> http://graphs.eluna.org </livesite> 
+   <livesite> http://graphs.eluna.org </livesite>
       <email> steph@eluna.org </email>
 
 </rrdworld>
-