- improvements to services calculation algorithms (Artem)

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

1 files changed, 15 insertions, 12 deletions

diff --git a/frontends/php/chart_sla.php b/frontends/php/chart_sla.php
index a4943a6b..5759bbeb 100644
--- a/frontends/php/chart_sla.php
+++ b/frontends/php/chart_sla.php
@@ -45,10 +45,13 @@ include_once "include/page_header.php";
 
 	$denyed_hosts = get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_ONLY,PERM_MODE_LT);
 	
-	if( !($service = DBfetch(DBselect("select s.* from services s left join triggers t on s.triggerid=t.triggerid ".
-		" left join functions f on t.triggerid=f.triggerid left join items i on f.itemid=i.itemid ".
-		" where (i.hostid is NULL or i.hostid not in (".$denyed_hosts.")) ".
-		" and s.serviceid=".$_REQUEST["serviceid"]
+	if( !($service = DBfetch(DBselect('SELECT s.* '.
+					' FROM services s '.
+						' LEFT JOIN triggers t ON s.triggerid=t.triggerid '.
+						' LEFT JOIN functions f ON t.triggerid=f.triggerid '.
+						' LEFT JOIN items i ON f.itemid=i.itemid '.
+					' WHERE (i.hostid is NULL or i.hostid not in ('.$denyed_hosts.')) '.
+						' AND s.serviceid='.$_REQUEST['serviceid']
 		))))
 	{
 		access_deny();
@@ -74,21 +77,21 @@ include_once "include/page_header.php";
 	ImageFilledRectangle($im,0,0,$sizeX,$sizeY,ImageColorAllocate($im,120,200,120));
 
 	$now=time(NULL);
-	$period_start=$now-7*24*3600;
+	$period_start=$now-7*86400;
 	$period_end=$now;
 	$stat=calculate_service_availability($_REQUEST["serviceid"],$period_start,$period_end);
-		
+
 	$problem=$stat["problem"];
 	$ok=$stat["ok"];
 
-// showen percentage period
-	$show_period = 20; 
+// Percentage to show
+	$percentage = 20;
 	
-	$p=min($problem,$show_period);
-	$g=max($service["goodsla"]-(100-$show_period),0);
+	$p=min($problem,$percentage);
+	$g=max($service["goodsla"]-(100 - $percentage),0);
 
-	ImageFilledRectangle($im,$sizeX-$sizeX*$p/$show_period,1,$sizeX-2,$sizeY-2,ImageColorAllocate($im,200,120,120));
-	ImageLine($im,$sizeX*$g/$show_period,1,$sizeX*$g/$show_period,$sizeY-1,$yellow);
+	ImageFilledRectangle($im,$sizeX-$sizeX*$p/$percentage,1,$sizeX-2,$sizeY-2,ImageColorAllocate($im,200,120,120));
+	ImageLine($im,$sizeX*$g/$percentage,1,$sizeX*$g/$percentage,$sizeY-1,$yellow);
 
 	ImageRectangle($im,0,0,$sizeX-1,$sizeY-1,$black);