--- a/html/includes/collectd/definitions.php
+++ b/html/includes/collectd/definitions.php
@@ -49,9 +49,9 @@
$GraphDefs = [];
$GraphDefs['apache_bytes'] = [
- 'DEF:min_raw={file}:count:MIN',
- 'DEF:avg_raw={file}:count:AVERAGE',
- 'DEF:max_raw={file}:count:MAX',
+ '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,*',
@@ -69,9 +69,9 @@
'GPRINT:min:MIN:%5.1lf%s\l',
'GPRINT:avg_sum:LAST: (ca. %5.1lf%sB Total)'];
$GraphDefs['apache_requests'] = [
- 'DEF:min={file}:count:MIN',
- 'DEF:avg={file}:count:AVERAGE',
- 'DEF:max={file}:count:MAX',
+ 'DEF:min={file}:value:MIN',
+ 'DEF:avg={file}:value:AVERAGE',
+ 'DEF:max={file}:value:MAX',
'COMMENT: Cur Avg Min Max\l',
"AREA:max#$HalfBlue",
"AREA:min#$Canvas",
@@ -81,9 +81,9 @@
'GPRINT:min:MIN:%5.2lf%s',
'GPRINT:max:MAX:%5.2lf%s\l'];
$GraphDefs['apache_scoreboard'] = [
- 'DEF:min={file}:count:MIN',
- 'DEF:avg={file}:count:AVERAGE',
- 'DEF:max={file}:count:MAX',
+ 'DEF:min={file}:value:MIN',
+ 'DEF:avg={file}:value:AVERAGE',
+ 'DEF:max={file}:value:MAX',
'COMMENT: Cur Min Avg Max\l',
"AREA:max#$HalfBlue",
"AREA:min#$Canvas",
@@ -387,9 +387,9 @@
'GPRINT:max:MAX:%4.1lf',
'GPRINT:avg:LAST:%4.1lf\l'];
$GraphDefs['spam_check'] = [
- 'DEF:avg={file}:hits:AVERAGE',
- 'DEF:min={file}:hits:MIN',
- 'DEF:max={file}:hits:MAX',
+ 'DEF:avg={file}:value:AVERAGE',
+ 'DEF:min={file}:value:MIN',
+ 'DEF:max={file}:value:MAX',
"AREA:max#$HalfMagenta",
"AREA:min#$Canvas",
"LINE1:avg#$FullMagenta:Count ",
@@ -399,9 +399,9 @@
'GPRINT:avg:LAST:%4.1lf\l'];
$GraphDefs['entropy'] = [
#'-v', 'Bits',
- 'DEF:avg={file}:entropy:AVERAGE',
- 'DEF:min={file}:entropy:MIN',
- 'DEF:max={file}:entropy:MAX',
+ 'DEF:avg={file}:value:AVERAGE',
+ 'DEF:min={file}:value:MIN',
+ 'DEF:max={file}:value:MAX',
'COMMENT: Min Avg Max Cur\l',
"AREA:max#$HalfBlue",
"AREA:min#$Canvas",
@@ -424,9 +424,9 @@
'GPRINT:avg:LAST:%4.1lf\l'];
$GraphDefs['frequency'] = [
#'-v', 'Hertz',
- 'DEF:avg={file}:frequency:AVERAGE',
- 'DEF:min={file}:frequency:MIN',
- 'DEF:max={file}:frequency:MAX',
+ 'DEF:avg={file}:value:AVERAGE',
+ 'DEF:min={file}:value:MIN',
+ 'DEF:max={file}:value:MAX',
"AREA:max#b5b5b5",
"AREA:min#$Canvas",
"LINE1:avg#$FullBlue:Frequency [Hz]",
@@ -435,9 +435,9 @@
'GPRINT:max:MAX:%4.1lf',
'GPRINT:avg:LAST:%4.1lf\l'];
$GraphDefs['time_dispersion'] = [ // NTPd
- 'DEF:ppm_avg={file}:seconds:AVERAGE',
- 'DEF:ppm_min={file}:seconds:MIN',
- 'DEF:ppm_max={file}:seconds:MAX',
+ 'DEF:ppm_avg={file}:value:AVERAGE',
+ 'DEF:ppm_min={file}:value:MIN',
+ 'DEF:ppm_max={file}:value:MAX',
'COMMENT:Seconds Min Avg Max Cur\l',
"AREA:ppm_max#b5b5b5",
"AREA:ppm_min#$Canvas",
@@ -447,9 +447,9 @@
'GPRINT:ppm_max:MAX:%5.2lf',
'GPRINT:ppm_avg:LAST:%5.2lf'];
$GraphDefs['delay'] = [ // NTPd
- 'DEF:ppm_avg={file}:seconds:AVERAGE',
- 'DEF:ppm_min={file}:seconds:MIN',
- 'DEF:ppm_max={file}:seconds:MAX',
+ 'DEF:ppm_avg={file}:value:AVERAGE',
+ 'DEF:ppm_min={file}:value:MIN',
+ 'DEF:ppm_max={file}:value:MAX',
'COMMENT:Seconds Min Avg Max Cur\l',
"AREA:ppm_max#$HalfBlue",
"AREA:ppm_min#$Canvas",
@@ -459,9 +459,9 @@
'GPRINT:ppm_max:MAX:%5.2lf',
'GPRINT:ppm_avg:LAST:%5.2lf'];
$GraphDefs['frequency_offset'] = [ // NTPd
- 'DEF:ppm_avg={file}:ppm:AVERAGE',
- 'DEF:ppm_min={file}:ppm:MIN',
- 'DEF:ppm_max={file}:ppm:MAX',
+ 'DEF:ppm_avg={file}:value:AVERAGE',
+ 'DEF:ppm_min={file}:value:MIN',
+ 'DEF:ppm_max={file}:value:MAX',
'COMMENT: Min Avg Max Cur\l',
"AREA:ppm_max#$HalfBlue",
"AREA:ppm_min#$Canvas",
@@ -1084,9 +1084,9 @@
'GPRINT:rbyte_avg:LAST:%5.1lf%s\l'];
$GraphDefs['percent'] = [
#'-v', 'Percent',
- 'DEF:avg={file}:percent:AVERAGE',
- 'DEF:min={file}:percent:MIN',
- 'DEF:max={file}:percent:MAX',
+ 'DEF:avg={file}:value:AVERAGE',
+ 'DEF:min={file}:value:MIN',
+ 'DEF:max={file}:value:MAX',
"AREA:max#$HalfBlue",
"AREA:min#$Canvas",
"LINE1:avg#$FullBlue:Percent",
@@ -1095,9 +1095,9 @@
'GPRINT:max:MAX:%5.1lf%%',
'GPRINT:avg:LAST:%5.1lf%%\l'];
$GraphDefs['ping'] = [
- 'DEF:ping_avg={file}:ping:AVERAGE',
- 'DEF:ping_min={file}:ping:MIN',
- 'DEF:ping_max={file}:ping:MAX',
+ 'DEF:ping_avg={file}:value:AVERAGE',
+ 'DEF:ping_min={file}:value:MIN',
+ 'DEF:ping_max={file}:value:MAX',
"AREA:ping_max#$HalfBlue",
"AREA:ping_min#$Canvas",
"LINE1:ping_avg#$FullBlue:Ping",
@@ -1375,9 +1375,9 @@
'GPRINT:temp_avg:LAST:%4.1lf\l'];
$GraphDefs['timeleft'] = [
#'-v', 'Minutes',
- 'DEF:avg={file}:timeleft:AVERAGE',
- 'DEF:min={file}:timeleft:MIN',
- 'DEF:max={file}:timeleft:MAX',
+ 'DEF:avg={file}:value:AVERAGE',
+ 'DEF:min={file}:value:MIN',
+ 'DEF:max={file}:value:MAX',
"AREA:max#$HalfBlue",
"AREA:min#$Canvas",
"LINE1:avg#$FullBlue:Time left [min]",
@@ -1386,9 +1386,9 @@
'GPRINT:max:MAX:%5.1lf%s',
'GPRINT:avg:LAST:%5.1lf%s\l'];
$GraphDefs['time_offset'] = [ # NTPd
- 'DEF:s_avg={file}:seconds:AVERAGE',
- 'DEF:s_min={file}:seconds:MIN',
- 'DEF:s_max={file}:seconds:MAX',
+ 'DEF:s_avg={file}:value:AVERAGE',
+ 'DEF:s_min={file}:value:MIN',
+ 'DEF:s_max={file}:value:MAX',
'COMMENT:Offset Min Avg Max Cur\l',
"AREA:s_max#$HalfBlue",
"AREA:s_min#$Canvas",
@@ -1458,9 +1458,9 @@
'GPRINT:multimeter_avg:LAST:%4.1lf\l'];
$GraphDefs['users'] = [
#'-v', 'Users',
- 'DEF:users_avg={file}:users:AVERAGE',
- 'DEF:users_min={file}:users:MIN',
- 'DEF:users_max={file}:users:MAX',
+ 'DEF:users_avg={file}:value:AVERAGE',
+ 'DEF:users_min={file}:value:MIN',
+ 'DEF:users_max={file}:value:MAX',
'COMMENT: Min Avg Max Cur\l',
"AREA:users_max#$HalfBlue",
"AREA:users_min#$Canvas",
@@ -1806,6 +1806,17 @@
$sources[] = ['name' => $inst, 'file' => $file];
}
+ // Plugins other than "memory" (e.g. redis) also use the "memory" type,
+ // but write a single "memory.rrd" without type instance.
+ if (empty($sources)) {
+ foreach ($config['datadirs'] as $datadir) {
+ if (is_file($datadir . '/' . $title . '.rrd')) {
+ $sources[] = ['name' => 'used', 'file' => $datadir . '/' . $title . '.rrd'];
+ break;
+ }
+ }
+ }
+
return collectd_draw_meta_stack($opts, $sources);
}
@@ -2101,7 +2112,7 @@
continue;
}
- $sources[] = ['name' => $inst, 'file' => $file, 'ds' => 'count'];
+ $sources[] = ['name' => $inst, 'file' => $file, 'ds' => 'value'];
}
return collectd_draw_meta_stack($opts, $sources);