Changeset 39805 for trunk/ippMonitor

Timestamp:

Nov 5, 2016, 12:39:15 PM (10 years ago)

Author:

mhuber

Message:

(MEH) fixing error report for db repl if null sec_behind and misc old changes of others

Location:

trunk/ippMonitor

Files:

• czartool/czartool/CzarDb.pm (modified) (4 diffs)
• czartool/czartool/Nebulous.pm (modified) (1 diff)
• czartool/czartool/Pantasks.pm (modified) (1 diff)
• czartool/czartool/czarconfig.xml.in (modified) (1 diff)
• def/simplePlotSkycalImage.d (modified) (1 diff)
• def/simplePlotStaticskyImage.d (modified) (1 diff)
• raw/czartool_servers.php (modified) (1 diff)

trunk/ippMonitor/czartool/czartool/CzarDb.pm

@@ -274 +274 @@
 # CZW: 2014-09-12 edit to force in lanl labels
     if ($server eq 'stdscience') {
-        push @{$labels}, 'LAP.PV3.20140730.final';
+#        push @{$labels}, 'LAP.PV3.20140730.final';
 #        push @{$labels}, 'LAP.PV3.20140730.local';
 #        push @{$labels}, 'LAP.PV3.20140730.ipp';
@@ -284 +284 @@
 #        push @{$labels}, 'LAP.PV3.20140730.diff01';
 #        push @{$labels}, 'LAP.PV3.20140730.diff01.left';
-        push @{$labels}, 'LAP.PV3.20140730.ff01.remote';
-        push @{$labels}, 'LAP.PV3.20140730.ff01';
-        push @{$labels}, 'LAP.PV3.20140730.ff01.left';
-        push @{$labels}, 'LAP.PV3W.20150312';
+#        push @{$labels}, 'LAP.PV3.20140730.ff01.remote';
+#        push @{$labels}, 'LAP.PV3.20140730.ff01';
+#        push @{$labels}, 'LAP.PV3.20140730.ff01.left';
+#        push @{$labels}, 'LAP.PV3.20140730.ff01.bulge';
+#        push @{$labels}, 'LAP.PV3W.20150312';
 #       push @{$labels}, 'SAS.20141118';
+## MEH 20150921 manuall add WS labels while in ippqub stdscience       
+        push @{$labels}, 'OSS.WS.nightlyscience';
+        push @{$labels}, 'MSS.WS.nightlyscience';
+        push @{$labels}, 'ESS.WS.nightlyscience';
+        push @{$labels}, 'ThreePi.WS.nightlyscience';
+        push @{$labels}, 'SNIa.WS.nightlyscience';
+        push @{$labels}, 'QUB.WS.nightlyscience';       
+        push @{$labels}, 'QUB.SS.nightlyscience';
+        push @{$labels}, 'ps_ud_QUB';
+        #push @{$labels}, 'CFA.WS.nightlyscience';
+        #push @{$labels}, 'CFA.SS.nightlyscience';
+        push @{$labels}, 'FSS.WS.nightlyscience';
+        #push @{$labels}, 'NCU.ref.20161026';
+        #push @{$labels}, 'NCU.ref.20161026.update';
+        #push @{$labels}, 'NCU.WS.nightlyscience';
+        #push @{$labels}, 'NCU.SS.nightlyscience';
+        #push @{$labels}, 'QUB.lowdec.20160712';
+        #push @{$labels}, 'SAS.20151208';
+## MEH 20150928 manually add MD.PV3 WS labels too       
+        #push @{$labels}, 'MD01.PV3.WSdiff.20150312';
+        #push @{$labels}, 'MD02.PV3.WSdiff.20150312';
+        #push @{$labels}, 'MD03.PV3.WSdiff.20150312';
+        #push @{$labels}, 'MD04.PV3.WSdiff.20150312';
+        #push @{$labels}, 'MD05.PV3.WSdiff.20150312';
+        #push @{$labels}, 'MD06.PV3.WSdiff.20150312';
+        #push @{$labels}, 'MD07.PV3.WSdiff.20150312';
+        #push @{$labels}, 'MD08.PV3.WSdiff.20150312';
+        #push @{$labels}, 'MD09.PV3.WSdiff.20150312';
+        #push @{$labels}, 'MD10.PV3.WSdiff.20150312';
     }
 
@@ -964 +994 @@
         my ($host, $used, $available, $writable, $readable) = @row;
 
+        # stsci hosts are no longer with us
+        next if $host =~ /stsci/;
+
         if (($used+$available) == 0) {
           $underLimit = 1;
@@ -971 +1004 @@
           $underLimit = 1;
         }
+
 
         # Col 1: host

trunk/ippMonitor/czartool/czartool/Nebulous.pm

@@ -112 +112 @@
             next;
         } 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/(stsci[0-1][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)
+# these nodes are gone
+#               || ($line =~ m/(stsci[0-1][0-9]+\.[0-9]{1})\s.+[0-9]+\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)%.*/i)) 
+        ) {
 
             $self->{_totalHosts}++;

trunk/ippMonitor/czartool/czartool/Pantasks.pm

@@ -7 +7 @@
 
 my @servers = (
-        "addstar", 
-        "addstarlap", 
+#        "addstar", 
+#        "addstarlap",
+        "ippqub:stdscience_ws",
         "cleanup", 
-        "deepstack",
-        "detrend", 
+#        "deepstack",
+#        "detrend", 
         "distribution", 
         "pstamp", 

trunk/ippMonitor/czartool/czartool/czarconfig.xml.in

@@ -49 +49 @@
     <serverinterval>20 MINUTE</serverinterval>
     <!-- whitespace-separated server list for servers we want roboczar to check --> 
-    <interestedservers>stdscience distribution summitcopy registration pstamp </interestedservers>
+    <interestedservers>ippqub:stdscience_ws stdscience distribution summitcopy registration pstamp </interestedservers>
     <!-- <interestedservers>pstamp</interestedservers> -->
   </roboczar>

trunk/ippMonitor/def/simplePlotSkycalImage.d

@@ -4 +4 @@
 MENU  ipp.plots.dat
 
-WHERE skycalRun.state != 'new' 
+WHERE skycalRun.state = 'full' 
 WHERE skycalRun.skycal_id = skycalResult.skycal_id
 WHERE skycalRun.stack_id = stackRun.stack_id

trunk/ippMonitor/def/simplePlotStaticskyImage.d

@@ -4 +4 @@
 MENU  ipp.plots.dat
 
-WHERE staticskyRun.state != 'new' 
+WHERE staticskyRun.state = 'full' 
 WHERE staticskyRun.sky_id = staticskyResult.sky_id
 WHERE staticskyRun.sky_id = staticskyInput.sky_id

trunk/ippMonitor/raw/czartool_servers.php

@@ -33 +33 @@
 
 $servers=array(
-        "addstar", 
+        #"addstar", 
+        "ippqub:stdscience_ws",
         "cleanup", 
-        "detrend", 
+        #"detrend", 
         "distribution", 
         "pstamp", 
-        "update", 
-        "publishing", 
+        #"update", 
+        #"publishing", 
         "registration", 
         "replication",