patches: Added collection.cgi.dpatch.

… fixing apache data-sources; thanks to Fabiano Pires for reporting this and
providing a patch!

Closes: #743881

diff --git a/debian/changelog b/debian/changelog
index 26f49e74ec1cdc6d6480574725f33536e97c6d9d..d33aaeef0f426a109c7261af7becbd726c6774f3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ collectd (5.4.1-2) UNRELEASED; urgency=medium
       into $HOME.
   * debian/control:
     - Drop build dependency on libvarnishapi-dev.
+  * debian/patches:
+    - Added collection.cgi.dpatch fixing apache data-sources; thanks to
+      Fabiano Pires for reporting this and providing a patch
+      (Closes: #743881).
 
  -- Sebastian Harl <tokkee@debian.org>  Sat, 26 Apr 2014 15:29:43 +0200
 

diff --git a/debian/patches/00list b/debian/patches/00list
index 23aacf62e043c084fffcce668440b01881337668..717d464c463c522d2d711caee35f4dfde1bdf39b 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,4 +1,5 @@
 rrd_filter_path.dpatch
 collection_conf_path.dpatch
+collection.cgi.dpatch
 myplugin_includes.dpatch
 bts559801_plugin_find_fix.dpatch

diff --git a/debian/patches/collection.cgi.dpatch b/debian/patches/collection.cgi.dpatch
new file mode 100644 (file)
index 0000000..5156449
--- /dev/null
+++ b/debian/patches/collection.cgi.dpatch
@@ -0,0 +1,75 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## collection.cgi.dpatch by Fabiano Pires <fxp@ig.com.br>
+##
+## DP: collection.cgi: Fixed apache data-sources.
+
+@DPATCH@
+
+diff a/contrib/collection.cgi b/contrib/collection.cgi
+--- a/contrib/collection.cgi
++++ b/contrib/collection.cgi
+@@ -957,9 +957,9 @@
+ 
+   $GraphDefs =
+   {
+-    apache_bytes => ['DEF:min_raw={file}:count:MIN',
+-    'DEF:avg_raw={file}:count:AVERAGE',
+-    'DEF:max_raw={file}:count:MAX',
++    apache_bytes => ['DEF:min_raw={file}:value:MIN',
++    'DEF:avg_raw={file}:value:AVERAGE',
++    'DEF:max_raw={file}:value:MAX',
+     'CDEF:min=min_raw,8,*',
+     'CDEF:avg=avg_raw,8,*',
+     'CDEF:max=max_raw,8,*',
+@@ -976,9 +976,9 @@
+     'GPRINT:avg:LAST:%5.1lf%s Last',
+     'GPRINT:avg_sum:LAST:(ca. %5.1lf%sB Total)\l'
+     ],
+-   apache_connections => ['DEF:min={file}:count:MIN',
+-    'DEF:avg={file}:count:AVERAGE',
+-    'DEF:max={file}:count:MAX',
++   apache_connections => ['DEF:min={file}:value:MIN',
++    'DEF:avg={file}:value:AVERAGE',
++    'DEF:max={file}:value:MAX',
+     "AREA:max#$HalfBlue",
+     "AREA:min#$Canvas",
+     "LINE1:avg#$FullBlue:Connections",
+@@ -987,9 +987,9 @@
+     'GPRINT:max:MAX:%6.2lf Max,',
+     'GPRINT:avg:LAST:%6.2lf Last'
+     ],
+-    apache_idle_workers => ['DEF:min={file}:count:MIN',
+-    'DEF:avg={file}:count:AVERAGE',
+-    'DEF:max={file}:count:MAX',
++    apache_idle_workers => ['DEF:min={file}:value:MIN',
++    'DEF:avg={file}:value:AVERAGE',
++    'DEF:max={file}:value:MAX',
+     "AREA:max#$HalfBlue",
+     "AREA:min#$Canvas",
+     "LINE1:avg#$FullBlue:Idle Workers",
+@@ -998,9 +998,9 @@
+     'GPRINT:max:MAX:%6.2lf Max,',
+     'GPRINT:avg:LAST:%6.2lf Last'
+     ],
+-    apache_requests => ['DEF:min={file}:count:MIN',
+-    'DEF:avg={file}:count:AVERAGE',
+-    'DEF:max={file}:count:MAX',
++    apache_requests => ['DEF:min={file}:value:MIN',
++    'DEF:avg={file}:value:AVERAGE',
++    'DEF:max={file}:value:MAX',
+     "AREA:max#$HalfBlue",
+     "AREA:min#$Canvas",
+     "LINE1:avg#$FullBlue:Requests/s",
+@@ -1009,9 +1009,9 @@
+     'GPRINT:max:MAX:%6.2lf Max,',
+     'GPRINT:avg:LAST:%6.2lf Last'
+     ],
+-    apache_scoreboard => ['DEF:min={file}:count:MIN',
+-    'DEF:avg={file}:count:AVERAGE',
+-    'DEF:max={file}:count:MAX',
++    apache_scoreboard => ['DEF:min={file}:value:MIN',
++    'DEF:avg={file}:value:AVERAGE',
++    'DEF:max={file}:value:MAX',
+     "AREA:max#$HalfBlue",
+     "AREA:min#$Canvas",
+     "LINE1:avg#$FullBlue:Processes",