Changeset 33415 for branches/meh_branches/ppstack_test/ippMonitor/raw/czartool_labels.php

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/raw/czartool_labels.php (modified) (12 diffs)

branches/meh_branches/ppstack_test/ippMonitor/raw/czartool_labels.php

@@ -27 +27 @@
 menu($myMenu, 'Czartool on '.$lastUpdateTime, 'ipp.css', $ID['link'], $ID['proj']);
 
-$states=array("full","new","drop","wait");
-$stages=array("burntool", "chip","cam","fake","warp","stack","diff","magic","magicDS","dist", "pub");
+$stages=array(
+        "burntool", 
+        "chip",
+        "cam",
+        "fake",
+        "warp",
+        "stack",
+        "diff",
+        "magic",
+        "magicDS",
+        "dist", 
+        "pub");
+
 $servers=array(
         "addstar",
@@ -41 +52 @@
         "replication",
         "stack",
+        "deepstack",
         "stdscience",
         "summitcopy");
@@ -149 +161 @@
 echo "<br>";
 echo $table;
-#"<table width=\"$width\" align=\"middle\" border=\"1\" cellspacing=\"0\" cellpadding=\"4\" style=\"font-size:80%\">\n";
+
 createTableTitle("Status and links", 3);
 echo "<tr>\n";
@@ -157 +169 @@
 echo "<tr><td>Postage stamp server status</td><td><a href=\"http://pstamp.ipp.ifa.hawaii.edu/status.php\"><font color=\"blue\">here</font></a></td></tr>";
 echo "<tr><td>Documentation</td><td><a href=\"http://svn.pan-starrs.ifa.hawaii.edu/trac/ipp/wiki/Processing\"><font color=\"blue\">here</font></a></td></tr>";
-echo "<tr><td>Cluster load</td><td><a href=\"http://ganglia.pan-starrs.ifa.hawaii.edu/?r=hour&s=descending&hc=6&c=IPP%2520Production\"><font color=\"blue\">here</font></a></td></tr>";
-echo "<tr><td>Who's using the cluster?</td><td><a href=\"http://ipp004.ifa.hawaii.edu/clusterMonitor/top.html\"><font color=\"blue\">here</font></a></td></tr>";
-echo "<tr><td>IPP metrics</td><td><a href=\"http://ipp004.ifa.hawaii.edu/ippMetrics\"><font color=\"blue\">here</font></a></td></tr>";
+echo "<tr><td>Cluster load</td><td><a href=\"http://ganglia.pan-starrs.ifa.hawaii.edu/?r=hour&s=descending&hc=6&c=IPP%2520Production\"><font color=\"blue\">here</font></a> <a href=\"http://ganglia.pan-starrs.ifa.hawaii.edu/?m=cpu_report&r=hour&s=by%2520name&c=IPP+Production&h=&sh=1&hc=8&z=small\"><font color=\"blue\">cpu_report</font></a></td></tr>";
+echo "<tr><td>Who's using the cluster?</td><td><a href=\"http://ippmonitor.ipp.ifa.hawaii.edu/ippMonitor/clusterMonitor/top.html\"><font color=\"blue\">here</font></a></td></tr>";
+echo "<tr><td>IPP metrics</td><td><a href=\"http://ipp0022.ifa.hawaii.edu/ps1sc/ippMetrics\"><font color=\"blue\">here</font></a></td></tr>";
 echo "<tr><td>Czar log pages</td><td><a href=\"http://svn.pan-starrs.ifa.hawaii.edu/trac/ipp/wiki/PS1_IPP_CzarLogs\"><font color=\"blue\">here</font></a></td></tr>";
 echo "<tr><td>Exposure summary</td><td><a href=\"czartool_exposures.php?pass=$pass&proj=$proj\"><font color=\"blue\">here</font></a></td></tr>";
@@ -165 +177 @@
 $plotTypeLink = ($plotType == "linear") ? "log" : "linear";
 $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&mode=" . $selectedMode . "&label=" . $selectedLabel . "&stage=" . $selectedStage . "&revertstage=" . $stage . "&plottype=$plotTypeLink";
-echo "<tr><td>Plot type</td><td><a href=\"$link\"><font color=\"blue\">Change to $plotTypeLink</font></a></td></tr>";
 
 
@@ -180 +191 @@
          $pubLabels, 
          $stages, 
-         $states, 
          "new", 
          $selectedLabel, 
@@ -201 +211 @@
       echo "<tr>";
       createTableColumnHeader("Database");
-      createTableColumnHeader("Status");
+      createTableColumnHeader("Status (sec behind master)");
       showReplicationsStatus($REPL_HOST_GPC1, $REPL_USER_GPC1, $REPL_PASSWORD_GPC1, $REPL_DBNAME_GPC1);
       showReplicationsStatus($REPL_HOST_NEBULOUS, $REPL_USER_NEBULOUS, $REPL_PASSWORD_NEBULOUS, $REPL_DBNAME_NEBULOUS);
@@ -349 +359 @@
         $pubLabels, 
         $stages, 
-        $states, 
         $selectedState, 
         $selectedLabel, $selectedStage, $plotType) {
@@ -483 +492 @@
     createFormattedTableCell(($selectedLabel != "all"), $link, "All labels", 0, null);
 
-    createFormattedTableCell(0, null, "Reverts:", 0, "$columnHeaderColor");
+    createFormattedTableCell(0, null, "Reverting?", 0, "$columnHeaderColor");
 
     foreach ($stages as &$stage) {
@@ -489 +498 @@
         if ($stage == "burntool") continue;
         $reverting = getRevertStatus($db, $stage);
-        $link = 
-            "czartool_labels.php?pass=".$pass
-            ."&proj=".$proj
-            ."&mode=" .$selectedMode
-            ."&label=".$selectedLabel
-            ."&stage=".$selectedStage
-            ."&plottype=".$plotType
-            ."&revertstage=".$stage
-            ."&revertmode=";
-
-        if(!$reverting) {$label =  "Start";$link = $link . "on";}
-        if($reverting) {$label = "Stop";$link = $link . "off";}
+        #$link = 
+        #    "czartool_labels.php?pass=".$pass
+        #    ."&proj=".$proj
+        #    ."&mode=" .$selectedMode
+        #    ."&label=".$selectedLabel
+        #    ."&stage=".$selectedStage
+        #    ."&plottype=".$plotType
+        #    ."&revertstage=".$stage
+        #    ."&revertmode=";
+#
+        #if(!$reverting) {$label =  "Start";$link = $link . "on";}
+        #if($reverting) {$label = "Stop";$link = $link . "off";}
+        if(!$reverting) {$label =  "no";}
+        if($reverting) {$label = "yes";}
         unset($reverting);
-        createFormattedTableCell(1, $link, $label, 0, "$columnHeaderColor");
+        #createFormattedTableCell(1, $link, $label, 0, "$columnHeaderColor");
+        createFormattedTableCell(0, null, $label, 0, "$columnHeaderColor");
         #echo "<td><a href=\"$link\"><font color=\"blue\">$label</font></td>";
 
@@ -904 +916 @@
         //die("MySQL DB connection error: Check the configuration for $replDatabaseName");
         //die("");
-        return;
+        return -1;
 
     }
@@ -911 +923 @@
         # Have a look for Last_Errno in http://dev.mysql.com/doc/refman/5.0/en/show-slave-status.html
         $errorStatusInMySql = $row[18];
-        $replStatus = ($errorStatusInMySql==0?"OK":"<font color=\"red\">PROBLEM</font>");
+        $sec_behind = $row[32];
+        $replStatus = ($errorStatusInMySql==0?"OK ($sec_behind)":"<font color=\"red\">PROBLEM</font>");
         echo "<tr><td>$replDatabaseName</td><td>$replStatus</td></tr>";
         if ($errorStatusInMySql!=0) {