Changeset 42794 for trunk/ippMonitor

Timestamp:

Mar 25, 2025, 4:04:52 PM (16 months ago)

Author:

cclin33

Message:

update pstamp server status with ippitc account

Location:

trunk/ippMonitor

Files:

• INSTALL (modified) (1 diff)
• 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) (1 diff)
• raw/ipp.php (modified) (1 diff)
• scripts/czartool_getServerStatus.pl (modified) (3 diffs)

trunk/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
+# 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
-psconfigure --htdocs /var/www/localhost/htdocs --wwwbin /var/www/localhost/wwwbin --pltdir /some/path --site ~/ippconfig/ippmonitor.config 
+# ippMetrics -> /export/ipp113.0/ipp/ippMetrics/
+# czartool_plots -> /export/ipp113.0/ipp/czartool_plots/
+psconfigure --htdocs /var/www/localhost/htdocs --wwwbin /var/www/localhost/wwwbin --pltdir /var/www/localhost/htdocs/ippMonitor --site ~/ippconfig/ippmonitor.config 
 
 ## NOTES:

trunk/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

trunk/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";
 

trunk/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

trunk/ippMonitor/raw/czartool_labels.php

@@ -87 +87 @@
         "distribution",
         "ippqub:stdscience_ws",
-        "pstamp",
+        "ippitc:pstamp",
         "registration",
 //        "stack",

trunk/ippMonitor/raw/ipp.php

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

trunk/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;
 }
+
+