diff -ru zabbix-2.4.1/database/ibm_db2/schema.sql zabbix-2.4.1_extended/database/ibm_db2/schema.sql
--- zabbix-2.4.1/database/ibm_db2/schema.sql 2014-10-08 08:59:36.000000000 +0200
+++ zabbix-2.4.1_extended/database/ibm_db2/schema.sql 2014-10-28 17:14:09.235102599 +0100
@@ -213,7 +213,7 @@
type integer WITH DEFAULT '0' NOT NULL,
useip integer WITH DEFAULT '1' NOT NULL,
ip varchar(64) WITH DEFAULT '127.0.0.1' NOT NULL,
- dns varchar(64) WITH DEFAULT '' NOT NULL,
+ dns varchar(255) WITH DEFAULT '' NOT NULL,
port varchar(64) WITH DEFAULT '10050' NOT NULL,
bulk integer WITH DEFAULT '1' NOT NULL,
PRIMARY KEY (interfaceid)
diff -ru zabbix-2.4.1/database/mysql/schema.sql zabbix-2.4.1_extended/database/mysql/schema.sql
--- zabbix-2.4.1/database/mysql/schema.sql 2014-10-08 08:59:36.000000000 +0200
+++ zabbix-2.4.1_extended/database/mysql/schema.sql 2014-10-28 17:12:55.156451458 +0100
@@ -213,7 +213,7 @@
`type` integer DEFAULT '0' NOT NULL,
`useip` integer DEFAULT '1' NOT NULL,
`ip` varchar(64) DEFAULT '127.0.0.1' NOT NULL,
- `dns` varchar(64) DEFAULT '' NOT NULL,
+ `dns` varchar(255) DEFAULT '' NOT NULL,
`port` varchar(64) DEFAULT '10050' NOT NULL,
`bulk` integer DEFAULT '1' NOT NULL,
PRIMARY KEY (interfaceid)
diff -ru zabbix-2.4.1/database/oracle/schema.sql zabbix-2.4.1_extended/database/oracle/schema.sql
--- zabbix-2.4.1/database/oracle/schema.sql 2014-10-08 08:59:36.000000000 +0200
+++ zabbix-2.4.1_extended/database/oracle/schema.sql 2014-10-28 17:15:03.308579211 +0100
@@ -213,7 +213,7 @@
type number(10) DEFAULT '0' NOT NULL,
useip number(10) DEFAULT '1' NOT NULL,
ip nvarchar2(64) DEFAULT '127.0.0.1' ,
- dns nvarchar2(64) DEFAULT '' ,
+ dns nvarchar2(255) DEFAULT '' ,
port nvarchar2(64) DEFAULT '10050' ,
bulk number(10) DEFAULT '1' NOT NULL,
PRIMARY KEY (interfaceid)
diff -ru zabbix-2.4.1/database/postgresql/schema.sql zabbix-2.4.1_extended/database/postgresql/schema.sql
--- zabbix-2.4.1/database/postgresql/schema.sql 2014-10-08 08:59:36.000000000 +0200
+++ zabbix-2.4.1_extended/database/postgresql/schema.sql 2014-10-28 17:15:13.029665009 +0100
@@ -213,7 +213,7 @@
type integer DEFAULT '0' NOT NULL,
useip integer DEFAULT '1' NOT NULL,
ip varchar(64) DEFAULT '127.0.0.1' NOT NULL,
- dns varchar(64) DEFAULT '' NOT NULL,
+ dns varchar(255) DEFAULT '' NOT NULL,
port varchar(64) DEFAULT '10050' NOT NULL,
bulk integer DEFAULT '1' NOT NULL,
PRIMARY KEY (interfaceid)
diff -ru zabbix-2.4.1/database/sqlite3/schema.sql zabbix-2.4.1_extended/database/sqlite3/schema.sql
--- zabbix-2.4.1/database/sqlite3/schema.sql 2014-10-08 08:59:36.000000000 +0200
+++ zabbix-2.4.1_extended/database/sqlite3/schema.sql 2014-10-28 17:15:25.823777981 +0100
@@ -213,7 +213,7 @@
type integer DEFAULT '0' NOT NULL,
useip integer DEFAULT '1' NOT NULL,
ip varchar(64) DEFAULT '127.0.0.1' NOT NULL,
- dns varchar(64) DEFAULT '' NOT NULL,
+ dns varchar(255) DEFAULT '' NOT NULL,
port varchar(64) DEFAULT '10050' NOT NULL,
bulk integer DEFAULT '1' NOT NULL,
PRIMARY KEY (interfaceid)
diff -ru zabbix-2.4.1/frontends/php/include/defines.inc.php zabbix-2.4.1_extended/frontends/php/include/defines.inc.php
--- zabbix-2.4.1/frontends/php/include/defines.inc.php 2014-10-08 08:59:00.000000000 +0200
+++ zabbix-2.4.1_extended/frontends/php/include/defines.inc.php 2014-10-28 17:31:43.119356366 +0100
@@ -792,7 +792,7 @@
define('ZBX_PREG_PARAMS', '(['.ZBX_PREG_PRINT.']+?)?');
define('ZBX_PREG_NUMBER', '([\-+]?[0-9]+[.]?[0-9]*['.ZBX_BYTE_SUFFIXES.ZBX_TIME_SUFFIXES.']?)');
define('ZBX_PREG_DEF_FONT_STRING', '/^[0-9\.:% ]+$/');
-define('ZBX_PREG_DNS_FORMAT', '([0-9a-zA-Z_\.\-$]|\{\$?'.ZBX_PREG_MACRO_NAME.'\})*');
+define('ZBX_PREG_DNS_FORMAT', '([0-9a-zA-Z_\.\-$]|\{\$?'.ZBX_PREG_MACRO_NAME.'\}|^service:jmx:.+)*');
define('ZBX_PREG_HOST_FORMAT', ZBX_PREG_INTERNAL_NAMES);
define('ZBX_PREG_MACRO_NAME_FORMAT', '(\{[A-Z\.]+\})');
define('ZBX_PREG_EXPRESSION_USER_MACROS', '(\{\$'.ZBX_PREG_MACRO_NAME.'\})');
diff -ru zabbix-2.4.1/frontends/php/include/schema.inc.php zabbix-2.4.1_extended/frontends/php/include/schema.inc.php
--- zabbix-2.4.1/frontends/php/include/schema.inc.php 2014-10-08 08:59:00.000000000 +0200
+++ zabbix-2.4.1_extended/frontends/php/include/schema.inc.php 2014-10-28 17:11:26.164671873 +0100
@@ -968,7 +968,7 @@
'dns' => array(
'null' => false,
'type' => DB::FIELD_TYPE_CHAR,
- 'length' => 64,
+ 'length' => 255,
'default' => '',
),
'port' => array(
diff -ru zabbix-2.4.1/frontends/php/include/views/js/configuration.host.edit.js.php zabbix-2.4.1_extended/frontends/php/include/views/js/configuration.host.edit.js.php
--- zabbix-2.4.1/frontends/php/include/views/js/configuration.host.edit.js.php 2014-10-08 08:59:00.000000000 +0200
+++ zabbix-2.4.1_extended/frontends/php/include/views/js/configuration.host.edit.js.php 2014-10-28 17:10:06.620977771 +0100
@@ -13,7 +13,7 @@
-
+
|
diff -ru zabbix-2.4.1/include/db.h zabbix-2.4.1_extended/include/db.h
--- zabbix-2.4.1/include/db.h 2014-10-08 08:58:58.000000000 +0200
+++ zabbix-2.4.1_extended/include/db.h 2014-10-28 17:17:40.081948774 +0100
@@ -91,7 +91,7 @@
#define HOST_IPMI_PASSWORD_LEN 20
#define HOST_IPMI_PASSWORD_LEN_MAX (HOST_IPMI_PASSWORD_LEN + 1)
-#define INTERFACE_DNS_LEN 64
+#define INTERFACE_DNS_LEN 255
#define INTERFACE_DNS_LEN_MAX (INTERFACE_DNS_LEN + 1)
#define INTERFACE_IP_LEN 64
#define INTERFACE_IP_LEN_MAX (INTERFACE_IP_LEN + 1)
diff -ru zabbix-2.4.1/src/libs/zbxdbhigh/dbschema.c zabbix-2.4.1_extended/src/libs/zbxdbhigh/dbschema.c
--- zabbix-2.4.1/src/libs/zbxdbhigh/dbschema.c 2014-10-08 08:59:36.000000000 +0200
+++ zabbix-2.4.1_extended/src/libs/zbxdbhigh/dbschema.c 2014-10-28 17:19:17.080522732 +0100
@@ -269,7 +269,7 @@
{"type", "0", NULL, NULL, 0, ZBX_TYPE_INT, ZBX_NOTNULL | ZBX_PROXY, 0},
{"useip", "1", NULL, NULL, 0, ZBX_TYPE_INT, ZBX_NOTNULL | ZBX_PROXY, 0},
{"ip", "127.0.0.1", NULL, NULL, 64, ZBX_TYPE_CHAR, ZBX_NOTNULL | ZBX_PROXY, 0},
- {"dns", "", NULL, NULL, 64, ZBX_TYPE_CHAR, ZBX_NOTNULL | ZBX_PROXY, 0},
+ {"dns", "", NULL, NULL, 255, ZBX_TYPE_CHAR, ZBX_NOTNULL | ZBX_PROXY, 0},
{"port", "10050", NULL, NULL, 64, ZBX_TYPE_CHAR, ZBX_NOTNULL | ZBX_PROXY, 0},
{"bulk", "1", NULL, NULL, 0, ZBX_TYPE_INT, ZBX_NOTNULL | ZBX_PROXY, 0},
{0}
@@ -1761,7 +1761,7 @@
type integer DEFAULT '0' NOT NULL,\n\
useip integer DEFAULT '1' NOT NULL,\n\
ip varchar(64) DEFAULT '127.0.0.1' NOT NULL,\n\
-dns varchar(64) DEFAULT '' NOT NULL,\n\
+dns varchar(255) DEFAULT '' NOT NULL,\n\
port varchar(64) DEFAULT '10050' NOT NULL,\n\
bulk integer DEFAULT '1' NOT NULL,\n\
PRIMARY KEY (interfaceid)\n\
diff -ru zabbix-2.4.1/src/zabbix_java/src/com/zabbix/gateway/JMXItemChecker.java zabbix-2.4.1_extended/src/zabbix_java/src/com/zabbix/gateway/JMXItemChecker.java
--- zabbix-2.4.1/src/zabbix_java/src/com/zabbix/gateway/JMXItemChecker.java 2014-10-08 08:58:58.000000000 +0200
+++ zabbix-2.4.1_extended/src/zabbix_java/src/com/zabbix/gateway/JMXItemChecker.java 2014-10-28 17:55:36.480242938 +0100
@@ -57,7 +57,12 @@
String conn = request.getString(JSON_TAG_CONN);
int port = request.getInt(JSON_TAG_PORT);
- url = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://" + conn + ":" + port + "/jmxrmi");
+ //allow to specify non-standard JMX service URL
+ if (conn.toLowerCase().startsWith("service:jmx:")){
+ url = new JMXServiceURL(conn);
+ }else{
+ url = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://" + conn + ":" + port + "/jmxrmi");
+ }
jmxc = null;
mbsc = null;
diff -ru zabbix-2.4.1/upgrades/dbpatches/2.0/ibm_db2/patch.sql zabbix-2.4.1_extended/upgrades/dbpatches/2.0/ibm_db2/patch.sql
--- zabbix-2.4.1/upgrades/dbpatches/2.0/ibm_db2/patch.sql 2014-10-08 08:59:41.000000000 +0200
+++ zabbix-2.4.1_extended/upgrades/dbpatches/2.0/ibm_db2/patch.sql 2014-10-28 17:21:53.640469764 +0100
@@ -1521,7 +1521,7 @@
type integer WITH DEFAULT '0' NOT NULL,
useip integer WITH DEFAULT '1' NOT NULL,
ip varchar(39) WITH DEFAULT '127.0.0.1' NOT NULL,
- dns varchar(64) WITH DEFAULT '' NOT NULL,
+ dns varchar(255) WITH DEFAULT '' NOT NULL,
port varchar(64) WITH DEFAULT '10050' NOT NULL,
PRIMARY KEY (interfaceid)
)
diff -ru zabbix-2.4.1/upgrades/dbpatches/2.0/mysql/patch.sql zabbix-2.4.1_extended/upgrades/dbpatches/2.0/mysql/patch.sql
--- zabbix-2.4.1/upgrades/dbpatches/2.0/mysql/patch.sql 2014-10-08 08:59:41.000000000 +0200
+++ zabbix-2.4.1_extended/upgrades/dbpatches/2.0/mysql/patch.sql 2014-10-28 17:22:17.799618124 +0100
@@ -732,7 +732,7 @@
type integer DEFAULT '0' NOT NULL,
useip integer DEFAULT '1' NOT NULL,
ip varchar(39) DEFAULT '127.0.0.1' NOT NULL,
- dns varchar(64) DEFAULT '' NOT NULL,
+ dns varchar(255) DEFAULT '' NOT NULL,
port varchar(64) DEFAULT '10050' NOT NULL,
PRIMARY KEY (interfaceid)
) ENGINE=InnoDB;
diff -ru zabbix-2.4.1/upgrades/dbpatches/2.0/oracle/patch.sql zabbix-2.4.1_extended/upgrades/dbpatches/2.0/oracle/patch.sql
--- zabbix-2.4.1/upgrades/dbpatches/2.0/oracle/patch.sql 2014-10-08 08:59:41.000000000 +0200
+++ zabbix-2.4.1_extended/upgrades/dbpatches/2.0/oracle/patch.sql 2014-10-28 17:22:35.384726480 +0100
@@ -665,7 +665,7 @@
type number(10) DEFAULT '0' NOT NULL,
useip number(10) DEFAULT '1' NOT NULL,
ip nvarchar2(39) DEFAULT '127.0.0.1' ,
- dns nvarchar2(64) DEFAULT '' ,
+ dns nvarchar2(255) DEFAULT '' ,
port nvarchar2(64) DEFAULT '10050' ,
PRIMARY KEY (interfaceid)
);
diff -ru zabbix-2.4.1/upgrades/dbpatches/2.0/postgresql/patch.sql zabbix-2.4.1_extended/upgrades/dbpatches/2.0/postgresql/patch.sql
--- zabbix-2.4.1/upgrades/dbpatches/2.0/postgresql/patch.sql 2014-10-08 08:59:41.000000000 +0200
+++ zabbix-2.4.1_extended/upgrades/dbpatches/2.0/postgresql/patch.sql 2014-10-28 17:22:55.515850903 +0100
@@ -742,7 +742,7 @@
type integer DEFAULT '0' NOT NULL,
useip integer DEFAULT '1' NOT NULL,
ip varchar(39) DEFAULT '127.0.0.1' NOT NULL,
- dns varchar(64) DEFAULT '' NOT NULL,
+ dns varchar(255) DEFAULT '' NOT NULL,
port varchar(64) DEFAULT '10050' NOT NULL,
PRIMARY KEY (interfaceid)
);
|