gwos sponsors

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

diff --git a/website/build.sh b/website/build.sh
index c6a3bc533ba3857c834f7e2344c3576b69702ec6..d50015014ab13e355a429fea92d05497f99c3145 100755 (executable)
--- a/website/build.sh
+++ b/website/build.sh
@@ -1,8 +1,9 @@
 #!/bin/sh
 PERL5LIB=/home/oetiker/lib/fake-perl/
 SITEROOT=`pwd`
+LANG=C
 PODPATH=`ls */build.sh | sed -e 's|/.*||g' | perl -0777 -e 'print join ":", map {"$_"} split /\n/, <>'`
-export PERL5LIB SITEROOT PODPATH
+export PERL5LIB SITEROOT PODPATH LANG
 rm */pod*tmp
 for x in `ls */build.sh | sed 's|/.*||g'`; do
   echo '****' $x '****'

diff --git a/website/doc/build.sh b/website/doc/build.sh
index 7f015cf20ff4265c9df3e6eb7d81fb1ac88e0837..4d6920113f7ca156ba9f25af78dcf528bf6a6863 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.5)
+src=/scratch/rrdtool-1.5
+git clone -b 1.5 git@github.com:oetiker/rrdtool-1.x.git $src
 . ../bin/pod2wml.sh
 
 pod2descr() {

diff --git a/website/gallery/index.en.html b/website/gallery/index.en.html
index 234f05d7c62b22fbafcceec9f0dd3750f9c791af..2c0444c629229071b52913e7b4ae991ed6ffe237 100644 (file)
--- a/website/gallery/index.en.html
+++ b/website/gallery/index.en.html
@@ -109,20 +109,11 @@ RRDtool
 <!-- # BODY -->
 <!-- ############################# -->
 <div id="body">
-<!-- google_ad_section_start -->
 <h1>RRDtool Gallery</h1>
 <div id="googlead_right">
 <script type="text/javascript"><!--
-google_ad_client = "pub-8135238818549668";
-/* rrdtool top right */
-google_ad_slot = "4985488960";
-google_ad_width = 300;
-google_ad_height = 250;
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
+amazon_ad_tag = "tobistools-20"; amazon_ad_width="300"; amazon_ad_height="250"; amazon_ad_logo="hide"; amazon_ad_price="retail"; amazon_ad_border="hide";//--></script>
+<script type="text/javascript" src="http://ir-na.amazon-adsystem.com/s/ads.js"></script>
 </div>
  <!-- no wider than 600 pixle -->
  <!-- creation date -->
@@ -133,6 +124,71 @@ 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> Squiddly Diddly </h2>
+<div class="image"><img src="sunny.png" alt="" width="695" height="388" /></div>
+<div class="caption"> This RRD graph shows the total CPU utilization of the Squid service. It also includes utilization of each individual Squid helper process. Graph uses various retro colors for each Squid process/helper. -- Sunny Aujla &lt;sunnyfedora99@<span class="legacy">XYZ-</span>gmail.com&gt;, 2015/10 </div>
+</div>
+        <!-- creation date -->
+   <!-- Optional -->
+<div class="gallery">
+<h2> The road to inbox zero </h2>
+<div class="image"><img src="iteisa.png" alt="" width="600" height="301" /></div>
+<div class="caption"> This graph charts every minute the number of email messages in
+each team member's inbox. As others, we adhere to the "inbox zero" workflow,
+so plotting this
+is useful for us to visualize how good or how bad are we are coping with
+email in the company. We use this chart as a self-motivational challenge ;-)
+as well as a base
+for betting and healthy competition inside the team. -- Jaime Gómez Obregón (@JaimeObregon) @ITEISA &lt;N/A&gt;, 2015/8 <a href="https://mailstats.iteisa.com">[demo]</a></div>
+</div>
+ <!-- no wider than 600 pixle -->
+        <!-- creation date -->
+   <!-- Optional -->
+<div class="gallery">
+<h2> VMware cluster memory quickstats</h2>
+<div class="image"><img src="VMware_cluster_memory_quickstats.png" alt="" width="595" height="308" /></div>
+<div class="caption"> This graph helps you visualize VMware cluster memory consumption and overcommitment over time. -- Raphael Schitz &lt;raphael@<span class="legacy">XYZ-</span>schitz.net&gt;, 2013/10 <a href="https://github.com/rschitz/vCacti">[demo]</a></div>
+</div>
+ <!-- no wider than 600 pixle -->
+        <!-- creation date -->
+   <!-- Optional -->
+<div class="gallery">
+<h2> ZFS zpool usage</h2>
+<div class="image"><img src="ZFS_zpool_usage.png" alt="" width="603" height="289" /></div>
+<div class="caption"> This graph helps you visualize data and snapshots usage in a ZFS zpool. -- Raphael Schitz &lt;raphael@<span class="legacy">XYZ-</span>schitz.net&gt;, 2012/8 <a href="http://www.hypervisor.fr/?p=4010">[demo]</a></div>
+</div>
+  <!-- creation date -->
+<div class="gallery">
+<p>
+<script type="text/javascript"><!--
+amazon_ad_tag = "tobistools-20"; amazon_ad_width="300"; amazon_ad_height="250"; amazon_ad_logo="hide"; amazon_ad_price="retail"; amazon_ad_border="hide";//--></script>
+<script type="text/javascript" src="http://ir-na.amazon-adsystem.com/s/ads.js"></script>
+</p>
+<h2> One-Wire Weather station with several temperature sensors </h2>
+<div class="image"><img src="cafelizardo.png" alt="" width="497" height="446" /></div>
+<div class="caption"> One-Wire weather station using Simon Melhuish's OWW software.
+Originally started with the original 1-wire demonstration
+weather station from Dallas Semiconductor which contained a single
+temperature sensor, wind speed and direction sensors. Added several
+sensors over the years some of which have stopped working but I still have 9
+working temperature sensors: several inside, two outside
+("spare" is original temp sensor on 10' pole attached to chimney), two in
+the attic and one each in the two return air ducts (two zone
+HAVAC). The barometer sensor is in the wiring closet which is the warmest
+room in the house. The sensor in the Living room is on the
+floor and is usually the coolest. The humidity sensor needs to be replaced.
+This plot which starts at about 6 am shows the heater (set point is 68 in
+the morning) was on while the outside temperature was just
+above freezing (33 F). You can see the sun heating the roof and attic which
+reaches 100+ just after noon. We had a high of 78 around
+2 pm, then house cooling off after sunset and the heater coming on around 10
+pm.
+ -- Claude Felizardo &lt;cafelizardoatgmail&gt;, 2005/10 </div>
 </div>
  <!-- no wider than 600 pixle -->
         <!-- creation date -->
@@ -169,24 +225,6 @@ These graphs shows the active VPN tunnels and the VPN network traffic generated
         <!-- creation date -->
    <!-- Optional -->
 <div class="gallery">
-<p>
-<script type="text/javascript"><!--
-google_ad_client = "pub-8135238818549668";
-google_ad_width = 300;
-google_ad_height = 250;
-google_ad_format = "300x250_as";
-google_ad_type = "text_image";
-google_ad_channel ="9159032853";
-google_color_border = "ffffff";
-google_color_bg = "f0f8FF";
-google_color_link = "191919";
-google_color_url = "0066CC";
-google_color_text = "000000";
-//--></script>
-<script type="text/javascript"
-  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>
@@ -726,7 +764,6 @@ than 600 pixels.</p>
       &lt;email&gt; max@example.com &lt;/email&gt;
 
 &lt;/gallery&gt;</pre>
-<!-- google_ad_section_end -->
 </div>
 </td>
 </tr>
@@ -738,7 +775,7 @@ than 600 pixels.</p>
 <!-- ############################# -->
 <div id="address">
 <small>
-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>
+10/30/15 | <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 da0d4e05798732929753de8ea3310775d5c5ba24..193c5147654aaa9834a609be4d922d38f8f5aa86 100644 (file)
--- a/website/gallery/index.wml
+++ b/website/gallery/index.wml
@@ -5,6 +5,11 @@
 <H1>RRDtool Gallery</H1>
 
 #include "mmh11.xml"
+#include "sunny.xml"
+#include "iteisa.xml"
+#include "VMware_cluster_memory_quickstats.xml"
+#include "ZFS_zpool_usage.xml"
+#include "cafelizardo.xml"
 #include "leucht.xml"
 #include "PTFDV_cpu.xml"
 #include "vpnttg.xml"

diff --git a/website/iana/RRDTOOL-SMI.txt b/website/iana/RRDTOOL-SMI.txt
index 0d70ea55c0461fccff2733e06e30b40996caa2a2..8b6441cd279d4fd94262c7f59260c25ceaba8522 100644 (file)
--- a/website/iana/RRDTOOL-SMI.txt
+++ b/website/iana/RRDTOOL-SMI.txt
@@ -39,7 +39,6 @@ mobilerrd  OBJECT-IDENTITY
        STATUS  current
        DESCRIPTION
                "RRDtool within KPN Mobile. 
-                 Contact mobilerrd{at}12move.nl
                 "
        ::= { rrdtool 2 }
        

diff --git a/website/inc/html.inc b/website/inc/html.inc
index c628cf9577668584954f646c116b7093ac2c5226..d4b689d0022b0c178fab90bed2ff6332cfc0b1ba 100644 (file)
--- a/website/inc/html.inc
+++ b/website/inc/html.inc
@@ -11,16 +11,8 @@ $x =~ s/\\n/ /g; print $x; :>:#H1_FLAT#}
 />
 <div id="googlead_right">
 <script type="text/javascript"><!--
-google_ad_client = "pub-8135238818549668";
-/* rrdtool top right */
-google_ad_slot = "4985488960";
-google_ad_width = 300;
-google_ad_height = 250;
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
+amazon_ad_tag = "tobistools-20"; amazon_ad_width = "300"; amazon_ad_height = "250"; amazon_ad_logo = "hide"; amazon_ad_price = "retail"; amazon_ad_border = "hide";//--></script>
+<script type="text/javascript" src="http://ir-na.amazon-adsystem.com/s/ads.js"></script>
 </div>
 <restore subtitle />
 </define-tag>
@@ -42,26 +34,8 @@ if ($addcount == 7){
 print <<'GOOGLEAD';
 <p>
 <script type="text/javascript"><!--
-google_ad_client = "pub-8135238818549668";
-google_ad_width = 300;
-google_ad_height = 250;
-google_ad_format = "300x250_as";
-google_ad_type = "text_image";
-google_ad_channel ="9159032853";
-google_color_border = "ffffff";
-google_color_bg = "f0f8FF";      
-google_color_link = "191919";      
-google_color_url = "0066CC";
-google_color_text = "000000";
-#google_color_border = "ffffff";
-#google_color_bg = "ffffff";
-#google_color_link = "2c3fbf";
-#google_color_url = "000000";
-#google_color_text = "000000";
-//--></script>
-<script type="text/javascript"
-  src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
+amazon_ad_tag = "tobistools-20"; amazon_ad_width = "300"; amazon_ad_height = "250"; amazon_ad_logo = "hide"; amazon_ad_price = "retail"; amazon_ad_border = "hide";//--></script>
+<script type="text/javascript" src="http://ir-na.amazon-adsystem.com/s/ads.js"></script>
 </p>
 GOOGLEAD
 }
@@ -76,21 +50,8 @@ if ($addcount == 7){
 print <<'GOOGLEAD';
 <p>
 <script type="text/javascript"><!--
-google_ad_client = "pub-8135238818549668";
-google_ad_width = 300;
-google_ad_height = 250;
-google_ad_format = "300x250_as";
-google_ad_type = "text_image";
-google_ad_channel ="9159032853";
-google_color_border = "ffffff";
-google_color_bg = "ffffff";
-google_color_link = "2c3fbf";
-google_color_url = "000000";
-google_color_text = "000000";
-//--></script>
-<script type="text/javascript"
-  src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
+amazon_ad_tag = "tobistools-20"; amazon_ad_width = "300"; amazon_ad_height = "250"; amazon_ad_logo = "hide"; amazon_ad_price = "retail"; amazon_ad_border = "hide";//--></script>
+<script type="text/javascript" src="http://ir-na.amazon-adsystem.com/s/ads.js"></script>
 </p>
 GOOGLEAD
 }

diff --git a/website/inc/pub_contrib_header.html b/website/inc/pub_contrib_header.html
index f3d2513afc70edbafa454ca5cc4fbb5d63923171..79e7e5094c62a78fafc1f27607a15a60a125e233 100644 (file)
--- a/website/inc/pub_contrib_header.html
+++ b/website/inc/pub_contrib_header.html
@@ -103,23 +103,13 @@
 <!-- ############################# -->
 <!-- # BODY -->
 <!-- ############################# -->
-<div id="body"><!-- google_ad_section_start -->
+<div id="body">
 <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>
+<div>
+<script type="text/javascript"><!--
+amazon_ad_tag = "tobistools-20"; amazon_ad_width = "728"; amazon_ad_height =
+"90"; amazon_ad_logo = "hide"; amazon_ad_price = "retail"; amazon_ad_border
+= "hide";//--></script>
+<script type="text/javascript"
+src="http://ir-na.amazon-adsystem.com/s/ads.js"></script>
+</div>

diff --git a/website/inc/pub_header.html b/website/inc/pub_header.html
index 2b95a2936e9d398478d3504af75f23f5cae0ee54..5558c0d33d2a2dc2af36c7f65a738cd18d683737 100644 (file)
--- a/website/inc/pub_header.html
+++ b/website/inc/pub_header.html
@@ -101,18 +101,15 @@
 <!-- ############################# -->
 <!-- # BODY -->
 <!-- ############################# -->
-<div id="body"><!-- google_ad_section_start -->
+<div id="body">
 <h1>RRDtool Download Area</h1>
 <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>               
+<script type="text/javascript"><!--
+amazon_ad_tag = "tobistools-20"; amazon_ad_width = "728"; amazon_ad_height =
+"90"; amazon_ad_logo = "hide"; amazon_ad_price = "retail"; amazon_ad_border
+= "hide";//--></script>
+<script type="text/javascript"
+src="http://ir-na.amazon-adsystem.com/s/ads.js"></script>
 </div>
 
 

diff --git a/website/inc/template.inc b/website/inc/template.inc
index e4d07d08e43edfaf6f6d1d92d9b2197b559e7f92..b16ea3b0f0a1bc02e87ebcc3c27e4c4cefa99186 100644 (file)
--- a/website/inc/template.inc
+++ b/website/inc/template.inc
@@ -127,9 +127,7 @@ RRDtool
 <!-- # BODY -->
 <!-- ############################# -->
 <div id="body">
-<!-- google_ad_section_start -->
 {#Body#}
-<!-- google_ad_section_end -->
 </div>
 </td>
 </tr>
@@ -144,21 +142,8 @@ if ( -s "$(WML_SRC_BASENAME).wml" > 4000 ){
 print <<'GOOGLEAD';
 <div style="clear:right">
 <script type="text/javascript"><!--
-google_ad_client = "pub-8135238818549668";
-google_ad_width = 300;
-google_ad_height = 250;
-google_ad_format = "300x250_as";
-google_ad_type = "text_image";
-google_ad_channel ="6085696737";
-google_color_border = "ffffff";
-google_color_bg = "f0f8FF";
-google_color_link = "191919";
-google_color_url = "0066CC";
-google_color_text = "000000";
-//--></script>
-<script type="text/javascript"
-  src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
+amazon_ad_tag = "tobistools-20"; amazon_ad_width = "300"; amazon_ad_height = "250"; amazon_ad_logo = "hide"; amazon_ad_price = "retail"; amazon_ad_border = "hide";//--></script>
+<script type="text/javascript" src="http://ir-na.amazon-adsystem.com/s/ads.js"></script>
 </div>
 GOOGLEAD
 }

diff --git a/website/rrdworld/index.wml b/website/rrdworld/index.wml
index e4f1a362821d2284b71ad99144a9ca76698ee53c..5f2ceeea2507d5caff59fdec1a9ca8b540578a51 100644 (file)
--- a/website/rrdworld/index.wml
+++ b/website/rrdworld/index.wml
@@ -10,6 +10,7 @@ add-ons to big applications or even replacements for rrdtool itself.</p>
 <h2>RRDtool Companions</h2>
 
 #include "rrd-editor.xml"
+#include "dokuwiki_rrdgraph.xml"
 #include "drraw.xml"
 #include "dsreport.xml"
 #include "nhawk_description.xml"
@@ -69,6 +70,7 @@ add-ons to big applications or even replacements for rrdtool itself.</p>
 #include "tstat.xml"
 #include "unnoc.xml"
 #include "webminstats.xml"
+#include "xymon.xml"
 #include "yacketystats.xml"
 #include "zenoss.xml"
 #include "zerod.xml"

diff --git a/website/sponsor.wml b/website/sponsor.wml
index f039d3643fdb0ebed8cc1aa19e65182bd4463c38..d9f0cabab9c2daa799a4b3706bd97d9c8ab83644 100644 (file)
--- a/website/sponsor.wml
+++ b/website/sponsor.wml
@@ -11,8 +11,9 @@ If you profit from RRDtool and want to support the project as a whole, you
 could <a href="http://www.oetiker.ch/home/oss/sponsoring/">become a
 sponsor</a>!</p>
 
-#<h2>2014 Gold Sponsors</h2>
-#
+<h2>2016 Gold Sponsors</h2>
+# heather.gray@foxt.com
+<a href="http://www.gwos.com/"><img border="0" alt="GroundWork Inc" src="$(ROOT)/logos/GroundWork-200x100.jpg"/></a>&nbsp;
 
 <h2>2015 Silver Sponsors</h2>
 <p>
@@ -33,8 +34,16 @@ globally recognised quality seal enabling you to prove trust and attract more cu
 #<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>
+#Laura Horstmanshof <laura@beslistmail.nl>
 <a href="http://www.beslist.be/"><img border="0" alt="beslist.nl" src="$(ROOT)/logos/beslistbe.png"/></a>&nbsp;
+#Jonas Krummenacher <jonas@keycdn.com>
+<a href="https://www.keycdn.com/"><img border="0" alt="keycdm.ch" src="$(ROOT)/logos/keycdn-logo.png"/></a>&nbsp;
+# Oscar Travis oscar@chameleonjohn.com
+<a href="http://www.chameleonjohn.com/"><img border="0" alt="chameleonjohn.com" src="$(ROOT)/logos/chameleonjohn-logo.jpg"/></a>&nbsp;
+# pavel.hampl@xorux.com
+<a href="http://www.xorux.com/"><img border="0" alt="xorux.com" src="$(ROOT)/logos/xorux_101x51.png"/></a>&nbsp;
+# markbarsno@gmail.com
+<a href="https://www.discountrue.com/"><img border="0" alt="online coupons from discountrue" src="$(ROOT)/logos/discountrue-coupons.jpg"/></a>&nbsp;
 </p>
 
 #<h2>2013 Gold Sponsors</h2>

diff --git a/website/tut/build.sh b/website/tut/build.sh
index 8e0677a9c4f2c73f58f7651268b62ba0214acbff..06f1d11cd2a4ec072c7632a683836a053eff85d3 100755 (executable)
--- a/website/tut/build.sh
+++ b/website/tut/build.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 sect=tut
-src=/home/oetiker/checkouts/rrdtool-1.x
-(cd $src; git checkout 1.4)
+src=/scratch/rrdtool-1.5
+git clone -b 1.5 git@github.com:oetiker/rrdtool-1.x.git $src
 . ../bin/pod2wml.sh
 
 pod2descr() {