summaryrefslogtreecommitdiffstats
path: root/frontends/php/include/items.inc.php
diff options
context:
space:
mode:
authoralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2006-09-14 11:06:27 +0000
committeralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2006-09-14 11:06:27 +0000
commit8755f9643aba3cffc5320321618fbe8e7b78b73b (patch)
tree61f79790fee2222b1d3c5c3cd3faf09c9de8f168 /frontends/php/include/items.inc.php
parent220a18752f8fefdd0af90ccd17cc045c2e6ae1a6 (diff)
downloadzabbix-8755f9643aba3cffc5320321618fbe8e7b78b73b.tar.gz
zabbix-8755f9643aba3cffc5320321618fbe8e7b78b73b.tar.xz
zabbix-8755f9643aba3cffc5320321618fbe8e7b78b73b.zip
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
Diffstat (limited to 'frontends/php/include/items.inc.php')
-rw-r--r--frontends/php/include/items.inc.php15
1 files changed, 9 insertions, 6 deletions
diff --git a/frontends/php/include/items.inc.php b/frontends/php/include/items.inc.php
index a62e78c1..9acdeb93 100644
--- a/frontends/php/include/items.inc.php
+++ b/frontends/php/include/items.inc.php
@@ -168,12 +168,13 @@
}
// first add mother item
+ $itemid=get_dbid("items","itemid");
$result=DBexecute("insert into items".
- " (description,key_,hostid,delay,history,nextcheck,status,type,".
+ " (itemid,description,key_,hostid,delay,history,nextcheck,status,type,".
"snmp_community,snmp_oid,value_type,trapper_hosts,snmp_port,units,multiplier,".
"delta,snmpv3_securityname,snmpv3_securitylevel,snmpv3_authpassphrase,".
"snmpv3_privpassphrase,formula,trends,logtimefmt,valuemapid,templateid)".
- " values (".zbx_dbstr($description).",".zbx_dbstr($key).",$hostid,$delay,$history,0,
+ " values ($itemid,".zbx_dbstr($description).",".zbx_dbstr($key).",$hostid,$delay,$history,0,
$status,$type,".zbx_dbstr($snmp_community).",".zbx_dbstr($snmp_oid).",$value_type,".
zbx_dbstr($trapper_hosts).",$snmp_port,".zbx_dbstr($units).",$multiplier,$delta,".
zbx_dbstr($snmpv3_securityname).",$snmpv3_securitylevel,".
@@ -184,11 +185,10 @@
if(!$result)
return $result;
- $itemid = DBinsert_id($result,"items","itemid");
-
foreach($applications as $appid)
{
- DBexecute("insert into items_applications (itemid,applicationid) values(".$itemid.",".$appid.")");
+ $itemappid=get_dbid("items_applications","itemappid");
+ DBexecute("insert into items_applications (itemappid,itemid,applicationid) values($itemappid,".$itemid.",".$appid.")");
}
info("Added new item ".$host["host"].":$key");
@@ -321,7 +321,10 @@
$result = DBexecute("delete from items_applications where itemid=$itemid");
foreach($applications as $appid)
- DBexecute("insert into items_applications (itemid,applicationid) values(".$itemid.",".$appid.")");
+ {
+ $itemappid=get_dbid("items_applications","itemappid");
+ DBexecute("insert into items_applications (itemappid,itemid,applicationid) values($itemappid,".$itemid.",".$appid.")");
+ }
$result=DBexecute(
"update items set description=".zbx_dbstr($description).",key_=".zbx_dbstr($key).",".