X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=contrib%2Fphp-collection%2Fdefinitions.php;h=7297d858e01d53d4318ab327d47bd9d0fb7567ed;hb=aac3a531403cfb5f9bde9915c9559555225d335b;hp=cb3e803e27f285649560d1ad47e8a946a3c33c7a;hpb=6a69db4d304118e11fd4bae9c761fc14674e4942;p=collectd.git

diff --git a/contrib/php-collection/definitions.php b/contrib/php-collection/definitions.php
index cb3e803e..7297d858 100644
--- a/contrib/php-collection/definitions.php
+++ b/contrib/php-collection/definitions.php
@@ -48,9 +48,9 @@ function load_graph_definitions($logarithmic = false, $tinylegend = false) {
 	$GraphDefs = array();
 	$GraphDefs['apache_bytes'] = array(
 		'-v', 'Bits/s',
-		'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,*',
@@ -68,9 +68,9 @@ function load_graph_definitions($logarithmic = false, $tinylegend = false) {
 		'GPRINT:avg_sum:LAST:(ca. %5.1lf%sB Total)\l');
 	$GraphDefs['apache_requests'] = array(
 		'-v', 'Requests/s',
-		'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',
 		"AREA:max#$HalfBlue",
 		"AREA:min#$Canvas",
 		"LINE1:avg#$FullBlue:Requests/s",
@@ -79,9 +79,9 @@ function load_graph_definitions($logarithmic = false, $tinylegend = false) {
 		'GPRINT:max:MAX:%6.2lf Max,',
 		'GPRINT:avg:LAST:%6.2lf Last');
 	$GraphDefs['apache_scoreboard'] = array(
-		'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',
 		"AREA:max#$HalfBlue",
 		"AREA:min#$Canvas",
 		"LINE1:avg#$FullBlue:Processes",
@@ -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()) {
@@ -2008,7 +2024,7 @@ function meta_graph_apache_scoreboard($host, $plugin, $plugin_instance, $type, $
 		if ($file == '')
 			continue;
 
-		$sources[] = array('name'=>$inst, 'file'=>$file, 'ds'=>'count');
+		$sources[] = array('name'=>$inst, 'file'=>$file, 'ds'=>'value');
 	}
 
 	return collectd_draw_meta_stack($opts, $sources);