mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1347 from clinta/apache-collectd

Browse Source 
Correct Apache collectd DS
This commit is contained in:
Daniel Preussker
2015-06-26 16:24:38 +02:00
parent 947d7de928 523cb83e91
commit 67a1463197
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
html/includes/collectd/definitions.php
View File

@ -47,9 +47,9 @@ function load_graph_definitions($logarithmic = false, $tinylegend = false) {
$GraphDefs = array(); $GraphDefs = array();
$GraphDefs['apache_bytes'] = array( $GraphDefs['apache_bytes'] = array(
'DEF:min_raw={file}:count:MIN', 'DEF:min_raw={file}:value:MIN',
'DEF:avg_raw={file}:count:AVERAGE', 'DEF:avg_raw={file}:value:AVERAGE',
'DEF:max_raw={file}:count:MAX', 'DEF:max_raw={file}:value:MAX',
'CDEF:min=min_raw,8,*', 'CDEF:min=min_raw,8,*',
'CDEF:avg=avg_raw,8,*', 'CDEF:avg=avg_raw,8,*',
'CDEF:max=max_raw,8,*', 'CDEF:max=max_raw,8,*',
@ -67,9 +67,9 @@ function load_graph_definitions($logarithmic = false, $tinylegend = false) {
'GPRINT:min:MIN:%5.1lf%s\l', 'GPRINT:min:MIN:%5.1lf%s\l',
'GPRINT:avg_sum:LAST: (ca. %5.1lf%sB Total)'); 'GPRINT:avg_sum:LAST: (ca. %5.1lf%sB Total)');
$GraphDefs['apache_requests'] = array( $GraphDefs['apache_requests'] = array(
'DEF:min={file}:count:MIN', 'DEF:min={file}:value:MIN',
'DEF:avg={file}:count:AVERAGE', 'DEF:avg={file}:value:AVERAGE',
'DEF:max={file}:count:MAX', 'DEF:max={file}:value:MAX',
'COMMENT: Cur Avg Min Max\l', 'COMMENT: Cur Avg Min Max\l',
"AREA:max#$HalfBlue", "AREA:max#$HalfBlue",
"AREA:min#$Canvas", "AREA:min#$Canvas",
@ -79,9 +79,9 @@ function load_graph_definitions($logarithmic = false, $tinylegend = false) {
'GPRINT:min:MIN:%5.2lf%s', 'GPRINT:min:MIN:%5.2lf%s',
'GPRINT:max:MAX:%5.2lf%s\l'); 'GPRINT:max:MAX:%5.2lf%s\l');
$GraphDefs['apache_scoreboard'] = array( $GraphDefs['apache_scoreboard'] = array(
'DEF:min={file}:count:MIN', 'DEF:min={file}:value:MIN',
'DEF:avg={file}:count:AVERAGE', 'DEF:avg={file}:value:AVERAGE',
'DEF:max={file}:count:MAX', 'DEF:max={file}:value:MAX',
'COMMENT: Cur Min Ave Max\l', 'COMMENT: Cur Min Ave Max\l',
"AREA:max#$HalfBlue", "AREA:max#$HalfBlue",
"AREA:min#$Canvas", "AREA:min#$Canvas",
@ -2043,7 +2043,7 @@ function meta_graph_apache_scoreboard($host, $plugin, $plugin_instance, $type, $
if ($file == '') if ($file == '')
continue; continue;
$sources[] = array('name'=>$inst, 'file'=>$file, 'ds'=>'count'); $sources[] = array('name'=>$inst, 'file'=>$file, 'ds'=>'value');
} }
return collectd_draw_meta_stack($opts, $sources); return collectd_draw_meta_stack($opts, $sources);