Support of node change in ZABBIX server.

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

2 files changed, 1 insertions, 40 deletions

diff --git a/create/data/change_nodeid.sh b/create/data/change_nodeid.sh
deleted file mode 100755
index 17ed77d7..00000000
--- a/create/data/change_nodeid.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-password=""
-user="root"
-dbname="zabbix"
-nodeid=$1
-
-echo "update config set configid=configid+0000100000000000000*$nodeid"|mysql --user="$user" --password="$password" $dbname
-echo "update media_type set mediatypeid=mediatypeid+0000100000000000000*$nodeid"|mysql --user="$user" --password="$password" $dbname
-echo "update users set userid=userid+0000100000000000000*$nodeid"|mysql --user="$user" --password="$password" $dbname
-echo "update usrgrp set usrgrpid=usrgrpid+0000100000000000000*$nodeid"|mysql --user="$user" --password="$password" $dbname
-echo "update rights set rightid=rightid+0000100000000000000*$nodeid"|mysql --user="$user" --password="$password" $dbname
-echo "update rights set groupid=groupid+0000100000000000000*$nodeid"|mysql --user="$user" --password="$password" $dbname
-echo "update hosts set hostid=hostid+0000100000000000000*$nodeid"|mysql --user="$user" --password="$password" $dbname
-echo "update groups set groupid=groupid+0000100000000000000*$nodeid"|mysql --user="$user" --password="$password" $dbname
-echo "update hosts_groups set hostgroupid=hostgroupid+0000100000000000000*$nodeid"|mysql --user="$user" --password="$password" $dbname
-echo "update hosts_groups set hostid=hostid+0000100000000000000*$nodeid"|mysql --user="$user" --password="$password" $dbname
-echo "update hosts_groups set groupid=groupid+0000100000000000000*$nodeid"|mysql --user="$user" --password="$password" $dbname
-echo "update items set itemid=itemid+0000100000000000000*$nodeid"|mysql --user="$user" --password="$password" $dbname
-echo "update items set hostid=hostid+0000100000000000000*$nodeid"|mysql --user="$user" --password="$password" $dbname
-echo "update functions set functionid=functionid+0000100000000000000*$nodeid"|mysql --user="$user" --password="$password" $dbname
-echo "update functions set itemid=itemid+0000100000000000000*$nodeid"|mysql --user="$user" --password="$password" $dbname
-echo "update functions set triggerid=triggerid+0000100000000000000*$nodeid"|mysql --user="$user" --password="$password" $dbname
-echo "update triggers set triggerid=triggerid+0000100000000000000*$nodeid"|mysql --user="$user" --password="$password" $dbname
-echo "update actions set actionid=actionid+0000100000000000000*$nodeid"|mysql --user="$user" --password="$password" $dbname
-echo "update actions set userid=userid+0000100000000000000*$nodeid"|mysql --user="$user" --password="$password" $dbname
-echo "update media set mediaid=mediaid+0000100000000000000*$nodeid"|mysql --user="$user" --password="$password" $dbname
-echo "update media set userid=userid+0000100000000000000*$nodeid"|mysql --user="$user" --password="$password" $dbname
-echo "update media set mediatypeid=mediatypeid+0000100000000000000*$nodeid"|mysql --user="$user" --password="$password" $dbname
-echo "update images set imageid=imageid+0000100000000000000*$nodeid"|mysql --user="$user" --password="$password" $dbname
-
-echo "select concat(triggerid,'_',expression) from triggers"|mysql --user="$user" --password="$password" $dbname|grep -v concat >tmp
-for i in `cat tmp`; do
-	expression=`echo $i|cut -f2 -d"_"`
-	recid=`echo $i|cut -f1 -d"_"`
-	id=`echo $i|cut -f2 -d"{"|cut -f1 -d "}"`
-	newid=`echo "$id+0000100000000000000*$nodeid"|bc`
-	newexpression=`echo $expression|sed "s/{$id}/{$newid}/g"`
-	echo "update triggers set expression='$newexpression' where triggerid=$recid"|mysql --user="$user" $dbname --password="$password" 
-done
-rm tmp
diff --git a/create/schema/gen.pl b/create/schema/gen.pl
index 17847ac0..b3c14fca 100755
--- a/create/schema/gen.pl
+++ b/create/schema/gen.pl
@@ -46,7 +46,7 @@ local $output;
 %c=(	"type"		=>	"code",
 	"after"		=>	"\t{0}\n};\n",
 	"t_bigint"	=>	"ZBX_TYPE_UINT",
-	"t_id"		=>	"ZBX_TYPE_UINT",
+	"t_id"		=>	"ZBX_TYPE_ID",
 	"t_integer"	=>	"ZBX_TYPE_INT",
 	"t_time"	=>	"ZBX_TYPE_INT",
 	"t_serial"	=>	"ZBX_TYPE_UINT",