X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=clearadm%2Fplot.cgi;fp=clearadm%2Fplot.cgi;h=9fada5528afb3a9dcd272e92978e4c12fcefade0;hb=0c802537ec02d6cfea4c41b3138535c09a319489;hp=422f15629e9330903bcfaa1e4d96c5000c12d192;hpb=bdb1e0c845a6921e22d52fbff3404d5c1dfae520;p=clearscm.git

diff --git a/clearadm/plot.cgi b/clearadm/plot.cgi
index 422f156..9fada55 100755
--- a/clearadm/plot.cgi
+++ b/clearadm/plot.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/local/bin/perl
 
 =pod
 
@@ -58,26 +58,31 @@ my $clearadm;
 sub displayGraph () {
   my $parms;
 
-  foreach (keys %opts) {
-    $parms .= '&'
-      if $parms;
+  for (keys %opts) {
+    $parms .= '&' if $parms;
     $parms .= "$_=$opts{$_}"
-  } # foreach
+  } # for
 
   display '<center>';
   
   if ($opts{type} eq 'loadavg') {
-  	unless ($opts{tiny}) {
+    unless ($opts{tiny}) {
       display img {src => "plotloadavg.cgi?$parms", class => 'chart'};
-  	} else {
+    } else {
       display img {src => "plotloadavg.cgi?$parms", border => 0};
-  	} # unless
+    } # unless
   } elsif ($opts{type} eq 'filesystem') {
-  	unless ($opts{tiny}) {
+    unless ($opts{tiny}) {
       display img {src => "plotfs.cgi?$parms", class => 'chart'};
-  	} else {
+    } else {
       display img {src => "plotfs.cgi?$parms", border => 0};
-  	} # unless
+    } # unless
+  } elsif ($opts{type} eq 'vob' or $opts{type} eq 'view') {
+    unless ($opts{tiny}) {
+      display img {src => "plotstorage.cgi?$parms", class => 'chart'};
+    } else {
+      display img {src => "plotstorage.cgi?$parms", border => 0};
+    } # unless
   } # if
 
   display '</center>';
@@ -140,7 +145,7 @@ sub displayFSInfo () {
   return;  
 } # displayInfo
 
-sub displayControls () {
+sub displayControls() {
   my $class = $opts{type} =~ /loadavg/i 
             ? 'controls'
             : 'filesystemControls';
@@ -152,15 +157,22 @@ sub displayControls () {
     width       => '800px',
   };
   
-  my $systemLink = span {id => 'systemLink'}, a {
-    href => "systemdetails.cgi?system=$opts{system}",
-  }, 'System';
+  my $tagsButtons;
+  my ($systemLink, $systemButtons);
 
-  my $systemButtons = makeSystemDropdown (
-    $systemLink, 
-    $opts{system}, 
-    'updateFilesystems(this.value);updateSystemLink(this.value)'
-  );
+  if ($opts{type} =~ /(vob|view)/i) {
+    $tagsButtons = makeTagsDropdown ($opts{type}, $opts{tag});
+  } else {
+    $systemLink = span {id => 'systemLink'}, a {
+      href => "systemdetails.cgi?system=$opts{system}",
+    }, 'System';
+
+    $systemButtons = makeSystemDropdown (
+      $systemLink, 
+      $opts{system}, 
+      'updateFilesystems(this.value);updateSystemLink(this.value)'
+    );
+  } # if
 
   my $startButtons = makeTimeDropdown (
     $opts{type},
@@ -182,9 +194,15 @@ sub displayControls () {
     $opts{scaling},
   );
 
-  my $update = $opts{type} eq 'loadavg' 
-             ? "updateSystem('$opts{system}')"
-             : "updateFilesystem('$opts{system}','$opts{filesystem}')";
+  my $update;
+
+  if ($opts{type} eq 'loadavg') {
+    $update = "updateSystem('$opts{system}')";
+  } elsif ($opts{type} eq 'filsystem') {
+    $update = "updateFilesystem('$opts{system}','$opts{filesystem}')";
+  } else {
+    $update = ''; # TODO do I need something here?
+  } # if
              
   my $intervalButtons = makeIntervalDropdown (
     'Interval',
@@ -195,7 +213,7 @@ sub displayControls () {
   display start_Tr;
     display td $startButtons;
     display td $intervalButtons;
-    display td $systemButtons;
+    display td $opts{type} =~ /(vob|view)/i ? $tagsButtons : $systemButtons;
   display end_Tr;
 
   display start_Tr;
@@ -216,14 +234,20 @@ sub displayControls () {
       value => 'Draw Graph',
     };
   } else {
-    my $filesystemButtons = makeFilesystemDropdown (
-      $opts{system}, 
-      'Filesystem',
-      undef,
-      "updateFilesystem('$opts{system}',this.value)",
-    );
+    if ($opts{type} eq 'filesystem') {
+      my $filesystemButtons = makeFilesystemDropdown (
+        $opts{system}, 
+        'Filesystem',
+        undef,
+        "updateFilesystem('$opts{system}',this.value)",
+      );
   	
-    display td $filesystemButtons;
+      display td $filesystemButtons;
+    } else {
+      my $storagePoolButtons = makeStoragePoolDropdown ($opts{type}, $opts{tag});
+
+      display td $storagePoolButtons;
+    } # if
     
     display end_Tr;
     display start_Tr;
@@ -240,10 +264,12 @@ sub displayControls () {
 
 $clearadm = Clearadm->new;
 
-my $title  = ucfirst ($opts{type}) . ': ' . ucfirst $opts{system};
+my $title  = ucfirst ($opts{type}) . ': ';
 
-$title .= ":$opts{filesystem}"
-  if $opts{filesystem};
+$title .= ucfirst $opts{system}           if $opts{system};
+$title .= ":$opts{filesystem}"            if $opts{filesystem};
+$title .= $opts{tag}                      if $opts{tag};
+$title .= " Storage pool: $opts{storage}" if $opts{storage};
 
 heading $title;
 
@@ -317,4 +343,4 @@ Please report problems to Andrew DeFaria <Andrew@ClearSCM.com>.
 
 Copyright (c) 2010, ClearSCM, Inc. All rights reserved.
 
-=cut
\ No newline at end of file
+=cut