X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=contrib%2Fphp-collection%2Fdefinitions.php;h=c84aabeae4427f31e5126274c1861650d8bc3e59;hb=f71895576cbd4b488cd66f0c96efb6fd3e7a6faf;hp=cb3e803e27f285649560d1ad47e8a946a3c33c7a;hpb=ee9183741485112c084467779cf0b05e23eeed05;p=collectd.git diff --git a/contrib/php-collection/definitions.php b/contrib/php-collection/definitions.php index cb3e803e..c84aabea 100644 --- a/contrib/php-collection/definitions.php +++ b/contrib/php-collection/definitions.php @@ -386,6 +386,18 @@ function load_graph_definitions($logarithmic = false, $tinylegend = false) { 'GPRINT:avg:AVERAGE:%4.1lf Avg,', 'GPRINT:max:MAX:%4.1lf Max,', 'GPRINT:avg:LAST:%4.1lf Last\l'); + $GraphDefs['conntrack'] = array( + '-v', 'Entries', + 'DEF:avg={file}:entropy:AVERAGE', + 'DEF:min={file}:entropy:MIN', + 'DEF:max={file}:entropy:MAX', + "AREA:max#$HalfBlue", + "AREA:min#$Canvas", + "LINE1:avg#$FullBlue:Count", + 'GPRINT:min:MIN:%4.0lf Min,', + 'GPRINT:avg:AVERAGE:%4.0lf Avg,', + 'GPRINT:max:MAX:%4.0lf Max,', + 'GPRINT:avg:LAST:%4.0lf Last\l'); $GraphDefs['entropy'] = array( '-v', 'Bits', 'DEF:avg={file}:entropy:AVERAGE', @@ -1578,6 +1590,7 @@ function load_graph_definitions($logarithmic = false, $tinylegend = false) { $MetaGraphDefs['tcp_connections'] = 'meta_graph_tcp_connections'; $MetaGraphDefs['dns_opcode'] = 'meta_graph_dns_event'; $MetaGraphDefs['dns_qtype'] = 'meta_graph_dns_event'; + $MetaGraphDefs['dns_qtype_cached'] = 'meta_graph_dns_event'; $MetaGraphDefs['dns_rcode'] = 'meta_graph_dns_event'; $MetaGraphDefs['dns_request'] = 'meta_graph_dns_event'; $MetaGraphDefs['dns_resolver'] = 'meta_graph_dns_event'; @@ -1745,7 +1758,10 @@ function meta_graph_memory($host, $plugin, $plugin_instance, $type, $type_instan $sources[] = array('name'=>$inst, 'file'=>$file); } - return collectd_draw_meta_stack($opts, $sources); + if ($plugin == 'bind') + return collectd_draw_meta_line($opts, $sources); + else + return collectd_draw_meta_stack($opts, $sources); } function meta_graph_vs_threads($host, $plugin, $plugin_instance, $type, $type_instances, $opts = array()) {