Changeset 35747 for branches/eam_branches/ipp-20130509/ippMonitor

Timestamp:

Jul 3, 2013, 1:43:50 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130509/ippMonitor

Files:

• . (modified) (1 prop)
• czartool/czartool/Nebulous.pm (modified) (1 diff)
• czartool/czartool/Plotter.pm (modified) (1 diff)
• czartool/czartool/czarconfig.xml (modified) (1 diff)
• czartool/sql/insert_new_stsci_nodes_stsciwave2.sql (copied) (copied from trunk/ippMonitor/czartool/sql/insert_new_stsci_nodes_stsciwave2.sql )
• def/diffProcessedSkyfile_Images.d (modified) (2 diffs)
• def/newsimplePlotStaticskyImage.d (copied) (copied from trunk/ippMonitor/def/newsimplePlotStaticskyImage.d )

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

@@ -113 +113 @@
         } 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/(stsci0[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)) {
 
             $self->{_totalHosts}++;

branches/eam_branches/ipp-20130509/ippMonitor/czartool/czartool/Plotter.pm

@@ -707 +707 @@
     if ($self->{_outputFormat} ne "X11") {print GP "set output \"$outputFile\";";}
     print GP
-        "set term $self->{_outputFormat} size 1280,1024;" .
+        "set term $self->{_outputFormat} size 2560,1024;" .
         "set title \"Nebulous disk use across IPP cluster ($totalPercent of total allocated)\";" .
         "set style fill solid 1.00 border -1;" .

branches/eam_branches/ipp-20130509/ippMonitor/czartool/czartool/czarconfig.xml

@@ -47 +47 @@
     <serverinterval>20 MINUTE</serverinterval>
     <!-- whitespace-separated server list for servers we want roboczar to check --> 
-    <interestedservers>stdscience distribution summitcopy registration pstamp stack publishing</interestedservers>
+    <interestedservers>stdscience distribution summitcopy registration stack publishing pstamp </interestedservers>
     <!-- <interestedservers>pstamp</interestedservers> -->
   </roboczar>

branches/eam_branches/ipp-20130509/ippMonitor/def/diffProcessedSkyfile_Images.d

@@ -3 +3 @@
 FILE  diffProcessedSkyfile_Images.php
 MENU  ipp.stack.dat
+
+UNRESTRICTED AND 0>1
+RESTRICT_COUNT AND 0>1
 
 WHERE diffRun.diff_id             = diffSkyfile.diff_id
@@ -13 +16 @@
 
 # if no query restrictions are supplied, we want to limit the query or it is extremely long running:
-UNRESTRICTED AND diffRun.diff_id = 0
+# UNRESTRICTED AND diffRun.diff_id = 0
 
 # XXX need to get camera from lookup