Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/DEV-capside/release-3.9.0:6365-6370
/branches/DEV-extra-notification-data:6734-6746
/branches/DEV-odw-calculations:9016-9160
/branches/DEV-restapi-monitoringservers:9778
/branches/DEV-snmp-multi:7324-7376
/branches/US187:9403-9479
/branches/US198b:8875-8994
/branches/US310:9851-9873
/branches/enterprise/BRAN-3.14:6874,6882,6956
/branches/enterprise/DEV-professional:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647,9693,9699,9721,9814,9825,9857,9879,9881,9939,10002,10029,10038-10041,10070,10086,10093,10345,10347,10388,10407,10560-10562,10565,10568
/branches/nagvis-iframe:9764-9786
/branches/us168:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/US306-slaves:9804-9823
/commercial/branches/US307-network-map:9685-9837
+ /branches/DEV-capside/release-3.9.0:6365-6370
/branches/DEV-extra-notification-data:6734-6746
/branches/DEV-odw-calculations:9016-9160
/branches/DEV-restapi-monitoringservers:9778
/branches/DEV-snmp-multi:7324-7376
/branches/US187:9403-9479
/branches/US198b:8875-8994
/branches/US310:9851-9873
/branches/enterprise/BRAN-3.14:6874,6882,6956
/branches/enterprise/DEV-professional:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647,9693,9699,9721,9814,9825,9857,9879,9881,9939,10002,10029,10038-10041,10070,10086,10093,10345,10347,10388,10407,10560-10562,10565,10568,10571
/branches/nagvis-iframe:9764-9786
/branches/us168:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/US306-slaves:9804-9823
/commercial/branches/US307-network-map:9685-9837
Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES 2012-10-22 15:57:44 UTC (rev 10571)
+++ trunk/CHANGES 2012-10-22 16:02:43 UTC (rev 10572)
@@ -9,6 +9,8 @@
Search box in the main interface now also searches host descriptions
Amend keyword references from 'keyword_N' to 'kN_<KEYWORD>' within the configuration files
NOTICES:
+ Updated primary keys for nagios_hostchecks and snmptrapexceptions to BIGINT
+ - those tables will be truncated on upgrade
FIXES:
Fixed HH displaying breadcrumbs for host groups that user did not have permission for
Fixed apache configuration for redundancy, specifically removing apache_proxy_ssl.conf and replacing with apache_ssl.conf
Modified: trunk/opsview-core/bin/db_runtime
===================================================================
--- trunk/opsview-core/bin/db_runtime 2012-10-22 15:57:44 UTC (rev 10571)
+++ trunk/opsview-core/bin/db_runtime 2012-10-22 16:02:43 UTC (rev 10572)
@@ -326,6 +326,7 @@
INSERT INTO schema_version (major_release, version) VALUES ('3.15', '9');
INSERT INTO schema_version (major_release, version, created_at) VALUES ('20120925hstpths', 'install', NOW());
INSERT INTO schema_version (major_release, version, created_at) VALUES ('20121004hstdepth', 'install', NOW());
+ INSERT INTO schema_version (major_release, version, created_at) VALUES ('20121022bigints', 'install', NOW());
-- Nagios portion of runtime database
source $topdir/../bin/ndo_mysql.sql;
Modified: trunk/opsview-core/installer/upgradedb_runtime.pl
===================================================================
--- trunk/opsview-core/installer/upgradedb_runtime.pl 2012-10-22 15:57:44 UTC (rev 10571)
+++ trunk/opsview-core/installer/upgradedb_runtime.pl 2012-10-22 16:02:43 UTC (rev 10572)
@@ -1353,7 +1353,7 @@
unless (
$db->is_installed(
"20121022bigints",
- "Converting IDs to BIGINT (this could take some time)", "all"
+ "Converting IDs to BIGINT (this will truncate tables first)", "all"
)
)
{
@@ -1369,6 +1369,7 @@
my $info = $sth->fetchrow_hashref || { TYPE_NAME => '' };
unless ( $info->{TYPE_NAME} eq 'BIGINT' ) {
$db->print( "Converting $table...\n" );
+ $dbh->do( "TRUNCATE TABLE $table" );
$dbh->do(
"ALTER TABLE $table MODIFY COLUMN $column BIGINT UNSIGNED NOT NULL AUTO_INCREMENT"
);
