1 files changed, 49 insertions, 1 deletions
diff --git a/plugin/apache.php b/plugin/apache.php
index 667d052..73fe70e 100644
--- a/plugin/apache.php
+++ b/plugin/apache.php
@@ -68,7 +68,31 @@ switch ($obj->args['type']) {
                require_once 'type/GenericStacked.class.php';
                $obj = new Type_GenericStacked($CONFIG);
                $obj->data_sources = array('count');
-                $obj->order = array('open', 'idle_cleanup', 'finishing', 'logging', 'closing', 'dnslookup', 'keepalive', 'sending', 'reading', 'starting', 'waiting');
+                $obj->order = array(
+                        'open',
+                        'idle_cleanup',
+                        'finishing',
+                        'logging',
+                        'closing',
+                        'dnslookup',
+                        'keepalive',
+                        'sending',
+                        'reading',
+                        'starting',
+                        'waiting',
+                        'connect',
+                        'hard_error',
+                        'close',
+                        'response_end',
+                        'write',
+                        'response_start',
+                        'handle_request',
+                        'read_post',
+                        'request_end',
+                        'read',
+                        'request_start',
+                );
                $obj->ds_names = array(
                        'open'      => 'Open (empty)',
                        'waiting'   => 'Waiting',
@@ -81,6 +105,18 @@ switch ($obj->args['type']) {
                        'logging'   => 'Logging',
                        'finishing' => 'Finishing',
                        'idle_cleanup' => 'Idle cleanup',
+                        'connect'        => 'Connect (empty)',
+                        'close'          => 'Close',
+                        'hard_error'     => 'Hard error',
+                        'read'           => 'Read',
+                        'read_post'      => 'Read POST',
+                        'write'          => 'Write',
+                        'handle_request' => 'Handle request',
+                        'request_start'  => 'Request start',
+                        'request_end'    => 'Request end',
+                        'response_start' => 'Response start',
+                        'response_end'   => 'Response end',
                );
                $obj->colors = array(
                        'open'      => 'e0e0e0',
@@ -94,6 +130,18 @@ switch ($obj->args['type']) {
                        'logging'   => 'a000a0',
                        'finishing' => '008080',
                        'idle_cleanup' => 'ffff00',
+                        'connect'        => 'e0e0e0',
+                        'close'          => '008080',
+                        'hard_error'     => 'ff0000',
+                        'read'           => 'ff00ff',
+                        'read_post'      => '00e000',
+                        'write'          => '000080',
+                        'handle_request' => '0080ff',
+                        'request_start'  => 'ffb000',
+                        'request_end'    => '0000ff',
+                        'response_start' => 'ffff00',
+                        'response_end'   => 'a000a0',
                );
                $obj->rrd_title = sprintf('Webserver Scoreboard%s',
                        !empty($obj->args['pinstance']) ? ' ('.$obj->args['pinstance'].')' : '');

diff --git a/plugin/apache.php b/plugin/apache.php index 667d052..73fe70e 100644 --- a/plugin/apache.php +++ b/plugin/apache.php
@@ -68,7 +68,31 @@ switch ($obj->args['type']) {
68	require_once 'type/GenericStacked.class.php';	68	require_once 'type/GenericStacked.class.php';
69	$obj = new Type_GenericStacked($CONFIG);	69	$obj = new Type_GenericStacked($CONFIG);
70	$obj->data_sources = array('count');	70	$obj->data_sources = array('count');
71	$obj->order = array('open', 'idle_cleanup', 'finishing', 'logging', 'closing', 'dnslookup', 'keepalive', 'sending', 'reading', 'starting', 'waiting');	71	$obj->order = array(
		72	'open',
		73	'idle_cleanup',
		74	'finishing',
		75	'logging',
		76	'closing',
		77	'dnslookup',
		78	'keepalive',
		79	'sending',
		80	'reading',
		81	'starting',
		82	'waiting',
		83
		84	'connect',
		85	'hard_error',
		86	'close',
		87	'response_end',
		88	'write',
		89	'response_start',
		90	'handle_request',
		91	'read_post',
		92	'request_end',
		93	'read',
		94	'request_start',
		95	);
72	$obj->ds_names = array(	96	$obj->ds_names = array(
73	'open' => 'Open (empty)',	97	'open' => 'Open (empty)',
74	'waiting' => 'Waiting',	98	'waiting' => 'Waiting',
@@ -81,6 +105,18 @@ switch ($obj->args['type']) {
81	'logging' => 'Logging',	105	'logging' => 'Logging',
82	'finishing' => 'Finishing',	106	'finishing' => 'Finishing',
83	'idle_cleanup' => 'Idle cleanup',	107	'idle_cleanup' => 'Idle cleanup',
		108
		109	'connect' => 'Connect (empty)',
		110	'close' => 'Close',
		111	'hard_error' => 'Hard error',
		112	'read' => 'Read',
		113	'read_post' => 'Read POST',
		114	'write' => 'Write',
		115	'handle_request' => 'Handle request',
		116	'request_start' => 'Request start',
		117	'request_end' => 'Request end',
		118	'response_start' => 'Response start',
		119	'response_end' => 'Response end',
84	);	120	);
85	$obj->colors = array(	121	$obj->colors = array(
86	'open' => 'e0e0e0',	122	'open' => 'e0e0e0',
@@ -94,6 +130,18 @@ switch ($obj->args['type']) {
94	'logging' => 'a000a0',	130	'logging' => 'a000a0',
95	'finishing' => '008080',	131	'finishing' => '008080',
96	'idle_cleanup' => 'ffff00',	132	'idle_cleanup' => 'ffff00',
		133
		134	'connect' => 'e0e0e0',
		135	'close' => '008080',
		136	'hard_error' => 'ff0000',
		137	'read' => 'ff00ff',
		138	'read_post' => '00e000',
		139	'write' => '000080',
		140	'handle_request' => '0080ff',
		141	'request_start' => 'ffb000',
		142	'request_end' => '0000ff',
		143	'response_start' => 'ffff00',
		144	'response_end' => 'a000a0',
97	);	145	);
98	$obj->rrd_title = sprintf('Webserver Scoreboard%s',	146	$obj->rrd_title = sprintf('Webserver Scoreboard%s',
99	!empty($obj->args['pinstance']) ? ' ('.$obj->args['pinstance'].')' : '');	147	!empty($obj->args['pinstance']) ? ' ('.$obj->args['pinstance'].')' : '');