Changeset 42819

Timestamp:

May 8, 2025, 4:08:38 PM (12 months ago)

Author:

eugene

Message:

merge from trunk: plotting improvements

Location:

branches/eam_branches/ipp-20230313/ippMonitor

Files:

• . (modified) (1 prop)
• INSTALL (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• czartool/czarpoll.pl (modified) (2 diffs)
• czartool/czartool/Nebulous.pm (modified) (1 diff)
• czartool/czartool/Pantasks.pm (modified) (3 diffs)
• czartool/extra_labels.dat (modified) (1 diff)
• raw/czartool_labels.php (modified) (2 diffs)
• raw/dataquality.php (copied) (copied from trunk/ippMonitor/raw/dataquality.php )
• raw/ipp.czar.dat (modified) (1 diff)
• raw/ipp.php (modified) (1 diff)
• raw/pointing.php (copied) (copied from trunk/ippMonitor/raw/pointing.php )
• scripts/czartool_getServerStatus.pl (modified) (3 diffs)

branches/eam_branches/ipp-20230313/ippMonitor/INSTALL

@@ -39 +39 @@
 # $CZARPLOTDIR and $METRICSPLOTDIR will be generated as links in the same folder as ippMonitor  
 # the structure of the names for these two directories are defined in Makefile.in a
-psconfigure --htdocs /var/www/localhost/htdocs --wwwbin /var/www/localhost/wwwbin --pltdir /some/path --site ~/ippconfig/ippmonitor.config --usePDO
+
+# pltdir is for ippMetrics and czartool_plots hyperlinked from /export/ipp113.0/ipp/ in /var/www/localhost/htdocs/ippMonitor
+# pltdir in ipp117 is /var/www/localhost/htdocs/ippMonitor
+# ippMetrics -> /export/ipp113.0/ipp/ippMetrics/
+# czartool_plots -> /export/ipp113.0/ipp/czartool_plots/
+# --usePDO selects a modern PHP/mysql interface
+psconfigure --htdocs /var/www/localhost/htdocs --wwwbin /var/www/localhost/wwwbin --pltdir /var/www/localhost/htdocs/ippMonitor --site ~/ippconfig/ippmonitor.config --usePDO
 
 # note that modern php requires the use of PDO, the older MDB2 and DB mysql interfaces have been deprecated

branches/eam_branches/ipp-20230313/ippMonitor/Makefile.in

@@ -91 +91 @@
 $(DESTWWW)/scatterPlotAirmassMcal.php \
 $(DESTWWW)/scatterPlotDataQuality.php \
+$(DESTWWW)/dataquality.php \
+$(DESTWWW)/pointing.php \
 $(DESTWWW)/loader.js
 

branches/eam_branches/ipp-20230313/ippMonitor/czartool/czarpoll.pl

@@ -380 +380 @@
         }
 
+        # check ippdb host IPP-2338
+        print "* Checking ippdb hosts\n";
+        my @hosts = qw(ipphome0 ipphome1 ippdb01 ippdb05 ippdb06 ippdb09 ippdb11 ippdb12 ippdb13 ippdb14);
+        if($dbupdate == 1) {check_disk_usage_and_update($czarDb, @hosts);}
+
         # check pantasks status
         if($dbupdate == 1) {updateServerStatus();}
@@ -604 +609 @@
 }
 
+###########################################################################
+#
+# Loops through given host and update to the host list
+#
+###########################################################################
+sub check_disk_usage_and_update {
+    my ($czarDb, @hosts) = @_;
+
+    foreach my $host (@hosts) {
+        print "Checking $host...\n";
+
+        for my $suffix (0, 1) {
+            my $mount_point = "/export/$host.$suffix";
+
+            # Use SSH to get disk stats
+            my $df_output = `ssh $host df -k $mount_point 2>/dev/null`;
+
+            #if (!$df_output || $df_output !~ /\d/) {
+            #    warn "Failed to get disk usage for $host on $mount_point\n";
+            #    next;
+            #}
+
+            my @lines = split /\n/, $df_output;
+            my $line = $lines[1] || next;
+
+            my ($filesystem, $blocks, $used, $available, $percent, $mount) = split /\s+/, $line;
+
+            # 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 $used_percent      = sprintf("%.3f", $used / $blocks * 100);
+            my $available_percent = sprintf("%.3f", $available / $blocks * 100);
+
+            my $readable = 1;
+            my $writable = 1;
+
+            #print "Mount $mount_point: total=${total_tb}TB, used=${used_tb}TB (${used_percent}%), available=${available_tb}TB (${available_percent}%)\n";
+
+            # Example: ippdb01.0(3.5T)
+            my $host_label = "$host.$suffix(${total_tb}T)";
+            $czarDb->updateHost($host_label, 100, $available_percent, $used_percent, $readable, $writable);
+        }
+    }
+}

branches/eam_branches/ipp-20230313/ippMonitor/czartool/czartool/Nebulous.pm

@@ -111 +111 @@
 
             next;
-        } elsif (($line =~ m/(ipp[0-9]+\.[0-9]{1})\s.+[0-9]+\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)%.*/i)||
+        } elsif (($line =~ m/(ipp[0-9]+(?:_bck)?\.[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)
 # these nodes are gone

branches/eam_branches/ipp-20230313/ippMonitor/czartool/czartool/Pantasks.pm

@@ -10 +10 @@
         "cleanup", 
         "distribution", 
-        "pstamp", 
+        "ippitc:pstamp", 
         "registration", 
         "stack", 
@@ -22 +22 @@
         "ippqub:stdscience_ws",
         "ippqub2:stdscience_ws",
+        "ippsky:stdscience_ipp138",
         "publishing", 
         "replication", 
@@ -27 +28 @@
         );
 # current home dir of gpc1 and gpc2 
-my $ipphome1 = "/home/panstarrs/ippitc";
+my $ipphome1 = "/home/panstarrs/ippps1";
 my $ipphome2 = "/home/panstarrs/ippps2";
 

branches/eam_branches/ipp-20230313/ippMonitor/czartool/extra_labels.dat

@@ -1 +1 @@
 ## TdB20190626: add extra labels for processing in this file. Syntax is as follows: [labelname] [telescope]
 ## Priorities for the labels must be added to the priorities mySQL table for the relevant telescope, if desired.
-PV3.Pole.Reprocess.20180510 gpc1
+## PV3.Pole.Reprocess.20180510 gpc1
 ps_ud_QUB gpc1
+## update.ipp138.fix gpc1
+## update.ipp138.fix gpc2

branches/eam_branches/ipp-20230313/ippMonitor/raw/czartool_labels.php

@@ -87 +87 @@
         "distribution",
         "ippqub:stdscience_ws",
-        "pstamp",
+        "ippitc:pstamp",
         "registration",
 //        "stack",
@@ -1668 +1668 @@
     $qry = $db->query($sql);
     if (dberror($qry)) {echo "<b>error with $sql </b><br>\n";}
+
+    // Set environment variables
+    putenv("PATH=/usr/local/bin:/usr/bin:/bin:/data/ippc65.0/ipp/src/psconfig//ipp-20210708-gentoo.lin64/bin");
+    putenv("PERL5LIB=/data/ippc65.0/ipp/src/psconfig//ipp-20210708-gentoo.lin64/lib");
+
     # not sure why neb-host doesn't work on ipp113 CCL.20210216
     exec("neb-host |cut -b 17-30,86-", $hostnoteall);

branches/eam_branches/ipp-20230313/ippMonitor/raw/ipp.czar.dat

@@ -5 +5 @@
 menulink   | menuselect      | link    | czartool               | czartool_labels.php
 menulink   | menuselect      | link    | storage status         | storage.php
+menulink   | menuselect      | link    | pointing               | pointing.php
+menulink   | menuselect      | link    | data quality           | dataquality.php
 menulink   | menuselect      | link    | mask stats             | maskStats.php
 menulink   | menuselect      | link    | night summary          | nightSummary.php

branches/eam_branches/ipp-20230313/ippMonitor/raw/ipp.php

@@ -982 +982 @@
 }
 
-
-
 ?>

branches/eam_branches/ipp-20230313/ippMonitor/scripts/czartool_getServerStatus.pl

@@ -19 +19 @@
 
 if ($proj eq 'gpc1') {
-  $user = 'ippitc';
+  $user = 'ippps1';
 } else {
   $user = 'ippps2';
+}
+
+my @cmdOut3 = `grep PANTASKS_SERVER ~$user/$server/ptolemy.rc |grep -v std | grep -v PORT 2>&1`;
+my $line3;
+foreach $line3 (@cmdOut3) {
+    chomp($line3);
+    print "$line3 \n";
 }
 
@@ -40 +47 @@
     my @fields = split /\s+/, $line2;
 
+
 #    run job example 
 # field0      1        2       3         4      5       6           7       8 
@@ -50 +58 @@
     $nline = $nline + 1;
 }
+
+