Changeset 29834 for branches/eam_branches/ipp-20101103/tools/czarpoll.pl

Timestamp:

Nov 26, 2010, 10:33:29 AM (16 years ago)

Author:

eugene

Message:

merge updates from trunk

File:

• branches/eam_branches/ipp-20101103/tools/czarpoll.pl (modified) (7 diffs)

branches/eam_branches/ipp-20101103/tools/czarpoll.pl

@@ -13 +13 @@
 use czartool::Plotter;
 use czartool::Burntool;
+use czartool::DayMetrics;
+
 
 my $period = 60;
@@ -27 +29 @@
 my $nebulous = new czartool::Nebulous($czarDb);
 my $pantasks = new czartool::Pantasks();
-my $plotter = new czartool::Plotter($czarDb, "%Y%m%d-%H%M%S", "png font \"/usr/share/fonts/corefonts/arial.ttf\" 8", "/tmp", $save_temps); # TODO hardcoded font path
+my $plotter = new czartool::Plotter($gpc1Db, $czarDb, "%Y%m%d-%H%M%S", "png font \"/usr/share/fonts/corefonts/arial.ttf\" 8", "/tmp", $save_temps); # TODO hardcoded font path
 my $burntool = new czartool::Burntool();
+
 
 $czarDb->setDateFormat("%Y%m%d-%H%i%s");
@@ -107 +110 @@
     my $lastDay = strftime('%Y-%m-%d', localtime);
     my $today = undef;
+    my $doneMetricsToday = 1;
 
     while (1) {
@@ -118 +122 @@
                 $czarDb->optimize();
                 $lastDay = $today;
+                $doneMetricsToday = 0;
         }
 
@@ -124 +129 @@
         $end = $czarDb->getNowTimestamp();
 
+        # if time now is after 06:35am, then create metrics for past 24 hours
+        if (!$doneMetricsToday && $czarDb->isBefore($begin, $end)) {
+        
+                print "* Creating metrics for last 24 hours\n";
+                # TODO hardcopded path needs to be in config
+                my $dayMetrics = new czartool::DayMetrics($gpc1Db, $czarDb, "/data/ipp004.0/ipp/ippMetrics/", 1, 0, $today); 
+                $dayMetrics->writeHTML();
+
+                $doneMetricsToday = 1;
+        }
+
+        # if time now is before 06:35am, include data from previous day
         if ($czarDb->isBefore($end, $begin)) {
 
@@ -197 +214 @@
             chomp($label);
             $plotter->createLogAndLinearTimeSeries($label,  $stage, $begin, $end);
-        }
-    }
+            $plotter->createRateTimeSeries($label, $stage, $begin, $end, undef, 0);
+        }
+    }
+
+    my $allServerLabels = undef;
 
     # create plots for each label for all stages
@@ -205 +225 @@
 
         $plotter->createLogAndLinearTimeSeries($label, undef, $begin, $end);
+        $plotter->createRateTimeSeries($label, undef, $begin, $end, undef, 0);
         $plotter->createHistogram($label, $begin, $end);
-
-        #routineChecks($label, "1 HOUR");
-    }
-    $plotter->createLogAndLinearTimeSeries("all_".$server."_labels", undef, $begin, $end);
-    $plotter->createHistogram("all_".$server."_labels", $begin, $end);
+    }
+
+    $allServerLabels = "all_".$server."_labels";
+
+    $plotter->createLogAndLinearTimeSeries($allServerLabels, undef, $begin, $end);
+    $plotter->createRateTimeSeries($allServerLabels, undef, $begin, $end, undef, 0);
+    $plotter->createHistogram($allServerLabels, $begin, $end);
     foreach $stage (@stages) {
 
-        $plotter->createLogAndLinearTimeSeries("all_".$server."_labels",  $stage, $begin, $end); # TODO must be a neater way...
+        $plotter->createLogAndLinearTimeSeries($allServerLabels,  $stage, $begin, $end); # TODO must be a neater way...
+        $plotter->createRateTimeSeries($allServerLabels, $stage, $begin, $end, undef, 0);
     }
 }