improoved draft version of httpmonitoring

git-svn-id: svn://svn.zabbix.com/trunk@3777 97f52cf1-0a1b-0410-bd0e-c28be96e8082

1 files changed, 101 insertions, 14 deletions

diff --git a/frontends/php/httpdetails.php b/frontends/php/httpdetails.php
index cc324eba..5617ffef 100644
--- a/frontends/php/httpdetails.php
+++ b/frontends/php/httpdetails.php
@@ -26,6 +26,7 @@
 
         $page["title"] = "S_DETAILS_OF_SCENARIO";
         $page["file"] = "httpdetails.php";
+	define('ZBX_PAGE_DO_REFRESH', 1);
 
 include_once "include/page_header.php";
 
@@ -45,7 +46,7 @@ include_once "include/page_header.php";
 
 	$accessible_hosts = get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_WRITE,null,null,$ZBX_CURNODEID);
 
-	if(!($httptest_data = DBfetch(DBselect('select ht.httptestid from httptest ht, applications a '.
+	if(!($httptest_data = DBfetch(DBselect('select ht.* from httptest ht, applications a '.
 		' where a.hostid in ('.$accessible_hosts.') and a.applicationid=ht.applicationid '.
 		' and ht.httptestid='.$_REQUEST['httptestid']))))
 	{
@@ -55,39 +56,125 @@ include_once "include/page_header.php";
 ?>
 <?php
 	$lnkCancel = new CLink(S_CANCEL,'httpmon.php'.url_param('groupid').url_param('hostid'));
-	show_table_header(S_DETAILS_OF_SCENARIO_BIG.' "'.bold($accessible_hosts['name']).'"',$lnkCancel);
+	show_table_header(S_DETAILS_OF_SCENARIO_BIG.' "'.bold($httptest_data['name']).'" - '.
+		date(S_DATE_FORMAT_YMDHMS,$httptest_data['lastcheck']),$lnkCancel);
 
 // TABLE
 	$table  = new CTableInfo();
-	$table->SetHeader(array(S_STEP, 'Lastcheck', 'Speed', 'Time', 'Response code', 'Status'));
+	$table->SetHeader(array(S_STEP, S_SPEED_PER_SECONDS, S_RESPONSE_TIME, S_RESPONSE_CODE, S_STATUS));
+
+	$items = array();
+	$total_data = array( HTTPSTEP_ITEM_TYPE_IN => null, HTTPSTEP_ITEM_TYPE_TIME => null );
+
+	$color = array(
+		'current' => 1,
+		1 => array('color' => 'Red', 		'next' => '2'),
+		2  => array('color' => 'Green',		'next' => '3'),
+		3  => array('color' => 'Blue', 		'next' => '4'),
+		4  => array('color' => 'Yellow', 	'next' => '5'),
+		5  => array('color' => 'Cyan', 		'next' => '6'),
+		6  => array('color' => 'Gray',		'next' => '7'),
+		7  => array('color' => 'Dark Red',	'next' => '8'),
+		8  => array('color' => 'Dark Green',	'next' => '9'),
+		9  => array('color' => 'Dark Blue', 	'next' => '10'),
+		10 => array('color' => 'Dark Yellow', 	'next' => '11'),
+		11 => array('color' => 'Black',	 	'next' => '1')
+		);
 
 	$db_httpsteps = DBselect('select * from httpstep where httptestid='.$httptest_data['httptestid'].' order by no');
 	while($httpstep_data = DBfetch($db_httpsteps))
 	{
-		$information = array(
-			bold($httpstep_data['name']) 
-			);
+		$db_items = DBselect('select i.*, hi.type as httpitem_type from items i, httpstepitem hi '.
+			' where hi.itemid=i.itemid and hi.httpstepid='.$httpstep_data['httpstepid']);
+		while($item_data = DBfetch($db_items))
+		{
+			$httpstep_data['item_data'][$item_data['httpitem_type']] = $item_data;
+
+			if (!in_array($item_data['httpitem_type'], array(HTTPSTEP_ITEM_TYPE_IN, HTTPSTEP_ITEM_TYPE_TIME))) continue;
+
+			if(isset($total_data[$item_data['httpitem_type']]))
+			{
+				$total_data[$item_data['httpitem_type']]['lastvalue'] += $item_data['lastvalue'];
+			}
+			else
+			{
+				$total_data[$item_data['httpitem_type']] = $item_data;
+			}
+			$items[$item_data['httpitem_type']][] = array(
+				'itemid' => $item_data['itemid'],
+				'color' => $color[$color['current'] = $color[$color['current']]['next']]['color'],
+				'sortorder' => 'no');
+		}
+
+		$status['msg'] = S_OK;
+		$status['style'] = 'enabled';
+
+		if($httptest_data['lastfailedstep'] > 0)
+		{
+			if($httptest_data['lastfailedstep'] == ($httpstep_data['no'] + 1))
+			{
+				$status['msg'] = S_FAIL;
+				$status['style'] = 'disabled';
+			}
+			else if($httptest_data['lastfailedstep'] < ($httpstep_data['no'] + 1))
+			{
+				$status['msg'] = S_UNKNOWN;
+				$status['style'] = 'unknown';
+			}
+		}
+
+		$table->AddRow(array(
+			$httpstep_data['name'],
+			format_lastvalue($httpstep_data['item_data'][HTTPSTEP_ITEM_TYPE_IN]),
+			format_lastvalue($httpstep_data['item_data'][HTTPSTEP_ITEM_TYPE_TIME]),
+			format_lastvalue($httpstep_data['item_data'][HTTPSTEP_ITEM_TYPE_RSPCODE]),
+			new CSpan($status['msg'], $status['style'])
+			));
+	}
 
-		$chart1 = $chart2 = $chart3 = '123.9 KBps';
+	$status['msg'] = S_OK;
+	$status['style'] = 'enabled';
 
-		$table->AddRow(array($information, '10/12/07 12:30', $chart1, $chart2, $chart3, new CSpan('Failed','disabled')));
+	if($httptest_data['lastfailedstep'] > 0)
+	{
+		$status['msg'] = S_FAIL;
+		$status['style'] = 'disabled';
 	}
-	$table->AddRow(array(bold('CONCLUSION'), 'Unknown', $chart1, $chart2, $chart3, new CSpan('Faild on step X fom Z', 'enabled')));
 
-	$table->Show();
+	$table->AddRow(array(
+		new CCol(S_TOTAL_BIG, 'bold'), 
+		format_lastvalue($total_data[HTTPSTEP_ITEM_TYPE_IN]),
+		format_lastvalue($total_data[HTTPSTEP_ITEM_TYPE_TIME]),
+		SPACE,
+		new CSpan($status['msg'], $status['style'])
+		));
 
-		$chart1 = $chart2 = $chart3 = new CImg('chart3.php?period=3600&from=0&name=KEY_NAME&height=150');
+	$table->Show();
 
 	echo BR;
 
 	show_table_header('History'.' "'.bold($accessible_hosts['name']).'"');
 	$form = new CTableInfo();
 
-	$form->AddRow(array(bold('Speed per seconds') , new CCol($chart1, 'center')));
-	$form->AddRow(array(bold('Response time') , new CCol($chart1,'center')));
+	$form->AddRow(array(bold(S_SPEED_PER_SECONDS) , new CCol(
+		new CImg('chart3.php?period=3600&from=0'.
+			url_param($httptest_data['name'], false,'name').
+			url_param(150, false,'height').
+			url_param($items[HTTPSTEP_ITEM_TYPE_IN], false, 'items').
+			url_param(GRAPH_TYPE_STACKED, false, 'graphtype')
+			)
+		, 'center')));
+
+	$form->AddRow(array(bold(S_RESPONSE_TIME) , new CCol(
+		new CImg('chart3.php?period=3600&from=0'.
+			url_param($httptest_data['name'], false,'name').
+			url_param(150, false,'height').
+			url_param($items[HTTPSTEP_ITEM_TYPE_TIME], false, 'items').
+			url_param(GRAPH_TYPE_STACKED, false, 'graphtype'))
+		,'center')));
 
 	$form->Show();
-	navigation_bar("#",$to_save_request);
+	navigation_bar("#", array('httptestid'));
 ?>
 <?php