zabbix-2.0.4-vine_path.patch 8.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960
  1. diff -uNr zabbix-2.0.4.orig/database/ibm_db2/data.sql zabbix-2.0.4/database/ibm_db2/data.sql
  2. --- zabbix-2.0.4.orig/database/ibm_db2/data.sql 2012-12-08 20:11:15.000000000 +0900
  3. +++ zabbix-2.0.4/database/ibm_db2/data.sql 2013-02-06 20:56:23.270120472 +0900
  4. @@ -822,7 +822,7 @@
  5. INSERT INTO users_groups (id,usrgrpid,userid) values ('4','7','1');
  6. INSERT INTO users_groups (id,usrgrpid,userid) values ('2','8','2');
  7. INSERT INTO scripts (scriptid,name,command,host_access,usrgrpid,groupid,description,confirmation,type,execute_on) values ('1','Ping','/bin/ping -c 3 {HOST.CONN} 2>&1','2',NULL,NULL,'','','0','1');
  8. -INSERT INTO scripts (scriptid,name,command,host_access,usrgrpid,groupid,description,confirmation,type,execute_on) values ('2','Traceroute','/usr/bin/traceroute {HOST.CONN} 2>&1','2',NULL,NULL,'','','0','1');
  9. +INSERT INTO scripts (scriptid,name,command,host_access,usrgrpid,groupid,description,confirmation,type,execute_on) values ('2','Traceroute','/bin/traceroute {HOST.CONN} 2>&1','2',NULL,NULL,'','','0','1');
  10. INSERT INTO scripts (scriptid,name,command,host_access,usrgrpid,groupid,description,confirmation,type,execute_on) values ('3','Detect operating system','sudo /usr/bin/nmap -O {HOST.CONN} 2>&1','2','7',NULL,'','','0','1');
  11. INSERT INTO actions (actionid,name,eventsource,evaltype,status,esc_period,def_shortdata,def_longdata,recovery_msg,r_shortdata,r_longdata) values ('2','Auto discovery. Linux servers.','1','0','1','0','','','0','','');
  12. INSERT INTO actions (actionid,name,eventsource,evaltype,status,esc_period,def_shortdata,def_longdata,recovery_msg,r_shortdata,r_longdata) values ('3','Report problems to Zabbix administrators','0','0','1','3600','{TRIGGER.STATUS}: {TRIGGER.NAME}','Trigger: {TRIGGER.NAME}
  13. diff -uNr zabbix-2.0.4.orig/database/mysql/data.sql zabbix-2.0.4/database/mysql/data.sql
  14. --- zabbix-2.0.4.orig/database/mysql/data.sql 2012-12-08 20:11:15.000000000 +0900
  15. +++ zabbix-2.0.4/database/mysql/data.sql 2013-02-06 20:58:56.554492484 +0900
  16. @@ -801,7 +801,7 @@
  17. INSERT INTO `users_groups` (`id`,`usrgrpid`,`userid`) values ('4','7','1');
  18. INSERT INTO `users_groups` (`id`,`usrgrpid`,`userid`) values ('2','8','2');
  19. INSERT INTO `scripts` (`scriptid`,`name`,`command`,`host_access`,`usrgrpid`,`groupid`,`description`,`confirmation`,`type`,`execute_on`) values ('1','Ping','/bin/ping -c 3 {HOST.CONN} 2>&1','2',NULL,NULL,'','','0','1');
  20. -INSERT INTO `scripts` (`scriptid`,`name`,`command`,`host_access`,`usrgrpid`,`groupid`,`description`,`confirmation`,`type`,`execute_on`) values ('2','Traceroute','/usr/bin/traceroute {HOST.CONN} 2>&1','2',NULL,NULL,'','','0','1');
  21. +INSERT INTO `scripts` (`scriptid`,`name`,`command`,`host_access`,`usrgrpid`,`groupid`,`description`,`confirmation`,`type`,`execute_on`) values ('2','Traceroute','/bin/traceroute {HOST.CONN} 2>&1','2',NULL,NULL,'','','0','1');
  22. INSERT INTO `scripts` (`scriptid`,`name`,`command`,`host_access`,`usrgrpid`,`groupid`,`description`,`confirmation`,`type`,`execute_on`) values ('3','Detect operating system','sudo /usr/bin/nmap -O {HOST.CONN} 2>&1','2','7',NULL,'','','0','1');
  23. INSERT INTO `actions` (`actionid`,`name`,`eventsource`,`evaltype`,`status`,`esc_period`,`def_shortdata`,`def_longdata`,`recovery_msg`,`r_shortdata`,`r_longdata`) values ('2','Auto discovery. Linux servers.','1','0','1','0','','','0','','');
  24. INSERT INTO `actions` (`actionid`,`name`,`eventsource`,`evaltype`,`status`,`esc_period`,`def_shortdata`,`def_longdata`,`recovery_msg`,`r_shortdata`,`r_longdata`) values ('3','Report problems to Zabbix administrators','0','0','1','3600','{TRIGGER.STATUS}: {TRIGGER.NAME}','Trigger: {TRIGGER.NAME}\r\nTrigger status: {TRIGGER.STATUS}\r\nTrigger severity: {TRIGGER.SEVERITY}\r\nTrigger URL: {TRIGGER.URL}\r\n\r\nItem values:\r\n\r\n1. {ITEM.NAME1} ({HOST.NAME1}:{ITEM.KEY1}): {ITEM.VALUE1}\r\n2. {ITEM.NAME2} ({HOST.NAME2}:{ITEM.KEY2}): {ITEM.VALUE2}\r\n3. {ITEM.NAME3} ({HOST.NAME3}:{ITEM.KEY3}): {ITEM.VALUE3}','1','{TRIGGER.STATUS}: {TRIGGER.NAME}','Trigger: {TRIGGER.NAME}\r\nTrigger status: {TRIGGER.STATUS}\r\nTrigger severity: {TRIGGER.SEVERITY}\r\nTrigger URL: {TRIGGER.URL}\r\n\r\nItem values:\r\n\r\n1. {ITEM.NAME1} ({HOST.NAME1}:{ITEM.KEY1}): {ITEM.VALUE1}\r\n2. {ITEM.NAME2} ({HOST.NAME2}:{ITEM.KEY2}): {ITEM.VALUE2}\r\n3. {ITEM.NAME3} ({HOST.NAME3}:{ITEM.KEY3}): {ITEM.VALUE3}');
  25. diff -uNr zabbix-2.0.4.orig/database/oracle/data.sql zabbix-2.0.4/database/oracle/data.sql
  26. --- zabbix-2.0.4.orig/database/oracle/data.sql 2012-12-08 20:11:15.000000000 +0900
  27. +++ zabbix-2.0.4/database/oracle/data.sql 2013-02-06 20:58:14.780390039 +0900
  28. @@ -2405,7 +2405,7 @@
  29. INSERT INTO scripts (scriptid,name,command,host_access,usrgrpid,groupid,description,confirmation,type,execute_on) values ('1','Ping','/bin/ping -c 3 {HOST.CONN} 2>&1','2',NULL,NULL,'','','0','1')
  30. /
  31. -INSERT INTO scripts (scriptid,name,command,host_access,usrgrpid,groupid,description,confirmation,type,execute_on) values ('2','Traceroute','/usr/bin/traceroute {HOST.CONN} 2>&1','2',NULL,NULL,'','','0','1')
  32. +INSERT INTO scripts (scriptid,name,command,host_access,usrgrpid,groupid,description,confirmation,type,execute_on) values ('2','Traceroute','/bin/traceroute {HOST.CONN} 2>&1','2',NULL,NULL,'','','0','1')
  33. /
  34. INSERT INTO scripts (scriptid,name,command,host_access,usrgrpid,groupid,description,confirmation,type,execute_on) values ('3','Detect operating system','sudo /usr/bin/nmap -O {HOST.CONN} 2>&1','2','7',NULL,'','','0','1')
  35. diff -uNr zabbix-2.0.4.orig/database/postgresql/data.sql zabbix-2.0.4/database/postgresql/data.sql
  36. --- zabbix-2.0.4.orig/database/postgresql/data.sql 2012-12-08 20:11:15.000000000 +0900
  37. +++ zabbix-2.0.4/database/postgresql/data.sql 2013-02-06 20:57:49.166328216 +0900
  38. @@ -823,7 +823,7 @@
  39. INSERT INTO users_groups (id,usrgrpid,userid) values ('4','7','1');
  40. INSERT INTO users_groups (id,usrgrpid,userid) values ('2','8','2');
  41. INSERT INTO scripts (scriptid,name,command,host_access,usrgrpid,groupid,description,confirmation,type,execute_on) values ('1','Ping','/bin/ping -c 3 {HOST.CONN} 2>&1','2',NULL,NULL,'','','0','1');
  42. -INSERT INTO scripts (scriptid,name,command,host_access,usrgrpid,groupid,description,confirmation,type,execute_on) values ('2','Traceroute','/usr/bin/traceroute {HOST.CONN} 2>&1','2',NULL,NULL,'','','0','1');
  43. +INSERT INTO scripts (scriptid,name,command,host_access,usrgrpid,groupid,description,confirmation,type,execute_on) values ('2','Traceroute','/bin/traceroute {HOST.CONN} 2>&1','2',NULL,NULL,'','','0','1');
  44. INSERT INTO scripts (scriptid,name,command,host_access,usrgrpid,groupid,description,confirmation,type,execute_on) values ('3','Detect operating system','sudo /usr/bin/nmap -O {HOST.CONN} 2>&1','2','7',NULL,'','','0','1');
  45. INSERT INTO actions (actionid,name,eventsource,evaltype,status,esc_period,def_shortdata,def_longdata,recovery_msg,r_shortdata,r_longdata) values ('2','Auto discovery. Linux servers.','1','0','1','0','','','0','','');
  46. INSERT INTO actions (actionid,name,eventsource,evaltype,status,esc_period,def_shortdata,def_longdata,recovery_msg,r_shortdata,r_longdata) values ('3','Report problems to Zabbix administrators','0','0','1','3600','{TRIGGER.STATUS}: {TRIGGER.NAME}','Trigger: {TRIGGER.NAME}
  47. diff -uNr zabbix-2.0.4.orig/database/sqlite3/data.sql zabbix-2.0.4/database/sqlite3/data.sql
  48. --- zabbix-2.0.4.orig/database/sqlite3/data.sql 2012-12-08 20:11:15.000000000 +0900
  49. +++ zabbix-2.0.4/database/sqlite3/data.sql 2013-02-06 20:57:32.060287129 +0900
  50. @@ -823,7 +823,7 @@
  51. INSERT INTO users_groups (id,usrgrpid,userid) values ('4','7','1');
  52. INSERT INTO users_groups (id,usrgrpid,userid) values ('2','8','2');
  53. INSERT INTO scripts (scriptid,name,command,host_access,usrgrpid,groupid,description,confirmation,type,execute_on) values ('1','Ping','/bin/ping -c 3 {HOST.CONN} 2>&1','2',NULL,NULL,'','','0','1');
  54. -INSERT INTO scripts (scriptid,name,command,host_access,usrgrpid,groupid,description,confirmation,type,execute_on) values ('2','Traceroute','/usr/bin/traceroute {HOST.CONN} 2>&1','2',NULL,NULL,'','','0','1');
  55. +INSERT INTO scripts (scriptid,name,command,host_access,usrgrpid,groupid,description,confirmation,type,execute_on) values ('2','Traceroute','/bin/traceroute {HOST.CONN} 2>&1','2',NULL,NULL,'','','0','1');
  56. INSERT INTO scripts (scriptid,name,command,host_access,usrgrpid,groupid,description,confirmation,type,execute_on) values ('3','Detect operating system','sudo /usr/bin/nmap -O {HOST.CONN} 2>&1','2','7',NULL,'','','0','1');
  57. INSERT INTO actions (actionid,name,eventsource,evaltype,status,esc_period,def_shortdata,def_longdata,recovery_msg,r_shortdata,r_longdata) values ('2','Auto discovery. Linux servers.','1','0','1','0','','','0','','');
  58. INSERT INTO actions (actionid,name,eventsource,evaltype,status,esc_period,def_shortdata,def_longdata,recovery_msg,r_shortdata,r_longdata) values ('3','Report problems to Zabbix administrators','0','0','1','3600','{TRIGGER.STATUS}: {TRIGGER.NAME}','Trigger: {TRIGGER.NAME}