Changeset 1755

Timestamp:

12/03/08 11:21:44 (1 month ago)

Author:

ton

Message:

RRD migration initiated from db upgrade scripts

Files:

• branches/DEV-opsview3/CHANGES (modified) (1 diff)
• branches/DEV-opsview3/opsview-core/bin/db_opsview (modified) (1 diff)
• branches/DEV-opsview3/opsview-core/installer/migrate_rrds (modified) (2 diffs)
• branches/DEV-opsview3/opsview-core/installer/upgradedb_opsview.pl (modified) (1 diff)

branches/DEV-opsview3/CHANGES

@@ -4 +4 @@
-        Convert all mysql datetime fields into UTC
-        nagiosgraph forked and now part of opsview-core package. Creates new style RRDs if the old ones do not exist
+        Old style RRDs are upgraded as part of the database upgrade process
-        Updated scriptaculous to 1.8.2
-

branches/DEV-opsview3/opsview-core/bin/db_opsview

@@ -787 +787 @@
-        INSERT INTO schema_version (major_release, version) VALUES ('2.13', '2');
-        INSERT INTO schema_version (major_release, version) VALUES ('2.14', '2');
-2
+3
-
-EOF

branches/DEV-opsview3/opsview-core/installer/migrate_rrds

@@ -59 +59 @@
-closedir D;
-
+my $now = scalar localtime;
+print "$now: Starting RRD migration\n";
-my $rrd_migration_flag = "/usr/local/nagios/var/rrd_migration.flag";
-open F, "> $rrd_migration_flag" or die "Cannot create migration flag";
@@ -235 +237 @@
-
-unlink $rrd_migration_flag;
+$now = scalar localtime;
+print "$now: Finished migration\n";
-
-# From insert.pl

branches/DEV-opsview3/opsview-core/installer/upgradedb_opsview.pl

@@ -1333 +1333 @@
-
-if ($db->is_lower("3.0.2")) {
+        print "Updating all auditlog entries to UTC - this may take some time\n";
-        $dbh->do("UPDATE auditlogs SET datetime=CONVERT_TZ(datetime, 'SYSTEM', '+00:00')");
-        $db->updated;
-}
-
+# Bit cheeky - this migration is run as if there is a db change, although no change has actually occurred 
+# at DB level. This ensures it is only run the once
+if ($db->is_lower("3.0.3")) {
+        print "Updating RRDs - running this in the background. Check /tmp/migrate_rrds.log for status\n";
+        system("nohup nice -n 20 /usr/local/nagios/installer/migrate_rrds >> /tmp/migrate_rrds.log 2>&1 &");
+        $db->updated;
+}
-
-if ($opts->{t}) {