Changeset 38258 for trunk/ippMonitor/raw/ipp.php

Timestamp:

May 13, 2015, 9:19:19 AM (11 years ago)

Author:

bills

Message:

Working version of czartool with plots.
raw/ipp.czar.dat

Remove 'czartool - ipptopsps link' from Czar left panel menu

raw/ipp.php

Get czardb name and host from site.php

raw/czartool_getplot.php

czartool plots are now in project specific directory
get base directory from

raw/czartool_labels.php

XXX: a couple of testing hacks to remove
Include proj in arguments to links to czartool_getplot.php

czartool/czarpoll.pl

Support for gathering data from multiple project databases.
czartool::Plotter now has an optional project database member. 3 Plotter
instances now.

plotter0 is for non project specific plots.
plotter1 is for gpc1
plotter1 is for gpc2

Keep track and print out how long each poll iteration takes. If it takes
less than the supplied period, sleep for the remainder. Currently takes
about 140 seconds which is larger than the default 60 second period.

Turn off the ippToPsps data gathering by nulling out the stage list.

czartool/czarplot.pl

Support for multiple projects

czartool/czartool/Metrics.pm

Metrics has a projectDb pass to Plotter constructor.
hardcoded member gpc1Db is deleted

czartool/czartool/DayMetrics.pm

projectDb isntead of hard coded gpc1Db
pass dbname to StageMetrics and CzarDb methods.

czartool/czartool/Config.pm

Added support for 2 project databases

czartool/czartool/CzarDb.pm

Operations on the stage tables now take "dbname" parameter.
This is passed to StageMetrics constructor.
XXX: should we split query for getTimeMinMaxDiff by project.

czartool/czartool/Plotter.pm

Add _projectDb member. Save dbname to _project for use in many method
invocations

czartool/czartool/StageMetrics.pm

Add dbname parameter.
XXX: Actually I'm not sure this is used any longer. This may have been
from a previous iteration. I've since moved the DB info to Plotter and Metrics.
Leaving in for now since this version is fully tested.

czartool/czartool/MySQLDb.pm

Add method to get _dbName

czartool/czartool/MetricsIndex.pm

Add database paramter to constructor for superclass Metrics. (It used to
have hard coded gpc1 db

File:

• trunk/ippMonitor/raw/ipp.php (modified) (3 diffs)

trunk/ippMonitor/raw/ipp.php

@@ -69 +69 @@
   global $DBUSER;
   global $DBPASS;
+  global $CZARDBNAME;
+  global $CZARDBHOST;
 
   $success = 0;
@@ -86 +88 @@
   // connect to the database
   if ($DBI == "DB") {
-    $db = DB::connect("mysql://$DBUSER:$DBPASS@$DBHOST/$database");
+    if ($database == $CZARDBNAME) {
+        $db = DB::connect("mysql://$DBUSER:$DBPASS@$CZARDBHOST/$database");
+    } else {
+        $db = DB::connect("mysql://$DBUSER:$DBPASS@$DBHOST/$database");
+    }
   }
   if ($DBI == "MDB2") {
@@ -192 +198 @@
 function checkID () {
 
+
   $VERBOSE = 0;
+  if ($VERBOSE > 1) {
+      phpinfo(32);
+  }
 
   // check for valid server method