- added housekeeping procedure for table sessions (Alexei)

 - changed width=\"X%\" to width=X% in *.php (Alexei)
 - Status of a trigger will blink if it was changes during last 60
 seconds (Alexei)
 - Zabbix daemons to update triggers.lastchange when triggers.values
 is changed (Alexei)
 - added misc/init.d/debian/zabbix-[suckerd|trapperd] (Alexei)
 - removed misc/init.d/debian/zabbix-server (Alexei)
 - send_email() will timeout after 10 seconds (Alexei)
 - DBadd_alarm() renamed to add_alarm() (Alexei)
 - support for SCO OpenServer (Alexei). Thanks to Alexender Kirhenstein.
 - ./configure will correctly define socklen_t (Alexei)
 - <center> changed to <div align=center> (Alexei)
 - reason of problem in screen IT Services (Alexei)
 - added frontends.php/helpdesk.php (Alexei)
 - added tables: problems, problems_comments,categories (Alexei)
 - added "...#form" to button Change in form Configuration of Users (Alexei)
 - "Just for information" changed to "Information" (Alexei)
 - fixed ./configure to correctly find zlib (Alexei)
 - housekeeping to delete no more than HousekeepingFrequency*3600 records
 from table history and history_str at once (MySQL only) (Alexei)


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

1 files changed, 28 insertions, 2 deletions

diff --git a/frontends/php/srv_status.php b/frontends/php/srv_status.php
index dd052214..eb873bf2 100644
--- a/frontends/php/srv_status.php
+++ b/frontends/php/srv_status.php
@@ -3,7 +3,7 @@
 	$page["file"] = "srv_status.php";
 
 	include "include/config.inc.php";
-	show_header($page["title"],10,0);
+	show_header($page["title"],30,0);
 ?>
  
 <?
@@ -15,7 +15,8 @@
 	echo "\n";
 	echo "<tr>";
 	echo "<td><b>Service</b></td>";
-	echo "<td width=\"10%\"><b>Status</b></td>";
+	echo "<td width=10%><b>Status</b></td>";
+	echo "<td width=20%><b>Reason</b></td>";
 	echo "</tr>";
 	echo "\n";
 	$col=0;
@@ -25,6 +26,7 @@
 		$service=get_service_by_serviceid($serviceid);
 		echo "<td><b><a href=\"srv_status.php?serviceid=".$service["serviceid"]."\">".$service["name"]."</a></b></td>";
 		echo "<td>".get_service_status_description($service["status"])."</td>";
+		echo "<td>&nbsp;</td>";
 		echo "</tr>"; 
 		$col++;
 	}
@@ -90,6 +92,30 @@
 			}
 		}
 		echo "<td>".get_service_status_description($row["status"])."</td>";
+		if($row["status"]==0)
+		{
+			echo "<td>-</td>";
+		}
+		else
+		{
+			echo "<td>";
+			$sql="select s.triggerid,s.serviceid from services s, triggers t where s.status>0 and s.triggerid is not NULL and t.triggerid=s.triggerid order by s.status desc,t.description";
+			$result2=DBselect($sql);
+			while($row2=DBfetch($result2))
+			{
+				if(does_service_depend_on_the_service($row["serviceid"],$row2["serviceid"]))
+				{
+					$trigger=get_trigger_by_triggerid($row2["triggerid"]);
+					$description=$trigger["description"];
+					if( strstr($description,"%s"))
+					{
+						$description=expand_trigger_description($row2["triggerid"]);
+					}
+					echo "<li><a href=\"alarms.php?triggerid=".$row2["triggerid"]."\">$description</a></li>";
+				}
+			}
+			echo "</td>";
+		}
 		echo "</tr>"; 
 	}
 	echo "</table>";