update website

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

diff --git a/website/doc/build.sh b/website/doc/build.sh
index 178225fe665e01671e86340e86397bf42b705921..7f015cf20ff4265c9df3e6eb7d81fb1ac88e0837 100755 (executable)
--- a/website/doc/build.sh
+++ b/website/doc/build.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 sect=doc
 src=/home/oetiker/checkouts/rrdtool-1.x
-(cd $src; git checkout 1.4)
+(cd $src; git checkout 1.5)
 . ../bin/pod2wml.sh
 
 pod2descr() {

diff --git a/website/download.wml b/website/download.wml
index 2ab211b3c935865858e17d54e5cc3c45a7d4d414..2ef18d05b5de0ea693f3f62e0120b258fea38785 100644 (file)
--- a/website/download.wml
+++ b/website/download.wml
@@ -28,17 +28,13 @@ You can download RRD tool from several places:
 <H2>Binary Distributions</H2>
 
 <UL>
- <LI>AIX by <A HREF="mailto:zoran.majcenic_inet.hr">Zoran Majcenic</A> -- <A HREF="http://www.inet.hr/zmp/ibm/rrdtool">http://www.inet.hr/zmp/ibm/rrdtool</A></LI>
  <LI>HP-UX by <A HREF="mailto:s_angelov@filibeto.org">Stoyan Angelov</A> -- <A HREF="http://www.filibeto.org/~aduritz/truetrue/rrdtool/">http://www.filibeto.org/~aduritz/truetrue/rrdtool/</A></LI>
  <LI>Solaris OpenCSW <A HREF="http://www.opencsw.org/packages/rrdtool"> http://www.opencsw.org/packages/rrdtool</a></LI>
  <LI>Debian Linux <A HREF="http://packages.debian.org/rrdtool">http://packages.debian.org/rrdtool</A></LI>
  <LI>T2 SDE Linux <A HREF="http://www.t2-project.org/packages/rrdtool.html">http://www.t2-project.org/packages/rrdtool.html</a></li>
-
  <LI>RHEL, CentOS, Fedora, Scientific Linux  <A HREF="mailto:wrl@express.org">William R. Lorenz</a> -- <A href="http://packages.express.org/rrdtool/">http://packages.express.org/rrdtool/</a></li>
  <LI>Redhat/Fedora <A href="http://dag.wieers.com/packages/rrdtool/">http://dag.wieers.com/packages/rrdtool/</a></li>
  <LI>Native Windows 1 <A HREF="http://oss.oetiker.ch/rrdtool/pub/?M=D">local</a></LI>
- <LI>Native Windows 2 <A HREF="http://www.gknw.net/mirror/rrdtool/">http://www.gknw.net/mirror/rrdtool/</a></LI>
- <LI>NetWare <A HREF="http://www.gknw.net/mirror/rrdtool/">http://www.gknw.net/mirror/rrdtool/</a></LI>
  <LI>Cygwin Windows <A HREF="http://www.cacti.net/downloads/rrdtool/win32">http://www.cacti.net/downloads/rrdtool/win32/</a></LI>
 </UL>
 
@@ -50,40 +46,19 @@ You can download RRD tool from several places:
 <li><a href="https://github.com/Orion98MC/node_rrd">Node.js native module</a> by Thierry Passeron</li>
 </ul>
 
-<H2>Anonymous SVN for RRDtool</H2>
-
-<p>RRDtool source is stored in a subversion repository with anonymous access.</p>
-
-<p>Browse the RRDtool SVN via <a href="http://oss.oetiker.ch/rrdtool-trac/browser/trunk/program">RRDtrac</a>.
-Or if you want todo more than look ...</p>
+<H2>Development</H2>
 
-<pre>
-svn ls svn://svn.oetiker.ch/rrdtool/
-</pre>
+<p>RRDtool source is stored on <a
+href="https://github.com/oetiker/rrdtool-1.x">GitHub</a> and this is also
+where development happens. Just fork the repository, make changes and send
+me a pull request.</p>
 
-<p>tells you what is in the repository. Development will happen in the
-"trunk" directory. Every major release gets an entry in the "branches" tree
-as soon as development in trunk starts up again ... normally after a bit of
-a settling periode, and every released version get added to the "tags"
-tree.</p>
+<p>Note that the version number in the header of the source files you get from github may be 'off' this is because
+the version number gets set by the release script prior to building the archive.</p>
 
-<p>To get the latest changes from the current trunk use this:</p>
-<pre>
-svn checkout svn://svn.oetiker.ch/rrdtool/trunk/program
-mv program rrdtool-trunk
-cd rrdtool-trunk
-./autogen.sh
-</pre>
-
-<p>If you checkout code from the subversion repository, you will find that
-the <b>configure</b> script is missing. The last line in the example above
-should have taken care of this problem. If not, it could be that you are
-missing automake, autoconf and libtool installations on your system.</p>
-
-<p>Make sure to run <code>./configure --enable-maintainer-mode</code> prior
+<p>When building from a git clone, run <code>./MakeMakefile</code> first to build the configure system and then
+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>If you fix a bug, I would love to see the output of '<b>svn diff</b>'.</p>
-
 

diff --git a/website/gallery/index.en.html b/website/gallery/index.en.html
index 1414c379afcddac5d75241994a58514f2484e083..234f05d7c62b22fbafcceec9f0dd3750f9c791af 100644 (file)
--- a/website/gallery/index.en.html
+++ b/website/gallery/index.en.html
@@ -76,7 +76,6 @@
 <br />
 <br />
 <p><b>Gold Sponsors</b></p>
-<p><a href="http://www.serverscheck.com/sensors?utm_source=mrtg&utm_medium=banner&utm_term=rrdtool&utm_campaign=mrtg"><img border="0" title="Serverscheck" alt="Serverscheck" src="../logos/serverscheck-3.gif" width="200" height="100" /></a></p>
 <p><a href="../sponsor.en.html">Silver Sponsors ...</a></p>
 <br />
 <br />
@@ -99,9 +98,6 @@
 <div id="mirrors">
 <a href="http://oss.oetiker.ch/rrdtool/gallery/index.en.html">Swiss Original</a>.&nbsp;Mirrors:
 <a href="http://rrdtool.mirror.graemef.net/gallery/index.en.html">UK</a><!--Graeme Fowler <graeme@graemef.net>-->
-<a href="http://rrdtool.cs.pu.edu.tw/gallery/index.en.html">TW</a><!--Hsun-Chang Chang <hsunchang@gmail.com>-->
-<a href="http://rrdtool.basemirror.de/gallery/index.en.html">DE</a><!--Baseportal Mirrors <mirrors@baseportal.de>-->
-<a href="http://rrdtool.mirroraty.org/gallery/index.en.html">US</a><!--Hossam Hossny <hossam@trexle.com>-->
 </div>
 <div id="logo">
 <div class="legacy">
@@ -142,30 +138,32 @@ as, Phone, VAS and MM4 (others operator). -- Alex Rivoltella &lt;alessio.r-delme
         <!-- creation date -->
    <!-- Optional -->
 <div class="gallery">
-<h2> Trafico OSPF </h2>
-<div class="image"><img src="ospf.png" alt="" width="596" height="389" /></div>
-<div class="caption"> This simple graph show the OSPF traffic that pass through in two central routers. -- Alessandro Palermo &lt;info.xmon@<span class="legacy">XYZ-</span>gmail.com&gt;, 2012/9 <a href="http://xmon.dyndns.org">[demo]</a></div>
+<h2> total percentaged traffic in</h2>
+<div class="image"><img src="leucht.png" alt="" width="597" height="471" /></div>
+<div class="caption"> This aggregated graph represents the total percentaged traffic incoming in bits per second -- Martin Leucht &lt;martin.leucht@<span class="legacy">XYZ-</span>freent.de&gt;, 2014/1 </div>
+</div>
+<div class="gallery">
+<h2>Cluster CPU Utilization</h2>
+<div class="image"><img src="PTFDV_cpu.png" alt="" width="703" height="438" /></div>
+<div class="caption">Each hypervisor stores data with sar.
+Data are remotely collected and updated to local rrd files.
+Graphs are generated by stacking data of each node -- Christophe Delaitre &lt;cdelaitre@<span class="legacy">XYZ-</span>gmail.com&gt;, 2014/5 </div>
 </div>
- <!-- no wider than 600 pixle -->
-        <!-- creation date -->
    <!-- Optional -->
 <div class="gallery">
-<h2> Sahi end2end web test runtimes </h2>
-<div class="image"><img src="sahi_end2end.png" alt="" width="597" height="271" /></div>
-<div class="caption"> 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. -- Simon Meggle &lt;simon.meggle@<span class="legacy">XYZ-</span>consol.de&gt;, 2012/12 <a href="https://github.com/simonmeggle/sahi2omd-db">[demo]</a></div>
+<h2> Active VPN Tunnels and VPN Network Traffic on Cisco ASA</h2>
+<div class="image"><img src="vpnttg.png" alt="" width="697" height="992" /></div>
+<div class="caption">
+These graphs shows the active VPN tunnels and the VPN network traffic generated from the L2L, RA, SVC and WebVPN users on Cisco ASA.
+ -- Merab Tavartkiladze &lt;vpnttg@<span class="legacy">XYZ-</span>vpnttg.com&gt;, 2013/6 <a href="http://www.vpnttg.com">[demo]</a></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>
-<div class="image"><img src="mgroth.png" alt="" width="537" height="468" /></div>
-<div class="caption">This graph is created to be able to see the temperature with the average for the year has been. Data for temperature is taken from a MCP9803 sensor that sits outdoors in an IP65 enclosure. -- Magnus Groth &lt;mgroth@<span class="legacy">XYZ-</span>gmail.com&gt;, 2011/7 </div>
+<h2> Trafico OSPF </h2>
+<div class="image"><img src="ospf.png" alt="" width="596" height="389" /></div>
+<div class="caption"> This simple graph show the OSPF traffic that pass through in two central routers. -- Alessandro Palermo &lt;info.xmon@<span class="legacy">XYZ-</span>gmail.com&gt;, 2012/9 <a href="http://xmon.dyndns.org">[demo]</a></div>
 </div>
  <!-- no wider than 600 pixle -->
         <!-- creation date -->
@@ -189,6 +187,27 @@ google_color_text = "000000";
   src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
 </script>
 </p>
+<h2> Sahi end2end web test runtimes </h2>
+<div class="image"><img src="sahi_end2end.png" alt="" width="597" height="271" /></div>
+<div class="caption"> 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. -- Simon Meggle &lt;simon.meggle@<span class="legacy">XYZ-</span>consol.de&gt;, 2012/12 <a href="https://github.com/simonmeggle/sahi2omd-db">[demo]</a></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>
+<div class="image"><img src="mgroth.png" alt="" width="537" height="468" /></div>
+<div class="caption">This graph is created to be able to see the temperature with the average for the year has been. Data for temperature is taken from a MCP9803 sensor that sits outdoors in an IP65 enclosure. -- Magnus Groth &lt;mgroth@<span class="legacy">XYZ-</span>gmail.com&gt;, 2011/7 </div>
+</div>
+ <!-- no wider than 600 pixle -->
+        <!-- creation date -->
+   <!-- Optional -->
+<div class="gallery">
 <h2> Sensor Network Temperature Gradients </h2>
 <div class="image"><img src="ga-usa.png" alt="" width="600" height="296" /></div>
 <div class="caption">
@@ -719,7 +738,7 @@ than 600 pixels.</p>
 <!-- ############################# -->
 <div id="address">
 <small>
-01/15/13 | <a href="mailto:tobi@..delete..this..removethis.oetiker.ch">Tobias Oetiker</a> | <a href="http://it.oetiker.ch/monitoring/">OETIKER+PARTNER AG</a>
+06/27/14 | <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>
@@ -735,14 +754,15 @@ 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 type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-var pageTracker = _gat._getTracker("UA-374525-1");
-pageTracker._initData();
-pageTracker._trackPageview();
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new
+  Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-374525-1', 'auto');
+  ga('require', 'linkid', 'linkid.js');
+  ga('send', 'pageview');
 </script>
 </body>
 </html>

diff --git a/website/gallery/index.wml b/website/gallery/index.wml
index 114779b9c95dd4b5a197f327929cac8ad1679f66..da0d4e05798732929753de8ea3310775d5c5ba24 100644 (file)
--- a/website/gallery/index.wml
+++ b/website/gallery/index.wml
@@ -5,6 +5,9 @@
 <H1>RRDtool Gallery</H1>
 
 #include "mmh11.xml"
+#include "leucht.xml"
+#include "PTFDV_cpu.xml"
+#include "vpnttg.xml"
 #include "ospf.xml"
 #include "sahi_end2end.xml"
 #include "ace_part.xml"

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

diff --git a/website/gallery/vpnttg.xml b/website/gallery/vpnttg.xml
new file mode 100644 (file)
index 0000000..2cbe6ee
--- /dev/null
+++ b/website/gallery/vpnttg.xml
@@ -0,0 +1,15 @@
+<gallery image="vpnttg.png" > 
+
+      <title> Active VPN Tunnels and VPN Network Traffic on Cisco ASA</title>
+     <author> Merab Tavartkiladze </author> 
+<description> 
+These graphs shows the active VPN tunnels and the VPN network traffic generated from the L2L, RA, SVC and WebVPN users on Cisco ASA. 
+</description>
+       <year> 2013 </year><month> 6 </month> 
+      
+   <!-- Optional -->   
+
+   <livesite> http://www.vpnttg.com </livesite> 
+      <email> vpnttg@vpnttg.com </email>
+
+</gallery>
\ No newline at end of file

diff --git a/website/inc/pub_footer.html b/website/inc/pub_footer.html
index f0c95ed980b5c3effbb69b755dc188cf7a9f4fae..117ab155ddf19b459dd0479b0e11eeaac6ee4fe9 100644 (file)
--- a/website/inc/pub_footer.html
+++ b/website/inc/pub_footer.html
@@ -12,12 +12,19 @@
 </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>
+
+(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new
+Date();a=s.createElement(o),
+
+m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+
+})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-374525-1', 'auto');
+  ga('send', 'pageview');
+
 </script>
 </body>
 </html>

diff --git a/website/inc/pub_header.html b/website/inc/pub_header.html
index b8db186392e98d1bd4a401e8ed64b7b0c03d086e..2b95a2936e9d398478d3504af75f23f5cae0ee54 100644 (file)
--- a/website/inc/pub_header.html
+++ b/website/inc/pub_header.html
@@ -75,9 +75,6 @@
 <br />
 <br />
 <br />
-<p><b>Gold Sponsors</b></p>
-<!-- <p><a href="http://www.zenoss.com/?rrdtool"><img border="0" title="Zenoss Open Source IT Monitoring" alt="Zenoss Open Source IT Monitoring" src="/rrdtool/logos/zenoss.png"/></a></p> -->
-<p><a href="http://www.serverscheck.com/sensors?utm_source=mrtg&utm_medium=banner&utm_term=mrtg&utm_campaign=rrdtool"><img border="0" title="Serverscheck" alt="Serverscheck" src="/rrdtool/logos/mrtg_sensorgateway.png"/></a></p>
 <p><a href="../sponsor.en.html">Silver Sponsors ...</a></p>
 <br />
 <br />
@@ -106,22 +103,17 @@
 <!-- ############################# -->
 <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>
+<div>
+<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+<!-- RRDtool Pub Top -->
+<ins class="adsbygoogle"
+     style="display:inline-block;width:728px;height:90px"
+     data-ad-client="ca-pub-8135238818549668"
+     data-ad-slot="4422190900"></ins>
+<script>
+   (adsbygoogle = window.adsbygoogle || []).push({});
+</script>               
+</div>
+
+
 

diff --git a/website/inc/template.inc b/website/inc/template.inc
index ddf38d09cdd335b9a3c54aacba047902a358201c..e4d07d08e43edfaf6f6d1d92d9b2197b559e7f92 100644 (file)
--- a/website/inc/template.inc
+++ b/website/inc/template.inc
@@ -80,7 +80,7 @@
 <br/>
 <br/>
 <p><b>Gold Sponsors</b></p>
-<p><a href="http://www.serverscheck.com/sensors?utm_source=mrtg&utm_medium=banner&utm_term=rrdtool&utm_campaign=mrtg"><img border="0" title="Serverscheck" alt="Serverscheck" src="$(ROOT)/logos/serverscheck-3.gif"/></a></p>
+#<p><a href="http://www.serverscheck.com/sensors?utm_source=mrtg&utm_medium=banner&utm_term=rrdtool&utm_campaign=mrtg"><img border="0" title="Serverscheck" alt="Serverscheck" src="$(ROOT)/logos/serverscheck-3.gif"/></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="$(ROOT)/logos/zenoss.png"/></a></p>
 #<p><a href="http://www.groundworkopensource.com/products/components/rrdtool.html?ldsrc=AD-RRDtool"><img title="GroundWork Open Source" border="0" alt="GroundWork Open Source Logo" src="$(ROOT)/logos/gw200x100.gif"/></a></p>
 #<p><a href="http://it.oetiker.ch/monitoring/sponsoring.var"><img border="0" alt="Open Gold Sponsorship Slot" src="$(ROOT)/inc/rrdtool-gold.png"/></a></p>
@@ -109,11 +109,11 @@
 <a href="http://oss.oetiker.ch/rrdtool/<where/>">Swiss Original</a>.&nbsp;Mirrors: 
 <a href="http://rrdtool.mirror.graemef.net/<where/>">UK</a><!--Graeme Fowler <graeme@graemef.net>-->
 #<a href="http://rrdtool.planetmirror.com/<where/>">AU</a><!--jason andrade <jason@dstc.edu.au>-->
-<a href="http://rrdtool.cs.pu.edu.tw/<where/>">TW</a><!--Hsun-Chang Chang <hsunchang@gmail.com>-->
+#<a href="http://rrdtool.cs.pu.edu.tw/<where/>">TW</a><!--Hsun-Chang Chang <hsunchang@gmail.com>-->
 #<a href="http://ftp.heanet.ie/mirrors/oss.oetiker.ch/rrdtool/<where/>">IE</a><!-- <mirrors@heanet.ie>-->
 #<a href="http://rrdtool.codemonkey.se/<where/>">SE</a><!--Hans Engren <hans@cyclone.se>-->
-<a href="http://rrdtool.basemirror.de/<where/>">DE</a><!--Baseportal Mirrors <mirrors@baseportal.de>-->
-<a href="http://rrdtool.mirroraty.org/<where/>">US</a><!--Hossam Hossny <hossam@trexle.com>-->
+#<a href="http://rrdtool.basemirror.de/<where/>">DE</a><!--Baseportal Mirrors <mirrors@baseportal.de>-->
+#<a href="http://rrdtool.mirroraty.org/<where/>">US</a><!--Hossam Hossny <hossam@trexle.com>-->
 #<a href="http://rrdtool.paracoda.com/<where/>">CA</a><!--Hossam Hossny <admin@paracoda.com>-->
 #<a href="http://rrdtool.PlaySystems.ro/<where/>">RO</a><!--dan.draghici@ulbsibiu.ro-->
 </div>
@@ -203,14 +203,15 @@ res are missing, then the mirror may not have picked up the contents of the <a h
 #<a href="http://www.konqueror.org">Konqueror</a> aus dem KDE Projekt.
 #</de>
 </p> 
-<script type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-var pageTracker = _gat._getTracker("UA-374525-1");
-pageTracker._initData();
-pageTracker._trackPageview();
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new
+  Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-374525-1', 'auto');
+  ga('require', 'linkid', 'linkid.js');
+  ga('send', 'pageview');
 </script>
 </body>
 </html>

diff --git a/website/index.wml b/website/index.wml
index 5b90a8b32516f8e8d916738d83e6bfaf8e3b5cf4..14847e61bac5508983f4f772a992e49d02c9224d 100644 (file)
--- a/website/index.wml
+++ b/website/index.wml
@@ -41,7 +41,8 @@ applications.</p>
 
 <h2>News</h2>
 
-For the lastest news regarding RRDtool, check the <a href="http://oss.oetiker.ch/rrdtool/forum.en.html#nabble-f937719">Announcements Mailinglist Archive</a>.
+<p>For the lastest news regarding RRDtool, check the <a href="http://oss.oetiker.ch/rrdtool/forum.en.html#nabble-f937719">Announcements Mailinglist Archive</a>.
+Or add our <a href="https://www.facebook.com/rrdtool.org">Facebook</a> and <a href="https://plus.google.com/117394673819512590121" rel="publisher">Google+</a> pages.</p>
 
 <h2>Download</h2>
 

diff --git a/website/rrdworld/index.wml b/website/rrdworld/index.wml
index 852cd70183e2aa9e2093cb22c0c35f63261409f3..e4f1a362821d2284b71ad99144a9ca76698ee53c 100644 (file)
--- a/website/rrdworld/index.wml
+++ b/website/rrdworld/index.wml
@@ -46,7 +46,6 @@ add-ons to big applications or even replacements for rrdtool itself.</p>
 #include "observium.xml"
 #include "ourmon.xml"
 #include "ow.xml"
-#include "ozmonitor.xml"
 #include "prb.xml"
 #include "pfsense.xml"
 #include "rrdbot.xml"

diff --git a/website/rrdworld/munin.xml b/website/rrdworld/munin.xml
index 9039fa915c0f28953434b473db8f59bd2576f21c..9a3aa4242afad828e91dae9d35cd667ea81060de 100644 (file)
--- a/website/rrdworld/munin.xml
+++ b/website/rrdworld/munin.xml
@@ -10,13 +10,13 @@ displaying it in a web interface. It has a master/node architecture. The
 master collects data from the nodes at regular intervals, storing the
 data in RRD, and updates the graphs. One of the main goals has been ease
 of creating plugins. </description>
-   <homepage> http://www.linpro.no/projects/munin/ </homepage> 
+   <homepage> http://munin-monitoring.org/ </homepage> 
        <year> 2005 </year><month> 11 </month> <!-- Entry creation date -->
     <license> GPL v2 </license>
 
    <!-- Optional -->   
 
-   <livesite> http://www.linpro.no/projects/munin/example/ </livesite> 
+   <livesite> http://demo.munin-monitoring.org/ </livesite> 
       <email> munin-users@lists.sourceforge.net </email> <!-- Author contact -->
 
 </rrdworld>

diff --git a/website/rrdworld/ozmonitor.gif b/website/rrdworld/ozmonitor.gif
deleted file mode 100644 (file)
index 7c4c76c..0000000
Binary files a/website/rrdworld/ozmonitor.gif and /dev/null differ

diff --git a/website/rrdworld/ozmonitor.xml b/website/rrdworld/ozmonitor.xml
deleted file mode 100644 (file)
index 74aed2e..0000000
--- a/website/rrdworld/ozmonitor.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<rrdworld type="application" icon="ozmonitor.gif" >
-
-      <name> ozMonitor </name>
-    <author> OZOOD Solutions </author>
-<description>
-ozMonitor monitor permanently your Web site.  As soon as this one is
-unvalable or that its performance
-(downloadtime) is degraded, you are automatically alerted.  You can thus
-react as soon as possible.  Thus, you
-control your Web site freely with ozMonitor.
-</description>
-  <homepage> http://www.ozmonitor.org</homepage>
-      <year> 2005 </year><month> 09 </month> <!-- Entry creation date -->
-   <license> Free ASP Mode </license>
-  <livesite> http://www.ozmonitor.org/index.php?option=com_ozdemo</livesite>
-</rrdworld>

diff --git a/website/rrdworld/rrd4j.xml b/website/rrdworld/rrd4j.xml
index 5575c3d4cf2ed7a0ede5eb20bca31816bc99789e..113d5b038b37b849b96940c6630ac725fe7349ab 100644 (file)
--- a/website/rrdworld/rrd4j.xml
+++ b/website/rrdworld/rrd4j.xml
@@ -1,9 +1,8 @@
-<rrdworld type="companion">
-      <name> RRD4J </name>
-    <author> Sasa Marcovic, Mathias Bogaert </author>
-<description> Rrd4j is a 100% pure java implementation of RRDTool.</description>
-  <homepage> https://rrd4j.dev.java.net/ </homepage>
-      <year> 2006 </year><month> 2 </month>
-   <license> LGPL </license>
-<email> m.bogaert@memenco.com </email> <!-- Author contact -->
+<rrdworld type="companion"> 
+    <name> RRD4J </name>
+    <author> Sasa Marcovic, Mathias Bogaert, Fabrice Bacchella</author>
+    <description> RRD4J is a 100% pure java implementation of RRDTool </description>
+    <homepage> https://code.google.com/p/rrd4j/ </homepage> 
+    <year> 2006 </year><month> 2 </month> <!-- Entry creation date -->
+    <license> Apache 2.0</license>
 </rrdworld>

diff --git a/website/sponsor.wml b/website/sponsor.wml
index af107561f09e9ed9b432bd54156efef11ec46542..f039d3643fdb0ebed8cc1aa19e65182bd4463c38 100644 (file)
--- a/website/sponsor.wml
+++ b/website/sponsor.wml
@@ -8,28 +8,52 @@ href="http://it.oetiker.ch/monitoring/support.var">customer specific add-on
 features and support contracts</a>. Since this work is focused towards the
 customers requirements this does not leave much room for general improvement.
 If you profit from RRDtool and want to support the project as a whole, you
-could <a href="http://it.oetiker.ch/monitoring/sponsoring.var">become a
+could <a href="http://www.oetiker.ch/home/oss/sponsoring/">become a
 sponsor</a>!</p>
 
-<h2>2013 Gold Sponsors</h2>
+#<h2>2014 Gold Sponsors</h2>
+#
 
+<h2>2015 Silver Sponsors</h2>
 <p>
-#maarten.vanlaere@serverscheck.com
-<a href="http://www.serverscheck.com/sensors/sensorgateway_availability.asp"><img border="0" title="ServersCheck" alt="ServersCheck" src="$(ROOT)/logos/serverscheck-3.gif"/></a>
+# "Cunaccia, Arianna" <Arianna.Cunaccia@wuerth-phoenix.com>
+<a href="http://www.wuerth-phoenix.com/neteye"><img border="0" alt="Wuerth Phoenix" src="$(ROOT)/logos/wuerth-phoenix.png"/></a>&nbsp;
+#From: David Schweikert <dws@open.ch>
+<a href="http://www.open.ch"><img border="0" title="open systems ag" alt="open systems ag" src="$(ROOT)/logos/opensystems-51x51.png"/></a>&nbsp;
+# christian@heutger.net
+<a href="http://www.psw.net"><img border="0" title="No matter whether it concerns an SSL certificate issued by renowned certificate authorities or an ISO 27001
+certification, the PSW GROUP is your competent partner. Our focus is your security: breaking new ground together, always
+focussed on our customers success. We assist you to establish a solid information security management system and gain a
+globally recognised quality seal enabling you to prove trust and attract more customers." alt="PSW GROUP GmbH &amp; Co. KG" src="$(ROOT)/logos/psw.jpg"/></a>&nbsp;
+# Felix Schueren <felix.schueren@hosteurope.de> Thu, 21 Dec 2006 12:24:51 +0100
+#<a href="http://www.hosteurope.de/"><img border="0" alt="HostEurope" src="$(ROOT)/logos/HE_Logo_101x51.gif"/></a>&nbsp;
+# Christine Mäder <christine.maeder@digicomp.ch>
+#<a href="http://www.digicomp.ch/linux"><img border="0" alt="Digicomp Academy AG" src="$(ROOT)/logos/digicomp.gif"/></a>&nbsp;
+# Jan Josephson <janj@op5.com>, Gunilla Enebro Lindberg <gunillae@op5.com>
+#<a href="http://www.op5.com"><img border="0" title="op5" alt="op5" src="$(ROOT)/logos/op5logoweb101x51.gif"/></a>&nbsp;
+# stuart@irisns.com
+<a href="http://www.irisns.com"><img border="0" title="IRIS" alt="IRIS" src="$(ROOT)/logos/iris.png"/></a>&nbsp;
+Laura Horstmanshof <laura@beslistmail.nl>
+<a href="http://www.beslist.be/"><img border="0" alt="beslist.nl" src="$(ROOT)/logos/beslistbe.png"/></a>&nbsp;
 </p>
 
-<h2>2013 Silver Sponsors</h2>
-<p>
+#<h2>2013 Gold Sponsors</h2>
+
+#<p>
+#maarten.vanlaere@serverscheck.com
+#<a href="http://www.serverscheck.com/sensors/sensorgateway_availability.asp"><img border="0" title="ServersCheck" alt="ServersCheck" src="$(ROOT)/logos/serverscheck-3.gif"/></a>
+#</p>
+
+#<h2>2013 Silver Sponsors</h2>
+#<p>
 # Ethan Galstad <egalstad@nagios.com> Tue, 28 Sep 2010 23:18:27 +0200
-<a href="http://www.nagios.com"><img border="0" alt="Nagios" src="$(ROOT)/logos/nagios.png"/></a>&nbsp;
-# "Cunaccia, Arianna" <Arianna.Cunaccia@wuerth-phoenix.com>
-<a href="http://www.wuerth-phoenix.com/neteye"><img border="0" alt="Wuerth Phoenix" src="$(ROOT)/logos/wuerth-phoenix.png"/></a>&nbsp;
+#<a href="http://www.nagios.com"><img border="0" alt="Nagios" src="$(ROOT)/logos/nagios.png"/></a>&nbsp;
 # Tarus Balog <tarus@opennms.org> rt#14393
-<a href="http://www.opennms.org"><img border="0" title="openNMS" alt="openNMS" src="$(ROOT)/logos/opennmscolorgroup.png"/></a>&nbsp;
+#<a href="http://www.opennms.org"><img border="0" title="openNMS" alt="openNMS" src="$(ROOT)/logos/opennmscolorgroup.png"/></a>&nbsp;
 # christian@heutger.net
-<a href="http://www.psw.net"><img border="0" alt="PSW" src="$(ROOT)/logos/psw.jpg"/></a>&nbsp;
+#<a href="http://www.psw.net"><img border="0" alt="PSW" src="$(ROOT)/logos/psw.jpg"/></a>&nbsp;
 #From: David Schweikert <dws@open.ch>
-<a href="http://www.open.ch"><img border="0" title="open systems ag" alt="open systems ag" src="$(ROOT)/logos/opensystems-51x51.png"/></a>&nbsp;
+#<a href="http://www.open.ch"><img border="0" title="open systems ag" alt="open systems ag" src="$(ROOT)/logos/opensystems-51x51.png"/></a>&nbsp;
 
 # Klas Bernehjält <klas.bernehjalt@op5.com>
 #<a href="http://www.op5.com"><img border="0" title="op5" alt="op5" src="$(ROOT)/logos/op5logoweb101x51.gif"/></a>&nbsp;