Fix overflow in freshness_threshold column (smallint) w/ DB IDO MySQL

fixes #9576

diff --git a/lib/db_ido_mysql/schema/mysql.sql b/lib/db_ido_mysql/schema/mysql.sql
index 7f6aa86726c624a8fbb452bddc5ac95ce7c4d866..0e61bce7e9acb4396f68373d93c9b9fef47d8e3d 100644 (file)
--- a/lib/db_ido_mysql/schema/mysql.sql
+++ b/lib/db_ido_mysql/schema/mysql.sql
@@ -666,7 +666,7 @@ CREATE TABLE IF NOT EXISTS icinga_hosts (
   high_flap_threshold double  default '0',
   process_performance_data smallint default 0,
   freshness_checks_enabled smallint default 0,
-  freshness_threshold smallint default 0,
+  freshness_threshold int default 0,
   passive_checks_enabled smallint default 0,
   event_handler_enabled smallint default 0,
   active_checks_enabled smallint default 0,
@@ -1160,7 +1160,7 @@ CREATE TABLE IF NOT EXISTS icinga_services (
   high_flap_threshold double  default '0',
   process_performance_data smallint default 0,
   freshness_checks_enabled smallint default 0,
-  freshness_threshold smallint default 0,
+  freshness_threshold int default 0,
   passive_checks_enabled smallint default 0,
   event_handler_enabled smallint default 0,
   active_checks_enabled smallint default 0,

diff --git a/lib/db_ido_mysql/schema/upgrade/2.4.0.sql b/lib/db_ido_mysql/schema/upgrade/2.4.0.sql
index d26564602ec8d69d13680bf1fdb6a7d33708633d..236eb1906a8f1da3fb13267466df58c90b612c09 100644 (file)
--- a/lib/db_ido_mysql/schema/upgrade/2.4.0.sql
+++ b/lib/db_ido_mysql/schema/upgrade/2.4.0.sql
@@ -7,6 +7,9 @@
 -- Please check http://docs.icinga.org for upgrading information!
 -- -----------------------------------------
 
+-- -----------------------------------------
+-- #9286 - zone tables
+-- -----------------------------------------
 
 ALTER TABLE icinga_endpoints ADD COLUMN zone_object_id bigint(20) unsigned DEFAULT '0';
 ALTER TABLE icinga_endpointstatus ADD COLUMN zone_object_id bigint(20) unsigned DEFAULT '0';
@@ -31,6 +34,13 @@ CREATE TABLE IF NOT EXISTS icinga_zonestatus (
 ) ENGINE=InnoDB COMMENT='Zone status';
 
 
+-- -----------------------------------------
+-- #9576 - freshness_threshold
+-- -----------------------------------------
+
+ALTER TABLE icinga_services MODIFY freshness_threshold int;
+ALTER TABLE icinga_hosts MODIFY freshness_threshold int;
+
 -- -----------------------------------------
 -- update dbversion
 -- -----------------------------------------