Changeset 32097

Timestamp:

Aug 15, 2011, 2:44:36 PM (15 years ago)

Author:

rhenders

Message:

changed nebulous command and regex necessary to get full host name (ipp037.0 rather than ipp037)

File:

• trunk/ippMonitor/czartool/czartool/Nebulous.pm (modified) (3 diffs)

trunk/ippMonitor/czartool/czartool/Nebulous.pm

@@ -89 +89 @@
     my ($self) = @_;
 
-    my @cmdOut = `neb-df`;
+    my @cmdOut = `neb-df --names`;
     my $line;
     $self->{_totalHosts} = 0;
@@ -110 +110 @@
             next;
         }
-        elsif (($line =~ m/(ipp[0-9]+)\s.+[0-9]+\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)%.*/i)||
-               ($line =~ m/(ippb[0-9]+)\s.+[0-9]+\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)%.*/i)) {
+        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)) {
         
             $self->{_totalHosts}++;
@@ -149 +149 @@
 
         chomp($line);
-        if ($line =~ m/$host\s+[0-9.A-Za-z]+\s+([01]+)\s+([01]+)\s+([01]+)\s+.*/i) {
+        if ($line =~ m/[0-9.A-Za-z]+\s+$host\s+([01]+)\s+([01]+)\s+([01]+)\s+.*/i) {
 
             # if mounted...