Changeset 33415 for branches/meh_branches/ppstack_test/ippMonitor/czartool/czarpoll.pl

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ippMonitor (modified) (1 prop)
• ippMonitor/czartool/czarpoll.pl (modified) (5 diffs)

branches/meh_branches/ppstack_test/ippMonitor/czartool/czarpoll.pl

@@ -37 +37 @@
 
 
-my @stages = ("burntool", "chip", "cam", "fake", "warp", "stack", "diff", "magic", "magicDS", "dist", "pub");
-
+my @stages = (
+        "burntool", 
+        "chip", 
+        "cam", 
+        "fake", 
+        "warp", 
+        "stack", 
+        "diff", 
+        "magic", 
+        "magicDS", 
+        "dist", 
+        "pub");
+
+my @ippToPspsStages = (
+        "processed",
+        "loaded_to_datastore",
+        "loaded_to_ODM",
+        "merge_worthy",
+        "deleted_datastore",
+        "deleted_dxlayer",
+        "merged",
+        "deleted_local");
+
+my @allStages = (@stages, @ippToPspsStages);
 
 timePoll($period);
@@ -219 +241 @@
 
                 updateAllStages($thisServer, $newState, $labels, $begin, $end);
-                createPlots($thisServer, $labels, $begin, $end);
+                if ($thisServer eq "stdscience") {createPlots($thisServer, $labels, $begin, $end);}
             }
             else { print "* WARNING: no $thisServer labels found in Db\n";}
@@ -244 +266 @@
     print "* Generating plots\n";
 
+    # get ippToPsps labels
+    my $ippToPspsLabels = undef;
+    $czarDb->getCurrentIppToPspsLabels($begin, $end, \$ippToPspsLabels);
+    $plotter->setIppToPspsMode();
+    
+    # create ippToPsps labels
+    foreach $stage (@ippToPspsStages) {
+        foreach $row ( @{$ippToPspsLabels} ) {
+            my ($label) = @{$row};
+            
+            chomp($label);
+            $plotter->createTimeSeries($label, $stage, $begin, $end, 1, 0, 1);
+        }
+    }
+
+    # create plots for each label for all stages for ippToPsps
+    foreach $row ( @{$ippToPspsLabels} ) {
+        my ($label) = @{$row};
+
+        $plotter->createTimeSeries($label, undef, $begin, $end, 1, 1, 1);
+    }
+
+
     # create plots for each label for each stage
+    $plotter->setStandardMode();
     foreach $stage (@stages) {
         foreach $row ( @{$rows} ) {
@@ -250 +296 @@
 
             chomp($label);
-            $plotter->createTimeSeries($label, $stage, $begin, $end, 1, 1, 1);
+            $plotter->createTimeSeries($label, $stage, $begin, $end, 1, 0, 1);
         }
     }
@@ -265 +311 @@
     $allServerLabels = "all_".$server."_labels";
 
-    $plotter->createTimeSeries($allServerLabels, undef, $begin, $end, 1, 1, 1);
+    $plotter->createTimeSeries($allServerLabels, undef, $begin, $end, 1, 0, 1);
 
     foreach $stage (@stages) {
 
-        $plotter->createTimeSeries($allServerLabels, $stage, $begin, $end, 1, 1, 1); # TODO must be a neater way...
+        $plotter->createTimeSeries($allServerLabels, $stage, $begin, $end, 1, 0, 1); # TODO must be a neater way...
     }
 }