From 5784b2fcc28da70b6fd6900a711b9c2265cca181 Mon Sep 17 00:00:00 2001 From: hugetoad Date: Sun, 25 Aug 2002 14:24:41 +0000 Subject: Basic support for service availability. git-svn-id: svn://svn.zabbix.com/trunk@464 97f52cf1-0a1b-0410-bd0e-c28be96e8082 --- frontends/php/include/config.inc.php | 18 ++++-- frontends/php/report2.php | 10 ++-- frontends/php/services.php | 109 ++++++++++++++++++----------------- frontends/php/srv_status.php | 12 ++-- frontends/php/tr_comments.php | 10 ++-- 5 files changed, 85 insertions(+), 74 deletions(-) (limited to 'frontends/php') diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php index 45fdfa6a..a1cc9637 100644 --- a/frontends/php/include/config.inc.php +++ b/frontends/php/include/config.inc.php @@ -13,6 +13,7 @@ return $row["cnt"]; } +/* Rewrite ! */ function check_right($right,$permission,$id) { global $USER_DETAILS; @@ -1460,7 +1461,7 @@ where h.hostid=i.hostid and i.itemid=f.itemid and f.triggerid=$triggerid"; return DBexecute($sql); } - function add_service($name,$triggerid,$linktrigger,$algorithm) + function add_service($serviceid,$name,$triggerid,$linktrigger,$algorithm) { if( isset($linktrigger)&&($linktrigger=="on") ) { @@ -1477,7 +1478,16 @@ where h.hostid=i.hostid and i.itemid=f.itemid and f.triggerid=$triggerid"; $sql="insert into services (name,status,algorithm) values ('$name',0,$algorithm)"; } $result=DBexecute($sql); - return DBinsert_id($result,"services","serviceid"); + if(!$result) + { + return FALSE; + } + $id=DBinsert_id($result,"services","serviceid"); + if(isset($serviceid)) + { + add_service_link($id,$serviceid,1); + } + return $id; } function add_host_to_services($hostid,$serviceid) @@ -1486,8 +1496,8 @@ where h.hostid=i.hostid and i.itemid=f.itemid and f.triggerid=$triggerid"; $result=DBselect($sql); while($row=DBfetch($result)) { - $serviceid2=add_service($row["description"],$row["triggerid"],"on",0); - add_service_link($serviceid2,$serviceid,0); + $serviceid2=add_service($serviceid,$row["description"],$row["triggerid"],"on",0); +// add_service_link($serviceid2,$serviceid,0); } return 1; } diff --git a/frontends/php/report2.php b/frontends/php/report2.php index d7b47b6b..0033eb1e 100644 --- a/frontends/php/report2.php +++ b/frontends/php/report2.php @@ -21,12 +21,12 @@ { continue; } - if( isset($hostid) && ($hostid == $row["hostid"]) ) + if( isset($HTTP_GET_VARS["hostid"]) && ($HTTP_GET_VARS["hostid"] == $row["hostid"]) ) { echo "["; } echo "".$row["host"].""; - if(isset($hostid) && ($hostid == $row["hostid"]) ) + if(isset($HTTP_GET_VARS["hostid"]) && ($HTTP_GET_VARS["hostid"] == $row["hostid"]) ) { echo "]"; } @@ -38,14 +38,14 @@ ?> "; - $result=DBselect("select host from hosts where hostid=$hostid"); + $result=DBselect("select host from hosts where hostid=".$HTTP_GET_VARS["hostid"]); $row=DBfetch($result); show_table_header($row["host"]); - $result=DBselect("select distinct h.hostid,h.host,t.triggerid,t.expression,t.description,t.value from triggers t,hosts h,items i,functions f where f.itemid=i.itemid and h.hostid=i.hostid and t.status=0 and t.triggerid=f.triggerid and h.hostid=$hostid and h.status in (0,2) and i.status=0 order by h.host, t.description"); + $result=DBselect("select distinct h.hostid,h.host,t.triggerid,t.expression,t.description,t.value from triggers t,hosts h,items i,functions f where f.itemid=i.itemid and h.hostid=i.hostid and t.status=0 and t.triggerid=f.triggerid and h.hostid=".$HTTP_GET_VARS["hostid"]." and h.status in (0,2) and i.status=0 order by h.host, t.description"); echo ""; echo ""; echo ""; diff --git a/frontends/php/services.php b/frontends/php/services.php index 7e75eae9..95bb0ac9 100644 --- a/frontends/php/services.php +++ b/frontends/php/services.php @@ -16,45 +16,45 @@ ?> "; $col=0; - if(isset($serviceid)) + if(isset($HTTP_GET_VARS["serviceid"])) { echo ""; - $service=get_service_by_serviceid($serviceid); + $service=get_service_by_serviceid($HTTP_GET_VARS["serviceid"]); echo ""; if($service["algorithm"] == SERVICE_ALGORITHM_NONE) { @@ -96,15 +96,15 @@ } while($row=DBfetch($result)) { - if(!isset($serviceid) && service_has_parent($row["serviceid"])) + if(!isset($HTTP_GET_VARS["serviceid"]) && service_has_parent($row["serviceid"])) { continue; } - if(isset($serviceid) && service_has_no_this_parent($serviceid,$row["serviceid"])) + if(isset($HTTP_GET_VARS["serviceid"]) && service_has_no_this_parent($HTTP_GET_VARS["serviceid"],$row["serviceid"])) { continue; } - if(isset($serviceid)&&($serviceid==$row["serviceid"])) + if(isset($HTTP_GET_VARS["serviceid"])&&($HTTP_GET_VARS["serviceid"]==$row["serviceid"])) { echo ""; } @@ -114,7 +114,7 @@ else { echo ""; } } $childs=get_num_of_service_childs($row["serviceid"]); - if(isset($serviceid)) + if(isset($HTTP_GET_VARS["serviceid"])) { echo ""; } @@ -141,7 +141,7 @@ ?> "; @@ -151,7 +151,7 @@ echo ""; echo ""; echo ""; - $sql="select linkid,servicedownid,serviceupid,soft from services_links where serviceupid=$serviceid or servicedownid=$serviceid"; + $sql="select linkid,servicedownid,serviceupid,soft from services_links where serviceupid=".$HTTP_GET_VARS["serviceid"]." or servicedownid=".$HTTP_GET_VARS["serviceid"]; $result=DBselect($sql); $col=0; while($row=DBfetch($result)) @@ -170,7 +170,7 @@ { echo ""; } - echo ""; + echo ""; echo ""; } echo "
Description
".$service["name"]."
- ".$row["name"]." [$childs]Soft/hard linkActions
SoftDeleteDelete
"; @@ -178,9 +178,9 @@ ?> "; @@ -197,10 +197,10 @@ echo "New service"; show_table2_v_delimiter(); - echo "
"; - if(isset($serviceid)) + echo ""; + if(isset($HTTP_GET_VARS["serviceid"])) { - echo ""; + echo ""; } echo "Name"; show_table2_h_delimiter(); @@ -211,9 +211,9 @@ show_table2_h_delimiter(); $result=DBselect("select triggerid,description from triggers order by description"); echo ""; } @@ -256,7 +256,7 @@ { $description_=expand_trigger_description($triggerid_); } - if(isset($triggerid) && ($triggerid==$triggerid_)) + if(isset($HTTP_GET_VARS["triggerid"]) && ($HTTP_GET_VARS["triggerid"]==$triggerid_)) { echo "