Changeset 42858 for trunk/ippMonitor/czartool/czarpoll.pl

Timestamp:

May 13, 2025, 1:13:09 PM (14 months ago)

Author:

cclin33

Message:

add disk usage in Database status section

File:

• trunk/ippMonitor/czartool/czarpoll.pl (modified) (4 diffs)

trunk/ippMonitor/czartool/czarpoll.pl

@@ -229 +229 @@
 
     my $server = undef;
-    my $alive = undef;
-    my $running = undef;
+
+    my ($alive, $running);
+
     foreach $server (@{$servers}) {
+        # For gpc1
         $pantasks->getServerStatus($server,'gpc1', \$alive, \$running);
         $czarDb->updateServerStatus($server,'gpc1', $alive, $running);
+        # For gpc2
         $pantasks->getServerStatus($server,'gpc2', \$alive, \$running);
         $czarDb->updateServerStatus($server,'gpc2', $alive, $running);
+
    }
 }
@@ -245 +249 @@
 ###########################################################################
 sub updateServerStatusLive {
-    print "* Checking all pantasks servers\n";
+    print "* Checking all pantasks live servers\n";
 
     my $servers = $pantasks->getServerList();
 
     my $server = undef;
-    my $alive = undef;
-    my $running = undef;
+    my ($alive, $running, $pan_host);
+
     foreach $server (@{$servers}) {
-        $pantasks->getServerStatus($server,'gpc1', \$alive, \$running);
-        $czarDb->updateServerStatusLive($server,'gpc1', $alive, $running);
-        $pantasks->getServerStatus($server,'gpc2', \$alive, \$running);
-        $czarDb->updateServerStatusLive($server,'gpc2', $alive, $running);
+        # For gpc1
+        $pantasks->getServerStatus($server,'gpc1', \$alive, \$running, \$pan_host);
+        $czarDb->updateServerStatusLive($server,'gpc1', $alive, $running, $pan_host);
+        print "Server: $server | Telescope: gpc1 | Alive: $alive | Running: $running | Host: " . (defined $pan_host ? $pan_host : "undef") . "\n";
+        # For gpc2
+        $pantasks->getServerStatus($server,'gpc2', \$alive, \$running, \$pan_host);
+        $czarDb->updateServerStatusLive($server,'gpc2', $alive, $running, $pan_host);
+        print "Server: $server | Telescope: gpc2 | Alive: $alive | Running: $running | Host: " . (defined $pan_host ? $pan_host : "undef") . "\n";
    }
 }
@@ -637 +645 @@
 
             # Convert KB to TB
-            my $total_tb     = sprintf("%.1f", $blocks    / 1024 / 1024 / 1024);
-            my $used_tb      = sprintf("%.1f", $used      / 1024 / 1024 / 1024);
-            my $available_tb = sprintf("%.1f", $available / 1024 / 1024 / 1024);
+            my $total_tb     = sprintf("%.3f", $blocks    / 1024 / 1024 / 1024 );
+            my $used_tb      = sprintf("%.3f", $used      / 1024 / 1024 / 1024 );
+            my $available_tb = sprintf("%.3f", $available / 1024 / 1024 / 1024 );
 
             my $used_percent      = sprintf("%.3f", $used / $blocks * 100);
@@ -650 +658 @@
 
             # Example: ippdb01.0(3.5T)
-            my $host_label = "$host.$suffix(${total_tb}T)";
-            $czarDb->updateHost($host_label, 100, $available_percent, $used_percent, $readable, $writable);
-        }
-    }
-}
+            #my $host_label = "$host.$suffix(${total_tb}T)";
+            my $host_label = "$host.$suffix";
+            $czarDb->updateHost($host_label, $total_tb, $available_tb, $used_tb, $readable, $writable);
+        }
+    }
+}