Initial integration of distributed monitoring.

Changes 3196:HEAD of branches/distributed


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

1 files changed, 14 insertions, 5 deletions

diff --git a/frontends/php/include/services.inc.php b/frontends/php/include/services.inc.php
index 80dbe883..96f35f2f 100644
--- a/frontends/php/include/services.inc.php
+++ b/frontends/php/include/services.inc.php
@@ -23,14 +23,16 @@
 	{
 		if(is_null($triggerid)) $triggerid = 'NULL';
 
-		$sql="insert into services (name,status,triggerid,algorithm,showsla,goodsla,sortorder)".
-			" values (".zbx_dbstr($name).",0,$triggerid,".zbx_dbstr($algorithm).",$showsla,".zbx_dbstr($goodsla).",$sortorder)";
+		$serviceid=get_dbid("services","serviceid");
+
+		$sql="insert into services (serviceid,name,status,triggerid,algorithm,showsla,goodsla,sortorder)".
+			" values ($serviceid,".zbx_dbstr($name).",0,$triggerid,".zbx_dbstr($algorithm).",$showsla,".zbx_dbstr($goodsla).",$sortorder)";
 		$result=DBexecute($sql);
 		if(!$result)
 		{
 			return FALSE;
 		}
-		return DBinsert_id($result,"services","serviceid");
+		return $serviceid;
 	}
 
 	function	update_service($serviceid,$name,$triggerid,$algorithm,$showsla,$goodsla,$sortorder)
@@ -156,8 +158,15 @@
 			return	false;
 		}
 
-		$sql="insert into services_links (servicedownid,serviceupid,soft) values ($servicedownid,$serviceupid,$softlink)";
-		return	dbexecute($sql);
+		$linkid=get_dbid("services_links","linkid");
+
+		$sql="insert into services_links (linkid,servicedownid,serviceupid,soft) values ($linkid,$servicedownid,$serviceupid,$softlink)";
+		$result=DBexecute($sql);
+
+		if(!$result)
+			return $result;
+
+		return $linkid;
 	}
 	function	update_service_link($linkid,$servicedownid,$serviceupid,$softlink)
 	{