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/US539:12178-12182
/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,10481,10549,10560-10562,10565,10568,10571,10577,10622,10932,11025,11035,11360-11612,11798-11799,11920,12075-12076,12096,12189,12207,12232,12266,12288,12322,12334,12355,12372,12401-12406,12428,12491,12523,12539-12540,12544,12546,12555,12580,12583,12599-12600,12609,12611,12614-12615,12618,12624,12630-12631,12633,12643,12645-12646,12649,12653-12654,12657-12658,12660,12662-12663,12666,12668,12678-
12679,12681-12682,12685,12687,12691-12693,12697,12703,12721,12724-12725,12731-12732,12737-12739,12741,12743-12744,12746,12750,12754-12756,12759,12764-12765,12770,12772-12776,12784,12787-12788,12795,12797,12799-12800,12806,12810,12814,12816-12817,12822-12823,12827,12833,12838,12841,12843-12846,12848,12851-12853,12856,12858,12860-12861,12863,12867,12876,12879-12880,12883,13126-13127,13211
/branches/nagvis-iframe:9764-9786
/branches/opsview2runtime:10960-11258
/branches/opsview2runtime_xs:11279-11303
/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/BRAN-4.2:10944,11017
/commercial/branches/BRAN-4.3:12423-12426
/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/US539:12178-12182
/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,10481,10549,10560-10562,10565,10568,10571,10577,10622,10932,11025,11035,11360-11612,11798-11799,11920,12075-12076,12096,12189,12207,12232,12266,12288,12322,12334,12355,12372,12401-12406,12428,12491,12523,12539-12540,12544,12546,12555,12580,12583,12599-12600,12609,12611,12614-12615,12618,12624,12630-12631,12633,12643,12645-12646,12649,12653-12654,12657-12658,12660,12662-12663,12666,12668,12678-
12679,12681-12682,12685,12687,12691-12693,12697,12703,12721,12724-12725,12731-12732,12737-12739,12741,12743-12744,12746,12750,12754-12756,12759,12764-12765,12770,12772-12776,12784,12787-12788,12795,12797,12799-12800,12806,12810,12814,12816-12817,12822-12823,12827,12833,12838,12841,12843-12846,12848,12851-12853,12856,12858,12860-12861,12863,12867,12876,12879-12880,12883-12884,13126-13127,13211
/branches/nagvis-iframe:9764-9786
/branches/opsview2runtime:10960-11258
/branches/opsview2runtime_xs:11279-11303
/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/BRAN-4.2:10944,11017
/commercial/branches/BRAN-4.3:12423-12426
/commercial/branches/US306-slaves:9804-9823
/commercial/branches/US307-network-map:9685-9837
Modified: trunk/opsview-core/bin/db_opsview
===================================================================
--- trunk/opsview-core/bin/db_opsview 2013-08-15 20:18:18 UTC (rev 13306)
+++ trunk/opsview-core/bin/db_opsview 2013-08-15 20:23:13 UTC (rev 13307)
@@ -1209,6 +1209,8 @@
INSERT INTO metadata (name, value) VALUES ('uncommitted', 0);
INSERT INTO metadata (name, value) VALUES ('version', '2.8.19');
+ INSERT INTO metadata (name, value) VALUES ('last_housekeeping_time',UNIX_TIMESTAMP());
+ INSERT INTO metadata (name, value) VALUES ('housekeeping_duration','0');
INSERT INTO schema_version (major_release, version) VALUES ('2.9', '4');
INSERT INTO schema_version (major_release, version) VALUES ('2.10', '5');
INSERT INTO schema_version (major_release, version) VALUES ('2.11', '6');
@@ -1237,6 +1239,7 @@
INSERT INTO schema_version (major_release, version, created_at) VALUES ('20130612accesses', 'install', NOW());
INSERT INTO schema_version (major_release, version, created_at) VALUES ('20130814surv', 'install', NOW());
INSERT INTO schema_version (major_release, version, created_at) VALUES ('20130702nagvis', 'install', NOW());
+ INSERT INTO schema_version (major_release, version, created_at) VALUES ('20130710hkmd', 'install', NOW());
EOF
populate_db
Modified: trunk/opsview-core/installer/upgradedb_opsview.pl
===================================================================
--- trunk/opsview-core/installer/upgradedb_opsview.pl 2013-08-15 20:18:18 UTC (rev 13306)
+++ trunk/opsview-core/installer/upgradedb_opsview.pl 2013-08-15 20:23:13 UTC (rev 13307)
@@ -4817,6 +4817,23 @@
}
+unless (
+ $db->is_installed( "20130710hkmd", "Master housekeep metadata", "all" ) )
+{
+
+ my %settings = (
+ last_housekeeping_time => time(),
+ housekeeping_duration => 0,
+ );
+
+ while ( my ( $name, $value ) = each %settings ) {
+ $dbh->do( "INSERT INTO metadata (name, value) VALUES (?, ?)",
+ undef, $name, $value );
+ }
+
+ $db->updated;
+}
+
# end of updates
if ( $postupdate->{regenerate_hostgroups_lft_rgt} ) {
$db->print( "Regenerating host group information" );
Modified: trunk/opsview-core/t/var/opsview.test.db
===================================================================
--- trunk/opsview-core/t/var/opsview.test.db 2013-08-15 20:18:18 UTC (rev 13306)
+++ trunk/opsview-core/t/var/opsview.test.db 2013-08-15 20:23:13 UTC (rev 13307)
@@ -1265,7 +1265,8 @@
LOCK TABLES `metadata` WRITE;
/*!40000 ALTER TABLE `metadata` DISABLE KEYS */;
-INSERT INTO `metadata` VALUES ('dashboardLast','');
+INSERT INTO `metadata` VALUES ('housekeeping_duration','0');
+INSERT INTO `metadata` VALUES ('last_housekeeping_time','1373463448');
INSERT INTO `metadata` VALUES ('uncommitted','0');
INSERT INTO `metadata` VALUES ('version','2.8.19');
/*!40000 ALTER TABLE `metadata` ENABLE KEYS */;
@@ -2094,6 +2095,7 @@
INSERT INTO `schema_version` VALUES ('20130612accesses','all','New accessess','2013-06-11 10:46:29',0);
INSERT INTO `schema_version` VALUES ('20130621tenacces','all','Rename tenancy access','2013-06-21 00:00:00',0);
INSERT INTO `schema_version` VALUES ('20130702nagvis','all','New access for Nagvis','2013-07-02 13:15:57',0);
+INSERT INTO `schema_version` VALUES ('20130710hkmd','all','Master housekeep metadata','2013-07-10 13:37:28',0);
INSERT INTO `schema_version` VALUES ('20130814surv','all','Set survey to always send','2013-06-30 16:38:26',0);
INSERT INTO `schema_version` VALUES ('3.0','4',NULL,NULL,NULL);
INSERT INTO `schema_version` VALUES ('3.1','4',NULL,NULL,NULL);
