Created
June 11, 2012 07:43
-
-
Save simonkowallik/2908937 to your computer and use it in GitHub Desktop.
ZBXNEXT-1170 Patch - Support for trigger expressions with more than 255 characters - Version 2.0.0 (Stable)
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- frontends/php/include/schema.inc.php.orig 2012-05-24 10:01:11.117073587 +0200 | |
+++ frontends/php/include/schema.inc.php 2012-05-24 10:01:35.909073589 +0200 | |
@@ -2197,13 +2197,13 @@ | |
'expression' => array( | |
'null' => false, | |
'type' => DB::FIELD_TYPE_CHAR, | |
- 'length' => 255, | |
+ 'length' => 1024, | |
'default' => '', | |
), | |
'description' => array( | |
'null' => false, | |
'type' => DB::FIELD_TYPE_CHAR, | |
- 'length' => 255, | |
+ 'length' => 1024, | |
'default' => '', | |
), | |
'url' => array( | |
@@ -3688,7 +3688,7 @@ | |
'expression' => array( | |
'null' => false, | |
'type' => DB::FIELD_TYPE_CHAR, | |
- 'length' => 255, | |
+ 'length' => 1024, | |
'default' => '', | |
), | |
'expression_type' => array( | |
--- database/mysql/schema.sql.orig 2012-05-24 10:00:49.749073589 +0200 | |
+++ database/mysql/schema.sql 2012-05-24 10:01:35.901073586 +0200 | |
@@ -471,8 +471,8 @@ | |
) ENGINE=InnoDB; | |
CREATE TABLE `triggers` ( | |
`triggerid` bigint unsigned NOT NULL, | |
- `expression` varchar(255) DEFAULT '' NOT NULL, | |
- `description` varchar(255) DEFAULT '' NOT NULL, | |
+ `expression` varchar(1024) DEFAULT '' NOT NULL, | |
+ `description` varchar(1024) DEFAULT '' NOT NULL, | |
`url` varchar(255) DEFAULT '' NOT NULL, | |
`status` integer DEFAULT '0' NOT NULL, | |
`value` integer DEFAULT '0' NOT NULL, | |
@@ -817,7 +817,7 @@ | |
CREATE TABLE `expressions` ( | |
`expressionid` bigint unsigned NOT NULL, | |
`regexpid` bigint unsigned NOT NULL, | |
- `expression` varchar(255) DEFAULT '' NOT NULL, | |
+ `expression` varchar(1024) DEFAULT '' NOT NULL, | |
`expression_type` integer DEFAULT '0' NOT NULL, | |
`exp_delimiter` varchar(1) DEFAULT '' NOT NULL, | |
`case_sensitive` integer DEFAULT '0' NOT NULL, | |
--- database/postgresql/schema.sql.orig 2012-05-24 10:01:00.445073579 +0200 | |
+++ database/postgresql/schema.sql 2012-05-24 10:01:35.905073588 +0200 | |
@@ -471,8 +471,8 @@ | |
); | |
CREATE TABLE triggers ( | |
triggerid bigint NOT NULL, | |
- expression varchar(255) DEFAULT '' NOT NULL, | |
- description varchar(255) DEFAULT '' NOT NULL, | |
+ expression varchar(1024) DEFAULT '' NOT NULL, | |
+ description varchar(1024) DEFAULT '' NOT NULL, | |
url varchar(255) DEFAULT '' NOT NULL, | |
status integer DEFAULT '0' NOT NULL, | |
value integer DEFAULT '0' NOT NULL, | |
@@ -817,7 +817,7 @@ | |
CREATE TABLE expressions ( | |
expressionid bigint NOT NULL, | |
regexpid bigint NOT NULL, | |
- expression varchar(255) DEFAULT '' NOT NULL, | |
+ expression varchar(1024) DEFAULT '' NOT NULL, | |
expression_type integer DEFAULT '0' NOT NULL, | |
exp_delimiter varchar(1) DEFAULT '' NOT NULL, | |
case_sensitive integer DEFAULT '0' NOT NULL, | |
--- src/libs/zbxdbhigh/dbschema.c.orig 2012-05-24 10:01:19.149073590 +0200 | |
+++ src/libs/zbxdbhigh/dbschema.c 2012-05-24 10:01:35.913073589 +0200 | |
@@ -538,8 +538,8 @@ | |
{"triggers", "triggerid", ZBX_SYNC, | |
{ | |
{"triggerid", NULL, NULL, 0, ZBX_TYPE_ID, ZBX_NOTNULL, 0}, | |
- {"expression", NULL, NULL, 255, ZBX_TYPE_CHAR, ZBX_NOTNULL | ZBX_SYNC, 0}, | |
- {"description", NULL, NULL, 255, ZBX_TYPE_CHAR, ZBX_NOTNULL | ZBX_SYNC, 0}, | |
+ {"expression", NULL, NULL, 1024, ZBX_TYPE_CHAR, ZBX_NOTNULL | ZBX_SYNC, 0}, | |
+ {"description", NULL, NULL, 1024, ZBX_TYPE_CHAR, ZBX_NOTNULL | ZBX_SYNC, 0}, | |
{"url", NULL, NULL, 255, ZBX_TYPE_CHAR, ZBX_NOTNULL | ZBX_SYNC, 0}, | |
{"status", NULL, NULL, 0, ZBX_TYPE_INT, ZBX_NOTNULL | ZBX_SYNC, 0}, | |
{"value", NULL, NULL, 0, ZBX_TYPE_INT, ZBX_NOTNULL | ZBX_SYNC, 0}, | |
@@ -920,7 +920,7 @@ | |
{ | |
{"expressionid", NULL, NULL, 0, ZBX_TYPE_ID, ZBX_NOTNULL, 0}, | |
{"regexpid", "regexps", "regexpid", 0, ZBX_TYPE_ID, ZBX_NOTNULL | ZBX_SYNC | ZBX_PROXY, ZBX_FK_CASCADE_DELETE}, | |
- {"expression", NULL, NULL, 255, ZBX_TYPE_CHAR, ZBX_NOTNULL | ZBX_SYNC | ZBX_PROXY, 0}, | |
+ {"expression", NULL, NULL, 1024, ZBX_TYPE_CHAR, ZBX_NOTNULL | ZBX_SYNC | ZBX_PROXY, 0}, | |
{"expression_type", NULL, NULL, 0, ZBX_TYPE_INT, ZBX_NOTNULL | ZBX_SYNC | ZBX_PROXY, 0}, | |
{"exp_delimiter", NULL, NULL, 1, ZBX_TYPE_CHAR, ZBX_NOTNULL | ZBX_SYNC | ZBX_PROXY, 0}, | |
{"case_sensitive", NULL, NULL, 0, ZBX_TYPE_INT, ZBX_NOTNULL | ZBX_SYNC | ZBX_PROXY, 0}, | |
@@ -1891,8 +1891,8 @@ | |
);\n\ | |
CREATE TABLE triggers (\n\ | |
triggerid bigint NOT NULL,\n\ | |
-expression varchar(255) WITH DEFAULT '' NOT NULL,\n\ | |
-description varchar(255) WITH DEFAULT '' NOT NULL,\n\ | |
+expression varchar(1024) WITH DEFAULT '' NOT NULL,\n\ | |
+description varchar(1024) WITH DEFAULT '' NOT NULL,\n\ | |
url varchar(255) WITH DEFAULT '' NOT NULL,\n\ | |
status integer WITH DEFAULT '0' NOT NULL,\n\ | |
value integer WITH DEFAULT '0' NOT NULL,\n\ | |
@@ -2237,7 +2237,7 @@ | |
CREATE TABLE expressions (\n\ | |
expressionid bigint NOT NULL,\n\ | |
regexpid bigint NOT NULL,\n\ | |
-expression varchar(255) WITH DEFAULT '' NOT NULL,\n\ | |
+expression varchar(1024) WITH DEFAULT '' NOT NULL,\n\ | |
expression_type integer WITH DEFAULT '0' NOT NULL,\n\ | |
exp_delimiter varchar(1) WITH DEFAULT '' NOT NULL,\n\ | |
case_sensitive integer WITH DEFAULT '0' NOT NULL,\n\ | |
@@ -3414,8 +3414,8 @@ | |
) ENGINE=InnoDB;\n\ | |
CREATE TABLE `triggers` (\n\ | |
`triggerid` bigint unsigned NOT NULL,\n\ | |
-`expression` varchar(255) DEFAULT '' NOT NULL,\n\ | |
-`description` varchar(255) DEFAULT '' NOT NULL,\n\ | |
+`expression` varchar(1024) DEFAULT '' NOT NULL,\n\ | |
+`description` varchar(1024) DEFAULT '' NOT NULL,\n\ | |
`url` varchar(255) DEFAULT '' NOT NULL,\n\ | |
`status` integer DEFAULT '0' NOT NULL,\n\ | |
`value` integer DEFAULT '0' NOT NULL,\n\ | |
@@ -3760,7 +3760,7 @@ | |
CREATE TABLE `expressions` (\n\ | |
`expressionid` bigint unsigned NOT NULL,\n\ | |
`regexpid` bigint unsigned NOT NULL,\n\ | |
-`expression` varchar(255) DEFAULT '' NOT NULL,\n\ | |
+`expression` varchar(1024) DEFAULT '' NOT NULL,\n\ | |
`expression_type` integer DEFAULT '0' NOT NULL,\n\ | |
`exp_delimiter` varchar(1) DEFAULT '' NOT NULL,\n\ | |
`case_sensitive` integer DEFAULT '0' NOT NULL,\n\ | |
@@ -4937,8 +4937,8 @@ | |
);\n\ | |
CREATE TABLE triggers (\n\ | |
triggerid number(20) NOT NULL,\n\ | |
-expression nvarchar2(255) DEFAULT '' ,\n\ | |
-description nvarchar2(255) DEFAULT '' ,\n\ | |
+expression nvarchar2(1024) DEFAULT '' ,\n\ | |
+description nvarchar2(1024) DEFAULT '' ,\n\ | |
url nvarchar2(255) DEFAULT '' ,\n\ | |
status number(10) DEFAULT '0' NOT NULL,\n\ | |
value number(10) DEFAULT '0' NOT NULL,\n\ | |
@@ -5283,7 +5283,7 @@ | |
CREATE TABLE expressions (\n\ | |
expressionid number(20) NOT NULL,\n\ | |
regexpid number(20) NOT NULL,\n\ | |
-expression nvarchar2(255) DEFAULT '' ,\n\ | |
+expression nvarchar2(1024) DEFAULT '' ,\n\ | |
expression_type number(10) DEFAULT '0' NOT NULL,\n\ | |
exp_delimiter nvarchar2(1) DEFAULT '' ,\n\ | |
case_sensitive number(10) DEFAULT '0' NOT NULL,\n\ | |
@@ -6532,8 +6532,8 @@ | |
);\n\ | |
CREATE TABLE triggers (\n\ | |
triggerid bigint NOT NULL,\n\ | |
-expression varchar(255) DEFAULT '' NOT NULL,\n\ | |
-description varchar(255) DEFAULT '' NOT NULL,\n\ | |
+expression varchar(1024) DEFAULT '' NOT NULL,\n\ | |
+description varchar(1024) DEFAULT '' NOT NULL,\n\ | |
url varchar(255) DEFAULT '' NOT NULL,\n\ | |
status integer DEFAULT '0' NOT NULL,\n\ | |
value integer DEFAULT '0' NOT NULL,\n\ | |
@@ -6878,7 +6878,7 @@ | |
CREATE TABLE expressions (\n\ | |
expressionid bigint NOT NULL,\n\ | |
regexpid bigint NOT NULL,\n\ | |
-expression varchar(255) DEFAULT '' NOT NULL,\n\ | |
+expression varchar(1024) DEFAULT '' NOT NULL,\n\ | |
expression_type integer DEFAULT '0' NOT NULL,\n\ | |
exp_delimiter varchar(1) DEFAULT '' NOT NULL,\n\ | |
case_sensitive integer DEFAULT '0' NOT NULL,\n\ | |
@@ -8055,8 +8055,8 @@ | |
);\n\ | |
CREATE TABLE triggers (\n\ | |
triggerid bigint NOT NULL,\n\ | |
-expression varchar(255) DEFAULT '' NOT NULL,\n\ | |
-description varchar(255) DEFAULT '' NOT NULL,\n\ | |
+expression varchar(1024) DEFAULT '' NOT NULL,\n\ | |
+description varchar(1024) DEFAULT '' NOT NULL,\n\ | |
url varchar(255) DEFAULT '' NOT NULL,\n\ | |
status integer DEFAULT '0' NOT NULL,\n\ | |
value integer DEFAULT '0' NOT NULL,\n\ | |
@@ -8401,7 +8401,7 @@ | |
CREATE TABLE expressions (\n\ | |
expressionid bigint NOT NULL,\n\ | |
regexpid bigint NOT NULL REFERENCES regexps (regexpid) ON DELETE CASCADE,\n\ | |
-expression varchar(255) DEFAULT '' NOT NULL,\n\ | |
+expression varchar(1024) DEFAULT '' NOT NULL,\n\ | |
expression_type integer DEFAULT '0' NOT NULL,\n\ | |
exp_delimiter varchar(1) DEFAULT '' NOT NULL,\n\ | |
case_sensitive integer DEFAULT '0' NOT NULL,\n\ | |
--- src/libs/zbxserver/expression.c.orig 2012-05-24 10:01:27.821073590 +0200 | |
+++ src/libs/zbxserver/expression.c 2012-05-24 10:01:35.917073589 +0200 | |
@@ -465,7 +465,7 @@ | |
const char *__function_name = "DCexpand_trigger_expression"; | |
char *tmp = NULL; | |
- size_t tmp_alloc = 256, tmp_offset = 0, l, r; | |
+ size_t tmp_alloc = 1025, tmp_offset = 0, l, r; | |
DC_FUNCTION function; | |
DC_ITEM item; | |
zbx_uint64_t functionid; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment