Changeset 29119 for trunk/tools/roboczar.pl

Timestamp:

Sep 3, 2010, 3:55:23 PM (16 years ago)

Author:

rhenders

Message:

Changes to way log/linear plots are generated

File:

• trunk/tools/roboczar.pl (modified) (6 diffs)

trunk/tools/roboczar.pl

@@ -11 +11 @@
 use czartool::Pantasks;
 use czartool::Nebulous;
-use czartool::Czarplot;
+use czartool::Plotter;
 use czartool::Burntool;
 
@@ -27 +27 @@
 my $nebulous = new czartool::Nebulous($czarDb);
 my $pantasks = new czartool::Pantasks();
-my $czarplot = new czartool::Czarplot($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($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();
 
@@ -109 +109 @@
 
         # sort out times
-        $begin =  strftime('%Y-%m-%d 06:30',localtime);
+        $begin =  strftime('%Y-%m-%d 06:35',localtime);
         $end = $czarDb->getNowTimestamp();
 
@@ -125 +125 @@
         print "* Checking Nebulous\n";
         $nebulous->updateClusterSpaceInfo();
-        $czarplot->plotDiskUsageHistogram();
+        $plotter->plotDiskUsageHistogram();
         updateServerStatus();
 
@@ -186 +186 @@
 
             chomp($label);
-            $czarplot->createTimeSeries($label,  $stage, $begin, $end, 1, 1);
+            $plotter->createLogAndLinearTimeSeries($label,  $stage, $begin, $end);
         }
     }
@@ -194 +194 @@
         my ($label) = @{$row};
 
-        $czarplot->createTimeSeries($label, undef, $begin, $end, 1, 1);
-        $czarplot->createHistogram($label, $begin, $end);
+        $plotter->createLogAndLinearTimeSeries($label, undef, $begin, $end);
+        $plotter->createHistogram($label, $begin, $end);
 
         #routineChecks($label, "1 HOUR");
     }
-    $czarplot->createTimeSeries("all_".$server."_labels", undef, $begin, $end, 1, 1);
-    $czarplot->createHistogram("all_".$server."_labels", $begin, $end);
+    $plotter->createLogAndLinearTimeSeries("all_".$server."_labels", undef, $begin, $end);
+    $plotter->createHistogram("all_".$server."_labels", $begin, $end);
     foreach $stage (@stages) {
 
-        $czarplot->createTimeSeries("all_".$server."_labels",  $stage, $begin, $end, 1, 1); # TODO must be a neater way...
+        $plotter->createLogAndLinearTimeSeries("all_".$server."_labels",  $stage, $begin, $end); # TODO must be a neater way...
     }
 }