Changeset 34096

Timestamp:

Jun 26, 2012, 3:20:39 PM (14 years ago)

Author:

Serge CHASTEL

Message:

Added stsci nodes to nebulous plot

Location:

trunk/ippMonitor/czartool/czartool

Files:

• CzarDb.pm (modified) (1 diff)
• Nebulous.pm (modified) (1 diff)
• Plotter.pm (modified) (1 diff)

trunk/ippMonitor/czartool/czartool/CzarDb.pm

@@ -927 +927 @@
         my ($host, $used, $available, $writable, $readable) = @row;
    
-        if (($used/($used+$available))*100 > $limit) {$underLimit = 0;}
-        else {$underLimit = 1;}
+        if (($used+$available) == 0) {
+          $underLimit = 1;
+        } elsif (($used/($used+$available))*100 > $limit) {
+          $underLimit = 0;
+        } else {
+          $underLimit = 1;
+        }
 
         # Col 1: host

trunk/ippMonitor/czartool/czartool/Nebulous.pm

@@ -111 +111 @@
         }
         elsif (($line =~ m/(ipp[0-9]+\.[0-9]{1})\s.+[0-9]+\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)%.*/i)||
-               ($line =~ m/(ippb[0-9]+\.[0-9]{1})\s.+[0-9]+\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)%.*/i)) {
+               ($line =~ m/(ippb[0-9]+\.[0-9]{1})\s.+[0-9]+\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)%.*/i) ||
+               ($line =~ m/(stsci0[0-9]+\.[0-9]{1})\s.+[0-9]+\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)%.*/i)) {
         
             $self->{_totalHosts}++;

trunk/ippMonitor/czartool/czartool/Plotter.pm

@@ -679 +679 @@
 
         "\n";
-
     close GP;
 }