Changeset 1757

Timestamp:

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

Author:

ton

Message:

Show message on Opsview reload page if rrd migration in progress

Files:

• branches/DEV-opsview3/CHANGES (modified) (1 diff)
• branches/DEV-opsview3/opsview-web/lib/Opsview/Web/Controller/Admin/Reload.pm (modified) (2 diffs)
• branches/DEV-opsview3/opsview-web/root/admin/reload/opsview (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
-
+. Opsview reload page will show message if migration is running
-        Updated scriptaculous to 1.8.2
-

branches/DEV-opsview3/opsview-web/lib/Opsview/Web/Controller/Admin/Reload.pm

@@ -33 +33 @@
-
-my $reload_flag="/usr/local/nagios/var/rw/reload_flag";
+my $rrd_migration_flag="/usr/local/nagios/var/rrd_migration.flag";
-
-sub auto :Private {
@@ -51 +52 @@
-sub opsview :Path {
-  my ($self, $c) = @_;
+  if (-e $rrd_migration_flag) {
+    $c->stash( rrd_migration_flag => 1 );
+  }
-  $c->stash( average_time => Opsview::Reloadtime->average_duration );
-  $c->stash(template => "opsview");

branches/DEV-opsview3/opsview-web/root/admin/reload/opsview

@@ -197 +197 @@
-   class="reload" onclick="Effect.Pulsate(this,{duration: 6}); restartOpsview()" /-->
-</div>
+[% IF rrd_migration_flag %]
+<br/>
+<div class="warn_text">
+WARNING: RRD migration is in progress. See <a href="http://docs.opsview.org/doku.php?id=opsview3.0:upgrading_from_2.14#rrd_migration">documentation</a> for more details
+</div>
+[% END %]
-<div id="warnings" class="warn_text" [% hide %]>
- <h2>[% c.loc("Configuration errors detected during last reload") %]</h2>