--- current/html/includes/collectd/definitions.php 2012-09-01 15:11:10.149914738 +0930
+++ gitsvn/trunk/html/includes/collectd/definitions.php 2012-05-04 22:24:34.000000000 +0930
@@ -47,9 +47,9 @@
$GraphDefs = array();
$GraphDefs['apache_bytes'] = array(
- 'DEF:min_raw={file}:value:MIN',
- 'DEF:avg_raw={file}:value:AVERAGE',
- 'DEF:max_raw={file}:value:MAX',
+ 'DEF:min_raw={file}:count:MIN',
+ 'DEF:avg_raw={file}:count:AVERAGE',
+ 'DEF:max_raw={file}:count:MAX',
'CDEF:min=min_raw,8,*',
'CDEF:avg=avg_raw,8,*',
'CDEF:max=max_raw,8,*',
@@ -67,9 +67,9 @@
'GPRINT:min:MIN:%5.1lf%s\l',
'GPRINT:avg_sum:LAST: (ca. %5.1lf%sB Total)');
$GraphDefs['apache_requests'] = array(
- 'DEF:min={file}:value:MIN',
- 'DEF:avg={file}:value:AVERAGE',
- 'DEF:max={file}:value:MAX',
+ 'DEF:min={file}:count:MIN',
+ 'DEF:avg={file}:count:AVERAGE',
+ 'DEF:max={file}:count:MAX',
'COMMENT: Cur Avg Min Max\l',
"AREA:max#$HalfBlue",
"AREA:min#$Canvas",
@@ -79,9 +79,9 @@
'GPRINT:min:MIN:%5.2lf%s',
'GPRINT:max:MAX:%5.2lf%s\l');
$GraphDefs['apache_scoreboard'] = array(
- 'DEF:min={file}:value:MIN',
- 'DEF:avg={file}:value:AVERAGE',
- 'DEF:max={file}:value:MAX',
+ 'DEF:min={file}:count:MIN',
+ 'DEF:avg={file}:count:AVERAGE',
+ 'DEF:max={file}:count:MAX',
'COMMENT: Cur Min Ave Max\l',
"AREA:max#$HalfBlue",
"AREA:min#$Canvas",
@@ -2043,7 +2043,7 @@
if ($file == '')
continue;
- $sources[] = array('name'=>$inst, 'file'=>$file, 'ds'=>'value');
+ $sources[] = array('name'=>$inst, 'file'=>$file, 'ds'=>'count');
}
return collectd_draw_meta_stack($opts, $sources);