debian/patches/collection.cgi.dpatch

   1 #! /bin/sh /usr/share/dpatch/dpatch-run
   2 ## collection.cgi.dpatch by Fabiano Pires <fxp@ig.com.br>
   3 ##
   4 ## DP: collection.cgi: Fixed apache data-sources.
   5
   6 @DPATCH@
   7
   8 diff a/contrib/collection.cgi b/contrib/collection.cgi
   9 --- a/contrib/collection.cgi
  10 +++ b/contrib/collection.cgi
  11 @@ -957,9 +957,9 @@
  12
  13    $GraphDefs =
  14    {
  15 -    apache_bytes => ['DEF:min_raw={file}:count:MIN',
  16 -    'DEF:avg_raw={file}:count:AVERAGE',
  17 -    'DEF:max_raw={file}:count:MAX',
  18 +    apache_bytes => ['DEF:min_raw={file}:value:MIN',
  19 +    'DEF:avg_raw={file}:value:AVERAGE',
  20 +    'DEF:max_raw={file}:value:MAX',
  21      'CDEF:min=min_raw,8,*',
  22      'CDEF:avg=avg_raw,8,*',
  23      'CDEF:max=max_raw,8,*',
  24 @@ -976,9 +976,9 @@
  25      'GPRINT:avg:LAST:%5.1lf%s Last',
  26      'GPRINT:avg_sum:LAST:(ca. %5.1lf%sB Total)\l'
  27      ],
  28 -   apache_connections => ['DEF:min={file}:count:MIN',
  29 -    'DEF:avg={file}:count:AVERAGE',
  30 -    'DEF:max={file}:count:MAX',
  31 +   apache_connections => ['DEF:min={file}:value:MIN',
  32 +    'DEF:avg={file}:value:AVERAGE',
  33 +    'DEF:max={file}:value:MAX',
  34      "AREA:max#$HalfBlue",
  35      "AREA:min#$Canvas",
  36      "LINE1:avg#$FullBlue:Connections",
  37 @@ -987,9 +987,9 @@
  38      'GPRINT:max:MAX:%6.2lf Max,',
  39      'GPRINT:avg:LAST:%6.2lf Last'
  40      ],
  41 -    apache_idle_workers => ['DEF:min={file}:count:MIN',
  42 -    'DEF:avg={file}:count:AVERAGE',
  43 -    'DEF:max={file}:count:MAX',
  44 +    apache_idle_workers => ['DEF:min={file}:value:MIN',
  45 +    'DEF:avg={file}:value:AVERAGE',
  46 +    'DEF:max={file}:value:MAX',
  47      "AREA:max#$HalfBlue",
  48      "AREA:min#$Canvas",
  49      "LINE1:avg#$FullBlue:Idle Workers",
  50 @@ -998,9 +998,9 @@
  51      'GPRINT:max:MAX:%6.2lf Max,',
  52      'GPRINT:avg:LAST:%6.2lf Last'
  53      ],
  54 -    apache_requests => ['DEF:min={file}:count:MIN',
  55 -    'DEF:avg={file}:count:AVERAGE',
  56 -    'DEF:max={file}:count:MAX',
  57 +    apache_requests => ['DEF:min={file}:value:MIN',
  58 +    'DEF:avg={file}:value:AVERAGE',
  59 +    'DEF:max={file}:value:MAX',
  60      "AREA:max#$HalfBlue",
  61      "AREA:min#$Canvas",
  62      "LINE1:avg#$FullBlue:Requests/s",
  63 @@ -1009,9 +1009,9 @@
  64      'GPRINT:max:MAX:%6.2lf Max,',
  65      'GPRINT:avg:LAST:%6.2lf Last'
  66      ],
  67 -    apache_scoreboard => ['DEF:min={file}:count:MIN',
  68 -    'DEF:avg={file}:count:AVERAGE',
  69 -    'DEF:max={file}:count:MAX',
  70 +    apache_scoreboard => ['DEF:min={file}:value:MIN',
  71 +    'DEF:avg={file}:value:AVERAGE',
  72 +    'DEF:max={file}:value:MAX',
  73      "AREA:max#$HalfBlue",
  74      "AREA:min#$Canvas",
  75      "LINE1:avg#$FullBlue:Processes",